diff options
| author | Alexander Potapenko <glider@google.com> | 2018-03-23 13:49:02 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-12 12:32:23 +0200 |
| commit | 787b940625ca497ef6ecfecdadc16311c519d034 (patch) | |
| tree | a529b6c26884b07f893433d9c42bccda5f45265c | |
| parent | 7948bc92791baac09957a20c70a73a0bfe7b1209 (diff) | |
| download | linux-stable-787b940625ca497ef6ecfecdadc16311c519d034.tar.gz linux-stable-787b940625ca497ef6ecfecdadc16311c519d034.tar.bz2 linux-stable-787b940625ca497ef6ecfecdadc16311c519d034.zip | |
netlink: make sure nladdr has correct size in netlink_connect()
[ Upstream commit 7880287981b60a6808f39f297bb66936e8bdf57a ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 9219bc134109..1b86eccf94b6 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -1053,6 +1053,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; |