Skip to contentSkip to conversation

netlink: Don't shift on 64 for ngroups

PATCH In review Dmitry Safonov 2 participants 2 messages Aug 5, 2018

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 netlink: Don't shift on 64 for ngroups

It's legal to have 64 groups for netlink_sock.

As user-supplied nladdr->nl_groups is __u32, it's possible to subscribe only to first 32 groups.

The check for correctness of .bind() userspace supplied parameter is done by applying mask made from ngroups shift. Which broke Android as they have 64 groups and the shift for mask resulted in an overflow.

Fixes 61f4b23769f0 ("netlink: Don't shift with UB on nlk->ngroups")
Cc "David S. Miller" <[email protected]>
Cc Herbert Xu <[email protected]>
Cc Steffen Klassert <[email protected]>

---
v2:
sizeof() is in bytes

 net/netlink/af_netlink.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
net/netlink/af_netlink.c +2 -2
index 7d860a22e5fb..d6ff4d409437 100644
@@ -1011,8 +1011,8 @@ static int netlink_bind(struct socket *sock, struct sockaddr *addr,
 
 	if (nlk->ngroups == 0)
 		groups = 0;
-	else
-		groups &= (1ULL << nlk->ngroups) - 1;
+	else if (nlk->ngroups < 8*sizeof(groups))
+		groups &= (1UL << nlk->ngroups) - 1;
 
 	bound = nlk->bound;
 	if (bound) {
Signature · 1 line
2.13.6
maintainer
#1 lore raw

From: Dmitry Safonov <[email protected]>
Date: Sun, 5 Aug 2018 01:35:53 +0100

Quoted 5 lines

It's legal to have 64 groups for netlink_sock.

As user-supplied nladdr->nl_groups is __u32, it's possible to subscribe only to first 32 groups.

Quoted 7 lines

The check for correctness of .bind() userspace supplied parameter is done by applying mask made from ngroups shift. Which broke Android as they have 64 groups and the shift for mask resulted in an overflow.

Fixes 61f4b23769f0 ("netlink: Don't shift with UB on nlk->ngroups")

Applied and queued up for -stable.