Linux 3.18.71
Greg KH
maintainerI'm announcing the release of the 3.18.71 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/arm/mm/fault.c | 5 +- drivers/ata/pata_amd.c | 1 drivers/ata/pata_cs5536.c | 1 drivers/base/bus.c | 2 drivers/input/mouse/trackpoint.c | 4 - drivers/scsi/sg.c | 19 ++++++-- drivers/staging/rts5208/rtsx_scsi.c | 2 drivers/usb/core/devio.c | 4 - drivers/usb/core/quirks.c | 6 ++ drivers/usb/host/pci-quirks.c | 35 ++++++++------- drivers/usb/serial/option.c | 1 fs/btrfs/super.c | 2 fs/dlm/user.c | 4 + fs/xfs/libxfs/xfs_dinode.h | 9 +++- include/linux/pci_ids.h | 1 include/linux/workqueue.h | 2 kernel/locking/locktorture.c | 4 + mm/cma.c | 15 ++---- net/bluetooth/l2cap_core.c | 80 +++++++++++++++++++----------------- sound/isa/msnd/msnd_midi.c | 30 ++++++------- sound/isa/msnd/msnd_pinnacle.c | 23 +++++----- 22 files changed, 147 insertions(+), 105 deletions(-)
Aleksa Sarai (1):
btrfs: resume qgroup rescan on rw remount
Andrey Korolyov (1):
cs5536: add support for IDE controller variant
Ben Hutchings (1):
workqueue: Fix flag collision
Ben Seri (1):
Bluetooth: Properly check L2CAP config option output buffer length
Christophe JAILLET (1):
driver core: bus: Fix a potential double free
Colin Ian King (1):
staging/rts5208: fix incorrect shift to extract upper nybble
Dmitry Fleytman (1):
usb: Add device quirk for Logitech HD Pro Webcam C920-C
Doug Berger (1):
cma: fix calculation of aligned offset
Douglas Anderson (1):
USB: core: Avoid race of async_completed() w/ usbdev_release()
Edwin Török (1):
dlm: avoid double-free on error path in dlm_device_{register,unregister}Greg Kroah-Hartman (1):
Linux 3.18.71
Kai-Heng Feng (1):
usb: quirks: add delay init quirk for Corsair Strafe RGB keyboard
Maciej S. Szmigiero (1):
USB: serial: option: add support for D-Link DWM-157 C1
Mark Rutland (1):
ARM: 8692/1: mm: abort uaccess retries upon fatal signal
Oscar Campos (1):
Input: trackpoint - assume 3 buttons when buttons detection fails
Richard Wareing (1):
xfs: XFS_IS_REALTIME_INODE() should be false if no rt device present
Sandeep Singh (1):
usb:xhci:Fix regression when ATI chipsets detected
Takashi Iwai (1):
ALSA: msnd: Optimize / harden DSP and MIDI loops
Todd Poynor (2):
scsi: sg: protect against races between mmap() and SG_SET_RESERVED_SIZE
scsi: sg: recheck MMAP_IO request length with lock held
Yang Shi (1):
locktorture: Fix potential memory leak with rw lock test
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 18 -SUBLEVEL = 70 +SUBLEVEL = 71 EXTRAVERSION = NAME = Diseased Newt
arch/arm/mm/fault.c +4 -1
@@ -315,8 +315,11 @@ retry:* signal first. We do not need to release the mmap_sem because * it would already be released in __lock_page_or_retry in * mm/filemap.c. */ -if ((fault &VM_FAULT_RETRY ) &&fatal_signal_pending (current)) +if ((fault &VM_FAULT_RETRY ) &&fatal_signal_pending (current)) { +if (!user_mode (regs)) + goto no_context;return 0 ; + }/* * Major/minor page fault accounting is only done on the
drivers/ata/pata_amd.c +1 -0
@@ -616,6 +616,7 @@ static const struct pci_device_id amd[] = { { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP73_IDE), 8 }, { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP77_IDE), 8 }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CS5536_IDE), 9 }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CS5536_DEV_IDE), 9 }, { }, };
drivers/ata/pata_cs5536.c +1 -0
@@ -289,6 +289,7 @@ static int cs5536_init_one(struct pci_dev *dev, const struct pci_device_id *id)static const struct pci_device_id cs5536[] = { {PCI_VDEVICE (AMD ,PCI_DEVICE_ID_AMD_CS5536_IDE ), }, + {PCI_VDEVICE (AMD ,PCI_DEVICE_ID_AMD_CS5536_DEV_IDE ), }, { }, };
drivers/base/bus.c +1 -1
@@ -722,7 +722,7 @@ int bus_add_driver(struct device_driver *drv) out_unregister:kobject_put (&priv->kobj); -kfree (drv->p); +/* drv->p is freed in driver_release() */ drv->p =NULL ; out_put_bus:bus_put (bus);
drivers/input/mouse/trackpoint.c +2 -2
@@ -377,8 +377,8 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties)return 0 ;if (trackpoint_read (&psmouse->ps2dev,TP_EXT_BTN , &button_info)) { -psmouse_warn (psmouse,"failed to get extended button data\n" ); - button_info =0 ; +psmouse_warn (psmouse,"failed to get extended button data, assuming 3 buttons\n" ); + button_info =0x33 ; } psmouse->private =kzalloc (sizeof (struct trackpoint_data ),GFP_KERNEL );
drivers/scsi/sg.c +14 -5
@@ -1295,6 +1295,7 @@ sg_mmap(struct file *filp, struct vm_area_struct *vma)unsigned long req_sz, len, sa;Sg_scatter_hold *rsv_schp;int k, length; +int ret =0 ;if ((!filp) || (!vma) || (!(sfp = (Sg_fd *) filp->private_data)))return -ENXIO ;
@@ -1305,8 +1306,11 @@ sg_mmap(struct file *filp, struct vm_area_struct *vma)if (vma->vm_pgoff)return -EINVAL ;/* want no offset */ rsv_schp = &sfp->reserve; -if (req_sz > rsv_schp->bufflen) -return -ENOMEM ;/* cannot map more than reserved buffer */ +mutex_lock (&sfp->f_mutex); +if (req_sz > rsv_schp->bufflen) { + ret = -ENOMEM ;/* cannot map more than reserved buffer */ + goto out; + } sa = vma->vm_start; length =1 << (PAGE_SHIFT + rsv_schp->page_order);
@@ -1320,7 +1324,9 @@ sg_mmap(struct file *filp, struct vm_area_struct *vma) vma->vm_flags |=VM_IO |VM_DONTEXPAND |VM_DONTDUMP ; vma->vm_private_data = sfp; vma->vm_ops = &sg_mmap_vm_ops; -return 0 ; +out: +mutex_unlock (&sfp->f_mutex); +return ret; } static void
@@ -1792,9 +1798,12 @@ sg_start_req(Sg_request *srp, unsigned char *cmd) !sfp->res_in_use) { sfp->res_in_use =1 ;sg_link_reserve (sfp, srp, dxfer_len); - } else if ((hp->flags & SG_FLAG_MMAP_IO) && sfp->res_in_use) { + } else if (hp->flags & SG_FLAG_MMAP_IO) { + res = -EBUSY ;/* sfp->res_in_use == 1 */ +if (dxfer_len > rsv_schp->bufflen) + res = -ENOMEM ;mutex_unlock (&sfp->f_mutex); -return -EBUSY ; +return res; } else { res =sg_build_indirect (req_schp, sfp, dxfer_len);if (res) {
drivers/staging/rts5208/rtsx_scsi.c +1 -1
@@ -417,7 +417,7 @@ void set_sense_data(struct rtsx_chip *chip, unsigned int lun, u8 err_code, sense->ascq = ascq;if (sns_key_info0 !=0 ) { sense->sns_key_info[0 ] =SKSV | sns_key_info0; - sense->sns_key_info[1 ] = (sns_key_info1 &0xf0 ) >>8 ; + sense->sns_key_info[1 ] = (sns_key_info1 &0xf0 ) >>4 ; sense->sns_key_info[2 ] = sns_key_info1 &0x0f ; } }
drivers/usb/core/devio.c +2 -2
@@ -519,6 +519,8 @@ static void async_completed(struct urb *urb)if (as->status <0 && as->bulk_addr && as->status != -ECONNRESET && as->status != -ENOENT )cancel_bulk_urbs (ps, as->bulk_addr); + +wake_up (&ps->wait);spin_unlock (&ps->lock);if (signr) {
@@ -526,8 +528,6 @@ static void async_completed(struct urb *urb)put_pid (pid);put_cred (cred); } - -wake_up (&ps->wait); }static void destroy_async (struct usb_dev_state *ps,struct list_head *list)
drivers/usb/core/quirks.c +5 -1
@@ -53,8 +53,9 @@ static const struct usb_device_id usb_quirk_list[] = {/* Microsoft LifeCam-VX700 v2.0 */ { USB_DEVICE(0x045e, 0x0770), .driver_info = USB_QUIRK_RESET_RESUME }, - /* Logitech HD Pro Webcams C920 and C930e */ + /* Logitech HD Pro Webcams C920, C920-C and C930e */ { USB_DEVICE(0x046d, 0x082d), .driver_info = USB_QUIRK_DELAY_INIT }, + { USB_DEVICE(0x046d, 0x0841), .driver_info = USB_QUIRK_DELAY_INIT }, { USB_DEVICE(0x046d, 0x0843), .driver_info = USB_QUIRK_DELAY_INIT },/* Logitech ConferenceCam CC3000e */
@@ -210,6 +211,9 @@ static const struct usb_device_id usb_quirk_list[] = { { USB_DEVICE(0x1a0a, 0x0200), .driver_info = USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL }, + /* Corsair Strafe RGB */ + { USB_DEVICE(0x1b1c, 0x1b20), .driver_info = USB_QUIRK_DELAY_INIT }, + /* Acer C120 LED Projector */ { USB_DEVICE(0x1de1, 0xc102), .driver_info = USB_QUIRK_NO_LPM },
drivers/usb/host/pci-quirks.c +18 -17
@@ -133,29 +133,30 @@ static int amd_chipset_sb_type_init(struct amd_chipset_info *pinfo) pinfo->sb_type.gen =AMD_CHIPSET_SB700 ; else if (rev >= 0x40 && rev <= 0x4f) pinfo->sb_type.gen =AMD_CHIPSET_SB800 ; - } - pinfo->smbus_dev =pci_get_device (PCI_VENDOR_ID_AMD , -0x145c ,NULL ); -if (pinfo->smbus_dev) { - pinfo->sb_type.gen =AMD_CHIPSET_TAISHAN ; }else { pinfo->smbus_dev =pci_get_device (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_HUDSON2_SMBUS ,NULL ); -if (!pinfo->smbus_dev) { - pinfo->sb_type.gen =NOT_AMD_CHIPSET ; -return 0 ; +if (pinfo->smbus_dev) { + rev = pinfo->smbus_dev->revision; +if (rev >=0x11 && rev <=0x14 ) + pinfo->sb_type.gen =AMD_CHIPSET_HUDSON2 ; +else if (rev >=0x15 && rev <=0x18 ) + pinfo->sb_type.gen =AMD_CHIPSET_BOLTON ; +else if (rev >=0x39 && rev <=0x3a ) + pinfo->sb_type.gen =AMD_CHIPSET_YANGTZE ; + }else { + pinfo->smbus_dev =pci_get_device (PCI_VENDOR_ID_AMD , +0x145c ,NULL ); +if (pinfo->smbus_dev) { + rev = pinfo->smbus_dev->revision; + pinfo->sb_type.gen =AMD_CHIPSET_TAISHAN ; + }else { + pinfo->sb_type.gen =NOT_AMD_CHIPSET ; +return 0 ; + } } - - rev = pinfo->smbus_dev->revision; -if (rev >=0x11 && rev <=0x14 ) - pinfo->sb_type.gen =AMD_CHIPSET_HUDSON2 ; -else if (rev >=0x15 && rev <=0x18 ) - pinfo->sb_type.gen =AMD_CHIPSET_BOLTON ; -else if (rev >=0x39 && rev <=0x3a ) - pinfo->sb_type.gen =AMD_CHIPSET_YANGTZE ; } - pinfo->sb_type.rev = rev;return 1 ; }
drivers/usb/serial/option.c +1 -0
@@ -2018,6 +2018,7 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x02, 0x01) }, { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x00, 0x00) }, { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d04, 0xff) }, /* D-Link DWM-158 */ + { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d0e, 0xff) }, /* D-Link DWM-157 C1 */ { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e19, 0xff), /* D-Link DWM-221 B1 */ .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e35, 0xff), /* D-Link DWM-222 */
fs/btrfs/super.c +2 -0
@@ -1575,6 +1575,8 @@ static int btrfs_remount(struct super_block *sb, int *flags, char *data) goto restore; } +btrfs_qgroup_rescan_resume (fs_info); +if (!fs_info->uuid_root) {btrfs_info (fs_info,"creating UUID tree" ); ret =btrfs_create_uuid_tree (fs_info);
fs/dlm/user.c +4 -0
@@ -346,6 +346,10 @@ static int dlm_device_register(struct dlm_ls *ls, char *name) error =misc_register (&ls->ls_device);if (error) {kfree (ls->ls_device.name); +/* this has to be set to NULL +* to avoid a double-free in dlm_device_deregister +*/ + ls->ls_device.name =NULL ; } fail:return error;
fs/xfs/libxfs/xfs_dinode.h +8 -1
@@ -228,7 +228,14 @@ static inline void xfs_dinode_put_rdev(struct xfs_dinode *dip, xfs_dev_t rdev)#define XFS_DIFLAG_FILESTREAM (1 << XFS_DIFLAG_FILESTREAM_BIT)#ifdef CONFIG_XFS_RT -#define XFS_IS_REALTIME_INODE (ip) ((ip)->i_d.di_flags & XFS_DIFLAG_REALTIME) + +/* +* make sure we ignore the inode flag if the filesystem doesn't have a +* configured realtime device. +*/ +#define XFS_IS_REALTIME_INODE (ip) \ + (((ip)->i_d.di_flags & XFS_DIFLAG_REALTIME) && \ + (ip)->i_mount->m_rtdev_targp)#else #define XFS_IS_REALTIME_INODE (ip) (0)#endif
include/linux/pci_ids.h +1 -0
@@ -570,6 +570,7 @@#define PCI_DEVICE_ID_AMD_CS5536_EHC 0x2095#define PCI_DEVICE_ID_AMD_CS5536_UDC 0x2096#define PCI_DEVICE_ID_AMD_CS5536_UOC 0x2097 +#define PCI_DEVICE_ID_AMD_CS5536_DEV_IDE 0x2092#define PCI_DEVICE_ID_AMD_CS5536_IDE 0x209A#define PCI_DEVICE_ID_AMD_LX_VIDEO 0x2081#define PCI_DEVICE_ID_AMD_LX_AES 0x2082
include/linux/workqueue.h +1 -1
@@ -315,7 +315,7 @@ enum { __WQ_DRAINING =1 <<16 ,/* internal: workqueue is draining */ __WQ_ORDERED =1 <<17 ,/* internal: workqueue is ordered */ - __WQ_ORDERED_EXPLICIT =1 <<18 ,/* internal: alloc_ordered_workqueue() */ + __WQ_ORDERED_EXPLICIT =1 <<19 ,/* internal: alloc_ordered_workqueue() */ WQ_MAX_ACTIVE =512 ,/* I like 512, better ideas? */ WQ_MAX_UNBOUND_PER_CPU = 4, /* 4 * #cpus for unbound wq */
kernel/locking/locktorture.c +4 -0
@@ -630,6 +630,8 @@ static void lock_torture_cleanup(void)else lock_torture_print_module_parms (cxt.cur_ops,"End of test: SUCCESS" ); +kfree (cxt.lwsa); +kfree (cxt.lrsa);torture_cleanup_end (); }
@@ -763,6 +765,8 @@ static int __init lock_torture_init(void) GFP_KERNEL);if (reader_tasks ==NULL ) {VERBOSE_TOROUT_ERRSTRING ("reader_tasks: Out of memory" ); +kfree (writer_tasks); + writer_tasks =NULL ; firsterr = -ENOMEM ; goto unwind; }
mm/cma.c +6 -9
@@ -58,7 +58,7 @@ unsigned long cma_get_size(const struct cma *cma) }static unsigned long cma_bitmap_aligned_mask (const struct cma *cma, -int align_order) +unsigned int align_order) {if (align_order <= cma->order_per_bit)return 0 ;
@@ -66,17 +66,14 @@ static unsigned long cma_bitmap_aligned_mask(const struct cma *cma, }/* -* Find a PFN aligned to the specified order and return an offset represented in -* order_per_bits. +* Find the offset of the base PFN from the specified align_order. +* The value returned is represented in order_per_bits. */ static unsigned long cma_bitmap_aligned_offset (const struct cma *cma, -int align_order) +unsigned int align_order) { -if (align_order <= cma->order_per_bit) -return 0 ; - -return (ALIGN (cma->base_pfn, (1UL << align_order)) - - cma->base_pfn) >> cma->order_per_bit; +return (cma->base_pfn & ((1UL << align_order) -1 )) + >> cma->order_per_bit; }static unsigned long cma_bitmap_maxno (struct cma *cma)
net/bluetooth/l2cap_core.c +43 -37
304 lines not on this page · raw message
sound/isa/msnd/msnd_midi.c +15 -15
@@ -120,24 +120,24 @@ void snd_msndmidi_input_read(void *mpuv)unsigned long flags;struct snd_msndmidi *mpu = mpuv;void *pwMIDQData = mpu->dev->mappedbase +MIDQ_DATA_BUFF ; +u16 head, tail, size;spin_lock_irqsave (&mpu->input_lock, flags); -while (readw (mpu->dev->MIDQ + JQS_wTail) != -readw (mpu->dev->MIDQ + JQS_wHead)) { -u16 wTmp, val; - val =readw (pwMIDQData +2 *readw (mpu->dev->MIDQ + JQS_wHead)); - -if (test_bit (MSNDMIDI_MODE_BIT_INPUT_TRIGGER , - &mpu->mode)) -snd_rawmidi_receive (mpu->substream_input, - (unsigned char *)&val,1 ); - - wTmp =readw (mpu->dev->MIDQ + JQS_wHead) +1 ; -if (wTmp >readw (mpu->dev->MIDQ + JQS_wSize)) -writew (0 , mpu->dev->MIDQ + JQS_wHead); -else -writew (wTmp, mpu->dev->MIDQ + JQS_wHead); + head =readw (mpu->dev->MIDQ + JQS_wHead); + tail =readw (mpu->dev->MIDQ + JQS_wTail); + size =readw (mpu->dev->MIDQ + JQS_wSize); +if (head > size || tail > size) + goto out; +while (head != tail) { +unsigned char val =readw (pwMIDQData +2 * head); + +if (test_bit (MSNDMIDI_MODE_BIT_INPUT_TRIGGER , &mpu->mode)) +snd_rawmidi_receive (mpu->substream_input, &val,1 ); +if (++head > size) + head =0 ; +writew (head, mpu->dev->MIDQ + JQS_wHead); } + out:spin_unlock_irqrestore (&mpu->input_lock, flags); }EXPORT_SYMBOL (snd_msndmidi_input_read);
sound/isa/msnd/msnd_pinnacle.c +12 -11
@@ -170,23 +170,24 @@ static irqreturn_t snd_msnd_interrupt(int irq, void *dev_id) {struct snd_msnd *chip = dev_id;void *pwDSPQData = chip->mappedbase +DSPQ_DATA_BUFF ; +u16 head, tail, size;/* Send ack to DSP */ /* inb(chip->io + HP_RXL); */ /* Evaluate queued DSP messages */ -while (readw (chip->DSPQ + JQS_wTail) !=readw (chip->DSPQ + JQS_wHead)) { -u16 wTmp; - -snd_msnd_eval_dsp_msg (chip, -readw (pwDSPQData +2 *readw (chip->DSPQ + JQS_wHead))); - - wTmp =readw (chip->DSPQ + JQS_wHead) +1 ; -if (wTmp >readw (chip->DSPQ + JQS_wSize)) -writew (0 , chip->DSPQ + JQS_wHead); -else -writew (wTmp, chip->DSPQ + JQS_wHead); + head =readw (chip->DSPQ + JQS_wHead); + tail =readw (chip->DSPQ + JQS_wTail); + size =readw (chip->DSPQ + JQS_wSize); +if (head > size || tail > size) + goto out; +while (head != tail) { +snd_msnd_eval_dsp_msg (chip,readw (pwDSPQData +2 * head)); +if (++head > size) + head =0 ; +writew (head, chip->DSPQ + JQS_wHead); } + out:/* Send ack to DSP */ inb (chip->io +HP_RXL );return IRQ_HANDLED ;