| From 6e447cd2e35351f535db1b9babd0b27635897fe1 Mon Sep 17 00:00:00 2001 |
| From: Sargun Dhillon <sargun@sargun.me> |
| Date: Sat, 28 Dec 2019 22:24:49 -0800 |
| Subject: [PATCH] selftests/seccomp: Zero out seccomp_notif |
| |
| commit 88c13f8bd71472fbab5338b01d99122908c77e53 upstream. |
| |
| The seccomp_notif structure should be zeroed out prior to calling the |
| SECCOMP_IOCTL_NOTIF_RECV ioctl. Previously, the kernel did not check |
| whether these structures were zeroed out or not, so these worked. |
| |
| This patch zeroes out the seccomp_notif data structure prior to calling |
| the ioctl. |
| |
| Signed-off-by: Sargun Dhillon <sargun@sargun.me> |
| Reviewed-by: Tycho Andersen <tycho@tycho.ws> |
| Reviewed-by: Christian Brauner <christian.brauner@ubuntu.com> |
| Link: https://lore.kernel.org/r/20191229062451.9467-1-sargun@sargun.me |
| Fixes: 6a21cc50f0c7 ("seccomp: add a return code to trap to userspace") |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Kees Cook <keescook@chromium.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c |
| index f29d50097625..e028551e79fa 100644 |
| --- a/tools/testing/selftests/seccomp/seccomp_bpf.c |
| +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c |
| @@ -3262,6 +3262,7 @@ TEST(user_notification_signal) |
| |
| close(sk_pair[1]); |
| |
| + memset(&req, 0, sizeof(req)); |
| EXPECT_EQ(ioctl(listener, SECCOMP_IOCTL_NOTIF_RECV, &req), 0); |
| |
| EXPECT_EQ(kill(pid, SIGUSR1), 0); |
| @@ -3280,6 +3281,7 @@ TEST(user_notification_signal) |
| EXPECT_EQ(ioctl(listener, SECCOMP_IOCTL_NOTIF_SEND, &resp), -1); |
| EXPECT_EQ(errno, ENOENT); |
| |
| + memset(&req, 0, sizeof(req)); |
| EXPECT_EQ(ioctl(listener, SECCOMP_IOCTL_NOTIF_RECV, &req), 0); |
| |
| resp.id = req.id; |
| -- |
| 2.7.4 |
| |
