projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
13c401f
)
bpf: check NULL for sk_to_full_sk() return value
author
WANG Cong
<
[email protected]
>
Mon, 17 Jul 2017 18:42:55 +0000
(11:42 -0700)
committer
David S. Miller
<
[email protected]
>
Mon, 17 Jul 2017 20:37:56 +0000
(13:37 -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 <
[email protected]
>
Tested-by: David Ahern <
[email protected]
>
Cc: Lawrence Brakmo <
[email protected]
>
Cc: Daniel Borkmann <
[email protected]
>
Signed-off-by: Cong Wang <
[email protected]
>
Acked-by: Daniel Borkmann <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
include/linux/bpf-cgroup.h
patch
|
blob
|
history
diff --git
a/include/linux/bpf-cgroup.h
b/include/linux/bpf-cgroup.h
index 360c082e885c7777ef6d9509dec75bbb6ee3fff3..d41d40ac3efdb940bf96391d17ee737456cd24c2 100644
(file)
--- 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); \