Linux 3.0.70
Greg KH
maintainerI'm announcing the release of the 3.0.70 kernel.
All users of the 3.0 kernel series must upgrade.
The updated 3.0.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.0.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
------------
Makefile | 2 arch/powerpc/kernel/cputable.c | 2 arch/s390/include/asm/tlbflush.h | 2 arch/x86/kernel/cpu/perf_event_intel_ds.c | 10 arch/x86/power/cpu.c | 2 drivers/block/loop.c | 2 drivers/char/hw_random/virtio-rng.c | 13 + drivers/gpu/drm/i915/i915_gem.c | 5 drivers/hwmon/lineage-pem.c | 2 drivers/hwmon/sht15.c | 2 drivers/md/md.c | 4 drivers/net/tun.c | 2 drivers/staging/vt6656/main_usb.c | 4 drivers/tty/pty.c | 1 drivers/tty/serial/Kconfig | 2 drivers/usb/class/cdc-wdm.c | 23 +- drivers/usb/host/ehci-q.c | 18 + drivers/usb/serial/cp210x.c | 20 + drivers/usb/serial/option.c | 5 drivers/usb/serial/qcaux.c | 1 drivers/usb/storage/initializers.c | 76 ------ drivers/usb/storage/initializers.h | 4 drivers/usb/storage/unusual_devs.h | 329 +++++++++++++++++++++++++++++- drivers/w1/w1.c | 3 fs/block_dev.c | 4 fs/btrfs/volumes.c | 6 fs/ext3/super.c | 4 include/linux/perf_event.h | 6 kernel/signal.c | 3 net/core/dev.c | 1 net/core/rtnetlink.c | 1 net/dcb/dcbnl.c | 7 net/ipv4/tcp_input.c | 6 net/ipv6/ip6_input.c | 3 net/ipv6/route.c | 3 net/l2tp/l2tp_ppp.c | 1 net/netlabel/netlabel_unlabeled.c | 27 +- net/rds/message.c | 3 security/selinux/xfrm.c | 2 sound/core/seq/seq_timer.c | 8 tools/perf/util/trace-event-parse.c | 2 41 files changed, 488 insertions(+), 133 deletions(-)
Alan Stern (1):
USB: EHCI: don't check DMA values in QH overlays
Amit Shah (1):
virtio: rng: disallow multiple device registrations, fixes crashes
Axel Lin (1):
hwmon: (lineage-pem) Add missing terminating entry for pem_[input|fan]_attributes
Ben Hutchings (1):
hwmon: (sht15) Fix memory leak if regulator_enable() fails
Benjamin Herrenschmidt (1):
powerpc: Fix cputable entry for 970MP rev 1.0
Bjørn Mork (2):
USB: option: add Huawei E5331
USB: storage: fix Huawei mode switching regression
Christian Schmiedl (1):
USB: added support for Cinterion's products AH6 and PLS8
Cong Wang (1):
rds: limit the size allocated by rds_message_alloc()
Cristian Bercaru (1):
bridging: fix rx_handlers return code
Dan Carpenter (1):
selinux: use GFP_ATOMIC under spin_lock
Dan Williams (1):
qcaux: add Franklin U600
David Rientjes (1):
perf,x86: fix link failure for non-Intel configs
Dmitry Rogozhkin (1):
drm/i915: EBUSY status handling added to i915_gem_fault().
Eric Dumazet (1):
tun: add a missing nf_reset() in tun_net_xmit()
Eric Sandeen (1):
btrfs: use rcu_barrier() to wait for bdev puts at unmount
Greg Kroah-Hartman (2):
Revert duplicated perf commit.
Linux 3.0.70
Guillaume Nault (1):
l2tp: Restore socket refcount when sendmsg succeeds
Guo Chao (2):
block: use i_size_write() in bd_set_size()
loopdev: fix a deadlock
Hannes Frederic Sowa (1):
ipv6: stop multicast forwarding to process interface scoped addresses
Heiko Carstens (1):
s390/mm: fix flush_tlb_kernel_range()
Jiri Slaby (1):
TTY: do not reset master's packet mode
Kees Cook (1):
signal: always clear sa_restorer on execve
Lars-Peter Clausen (1):
ext3: Fix format string issues
Linus Torvalds (1):
perf,x86: fix wrmsr_on_cpu() warning on suspend/resume
Lorenzo Colitti (1):
net: ipv6: Don't purge default router if accept_ra=2
Malcolm Priestley (1):
staging: vt6656: Fix oops on resume from suspend.
Marcin Jurkowski (1):
w1: fix oops when w1_search is called from netlink connector
Mathias Krause (2):
rtnl: fix info leak on RTM_GETLINK request for VF devices
dcbnl: fix various netlink info leaks
Matwey V. Kornilov (1):
usb: cp210x new Vendor/Device IDs
Neal Cardwell (1):
tcp: fix double-counted receiver RTT when leaving receiver fast path
Oliver Neukum (1):
USB: cdc-wdm: fix buffer overflow
Paul Bolle (1):
tty: serial: fix typo "ARCH_S5P6450"
Paul Moore (1):
netlabel: correctly list all the static label mappings
Sebastian Riemer (1):
md: protect against crash upon fsync on ro array
Stephane Eranian (1):
perf,x86: fix kernel crash with PEBS/BTS after suspend/resume
Steve Conklin (1):
usb: serial: Add Rigblaster Advantage to device table
Takashi Iwai (1):
ALSA: seq: Fix missing error handling in snd_seq_timer_open()
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 0 -SUBLEVEL = 69 +SUBLEVEL = 70 EXTRAVERSION = NAME = Sneaky Weasel
arch/powerpc/kernel/cputable.c +1 -1
@@ -268,7 +268,7 @@ static struct cpu_spec __initdata cpu_specs[] = { .cpu_features = CPU_FTRS_PPC970, .cpu_user_features =COMMON_USER_POWER4 | PPC_FEATURE_HAS_ALTIVEC_COMP, - .mmu_features = MMU_FTR_HPTE_TABLE, + .mmu_features = MMU_FTRS_PPC970, .icache_bsize = 128, .dcache_bsize = 128, .num_pmcs = 8,
arch/s390/include/asm/tlbflush.h +0 -2
@@ -73,8 +73,6 @@ static inline void __tlb_flush_idte(unsigned long asce)static inline void __tlb_flush_mm (struct mm_struct * mm) { -if (unlikely (cpumask_empty (mm_cpumask (mm)))) -return ;/* * If the machine has IDTE we prefer to do a per mm flush * on all cpus instead of doing a local flush if the mm
arch/x86/kernel/cpu/perf_event_intel_ds.c +10 -0
@@ -754,6 +754,16 @@ static void intel_ds_init(void) } } +void perf_restore_debug_store (void ) +{ +struct debug_store *ds =__this_cpu_read (cpu_hw_events.ds); + +if (!x86_pmu.bts && !x86_pmu.pebs) +return ; + +wrmsrl (MSR_IA32_DS_AREA , (unsigned long )ds); +} +#else /* CONFIG_CPU_SUP_INTEL */ static void reserve_ds_buffers (void )
arch/x86/power/cpu.c +2 -0
@@ -10,6 +10,7 @@#include <linux/suspend.h> #include <linux/smp.h> +#include <linux/perf_event.h> #include <asm/pgtable.h> #include <asm/proto.h>
@@ -224,6 +225,7 @@ static void __restore_processor_state(struct saved_context *ctxt)do_fpu_end ();mtrr_bp_restore (); +perf_restore_debug_store (); }/* Needed by apm.c */
drivers/block/loop.c +0 -2
@@ -1274,11 +1274,9 @@ static int loop_set_capacity(struct loop_device *lo, struct block_device *bdev)/* the width of sector_t may be narrow for bit-shift */ sz = sec; sz <<=9 ; -mutex_lock (&bdev->bd_mutex);bd_set_size (bdev, sz);/* let user-space know about the new size */ kobject_uevent (&disk_to_dev (bdev->bd_disk)->kobj,KOBJ_CHANGE ); -mutex_unlock (&bdev->bd_mutex); out:return err;
drivers/char/hw_random/virtio-rng.c +11 -2
@@ -88,14 +88,22 @@ static int virtrng_probe(struct virtio_device *vdev) {int err; +if (vq) { +/* We only support one device for now */ +return -EBUSY ; + }/* We expect a single virtqueue. */ vq =virtio_find_single_vq (vdev, random_recv_done,"input" ); -if (IS_ERR (vq)) -return PTR_ERR (vq); +if (IS_ERR (vq)) { + err =PTR_ERR (vq); + vq =NULL ; +return err; + } err =hwrng_register (&virtio_hwrng);if (err) { vdev->config->del_vqs (vdev); + vq =NULL ;return err; }
@@ -107,6 +115,7 @@ static void __devexit virtrng_remove(struct virtio_device *vdev) vdev->config->reset (vdev);hwrng_unregister (&virtio_hwrng); vdev->config->del_vqs (vdev); + vq =NULL ; }static struct virtio_device_id id_table[] = {
drivers/gpu/drm/i915/i915_gem.c +5 -0
@@ -1256,6 +1256,11 @@ out:case 0 :case -ERESTARTSYS :case -EINTR : +case -EBUSY : +/* +* EBUSY is ok: this just means that another thread +* already did the job. +*/ return VM_FAULT_NOPAGE ;case -ENOMEM :return VM_FAULT_OOM ;
drivers/hwmon/lineage-pem.c +2 -0
@@ -421,6 +421,7 @@ static struct attribute *pem_input_attributes[] = { &sensor_dev_attr_in2_input.dev_attr.attr, &sensor_dev_attr_curr1_input.dev_attr.attr, &sensor_dev_attr_power1_input.dev_attr.attr, +NULL }; static const struct attribute_group pem_input_group = {
@@ -431,6 +432,7 @@ static struct attribute *pem_fan_attributes[] = { &sensor_dev_attr_fan1_input.dev_attr.attr, &sensor_dev_attr_fan2_input.dev_attr.attr, &sensor_dev_attr_fan3_input.dev_attr.attr, +NULL }; static const struct attribute_group pem_fan_group = {
drivers/hwmon/sht15.c +1 -1
@@ -930,7 +930,7 @@ static int __devinit sht15_probe(struct platform_device *pdev)if (ret !=0 ) {dev_err (&pdev->dev,"failed to enable regulator: %d\n" , ret); -return ret; + goto err_free_data; }/*
drivers/md/md.c +4 -0
@@ -299,6 +299,10 @@ static int md_make_request(struct request_queue *q, struct bio *bio)bio_io_error (bio);return 0 ; } +if (mddev->ro ==1 &&unlikely (rw ==WRITE )) { +bio_endio (bio,bio_sectors (bio) ==0 ?0 : -EROFS ); +return 0 ; + }smp_rmb ();/* Ensure implications of 'active' are visible */ rcu_read_lock ();if (mddev->suspended) {
drivers/net/tun.c +2 -0
@@ -417,6 +417,8 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev)* for indefinite time. */ skb_orphan (skb); +nf_reset (skb); +/* Enqueue packet */ skb_queue_tail (&tun->socket.sk->sk_receive_queue, skb);
drivers/staging/vt6656/main_usb.c +0 -4
@@ -725,8 +725,6 @@ static int vt6656_suspend(struct usb_interface *intf, pm_message_t message)if (device->flags &DEVICE_FLAGS_OPENED )device_close (device->dev); -usb_put_dev (interface_to_usbdev (intf)); -return 0 ; }
@@ -737,8 +735,6 @@ static int vt6656_resume(struct usb_interface *intf)if (!device || !device->dev)return -ENODEV ; -usb_get_dev (interface_to_usbdev (intf)); -if (!(device->flags &DEVICE_FLAGS_OPENED ))device_open (device->dev);
drivers/tty/pty.c +0 -1
@@ -49,7 +49,6 @@ static void pty_close(struct tty_struct *tty, struct file *filp) tty->packet =0 ;if (!tty->link)return ; - tty->link->packet =0 ;set_bit (TTY_OTHER_CLOSED , &tty->link->flags);wake_up_interruptible (&tty->link->read_wait);wake_up_interruptible (&tty->link->write_wait);
drivers/tty/serial/Kconfig +1 -1
@@ -458,7 +458,7 @@ config SERIAL_SAMSUNG_UARTS int depends on ARM && PLAT_SAMSUNG default 2 if ARCH_S3C2400 - default 6 if ARCH_S5P6450 + default 6 if CPU_S5P6450 default 4 if SERIAL_SAMSUNG_UARTS_4 default 3 help
drivers/usb/class/cdc-wdm.c +20 -3
@@ -54,6 +54,7 @@ MODULE_DEVICE_TABLE (usb, wdm_ids);#define WDM_POLL_RUNNING 6#define WDM_RESPONDING 7#define WDM_SUSPENDING 8 +#define WDM_OVERFLOW 10#define WDM_MAX 16
@@ -118,6 +119,7 @@ static void wdm_in_callback(struct urb *urb) {struct wdm_device *desc = urb->context;int status = urb->status; +int length = urb->actual_length;spin_lock (&desc->iuspin);clear_bit (WDM_RESPONDING , &desc->flags);
@@ -148,9 +150,17 @@ static void wdm_in_callback(struct urb *urb) } desc->rerr = status; - desc->reslength = urb->actual_length; -memmove (desc->ubuf + desc->length, desc->inbuf, desc->reslength); - desc->length += desc->reslength; +if (length + desc->length > desc->wMaxCommand) { +/* The buffer would overflow */ +set_bit (WDM_OVERFLOW , &desc->flags); + }else { +/* we may already be in overflow */ +if (!test_bit (WDM_OVERFLOW , &desc->flags)) { +memmove (desc->ubuf + desc->length, desc->inbuf, length); + desc->length += length; + desc->reslength = length; + } + } skip_error:wake_up (&desc->wait);
@@ -417,6 +427,11 @@ retry: rv = -ENODEV ; goto err; } +if (test_bit (WDM_OVERFLOW , &desc->flags)) { +clear_bit (WDM_OVERFLOW , &desc->flags); + rv = -ENOBUFS ; + goto err; + } i++;if (file->f_flags &O_NONBLOCK ) {if (!test_bit (WDM_READ , &desc->flags)) {
@@ -456,6 +471,7 @@ retry:spin_unlock_irq (&desc->iuspin); goto retry; } +if (!desc->reslength) {/* zero length read */ dev_dbg (&desc->intf->dev,"%s: zero length - clearing WDM_READ\n" , __func__);clear_bit (WDM_READ , &desc->flags);
@@ -901,6 +917,7 @@ static int wdm_post_reset(struct usb_interface *intf)struct wdm_device *desc =usb_get_intfdata (intf);int rv; +clear_bit (WDM_OVERFLOW , &desc->flags); rv =recover_from_urb_loss (desc);mutex_unlock (&desc->wlock);mutex_unlock (&desc->rlock);
drivers/usb/host/ehci-q.c +13 -5
@@ -137,7 +137,7 @@ qh_refresh (struct ehci_hcd *ehci, struct ehci_qh *qh)* qtd is updated in qh_completions(). Update the QH * overlay here. */ -if (cpu_to_hc32 (ehci, qtd->qtd_dma) == qh->hw->hw_current) { +if (qh->hw->hw_token &ACTIVE_BIT (ehci)) { qh->hw->hw_qtd_next = qtd->hw_next; qtd =NULL ; }
@@ -450,11 +450,19 @@ qh_completions (struct ehci_hcd *ehci, struct ehci_qh *qh)else if (last_status == -EINPROGRESS && !urb->unlinked)continue ; -/* qh unlinked; token in overlay may be most current */ -if (state ==QH_STATE_IDLE - &&cpu_to_hc32 (ehci, qtd->qtd_dma) - == hw->hw_current) { +/* +* If this was the active qtd when the qh was unlinked +* and the overlay's token is active, then the overlay +* hasn't been written back to the qtd yet so use its +* token instead of the qtd's. After the qtd is +* processed and removed, the overlay won't be valid +* any more. +*/ +if (state ==QH_STATE_IDLE && + qh->qtd_list.next == &qtd->qtd_list && + (hw->hw_token &ACTIVE_BIT (ehci))) { token =hc32_to_cpu (ehci, hw->hw_token); + hw->hw_token &= ~ACTIVE_BIT (ehci);/* An unlink may leave an incomplete * async transaction in the TT buffer.
drivers/usb/serial/cp210x.c +20 -0
@@ -91,6 +91,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x10C4, 0x813F) }, /* Tams Master Easy Control */ { USB_DEVICE(0x10C4, 0x814A) }, /* West Mountain Radio RIGblaster P&P */ { USB_DEVICE(0x10C4, 0x814B) }, /* West Mountain Radio RIGtalk */ + { USB_DEVICE(0x2405, 0x0003) }, /* West Mountain Radio RIGblaster Advantage */ { USB_DEVICE(0x10C4, 0x8156) }, /* B&G H3000 link cable */ { USB_DEVICE(0x10C4, 0x815E) }, /* Helicomm IP-Link 1220-DVM */ { USB_DEVICE(0x10C4, 0x815F) }, /* Timewave HamLinkUSB */
@@ -156,6 +157,25 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x1BE3, 0x07A6) }, /* WAGO 750-923 USB Service Cable */ { USB_DEVICE(0x1E29, 0x0102) }, /* Festo CPX-USB */ { USB_DEVICE(0x1E29, 0x0501) }, /* Festo CMSP */ + { USB_DEVICE(0x1FB9, 0x0100) }, /* Lake Shore Model 121 Current Source */ + { USB_DEVICE(0x1FB9, 0x0200) }, /* Lake Shore Model 218A Temperature Monitor */ + { USB_DEVICE(0x1FB9, 0x0201) }, /* Lake Shore Model 219 Temperature Monitor */ + { USB_DEVICE(0x1FB9, 0x0202) }, /* Lake Shore Model 233 Temperature Transmitter */ + { USB_DEVICE(0x1FB9, 0x0203) }, /* Lake Shore Model 235 Temperature Transmitter */ + { USB_DEVICE(0x1FB9, 0x0300) }, /* Lake Shore Model 335 Temperature Controller */ + { USB_DEVICE(0x1FB9, 0x0301) }, /* Lake Shore Model 336 Temperature Controller */ + { USB_DEVICE(0x1FB9, 0x0302) }, /* Lake Shore Model 350 Temperature Controller */ + { USB_DEVICE(0x1FB9, 0x0303) }, /* Lake Shore Model 371 AC Bridge */ + { USB_DEVICE(0x1FB9, 0x0400) }, /* Lake Shore Model 411 Handheld Gaussmeter */ + { USB_DEVICE(0x1FB9, 0x0401) }, /* Lake Shore Model 425 Gaussmeter */ + { USB_DEVICE(0x1FB9, 0x0402) }, /* Lake Shore Model 455A Gaussmeter */ + { USB_DEVICE(0x1FB9, 0x0403) }, /* Lake Shore Model 475A Gaussmeter */ + { USB_DEVICE(0x1FB9, 0x0404) }, /* Lake Shore Model 465 Three Axis Gaussmeter */ + { USB_DEVICE(0x1FB9, 0x0600) }, /* Lake Shore Model 625A Superconducting MPS */ + { USB_DEVICE(0x1FB9, 0x0601) }, /* Lake Shore Model 642A Magnet Power Supply */ + { USB_DEVICE(0x1FB9, 0x0602) }, /* Lake Shore Model 648 Magnet Power Supply */ + { USB_DEVICE(0x1FB9, 0x0700) }, /* Lake Shore Model 737 VSM Controller */ + { USB_DEVICE(0x1FB9, 0x0701) }, /* Lake Shore Model 776 Hall Matrix */ { USB_DEVICE(0x3195, 0xF190) }, /* Link Instruments MSO-19 */ { USB_DEVICE(0x3195, 0xF280) }, /* Link Instruments MSO-28 */ { USB_DEVICE(0x3195, 0xF281) }, /* Link Instruments MSO-28 */
drivers/usb/serial/option.c +5 -0
@@ -341,6 +341,8 @@ static void option_instat_callback(struct urb *urb);#define CINTERION_PRODUCT_EU3_E 0x0051#define CINTERION_PRODUCT_EU3_P 0x0052#define CINTERION_PRODUCT_PH8 0x0053 +#define CINTERION_PRODUCT_AH6 0x0055 +#define CINTERION_PRODUCT_PLS8 0x0060/* Olivetti products */ #define OLIVETTI_VENDOR_ID 0x0b3c
@@ -579,6 +581,7 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE(QUANTA_VENDOR_ID, 0xea42), .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c05, USB_CLASS_COMM, 0x02, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c1f, USB_CLASS_COMM, 0x02, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c23, USB_CLASS_COMM, 0x02, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t) &net_intf1_blacklist },
@@ -1260,6 +1263,8 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EU3_E) }, { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EU3_P) }, { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PH8) }, + { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AH6) }, + { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PLS8) }, { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) }, { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) }, { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC25_MDM) },
drivers/usb/serial/qcaux.c +1 -0
@@ -69,6 +69,7 @@ static struct usb_device_id id_table[] = { { USB_VENDOR_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, 0xff, 0xfd, 0xff) }, /* NMEA */ { USB_VENDOR_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, 0xff, 0xfe, 0xff) }, /* WMC */ { USB_VENDOR_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, 0xff, 0xff, 0xff) }, /* DIAG */ + { USB_DEVICE_AND_INTERFACE_INFO(0x1fac, 0x0151, 0xff, 0xff, 0xff) }, { }, };MODULE_DEVICE_TABLE (usb, id_table);
drivers/usb/storage/initializers.c +2 -74
85 lines not on this page · raw message
drivers/usb/storage/initializers.h +2 -2
@@ -46,5 +46,5 @@ int usb_stor_euscsi_init(struct us_data *us);* flash reader */ int usb_stor_ucr61s2b_init (struct us_data *us); -/* This places the HUAWEI usb dongles in multi-port mode */ -int usb_stor_huawei_init (struct us_data *us); +/* This places the HUAWEI E220 devices in multi-port mode */ +int usb_stor_huawei_e220_init (struct us_data *us);
drivers/usb/storage/unusual_devs.h +327 -2
337 lines not on this page · raw message
drivers/w1/w1.c +2 -1
@@ -918,7 +918,8 @@ void w1_search(struct w1_master *dev, u8 search_type, w1_slave_found_callback cb tmp64 = (triplet_ret >>2 ); rn |= (tmp64 << i); -if (kthread_should_stop ()) { +/* ensure we're called from kthread and not by netlink callback */ +if (!dev->priv &&kthread_should_stop ()) {dev_dbg (&dev->dev,"Abort w1_search\n" );return ; }
fs/block_dev.c +3 -1
@@ -1052,7 +1052,9 @@ void bd_set_size(struct block_device *bdev, loff_t size) {unsigned bsize =bdev_logical_block_size (bdev); - bdev->bd_inode->i_size = size; +mutex_lock (&bdev->bd_inode->i_mutex); +i_size_write (bdev->bd_inode, size); +mutex_unlock (&bdev->bd_inode->i_mutex);while (bsize <PAGE_CACHE_SIZE ) {if (size & bsize)break ;
fs/btrfs/volumes.c +6 -0
@@ -546,6 +546,12 @@ int btrfs_close_devices(struct btrfs_fs_devices *fs_devices)__btrfs_close_devices (fs_devices);free_fs_devices (fs_devices); } +/* +* Wait for rcu kworkers under __btrfs_close_devices +* to finish all blkdev_puts so device is really +* free when umount is done. +*/ +rcu_barrier ();return ret; }
fs/ext3/super.c +2 -2
@@ -371,7 +371,7 @@ static struct block_device *ext3_blkdev_get(dev_t dev, struct super_block *sb)return bdev; fail: -ext3_msg (sb,"error: failed to open journal device %s: %ld" , +ext3_msg (sb,KERN_ERR ,"error: failed to open journal device %s: %ld" ,__bdevname (dev, b),PTR_ERR (bdev));return NULL ;
@@ -892,7 +892,7 @@ static ext3_fsblk_t get_sb_block(void **data, struct super_block *sb)/*todo: use simple_strtoll with >32bit ext3 */ sb_block =simple_strtoul (options, &options,0 );if (*options && *options !=',' ) { -ext3_msg (sb,"error: invalid sb specification: %s" , +ext3_msg (sb,KERN_ERR ,"error: invalid sb specification: %s" , (char *) *data);return 1 ; }
include/linux/perf_event.h +6 -0
@@ -1189,6 +1189,12 @@ static inline void perf_event_disable(struct perf_event *event) { }static inline void perf_event_task_tick (void ) { }#endif +#if defined(CONFIG_PERF_EVENTS ) && defined(CONFIG_CPU_SUP_INTEL ) +extern void perf_restore_debug_store (void ); +#else +static inline void perf_restore_debug_store (void ) { } +#endif +#define perf_output_put (handle, x) perf_output_copy((handle), &(x), sizeof(x))/*
kernel/signal.c +3 -0
@@ -437,6 +437,9 @@ flush_signal_handlers(struct task_struct *t, int force_default)if (force_default || ka->sa.sa_handler !=SIG_IGN ) ka->sa.sa_handler =SIG_DFL ; ka->sa.sa_flags =0 ; +#ifdef SA_RESTORER + ka->sa.sa_restorer =NULL ; +#endif sigemptyset (&ka->sa.sa_mask); ka++; }
net/core/dev.c +1 -0
@@ -3165,6 +3165,7 @@ ncls: }switch (rx_handler (&skb)) {case RX_HANDLER_CONSUMED : + ret =NET_RX_SUCCESS ; goto out;case RX_HANDLER_ANOTHER : goto another_round;
net/core/rtnetlink.c +1 -0
@@ -963,6 +963,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,struct ifla_vf_mac vf_mac;struct ifla_vf_vlan vf_vlan;struct ifla_vf_tx_rate vf_tx_rate; +memset (ivi.mac,0 ,sizeof (ivi.mac));if (dev->netdev_ops->ndo_get_vf_config (dev, i, &ivi))break ; vf_mac.vf = vf_vlan.vf = vf_tx_rate.vf = ivi.vf;
net/dcb/dcbnl.c +7 -0
@@ -335,6 +335,7 @@ static int dcbnl_getperm_hwaddr(struct net_device *netdev, struct nlattr **tb, dcb->dcb_family =AF_UNSPEC ; dcb->cmd =DCB_CMD_GPERM_HWADDR ; +memset (perm_addr,0 ,sizeof (perm_addr)); netdev->dcbnl_ops->getpermhwaddr (netdev, perm_addr); ret = nla_put(dcbnl_skb, DCB_ATTR_PERM_HWADDR, sizeof(perm_addr),
@@ -1311,6 +1312,7 @@ static int dcbnl_ieee_get(struct net_device *netdev, struct nlattr **tb,if (ops->ieee_getets) {struct ieee_ets ets; +memset (&ets,0 ,sizeof (ets)); err = ops->ieee_getets (netdev, &ets);if (!err)NLA_PUT (skb,DCB_ATTR_IEEE_ETS ,sizeof (ets), &ets);
@@ -1318,6 +1320,7 @@ static int dcbnl_ieee_get(struct net_device *netdev, struct nlattr **tb,if (ops->ieee_getpfc) {struct ieee_pfc pfc; +memset (&pfc,0 ,sizeof (pfc)); err = ops->ieee_getpfc (netdev, &pfc);if (!err)NLA_PUT (skb,DCB_ATTR_IEEE_PFC ,sizeof (pfc), &pfc);
@@ -1344,6 +1347,7 @@ static int dcbnl_ieee_get(struct net_device *netdev, struct nlattr **tb,/* get peer info if available */ if (ops->ieee_peer_getets) {struct ieee_ets ets; +memset (&ets,0 ,sizeof (ets)); err = ops->ieee_peer_getets (netdev, &ets);if (!err)NLA_PUT (skb,DCB_ATTR_IEEE_PEER_ETS ,sizeof (ets), &ets);
@@ -1351,6 +1355,7 @@ static int dcbnl_ieee_get(struct net_device *netdev, struct nlattr **tb,if (ops->ieee_peer_getpfc) {struct ieee_pfc pfc; +memset (&pfc,0 ,sizeof (pfc)); err = ops->ieee_peer_getpfc (netdev, &pfc);if (!err)NLA_PUT (skb,DCB_ATTR_IEEE_PEER_PFC ,sizeof (pfc), &pfc);
@@ -1551,6 +1556,7 @@ static int dcbnl_cee_get(struct net_device *netdev, struct nlattr **tb,/* get peer info if available */ if (ops->cee_peer_getpg) {struct cee_pg pg; +memset (&pg,0 ,sizeof (pg)); err = ops->cee_peer_getpg (netdev, &pg);if (!err)NLA_PUT (skb,DCB_ATTR_CEE_PEER_PG ,sizeof (pg), &pg);
@@ -1558,6 +1564,7 @@ static int dcbnl_cee_get(struct net_device *netdev, struct nlattr **tb,if (ops->cee_peer_getpfc) {struct cee_pfc pfc; +memset (&pfc,0 ,sizeof (pfc)); err = ops->cee_peer_getpfc (netdev, &pfc);if (!err)NLA_PUT (skb,DCB_ATTR_CEE_PEER_PFC ,sizeof (pfc), &pfc);
net/ipv4/tcp_input.c +3 -3
@@ -5419,6 +5419,9 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb,if (tcp_checksum_complete_user (sk, skb)) goto csum_error; +if ((int )skb->truesize > sk->sk_forward_alloc) + goto step5; +/* Predicted packet is in window by definition. * seq == rcv_nxt and rcv_wup <= rcv_nxt. * Hence, check seq<=rcv_wup reduces to:
@@ -5430,9 +5433,6 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb,tcp_rcv_rtt_measure_ts (sk, skb); -if ((int )skb->truesize > sk->sk_forward_alloc) - goto step5; -NET_INC_STATS_BH (sock_net (sk),LINUX_MIB_TCPHPHITS );/* Bulk data transfer: receiver */
net/ipv6/ip6_input.c +2 -1
@@ -257,7 +257,8 @@ int ip6_mc_input(struct sk_buff *skb)* IPv6 multicast router mode is now supported ;) */ if (dev_net (skb->dev)->ipv6.devconf_all->mc_forwarding && - !(ipv6_addr_type (&hdr->daddr) &IPV6_ADDR_LINKLOCAL ) && + !(ipv6_addr_type (&hdr->daddr) & + (IPV6_ADDR_LOOPBACK |IPV6_ADDR_LINKLOCAL )) &&likely (!(IP6CB (skb)->flags &IP6SKB_FORWARDED ))) {/* * Okay, we try to forward - split and duplicate
net/ipv6/route.c +2 -1
@@ -1885,7 +1885,8 @@ void rt6_purge_dflt_routers(struct net *net) restart:read_lock_bh (&table->tb6_lock);for (rt = table->tb6_root.leaf; rt; rt = rt->dst.rt6_next) { -if (rt->rt6i_flags & (RTF_DEFAULT |RTF_ADDRCONF )) { +if (rt->rt6i_flags & (RTF_DEFAULT |RTF_ADDRCONF ) && + (!rt->rt6i_idev || rt->rt6i_idev->cnf.accept_ra !=2 )) {dst_hold (&rt->dst);read_unlock_bh (&table->tb6_lock);ip6_del_rt (rt);
net/l2tp/l2tp_ppp.c +1 -0
@@ -360,6 +360,7 @@ static int pppol2tp_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghl2tp_xmit_skb (session, skb, session->hdr_len);sock_put (ps->tunnel_sock); +sock_put (sk);return error;
net/netlabel/netlabel_unlabeled.c +11 -16
@@ -1192,8 +1192,6 @@ static int netlbl_unlabel_staticlist(struct sk_buff *skb,struct netlbl_unlhsh_walk_arg cb_arg;u32 skip_bkt = cb->args[0 ];u32 skip_chain = cb->args[1 ]; -u32 skip_addr4 = cb->args[2 ]; -u32 skip_addr6 = cb->args[3 ];u32 iter_bkt;u32 iter_chain =0 , iter_addr4 =0 , iter_addr6 =0 ;struct netlbl_unlhsh_iface *iface;
@@ -1218,7 +1216,7 @@ static int netlbl_unlabel_staticlist(struct sk_buff *skb,continue ;netlbl_af4list_foreach_rcu (addr4, &iface->addr4_list) { -if (iter_addr4++ < skip_addr4) +if (iter_addr4++ < cb->args[2 ])continue ; if (netlbl_unlabel_staticlist_gen( NLBL_UNLABEL_C_STATICLIST,
@@ -1234,7 +1232,7 @@ static int netlbl_unlabel_staticlist(struct sk_buff *skb,#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE )netlbl_af6list_foreach_rcu (addr6, &iface->addr6_list) { -if (iter_addr6++ < skip_addr6) +if (iter_addr6++ < cb->args[3 ])continue ; if (netlbl_unlabel_staticlist_gen( NLBL_UNLABEL_C_STATICLIST,
@@ -1253,10 +1251,10 @@ static int netlbl_unlabel_staticlist(struct sk_buff *skb, unlabel_staticlist_return:rcu_read_unlock (); - cb->args[0 ] = skip_bkt; - cb->args[1 ] = skip_chain; - cb->args[2 ] = skip_addr4; - cb->args[3 ] = skip_addr6; + cb->args[0 ] = iter_bkt; + cb->args[1 ] = iter_chain; + cb->args[2 ] = iter_addr4; + cb->args[3 ] = iter_addr6;return skb->len; }
@@ -1276,12 +1274,9 @@ static int netlbl_unlabel_staticlistdef(struct sk_buff *skb, {struct netlbl_unlhsh_walk_arg cb_arg;struct netlbl_unlhsh_iface *iface; -u32 skip_addr4 = cb->args[0 ]; -u32 skip_addr6 = cb->args[1 ]; -u32 iter_addr4 =0 ; +u32 iter_addr4 =0 , iter_addr6 =0 ;struct netlbl_af4list *addr4;#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE ) -u32 iter_addr6 =0 ;struct netlbl_af6list *addr6;#endif
@@ -1295,7 +1290,7 @@ static int netlbl_unlabel_staticlistdef(struct sk_buff *skb, goto unlabel_staticlistdef_return; netlbl_af4list_foreach_rcu(addr4, &iface->addr4_list) { -if (iter_addr4++ < skip_addr4) +if (iter_addr4++ < cb->args[0 ])continue ; if (netlbl_unlabel_staticlist_gen(NLBL_UNLABEL_C_STATICLISTDEF, iface,
@@ -1308,7 +1303,7 @@ static int netlbl_unlabel_staticlistdef(struct sk_buff *skb, }#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE ) netlbl_af6list_foreach_rcu(addr6, &iface->addr6_list) { -if (iter_addr6++ < skip_addr6) +if (iter_addr6++ < cb->args[1 ])continue ; if (netlbl_unlabel_staticlist_gen(NLBL_UNLABEL_C_STATICLISTDEF, iface,
@@ -1323,8 +1318,8 @@ static int netlbl_unlabel_staticlistdef(struct sk_buff *skb, unlabel_staticlistdef_return:rcu_read_unlock (); - cb->args[0 ] = skip_addr4; - cb->args[1 ] = skip_addr6; + cb->args[0 ] = iter_addr4; + cb->args[1 ] = iter_addr6;return skb->len; }
net/rds/message.c +3 -0
@@ -196,6 +196,9 @@ struct rds_message *rds_message_alloc(unsigned int extra_len, gfp_t gfp) {struct rds_message *rm; +if (extra_len >KMALLOC_MAX_SIZE -sizeof (struct rds_message )) +return NULL ; + rm =kzalloc (sizeof (struct rds_message ) + extra_len, gfp);if (!rm) goto out;
security/selinux/xfrm.c +1 -1
@@ -310,7 +310,7 @@ int selinux_xfrm_policy_clone(struct xfrm_sec_ctx *old_ctx,if (old_ctx) { new_ctx =kmalloc (sizeof (*old_ctx) + old_ctx->ctx_len, -GFP_KERNEL ); +GFP_ATOMIC );if (!new_ctx)return -ENOMEM ;
sound/core/seq/seq_timer.c +4 -4
@@ -290,10 +290,10 @@ int snd_seq_timer_open(struct snd_seq_queue *q) tid.device =SNDRV_TIMER_GLOBAL_SYSTEM ; err =snd_timer_open (&t, str, &tid, q->queue); } -if (err <0 ) { -snd_printk (KERN_ERR "seq fatal error: cannot create timer (%i)\n" , err); -return err; - } + } +if (err <0 ) { +snd_printk (KERN_ERR "seq fatal error: cannot create timer (%i)\n" , err); +return err; } t->callback = snd_seq_timer_interrupt; t->callback_data = q;
tools/perf/util/trace-event-parse.c +0 -2
@@ -1582,8 +1582,6 @@ process_symbols(struct event *event, struct print_arg *arg, char **tok) field =malloc_or_die (sizeof (*field)); type =process_arg (event, field, &token); -while (type ==EVENT_OP ) - type =process_op (event, field, &token);if (test_type_token (type, token,EVENT_DELIM ,"," )) goto out_free;