lkml.org 
[lkml]   [2016]   [Mar]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19.y-ckt 035/196] MIPS: Fix buffer overflow in syscall_get_arguments()
    Date
    3.19.8-ckt16 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: James Hogan <james.hogan@imgtec.com>

    commit f4dce1ffd2e30fa31756876ef502ce6d2324be35 upstream.

    Since commit 4c21b8fd8f14 ("MIPS: seccomp: Handle indirect system calls
    (o32)"), syscall_get_arguments() attempts to handle o32 indirect syscall
    arguments by incrementing both the start argument number and the number
    of arguments to fetch. However only the start argument number needs to
    be incremented. The number of arguments does not change, they're just
    shifted up by one, and in fact the output array is provided by the
    caller and is likely only n entries long, so reading more arguments
    overflows the output buffer.

    In the case of seccomp, this results in it fetching 7 arguments starting
    at the 2nd one, which overflows the unsigned long args[6] in
    populate_seccomp_data(). This clobbers the $s0 register from
    syscall_trace_enter() which __seccomp_phase1_filter() saved onto the
    stack, into which syscall_trace_enter() had placed its syscall number
    argument. This caused Chromium to crash.

    Credit goes to Milko for tracking it down as far as $s0 being clobbered.

    Fixes: 4c21b8fd8f14 ("MIPS: seccomp: Handle indirect system calls (o32)")
    Reported-by: Milko Leporis <milko.leporis@imgtec.com>
    Signed-off-by: James Hogan <james.hogan@imgtec.com>
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/12213/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    arch/mips/include/asm/syscall.h | 4 +---
    1 file changed, 1 insertion(+), 3 deletions(-)

    diff --git a/arch/mips/include/asm/syscall.h b/arch/mips/include/asm/syscall.h
    index 6499d93..47bc45a 100644
    --- a/arch/mips/include/asm/syscall.h
    +++ b/arch/mips/include/asm/syscall.h
    @@ -101,10 +101,8 @@ static inline void syscall_get_arguments(struct task_struct *task,
    /* O32 ABI syscall() - Either 64-bit with O32 or 32-bit */
    if ((config_enabled(CONFIG_32BIT) ||
    test_tsk_thread_flag(task, TIF_32BIT_REGS)) &&
    - (regs->regs[2] == __NR_syscall)) {
    + (regs->regs[2] == __NR_syscall))
    i++;
    - n++;
    - }

    while (n--)
    ret |= mips_get_syscall_arg(args++, task, regs, i++);
    --
    2.7.0
    \
     
     \ /
      Last update: 2016-03-09 02:41    [W:4.130 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site