| Message ID | 1418271295-5829-1-git-send-email-ast@plumgrid.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Alexei Starovoitov <ast@plumgrid.com> Date: Wed, 10 Dec 2014 20:14:55 -0800 > 0day robot reported the following crash: > [ 21.233581] BUG: unable to handle kernel NULL pointer dereference at 0000000000000007 > [ 21.234709] IP: [<ffffffff8156ebda>] sk_attach_bpf+0x39/0xc2 > > It's due to bpf_prog_get() returning ERR_PTR. > Check it properly. > > Reported-by: Fengguang Wu <fengguang.wu@intel.com> > Fixes: 89aa075832b0 ("net: sock: allow eBPF programs to be attached to sockets") > Signed-off-by: Alexei Starovoitov <ast@plumgrid.com> > --- > Silly mistake. I was sure I've checked this error path. Apparently not :( Applied, thanks Alexei. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/core/filter.c b/net/core/filter.c index 8cc3c03078b3..ec9baea10c16 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -1103,8 +1103,8 @@ int sk_attach_bpf(u32 ufd, struct sock *sk) return -EPERM; prog = bpf_prog_get(ufd); - if (!prog) - return -EINVAL; + if (IS_ERR(prog)) + return PTR_ERR(prog); if (prog->aux->prog_type != BPF_PROG_TYPE_SOCKET_FILTER) { /* valid fd, but invalid program type */
0day robot reported the following crash: [ 21.233581] BUG: unable to handle kernel NULL pointer dereference at 0000000000000007 [ 21.234709] IP: [<ffffffff8156ebda>] sk_attach_bpf+0x39/0xc2 It's due to bpf_prog_get() returning ERR_PTR. Check it properly. Reported-by: Fengguang Wu <fengguang.wu@intel.com> Fixes: 89aa075832b0 ("net: sock: allow eBPF programs to be attached to sockets") Signed-off-by: Alexei Starovoitov <ast@plumgrid.com> --- Silly mistake. I was sure I've checked this error path. Apparently not :( net/core/filter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)