bpf: Prevent double bpf_prog_put call from bpf_tracing_prog_attach
Subsystems (4)
Jiri Olsa
reviewerPATCH 1/1 bpf: Prevent double bpf_prog_put call from bpf_tracing_prog_attach
The bpf_tracing_prog_attach error path calls bpf_prog_put on prog, which causes refcount underflow when it's called from link_create function.
link_create
prog = bpf_prog_get <-- get
...
tracing_bpf_link_attach(prog..
bpf_tracing_prog_attach(prog..
out_put_prog:
bpf_prog_put(prog); <-- put
if (ret < 0)
bpf_prog_put(prog); <-- put
Removing bpf_prog_put call from bpf_tracing_prog_attach and making sure its callers call it instead.
--- kernel/bpf/syscall.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
kernel/bpf/syscall.c +4 -2
@@ -2712,7 +2712,6 @@ static int bpf_tracing_prog_attach(struct bpf_prog *prog, out_put_prog:if (tgt_prog_fd && tgt_prog)bpf_prog_put (tgt_prog); -bpf_prog_put (prog);return err; }
@@ -2825,7 +2824,10 @@ static int bpf_raw_tracepoint_open(const union bpf_attr *attr) tp_name = prog->aux->attach_func_name;break ; } -return bpf_tracing_prog_attach (prog,0 ,0 ); + err =bpf_tracing_prog_attach (prog,0 ,0 ); +if (err >=0 ) +return err; + goto out_put_prog;case BPF_PROG_TYPE_RAW_TRACEPOINT :case BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE : if (strncpy_from_user(buf,
Signature · 1 line
2.26.2
Quoted 12 lines · Jiri Olsa
The
bpf_tracing_prog_attacherror path callsbpf_prog_puton prog, which causes refcount underflow when it's called fromlink_createfunction.
link_create
prog =bpf_prog_get<-- get
...
tracing_bpf_link_attach(prog..
bpf_tracing_prog_attach(prog..
out_put_prog:
bpf_prog_put(prog); <-- put
Quoted 7 lines
if (ret < 0)
bpf_prog_put(prog); <-- putRemoving
bpf_prog_putcall frombpf_tracing_prog_attachand making sure its callers call it instead.Signed-off-by Jiri Olsa <[email protected]>
Quoted 13 lines · Jiri Olsa
The
bpf_tracing_prog_attacherror path callsbpf_prog_puton prog, which causes refcount underflow when it's called fromlink_createfunction.
link_create
prog =bpf_prog_get<-- get
...
tracing_bpf_link_attach(prog..
bpf_tracing_prog_attach(prog..
out_put_prog:
bpf_prog_put(prog); <-- put
Quoted 8 lines
if (ret < 0)
bpf_prog_put(prog); <-- putRemoving
bpf_prog_putcall frombpf_tracing_prog_attachand making sure its callers call it instead.Signed-off-by Jiri Olsa <[email protected]>---
I also double-checked all other attach functions called from link_create, they all seem to be fine and don't put prog on failure, so this should be the only needed fix. Also, missing:
multiple attach points")
Quoted 30 lines
kernel/bpf/syscall.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)kernel/bpf/syscall.c +4
-3@@ -2712,7 +2712,6 @@ static int bpf_tracing_prog_attach(struct bpf_prog *prog, out_put_prog:if (tgt_prog_fd && tgt_prog)bpf_prog_put (tgt_prog); -bpf_prog_put (prog);return err; }@@ -2825,7 +2824,10 @@ static int bpf_raw_tracepoint_open(const union bpf_attr *attr) tp_name = prog->aux->attach_func_name;break ; } -return bpf_tracing_prog_attach (prog,0 ,0 ); + err =bpf_tracing_prog_attach (prog,0 ,0 ); +if (err >=0 ) +return err; + goto out_put_prog;case BPF_PROG_TYPE_RAW_TRACEPOINT :case BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE : if (strncpy_from_user(buf, --2.26.2
Quoted 20 lines · Andrii Nakryiko
Quoted 19 lines · Jiri Olsa
The
bpf_tracing_prog_attacherror path callsbpf_prog_puton prog, which causes refcount underflow when it's called fromlink_createfunction.
link_create
prog =bpf_prog_get<-- get
...
tracing_bpf_link_attach(prog..
bpf_tracing_prog_attach(prog..
out_put_prog:
bpf_prog_put(prog); <-- putif (ret < 0)
bpf_prog_put(prog); <-- putRemoving
bpf_prog_putcall frombpf_tracing_prog_attachand making sure its callers call it instead.
Quoted 6 lines
Quoted 2 lines
Signed-off-by Jiri Olsa <[email protected]>---
I also double-checked all other attach functions called from
link_create, they all seem to be fine and don't put prog on failure, so this should be the only needed fix. Also, missing:
it'd be easier to spot this if we use refcount_t instead of the atomic64_t, I replaced it for this refcount and got nice console warning for this bug
then I saw:
85192dbf4de0 bpf: Convert bpf_prog refcnt to atomic64_t
so I guess we need something like refcount64_t first
jirka
Quoted 37 lines
Fixes 4a1e7c0c63e0 ("bpf: Support attaching freplace programs tomultiple attach points")
Acked-by Andrii Nakryiko <[email protected]>Quoted 30 lines
kernel/bpf/syscall.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)kernel/bpf/syscall.c +4
-3@@ -2712,7 +2712,6 @@ static int bpf_tracing_prog_attach(struct bpf_prog *prog, out_put_prog:if (tgt_prog_fd && tgt_prog)bpf_prog_put (tgt_prog); -bpf_prog_put (prog);return err; }@@ -2825,7 +2824,10 @@ static int bpf_raw_tracepoint_open(const union bpf_attr *attr) tp_name = prog->aux->attach_func_name;break ; } -return bpf_tracing_prog_attach (prog,0 ,0 ); + err =bpf_tracing_prog_attach (prog,0 ,0 ); +if (err >=0 ) +return err; + goto out_put_prog;case BPF_PROG_TYPE_RAW_TRACEPOINT :case BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE : if (strncpy_from_user(buf, --2.26.2
Quoted 29 lines · Jiri Olsa
Quoted 20 lines · Andrii Nakryiko
Quoted 19 lines · Jiri Olsa
The
bpf_tracing_prog_attacherror path callsbpf_prog_puton prog, which causes refcount underflow when it's called fromlink_createfunction.
link_create
prog =bpf_prog_get<-- get
...
tracing_bpf_link_attach(prog..
bpf_tracing_prog_attach(prog..
out_put_prog:
bpf_prog_put(prog); <-- putif (ret < 0)
bpf_prog_put(prog); <-- putRemoving
bpf_prog_putcall frombpf_tracing_prog_attachand making sure its callers call it instead.Quoted 6 lines
Quoted 2 lines
Signed-off-by Jiri Olsa <[email protected]>---
I also double-checked all other attach functions called from
link_create, they all seem to be fine and don't put prog on failure, so this should be the only needed fix. Also, missing:
Quoted 7 lines
it'd be easier to spot this if we use
refcount_tinstead of theatomic64_t, I replaced it for this refcount and got nice console warning for this bugthen I saw:
85192dbf4de0bpf: Convertbpf_progrefcnt toatomic64_tso I guess we need something like
refcount64_tfirst
Having a non-failing refcount simplifies code quite a lot. I was having a problem having to deal with potential refcount failure during mmap()'ing, where it's impossible to communicate failure back to the kernel. So if atomic64_t would never fail, but would generate a warning on underflow, then yeah, it would be an improvement.
Quoted 41 lines
jirka
Quoted 37 lines
Fixes 4a1e7c0c63e0 ("bpf: Support attaching freplace programs tomultiple attach points")
Acked-by Andrii Nakryiko <[email protected]>Quoted 30 lines
kernel/bpf/syscall.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)kernel/bpf/syscall.c +4
-3@@ -2712,7 +2712,6 @@ static int bpf_tracing_prog_attach(struct bpf_prog *prog, out_put_prog:if (tgt_prog_fd && tgt_prog)bpf_prog_put (tgt_prog); -bpf_prog_put (prog);return err; }@@ -2825,7 +2824,10 @@ static int bpf_raw_tracepoint_open(const union bpf_attr *attr) tp_name = prog->aux->attach_func_name;break ; } -return bpf_tracing_prog_attach (prog,0 ,0 ); + err =bpf_tracing_prog_attach (prog,0 ,0 ); +if (err >=0 ) +return err; + goto out_put_prog;case BPF_PROG_TYPE_RAW_TRACEPOINT :case BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE : if (strncpy_from_user(buf, --2.26.2
This patch was applied to bpf/bpf.git (refs/heads/master):
Hello:
This patch was applied to bpf/bpf.git (refs/heads/master):
Quoted 12 lines · On Mon, 11 Jan 2021 20:16:50 +0100 you wrote:
The
bpf_tracing_prog_attacherror path callsbpf_prog_puton prog, which causes refcount underflow when it's called fromlink_createfunction.
link_create
prog =bpf_prog_get<-- get
...
tracing_bpf_link_attach(prog..
bpf_tracing_prog_attach(prog..
out_put_prog:
bpf_prog_put(prog); <-- put
Quoted 1 line
[...]
Here is the summary with links:
- bpf: Prevent double bpf_prog_put call from bpf_tracing_prog_attach
https://git.kernel.org/bpf/bpf/c/5541075a348b
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html