seccomp: cap SECCOMP_RET_ERRNO data to MAX_ERRNO
PATCH 1/1 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.
Reported-by Dmitry V. Levin <[email protected]>
Signed-off-by Kees Cook <[email protected]>
--- kernel/seccomp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/seccomp.c +3 -1
@@ -629,7 +629,9 @@ static u32 __seccomp_phase1_filter(int this_syscall, struct seccomp_data *sd)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;
Signature · 6 lines
1.9.1 -- Kees Cook Chrome OS Security
Quoted 4 lines · Kees Cook
The value resulting from the
SECCOMP_RET_DATAmask could exceedMAX_ERRNOwhen setting errno during aSECCOMP_RET_ERRNOfilter action. This makes sure we have a reliable value being set, so that an invalid errno will not be ignored by userspace.
Acked-by Dmitry V. Levin <[email protected]>
Signature · 1 line
ldv