diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-21 11:04:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-21 11:04:56 -0800 |
| commit | 902d9fcd8dccf6a5ccd009f2ae8fec5b3db7f41b (patch) | |
| tree | cdbc62dfbf41589e8282af735a5670f78b13f20b | |
| parent | 8cc01d43f882fa1f44d8aa6727a6ea783d8fbe3f (diff) | |
| parent | 0fb0624b15d21622c214617fda5c05a203b04564 (diff) | |
| download | linux-902d9fcd8dccf6a5ccd009f2ae8fec5b3db7f41b.tar.gz | |
Merge tag 'seccomp-v6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull seccomp update from Kees Cook:
- Fix kernel-doc function name ordering to avoid warning (Randy Dunlap)
* tag 'seccomp-v6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
seccomp: fix kernel-doc function name warning
| -rw-r--r-- | kernel/seccomp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/seccomp.c b/kernel/seccomp.c index e9852d1b4a5ec7..cebf26445f9e7c 100644 --- a/kernel/seccomp.c +++ b/kernel/seccomp.c @@ -388,6 +388,7 @@ static inline bool seccomp_cache_check_allow(const struct seccomp_filter *sfilte } #endif /* SECCOMP_ARCH_NATIVE */ +#define ACTION_ONLY(ret) ((s32)((ret) & (SECCOMP_RET_ACTION_FULL))) /** * seccomp_run_filters - evaluates all seccomp filters against @sd * @sd: optional seccomp data to be passed to filters @@ -397,7 +398,6 @@ static inline bool seccomp_cache_check_allow(const struct seccomp_filter *sfilte * * Returns valid seccomp BPF response codes. */ -#define ACTION_ONLY(ret) ((s32)((ret) & (SECCOMP_RET_ACTION_FULL))) static u32 seccomp_run_filters(const struct seccomp_data *sd, struct seccomp_filter **match) { |