Linux 3.14.58
Greg KH
maintainerI'm announcing the release of the 3.14.58 kernel.
All users of the 3.14 kernel series must upgrade.
The updated 3.14.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.14.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/common/edma.c | 6 - arch/arm/mm/dma-mapping.c | 7 + arch/arm/plat-orion/common.c | 2 arch/arm64/include/asm/ptrace.h | 16 +-- arch/x86/kernel/cpu/common.c | 3 arch/x86/kernel/head_64.S | 8 + arch/x86/kernel/setup.c | 8 + arch/x86/kernel/verify_cpu.S | 12 +- drivers/bluetooth/ath3k.c | 4 drivers/bluetooth/btusb.c | 2 drivers/net/can/sja1000/sja1000.c | 3 drivers/net/ethernet/marvell/mvneta.c | 2 drivers/net/ethernet/mellanox/mlx4/cmd.c | 2 drivers/net/ethernet/mellanox/mlx4/eq.c | 2 drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 7 + drivers/net/macvtap.c | 2 drivers/net/ppp/pppoe.c | 2 drivers/net/virtio_net.c | 4 drivers/net/wireless/mwifiex/debugfs.c | 14 +-- drivers/staging/rtl8712/usb_intf.c | 1 drivers/usb/class/usblp.c | 2 drivers/usb/musb/musb_core.c | 10 +- drivers/usb/serial/option.c | 11 ++ drivers/usb/serial/ti_usb_3410_5052.c | 2 drivers/usb/serial/ti_usb_3410_5052.h | 4 include/net/inet_common.h | 3 net/bluetooth/hidp/core.c | 14 +++ net/core/dst.c | 2 net/ipv4/ipmr.c | 6 - net/irda/irlmp.c | 2 net/mac80211/mlme.c | 2 net/packet/af_packet.c | 80 +++++++++++-------- net/rds/connection.c | 6 + net/rds/tcp_recv.c | 11 ++ sound/usb/midi.c | 46 ++++++++++ sound/usb/quirks-table.h | 11 ++ sound/usb/quirks.c | 1 sound/usb/usbaudio.h | 1 39 files changed, 242 insertions(+), 81 deletions(-)
Aleksander Morgado (1):
USB: serial: option: add support for Novatel MiFi USB620L
Andrew Cooper (1):
x86/cpu: Fix SMAP check in PVOPS environments
Ani Sinha (1):
ipmr: fix possible race resulting from improper usage of IP_INC_STATS_BH() in preemptible context.
Bjørn Mork (1):
USB: option: add XS Stick W100-2 from 4G Systems
Borislav Petkov (1):
x86/cpu: Call verify_cpu() after having entered long mode too
Carol L Soto (1):
net/mlx4: Copy/set only sizeof struct mlx4_eqe bytes
Clemens Ladisch (3):
ALSA: usb-audio: add packet size quirk for the Medeli DD305
ALSA: usb-audio: prevent CH345 multiport output SysEx corruption
ALSA: usb-audio: work around CH345 input SysEx corruption
Dan Carpenter (2):
irda: precedence bug in irlmp_seq_hb_idx()
mwifiex: fix mwifiex_rdeeprom_read()
David Herrmann (1):
Bluetooth: hidp: fix device disconnect on idle timeout
David Woodhouse (1):
USB: ti_usb_3410_5052: Add Honeywell HGI80 ID
Dmitry Tunin (2):
Bluetooth: ath3k: Add new AR3012 0930:021c id
Bluetooth: ath3k: Add support of AR3012 0cf3:817b device
Eric Dumazet (2):
net: avoid NULL deref in inet_ctl_sock_destroy()
net: fix a race in dst_release()
Florian Fainelli (1):
ARM: orion: Fix DSA platform device after mvmdio conversion
Francesco Ruggeri (1):
packet: race condition in packet_bind
Greg Kroah-Hartman (1):
Linux 3.14.58
Guillaume Nault (1):
ppp: fix pppoe_dev deletion condition in pppoe_release()
Jason Wang (2):
macvtap: unbreak receiving of gro skb with frag list
virtio-net: drop NETIF_F_FRAGLIST
Jiri Slaby (1):
usblp: do not set TASK_INTERRUPTIBLE before lock
Johannes Berg (1):
mac80211: fix driver RSSI event calculations
Krzysztof Mazur (1):
x86/setup: Fix low identity map for >= 2GB kernel range
Larry Finger (1):
staging: rtl8712: Add device ID for Sitecom WLA2100
Marek Szyprowski (2):
ARM: 8426/1: dma-mapping: add missing range check in dma_mmap()
ARM: 8427/1: dma-mapping: add support for offset parameter in dma_mmap()
Maxime Ripard (1):
net: mvneta: Fix CPU_MAP registers initialisation
Mirza Krak (1):
can: sja1000: clear interrupts on start
Paolo Bonzini (1):
x86/setup: Extend low identity map to cover whole kernel range
Peter Ujfalusi (1):
ARM: common: edma: Fix channel parameter for irq callbacks
Phil Reid (1):
stmmac: Correctly report PTP capabilities.
Robin Murphy (1):
arm64: Fix compat register mappings
Sasha Levin (1):
RDS: verify the underlying transport exists before creating a connection
Sowmini Varadhan (1):
RDS-TCP: Recover correctly from pskb_pull()/pksb_trim() failure in rds_tcp_data_recv
Uwe Kleine-König (1):
usb: musb: core: fix order of arguments to ulpi write callback
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 14 -SUBLEVEL = 57 +SUBLEVEL = 58 EXTRAVERSION = NAME = Remembering Coco
arch/arm/common/edma.c +4 -2
@@ -404,7 +404,8 @@ static irqreturn_t dma_irq_handler(int irq, void *data) BIT(slot));if (edma_cc[ctlr]->intr_data[channel].callback) edma_cc[ctlr]->intr_data[channel].callback ( - channel,EDMA_DMA_COMPLETE , +EDMA_CTLR_CHAN (ctlr, channel), +EDMA_DMA_COMPLETE , edma_cc[ctlr]->intr_data[channel].data); } }while (sh_ipr);
@@ -458,7 +459,8 @@ static irqreturn_t dma_ccerr_handler(int irq, void *data)if (edma_cc[ctlr]->intr_data[k]. callback) { edma_cc[ctlr]->intr_data[k]. -callback (k, +callback ( +EDMA_CTLR_CHAN (ctlr, k),EDMA_DMA_CC_ERROR , edma_cc[ctlr]->intr_data [k].data);
arch/arm/mm/dma-mapping.c +7 -0
@@ -1411,12 +1411,19 @@ static int arm_iommu_mmap_attrs(struct device *dev, struct vm_area_struct *vma,unsigned long uaddr = vma->vm_start;unsigned long usize = vma->vm_end - vma->vm_start;struct page **pages =__iommu_get_pages (cpu_addr, attrs); +unsigned long nr_pages =PAGE_ALIGN (size) >>PAGE_SHIFT ; +unsigned long off = vma->vm_pgoff; vma->vm_page_prot =__get_dma_pgprot (attrs, vma->vm_page_prot);if (!pages)return -ENXIO ; +if (off >= nr_pages || (usize >>PAGE_SHIFT ) > nr_pages - off) +return -ENXIO ; + + pages += off; + do { int ret = vm_insert_page(vma, uaddr, *pages++); if (ret) {
arch/arm/plat-orion/common.c +1 -1
@@ -499,7 +499,7 @@ void __init orion_ge00_switch_init(struct dsa_platform_data *d, int irq) d->netdev = &orion_ge00.dev;for (i =0 ; i < d->nr_chips; i++) - d->chip[i].mii_bus = &orion_ge00_shared.dev; + d->chip[i].mii_bus = &orion_ge_mvmdio.dev; orion_switch_device.dev.platform_data = d;platform_device_register (&orion_switch_device);
arch/arm64/include/asm/ptrace.h +8 -8
@@ -71,14 +71,14 @@#define compat_sp regs[13]#define compat_lr regs[14]#define compat_sp_hyp regs[15] -#define compat_sp_irq regs[16] -#define compat_lr_irq regs[17] -#define compat_sp_svc regs[18] -#define compat_lr_svc regs[19] -#define compat_sp_abt regs[20] -#define compat_lr_abt regs[21] -#define compat_sp_und regs[22] -#define compat_lr_und regs[23] +#define compat_lr_irq regs[16] +#define compat_sp_irq regs[17] +#define compat_lr_svc regs[18] +#define compat_sp_svc regs[19] +#define compat_lr_abt regs[20] +#define compat_sp_abt regs[21] +#define compat_lr_und regs[22] +#define compat_sp_und regs[23]#define compat_r8_fiq regs[24]#define compat_r9_fiq regs[25]#define compat_r10_fiq regs[26]
arch/x86/kernel/cpu/common.c +1 -2
@@ -280,10 +280,9 @@ __setup("nosmap", setup_disable_smap); static __always_inline void setup_smap(struct cpuinfo_x86 *c) { -unsigned long eflags; +unsigned long eflags =native_save_fl ();/* This should have been cleared long ago */ -raw_local_save_flags (eflags);BUG_ON (eflags &X86_EFLAGS_AC );if (cpu_has (c,X86_FEATURE_SMAP )) {
arch/x86/kernel/head_64.S +8 -0
@@ -65,6 +65,9 @@ startup_64: * tables and then reload them. */ + /* Sanitize CPU configuration */ + call verify_cpu + /* * Compute the delta between the address I am compiled to run at and the * address I am actually running at.
@@ -174,6 +177,9 @@ ENTRY(secondary_startup_64) * after the boot processor executes this code. */ + /* Sanitize CPU configuration */ + call verify_cpu + movq $(init_level4_pgt - __START_KERNEL_map), %rax 1:
@@ -288,6 +294,8 @@ ENTRY(secondary_startup_64) pushq %rax # target address in negative space lretq +#include "verify_cpu.S" + #ifdef CONFIG_HOTPLUG_CPU /* * Boot CPU0 entry point. It's called from play_dead(). Everything has been set
arch/x86/kernel/setup.c +8 -0
@@ -1178,6 +1178,14 @@ void __init setup_arch(char **cmdline_p)clone_pgd_range (initial_page_table +KERNEL_PGD_BOUNDARY , swapper_pg_dir +KERNEL_PGD_BOUNDARY ,KERNEL_PGD_PTRS ); + +/* +* sync back low identity map too. It is used for example +* in the 32-bit EFI stub. +*/ +clone_pgd_range (initial_page_table, + swapper_pg_dir +KERNEL_PGD_BOUNDARY , +min (KERNEL_PGD_PTRS ,KERNEL_PGD_BOUNDARY ));#endif tboot_probe ();
arch/x86/kernel/verify_cpu.S +7 -5
@@ -34,10 +34,11 @@ #include <asm/msr-index.h> verify_cpu: - pushfl # Save caller passed flags - pushl $0 # Kill any dangerous flags - popfl + pushf # Save caller passed flags + push $0 # Kill any dangerous flags + popf +#ifndef __x86_64__ pushfl # standard way to check for cpuid popl %eax movl %eax,%ebx
@@ -48,6 +49,7 @@ verify_cpu: popl %eax cmpl %eax,%ebx jz verify_cpu_no_longmode # cpu has no cpuid +#endif movl $0x0,%eax # See if cpuid 1 is implemented cpuid
@@ -130,10 +132,10 @@ verify_cpu_sse_test: jmp verify_cpu_sse_test # try again verify_cpu_no_longmode: - popfl # Restore caller passed flags + popf # Restore caller passed flags movl $1,%eax ret verify_cpu_sse_ok: - popfl # Restore caller passed flags + popf # Restore caller passed flags xorl %eax, %eax ret
drivers/bluetooth/ath3k.c +4 -0
@@ -90,6 +90,7 @@ static const struct usb_device_id ath3k_table[] = { { USB_DEVICE(0x04CA, 0x300b) }, { USB_DEVICE(0x04CA, 0x3010) }, { USB_DEVICE(0x0930, 0x0219) }, + { USB_DEVICE(0x0930, 0x021c) }, { USB_DEVICE(0x0930, 0x0220) }, { USB_DEVICE(0x0930, 0x0227) }, { USB_DEVICE(0x0b05, 0x17d0) },
@@ -101,6 +102,7 @@ static const struct usb_device_id ath3k_table[] = { { USB_DEVICE(0x0CF3, 0x311F) }, { USB_DEVICE(0x0cf3, 0x3121) }, { USB_DEVICE(0x0CF3, 0x817a) }, + { USB_DEVICE(0x0CF3, 0x817b) }, { USB_DEVICE(0x0cf3, 0xe003) }, { USB_DEVICE(0x0CF3, 0xE004) }, { USB_DEVICE(0x0CF3, 0xE005) },
@@ -146,6 +148,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x3010), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0930, 0x021c), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0227), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0b05, 0x17d0), .driver_info = BTUSB_ATH3012 },
@@ -157,6 +160,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { { USB_DEVICE(0x0cf3, 0x311F), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x3121), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0CF3, 0x817a), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0CF3, 0x817b), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0xe005), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0xe003), .driver_info = BTUSB_ATH3012 },
drivers/bluetooth/btusb.c +2 -0
@@ -168,6 +168,7 @@ static const struct usb_device_id blacklist_table[] = { { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x3010), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0930, 0x021c), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0227), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0b05, 0x17d0), .driver_info = BTUSB_ATH3012 },
@@ -179,6 +180,7 @@ static const struct usb_device_id blacklist_table[] = { { USB_DEVICE(0x0cf3, 0x311f), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x3121), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0x817a), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0cf3, 0x817b), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0xe003), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0cf3, 0xe005), .driver_info = BTUSB_ATH3012 },
drivers/net/can/sja1000/sja1000.c +3 -0
@@ -184,6 +184,9 @@ static void sja1000_start(struct net_device *dev) priv->write_reg (priv,SJA1000_RXERR ,0x0 ); priv->read_reg (priv,SJA1000_ECC ); +/* clear interrupt flags */ + priv->read_reg (priv,SJA1000_IR ); +/* leave reset mode */ set_normal_mode (dev); }
drivers/net/ethernet/marvell/mvneta.c +1 -1
@@ -950,7 +950,7 @@ static void mvneta_defaults_set(struct mvneta_port *pp)/* Set CPU queue access map - all CPUs have access to all RX * queues and to all TX queues */ -for (cpu =0 ; cpu <CONFIG_NR_CPUS ; cpu++) +for_each_present_cpu (cpu)mvreg_write (pp,MVNETA_CPU_MAP (cpu), (MVNETA_CPU_RXQ_ACCESS_ALL_MASK |MVNETA_CPU_TXQ_ACCESS_ALL_MASK ));
drivers/net/ethernet/mellanox/mlx4/cmd.c +1 -1
@@ -1987,7 +1987,7 @@ int mlx4_multi_func_init(struct mlx4_dev *dev)spin_lock_init (&s_state->lock); } -memset (&priv->mfunc.master.cmd_eqe,0 , dev->caps.eqe_size); +memset (&priv->mfunc.master.cmd_eqe,0 ,sizeof (struct mlx4_eqe )); priv->mfunc.master.cmd_eqe.type =MLX4_EVENT_TYPE_CMD ;INIT_WORK (&priv->mfunc.master.comm_work, mlx4_master_comm_channel);
drivers/net/ethernet/mellanox/mlx4/eq.c +1 -1
@@ -183,7 +183,7 @@ static void slave_event(struct mlx4_dev *dev, u8 slave, struct mlx4_eqe *eqe)return ; } -memcpy (s_eqe, eqe, dev->caps.eqe_size -1 ); +memcpy (s_eqe, eqe,sizeof (struct mlx4_eqe ) -1 ); s_eqe->slave_id = slave;/* ensure all information is written before setting the ownersip bit */ wmb ();
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +5 -2
@@ -731,10 +731,13 @@ static int stmmac_get_ts_info(struct net_device *dev, {struct stmmac_priv *priv =netdev_priv (dev); -if ((priv->hwts_tx_en) && (priv->hwts_rx_en)) { +if ((priv->dma_cap.time_stamp || priv->dma_cap.atime_stamp)) { - info->so_timestamping =SOF_TIMESTAMPING_TX_HARDWARE | + info->so_timestamping =SOF_TIMESTAMPING_TX_SOFTWARE | +SOF_TIMESTAMPING_TX_HARDWARE | +SOF_TIMESTAMPING_RX_SOFTWARE |SOF_TIMESTAMPING_RX_HARDWARE | +SOF_TIMESTAMPING_SOFTWARE |SOF_TIMESTAMPING_RAW_HARDWARE ;if (priv->ptp_clock)
drivers/net/macvtap.c +1 -1
@@ -68,7 +68,7 @@ static const struct proto_ops macvtap_socket_ops;#define TUN_OFFLOADS (NETIF_F_HW_CSUM | NETIF_F_TSO_ECN | NETIF_F_TSO | \ NETIF_F_TSO6 | NETIF_F_UFO)#define RX_OFFLOADS (NETIF_F_GRO | NETIF_F_LRO) -#define TAP_FEATURES (NETIF_F_GSO | NETIF_F_SG) +#define TAP_FEATURES (NETIF_F_GSO | NETIF_F_SG | NETIF_F_FRAGLIST)static struct macvlan_dev *macvtap_get_vlan_rcu (const struct net_device *dev) {
drivers/net/ppp/pppoe.c +1 -1
@@ -569,7 +569,7 @@ static int pppoe_release(struct socket *sock) po =pppox_sk (sk); -if (sk->sk_state & (PPPOX_CONNECTED |PPPOX_BOUND |PPPOX_ZOMBIE )) { +if (po->pppoe_dev) {dev_put (po->pppoe_dev); po->pppoe_dev =NULL ; }
drivers/net/virtio_net.c +2 -2
@@ -1652,9 +1652,9 @@ static int virtnet_probe(struct virtio_device *vdev)/* Do we support "hardware" checksums? */ if (virtio_has_feature (vdev,VIRTIO_NET_F_CSUM )) {/* This opens up the world of extra features. */ - dev->hw_features |=NETIF_F_HW_CSUM |NETIF_F_SG |NETIF_F_FRAGLIST ; + dev->hw_features |=NETIF_F_HW_CSUM |NETIF_F_SG ;if (csum) - dev->features |=NETIF_F_HW_CSUM |NETIF_F_SG |NETIF_F_FRAGLIST ; + dev->features |=NETIF_F_HW_CSUM |NETIF_F_SG ;if (virtio_has_feature (vdev,VIRTIO_NET_F_GSO )) { dev->hw_features |=NETIF_F_TSO |NETIF_F_UFO
drivers/net/wireless/mwifiex/debugfs.c +7 -7
@@ -637,7 +637,7 @@ mwifiex_rdeeprom_read(struct file *file, char __user *ubuf, (struct mwifiex_private *) file->private_data;unsigned long addr =get_zeroed_page (GFP_KERNEL );char *buf = (char *) addr; -int pos =0 , ret =0 , i; +int pos, ret, i;u8 value[MAX_EEPROM_DATA ];if (!buf)
@@ -645,7 +645,7 @@ mwifiex_rdeeprom_read(struct file *file, char __user *ubuf,if (saved_offset ==-1 ) {/* No command has been given */ - pos +=snprintf (buf,PAGE_SIZE ,"0" ); + pos =snprintf (buf,PAGE_SIZE ,"0" ); goto done; }
@@ -654,17 +654,17 @@ mwifiex_rdeeprom_read(struct file *file, char __user *ubuf, (u16) saved_bytes, value);if (ret) { ret = -EINVAL ; - goto done; + goto out_free; } - pos +=snprintf (buf,PAGE_SIZE ,"%d %d " , saved_offset, saved_bytes); + pos =snprintf (buf,PAGE_SIZE ,"%d %d " , saved_offset, saved_bytes);for (i =0 ; i < saved_bytes; i++) - pos +=snprintf (buf +strlen (buf),PAGE_SIZE ,"%d " , value[i]); - - ret =simple_read_from_buffer (ubuf, count, ppos, buf, pos); + pos +=scnprintf (buf + pos,PAGE_SIZE - pos,"%d " , value[i]); done: + ret =simple_read_from_buffer (ubuf, count, ppos, buf, pos); +out_free:free_page (addr);return ret; }
drivers/staging/rtl8712/usb_intf.c +1 -0
@@ -144,6 +144,7 @@ static struct usb_device_id rtl871x_usb_id_tbl[] = { {USB_DEVICE(0x0DF6, 0x0058)}, {USB_DEVICE(0x0DF6, 0x0049)}, {USB_DEVICE(0x0DF6, 0x004C)}, + {USB_DEVICE(0x0DF6, 0x006C)}, {USB_DEVICE(0x0DF6, 0x0064)},/* Skyworth */ {USB_DEVICE(0x14b2, 0x3300)},
drivers/usb/class/usblp.c +1 -1
@@ -869,11 +869,11 @@ static int usblp_wwait(struct usblp *usblp, int nonblock)add_wait_queue (&usblp->wwait, &waita);for (;;) { -set_current_state (TASK_INTERRUPTIBLE );if (mutex_lock_interruptible (&usblp->mut)) { rc = -EINTR ;break ; } +set_current_state (TASK_INTERRUPTIBLE ); rc =usblp_wtest (usblp, nonblock);mutex_unlock (&usblp->mut);if (rc <=0 )
drivers/usb/musb/musb_core.c +5 -5
@@ -132,7 +132,7 @@ static inline struct musb *dev_to_musb(struct device *dev)/*-------------------------------------------------------------------------*/ #ifndef CONFIG_BLACKFIN -static int musb_ulpi_read (struct usb_phy *phy,u32 offset) +static int musb_ulpi_read (struct usb_phy *phy,u32 reg) {void __iomem *addr = phy->io_priv;int i =0 ;
@@ -151,7 +151,7 @@ static int musb_ulpi_read(struct usb_phy *phy, u32 offset)* ULPICarKitControlDisableUTMI after clearing POWER_SUSPENDM. */ -musb_writeb (addr,MUSB_ULPI_REG_ADDR , (u8 )offset); +musb_writeb (addr,MUSB_ULPI_REG_ADDR , (u8 )reg);musb_writeb (addr,MUSB_ULPI_REG_CONTROL ,MUSB_ULPI_REG_REQ |MUSB_ULPI_RDN_WR );
@@ -176,7 +176,7 @@ out:return ret; } -static int musb_ulpi_write (struct usb_phy *phy,u32 offset,u32 data) +static int musb_ulpi_write (struct usb_phy *phy,u32 val,u32 reg) {void __iomem *addr = phy->io_priv;int i =0 ;
@@ -191,8 +191,8 @@ static int musb_ulpi_write(struct usb_phy *phy, u32 offset, u32 data) power &= ~MUSB_POWER_SUSPENDM ;musb_writeb (addr,MUSB_POWER , power); -musb_writeb (addr,MUSB_ULPI_REG_ADDR , (u8 )offset); -musb_writeb (addr,MUSB_ULPI_REG_DATA , (u8 )data); +musb_writeb (addr,MUSB_ULPI_REG_ADDR , (u8 )reg); +musb_writeb (addr,MUSB_ULPI_REG_DATA , (u8 )val);musb_writeb (addr,MUSB_ULPI_REG_CONTROL ,MUSB_ULPI_REG_REQ ); while (!(musb_readb(addr, MUSB_ULPI_REG_CONTROL)
drivers/usb/serial/option.c +11 -0
@@ -162,6 +162,7 @@ static void option_instat_callback(struct urb *urb);#define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_HIGHSPEED 0x9001#define NOVATELWIRELESS_PRODUCT_E362 0x9010#define NOVATELWIRELESS_PRODUCT_E371 0x9011 +#define NOVATELWIRELESS_PRODUCT_U620L 0x9022#define NOVATELWIRELESS_PRODUCT_G2 0xA010#define NOVATELWIRELESS_PRODUCT_MC551 0xB001
@@ -354,6 +355,7 @@ static void option_instat_callback(struct urb *urb);/* This is the 4G XS Stick W14 a.k.a. Mobilcom Debitel Surf-Stick * * It seems to contain a Qualcomm QSC6240/6290 chipset */ #define FOUR_G_SYSTEMS_PRODUCT_W14 0x9603 +#define FOUR_G_SYSTEMS_PRODUCT_W100 0x9b01/* iBall 3.5G connect wireless modem */ #define IBALL_3_5G_CONNECT 0x9605
@@ -527,6 +529,11 @@ static const struct option_blacklist_info four_g_w14_blacklist = { .sendsetup = BIT(0) | BIT(1), }; +static const struct option_blacklist_info four_g_w100_blacklist = { + .sendsetup =BIT (1 ) |BIT (2 ), + .reserved =BIT (3 ), +}; +static const struct option_blacklist_info alcatel_x200_blacklist = { .sendsetup =BIT (0 ) |BIT (1 ), .reserved =BIT (4 ),
@@ -1060,6 +1067,7 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_AND_INTERFACE_INFO(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC551, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_E362, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_E371, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U620L, 0xff, 0x00, 0x00) }, { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01) }, { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01A) },
@@ -1641,6 +1649,9 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14), .driver_info = (kernel_ulong_t)&four_g_w14_blacklist }, + { USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W100), + .driver_info = (kernel_ulong_t)&four_g_w100_blacklist + }, { USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, SPEEDUP_PRODUCT_SU9800, 0xff) }, { USB_DEVICE(LONGCHEER_VENDOR_ID, ZOOM_PRODUCT_4597) }, { USB_DEVICE(LONGCHEER_VENDOR_ID, IBALL_3_5G_CONNECT) },
drivers/usb/serial/ti_usb_3410_5052.c +2 -0
@@ -159,6 +159,7 @@ static const struct usb_device_id ti_id_table_3410[] = { { USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_STEREO_PLUG_ID) }, { USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_STRIP_PORT_ID) }, { USB_DEVICE(TI_VENDOR_ID, FRI2_PRODUCT_ID) }, + { USB_DEVICE(HONEYWELL_VENDOR_ID, HONEYWELL_HGI80_PRODUCT_ID) }, { } /* terminator */ };
@@ -191,6 +192,7 @@ static const struct usb_device_id ti_id_table_combined[] = { { USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_PRODUCT_ID) }, { USB_DEVICE(ABBOTT_VENDOR_ID, ABBOTT_STRIP_PORT_ID) }, { USB_DEVICE(TI_VENDOR_ID, FRI2_PRODUCT_ID) }, + { USB_DEVICE(HONEYWELL_VENDOR_ID, HONEYWELL_HGI80_PRODUCT_ID) }, { } /* terminator */ };
drivers/usb/serial/ti_usb_3410_5052.h +4 -0
@@ -56,6 +56,10 @@#define ABBOTT_PRODUCT_ID ABBOTT_STEREO_PLUG_ID#define ABBOTT_STRIP_PORT_ID 0x3420 +/* Honeywell vendor and product IDs */ +#define HONEYWELL_VENDOR_ID 0x10ac +#define HONEYWELL_HGI80_PRODUCT_ID 0x0102/* Honeywell HGI80 */ +/* Commands */ #define TI_GET_VERSION 0x01#define TI_GET_PORT_STATUS 0x02
include/net/inet_common.h +2 -1
@@ -40,7 +40,8 @@ int inet_ctl_sock_create(struct sock **sk, unsigned short family,static inline void inet_ctl_sock_destroy (struct sock *sk) { -sk_release_kernel (sk); +if (sk) +sk_release_kernel (sk); }#endif
net/bluetooth/hidp/core.c +14 -0
@@ -415,6 +415,20 @@ static void hidp_idle_timeout(unsigned long arg) {struct hidp_session *session = (struct hidp_session *) arg; +/* The HIDP user-space API only contains calls to add and remove +* devices. There is no way to forward events of any kind. Therefore, +* we have to forcefully disconnect a device on idle-timeouts. This is +* unfortunate and weird API design, but it is spec-compliant and +* required for backwards-compatibility. Hence, on idle-timeout, we +* signal driver-detach events, so poll() will be woken up with an +* error-condition on both sockets. +*/ + + session->intr_sock->sk->sk_err =EUNATCH ; + session->ctrl_sock->sk->sk_err =EUNATCH ; +wake_up_interruptible (sk_sleep (session->intr_sock->sk)); +wake_up_interruptible (sk_sleep (session->ctrl_sock->sk)); +hidp_session_terminate (session); }
net/core/dst.c +1 -1
@@ -283,7 +283,7 @@ void dst_release(struct dst_entry *dst) newrefcnt =atomic_dec_return (&dst->__refcnt);WARN_ON (newrefcnt <0 ); -if (unlikely (dst->flags &DST_NOCACHE ) && !newrefcnt) +if (!newrefcnt &&unlikely (dst->flags &DST_NOCACHE ))call_rcu (&dst->rcu_head, dst_destroy_rcu); } }
net/ipv4/ipmr.c +3 -3
@@ -1674,8 +1674,8 @@ static inline int ipmr_forward_finish(struct sk_buff *skb) {struct ip_options *opt = &(IPCB (skb)->opt); -IP_INC_STATS_BH (dev_net (skb_dst (skb)->dev),IPSTATS_MIB_OUTFORWDATAGRAMS ); -IP_ADD_STATS_BH (dev_net (skb_dst (skb)->dev),IPSTATS_MIB_OUTOCTETS , skb->len); +IP_INC_STATS (dev_net (skb_dst (skb)->dev),IPSTATS_MIB_OUTFORWDATAGRAMS ); +IP_ADD_STATS (dev_net (skb_dst (skb)->dev),IPSTATS_MIB_OUTOCTETS , skb->len);if (unlikely (opt->optlen))ip_forward_options (skb);
@@ -1737,7 +1737,7 @@ static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt,* to blackhole. */ -IP_INC_STATS_BH (dev_net (dev),IPSTATS_MIB_FRAGFAILS ); +IP_INC_STATS (dev_net (dev),IPSTATS_MIB_FRAGFAILS );ip_rt_put (rt); goto out_free; }
net/irda/irlmp.c +1 -1
@@ -1876,7 +1876,7 @@ static void *irlmp_seq_hb_idx(struct irlmp_iter_state *iter, loff_t *off)for (element =hashbin_get_first (iter->hashbin); element !=NULL ; element =hashbin_get_next (iter->hashbin)) { -if (!off || *off-- ==0 ) { +if (!off || (*off)-- ==0 ) {/* NB: hashbin left locked */ return element; }
net/mac80211/mlme.c +1 -1
@@ -2869,7 +2869,7 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,if (ifmgd->rssi_min_thold != ifmgd->rssi_max_thold && ifmgd->count_beacon_signal >=IEEE80211_SIGNAL_AVE_MIN_COUNT ) { -int sig = ifmgd->ave_beacon_signal; +int sig = ifmgd->ave_beacon_signal /16 ;int last_sig = ifmgd->last_ave_beacon_signal;/*
net/packet/af_packet.c +49 -31
144 lines not on this page · raw message
net/rds/connection.c +6 -0
@@ -183,6 +183,12 @@ static struct rds_connection *__rds_conn_create(__be32 laddr, __be32 faddr, } } +if (trans ==NULL ) { +kmem_cache_free (rds_conn_slab, conn); + conn =ERR_PTR (-ENODEV ); + goto out; + } + conn->c_trans = trans; ret = trans->conn_alloc (conn, gfp);
net/rds/tcp_recv.c +9 -2
@@ -234,8 +234,15 @@ static int rds_tcp_data_recv(read_descriptor_t *desc, struct sk_buff *skb, } to_copy =min (tc->t_tinc_data_rem, left); -pskb_pull (clone, offset); -pskb_trim (clone, to_copy); +if (!pskb_pull (clone, offset) || +pskb_trim (clone, to_copy)) { +pr_warn ("rds_tcp_data_recv: pull/trim failed " +"left %zu data_rem %zu skb_len %d\n" , + left, tc->t_tinc_data_rem, skb->len); +kfree_skb (clone); + desc->error = -ENOMEM ; + goto out; + }skb_queue_tail (&tinc->ti_skb_list, clone); rdsdebug("skb %p data %p len %d off %u to_copy %zu -> "
sound/usb/midi.c +46 -0
76 lines not on this page · raw message
sound/usb/quirks-table.h +11 -0
@@ -2875,6 +2875,17 @@ YAMAHA_DEVICE(0x7010, "UB99"), .idProduct = 0x1020, }, +/* QinHeng devices */ +{ + USB_DEVICE(0x1a86, 0x752d), + .driver_info = (unsigned long ) &(const struct snd_usb_audio_quirk ) { + .vendor_name ="QinHeng" , + .product_name ="CH345" , + .ifnum =1 , + .type =QUIRK_MIDI_CH345 + } +}, +/* KeithMcMillen Stringport */ { USB_DEVICE(0x1f38, 0x0001),
sound/usb/quirks.c +1 -0
@@ -526,6 +526,7 @@ int snd_usb_create_quirk(struct snd_usb_audio *chip, [QUIRK_MIDI_CME] = create_any_midi_quirk, [QUIRK_MIDI_AKAI] = create_any_midi_quirk, [QUIRK_MIDI_FTDI] = create_any_midi_quirk, + [QUIRK_MIDI_CH345] = create_any_midi_quirk, [QUIRK_AUDIO_STANDARD_INTERFACE] = create_standard_audio_quirk, [QUIRK_AUDIO_FIXED_ENDPOINT] = create_fixed_stream_quirk, [QUIRK_AUDIO_EDIROL_UAXX] = create_uaxx_quirk,
sound/usb/usbaudio.h +1 -0
@@ -84,6 +84,7 @@ enum quirk_type {QUIRK_MIDI_AKAI ,QUIRK_MIDI_US122L ,QUIRK_MIDI_FTDI , +QUIRK_MIDI_CH345 ,QUIRK_AUDIO_STANDARD_INTERFACE ,QUIRK_AUDIO_FIXED_ENDPOINT , QUIRK_AUDIO_EDIROL_UAXX,
Hi,
We've noticed livelocks in shrink_dentry_list() very similar to this report on stable 3.14.56:
http://lkml.iu.edu/hypermail/linux/kernel/1405.3/00470.html
It appears that the patches that introduced this issue came into 3.14.51 in August with the same set of patches mentioned in the referenced report. We unfortunately haven't narrowed down a reproducer, so I can't bisect the issue, but 3.14.50 did not appear to have the issue.
Upstream merge commit - 6f6111e4a73d0f6370eb8be4f8e4523210b6a67d (Pull vfs dcache livelock fix from Al Viro) brought in a series to address this issue. So that may be needed here as well...
Thanks,
-Jason
Quoted 156 lines · Greg KH
I'm announcing the release of the 3.14.58 kernel.
All users of the 3.14 kernel series must upgrade.
The updated 3.14.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.gitlinux-3.14.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=summarythanks,
greg k-h
------------
Makefile | 2 arch/arm/common/edma.c | 6 - arch/arm/mm/dma-mapping.c | 7 + arch/arm/plat-orion/common.c | 2 arch/arm64/include/asm/ptrace.h | 16 +-- arch/x86/kernel/cpu/common.c | 3 arch/x86/kernel/head_64.S | 8 + arch/x86/kernel/setup.c | 8 + arch/x86/kernel/verify_cpu.S | 12 +- drivers/bluetooth/ath3k.c | 4 drivers/bluetooth/btusb.c | 2 drivers/net/can/sja1000/sja1000.c | 3 drivers/net/ethernet/marvell/mvneta.c | 2 drivers/net/ethernet/mellanox/mlx4/cmd.c | 2 drivers/net/ethernet/mellanox/mlx4/eq.c | 2 drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 7 + drivers/net/macvtap.c | 2 drivers/net/ppp/pppoe.c | 2 drivers/net/virtio_net.c | 4 drivers/net/wireless/mwifiex/debugfs.c | 14 +-- drivers/staging/rtl8712/usb_intf.c | 1 drivers/usb/class/usblp.c | 2 drivers/usb/musb/musb_core.c | 10 +- drivers/usb/serial/option.c | 11 ++ drivers/usb/serial/ti_usb_3410_5052.c | 2 drivers/usb/serial/ti_usb_3410_5052.h | 4 include/net/inet_common.h | 3 net/bluetooth/hidp/core.c | 14 +++ net/core/dst.c | 2 net/ipv4/ipmr.c | 6 - net/irda/irlmp.c | 2 net/mac80211/mlme.c | 2 net/packet/af_packet.c | 80 +++++++++++-------- net/rds/connection.c | 6 + net/rds/tcp_recv.c | 11 ++ sound/usb/midi.c | 46 ++++++++++ sound/usb/quirks-table.h | 11 ++ sound/usb/quirks.c | 1 sound/usb/usbaudio.h | 1 39 files changed, 242 insertions(+), 81 deletions(-)Aleksander Morgado (1):
USB: serial: option: add support for Novatel MiFi USB620LAndrew Cooper (1):
x86/cpu: Fix SMAP check in PVOPS environmentsAni Sinha (1):
ipmr: fix possible race resulting from improper usage ofIP_INC_STATS_BH()in preemptible context.Bj�rn Mork (1):
USB: option: add XS Stick W100-2 from 4G SystemsBorislav Petkov (1):
x86/cpu: Callverify_cpu()after having entered long mode tooCarol L Soto (1):
net/mlx4: Copy/set only sizeof structmlx4_eqebytesClemens Ladisch (3):
ALSA: usb-audio: add packet size quirk for the Medeli DD305
ALSA: usb-audio: prevent CH345 multiport output SysEx corruption
ALSA: usb-audio: work around CH345 input SysEx corruptionDan Carpenter (2):
irda: precedence bug inirlmp_seq_hb_idx()
mwifiex: fixmwifiex_rdeeprom_read()David Herrmann (1):
Bluetooth: hidp: fix device disconnect on idle timeoutDavid Woodhouse (1):
USB: ti_usb_3410_5052: Add Honeywell HGI80 IDDmitry Tunin (2):
Bluetooth: ath3k: Add new AR3012 0930:021c id
Bluetooth: ath3k: Add support of AR3012 0cf3:817b deviceEric Dumazet (2):
net: avoid NULL deref ininet_ctl_sock_destroy()
net: fix a race indst_release()Florian Fainelli (1):
ARM: orion: Fix DSA platform device after mvmdio conversionFrancesco Ruggeri (1):
packet: race condition inpacket_bindGreg Kroah-Hartman (1):
Linux 3.14.58Guillaume Nault (1):
ppp: fixpppoe_devdeletion condition inpppoe_release()Jason Wang (2):
macvtap: unbreak receiving of gro skb with frag list
virtio-net: dropNETIF_F_FRAGLISTJiri Slaby (1):
usblp: do not setTASK_INTERRUPTIBLEbefore lockJohannes Berg (1):
mac80211: fix driver RSSI event calculationsKrzysztof Mazur (1):
x86/setup: Fix low identity map for >= 2GB kernel rangeLarry Finger (1):
staging: rtl8712: Add device ID for Sitecom WLA2100Marek Szyprowski (2):
ARM: 8426/1: dma-mapping: add missing range check indma_mmap()
ARM: 8427/1: dma-mapping: add support for offset parameter indma_mmap()Maxime Ripard (1):
net: mvneta: FixCPU_MAPregisters initialisationMirza Krak (1):
can: sja1000: clear interrupts on startPaolo Bonzini (1):
x86/setup: Extend low identity map to cover whole kernel rangePeter Ujfalusi (1):
ARM: common: edma: Fix channel parameter for irq callbacksPhil Reid (1):
stmmac: Correctly report PTP capabilities.Robin Murphy (1):
arm64: Fix compat register mappingsSasha Levin (1):
RDS: verify the underlying transport exists before creating a connectionSowmini Varadhan (1):
RDS-TCP: Recover correctly from pskb_pull()/pksb_trim() failure inrds_tcp_data_recvUwe Kleine-K�nig (1):
usb: musb: core: fix order of arguments to ulpi write callback
Jason,
Quoted 4 lines · Jason Baron
We've noticed livelocks in
shrink_dentry_list()very similar to this report on stable 3.14.56:
http://lkml.iu.edu/hypermail/linux/kernel/1405.3/00470.html
Quoted 8 lines
It appears that the patches that introduced this issue came into 3.14.51 in August with the same set of patches mentioned in the referenced report. We unfortunately haven't narrowed down a reproducer, so I can't bisect the issue, but 3.14.50 did not appear to have the issue.
Upstream merge commit -
6f6111e4a73d0f6370eb8be4f8e4523210b6a67d(Pull vfs dcache livelock fix from Al Viro) brought in a series to address this issue. So that may be needed here as well...
FWIW I noticed the same thing. The commits listed in
http://www.spinics.net/lists/stable/msg111553.html fixed the problem for me.
I assume Greg will pick them up soon...
Signature · 1 line
Guillaume Morin <[email protected]>
Quoted 12 lines · Guillaume Morin
Jason,
Quoted 9 lines · Jason Baron
We've noticed livelocks in
shrink_dentry_list()very similar to this report on stable 3.14.56:
http://lkml.iu.edu/hypermail/linux/kernel/1405.3/00470.htmlIt appears that the patches that introduced this issue came into 3.14.51 in August with the same set of patches mentioned in the referenced report. We unfortunately haven't narrowed down a reproducer, so I can't bisect the issue, but 3.14.50 did not appear to have the issue.
Quoted 9 lines
Quoted 3 lines
Upstream merge commit -
6f6111e4a73d0f6370eb8be4f8e4523210b6a67d(Pull vfs dcache livelock fix from Al Viro) brought in a series to address this issue. So that may be needed here as well...FWIW I noticed the same thing. The commits listed in
http://www.spinics.net/lists/stable/msg111553.html fixed the problem for me.I assume Greg will pick them up soon...
Thanks for the info!
-Jason