Linux 2.6.19.6
Subsystems (9)
We (the -stable team) are announcing the release of the 2.6.19.6 kernel. It contains a number of bugfixes, and all 2.6.19 users are recommended to upgrade.
Barring anything major, there will not be any more 2.6.19 releases. If you disagree with this, please let the stable team know about the patches that you feel must be in a new release. We need to move on to flushing out the very large backlog of 2.6.20-stable patches.
The diffstat and short summary of the fixes are below.
I'll also be replying to this message with a copy of the patch between 2.6.19.5 and 2.6.19.6, as it is small enough to do so.
The updated 2.6.19.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.19.y.git
and can be browsed at the normal kernel.org git web browser:
www.kernel.org/git/
thanks,
greg k-h
--------
Makefile | 2 drivers/input/mouse/psmouse-base.c | 28 +++ drivers/input/mouse/psmouse.h | 1 drivers/input/mouse/synaptics.c | 1 drivers/net/8139cp.c | 6 drivers/net/b44.c | 6 drivers/net/forcedeth.c | 11 - drivers/net/skge.c | 5 drivers/net/sky2.c | 51 +++-- drivers/net/sky2.h | 2 drivers/usb/net/usbnet.c | 7 fs/bad_inode.c | 330 ++++++++++++++++++++++++++++++++----- fs/cifs/sess.c | 13 - fs/ext2/super.c | 4 fs/ext3/super.c | 4 fs/ext4/super.c | 4 lib/swiotlb.c | 2 sound/pci/hda/hda_intel.c | 2 sound/pci/hda/patch_si3054.c | 3 19 files changed, 400 insertions(+), 82 deletions(-)
Summary of changes from v2.6.19.5 to v2.6.19.6
==============================================
David Brownell (1):
USB: usbnet driver bugfix
David Moore (1):
Missing critical phys_to_virt in lib/swiotlb.c
Eric Sandeen (1):
fix memory corruption from misinterpreted bad_inode_ops return values (CVE-2006-5753)
Francois Romieu (1):
netpoll: drivers must not enable IRQ unconditionally in their NAPI handler
Greg Kroah-Hartman (1):
Linux 2.6.19.6
Hugh Dickins (1):
fix umask when noACL kernel meets extN tuned for ACLs
Stephen Hemminger (6):
sky2: pci config blocks phy power control
sky2: fix for NAPI with dual port boards
sky2: kfree_skb with IRQ with netconsole
sky2: transmit timeout deadlock
sky2: dont flush good pause frames
sky2: fix ram buffer allocation settings
Steve French (1):
Fix oops when Windows server sent bad domain name null terminator
Takashi Iwai (2):
hda-intel - Don't try to probe invalid codecs hda-codec - Don't return error at initialization of modem codec
Thomas Renninger (1):
Backport of psmouse suspend/shutdown cleanups
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 19 -EXTRAVERSION = .5 +EXTRAVERSION = .6 NAME=Avast! A bilge rat! # *DOCUMENTATION*
drivers/input/mouse/psmouse-base.c +28 -0
@@ -986,8 +986,36 @@ static void psmouse_resync(void *p)static void psmouse_cleanup (struct serio *serio) {struct psmouse *psmouse =serio_get_drvdata (serio); +struct psmouse *parent =NULL ; + +mutex_lock (&psmouse_mutex); + +if (serio->parent && serio->id.type ==SERIO_PS_PSTHRU ) { + parent =serio_get_drvdata (serio->parent); +psmouse_deactivate (parent); + } + +psmouse_deactivate (psmouse); + +if (psmouse->cleanup) + psmouse->cleanup (psmouse);psmouse_reset (psmouse); + +/* +* Some boxes, such as HP nx7400, get terribly confused if mouse +* is not fully enabled before suspending/shutting down. +*/ +ps2_command (&psmouse->ps2dev,NULL ,PSMOUSE_CMD_ENABLE ); + +if (parent) { +if (parent->pt_deactivate) + parent->pt_deactivate (parent); + +psmouse_activate (parent); + } + +mutex_unlock (&psmouse_mutex); }/*
drivers/input/mouse/psmouse.h +1 -0
@@ -68,6 +68,7 @@ struct psmouse {int (*reconnect)(struct psmouse *psmouse);void (*disconnect)(struct psmouse *psmouse); +void (*cleanup)(struct psmouse *psmouse);int (*poll)(struct psmouse *psmouse);void (*pt_activate)(struct psmouse *psmouse);
drivers/input/mouse/synaptics.c +1 -0
@@ -652,6 +652,7 @@ int synaptics_init(struct psmouse *psmouse) psmouse->set_rate = synaptics_set_rate; psmouse->disconnect = synaptics_disconnect; psmouse->reconnect = synaptics_reconnect; + psmouse->cleanup = synaptics_reset; psmouse->pktsize =6 ;/* Synaptics can usually stay in sync without extra help */ psmouse->resync_time =0 ;
drivers/net/8139cp.c +4 -2
@@ -617,13 +617,15 @@ rx_next:* this round of polling */ if (rx_work) { +unsigned long flags; +if (cpr16 (IntrStatus) & cp_rx_intr_mask) goto rx_status_loop; -local_irq_disable (); +local_irq_save (flags);cpw16_f (IntrMask, cp_intr_mask);__netif_rx_complete (dev); -local_irq_enable (); +local_irq_restore (flags);return 0 ;/* done */ }
drivers/net/b44.c +4 -2
@@ -879,12 +879,14 @@ static int b44_poll(struct net_device *netdev, int *budget) }if (bp->istat &ISTAT_ERRORS ) { -spin_lock_irq (&bp->lock); +unsigned long flags; + +spin_lock_irqsave (&bp->lock, flags);b44_halt (bp);b44_init_rings (bp);b44_init_hw (bp,1 );netif_wake_queue (bp->dev); -spin_unlock_irq (&bp->lock); +spin_unlock_irqrestore (&bp->lock, flags); done =1 ; }
drivers/net/forcedeth.c +7 -4
@@ -2544,14 +2544,15 @@ static int nv_napi_poll(struct net_device *dev, int *budget)int pkts, limit =min (*budget, dev->quota);struct fe_priv *np =netdev_priv (dev);u8 __iomem *base =get_hwbase (dev); +unsigned long flags; pkts =nv_rx_process (dev, limit);if (nv_alloc_rx (dev)) { -spin_lock_irq (&np->lock); +spin_lock_irqsave (&np->lock, flags);if (!np->in_shutdown)mod_timer (&np->oom_kick, jiffies +OOM_REFILL ); -spin_unlock_irq (&np->lock); +spin_unlock_irqrestore (&np->lock, flags); }if (pkts < limit) {
@@ -2559,13 +2560,15 @@ static int nv_napi_poll(struct net_device *dev, int *budget)netif_rx_complete (dev);/* re-enable receive interrupts */ -spin_lock_irq (&np->lock); +spin_lock_irqsave (&np->lock, flags); + np->irqmask |=NVREG_IRQ_RX_ALL ;if (np->msi_flags &NV_MSI_X_ENABLED )writel (NVREG_IRQ_RX_ALL , base + NvRegIrqMask);else writel (np->irqmask, base + NvRegIrqMask); -spin_unlock_irq (&np->lock); + +spin_unlock_irqrestore (&np->lock, flags);return 0 ; }else {/* used up our quantum, so reschedule */
drivers/net/skge.c +3 -2
@@ -2919,6 +2919,7 @@ static int skge_poll(struct net_device *dev, int *budget)struct skge_hw *hw = skge->hw;struct skge_ring *ring = &skge->rx_ring;struct skge_element *e; +unsigned long flags;int to_do =min (dev->quota, *budget);int work_done =0 ;
@@ -2956,12 +2957,12 @@ static int skge_poll(struct net_device *dev, int *budget)if (work_done >= to_do)return 1 ;/* not done */ -spin_lock_irq (&hw->hw_lock); +spin_lock_irqsave (&hw->hw_lock, flags);__netif_rx_complete (dev); hw->intr_mask |= irqmask[skge->port];skge_write32 (hw,B0_IMSK , hw->intr_mask);skge_read32 (hw,B0_IMSK ); -spin_unlock_irq (&hw->hw_lock); +spin_unlock_irqrestore (&hw->hw_lock, flags);return 0 ; }
drivers/net/sky2.c +32 -19
110 lines not on this page · raw message
drivers/net/sky2.h +1 -1
@@ -1576,7 +1576,7 @@ enum {GMR_FS_ANY_ERR =GMR_FS_RX_FF_OV |GMR_FS_CRC_ERR |GMR_FS_FRAGMENT |GMR_FS_LONG_ERR | -GMR_FS_MII_ERR |GMR_FS_GOOD_FC |GMR_FS_BAD_FC | +GMR_FS_MII_ERR |GMR_FS_BAD_FC | GMR_FS_UN_SIZE | GMR_FS_JABBER, };
drivers/usb/net/usbnet.c +5 -2
@@ -1181,6 +1181,9 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)// NOTE net->name still not usable ... if (info->bind) { status = info->bind (dev, udev); +if (status <0 ) + goto out1; +// heuristic: "usb%d" for links we know are two-host, // else "eth%d" when there's reasonable doubt. userspace // can rename the link if it knows better.
@@ -1207,12 +1210,12 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)if (status ==0 && dev->status) status =init_status (dev, udev);if (status <0 ) - goto out1; + goto out3;if (!dev->rx_urb_size) dev->rx_urb_size = dev->hard_mtu; dev->maxpacket =usb_maxpacket (dev->udev, dev->out,1 ); - +SET_NETDEV_DEV (net, &udev->dev); status =register_netdev (net);if (status)
fs/bad_inode.c +289 -41
362 lines not on this page · raw message
fs/cifs/sess.c +8 -5
@@ -182,11 +182,14 @@ static int decode_unicode_ssetup(char ** pbcc_area, int bleft, struct cifsSesInfcFYI (1 ,("bleft %d" ,bleft)); -/* word align, if bytes remaining is not even */ -if (bleft %2 ) { - bleft--; - data++; - } +/* SMB header is unaligned, so cifs servers word align start of +Unicode strings */ + data++; + bleft--;/* Windows servers do not always double null terminate +their final Unicode string - in which case we +now will not attempt to decode the byte of junk +which follows it */ + words_left = bleft /2 ;/* save off server operating system */
fs/ext2/super.c +4 -0
@@ -710,10 +710,14 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)set_opt (sbi->s_mount_opt,GRPID );if (def_mount_opts &EXT2_DEFM_UID16 )set_opt (sbi->s_mount_opt,NO_UID32 ); +#ifdef CONFIG_EXT2_FS_XATTR if (def_mount_opts &EXT2_DEFM_XATTR_USER )set_opt (sbi->s_mount_opt,XATTR_USER ); +#endif +#ifdef CONFIG_EXT2_FS_POSIX_ACL if (def_mount_opts &EXT2_DEFM_ACL )set_opt (sbi->s_mount_opt,POSIX_ACL ); +#endif if (le16_to_cpu (sbi->s_es->s_errors) ==EXT2_ERRORS_PANIC )set_opt (sbi->s_mount_opt,ERRORS_PANIC );
fs/ext3/super.c +4 -0
@@ -1455,10 +1455,14 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)set_opt (sbi->s_mount_opt,GRPID );if (def_mount_opts &EXT3_DEFM_UID16 )set_opt (sbi->s_mount_opt,NO_UID32 ); +#ifdef CONFIG_EXT3_FS_XATTR if (def_mount_opts &EXT3_DEFM_XATTR_USER )set_opt (sbi->s_mount_opt,XATTR_USER ); +#endif +#ifdef CONFIG_EXT3_FS_POSIX_ACL if (def_mount_opts &EXT3_DEFM_ACL )set_opt (sbi->s_mount_opt,POSIX_ACL ); +#endif if ((def_mount_opts &EXT3_DEFM_JMODE ) ==EXT3_DEFM_JMODE_DATA ) sbi->s_mount_opt |=EXT3_MOUNT_JOURNAL_DATA ;else if ((def_mount_opts &EXT3_DEFM_JMODE ) ==EXT3_DEFM_JMODE_ORDERED )
fs/ext4/super.c +4 -0
@@ -1512,10 +1512,14 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent)set_opt (sbi->s_mount_opt,GRPID );if (def_mount_opts &EXT4_DEFM_UID16 )set_opt (sbi->s_mount_opt,NO_UID32 ); +#ifdef CONFIG_EXT4DEV_FS_XATTR if (def_mount_opts &EXT4_DEFM_XATTR_USER )set_opt (sbi->s_mount_opt,XATTR_USER ); +#endif +#ifdef CONFIG_EXT4DEV_FS_POSIX_ACL if (def_mount_opts &EXT4_DEFM_ACL )set_opt (sbi->s_mount_opt,POSIX_ACL ); +#endif if ((def_mount_opts &EXT4_DEFM_JMODE ) ==EXT4_DEFM_JMODE_DATA ) sbi->s_mount_opt |=EXT4_MOUNT_JOURNAL_DATA ;else if ((def_mount_opts &EXT4_DEFM_JMODE ) ==EXT4_DEFM_JMODE_ORDERED )
lib/swiotlb.c +1 -1
@@ -750,7 +750,7 @@ swiotlb_sync_sg(struct device *hwdev, struct scatterlist *sg,for (i =0 ; i < nelems; i++, sg++)if (sg->dma_address !=SG_ENT_PHYS_ADDRESS (sg)) -sync_single (hwdev, (void *) sg->dma_address, +sync_single (hwdev,phys_to_virt (sg->dma_address), sg->dma_length, dir, target); }
sound/pci/hda/hda_intel.c +1 -1
@@ -198,7 +198,7 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 };/* STATESTS int mask: SD2,SD1,SD0 */ #define STATESTS_INT_MASK 0x07 -#define AZX_MAX_CODECS 4 +#define AZX_MAX_CODECS 3/* SD_CTL bits */ #define SD_CTL_STREAM_RESET 0x01/* stream reset bit */
sound/pci/hda/patch_si3054.c +2 -1
@@ -243,7 +243,8 @@ static int si3054_init(struct hda_codec *codec)if ((val&SI3054_MEI_READY ) !=SI3054_MEI_READY ) {snd_printk (KERN_ERR "si3054: cannot initialize. EXT MID = %04x\n" , val); -return -EACCES ; +/* let's pray that this is no fatal error */ +/* return -EACCES; */ }SET_REG (codec,SI3054_GPIO_POLARITY ,0xffff );