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

bpf: Fix memory leaks in __check_func_call

kmemleak reports this issue:

unreferenced object 0xffff88817139d000 (size 2048):
comm "test_progs", pid 33246, jiffies 4307381979 (age 45851.820s)
hex dump (first 32 bytes):
01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<0000000045f075f0>] kmalloc_trace+0x27/0xa0
[<0000000098b7c90a>] __check_func_call+0x316/0x1230
[<00000000b4c3c403>] check_helper_call+0x172e/0x4700
[<00000000aa3875b7>] do_check+0x21d8/0x45e0
[<000000001147357b>] do_check_common+0x767/0xaf0
[<00000000b5a595b4>] bpf_check+0x43e3/0x5bc0
[<0000000011e391b1>] bpf_prog_load+0xf26/0x1940
[<0000000007f765c0>] __sys_bpf+0xd2c/0x3650
[<00000000839815d6>] __x64_sys_bpf+0x75/0xc0
[<00000000946ee250>] do_syscall_64+0x3b/0x90
[<0000000000506b7f>] entry_SYSCALL_64_after_hwframe+0x63/0xcd

The root case here is: In function prepare_func_exit(), the callee is
not released in the abnormal scenario after "state->curframe--;". To
fix, move "state->curframe--;" to the very bottom of the function,
right when we free callee and reset frame[] pointer to NULL, as Andrii
suggested.

In addition, function __check_func_call() has a similar problem. In
the abnormal scenario before "state->curframe++;", the callee also
should be released by free_func_state().

Fixes: 69c087ba6225 ("bpf: Add bpf_for_each_map_elem() helper")
Fixes: fd978bf7fd31 ("bpf: Add reference tracking to verifier")
Signed-off-by: Wang Yufen <wangyufen@huawei.com>
Link: https://lore.kernel.org/r/1667884291-15666-1-git-send-email-wangyufen@huawei.com
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>

authored by

Wang Yufen and committed by
Martin KaFai Lau
eb86559a a679120e

+9 -5
+9 -5
kernel/bpf/verifier.c
··· 6745 6745 /* Transfer references to the callee */ 6746 6746 err = copy_reference_state(callee, caller); 6747 6747 if (err) 6748 - return err; 6748 + goto err_out; 6749 6749 6750 6750 err = set_callee_state_cb(env, caller, callee, *insn_idx); 6751 6751 if (err) 6752 - return err; 6752 + goto err_out; 6753 6753 6754 6754 clear_caller_saved_regs(env, caller->regs); 6755 6755 ··· 6766 6766 print_verifier_state(env, callee, true); 6767 6767 } 6768 6768 return 0; 6769 + 6770 + err_out: 6771 + free_func_state(callee); 6772 + state->frame[state->curframe + 1] = NULL; 6773 + return err; 6769 6774 } 6770 6775 6771 6776 int map_set_for_each_callback_args(struct bpf_verifier_env *env, ··· 6984 6979 return -EINVAL; 6985 6980 } 6986 6981 6987 - state->curframe--; 6988 - caller = state->frame[state->curframe]; 6982 + caller = state->frame[state->curframe - 1]; 6989 6983 if (callee->in_callback_fn) { 6990 6984 /* enforce R0 return value range [0, 1]. */ 6991 6985 struct tnum range = callee->callback_ret_range; ··· 7023 7019 } 7024 7020 /* clear everything in the callee */ 7025 7021 free_func_state(callee); 7026 - state->frame[state->curframe + 1] = NULL; 7022 + state->frame[state->curframe--] = NULL; 7027 7023 return 0; 7028 7024 } 7029 7025