* [PATCH] netlink: Don't shift on 64 for ngroups
@ 2018-08-04 23:55 Dmitry Safonov
2018-08-05 0:08 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Dmitry Safonov @ 2018-08-04 23:55 UTC (permalink / raw)
To: linux-kernel
Cc: Dmitry Safonov, Nathan Chancellor, David S. Miller, Herbert Xu,
Steffen Klassert, netdev, stable
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" <davem@davemloft.net>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: netdev@vger.kernel.org
Cc: stable@vger.kernel.org
Reported-and-Tested-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
net/netlink/af_netlink.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 7d860a22e5fb..e44edadfad20 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -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 < sizeof(long unsigned int))
+ groups &= (1UL << nlk->ngroups) - 1;
bound = nlk->bound;
if (bound) {
--
2.13.6
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] netlink: Don't shift on 64 for ngroups
2018-08-04 23:55 [PATCH] netlink: Don't shift on 64 for ngroups Dmitry Safonov
@ 2018-08-05 0:08 ` David Miller
2018-08-05 0:37 ` Dmitry Safonov
0 siblings, 1 reply; 3+ messages in thread
From: David Miller @ 2018-08-05 0:08 UTC (permalink / raw)
To: dima
Cc: linux-kernel, natechancellor, herbert, steffen.klassert, netdev, stable
From: Dmitry Safonov <dima@arista.com>
Date: Sun, 5 Aug 2018 00:55:44 +0100
> @@ -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 < sizeof(long unsigned int))
> + groups &= (1UL << nlk->ngroups) - 1;
Sizeof is in bytes, you want to compare against bits.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] netlink: Don't shift on 64 for ngroups
2018-08-05 0:08 ` David Miller
@ 2018-08-05 0:37 ` Dmitry Safonov
0 siblings, 0 replies; 3+ messages in thread
From: Dmitry Safonov @ 2018-08-05 0:37 UTC (permalink / raw)
To: David Miller
Cc: linux-kernel, natechancellor, herbert, steffen.klassert, netdev, stable
On Sat, 2018-08-04 at 17:08 -0700, David Miller wrote:
> From: Dmitry Safonov <dima@arista.com>
> Date: Sun, 5 Aug 2018 00:55:44 +0100
>
> > @@ -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 < sizeof(long unsigned int))
> > + groups &= (1UL << nlk->ngroups) - 1;
>
> Sizeof is in bytes, you want to compare against bits.
I'm too bad. Drop this version, please.
I've resent v2.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-08-05 0:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-04 23:55 [PATCH] netlink: Don't shift on 64 for ngroups Dmitry Safonov
2018-08-05 0:08 ` David Miller
2018-08-05 0:37 ` Dmitry Safonov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).