Skip to content

Commit 737be05

Browse files
Tetsuo Handagregkh
authored andcommitted
bpf: Fix reference count leak in bpf_prog_test_run_xdp()
[ Upstream commit ec69daa ] syzbot is reporting unregister_netdevice: waiting for sit0 to become free. Usage count = 2 problem. A debug printk() patch found that a refcount is obtained at xdp_convert_md_to_buff() from bpf_prog_test_run_xdp(). According to commit ec94670 ("bpf: Support specifying ingress via xdp_md context in BPF_PROG_TEST_RUN"), the refcount obtained by xdp_convert_md_to_buff() will be released by xdp_convert_buff_to_md(). Therefore, we can consider that the error handling path introduced by commit 1c19499 ("bpf: introduce frags support to bpf_prog_test_run_xdp()") forgot to call xdp_convert_buff_to_md(). Reported-by: syzbot+881d65229ca4f9ae8c84@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=881d65229ca4f9ae8c84 Fixes: 1c19499 ("bpf: introduce frags support to bpf_prog_test_run_xdp()") Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Reviewed-by: Toke Høiland-Jørgensen <toke@redhat.com> Link: https://lore.kernel.org/r/af090e53-9d9b-4412-8acb-957733b3975c@I-love.SAKURA.ne.jp Signed-off-by: Alexei Starovoitov <ast@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 31e37f4 commit 737be05

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

net/bpf/test_run.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1300,13 +1300,13 @@ int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr,
13001300

13011301
if (sinfo->nr_frags == MAX_SKB_FRAGS) {
13021302
ret = -ENOMEM;
1303-
goto out;
1303+
goto out_put_dev;
13041304
}
13051305

13061306
page = alloc_page(GFP_KERNEL);
13071307
if (!page) {
13081308
ret = -ENOMEM;
1309-
goto out;
1309+
goto out_put_dev;
13101310
}
13111311

13121312
frag = &sinfo->frags[sinfo->nr_frags++];
@@ -1318,7 +1318,7 @@ int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr,
13181318
if (copy_from_user(page_address(page), data_in + size,
13191319
data_len)) {
13201320
ret = -EFAULT;
1321-
goto out;
1321+
goto out_put_dev;
13221322
}
13231323
sinfo->xdp_frags_size += data_len;
13241324
size += data_len;
@@ -1333,6 +1333,7 @@ int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr,
13331333
ret = bpf_test_run_xdp_live(prog, &xdp, repeat, batch_size, &duration);
13341334
else
13351335
ret = bpf_test_run(prog, &xdp, repeat, &retval, &duration, true);
1336+
out_put_dev:
13361337
/* We convert the xdp_buff back to an xdp_md before checking the return
13371338
* code so the reference count of any held netdevice will be decremented
13381339
* even if the test run failed.

0 commit comments

Comments
 (0)