Linux 2.6.32.54
Subsystems (14)
I'm announcing the release of the 2.6.32.54 kernel.
All users of the 2.6.32 kernel series must upgrade.
The updated 2.6.32.y git tree can be found at (NOTE THE ADDRESS CHANGE):
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-2.6.32.y and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=shortlog;h=refs/heads/linux-2.6.32.y
thanks,
greg k-h
------------
Documentation/HOWTO | 4 - Documentation/development-process/5.Posting | 8 +-- Documentation/usb/usbmon.txt | 14 +++-- MAINTAINERS | 2 Makefile | 2 drivers/base/firmware_class.c | 14 ++--- drivers/net/usb/asix.c | 6 +- drivers/scsi/device_handler/scsi_dh.c | 7 ++ drivers/usb/class/cdc-acm.c | 4 + drivers/usb/core/quirks.c | 5 + drivers/usb/misc/isight_firmware.c | 6 +- drivers/usb/serial/cp210x.c | 1 drivers/usb/serial/omninet.c | 2 drivers/usb/storage/usb.c | 1 drivers/video/offb.c | 52 +++++++++---------- fs/reiserfs/super.c | 27 ++++++---- fs/xfs/linux-2.6/xfs_acl.c | 4 + kernel/cpu.c | 74 ++++++++++++++++++++++++++++ 18 files changed, 167 insertions(+), 66 deletions(-)
Alan Stern (1):
USB: update documentation for usbmon
Aurelien Jacobs (2):
asix: new device id
asix: fix infinite loop in rx_fixup()
Benjamin Herrenschmidt (2):
offb: Fix setting of the pseudo-palette for >8bpp
offb: Fix bug in calculating requested vram size
Christoph Hellwig (1):
xfs: validate acl count
Greg Kroah-Hartman (2):
USB: isight: fix kernel bug when loading firmware Linux 2.6.32.54
Huajun Li (1):
usb: usb-storage doesn't support dynamic id currently, the patch disables the feature to fix an oops
Jan Kara (1):
reiserfs: Fix quota mount option parsing
Jeff Mahoney (1):
reiserfs: Force inode evictions before umount to avoid crash
Joe Perches (2):
MAINTAINERS: stable: Update address
Documentation: Update stable address
Johan Hovold (1):
USB: omninet: fix write_room
Julia Lawall (1):
drivers/usb/class/cdc-acm.c: clear dangling pointer
Malte Schröder (1):
USB: Add USB-ID for Multiplex RC serial adapter to cp210x.c
Moger, Babu (1):
SCSI: scsi_dh: check queuedata pointer before proceeding further
Neil Horman (1):
firmware: Fix an oops on reading fw_priv->fw in sysfs loading file
Oliver Neukum (1):
USB: add quirk for another camera
Srivatsa S. Bhat (1):
PM / Sleep: Fix race between CPU hotplug and freezer
Xi Wang (1):
xfs: fix acl count validation in xfs_acl_from_disk()
Documentation/HOWTO +2 -2
@@ -275,8 +275,8 @@ versions. If no 2.6.x.y kernel is available, then the highest numbered 2.6.x kernel is the current stable kernel. -2.6.x.y are maintained by the "stable" team <[email protected]>, and are -released as needs dictate. The normal release period is approximately +2.6.x.y are maintained by the "stable" team <[email protected]>, and +are released as needs dictate. The normal release period is approximately two weeks, but it can be longer if there are no pressing problems. A security-related problem, instead, can cause a release to happen almost instantly.
Documentation/development-process/5.Posting +4 -4
@@ -267,10 +267,10 @@ copies should go to: the linux-kernel list. - If you are fixing a bug, think about whether the fix should go into the - next stable update. If so, [email protected] should get a copy of the - patch. Also add a "Cc: [email protected]" to the tags within the patch - itself; that will cause the stable team to get a notification when your - fix goes into the mainline. + next stable update. If so, [email protected] should get a copy of + the patch. Also add a "Cc: [email protected]" to the tags within + the patch itself; that will cause the stable team to get a notification + when your fix goes into the mainline. When selecting recipients for a patch, it is good to have an idea of who you think will eventually accept the patch and get it merged. While it
Documentation/usb/usbmon.txt +9 -5
@@ -43,10 +43,11 @@ This allows to filter away annoying devices that talk continuously. 2. Find which bus connects to the desired device -Run "cat /proc/bus/usb/devices", and find the T-line which corresponds to -the device. Usually you do it by looking for the vendor string. If you have -many similar devices, unplug one and compare two /proc/bus/usb/devices outputs. -The T-line will have a bus number. Example: +Run "cat /sys/kernel/debug/usb/devices", and find the T-line which corresponds +to the device. Usually you do it by looking for the vendor string. If you have +many similar devices, unplug one and compare the two +/sys/kernel/debug/usb/devices outputs. The T-line will have a bus number. +Example: T: Bus=03 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 2 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 8 #Cfgs= 1
@@ -54,7 +55,10 @@ P: Vendor=0557 ProdID=2004 Rev= 1.00 S: Manufacturer=ATEN S: Product=UC100KM V2.00 -Bus=03 means it's bus 3. +"Bus=03" means it's bus 3. Alternatively, you can look at the output from +"lsusb" and get the bus number from the appropriate line. Example: + +Bus 003 Device 002: ID 0557:2004 ATEN UC100KM V2.00 3. Start 'cat'
MAINTAINERS +1 -1
@@ -5010,7 +5010,7 @@ F: arch/alpha/kernel/srm_env.c STABLE BRANCH M: Greg Kroah-Hartman <[email protected]> -L: [email protected] +L: [email protected] S: Maintained STAGING SUBSYSTEM
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 32 -EXTRAVERSION = .53 +EXTRAVERSION = .54 NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION*
drivers/base/firmware_class.c +7 -7
@@ -161,13 +161,13 @@ static ssize_t firmware_loading_store(struct device *dev,int loading =simple_strtol (buf,NULL ,10 );int i; +mutex_lock (&fw_lock); + +if (!fw_priv->fw) + goto out; +switch (loading) {case 1 : -mutex_lock (&fw_lock); -if (!fw_priv->fw) { -mutex_unlock (&fw_lock); -break ; - }firmware_free_data (fw_priv->fw);memset (fw_priv->fw,0 ,sizeof (struct firmware ));/* If the pages are not owned by 'struct firmware' */
@@ -178,7 +178,6 @@ static ssize_t firmware_loading_store(struct device *dev, fw_priv->page_array_size =0 ; fw_priv->nr_pages =0 ;set_bit (FW_STATUS_LOADING , &fw_priv->status); -mutex_unlock (&fw_lock);break ;case 0 :if (test_bit (FW_STATUS_LOADING , &fw_priv->status)) {
@@ -209,7 +208,8 @@ static ssize_t firmware_loading_store(struct device *dev,fw_load_abort (fw_priv);break ; } - +out: +mutex_unlock (&fw_lock);return count; }
drivers/net/usb/asix.c +5 -1
@@ -339,7 +339,7 @@ static int asix_rx_fixup(struct usbnet *dev, struct sk_buff *skb)skb_pull (skb, (size +1 ) &0xfffe ); -if (skb->len ==0 ) +if (skb->len <sizeof (header))break ; head = (u8 *) skb->data;
@@ -1522,6 +1522,10 @@ static const struct usb_device_id products [] = {// ASIX 88772a USB_DEVICE(0x0db0, 0xa877), .driver_info = (unsigned long) &ax88772_info, +}, { +// Asus USB Ethernet Adapter + USB_DEVICE (0x0b95, 0x7e2b), + .driver_info = (unsigned long) &ax88772_info, }, { }, // END };
drivers/scsi/device_handler/scsi_dh.c +6 -1
@@ -432,7 +432,12 @@ int scsi_dh_activate(struct request_queue *q)spin_lock_irqsave (q->queue_lock, flags); sdev = q->queuedata; -if (sdev && sdev->scsi_dh_data) +if (!sdev) { +spin_unlock_irqrestore (q->queue_lock, flags); +return SCSI_DH_NOSYS ; + } + +if (sdev->scsi_dh_data) scsi_dh = sdev->scsi_dh_data->scsi_dh;if (!scsi_dh || !get_device (&sdev->sdev_gendev)) err =SCSI_DH_NOSYS ;
drivers/usb/class/cdc-acm.c +4 -0
@@ -1264,6 +1264,8 @@ made_compressed_probe: i =device_create_file (&intf->dev, &dev_attr_wCountryCodes);if (i <0 ) {kfree (acm->country_codes); + acm->country_codes =NULL ; + acm->country_code_size =0 ; goto skip_countries; }
@@ -1272,6 +1274,8 @@ made_compressed_probe:if (i <0 ) {device_remove_file (&intf->dev, &dev_attr_wCountryCodes);kfree (acm->country_codes); + acm->country_codes =NULL ; + acm->country_code_size =0 ; goto skip_countries; } }
drivers/usb/core/quirks.c +4 -1
@@ -114,9 +114,12 @@ static const struct usb_device_id usb_quirk_list[] = { { USB_DEVICE(0x06a3, 0x0006), .driver_info = USB_QUIRK_CONFIG_INTF_STRINGS }, - /* Guillemot Webcam Hercules Dualpix Exchange*/ + /* Guillemot Webcam Hercules Dualpix Exchange (2nd ID) */ { USB_DEVICE(0x06f8, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME }, + /* Guillemot Webcam Hercules Dualpix Exchange*/ + { USB_DEVICE(0x06f8, 0x3005), .driver_info = USB_QUIRK_RESET_RESUME }, + /* M-Systems Flash Disk Pioneers */ { USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },
drivers/usb/misc/isight_firmware.c +4 -2
@@ -54,8 +54,9 @@ static int isight_firmware_load(struct usb_interface *intf, ptr = firmware->data; + buf[0 ] =0x01 ;if (usb_control_msg - (dev,usb_sndctrlpipe (dev,0 ),0xa0 ,0x40 ,0xe600 ,0 ,"\1" ,1 , + (dev,usb_sndctrlpipe (dev,0 ),0xa0 ,0x40 ,0xe600 ,0 , buf,1 ,300 ) !=1 ) {printk (KERN_ERR "Failed to initialise isight firmware loader\n" );
@@ -99,8 +100,9 @@ static int isight_firmware_load(struct usb_interface *intf, } } + buf[0 ] =0x00 ;if (usb_control_msg - (dev,usb_sndctrlpipe (dev,0 ),0xa0 ,0x40 ,0xe600 ,0 ,"\0" ,1 , + (dev,usb_sndctrlpipe (dev,0 ),0xa0 ,0x40 ,0xe600 ,0 , buf,1 ,300 ) !=1 ) {printk (KERN_ERR "isight firmware loading completion failed\n" ); ret = -ENODEV ;
drivers/usb/serial/cp210x.c +1 -0
@@ -94,6 +94,7 @@ static struct usb_device_id id_table [] = { { USB_DEVICE(0x10C4, 0x818B) }, /* AVIT Research USB to TTL */ { USB_DEVICE(0x10C4, 0x819F) }, /* MJS USB Toslink Switcher */ { USB_DEVICE(0x10C4, 0x81A6) }, /* ThinkOptics WavIt */ + { USB_DEVICE(0x10C4, 0x81A9) }, /* Multiplex RC Interface */ { USB_DEVICE(0x10C4, 0x81AC) }, /* MSD Dash Hawk */ { USB_DEVICE(0x10C4, 0x81AD) }, /* INSYS USB Modem */ { USB_DEVICE(0x10C4, 0x81C8) }, /* Lipowsky Industrie Elektronik GmbH, Baby-JTAG */
drivers/usb/serial/omninet.c +1 -1
@@ -317,7 +317,7 @@ static int omninet_write_room(struct tty_struct *tty)int room =0 ;/* Default: no room */ /* FIXME: no consistent locking for write_urb_busy */ -if (wport->write_urb_busy) +if (!wport->write_urb_busy) room = wport->bulk_out_size -OMNINET_HEADERLEN ;dbg ("%s - returns %d" , __func__, room);
drivers/usb/storage/usb.c +1 -0
@@ -1025,6 +1025,7 @@ static struct usb_driver usb_storage_driver = { .post_reset = usb_stor_post_reset, .id_table = usb_storage_usb_ids, .soft_unbind = 1, + .no_dynamic_id = 1, };static int __init usb_stor_init (void )
drivers/video/offb.c +24 -28
67 lines not on this page · raw message
fs/reiserfs/super.c +16 -11
@@ -445,16 +445,20 @@ int remove_save_link(struct inode *inode, int truncate)static void reiserfs_kill_sb (struct super_block *s) {if (REISERFS_SB (s)) { -if (REISERFS_SB (s)->xattr_root) { -d_invalidate (REISERFS_SB (s)->xattr_root); -dput (REISERFS_SB (s)->xattr_root); -REISERFS_SB (s)->xattr_root =NULL ; - } -if (REISERFS_SB (s)->priv_root) { -d_invalidate (REISERFS_SB (s)->priv_root); -dput (REISERFS_SB (s)->priv_root); -REISERFS_SB (s)->priv_root =NULL ; - } +/* +* Force any pending inode evictions to occur now. Any +* inodes to be removed that have extended attributes +* associated with them need to clean them up before +* we can release the extended attribute root dentries. +* shrink_dcache_for_umount will BUG if we don't release +* those before it's called so ->put_super is too late. +*/ +shrink_dcache_sb (s); + +dput (REISERFS_SB (s)->xattr_root); +REISERFS_SB (s)->xattr_root =NULL ; +dput (REISERFS_SB (s)->priv_root); +REISERFS_SB (s)->priv_root =NULL ; }kill_block_super (s);
@@ -1149,7 +1153,8 @@ static void handle_quota_files(struct super_block *s, char **qf_names,kfree (REISERFS_SB (s)->s_qf_names[i]); REISERFS_SB(s)->s_qf_names[i] = qf_names[i]; } -REISERFS_SB (s)->s_jquota_fmt = *qfmt; +if (*qfmt) +REISERFS_SB (s)->s_jquota_fmt = *qfmt; }#endif
fs/xfs/linux-2.6/xfs_acl.c +3 -1
@@ -37,9 +37,11 @@ xfs_acl_from_disk(struct xfs_acl *aclp)struct posix_acl_entry *acl_e;struct posix_acl *acl;struct xfs_acl_entry *ace; -int count, i; +unsigned int count, i; count =be32_to_cpu (aclp->acl_cnt); +if (count >XFS_ACL_MAX_ENTRIES ) +return ERR_PTR (-EFSCORRUPTED ); acl =posix_acl_alloc (count,GFP_KERNEL );if (!acl)
kernel/cpu.c +74 -0
86 lines not on this page · raw message