| Message ID | 20190918084833.9369-4-christian.brauner@ubuntu.com |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
| Series | seccomp: continue syscall from notifier | expand |
On 2019-09-18 10:48:32, Christian Brauner wrote: > USER_NOTIF_MAGIC is assigned to int variables in this test so set it to INT_MAX > to avoid warnings: > > seccomp_bpf.c: In function ‘user_notification_continue’: > seccomp_bpf.c:3088:26: warning: overflow in implicit constant conversion [-Woverflow] > #define USER_NOTIF_MAGIC 116983961184613L > ^ > seccomp_bpf.c:3572:15: note: in expansion of macro ‘USER_NOTIF_MAGIC’ > resp.error = USER_NOTIF_MAGIC; > ^~~~~~~~~~~~~~~~ > > Fixes: 6a21cc50f0c7 ("seccomp: add a return code to trap to userspace") > Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com> > Cc: Kees Cook <keescook@chromium.org> > Cc: Andy Lutomirski <luto@amacapital.net> > Cc: Will Drewry <wad@chromium.org> > Cc: Shuah Khan <shuah@kernel.org> > Cc: Alexei Starovoitov <ast@kernel.org> > Cc: Daniel Borkmann <daniel@iogearbox.net> > Cc: Martin KaFai Lau <kafai@fb.com> > Cc: Song Liu <songliubraving@fb.com> > Cc: Yonghong Song <yhs@fb.com> > Cc: Tycho Andersen <tycho@tycho.ws> > CC: Tyler Hicks <tyhicks@canonical.com> INT_MAX should be a safe value to use. Reviewed-by: Tyler Hicks <tyhicks@canonical.com> Tyler > Cc: Jann Horn <jannh@google.com> > Cc: stable@vger.kernel.org > Cc: linux-kselftest@vger.kernel.org > Cc: netdev@vger.kernel.org > Cc: bpf@vger.kernel.org > --- > tools/testing/selftests/seccomp/seccomp_bpf.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c > index ee52eab01800..921f0e26f835 100644 > --- a/tools/testing/selftests/seccomp/seccomp_bpf.c > +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c > @@ -35,6 +35,7 @@ > #include <stdbool.h> > #include <string.h> > #include <time.h> > +#include <limits.h> > #include <linux/elf.h> > #include <sys/uio.h> > #include <sys/utsname.h> > @@ -3080,7 +3081,7 @@ static int user_trap_syscall(int nr, unsigned int flags) > return seccomp(SECCOMP_SET_MODE_FILTER, flags, &prog); > } > > -#define USER_NOTIF_MAGIC 116983961184613L > +#define USER_NOTIF_MAGIC INT_MAX > TEST(user_notification_basic) > { > pid_t pid; > -- > 2.23.0 >
diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c index ee52eab01800..921f0e26f835 100644 --- a/tools/testing/selftests/seccomp/seccomp_bpf.c +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c @@ -35,6 +35,7 @@ #include <stdbool.h> #include <string.h> #include <time.h> +#include <limits.h> #include <linux/elf.h> #include <sys/uio.h> #include <sys/utsname.h> @@ -3080,7 +3081,7 @@ static int user_trap_syscall(int nr, unsigned int flags) return seccomp(SECCOMP_SET_MODE_FILTER, flags, &prog); } -#define USER_NOTIF_MAGIC 116983961184613L +#define USER_NOTIF_MAGIC INT_MAX TEST(user_notification_basic) { pid_t pid;
USER_NOTIF_MAGIC is assigned to int variables in this test so set it to INT_MAX to avoid warnings: seccomp_bpf.c: In function ‘user_notification_continue’: seccomp_bpf.c:3088:26: warning: overflow in implicit constant conversion [-Woverflow] #define USER_NOTIF_MAGIC 116983961184613L ^ seccomp_bpf.c:3572:15: note: in expansion of macro ‘USER_NOTIF_MAGIC’ resp.error = USER_NOTIF_MAGIC; ^~~~~~~~~~~~~~~~ Fixes: 6a21cc50f0c7 ("seccomp: add a return code to trap to userspace") Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com> Cc: Kees Cook <keescook@chromium.org> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Will Drewry <wad@chromium.org> Cc: Shuah Khan <shuah@kernel.org> Cc: Alexei Starovoitov <ast@kernel.org> Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: Martin KaFai Lau <kafai@fb.com> Cc: Song Liu <songliubraving@fb.com> Cc: Yonghong Song <yhs@fb.com> Cc: Tycho Andersen <tycho@tycho.ws> CC: Tyler Hicks <tyhicks@canonical.com> Cc: Jann Horn <jannh@google.com> Cc: stable@vger.kernel.org Cc: linux-kselftest@vger.kernel.org Cc: netdev@vger.kernel.org Cc: bpf@vger.kernel.org --- tools/testing/selftests/seccomp/seccomp_bpf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)