diff options
| author | Christian Brauner <christian.brauner@ubuntu.com> | 2019-10-24 23:25:39 +0200 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2019-10-28 20:29:46 +0100 |
| commit | 23b2c96fad21886c53f5e1a4ffedd45ddd2e85ba (patch) | |
| tree | 955198c930f1c6e6592b0a1933e034a412ae59ae /include/uapi | |
| parent | seccomp: fix SECCOMP_USER_NOTIF_FLAG_CONTINUE test (diff) | |
| download | linux-23b2c96fad21886c53f5e1a4ffedd45ddd2e85ba.tar.xz linux-23b2c96fad21886c53f5e1a4ffedd45ddd2e85ba.zip | |
seccomp: rework define for SECCOMP_USER_NOTIF_FLAG_CONTINUE
Switch from BIT(0) to (1UL << 0).
First, there are already two different forms used in the header, so there's
no need to add a third. Second, the BIT() macros is kernel internal and
afaict not actually exposed to userspace. Maybe there's some magic there
I'm missing but it definitely causes issues when compiling a program that
tries to use SECCOMP_USER_NOTIF_FLAG_CONTINUE. It currently fails in the
following way:
# github.com/lxc/lxd/lxd
/usr/bin/ld: $WORK/b001/_x003.o: in function
`__do_user_notification_continue':
lxd/main_checkfeature.go:240: undefined reference to `BIT'
collect2: error: ld returned 1 exit status
Switching to (1UL << 0) should prevent that and is more in line what is
already done in the rest of the header.
Cc: Kees Cook <keescook@chromium.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Link: https://lore.kernel.org/r/20191024212539.4059-1-christian.brauner@ubuntu.com
Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/seccomp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/seccomp.h b/include/uapi/linux/seccomp.h index e48e2fa2d248..be84d87f1f46 100644 --- a/include/uapi/linux/seccomp.h +++ b/include/uapi/linux/seccomp.h @@ -103,7 +103,7 @@ struct seccomp_notif { * SECCOMP_USER_NOTIF_FLAG_CONTINUE. Note that SECCOMP_RET_TRACE can equally * be overriden by SECCOMP_USER_NOTIF_FLAG_CONTINUE. */ -#define SECCOMP_USER_NOTIF_FLAG_CONTINUE BIT(0) +#define SECCOMP_USER_NOTIF_FLAG_CONTINUE (1UL << 0) struct seccomp_notif_resp { __u64 id; |