diff mbox series

[bpf-next,v9,2/2] bpf: Add tests for bpf_copy_from_user_str kfunc

Message ID 20240823184823.3236004-2-linux@jordanrome.com (mailing list archive)
State Superseded
Delegated to: BPF
Headers show
Series [bpf-next,v9,1/2] bpf: Add bpf_copy_from_user_str kfunc | expand

Checks

Context Check Description
bpf/vmtest-bpf-next-PR success PR summary
bpf/vmtest-bpf-next-VM_Test-0 success Logs for Lint
bpf/vmtest-bpf-next-VM_Test-1 success Logs for ShellCheck
bpf/vmtest-bpf-next-VM_Test-3 success Logs for Validate matrix.py
bpf/vmtest-bpf-next-VM_Test-2 success Logs for Unittests
bpf/vmtest-bpf-next-VM_Test-5 success Logs for aarch64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-4 success Logs for aarch64-gcc / build / build for aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-10 success Logs for aarch64-gcc / veristat
bpf/vmtest-bpf-next-VM_Test-9 success Logs for aarch64-gcc / test (test_verifier, false, 360) / test_verifier on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-12 success Logs for s390x-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-6 success Logs for aarch64-gcc / test (test_maps, false, 360) / test_maps on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-8 success Logs for aarch64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-7 success Logs for aarch64-gcc / test (test_progs, false, 360) / test_progs on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-11 success Logs for s390x-gcc / build / build for s390x with gcc
bpf/vmtest-bpf-next-VM_Test-15 success Logs for s390x-gcc / test (test_verifier, false, 360) / test_verifier on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-16 success Logs for s390x-gcc / veristat
bpf/vmtest-bpf-next-VM_Test-18 success Logs for x86_64-gcc / build / build for x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-17 success Logs for set-matrix
bpf/vmtest-bpf-next-VM_Test-19 success Logs for x86_64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-20 success Logs for x86_64-gcc / test (test_maps, false, 360) / test_maps on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-23 success Logs for x86_64-gcc / test (test_progs_no_alu32_parallel, true, 30) / test_progs_no_alu32_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-26 success Logs for x86_64-gcc / veristat / veristat on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-27 success Logs for x86_64-llvm-17 / build / build for x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-25 success Logs for x86_64-gcc / test (test_verifier, false, 360) / test_verifier on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-36 success Logs for x86_64-llvm-18 / test (test_maps, false, 360) / test_maps on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-28 success Logs for x86_64-llvm-17 / build-release / build for x86_64 with llvm-17-O2
bpf/vmtest-bpf-next-VM_Test-35 success Logs for x86_64-llvm-18 / build-release / build for x86_64 with llvm-18-O2
bpf/vmtest-bpf-next-VM_Test-41 success Logs for x86_64-llvm-18 / veristat
bpf/vmtest-bpf-next-VM_Test-29 success Logs for x86_64-llvm-17 / test (test_maps, false, 360) / test_maps on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-33 success Logs for x86_64-llvm-17 / veristat
bpf/vmtest-bpf-next-VM_Test-40 success Logs for x86_64-llvm-18 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-24 success Logs for x86_64-gcc / test (test_progs_parallel, true, 30) / test_progs_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-34 success Logs for x86_64-llvm-18 / build / build for x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-32 success Logs for x86_64-llvm-17 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-13 success Logs for s390x-gcc / test (test_progs, false, 360) / test_progs on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-22 success Logs for x86_64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-30 success Logs for x86_64-llvm-17 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-39 success Logs for x86_64-llvm-18 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-31 success Logs for x86_64-llvm-17 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-38 success Logs for x86_64-llvm-18 / test (test_progs_cpuv4, false, 360) / test_progs_cpuv4 on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-37 success Logs for x86_64-llvm-18 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-21 success Logs for x86_64-gcc / test (test_progs, false, 360) / test_progs on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-14 success Logs for s390x-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on s390x with gcc
netdev/series_format success Single patches do not need cover letters
netdev/tree_selection success Clearly marked for bpf-next, async
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 7 this patch: 7
netdev/build_tools success Errors and warnings before: 0 this patch: 0
netdev/cc_maintainers warning 13 maintainers not CCed: houtao1@huawei.com mykolal@fb.com sdf@fomichev.me eddyz87@gmail.com haoluo@google.com shuah@kernel.org jolsa@kernel.org linux-kselftest@vger.kernel.org song@kernel.org yonghong.song@linux.dev kpsingh@kernel.org martin.lau@linux.dev john.fastabend@gmail.com
netdev/build_clang success Errors and warnings before: 7 this patch: 7
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 7 this patch: 7
netdev/checkpatch warning WARNING: line length of 102 exceeds 80 columns WARNING: line length of 104 exceeds 80 columns WARNING: line length of 105 exceeds 80 columns WARNING: line length of 107 exceeds 80 columns WARNING: line length of 109 exceeds 80 columns WARNING: line length of 111 exceeds 80 columns WARNING: line length of 115 exceeds 80 columns WARNING: line length of 81 exceeds 80 columns WARNING: line length of 82 exceeds 80 columns WARNING: line length of 84 exceeds 80 columns WARNING: line length of 87 exceeds 80 columns WARNING: line length of 94 exceeds 80 columns
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 2 this patch: 2
netdev/source_inline success Was 0 now: 0

