Skip to content

Commit 7f79097

Browse files
eddyz87gregkh
authored andcommitted
bpf: mark bpf_dummy_struct_ops.test_1 parameter as nullable
[ Upstream commit 1479eaf ] 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 <jemarch@gnu.org> Signed-off-by: Eduard Zingerman <eddyz87@gmail.com> Link: https://lore.kernel.org/r/20240424012821.595216-2-eddyz87@gmail.com Signed-off-by: Alexei Starovoitov <ast@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 2b9c778 commit 7f79097

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
@@ -230,7 +230,7 @@ static void bpf_dummy_unreg(void *kdata)
230230
{
231231
}
232232

233-
static int bpf_dummy_test_1(struct bpf_dummy_ops_state *cb)
233+
static int bpf_dummy_ops__test_1(struct bpf_dummy_ops_state *cb__nullable)
234234
{
235235
return 0;
236236
}
@@ -247,7 +247,7 @@ static int bpf_dummy_test_sleepable(struct bpf_dummy_ops_state *cb)
247247
}
248248

249249
static struct bpf_dummy_ops __bpf_bpf_dummy_ops = {
250-
.test_1 = bpf_dummy_test_1,
250+
.test_1 = bpf_dummy_ops__test_1,
251251
.test_2 = bpf_dummy_test_2,
252252
.test_sleepable = bpf_dummy_test_sleepable,
253253
};

0 commit comments

Comments
 (0)