Linux 2.6.25.9
Subsystems (12)
We (the -stable team) are announcing the release of the 2.6.25.9 kernel.
It contains a number of assorted bugfixes all over the tree. Any users of the 2.6.25 kernel series are STRONGLY encouraged to upgrade!
I'll also be replying to this message with a copy of the patch between 2.6.25.8 and 2.6.25.9
The updated 2.6.25.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.25.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.25.y.git;a=summarythanks,
greg k-h
--------
Makefile | 2 arch/powerpc/kernel/vdso.c | 2 arch/x86/kernel/setup_32.c | 10 ++ drivers/hwmon/adt7473.c | 3 drivers/hwmon/lm85.c | 2 drivers/net/atl1/atl1_hw.c | 1 drivers/watchdog/hpwdt.c | 154 +++++++++++++++++++++++---------------------- include/asm-x86/page_32.h | 3 include/linux/bootmem.h | 2 mm/bootmem.c | 4 - mm/memory.c | 41 +++++++++-- mm/migrate.c | 10 ++ net/sctp/socket.c | 4 - 13 files changed, 145 insertions(+), 93 deletions(-)
Bernhard Walle (2):
Add return value to reserve_bootmem_node()
x86: use BOOTMEM_EXCLUSIVE on 32-bit
David S. Miller (1):
sctp: Make sure N * sizeof(union sctp_addr) does not overflow.
Greg Kroah-Hartman (1):
Linux 2.6.25.9
Jean Delvare (2):
hwmon: (lm85) Fix function RANGE_TO_REG()
hwmon: (adt7473) Initialize max_duty_at_overheat before use
Jeremy Fitzhardinge (1):
x86: set PAE PHYSICAL_MASK_SHIFT to 44 bits.
Linus Torvalds (3):
Reinstate ZERO_PAGE optimization in 'get_user_pages()' and fix XIP
watchdog: hpwdt: fix use of inline assembly
Fix ZERO_PAGE breakage with vmware
Radu Cristescu (1):
atl1: relax eeprom mac address error check
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 25 -EXTRAVERSION = .8 +EXTRAVERSION = .9 NAME = Funky Weasel is Jiggy wit it # *DOCUMENTATION*
arch/powerpc/kernel/vdso.c +1 -1
@@ -141,7 +141,7 @@ static void dump_one_vdso_page(struct page *pg, struct page *upg)printk ("kpg: %p (c:%d,f:%08lx)" ,__va (page_to_pfn (pg) <<PAGE_SHIFT ),page_count (pg), pg->flags); -if (upg/* && pg != upg*/ ) { +if (upg && !IS_ERR (upg)/* && pg != upg*/ ) { printk(" upg: %p (c:%d,f:%08lx)", __va(page_to_pfn(upg) << PAGE_SHIFT), page_count(upg),
arch/x86/kernel/setup_32.c +8 -2
@@ -483,10 +483,16 @@ static void __init reserve_crashkernel(void) (unsigned long )(crash_size >>20 ), (unsigned long )(crash_base >>20 ), (unsigned long)(total_mem >> 20)); + +if (reserve_bootmem (crash_base, crash_size, +BOOTMEM_EXCLUSIVE ) <0 ) { +printk (KERN_INFO "crashkernel reservation " +"failed - memory is in use\n" ); +return ; + } + crashk_res.start = crash_base; crashk_res.end = crash_base + crash_size -1 ; -reserve_bootmem (crash_base, crash_size, -BOOTMEM_DEFAULT ); }else printk (KERN_INFO "crashkernel reservation failed - " "you have to specify a base address\n" );
drivers/hwmon/adt7473.c +3 -0
@@ -309,6 +309,9 @@ no_sensor_update: ADT7473_REG_PWM_BHVR(i)); } + i =i2c_smbus_read_byte_data (client,ADT7473_REG_CFG4 ); + data->max_duty_at_overheat = !!(i &ADT7473_CFG4_MAX_DUTY_AT_OVT ); + data->limits_last_updated = local_jiffies; data->limits_valid =1 ;
drivers/hwmon/lm85.c +1 -1
@@ -192,7 +192,7 @@ static int RANGE_TO_REG( int range ) {int i; -if ( range < lm85_range_map[0 ] ) { +if (range <= lm85_range_map[0 ]) {return 0 ; }else if ( range > lm85_range_map[15 ] ) {return 15 ;
drivers/net/atl1/atl1_hw.c +0 -1
@@ -250,7 +250,6 @@ static int atl1_get_permanent_address(struct atl1_hw *hw)memcpy (hw->perm_mac_addr, eth_addr,ETH_ALEN );return 0 ; } -return 1 ; }/* see if SPI FLAGS exist ? */
drivers/watchdog/hpwdt.c +79 -75
171 lines not on this page · raw message
include/asm-x86/page_32.h +2 -1
@@ -14,7 +14,8 @@#define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL)#ifdef CONFIG_X86_PAE -#define __PHYSICAL_MASK_SHIFT 36 +/* 44=32+12, the limit we can fit into an unsigned long pfn */ +#define __PHYSICAL_MASK_SHIFT 44#define __VIRTUAL_MASK_SHIFT 32#define PAGETABLE_LEVELS 3
include/linux/bootmem.h +1 -1
@@ -94,7 +94,7 @@ extern unsigned long init_bootmem_node(pg_data_t *pgdat,unsigned long freepfn, unsigned long startpfn, unsigned long endpfn); -extern void reserve_bootmem_node (pg_data_t *pgdat, +extern int reserve_bootmem_node (pg_data_t *pgdat,unsigned long physaddr,unsigned long size,int flags);
mm/bootmem.c +2 -2
@@ -398,10 +398,10 @@ unsigned long __init init_bootmem_node(pg_data_t *pgdat, unsigned long freepfn,return init_bootmem_core (pgdat, freepfn, startpfn, endpfn); } -void __init reserve_bootmem_node (pg_data_t *pgdat,unsigned long physaddr, +int __init reserve_bootmem_node (pg_data_t *pgdat,unsigned long physaddr,unsigned long size,int flags) { -reserve_bootmem_core (pgdat->bdata, physaddr, size, flags); +return reserve_bootmem_core (pgdat->bdata, physaddr, size, flags); } void __init free_bootmem_node(pg_data_t *pgdat, unsigned long physaddr,
mm/memory.c +34 -7
78 lines not on this page · raw message
mm/migrate.c +10 -0
@@ -858,6 +858,11 @@ static int do_move_pages(struct mm_struct *mm, struct page_to_node *pm, goto set_status; page =follow_page (vma, pp->addr,FOLL_GET ); + + err =PTR_ERR (page); +if (IS_ERR (page)) + goto set_status; + err = -ENOENT ;if (!page) goto set_status;
@@ -921,6 +926,11 @@ static int do_pages_stat(struct mm_struct *mm, struct page_to_node *pm) goto set_status; page =follow_page (vma, pm->addr,0 ); + + err =PTR_ERR (page); +if (IS_ERR (page)) + goto set_status; + err = -ENOENT ;/* Use PageReserved to check for zero page */ if (!page ||PageReserved (page))
net/sctp/socket.c +3 -1
@@ -4421,7 +4421,9 @@ static int sctp_getsockopt_local_addrs_old(struct sock *sk, int len,if (copy_from_user (&getaddrs, optval, len))return -EFAULT ; -if (getaddrs.addr_num <=0 )return -EINVAL ; +if (getaddrs.addr_num <=0 || + getaddrs.addr_num >= (INT_MAX /sizeof (union sctp_addr ))) +return -EINVAL ;/* * For UDP-style sockets, id specifies the association to query. * If the id field is set to the value '0' then the locally bound