6 messages, 6 authors, 2016-06-06 · open the first message on its own page
From: Craig Gallek <hidden>
Date: 2016-06-03 21:33:12
On Fri, Jun 3, 2016 at 5:09 PM, Helge Deller [off-list ref] wrote:
Any idea for a better naming than "do_sockopt_fix_sock_fprog()" ?
Thanks for catching and fixing this. I'd suggest simply leaving the function name as-is. Your fix to the condition in that function is sufficient to address the issue. Craig
From: Alexei Starovoitov <hidden>
Date: 2016-06-03 21:40:08
On Fri, Jun 03, 2016 at 05:33:09PM -0400, Craig Gallek wrote:
On Fri, Jun 3, 2016 at 5:09 PM, Helge Deller [off-list ref] wrote:quoted
Any idea for a better naming than "do_sockopt_fix_sock_fprog()" ?Thanks for catching and fixing this. I'd suggest simply leaving the function name as-is. Your fix to the condition in that function is sufficient to address the issue.
+1 and thanks for the fixes!
From: Helge Deller <deller@gmx.de>
Date: 2016-06-03 21:49:34
Commit 538950a1b752 ("soreuseport: setsockopt SO_ATTACH_REUSEPORT_[CE]BPF")
missed to add the compat case for the SO_ATTACH_REUSEPORT_CBPF option.
Signed-off-by: Helge Deller <deller@gmx.de>
diff --git a/net/compat.c b/net/compat.c
index 5cfd26a..1373947 100644
--- a/net/compat.c
+++ b/net/compat.c@@ -354,7 +354,8 @@ static int do_set_sock_timeout(struct socket *sock, int level, static int compat_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, unsigned int optlen) { - if (optname == SO_ATTACH_FILTER) + if (optname == SO_ATTACH_FILTER || + optname == SO_ATTACH_REUSEPORT_CBPF) return do_set_attach_filter(sock, level, optname, optval, optlen); if (optname == SO_RCVTIMEO || optname == SO_SNDTIMEO)
From: Daniel Borkmann <daniel@iogearbox.net>
Date: 2016-06-03 22:20:09
On 06/03/2016 11:49 PM, Helge Deller wrote:
Commit 538950a1b752 ("soreuseport: setsockopt SO_ATTACH_REUSEPORT_[CE]BPF")
missed to add the compat case for the SO_ATTACH_REUSEPORT_CBPF option.
Signed-off-by: Helge Deller <deller@gmx.de>LGTM, thanks! Acked-by: Daniel Borkmann <daniel@iogearbox.net> [ Cc Willem: I believe we also need something similar for PACKET_FANOUT_DATA when PACKET_FANOUT_CBPF is requested since we have the same issue with the pointer in struct sock_fprog there, too. ]
diff --git a/net/compat.c b/net/compat.c index 5cfd26a..1373947 100644 --- a/net/compat.c +++ b/net/compat.c@@ -354,7 +354,8 @@ static int do_set_sock_timeout(struct socket *sock, int level, static int compat_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, unsigned int optlen) { - if (optname == SO_ATTACH_FILTER) + if (optname == SO_ATTACH_FILTER || + optname == SO_ATTACH_REUSEPORT_CBPF) return do_set_attach_filter(sock, level, optname, optval, optlen); if (optname == SO_RCVTIMEO || optname == SO_SNDTIMEO)
From: Willem de Bruijn <willemdebruijn.kernel@gmail.com>
Date: 2016-06-05 13:16:49
Acked-by: Daniel Borkmann <daniel@iogearbox.net> [ Cc Willem: I believe we also need something similar for PACKET_FANOUT_DATA when PACKET_FANOUT_CBPF is requested since we have the same issue with the pointer in struct sock_fprog there, too. ]
Indeed. I'll send a patch in a few days (am traveling). Thanks for the heads-up, Daniel. (apologies if you also received an html version of this reply)
From: David Miller <davem@davemloft.net>
Date: 2016-06-06 22:21:20
From: Helge Deller <deller@gmx.de> Date: Fri, 3 Jun 2016 23:49:17 +0200
Commit 538950a1b752 ("soreuseport: setsockopt SO_ATTACH_REUSEPORT_[CE]BPF")
missed to add the compat case for the SO_ATTACH_REUSEPORT_CBPF option.
Signed-off-by: Helge Deller <deller@gmx.de>Applied.