Commit Message

Jordan Rome Aug. 23, 2024, 6:48 p.m. UTC 
This adds tests for both the happy path and
the error path.

Signed-off-by: Jordan Rome <linux@jordanrome.com>
---
 .../selftests/bpf/prog_tests/attach_probe.c   |  8 ++-
 .../selftests/bpf/prog_tests/read_vsyscall.c  |  1 +
 .../selftests/bpf/progs/read_vsyscall.c       |  9 ++-
 .../selftests/bpf/progs/test_attach_probe.c   | 64 ++++++++++++++++++-
 4 files changed, 75 insertions(+), 7 deletions(-)

--
2.43.5

Comments

Alexei Starovoitov Aug. 23, 2024, 6:52 p.m. UTC | #1 
On Fri, Aug 23, 2024 at 11:49 AM Jordan Rome <linux@jordanrome.com> wrote:
>
> +u32 dynamic_sz = 1;

..

> +
> +       // Make sure this passes the verifier
> +       ret = bpf_copy_from_user_str(data_long, dynamic_sz &= sizeof(data_long), user_ptr, 0);

Did you really mean to &= into the global variable while passing it as
an argument?

And the compiler didn't warn?
Jordan Rome Aug. 23, 2024, 6:55 p.m. UTC | #2 
On Fri, Aug 23, 2024 at 2:52 PM Alexei Starovoitov
<alexei.starovoitov@gmail.com> wrote:
>
> On Fri, Aug 23, 2024 at 11:49 AM Jordan Rome <linux@jordanrome.com> wrote:
> >
> > +u32 dynamic_sz = 1;
>
> ..
>
> > +
> > +       // Make sure this passes the verifier
> > +       ret = bpf_copy_from_user_str(data_long, dynamic_sz &= sizeof(data_long), user_ptr, 0);
>
> Did you really mean to &= into the global variable while passing it as
> an argument?
>
> And the compiler didn't warn?

The compiler didn't warn but no, I meant to do just '&' - here comes v10!
Andrii Nakryiko Aug. 23, 2024, 6:59 p.m. UTC | #3 
On Fri, Aug 23, 2024 at 11:49 AM Jordan Rome <linux@jordanrome.com> wrote:
>
> This adds tests for both the happy path and
> the error path.
>
> Signed-off-by: Jordan Rome <linux@jordanrome.com>
> ---
>  .../selftests/bpf/prog_tests/attach_probe.c   |  8 ++-
>  .../selftests/bpf/prog_tests/read_vsyscall.c  |  1 +
>  .../selftests/bpf/progs/read_vsyscall.c       |  9 ++-
>  .../selftests/bpf/progs/test_attach_probe.c   | 64 ++++++++++++++++++-
>  4 files changed, 75 insertions(+), 7 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/attach_probe.c b/tools/testing/selftests/bpf/prog_tests/attach_probe.c
> index 7175af39134f..329c7862b52d 100644
> --- a/tools/testing/selftests/bpf/prog_tests/attach_probe.c
> +++ b/tools/testing/selftests/bpf/prog_tests/attach_probe.c
> @@ -283,9 +283,11 @@ static void test_uprobe_sleepable(struct test_attach_probe *skel)
>         trigger_func3();
>
>         ASSERT_EQ(skel->bss->uprobe_byname3_sleepable_res, 9, "check_uprobe_byname3_sleepable_res");
> -       ASSERT_EQ(skel->bss->uprobe_byname3_res, 10, "check_uprobe_byname3_res");
> -       ASSERT_EQ(skel->bss->uretprobe_byname3_sleepable_res, 11, "check_uretprobe_byname3_sleepable_res");
> -       ASSERT_EQ(skel->bss->uretprobe_byname3_res, 12, "check_uretprobe_byname3_res");
> +       ASSERT_EQ(skel->bss->uprobe_byname3_str_sleepable_res, 10, "check_uprobe_byname3_str_sleepable_res");
> +       ASSERT_EQ(skel->bss->uprobe_byname3_res, 11, "check_uprobe_byname3_res");
> +       ASSERT_EQ(skel->bss->uretprobe_byname3_sleepable_res, 12, "check_uretprobe_byname3_sleepable_res");
> +       ASSERT_EQ(skel->bss->uretprobe_byname3_str_sleepable_res, 13, "check_uretprobe_byname3_str_sleepable_res");
> +       ASSERT_EQ(skel->bss->uretprobe_byname3_res, 14, "check_uretprobe_byname3_res");
>  }
>
>  void test_attach_probe(void)
> diff --git a/tools/testing/selftests/bpf/prog_tests/read_vsyscall.c b/tools/testing/selftests/bpf/prog_tests/read_vsyscall.c
> index 3405923fe4e6..c7b9ba8b1d06 100644
> --- a/tools/testing/selftests/bpf/prog_tests/read_vsyscall.c
> +++ b/tools/testing/selftests/bpf/prog_tests/read_vsyscall.c
> @@ -23,6 +23,7 @@ struct read_ret_desc {
>         { .name = "probe_read_user_str", .ret = -EFAULT },
>         { .name = "copy_from_user", .ret = -EFAULT },
>         { .name = "copy_from_user_task", .ret = -EFAULT },
> +       { .name = "copy_from_user_str", .ret = -EFAULT },
>  };
>
>  void test_read_vsyscall(void)
> diff --git a/tools/testing/selftests/bpf/progs/read_vsyscall.c b/tools/testing/selftests/bpf/progs/read_vsyscall.c
> index 986f96687ae1..39ebef430059 100644
> --- a/tools/testing/selftests/bpf/progs/read_vsyscall.c
> +++ b/tools/testing/selftests/bpf/progs/read_vsyscall.c
> @@ -1,5 +1,6 @@
>  // SPDX-License-Identifier: GPL-2.0
>  /* Copyright (C) 2024. Huawei Technologies Co., Ltd */
> +#include "vmlinux.h"
>  #include <linux/types.h>
>  #include <bpf/bpf_helpers.h>
>
> @@ -7,10 +8,15 @@
>
>  int target_pid = 0;
>  void *user_ptr = 0;
> -int read_ret[8];
> +int read_ret[9];
>
>  char _license[] SEC("license") = "GPL";
>
> +/*
> + * This is the only kfunc, the others are helpers
> + */
> +int bpf_copy_from_user_str(void *dst, u32, const void *, u64) __weak __ksym;
> +
>  SEC("fentry/" SYS_PREFIX "sys_nanosleep")
>  int do_probe_read(void *ctx)
>  {
> @@ -40,6 +46,7 @@ int do_copy_from_user(void *ctx)
>         read_ret[6] = bpf_copy_from_user(buf, sizeof(buf), user_ptr);
>         read_ret[7] = bpf_copy_from_user_task(buf, sizeof(buf), user_ptr,
>                                               bpf_get_current_task_btf(), 0);
> +       read_ret[8] = bpf_copy_from_user_str((char *)buf, sizeof(buf), user_ptr, 0);
>
>         return 0;
>  }
> diff --git a/tools/testing/selftests/bpf/progs/test_attach_probe.c b/tools/testing/selftests/bpf/progs/test_attach_probe.c
> index 68466a6ad18c..0b16502726f8 100644
> --- a/tools/testing/selftests/bpf/progs/test_attach_probe.c
> +++ b/tools/testing/selftests/bpf/progs/test_attach_probe.c
> @@ -5,6 +5,7 @@
>  #include <bpf/bpf_helpers.h>
>  #include <bpf/bpf_tracing.h>
>  #include <bpf/bpf_core_read.h>
> +#include <errno.h>
>  #include "bpf_misc.h"
>
>  int kprobe2_res = 0;
> @@ -14,10 +15,15 @@ int uretprobe_byname_res = 0;
>  int uprobe_byname2_res = 0;
>  int uretprobe_byname2_res = 0;
>  int uprobe_byname3_sleepable_res = 0;
> +int uprobe_byname3_str_sleepable_res = 0;
>  int uprobe_byname3_res = 0;
>  int uretprobe_byname3_sleepable_res = 0;
> +int uretprobe_byname3_str_sleepable_res = 0;
>  int uretprobe_byname3_res = 0;
>  void *user_ptr = 0;
> +u32 dynamic_sz = 1;
> +
> +int bpf_copy_from_user_str(void *dst, u32, const void *, u64) __weak __ksym;
>
>  SEC("ksyscall/nanosleep")
>  int BPF_KSYSCALL(handle_kprobe_auto, struct __kernel_timespec *req, struct __kernel_timespec *rem)
> @@ -87,11 +93,61 @@ static __always_inline bool verify_sleepable_user_copy(void)
>         return bpf_strncmp(data, sizeof(data), "test_data") == 0;
>  }
>
> +static __always_inline bool verify_sleepable_user_copy_str(void)
> +{
> +       int ret;
> +       char data_long[20];
> +       char data_long_pad[20];
> +       char data_long_err[20];
> +       char data_short[4];
> +       char data_short_pad[4];
> +
> +       ret = bpf_copy_from_user_str(data_short, sizeof(data_short), user_ptr, 0);
> +
> +       if (bpf_strncmp(data_short, 4, "tes\0") != 0 || ret != 4)
> +               return false;
> +
> +       ret = bpf_copy_from_user_str(data_short_pad, sizeof(data_short_pad), user_ptr, BPF_F_PAD_ZEROS);
> +
> +       if (bpf_strncmp(data_short, 4, "tes\0") != 0 || ret != 4)
> +               return false;
> +
> +       // Make sure this passes the verifier

also please don't use C++-style comments

> +       ret = bpf_copy_from_user_str(data_long, dynamic_sz &= sizeof(data_long), user_ptr, 0);
> +
> +       if (ret != 0)
> +               return false;
> +
> +       ret = bpf_copy_from_user_str(data_long, sizeof(data_long), user_ptr, 0);
> +
> +       if (bpf_strncmp(data_long, 10, "test_data\0") != 0 || ret != 10)
> +               return false;
> +
> +       ret = bpf_copy_from_user_str(data_long_pad, sizeof(data_long_pad), user_ptr, BPF_F_PAD_ZEROS);
> +
> +       if (bpf_strncmp(data_long_pad, 10, "test_data\0") != 0 || ret != 10 || data_long_pad[19] != '\0')
> +               return false;
> +
> +       ret = bpf_copy_from_user_str(data_long_err, sizeof(data_long_err), (void *)data_long, BPF_F_PAD_ZEROS);
> +
> +       if (ret > 0 || data_long_err[19] != '\0')
> +               return false;
> +
> +       ret = bpf_copy_from_user_str(data_long, sizeof(data_long), user_ptr, 2);
> +
> +       if (ret != -EINVAL)
> +               return false;
> +
> +       return true;
> +}
> +
>  SEC("uprobe.s//proc/self/exe:trigger_func3")
>  int handle_uprobe_byname3_sleepable(struct pt_regs *ctx)
>  {
>         if (verify_sleepable_user_copy())
>                 uprobe_byname3_sleepable_res = 9;
> +       if (verify_sleepable_user_copy_str())
> +               uprobe_byname3_str_sleepable_res = 10;
>         return 0;
>  }
>
> @@ -102,7 +158,7 @@ int handle_uprobe_byname3_sleepable(struct pt_regs *ctx)
>  SEC("uprobe//proc/self/exe:trigger_func3")
>  int handle_uprobe_byname3(struct pt_regs *ctx)
>  {
> -       uprobe_byname3_res = 10;
> +       uprobe_byname3_res = 11;
>         return 0;
>  }
>
> @@ -110,14 +166,16 @@ SEC("uretprobe.s//proc/self/exe:trigger_func3")
>  int handle_uretprobe_byname3_sleepable(struct pt_regs *ctx)
>  {
>         if (verify_sleepable_user_copy())
> -               uretprobe_byname3_sleepable_res = 11;
> +               uretprobe_byname3_sleepable_res = 12;
> +       if (verify_sleepable_user_copy_str())
> +               uretprobe_byname3_str_sleepable_res = 13;
>         return 0;
>  }
>
>  SEC("uretprobe//proc/self/exe:trigger_func3")
>  int handle_uretprobe_byname3(struct pt_regs *ctx)
>  {
> -       uretprobe_byname3_res = 12;
> +       uretprobe_byname3_res = 14;
>         return 0;
>  }
>
> --
> 2.43.5
>
Jordan Rome Aug. 23, 2024, 7:05 p.m. UTC | #4 
On Fri, Aug 23, 2024 at 3:00 PM Andrii Nakryiko
<andrii.nakryiko@gmail.com> wrote:
>
> On Fri, Aug 23, 2024 at 11:49 AM Jordan Rome <linux@jordanrome.com> wrote:
> >
> > This adds tests for both the happy path and
> > the error path.
> >
> > Signed-off-by: Jordan Rome <linux@jordanrome.com>
> > ---
> >  .../selftests/bpf/prog_tests/attach_probe.c   |  8 ++-
> >  .../selftests/bpf/prog_tests/read_vsyscall.c  |  1 +
> >  .../selftests/bpf/progs/read_vsyscall.c       |  9 ++-
> >  .../selftests/bpf/progs/test_attach_probe.c   | 64 ++++++++++++++++++-
> >  4 files changed, 75 insertions(+), 7 deletions(-)
> >
> > diff --git a/tools/testing/selftests/bpf/prog_tests/attach_probe.c b/tools/testing/selftests/bpf/prog_tests/attach_probe.c
> > index 7175af39134f..329c7862b52d 100644
> > --- a/tools/testing/selftests/bpf/prog_tests/attach_probe.c
> > +++ b/tools/testing/selftests/bpf/prog_tests/attach_probe.c
> > @@ -283,9 +283,11 @@ static void test_uprobe_sleepable(struct test_attach_probe *skel)
> >         trigger_func3();
> >
> >         ASSERT_EQ(skel->bss->uprobe_byname3_sleepable_res, 9, "check_uprobe_byname3_sleepable_res");
> > -       ASSERT_EQ(skel->bss->uprobe_byname3_res, 10, "check_uprobe_byname3_res");
> > -       ASSERT_EQ(skel->bss->uretprobe_byname3_sleepable_res, 11, "check_uretprobe_byname3_sleepable_res");
> > -       ASSERT_EQ(skel->bss->uretprobe_byname3_res, 12, "check_uretprobe_byname3_res");
> > +       ASSERT_EQ(skel->bss->uprobe_byname3_str_sleepable_res, 10, "check_uprobe_byname3_str_sleepable_res");
> > +       ASSERT_EQ(skel->bss->uprobe_byname3_res, 11, "check_uprobe_byname3_res");
> > +       ASSERT_EQ(skel->bss->uretprobe_byname3_sleepable_res, 12, "check_uretprobe_byname3_sleepable_res");
> > +       ASSERT_EQ(skel->bss->uretprobe_byname3_str_sleepable_res, 13, "check_uretprobe_byname3_str_sleepable_res");
> > +       ASSERT_EQ(skel->bss->uretprobe_byname3_res, 14, "check_uretprobe_byname3_res");
> >  }
> >
> >  void test_attach_probe(void)
> > diff --git a/tools/testing/selftests/bpf/prog_tests/read_vsyscall.c b/tools/testing/selftests/bpf/prog_tests/read_vsyscall.c
> > index 3405923fe4e6..c7b9ba8b1d06 100644
> > --- a/tools/testing/selftests/bpf/prog_tests/read_vsyscall.c
> > +++ b/tools/testing/selftests/bpf/prog_tests/read_vsyscall.c
> > @@ -23,6 +23,7 @@ struct read_ret_desc {
> >         { .name = "probe_read_user_str", .ret = -EFAULT },
> >         { .name = "copy_from_user", .ret = -EFAULT },
> >         { .name = "copy_from_user_task", .ret = -EFAULT },
> > +       { .name = "copy_from_user_str", .ret = -EFAULT },
> >  };
> >
> >  void test_read_vsyscall(void)
> > diff --git a/tools/testing/selftests/bpf/progs/read_vsyscall.c b/tools/testing/selftests/bpf/progs/read_vsyscall.c
> > index 986f96687ae1..39ebef430059 100644
> > --- a/tools/testing/selftests/bpf/progs/read_vsyscall.c
> > +++ b/tools/testing/selftests/bpf/progs/read_vsyscall.c
> > @@ -1,5 +1,6 @@
> >  // SPDX-License-Identifier: GPL-2.0
> >  /* Copyright (C) 2024. Huawei Technologies Co., Ltd */
> > +#include "vmlinux.h"
> >  #include <linux/types.h>
> >  #include <bpf/bpf_helpers.h>
> >
> > @@ -7,10 +8,15 @@
> >
> >  int target_pid = 0;
> >  void *user_ptr = 0;
> > -int read_ret[8];
> > +int read_ret[9];
> >
> >  char _license[] SEC("license") = "GPL";
> >
> > +/*
> > + * This is the only kfunc, the others are helpers
> > + */
> > +int bpf_copy_from_user_str(void *dst, u32, const void *, u64) __weak __ksym;
> > +
> >  SEC("fentry/" SYS_PREFIX "sys_nanosleep")
> >  int do_probe_read(void *ctx)
> >  {
> > @@ -40,6 +46,7 @@ int do_copy_from_user(void *ctx)
> >         read_ret[6] = bpf_copy_from_user(buf, sizeof(buf), user_ptr);
> >         read_ret[7] = bpf_copy_from_user_task(buf, sizeof(buf), user_ptr,
> >                                               bpf_get_current_task_btf(), 0);
> > +       read_ret[8] = bpf_copy_from_user_str((char *)buf, sizeof(buf), user_ptr, 0);
> >
> >         return 0;
> >  }
> > diff --git a/tools/testing/selftests/bpf/progs/test_attach_probe.c b/tools/testing/selftests/bpf/progs/test_attach_probe.c
> > index 68466a6ad18c..0b16502726f8 100644
> > --- a/tools/testing/selftests/bpf/progs/test_attach_probe.c
> > +++ b/tools/testing/selftests/bpf/progs/test_attach_probe.c
> > @@ -5,6 +5,7 @@
> >  #include <bpf/bpf_helpers.h>
> >  #include <bpf/bpf_tracing.h>
> >  #include <bpf/bpf_core_read.h>
> > +#include <errno.h>
> >  #include "bpf_misc.h"
> >
> >  int kprobe2_res = 0;
> > @@ -14,10 +15,15 @@ int uretprobe_byname_res = 0;
> >  int uprobe_byname2_res = 0;
> >  int uretprobe_byname2_res = 0;
> >  int uprobe_byname3_sleepable_res = 0;
> > +int uprobe_byname3_str_sleepable_res = 0;
> >  int uprobe_byname3_res = 0;
> >  int uretprobe_byname3_sleepable_res = 0;
> > +int uretprobe_byname3_str_sleepable_res = 0;
> >  int uretprobe_byname3_res = 0;
> >  void *user_ptr = 0;
> > +u32 dynamic_sz = 1;
> > +
> > +int bpf_copy_from_user_str(void *dst, u32, const void *, u64) __weak __ksym;
> >
> >  SEC("ksyscall/nanosleep")
> >  int BPF_KSYSCALL(handle_kprobe_auto, struct __kernel_timespec *req, struct __kernel_timespec *rem)
> > @@ -87,11 +93,61 @@ static __always_inline bool verify_sleepable_user_copy(void)
> >         return bpf_strncmp(data, sizeof(data), "test_data") == 0;
> >  }
> >
> > +static __always_inline bool verify_sleepable_user_copy_str(void)
> > +{
> > +       int ret;
> > +       char data_long[20];
> > +       char data_long_pad[20];
> > +       char data_long_err[20];
> > +       char data_short[4];
> > +       char data_short_pad[4];
> > +
> > +       ret = bpf_copy_from_user_str(data_short, sizeof(data_short), user_ptr, 0);
> > +
> > +       if (bpf_strncmp(data_short, 4, "tes\0") != 0 || ret != 4)
> > +               return false;
> > +
> > +       ret = bpf_copy_from_user_str(data_short_pad, sizeof(data_short_pad), user_ptr, BPF_F_PAD_ZEROS);
> > +
> > +       if (bpf_strncmp(data_short, 4, "tes\0") != 0 || ret != 4)
> > +               return false;
> > +
> > +       // Make sure this passes the verifier
>
> also please don't use C++-style comments
>

Good catch. Will fix.

> > +       ret = bpf_copy_from_user_str(data_long, dynamic_sz &= sizeof(data_long), user_ptr, 0);
> > +
> > +       if (ret != 0)
> > +               return false;
> > +
> > +       ret = bpf_copy_from_user_str(data_long, sizeof(data_long), user_ptr, 0);
> > +
> > +       if (bpf_strncmp(data_long, 10, "test_data\0") != 0 || ret != 10)
> > +               return false;
> > +
> > +       ret = bpf_copy_from_user_str(data_long_pad, sizeof(data_long_pad), user_ptr, BPF_F_PAD_ZEROS);
> > +
> > +       if (bpf_strncmp(data_long_pad, 10, "test_data\0") != 0 || ret != 10 || data_long_pad[19] != '\0')
> > +               return false;
> > +
> > +       ret = bpf_copy_from_user_str(data_long_err, sizeof(data_long_err), (void *)data_long, BPF_F_PAD_ZEROS);
> > +
> > +       if (ret > 0 || data_long_err[19] != '\0')
> > +               return false;
> > +
> > +       ret = bpf_copy_from_user_str(data_long, sizeof(data_long), user_ptr, 2);
> > +
> > +       if (ret != -EINVAL)
> > +               return false;
> > +
> > +       return true;
> > +}
> > +
> >  SEC("uprobe.s//proc/self/exe:trigger_func3")
> >  int handle_uprobe_byname3_sleepable(struct pt_regs *ctx)
> >  {
> >         if (verify_sleepable_user_copy())
> >                 uprobe_byname3_sleepable_res = 9;
> > +       if (verify_sleepable_user_copy_str())
> > +               uprobe_byname3_str_sleepable_res = 10;
> >         return 0;
> >  }
> >
> > @@ -102,7 +158,7 @@ int handle_uprobe_byname3_sleepable(struct pt_regs *ctx)
> >  SEC("uprobe//proc/self/exe:trigger_func3")
> >  int handle_uprobe_byname3(struct pt_regs *ctx)
> >  {
> > -       uprobe_byname3_res = 10;
> > +       uprobe_byname3_res = 11;
> >         return 0;
> >  }
> >
> > @@ -110,14 +166,16 @@ SEC("uretprobe.s//proc/self/exe:trigger_func3")
> >  int handle_uretprobe_byname3_sleepable(struct pt_regs *ctx)
> >  {
> >         if (verify_sleepable_user_copy())
> > -               uretprobe_byname3_sleepable_res = 11;
> > +               uretprobe_byname3_sleepable_res = 12;
> > +       if (verify_sleepable_user_copy_str())
> > +               uretprobe_byname3_str_sleepable_res = 13;
> >         return 0;
> >  }
> >
> >  SEC("uretprobe//proc/self/exe:trigger_func3")
> >  int handle_uretprobe_byname3(struct pt_regs *ctx)
> >  {
> > -       uretprobe_byname3_res = 12;
> > +       uretprobe_byname3_res = 14;
> >         return 0;
> >  }
> >
> > --
> > 2.43.5
> >
diff mbox series

