[PATCH] netlink: make sure nladdr has correct size in netlink_connect()

Subsystems: networking [general], the rest

STALE3143d

2 messages, 2 authors, 2018-03-14 · open the first message on its own page

[PATCH] netlink: make sure nladdr has correct size in netlink_connect()

From: Alexander Potapenko <glider@google.com>
Date: 2018-03-14 14:03:29

KMSAN reports use of uninitialized memory in the case when |alen| is
smaller than sizeof(struct netlink_sock), and therefore |nladdr| isn't
fully copied from the userspace.

Signed-off-by: Alexander Potapenko <glider@google.com>
Fixes: 1da177e4c3f41524 ("Linux-2.6.12-rc2")
---
 net/netlink/af_netlink.c | 3 +++
 1 file changed, 3 insertions(+)
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 07e8478068f0..5d49b39e81c3 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -1085,6 +1085,9 @@ static int netlink_connect(struct socket *sock, struct sockaddr *addr,
 	if (addr->sa_family != AF_NETLINK)
 		return -EINVAL;
 
+	if (alen < sizeof(struct netlink_sock))
+		return -EINVAL;
+
 	if ((nladdr->nl_groups || nladdr->nl_pid) &&
 	    !netlink_allowed(sock, NL_CFG_F_NONROOT_SEND))
 		return -EPERM;
-- 
2.16.2.804.g6dcf76e118-goog

Re: [PATCH] netlink: make sure nladdr has correct size in netlink_connect()

From: Eric Dumazet <hidden>
Date: 2018-03-14 14:11:48

On Wed, Mar 14, 2018 at 7:03 AM, Alexander Potapenko [off-list ref] wrote:
quoted hunk
KMSAN reports use of uninitialized memory in the case when |alen| is
smaller than sizeof(struct netlink_sock), and therefore |nladdr| isn't
fully copied from the userspace.

Signed-off-by: Alexander Potapenko <glider@google.com>
Fixes: 1da177e4c3f41524 ("Linux-2.6.12-rc2")
---
 net/netlink/af_netlink.c | 3 +++
 1 file changed, 3 insertions(+)
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 07e8478068f0..5d49b39e81c3 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -1085,6 +1085,9 @@ static int netlink_connect(struct socket *sock, struct sockaddr *addr,
        if (addr->sa_family != AF_NETLINK)
                return -EINVAL;

+       if (alen < sizeof(struct netlink_sock))
+               return -EINVAL;
+
Hmmm. How was this patch tested exactly ?

Thanks.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help