Linux 4.12.12
Greg KH
maintainerI'm announcing the release of the 4.12.12 kernel.
All users of the 4.12 kernel series must upgrade.
The updated 4.12.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.12.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/s390/include/asm/pgtable.h | 2 arch/s390/mm/gmap.c | 39 +++++- arch/s390/mm/mmap.c | 6 drivers/android/Kconfig | 2 drivers/android/binder.c | 8 - drivers/ata/ahci.c | 9 + drivers/ata/pata_amd.c | 1 drivers/ata/pata_cs5536.c | 1 drivers/base/bus.c | 2 drivers/bluetooth/btusb.c | 1 drivers/crypto/caam/caamalg.c | 66 ++-------- drivers/crypto/caam/caamalg_qi.c | 6 drivers/crypto/caam/error.c | 40 ++++++ drivers/crypto/caam/error.h | 4 drivers/crypto/caam/qi.c | 2 drivers/fpga/altera-hps2fpga.c | 4 drivers/gpu/drm/nouveau/nv50_display.c | 7 - drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c | 4 drivers/hid/wacom_wac.c | 8 + drivers/hwtracing/intel_th/pci.c | 10 + drivers/iio/adc/ti-ads1015.c | 123 +++++++++++--------- drivers/input/mouse/trackpoint.c | 4 drivers/mcb/mcb-lpc.c | 15 ++ drivers/net/wireless/ath/ath10k/core.c | 12 - drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 1 drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 drivers/net/wireless/marvell/mwifiex/scan.c | 6 drivers/net/wireless/realtek/rtlwifi/pci.c | 4 drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c | 2 drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c | 2 drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c | 4 drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c | 2 drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c | 2 drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c | 2 drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c | 2 drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 15 -- drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 19 +-- drivers/of/device.c | 2 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/musb/musb_core.c | 18 +- drivers/usb/serial/option.c | 1 fs/dlm/user.c | 4 include/linux/pci_ids.h | 1 include/linux/workqueue.h | 2 include/uapi/linux/android/binder.h | 2 kernel/configs/android-base.config | 1 51 files changed, 344 insertions(+), 194 deletions(-)
Akinobu Mita (6):
iio: adc: ti-ads1015: fix incorrect data rate setting update
iio: adc: ti-ads1015: fix scale information for ADS1115
iio: adc: ti-ads1015: enable conversion when CONFIG_PM is not set
iio: adc: ti-ads1015: avoid getting stale result after runtime resume
iio: adc: ti-ads1015: don't return invalid value from buffer setup callbacks
iio: adc: ti-ads1015: add adequate wait time to get correct conversion
Alexander Shishkin (2):
intel_th: pci: Add Cannon Lake PCH-H support
intel_th: pci: Add Cannon Lake PCH-LP support
Andrey Korolyov (1):
cs5536: add support for IDE controller variant
Ben Hutchings (1):
workqueue: Fix flag collision
Bjorn Andersson (1):
of/device: Prevent buffer overflow in of_device_modalias()
Brian Norris (1):
mwifiex: correct channel stat buffer overflows
Christian Borntraeger (1):
s390/mm: avoid empty zero pages for KVM guests to avoid postcopy hangs
Christian Brauner (1):
binder: free memory on error
Christoph Hellwig (1):
ahci: don't use MSI for devices with the silly Intel NVMe remapping scheme
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
Dmitry Tunin (1):
Bluetooth: Add support of 13d3:3494 RTL8723BE device
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 4.12.12
Horia Geantă (2):
crypto: caam/qi - fix compilation with CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
crypto: caam/qi - fix compilation with DEBUG enabled
Ian Abbott (1):
fpga: altera-hps2fpga: fix multiple init of l3_remap_lock
Ilia Mirkin (1):
drm/nouveau/pci/msi: disable MSI on big-endian platforms by default
Jason Gerecke (1):
HID: wacom: Do not completely map WACOM_HID_WD_TOUCHRINGSTATUS usage
Johan Hovold (1):
USB: musb: fix external abort on suspend
Kai-Heng Feng (1):
usb: quirks: add delay init quirk for Corsair Strafe RGB keyboard
Luca Coelho (1):
iwlwifi: pci: add new PCI ID for 7265D
Maarten Lankhorst (1):
drm/nouveau: Fix error handling in nv50_disp_atomic_commit
Maciej S. Szmigiero (1):
USB: serial: option: add support for D-Link DWM-157 C1
Malcolm Priestley (1):
rtlwifi: rtl_pci_probe: Fix fail path of _rtl_pci_find_adapter
Martijn Coenen (2):
ANDROID: binder: add padding to binder_fd_array_object.
ANDROID: binder: add hwbinder,vndbinder to BINDER_DEVICES.
Martin Schwidefsky (1):
s390/mm: fix BUG_ON in crst_table_upgrade
Michael Moese (1):
MCB: add support for SC31 to mcb-lpc
Oscar Campos (1):
Input: trackpoint - assume 3 buttons when buttons detection fails
Rakesh Pillai (1):
ath10k: fix memory leak in rx ring buffer allocation
Sandeep Singh (1):
usb:xhci:Fix regression when ATI chipsets detected
Souptick Joarder (1):
rtlwifi: Fix memory leak when firmware request fails
Sven Joachim (1):
rtlwifi: Fix fallback firmware loading
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
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 12 -SUBLEVEL = 11 +SUBLEVEL = 12 EXTRAVERSION = NAME = Fearless Coyote
arch/s390/include/asm/pgtable.h +1 -1
@@ -502,7 +502,7 @@ static inline int mm_alloc_pgste(struct mm_struct *mm)* In the case that a guest uses storage keys * faults should no longer be backed by zero pages */ -#define mm_forbids_zeropage mm_use_skey +#define mm_forbids_zeropage mm_has_pgstestatic inline int mm_use_skey (struct mm_struct *mm) {#ifdef CONFIG_PGSTE
arch/s390/mm/gmap.c +32 -7
@@ -2117,6 +2117,37 @@ static inline void thp_split_mm(struct mm_struct *mm)#endif } +/* +* Remove all empty zero pages from the mapping for lazy refaulting +* - This must be called after mm->context.has_pgste is set, to avoid +* future creation of zero pages +* - This must be called after THP was enabled +*/ +static int __zap_zero_pages (pmd_t *pmd,unsigned long start, +unsigned long end,struct mm_walk *walk) +{ +unsigned long addr; + +for (addr = start; addr != end; addr +=PAGE_SIZE ) { +pte_t *ptep; +spinlock_t *ptl; + + ptep =pte_offset_map_lock (walk->mm, pmd, addr, &ptl); +if (is_zero_pfn (pte_pfn (*ptep))) +ptep_xchg_direct (walk->mm, addr, ptep,__pte (_PAGE_INVALID)); +pte_unmap_unlock (ptep, ptl); + } +return 0 ; +} + +static inline void zap_zero_pages (struct mm_struct *mm) +{ +struct mm_walk walk = { .pmd_entry = __zap_zero_pages }; + + walk.mm = mm; +walk_page_range (0 ,TASK_SIZE , &walk); +} +/* * switch on pgstes for its userspace process (for kvm) */
@@ -2134,6 +2165,7 @@ int s390_enable_sie(void) mm->context.has_pgste =1 ;/* split thp mappings and disable thp for future mappings */ thp_split_mm (mm); +zap_zero_pages (mm);up_write (&mm->mmap_sem);return 0 ; }
@@ -2146,13 +2178,6 @@ EXPORT_SYMBOL_GPL(s390_enable_sie);static int __s390_enable_skey (pte_t *pte,unsigned long addr,unsigned long next,struct mm_walk *walk) { -/* -* Remove all zero page mappings, -* after establishing a policy to forbid zero page mappings -* following faults for that page will get fresh anonymous pages -*/ -if (is_zero_pfn (pte_pfn (*pte))) -ptep_xchg_direct (walk->mm, addr, pte,__pte (_PAGE_INVALID));/* Clear storage key */ ptep_zap_key (walk->mm, addr, pte);return 0 ;
arch/s390/mm/mmap.c +4 -2
@@ -119,7 +119,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,return addr; check_asce_limit: -if (addr + len > current->mm->context.asce_limit) { +if (addr + len > current->mm->context.asce_limit && + addr + len <=TASK_SIZE ) { rc =crst_table_upgrade (mm);if (rc)return (unsigned long ) rc;
@@ -183,7 +184,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, } check_asce_limit: -if (addr + len > current->mm->context.asce_limit) { +if (addr + len > current->mm->context.asce_limit && + addr + len <=TASK_SIZE ) { rc =crst_table_upgrade (mm);if (rc)return (unsigned long ) rc;
drivers/android/Kconfig +1 -1
@@ -22,7 +22,7 @@ config ANDROID_BINDER_IPC config ANDROID_BINDER_DEVICES string "Android Binder devices" depends on ANDROID_BINDER_IPC - default "binder,hwbinder" + default "binder,hwbinder,vndbinder" ---help--- Default value for the binder.devices parameter.
drivers/android/binder.c +6 -2
@@ -4215,7 +4215,7 @@ static int __init init_binder_device(const char *name)static int __init binder_init (void ) {int ret; -char *device_name, *device_names; +char *device_name, *device_names, *device_tmp;struct binder_device *device;struct hlist_node *tmp;
@@ -4263,7 +4263,8 @@ static int __init binder_init(void) }strcpy (device_names, binder_devices_param); -while ((device_name =strsep (&device_names,"," ))) { + device_tmp = device_names; +while ((device_name =strsep (&device_tmp,"," ))) { ret =init_binder_device (device_name);if (ret) goto err_init_binder_device_failed;
@@ -4277,6 +4278,9 @@ static int __init binder_init(void)hlist_del (&device->hlist);kfree (device); } + +kfree (device_names); + err_alloc_device_names_failed:debugfs_remove_recursive (binder_debugfs_dir_entry_root);
drivers/ata/ahci.c +8 -1
@@ -1467,7 +1467,14 @@ static void ahci_remap_check(struct pci_dev *pdev, int bar,return ;dev_warn (&pdev->dev,"Found %d remapped NVMe devices.\n" , count); -dev_warn (&pdev->dev,"Switch your BIOS from RAID to AHCI mode to use them.\n" ); +dev_warn (&pdev->dev, +"Switch your BIOS from RAID to AHCI mode to use them.\n" ); + +/* +* Don't rely on the msi-x capability in the remap case, +* share the legacy interrupt across ahci and remapped devices. +*/ + hpriv->flags |=AHCI_HFLAG_NO_MSI ; }static int ahci_get_irq_vector (struct ata_host *host,int port)
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
@@ -736,7 +736,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/bluetooth/btusb.c +1 -0
@@ -355,6 +355,7 @@ static const struct usb_device_id blacklist_table[] = { { USB_DEVICE(0x13d3, 0x3410), .driver_info = BTUSB_REALTEK }, { USB_DEVICE(0x13d3, 0x3416), .driver_info = BTUSB_REALTEK }, { USB_DEVICE(0x13d3, 0x3459), .driver_info = BTUSB_REALTEK }, + { USB_DEVICE(0x13d3, 0x3494), .driver_info = BTUSB_REALTEK }, /* Additional Realtek 8821AE Bluetooth devices */ { USB_DEVICE(0x0b05, 0x17dc), .driver_info = BTUSB_REALTEK },
drivers/crypto/caam/caamalg.c +15 -51
106 lines not on this page · raw message
drivers/crypto/caam/caamalg_qi.c +3 -3
@@ -791,9 +791,9 @@ static void ablkcipher_done(struct caam_drv_req *drv_req, u32 status) print_hex_dump(KERN_ERR, "dstiv @" __stringify(__LINE__)": ",DUMP_PREFIX_ADDRESS ,16 ,4 , req->info, edesc->src_nents >1 ?100 : ivsize,1 ); - dbg_dump_sg(KERN_ERR, "dst @" __stringify(__LINE__)": ", -DUMP_PREFIX_ADDRESS ,16 ,4 , req->dst, - edesc->dst_nents >1 ?100 : req->nbytes,1 ); + caam_dump_sg(KERN_ERR, "dst @" __stringify(__LINE__)": ", +DUMP_PREFIX_ADDRESS ,16 ,4 , req->dst, + edesc->dst_nents >1 ?100 : req->nbytes,1 );#endif ablkcipher_unmap (qidev, edesc, req);
drivers/crypto/caam/error.c +40 -0
@@ -9,6 +9,46 @@#include "desc.h" #include "error.h" +#ifdef DEBUG +#include <linux/highmem.h> + +void caam_dump_sg (const char *level,const char *prefix_str,int prefix_type, +int rowsize,int groupsize,struct scatterlist *sg, +size_t tlen,bool ascii) +{ +struct scatterlist *it; +void *it_page; +size_t len; +void *buf; + +for (it = sg; it && tlen >0 ; it =sg_next (sg)) { +/* +* make sure the scatterlist's page +* has a valid virtual memory mapping +*/ + it_page =kmap_atomic (sg_page (it)); +if (unlikely (!it_page)) { +pr_err ("caam_dump_sg: kmap failed\n" ); +return ; + } + + buf = it_page + it->offset; + len =min_t (size_t, tlen, it->length); +print_hex_dump (level, prefix_str, prefix_type, rowsize, + groupsize, buf, len, ascii); + tlen -= len; + +kunmap_atomic (it_page); + } +} +#else +void caam_dump_sg (const char *level,const char *prefix_str,int prefix_type, +int rowsize,int groupsize,struct scatterlist *sg, +size_t tlen,bool ascii) +{} +#endif /* DEBUG */ +EXPORT_SYMBOL (caam_dump_sg); + static const struct { u8 value; const char *error_text;
drivers/crypto/caam/error.h +4 -0
@@ -8,4 +8,8 @@#define CAAM_ERROR_H #define CAAM_ERROR_STR_MAX 302void caam_jr_strstatus (struct device *jrdev,u32 status); + +void caam_dump_sg (const char *level,const char *prefix_str,int prefix_type, +int rowsize,int groupsize,struct scatterlist *sg, +size_t tlen,bool ascii);#endif /* CAAM_ERROR_H */
drivers/crypto/caam/qi.c +1 -1
@@ -55,6 +55,7 @@ struct caam_qi_pcpu_priv { }____cacheline_aligned ; static DEFINE_PER_CPU(struct caam_qi_pcpu_priv, pcpu_qipriv); +static DEFINE_PER_CPU(int, last_cpu);/* * caam_qi_priv - CAAM QI backend private params
@@ -392,7 +393,6 @@ struct caam_drv_ctx *caam_drv_ctx_init(struct device *qidev,dma_addr_t hwdesc;struct caam_drv_ctx *drv_ctx;const cpumask_t *cpus =qman_affine_cpus (); - static DEFINE_PER_CPU(int, last_cpu); num_words =desc_len (sh_desc);if (num_words >MAX_SDLEN ) {
drivers/fpga/altera-hps2fpga.c +1 -3
@@ -66,7 +66,7 @@ static int alt_hps2fpga_enable_show(struct fpga_bridge *bridge)/* The L3 REMAP register is write only, so keep a cached value. */ static unsigned int l3_remap_shadow; -static spinlock_t l3_remap_lock; +static DEFINE_SPINLOCK (l3_remap_lock);static int _alt_hps2fpga_enable_set (struct altera_hps2fpga_data *priv,bool enable)
@@ -171,8 +171,6 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)return -EBUSY ; } -spin_lock_init (&l3_remap_lock); -if (!of_property_read_u32 (dev->of_node,"bridge-enable" , &enable)) {if (enable >1 ) {dev_warn (dev,"invalid bridge-enable %u > 1\n" , enable);
drivers/gpu/drm/nouveau/nv50_display.c +5 -2
@@ -4091,7 +4091,7 @@ nv50_disp_atomic_commit(struct drm_device *dev,if (!nonblock) { ret =drm_atomic_helper_wait_for_fences (dev, state, true);if (ret) - goto done; + goto err_cleanup; }for_each_plane_in_state (state, plane, plane_state, i) {
@@ -4119,7 +4119,7 @@ nv50_disp_atomic_commit(struct drm_device *dev,if (crtc->state->enable) {if (!drm->have_disp_power_ref) { drm->have_disp_power_ref = true; -return ret; +return 0 ; } active = true;break ;
@@ -4131,6 +4131,9 @@ nv50_disp_atomic_commit(struct drm_device *dev, drm->have_disp_power_ref = false; } +err_cleanup: +if (ret) +drm_atomic_helper_cleanup_planes (dev, state); done:pm_runtime_put_autosuspend (dev->dev);return ret;
drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c +4 -0
@@ -192,6 +192,10 @@ nvkm_pci_new_(const struct nvkm_pci_func *func, struct nvkm_device *device, } } +#ifdef __BIG_ENDIAN + pci->msi = false; +#endif + pci->msi =nvkm_boolopt (device->cfgopt,"NvMSI" , pci->msi);if (pci->msi && func->msi_rearm) { pci->msi =pci_enable_msi (pci->pdev) ==0 ;
drivers/hid/wacom_wac.c +7 -1
@@ -1767,7 +1767,13 @@ static void wacom_wac_pad_usage_mapping(struct hid_device *hdev, features->device_type |=WACOM_DEVICETYPE_PAD ;break ;case WACOM_HID_WD_TOUCHRINGSTATUS : -wacom_map_usage (input, usage, field,EV_ABS ,ABS_WHEEL ,0 ); +/* +* Only set up type/code association. Completely mapping +* this usage may overwrite the axis resolution and range. +*/ + usage->type =EV_ABS ; + usage->code =ABS_WHEEL ; +set_bit (EV_ABS , input->evbit); features->device_type |=WACOM_DEVICETYPE_PAD ;break ;case WACOM_HID_WD_BUTTONCONFIG :
drivers/hwtracing/intel_th/pci.c +10 -0
@@ -95,6 +95,16 @@ static const struct pci_device_id intel_th_pci_id_table[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x318e), .driver_data = (kernel_ulong_t)0, }, + { +/* Cannon Lake H */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa326), + .driver_data = (kernel_ulong_t )0 , + }, + { +/* Cannon Lake LP */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x9da6 ), + .driver_data = (kernel_ulong_t)0, + }, { 0 }, };
drivers/iio/adc/ti-ads1015.c +72 -51
231 lines not on this page · raw message
drivers/input/mouse/trackpoint.c +2 -2
@@ -381,8 +381,8 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties)return 0 ;if (trackpoint_read (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/mcb/mcb-lpc.c +15 -0
@@ -114,6 +114,12 @@ static struct resource sc24_fpga_resource = { .flags = IORESOURCE_MEM, }; +static struct resource sc31_fpga_resource = { + .start =0xf000e000 , + .end =0xf000e000 +CHAM_HEADER_SIZE , + .flags =IORESOURCE_MEM , +}; +static struct platform_driver mcb_lpc_driver = { .driver = { .name ="mcb-lpc" ,
@@ -132,6 +138,15 @@ static const struct dmi_system_id mcb_lpc_dmi_table[] = { .driver_data = (void *)&sc24_fpga_resource, .callback = mcb_lpc_create_platform_device, }, + { + .ident = "SC31", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "MEN"), + DMI_MATCH(DMI_PRODUCT_VERSION, "14SC31"), + }, + .driver_data = (void *)&sc31_fpga_resource, + .callback = mcb_lpc_create_platform_device, + }, {} }; MODULE_DEVICE_TABLE(dmi, mcb_lpc_dmi_table);
drivers/net/wireless/ath/ath10k/core.c +6 -6
@@ -1984,6 +1984,12 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode, goto err_wmi_detach; } +/* If firmware indicates Full Rx Reorder support it must be used in a +* slightly different manner. Let HTT code know. +*/ + ar->htt.rx_ring.in_ord_rx = !!(test_bit (WMI_SERVICE_RX_FULL_REORDER , + ar->wmi.svc_map)); + status =ath10k_htt_rx_alloc (&ar->htt);if (status) {ath10k_err (ar,"failed to alloc htt rx: %d\n" , status);
@@ -2096,12 +2102,6 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode, } } -/* If firmware indicates Full Rx Reorder support it must be used in a -* slightly different manner. Let HTT code know. -*/ - ar->htt.rx_ring.in_ord_rx = !!(test_bit (WMI_SERVICE_RX_FULL_REORDER , - ar->wmi.svc_map)); - status =ath10k_htt_rx_ring_refill (ar);if (status) {ath10k_err (ar,"failed to refill htt rx ring: %d\n" , status);
drivers/net/wireless/intel/iwlwifi/pcie/drv.c +1 -0
@@ -429,6 +429,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = { {IWL_PCI_DEVICE(0x095B, 0x520A, iwl7265_2ac_cfg)}, {IWL_PCI_DEVICE(0x095A, 0x9000, iwl7265_2ac_cfg)}, {IWL_PCI_DEVICE(0x095A, 0x9400, iwl7265_2ac_cfg)}, + {IWL_PCI_DEVICE(0x095A, 0x9E10, iwl7265_2ac_cfg)},/* 8000 Series */ {IWL_PCI_DEVICE(0x24F3, 0x0010, iwl8260_2ac_cfg)},
drivers/net/wireless/marvell/mwifiex/cfg80211.c +1 -1
@@ -4221,7 +4221,7 @@ int mwifiex_init_channel_scan_gap(struct mwifiex_adapter *adapter)if (adapter->config_bands &BAND_A ) n_channels_a = mwifiex_band_5ghz.n_channels; - adapter->num_in_chan_stats =max_t (u32, n_channels_bg, n_channels_a); + adapter->num_in_chan_stats = n_channels_bg + n_channels_a; adapter->chan_stats =vmalloc (sizeof (*adapter->chan_stats) * adapter->num_in_chan_stats);
drivers/net/wireless/marvell/mwifiex/scan.c +6 -0
@@ -2492,6 +2492,12 @@ mwifiex_update_chan_statistics(struct mwifiex_private *priv,sizeof (struct mwifiex_chan_stats );for (i =0 ; i < num_chan; i++) { +if (adapter->survey_idx >= adapter->num_in_chan_stats) { +mwifiex_dbg (adapter,WARN , +"FW reported too many channel results (max %d)\n" , + adapter->num_in_chan_stats); +return ; + } chan_stats.chan_num = fw_chan_stats->chan_num; chan_stats.bandcfg = fw_chan_stats->bandcfg; chan_stats.flags = fw_chan_stats->flags;
drivers/net/wireless/realtek/rtlwifi/pci.c +2 -2
@@ -2255,7 +2255,7 @@ int rtl_pci_probe(struct pci_dev *pdev,/* find adapter */ if (!_rtl_pci_find_adapter (pdev, hw)) { err = -ENODEV ; - goto fail3; + goto fail2; }/* Init IO handler */
@@ -2316,10 +2316,10 @@ int rtl_pci_probe(struct pci_dev *pdev,pci_set_drvdata (pdev,NULL );rtl_deinit_core (hw); +fail2:if (rtlpriv->io.pci_mem_start !=0 )pci_iounmap (pdev, (void __iomem *)rtlpriv->io.pci_mem_start); -fail2:pci_release_regions (pdev);complete (&rtlpriv->firmware_loading_complete);
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c +2 -0
@@ -175,6 +175,8 @@ int rtl88e_init_sw_vars(struct ieee80211_hw *hw) rtl_fw_cb);if (err) {pr_info ("Failed to request firmware!\n" ); +vfree (rtlpriv->rtlhal.pfirmware); + rtlpriv->rtlhal.pfirmware =NULL ;return 1 ; }
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c +2 -0
@@ -176,6 +176,8 @@ int rtl92c_init_sw_vars(struct ieee80211_hw *hw) rtl_fw_cb);if (err) {pr_err ("Failed to request firmware!\n" ); +vfree (rtlpriv->rtlhal.pfirmware); + rtlpriv->rtlhal.pfirmware =NULL ;return 1 ; }
drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c +4 -0
@@ -85,6 +85,10 @@ static int rtl92cu_init_sw_vars(struct ieee80211_hw *hw) err =request_firmware_nowait (THIS_MODULE ,1 , fw_name, rtlpriv->io.dev,GFP_KERNEL , hw, rtl_fw_cb); +if (err) { +vfree (rtlpriv->rtlhal.pfirmware); + rtlpriv->rtlhal.pfirmware =NULL ; + }return err; }
drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c +2 -0
@@ -183,6 +183,8 @@ static int rtl92d_init_sw_vars(struct ieee80211_hw *hw) rtl_fw_cb);if (err) {pr_err ("Failed to request firmware!\n" ); +vfree (rtlpriv->rtlhal.pfirmware); + rtlpriv->rtlhal.pfirmware =NULL ;return 1 ; }
drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c +2 -0
@@ -177,6 +177,8 @@ int rtl92ee_init_sw_vars(struct ieee80211_hw *hw) rtl_fw_cb);if (err) {pr_err ("Failed to request firmware!\n" ); +vfree (rtlpriv->rtlhal.pfirmware); + rtlpriv->rtlhal.pfirmware =NULL ;return 1 ; }
drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c +2 -0
@@ -216,6 +216,8 @@ static int rtl92s_init_sw_vars(struct ieee80211_hw *hw) rtl92se_fw_cb);if (err) {pr_err ("Failed to request firmware!\n" ); +vfree (rtlpriv->rtlhal.pfirmware); + rtlpriv->rtlhal.pfirmware =NULL ;return 1 ; }
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c +2 -0
@@ -184,6 +184,8 @@ int rtl8723e_init_sw_vars(struct ieee80211_hw *hw) rtl_fw_cb);if (err) {pr_err ("Failed to request firmware!\n" ); +vfree (rtlpriv->rtlhal.pfirmware); + rtlpriv->rtlhal.pfirmware =NULL ;return 1 ; }return 0 ;
drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c +5 -10
@@ -187,16 +187,10 @@ int rtl8723be_init_sw_vars(struct ieee80211_hw *hw) rtlpriv->io.dev,GFP_KERNEL , hw, rtl_fw_cb);if (err) { -/* Failed to get firmware. Check if old version available */ - fw_name ="rtlwifi/rtl8723befw.bin" ; -pr_info ("Using firmware %s\n" , fw_name); - err =request_firmware_nowait (THIS_MODULE ,1 , fw_name, - rtlpriv->io.dev,GFP_KERNEL , hw, - rtl_fw_cb); -if (err) { -pr_err ("Failed to request firmware!\n" ); -return 1 ; - } +pr_err ("Failed to request firmware!\n" ); +vfree (rtlpriv->rtlhal.pfirmware); + rtlpriv->rtlhal.pfirmware =NULL ; +return 1 ; }return 0 ; }
@@ -287,6 +281,7 @@ static const struct rtl_hal_cfg rtl8723be_hal_cfg = { .bar_id = 2, .write_readback = true, .name = "rtl8723be_pci", + .alt_fw_name = "rtlwifi/rtl8723befw.bin", .ops = &rtl8723be_hal_ops, .mod_params = &rtl8723be_mod_params, .maps[SYS_ISO_CTRL] = REG_SYS_ISO_CTRL,
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c +9 -10
@@ -196,6 +196,8 @@ int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw) rtlpriv->rtlhal.wowlan_firmware =vzalloc (0x8000 );if (!rtlpriv->rtlhal.wowlan_firmware) {pr_err ("Can't alloc buffer for wowlan fw.\n" ); +vfree (rtlpriv->rtlhal.pfirmware); + rtlpriv->rtlhal.pfirmware =NULL ;return 1 ; }
@@ -214,16 +216,10 @@ int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw) rtlpriv->io.dev,GFP_KERNEL , hw, rtl_fw_cb);if (err) { -/* Failed to get firmware. Check if old version available */ - fw_name ="rtlwifi/rtl8821aefw.bin" ; -pr_info ("Using firmware %s\n" , fw_name); - err =request_firmware_nowait (THIS_MODULE ,1 , fw_name, - rtlpriv->io.dev,GFP_KERNEL , hw, - rtl_fw_cb); -if (err) { -pr_err ("Failed to request normal firmware!\n" ); -return 1 ; - } +pr_err ("Failed to request normal firmware!\n" ); +vfree (rtlpriv->rtlhal.wowlan_firmware); +vfree (rtlpriv->rtlhal.pfirmware); +return 1 ; }/*load wowlan firmware*/ pr_info ("Using firmware %s\n" , wowlan_fw_name);
@@ -233,6 +229,8 @@ int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw) rtl_wowlan_fw_cb);if (err) {pr_err ("Failed to request wowlan firmware!\n" ); +vfree (rtlpriv->rtlhal.wowlan_firmware); +vfree (rtlpriv->rtlhal.pfirmware);return 1 ; }return 0 ;
@@ -325,6 +323,7 @@ static const struct rtl_hal_cfg rtl8821ae_hal_cfg = { .bar_id = 2, .write_readback = true, .name = "rtl8821ae_pci", + .alt_fw_name = "rtlwifi/rtl8821aefw.bin", .ops = &rtl8821ae_hal_ops, .mod_params = &rtl8821ae_mod_params, .maps[SYS_ISO_CTRL] = REG_SYS_ISO_CTRL,
drivers/of/device.c +2 -0
@@ -274,6 +274,8 @@ ssize_t of_device_modalias(struct device *dev, char *str, ssize_t len)ssize_t sl =of_device_get_modalias (dev, str, len -2 );if (sl <0 )return sl; +if (sl > len -2 ) +return -ENOMEM ; str[sl++] ='\n' ; str[sl] =0 ;
drivers/scsi/sg.c +14 -5
@@ -1233,6 +1233,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 ;
@@ -1243,8 +1244,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);
@@ -1258,7 +1262,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
@@ -1737,9 +1743,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
@@ -414,7 +414,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
@@ -623,6 +623,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) {
@@ -630,8 +632,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
@@ -57,8 +57,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 */
@@ -217,6 +218,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
@@ -142,29 +142,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/musb/musb_core.c +10 -8
@@ -2668,6 +2668,13 @@ static int musb_suspend(struct device *dev) {struct musb *musb =dev_to_musb (dev);unsigned long flags; +int ret; + + ret =pm_runtime_get_sync (dev); +if (ret <0 ) { +pm_runtime_put_noidle (dev); +return ret; + }musb_platform_disable (musb);musb_disable_interrupts (musb);
@@ -2718,14 +2725,6 @@ static int musb_resume(struct device *dev)if ((devctl & mask) != (musb->context.devctl & mask)) musb->port1_status =0 ; -/* -* The USB HUB code expects the device to be in RPM_ACTIVE once it came -* out of suspend -*/ -pm_runtime_disable (dev); -pm_runtime_set_active (dev); -pm_runtime_enable (dev); -musb_start (musb);spin_lock_irqsave (&musb->lock, flags);
@@ -2735,6 +2734,9 @@ static int musb_resume(struct device *dev) error);spin_unlock_irqrestore (&musb->lock, flags); +pm_runtime_mark_last_busy (dev); +pm_runtime_put_autosuspend (dev); +return 0 ; }
drivers/usb/serial/option.c +1 -0
@@ -2023,6 +2023,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/dlm/user.c +4 -0
@@ -355,6 +355,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;
include/linux/pci_ids.h +1 -0
@@ -576,6 +576,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
@@ -323,8 +323,8 @@ 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_LEGACY =1 <<18 ,/* internal: create*_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 */
include/uapi/linux/android/binder.h +2 -0
@@ -132,6 +132,7 @@ enum {/* struct binder_fd_array_object - object describing an array of fds in a buffer * @hdr: common header structure +* @pad: padding to ensure correct alignment * @num_fds: number of file descriptors in the buffer * @parent: index in offset array to buffer holding the fd array * @parent_offset: start offset of fd array in the buffer
@@ -152,6 +153,7 @@ enum {*/ struct binder_fd_array_object {struct binder_object_header hdr; +__u32 pad;binder_size_t num_fds;binder_size_t parent;binder_size_t parent_offset;
kernel/configs/android-base.config +1 -0
@@ -7,6 +7,7 @@ # CONFIG_SYSVIPC is not set CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y +CONFIG_ANDROID_BINDER_DEVICES=binder,hwbinder,vndbinder CONFIG_ANDROID_LOW_MEMORY_KILLER=y CONFIG_ARMV8_DEPRECATED=y CONFIG_ASHMEM=y