Message ID | 20180323124902.41625-1-glider@google.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
Series | netlink: make sure nladdr has correct size in netlink_connect() | expand |
On 03/23/2018 05:49 AM, Alexander Potapenko wrote: > 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> Thanks Alexander.
From: Alexander Potapenko <glider@google.com> Date: Fri, 23 Mar 2018 13:49:02 +0100 > 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") > --- > v2: fixed a typo spotted by Eric Dumazet Applied and queued up for -stable, thank you.
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 07e8478068f0..70c455341243 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;
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") --- v2: fixed a typo spotted by Eric Dumazet --- net/netlink/af_netlink.c | 3 +++ 1 file changed, 3 insertions(+)