bpf: fix NPE when computing changes_pkt_data of program w/o subprograms
Subsystems (4)
Eduard Zingerman
maintainerPATCH 1/2 bpf: fix NPE when computing changes_pkt_data of program w/o subprograms
bpf_prog_aux->func field might be NULL if program does not have subprograms except for main sub-program. The fixed commit does bpf_prog_aux->func access unconditionally, which might lead to null pointer dereference.
The bug could be triggered by replacing the following BPF program:
SEC("tc")
int main_changes(struct __sk_buff *sk)
{
bpf_skb_pull_data(sk, 0);
return 0;
}With the following BPF program:
SEC("freplace")
long changes_pkt_data(struct __sk_buff *sk)
{
return bpf_skb_pull_data(sk, 0);
}bpf_prog_aux instance itself represents the main sub-program, use this property to fix the bug.
--- kernel/bpf/verifier.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
kernel/bpf/verifier.c +5 -2
@@ -22193,6 +22193,7 @@ int bpf_check_attach_target(struct bpf_verifier_log *log, }if (tgt_prog) {struct bpf_prog_aux *aux = tgt_prog->aux; +bool tgt_changes_pkt_data;if (bpf_prog_is_dev_bound (prog->aux) && !bpf_prog_dev_bound_match (prog, tgt_prog)) {
@@ -22227,8 +22228,10 @@ int bpf_check_attach_target(struct bpf_verifier_log *log, "Extension programs should be JITed\n");return -EINVAL ; } -if (prog->aux->changes_pkt_data && - !aux->func[subprog]->aux->changes_pkt_data) { + tgt_changes_pkt_data = aux->func + ? aux->func[subprog]->aux->changes_pkt_data + : aux->changes_pkt_data; +if (prog->aux->changes_pkt_data && !tgt_changes_pkt_data) {bpf_log (log,"Extension program changes packet data, while original does not\n" );return -EINVAL ;
Signature · 1 line
2.47.0
Eduard Zingerman
maintainerPATCH 2/2 selftests/bpf: extend changes_pkt_data with cases w/o subprograms
Extend changes_pkt_data tests with test cases freplacing the main program that does not have subprograms. Try four combinations when both main program and replacement do and do not change packet data.
--- .../bpf/prog_tests/changes_pkt_data.c | 55 +++++++++++++++---- .../selftests/bpf/progs/changes_pkt_data.c | 27 ++++++--- .../bpf/progs/changes_pkt_data_freplace.c | 6 +- 3 files changed, 66 insertions(+), 22 deletions(-)
tools/testing/selftests/bpf/prog_tests/changes_pkt_data.c +43 -12
@@ -10,10 +10,14 @@ static void print_verifier_log(const char *log)fprintf (stdout,"VERIFIER LOG:\n=============\n%s=============\n" , log); } -static void test_aux (const char *main_prog_name,const char *freplace_prog_name,bool expect_load) +static void test_aux (const char *main_prog_name, +const char *to_be_replaced, +const char *replacement, +bool expect_load) {struct changes_pkt_data_freplace *freplace =NULL ;struct bpf_program *freplace_prog =NULL ; +struct bpf_program *main_prog =NULL ;LIBBPF_OPTS (bpf_object_open_opts, opts);struct changes_pkt_data *main =NULL ;char log[16 *1024 ];
@@ -26,6 +30,10 @@ static void test_aux(const char *main_prog_name, const char *freplace_prog_name, main =changes_pkt_data__open_opts (&opts);if (!ASSERT_OK_PTR (main,"changes_pkt_data__open" )) goto out; + main_prog =bpf_object__find_program_by_name (main->obj, main_prog_name); +if (!ASSERT_OK_PTR (main_prog,"main_prog" )) + goto out; +bpf_program__set_autoload (main_prog, true); err =changes_pkt_data__load (main);print_verifier_log (log);if (!ASSERT_OK (err,"changes_pkt_data__load" ))
@@ -33,14 +41,14 @@ static void test_aux(const char *main_prog_name, const char *freplace_prog_name, freplace =changes_pkt_data_freplace__open_opts (&opts);if (!ASSERT_OK_PTR (freplace,"changes_pkt_data_freplace__open" )) goto out; - freplace_prog =bpf_object__find_program_by_name (freplace->obj, freplace_prog_name); + freplace_prog =bpf_object__find_program_by_name (freplace->obj, replacement);if (!ASSERT_OK_PTR (freplace_prog,"freplace_prog" )) goto out;bpf_program__set_autoload (freplace_prog, true);bpf_program__set_autoattach (freplace_prog, true);bpf_program__set_attach_target (freplace_prog, -bpf_program__fd (main->progs.dummy), - main_prog_name); +bpf_program__fd (main_prog), + to_be_replaced); err =changes_pkt_data_freplace__load (freplace);print_verifier_log (log);if (expect_load) {
@@ -62,15 +70,38 @@ static void test_aux(const char *main_prog_name, const char *freplace_prog_name,* that either do or do not. It is only ok to freplace subprograms * that do not change packet data with those that do not as well. * The below tests check outcomes for each combination of such freplace. +* Also test a case when main subprogram itself is replaced and is a single +* subprogram in a program. */ void test_changes_pkt_data_freplace (void ) { -if (test__start_subtest ("changes_with_changes" )) -test_aux ("changes_pkt_data" ,"changes_pkt_data" , true); -if (test__start_subtest ("changes_with_doesnt_change" )) -test_aux ("changes_pkt_data" ,"does_not_change_pkt_data" , true); -if (test__start_subtest ("doesnt_change_with_changes" )) -test_aux ("does_not_change_pkt_data" ,"changes_pkt_data" , false); -if (test__start_subtest ("doesnt_change_with_doesnt_change" )) -test_aux ("does_not_change_pkt_data" ,"does_not_change_pkt_data" , true); +struct { +const char *main; +const char *to_be_replaced; +bool changes; + } mains[] = { + {"main_with_subprogs" ,"changes_pkt_data" , true }, + {"main_with_subprogs" ,"does_not_change_pkt_data" , false }, + {"main_changes" ,"main_changes" , true }, + {"main_does_not_change" ,"main_does_not_change" , false }, + }; +struct { +const char *func; +bool changes; + } replacements[] = { + {"changes_pkt_data" , true }, + {"does_not_change_pkt_data" , false } + }; +char buf[64 ]; + +for (int i =0 ; i <ARRAY_SIZE (mains); ++i) { +for (int j =0 ; j <ARRAY_SIZE (replacements); ++j) { +snprintf (buf,sizeof (buf),"%s_with_%s" , + mains[i].to_be_replaced, replacements[j].func); +if (!test__start_subtest (buf)) +continue ; +test_aux (mains[i].main, mains[i].to_be_replaced, replacements[j].func, + mains[i].changes || !replacements[j].changes); + } + } }
tools/testing/selftests/bpf/progs/changes_pkt_data.c +20 -7
@@ -4,22 +4,35 @@#include <bpf/bpf_helpers.h> __noinline -long changes_pkt_data (struct __sk_buff *sk,__u32 len) +long changes_pkt_data (struct __sk_buff *sk) { -return bpf_skb_pull_data (sk, len); +return bpf_skb_pull_data (sk,0 ); }__noinline __weak -long does_not_change_pkt_data (struct __sk_buff *sk,__u32 len) +long does_not_change_pkt_data (struct __sk_buff *sk) {return 0 ; } -SEC("tc") -int dummy (struct __sk_buff *sk) +SEC("?tc") +int main_with_subprogs (struct __sk_buff *sk) +{ +changes_pkt_data (sk); +does_not_change_pkt_data (sk); +return 0 ; +} + +SEC("?tc") +int main_changes (struct __sk_buff *sk) +{ +bpf_skb_pull_data (sk,0 ); +return 0 ; +} + +SEC("?tc") +int main_does_not_change (struct __sk_buff *sk) { -changes_pkt_data (sk,0 ); -does_not_change_pkt_data (sk,0 );return 0 ; }
tools/testing/selftests/bpf/progs/changes_pkt_data_freplace.c +3 -3
@@ -4,13 +4,13 @@#include <bpf/bpf_helpers.h> SEC("?freplace") -long changes_pkt_data (struct __sk_buff *sk,__u32 len) +long changes_pkt_data (struct __sk_buff *sk) { -return bpf_skb_pull_data (sk, len); +return bpf_skb_pull_data (sk,0 ); } SEC("?freplace") -long does_not_change_pkt_data (struct __sk_buff *sk,__u32 len) +long does_not_change_pkt_data (struct __sk_buff *sk) {return 0 ; }
Signature · 1 line
2.47.0
What is 'NPE' ?
Eduard Zingerman
maintainerQuoted 1 line · Alexei Starovoitov
What is 'NPE' ?
Null Pointer Exception, java lingo, grepping through the kernel commit logs does not seem it is used much. Can resubmit with changed subject.
This series was applied to bpf/bpf.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This series was applied to bpf/bpf.git (master)
by Alexei Starovoitov <[email protected]>:
Quoted 8 lines · On Wed, 11 Dec 2024 23:07:10 -0800 you wrote:
bpf_prog_aux->funcfield might be NULL if program does not have subprograms except for main sub-program. The fixed commit doesbpf_prog_aux->funcaccess unconditionally, which might lead to null pointer dereference.The bug could be triggered by replacing the following BPF program:
[...]
Here is the summary with links:
- [bpf,1/2] bpf: fix NPE when computing changes_pkt_data of program w/o subprograms
https://git.kernel.org/bpf/bpf/c/ac6542ad9275 - [bpf,2/2] selftests/bpf: extend changes_pkt_data with cases w/o subprograms https://git.kernel.org/bpf/bpf/c/04789af756a4
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html