The patch titled
Subject: seccomp: cap SECCOMP_RET_ERRNO data to MAX_ERRNO
has been removed from the -mm tree. Its filename was
seccomp-cap-seccomp_ret_errno-data-to-max_errno.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Kees Cook <keescook@xxxxxxxxxxxx>
Subject: seccomp: cap SECCOMP_RET_ERRNO data to MAX_ERRNO
The value resulting from the SECCOMP_RET_DATA mask could exceed MAX_ERRNO
when setting errno during a SECCOMP_RET_ERRNO filter action. This makes
sure we have a reliable value being set, so that an invalid errno will not
be ignored by userspace.
Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
Reported-by: Dmitry V. Levin <ldv@xxxxxxxxxxxx>
Cc: Andy Lutomirski <luto@xxxxxxxxxxxxxx>
Cc: Will Drewry <wad@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/seccomp.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff -puN kernel/seccomp.c~seccomp-cap-seccomp_ret_errno-data-to-max_errno kernel/seccomp.c
--- a/kernel/seccomp.c~seccomp-cap-seccomp_ret_errno-data-to-max_errno
+++ a/kernel/seccomp.c
@@ -629,7 +629,9 @@ static u32 __seccomp_phase1_filter(int t
switch (action) {
case SECCOMP_RET_ERRNO:
- /* Set the low-order 16-bits as a errno. */
+ /* Set low-order bits as an errno, capped at MAX_ERRNO. */
+ if (data > MAX_ERRNO)
+ data = MAX_ERRNO;
syscall_set_return_value(current, task_pt_regs(current),
-data, 0);
goto skip;
_
Patches currently in -mm which might be from keescook@xxxxxxxxxxxx are
origin.patch
aslr-fix-stack-randomization-on-64-bit-systems.patch
lib-vsprintf-add-%pt-format-specifier.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
