Merge tag 'seccomp-v6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

torvalds · torvalds · commit 902d9fcd8dcc · 2023-02-21T11:04:56.000-08:00
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
diff --git 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)
 {

Original file line number	Diff line number	Diff line change
`@@ -388,6 +388,7 @@ static inline bool seccomp_cache_check_allow(const struct seccomp_filter *sfilte`
`388`	`388`	`}`
`389`	`389`	`#endif /* SECCOMP_ARCH_NATIVE */`
`390`	`390`
	`391`	`+#define ACTION_ONLY(ret) ((s32)((ret) & (SECCOMP_RET_ACTION_FULL)))`
`391`	`392`	`/**`
`392`	`393`	`* seccomp_run_filters - evaluates all seccomp filters against @sd`
`393`	`394`	`* @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`	`398`	`*`
`398`	`399`	`* Returns valid seccomp BPF response codes.`
`399`	`400`	`*/`
`400`		`-#define ACTION_ONLY(ret) ((s32)((ret) & (SECCOMP_RET_ACTION_FULL)))`
`401`	`401`	`static u32 seccomp_run_filters(const struct seccomp_data *sd,`
`402`	`402`	`struct seccomp_filter **match)`
`403`	`403`	`{`