| Message ID | 20250128145806.1849977-1-eyal.birger@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] seccomp: passthrough uretprobe systemcall without filtering | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
can't review, I know nothing about seccomp_cache, but On 01/28, Eyal Birger wrote: > > +static bool seccomp_is_const_allow(struct sock_fprog_kern *fprog, > + struct seccomp_data *sd) > +{ > +#ifdef __NR_uretprobe > + if (sd->nr == __NR_uretprobe > +#ifdef SECCOMP_ARCH_COMPAT > + && sd->arch != SECCOMP_ARCH_COMPAT > +#endif it seems you can check && sd->arch == SECCOMP_ARCH_NATIVE and avoid #ifdef SECCOMP_ARCH_COMPAT Oleg.
On 01/28, Oleg Nesterov wrote: > > can't review, I know nothing about seccomp_cache, but > > On 01/28, Eyal Birger wrote: > > > > +static bool seccomp_is_const_allow(struct sock_fprog_kern *fprog, > > + struct seccomp_data *sd) > > +{ > > +#ifdef __NR_uretprobe > > + if (sd->nr == __NR_uretprobe > > +#ifdef SECCOMP_ARCH_COMPAT > > + && sd->arch != SECCOMP_ARCH_COMPAT > > +#endif > > it seems you can check > > && sd->arch == SECCOMP_ARCH_NATIVE > > and avoid #ifdef SECCOMP_ARCH_COMPAT Although perhaps you added this ifdef to avoid the unnecessary sd->arch check if !CONFIG_COMPAT ... Oleg.
On Tue, Jan 28, 2025 at 06:58:06AM -0800, Eyal Birger wrote: > Note: uretprobe isn't supported in i386 and __NR_ia32_rt_tgsigqueueinfo > uses the same number as __NR_uretprobe so the syscall isn't forced in the > compat bitmap. So a 64-bit tracer cannot use uretprobe on a 32-bit process? Also is uretprobe strictly an x86_64 feature? > [...] > diff --git a/kernel/seccomp.c b/kernel/seccomp.c > index 385d48293a5f..23b594a68bc0 100644 > --- a/kernel/seccomp.c > +++ b/kernel/seccomp.c > @@ -734,13 +734,13 @@ seccomp_prepare_user_filter(const char __user *user_filter) > > #ifdef SECCOMP_ARCH_NATIVE > /** > - * seccomp_is_const_allow - check if filter is constant allow with given data > + * seccomp_is_filter_const_allow - check if filter is constant allow with given data > * @fprog: The BPF programs > * @sd: The seccomp data to check against, only syscall number and arch > * number are considered constant. > */ > -static bool seccomp_is_const_allow(struct sock_fprog_kern *fprog, > - struct seccomp_data *sd) > +static bool seccomp_is_filter_const_allow(struct sock_fprog_kern *fprog, > + struct seccomp_data *sd) > { > unsigned int reg_value = 0; > unsigned int pc; > @@ -812,6 +812,21 @@ static bool seccomp_is_const_allow(struct sock_fprog_kern *fprog, > return false; > } > > +static bool seccomp_is_const_allow(struct sock_fprog_kern *fprog, > + struct seccomp_data *sd) > +{ > +#ifdef __NR_uretprobe > + if (sd->nr == __NR_uretprobe > +#ifdef SECCOMP_ARCH_COMPAT > + && sd->arch != SECCOMP_ARCH_COMPAT > +#endif I don't like this because it's not future-proof enough. __NR_uretprobe may collide with other syscalls at some point. And if __NR_uretprobe_32 is ever implemented, the seccomp logic will be missing. I think this will work now and in the future: #ifdef __NR_uretprobe # ifdef SECCOMP_ARCH_COMPAT if (sd->arch == SECCOMP_ARCH_COMPAT) { # ifdef __NR_uretprobe_32 if (sd->nr == __NR_uretprobe_32) return true; # endif } else # endif if (sd->nr == __NR_uretprobe) return true; #endif Instead of doing a function rename dance, I think you can just stick the above into seccomp_is_const_allow() after the WARN(). Also please add a KUnit tests to cover this in tools/testing/selftests/seccomp/seccomp_bpf.c With at least these cases combinations below. Check each of: - not using uretprobe passes - using uretprobe passes (and validates that uretprobe did work) in each of the following conditions: - default-allow filter - default-block filter - filter explicitly blocking __NR_uretprobe and nothing else - filter explicitly allowing __NR_uretprobe (and only other required syscalls) Hm, is uretprobe expected to work on mips? Because if so, you'll need to do something similar to the mode1 checking in the !SECCOMP_ARCH_NATIVE version of seccomp_cache_check_allow(). (You can see why I really dislike having policy baked into seccomp!) > + ) > + return true; > +#endif > + > + return seccomp_is_filter_const_allow(fprog, sd); > +} > + > static void seccomp_cache_prepare_bitmap(struct seccomp_filter *sfilter, > void *bitmap, const void *bitmap_prev, > size_t bitmap_size, int arch) > @@ -1023,6 +1038,9 @@ static inline void seccomp_log(unsigned long syscall, long signr, u32 action, > */ > static const int mode1_syscalls[] = { > __NR_seccomp_read, __NR_seccomp_write, __NR_seccomp_exit, __NR_seccomp_sigreturn, > +#ifdef __NR_uretprobe > + __NR_uretprobe, > +#endif It'd be nice to update mode1_syscalls_32 with __NR_uretprobe_32 even though it doesn't exist. (Is it _never_ planned to be implemented?) But then, maybe the chances of a compat mode1 seccomp process running under uretprobe is vanishingly small. > -1, /* negative terminated */ > }; > > -- > 2.43.0 > -Kees
Hi, Thanks for the review! On Tue, Jan 28, 2025 at 5:41 PM Kees Cook <kees@kernel.org> wrote: > > On Tue, Jan 28, 2025 at 06:58:06AM -0800, Eyal Birger wrote: > > Note: uretprobe isn't supported in i386 and __NR_ia32_rt_tgsigqueueinfo > > uses the same number as __NR_uretprobe so the syscall isn't forced in the > > compat bitmap. > > So a 64-bit tracer cannot use uretprobe on a 32-bit process? Also is > uretprobe strictly an x86_64 feature? > My understanding is that they'd be able to do so, but use the int3 trap instead of the uretprobe syscall. > > [...] > > diff --git a/kernel/seccomp.c b/kernel/seccomp.c > > index 385d48293a5f..23b594a68bc0 100644 > > --- a/kernel/seccomp.c > > +++ b/kernel/seccomp.c > > @@ -734,13 +734,13 @@ seccomp_prepare_user_filter(const char __user *user_filter) > > > > #ifdef SECCOMP_ARCH_NATIVE > > /** > > - * seccomp_is_const_allow - check if filter is constant allow with given data > > + * seccomp_is_filter_const_allow - check if filter is constant allow with given data > > * @fprog: The BPF programs > > * @sd: The seccomp data to check against, only syscall number and arch > > * number are considered constant. > > */ > > -static bool seccomp_is_const_allow(struct sock_fprog_kern *fprog, > > - struct seccomp_data *sd) > > +static bool seccomp_is_filter_const_allow(struct sock_fprog_kern *fprog, > > + struct seccomp_data *sd) > > { > > unsigned int reg_value = 0; > > unsigned int pc; > > @@ -812,6 +812,21 @@ static bool seccomp_is_const_allow(struct sock_fprog_kern *fprog, > > return false; > > } > > > > +static bool seccomp_is_const_allow(struct sock_fprog_kern *fprog, > > + struct seccomp_data *sd) > > +{ > > +#ifdef __NR_uretprobe > > + if (sd->nr == __NR_uretprobe > > +#ifdef SECCOMP_ARCH_COMPAT > > + && sd->arch != SECCOMP_ARCH_COMPAT > > +#endif > > I don't like this because it's not future-proof enough. __NR_uretprobe > may collide with other syscalls at some point. I'm not sure I got this point. > And if __NR_uretprobe_32 > is ever implemented, the seccomp logic will be missing. I think this > will work now and in the future: > > #ifdef __NR_uretprobe > # ifdef SECCOMP_ARCH_COMPAT > if (sd->arch == SECCOMP_ARCH_COMPAT) { > # ifdef __NR_uretprobe_32 > if (sd->nr == __NR_uretprobe_32) > return true; > # endif > } else > # endif > if (sd->nr == __NR_uretprobe) > return true; > #endif I don't know if implementing uretprobe syscall for compat binaries is planned or makes sense - I'd appreciate Jiri's and others opinion on that. That said, I don't mind adding this code for the sake of future proofing. > > Instead of doing a function rename dance, I think you can just stick > the above into seccomp_is_const_allow() after the WARN(). My motivation for the renaming dance was that you mentioned we might add new syscalls to this as well, so I wanted to avoid cluttering the existing function which seems to be well defined. > > Also please add a KUnit tests to cover this in > tools/testing/selftests/seccomp/seccomp_bpf.c I think this would mean that this test suite would need to run as privileged. Is that Ok? or maybe it'd be better to have a new suite? > With at least these cases combinations below. Check each of: > > - not using uretprobe passes > - using uretprobe passes (and validates that uretprobe did work) > > in each of the following conditions: > > - default-allow filter > - default-block filter > - filter explicitly blocking __NR_uretprobe and nothing else > - filter explicitly allowing __NR_uretprobe (and only other > required syscalls) Ok. > > Hm, is uretprobe expected to work on mips? Because if so, you'll need to > do something similar to the mode1 checking in the !SECCOMP_ARCH_NATIVE > version of seccomp_cache_check_allow(). I don't know if uretprobe syscall is expected to run on mips. Personally I'd avoid adding this dead code. > > (You can see why I really dislike having policy baked into seccomp!) I definitely understand :) > > > + ) > > + return true; > > +#endif > > + > > + return seccomp_is_filter_const_allow(fprog, sd); > > +} > > + > > static void seccomp_cache_prepare_bitmap(struct seccomp_filter *sfilter, > > void *bitmap, const void *bitmap_prev, > > size_t bitmap_size, int arch) > > @@ -1023,6 +1038,9 @@ static inline void seccomp_log(unsigned long syscall, long signr, u32 action, > > */ > > static const int mode1_syscalls[] = { > > __NR_seccomp_read, __NR_seccomp_write, __NR_seccomp_exit, __NR_seccomp_sigreturn, > > +#ifdef __NR_uretprobe > > + __NR_uretprobe, > > +#endif > > It'd be nice to update mode1_syscalls_32 with __NR_uretprobe_32 even > though it doesn't exist. (Is it _never_ planned to be implemented?) But > then, maybe the chances of a compat mode1 seccomp process running under > uretprobe is vanishingly small. It seems to me very unlikely. BTW, when I tested the "strict" mode change my program was killed by seccomp. The reason wasn't the uretprobe syscall (which I added to the list), it was actually the exit_group syscall which libc uses instead of the exit syscall. Thanks again, Eyal.
On Wed, Jan 29, 2025 at 9:27 AM Eyal Birger <eyal.birger@gmail.com> wrote: > > Hi, > > Thanks for the review! > > On Tue, Jan 28, 2025 at 5:41 PM Kees Cook <kees@kernel.org> wrote: > > > > On Tue, Jan 28, 2025 at 06:58:06AM -0800, Eyal Birger wrote: > > > Note: uretprobe isn't supported in i386 and __NR_ia32_rt_tgsigqueueinfo > > > uses the same number as __NR_uretprobe so the syscall isn't forced in the > > > compat bitmap. > > > > So a 64-bit tracer cannot use uretprobe on a 32-bit process? Also is > > uretprobe strictly an x86_64 feature? > > > > My understanding is that they'd be able to do so, but use the int3 trap > instead of the uretprobe syscall. > Syscall-based uretprobe implementation is strictly x86-64 and I don't think we have any plans to expand it beyond x86-64. But uretprobes in general do work across many bitnesses and architectures, they are just implemented through a trap approach (int3 on x86), so none of that should be relevant to seccomp. It's just that trapping on x86-64 is that much slower that we had to do syscall to speed it up but quite a lot. > > > [...] > > > diff --git a/kernel/seccomp.c b/kernel/seccomp.c > > > index 385d48293a5f..23b594a68bc0 100644 > > > --- a/kernel/seccomp.c > > > +++ b/kernel/seccomp.c > > > @@ -734,13 +734,13 @@ seccomp_prepare_user_filter(const char __user *user_filter) > > > [...]
diff --git a/kernel/seccomp.c b/kernel/seccomp.c index 385d48293a5f..23b594a68bc0 100644 --- a/kernel/seccomp.c +++ b/kernel/seccomp.c @@ -734,13 +734,13 @@ seccomp_prepare_user_filter(const char __user *user_filter) #ifdef SECCOMP_ARCH_NATIVE /** - * seccomp_is_const_allow - check if filter is constant allow with given data + * seccomp_is_filter_const_allow - check if filter is constant allow with given data * @fprog: The BPF programs * @sd: The seccomp data to check against, only syscall number and arch * number are considered constant. */ -static bool seccomp_is_const_allow(struct sock_fprog_kern *fprog, - struct seccomp_data *sd) +static bool seccomp_is_filter_const_allow(struct sock_fprog_kern *fprog, + struct seccomp_data *sd) { unsigned int reg_value = 0; unsigned int pc; @@ -812,6 +812,21 @@ static bool seccomp_is_const_allow(struct sock_fprog_kern *fprog, return false; } +static bool seccomp_is_const_allow(struct sock_fprog_kern *fprog, + struct seccomp_data *sd) +{ +#ifdef __NR_uretprobe + if (sd->nr == __NR_uretprobe +#ifdef SECCOMP_ARCH_COMPAT + && sd->arch != SECCOMP_ARCH_COMPAT +#endif + ) + return true; +#endif + + return seccomp_is_filter_const_allow(fprog, sd); +} + static void seccomp_cache_prepare_bitmap(struct seccomp_filter *sfilter, void *bitmap, const void *bitmap_prev, size_t bitmap_size, int arch) @@ -1023,6 +1038,9 @@ static inline void seccomp_log(unsigned long syscall, long signr, u32 action, */ static const int mode1_syscalls[] = { __NR_seccomp_read, __NR_seccomp_write, __NR_seccomp_exit, __NR_seccomp_sigreturn, +#ifdef __NR_uretprobe + __NR_uretprobe, +#endif -1, /* negative terminated */ };
When attaching uretprobes to processes running inside docker, the attached process is segfaulted when encountering the retprobe. The reason is that now that uretprobe is a system call the default seccomp filters in docker block it as they only allow a specific set of known syscalls. This is true for other userspace applications which use seccomp to control their syscall surface. Since uretprobe is a "kernel implementation detail" system call which is not used by userspace application code directly, it is impractical and there's very little point in forcing all userspace applications to explicitly allow it in order to avoid crashing tracked processes. Pass this systemcall through seccomp without depending on configuration. Note: uretprobe isn't supported in i386 and __NR_ia32_rt_tgsigqueueinfo uses the same number as __NR_uretprobe so the syscall isn't forced in the compat bitmap. Fixes: ff474a78cef5 ("uprobe: Add uretprobe syscall to speed up return probe") Reported-by: Rafael Buchbinder <rafi@rbk.io> Link: https://lore.kernel.org/lkml/CAHsH6Gs3Eh8DFU0wq58c_LF8A4_+o6z456J7BidmcVY2AqOnHQ@mail.gmail.com/ Link: https://lore.kernel.org/lkml/20250121182939.33d05470@gandalf.local.home/T/#me2676c378eff2d6a33f3054fed4a5f3afa64e65b Cc: stable@vger.kernel.org Signed-off-by: Eyal Birger <eyal.birger@gmail.com> --- v2: use action_cache bitmap and mode1 array to check the syscall The following reproduction script synthetically demonstrates the problem for seccomp filters: cat > /tmp/x.c << EOF char *syscalls[] = { "write", "exit_group", "fstat", }; __attribute__((noinline)) int probed(void) { printf("Probed\n"); return 1; } void apply_seccomp_filter(char **syscalls, int num_syscalls) { scmp_filter_ctx ctx; ctx = seccomp_init(SCMP_ACT_KILL); for (int i = 0; i < num_syscalls; i++) { seccomp_rule_add(ctx, SCMP_ACT_ALLOW, seccomp_syscall_resolve_name(syscalls[i]), 0); } seccomp_load(ctx); seccomp_release(ctx); } int main(int argc, char *argv[]) { int num_syscalls = sizeof(syscalls) / sizeof(syscalls[0]); apply_seccomp_filter(syscalls, num_syscalls); probed(); return 0; } EOF cat > /tmp/trace.bt << EOF uretprobe:/tmp/x:probed { printf("ret=%d\n", retval); } EOF gcc -o /tmp/x /tmp/x.c -lseccomp /usr/bin/bpftrace /tmp/trace.bt & sleep 5 # wait for uretprobe attach /tmp/x pkill bpftrace rm /tmp/x /tmp/x.c /tmp/trace.bt --- kernel/seccomp.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)