From 3b96593bb7e1796fba0d383801eb121b2f0222d3 Mon Sep 17 00:00:00 2001
From: Hannes Frederic Sowa <hannes@stressinduktion.org>
Date: Sat, 15 Dec 2012 15:42:19 +0000
Subject: [PATCH] --- yaml --- r: 347308 b: refs/heads/master c:
 4e4b53768f1ddce38b7f6edcad3a063020ef0024 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/net/netlink/af_netlink.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 639e98423659..d04e29e6c940 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f1e0ad0ad3e19fce3df864502e9f419204397d7
+refs/heads/master: 4e4b53768f1ddce38b7f6edcad3a063020ef0024
diff --git a/trunk/net/netlink/af_netlink.c b/trunk/net/netlink/af_netlink.c
index 9ee52b6a12dd..c0353d55d56f 100644
--- a/trunk/net/netlink/af_netlink.c
+++ b/trunk/net/netlink/af_netlink.c
@@ -669,6 +669,9 @@ static int netlink_bind(struct socket *sock, struct sockaddr *addr,
 	struct sockaddr_nl *nladdr = (struct sockaddr_nl *)addr;
 	int err;
 
+	if (addr_len < sizeof(struct sockaddr_nl))
+		return -EINVAL;
+
 	if (nladdr->nl_family != AF_NETLINK)
 		return -EINVAL;