Linux 3.18.54
Greg KH
maintainerI'm announcing the release of the 3.18.54 kernel.
All users of the 3.18 kernel series must upgrade.
The updated 3.18.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.18.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/arm64/kernel/perf_event.c | 21 +- arch/arm64/kernel/sys.c | 2 arch/x86/boot/boot.h | 2 arch/x86/um/ptrace_64.c | 2 drivers/hid/hid-core.c | 3 drivers/infiniband/hw/mlx4/main.c | 1 drivers/infiniband/ulp/ipoib/ipoib_fs.c | 3 drivers/infiniband/ulp/ipoib/ipoib_main.c | 44 ++++- drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 3 drivers/md/dm-era-target.c | 8 drivers/md/raid1.c | 2 drivers/net/ppp/ppp_generic.c | 5 drivers/net/usb/cdc_ncm.c | 20 -- drivers/scsi/sg.c | 8 drivers/staging/comedi/drivers/jr3_pci.c | 13 - drivers/staging/gdm724x/gdm_mux.c | 3 drivers/staging/vt6656/usbpipe.c | 31 +++ drivers/target/target_core_file.c | 3 drivers/tty/serial/omap-serial.c | 9 - drivers/usb/core/driver.c | 3 drivers/usb/core/file.c | 9 - drivers/usb/core/hub.c | 6 drivers/usb/host/xhci-mem.c | 2 drivers/usb/misc/legousbtower.c | 37 +++- drivers/usb/misc/usbtest.c | 1 drivers/usb/serial/ftdi_sio.c | 1 drivers/usb/serial/ftdi_sio_ids.h | 6 fs/block_dev.c | 11 - fs/ceph/xattr.c | 3 fs/cifs/cifs_unicode.c | 6 fs/cifs/cifs_unicode.h | 5 fs/cifs/cifssmb.c | 3 fs/cifs/smb2pdu.c | 14 + fs/ext4/ext4_jbd2.c | 6 fs/xattr.c | 2 kernel/events/core.c | 264 +++++++++++++++++++++++------- kernel/padata.c | 2 kernel/sched/core.c | 3 lib/asn1_decoder.c | 21 +- net/bluetooth/hci_sock.c | 3 net/sctp/ipv6.c | 16 + net/unix/af_unix.c | 7 sound/core/seq/seq_queue.c | 2 sound/core/timer.c | 35 ++- 45 files changed, 481 insertions(+), 172 deletions(-)
Ajay Kaher (1):
USB: Proper handling of Race Condition when two USB class drivers try to call init_usb_class simultaneously
Andrey Ryabinin (1):
fs/block_dev: always invalidate cleancache in invalidate_bdev()
Ashish Kalra (1):
x86/boot: Fix BSS corruption/overwrite bug in early x86 kernel startup
Bart Van Assche (1):
target/fileio: Fix zero-length READ and WRITE handling
Benjamin Tissoires (1):
HID: core: prevent out-of-bound readings
Björn Jacke (2):
CIFS: fix mapping of SFM_SPACE and SFM_PERIOD
CIFS: add misssing SFM mapping for doublequote
Bjørn Mork (1):
cdc_ncm: do not call usbnet_link_change from cdc_ncm_bind
Calvin Owens (1):
sg: Fix double-free when drives detach during SG_IO
David Howells (2):
ASN.1: Fix non-match detection failure on data overrun
KEYS: Fix ASN.1 indefinite length object parsing
Eric Dumazet (2):
ipv6: sctp: add rcu protection around np->opt
ipv6: sctp: fix lockdep splat in sctp_v6_get_dst()
Greg Kroah-Hartman (1):
Linux 3.18.54
Guenter Roeck (1):
usb: hub: Do not attempt to autosuspend disconnected devices
Gustavo A. R. Silva (1):
usb: misc: add missing continue in switch
Ian Abbott (2):
staging: comedi: jr3_pci: fix possible null pointer dereference
staging: comedi: jr3_pci: cope with jiffies wraparound
Jack Morgenstein (1):
IB/mlx4: Fix ib device initialization error flow
Jann Horn (1):
sched: panic on corrupted stack end
Jason A. Donenfeld (1):
padata: free correct variable
Johan Hovold (3):
staging: gdm724x: gdm_mux: fix use-after-free on module unload
serial: omap: fix runtime-pm handling on unbind
serial: omap: suspend device on probe errors
Kangjie Lu (3):
ALSA: timer: Fix leak in SNDRV_TIMER_IOCTL_PARAMS
ALSA: timer: Fix leak in events via snd_timer_user_ccallback
ALSA: timer: Fix leak in events via snd_timer_user_tinterrupt
Luis Henriques (1):
ceph: fix memory leak in __ceph_setxattr()
Lukas Czerner (1):
ext4: fix potential use after free in __ext4_journal_stop
Maksim Salau (1):
usb: misc: legousbtower: Fix buffers on stack
Malcolm Priestley (2):
staging: vt6656: use off stack for in buffer USB transfers.
staging: vt6656: use off stack for out buffer USB transfers.
Marek Vasut (1):
USB: serial: ftdi_sio: add device ID for Microsemi/Arrow SF2PLUS Dev Kit
Mark Rutland (1):
arm64: make sys_call_table const
Michal Hocko (1):
fs/xattr.c: zero out memory copied to userspace in getxattr
NeilBrown (1):
md/raid1: avoid reusing a resync bio after error handling.
Peter Chen (1):
usb: host: xhci: print correct command ring address
Peter Zijlstra (2):
perf: Fix event->ctx locking
perf: Fix race in swevent hash
Rainer Weikusat (1):
af_unix: Guard against other == sk in unix_dgram_sendmsg
Richard Weinberger (1):
um: Fix PTRACE_POKEUSER on x86_64
Shamir Rabinovitch (1):
IB/IPoIB: ibX: failed to create mcg debug file
Somasundaram Krishnasamy (1):
dm era: save spacemap metadata root after the pre-commit
Steve French (2):
Set unicode flag on cifs echo request to avoid Mac error
SMB3: Work around mount failure when using SMB3 dialect to Macs
Suzuki K. Poulose (1):
arm64: perf: reject groups spanning multiple HW PMUs
Szymon Janc (1):
Bluetooth: Fix user channel for 32bit userspace on 64bit kernel
Takashi Iwai (2):
ALSA: seq: Fix race at timer setup and close
ALSA: timer: Fix race among timer ioctls
WANG Cong (1):
ppp: defer netns reference release for ppp channel
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 18 -SUBLEVEL = 53 +SUBLEVEL = 54 EXTRAVERSION = NAME = Diseased Newt
arch/arm64/kernel/perf_event.c +15 -6
@@ -316,22 +316,31 @@ out: }static int -validate_event (struct pmu_hw_events *hw_events, -struct perf_event *event) +validate_event (struct pmu *pmu,struct pmu_hw_events *hw_events, +struct perf_event *event) { -struct arm_pmu *armpmu =to_arm_pmu (event->pmu); +struct arm_pmu *armpmu;struct hw_perf_event fake_event = event->hw;struct pmu *leader_pmu = event->group_leader->pmu;if (is_software_event (event))return 1 ; +/* +* Reject groups spanning multiple HW PMUs (e.g. CPU + CCI). The +* core perf code won't check that the pmu->ctx == leader->ctx +* until after pmu->event_init(event). +*/ +if (event->pmu != pmu) +return 0 ; +if (event->pmu != leader_pmu || event->state <PERF_EVENT_STATE_OFF )return 1 ;if (event->state ==PERF_EVENT_STATE_OFF && !event->attr.enable_on_exec)return 1 ; + armpmu =to_arm_pmu (event->pmu);return armpmu->get_event_idx (hw_events, &fake_event) >=0 ; }
@@ -349,15 +358,15 @@ validate_group(struct perf_event *event)memset (fake_used_mask,0 ,sizeof (fake_used_mask)); fake_pmu.used_mask = fake_used_mask; -if (!validate_event (&fake_pmu, leader)) +if (!validate_event (event->pmu, &fake_pmu, leader))return -EINVAL ;list_for_each_entry (sibling, &leader->sibling_list, group_entry) { -if (!validate_event (&fake_pmu, sibling)) +if (!validate_event (event->pmu, &fake_pmu, sibling))return -EINVAL ; } -if (!validate_event (&fake_pmu, event)) +if (!validate_event (event->pmu, &fake_pmu, event))return -EINVAL ;return 0 ;
arch/arm64/kernel/sys.c +1 -1
@@ -50,7 +50,7 @@ asmlinkage long sys_mmap(unsigned long addr, unsigned long len,* The sys_call_table array must be 4K aligned to be accessible from * kernel/entry.S. */ -void *sys_call_table[__NR_syscalls]__aligned(4096) = { +void *const sys_call_table[__NR_syscalls]__aligned(4096) = { [0 ... __NR_syscalls -1 ] = sys_ni_syscall, #include <asm/unistd.h> };
arch/x86/boot/boot.h +1 -1
@@ -16,7 +16,7 @@#ifndef BOOT_BOOT_H #define BOOT_BOOT_H -#define STACK_SIZE 512/* Minimum number of bytes for stack */ +#define STACK_SIZE 1024/* Minimum number of bytes for stack */ #ifndef __ASSEMBLY__
arch/x86/um/ptrace_64.c +1 -1
@@ -120,7 +120,7 @@ int poke_user(struct task_struct *child, long addr, long data) else if ((addr >= offsetof(struct user, u_debugreg[0])) && (addr <= offsetof(struct user, u_debugreg[7]))) { addr -= offsetof(struct user, u_debugreg[0]); - addr = addr >>2 ; + addr = addr >>3 ;if ((addr ==4 ) || (addr ==5 ))return -EIO ; child->thread.arch.debugregs[addr] = data;
drivers/hid/hid-core.c +3 -0
@@ -1213,6 +1213,7 @@ static void hid_input_field(struct hid_device *hid, struct hid_field *field,/* Ignore report if ErrorRollOver */ if (!(field->flags &HID_MAIN_ITEM_VARIABLE ) && value[n] >= min && value[n] <= max && + value[n] - min < field->maxusage && field->usage[value[n] - min].hid ==HID_UP_KEYBOARD +1 ) goto exit; }
@@ -1225,11 +1226,13 @@ static void hid_input_field(struct hid_device *hid, struct hid_field *field, }if (field->value[n] >= min && field->value[n] <= max + && field->value[n] - min < field->maxusage && field->usage[field->value[n] - min].hid &&search (value, field->value[n], count))hid_process_event (hid, field, &field->usage[field->value[n] - min],0 , interrupt);if (value[n] >= min && value[n] <= max + && value[n] - min < field->maxusage && field->usage[value[n] - min].hid &&search (field->value, value[n], count))hid_process_event (hid, field, &field->usage[value[n] - min],1 , interrupt);
drivers/infiniband/hw/mlx4/main.c +1 -0
@@ -2357,6 +2357,7 @@ err_counter:mlx4_counter_free (ibdev->dev, ibdev->counters[i -1 ]); err_map: +mlx4_ib_free_eqs (dev, ibdev);iounmap (ibdev->uar_map); err_uar:
drivers/infiniband/ulp/ipoib/ipoib_fs.c +3 -0
@@ -281,8 +281,11 @@ void ipoib_delete_debug_files(struct net_device *dev) {struct ipoib_dev_priv *priv =netdev_priv (dev); +WARN_ONCE (!priv->mcg_dentry,"null mcg debug file\n" ); +WARN_ONCE (!priv->path_dentry,"null path debug file\n" );debugfs_remove (priv->mcg_dentry);debugfs_remove (priv->path_dentry); + priv->mcg_dentry = priv->path_dentry =NULL ; }int ipoib_register_debugfs (void )
drivers/infiniband/ulp/ipoib/ipoib_main.c +39 -5
86 lines not on this page · raw message
drivers/infiniband/ulp/ipoib/ipoib_vlan.c +0 -3
@@ -86,8 +86,6 @@ int __ipoib_vlan_add(struct ipoib_dev_priv *ppriv, struct ipoib_dev_priv *priv, priv->parent = ppriv->dev; -ipoib_create_debug_files (priv->dev); -/* RTNL childs don't need proprietary sysfs entries */ if (type ==IPOIB_LEGACY_CHILD ) {if (ipoib_cm_add_mode_attr (priv->dev))
@@ -109,7 +107,6 @@ int __ipoib_vlan_add(struct ipoib_dev_priv *ppriv, struct ipoib_dev_priv *priv, sysfs_failed: result = -ENOMEM ; -ipoib_delete_debug_files (priv->dev);unregister_netdevice (priv->dev); register_failed:
drivers/md/dm-era-target.c +4 -4
@@ -957,15 +957,15 @@ static int metadata_commit(struct era_metadata *md) } } - r =save_sm_root (md); + r =dm_tm_pre_commit (md->tm);if (r) { -DMERR ("%s: save_sm_root failed" , __func__); +DMERR ("%s: pre commit failed" , __func__);return r; } - r =dm_tm_pre_commit (md->tm); + r =save_sm_root (md);if (r) { -DMERR ("%s: pre commit failed" , __func__); +DMERR ("%s: save_sm_root failed" , __func__);return r; }
drivers/md/raid1.c +2 -0
@@ -2067,6 +2067,8 @@ static void sync_request_write(struct mddev *mddev, struct r1bio *r1_bio) (i == r1_bio->read_disk || !test_bit(MD_RECOVERY_SYNC, &mddev->recovery)))) continue; +if (test_bit (Faulty, &conf->mirrors[i].rdev->flags)) +continue ; wbio->bi_rw =WRITE ; wbio->bi_end_io = end_sync_write;
drivers/net/ppp/ppp_generic.c +3 -2
@@ -2342,8 +2342,6 @@ ppp_unregister_channel(struct ppp_channel *chan)spin_lock_bh (&pn->all_channels_lock);list_del (&pch->list);spin_unlock_bh (&pn->all_channels_lock); -put_net (pch->chan_net); - pch->chan_net =NULL ; pch->file.dead =1 ;wake_up_interruptible (&pch->file.rwait);
@@ -2960,6 +2958,9 @@ ppp_disconnect_channel(struct channel *pch)*/ static void ppp_destroy_channel (struct channel *pch) { +put_net (pch->chan_net); + pch->chan_net =NULL ; +atomic_dec (&channel_count);if (!pch->file.dead) {
drivers/net/usb/cdc_ncm.c +5 -15
@@ -952,23 +952,12 @@ EXPORT_SYMBOL_GPL(cdc_ncm_select_altsetting);static int cdc_ncm_bind (struct usbnet *dev,struct usb_interface *intf) { -int ret; -/* MBIM backwards compatible function? */ if (cdc_ncm_select_altsetting (intf) !=CDC_NCM_COMM_ALTSETTING_NCM )return -ENODEV ;/* The NCM data altsetting is fixed */ - ret =cdc_ncm_bind_common (dev, intf,CDC_NCM_DATA_ALTSETTING_NCM ); - -/* -* We should get an event when network connection is "connected" or -* "disconnected". Set network connection in "disconnected" state -* (carrier is OFF) during attach, so the IP network stack does not -* start IPv6 negotiation and more. -*/ -usbnet_link_change (dev,0 ,0 ); -return ret; +return cdc_ncm_bind_common (dev, intf,CDC_NCM_DATA_ALTSETTING_NCM ); }static void cdc_ncm_align_tail (struct sk_buff *skb,size_t modulus,size_t remainder,size_t max)
@@ -1510,7 +1499,8 @@ static void cdc_ncm_status(struct usbnet *dev, struct urb *urb)static const struct driver_info cdc_ncm_info = { .description ="CDC NCM" , - .flags =FLAG_POINTTOPOINT |FLAG_NO_SETINT |FLAG_MULTI_PACKET , + .flags =FLAG_POINTTOPOINT |FLAG_NO_SETINT |FLAG_MULTI_PACKET + |FLAG_LINK_INTR , .bind = cdc_ncm_bind, .unbind = cdc_ncm_unbind, .manage_power = usbnet_manage_power,
@@ -1523,7 +1513,7 @@ static const struct driver_info cdc_ncm_info = {static const struct driver_info wwan_info = { .description ="Mobile Broadband Network Device" , .flags =FLAG_POINTTOPOINT |FLAG_NO_SETINT |FLAG_MULTI_PACKET - |FLAG_WWAN , + |FLAG_LINK_INTR |FLAG_WWAN , .bind = cdc_ncm_bind, .unbind = cdc_ncm_unbind, .manage_power = usbnet_manage_power,
@@ -1536,7 +1526,7 @@ static const struct driver_info wwan_info = {static const struct driver_info wwan_noarp_info = { .description ="Mobile Broadband Network Device (NO ARP)" , .flags =FLAG_POINTTOPOINT |FLAG_NO_SETINT |FLAG_MULTI_PACKET - |FLAG_WWAN |FLAG_NOARP , + |FLAG_LINK_INTR |FLAG_WWAN |FLAG_NOARP , .bind = cdc_ncm_bind, .unbind = cdc_ncm_unbind, .manage_power = usbnet_manage_power,
drivers/scsi/sg.c +7 -1
@@ -791,8 +791,14 @@ sg_common_write(Sg_fd * sfp, Sg_request * srp,return k;/* probably out of space --> ENOMEM */ }if (atomic_read (&sdp->detaching)) { -if (srp->bio) +if (srp->bio) { +if (srp->rq->cmd != srp->rq->__cmd) +kfree (srp->rq->cmd); +blk_end_request_all (srp->rq, -EIO ); + srp->rq =NULL ; + } +sg_finish_rem_req (srp);return -ENODEV ; }
drivers/staging/comedi/drivers/jr3_pci.c +7 -6
@@ -611,7 +611,7 @@ static void jr3_pci_poll_dev(unsigned long data) s = &dev->subdevices[i]; spriv = s->private; -if (now > spriv->next_time_min) { +if (time_after_eq (now, spriv->next_time_min)) {struct jr3_pci_poll_delay sub_delay; sub_delay =jr3_pci_poll_subdevice (s);
@@ -729,11 +729,12 @@ static int jr3_pci_auto_attach(struct comedi_device *dev, s->insn_read = jr3_pci_ai_insn_read; spriv =jr3_pci_alloc_spriv (dev, s); -if (spriv) { -/* Channel specific range and maxdata */ - s->range_table_list = spriv->range_table_list; - s->maxdata_list = spriv->maxdata_list; - } +if (!spriv) +return -ENOMEM ; + +/* Channel specific range and maxdata */ + s->range_table_list = spriv->range_table_list; + s->maxdata_list = spriv->maxdata_list; }/* Reset DSP card */
drivers/staging/gdm724x/gdm_mux.c +1 -2
@@ -674,14 +674,13 @@ static int __init gdm_usb_mux_init(void) static void __exit gdm_usb_mux_exit(void) { -unregister_lte_tty_driver (); -if (mux_rx_wq) {flush_workqueue (mux_rx_wq);destroy_workqueue (mux_rx_wq); }usb_deregister (&gdm_mux_driver); +unregister_lte_tty_driver (); }module_init (gdm_usb_mux_init);
drivers/staging/vt6656/usbpipe.c +27 -4
@@ -50,15 +50,25 @@ int vnt_control_out(struct vnt_private *priv, u8 request, u16 value, u16 index, u16 length, u8 *buffer) { int status = 0; +u8 *usb_buffer;if (test_bit (DEVICE_FLAGS_DISCONNECTED , &priv->flags))return STATUS_FAILURE ;mutex_lock (&priv->usb_lock); + usb_buffer =kmemdup (buffer, length,GFP_KERNEL ); +if (!usb_buffer) { +mutex_unlock (&priv->usb_lock); +return -ENOMEM ; + } + status =usb_control_msg (priv->usb, -usb_sndctrlpipe (priv->usb,0 ), request,0x40 , value, - index, buffer, length,USB_CTL_WAIT ); +usb_sndctrlpipe (priv->usb,0 ), + request,0x40 , value, + index, usb_buffer, length,USB_CTL_WAIT ); + +kfree (usb_buffer);mutex_unlock (&priv->usb_lock);
@@ -78,15 +88,28 @@ int vnt_control_in(struct vnt_private *priv, u8 request, u16 value, u16 index, u16 length, u8 *buffer) { int status; +u8 *usb_buffer;if (test_bit (DEVICE_FLAGS_DISCONNECTED , &priv->flags))return STATUS_FAILURE ;mutex_lock (&priv->usb_lock); + usb_buffer =kmalloc (length,GFP_KERNEL ); +if (!usb_buffer) { +mutex_unlock (&priv->usb_lock); +return -ENOMEM ; + } + status =usb_control_msg (priv->usb, -usb_rcvctrlpipe (priv->usb,0 ), request,0xc0 , value, - index, buffer, length,USB_CTL_WAIT ); +usb_rcvctrlpipe (priv->usb,0 ), + request,0xc0 , value, + index, usb_buffer, length,USB_CTL_WAIT ); + +if (status == length) +memcpy (buffer, usb_buffer, length); + +kfree (usb_buffer);mutex_unlock (&priv->usb_lock);
drivers/target/target_core_file.c +1 -2
@@ -760,8 +760,7 @@ fd_execute_rw(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents,return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE ; } -if (ret) -target_complete_cmd (cmd,SAM_STAT_GOOD ); +target_complete_cmd (cmd,SAM_STAT_GOOD );return 0 ; }
drivers/tty/serial/omap-serial.c +7 -2
@@ -1743,7 +1743,8 @@ static int serial_omap_probe(struct platform_device *pdev)return 0 ; err_add_port: -pm_runtime_put (&pdev->dev); +pm_runtime_dont_use_autosuspend (&pdev->dev); +pm_runtime_put_sync (&pdev->dev);pm_runtime_disable (&pdev->dev); err_rs485: err_port_line:
@@ -1756,9 +1757,13 @@ static int serial_omap_remove(struct platform_device *dev) {struct uart_omap_port *up =platform_get_drvdata (dev); +pm_runtime_get_sync (up->dev); + +uart_remove_one_port (&serial_omap_reg, &up->port); + +pm_runtime_dont_use_autosuspend (up->dev);pm_runtime_put_sync (up->dev);pm_runtime_disable (up->dev); -uart_remove_one_port (&serial_omap_reg, &up->port);pm_qos_remove_request (&up->pm_qos_request);device_init_wakeup (&dev->dev, false);
drivers/usb/core/driver.c +3 -0
@@ -1757,6 +1757,9 @@ static int autosuspend_check(struct usb_device *udev)int w, i;struct usb_interface *intf; +if (udev->state ==USB_STATE_NOTATTACHED ) +return -ENODEV ; +/* Fail if autosuspend is disabled, or any interfaces are in use, or * any interface drivers require remote wakeup but it isn't available. */
drivers/usb/core/file.c +7 -2
@@ -26,6 +26,7 @@#define MAX_USB_MINORS 256static const struct file_operations *usb_minors[MAX_USB_MINORS ];static DECLARE_RWSEM (minor_rwsem); +static DEFINE_MUTEX (init_usb_class_mutex);static int usb_open (struct inode *inode,struct file *file) {
@@ -108,8 +109,9 @@ static void release_usb_class(struct kref *kref)static void destroy_usb_class (void ) { -if (usb_class) -kref_put (&usb_class->kref, release_usb_class); +mutex_lock (&init_usb_class_mutex); +kref_put (&usb_class->kref, release_usb_class); +mutex_unlock (&init_usb_class_mutex); }int usb_major_init (void )
@@ -171,7 +173,10 @@ int usb_register_dev(struct usb_interface *intf,if (intf->minor >=0 )return -EADDRINUSE ; +mutex_lock (&init_usb_class_mutex); retval =init_usb_class (); +mutex_unlock (&init_usb_class_mutex); +if (retval)return retval;
drivers/usb/core/hub.c +6 -0
@@ -2100,6 +2100,12 @@ void usb_disconnect(struct usb_device **pdev)dev_info (&udev->dev,"USB disconnect, device number %d\n" , udev->devnum); +/* +* Ensure that the pm runtime code knows that the USB device +* is in the process of being disconnected. +*/ +pm_runtime_barrier (&udev->dev); +usb_lock_device (udev);hub_disconnect_children (udev);
drivers/usb/host/xhci-mem.c +1 -1
@@ -2428,7 +2428,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) (xhci->cmd_ring->first_seg->dma & (u64 ) ~CMD_RING_RSVD_BITS ) | xhci->cmd_ring->cycle_state;xhci_dbg_trace (xhci, trace_xhci_dbg_init, -"// Setting command ring address to 0x%x" , val); +"// Setting command ring address to 0x%016llx" , val_64);xhci_write_64 (xhci, val_64, &xhci->op_regs->cmd_ring);xhci_dbg_cmd_ptrs (xhci);
drivers/usb/misc/legousbtower.c +27 -10
@@ -317,9 +317,16 @@ static int tower_open (struct inode *inode, struct file *file)int subminor;int retval =0 ;struct usb_interface *interface; -struct tower_reset_reply reset_reply; +struct tower_reset_reply *reset_reply;int result; + reset_reply =kmalloc (sizeof (*reset_reply),GFP_KERNEL ); + +if (!reset_reply) { + retval = -ENOMEM ; + goto exit; + } +nonseekable_open (inode, file); subminor =iminor (inode);
@@ -364,8 +371,8 @@ static int tower_open (struct inode *inode, struct file *file)USB_TYPE_VENDOR |USB_DIR_IN |USB_RECIP_DEVICE ,0 ,0 , - &reset_reply, -sizeof (reset_reply), + reset_reply, +sizeof (*reset_reply), 1000);if (result <0 ) { dev_err(&dev->udev->dev,
@@ -406,6 +413,7 @@ unlock_exit:mutex_unlock (&dev->lock); exit: +kfree (reset_reply);return retval; }
@@ -808,7 +816,7 @@ static int tower_probe (struct usb_interface *interface, const struct usb_devicestruct lego_usb_tower *dev =NULL ;struct usb_host_interface *iface_desc;struct usb_endpoint_descriptor * endpoint; -struct tower_get_version_reply get_version_reply; +struct tower_get_version_reply *get_version_reply =NULL ;int i;int retval = -ENOMEM ;int result;
@@ -916,6 +924,13 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device"%d minor %d\n" , (dev->minor -LEGO_USB_TOWER_MINOR_BASE ), USB_MAJOR, dev->minor); + get_version_reply =kmalloc (sizeof (*get_version_reply),GFP_KERNEL ); + +if (!get_version_reply) { + retval = -ENOMEM ; + goto error; + } +/* get the firmware version and log it */ result = usb_control_msg (udev, usb_rcvctrlpipe(udev, 0),
@@ -923,24 +938,26 @@ static int tower_probe (struct usb_interface *interface, const struct usb_deviceUSB_TYPE_VENDOR |USB_DIR_IN |USB_RECIP_DEVICE ,0 ,0 , - &get_version_reply, -sizeof (get_version_reply), + get_version_reply, +sizeof (*get_version_reply), 1000);if (result <0 ) {dev_err (idev,"LEGO USB Tower get version control request failed\n" ); retval = result; goto error; } -dev_info (&interface->dev,"LEGO USB Tower firmware version is %d.%d " -"build %d\n" , get_version_reply.major, - get_version_reply.minor, -le16_to_cpu (get_version_reply.build_no)); +dev_info (&interface->dev, +"LEGO USB Tower firmware version is %d.%d build %d\n" , + get_version_reply->major, + get_version_reply->minor, +le16_to_cpu (get_version_reply->build_no)); exit:return retval; error: +kfree (get_version_reply);tower_delete (dev);return retval; }
drivers/usb/misc/usbtest.c +1 -0
@@ -133,6 +133,7 @@ get_endpoints(struct usbtest_dev *dev, struct usb_interface *intf)case USB_ENDPOINT_XFER_INT :if (dev->info->intr) goto try_intr; +continue ;case USB_ENDPOINT_XFER_ISOC :if (dev->info->iso) goto try_iso;
drivers/usb/serial/ftdi_sio.c +1 -0
@@ -873,6 +873,7 @@ static const struct usb_device_id id_table_combined[] = { {USB_DEVICE_AND_INTERFACE_INFO (MICROCHIP_VID ,MICROCHIP_USB_BOARD_PID ,USB_CLASS_VENDOR_SPEC , USB_SUBCLASS_VENDOR_SPEC, 0x00) }, + { USB_DEVICE_INTERFACE_NUMBER(ACTEL_VID, MICROSEMI_ARROW_SF2PLUS_BOARD_PID, 2) }, { USB_DEVICE(JETI_VID, JETI_SPC1201_PID) }, { USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID), .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
drivers/usb/serial/ftdi_sio_ids.h +6 -0
@@ -867,6 +867,12 @@#define FIC_VID 0x1457#define FIC_NEO1973_DEBUG_PID 0x5118 +/* +* Actel / Microsemi +*/ +#define ACTEL_VID 0x1514 +#define MICROSEMI_ARROW_SF2PLUS_BOARD_PID 0x2008 +/* Olimex */ #define OLIMEX_VID 0x15BA#define OLIMEX_ARM_USB_OCD_PID 0x0003
fs/block_dev.c +5 -6
@@ -86,12 +86,11 @@ void invalidate_bdev(struct block_device *bdev) {struct address_space *mapping = bdev->bd_inode->i_mapping; -if (mapping->nrpages ==0 ) -return ; - -invalidate_bh_lrus (); -lru_add_drain_all ();/* make sure all lru add caches are flushed */ -invalidate_mapping_pages (mapping,0 ,-1 ); +if (mapping->nrpages) { +invalidate_bh_lrus (); +lru_add_drain_all ();/* make sure all lru add caches are flushed */ +invalidate_mapping_pages (mapping,0 ,-1 ); + }/* 99% of the time, we don't need to flush the cleancache on the bdev. * But, for the strange corners, lets be cautious */
fs/ceph/xattr.c +3 -0
@@ -369,6 +369,7 @@ static int __set_xattr(struct ceph_inode_info *ci,if (update_xattr) {int err =0 ; +if (xattr && (flags &XATTR_CREATE )) err = -EEXIST ;else if (!xattr && (flags &XATTR_REPLACE ))
@@ -376,12 +377,14 @@ static int __set_xattr(struct ceph_inode_info *ci,if (err) {kfree (name);kfree (val); +kfree (*newxattr);return err; }if (update_xattr <0 ) {if (xattr)__remove_xattr (ci, xattr);kfree (name); +kfree (*newxattr);return 0 ; } }
fs/cifs/cifs_unicode.c +6 -0
@@ -118,6 +118,9 @@ convert_sfm_char(const __u16 src_char, char *target)case SFM_COLON : *target =':' ;break ; +case SFM_DOUBLEQUOTE : + *target ='"' ; +break ;case SFM_ASTERISK : *target ='*' ;break ;
@@ -378,6 +381,9 @@ static __le16 convert_to_sfm_char(char src_char, bool end_of_string)case ':' : dest_char =cpu_to_le16 (SFM_COLON );break ; +case '"' : + dest_char =cpu_to_le16 (SFM_DOUBLEQUOTE ); +break ;case '*' : dest_char =cpu_to_le16 (SFM_ASTERISK );break ;
fs/cifs/cifs_unicode.h +3 -2
@@ -57,6 +57,7 @@* not conflict (although almost does) with the mapping above. */ +#define SFM_DOUBLEQUOTE ((__u16) 0xF020)#define SFM_ASTERISK ((__u16) 0xF021)#define SFM_QUESTION ((__u16) 0xF025)#define SFM_COLON ((__u16) 0xF022)
@@ -64,8 +65,8 @@#define SFM_LESSTHAN ((__u16) 0xF023)#define SFM_PIPE ((__u16) 0xF027)#define SFM_SLASH ((__u16) 0xF026) -#define SFM_PERIOD ((__u16) 0xF028) -#define SFM_SPACE ((__u16) 0xF029) +#define SFM_SPACE ((__u16) 0xF028) +#define SFM_PERIOD ((__u16) 0xF029)/* * Mapping mechanism to use when one of the seven reserved characters is
fs/cifs/cifssmb.c +3 -0
@@ -715,6 +715,9 @@ CIFSSMBEcho(struct TCP_Server_Info *server)if (rc)return rc; +if (server->capabilities &CAP_UNICODE ) + smb->hdr.Flags2 |=SMBFLG2_UNICODE ; +/* set up echo request */ smb->hdr.Tid =0xffff ; smb->hdr.WordCount =1 ;
fs/cifs/smb2pdu.c +11 -3
@@ -491,8 +491,12 @@ int smb3_validate_negotiate(const unsigned int xid, struct cifs_tcon *tcon) }if (rsplen !=sizeof (struct validate_negotiate_info_rsp )) { -cifs_dbg (VFS ,"invalid size of protocol negotiate response\n" ); -return -EIO ; +cifs_dbg (VFS ,"invalid protocol negotiate response size: %d\n" , + rsplen); + +/* relax check since Mac returns max bufsize allowed on ioctl */ +if (rsplen > CIFSMaxBufSize) +return -EIO ; }/* check validate negotiate info response matches what we got earlier */
@@ -1308,8 +1312,12 @@ SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,* than one credit. Windows typically sets this smaller, but for some * ioctls it may be useful to allow server to send more. No point * limiting what the server can send as long as fits in one credit +* Unfortunately - we can not handle more than CIFS_MAX_MSG_SIZE +* (by default, note that it can be overridden to make max larger) +* in responses (except for read responses which can be bigger. +* We may want to bump this limit up */ - req->MaxOutputResponse =cpu_to_le32 (0xFF00 );/* < 64K uses 1 credit */ + req->MaxOutputResponse =cpu_to_le32 (CIFSMaxBufSize);if (is_fsctl) req->Flags =cpu_to_le32 (SMB2_0_IOCTL_IS_FSCTL );
fs/ext4/ext4_jbd2.c +3 -3
@@ -88,13 +88,13 @@ int __ext4_journal_stop(const char *where, unsigned int line, handle_t *handle)return 0 ; } + err = handle->h_err;if (!handle->h_transaction) { - err =jbd2_journal_stop (handle); -return handle->h_err ? handle->h_err : err; + rc =jbd2_journal_stop (handle); +return err ? err : rc; } sb = handle->h_transaction->t_journal->j_private; - err = handle->h_err; rc =jbd2_journal_stop (handle);if (!err)
fs/xattr.c +1 -1
@@ -444,7 +444,7 @@ getxattr(struct dentry *d, const char __user *name, void __user *value, size =XATTR_SIZE_MAX ; kvalue =kzalloc (size,GFP_KERNEL | __GFP_NOWARN);if (!kvalue) { - vvalue =vmalloc (size); + vvalue =vzalloc (size);if (!vvalue)return -ENOMEM ; kvalue = vvalue;
kernel/events/core.c +208 -56
499 lines not on this page · raw message
kernel/padata.c +1 -1
@@ -357,7 +357,7 @@ static int padata_setup_cpumasks(struct parallel_data *pd,cpumask_and (pd->cpumask.pcpu, pcpumask, cpu_online_mask);if (!alloc_cpumask_var (&pd->cpumask.cbcpu,GFP_KERNEL )) { -free_cpumask_var (pd->cpumask.cbcpu); +free_cpumask_var (pd->cpumask.pcpu);return -ENOMEM ; }
kernel/sched/core.c +2 -1
@@ -2709,7 +2709,8 @@ static noinline void __schedule_bug(struct task_struct *prev)static inline void schedule_debug (struct task_struct *prev) {#ifdef CONFIG_SCHED_STACK_END_CHECK -BUG_ON (unlikely (task_stack_end_corrupted (prev))); +if (task_stack_end_corrupted (prev)) +panic ("corrupted stack end detected inside scheduler\n" );#endif /* * Test if we are atomic. Since do_exit() needs to call into
lib/asn1_decoder.c +11 -10
@@ -69,7 +69,7 @@ next_tag:/* Extract a tag from the data */ tag = data[dp++]; -if (tag ==0 ) { +if (tag ==ASN1_EOC ) {/* It appears to be an EOC. */ if (data[dp++] !=0 ) goto invalid_eoc;
@@ -91,10 +91,8 @@ next_tag:/* Extract the length */ len = data[dp++]; -if (len <=0x7f ) { - dp += len; - goto next_tag; - } +if (len <=0x7f ) + goto check_length;if (unlikely (len ==ASN1_INDEFINITE_LENGTH )) {/* Indefinite length */
@@ -105,14 +103,18 @@ next_tag: } n = len -0x80 ; -if (unlikely (n >sizeof (size_t ) -1 )) +if (unlikely (n >sizeof (len) -1 )) goto length_too_long;if (unlikely (n > datalen - dp)) goto data_overrun_error; -for (len =0 ; n >0 ; n--) { + len =0 ; +for (; n >0 ; n--) { len <<=8 ; len |= data[dp++]; } +check_length: +if (len > datalen - dp) + goto data_overrun_error; dp += len; goto next_tag;
@@ -208,9 +210,8 @@ next_op:unsigned char tmp;/* Skip conditional matches if possible */ -if ((op &ASN1_OP_MATCH__COND && - flags &FLAG_MATCHED ) || - dp == datalen) { +if ((op &ASN1_OP_MATCH__COND && flags &FLAG_MATCHED ) || + (op &ASN1_OP_MATCH__SKIP && dp == datalen)) { pc += asn1_op_lengths[op]; goto next_op; }
net/bluetooth/hci_sock.c +2 -1
@@ -909,7 +909,8 @@ static int hci_sock_sendmsg(struct kiocb *iocb, struct socket *sock,if (msg->msg_flags &MSG_OOB )return -EOPNOTSUPP ; -if (msg->msg_flags & ~(MSG_DONTWAIT |MSG_NOSIGNAL |MSG_ERRQUEUE )) +if (msg->msg_flags & ~(MSG_DONTWAIT |MSG_NOSIGNAL |MSG_ERRQUEUE | +MSG_CMSG_COMPAT ))return -EINVAL ;if (len <4 || len >HCI_MAX_FRAME_SIZE )
net/sctp/ipv6.c +11 -5
@@ -209,6 +209,7 @@ static int sctp_v6_xmit(struct sk_buff *skb, struct sctp_transport *transport)struct sock *sk = skb->sk;struct ipv6_pinfo *np =inet6_sk (sk);struct flowi6 *fl6 = &transport->fl.u.ip6; +int res;pr_debug ("%s: skb:%p, len:%d, src:%pI6 dst:%pI6\n" , __func__, skb, skb->len, &fl6->saddr, &fl6->daddr);
@@ -220,7 +221,10 @@ static int sctp_v6_xmit(struct sk_buff *skb, struct sctp_transport *transport)SCTP_INC_STATS (sock_net (sk),SCTP_MIB_OUTSCTPPACKS ); -return ip6_xmit (sk, skb, fl6, np->opt, np->tclass); +rcu_read_lock (); + res =ip6_xmit (sk, skb, fl6,rcu_dereference (np->opt), np->tclass); +rcu_read_unlock (); +return res; }/* Returns the dst cache entry for the given source and destination ip
@@ -262,7 +266,10 @@ static void sctp_v6_get_dst(struct sctp_transport *t, union sctp_addr *saddr,pr_debug ("src=%pI6 - " , &fl6->saddr); } - final_p =fl6_update_dst (fl6, np->opt, &final); +rcu_read_lock (); + final_p =fl6_update_dst (fl6,rcu_dereference (np->opt), &final); +rcu_read_unlock (); + dst =ip6_dst_lookup_flow (sk, fl6, final_p);if (!asoc || saddr) goto out;
@@ -316,14 +323,13 @@ static void sctp_v6_get_dst(struct sctp_transport *t, union sctp_addr *saddr, } } } -rcu_read_unlock (); -if (baddr) { fl6->saddr = baddr->v6.sin6_addr; fl6->fl6_sport = baddr->v6.sin6_port; - final_p =fl6_update_dst (fl6, np->opt, &final); + final_p =fl6_update_dst (fl6,rcu_dereference (np->opt), &final); dst =ip6_dst_lookup_flow (sk, fl6, final_p); } +rcu_read_unlock (); out:if (!IS_ERR_OR_NULL (dst)) {
net/unix/af_unix.c +6 -1
@@ -1722,7 +1722,12 @@ restart_locked: goto out_unlock; } -if (unlikely (unix_peer (other) != sk &&unix_recvq_full (other))) { +/* other == sk && unix_peer(other) != sk if +* - unix_peer(sk) == NULL, destination address bound to sk +* - unix_peer(sk) == sk by time of get but disconnected before lock +*/ +if (other != sk && +unlikely (unix_peer (other) != sk &&unix_recvq_full (other))) {if (timeo) { timeo =unix_wait_for_peer (other, timeo);
sound/core/seq/seq_queue.c +2 -0
@@ -142,8 +142,10 @@ static struct snd_seq_queue *queue_new(int owner, int locked)static void queue_delete (struct snd_seq_queue *q) {/* stop and release the timer */ +mutex_lock (&q->timer_mutex);snd_seq_timer_stop (q->timer);snd_seq_timer_close (q); +mutex_unlock (&q->timer_mutex);/* wait until access free */ snd_use_lock_sync (&q->use_lock);/* release resources... */
sound/core/timer.c +22 -13
@@ -77,7 +77,7 @@ struct snd_timer_user {struct timespec tstamp;/* trigger tstamp */ wait_queue_head_t qchange_sleep;struct fasync_struct *fasync; -struct mutex tread_sem; +struct mutex ioctl_lock; };/* list of timers */
@@ -1260,6 +1260,7 @@ static void snd_timer_user_ccallback(struct snd_timer_instance *timeri, tu->tstamp = *tstamp;if ((tu->filter & (1 << event)) ==0 || !tu->tread)return ; +memset (&r1,0 ,sizeof (r1)); r1.event = event; r1.tstamp = *tstamp; r1.val = resolution;
@@ -1294,6 +1295,7 @@ static void snd_timer_user_tinterrupt(struct snd_timer_instance *timeri, }if ((tu->filter & (1 <<SNDRV_TIMER_EVENT_RESOLUTION )) && tu->last_resolution != resolution) { +memset (&r1,0 ,sizeof (r1)); r1.event =SNDRV_TIMER_EVENT_RESOLUTION ; r1.tstamp = tstamp; r1.val = resolution;
@@ -1342,7 +1344,7 @@ static int snd_timer_user_open(struct inode *inode, struct file *file)return -ENOMEM ;spin_lock_init (&tu->qlock);init_waitqueue_head (&tu->qchange_sleep); -mutex_init (&tu->tread_sem); +mutex_init (&tu->ioctl_lock); tu->ticks =1 ; tu->queue_size =128 ; tu->queue = kmalloc(tu->queue_size * sizeof(struct snd_timer_read),
@@ -1362,8 +1364,10 @@ static int snd_timer_user_release(struct inode *inode, struct file *file)if (file->private_data) { tu = file->private_data; file->private_data =NULL ; +mutex_lock (&tu->ioctl_lock);if (tu->timeri)snd_timer_close (tu->timeri); +mutex_unlock (&tu->ioctl_lock);kfree (tu->queue);kfree (tu->tqueue);kfree (tu);
@@ -1601,7 +1605,6 @@ static int snd_timer_user_tselect(struct file *file,int err =0 ; tu = file->private_data; -mutex_lock (&tu->tread_sem);if (tu->timeri) {snd_timer_close (tu->timeri); tu->timeri =NULL ;
@@ -1645,7 +1648,6 @@ static int snd_timer_user_tselect(struct file *file, } __err: -mutex_unlock (&tu->tread_sem);return err; }
@@ -1759,6 +1761,7 @@ static int snd_timer_user_params(struct file *file,if (tu->timeri->flags &SNDRV_TIMER_IFLG_EARLY_EVENT ) {if (tu->tread) {struct snd_timer_tread tread; +memset (&tread,0 ,sizeof (tread)); tread.event =SNDRV_TIMER_EVENT_EARLY ; tread.tstamp.tv_sec =0 ; tread.tstamp.tv_nsec =0 ;
@@ -1861,7 +1864,7 @@ enum { SNDRV_TIMER_IOCTL_PAUSE_OLD = _IO('T', 0x23), }; -static long snd_timer_user_ioctl (struct file *file,unsigned int cmd, +static long __snd_timer_user_ioctl (struct file *file,unsigned int cmd,unsigned long arg) {struct snd_timer_user *tu;
@@ -1878,17 +1881,11 @@ static long snd_timer_user_ioctl(struct file *file, unsigned int cmd, {int xarg; -mutex_lock (&tu->tread_sem); -if (tu->timeri) {/* too late */ -mutex_unlock (&tu->tread_sem); +if (tu->timeri)/* too late */ return -EBUSY ; - } -if (get_user (xarg, p)) { -mutex_unlock (&tu->tread_sem); +if (get_user (xarg, p))return -EFAULT ; - } tu->tread = xarg ?1 :0 ; -mutex_unlock (&tu->tread_sem);return 0 ; }case SNDRV_TIMER_IOCTL_GINFO :
@@ -1921,6 +1918,18 @@ static long snd_timer_user_ioctl(struct file *file, unsigned int cmd,return -ENOTTY ; } +static long snd_timer_user_ioctl (struct file *file,unsigned int cmd, +unsigned long arg) +{ +struct snd_timer_user *tu = file->private_data; +long ret; + +mutex_lock (&tu->ioctl_lock); + ret =__snd_timer_user_ioctl (file, cmd, arg); +mutex_unlock (&tu->ioctl_lock); +return ret; +} +static int snd_timer_user_fasync (int fd,struct file * file,int on) {struct snd_timer_user *tu;