Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

bpf: Fix reference count leak in bpf_prog_test_run_xdp()

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 ec94670fcb3b ("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 1c1949982524 ("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: 1c1949982524 ("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>

authored by

Tetsuo Handa and committed by
Alexei Starovoitov
ec69daab 9df5fad8

+4 -3
+4 -3
net/bpf/test_run.c
··· 1363 1363 1364 1364 if (sinfo->nr_frags == MAX_SKB_FRAGS) { 1365 1365 ret = -ENOMEM; 1366 - goto out; 1366 + goto out_put_dev; 1367 1367 } 1368 1368 1369 1369 page = alloc_page(GFP_KERNEL); 1370 1370 if (!page) { 1371 1371 ret = -ENOMEM; 1372 - goto out; 1372 + goto out_put_dev; 1373 1373 } 1374 1374 1375 1375 frag = &sinfo->frags[sinfo->nr_frags++]; ··· 1381 1381 if (copy_from_user(page_address(page), data_in + size, 1382 1382 data_len)) { 1383 1383 ret = -EFAULT; 1384 - goto out; 1384 + goto out_put_dev; 1385 1385 } 1386 1386 sinfo->xdp_frags_size += data_len; 1387 1387 size += data_len; ··· 1396 1396 ret = bpf_test_run_xdp_live(prog, &xdp, repeat, batch_size, &duration); 1397 1397 else 1398 1398 ret = bpf_test_run(prog, &xdp, repeat, &retval, &duration, true); 1399 + out_put_dev: 1399 1400 /* We convert the xdp_buff back to an xdp_md before checking the return 1400 1401 * code so the reference count of any held netdevice will be decremented 1401 1402 * even if the test run failed.