Patch

diff --git a/tools/testing/selftests/bpf/prog_tests/attach_probe.c b/tools/testing/selftests/bpf/prog_tests/attach_probe.c
index 7175af39134f..329c7862b52d 100644
--- a/tools/testing/selftests/bpf/prog_tests/attach_probe.c
+++ b/tools/testing/selftests/bpf/prog_tests/attach_probe.c
@@ -283,9 +283,11 @@  static void test_uprobe_sleepable(struct test_attach_probe *skel)
 	trigger_func3();

 	ASSERT_EQ(skel->bss->uprobe_byname3_sleepable_res, 9, "check_uprobe_byname3_sleepable_res");
-	ASSERT_EQ(skel->bss->uprobe_byname3_res, 10, "check_uprobe_byname3_res");
-	ASSERT_EQ(skel->bss->uretprobe_byname3_sleepable_res, 11, "check_uretprobe_byname3_sleepable_res");
-	ASSERT_EQ(skel->bss->uretprobe_byname3_res, 12, "check_uretprobe_byname3_res");
+	ASSERT_EQ(skel->bss->uprobe_byname3_str_sleepable_res, 10, "check_uprobe_byname3_str_sleepable_res");
+	ASSERT_EQ(skel->bss->uprobe_byname3_res, 11, "check_uprobe_byname3_res");
+	ASSERT_EQ(skel->bss->uretprobe_byname3_sleepable_res, 12, "check_uretprobe_byname3_sleepable_res");
+	ASSERT_EQ(skel->bss->uretprobe_byname3_str_sleepable_res, 13, "check_uretprobe_byname3_str_sleepable_res");
+	ASSERT_EQ(skel->bss->uretprobe_byname3_res, 14, "check_uretprobe_byname3_res");
 }

 void test_attach_probe(void)
