netlink: Don't shift with UB on nlk->ngroups
authorDmitry Safonov <dima@arista.com>
Mon, 30 Jul 2018 17:32:36 +0000 (18:32 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Aug 2018 10:17:59 +0000 (12:17 +0200)
[ 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>
net/netlink/af_netlink.c

index cbcc92ebe97a2dec518f533dbb05b0ba3d299c28..26ff1c7bbcfa59e66f4c5fba70e1c9b5a467598b 100644 (file)
@@ -985,7 +985,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) {