2023-10-17 08:31:04

by Jiri Slaby

Subject: [PATCH] perf/benchmark: fix seccom_unotify benchmark for 32-bit

Commit 7d5cb68af638 (perf/benchmark: add a new benchmark for
seccom_unotify) added a reference to __NR_seccomp into perf. This is
fine as it added also a definition of __NR_seccomp for 64-bit. But it
failed to do so for 32-bit as instead of ifndef, ifdef was used.

Fix this typo (so fix the build of perf on 32-bit).

Fixes: 7d5cb68af638 (perf/benchmark: add a new benchmark for seccom_unotify)
Cc: Andrei Vagin <[email protected]>
Cc: "Peter Zijlstra (Intel)" <[email protected]>
Cc: Kees Cook <[email protected]>
Signed-off-by: Jiri Slaby (SUSE) <[email protected]>
---
tools/arch/x86/include/uapi/asm/unistd_32.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/arch/x86/include/uapi/asm/unistd_32.h b/tools/arch/x86/include/uapi/asm/unistd_32.h
index 4798f9d18fe8..9de35df1afc3 100644
--- a/tools/arch/x86/include/uapi/asm/unistd_32.h
+++ b/tools/arch/x86/include/uapi/asm/unistd_32.h
@@ -26,6 +26,6 @@
#ifndef __NR_setns
#define __NR_setns 346
#endif
-#ifdef __NR_seccomp
+#ifndef __NR_seccomp
#define __NR_seccomp 354
#endif
--
2.42.0

2023-10-17 16:51:37

by Kees Cook

Subject: Re: [PATCH] perf/benchmark: fix seccom_unotify benchmark for 32-bit

On Tue, 17 Oct 2023 10:30:19 +0200, Jiri Slaby (SUSE) wrote:
> Commit 7d5cb68af638 (perf/benchmark: add a new benchmark for
> seccom_unotify) added a reference to __NR_seccomp into perf. This is
> fine as it added also a definition of __NR_seccomp for 64-bit. But it
> failed to do so for 32-bit as instead of ifndef, ifdef was used.
>
> Fix this typo (so fix the build of perf on 32-bit).
>
> [...]

Applied to for-linus/seccomp, thanks!

[1/1] perf/benchmark: fix seccom_unotify benchmark for 32-bit
https://git.kernel.org/kees/c/65159865e69e

Take care,

--
Kees Cook