* [Patch net] bpf: check NULL for sk_to_full_sk() return value
@ 2017-07-17 18:42 Cong Wang
2017-07-17 19:06 ` Daniel Borkmann
2017-07-17 20:38 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Cong Wang @ 2017-07-17 18:42 UTC (permalink / raw)
To: netdev; +Cc: dsahern, Cong Wang, Lawrence Brakmo, Daniel Borkmann
When req->rsk_listener is NULL, sk_to_full_sk() returns
NULL too, so we have to check its return value against
NULL here.
Fixes: 40304b2a1567 ("bpf: BPF support for sock_ops")
Reported-by: David Ahern <dsahern@gmail.com>
Tested-by: David Ahern <dsahern@gmail.com>
Cc: Lawrence Brakmo <brakmo@fb.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
---
include/linux/bpf-cgroup.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/bpf-cgroup.h b/include/linux/bpf-cgroup.h
index 360c082e885c..d41d40ac3efd 100644
--- a/include/linux/bpf-cgroup.h
+++ b/include/linux/bpf-cgroup.h
@@ -85,7 +85,7 @@ int __cgroup_bpf_run_filter_sock_ops(struct sock *sk,
int __ret = 0; \
if (cgroup_bpf_enabled && (sock_ops)->sk) { \
typeof(sk) __sk = sk_to_full_sk((sock_ops)->sk); \
- if (sk_fullsock(__sk)) \
+ if (__sk && sk_fullsock(__sk)) \
__ret = __cgroup_bpf_run_filter_sock_ops(__sk, \
sock_ops, \
BPF_CGROUP_SOCK_OPS); \
--
2.13.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Patch net] bpf: check NULL for sk_to_full_sk() return value
2017-07-17 18:42 [Patch net] bpf: check NULL for sk_to_full_sk() return value Cong Wang
@ 2017-07-17 19:06 ` Daniel Borkmann
2017-07-17 20:38 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Daniel Borkmann @ 2017-07-17 19:06 UTC (permalink / raw)
To: Cong Wang, netdev; +Cc: dsahern, Lawrence Brakmo
On 07/17/2017 08:42 PM, Cong Wang wrote:
> When req->rsk_listener is NULL, sk_to_full_sk() returns
> NULL too, so we have to check its return value against
> NULL here.
>
> Fixes: 40304b2a1567 ("bpf: BPF support for sock_ops")
> Reported-by: David Ahern <dsahern@gmail.com>
> Tested-by: David Ahern <dsahern@gmail.com>
> Cc: Lawrence Brakmo <brakmo@fb.com>
> Cc: Daniel Borkmann <daniel@iogearbox.net>
> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Patch net] bpf: check NULL for sk_to_full_sk() return value
2017-07-17 18:42 [Patch net] bpf: check NULL for sk_to_full_sk() return value Cong Wang
2017-07-17 19:06 ` Daniel Borkmann
@ 2017-07-17 20:38 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2017-07-17 20:38 UTC (permalink / raw)
To: xiyou.wangcong; +Cc: netdev, dsahern, brakmo, daniel
From: Cong Wang <xiyou.wangcong@gmail.com>
Date: Mon, 17 Jul 2017 11:42:55 -0700
> When req->rsk_listener is NULL, sk_to_full_sk() returns
> NULL too, so we have to check its return value against
> NULL here.
>
> Fixes: 40304b2a1567 ("bpf: BPF support for sock_ops")
> Reported-by: David Ahern <dsahern@gmail.com>
> Tested-by: David Ahern <dsahern@gmail.com>
> Cc: Lawrence Brakmo <brakmo@fb.com>
> Cc: Daniel Borkmann <daniel@iogearbox.net>
> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-07-17 20:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-17 18:42 [Patch net] bpf: check NULL for sk_to_full_sk() return value Cong Wang
2017-07-17 19:06 ` Daniel Borkmann
2017-07-17 20:38 ` David Miller
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).