Linux 2.6.25.20
Subsystems (15)
We (the -stable team) are announcing the release of the 2.6.25.20 kernel.
It is the last release of the 2.6.25.y tree that I have planned to do. the .25 tree has lasted a very long time (in the overall -stable timeframe), and it's lifetime is pretty much over. All users using the 2.6.25.y tree are strongly encouraged to upgrade to this version, and then consider how they are going to upgrade to the latest 2.6.27 version soon.
I'll also be replying to this message with a copy of the patch between 2.6.25.19 and 2.6.25.20
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/sparc64/kernel/trampoline.S | 18 ++- drivers/acpi/dock.c | 5 - drivers/acpi/video.c | 123 ++++++++++++++----------- drivers/edac/cell_edac.c | 2 drivers/gpio/gpiolib.c | 2 drivers/net/wireless/libertas/scan.c | 4 fs/ext2/dir.c | 60 +++++++----- fs/ext3/dir.c | 10 +- fs/ext4/dir.c | 11 +- include/linux/sched.h | 2 include/math-emu/op-common.h | 17 ++- include/net/scm.h | 5 - net/core/dev.c | 27 +---- net/core/rtnetlink.c | 2 net/core/scm.c | 24 ++++ net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 2 net/ipv4/netfilter/nf_nat_snmp_basic.c | 1 net/ipv6/tcp_ipv6.c | 2 net/netfilter/xt_iprange.c | 8 - security/commoncap.c | 6 - sound/core/control.c | 4 22 files changed, 205 insertions(+), 132 deletions(-)
Alexey Dobriyan (1):
netfilter: xt_iprange: fix range inversion match
Andrea Shepard (1):
sparc64: Fix race in arch/sparc64/kernel/trampoline.S
Benjamin Herrenschmidt (1):
edac cell: fix incorrect edac_mode
David Brownell (1):
gpiolib: fix oops in gpio_get_value_cansleep()
David Miller (1):
net: Fix recursive descent in __scm_destroy().
Eric Sandeen (1):
ext[234]: Avoid printk floods in the face of directory corruption (CVE-2008-3528)
Greg Kroah-Hartman (1):
Linux 2.6.25.20
Herbert Xu (1):
net: Fix netdev_run_todo dead-lock
Ilpo Järvinen (2):
tcpv6: fix option space offsets with md5
netfilter: snmp nat leaks memory in case of failure
Johannes Berg (1):
libertas: fix buffer overrun
Julia Jomantaite (1):
ACPI: video: fix brightness allocation
Kumar Gala (1):
math-emu: Fix signalling of underflow and inexact while packing result.
Patrick McHardy (1):
netfilter: restore lost ifdef guarding defrag exception
Serge Hallyn (1):
file caps: always start with clear bprm->caps_*
Shaohua Li (1):
ACPI: dock: avoid check _STA method
Takashi Iwai (1):
ALSA: use correct lock in snd_ctl_dev_disconnect()
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 25 -EXTRAVERSION = .19 +EXTRAVERSION = .20 NAME = Funky Weasel is Jiggy wit it # *DOCUMENTATION*
arch/sparc64/kernel/trampoline.S +14 -4
@@ -328,6 +328,12 @@ after_lock_tlb: wrpr %g0, 0, %wstate + sethi %hi(prom_entry_lock), %g2 +1: ldstub [%g2 + %lo(prom_entry_lock)], %g1 + membar #StoreLoad | #StoreStore + brnz,pn %g1, 1b + nop + /* As a hack, put &init_thread_union into %g6. * prom_world() loads from here to restore the %asi * register.
@@ -337,7 +343,7 @@ after_lock_tlb: sethi %hi(is_sun4v), %o0 lduw [%o0 + %lo(is_sun4v)], %o0 - brz,pt %o0, 1f + brz,pt %o0, 2f nop TRAP_LOAD_TRAP_BLOCK(%g2, %g3)
@@ -369,10 +375,10 @@ after_lock_tlb: call %o1 add %sp, (2047 + 128), %o0 - ba,pt %xcc, 2f + ba,pt %xcc, 3f nop -1: sethi %hi(sparc64_ttable_tl0), %o0 +2: sethi %hi(sparc64_ttable_tl0), %o0 set prom_set_trap_table_name, %g2 stx %g2, [%sp + 2047 + 128 + 0x00] mov 1, %g2
@@ -386,7 +392,11 @@ after_lock_tlb: call %o1 add %sp, (2047 + 128), %o0 -2: ldx [%l0], %g6 +3: sethi %hi(prom_entry_lock), %g2 + stb %g0, [%g2 + %lo(prom_entry_lock)] + membar #StoreStore | #StoreLoad + + ldx [%l0], %g6 ldx [%g6 + TI_TASK], %g4 mov 1, %g5
drivers/acpi/dock.c +4 -1
@@ -599,14 +599,17 @@ static int handle_eject_request(struct dock_station *ds, u32 event)static void dock_notify (acpi_handle handle,u32 event,void *data) {struct dock_station *ds = data; +struct acpi_device *tmp;switch (event) {case ACPI_NOTIFY_BUS_CHECK : -if (!dock_in_progress (ds) &&dock_present (ds)) { +if (!dock_in_progress (ds) &&acpi_bus_get_device (ds->handle, + &tmp)) {begin_dock (ds);dock (ds);if (!dock_present (ds)) { printk(KERN_ERR PREFIX "Unable to dock!\n"); +complete_dock (ds);break ; } atomic_notifier_call_chain(&dock_notifier_list,
drivers/acpi/video.c +73 -50
148 lines not on this page · raw message
drivers/edac/cell_edac.c +1 -1
@@ -141,7 +141,7 @@ static void __devinit cell_edac_init_csrows(struct mem_ctl_info *mci) csrow->nr_pages = (r.end - r.start +1 ) >>PAGE_SHIFT ; csrow->last_page = csrow->first_page + csrow->nr_pages -1 ; csrow->mtype =MEM_XDR ; - csrow->edac_mode =EDAC_FLAG_EC |EDAC_FLAG_SECDED ; + csrow->edac_mode =EDAC_SECDED ; dev_dbg(mci->dev, "Initialized on node %d, chanmask=0x%x," " first_page=0x%lx, nr_pages=0x%x\n",
drivers/gpio/gpiolib.c +1 -1
@@ -426,7 +426,7 @@ int gpio_get_value_cansleep(unsigned gpio)might_sleep_if (extra_checks); chip =gpio_to_chip (gpio); -return chip->get (chip, gpio - chip->base); +return chip->get ? chip->get (chip, gpio - chip->base) :0 ; }EXPORT_SYMBOL_GPL (gpio_get_value_cansleep);
drivers/net/wireless/libertas/scan.c +2 -2
@@ -787,8 +787,8 @@ static int lbs_process_bss(struct bss_descriptor *bss,switch (elem->id) {case MFIE_TYPE_SSID : - bss->ssid_len = elem->len; -memcpy (bss->ssid, elem->data, elem->len); + bss->ssid_len =min_t (int,32 , elem->len); +memcpy (bss->ssid, elem->data, bss->ssid_len);lbs_deb_scan ("got SSID IE: '%s', len %u\n" ,escape_essid (bss->ssid, bss->ssid_len), bss->ssid_len);
fs/ext2/dir.c +35 -25
139 lines not on this page · raw message
fs/ext3/dir.c +7 -3
@@ -102,6 +102,7 @@ static int ext3_readdir(struct file * filp,int err;struct inode *inode = filp->f_path.dentry->d_inode;int ret =0 ; +int dir_has_error =0 ; sb = inode->i_sb;
@@ -148,9 +149,12 @@ static int ext3_readdir(struct file * filp,* of recovering data when there's a bad sector */ if (!bh) { -ext3_error (sb,"ext3_readdir" , -"directory #%lu contains a hole at offset %lu" , - inode->i_ino, (unsigned long )filp->f_pos); +if (!dir_has_error) { +ext3_error (sb, __func__,"directory #%lu " +"contains a hole at offset %lld" , + inode->i_ino, filp->f_pos); + dir_has_error =1 ; + }/* corrupt size? Maybe no more blocks to read */ if (filp->f_pos > inode->i_blocks <<9 )break ;
fs/ext4/dir.c +8 -3
@@ -102,6 +102,7 @@ static int ext4_readdir(struct file * filp,int err;struct inode *inode = filp->f_path.dentry->d_inode;int ret =0 ; +int dir_has_error =0 ; sb = inode->i_sb;
@@ -147,9 +148,13 @@ static int ext4_readdir(struct file * filp,* of recovering data when there's a bad sector */ if (!bh) { -ext4_error (sb,"ext4_readdir" , -"directory #%lu contains a hole at offset %lu" , - inode->i_ino, (unsigned long )filp->f_pos); +if (!dir_has_error) { +ext4_error (sb, __func__,"directory #%lu " +"contains a hole at offset %Lu" , + inode->i_ino, + (unsigned long long ) filp->f_pos); + dir_has_error =1 ; + }/* corrupt size? Maybe no more blocks to read */ if (filp->f_pos > inode->i_blocks <<9 )break ;
include/linux/sched.h +2 -0
@@ -1256,6 +1256,8 @@ struct task_struct {atomic_t fs_excl;/* holding fs exclusive resources */ struct rcu_head rcu; +struct list_head *scm_work_list; +/* * cache last used pipe for splice */
include/math-emu/op-common.h +13 -4
@@ -139,18 +139,27 @@ do { \ if (X##_e <= _FP_WFRACBITS_##fs) \ { \ _FP_FRAC_SRS_##wc(X, X##_e, _FP_WFRACBITS_##fs); \ - _FP_ROUND(wc, X); \ if (_FP_FRAC_HIGH_##fs(X) \ & (_FP_OVERFLOW_##fs >> 1)) \ { \ X##_e = 1; \ _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc); \ - FP_SET_EXCEPTION(FP_EX_INEXACT); \ } \ else \ { \ - X##_e = 0; \ - _FP_FRAC_SRL_##wc(X, _FP_WORKBITS); \ + _FP_ROUND(wc, X); \ + if (_FP_FRAC_HIGH_##fs(X) \ + & (_FP_OVERFLOW_##fs >> 1)) \ + { \ + X##_e = 1; \ + _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc); \ + FP_SET_EXCEPTION(FP_EX_INEXACT); \ + } \ + else \ + { \ + X##_e = 0; \ + _FP_FRAC_SRL_##wc(X, _FP_WORKBITS); \ + } \ } \ if ((FP_CUR_EXCEPTIONS & FP_EX_INEXACT) || \ (FP_TRAPPING_EXCEPTIONS & FP_EX_UNDERFLOW)) \
include/net/scm.h +3 -2
@@ -14,8 +14,9 @@struct scm_fp_list { -int count; -struct file *fp[SCM_MAX_FD ]; +struct list_head list; +int count; +struct file *fp[SCM_MAX_FD ]; };struct scm_cookie
net/core/dev.c +6 -21
@@ -3593,14 +3593,11 @@ static int dev_new_index(struct net *net) }/* Delayed registration/unregisteration */ -static DEFINE_SPINLOCK (net_todo_list_lock);static LIST_HEAD (net_todo_list);static void net_set_todo (struct net_device *dev) { -spin_lock (&net_todo_list_lock);list_add_tail (&dev->todo_list, &net_todo_list); -spin_unlock (&net_todo_list_lock); }static void rollback_registered (struct net_device *dev)
@@ -3909,33 +3906,24 @@ static void netdev_wait_allrefs(struct net_device *dev)* free_netdev(y1); * free_netdev(y2); * -* We are invoked by rtnl_unlock() after it drops the semaphore. +* We are invoked by rtnl_unlock(). * This allows us to deal with problems: * 1) We can delete sysfs objects which invoke hotplug * without deadlocking with linkwatch via keventd. * 2) Since we run with the RTNL semaphore not held, we can sleep * safely in order to wait for the netdev refcnt to drop to zero. +* +* We must not return until all unregister events added during +* the interval the lock was held have been completed. */ -static DEFINE_MUTEX (net_todo_run_mutex);void netdev_run_todo (void ) {struct list_head list; -/* Need to guard against multiple cpu's getting out of order. */ -mutex_lock (&net_todo_run_mutex); - -/* Not safe to do outside the semaphore. We must not return -* until all unregister events invoked by the local processor -* have been completed (either by this todo run, or one on -* another cpu). -*/ -if (list_empty (&net_todo_list)) - goto out; -/* Snapshot list, allow later requests */ -spin_lock (&net_todo_list_lock);list_replace_init (&net_todo_list, &list); -spin_unlock (&net_todo_list_lock); + +__rtnl_unlock ();while (!list_empty (&list)) {struct net_device *dev
@@ -3965,9 +3953,6 @@ void netdev_run_todo(void)/* Free network device */ kobject_put (&dev->dev.kobj); } - -out: -mutex_unlock (&net_todo_run_mutex); }static struct net_device_stats *internal_stats (struct net_device *dev)
net/core/rtnetlink.c +1 -1
@@ -73,7 +73,7 @@ void __rtnl_unlock(void)void rtnl_unlock (void ) { -mutex_unlock (&rtnl_mutex); +/* This fellow will unlock it for us. */ netdev_run_todo (); }
net/core/scm.c +21 -3
@@ -75,6 +75,7 @@ static int scm_fp_copy(struct cmsghdr *cmsg, struct scm_fp_list **fplp)if (!fpl)return -ENOMEM ; *fplp = fpl; +INIT_LIST_HEAD (&fpl->list); fpl->count =0 ; } fpp = &fpl->fp[fpl->count];
@@ -106,9 +107,25 @@ void __scm_destroy(struct scm_cookie *scm)if (fpl) { scm->fp =NULL ; -for (i=fpl->count-1 ; i>=0 ; i--) -fput (fpl->fp[i]); -kfree (fpl); +if (current->scm_work_list) { +list_add_tail (&fpl->list, current->scm_work_list); + }else { +LIST_HEAD (work_list); + + current->scm_work_list = &work_list; + +list_add (&fpl->list, &work_list); +while (!list_empty (&work_list)) { + fpl = list_first_entry(&work_list, struct scm_fp_list, list); + +list_del (&fpl->list); +for (i=fpl->count-1 ; i>=0 ; i--) +fput (fpl->fp[i]); +kfree (fpl); + } + + current->scm_work_list =NULL ; + } } }
@@ -284,6 +301,7 @@ struct scm_fp_list *scm_fp_dup(struct scm_fp_list *fpl) new_fpl =kmalloc (sizeof (*fpl),GFP_KERNEL );if (new_fpl) { +INIT_LIST_HEAD (&new_fpl->list);for (i=fpl->count-1 ; i>=0 ; i--)get_file (fpl->fp[i]);memcpy (new_fpl, fpl,sizeof (*fpl));
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +2 -0
@@ -138,10 +138,12 @@ static unsigned int ipv4_conntrack_defrag(unsigned int hooknum, const struct net_device *out, int (*okfn)(struct sk_buff *)) { +#if !defined(CONFIG_NF_NAT ) && !defined(CONFIG_NF_NAT_MODULE )/* Previously seen (loopback)? Ignore. Do this before fragment check. */ if (skb->nfct)return NF_ACCEPT ; +#endif /* Gather fragments. */ if (ip_hdr (skb)->frag_off &htons (IP_MF |IP_OFFSET )) {
net/ipv4/netfilter/nf_nat_snmp_basic.c +1 -0
@@ -742,6 +742,7 @@ static unsigned char snmp_object_decode(struct asn1_ctx *ctx, *obj =kmalloc (sizeof (struct snmp_object ) + len,GFP_ATOMIC );if (*obj ==NULL ) { +kfree (p);kfree (id);if (net_ratelimit ())printk ("OOM in bsalg (%d)\n" , __LINE__);
net/ipv6/tcp_ipv6.c +1 -1
@@ -1130,7 +1130,7 @@ static void tcp_v6_send_ack(struct tcp_timewait_sock *tw, *topt++ =htonl ((TCPOPT_NOP <<24 ) | (TCPOPT_NOP <<16 ) | (TCPOPT_TIMESTAMP <<8 ) |TCPOLEN_TIMESTAMP ); *topt++ =htonl (tcp_time_stamp); - *topt =htonl (ts); + *topt++ =htonl (ts); }#ifdef CONFIG_TCP_MD5SIG
net/netfilter/xt_iprange.c +4 -4
@@ -67,7 +67,7 @@ iprange_mt4(const struct sk_buff *skb, const struct net_device *in,if (info->flags &IPRANGE_SRC ) { m =ntohl (iph->saddr) <ntohl (info->src_min.ip); m |=ntohl (iph->saddr) >ntohl (info->src_max.ip); - m ^= info->flags &IPRANGE_SRC_INV ; + m ^= !!(info->flags &IPRANGE_SRC_INV );if (m) { pr_debug("src IP " NIPQUAD_FMT " NOT in range %s" NIPQUAD_FMT "-" NIPQUAD_FMT "\n",
@@ -81,7 +81,7 @@ iprange_mt4(const struct sk_buff *skb, const struct net_device *in,if (info->flags &IPRANGE_DST ) { m =ntohl (iph->daddr) <ntohl (info->dst_min.ip); m |=ntohl (iph->daddr) >ntohl (info->dst_max.ip); - m ^= info->flags &IPRANGE_DST_INV ; + m ^= !!(info->flags &IPRANGE_DST_INV );if (m) { pr_debug("dst IP " NIPQUAD_FMT " NOT in range %s" NIPQUAD_FMT "-" NIPQUAD_FMT "\n",
@@ -123,14 +123,14 @@ iprange_mt6(const struct sk_buff *skb, const struct net_device *in,if (info->flags &IPRANGE_SRC ) { m =iprange_ipv6_sub (&iph->saddr, &info->src_min.in6) <0 ; m |=iprange_ipv6_sub (&iph->saddr, &info->src_max.in6) >0 ; - m ^= info->flags &IPRANGE_SRC_INV ; + m ^= !!(info->flags &IPRANGE_SRC_INV );if (m)return false; }if (info->flags &IPRANGE_DST ) { m =iprange_ipv6_sub (&iph->daddr, &info->dst_min.in6) <0 ; m |=iprange_ipv6_sub (&iph->daddr, &info->dst_max.in6) >0 ; - m ^= info->flags &IPRANGE_DST_INV ; + m ^= !!(info->flags &IPRANGE_DST_INV );if (m)return false; }
security/commoncap.c +3 -3
@@ -244,10 +244,10 @@ static int get_file_caps(struct linux_binprm *bprm)struct vfs_cap_data vcaps;struct inode *inode; -if (bprm->file->f_vfsmnt->mnt_flags &MNT_NOSUID ) { -bprm_clear_caps (bprm); +bprm_clear_caps (bprm); + +if (bprm->file->f_vfsmnt->mnt_flags &MNT_NOSUID )return 0 ; - } dentry =dget (bprm->file->f_dentry); inode = dentry->d_inode;
sound/core/control.c +2 -2
@@ -1426,12 +1426,12 @@ static int snd_ctl_dev_disconnect(struct snd_device *device) cardnum = card->number;snd_assert (cardnum >=0 && cardnum <SNDRV_CARDS , return -ENXIO ); -down_read (&card->controls_rwsem); +read_lock (&card->ctl_files_rwlock);list_for_each_entry (ctl, &card->ctl_files, list) {wake_up (&ctl->change_sleep);kill_fasync (&ctl->fasync,SIGIO ,POLL_ERR ); } -up_read (&card->controls_rwsem); +read_unlock (&card->ctl_files_rwlock);if ((err =snd_unregister_device (SNDRV_DEVICE_TYPE_CONTROL , card,-1 )) <0 )