diff options
author | Ingo Molnar <mingo@kernel.org> | 2020-01-06 07:51:15 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2020-01-06 07:51:15 +0100 |
commit | 31c7ac388aa905a196ee16dff2015111f701f035 (patch) | |
tree | 09a43dde7fbf30ce57eaf5ba7ebda84da961538d /kernel/seccomp.c | |
parent | 28336be568bb473d16ba80db0801276fb4f1bbe5 (diff) | |
parent | c79f46a282390e0f5b306007bf7b11a46d529538 (diff) |
Merge tag 'v5.5-rc5' into locking/kcsan, to resolve conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/seccomp.c')
-rw-r--r-- | kernel/seccomp.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/seccomp.c b/kernel/seccomp.c index 12d2227e5786..b6ea3dcb57bf 100644 --- a/kernel/seccomp.c +++ b/kernel/seccomp.c @@ -1026,6 +1026,13 @@ static long seccomp_notify_recv(struct seccomp_filter *filter, struct seccomp_notif unotif; ssize_t ret; + /* Verify that we're not given garbage to keep struct extensible. */ + ret = check_zeroed_user(buf, sizeof(unotif)); + if (ret < 0) + return ret; + if (!ret) + return -EINVAL; + memset(&unotif, 0, sizeof(unotif)); ret = down_interruptible(&filter->notif->request); |