summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDmitry Safonov <dima@arista.com>2018-07-30 18:32:36 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-08-03 07:48:05 +0200
commitdc73f8ae16dbc6371256baa3f9c2eb5963101864 (patch)
treed905be3881df3f28900e6fbd27da48f13a16476e /net
parentfc3364865d978bfa7b83c9fb2ba74a38500cc090 (diff)
downloadlinux-dc73f8ae16dbc6371256baa3f9c2eb5963101864.tar.gz
linux-dc73f8ae16dbc6371256baa3f9c2eb5963101864.tar.bz2
linux-dc73f8ae16dbc6371256baa3f9c2eb5963101864.zip
netlink: Don't shift with UB on nlk->ngroups
[ Upstream commit 61f4b23769f0cc72ae62c9a81cf08f0397d40da8 ] On i386 nlk->ngroups might be 32 or 0. Which leads to UB, resulting in hang during boot. Check for 0 ngroups and use (unsigned long long) as a type to shift. Fixes: 7acf9d4237c4 ("netlink: Do not subscribe to non-existent groups"). Reported-by: kernel test robot <rong.a.chen@intel.com> Signed-off-by: Dmitry Safonov <dima@arista.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/netlink/af_netlink.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index fc5df9598a5a..890f22f90344 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -1008,7 +1008,11 @@ static int netlink_bind(struct socket *sock, struct sockaddr *addr,
if (err)
return err;
}
- groups &= (1UL << nlk->ngroups) - 1;
+
+ if (nlk->ngroups == 0)
+ groups = 0;
+ else
+ groups &= (1ULL << nlk->ngroups) - 1;
bound = nlk->bound;
if (bound) {