Skip to content

Commit 1479eaf

Browse files
eddyz87Alexei Starovoitov
authored andcommitted
bpf: mark bpf_dummy_struct_ops.test_1 parameter as nullable
Test case dummy_st_ops/dummy_init_ret_value passes NULL as the first parameter of the test_1() function. Mark this parameter as nullable to make verifier aware of such possibility. Otherwise, NULL check in the test_1() code: SEC("struct_ops/test_1") int BPF_PROG(test_1, struct bpf_dummy_ops_state *state) { if (!state) return ...; ... access state ... } Might be removed by verifier, thus triggering NULL pointer dereference under certain conditions. Reported-by: Jose E. Marchesi <[email protected]> Signed-off-by: Eduard Zingerman <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Alexei Starovoitov <[email protected]>
1 parent 638a485 commit 1479eaf

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

net/bpf/bpf_dummy_struct_ops.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ static void bpf_dummy_unreg(void *kdata)
232232
{
233233
}
234234

235-
static int bpf_dummy_test_1(struct bpf_dummy_ops_state *cb)
235+
static int bpf_dummy_ops__test_1(struct bpf_dummy_ops_state *cb__nullable)
236236
{
237237
return 0;
238238
}
@@ -249,7 +249,7 @@ static int bpf_dummy_test_sleepable(struct bpf_dummy_ops_state *cb)
249249
}
250250

251251
static struct bpf_dummy_ops __bpf_bpf_dummy_ops = {
252-
.test_1 = bpf_dummy_test_1,
252+
.test_1 = bpf_dummy_ops__test_1,
253253
.test_2 = bpf_dummy_test_2,
254254
.test_sleepable = bpf_dummy_test_sleepable,
255255
};

0 commit comments

Comments
 (0)