diff options
author | Alexander Potapenko <glider@google.com> | 2018-03-23 13:49:02 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-03-25 21:14:51 -0400 |
commit | 7880287981b60a6808f39f297bb66936e8bdf57a (patch) | |
tree | 57a3a7410835c1868a4fec3a8ed8fbc5020c3526 /net/netlink | |
parent | e69647a19c870c2f919e4d5023af8a515e8ef25f (diff) | |
download | op-kernel-dev-7880287981b60a6808f39f297bb66936e8bdf57a.zip op-kernel-dev-7880287981b60a6808f39f297bb66936e8bdf57a.tar.gz |
netlink: make sure nladdr has correct size in netlink_connect()
KMSAN reports use of uninitialized memory in the case when |alen| is
smaller than sizeof(struct sockaddr_nl), 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")
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netlink')
-rw-r--r-- | net/netlink/af_netlink.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 07e8478..70c4553 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 sockaddr_nl)) + return -EINVAL; + if ((nladdr->nl_groups || nladdr->nl_pid) && !netlink_allowed(sock, NL_CFG_F_NONROOT_SEND)) return -EPERM; |