Skip to content

Commit fb9ef40

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 6447e69 commit fb9ef40

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
@@ -1299,13 +1299,13 @@ int bpf_prog_test_run_xdp(struct bpf_prog *prog, const union bpf_attr *kattr,
12991299

13001300
if (sinfo->nr_frags == MAX_SKB_FRAGS) {
13011301
ret = -ENOMEM;
1302-
goto out;
1302+
goto out_put_dev;
13031303
}
13041304

13051305
page = alloc_page(GFP_KERNEL);
13061306
if (!page) {
13071307
ret = -ENOMEM;
1308-
goto out;
1308+
goto out_put_dev;
13091309
}
13101310

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

0 commit comments

Comments
 (0)