Linux 4.14.105
Greg KH
maintainerI'm announcing the release of the 4.14.105 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:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arc/include/asm/bitops.h | 6 - arch/mips/kernel/cmpxchg.c | 3 arch/mips/net/ebpf_jit.c | 2 arch/powerpc/include/asm/epapr_hcalls.h | 12 +- arch/x86/include/asm/uaccess.h | 7 - arch/x86/kvm/svm.c | 27 ++---- drivers/block/loop.c | 47 +++++------ drivers/clk/clk-versaclock5.c | 4 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_processpptables.c | 22 ++++- drivers/gpu/drm/msm/msm_rd.c | 7 + drivers/mmc/host/mmc_spi.c | 1 drivers/mmc/host/renesas_sdhi_sys_dmac.c | 1 drivers/mmc/host/sdhci-esdhc-imx.c | 9 +- drivers/mmc/host/tmio_mmc.h | 5 + drivers/mmc/host/tmio_mmc_core.c | 17 ++- drivers/net/ethernet/altera/altera_tse_main.c | 4 drivers/net/ethernet/ibm/ibmveth.c | 2 drivers/net/ethernet/stmicro/stmmac/common.h | 2 drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 3 drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c | 12 ++ drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c | 15 +++ drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 2 drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 5 - drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 9 +- drivers/net/hyperv/rndis_filter.c | 25 ++++- drivers/net/usb/asix_devices.c | 9 +- drivers/scsi/csiostor/csio_attr.c | 2 drivers/scsi/libsas/sas_expander.c | 2 drivers/staging/android/ion/ion.c | 2 drivers/staging/rtl8723bs/include/ieee80211.h | 6 - drivers/thermal/int340x_thermal/processor_thermal_device.c | 30 +++---- drivers/tty/serial/fsl_lpuart.c | 2 drivers/usb/dwc3/gadget.c | 3 drivers/usb/gadget/function/f_sourcesink.c | 2 fs/direct-io.c | 5 - fs/fs-writeback.c | 40 ++++++++- include/linux/backing-dev-defs.h | 1 include/linux/if_arp.h | 1 kernel/exit.c | 2 kernel/futex.c | 13 +-- kernel/irq/manage.c | 3 kernel/locking/rwsem-xadd.c | 11 ++ mm/backing-dev.c | 1 mm/mmap.c | 7 - net/mac80211/cfg.c | 4 net/mac80211/rx.c | 6 - net/wireless/reg.c | 4 sound/core/compress_offload.c | 3 sound/soc/codecs/rt274.c | 5 - sound/soc/fsl/imx-audmux.c | 24 ++--- sound/soc/intel/boards/broadwell.c | 2 sound/soc/intel/boards/haswell.c | 2 sound/soc/soc-dapm.c | 10 +- tools/testing/selftests/gpio/gpio-mockup-chardev.c | 9 +- tools/testing/selftests/seccomp/Makefile | 2 56 files changed, 313 insertions(+), 151 deletions(-)
Aaron Hill (1):
drivers: thermal: int340x_thermal: Fix sysfs race condition
Andy Lutomirski (1):
x86/uaccess: Don't leak the AC flag into __put_user() value evaluation
Atsushi Nemoto (1):
net: altera_tse: fix connect_local_phy error path
BOUGH CHEN (1):
mmc: sdhci-esdhc-imx: correct the fix of ERR004536
Balaji Pothunoori (1):
mac80211: don't initiate TDLS connection if station is not associated to AP
Bo He (1):
usb: dwc3: gadget: synchronize_irq dwc irq in suspend
Bob Copeland (1):
mac80211: fix miscounting of ttl-dropped frames
Chaitanya Tata (1):
cfg80211: extend range deviation for DMG
Dan Carpenter (3):
ALSA: compress: prevent potential divide by zero bugs
thermal: int340x_thermal: Fix a NULL vs IS_ERR() check
usb: gadget: Potential NULL dereference on allocation error
Ernesto A. Fernández (1):
direct-io: allow direct writes to empty inodes
Eugeniy Paltsev (1):
ARC: fix __ffs return value to avoid build warnings
Fathi Boudra (1):
selftests: seccomp: use LDLIBS instead of LDFLAGS
Florian Fainelli (1):
net: stmmac: Fix reception of Broadcom switches tags
Geert Uytterhoeven (1):
selftests: gpio-mockup-chardev: Check asprintf() for error
Greg Kroah-Hartman (4):
Revert "loop: Fix double mutex_unlock(&loop_ctl_mutex) in loop_control_ioctl()" Revert "loop: Get rid of loop_index_mutex"
Revert "loop: Fold __loop_release into loop_release"
Linux 4.14.105
Haiyang Zhang (1):
hv_netvsc: Fix ethtool change hash key error
Jann Horn (1):
mm: enforce min addr even if capable() in expand_downwards()
John Garry (1):
scsi: libsas: Fix rphy phy_identifier for PHYs with end devices attached
Jonathan Neuschäfer (1):
mmc: spi: Fix card detection during probe
Jose Abreu (1):
net: stmmac: Disable ACS Feature for GMAC >= 4
Kenneth Feng (1):
drm/amd/powerplay: OD setting fix on Vega10
Kristian H. Kristensen (1):
drm/msm: Unblock writer if reader closes file
Liam Mark (1):
staging: android: ion: Support cpu access during dma_buf_detach
Maciej Żenczykowski (1):
net: dev_is_mac_header_xmit() true for ARPHRD_RAWIP
Marek Vasut (1):
clk: vc5: Abort clock configuration without upstream clock
Mathieu Malaterre (1):
mac80211: Add attribute aligned(2) to struct 'action'
Michael Clark (1):
MIPS: fix truncation in __cmpxchg_small for short values
Nathan Chancellor (1):
staging: rtl8723bs: Fix build error with Clang when inlining is disabled
Paul Burton (1):
MIPS: eBPF: Fix icache flush end address
Peter Zijlstra (1):
futex: Fix (possible) missed wakeup
Prateek Sood (1):
sched/wait: Fix rcuwait_wake_up() ordering
Rander Wang (1):
ASoC: Intel: Haswell/Broadwell: fix setting for .dynamic field
Sergei Shtylyov (1):
mmc: tmio_mmc_core: don't claim spurious interrupts
Seth Forshee (1):
powerpc: Always initialize input array when calling epapr_hypercall()
Silvio Cesare (2):
ASoC: dapm: change snprintf to scnprintf for possible overflow
ASoC: imx-audmux: change snprintf to scnprintf for possible overflow
Srinivas Ramana (1):
genirq: Make sure the initial affinity is not empty
Suravee Suthikulpanit (1):
svm: Fix AVIC incomplete IPI emulation
Takeshi Saito (1):
mmc: tmio: fix access width of Block Count Register
Tejun Heo (1):
writeback: synchronize sync(2) against cgroup writeback membership switches
Thomas Falcon (1):
ibmveth: Do not process frames after calling napi_reschedule
Tomonori Sakita (1):
serial: fsl_lpuart: fix maximum acceptable baud rate with over-sampling
Varun Prakash (1):
scsi: csiostor: fix NULL pointer dereference in csio_vport_set_state()
Vitaly Kuznetsov (1):
KVM: nSVM: clear events pending from svm_complete_interrupts() when exiting to L1
Xie Yongji (1):
locking/rwsem: Fix (possible) missed wakeup
Yizhuo (1):
ASoC: Variable "val" in function rt274_i2c_probe() could be uninitialized
Zeng Tao (1):
usb: dwc3: gadget: Fix the uninitialized link_state when udc starts
Zhang Run (1):
net: usb: asix: ax88772_bind return error when hw_reset fail
Greg KH
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 14 -SUBLEVEL = 104 +SUBLEVEL = 105 EXTRAVERSION = NAME = Petit Gorille
arch/arc/include/asm/bitops.h +3 -3
@@ -340,7 +340,7 @@ static inline __attribute__ ((const)) int __fls(unsigned long x)/* * __ffs: Similar to ffs, but zero based (0-31) */ -static inline __attribute__ ((const))int __ffs (unsigned long word) +static inline __attribute__ ((const))unsigned long __ffs (unsigned long word) {if (!word)return word;
@@ -400,9 +400,9 @@ static inline __attribute__ ((const)) int ffs(unsigned long x)/* * __ffs: Similar to ffs, but zero based (0-31) */ -static inline __attribute__ ((const))int __ffs (unsigned long x) +static inline __attribute__ ((const))unsigned long __ffs (unsigned long x) { -int n; +unsigned long n; asmvolatile ( " ffs.f %0, %1 \n" /* 0:31; 31(Z) if src 0 */
arch/mips/kernel/cmpxchg.c +1 -2
@@ -54,10 +54,9 @@ unsigned long __xchg_small(volatile void *ptr, unsigned long val, unsigned int sunsigned long __cmpxchg_small (volatile void *ptr,unsigned long old,unsigned long new,unsigned int size) { -u32 mask, old32, new32, load32; +u32 mask, old32, new32, load32, load;volatile u32 *ptr32;unsigned int shift; -u8 load;/* Check that ptr is naturally aligned */ WARN_ON ((unsigned long )ptr & (size -1 ));
arch/mips/net/ebpf_jit.c +1 -1
@@ -1971,7 +1971,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)/* Update the icache */ flush_icache_range ((unsigned long )ctx.target, - (unsigned long )(ctx.target + ctx.idx *sizeof (u32))); + (unsigned long )&ctx.target[ctx.idx]);if (bpf_jit_enable >1 )/* Dump JIT code */
arch/powerpc/include/asm/epapr_hcalls.h +6 -6
@@ -508,7 +508,7 @@ static unsigned long epapr_hypercall(unsigned long *in,static inline long epapr_hypercall0_1 (unsigned int nr,unsigned long *r2) { -unsigned long in[8 ]; +unsigned long in[8 ] = {0 };unsigned long out[8 ];unsigned long r;
@@ -520,7 +520,7 @@ static inline long epapr_hypercall0_1(unsigned int nr, unsigned long *r2)static inline long epapr_hypercall0 (unsigned int nr) { -unsigned long in[8 ]; +unsigned long in[8 ] = {0 };unsigned long out[8 ];return epapr_hypercall (in, out, nr);
@@ -528,7 +528,7 @@ static inline long epapr_hypercall0(unsigned int nr)static inline long epapr_hypercall1 (unsigned int nr,unsigned long p1) { -unsigned long in[8 ]; +unsigned long in[8 ] = {0 };unsigned long out[8 ]; in[0 ] = p1;
@@ -538,7 +538,7 @@ static inline long epapr_hypercall1(unsigned int nr, unsigned long p1)static inline long epapr_hypercall2 (unsigned int nr,unsigned long p1,unsigned long p2) { -unsigned long in[8 ]; +unsigned long in[8 ] = {0 };unsigned long out[8 ]; in[0 ] = p1;
@@ -549,7 +549,7 @@ static inline long epapr_hypercall2(unsigned int nr, unsigned long p1,static inline long epapr_hypercall3 (unsigned int nr,unsigned long p1,unsigned long p2,unsigned long p3) { -unsigned long in[8 ]; +unsigned long in[8 ] = {0 };unsigned long out[8 ]; in[0 ] = p1;
@@ -562,7 +562,7 @@ static inline long epapr_hypercall4(unsigned int nr, unsigned long p1, unsigned long p2, unsigned long p3, unsigned long p4) { - unsigned long in[8]; + unsigned long in[8] = {0};unsigned long out[8 ]; in[0 ] = p1;
arch/x86/include/asm/uaccess.h +4 -3
@@ -293,8 +293,7 @@ do { \__put_user_asm (x, ptr, retval,"l" ,"k" ,"ir" , errret); \break ; \case 8 : \ -__put_user_asm_u64 ((__typeof__ (*ptr))(x), ptr, retval, \ - errret); \ +__put_user_asm_u64 (x, ptr, retval, errret); \break ; \default : \__put_user_bad (); \
@@ -440,8 +439,10 @@ do { \#define __put_user_nocheck (x, ptr, size) \ ({ \ int __pu_err; \ + __typeof__(*(ptr)) __pu_val; \ + __pu_val = x; \ __uaccess_begin(); \ - __put_user_size((x), (ptr), (size), __pu_err, -EFAULT); \ + __put_user_size(__pu_val, (ptr), (size), __pu_err, -EFAULT);\ __uaccess_end(); \ __builtin_expect(__pu_err, 0); \ })
arch/x86/kvm/svm.c +12 -15
@@ -2929,6 +2929,14 @@ static int nested_svm_vmexit(struct vcpu_svm *svm)kvm_mmu_reset_context (&svm->vcpu);kvm_mmu_load (&svm->vcpu); +/* +* Drop what we picked up for L2 via svm_complete_interrupts() so it +* doesn't end up in L1. +*/ + svm->vcpu.arch.nmi_injected = false; +kvm_clear_exception_queue (&svm->vcpu); +kvm_clear_interrupt_queue (&svm->vcpu); +return 0 ; }
@@ -4006,25 +4014,14 @@ static int avic_incomplete_ipi_interception(struct vcpu_svm *svm)kvm_lapic_reg_write (apic,APIC_ICR , icrl);break ;case AVIC_IPI_FAILURE_TARGET_NOT_RUNNING : { -int i; -struct kvm_vcpu *vcpu; -struct kvm *kvm = svm->vcpu.kvm;struct kvm_lapic *apic = svm->vcpu.arch.apic;/* -* At this point, we expect that the AVIC HW has already -* set the appropriate IRR bits on the valid target -* vcpus. So, we just need to kick the appropriate vcpu. +* Update ICR high and low, then emulate sending IPI, +* which is handled when writing APIC_ICR. */ -kvm_for_each_vcpu (i, vcpu, kvm) { -bool m =kvm_apic_match_dest (vcpu, apic, - icrl &KVM_APIC_SHORT_MASK , -GET_APIC_DEST_FIELD (icrh), - icrl &KVM_APIC_DEST_MASK ); - -if (m && !avic_vcpu_is_running (vcpu)) -kvm_vcpu_wake_up (vcpu); - } +kvm_lapic_reg_write (apic,APIC_ICR2 , icrh); +kvm_lapic_reg_write (apic,APIC_ICR , icrl);break ; }case AVIC_IPI_FAILURE_INVALID_TARGET :
drivers/block/loop.c +25 -22
131 lines not on this page · raw message
drivers/clk/clk-versaclock5.c +3 -1
@@ -262,8 +262,10 @@ static int vc5_mux_set_parent(struct clk_hw *hw, u8 index)if (vc5->clk_mux_ins ==VC5_MUX_IN_XIN ) src =VC5_PRIM_SRC_SHDN_EN_XTAL ; -if (vc5->clk_mux_ins ==VC5_MUX_IN_CLKIN ) +else if (vc5->clk_mux_ins ==VC5_MUX_IN_CLKIN ) src =VC5_PRIM_SRC_SHDN_EN_CLKIN ; +else /* Invalid; should have been caught by vc5_probe() */ +return -EINVAL ; }return regmap_update_bits (vc5->regmap,VC5_PRIM_SRC_SHDN , mask, src);
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_processpptables.c +21 -1
@@ -32,6 +32,7 @@#include "vega10_pptable.h" #define NUM_DSPCLK_LEVELS 8 +#define VEGA10_ENGINECLOCK_HARDMAX 198000static void set_hw_cap (struct pp_hwmgr *hwmgr,bool enable,enum phm_platform_caps cap)
@@ -258,7 +259,26 @@ static int init_over_drive_limits(struct pp_hwmgr *hwmgr, const ATOM_Vega10_POWERPLAYTABLE *powerplay_table) { - hwmgr->platform_descriptor.overdriveLimit.engineClock = + const ATOM_Vega10_GFXCLK_Dependency_Table *gfxclk_dep_table = + (const ATOM_Vega10_GFXCLK_Dependency_Table *) + (((unsigned long ) powerplay_table) + +le16_to_cpu (powerplay_table->usGfxclkDependencyTableOffset)); +bool is_acg_enabled = false; +ATOM_Vega10_GFXCLK_Dependency_Record_V2 *patom_record_v2; + +if (gfxclk_dep_table->ucRevId ==1 ) { + patom_record_v2 = + (ATOM_Vega10_GFXCLK_Dependency_Record_V2 *)gfxclk_dep_table->entries; + is_acg_enabled = + (bool )patom_record_v2[gfxclk_dep_table->ucNumEntries-1 ].ucACGEnable; + } + +if (powerplay_table->ulMaxODEngineClock >VEGA10_ENGINECLOCK_HARDMAX && + !is_acg_enabled) + hwmgr->platform_descriptor.overdriveLimit.engineClock = +VEGA10_ENGINECLOCK_HARDMAX ; +else + hwmgr->platform_descriptor.overdriveLimit.engineClock =le32_to_cpu (powerplay_table->ulMaxODEngineClock); hwmgr->platform_descriptor.overdriveLimit.memoryClock =le32_to_cpu (powerplay_table->ulMaxODMemoryClock);
drivers/gpu/drm/msm/msm_rd.c +6 -1
@@ -109,7 +109,9 @@ static void rd_write(struct msm_rd_state *rd, const void *buf, int sz)char *fptr = &fifo->buf[fifo->head];int n; -wait_event (rd->fifo_event,circ_space (&rd->fifo) >0 ); +wait_event (rd->fifo_event,circ_space (&rd->fifo) >0 || !rd->open); +if (!rd->open) +return ;/* Note that smp_load_acquire() is not strictly required * as CIRC_SPACE_TO_END() does not access the tail more
@@ -207,7 +209,10 @@ static int rd_open(struct inode *inode, struct file *file)static int rd_release (struct inode *inode,struct file *file) {struct msm_rd_state *rd = inode->i_private; + rd->open = false; +wake_up_all (&rd->fifo_event); +return 0 ; }
drivers/mmc/host/mmc_spi.c +1 -0
@@ -1447,6 +1447,7 @@ static int mmc_spi_probe(struct spi_device *spi) mmc->caps &= ~MMC_CAP_NEEDS_POLL ;mmc_gpiod_request_cd_irq (mmc); } +mmc_detect_change (mmc,0 );if (host->pdata && host->pdata->flags &MMC_SPI_USE_RO_GPIO ) { has_ro = true;
drivers/mmc/host/renesas_sdhi_sys_dmac.c +1 -0
@@ -68,6 +68,7 @@ static const struct renesas_sdhi_of_data of_rcar_gen2_compatible = { .scc_offset = 0x0300, .taps = rcar_gen2_scc_taps, .taps_num = ARRAY_SIZE(rcar_gen2_scc_taps), + .max_blk_count = 0xffffffff, };/* Definitions for sampling clocks */
drivers/mmc/host/sdhci-esdhc-imx.c +5 -4
@@ -1077,11 +1077,12 @@ static void sdhci_esdhc_imx_hwinit(struct sdhci_host *host)writel (readl (host->ioaddr +SDHCI_HOST_CONTROL ) |ESDHC_BURST_LEN_EN_INCR , host->ioaddr +SDHCI_HOST_CONTROL ); +/* -* erratum ESDHC_FLAG_ERR004536 fix for MX6Q TO1.2 and MX6DL -* TO1.1, it's harmless for MX6SL -*/ -writel (readl (host->ioaddr +0x6c ) |BIT (7 ), +* erratum ESDHC_FLAG_ERR004536 fix for MX6Q TO1.2 and MX6DL +* TO1.1, it's harmless for MX6SL +*/ +writel (readl (host->ioaddr +0x6c ) & ~BIT (7 ), host->ioaddr +0x6c );/* disable DLL_CTRL delay line settings */
drivers/mmc/host/tmio_mmc.h +5 -0
@@ -286,6 +286,11 @@ static inline void sd_ctrl_write32_as_16_and_16(struct tmio_mmc_host *host,writew (val >>16 , host->ctl + ((addr +2 ) << host->bus_shift)); } +static inline void sd_ctrl_write32 (struct tmio_mmc_host *host,int addr,u32 val) +{ +iowrite32 (val, host->ctl + (addr << host->bus_shift)); +} +static inline void sd_ctrl_write32_rep (struct tmio_mmc_host *host,int addr,const u32 *buf,int count) {
drivers/mmc/host/tmio_mmc_core.c +12 -5
@@ -46,6 +46,7 @@#include <linux/regulator/consumer.h> #include <linux/mmc/sdio.h> #include <linux/scatterlist.h> +#include <linux/sizes.h> #include <linux/spinlock.h> #include <linux/swiotlb.h> #include <linux/workqueue.h>
@@ -688,7 +689,7 @@ static bool __tmio_mmc_sdcard_irq(struct tmio_mmc_host *host, int ireg,return false; } -static void __tmio_mmc_sdio_irq (struct tmio_mmc_host *host) +static bool __tmio_mmc_sdio_irq (struct tmio_mmc_host *host) {struct mmc_host *mmc = host->mmc;struct tmio_mmc_data *pdata = host->pdata;
@@ -696,7 +697,7 @@ static void __tmio_mmc_sdio_irq(struct tmio_mmc_host *host)unsigned int sdio_status;if (!(pdata->flags &TMIO_MMC_SDIO_IRQ )) -return ; +return false; status =sd_ctrl_read16 (host,CTL_SDIO_STATUS ); ireg = status &TMIO_SDIO_MASK_ALL & ~host->sdio_irq_mask;
@@ -709,6 +710,8 @@ static void __tmio_mmc_sdio_irq(struct tmio_mmc_host *host)if (mmc->caps &MMC_CAP_SDIO_IRQ && ireg &TMIO_SDIO_STAT_IOIRQ )mmc_signal_sdio_irq (mmc); + +return ireg; }irqreturn_t tmio_mmc_irq (int irq,void *devid)
@@ -727,9 +730,10 @@ irqreturn_t tmio_mmc_irq(int irq, void *devid)if (__tmio_mmc_sdcard_irq (host, ireg, status))return IRQ_HANDLED ; -__tmio_mmc_sdio_irq (host); +if (__tmio_mmc_sdio_irq (host)) +return IRQ_HANDLED ; -return IRQ_HANDLED ; +return IRQ_NONE ; }EXPORT_SYMBOL_GPL (tmio_mmc_irq);
@@ -758,7 +762,10 @@ static int tmio_mmc_start_data(struct tmio_mmc_host *host,/* Set transfer length / blocksize */ sd_ctrl_write16 (host,CTL_SD_XFER_LEN , data->blksz); -sd_ctrl_write16 (host,CTL_XFER_BLK_COUNT , data->blocks); +if (host->mmc->max_blk_count >=SZ_64K ) +sd_ctrl_write32 (host,CTL_XFER_BLK_COUNT , data->blocks); +else +sd_ctrl_write16 (host,CTL_XFER_BLK_COUNT , data->blocks);tmio_mmc_start_dma (host, data);
drivers/net/ethernet/altera/altera_tse_main.c +3 -1
@@ -714,8 +714,10 @@ static struct phy_device *connect_local_phy(struct net_device *dev) phydev =phy_connect (dev, phy_id_fmt, &altera_tse_adjust_link, priv->phy_iface); -if (IS_ERR (phydev)) +if (IS_ERR (phydev)) {netdev_err (dev,"Could not attach to PHY\n" ); + phydev =NULL ; + } }else {int ret;
drivers/net/ethernet/ibm/ibmveth.c +0 -2
@@ -1314,7 +1314,6 @@ static int ibmveth_poll(struct napi_struct *napi, int budget)unsigned long lpar_rc;u16 mss =0 ; -restart_poll:while (frames_processed < budget) {if (!ibmveth_rxq_pending_buffer (adapter))break ;
@@ -1402,7 +1401,6 @@ static int ibmveth_poll(struct napi_struct *napi, int budget) napi_reschedule(napi)) { lpar_rc =h_vio_signal (adapter->vdev->unit_address,VIO_IRQ_DISABLE ); - goto restart_poll; } }
drivers/net/ethernet/stmicro/stmmac/common.h +1 -1
@@ -475,7 +475,7 @@ struct mac_device_info;/* Helpers to program the MAC core */ struct stmmac_ops {/* MAC core initialization */ -void (*core_init)(struct mac_device_info *hw,int mtu); +void (*core_init)(struct mac_device_info *hw,struct net_device *dev);/* Enable the MAC RX/TX */ void (*set_mac)(void __iomem *ioaddr,bool enable);/* Enable and verify that the IPC module is supported */
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +2 -1
@@ -477,7 +477,8 @@ static int sun8i_dwmac_init(struct platform_device *pdev, void *priv)return 0 ; } -static void sun8i_dwmac_core_init (struct mac_device_info *hw,int mtu) +static void sun8i_dwmac_core_init (struct mac_device_info *hw, +struct net_device *dev) {void __iomem *ioaddr = hw->pcsr;u32 v;
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c +11 -1
@@ -25,18 +25,28 @@#include <linux/crc32.h> #include <linux/slab.h> #include <linux/ethtool.h> +#include <net/dsa.h> #include <asm/io.h> #include "stmmac_pcs.h" #include "dwmac1000.h" -static void dwmac1000_core_init (struct mac_device_info *hw,int mtu) +static void dwmac1000_core_init (struct mac_device_info *hw, +struct net_device *dev) {void __iomem *ioaddr = hw->pcsr;u32 value =readl (ioaddr +GMAC_CONTROL ); +int mtu = dev->mtu;/* Configure GMAC core */ value |=GMAC_CORE_INIT ; +/* Clear ACS bit because Ethernet switch tagging formats such as +* Broadcom tags can look like invalid LLC/SNAP packets and cause the +* hardware to truncate packets on reception. +*/ +if (netdev_uses_dsa (dev)) + value &= ~GMAC_CONTROL_ACS ; +if (mtu >1500 ) value |=GMAC_CONTROL_2K ;if (mtu >2000 )
drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c +13 -2
@@ -25,15 +25,26 @@*******************************************************************************/ #include <linux/crc32.h> +#include <net/dsa.h> #include <asm/io.h> #include "dwmac100.h" -static void dwmac100_core_init (struct mac_device_info *hw,int mtu) +static void dwmac100_core_init (struct mac_device_info *hw, +struct net_device *dev) {void __iomem *ioaddr = hw->pcsr;u32 value =readl (ioaddr +MAC_CONTROL ); -writel ((value |MAC_CORE_INIT ), ioaddr +MAC_CONTROL ); + value |=MAC_CORE_INIT ; + +/* Clear ASTP bit because Ethernet switch tagging formats such as +* Broadcom tags can look like invalid LLC/SNAP packets and cause the +* hardware to truncate packets on reception. +*/ +if (netdev_uses_dsa (dev)) + value &= ~MAC_CONTROL_ASTP ; + +writel (value, ioaddr +MAC_CONTROL );#ifdef STMMAC_VLAN_TAG_USED writel (ETH_P_8021Q , ioaddr +MAC_VLAN1 );
drivers/net/ethernet/stmicro/stmmac/dwmac4.h +1 -1
@@ -336,7 +336,7 @@ enum power_event {#define MTL_RX_OVERFLOW_INT BIT(16)/* Default operating mode of the MAC */ -#define GMAC_CORE_INIT (GMAC_CONFIG_JD | GMAC_CONFIG_PS | GMAC_CONFIG_ACS | \ +#define GMAC_CORE_INIT (GMAC_CONFIG_JD | GMAC_CONFIG_PS | \ GMAC_CONFIG_BE | GMAC_CONFIG_DCRS)/* To dump the core regs excluding the Address Registers */
drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +4 -1
@@ -17,13 +17,16 @@#include <linux/slab.h> #include <linux/ethtool.h> #include <linux/io.h> +#include <net/dsa.h> #include "stmmac_pcs.h" #include "dwmac4.h" -static void dwmac4_core_init (struct mac_device_info *hw,int mtu) +static void dwmac4_core_init (struct mac_device_info *hw, +struct net_device *dev) {void __iomem *ioaddr = hw->pcsr;u32 value =readl (ioaddr +GMAC_CONFIG ); +int mtu = dev->mtu; value |=GMAC_CORE_INIT ;
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +7 -2
@@ -2497,7 +2497,7 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp) }/* Initialize the MAC Core */ - priv->hw->mac->core_init (priv->hw, dev->mtu); + priv->hw->mac->core_init (priv->hw, dev);/* Initialize MTL*/ if (priv->synopsys_id >=DWMAC_CORE_4_00 )
@@ -3415,8 +3415,13 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue)/* ACS is set; GMAC core strips PAD/FCS for IEEE 802.3 * Type frames (LLC/LLC-SNAP) +* +* llc_snap is never checked in GMAC >= 4, so this ACS +* feature is always disabled and packets need to be +* stripped manually. */ -if (unlikely (status != llc_snap)) +if (unlikely (priv->synopsys_id >=DWMAC_CORE_4_00 ) || +unlikely (status != llc_snap)) frame_len -=ETH_FCS_LEN ;if (netif_msg_rx_status (priv)) {
drivers/net/hyperv/rndis_filter.c +19 -6
@@ -711,8 +711,8 @@ rndis_filter_set_offload_params(struct net_device *ndev,return ret; } -int rndis_filter_set_rss_param (struct rndis_device *rdev, -const u8 *rss_key) +static int rndis_set_rss_param_msg (struct rndis_device *rdev, +const u8 *rss_key,u16 flag) {struct net_device *ndev = rdev->ndev;struct rndis_request *request;
@@ -741,7 +741,7 @@ int rndis_filter_set_rss_param(struct rndis_device *rdev, rssp->hdr.type =NDIS_OBJECT_TYPE_RSS_PARAMETERS ; rssp->hdr.rev =NDIS_RECEIVE_SCALE_PARAMETERS_REVISION_2 ; rssp->hdr.size =sizeof (struct ndis_recv_scale_param ); - rssp->flag =0 ; + rssp->flag = flag; rssp->hashinfo =NDIS_HASH_FUNC_TOEPLITZ |NDIS_HASH_IPV4 |NDIS_HASH_TCP_IPV4 |NDIS_HASH_IPV6 |NDIS_HASH_TCP_IPV6 ;
@@ -766,9 +766,12 @@ int rndis_filter_set_rss_param(struct rndis_device *rdev,wait_for_completion (&request->wait_event); set_complete = &request->response_msg.msg.set_complete; -if (set_complete->status ==RNDIS_STATUS_SUCCESS ) -memcpy (rdev->rss_key, rss_key,NETVSC_HASH_KEYLEN ); -else { +if (set_complete->status ==RNDIS_STATUS_SUCCESS ) { +if (!(flag &NDIS_RSS_PARAM_FLAG_DISABLE_RSS ) && + !(flag &NDIS_RSS_PARAM_FLAG_HASH_KEY_UNCHANGED )) +memcpy (rdev->rss_key, rss_key,NETVSC_HASH_KEYLEN ); + + }else {netdev_err (ndev,"Fail to set RSS parameters:0x%x\n" , set_complete->status); ret = -EINVAL ;
@@ -779,6 +782,16 @@ int rndis_filter_set_rss_param(struct rndis_device *rdev,return ret; } +int rndis_filter_set_rss_param (struct rndis_device *rdev, +const u8 *rss_key) +{ +/* Disable RSS before change */ +rndis_set_rss_param_msg (rdev, rss_key, +NDIS_RSS_PARAM_FLAG_DISABLE_RSS ); + +return rndis_set_rss_param_msg (rdev, rss_key,0 ); +} +static int rndis_filter_query_device_link_status (struct rndis_device *dev,struct netvsc_device *net_device) {
drivers/net/usb/asix_devices.c +7 -2
@@ -731,8 +731,13 @@ static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf)asix_read_cmd (dev,AX_CMD_STATMNGSTS_REG ,0 ,0 ,1 , &chipcode,0 ); chipcode &=AX_CHIPCODE_MASK ; - (chipcode ==AX_AX88772_CHIPCODE ) ?ax88772_hw_reset (dev,0 ) : -ax88772a_hw_reset (dev,0 ); + ret = (chipcode ==AX_AX88772_CHIPCODE ) ?ax88772_hw_reset (dev,0 ) : +ax88772a_hw_reset (dev,0 ); + +if (ret <0 ) { +netdev_dbg (dev->net,"Failed to reset AX88772: %d\n" , ret); +return ret; + }/* Read PHYID register *AFTER* the PHY was reset properly */ phyid =asix_get_phyid (dev);
drivers/scsi/csiostor/csio_attr.c +1 -1
@@ -582,12 +582,12 @@ csio_vport_create(struct fc_vport *fc_vport, bool disable) }fc_vport_set_state (fc_vport,FC_VPORT_INITIALIZING ); + ln->fc_vport = fc_vport;if (csio_fcoe_alloc_vnp (hw, ln)) goto error; *(struct csio_lnode **)fc_vport->dd_data = ln; - ln->fc_vport = fc_vport;if (!fc_vport->node_name) fc_vport->node_name =wwn_to_u64 (csio_ln_wwnn (ln));if (!fc_vport->port_name)
drivers/scsi/libsas/sas_expander.c +2 -0
@@ -829,6 +829,7 @@ static struct domain_device *sas_ex_discover_end_dev( rphy =sas_end_device_alloc (phy->port);if (!rphy) goto out_free; + rphy->identify.phy_identifier = phy_id; child->rphy = rphy;get_device (&rphy->dev);
@@ -856,6 +857,7 @@ static struct domain_device *sas_ex_discover_end_dev( child->rphy = rphy;get_device (&rphy->dev); + rphy->identify.phy_identifier = phy_id;sas_fill_in_rphy (child, rphy);list_add_tail (&child->disco_list_node, &parent->port->disco_list);
drivers/staging/android/ion/ion.c +1 -1
@@ -257,10 +257,10 @@ static void ion_dma_buf_detatch(struct dma_buf *dmabuf,struct ion_dma_buf_attachment *a = attachment->priv;struct ion_buffer *buffer = dmabuf->priv; -free_duped_table (a->table);mutex_lock (&buffer->lock);list_del (&a->list);mutex_unlock (&buffer->lock); +free_duped_table (a->table);kfree (a); }
drivers/staging/rtl8723bs/include/ieee80211.h +3 -3
@@ -1008,18 +1008,18 @@ enum ieee80211_state {#define IP_FMT "%pI4"#define IP_ARG (x) (x) -extern __inlineint is_multicast_mac_addr (const u8 *addr) +static inline int is_multicast_mac_addr (const u8 *addr) {return ((addr[0 ] !=0xff ) && (0x01 & addr[0 ])); } -extern __inlineint is_broadcast_mac_addr (const u8 *addr) +static inline int is_broadcast_mac_addr (const u8 *addr) {return ((addr[0 ] ==0xff ) && (addr[1 ] ==0xff ) && (addr[2 ] ==0xff ) && \ (addr[3 ] ==0xff ) && (addr[4 ] ==0xff ) && (addr[5 ] ==0xff )); } -extern __inlineint is_zero_mac_addr (const u8 *addr) +static inline int is_zero_mac_addr (const u8 *addr) {return ((addr[0 ] ==0x00 ) && (addr[1 ] ==0x00 ) && (addr[2 ] ==0x00 ) && \ (addr[3 ] ==0x00 ) && (addr[4 ] ==0x00 ) && (addr[5 ] ==0x00 ));
drivers/thermal/int340x_thermal/processor_thermal_device.c +16 -14
@@ -77,7 +77,12 @@ static ssize_t power_limit_##index##_##suffix##_show(struct device *dev, \struct pci_dev *pci_dev; \struct platform_device *pdev; \struct proc_thermal_device *proc_dev; \ -\ + \ +if (proc_thermal_emum_mode ==PROC_THERMAL_NONE ) { \ +dev_warn (dev,"Attempted to get power limit before device was initialized!\n" ); \ +return 0 ; \ + } \ + \if (proc_thermal_emum_mode ==PROC_THERMAL_PLATFORM_DEV ) { \ pdev =to_platform_device (dev); \ proc_dev =platform_get_drvdata (pdev); \
@@ -291,11 +296,6 @@ static int proc_thermal_add(struct device *dev, *priv = proc_priv; ret =proc_thermal_read_ppcc (proc_priv); -if (!ret) { - ret =sysfs_create_group (&dev->kobj, - &power_limit_attribute_group); - - }if (ret)return ret;
@@ -309,8 +309,7 @@ static int proc_thermal_add(struct device *dev, proc_priv->int340x_zone =int340x_thermal_zone_add (adev, ops);if (IS_ERR (proc_priv->int340x_zone)) { - ret =PTR_ERR (proc_priv->int340x_zone); - goto remove_group; +return PTR_ERR (proc_priv->int340x_zone); }else ret =0 ;
@@ -324,9 +323,6 @@ static int proc_thermal_add(struct device *dev, remove_zone:int340x_thermal_zone_remove (proc_priv->int340x_zone); -remove_group: -sysfs_remove_group (&proc_priv->dev->kobj, - &power_limit_attribute_group);return ret; }
@@ -357,7 +353,10 @@ static int int3401_add(struct platform_device *pdev)platform_set_drvdata (pdev, proc_priv); proc_thermal_emum_mode =PROC_THERMAL_PLATFORM_DEV ; -return 0 ; +dev_info (&pdev->dev,"Creating sysfs group for PROC_THERMAL_PLATFORM_DEV\n" ); + +return sysfs_create_group (&pdev->dev.kobj, + &power_limit_attribute_group); }static int int3401_remove (struct platform_device *pdev)
@@ -416,7 +415,7 @@ static int proc_thermal_pci_probe(struct pci_dev *pdev, proc_priv->soc_dts =intel_soc_dts_iosf_init (INTEL_SOC_DTS_INTERRUPT_MSI ,2 ,0 ); -if (proc_priv->soc_dts && pdev->irq) { +if (!IS_ERR (proc_priv->soc_dts) && pdev->irq) { ret =pci_enable_msi (pdev);if (!ret) { ret = request_threaded_irq(pdev->irq, NULL,
@@ -434,7 +433,10 @@ static int proc_thermal_pci_probe(struct pci_dev *pdev,dev_err (&pdev->dev,"No auxiliary DTSs enabled\n" ); } -return 0 ; +dev_info (&pdev->dev,"Creating sysfs group for PROC_THERMAL_PCI\n" ); + +return sysfs_create_group (&pdev->dev.kobj, + &power_limit_attribute_group); }static void proc_thermal_pci_remove (struct pci_dev *pdev)
drivers/tty/serial/fsl_lpuart.c +1 -1
@@ -1701,7 +1701,7 @@ lpuart32_set_termios(struct uart_port *port, struct ktermios *termios, }/* ask the core to calculate the divisor */ - baud =uart_get_baud_rate (port, termios, old,50 , port->uartclk /16 ); + baud =uart_get_baud_rate (port, termios, old,50 , port->uartclk /4 );spin_lock_irqsave (&sport->port.lock, flags);
drivers/usb/dwc3/gadget.c +3 -0
@@ -1910,6 +1910,7 @@ static int __dwc3_gadget_start(struct dwc3 *dwc)/* begin to receive SETUP packets */ dwc->ep0state =EP0_SETUP_PHASE ; + dwc->link_state =DWC3_LINK_STATE_SS_DIS ;dwc3_ep0_out_start (dwc);dwc3_gadget_enable_irq (dwc);
@@ -3327,6 +3328,8 @@ int dwc3_gadget_suspend(struct dwc3 *dwc)dwc3_disconnect_gadget (dwc);__dwc3_gadget_stop (dwc); +synchronize_irq (dwc->irq_gadget); +return 0 ; }
drivers/usb/gadget/function/f_sourcesink.c +1 -1
@@ -842,7 +842,7 @@ static struct usb_function *source_sink_alloc_func( ss =kzalloc (sizeof (*ss),GFP_KERNEL );if (!ss) -return NULL ; +return ERR_PTR (-ENOMEM ); ss_opts = container_of(fi, struct f_ss_opts, func_inst);
fs/direct-io.c +3 -2
@@ -658,6 +658,7 @@ static int get_more_blocks(struct dio *dio, struct dio_submit *sdio,unsigned long fs_count;/* Number of filesystem-sized blocks */ int create;unsigned int i_blkbits = sdio->blkbits + sdio->blkfactor; +loff_t i_size;/* * If there was a memory error and we've overwritten all the
@@ -687,8 +688,8 @@ static int get_more_blocks(struct dio *dio, struct dio_submit *sdio,*/ create = dio->op ==REQ_OP_WRITE ;if (dio->flags &DIO_SKIP_HOLES ) { -if (fs_startblk <= ((i_size_read (dio->inode) -1 ) >> - i_blkbits)) + i_size =i_size_read (dio->inode); +if (i_size && fs_startblk <= (i_size -1 ) >> i_blkbits) create =0 ; }
fs/fs-writeback.c +38 -2
@@ -331,11 +331,22 @@ struct inode_switch_wbs_context {struct work_struct work; }; +static void bdi_down_write_wb_switch_rwsem (struct backing_dev_info *bdi) +{ +down_write (&bdi->wb_switch_rwsem); +} + +static void bdi_up_write_wb_switch_rwsem (struct backing_dev_info *bdi) +{ +up_write (&bdi->wb_switch_rwsem); +} +static void inode_switch_wbs_work_fn (struct work_struct *work) {struct inode_switch_wbs_context *isw = container_of(work, struct inode_switch_wbs_context, work);struct inode *inode = isw->inode; +struct backing_dev_info *bdi =inode_to_bdi (inode);struct address_space *mapping = inode->i_mapping;struct bdi_writeback *old_wb = inode->i_wb;struct bdi_writeback *new_wb = isw->new_wb;
@@ -343,6 +354,12 @@ static void inode_switch_wbs_work_fn(struct work_struct *work)bool switched = false;void **slot; +/* +* If @inode switches cgwb membership while sync_inodes_sb() is +* being issued, sync_inodes_sb() might miss it. Synchronize. +*/ +down_read (&bdi->wb_switch_rwsem); +/* * By the time control reaches here, RCU grace period has passed * since I_WB_SWITCH assertion and all wb stat update transactions
@@ -435,6 +452,8 @@ static void inode_switch_wbs_work_fn(struct work_struct *work)spin_unlock (&new_wb->list_lock);spin_unlock (&old_wb->list_lock); +up_read (&bdi->wb_switch_rwsem); +if (switched) {wb_wakeup (new_wb);wb_put (old_wb);
@@ -475,9 +494,18 @@ static void inode_switch_wbs(struct inode *inode, int new_wb_id)if (inode->i_state &I_WB_SWITCH )return ; +/* +* Avoid starting new switches while sync_inodes_sb() is in +* progress. Otherwise, if the down_write protected issue path +* blocks heavily, we might end up starting a large number of +* switches which will block on the rwsem. +*/ +if (!down_read_trylock (&bdi->wb_switch_rwsem)) +return ; + isw =kzalloc (sizeof (*isw),GFP_ATOMIC );if (!isw) -return ; + goto out_unlock;/* find and pin the new wb */ rcu_read_lock ();
@@ -511,12 +539,14 @@ static void inode_switch_wbs(struct inode *inode, int new_wb_id)* Let's continue after I_WB_SWITCH is guaranteed to be visible. */ call_rcu (&isw->rcu_head, inode_switch_wbs_rcu_fn); -return ; + goto out_unlock; out_free:if (isw->new_wb)wb_put (isw->new_wb);kfree (isw); +out_unlock: +up_read (&bdi->wb_switch_rwsem); }/**
@@ -894,6 +924,9 @@ fs_initcall(cgroup_writeback_init);#else /* CONFIG_CGROUP_WRITEBACK */ +static void bdi_down_write_wb_switch_rwsem (struct backing_dev_info *bdi) { } +static void bdi_up_write_wb_switch_rwsem (struct backing_dev_info *bdi) { } +static struct bdi_writeback *locked_inode_to_wb_and_lock_list (struct inode *inode) __releases(&inode->i_lock)
@@ -2408,8 +2441,11 @@ void sync_inodes_sb(struct super_block *sb)return ;WARN_ON (!rwsem_is_locked (&sb->s_umount)); +/* protect against inode wb switch, see inode_switch_wbs_work_fn() */ +bdi_down_write_wb_switch_rwsem (bdi);bdi_split_work_to_wbs (bdi, &work, false);wb_wait_for_completion (bdi, &done); +bdi_up_write_wb_switch_rwsem (bdi);wait_sb_inodes (sb); }
include/linux/backing-dev-defs.h +1 -0
@@ -165,6 +165,7 @@ struct backing_dev_info {struct radix_tree_root cgwb_tree;/* radix tree of active cgroup wbs */ struct rb_root cgwb_congested_tree;/* their congested states */ struct mutex cgwb_release_mutex;/* protect shutdown of wb structs */ +struct rw_semaphore wb_switch_rwsem;/* no cgwb switch while syncing */ #else struct bdi_writeback_congested *wb_congested;#endif
include/linux/if_arp.h +1 -0
@@ -54,6 +54,7 @@ static inline bool dev_is_mac_header_xmit(const struct net_device *dev)case ARPHRD_IPGRE :case ARPHRD_VOID :case ARPHRD_NONE : +case ARPHRD_RAWIP :return false;default :return true;
kernel/exit.c +1 -1
@@ -306,7 +306,7 @@ void rcuwait_wake_up(struct rcuwait *w)* MB (A) MB (B) * [L] cond [L] tsk */ -smp_rmb ();/* (B) */ +smp_mb ();/* (B) */ /* * Avoid using task_rcu_dereference() magic as long as we are careful,
kernel/futex.c +8 -5
@@ -1462,11 +1462,7 @@ static void mark_wake_futex(struct wake_q_head *wake_q, struct futex_q *q)if (WARN (q->pi_state || q->rt_waiter,"refusing to wake PI futex\n" ))return ; -/* -* Queue the task for later wakeup for after we've released -* the hb->lock. wake_q_add() grabs reference to p. -*/ -wake_q_add (wake_q, p); +get_task_struct (p);__unqueue_futex (q);/* * The waiting task can free the futex_q as soon as q->lock_ptr = NULL
@@ -1476,6 +1472,13 @@ static void mark_wake_futex(struct wake_q_head *wake_q, struct futex_q *q)* plist_del in __unqueue_futex(). */ smp_store_release (&q->lock_ptr,NULL ); + +/* +* Queue the task for later wakeup for after we've released +* the hb->lock. wake_q_add() grabs reference to p. +*/ +wake_q_add (wake_q, p); +put_task_struct (p); }/*
kernel/irq/manage.c +3 -0
@@ -360,6 +360,9 @@ int irq_setup_affinity(struct irq_desc *desc) }cpumask_and (&mask, cpu_online_mask, set); +if (cpumask_empty (&mask)) +cpumask_copy (&mask, cpu_online_mask); +if (node !=NUMA_NO_NODE ) {const struct cpumask *nodemask =cpumask_of_node (node);
kernel/locking/rwsem-xadd.c +9 -2
@@ -198,15 +198,22 @@ static void __rwsem_mark_wake(struct rw_semaphore *sem, woken++; tsk = waiter->task; -wake_q_add (wake_q, tsk); +get_task_struct (tsk);list_del (&waiter->list);/* -* Ensure that the last operation is setting the reader +* Ensure calling get_task_struct() before setting the reader * waiter to nil such that rwsem_down_read_failed() cannot * race with do_exit() by always holding a reference count * to the task to wakeup. */ smp_store_release (&waiter->task,NULL ); +/* +* Ensure issuing the wakeup (either by us or someone else) +* after setting the reader waiter to nil. +*/ +wake_q_add (wake_q, tsk); +/* wake_q_add() already take the task ref */ +put_task_struct (tsk); } adjustment = woken *RWSEM_ACTIVE_READ_BIAS - adjustment;
mm/backing-dev.c +1 -0
@@ -684,6 +684,7 @@ static int cgwb_bdi_init(struct backing_dev_info *bdi)INIT_RADIX_TREE (&bdi->cgwb_tree,GFP_ATOMIC ); bdi->cgwb_congested_tree =RB_ROOT ;mutex_init (&bdi->cgwb_release_mutex); +init_rwsem (&bdi->wb_switch_rwsem); ret =wb_init (&bdi->wb, bdi,1 ,GFP_KERNEL );if (!ret) {
mm/mmap.c +3 -4
@@ -2348,12 +2348,11 @@ int expand_downwards(struct vm_area_struct *vma, {struct mm_struct *mm = vma->vm_mm;struct vm_area_struct *prev; -int error; +int error =0 ; address &=PAGE_MASK ; - error =security_mmap_addr (address); -if (error) -return error; +if (address < mmap_min_addr) +return -EPERM ;/* Enforce stack_guard_gap */ prev = vma->vm_prev;
net/mac80211/cfg.c +4 -0
@@ -1466,6 +1466,10 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev,if (params->sta_flags_set &BIT (NL80211_STA_FLAG_TDLS_PEER )) sta->sta.tdls = true; +if (sta->sta.tdls && sdata->vif.type ==NL80211_IFTYPE_STATION && + !sdata->u.mgd.associated) +return -EINVAL ; + err =sta_apply_parameters (local, sta, params);if (err) {sta_info_free (local, sta);
net/mac80211/rx.c +4 -2
@@ -206,7 +206,7 @@ static void ieee80211_handle_mu_mimo_mon(struct ieee80211_sub_if_data *sdata,struct ieee80211_hdr_3addr hdr;u8 category;u8 action_code; - }__packed action; + }__packed __aligned(2) action;if (!sdata)return ;
@@ -2533,7 +2533,9 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)skb_set_queue_mapping (skb, q);if (!--mesh_hdr->ttl) { -IEEE80211_IFSTA_MESH_CTR_INC (ifmsh, dropped_frames_ttl); +if (!is_multicast_ether_addr (hdr->addr1)) +IEEE80211_IFSTA_MESH_CTR_INC (ifmsh, + dropped_frames_ttl); goto out; }
net/wireless/reg.c +2 -2
@@ -759,7 +759,7 @@ static bool is_valid_rd(const struct ieee80211_regdomain *rd)* definitions (the "2.4 GHz band", the "5 GHz band" and the "60GHz band"), * however it is safe for now to assume that a frequency rule should not be * part of a frequency's band if the start freq or end freq are off by more -* than 2 GHz for the 2.4 and 5 GHz bands, and by more than 10 GHz for the +* than 2 GHz for the 2.4 and 5 GHz bands, and by more than 20 GHz for the * 60 GHz band. * This resolution can be lowered and should be considered as we add * regulatory rule support for other "bands".
@@ -774,7 +774,7 @@ static bool freq_in_rule_band(const struct ieee80211_freq_range *freq_range,* with the Channel starting frequency above 45 GHz. */ u32 limit = freq_khz >45 *ONE_GHZ_IN_KHZ ? -10 *ONE_GHZ_IN_KHZ :2 *ONE_GHZ_IN_KHZ ; +20 *ONE_GHZ_IN_KHZ :2 *ONE_GHZ_IN_KHZ ;if (abs (freq_khz - freq_range->start_freq_khz) <= limit)return true;if (abs (freq_khz - freq_range->end_freq_khz) <= limit)
sound/core/compress_offload.c +2 -1
@@ -529,7 +529,8 @@ static int snd_compress_check_input(struct snd_compr_params *params) {/* first let's check the buffer parameter's */ if (params->buffer.fragment_size ==0 || - params->buffer.fragments >INT_MAX / params->buffer.fragment_size) + params->buffer.fragments >INT_MAX / params->buffer.fragment_size || + params->buffer.fragments ==0 )return -EINVAL ;/* now codec parameters */
sound/soc/codecs/rt274.c +4 -1
@@ -1128,8 +1128,11 @@ static int rt274_i2c_probe(struct i2c_client *i2c,return ret; } -regmap_read (rt274->regmap, + ret =regmap_read (rt274->regmap,RT274_GET_PARAM (AC_NODE_ROOT ,AC_PAR_VENDOR_ID ), &val); +if (ret) +return ret; +if (val !=RT274_VENDOR_ID ) {dev_err (&i2c->dev,"Device with ID register %#x is not rt274\n" , val);
sound/soc/fsl/imx-audmux.c +12 -12
@@ -86,49 +86,49 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf,if (!buf)return -ENOMEM ; - ret =snprintf (buf,PAGE_SIZE ,"PDCR: %08x\nPTCR: %08x\n" , + ret =scnprintf (buf,PAGE_SIZE ,"PDCR: %08x\nPTCR: %08x\n" , pdcr, ptcr);if (ptcr &IMX_AUDMUX_V2_PTCR_TFSDIR ) - ret +=snprintf (buf + ret,PAGE_SIZE - ret, + ret +=scnprintf (buf + ret,PAGE_SIZE - ret,"TxFS output from %s, " ,audmux_port_string ((ptcr >>27 ) &0x7 ));else - ret +=snprintf (buf + ret,PAGE_SIZE - ret, + ret +=scnprintf (buf + ret,PAGE_SIZE - ret,"TxFS input, " );if (ptcr &IMX_AUDMUX_V2_PTCR_TCLKDIR ) - ret +=snprintf (buf + ret,PAGE_SIZE - ret, + ret +=scnprintf (buf + ret,PAGE_SIZE - ret,"TxClk output from %s" ,audmux_port_string ((ptcr >>22 ) &0x7 ));else - ret +=snprintf (buf + ret,PAGE_SIZE - ret, + ret +=scnprintf (buf + ret,PAGE_SIZE - ret,"TxClk input" ); - ret +=snprintf (buf + ret,PAGE_SIZE - ret,"\n" ); + ret +=scnprintf (buf + ret,PAGE_SIZE - ret,"\n" );if (ptcr &IMX_AUDMUX_V2_PTCR_SYN ) { - ret +=snprintf (buf + ret,PAGE_SIZE - ret, + ret +=scnprintf (buf + ret,PAGE_SIZE - ret,"Port is symmetric" ); }else {if (ptcr &IMX_AUDMUX_V2_PTCR_RFSDIR ) - ret +=snprintf (buf + ret,PAGE_SIZE - ret, + ret +=scnprintf (buf + ret,PAGE_SIZE - ret,"RxFS output from %s, " ,audmux_port_string ((ptcr >>17 ) &0x7 ));else - ret +=snprintf (buf + ret,PAGE_SIZE - ret, + ret +=scnprintf (buf + ret,PAGE_SIZE - ret,"RxFS input, " );if (ptcr &IMX_AUDMUX_V2_PTCR_RCLKDIR ) - ret +=snprintf (buf + ret,PAGE_SIZE - ret, + ret +=scnprintf (buf + ret,PAGE_SIZE - ret,"RxClk output from %s" ,audmux_port_string ((ptcr >>12 ) &0x7 ));else - ret +=snprintf (buf + ret,PAGE_SIZE - ret, + ret +=scnprintf (buf + ret,PAGE_SIZE - ret,"RxClk input" ); } - ret +=snprintf (buf + ret,PAGE_SIZE - ret, + ret +=scnprintf (buf + ret,PAGE_SIZE - ret,"\nData received from %s\n" ,audmux_port_string ((pdcr >>13 ) &0x7 ));
sound/soc/intel/boards/broadwell.c +1 -1
@@ -191,7 +191,7 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = { .stream_name = "Loopback", .cpu_dai_name = "Loopback Pin", .platform_name = "haswell-pcm-audio", - .dynamic = 0, + .dynamic = 1, .codec_name = "snd-soc-dummy", .codec_dai_name = "snd-soc-dummy-dai", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
sound/soc/intel/boards/haswell.c +1 -1
@@ -145,7 +145,7 @@ static struct snd_soc_dai_link haswell_rt5640_dais[] = { .stream_name = "Loopback", .cpu_dai_name = "Loopback Pin", .platform_name = "haswell-pcm-audio", - .dynamic = 0, + .dynamic = 1, .codec_name = "snd-soc-dummy", .codec_dai_name = "snd-soc-dummy-dai", .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
sound/soc/soc-dapm.c +5 -5
@@ -2009,19 +2009,19 @@ static ssize_t dapm_widget_power_read_file(struct file *file, out =is_connected_output_ep (w,NULL ,NULL ); } - ret =snprintf (buf,PAGE_SIZE ,"%s: %s%s in %d out %d" , + ret =scnprintf (buf,PAGE_SIZE ,"%s: %s%s in %d out %d" , w->name, w->power ?"On" :"Off" , w->force ?" (forced)" :"" , in, out);if (w->reg >=0 ) - ret +=snprintf (buf + ret,PAGE_SIZE - ret, + ret +=scnprintf (buf + ret,PAGE_SIZE - ret," - R%d(0x%x) mask 0x%x" , w->reg, w->reg, w->mask << w->shift); - ret +=snprintf (buf + ret,PAGE_SIZE - ret,"\n" ); + ret +=scnprintf (buf + ret,PAGE_SIZE - ret,"\n" );if (w->sname) - ret +=snprintf (buf + ret,PAGE_SIZE - ret," stream %s %s\n" , + ret +=scnprintf (buf + ret,PAGE_SIZE - ret," stream %s %s\n" , w->sname, w->active ?"active" :"inactive" );
@@ -2034,7 +2034,7 @@ static ssize_t dapm_widget_power_read_file(struct file *file,if (!p->connect)continue ; - ret += snprintf(buf + ret, PAGE_SIZE - ret, + ret += scnprintf(buf + ret, PAGE_SIZE - ret, " %s \"%s\" \"%s\"\n", (rdir == SND_SOC_DAPM_DIR_IN) ? "in" : "out", p->name ? p->name : "static",
tools/testing/selftests/gpio/gpio-mockup-chardev.c +6 -3
@@ -37,7 +37,7 @@ static int get_debugfs(char **path)struct libmnt_table *tb;struct libmnt_iter *itr =NULL ;struct libmnt_fs *fs; -int found =0 ; +int found =0 , ret; cxt =mnt_new_context ();if (!cxt)
@@ -58,8 +58,11 @@ static int get_debugfs(char **path)break ; } } -if (found) -asprintf (path,"%s/gpio" ,mnt_fs_get_target (fs)); +if (found) { + ret =asprintf (path,"%s/gpio" ,mnt_fs_get_target (fs)); +if (ret <0 ) +err (EXIT_FAILURE ,"failed to format string" ); + }mnt_free_iter (itr);mnt_free_context (cxt);
tools/testing/selftests/seccomp/Makefile +1 -1
@@ -9,7 +9,7 @@ BINARIES := seccomp_bpf seccomp_benchmark CFLAGS += -Wl,-no-as-needed -Wall seccomp_bpf: seccomp_bpf.c ../kselftest_harness.h - $(CC) $(CFLAGS) $(LDFLAGS) -lpthread $< -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $< -lpthread -o $@ TEST_PROGS += $(BINARIES) EXTRA_CLEAN := $(BINARIES)