Linux 3.4.53
Greg KH
maintainerI'm announcing the release of the 3.4.53 kernel.
All users of the 3.4 kernel series must upgrade.
The updated 3.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.4.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=summary
thanks,
greg k-h
------------
MAINTAINERS | 1 + Makefile | 2 +- block/genhd.c | 2 +- crypto/algapi.c | 3 ++- drivers/block/nbd.c | 3 ++- drivers/cdrom/cdrom.c | 2 +- drivers/power/charger-manager.c | 2 +- drivers/scsi/osd/osd_uld.c | 2 +- drivers/scsi/sd.c | 2 +- drivers/tty/serial/8250/8250_pci.c | 4 ---- fs/hpfs/map.c | 3 ++- fs/hpfs/super.c | 8 +++++++- fs/nfsd/nfs4xdr.c | 2 +- kernel/time/tick-sched.c | 1 - net/ceph/auth_none.c | 6 ++++++ 15 files changed, 27 insertions(+), 16 deletions(-)
Ben Hutchings (1):
SCSI: sd: Fix parsing of 'temporary ' cache mode prefix
Greg Kroah-Hartman (4):
MAINTAINERS: add stable_kernel_rules.txt to stable maintainer information
Revert "serial: 8250_pci: add support for another kind of NetMos Technology PCI 9835 Multi-I/O Controller" Revert "sched: Add missing call to calc_load_exit_idle()"
Linux 3.4.53
J. Bruce Fields (1):
nfsd4: fix decoding of compounds across page boundaries
Jonathan Salwan (1):
drivers/cdrom/cdrom.c: use kzalloc() for failing hardware
Kees Cook (3):
charger-manager: Ensure event is not used as format string
block: do not pass disk names as format strings
crypto: sanitize argument for format string
Mikulas Patocka (1):
hpfs: better test for errors
Tyler Hicks (1):
libceph: Fix NULL pointer dereference in auth client code
Greg KH
maintainerMAINTAINERS +1 -0
@@ -6390,6 +6390,7 @@ STABLE BRANCH M: Greg Kroah-Hartman <[email protected]> L: [email protected] S: Supported +F: Documentation/stable_kernel_rules.txt STAGING SUBSYSTEM M: Greg Kroah-Hartman <[email protected]>
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 4 -SUBLEVEL = 52 +SUBLEVEL = 53 EXTRAVERSION = NAME = Saber-toothed Squirrel
block/genhd.c +1 -1
@@ -518,7 +518,7 @@ static void register_disk(struct gendisk *disk) ddev->parent = disk->driverfs_dev; -dev_set_name (ddev, disk->disk_name); +dev_set_name (ddev,"%s" , disk->disk_name);/* delay uevents, until we scanned partition table */ dev_set_uevent_suppress (ddev,1 );
crypto/algapi.c +2 -1
@@ -512,7 +512,8 @@ static struct crypto_template *__crypto_lookup_template(const char *name)struct crypto_template *crypto_lookup_template (const char *name) { -return try_then_request_module (__crypto_lookup_template (name), name); +return try_then_request_module (__crypto_lookup_template (name),"%s" , + name); }EXPORT_SYMBOL_GPL (crypto_lookup_template);
drivers/block/nbd.c +2 -1
@@ -666,7 +666,8 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,mutex_unlock (&nbd->tx_lock); - thread =kthread_create (nbd_thread, nbd, nbd->disk->disk_name); + thread =kthread_create (nbd_thread, nbd,"%s" , + nbd->disk->disk_name);if (IS_ERR (thread)) {mutex_lock (&nbd->tx_lock);return PTR_ERR (thread);
drivers/cdrom/cdrom.c +1 -1
@@ -2882,7 +2882,7 @@ static noinline int mmc_ioctl_cdrom_read_data(struct cdrom_device_info *cdi,if (lba <0 )return -EINVAL ; - cgc->buffer =kmalloc (blocksize,GFP_KERNEL ); + cgc->buffer =kzalloc (blocksize,GFP_KERNEL );if (cgc->buffer ==NULL )return -ENOMEM ;
drivers/power/charger-manager.c +1 -1
@@ -330,7 +330,7 @@ static void uevent_notify(struct charger_manager *cm, const char *event)strncpy (env_str, event,UEVENT_BUF_SIZE );kobject_uevent (&cm->dev->kobj,KOBJ_CHANGE ); -dev_info (cm->dev, event); +dev_info (cm->dev,"%s" , event); }/**
drivers/scsi/osd/osd_uld.c +1 -1
@@ -465,7 +465,7 @@ static int osd_probe(struct device *dev) oud->class_dev.class = &osd_uld_class; oud->class_dev.parent = dev; oud->class_dev.release = __remove; - error =dev_set_name (&oud->class_dev, disk->disk_name); + error =dev_set_name (&oud->class_dev,"%s" , disk->disk_name);if (error) {OSD_ERR ("dev_set_name failed => %d\n" , error); goto err_put_cdev;
drivers/scsi/sd.c +1 -1
@@ -140,7 +140,7 @@ sd_store_cache_type(struct device *dev, struct device_attribute *attr,char *buffer_data;struct scsi_mode_data data;struct scsi_sense_hdr sshdr; -const char *temp ="temporary " ; +static const char temp[] ="temporary " ;int len;if (sdp->type !=TYPE_DISK )
drivers/tty/serial/8250/8250_pci.c +0 -4
@@ -4086,10 +4086,6 @@ static struct pci_device_id serial_pci_tbl[] = {PCI_VENDOR_ID_IBM ,0x0299 , 0, 0, pbn_b0_bt_2_115200 }, - { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835, -0x1000 ,0x0012 , - 0, 0, pbn_b0_bt_2_115200 }, - { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9901,0xA000 ,0x1000 , 0, 0, pbn_b0_1_115200 },
fs/hpfs/map.c +2 -1
@@ -17,7 +17,8 @@ unsigned int *hpfs_map_bitmap(struct super_block *s, unsigned bmp_block, struct quad_buffer_head *qbh, char *id) { secno sec; -if (hpfs_sb (s)->sb_chk)if (bmp_block *16384 >hpfs_sb (s)->sb_fs_size) { +unsigned n_bands = (hpfs_sb (s)->sb_fs_size +0x3fff ) >>14 ; +if (hpfs_sb (s)->sb_chk)if (bmp_block >= n_bands) {hpfs_error (s,"hpfs_map_bitmap called with bad parameter: %08x at %s" , bmp_block, id);return NULL ; }
fs/hpfs/super.c +7 -1
@@ -552,7 +552,13 @@ static int hpfs_fill_super(struct super_block *s, void *options, int silent) sbi->sb_cp_table =NULL ; sbi->sb_c_bitmap =-1 ; sbi->sb_max_fwd_alloc =0xffffff ; - + +if (sbi->sb_fs_size >=0x80000000 ) { +hpfs_error (s,"invalid size in superblock: %08x" , + (unsigned )sbi->sb_fs_size); + goto bail4; + } +/* Load bitmap directory */ if (!(sbi->sb_bmp_dir =hpfs_load_bitmap_directory (s,le32_to_cpu (superblock->bitmaps)))) goto bail4;
fs/nfsd/nfs4xdr.c +1 -1
@@ -161,8 +161,8 @@ static __be32 *read_buf(struct nfsd4_compoundargs *argp, u32 nbytes)*/ memcpy (p, argp->p, avail);/* step to next page */ - argp->p =page_address (argp->pagelist[0 ]); argp->pagelist++; + argp->p =page_address (argp->pagelist[0 ]);if (argp->pagelen <PAGE_SIZE ) { argp->end = argp->p + (argp->pagelen>>2 ); argp->pagelen =0 ;
kernel/time/tick-sched.c +0 -1
@@ -145,7 +145,6 @@ static void tick_nohz_update_jiffies(ktime_t now)tick_do_update_jiffies64 (now);local_irq_restore (flags); -calc_load_exit_idle ();touch_softlockup_watchdog (); }
net/ceph/auth_none.c +6 -0
@@ -39,6 +39,11 @@ static int should_authenticate(struct ceph_auth_client *ac)return xi->starting; } +static int build_request (struct ceph_auth_client *ac,void *buf,void *end) +{ +return 0 ; +} +/* * the generic auth code decode the global_id, and we carry no actual * authenticate state, so nothing happens here.
@@ -106,6 +111,7 @@ static const struct ceph_auth_client_ops ceph_auth_none_ops = { .destroy = destroy, .is_authenticated = is_authenticated, .should_authenticate = should_authenticate, + .build_request = build_request, .handle_reply = handle_reply, .create_authorizer = ceph_auth_none_create_authorizer, .destroy_authorizer = ceph_auth_none_destroy_authorizer,