Linux 3.14.67
Greg KH
maintainerI'm announcing the release of the 3.14.67 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/parisc/kernel/parisc_ksyms.c | 10 +-- arch/parisc/kernel/traps.c | 3 + drivers/gpu/drm/radeon/radeon_sa.c | 6 +- drivers/gpu/drm/radeon/si_dpm.c | 5 + drivers/hid/usbhid/hid-core.c | 73 +++++++++++++------------- drivers/hwmon/max1111.c | 6 ++ drivers/media/usb/usbvision/usbvision-video.c | 40 +++++++++++--- drivers/net/ethernet/jme.c | 3 - drivers/net/ethernet/qlogic/qlge/qlge_main.c | 11 +++ drivers/net/ethernet/renesas/sh_eth.c | 3 - drivers/net/ppp/ppp_generic.c | 4 + drivers/net/usb/cdc_ncm.c | 6 +- drivers/net/usb/qmi_wwan.c | 1 drivers/net/usb/usbnet.c | 7 ++ drivers/net/wan/farsync.c | 2 drivers/net/wireless/ath/ath9k/eeprom.c | 7 +- drivers/usb/core/hub.c | 8 +- drivers/usb/renesas_usbhs/fifo.c | 4 + drivers/xen/events/events_base.c | 28 ++++++++- fs/ext4/ext4.h | 23 ++++++++ fs/ext4/move_extent.c | 11 +++ fs/ext4/super.c | 25 ++++++++ kernel/events/core.c | 6 +- mm/page_isolation.c | 8 +- net/ipv4/udp.c | 12 ++-- net/ipv6/exthdrs_core.c | 6 +- net/ipv6/ip6_tunnel.c | 2 net/ipv6/udp.c | 6 -- net/l2tp/l2tp_ip.c | 8 +- net/l2tp/l2tp_ip6.c | 8 +- net/mac80211/rx.c | 5 + net/sctp/ipv6.c | 2 net/socket.c | 38 ++++++------- sound/core/timer.c | 4 - 35 files changed, 272 insertions(+), 121 deletions(-)
Alan Stern (1):
HID: usbhid: fix inconsistent reset/resume/reset-resume behavior
Alex Deucher (2):
drm/radeon: add a dpm quirk for sapphire Dual-X R7 370 2G D5 drm/radeon: add a dpm quirk for all R7 370 parts
Alexey Khoroshilov (1):
usbvision: fix leak of usb_dev on failure paths in usbvision_probe()
Arnaldo Carvalho de Melo (1):
net: Fix use after free in the recvmmsg exit path
Arnd Bergmann (2):
farsync: fix off-by-one bug in fst_add_one
ath9k: fix buffer overrun for ar9287
Bill Sommerfeld (1):
udp6: fix UDP/IPv6 encap resubmit path
Bjørn Mork (2):
cdc_ncm: toggle altsetting to force reset before setup
qmi_wwan: add "D-Link DWM-221 B1" device id
Boris Ostrovsky (1):
xen/events: Mask a moving irq
Diego Viola (1):
net: jme: fix suspend/resume on JMC260
Florian Westphal (1):
ipv6: re-enable fragment header matching in ipv6_find_hdr
Greg Kroah-Hartman (3):
Revert bad backport of "drm/radeon: hold reference to fences in radeon_sa_bo_new" Revert "usb: hub: do not clear BOS field during reset device"
Linux 3.14.67
Guenter Roeck (1):
hwmon: (max1111) Return -ENODEV from max1111_read_channel if not instantiated
Guillaume Nault (1):
ppp: take reference on channels netns
Haishuang Yan (2):
ipv4: l2tp: fix a potential issue in l2tp_ip_recv
ipv6: l2tp: fix a potential issue in l2tp_ip6_recv
Helge Deller (2):
parisc: Avoid function pointers for kernel exception routines
parisc: Fix kernel crash with reversed copy_from_user()
Manish Chopra (1):
qlge: Fix receive packets drop.
Michal Kazior (1):
mac80211: fix unnecessary frame drops in mesh fwding
Nicolai Hähnle (1):
drm/radeon: hold reference to fences in radeon_sa_bo_new (3.17 and older)
Oliver Neukum (1):
usbnet: cleanup after bind() in probe()
Paolo Abeni (1):
ipv4: fix broadcast packets reception
Peter Zijlstra (1):
perf: Cure event->pending_disable race
Sergei Shtylyov (1):
sh_eth: fix NULL pointer dereference in sh_eth_ring_format()
Takashi Iwai (1):
ALSA: timer: Use mod_timer() for rearming the system timer
Thadeu Lima de Souza Cascardo (1):
ip6_tunnel: set rtnl_link_ops before calling register_netdevice
Theodore Ts'o (1):
ext4: add lockdep annotations for i_data_sem
Vladis Dronov (1):
usbvision: fix crash on detecting device with invalid configuration
Xin Long (1):
sctp: lack the check for ports in sctp_v6_cmp_addr
Xishi Qiu (1):
mm: fix invalid node in alloc_migrate_target()
Yoshihiro Shimoda (2):
usb: renesas_usbhs: avoid NULL pointer derefernce in usbhsf_pkt_handler()
usb: renesas_usbhs: disable TX IRQ before starting TX DMAC transfer
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 14 -SUBLEVEL = 66 +SUBLEVEL = 67 EXTRAVERSION = NAME = Remembering Coco
arch/parisc/kernel/parisc_ksyms.c +5 -5
@@ -47,11 +47,11 @@ EXPORT_SYMBOL(__cmpxchg_u64);EXPORT_SYMBOL (lclear_user);EXPORT_SYMBOL (lstrnlen_user); -/* Global fixups */ -extern void fixup_get_user_skip_1 (void ); -extern void fixup_get_user_skip_2 (void ); -extern void fixup_put_user_skip_1 (void ); -extern void fixup_put_user_skip_2 (void ); +/* Global fixups - defined as int to avoid creation of function pointers */ +extern int fixup_get_user_skip_1; +extern int fixup_get_user_skip_2; +extern int fixup_put_user_skip_1; +extern int fixup_put_user_skip_2;EXPORT_SYMBOL (fixup_get_user_skip_1);EXPORT_SYMBOL (fixup_get_user_skip_2);EXPORT_SYMBOL (fixup_put_user_skip_1);
arch/parisc/kernel/traps.c +3 -0
@@ -802,6 +802,9 @@ void notrace handle_interruption(int code, struct pt_regs *regs)if (fault_space ==0 && !in_atomic ()) { +/* Clean up and return if in exception table. */ +if (fixup_exception (regs)) +return ;pdc_chassis_send_status (PDC_CHASSIS_DIRECT_PANIC );parisc_terminate ("Kernel Fault" , regs, code, fault_address); }
drivers/gpu/drm/radeon/radeon_sa.c +4 -2
@@ -349,8 +349,10 @@ int radeon_sa_bo_new(struct radeon_device *rdev,/* see if we can skip over some allocations */ }while (radeon_sa_bo_next_hole (sa_manager, fences, tries)); -for (i =0 ; i <RADEON_NUM_RINGS ; ++i) -radeon_fence_ref (fences[i]); +for (i =0 ; i <RADEON_NUM_RINGS ; ++i) { +if (fences[i]) +radeon_fence_ref (fences[i]); + }spin_unlock (&sa_manager->wq.lock); r =radeon_fence_wait_any (rdev, fences, false);
drivers/gpu/drm/radeon/si_dpm.c +5 -0
@@ -2914,6 +2914,7 @@ static struct si_dpm_quirk si_dpm_quirk_list[] = {/* PITCAIRN - https://bugs.freedesktop.org/show_bug.cgi?id=76490 */ { PCI_VENDOR_ID_ATI, 0x6810, 0x1462, 0x3036, 0, 120000 }, { PCI_VENDOR_ID_ATI, 0x6811, 0x174b, 0xe271, 0, 120000 }, + { PCI_VENDOR_ID_ATI, 0x6811, 0x174b, 0x2015, 0, 120000 }, { PCI_VENDOR_ID_ATI, 0x6810, 0x174b, 0xe271, 85000, 90000 }, { 0, 0, 0, 0 }, };
@@ -3006,6 +3007,10 @@ static void si_apply_state_adjust_rules(struct radeon_device *rdev, ps->performance_levels[i].sclk = max_sclk; } } +/* limit mclk on all R7 370 parts for stability */ +if (rdev->pdev->device ==0x6811 && + rdev->pdev->revision ==0x81 ) + max_mclk =120000 ;/* XXX validate the min clocks required for display */
drivers/hid/usbhid/hid-core.c +37 -36
118 lines not on this page · raw message
drivers/hwmon/max1111.c +6 -0
@@ -85,6 +85,9 @@ static struct max1111_data *the_max1111;int max1111_read_channel (int channel) { +if (!the_max1111 || !the_max1111->spi) +return -ENODEV ; +return max1111_read (&the_max1111->spi->dev, channel); }EXPORT_SYMBOL (max1111_read_channel);
@@ -260,6 +263,9 @@ static int max1111_remove(struct spi_device *spi) {struct max1111_data *data =spi_get_drvdata (spi); +#ifdef CONFIG_SHARPSL_PM + the_max1111 =NULL ; +#endif hwmon_device_unregister (data->hwmon_dev);sysfs_remove_group (&spi->dev.kobj, &max1110_attr_group);sysfs_remove_group (&spi->dev.kobj, &max1111_attr_group);
drivers/media/usb/usbvision/usbvision-video.c +32 -8
@@ -1522,7 +1522,7 @@ static int usbvision_probe(struct usb_interface *intf,const struct usb_host_interface *interface;struct usb_usbvision *usbvision =NULL ;const struct usb_endpoint_descriptor *endpoint; -int model, i; +int model, i, ret; PDEBUG(DBG_PROBE, "VID=%#04x, PID=%#04x, ifnum=%u", dev->descriptor.idVendor,
@@ -1531,33 +1531,51 @@ static int usbvision_probe(struct usb_interface *intf, model = devid->driver_info;if (model <0 || model >= usbvision_device_data_size) {PDEBUG (DBG_PROBE ,"model out of bounds %d" , model); -return -ENODEV ; + ret = -ENODEV ; + goto err_usb; }printk (KERN_INFO "%s: %s found\n" , __func__, usbvision_device_data[model].model_string);if (usbvision_device_data[model].interface >=0 ) interface = &dev->actconfig->interface[usbvision_device_data[model].interface]->altsetting[0 ]; -else +else if (ifnum < dev->actconfig->desc.bNumInterfaces) interface = &dev->actconfig->interface[ifnum]->altsetting[0 ]; +else { +dev_err (&intf->dev,"interface %d is invalid, max is %d\n" , + ifnum, dev->actconfig->desc.bNumInterfaces -1 ); + ret = -ENODEV ; + goto err_usb; + } + +if (interface->desc.bNumEndpoints <2 ) { +dev_err (&intf->dev,"interface %d has %d endpoints, but must" +" have minimum 2\n" , ifnum, interface->desc.bNumEndpoints); + ret = -ENODEV ; + goto err_usb; + } endpoint = &interface->endpoint[1 ].desc; +if (!usb_endpoint_xfer_isoc (endpoint)) {dev_err (&intf->dev,"%s: interface %d. has non-ISO endpoint!\n" , __func__, ifnum);dev_err (&intf->dev,"%s: Endpoint attributes %d" , __func__, endpoint->bmAttributes); -return -ENODEV ; + ret = -ENODEV ; + goto err_usb; }if (usb_endpoint_dir_out (endpoint)) {dev_err (&intf->dev,"%s: interface %d. has ISO OUT endpoint!\n" , __func__, ifnum); -return -ENODEV ; + ret = -ENODEV ; + goto err_usb; } usbvision =usbvision_alloc (dev, intf);if (usbvision ==NULL ) {dev_err (&intf->dev,"%s: couldn't allocate USBVision struct\n" , __func__); -return -ENOMEM ; + ret = -ENOMEM ; + goto err_usb; }if (dev->descriptor.bNumConfigurations >1 )
@@ -1576,8 +1594,8 @@ static int usbvision_probe(struct usb_interface *intf, usbvision->alt_max_pkt_size =kmalloc (32 * usbvision->num_alt,GFP_KERNEL );if (usbvision->alt_max_pkt_size ==NULL ) {dev_err (&intf->dev,"usbvision: out of memory!\n" ); -usbvision_release (usbvision); -return -ENOMEM ; + ret = -ENOMEM ; + goto err_pkt; }for (i =0 ; i < usbvision->num_alt; i++) {
@@ -1612,6 +1630,12 @@ static int usbvision_probe(struct usb_interface *intf,PDEBUG (DBG_PROBE ,"success" );return 0 ; + +err_pkt: +usbvision_release (usbvision); +err_usb: +usb_put_dev (dev); +return ret; }
drivers/net/ethernet/jme.c +2 -1
@@ -3287,13 +3287,14 @@ jme_resume(struct device *dev)jme_reset_phy_processor (jme);jme_phy_calibration (jme);jme_phy_setEA (jme); -jme_start_irq (jme);netif_device_attach (netdev);atomic_inc (&jme->link_changing);jme_reset_link (jme); +jme_start_irq (jme); +return 0 ; }
drivers/net/ethernet/qlogic/qlge/qlge_main.c +11 -0
@@ -1648,7 +1648,18 @@ static void ql_process_mac_rx_skb(struct ql_adapter *qdev,return ; }skb_reserve (new_skb,NET_IP_ALIGN ); + +pci_dma_sync_single_for_cpu (qdev->pdev, +dma_unmap_addr (sbq_desc, mapaddr), +dma_unmap_len (sbq_desc, maplen), +PCI_DMA_FROMDEVICE ); +memcpy (skb_put (new_skb, length), skb->data, length); + +pci_dma_sync_single_for_device (qdev->pdev, +dma_unmap_addr (sbq_desc, mapaddr), +dma_unmap_len (sbq_desc, maplen), +PCI_DMA_FROMDEVICE ); skb = new_skb;/* Frame error, so drop the packet. */
drivers/net/ethernet/renesas/sh_eth.c +2 -1
@@ -1156,7 +1156,8 @@ static void sh_eth_ring_format(struct net_device *ndev) mdp->dirty_rx = (u32) (i - mdp->num_rx_ring);/* Mark the last entry as wrapping the ring. */ - rxdesc->status |=cpu_to_edmac (mdp,RD_RDEL ); +if (rxdesc) + rxdesc->status |=cpu_to_edmac (mdp,RD_RDEL );memset (mdp->tx_ring,0 , tx_ringsize);
drivers/net/ppp/ppp_generic.c +3 -1
@@ -2220,7 +2220,7 @@ int ppp_register_net_channel(struct net *net, struct ppp_channel *chan) pch->ppp =NULL ; pch->chan = chan; - pch->chan_net = net; + pch->chan_net =get_net (net); chan->ppp = pch;init_ppp_file (&pch->file,CHANNEL ); pch->file.hdrlen = chan->hdrlen;
@@ -2317,6 +2317,8 @@ 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);
drivers/net/usb/cdc_ncm.c +5 -1
@@ -423,7 +423,11 @@ advance: iface_no = ctx->data->cur_altsetting->desc.bInterfaceNumber; -/* reset data interface */ +/* Reset data interface. Some devices will not reset properly +* unless they are configured first. Toggle the altsetting to +* force a reset +*/ +usb_set_interface (dev->udev, iface_no, data_altsetting); temp =usb_set_interface (dev->udev, iface_no,0 );if (temp) {dev_dbg (&intf->dev,"set interface failed\n" );
drivers/net/usb/qmi_wwan.c +1 -0
@@ -737,6 +737,7 @@ static const struct usb_device_id products[] = { {QMI_FIXED_INTF(0x19d2, 0x1426, 2)}, /* ZTE MF91 */ {QMI_FIXED_INTF(0x19d2, 0x1428, 2)}, /* Telewell TW-LTE 4G v2 */ {QMI_FIXED_INTF(0x19d2, 0x2002, 4)}, /* ZTE (Vodafone) K3765-Z */ + {QMI_FIXED_INTF(0x2001, 0x7e19, 4)}, /* D-Link DWM-221 B1 */ {QMI_FIXED_INTF(0x0f3d, 0x68a2, 8)}, /* Sierra Wireless MC7700 */ {QMI_FIXED_INTF(0x114f, 0x68a2, 8)}, /* Sierra Wireless MC7750 */ {QMI_FIXED_INTF(0x1199, 0x68a2, 8)}, /* Sierra Wireless MC7710 in QMI mode */
drivers/net/usb/usbnet.c +7 -0
@@ -1718,6 +1718,13 @@ out3:if (info->unbind) info->unbind (dev, udev); out1: +/* subdrivers must undo all they did in bind() if they +* fail it, but we may fail later and a deferred kevent +* may trigger an error resubmitting itself and, worse, +* schedule a timer. So we kill it all just in case. +*/ +cancel_work_sync (&dev->kevent); +del_timer_sync (&dev->delay);free_netdev (net); out:return status;
drivers/net/wan/farsync.c +1 -1
@@ -2545,7 +2545,7 @@ fst_add_one(struct pci_dev *pdev, const struct pci_device_id *ent) dev->mem_start = card->phys_mem +BUF_OFFSET ( txBuffer[i][0 ][0 ]); dev->mem_end = card->phys_mem - +BUF_OFFSET ( txBuffer[i][NUM_TX_BUFFER ][0 ]); + +BUF_OFFSET ( txBuffer[i][NUM_TX_BUFFER -1 ][LEN_RX_BUFFER -1 ]); dev->base_addr = card->pci_conf; dev->irq = card->irq;
drivers/net/wireless/ath/ath9k/eeprom.c +3 -4
@@ -408,10 +408,9 @@ void ath9k_hw_get_gain_boundaries_pdadcs(struct ath_hw *ah,if (match) {if (AR_SREV_9287 (ah)) { -/* FIXME: array overrun? */ for (i =0 ; i < numXpdGains; i++) { minPwrT4[i] = data_9287[idxL].pwrPdg[i][0 ]; - maxPwrT4[i] = data_9287[idxL].pwrPdg[i][4 ]; + maxPwrT4[i] = data_9287[idxL].pwrPdg[i][intercepts -1 ]; ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i], data_9287[idxL].pwrPdg[i], data_9287[idxL].vpdPdg[i],
@@ -421,7 +420,7 @@ void ath9k_hw_get_gain_boundaries_pdadcs(struct ath_hw *ah, }else if (eeprom_4k) {for (i =0 ; i < numXpdGains; i++) { minPwrT4[i] = data_4k[idxL].pwrPdg[i][0 ]; - maxPwrT4[i] = data_4k[idxL].pwrPdg[i][4 ]; + maxPwrT4[i] = data_4k[idxL].pwrPdg[i][intercepts -1 ]; ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i], data_4k[idxL].pwrPdg[i], data_4k[idxL].vpdPdg[i],
@@ -431,7 +430,7 @@ void ath9k_hw_get_gain_boundaries_pdadcs(struct ath_hw *ah, }else {for (i =0 ; i < numXpdGains; i++) { minPwrT4[i] = data_def[idxL].pwrPdg[i][0 ]; - maxPwrT4[i] = data_def[idxL].pwrPdg[i][4 ]; + maxPwrT4[i] = data_def[idxL].pwrPdg[i][intercepts -1 ]; ath9k_hw_fill_vpd_table(minPwrT4[i], maxPwrT4[i], data_def[idxL].pwrPdg[i], data_def[idxL].vpdPdg[i],
drivers/usb/core/hub.c +3 -5
@@ -5231,6 +5231,7 @@ static int usb_reset_and_verify_device(struct usb_device *udev)usb_set_usb2_hardware_lpm (udev,0 ); bos = udev->bos; + udev->bos =NULL ;/* Disable LPM and LTM while we reset the device and reinstall the alt * settings. Device-initiated LPM settings, and system exit latency
@@ -5339,11 +5340,8 @@ done:usb_set_usb2_hardware_lpm (udev,1 );usb_unlocked_enable_lpm (udev);usb_enable_ltm (udev); -/* release the new BOS descriptor allocated by hub_port_init() */ -if (udev->bos != bos) { -usb_release_bos_descriptor (udev); - udev->bos = bos; - } +usb_release_bos_descriptor (udev); + udev->bos = bos;return 0 ; re_enumerate:
drivers/usb/renesas_usbhs/fifo.c +3 -1
@@ -166,7 +166,8 @@ static int usbhsf_pkt_handler(struct usbhs_pipe *pipe, int type) goto __usbhs_pkt_handler_end; } - ret =func (pkt, &is_done); +if (likely (func)) + ret =func (pkt, &is_done);if (is_done)__usbhsf_pkt_del (pkt);
@@ -933,6 +934,7 @@ static int usbhsf_dma_try_pop(struct usbhs_pkt *pkt, int *is_done) pkt->trans = len; +usbhsf_tx_irq_ctrl (pipe,0 );INIT_WORK (&pkt->work, xfer_work);schedule_work (&pkt->work);
drivers/xen/events/events_base.c +24 -4
@@ -503,9 +503,19 @@ static void eoi_pirq(struct irq_data *data)struct physdev_eoi eoi = { .irq =pirq_from_irq (data->irq) };int rc =0 ; -irq_move_irq (data); +if (!VALID_EVTCHN (evtchn)) +return ; -if (VALID_EVTCHN (evtchn)) +if (unlikely (irqd_is_setaffinity_pending (data))) { +int masked =test_and_set_mask (evtchn); + +clear_evtchn (evtchn); + +irq_move_masked_irq (data); + +if (!masked) +unmask_evtchn (evtchn); + }else clear_evtchn (evtchn);if (pirq_needs_eoi (data->irq)) {
@@ -1395,9 +1405,19 @@ static void ack_dynirq(struct irq_data *data) {int evtchn =evtchn_from_irq (data->irq); -irq_move_irq (data); +if (!VALID_EVTCHN (evtchn)) +return ; -if (VALID_EVTCHN (evtchn)) +if (unlikely (irqd_is_setaffinity_pending (data))) { +int masked =test_and_set_mask (evtchn); + +clear_evtchn (evtchn); + +irq_move_masked_irq (data); + +if (!masked) +unmask_evtchn (evtchn); + }else clear_evtchn (evtchn); }
fs/ext4/ext4.h +23 -0
@@ -847,6 +847,29 @@ do { \#include "extents_status.h" /* +* Lock subclasses for i_data_sem in the ext4_inode_info structure. +* +* These are needed to avoid lockdep false positives when we need to +* allocate blocks to the quota inode during ext4_map_blocks(), while +* holding i_data_sem for a normal (non-quota) inode. Since we don't +* do quota tracking for the quota inode, this avoids deadlock (as +* well as infinite recursion, since it isn't turtles all the way +* down...) +* +* I_DATA_SEM_NORMAL - Used for most inodes +* I_DATA_SEM_OTHER - Used by move_inode.c for the second normal inode +* where the second inode has larger inode number +* than the first +* I_DATA_SEM_QUOTA - Used for quota inodes only +*/ +enum { +I_DATA_SEM_NORMAL =0 , +I_DATA_SEM_OTHER , +I_DATA_SEM_QUOTA , +}; + + +/* * fourth extended file system inode data in memory */ struct ext4_inode_info {
fs/ext4/move_extent.c +9 -2
@@ -154,10 +154,10 @@ ext4_double_down_write_data_sem(struct inode *first, struct inode *second) {if (first < second) {down_write (&EXT4_I (first)->i_data_sem); -down_write_nested (&EXT4_I (second)->i_data_sem,SINGLE_DEPTH_NESTING ); +down_write_nested (&EXT4_I (second)->i_data_sem,I_DATA_SEM_OTHER ); }else {down_write (&EXT4_I (second)->i_data_sem); -down_write_nested (&EXT4_I (first)->i_data_sem,SINGLE_DEPTH_NESTING ); +down_write_nested (&EXT4_I (first)->i_data_sem,I_DATA_SEM_OTHER ); } }
@@ -1114,6 +1114,13 @@ mext_check_arguments(struct inode *orig_inode,return -EINVAL ; } +if (IS_NOQUOTA (orig_inode) ||IS_NOQUOTA (donor_inode)) { +ext4_debug ("ext4 move extent: The argument files should " +"not be quota files [ino:orig %lu, donor %lu]\n" , + orig_inode->i_ino, donor_inode->i_ino); +return -EBUSY ; + } +/* Ext4 move extent supports only extent based file */ if (!(ext4_test_inode_flag (orig_inode,EXT4_INODE_EXTENTS ))) { ext4_debug("ext4 move extent: orig file is not extents "
fs/ext4/super.c +23 -2
@@ -5123,6 +5123,20 @@ static int ext4_quota_on_mount(struct super_block *sb, int type) EXT4_SB(sb)->s_jquota_fmt, type); } +static void lockdep_set_quota_inode (struct inode *inode,int subclass) +{ +struct ext4_inode_info *ei =EXT4_I (inode); + +/* The first argument of lockdep_set_subclass has to be +* *exactly* the same as the argument to init_rwsem() --- in +* this case, in init_once() --- or lockdep gets unhappy +* because the name of the lock is set using the +* stringification of the argument to init_rwsem(). +*/ + (void ) ei;/* shut up clang warning if !CONFIG_LOCKDEP */ +lockdep_set_subclass (&ei->i_data_sem, subclass); +} +/* * Standard function to be called on quota_on */
@@ -5162,8 +5176,12 @@ static int ext4_quota_on(struct super_block *sb, int type, int format_id,if (err)return err; } - -return dquot_quota_on (sb, type, format_id, path); +lockdep_set_quota_inode (path->dentry->d_inode,I_DATA_SEM_QUOTA ); + err =dquot_quota_on (sb, type, format_id, path); +if (err) +lockdep_set_quota_inode (path->dentry->d_inode, +I_DATA_SEM_NORMAL ); +return err; } static int ext4_quota_enable(struct super_block *sb, int type, int format_id,
@@ -5189,8 +5207,11 @@ static int ext4_quota_enable(struct super_block *sb, int type, int format_id,/* Don't account quota for quota files to avoid recursion */ qf_inode->i_flags |=S_NOQUOTA ; +lockdep_set_quota_inode (qf_inode,I_DATA_SEM_QUOTA ); err =dquot_enable (qf_inode, type, format_id, flags);iput (qf_inode); +if (err) +lockdep_set_quota_inode (qf_inode,I_DATA_SEM_NORMAL );return err; }
kernel/events/core.c +3 -3
@@ -1400,14 +1400,14 @@ event_sched_out(struct perf_event *event,perf_pmu_disable (event->pmu); + event->tstamp_stopped = tstamp; + event->pmu->del (event,0 ); + event->oncpu =-1 ; event->state =PERF_EVENT_STATE_INACTIVE ;if (event->pending_disable) { event->pending_disable =0 ; event->state =PERF_EVENT_STATE_OFF ; } - event->tstamp_stopped = tstamp; - event->pmu->del (event,0 ); - event->oncpu =-1 ;if (!is_software_event (event)) cpuctx->active_oncpu--;
mm/page_isolation.c +4 -4
@@ -259,11 +259,11 @@ struct page *alloc_migrate_target(struct page *page, unsigned long private,* now as a simple work-around, we use the next node for destination. */ if (PageHuge (page)) { -nodemask_t src =nodemask_of_node (page_to_nid (page)); -nodemask_t dst; -nodes_complement (dst, src); +int node =next_online_node (page_to_nid (page)); +if (node ==MAX_NUMNODES ) + node = first_online_node;return alloc_huge_page_node (page_hstate (compound_head (page)), -next_node (page_to_nid (page), dst)); + node); }if (PageHighMem (page))
net/ipv4/udp.c +8 -4
@@ -1939,10 +1939,14 @@ void udp_v4_early_demux(struct sk_buff *skb)if (!in_dev)return ; - ours =ip_check_mc_rcu (in_dev, iph->daddr, iph->saddr, - iph->protocol); -if (!ours) -return ; +/* we are supposed to accept bcast packets */ +if (skb->pkt_type ==PACKET_MULTICAST ) { + ours =ip_check_mc_rcu (in_dev, iph->daddr, iph->saddr, + iph->protocol); +if (!ours) +return ; + } + sk =__udp4_lib_mcast_demux_lookup (net, uh->dest, iph->daddr, uh->source, iph->saddr, dif); }else if (skb->pkt_type ==PACKET_HOST ) {
net/ipv6/exthdrs_core.c +5 -1
@@ -257,7 +257,11 @@ int ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset, *fragoff = _frag_off;return hp->nexthdr; } -return -ENOENT ; +if (!found) +return -ENOENT ; +if (fragoff) + *fragoff = _frag_off; +break ; } hdrlen =8 ; }else if (nexthdr ==NEXTHDR_AUTH ) {
net/ipv6/ip6_tunnel.c +1 -1
@@ -273,12 +273,12 @@ static int ip6_tnl_create2(struct net_device *dev) t =netdev_priv (dev); + dev->rtnl_link_ops = &ip6_link_ops; err =register_netdevice (dev);if (err <0 ) goto out;strcpy (t->parms.name, dev->name); - dev->rtnl_link_ops = &ip6_link_ops;dev_hold (dev);ip6_tnl_link (ip6n, t);
net/ipv6/udp.c +2 -4
@@ -868,11 +868,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, ret =udpv6_queue_rcv_skb (sk, skb);sock_put (sk); -/* a return value > 0 means to resubmit the input, but -* it wants the return to be -protocol, or 0 -*/ +/* a return value > 0 means to resubmit the input */ if (ret >0 ) -return -ret; +return ret;return 0 ; }
net/l2tp/l2tp_ip.c +5 -3
@@ -123,12 +123,11 @@ static int l2tp_ip_recv(struct sk_buff *skb)struct l2tp_tunnel *tunnel =NULL ;int length; -/* Point to L2TP header */ - optr = ptr = skb->data; -if (!pskb_may_pull (skb,4 )) goto discard; +/* Point to L2TP header */ + optr = ptr = skb->data; session_id =ntohl (*((__be32 *) ptr)); ptr +=4 ;
@@ -156,6 +155,9 @@ static int l2tp_ip_recv(struct sk_buff *skb)if (!pskb_may_pull (skb, length)) goto discard; +/* Point to L2TP header */ + optr = ptr = skb->data; + ptr +=4 ;pr_debug ("%s: ip recv\n" , tunnel->name);print_hex_dump_bytes ("" ,DUMP_PREFIX_OFFSET , ptr, length); }
net/l2tp/l2tp_ip6.c +5 -3
@@ -135,12 +135,11 @@ static int l2tp_ip6_recv(struct sk_buff *skb)struct l2tp_tunnel *tunnel =NULL ;int length; -/* Point to L2TP header */ - optr = ptr = skb->data; -if (!pskb_may_pull (skb,4 )) goto discard; +/* Point to L2TP header */ + optr = ptr = skb->data; session_id =ntohl (*((__be32 *) ptr)); ptr +=4 ;
@@ -168,6 +167,9 @@ static int l2tp_ip6_recv(struct sk_buff *skb)if (!pskb_may_pull (skb, length)) goto discard; +/* Point to L2TP header */ + optr = ptr = skb->data; + ptr +=4 ;pr_debug ("%s: ip recv\n" , tunnel->name);print_hex_dump_bytes ("" ,DUMP_PREFIX_OFFSET , ptr, length); }
net/mac80211/rx.c +3 -2
@@ -2087,7 +2087,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)struct ieee80211_sub_if_data *sdata = rx->sdata;struct ieee80211_rx_status *status =IEEE80211_SKB_RXCB (skb);struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; -u16 q, hdrlen; +u16 ac, q, hdrlen; hdr = (struct ieee80211_hdr *) skb->data; hdrlen =ieee80211_hdrlen (hdr->frame_control);
@@ -2157,7 +2157,8 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) ether_addr_equal(sdata->vif.addr, hdr->addr3))return RX_CONTINUE ; - q =ieee80211_select_queue_80211 (sdata, skb, hdr); + ac =ieee80211_select_queue_80211 (sdata, skb, hdr); + q = sdata->vif.hw_queue[ac];if (ieee80211_queue_stopped (&local->hw, q)) {IEEE80211_IFSTA_MESH_CTR_INC (ifmsh, dropped_frames_congestion);return RX_DROP_MONITOR ;
net/sctp/ipv6.c +2 -0
@@ -519,6 +519,8 @@ static int sctp_v6_cmp_addr(const union sctp_addr *addr1, }return 0 ; } +if (addr1->v6.sin6_port != addr2->v6.sin6_port) +return 0 ;if (!ipv6_addr_equal (&addr1->v6.sin6_addr, &addr2->v6.sin6_addr))return 0 ;/* If this is a linklocal address, compare the scope_id. */
net/socket.c +19 -19
@@ -2400,31 +2400,31 @@ int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen,break ; } -out_put: -fput_light (sock->file, fput_needed); -if (err ==0 ) -return datagrams; + goto out_put; -if (datagrams !=0 ) { +if (datagrams ==0 ) { + datagrams = err; + goto out_put; + } + +/* +* We may return less entries than requested (vlen) if the +* sock is non block and there aren't enough datagrams... +*/ +if (err != -EAGAIN ) {/* -* We may return less entries than requested (vlen) if the -* sock is non block and there aren't enough datagrams... +* ... or if recvmsg returns an error after we +* received some datagrams, where we record the +* error to return on the next call or if the +* app asks about it using getsockopt(SO_ERROR). */ -if (err != -EAGAIN ) { -/* -* ... or if recvmsg returns an error after we -* received some datagrams, where we record the -* error to return on the next call or if the -* app asks about it using getsockopt(SO_ERROR). -*/ - sock->sk->sk_err = -err; - } - -return datagrams; + sock->sk->sk_err = -err; } +out_put: +fput_light (sock->file, fput_needed); -return err; +return datagrams; } SYSCALL_DEFINE5(recvmmsg, int, fd, struct mmsghdr __user *, mmsg,
sound/core/timer.c +2 -2
@@ -1012,8 +1012,8 @@ static int snd_timer_s_start(struct snd_timer * timer) njiff += timer->sticks - priv->correction; priv->correction =0 ; } - priv->last_expires = priv->tlist.expires = njiff; -add_timer (&priv->tlist); + priv->last_expires = njiff; +mod_timer (&priv->tlist, njiff);return 0 ; }
Re: probably missing patch to stable?
In reply to Greg KHHello Greg,
Quoted 3 lines · Greg KH
I'm announcing the release of the 3.14.67 kernel.
// CUT
Quoted 2 lines
Revert "usb: hub: do not clear BOS field during reset device"
If I'm parsing Tony's followup on "Re: probably missing patch to stable?" [1] regarding the above commit, I think we also need to apply commit:
464ad8c usb: core : hub: Fix BOS 'NULL pointer' kernel panic
to resolve the original problem which "usb: hub: do not clear BOS field during reset device" was attempting to fix?
I notice that commit 464ad8c is included in other stable branches along with the above reverted commit but I do not see it in linux-3.14.y. Based on what I'm reading, it appears it's needed for linux-3.14.y.
TIA!
--
Regards,
George
[1] http://permalink.gmane.org/gmane.linux.usb.general/139731
Greg KH
maintainerRe: probably missing patch to stable?
Quoted 14 lines · George G. Davis
Hello Greg,
Quoted 3 lines · Greg KH
I'm announcing the release of the 3.14.67 kernel.
// CUT
Quoted 2 lines
Revert "usb: hub: do not clear BOS field during reset device"
If I'm parsing Tony's followup on "Re: probably missing patch to stable?" [1] regarding the above commit, I think we also need to apply commit:
Quoted 8 lines
464ad8c usb: core : hub: Fix BOS 'NULL pointer' kernel panic
to resolve the original problem which "usb: hub: do not clear BOS field during reset device" was attempting to fix?
I notice that commit 464ad8c is included in other stable branches along with the above reverted commit but I do not see it in linux-3.14.y. Based on what I'm reading, it appears it's needed for linux-3.14.y.
The revert showed up in 3.14.67.
thanks,
greg k-h