Commit 902d9fcd authored by Linus Torvalds's avatar Linus Torvalds

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
parents 8cc01d43 0fb0624b
...@@ -388,6 +388,7 @@ static inline bool seccomp_cache_check_allow(const struct seccomp_filter *sfilte ...@@ -388,6 +388,7 @@ static inline bool seccomp_cache_check_allow(const struct seccomp_filter *sfilte
} }
#endif /* SECCOMP_ARCH_NATIVE */ #endif /* SECCOMP_ARCH_NATIVE */
#define ACTION_ONLY(ret) ((s32)((ret) & (SECCOMP_RET_ACTION_FULL)))
/** /**
* seccomp_run_filters - evaluates all seccomp filters against @sd * seccomp_run_filters - evaluates all seccomp filters against @sd
* @sd: optional seccomp data to be passed to filters * @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 ...@@ -397,7 +398,6 @@ static inline bool seccomp_cache_check_allow(const struct seccomp_filter *sfilte
* *
* Returns valid seccomp BPF response codes. * 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, static u32 seccomp_run_filters(const struct seccomp_data *sd,
struct seccomp_filter **match) struct seccomp_filter **match)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment