Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/kernel26-magellan/patches-2.6.35-r3/0301-2.6.35-CVE-2010-3301.patch

    Diff of /trunk/kernel26-magellan/patches-2.6.35-r3/0301-2.6.35-CVE-2010-3301.patch

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 1136 by niro, Sat Sep 18 11:01:49 2010 UTC revision 1137 by niro, Mon Sep 20 07:44:10 2010 UTC
    # Line 46  Cc: <stable@kernel.org> Line 46  Cc: <stable@kernel.org>
    46   arch/powerpc/include/asm/compat.h |    2 +-   arch/powerpc/include/asm/compat.h |    2 +-
    47   arch/s390/include/asm/compat.h    |    2 +-   arch/s390/include/asm/compat.h    |    2 +-
    48   arch/sparc/include/asm/compat.h   |    2 +-   arch/sparc/include/asm/compat.h   |    2 +-
      arch/tile/include/asm/compat.h    |    2 +-  
    49   arch/x86/include/asm/compat.h     |    2 +-   arch/x86/include/asm/compat.h     |    2 +-
    50   include/linux/compat.h            |    3 +++   include/linux/compat.h            |    3 +++
    51   kernel/compat.c                   |   21 +++++++++++++++++++++   kernel/compat.c                   |   21 +++++++++++++++++++++
    # Line 130  index 5016f76..6f57325 100644 Line 129  index 5016f76..6f57325 100644
    129   {   {
    130   struct pt_regs *regs = current_thread_info()->kregs;   struct pt_regs *regs = current_thread_info()->kregs;
    131   unsigned long usp = regs->u_regs[UREG_I6];   unsigned long usp = regs->u_regs[UREG_I6];
     diff --git a/arch/tile/include/asm/compat.h b/arch/tile/include/asm/compat.h  
     index 5a34da6..345d81c 100644  
     --- a/arch/tile/include/asm/compat.h  
     +++ b/arch/tile/include/asm/compat.h  
     @@ -195,7 +195,7 @@ static inline unsigned long ptr_to_compat_reg(void __user *uptr)  
      return (long)(int)(long __force)uptr;  
      }  
       
     -static inline void __user *compat_alloc_user_space(long len)  
     +static inline void __user *arch_compat_alloc_user_space(long len)  
      {  
      struct pt_regs *regs = task_pt_regs(current);  
      return (void __user *)regs->sp - len;  
    132  diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h  diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
    133  index 306160e..1d9cd27 100644  index 306160e..1d9cd27 100644
    134  --- a/arch/x86/include/asm/compat.h  --- a/arch/x86/include/asm/compat.h
    Legend:
    Removed from v.1136  
    changed lines
      Added in v.1137