diff --git a/tools/testing/selftests/bpf/prog_tests/read_vsyscall.c b/tools/testing/selftests/bpf/prog_tests/read_vsyscall.c
index 3405923fe4e6..c7b9ba8b1d06 100644
--- a/tools/testing/selftests/bpf/prog_tests/read_vsyscall.c
+++ b/tools/testing/selftests/bpf/prog_tests/read_vsyscall.c
@@ -23,6 +23,7 @@  struct read_ret_desc {
 	{ .name = "probe_read_user_str", .ret = -EFAULT },
 	{ .name = "copy_from_user", .ret = -EFAULT },
 	{ .name = "copy_from_user_task", .ret = -EFAULT },
+	{ .name = "copy_from_user_str", .ret = -EFAULT },
 };

 void test_read_vsyscall(void)
diff --git a/tools/testing/selftests/bpf/progs/read_vsyscall.c b/tools/testing/selftests/bpf/progs/read_vsyscall.c
index 986f96687ae1..39ebef430059 100644
--- a/tools/testing/selftests/bpf/progs/read_vsyscall.c
+++ b/tools/testing/selftests/bpf/progs/read_vsyscall.c
@@ -1,5 +1,6 @@ 
 // SPDX-License-Identifier: GPL-2.0
 /* Copyright (C) 2024. Huawei Technologies Co., Ltd */
