Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions kernel/bpf/bpf_lsm.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ BTF_ID(func, bpf_lsm_key_getsecurity)
BTF_ID(func, bpf_lsm_audit_rule_match)
#endif
BTF_ID(func, bpf_lsm_ismaclabel)
BTF_ID(func, bpf_lsm_file_alloc_security)
BTF_SET_END(bpf_lsm_disabled_hooks)

/* List of LSM hooks that should operate on 'current' cgroup regardless
Expand Down
2 changes: 1 addition & 1 deletion tools/testing/selftests/bpf/prog_tests/test_lsm.c
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ static void test_lsm_tailcall(void)
if (CHECK_FAIL(!err))
goto close_prog;

prog_fd = bpf_program__fd(skel->progs.lsm_file_alloc_security_prog);
prog_fd = bpf_program__fd(skel->progs.lsm_kernfs_init_security_prog);
if (CHECK_FAIL(prog_fd < 0))
goto close_prog;

Expand Down
8 changes: 4 additions & 4 deletions tools/testing/selftests/bpf/progs/lsm_tailcall.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ int lsm_file_permission_prog(void *ctx)
return 0;
}

SEC("lsm/file_alloc_security")
int lsm_file_alloc_security_prog(void *ctx)
SEC("lsm/kernfs_init_security")
int lsm_kernfs_init_security_prog(void *ctx)
{
return 0;
}

SEC("lsm/file_alloc_security")
int lsm_file_alloc_security_entry(void *ctx)
SEC("lsm/kernfs_init_security")
int lsm_kernfs_init_security_entry(void *ctx)
{
bpf_tail_call_static(ctx, &jmp_table, 0);
return 0;
Expand Down
4 changes: 2 additions & 2 deletions tools/testing/selftests/bpf/progs/verifier_lsm.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <bpf/bpf_helpers.h>
#include "bpf_misc.h"

SEC("lsm/file_alloc_security")
SEC("lsm/file_permission")
__description("lsm bpf prog with -4095~0 retval. test 1")
__success
__naked int errno_zero_retval_test1(void *ctx)
Expand All @@ -15,7 +15,7 @@ __naked int errno_zero_retval_test1(void *ctx)
::: __clobber_all);
}

SEC("lsm/file_alloc_security")
SEC("lsm/file_permission")
__description("lsm bpf prog with -4095~0 retval. test 2")
__success
__naked int errno_zero_retval_test2(void *ctx)
Expand Down
Loading