Linux 4.14.134
Greg KH
maintainerI'm announcing the release of the 4.14.134 kernel.
All users of the 4.14 kernel series must upgrade.
The updated 4.14.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.14.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/ABI/testing/sysfs-class-net-qmi | 4 Documentation/admin-guide/hw-vuln/index.rst | 1 Documentation/admin-guide/hw-vuln/spectre.rst | 697 ++++++++++ Documentation/devicetree/bindings/net/can/microchip,mcp251x.txt | 1 Documentation/userspace-api/spec_ctrl.rst | 2 Makefile | 2 arch/arc/kernel/unwind.c | 9 arch/arm/boot/dts/am335x-pcm-953.dtsi | 2 arch/arm/boot/dts/am335x-wega.dtsi | 2 arch/arm/boot/dts/imx6ul.dtsi | 8 arch/arm/mach-davinci/board-da850-evm.c | 2 arch/arm/mach-davinci/devices-da8xx.c | 3 arch/arm/mach-omap2/prm3xxx.c | 2 arch/mips/include/uapi/asm/sgidefs.h | 8 arch/s390/include/asm/facility.h | 21 arch/x86/kernel/head64.c | 17 arch/x86/kernel/ptrace.c | 5 arch/x86/kernel/tls.c | 9 block/bfq-iosched.c | 1 drivers/android/binder.c | 4 drivers/base/cacheinfo.c | 3 drivers/clk/ti/clkctrl.c | 7 drivers/crypto/nx/nx-842-powernv.c | 8 drivers/crypto/talitos.c | 16 drivers/firmware/efi/efi-bgrt.c | 5 drivers/gpu/drm/drm_bufs.c | 5 drivers/gpu/drm/drm_ioc32.c | 5 drivers/gpu/drm/udl/udl_drv.c | 56 drivers/gpu/drm/udl/udl_drv.h | 9 drivers/gpu/drm/udl/udl_fb.c | 12 drivers/gpu/drm/udl/udl_main.c | 35 drivers/input/keyboard/imx_keypad.c | 18 drivers/input/mouse/elantech.c | 2 drivers/input/mouse/synaptics.c | 1 drivers/md/dm-verity-target.c | 4 drivers/md/md.c | 36 drivers/misc/vmw_vmci/vmci_context.c | 80 - drivers/misc/vmw_vmci/vmci_handle_array.c | 38 drivers/misc/vmw_vmci/vmci_handle_array.h | 29 drivers/net/can/m_can/m_can.c | 21 drivers/net/can/spi/Kconfig | 5 drivers/net/can/spi/mcp251x.c | 25 drivers/net/dsa/mv88e6xxx/global1_vtu.c | 2 drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 3 drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 1 drivers/net/ethernet/cavium/liquidio/lio_core.c | 2 drivers/net/ethernet/emulex/benet/be_ethtool.c | 28 drivers/net/ethernet/ibm/ibmvnic.c | 3 drivers/net/ethernet/intel/e1000e/netdev.c | 21 drivers/net/ethernet/mellanox/mlxsw/reg.h | 2 drivers/net/ethernet/sis/sis900.c | 16 drivers/net/ppp/ppp_mppe.c | 1 drivers/net/usb/qmi_wwan.c | 27 drivers/net/wireless/ath/carl9170/usb.c | 39 drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 1 drivers/net/wireless/intersil/p54/p54usb.c | 43 drivers/net/wireless/marvell/mwifiex/fw.h | 12 drivers/net/wireless/marvell/mwifiex/ie.c | 45 drivers/net/wireless/marvell/mwifiex/scan.c | 31 drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 4 drivers/net/wireless/marvell/mwifiex/wmm.c | 2 drivers/s390/cio/qdio_setup.c | 2 drivers/s390/cio/qdio_thinint.c | 5 drivers/staging/comedi/drivers/amplc_pci230.c | 3 drivers/staging/comedi/drivers/dt282x.c | 3 drivers/staging/iio/cdc/ad7150.c | 19 drivers/tty/serial/8250/8250_port.c | 3 drivers/usb/gadget/function/u_ether.c | 6 drivers/usb/renesas_usbhs/fifo.c | 34 drivers/usb/serial/ftdi_sio.c | 1 drivers/usb/serial/ftdi_sio_ids.h | 6 drivers/usb/serial/option.c | 1 fs/crypto/policy.c | 2 fs/quota/dquot.c | 4 fs/udf/inode.c | 93 - include/linux/cpuhotplug.h | 1 include/linux/kernel.h | 3 include/linux/vmw_vmci_defs.h | 11 include/net/ip6_tunnel.h | 9 include/uapi/linux/nilfs2_ondisk.h | 24 kernel/cpu.c | 3 kernel/events/core.c | 2 net/can/af_can.c | 24 net/core/skbuff.c | 1 net/ipv6/netfilter/nf_conntrack_reasm.c | 22 net/mac80211/ieee80211_i.h | 2 net/mac80211/mesh.c | 6 net/sunrpc/clnt.c | 1 samples/bpf/bpf_load.c | 2 sound/pci/hda/patch_realtek.c | 2 virt/kvm/arm/vgic/vgic-its.c | 1 91 files changed, 1392 insertions(+), 407 deletions(-)
Aaron Ma (1):
Input: elantech - enable middle button support on 2 ThinkPads
Alan Stern (1):
p54usb: Fix race between disconnect and firmware loading
Andreas Fritiofson (1):
USB: serial: ftdi_sio: add ID for isodebug v1
Anson Huang (1):
Input: imx_keypad - make sure keyboard can always wake up system
Arnd Bergmann (2):
ARM: omap2: remove incorrect __init annotation
ARC: hide unused function unw_hdr_alloc
Bartosz Golaszewski (2):
ARM: davinci: da850-evm: call regulator_has_full_constraints()
ARM: davinci: da8xx: specify dma_coherent_mask for lcdc
Brian Norris (1):
mwifiex: Don't abort on small, spec-compliant vendor IEs
Chang-Hsien Tsai (1):
samples, bpf: fix to change the buffer size for read()
Christian Lamparter (1):
carl9170: fix misuse of device driver API
Christophe Leroy (1):
crypto: talitos - rename alternative AEAD algos.
Cole Rogers (1):
Input: synaptics - enable SMBUS on T480 thinkpad trackpad
Colin Ian King (1):
net: lio_core: fix potential sign-extension overflow on large shift
Dan Carpenter (1):
drm: return -EFAULT if copy_to_user() fails
Dave Airlie (2):
drm/udl: introduce a macro to convert dev to udl. drm/udl: move to embedding drm device inside udl device.
Dave Martin (1):
KVM: arm/arm64: vgic: Fix kvm_device leak in vgic_its_destroy
Dianzhang Chen (2):
x86/ptrace: Fix possible spectre-v1 in ptrace_get_debugreg() x86/tls: Fix possible spectre-v1 in do_get_thread_area()
Douglas Anderson (1):
block, bfq: NULL out the bic when it's no longer valid
Eiichi Tsukata (1):
cpu/hotplug: Fix out-of-bounds read when setting fail state
Eugen Hristev (1):
can: m_can: implement errata "Needless activation of MRAF irq"
Greg Kroah-Hartman (1):
Linux 4.14.134
Guillaume Nault (2):
netfilter: ipv6: nf_defrag: fix leakage of unqueued fragments
netfilter: ipv6: nf_defrag: accept duplicate fragments again
Hans de Goede (1):
efi/bgrt: Drop BGRT status field reserved bits check
Haren Myneni (1):
crypto/NX: Set receive window credits to max number of CRBs in RxFIFO
Heiko Carstens (1):
s390: fix stfle zero padding
Hongjie Fang (1):
fscrypt: don't set policy for a dead directory
Ian Abbott (2):
staging: comedi: dt282x: fix a null pointer deref on interrupt
staging: comedi: amplc_pci230: fix null pointer deref on interrupt
Ido Schimmel (1):
mlxsw: spectrum: Disallow prio-tagged packets when PVID is removed
James Morse (1):
drivers: base: cacheinfo: Ensure cpu hotplug work is done before Intel RDT
Jia-Ju Bai (1):
iwlwifi: Fix double-free problems in iwl_req_fw_callback()
John Fastabend (1):
bpf: sockmap, fix use after free from sleep in psock backlog workqueue
Julian Wiedmann (2):
s390/qdio: (re-)initialize tiqdio list entries s390/qdio: don't touch the dsci in tiqdio_add_input_queues()
Jörgen Storvist (1):
USB: serial: option: add support for GosunCn ME3630 RNDIS mode
Kailang Yang (1):
ALSA: hda/realtek - Headphone Mic can't record after S3
Kirill A. Shutemov (1):
x86/boot/64: Fix crash if kernel image crosses page table boundary
Kiruthika Varadarajan (1):
usb: gadget: ether: Fix race between gether_disconnect and rx_submit
Konstantin Khlebnikov (2):
Revert "e1000e: fix cyclic resets at link up with active tx"
e1000e: start network tx queue only when link is up
Lin Yi (1):
net :sunrpc :clnt :Fix xps refcount imbalance on the error path
Mariusz Tkaczyk (1):
md: fix for divide error in status_resync
Masahiro Yamada (1):
nilfs2: do not use unexported cpu_to_le32()/le32_to_cpu() in uapi header
Mauro S. M. Rodrigues (1):
bnx2x: Check if transceiver implements DDM before access
Melissa Wen (1):
staging:iio:ad7150: fix threshold mode config bit
Milan Broz (1):
dm verity: use message limit for data block corruption message
Oliver Barta (1):
Revert "serial: 8250: Don't service RX FIFO if interrupts are disabled"
Peter Zijlstra (1):
perf/core: Fix perf_sample_regs_user() mm check
Petr Oros (1):
be2net: fix link failure after ethtool offline test
Pradeep Kumar Chitrapu (1):
mac80211: free peer keys before vif down in mesh
Rasmus Villemoes (1):
net: dsa: mv88e6xxx: fix shift of FID bits in mv88e6185_g1_vtu_loadpurge()
Reinhard Speyerer (3):
qmi_wwan: add support for QMAP padding in the RX path
qmi_wwan: avoid RCU stalls on device disconnect when in QMAP mode
qmi_wwan: extend permitted QMAP mux_id value range
Sean Nyekjaer (2):
dt-bindings: can: mcp251x: add mcp25625 support
can: mcp251x: add support for mcp25625Sean Young (1):
MIPS: Remove superfluous check for __linux__
Sergej Benilov (1):
sis900: fix TX completion
Steven J. Magnani (1):
udf: Fix incorrect final NOT_ALLOCATED (hole) extent length
Sébastien Szymanski (1):
ARM: dts: imx6ul: fix PWM[1-4] interrupts
Takashi Iwai (4):
mwifiex: Fix possible buffer overflows at parsing bss descriptor
mwifiex: Abort at too short BSS descriptor element
mwifiex: Fix heap overflow in mwifiex_uap_parse_tail_ies()
ppp: mppe: Add softdep to arc4
Teresa Remmet (1):
ARM: dts: am335x phytec boards: Fix cd-gpios active level
Thomas Falcon (1):
ibmvnic: Refresh device multicast list after reset
Thomas Pedersen (1):
mac80211: mesh: fix RCU warning
Tim Chen (1):
Documentation: Add section about CPU vulnerabilities for Spectre
Todd Kjos (1):
binder: fix memory leak in error path
Tony Lindgren (1):
clk: ti: clkctrl: Fix returning uninitialized data
Vinod Koul (1):
linux/kernel.h: fix overflow for DIV_ROUND_UP_ULL
Vishnu DASA (1):
VMCI: Fix integer overflow in VMCI handle arrays
Xin Long (1):
ip6_tunnel: allow not to count pkts on tstats by passing dev as NULL
Yibo Zhao (1):
mac80211: only warn once on chanctx_conf being NULL
Yoshihiro Shimoda (1):
usb: renesas_usbhs: add a workaround for a race condition of workqueue
YueHaibing (1):
can: af_can: Fix error path of can_init()
yangerkun (1):
quota: fix a problem about transfer quota
Greg KH
maintainerDocumentation/ABI/testing/sysfs-class-net-qmi +2 -2
@@ -29,7 +29,7 @@ Contact: Bjørn Mork <[email protected]> Description: Unsigned integer. - Write a number ranging from 1 to 127 to add a qmap mux + Write a number ranging from 1 to 254 to add a qmap mux based network device, supported by recent Qualcomm based modems.
@@ -46,5 +46,5 @@ Contact: Bjørn Mork <[email protected]> Description: Unsigned integer. - Write a number ranging from 1 to 127 to delete a previously + Write a number ranging from 1 to 254 to delete a previously created qmap mux based network device.
Documentation/admin-guide/hw-vuln/index.rst +1 -0
@@ -9,5 +9,6 @@ are configurable at compile, boot or run time. .. toctree:: :maxdepth: 1 + spectre l1tf mds
Documentation/admin-guide/hw-vuln/spectre.rst new file +697 -0
697 lines not on this page · raw message
Documentation/devicetree/bindings/net/can/microchip,mcp251x.txt +1 -0
@@ -4,6 +4,7 @@ Required properties: - compatible: Should be one of the following: - "microchip,mcp2510" for MCP2510. - "microchip,mcp2515" for MCP2515. + - "microchip,mcp25625" for MCP25625. - reg: SPI chip select. - clocks: The clock feeding the CAN controller. - interrupt-parent: The parent interrupt controller.
Documentation/userspace-api/spec_ctrl.rst +2 -0
@@ -47,6 +47,8 @@ If PR_SPEC_PRCTL is set, then the per-task control of the mitigation is available. If not set, prctl(PR_SET_SPECULATION_CTRL) for the speculation misfeature will fail. +.. _set_spec_ctrl: + PR_SET_SPECULATION_CTRL -----------------------
Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 14 -SUBLEVEL = 133 +SUBLEVEL = 134 EXTRAVERSION = NAME = Petit Gorille
arch/arc/kernel/unwind.c +4 -5
@@ -185,11 +185,6 @@ static void *__init unw_hdr_alloc_early(unsigned long sz) MAX_DMA_ADDRESS); } -static void *unw_hdr_alloc (unsigned long sz) -{ -return kmalloc (sz,GFP_KERNEL ); -} - static void init_unwind_table(struct unwind_table *table, const char *name, const void *core_start, unsigned long core_size, const void *init_start, unsigned long init_size,
@@ -370,6 +365,10 @@ static void init_unwind_hdr(struct unwind_table *table, }#ifdef CONFIG_MODULES +static void *unw_hdr_alloc (unsigned long sz) +{ +return kmalloc (sz,GFP_KERNEL ); +}static struct unwind_table *last_table;
arch/arm/boot/dts/am335x-pcm-953.dtsi +1 -1
@@ -197,7 +197,7 @@ bus-width = <4>; pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins>; - cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; + cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; status = "okay"; };
arch/arm/boot/dts/am335x-wega.dtsi +1 -1
@@ -157,7 +157,7 @@ bus-width = <4>; pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins>; - cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; + cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; status = "okay"; };
arch/arm/boot/dts/imx6ul.dtsi +4 -4
@@ -342,7 +342,7 @@ pwm1: pwm@02080000 { compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm"; reg = <0x02080000 0x4000>; - interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6UL_CLK_PWM1>, <&clks IMX6UL_CLK_PWM1>; clock-names = "ipg", "per";
@@ -353,7 +353,7 @@ pwm2: pwm@02084000 { compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm"; reg = <0x02084000 0x4000>; - interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6UL_CLK_PWM2>, <&clks IMX6UL_CLK_PWM2>; clock-names = "ipg", "per";
@@ -364,7 +364,7 @@ pwm3: pwm@02088000 { compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm"; reg = <0x02088000 0x4000>; - interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6UL_CLK_PWM3>, <&clks IMX6UL_CLK_PWM3>; clock-names = "ipg", "per";
@@ -375,7 +375,7 @@ pwm4: pwm@0208c000 { compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm"; reg = <0x0208c000 0x4000>; - interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6UL_CLK_PWM4>, <&clks IMX6UL_CLK_PWM4>; clock-names = "ipg", "per";
arch/arm/mach-davinci/board-da850-evm.c +2 -0
@@ -1464,6 +1464,8 @@ static __init void da850_evm_init(void)if (ret)pr_warn ("%s: dsp/rproc registration failed: %d\n" , __func__, ret); + +regulator_has_full_constraints (); }#ifdef CONFIG_SERIAL_8250_CONSOLE
arch/arm/mach-davinci/devices-da8xx.c +3 -0
@@ -699,6 +699,9 @@ static struct platform_device da8xx_lcdc_device = { .id = 0, .num_resources = ARRAY_SIZE(da8xx_lcdc_resources), .resource = da8xx_lcdc_resources, + .dev = { + .coherent_dma_mask = DMA_BIT_MASK(32), + } };int __init da8xx_register_lcdc (struct da8xx_lcdc_platform_data *pdata)
arch/arm/mach-omap2/prm3xxx.c +1 -1
@@ -433,7 +433,7 @@ static void omap3_prm_reconfigure_io_chain(void)* registers, and omap3xxx_prm_reconfigure_io_chain() must be called. * No return value. */ -static void __init omap3xxx_prm_enable_io_wakeup (void ) +static void omap3xxx_prm_enable_io_wakeup (void ) {if (prm_features &PRM_HAS_IO_WAKEUP ) omap2_prm_set_mod_reg_bits(OMAP3430_EN_IO_MASK, WKUP_MOD,
arch/mips/include/uapi/asm/sgidefs.h +0 -8
@@ -11,14 +11,6 @@#ifndef __ASM_SGIDEFS_H#define __ASM_SGIDEFS_H -/* -* Using a Linux compiler for building Linux seems logic but not to -* everybody. -*/ -#ifndef __linux__ -#error Use a Linux compiler or give up. -#endif -/* * Definitions for the ISA levels *
arch/s390/include/asm/facility.h +14 -7
@@ -59,6 +59,18 @@ static inline int test_facility(unsigned long nr)return __test_facility (nr, &S390_lowcore.stfle_fac_list); } +static inline unsigned long __stfle_asm (u64 *stfle_fac_list,int size) +{ + register unsigned long reg0 asm("0") = size - 1; + + asmvolatile ( +".insn s,0xb2b00000,0(%1)" /* stfle */ + :"+d" (reg0) + :"a" (stfle_fac_list) + :"memory" ,"cc" ); +return reg0; +} +/** * stfle - Store facility list extended * @stfle_fac_list: array where facility list can be stored
@@ -76,13 +88,8 @@ static inline void stfle(u64 *stfle_fac_list, int size)memcpy (stfle_fac_list, &S390_lowcore.stfl_fac_list,4 );if (S390_lowcore.stfl_fac_list &0x01000000 ) {/* More facility bits available with stfle */ - register unsigned long reg0 asm("0") = size - 1; - - asmvolatile (".insn s,0xb2b00000,0(%1)" /* stfle */ - :"+d" (reg0) - :"a" (stfle_fac_list) - :"memory" ,"cc" ); - nr = (reg0 +1 ) *8 ;/* # bytes stored by stfle */ + nr =__stfle_asm (stfle_fac_list, size); + nr = min_t(unsigned long, (nr + 1) * 8, size * 8); }memset ((char *) stfle_fac_list + nr,0 , size *8 - nr);preempt_enable ();
arch/x86/kernel/head64.c +9 -8
@@ -117,26 +117,27 @@ unsigned long __head __startup_64(unsigned long physaddr, pgd[i +0 ] = (pgdval_t )p4d + pgtable_flags; pgd[i +1 ] = (pgdval_t )p4d + pgtable_flags; - i = (physaddr >>P4D_SHIFT ) %PTRS_PER_P4D ; - p4d[i +0 ] = (pgdval_t )pud + pgtable_flags; - p4d[i +1 ] = (pgdval_t )pud + pgtable_flags; + i = physaddr >>P4D_SHIFT ; + p4d[(i +0 ) %PTRS_PER_P4D ] = (pgdval_t )pud + pgtable_flags; + p4d[(i +1 ) %PTRS_PER_P4D ] = (pgdval_t )pud + pgtable_flags; }else { i = (physaddr >>PGDIR_SHIFT ) %PTRS_PER_PGD ; pgd[i +0 ] = (pgdval_t )pud + pgtable_flags; pgd[i +1 ] = (pgdval_t )pud + pgtable_flags; } - i = (physaddr >>PUD_SHIFT ) %PTRS_PER_PUD ; - pud[i +0 ] = (pudval_t )pmd + pgtable_flags; - pud[i +1 ] = (pudval_t )pmd + pgtable_flags; + i = physaddr >>PUD_SHIFT ; + pud[(i +0 ) %PTRS_PER_PUD ] = (pudval_t )pmd + pgtable_flags; + pud[(i +1 ) %PTRS_PER_PUD ] = (pudval_t )pmd + pgtable_flags; pmd_entry = __PAGE_KERNEL_LARGE_EXEC & ~_PAGE_GLOBAL; pmd_entry +=sme_get_me_mask (); pmd_entry += physaddr;for (i =0 ; i <DIV_ROUND_UP (_end - _text,PMD_SIZE ); i++) { -int idx = i + (physaddr >>PMD_SHIFT ) %PTRS_PER_PMD ; - pmd[idx] = pmd_entry + i *PMD_SIZE ; +int idx = i + (physaddr >>PMD_SHIFT ); + + pmd[idx %PTRS_PER_PMD ] = pmd_entry + i *PMD_SIZE ; }/*
arch/x86/kernel/ptrace.c +4 -1
@@ -24,6 +24,7 @@#include <linux/rcupdate.h> #include <linux/export.h> #include <linux/context_tracking.h> +#include <linux/nospec.h> #include <linux/uaccess.h> #include <asm/pgtable.h>
@@ -651,9 +652,11 @@ static unsigned long ptrace_get_debugreg(struct task_struct *tsk, int n) {struct thread_struct *thread = &tsk->thread;unsigned long val =0 ; +int index = n;if (n <HBP_NUM ) { -struct perf_event *bp = thread->ptrace_bps[n]; +struct perf_event *bp = thread->ptrace_bps[index]; + index =array_index_nospec (index,HBP_NUM );if (bp) val = bp->hw.info.address;
arch/x86/kernel/tls.c +7 -2
@@ -5,6 +5,7 @@#include <linux/user.h> #include <linux/regset.h> #include <linux/syscalls.h> +#include <linux/nospec.h> #include <linux/uaccess.h> #include <asm/desc.h>
@@ -220,6 +221,7 @@ int do_get_thread_area(struct task_struct *p, int idx, struct user_desc __user *u_info) {struct user_desc info; +int index;if (idx ==-1 &&get_user (idx, &u_info->entry_number))return -EFAULT ;
@@ -227,8 +229,11 @@ int do_get_thread_area(struct task_struct *p, int idx,if (idx <GDT_ENTRY_TLS_MIN || idx >GDT_ENTRY_TLS_MAX )return -EINVAL ; -fill_user_desc (&info, idx, - &p->thread.tls_array[idx -GDT_ENTRY_TLS_MIN ]); + index = idx -GDT_ENTRY_TLS_MIN ; + index =array_index_nospec (index, +GDT_ENTRY_TLS_MAX -GDT_ENTRY_TLS_MIN +1 ); + +fill_user_desc (&info, idx, &p->thread.tls_array[index]);if (copy_to_user (u_info, &info,sizeof (info)))return -EFAULT ;
block/bfq-iosched.c +1 -0
@@ -3760,6 +3760,7 @@ static void bfq_exit_icq_bfqq(struct bfq_io_cq *bic, bool is_sync)unsigned long flags;spin_lock_irqsave (&bfqd->lock, flags); + bfqq->bic =NULL ;bfq_exit_bfqq (bfqd, bfqq);bic_set_bfqq (bic,NULL , is_sync);spin_unlock_irqrestore (&bfqd->lock, flags);
drivers/android/binder.c +2 -2
@@ -3876,6 +3876,8 @@ static int binder_thread_read(struct binder_proc *proc,case BINDER_WORK_TRANSACTION_COMPLETE : {binder_inner_proc_unlock (proc); cmd =BR_TRANSACTION_COMPLETE ; +kfree (w); +binder_stats_deleted (BINDER_STAT_TRANSACTION_COMPLETE );if (put_user (cmd, (uint32_t __user *)ptr))return -EFAULT ; ptr +=sizeof (uint32_t );
@@ -3884,8 +3886,6 @@ static int binder_thread_read(struct binder_proc *proc,binder_debug (BINDER_DEBUG_TRANSACTION_COMPLETE ,"%d:%d BR_TRANSACTION_COMPLETE\n" , proc->pid, thread->pid); -kfree (w); -binder_stats_deleted (BINDER_STAT_TRANSACTION_COMPLETE ); }break ;case BINDER_WORK_NODE : { struct binder_node *node = container_of(w, struct binder_node, work);
drivers/base/cacheinfo.c +2 -1
@@ -669,7 +669,8 @@ static int cacheinfo_cpu_pre_down(unsigned int cpu)static int __init cacheinfo_sysfs_init (void ) { -return cpuhp_setup_state (CPUHP_AP_ONLINE_DYN ,"base/cacheinfo:online" , +return cpuhp_setup_state (CPUHP_AP_BASE_CACHEINFO_ONLINE , +"base/cacheinfo:online" , cacheinfo_cpu_online, cacheinfo_cpu_pre_down); }device_initcall (cacheinfo_sysfs_init);
drivers/clk/ti/clkctrl.c +5 -2
@@ -215,6 +215,7 @@ static struct clk_hw *_ti_omap4_clkctrl_xlate(struct of_phandle_args *clkspec, {struct omap_clkctrl_provider *provider = data;struct omap_clkctrl_clk *entry; +bool found = false;if (clkspec->args_count !=2 )return ERR_PTR (-EINVAL );
@@ -224,11 +225,13 @@ static struct clk_hw *_ti_omap4_clkctrl_xlate(struct of_phandle_args *clkspec,list_for_each_entry (entry, &provider->clocks, node) {if (entry->reg_offset == clkspec->args[0 ] && - entry->bit_offset == clkspec->args[1 ]) + entry->bit_offset == clkspec->args[1 ]) { + found = true;break ; + } } -if (!entry) +if (!found)return ERR_PTR (-EINVAL );return entry->clk;
drivers/crypto/nx/nx-842-powernv.c +5 -3
@@ -34,8 +34,6 @@ MODULE_ALIAS_CRYPTO("842-nx");#define WORKMEM_ALIGN (CRB_ALIGN)#define CSB_WAIT_MAX (5000)/* ms */ #define VAS_RETRIES (10) -/* # of requests allowed per RxFIFO at a time. 0 for unlimited */ -#define MAX_CREDITS_PER_RXFIFO (1024)struct nx842_workmem {/* Below fields must be properly aligned */
@@ -801,7 +799,11 @@ static int __init vas_cfg_coproc_info(struct device_node *dn, int chip_id, rxattr.lnotify_lpid = lpid; rxattr.lnotify_pid = pid; rxattr.lnotify_tid = tid; - rxattr.wcreds_max =MAX_CREDITS_PER_RXFIFO ; +/* +* Maximum RX window credits can not be more than #CRBs in +* RxFIFO. Otherwise, can get checkstop if RxFIFO overruns. +*/ + rxattr.wcreds_max = fifo_size /CRB_SIZE ;/* * Open a VAS receice window which is used to configure RxFIFO
drivers/crypto/talitos.c +8 -8
@@ -2185,7 +2185,7 @@ static struct talitos_alg_template driver_algs[] = { .base = { .cra_name = "authenc(hmac(sha1),cbc(aes))", .cra_driver_name ="authenc-hmac-sha1-" - "cbc-aes-talitos", + "cbc-aes-talitos-hsna", .cra_blocksize = AES_BLOCK_SIZE, .cra_flags = CRYPTO_ALG_ASYNC, },
@@ -2229,7 +2229,7 @@ static struct talitos_alg_template driver_algs[] = { .cra_name = "authenc(hmac(sha1)," "cbc(des3_ede))", .cra_driver_name ="authenc-hmac-sha1-" - "cbc-3des-talitos", + "cbc-3des-talitos-hsna", .cra_blocksize = DES3_EDE_BLOCK_SIZE, .cra_flags = CRYPTO_ALG_ASYNC, },
@@ -2271,7 +2271,7 @@ static struct talitos_alg_template driver_algs[] = { .base = { .cra_name = "authenc(hmac(sha224),cbc(aes))", .cra_driver_name ="authenc-hmac-sha224-" - "cbc-aes-talitos", + "cbc-aes-talitos-hsna", .cra_blocksize = AES_BLOCK_SIZE, .cra_flags = CRYPTO_ALG_ASYNC, },
@@ -2315,7 +2315,7 @@ static struct talitos_alg_template driver_algs[] = { .cra_name = "authenc(hmac(sha224)," "cbc(des3_ede))", .cra_driver_name ="authenc-hmac-sha224-" - "cbc-3des-talitos", + "cbc-3des-talitos-hsna", .cra_blocksize = DES3_EDE_BLOCK_SIZE, .cra_flags = CRYPTO_ALG_ASYNC, },
@@ -2357,7 +2357,7 @@ static struct talitos_alg_template driver_algs[] = { .base = { .cra_name = "authenc(hmac(sha256),cbc(aes))", .cra_driver_name ="authenc-hmac-sha256-" - "cbc-aes-talitos", + "cbc-aes-talitos-hsna", .cra_blocksize = AES_BLOCK_SIZE, .cra_flags = CRYPTO_ALG_ASYNC, },
@@ -2401,7 +2401,7 @@ static struct talitos_alg_template driver_algs[] = { .cra_name = "authenc(hmac(sha256)," "cbc(des3_ede))", .cra_driver_name ="authenc-hmac-sha256-" - "cbc-3des-talitos", + "cbc-3des-talitos-hsna", .cra_blocksize = DES3_EDE_BLOCK_SIZE, .cra_flags = CRYPTO_ALG_ASYNC, },
@@ -2527,7 +2527,7 @@ static struct talitos_alg_template driver_algs[] = { .base = { .cra_name = "authenc(hmac(md5),cbc(aes))", .cra_driver_name ="authenc-hmac-md5-" - "cbc-aes-talitos", + "cbc-aes-talitos-hsna", .cra_blocksize = AES_BLOCK_SIZE, .cra_flags = CRYPTO_ALG_ASYNC, },
@@ -2569,7 +2569,7 @@ static struct talitos_alg_template driver_algs[] = { .base = { .cra_name = "authenc(hmac(md5),cbc(des3_ede))", .cra_driver_name ="authenc-hmac-md5-" - "cbc-3des-talitos", + "cbc-3des-talitos-hsna", .cra_blocksize = DES3_EDE_BLOCK_SIZE, .cra_flags = CRYPTO_ALG_ASYNC, },
drivers/firmware/efi/efi-bgrt.c +0 -5
@@ -50,11 +50,6 @@ void __init efi_bgrt_init(struct acpi_table_header *table) bgrt->version); goto out; } -if (bgrt->status &0xfe ) { -pr_notice ("Ignoring BGRT: reserved status bits are non-zero %u\n" , - bgrt->status); - goto out; - }if (bgrt->image_type !=0 ) {pr_notice ("Ignoring BGRT: invalid image type %u (expected 0)\n" , bgrt->image_type);
drivers/gpu/drm/drm_bufs.c +4 -1
@@ -1321,7 +1321,10 @@ static int copy_one_buf(void *data, int count, struct drm_buf_entry *from) .size = from->buf_size, .low_mark = from->low_mark, .high_mark = from->high_mark}; -return copy_to_user (to, &v, offsetof(struct drm_buf_desc , flags)); + +if (copy_to_user (to, &v, offsetof(struct drm_buf_desc , flags))) +return -EFAULT ; +return 0 ; } int drm_legacy_infobufs(struct drm_device *dev, void *data,
drivers/gpu/drm/drm_ioc32.c +4 -1
@@ -372,7 +372,10 @@ static int copy_one_buf32(void *data, int count, struct drm_buf_entry *from) .size = from->buf_size, .low_mark = from->low_mark, .high_mark = from->high_mark}; -return copy_to_user (to + count, &v, offsetof(drm_buf_desc32_t , flags)); + +if (copy_to_user (to + count, &v, offsetof(drm_buf_desc32_t , flags))) +return -EFAULT ; +return 0 ; } static int drm_legacy_infobufs32(struct drm_device *dev, void *data,
drivers/gpu/drm/udl/udl_drv.c +45 -11
83 lines not on this page · raw message
drivers/gpu/drm/udl/udl_drv.h +5 -4
@@ -49,8 +49,8 @@ struct urb_list {struct udl_fbdev ;struct udl_device { +struct drm_device drm;struct device *dev; -struct drm_device *ddev;struct usb_device *udev;struct drm_crtc *crtc;
@@ -68,6 +68,8 @@ struct udl_device {atomic_t cpu_kcycles_used;/* transpired during pixel processing */ }; +#define to_udl (x) container_of(x, struct udl_device, drm) +struct udl_gem_object {struct drm_gem_object base;struct page **pages;
@@ -99,9 +101,8 @@ struct urb *udl_get_urb(struct drm_device *dev);int udl_submit_urb (struct drm_device *dev,struct urb *urb,size_t len);void udl_urb_completion (struct urb *urb); -int udl_driver_load (struct drm_device *dev,unsigned long flags); -void udl_driver_unload (struct drm_device *dev); -void udl_driver_release (struct drm_device *dev); +int udl_init (struct udl_device *udl); +void udl_fini (struct drm_device *dev);int udl_fbdev_init (struct drm_device *dev);void udl_fbdev_cleanup (struct drm_device *dev);
drivers/gpu/drm/udl/udl_fb.c +6 -6
@@ -82,7 +82,7 @@ int udl_handle_damage(struct udl_framebuffer *fb, int x, int y, int width, int height) {struct drm_device *dev = fb->base.dev; -struct udl_device *udl = dev->dev_private; +struct udl_device *udl =to_udl (dev);int i, ret;char *cmd;cycles_t start_cycles, end_cycles;
@@ -210,10 +210,10 @@ static int udl_fb_open(struct fb_info *info, int user) {struct udl_fbdev *ufbdev = info->par;struct drm_device *dev = ufbdev->ufb.base.dev; -struct udl_device *udl = dev->dev_private; +struct udl_device *udl =to_udl (dev);/* If the USB device is gone, we don't accept new opens */ -if (drm_dev_is_unplugged (udl->ddev)) +if (drm_dev_is_unplugged (&udl->drm))return -ENODEV ; ufbdev->fb_count++;
@@ -441,7 +441,7 @@ static void udl_fbdev_destroy(struct drm_device *dev,int udl_fbdev_init (struct drm_device *dev) { -struct udl_device *udl = dev->dev_private; +struct udl_device *udl =to_udl (dev);int bpp_sel = fb_bpp;struct udl_fbdev *ufbdev;int ret;
@@ -480,7 +480,7 @@ int udl_fbdev_init(struct drm_device *dev)void udl_fbdev_cleanup (struct drm_device *dev) { -struct udl_device *udl = dev->dev_private; +struct udl_device *udl =to_udl (dev);if (!udl->fbdev)return ;
@@ -491,7 +491,7 @@ void udl_fbdev_cleanup(struct drm_device *dev)void udl_fbdev_unplug (struct drm_device *dev) { -struct udl_device *udl = dev->dev_private; +struct udl_device *udl =to_udl (dev);struct udl_fbdev *ufbdev;if (!udl->fbdev)return ;
drivers/gpu/drm/udl/udl_main.c +9 -26
@@ -28,7 +28,7 @@static int udl_parse_vendor_descriptor (struct drm_device *dev,struct usb_device *usbdev) { -struct udl_device *udl = dev->dev_private; +struct udl_device *udl =to_udl (dev);char *desc;char *buf;char *desc_end;
@@ -164,7 +164,7 @@ void udl_urb_completion(struct urb *urb)static void udl_free_urb_list (struct drm_device *dev) { -struct udl_device *udl = dev->dev_private; +struct udl_device *udl =to_udl (dev);int count = udl->urbs.count;struct list_head *node;struct urb_node *unode;
@@ -198,7 +198,7 @@ static void udl_free_urb_list(struct drm_device *dev)static int udl_alloc_urb_list (struct drm_device *dev,int count,size_t size) { -struct udl_device *udl = dev->dev_private; +struct udl_device *udl =to_udl (dev);struct urb *urb;struct urb_node *unode;char *buf;
@@ -262,7 +262,7 @@ static int udl_alloc_urb_list(struct drm_device *dev, int count, size_t size)struct urb *udl_get_urb (struct drm_device *dev) { -struct udl_device *udl = dev->dev_private; +struct udl_device *udl =to_udl (dev);int ret =0 ;struct list_head *entry;struct urb_node *unode;
@@ -296,7 +296,7 @@ struct urb *udl_get_urb(struct drm_device *dev)int udl_submit_urb (struct drm_device *dev,struct urb *urb,size_t len) { -struct udl_device *udl = dev->dev_private; +struct udl_device *udl =to_udl (dev);int ret;BUG_ON (len > udl->urbs.size);
@@ -311,20 +311,12 @@ int udl_submit_urb(struct drm_device *dev, struct urb *urb, size_t len)return ret; } -int udl_driver_load (struct drm_device *dev,unsigned long flags) +int udl_init (struct udl_device *udl) { -struct usb_device *udev = (void *)flags; -struct udl_device *udl; +struct drm_device *dev = &udl->drm;int ret = -ENOMEM ;DRM_DEBUG ("\n" ); - udl =kzalloc (sizeof (struct udl_device ),GFP_KERNEL ); -if (!udl) -return -ENOMEM ; - - udl->udev = udev; - udl->ddev = dev; - dev->dev_private = udl;if (!udl_parse_vendor_descriptor (dev, udl->udev)) { ret = -ENODEV ;
@@ -359,7 +351,6 @@ int udl_driver_load(struct drm_device *dev, unsigned long flags) err:if (udl->urbs.count)udl_free_urb_list (dev); -kfree (udl);DRM_ERROR ("%d\n" , ret);return ret; }
@@ -370,20 +361,12 @@ int udl_drop_usb(struct drm_device *dev)return 0 ; } -void udl_driver_unload (struct drm_device *dev) +void udl_fini (struct drm_device *dev) { -struct udl_device *udl = dev->dev_private; +struct udl_device *udl =to_udl (dev);if (udl->urbs.count)udl_free_urb_list (dev);udl_fbdev_cleanup (dev); -kfree (udl); -} - -void udl_driver_release (struct drm_device *dev) -{ -udl_modeset_cleanup (dev); -drm_dev_fini (dev); -kfree (dev); }
drivers/input/keyboard/imx_keypad.c +14 -4
@@ -530,11 +530,12 @@ static int imx_keypad_probe(struct platform_device *pdev)return 0 ; } -static int __maybe_unused imx_kbd_suspend (struct device *dev) +static int __maybe_unused imx_kbd_noirq_suspend (struct device *dev) {struct platform_device *pdev =to_platform_device (dev);struct imx_keypad *kbd =platform_get_drvdata (pdev);struct input_dev *input_dev = kbd->input_dev; +unsigned short reg_val =readw (kbd->mmio_base +KPSR );/* imx kbd can wake up system even clock is disabled */ mutex_lock (&input_dev->mutex);
@@ -544,13 +545,20 @@ static int __maybe_unused imx_kbd_suspend(struct device *dev)mutex_unlock (&input_dev->mutex); -if (device_may_wakeup (&pdev->dev)) +if (device_may_wakeup (&pdev->dev)) { +if (reg_val &KBD_STAT_KPKD ) + reg_val |=KBD_STAT_KRIE ; +if (reg_val &KBD_STAT_KPKR ) + reg_val |=KBD_STAT_KDIE ; +writew (reg_val, kbd->mmio_base +KPSR ); +enable_irq_wake (kbd->irq); + }return 0 ; } -static int __maybe_unused imx_kbd_resume (struct device *dev) +static int __maybe_unused imx_kbd_noirq_resume (struct device *dev) {struct platform_device *pdev =to_platform_device (dev);struct imx_keypad *kbd =platform_get_drvdata (pdev);
@@ -574,7 +582,9 @@ static int __maybe_unused imx_kbd_resume(struct device *dev)return ret; } -static SIMPLE_DEV_PM_OPS(imx_kbd_pm_ops, imx_kbd_suspend, imx_kbd_resume); +static const struct dev_pm_ops imx_kbd_pm_ops = { +SET_NOIRQ_SYSTEM_SLEEP_PM_OPS (imx_kbd_noirq_suspend, imx_kbd_noirq_resume) +};static struct platform_driver imx_keypad_driver = { .driver = {
drivers/input/mouse/elantech.c +2 -0
@@ -1191,6 +1191,8 @@ static const char * const middle_button_pnp_ids[] = {"LEN2132" ,/* ThinkPad P52 */ "LEN2133" ,/* ThinkPad P72 w/ NFC */ "LEN2134" ,/* ThinkPad P72 */ +"LEN0407" , +"LEN0408" , NULL };
drivers/input/mouse/synaptics.c +1 -0
@@ -176,6 +176,7 @@ static const char * const smbus_pnp_ids[] = {"LEN0072" ,/* X1 Carbon Gen 5 (2017) - Elan/ALPS trackpoint */ "LEN0073" ,/* X1 Carbon G5 (Elantech) */ "LEN0092" ,/* X1 Carbon 6 */ +"LEN0093" ,/* T480 */ "LEN0096" ,/* X280 */ "LEN0097" ,/* X280 -> ALPS trackpoint */ "LEN200f", /* T450s */
drivers/md/dm-verity-target.c +2 -2
@@ -276,8 +276,8 @@ static int verity_handle_err(struct dm_verity *v, enum verity_block_type type,BUG (); } -DMERR ("%s: %s block %llu is corrupted" , v->data_dev->name, type_str, - block); +DMERR_LIMIT ("%s: %s block %llu is corrupted" , v->data_dev->name, + type_str, block);if (v->corrupted_errs ==DM_VERITY_MAX_CORRUPTED_ERRS )DMERR ("%s: reached maximum errors" , v->data_dev->name);
drivers/md/md.c +22 -14
@@ -7605,9 +7605,9 @@ static void status_unused(struct seq_file *seq)static int status_resync (struct seq_file *seq,struct mddev *mddev) {sector_t max_sectors, resync, res; -unsigned long dt, db; -sector_t rt; -int scale; +unsigned long dt, db =0 ; +sector_t rt, curr_mark_cnt, resync_mark_cnt; +int scale, recovery_active;unsigned int per_milli; if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery) ||
@@ -7677,22 +7677,30 @@ static int status_resync(struct seq_file *seq, struct mddev *mddev)* db: blocks written from mark until now * rt: remaining time * -* rt is a sector_t, so could be 32bit or 64bit. -* So we divide before multiply in case it is 32bit and close -* to the limit. -* We scale the divisor (db) by 32 to avoid losing precision -* near the end of resync when the number of remaining sectors -* is close to 'db'. -* We then divide rt by 32 after multiplying by db to compensate. -* The '+1' avoids division by zero if db is very small. +* rt is a sector_t, which is always 64bit now. We are keeping +* the original algorithm, but it is not really necessary. +* +* Original algorithm: +* So we divide before multiply in case it is 32bit and close +* to the limit. +* We scale the divisor (db) by 32 to avoid losing precision +* near the end of resync when the number of remaining sectors +* is close to 'db'. +* We then divide rt by 32 after multiplying by db to compensate. +* The '+1' avoids division by zero if db is very small. */ dt = ((jiffies - mddev->resync_mark) /HZ );if (!dt) dt++; - db = (mddev->curr_mark_cnt -atomic_read (&mddev->recovery_active)) - - mddev->resync_mark_cnt; + + curr_mark_cnt = mddev->curr_mark_cnt; + recovery_active =atomic_read (&mddev->recovery_active); + resync_mark_cnt = mddev->resync_mark_cnt; + +if (curr_mark_cnt >= (recovery_active + resync_mark_cnt)) + db = curr_mark_cnt - (recovery_active + resync_mark_cnt); rt = max_sectors - resync;/* number of remaining sectors */ -sector_div (rt, db/32 +1 ); + rt =div64_u64 (rt, db/32 +1 ); rt *= dt; rt >>=5 ;
drivers/misc/vmw_vmci/vmci_context.c +45 -35
152 lines not on this page · raw message
drivers/misc/vmw_vmci/vmci_handle_array.c +25 -13
@@ -16,24 +16,29 @@#include <linux/slab.h> #include "vmci_handle_array.h" -static size_t handle_arr_calc_size (size_t capacity) +static size_t handle_arr_calc_size (u32 capacity) { -return sizeof (struct vmci_handle_arr ) + +return VMCI_HANDLE_ARRAY_HEADER_SIZE + capacity *sizeof (struct vmci_handle ); } -struct vmci_handle_arr *vmci_handle_arr_create (size_t capacity) +struct vmci_handle_arr *vmci_handle_arr_create (u32 capacity,u32 max_capacity) {struct vmci_handle_arr *array; +if (max_capacity ==0 || capacity > max_capacity) +return NULL ; +if (capacity ==0 ) - capacity =VMCI_HANDLE_ARRAY_DEFAULT_SIZE ; + capacity =min ((u32 )VMCI_HANDLE_ARRAY_DEFAULT_CAPACITY , + max_capacity); array =kmalloc (handle_arr_calc_size (capacity),GFP_ATOMIC );if (!array)return NULL ; array->capacity = capacity; + array->max_capacity = max_capacity; array->size =0 ;return array;
@@ -44,27 +49,34 @@ void vmci_handle_arr_destroy(struct vmci_handle_arr *array)kfree (array); } -void vmci_handle_arr_append_entry (struct vmci_handle_arr **array_ptr, -struct vmci_handle handle) +int vmci_handle_arr_append_entry (struct vmci_handle_arr **array_ptr, +struct vmci_handle handle) {struct vmci_handle_arr *array = *array_ptr;if (unlikely (array->size >= array->capacity)) {/* reallocate. */ struct vmci_handle_arr *new_array; -size_t new_capacity = array->capacity *VMCI_ARR_CAP_MULT ; -size_t new_size =handle_arr_calc_size (new_capacity); +u32 capacity_bump =min (array->max_capacity - array->capacity, + array->capacity); +size_t new_size =handle_arr_calc_size (array->capacity + + capacity_bump); + +if (array->size >= array->max_capacity) +return VMCI_ERROR_NO_MEM ; new_array =krealloc (array, new_size,GFP_ATOMIC );if (!new_array) -return ; +return VMCI_ERROR_NO_MEM ; - new_array->capacity = new_capacity; + new_array->capacity += capacity_bump; *array_ptr = array = new_array; } array->entries[array->size] = handle; array->size++; + +return VMCI_SUCCESS ; }/*
@@ -74,7 +86,7 @@ struct vmci_handle vmci_handle_arr_remove_entry(struct vmci_handle_arr *array, struct vmci_handle entry_handle) {struct vmci_handle handle =VMCI_INVALID_HANDLE ; -size_t i; +u32 i;for (i =0 ; i < array->size; i++) {if (vmci_handle_is_equal (array->entries[i], entry_handle)) {
@@ -109,7 +121,7 @@ struct vmci_handle vmci_handle_arr_remove_tail(struct vmci_handle_arr *array)* Handle at given index, VMCI_INVALID_HANDLE if invalid index. */ struct vmci_handle -vmci_handle_arr_get_entry (const struct vmci_handle_arr *array,size_t index) +vmci_handle_arr_get_entry (const struct vmci_handle_arr *array,u32 index) {if (unlikely (index >= array->size))return VMCI_INVALID_HANDLE ;
@@ -120,7 +132,7 @@ vmci_handle_arr_get_entry(const struct vmci_handle_arr *array, size_t index)bool vmci_handle_arr_has_entry (const struct vmci_handle_arr *array,struct vmci_handle entry_handle) { -size_t i; +u32 i;for (i =0 ; i < array->size; i++)if (vmci_handle_is_equal (array->entries[i], entry_handle))
drivers/misc/vmw_vmci/vmci_handle_array.h +19 -10
@@ -17,32 +17,41 @@#define _VMCI_HANDLE_ARRAY_H_#include <linux/vmw_vmci_defs.h> +#include <linux/limits.h> #include <linux/types.h> -#define VMCI_HANDLE_ARRAY_DEFAULT_SIZE 4 -#define VMCI_ARR_CAP_MULT 2/* Array capacity multiplier */ -struct vmci_handle_arr { -size_t capacity; -size_t size; +u32 capacity; +u32 max_capacity; +u32 size; +u32 pad;struct vmci_handle entries[]; }; -struct vmci_handle_arr *vmci_handle_arr_create (size_t capacity); +#define VMCI_HANDLE_ARRAY_HEADER_SIZE \ + offsetof(struct vmci_handle_arr, entries) +/* Select a default capacity that results in a 64 byte sized array */ +#define VMCI_HANDLE_ARRAY_DEFAULT_CAPACITY 6 +/* Make sure that the max array size can be expressed by a u32 */ +#define VMCI_HANDLE_ARRAY_MAX_CAPACITY \ + ((U32_MAX - VMCI_HANDLE_ARRAY_HEADER_SIZE - 1) / \ + sizeof(struct vmci_handle)) + +struct vmci_handle_arr *vmci_handle_arr_create (u32 capacity,u32 max_capacity);void vmci_handle_arr_destroy (struct vmci_handle_arr *array); -void vmci_handle_arr_append_entry (struct vmci_handle_arr **array_ptr, -struct vmci_handle handle); +int vmci_handle_arr_append_entry (struct vmci_handle_arr **array_ptr, +struct vmci_handle handle);struct vmci_handle vmci_handle_arr_remove_entry (struct vmci_handle_arr *array,struct vmci_handle entry_handle);struct vmci_handle vmci_handle_arr_remove_tail (struct vmci_handle_arr *array);struct vmci_handle -vmci_handle_arr_get_entry (const struct vmci_handle_arr *array,size_t index); +vmci_handle_arr_get_entry (const struct vmci_handle_arr *array,u32 index);bool vmci_handle_arr_has_entry (const struct vmci_handle_arr *array,struct vmci_handle entry_handle);struct vmci_handle *vmci_handle_arr_get_handles (struct vmci_handle_arr *array); -static inline size_t vmci_handle_arr_get_size ( +static inline u32 vmci_handle_arr_get_size (const struct vmci_handle_arr *array) {return array->size;
drivers/net/can/m_can/m_can.c +21 -0
@@ -818,6 +818,27 @@ static int m_can_poll(struct napi_struct *napi, int quota)if (!irqstatus) goto end; +/* Errata workaround for issue "Needless activation of MRAF irq" +* During frame reception while the MCAN is in Error Passive state +* and the Receive Error Counter has the value MCAN_ECR.REC = 127, +* it may happen that MCAN_IR.MRAF is set although there was no +* Message RAM access failure. +* If MCAN_IR.MRAF is enabled, an interrupt to the Host CPU is generated +* The Message RAM Access Failure interrupt routine needs to check +* whether MCAN_ECR.RP = ’1’ and MCAN_ECR.REC = 127. +* In this case, reset MCAN_IR.MRAF. No further action is required. +*/ +if ((priv->version <=31 ) && (irqstatus &IR_MRAF ) && + (m_can_read (priv,M_CAN_ECR ) &ECR_RP )) { +struct can_berr_counter bec; + +__m_can_get_berr_counter (dev, &bec); +if (bec.rxerr ==127 ) { +m_can_write (priv,M_CAN_IR ,IR_MRAF ); + irqstatus &= ~IR_MRAF ; + } + } + psr =m_can_read (priv,M_CAN_PSR );if (irqstatus &IR_ERR_STATE ) work_done +=m_can_handle_state_errors (dev, psr);
drivers/net/can/spi/Kconfig +3 -2
@@ -8,9 +8,10 @@ config CAN_HI311X Driver for the Holt HI311x SPI CAN controllers. config CAN_MCP251X - tristate "Microchip MCP251x SPI CAN controllers" + tristate "Microchip MCP251x and MCP25625 SPI CAN controllers" depends on HAS_DMA ---help--- - Driver for the Microchip MCP251x SPI CAN controllers. + Driver for the Microchip MCP251x and MCP25625 SPI CAN + controllers. endmenu
drivers/net/can/spi/mcp251x.c +16 -9
@@ -1,5 +1,5 @@/* -* CAN bus driver for Microchip 251x CAN Controller with SPI Interface +* CAN bus driver for Microchip 251x/25625 CAN Controller with SPI Interface * * MCP2510 support and bug fixes by Christian Pellegrin * <[email protected]>
@@ -41,7 +41,7 @@* static struct spi_board_info spi_board_info[] = { * { * .modalias = "mcp2510", -* // or "mcp2515" depending on your controller +* // "mcp2515" or "mcp25625" depending on your controller * .platform_data = &mcp251x_info, * .irq = IRQ_EINT13, * .max_speed_hz = 2*1000*1000,
@@ -238,6 +238,7 @@ static const struct can_bittiming_const mcp251x_bittiming_const = {enum mcp251x_model {CAN_MCP251X_MCP2510 =0x2510 ,CAN_MCP251X_MCP2515 =0x2515 , +CAN_MCP251X_MCP25625 =0x25625 , };struct mcp251x_priv {
@@ -280,7 +281,6 @@ static inline int mcp251x_is_##_model(struct spi_device *spi) \ }MCP251X_IS (2510 ); -MCP251X_IS (2515 );static void mcp251x_clean (struct net_device *net) {
@@ -640,7 +640,7 @@ static int mcp251x_hw_reset(struct spi_device *spi)/* Wait for oscillator startup timer after reset */ mdelay (MCP251X_OST_DELAY_MS ); - + reg =mcp251x_read_reg (spi,CANSTAT );if ((reg &CANCTRL_REQOP_MASK ) !=CANCTRL_REQOP_CONF )return -ENODEV ;
@@ -821,9 +821,8 @@ static irqreturn_t mcp251x_can_ist(int irq, void *dev_id)/* receive buffer 0 */ if (intf &CANINTF_RX0IF ) {mcp251x_hw_rx (spi,0 ); -/* -* Free one buffer ASAP -* (The MCP2515 does this automatically.) +/* Free one buffer ASAP +* (The MCP2515/25625 does this automatically.) */ if (mcp251x_is_2510 (spi))mcp251x_write_bits (spi,CANINTF ,CANINTF_RX0IF ,0x00 );
@@ -832,7 +831,7 @@ static irqreturn_t mcp251x_can_ist(int irq, void *dev_id)/* receive buffer 1 */ if (intf &CANINTF_RX1IF ) {mcp251x_hw_rx (spi,1 ); -/* the MCP2515 does this automatically */ +/* The MCP2515/25625 does this automatically. */ if (mcp251x_is_2510 (spi)) clear_intf |=CANINTF_RX1IF ; }
@@ -1007,6 +1006,10 @@ static const struct of_device_id mcp251x_of_match[] = { .compatible = "microchip,mcp2515", .data = (void *)CAN_MCP251X_MCP2515, }, + { + .compatible = "microchip,mcp25625", + .data = (void *)CAN_MCP251X_MCP25625, + }, { } };MODULE_DEVICE_TABLE (of, mcp251x_of_match);
@@ -1020,6 +1023,10 @@ static const struct spi_device_id mcp251x_id_table[] = { .name = "mcp2515", .driver_data = (kernel_ulong_t)CAN_MCP251X_MCP2515, }, + { + .name = "mcp25625", + .driver_data = (kernel_ulong_t)CAN_MCP251X_MCP25625, + }, { } };MODULE_DEVICE_TABLE (spi, mcp251x_id_table);
@@ -1260,5 +1267,5 @@ module_spi_driver(mcp251x_can_driver);MODULE_AUTHOR ("Chris Elston <[email protected]>, " "Christian Pellegrin <[email protected]>" ); -MODULE_DESCRIPTION ("Microchip 251x CAN driver" ); +MODULE_DESCRIPTION ("Microchip 251x/25625 CAN driver" );MODULE_LICENSE ("GPL v2" );
drivers/net/dsa/mv88e6xxx/global1_vtu.c +1 -1
@@ -416,7 +416,7 @@ int mv88e6185_g1_vtu_loadpurge(struct mv88e6xxx_chip *chip,* VTU DBNum[7:4] are located in VTU Operation 11:8 */ op |= entry->fid &0x000f ; - op |= (entry->fid &0x00f0 ) <<8 ; + op |= (entry->fid &0x00f0 ) <<4 ; }return mv88e6xxx_g1_vtu_op (chip, op);
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c +2 -1
@@ -1581,7 +1581,8 @@ static int bnx2x_get_module_info(struct net_device *dev, }if (!sff8472_comp || - (diag_type &SFP_EEPROM_DIAG_ADDR_CHANGE_REQ )) { + (diag_type &SFP_EEPROM_DIAG_ADDR_CHANGE_REQ ) || + !(diag_type &SFP_EEPROM_DDM_IMPLEMENTED )) { modinfo->type =ETH_MODULE_SFF_8079 ; modinfo->eeprom_len =ETH_MODULE_SFF_8079_LEN ; }else {
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h +1 -0
@@ -62,6 +62,7 @@#define SFP_EEPROM_DIAG_TYPE_ADDR 0x5c#define SFP_EEPROM_DIAG_TYPE_SIZE 1#define SFP_EEPROM_DIAG_ADDR_CHANGE_REQ (1<<2) +#define SFP_EEPROM_DDM_IMPLEMENTED (1<<6)#define SFP_EEPROM_SFF_8472_COMP_ADDR 0x5e#define SFP_EEPROM_SFF_8472_COMP_SIZE 1
drivers/net/ethernet/cavium/liquidio/lio_core.c +1 -1
@@ -854,7 +854,7 @@ static void liquidio_schedule_droq_pkt_handlers(struct octeon_device *oct)if (droq->ops.poll_mode) { droq->ops.napi_fn (droq); - oct_priv->napi_mask |= (1 << oq_no); + oct_priv->napi_mask |=BIT_ULL (oq_no); }else {tasklet_schedule (&oct_priv->droq_tasklet); }
drivers/net/ethernet/emulex/benet/be_ethtool.c +22 -6
@@ -893,7 +893,7 @@ static void be_self_test(struct net_device *netdev, struct ethtool_test *test, u64 *data) {struct be_adapter *adapter =netdev_priv (netdev); -int status; +int status, cnt;u8 link_status =0 ;if (adapter->function_caps &BE_FUNCTION_CAPS_SUPER_NIC ) {
@@ -904,6 +904,9 @@ static void be_self_test(struct net_device *netdev, struct ethtool_test *test,memset (data,0 ,sizeof (u64) *ETHTOOL_TESTS_NUM ); +/* check link status before offline tests */ + link_status =netif_carrier_ok (netdev); +if (test->flags Ð_TEST_FL_OFFLINE ) {if (be_loopback_test (adapter,BE_MAC_LOOPBACK , &data[0 ]) !=0 ) test->flags |=ETH_TEST_FL_FAILED ;
@@ -924,13 +927,26 @@ static void be_self_test(struct net_device *netdev, struct ethtool_test *test, test->flags |=ETH_TEST_FL_FAILED ; } - status =be_cmd_link_status_query (adapter,NULL , &link_status,0 ); -if (status) { - test->flags |=ETH_TEST_FL_FAILED ; - data[4 ] =-1 ; - }else if (!link_status) { +/* link status was down prior to test */ +if (!link_status) { test->flags |=ETH_TEST_FL_FAILED ; data[4 ] =1 ; +return ; + } + +for (cnt =10 ; cnt; cnt--) { + status =be_cmd_link_status_query (adapter,NULL , &link_status, +0 ); +if (status) { + test->flags |=ETH_TEST_FL_FAILED ; + data[4 ] =-1 ; +break ; + } + +if (link_status) +break ; + +msleep_interruptible (500 ); } }
drivers/net/ethernet/ibm/ibmvnic.c +3 -0
@@ -1489,6 +1489,9 @@ static int do_reset(struct ibmvnic_adapter *adapter,return 0 ; } +/* refresh device's multicast list */ +ibmvnic_set_multi (netdev); +/* kick napi */ for (i =0 ; i < adapter->req_rx_queues; i++)napi_schedule (&adapter->napi[i]);
drivers/net/ethernet/intel/e1000e/netdev.c +13 -8
@@ -4228,7 +4228,7 @@ void e1000e_up(struct e1000_adapter *adapter)e1000_configure_msix (adapter);e1000_irq_enable (adapter); -netif_start_queue (adapter->netdev); +/* Tx queue started by watchdog timer when link is up */ e1000e_trigger_lsc (adapter); }
@@ -4604,6 +4604,7 @@ int e1000e_open(struct net_device *netdev)pm_runtime_get_sync (&pdev->dev);netif_carrier_off (netdev); +netif_stop_queue (netdev);/* allocate transmit descriptors */ err =e1000e_setup_tx_resources (adapter->tx_ring);
@@ -4664,7 +4665,6 @@ int e1000e_open(struct net_device *netdev)e1000_irq_enable (adapter); adapter->tx_hang_recheck = false; -netif_start_queue (netdev); hw->mac.get_link_status = true;pm_runtime_put (&pdev->dev);
@@ -5286,6 +5286,7 @@ static void e1000_watchdog_task(struct work_struct *work)if (phy->ops.cfg_on_link_up) phy->ops.cfg_on_link_up (hw); +netif_wake_queue (netdev);netif_carrier_on (netdev);if (!test_bit (__E1000_DOWN, &adapter->state))
@@ -5299,6 +5300,7 @@ static void e1000_watchdog_task(struct work_struct *work)/* Link status message must follow this format */ pr_info ("%s NIC Link is Down\n" , adapter->netdev->name);netif_carrier_off (netdev); +netif_stop_queue (netdev);if (!test_bit (__E1000_DOWN, &adapter->state))mod_timer (&adapter->phy_info_timer,round_jiffies (jiffies +2 *HZ ));
@@ -5306,13 +5308,8 @@ static void e1000_watchdog_task(struct work_struct *work)/* 8000ES2LAN requires a Rx packet buffer work-around * on link down event; reset the controller to flush * the Rx packet buffer. -* -* If the link is lost the controller stops DMA, but -* if there is queued Tx work it cannot be done. So -* reset the controller to flush the Tx packet buffers. */ -if ((adapter->flags &FLAG_RX_NEEDS_RESTART ) || -e1000_desc_unused (tx_ring) +1 < tx_ring->count) +if (adapter->flags &FLAG_RX_NEEDS_RESTART ) adapter->flags |=FLAG_RESTART_NOW ;else pm_schedule_suspend(netdev->dev.parent,
@@ -5335,6 +5332,14 @@ static void e1000_watchdog_task(struct work_struct *work) adapter->gotc_old = adapter->stats.gotc;spin_unlock (&adapter->stats64_lock); +/* If the link is lost the controller stops DMA, but +* if there is queued Tx work it cannot be done. So +* reset the controller to flush the Tx packet buffers. +*/ +if (!netif_carrier_ok (netdev) && + (e1000_desc_unused (tx_ring) +1 < tx_ring->count)) + adapter->flags |=FLAG_RESTART_NOW ; +/* If reset is necessary, do it outside of interrupt context. */ if (adapter->flags &FLAG_RESTART_NOW ) {schedule_work (&adapter->reset_task);
drivers/net/ethernet/mellanox/mlxsw/reg.h +1 -1
@@ -911,7 +911,7 @@ static inline void mlxsw_reg_spaft_pack(char *payload, u8 local_port,MLXSW_REG_ZERO (spaft, payload);mlxsw_reg_spaft_local_port_set (payload, local_port);mlxsw_reg_spaft_allow_untagged_set (payload, allow_untagged); -mlxsw_reg_spaft_allow_prio_tagged_set (payload, true); +mlxsw_reg_spaft_allow_prio_tagged_set (payload, allow_untagged);mlxsw_reg_spaft_allow_tagged_set (payload, true); }
drivers/net/ethernet/sis/sis900.c +8 -8
@@ -1057,7 +1057,7 @@ sis900_open(struct net_device *net_dev)sis900_set_mode (sis_priv,HW_SPEED_10_MBPS ,FDX_CAPABLE_HALF_SELECTED );/* Enable all known interrupts by setting the interrupt mask. */ -sw32 (imr, RxSOVR | RxORN | RxERR | RxOK | TxURN | TxERR | TxIDLE); +sw32 (imr, RxSOVR | RxORN | RxERR | RxOK | TxURN | TxERR | TxIDLE | TxDESC);sw32 (cr, RxENA |sr32 (cr));sw32 (ier,IE );
@@ -1580,7 +1580,7 @@ static void sis900_tx_timeout(struct net_device *net_dev)sw32 (txdp, sis_priv->tx_ring_dma);/* Enable all known interrupts by setting the interrupt mask. */ -sw32 (imr, RxSOVR | RxORN | RxERR | RxOK | TxURN | TxERR | TxIDLE); +sw32 (imr, RxSOVR | RxORN | RxERR | RxOK | TxURN | TxERR | TxIDLE | TxDESC); }/**
@@ -1620,7 +1620,7 @@ sis900_start_xmit(struct sk_buff *skb, struct net_device *net_dev)spin_unlock_irqrestore (&sis_priv->lock, flags);return NETDEV_TX_OK ; } - sis_priv->tx_ring[entry].cmdsts = (OWN | skb->len); + sis_priv->tx_ring[entry].cmdsts = (OWN |INTR | skb->len);sw32 (cr, TxENA |sr32 (cr)); sis_priv->cur_tx ++;
@@ -1676,7 +1676,7 @@ static irqreturn_t sis900_interrupt(int irq, void *dev_instance) do { status = sr32(isr); - if ((status & (HIBERR|TxURN|TxERR|TxIDLE|RxORN|RxERR|RxOK)) == 0) + if ((status & (HIBERR|TxURN|TxERR|TxIDLE|TxDESC|RxORN|RxERR|RxOK)) == 0) /* nothing intresting happened */ break; handled = 1;
@@ -1686,7 +1686,7 @@ static irqreturn_t sis900_interrupt(int irq, void *dev_instance)/* Rx interrupt */ sis900_rx (net_dev); -if (status & (TxURN | TxERR | TxIDLE)) +if (status & (TxURN | TxERR | TxIDLE | TxDESC))/* Tx interrupt */ sis900_finish_xmit (net_dev);
@@ -1898,8 +1898,8 @@ static void sis900_finish_xmit (struct net_device *net_dev)if (tx_status &OWN ) {/* The packet is not transmitted yet (owned by hardware) ! -* Note: the interrupt is generated only when Tx Machine -* is idle, so this is an almost impossible case */ +* Note: this is an almost impossible condition +* in case of TxDESC ('descriptor interrupt') */ break ; }
@@ -2475,7 +2475,7 @@ static int sis900_resume(struct pci_dev *pci_dev)sis900_set_mode (sis_priv,HW_SPEED_10_MBPS ,FDX_CAPABLE_HALF_SELECTED );/* Enable all known interrupts by setting the interrupt mask. */ -sw32 (imr, RxSOVR | RxORN | RxERR | RxOK | TxURN | TxERR | TxIDLE); +sw32 (imr, RxSOVR | RxORN | RxERR | RxOK | TxURN | TxERR | TxIDLE | TxDESC);sw32 (cr, RxENA |sr32 (cr));sw32 (ier,IE );
drivers/net/ppp/ppp_mppe.c +1 -0
@@ -63,6 +63,7 @@ MODULE_AUTHOR("Frank Cusack <[email protected]>");MODULE_DESCRIPTION ("Point-to-Point Protocol Microsoft Point-to-Point Encryption support" );MODULE_LICENSE ("Dual BSD/GPL" );MODULE_ALIAS ("ppp-compress-" __stringify(CI_MPPE )); +MODULE_SOFTDEP ("pre: arc4" );MODULE_VERSION ("1.0.2" ); static unsigned int
drivers/net/usb/qmi_wwan.c +18 -9
@@ -153,7 +153,7 @@ static bool qmimux_has_slaves(struct usbnet *dev)static int qmimux_rx_fixup (struct usbnet *dev,struct sk_buff *skb) { -unsigned int len, offset =0 ; +unsigned int len, offset =0 , pad_len, pkt_len;struct qmimux_hdr *hdr;struct net_device *net;struct sk_buff *skbn;
@@ -171,10 +171,16 @@ static int qmimux_rx_fixup(struct usbnet *dev, struct sk_buff *skb)if (hdr->pad &0x80 ) goto skip; +/* extract padding length and check for valid length info */ + pad_len = hdr->pad &0x3f ; +if (len ==0 || pad_len >= len) + goto skip; + pkt_len = len - pad_len; + net =qmimux_find_dev (dev, hdr->mux_id);if (!net) goto skip; - skbn =netdev_alloc_skb (net, len); + skbn =netdev_alloc_skb (net, pkt_len);if (!skbn)return 0 ; skbn->dev = net;
@@ -191,7 +197,7 @@ static int qmimux_rx_fixup(struct usbnet *dev, struct sk_buff *skb) goto skip; } -skb_put_data (skbn, skb->data + offset + qmimux_hdr_sz, len); +skb_put_data (skbn, skb->data + offset + qmimux_hdr_sz, pkt_len);if (netif_rx (skbn) !=NET_RX_SUCCESS )return 0 ;
@@ -241,13 +247,14 @@ static int qmimux_register_device(struct net_device *real_dev, u8 mux_id)return err; } -static void qmimux_unregister_device (struct net_device *dev) +static void qmimux_unregister_device (struct net_device *dev, +struct list_head *head) {struct qmimux_priv *priv =netdev_priv (dev);struct net_device *real_dev = priv->real_dev;netdev_upper_dev_unlink (real_dev, dev); -unregister_netdevice (dev); +unregister_netdevice_queue (dev, head);/* Get rid of the reference to real_dev */ dev_put (real_dev);
@@ -356,8 +363,8 @@ static ssize_t add_mux_store(struct device *d, struct device_attribute *attr, cif (kstrtou8 (buf,0 , &mux_id))return -EINVAL ; -/* mux_id [1 - 0x7f] range empirically found */ -if (mux_id <1 || mux_id >0x7f ) +/* mux_id [1 - 254] for compatibility with ip(8) and the rmnet driver */ +if (mux_id <1 || mux_id >254 )return -EINVAL ;if (!rtnl_trylock ())
@@ -418,7 +425,7 @@ static ssize_t del_mux_store(struct device *d, struct device_attribute *attr, c ret = -EINVAL ; goto err; } -qmimux_unregister_device (del_dev); +qmimux_unregister_device (del_dev,NULL );if (!qmimux_has_slaves (dev)) info->flags &= ~QMI_WWAN_FLAG_MUX ;
@@ -1417,6 +1424,7 @@ static void qmi_wwan_disconnect(struct usb_interface *intf)struct qmi_wwan_state *info;struct list_head *iter;struct net_device *ldev; +LIST_HEAD (list);/* called twice if separate control and data intf */ if (!dev)
@@ -1429,8 +1437,9 @@ static void qmi_wwan_disconnect(struct usb_interface *intf) }rcu_read_lock ();netdev_for_each_upper_dev_rcu (dev->net, ldev, iter) -qmimux_unregister_device (ldev); +qmimux_unregister_device (ldev, &list);rcu_read_unlock (); +unregister_netdevice_many (&list);rtnl_unlock (); info->flags &= ~QMI_WWAN_FLAG_MUX ; }
drivers/net/wireless/ath/carl9170/usb.c +17 -22
@@ -128,6 +128,8 @@ static const struct usb_device_id carl9170_usb_ids[] = { };MODULE_DEVICE_TABLE (usb, carl9170_usb_ids); +static struct usb_driver carl9170_driver; +static void carl9170_usb_submit_data_urb (struct ar9170 *ar) {struct urb *urb;
@@ -966,32 +968,28 @@ static int carl9170_usb_init_device(struct ar9170 *ar)static void carl9170_usb_firmware_failed (struct ar9170 *ar) { -struct device *parent = ar->udev->dev.parent; -struct usb_device *udev; - -/* -* Store a copy of the usb_device pointer locally. -* This is because device_release_driver initiates -* carl9170_usb_disconnect, which in turn frees our -* driver context (ar). +/* Store a copies of the usb_interface and usb_device pointer locally. +* This is because release_driver initiates carl9170_usb_disconnect, +* which in turn frees our driver context (ar). */ - udev = ar->udev; +struct usb_interface *intf = ar->intf; +struct usb_device *udev = ar->udev;complete (&ar->fw_load_wait); +/* at this point 'ar' could be already freed. Don't use it anymore */ + ar =NULL ;/* unbind anything failed */ -if (parent) -device_lock (parent); - -device_release_driver (&udev->dev); -if (parent) -device_unlock (parent); +usb_lock_device (udev); +usb_driver_release_interface (&carl9170_driver, intf); +usb_unlock_device (udev); -usb_put_dev (udev); +usb_put_intf (intf); }static void carl9170_usb_firmware_finish (struct ar9170 *ar) { +struct usb_interface *intf = ar->intf;int err; err =carl9170_parse_firmware (ar);
@@ -1009,7 +1007,7 @@ static void carl9170_usb_firmware_finish(struct ar9170 *ar) goto err_unrx;complete (&ar->fw_load_wait); -usb_put_dev (ar->udev); +usb_put_intf (intf);return ; err_unrx:
@@ -1052,7 +1050,6 @@ static int carl9170_usb_probe(struct usb_interface *intf,return PTR_ERR (ar); udev =interface_to_usbdev (intf); -usb_get_dev (udev); ar->udev = udev; ar->intf = intf; ar->features = id->driver_info;
@@ -1094,15 +1091,14 @@ static int carl9170_usb_probe(struct usb_interface *intf,atomic_set (&ar->rx_anch_urbs,0 );atomic_set (&ar->rx_pool_urbs,0 ); -usb_get_dev (ar->udev); +usb_get_intf (intf);carl9170_set_state (ar,CARL9170_STOPPED ); err =request_firmware_nowait (THIS_MODULE ,1 ,CARL9170FW_NAME , &ar->udev->dev,GFP_KERNEL , ar, carl9170_usb_firmware_step2);if (err) { -usb_put_dev (udev); -usb_put_dev (udev); +usb_put_intf (intf);carl9170_free (ar); }return err;
@@ -1131,7 +1127,6 @@ static void carl9170_usb_disconnect(struct usb_interface *intf)carl9170_release_firmware (ar);carl9170_free (ar); -usb_put_dev (udev); }#ifdef CONFIG_PM
drivers/net/wireless/intel/iwlwifi/iwl-drv.c +0 -1
@@ -1509,7 +1509,6 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) goto free; out_free_fw: -iwl_dealloc_ucode (drv);release_firmware (ucode_raw); out_unbind:complete (&drv->request_firmware_complete);
drivers/net/wireless/intersil/p54/p54usb.c +18 -25
98 lines not on this page · raw message
drivers/net/wireless/marvell/mwifiex/fw.h +9 -3
@@ -1744,9 +1744,10 @@ struct mwifiex_ie_types_wmm_queue_status {struct ieee_types_vendor_header {u8 element_id;u8 len; -u8 oui[4 ];/* 0~2: oui, 3: oui_type */ -u8 oui_subtype; -u8 version; +struct { +u8 oui[3 ]; +u8 oui_type; + } __packed oui; } __packed;struct ieee_types_wmm_parameter {
@@ -1760,6 +1761,9 @@ struct ieee_types_wmm_parameter {* Version [1] */ struct ieee_types_vendor_header vend_hdr; +u8 oui_subtype; +u8 version; +u8 qos_info_bitmap;u8 reserved;struct ieee_types_wmm_ac_parameters ac_params[IEEE80211_NUM_ACS ];
@@ -1777,6 +1781,8 @@ struct ieee_types_wmm_info {* Version [1] */ struct ieee_types_vendor_header vend_hdr; +u8 oui_subtype; +u8 version;u8 qos_info_bitmap; } __packed;
drivers/net/wireless/marvell/mwifiex/ie.c +30 -15
83 lines not on this page · raw message
drivers/net/wireless/marvell/mwifiex/scan.c +27 -4
@@ -1244,6 +1244,8 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter, }switch (element_id) {case WLAN_EID_SSID : +if (element_len >IEEE80211_MAX_SSID_LEN ) +return -EINVAL ; bss_entry->ssid.ssid_len = element_len;memcpy (bss_entry->ssid.ssid, (current_ptr +2 ), element_len);
@@ -1253,6 +1255,8 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,break ;case WLAN_EID_SUPP_RATES : +if (element_len >MWIFIEX_SUPPORTED_RATES ) +return -EINVAL ;memcpy (bss_entry->data_rates, current_ptr +2 , element_len); memcpy(bss_entry->supported_rates, current_ptr + 2,
@@ -1262,6 +1266,8 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,break ;case WLAN_EID_FH_PARAMS : +if (element_len +2 <sizeof (*fh_param_set)) +return -EINVAL ; fh_param_set = (struct ieee_types_fh_param_set *) current_ptr; memcpy(&bss_entry->phy_param_set.fh_param_set,
@@ -1270,6 +1276,8 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,break ;case WLAN_EID_DS_PARAMS : +if (element_len +2 <sizeof (*ds_param_set)) +return -EINVAL ; ds_param_set = (struct ieee_types_ds_param_set *) current_ptr;
@@ -1281,6 +1289,8 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,break ;case WLAN_EID_CF_PARAMS : +if (element_len +2 <sizeof (*cf_param_set)) +return -EINVAL ; cf_param_set = (struct ieee_types_cf_param_set *) current_ptr; memcpy(&bss_entry->ss_param_set.cf_param_set,
@@ -1289,6 +1299,8 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,break ;case WLAN_EID_IBSS_PARAMS : +if (element_len +2 <sizeof (*ibss_param_set)) +return -EINVAL ; ibss_param_set = (struct ieee_types_ibss_param_set *) current_ptr;
@@ -1298,10 +1310,14 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,break ;case WLAN_EID_ERP_INFO : +if (!element_len) +return -EINVAL ; bss_entry->erp_flags = *(current_ptr +2 );break ;case WLAN_EID_PWR_CONSTRAINT : +if (!element_len) +return -EINVAL ; bss_entry->local_constraint = *(current_ptr +2 ); bss_entry->sensed_11h = true;break ;
@@ -1344,15 +1360,22 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter, vendor_ie = (struct ieee_types_vendor_specific *) current_ptr; -if (!memcmp - (vendor_ie->vend_hdr.oui, wpa_oui, -sizeof (wpa_oui))) { +/* 802.11 requires at least 3-byte OUI. */ +if (element_len <sizeof (vendor_ie->vend_hdr.oui.oui)) +return -EINVAL ; + +/* Not long enough for a match? Skip it. */ +if (element_len <sizeof (wpa_oui)) +break ; + +if (!memcmp (&vendor_ie->vend_hdr.oui, wpa_oui, +sizeof (wpa_oui))) { bss_entry->bcn_wpa_ie = (struct ieee_types_vendor_specific *) current_ptr; bss_entry->wpa_offset = (u16) (current_ptr - bss_entry->beacon_buf); - }else if (!memcmp (vendor_ie->vend_hdr.oui, wmm_oui, + }else if (!memcmp (&vendor_ie->vend_hdr.oui, wmm_oui,sizeof (wmm_oui))) { if (total_ie_len == sizeof(struct ieee_types_wmm_parameter) ||
drivers/net/wireless/marvell/mwifiex/sta_ioctl.c +2 -2
@@ -1388,7 +1388,7 @@ mwifiex_set_gen_ie_helper(struct mwifiex_private *priv, u8 *ie_data_ptr,/* Test to see if it is a WPA IE, if not, then * it is a gen IE */ -if (!memcmp (pvendor_ie->oui, wpa_oui, +if (!memcmp (&pvendor_ie->oui, wpa_oui,sizeof (wpa_oui))) {/* IE is a WPA/WPA2 IE so call set_wpa function */
@@ -1398,7 +1398,7 @@ mwifiex_set_gen_ie_helper(struct mwifiex_private *priv, u8 *ie_data_ptr, goto next_ie; } -if (!memcmp (pvendor_ie->oui, wps_oui, +if (!memcmp (&pvendor_ie->oui, wps_oui,sizeof (wps_oui))) {/* Test to see if it is a WPS IE, * if so, enable wps session flag
drivers/net/wireless/marvell/mwifiex/wmm.c +1 -1
@@ -240,7 +240,7 @@ mwifiex_wmm_setup_queue_priorities(struct mwifiex_private *priv,mwifiex_dbg (priv->adapter,INFO ,"info: WMM Parameter IE: version=%d,\t" "qos_info Parameter Set Count=%d, Reserved=%#x\n" , - wmm_ie->vend_hdr.version, wmm_ie->qos_info_bitmap & + wmm_ie->version, wmm_ie->qos_info_bitmap &IEEE80211_WMM_IE_AP_QOSINFO_PARAM_SET_CNT_MASK , wmm_ie->reserved);
drivers/s390/cio/qdio_setup.c +2 -0
@@ -150,6 +150,7 @@ static int __qdio_allocate_qs(struct qdio_q **irq_ptr_qs, int nr_queues)return -ENOMEM ; } irq_ptr_qs[i] = q; +INIT_LIST_HEAD (&q->entry); }return 0 ; }
@@ -178,6 +179,7 @@ static void setup_queues_misc(struct qdio_q *q, struct qdio_irq *irq_ptr, q->mask =1 << (31 - i); q->nr = i; q->handler = handler; +INIT_LIST_HEAD (&q->entry); } static void setup_storage_lists(struct qdio_q *q, struct qdio_irq *irq_ptr,
drivers/s390/cio/qdio_thinint.c +2 -3
@@ -83,7 +83,6 @@ void tiqdio_add_input_queues(struct qdio_irq *irq_ptr)mutex_lock (&tiq_list_lock);list_add_rcu (&irq_ptr->input_qs[0 ]->entry, &tiq_list);mutex_unlock (&tiq_list_lock); -xchg (irq_ptr->dsci,1 <<7 ); }void tiqdio_remove_input_queues (struct qdio_irq *irq_ptr)
@@ -91,14 +90,14 @@ void tiqdio_remove_input_queues(struct qdio_irq *irq_ptr)struct qdio_q *q; q = irq_ptr->input_qs[0 ]; -/* if establish triggered an error */ -if (!q || !q->entry.prev || !q->entry.next) +if (!q)return ;mutex_lock (&tiq_list_lock);list_del_rcu (&q->entry);mutex_unlock (&tiq_list_lock);synchronize_rcu (); +INIT_LIST_HEAD (&q->entry); }static inline int has_multiple_inq_on_dsci (struct qdio_irq *irq_ptr)
drivers/staging/comedi/drivers/amplc_pci230.c +2 -1
@@ -2339,7 +2339,8 @@ static irqreturn_t pci230_interrupt(int irq, void *d) devpriv->intr_running = false;spin_unlock_irqrestore (&devpriv->isr_spinlock, irqflags); -comedi_handle_events (dev, s_ao); +if (s_ao) +comedi_handle_events (dev, s_ao);comedi_handle_events (dev, s_ai);return IRQ_HANDLED ;
drivers/staging/comedi/drivers/dt282x.c +2 -1
@@ -566,7 +566,8 @@ static irqreturn_t dt282x_interrupt(int irq, void *d) }#endif comedi_handle_events (dev, s); -comedi_handle_events (dev, s_ao); +if (s_ao) +comedi_handle_events (dev, s_ao);return IRQ_RETVAL (handled); }
drivers/staging/iio/cdc/ad7150.c +11 -8
@@ -6,6 +6,7 @@* Licensed under the GPL-2 or later. */ +#include <linux/bitfield.h> #include <linux/interrupt.h> #include <linux/device.h> #include <linux/kernel.h>
@@ -129,7 +130,7 @@ static int ad7150_read_event_config(struct iio_dev *indio_dev, {int ret;u8 threshtype; -bool adaptive; +bool thrfixed;struct ad7150_chip_info *chip =iio_priv (indio_dev); ret =i2c_smbus_read_byte_data (chip->client,AD7150_CFG );
@@ -137,21 +138,23 @@ static int ad7150_read_event_config(struct iio_dev *indio_dev,return ret; threshtype = (ret >>5 ) &0x03 ; - adaptive = !!(ret &0x80 ); + +/*check if threshold mode is fixed or adaptive*/ + thrfixed =FIELD_GET (AD7150_CFG_FIX , ret);switch (type) {case IIO_EV_TYPE_MAG_ADAPTIVE :if (dir ==IIO_EV_DIR_RISING ) -return adaptive && (threshtype ==0x1 ); -return adaptive && (threshtype ==0x0 ); +return !thrfixed && (threshtype ==0x1 ); +return !thrfixed && (threshtype ==0x0 );case IIO_EV_TYPE_THRESH_ADAPTIVE :if (dir ==IIO_EV_DIR_RISING ) -return adaptive && (threshtype ==0x3 ); -return adaptive && (threshtype ==0x2 ); +return !thrfixed && (threshtype ==0x3 ); +return !thrfixed && (threshtype ==0x2 );case IIO_EV_TYPE_THRESH :if (dir ==IIO_EV_DIR_RISING ) -return !adaptive && (threshtype ==0x1 ); -return !adaptive && (threshtype ==0x0 ); +return thrfixed && (threshtype ==0x1 ); +return thrfixed && (threshtype ==0x0 );default :break ; }
drivers/tty/serial/8250/8250_port.c +1 -2
@@ -1873,8 +1873,7 @@ int serial8250_handle_irq(struct uart_port *port, unsigned int iir) status =serial_port_in (port,UART_LSR ); -if (status & (UART_LSR_DR |UART_LSR_BI ) && - iir &UART_IIR_RDI ) { +if (status & (UART_LSR_DR |UART_LSR_BI )) {if (!up->dma ||handle_rx_dma (up, iir)) status =serial8250_rx_chars (up, status); }
drivers/usb/gadget/function/u_ether.c +4 -2
@@ -190,11 +190,12 @@ rx_submit(struct eth_dev *dev, struct usb_request *req, gfp_t gfp_flags) out = dev->port_usb->out_ep; else out =NULL ; -spin_unlock_irqrestore (&dev->lock, flags);if (!out) + { +spin_unlock_irqrestore (&dev->lock, flags);return -ENOTCONN ; - + }/* Padding up to RX_EXTRA handles minor disagreements with host. * Normally we use the USB "terminate on short read" convention;
@@ -218,6 +219,7 @@ rx_submit(struct eth_dev *dev, struct usb_request *req, gfp_t gfp_flags)if (dev->port_usb->is_fixed) size =max_t (size_t, size, dev->port_usb->fixed_out_len); +spin_unlock_irqrestore (&dev->lock, flags); skb =__netdev_alloc_skb (dev->net, size +NET_IP_ALIGN , gfp_flags);if (skb ==NULL ) {
drivers/usb/renesas_usbhs/fifo.c +22 -12
@@ -818,9 +818,8 @@ static int __usbhsf_dma_map_ctrl(struct usbhs_pkt *pkt, int map) }static void usbhsf_dma_complete (void *arg); -static void xfer_work (struct work_struct *work) +static void usbhsf_dma_xfer_preparing (struct usbhs_pkt *pkt) { - struct usbhs_pkt *pkt = container_of(work, struct usbhs_pkt, work);struct usbhs_pipe *pipe = pkt->pipe;struct usbhs_fifo *fifo;struct usbhs_priv *priv =usbhs_pipe_to_priv (pipe);
@@ -828,12 +827,10 @@ static void xfer_work(struct work_struct *work)struct dma_chan *chan;struct device *dev =usbhs_priv_to_dev (priv);enum dma_transfer_direction dir; -unsigned long flags; -usbhs_lock (priv, flags); fifo =usbhs_pipe_to_fifo (pipe);if (!fifo) - goto xfer_work_end; +return ; chan =usbhsf_dma_chan_get (fifo, pkt); dir =usbhs_pipe_is_dir_in (pipe) ?DMA_DEV_TO_MEM :DMA_MEM_TO_DEV ;
@@ -842,7 +839,7 @@ static void xfer_work(struct work_struct *work) pkt->trans, dir, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);if (!desc) - goto xfer_work_end; +return ; desc->callback = usbhsf_dma_complete; desc->callback_param = pipe;
@@ -850,7 +847,7 @@ static void xfer_work(struct work_struct *work) pkt->cookie =dmaengine_submit (desc);if (pkt->cookie <0 ) {dev_err (dev,"Failed to submit dma descriptor\n" ); - goto xfer_work_end; +return ; } dev_dbg(dev, " %s %d (%d/ %d)\n",
@@ -861,8 +858,17 @@ static void xfer_work(struct work_struct *work)dma_async_issue_pending (chan);usbhsf_dma_start (pipe, fifo);usbhs_pipe_enable (pipe); +} + +static void xfer_work (struct work_struct *work) +{ + struct usbhs_pkt *pkt = container_of(work, struct usbhs_pkt, work); +struct usbhs_pipe *pipe = pkt->pipe; +struct usbhs_priv *priv =usbhs_pipe_to_priv (pipe); +unsigned long flags; -xfer_work_end: +usbhs_lock (priv, flags); +usbhsf_dma_xfer_preparing (pkt);usbhs_unlock (priv, flags); }
@@ -915,8 +921,13 @@ static int usbhsf_dma_prepare_push(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); +/* FIXME: Workaound for usb dmac that driver can be used in atomic */ +if (usbhs_get_dparam (priv, has_usb_dmac)) { +usbhsf_dma_xfer_preparing (pkt); + }else { +INIT_WORK (&pkt->work, xfer_work); +schedule_work (&pkt->work); + }return 0 ;
@@ -1022,8 +1033,7 @@ static int usbhsf_dma_prepare_pop_with_usb_dmac(struct usbhs_pkt *pkt, pkt->trans = pkt->length; -INIT_WORK (&pkt->work, xfer_work); -schedule_work (&pkt->work); +usbhsf_dma_xfer_preparing (pkt);return 0 ;
drivers/usb/serial/ftdi_sio.c +1 -0
@@ -1024,6 +1024,7 @@ static const struct usb_device_id id_table_combined[] = { { USB_DEVICE(AIRBUS_DS_VID, AIRBUS_DS_P8GR) },/* EZPrototypes devices */ { USB_DEVICE(EZPROTOTYPES_VID, HJELMSLUND_USB485_ISO_PID) }, + { USB_DEVICE_INTERFACE_NUMBER(UNJO_VID, UNJO_ISODEBUG_V1_PID, 1) }, { } /* Terminating entry */ };
drivers/usb/serial/ftdi_sio_ids.h +6 -0
@@ -1543,3 +1543,9 @@#define CHETCO_SEASMART_DISPLAY_PID 0xA5AD/* SeaSmart NMEA2000 Display */ #define CHETCO_SEASMART_LITE_PID 0xA5AE/* SeaSmart Lite USB Adapter */ #define CHETCO_SEASMART_ANALOG_PID 0xA5AF/* SeaSmart Analog Adapter */ + +/* +* Unjo AB +*/ +#define UNJO_VID 0x22B7 +#define UNJO_ISODEBUG_V1_PID 0x150D
drivers/usb/serial/option.c +1 -0
@@ -1346,6 +1346,7 @@ static const struct usb_device_id option_ids[] = { .driver_info = RSVD(4) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0414, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0417, 0xff, 0xff, 0xff) }, + { USB_DEVICE_INTERFACE_CLASS(ZTE_VENDOR_ID, 0x0601, 0xff) }, /* GosunCn ZTE WeLink ME3630 (RNDIS mode) */ { USB_DEVICE_INTERFACE_CLASS(ZTE_VENDOR_ID, 0x0602, 0xff) }, /* GosunCn ZTE WeLink ME3630 (MBIM mode) */ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1008, 0xff, 0xff, 0xff), .driver_info = RSVD(4) },
fs/crypto/policy.c +2 -0
@@ -81,6 +81,8 @@ int fscrypt_ioctl_set_policy(struct file *filp, const void __user *arg)if (ret == -ENODATA ) {if (!S_ISDIR (inode->i_mode)) ret = -ENOTDIR ; +else if (IS_DEADDIR (inode)) + ret = -ENOENT ;else if (!inode->i_sb->s_cop->empty_dir (inode)) ret = -ENOTEMPTY ;else
fs/quota/dquot.c +2 -2
@@ -1989,8 +1989,8 @@ int __dquot_transfer(struct inode *inode, struct dquot **transfer_to) &warn_to[cnt]);if (ret) goto over_quota; - ret =dquot_add_space (transfer_to[cnt], cur_space, rsv_space,0 , - &warn_to[cnt]); + ret =dquot_add_space (transfer_to[cnt], cur_space, rsv_space, +DQUOT_SPACE_WARN , &warn_to[cnt]);if (ret) {spin_lock (&transfer_to[cnt]->dq_dqb_lock);dquot_decr_inodes (transfer_to[cnt], inode_usage);
fs/udf/inode.c +60 -33
95 lines not on this page · raw message
net/ipv6/netfilter/nf_conntrack_reasm.c +12 -10
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.