+#include "vmlinux.h"
 #include <linux/types.h>
 #include <bpf/bpf_helpers.h>

@@ -7,10 +8,15 @@ 

 int target_pid = 0;
 void *user_ptr = 0;
-int read_ret[8];
+int read_ret[9];

 char _license[] SEC("license") = "GPL";

+/*
+ * This is the only kfunc, the others are helpers
+ */
+int bpf_copy_from_user_str(void *dst, u32, const void *, u64) __weak __ksym;
+
 SEC("fentry/" SYS_PREFIX "sys_nanosleep")
 int do_probe_read(void *ctx)
 {
@@ -40,6 +46,7 @@  int do_copy_from_user(void *ctx)
 	read_ret[6] = bpf_copy_from_user(buf, sizeof(buf), user_ptr);
 	read_ret[7] = bpf_copy_from_user_task(buf, sizeof(buf), user_ptr,
 					      bpf_get_current_task_btf(), 0);
+	read_ret[8] = bpf_copy_from_user_str((char *)buf, sizeof(buf), user_ptr, 0);

 	return 0;
 }
diff --git a/tools/testing/selftests/bpf/progs/test_attach_probe.c b/tools/testing/selftests/bpf/progs/test_attach_probe.c
index 68466a6ad18c..0b16502726f8 100644
--- a/tools/testing/selftests/bpf/progs/test_attach_probe.c
+++ b/tools/testing/selftests/bpf/progs/test_attach_probe.c
@@ -5,6 +5,7 @@ 
 #include <bpf/bpf_helpers.h>
 #include <bpf/bpf_tracing.h>
 #include <bpf/bpf_core_read.h>
