Linux 2.6.27.53
Subsystems (13)
I'm announcing the release of the 2.6.27.54 kernel.
All users of the 2.6.27 kernel series must upgrade.
The updated 2.6.27.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.27.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.27.y.git;a=summarythanks,
greg k-h
------------
Makefile | 2 +- arch/ia64/include/asm/compat.h | 2 +- arch/powerpc/include/asm/compat.h | 2 +- arch/s390/include/asm/compat.h | 2 +- arch/sparc/include/asm/compat.h | 2 +- arch/x86/ia32/ia32entry.S | 22 ++++++++++++++-------- drivers/hwmon/f75375s.c | 6 +++--- drivers/net/wireless/ath9k/ath9k.h | 2 +- drivers/power/apm_power.c | 1 + include/asm-mips/compat.h | 2 +- include/asm-parisc/compat.h | 2 +- include/asm-x86/compat.h | 2 +- include/linux/compat.h | 2 ++ kernel/compat.c | 22 ++++++++++++++++++++++ kernel/trace/ftrace.c | 2 +- mm/bounce.c | 2 +- net/irda/irlan/irlan_common.c | 2 +- sound/core/seq/oss/seq_oss_init.c | 9 ++++----- 18 files changed, 58 insertions(+), 28 deletions(-)
Anton Vorontsov (1):
apm_power: Add missing break statement
Dan Carpenter (1):
irda: off by one
Gary King (1):
bounce: call flush_dcache_page() after bounce_copy_vec()
Greg Kroah-Hartman (1):
Linux 2.6.27.54
Guillem Jover (2):
hwmon: (f75375s) Shift control mode to the correct bit position
hwmon: (f75375s) Do not overwrite values read from registers
H. Peter Anvin (2):
x86-64, compat: Test %rax for the syscall number, not %eax
compat: Make compat_alloc_user_space() incorporate the access_ok()
Luis R. Rodriguez (1):
ath9k_hw: fix parsing of HT40 5 GHz CTLs
Roland McGrath (1):
x86-64, compat: Retruncate rax after ia32 syscall entry tracing
Steven Rostedt (1):
tracing: Do not allow llseek to set_ftrace_filter
Takashi Iwai (1):
ALSA: seq/oss - Fix double-free at error path of snd_seq_oss_open()
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 27 -EXTRAVERSION = .53 +EXTRAVERSION = .54 NAME = Trembling Tortoise # *DOCUMENTATION*
arch/ia64/include/asm/compat.h +1 -1
@@ -198,7 +198,7 @@ ptr_to_compat(void __user *uptr) }static __inline__void __user * -compat_alloc_user_space (long len) +arch_compat_alloc_user_space (long len) {struct pt_regs *regs =task_pt_regs (current);return (void __user *) (((regs->r12 &0xffffffff ) &-16 ) - len);
arch/powerpc/include/asm/compat.h +1 -1
@@ -133,7 +133,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr)return (u32 )(unsigned long )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 = current->thread.regs;unsigned long usp = regs->gpr[1 ];
arch/s390/include/asm/compat.h +1 -1
@@ -163,7 +163,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr)return (u32 )(unsigned long )uptr; } -static inline void __user *compat_alloc_user_space (long len) +static inline void __user *arch_compat_alloc_user_space (long len) {unsigned long stack;
arch/sparc/include/asm/compat.h +1 -1
@@ -166,7 +166,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr)return (u32 )(unsigned long )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 =current_thread_info ()->kregs;unsigned long usp = regs->u_regs[UREG_I6 ];
arch/x86/ia32/ia32entry.S +14 -8
@@ -50,7 +50,12 @@ /* * Reload arg registers from stack in case ptrace changed them. * We don't reload %eax because syscall_trace_enter() returned - * the value it wants us to use in the table lookup. + * the %rax value we should see. Instead, we just truncate that + * value to 32 bits again as we did on entry from user mode. + * If it's a new value set by user_regset during entry tracing, + * this matches the normal truncation of the user-mode value. + * If it's -1 to make us punt the syscall, then (u32)-1 is still + * an appropriately invalid value. */ .macro LOAD_ARGS32 offset, _r9=0 .if \_r9
@@ -60,6 +65,7 @@ movl \offset+48(%rsp),%edx movl \offset+56(%rsp),%esi movl \offset+64(%rsp),%edi + movl %eax,%eax /* zero extension */ .endm .macro CFI_STARTPROC32 simple
@@ -153,7 +159,7 @@ ENTRY(ia32_sysenter_target) testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10) CFI_REMEMBER_STATE jnz sysenter_tracesys - cmpl $(IA32_NR_syscalls-1),%eax + cmpq $(IA32_NR_syscalls-1),%rax ja ia32_badsys sysenter_do_call: IA32_ARG_FIXUP
@@ -195,7 +201,7 @@ sysexit_from_sys_call: movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */ call audit_syscall_entry movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */ - cmpl $(IA32_NR_syscalls-1),%eax + cmpq $(IA32_NR_syscalls-1),%rax ja ia32_badsys movl %ebx,%edi /* reload 1st syscall arg */ movl RCX-ARGOFFSET(%rsp),%esi /* reload 2nd syscall arg */
@@ -248,7 +254,7 @@ sysenter_tracesys: call syscall_trace_enter LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */ RESTORE_REST - cmpl $(IA32_NR_syscalls-1),%eax + cmpq $(IA32_NR_syscalls-1),%rax ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */ jmp sysenter_do_call CFI_ENDPROC
@@ -314,7 +320,7 @@ ENTRY(ia32_cstar_target) testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10) CFI_REMEMBER_STATE jnz cstar_tracesys - cmpl $IA32_NR_syscalls-1,%eax + cmpq $IA32_NR_syscalls-1,%rax ja ia32_badsys cstar_do_call: IA32_ARG_FIXUP 1
@@ -367,7 +373,7 @@ cstar_tracesys: LOAD_ARGS32 ARGOFFSET, 1 /* reload args from stack in case ptrace changed it */ RESTORE_REST xchgl %ebp,%r9d - cmpl $(IA32_NR_syscalls-1),%eax + cmpq $(IA32_NR_syscalls-1),%rax ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */ jmp cstar_do_call END(ia32_cstar_target)
@@ -425,7 +431,7 @@ ENTRY(ia32_syscall) orl $TS_COMPAT,TI_status(%r10) testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10) jnz ia32_tracesys - cmpl $(IA32_NR_syscalls-1),%eax + cmpq $(IA32_NR_syscalls-1),%rax ja ia32_badsys ia32_do_call: IA32_ARG_FIXUP
@@ -444,7 +450,7 @@ ia32_tracesys: call syscall_trace_enter LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */ RESTORE_REST - cmpl $(IA32_NR_syscalls-1),%eax + cmpq $(IA32_NR_syscalls-1),%rax ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */ jmp ia32_do_call END(ia32_syscall)
drivers/hwmon/f75375s.c +3 -3
@@ -79,7 +79,7 @@ I2C_CLIENT_INSMOD_2(f75373, f75375);#define F75375_REG_PWM2_DROP_DUTY 0x6C#define FAN_CTRL_LINEAR (nr) (4 + nr) -#define FAN_CTRL_MODE (nr) (5 + ((nr) * 2)) +#define FAN_CTRL_MODE (nr) (4 + ((nr) * 2))/* * Data structures and manipulation thereof
@@ -298,7 +298,7 @@ static int set_pwm_enable_direct(struct i2c_client *client, int nr, int val)return -EINVAL ; fanmode =f75375_read8 (client,F75375_REG_FAN_TIMER ); - fanmode = ~(3 <<FAN_CTRL_MODE (nr)); + fanmode &= ~(3 <<FAN_CTRL_MODE (nr));switch (val) {case 0 :/* Full speed */
@@ -350,7 +350,7 @@ static ssize_t set_pwm_mode(struct device *dev, struct device_attribute *attr,mutex_lock (&data->update_lock); conf =f75375_read8 (client,F75375_REG_CONFIG1 ); - conf = ~(1 <<FAN_CTRL_LINEAR (nr)); + conf &= ~(1 <<FAN_CTRL_LINEAR (nr));if (val ==0 ) conf |= (1 <<FAN_CTRL_LINEAR (nr)) ;
drivers/net/wireless/ath9k/ath9k.h +1 -1
@@ -554,7 +554,7 @@ enum ath9k_cipher {#define SD_NO_CTL 0xE0#define NO_CTL 0xff -#define CTL_MODE_M 7 +#define CTL_MODE_M 0xf#define CTL_11A 0#define CTL_11B 1#define CTL_11G 2
drivers/power/apm_power.c +1 -0
@@ -233,6 +233,7 @@ static int calculate_capacity(enum apm_source source) empty_design_prop =POWER_SUPPLY_PROP_ENERGY_EMPTY_DESIGN ; now_prop =POWER_SUPPLY_PROP_ENERGY_NOW ; avg_prop =POWER_SUPPLY_PROP_ENERGY_AVG ; +break ;case SOURCE_VOLTAGE : full_prop =POWER_SUPPLY_PROP_VOLTAGE_MAX ; empty_prop =POWER_SUPPLY_PROP_VOLTAGE_MIN ;
include/asm-mips/compat.h +1 -1
@@ -145,7 +145,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr)return (u32 )(unsigned long )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 = (struct pt_regs *) ((unsigned long )current_thread_info () +THREAD_SIZE -32 ) -1 ;
include/asm-parisc/compat.h +1 -1
@@ -146,7 +146,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr)return (u32 )(unsigned long )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 = ¤t->thread.regs;return (void __user *)regs->gr[30 ];
include/asm-x86/compat.h +1 -1
@@ -204,7 +204,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr)return (u32 )(unsigned long )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;
include/linux/compat.h +2 -0
@@ -291,5 +291,7 @@ asmlinkage long compat_sys_newfstatat(unsigned int dfd, char __user * filename,asmlinkage long compat_sys_openat (unsigned int dfd,const char __user *filename,int flags,int mode); +extern void __user *compat_alloc_user_space (unsigned long len); +#endif /* CONFIG_COMPAT */ #endif /* _LINUX_COMPAT_H */
kernel/compat.c +22 -0
@@ -23,6 +23,7 @@#include <linux/timex.h> #include <linux/migrate.h> #include <linux/posix-timers.h> +#include <linux/module.h> #include <asm/uaccess.h>
@@ -1081,3 +1082,24 @@ compat_sys_sysinfo(struct compat_sysinfo __user *info)return 0 ; } + +/* +* Allocate user-space memory for the duration of a single system call, +* in order to marshall parameters inside a compat thunk. +*/ +void __user *compat_alloc_user_space (unsigned long len) +{ +void __user *ptr; + +/* If len would occupy more than half of the entire compat space... */ +if (unlikely (len > (((compat_uptr_t )~0 ) >>1 ))) +return NULL ; + + ptr =arch_compat_alloc_user_space (len); + +if (unlikely (!access_ok (VERIFY_WRITE , ptr, len))) +return NULL ; + +return ptr; +} +EXPORT_SYMBOL_GPL (compat_alloc_user_space);
kernel/trace/ftrace.c +1 -1
@@ -1456,7 +1456,7 @@ static struct file_operations ftrace_filter_fops = { .open = ftrace_filter_open, .read = ftrace_regex_read, .write = ftrace_filter_write, - .llseek = ftrace_regex_lseek, + .llseek = no_llseek, .release = ftrace_filter_release, };
mm/bounce.c +1 -1
@@ -114,8 +114,8 @@ static void copy_to_high_bio_irq(struct bio *to, struct bio *from)*/ vfrom =page_address (fromvec->bv_page) + tovec->bv_offset; -flush_dcache_page (tovec->bv_page);bounce_copy_vec (tovec, vfrom); +flush_dcache_page (tovec->bv_page); } }
net/irda/irlan/irlan_common.c +1 -1
@@ -1100,7 +1100,7 @@ int irlan_extract_param(__u8 *buf, char *name, char *value, __u16 *len)memcpy (&val_len, buf+n,2 );/* To avoid alignment problems */ le16_to_cpus (&val_len); n+=2 ; -if (val_len >1016 ) { +if (val_len >=1016 ) {IRDA_DEBUG (2 ,"%s(), parameter length to long\n" , __func__ );return -RSP_INVALID_COMMAND_FORMAT ; }
sound/core/seq/oss/seq_oss_init.c +4 -5
@@ -280,13 +280,10 @@ snd_seq_oss_open(struct file *file, int level)return 0 ; _error: -snd_seq_oss_writeq_delete (dp->writeq); -snd_seq_oss_readq_delete (dp->readq);snd_seq_oss_synth_cleanup (dp);snd_seq_oss_midi_cleanup (dp); -delete_port (dp);delete_seq_queue (dp->queue); -kfree (dp); +delete_port (dp);return rc; }
@@ -349,8 +346,10 @@ create_port(struct seq_oss_devinfo *dp)static int delete_port (struct seq_oss_devinfo *dp) { -if (dp->port <0 ) +if (dp->port <0 ) { +kfree (dp);return 0 ; + }debug_printk (("delete_port %i\n" , dp->port));return snd_seq_event_port_detach (dp->cseq, dp->port);