diff options
| author |   Alexander Potapenko <glider@google.com> | 2018-03-23 13:49:02 +0100 |
|---|---|---|
| committer |   Ben Hutchings <ben@decadent.org.uk> | 2018-06-01 00:30:25 +0100 |
| commit | 85612401b97f42ca3addf3d5786cc6de4fcb8fda (patch) | |
| tree | f7894518f23f4ce17f27a70bb45b950b1b13bceb | |
| parent | tty: vt: fix up tabstops properly (diff) | |
| download | linux-stable-85612401b97f42ca3addf3d5786cc6de4fcb8fda.tar.xz linux-stable-85612401b97f42ca3addf3d5786cc6de4fcb8fda.zip | |
netlink: make sure nladdr has correct size in netlink_connect()
commit 7880287981b60a6808f39f297bb66936e8bdf57a upstream.
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>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -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 2369e9620aa4..d1017ad64edc 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -706,6 +706,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; + /* Only superuser is allowed to send multicasts */ if (nladdr->nl_groups && !netlink_capable(sock, NL_NONROOT_SEND)) return -EPERM; |