+#include <errno.h>
 #include "bpf_misc.h"

 int kprobe2_res = 0;
@@ -14,10 +15,15 @@  int uretprobe_byname_res = 0;
 int uprobe_byname2_res = 0;
 int uretprobe_byname2_res = 0;
 int uprobe_byname3_sleepable_res = 0;
+int uprobe_byname3_str_sleepable_res = 0;
 int uprobe_byname3_res = 0;
 int uretprobe_byname3_sleepable_res = 0;
+int uretprobe_byname3_str_sleepable_res = 0;
 int uretprobe_byname3_res = 0;
 void *user_ptr = 0;
+u32 dynamic_sz = 1;
+
+int bpf_copy_from_user_str(void *dst, u32, const void *, u64) __weak __ksym;

 SEC("ksyscall/nanosleep")
 int BPF_KSYSCALL(handle_kprobe_auto, struct __kernel_timespec *req, struct __kernel_timespec *rem)
@@ -87,11 +93,61 @@  static __always_inline bool verify_sleepable_user_copy(void)
 	return bpf_strncmp(data, sizeof(data), "test_data") == 0;
 }

+static __always_inline bool verify_sleepable_user_copy_str(void)
+{
+	int ret;
+	char data_long[20];
+	char data_long_pad[20];
+	char data_long_err[20];
+	char data_short[4];
+	char data_short_pad[4];
+
+	ret = bpf_copy_from_user_str(data_short, sizeof(data_short), user_ptr, 0);
+
+	if (bpf_strncmp(data_short, 4, "tes\0") != 0 || ret != 4)
+		return false;
+
+	ret = bpf_copy_from_user_str(data_short_pad, sizeof(data_short_pad), user_ptr, BPF_F_PAD_ZEROS);
+
+	if (bpf_strncmp(data_short, 4, "tes\0") != 0 || ret != 4)
+		return false;
+
+	// Make sure this passes the verifier
+	ret = bpf_copy_from_user_str(data_long, dynamic_sz &= sizeof(data_long), user_ptr, 0);
+
+	if (ret != 0)
+		return false;
+
+	ret = bpf_copy_from_user_str(data_long, sizeof(data_long), user_ptr, 0);
+
+	if (bpf_strncmp(data_long, 10, "test_data\0") != 0 || ret != 10)
+		return false;
+
+	ret = bpf_copy_from_user_str(data_long_pad, sizeof(data_long_pad), user_ptr, BPF_F_PAD_ZEROS);
+
+	if (bpf_strncmp(data_long_pad, 10, "test_data\0") != 0 || ret != 10 || data_long_pad[19] != '\0')
+		return false;
+
+	ret = bpf_copy_from_user_str(data_long_err, sizeof(data_long_err), (void *)data_long, BPF_F_PAD_ZEROS);
+
+	if (ret > 0 || data_long_err[19] != '\0')
+		return false;
+
+	ret = bpf_copy_from_user_str(data_long, sizeof(data_long), user_ptr, 2);
+
+	if (ret != -EINVAL)
+		return false;
+
+	return true;
+}
+
 SEC("uprobe.s//proc/self/exe:trigger_func3")
 int handle_uprobe_byname3_sleepable(struct pt_regs *ctx)
 {
 	if (verify_sleepable_user_copy())
 		uprobe_byname3_sleepable_res = 9;
+	if (verify_sleepable_user_copy_str())
+		uprobe_byname3_str_sleepable_res = 10;
 	return 0;
 }

@@ -102,7 +158,7 @@  int handle_uprobe_byname3_sleepable(struct pt_regs *ctx)
 SEC("uprobe//proc/self/exe:trigger_func3")
 int handle_uprobe_byname3(struct pt_regs *ctx)
 {
-	uprobe_byname3_res = 10;
+	uprobe_byname3_res = 11;
 	return 0;
 }

@@ -110,14 +166,16 @@  SEC("uretprobe.s//proc/self/exe:trigger_func3")
 int handle_uretprobe_byname3_sleepable(struct pt_regs *ctx)
 {
 	if (verify_sleepable_user_copy())
-		uretprobe_byname3_sleepable_res = 11;
+		uretprobe_byname3_sleepable_res = 12;
+	if (verify_sleepable_user_copy_str())
+		uretprobe_byname3_str_sleepable_res = 13;
 	return 0;
 }

 SEC("uretprobe//proc/self/exe:trigger_func3")
 int handle_uretprobe_byname3(struct pt_regs *ctx)
 {
-	uretprobe_byname3_res = 12;
+	uretprobe_byname3_res = 14;
 	return 0;
 }