Linux 4.9.147
Greg KH
maintainerI'm announcing the release of the 4.9.147 kernel.
All users of the 4.9 kernel series must upgrade.
The updated 4.9.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.9.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/io.h | 72 ++++++++++ arch/arm/mach-mmp/cputype.h | 6 arch/arm/mm/cache-v7.S | 8 - arch/arm/mm/cache-v7m.S | 14 +- arch/powerpc/kernel/msi.c | 7 - arch/x86/include/asm/qspinlock.h | 25 +++ arch/x86/include/asm/qspinlock_paravirt.h | 3 arch/x86/platform/efi/early_printk.c | 2 drivers/ata/libata-core.c | 1 drivers/clk/mmp/clk.c | 2 drivers/clk/mvebu/cp110-system-controller.c | 4 drivers/gpu/drm/ast/ast_fb.c | 1 drivers/gpu/drm/i915/intel_lrc.c | 7 - drivers/gpu/drm/msm/msm_atomic.c | 5 drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 6 drivers/i2c/busses/i2c-axxia.c | 40 ++++- drivers/i2c/busses/i2c-scmi.c | 10 + drivers/ide/pmac.c | 1 drivers/infiniband/hw/hfi1/user_sdma.c | 28 +--- drivers/infiniband/hw/hfi1/user_sdma.h | 7 - drivers/input/keyboard/omap4-keypad.c | 18 ++ drivers/mmc/host/omap.c | 11 + drivers/net/bonding/bond_3ad.c | 3 drivers/net/dsa/mv88e6060.c | 10 - drivers/net/ethernet/freescale/fman/fman.c | 5 drivers/net/ethernet/mellanox/mlx4/Kconfig | 2 drivers/net/wireless/mac80211_hwsim.c | 12 + drivers/nvme/target/rdma.c | 3 drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c | 2 drivers/rtc/rtc-snvs.c | 104 ++++++++++---- drivers/sbus/char/display7seg.c | 1 drivers/sbus/char/envctrl.c | 2 drivers/scsi/libiscsi.c | 4 drivers/scsi/vmw_pvscsi.c | 4 drivers/tty/serial/suncore.c | 1 drivers/vhost/vsock.c | 22 ++- fs/aio.c | 2 fs/cifs/Kconfig | 2 fs/nfs/direct.c | 9 + include/asm-generic/qspinlock_types.h | 32 ++++ include/linux/compat.h | 3 kernel/bpf/verifier.c | 3 kernel/locking/qspinlock.c | 195 +++++++++++++--------------- kernel/locking/qspinlock_paravirt.h | 42 +----- kernel/signal.c | 17 +- kernel/time/timer_list.c | 2 kernel/trace/ftrace.c | 1 kernel/trace/trace_events_trigger.c | 6 lib/interval_tree_test.c | 93 ++++++++----- lib/rbtree_test.c | 55 ++++--- net/mac80211/mlme.c | 3 net/sunrpc/xprt.c | 11 + 53 files changed, 603 insertions(+), 328 deletions(-)
Aaro Koskinen (1):
MMC: OMAP: fix broken MMC on OMAP15XX/OMAP5910/OMAP310
Adamski, Krzysztof (Nokia - PL/Wroclaw) (1):
i2c: axxia: properly handle master timeout
Alexei Starovoitov (1):
bpf: check pending signals while verifying programs
Alexey Khoroshilov (1):
mac80211_hwsim: fix module init error paths for netlink
Anderson Luiz Alves (1):
mv88e6060: disable hardware level MAC learning
Brian Norris (1):
Revert "drm/rockchip: Allow driver to be shutdown on reboot/kexec"
Cathy Avery (1):
scsi: vmw_pscsi: Rearrange code to avoid multiple calls to free_irq during unload
Chen-Yu Tsai (1):
pinctrl: sunxi: a83t: Fix IRQ offset typo for PH11
Chris Cole (1):
ARM: 8814/1: mm: improve/fix ARM v7_dma_inv_range() unaligned address handling
Chris Wilson (1):
drm/i915/execlists: Apply a full mb before execution for Braswell
Dan Carpenter (2):
clk: mvebu: Off by one bugs in cp110_of_clk_get()
clk: mmp: Off by one in mmp_clk_add()
Dave Kleikamp (1):
nfs: don't dirty kernel pages read by direct-io
Davidlohr Bueso (5):
lib/interval_tree_test.c: make test options module parameters lib/interval_tree_test.c: allow full tree search lib/rbtree_test.c: make input module parameters lib/rbtree-test: lower default params lib/interval_tree_test.c: allow users to limit scope of endpoint
Emmanuel Grumbach (1):
mac80211: don't WARN on bad WMM parameters from buggy APs
Fred Herard (1):
scsi: libiscsi: Fix NULL pointer dereference in iscsi_eh_session_reset
Greg Kroah-Hartman (1):
Linux 4.9.147
Guy Shapiro (1):
rtc: snvs: add a missing write sync
Hans de Goede (1):
i2c: scmi: Fix probe error on devices with an empty SMB0001 ACPI device node
Ilan Peer (1):
mac80211: Fix condition validating WMM IE
Ingo Molnar (1):
timer/debug: Change /proc/timer_list from 0444 to 0400
Israel Rukshin (1):
nvmet-rdma: fix response use after free
Jeff Moyer (1):
aio: fix spectre gadget in lookup_ioctx
Jose Abreu (1):
ARC: io.h: Implement reads{x}()/writes{x}()Juha-Matti Tilli (1):
libata: whitelist all SAMSUNG MZ7KM* solid-state disks
Lubomir Rintel (1):
ARM: mmp/mmp2: fix cpu_is_mmp2() on mmp2-dt
Michael J. Ruhl (1):
IB/hfi1: Remove race conditions in user_sdma send path
Nicolas Saenz Julienne (1):
ethernet: fman: fix wrong of_node_put() in probe function
Paul E. McKenney (1):
locking: Remove smp_read_barrier_depends() from queued_spin_lock_slowpath()
Peter Zijlstra (2):
locking/qspinlock: Re-order code locking/qspinlock, x86: Provide liveness guarantee
Radu Rendec (1):
powerpc/msi: Fix NULL pointer access in teardown code
Saeed Mahameed (1):
net/mlx4_en: Fix build break when CONFIG_INET is off
Sam Bobroff (1):
drm/ast: Fix connector leak during driver unload
Sean Paul (1):
drm/msm: Grab a vblank reference when waiting for commit_done
Stefan Hajnoczi (1):
vhost/vsock: fix reset orphans race with close timeout
Steve French (1):
cifs: In Kconfig CONFIG_CIFS_POSIX needs depends on legacy (insecure cifs)
Steven Rostedt (VMware) (3):
tracing: Fix memory leak in set_trigger_filter()
tracing: Fix memory leak of instance function hash filters locking/qspinlock: Fix build for anonymous union in older GCC compilers
Toni Peltonen (1):
bonding: fix 802.3ad state sent to partner when unbinding slave
Tony Lindgren (1):
Input: omap-keypad - fix keyboard debounce configuration
Trent Piepho (1):
rtc: snvs: Add timeouts to avoid kernel lockups
Trond Myklebust (1):
SUNRPC: Fix a potential race in xprt_connect()
Vladimir Murzin (1):
ARM: 8815/1: V7M: align v7m_dma_inv_range() with v7 counterpart
Will Deacon (8):
signal: Introduce COMPAT_SIGMINSTKSZ for use in compat_sys_sigaltstack locking/qspinlock: Ensure node is initialised before updating prev->next locking/qspinlock: Bound spinning on pending->locked transition in slowpath locking/qspinlock: Merge 'struct __qspinlock' into 'struct qspinlock' locking/qspinlock: Remove unbounded cmpxchg() loop from locking slowpath locking/qspinlock: Remove duplicate clear_pending() function from PV code locking/qspinlock: Kill cmpxchg() loop when claiming lock from head of queue locking/qspinlock/x86: Increase _Q_PENDING_LOOPS upper bound
Yangtao Li (4):
sbus: char: add of_node_put()
drivers/sbus/char: add of_node_put()
drivers/tty: add missing of_node_put()
ide: pmac: add of_node_put()
YiFei Zhu (1):
x86/earlyprintk/efi: Fix infinite loop on some screen widths
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 9 -SUBLEVEL = 146 +SUBLEVEL = 147 EXTRAVERSION = NAME = Roaring Lionus
arch/arc/include/asm/io.h +72 -0
100 lines not on this page · raw message
arch/arm/mach-mmp/cputype.h +4 -2
@@ -43,10 +43,12 @@ static inline int cpu_is_pxa910(void)#define cpu_is_pxa910 () (0)#endif -#ifdef CONFIG_CPU_MMP2 +#if defined(CONFIG_CPU_MMP2 ) || defined(CONFIG_MACH_MMP2_DT )static inline int cpu_is_mmp2 (void ) { -return (((read_cpuid_id () >>8 ) &0xff ) ==0x58 ); +return (((read_cpuid_id () >>8 ) &0xff ) ==0x58 ) && + (((mmp_chip_id &0xfff ) ==0x410 ) || + ((mmp_chip_id &0xfff ) ==0x610 )); }#else #define cpu_is_mmp2 () (0)
arch/arm/mm/cache-v7.S +5 -3
@@ -359,14 +359,16 @@ v7_dma_inv_range: ALT_UP(W(nop)) #endif mcrne p15, 0, r0, c7, c14, 1 @ clean & invalidate D / U line + addne r0, r0, r2 tst r1, r3 bic r1, r1, r3 mcrne p15, 0, r1, c7, c14, 1 @ clean & invalidate D / U line -1: - mcr p15, 0, r0, c7, c6, 1 @ invalidate D / U line - add r0, r0, r2 cmp r0, r1 +1: + mcrlo p15, 0, r0, c7, c6, 1 @ invalidate D / U line + addlo r0, r0, r2 + cmplo r0, r1 blo 1b dsb st ret lr
arch/arm/mm/cache-v7m.S +9 -5
@@ -73,9 +73,11 @@ /* * dcimvac: Invalidate data cache line by MVA to PoC */ -.macro dcimvac, rt, tmp - v7m_cacheop \rt, \tmp, V7M_SCB_DCIMVAC +.irp c,,eq,ne,cs,cc,mi,pl,vs,vc,hi,ls,ge,lt,gt,le,hs,lo +.macro dcimvac\c, rt, tmp + v7m_cacheop \rt, \tmp, V7M_SCB_DCIMVAC, \c .endm +.endr /* * dccmvau: Clean data cache line by MVA to PoU
@@ -369,14 +371,16 @@ v7m_dma_inv_range: tst r0, r3 bic r0, r0, r3 dccimvacne r0, r3 + addne r0, r0, r2 subne r3, r2, #1 @ restore r3, corrupted by v7m's dccimvac tst r1, r3 bic r1, r1, r3 dccimvacne r1, r3 -1: - dcimvac r0, r3 - add r0, r0, r2 cmp r0, r1 +1: + dcimvaclo r0, r3 + addlo r0, r0, r2 + cmplo r0, r1 blo 1b dsb st ret lr
arch/powerpc/kernel/msi.c +6 -1
@@ -34,5 +34,10 @@ void arch_teardown_msi_irqs(struct pci_dev *dev) {struct pci_controller *phb =pci_bus_to_host (dev->bus); - phb->controller_ops.teardown_msi_irqs (dev); +/* +* We can be called even when arch_setup_msi_irqs() returns -ENOSYS, +* so check the pointer again. +*/ +if (phb->controller_ops.teardown_msi_irqs) + phb->controller_ops.teardown_msi_irqs (dev); }
arch/x86/include/asm/qspinlock.h +24 -1
@@ -4,6 +4,29 @@#include <asm/cpufeature.h> #include <asm-generic/qspinlock_types.h> #include <asm/paravirt.h> +#include <asm/rmwcc.h> + +#define _Q_PENDING_LOOPS (1 << 9) + +#define queued_fetch_set_pending_acquire queued_fetch_set_pending_acquire + +static __always_inline bool __queued_RMW_btsl(struct qspinlock *lock) +{ +GEN_BINARY_RMWcc (LOCK_PREFIX "btsl" , lock->val.counter, +"I" , _Q_PENDING_OFFSET,"%0" , c); +} + +static __always_inline u32 queued_fetch_set_pending_acquire(struct qspinlock *lock) +{ +u32 val =0 ; + +if (__queued_RMW_btsl (lock)) + val |= _Q_PENDING_VAL; + + val |=atomic_read (&lock->val) & ~_Q_PENDING_MASK; + +return val; +}#define queued_spin_unlock queued_spin_unlock/**
@@ -14,7 +37,7 @@*/ static inline void native_queued_spin_unlock (struct qspinlock *lock) { -smp_store_release ((u8 *)lock,0 ); +smp_store_release (&lock->locked,0 ); }#ifdef CONFIG_PARAVIRT_SPINLOCKS
arch/x86/include/asm/qspinlock_paravirt.h +1 -2
@@ -21,8 +21,7 @@ PV_CALLEE_SAVE_REGS_THUNK(__pv_queued_spin_unlock_slowpath);* * void __pv_queued_spin_unlock(struct qspinlock *lock) * { -* struct __qspinlock *l = (void *)lock; -* u8 lockval = cmpxchg(&l->locked, _Q_LOCKED_VAL, 0); +* u8 lockval = cmpxchg(&lock->locked, _Q_LOCKED_VAL, 0); * * if (likely(lockval == _Q_LOCKED_VAL)) * return;
arch/x86/platform/efi/early_printk.c +1 -1
@@ -179,7 +179,7 @@ early_efi_write(struct console *con, const char *str, unsigned int num) num--; } -if (efi_x >= si->lfb_width) { +if (efi_x + font->width > si->lfb_width) { efi_x =0 ; efi_y += font->height; }
drivers/ata/libata-core.c +1 -0
@@ -4476,6 +4476,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { { "SSD*INTEL*", NULL, ATA_HORKAGE_ZERO_AFTER_TRIM, }, { "Samsung*SSD*", NULL, ATA_HORKAGE_ZERO_AFTER_TRIM, }, { "SAMSUNG*SSD*", NULL, ATA_HORKAGE_ZERO_AFTER_TRIM, }, + { "SAMSUNG*MZ7KM*", NULL, ATA_HORKAGE_ZERO_AFTER_TRIM, }, { "ST[1248][0248]0[FH]*", NULL, ATA_HORKAGE_ZERO_AFTER_TRIM, },/*
drivers/clk/mmp/clk.c +1 -1
@@ -182,7 +182,7 @@ void mmp_clk_add(struct mmp_clk_unit *unit, unsigned int id,pr_err ("CLK %d has invalid pointer %p\n" , id, clk);return ; } -if (id > unit->nr_clks) { +if (id >= unit->nr_clks) {pr_err ("CLK %d is invalid\n" , id);return ; }
drivers/clk/mvebu/cp110-system-controller.c +2 -2
@@ -172,11 +172,11 @@ static struct clk *cp110_of_clk_get(struct of_phandle_args *clkspec, void *data)unsigned int idx = clkspec->args[1 ];if (type ==CP110_CLK_TYPE_CORE ) { -if (idx >CP110_MAX_CORE_CLOCKS ) +if (idx >=CP110_MAX_CORE_CLOCKS )return ERR_PTR (-EINVAL );return clk_data->clks[idx]; }else if (type ==CP110_CLK_TYPE_GATABLE ) { -if (idx >CP110_MAX_GATABLE_CLOCKS ) +if (idx >=CP110_MAX_GATABLE_CLOCKS )return ERR_PTR (-EINVAL );return clk_data->clks[CP110_MAX_CORE_CLOCKS + idx]; }
drivers/gpu/drm/ast/ast_fb.c +1 -0
@@ -286,6 +286,7 @@ static void ast_fbdev_destroy(struct drm_device *dev, {struct ast_framebuffer *afb = &afbdev->afb; +drm_crtc_force_disable_all (dev);drm_fb_helper_unregister_fbi (&afbdev->helper);drm_fb_helper_release_fbi (&afbdev->helper);
drivers/gpu/drm/i915/intel_lrc.c +6 -1
@@ -386,8 +386,13 @@ static u64 execlists_update_context(struct drm_i915_gem_request *rq)* may not be visible to the HW prior to the completion of the UC * register write and that we may begin execution from the context * before its image is complete leading to invalid PD chasing. +* +* Furthermore, Braswell, at least, wants a full mb to be sure that +* the writes are coherent in memory (visible to the GPU) prior to +* execution, and not just visible to other CPUs (as is the result of +* wmb). */ -wmb (); +mb ();return ce->lrc_desc; }
drivers/gpu/drm/msm/msm_atomic.c +5 -0
@@ -98,7 +98,12 @@ static void msm_atomic_wait_for_commit_done(struct drm_device *dev,if (old_state->legacy_cursor_update)continue ; +if (drm_crtc_vblank_get (crtc)) +continue ; + kms->funcs->wait_for_crtc_commit_done (kms, crtc); + +drm_crtc_vblank_put (crtc); } }
drivers/gpu/drm/rockchip/rockchip_drm_drv.c +0 -6
@@ -478,11 +478,6 @@ static int rockchip_drm_platform_remove(struct platform_device *pdev)return 0 ; } -static void rockchip_drm_platform_shutdown (struct platform_device *pdev) -{ -rockchip_drm_platform_remove (pdev); -} -static const struct of_device_id rockchip_drm_dt_ids[] = { { .compatible ="rockchip,display-subsystem" , }, {/* sentinel */ },
@@ -492,7 +487,6 @@ MODULE_DEVICE_TABLE(of, rockchip_drm_dt_ids);static struct platform_driver rockchip_drm_platform_driver = { .probe = rockchip_drm_platform_probe, .remove = rockchip_drm_platform_remove, - .shutdown = rockchip_drm_platform_shutdown, .driver = { .name ="rockchip-drm" , .of_match_table = rockchip_drm_dt_ids,
drivers/i2c/busses/i2c-axxia.c +29 -11
@@ -74,8 +74,7 @@ MST_STATUS_ND)#define MST_STATUS_ERR (MST_STATUS_NAK | \ MST_STATUS_AL | \ - MST_STATUS_IP | \ - MST_STATUS_TSS) + MST_STATUS_IP)#define MST_TX_BYTES_XFRD 0x50#define MST_RX_BYTES_XFRD 0x54#define SCL_HIGH_PERIOD 0x80
@@ -241,7 +240,7 @@ static int axxia_i2c_empty_rx_fifo(struct axxia_i2c_dev *idev)*/ if (c <=0 || c >I2C_SMBUS_BLOCK_MAX ) { idev->msg_err = -EPROTO ; -i2c_int_disable (idev, ~0 ); +i2c_int_disable (idev, ~MST_STATUS_TSS );complete (&idev->msg_complete);break ; }
@@ -299,14 +298,19 @@ static irqreturn_t axxia_i2c_isr(int irq, void *_dev)if (status &MST_STATUS_SCC ) {/* Stop completed */ -i2c_int_disable (idev, ~0 ); +i2c_int_disable (idev, ~MST_STATUS_TSS );complete (&idev->msg_complete); }else if (status &MST_STATUS_SNS ) {/* Transfer done */ -i2c_int_disable (idev, ~0 ); +i2c_int_disable (idev, ~MST_STATUS_TSS );if (i2c_m_rd (idev->msg) && idev->msg_xfrd < idev->msg->len)axxia_i2c_empty_rx_fifo (idev);complete (&idev->msg_complete); + }else if (status &MST_STATUS_TSS ) { +/* Transfer timeout */ + idev->msg_err = -ETIMEDOUT ; +i2c_int_disable (idev, ~MST_STATUS_TSS ); +complete (&idev->msg_complete); }else if (unlikely (status &MST_STATUS_ERR )) {/* Transfer error */ i2c_int_disable (idev, ~0 );
@@ -339,10 +343,10 @@ static int axxia_i2c_xfer_msg(struct axxia_i2c_dev *idev, struct i2c_msg *msg)u32 rx_xfer, tx_xfer;u32 addr_1, addr_2;unsigned long time_left; +unsigned int wt_value; idev->msg = msg; idev->msg_xfrd =0 ; - idev->msg_err =0 ;reinit_completion (&idev->msg_complete);if (i2c_m_ten (msg)) {
@@ -382,9 +386,18 @@ static int axxia_i2c_xfer_msg(struct axxia_i2c_dev *idev, struct i2c_msg *msg)else if (axxia_i2c_fill_tx_fifo (idev) !=0 ) int_mask |=MST_STATUS_TFL ; + wt_value =WT_VALUE (readl (idev->base +WAIT_TIMER_CONTROL )); +/* Disable wait timer temporarly */ +writel (wt_value, idev->base +WAIT_TIMER_CONTROL ); +/* Check if timeout error happened */ +if (idev->msg_err) + goto out; +/* Start manual mode */ writel (CMD_MANUAL , idev->base +MST_COMMAND ); +writel (WT_EN | wt_value, idev->base +WAIT_TIMER_CONTROL ); +i2c_int_enable (idev, int_mask); time_left = wait_for_completion_timeout(&idev->msg_complete,
@@ -395,13 +408,15 @@ static int axxia_i2c_xfer_msg(struct axxia_i2c_dev *idev, struct i2c_msg *msg)if (readl (idev->base +MST_COMMAND ) &CMD_BUSY )dev_warn (idev->dev,"busy after xfer\n" ); -if (time_left ==0 ) +if (time_left ==0 ) { idev->msg_err = -ETIMEDOUT ; - -if (idev->msg_err == -ETIMEDOUT )i2c_recover_bus (&idev->adapter); +axxia_i2c_init (idev); + } -if (unlikely (idev->msg_err) && idev->msg_err != -ENXIO ) +out: +if (unlikely (idev->msg_err) && idev->msg_err != -ENXIO && + idev->msg_err != -ETIMEDOUT )axxia_i2c_init (idev);return idev->msg_err;
@@ -409,7 +424,7 @@ static int axxia_i2c_xfer_msg(struct axxia_i2c_dev *idev, struct i2c_msg *msg)static int axxia_i2c_stop (struct axxia_i2c_dev *idev) { -u32 int_mask =MST_STATUS_ERR |MST_STATUS_SCC ; +u32 int_mask =MST_STATUS_ERR |MST_STATUS_SCC |MST_STATUS_TSS ;unsigned long time_left;reinit_completion (&idev->msg_complete);
@@ -436,6 +451,9 @@ axxia_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)int i;int ret =0 ; + idev->msg_err =0 ; +i2c_int_enable (idev,MST_STATUS_TSS ); +for (i =0 ; ret ==0 && i < num; ++i) ret =axxia_i2c_xfer_msg (idev, &msgs[i]);
drivers/i2c/busses/i2c-scmi.c +7 -3
@@ -364,6 +364,7 @@ static int acpi_smbus_cmi_add(struct acpi_device *device) {struct acpi_smbus_cmi *smbus_cmi;const struct acpi_device_id *id; +int ret; smbus_cmi =kzalloc (sizeof (struct acpi_smbus_cmi ),GFP_KERNEL );if (!smbus_cmi)
@@ -385,8 +386,10 @@ static int acpi_smbus_cmi_add(struct acpi_device *device)acpi_walk_namespace (ACPI_TYPE_METHOD , smbus_cmi->handle,1 , acpi_smbus_cmi_query_methods,NULL , smbus_cmi,NULL ); -if (smbus_cmi->cap_info ==0 ) +if (smbus_cmi->cap_info ==0 ) { + ret = -ENODEV ; goto err; + } snprintf(smbus_cmi->adapter.name, sizeof(smbus_cmi->adapter.name), "SMBus CMI adapter %s",
@@ -397,7 +400,8 @@ static int acpi_smbus_cmi_add(struct acpi_device *device) smbus_cmi->adapter.class =I2C_CLASS_HWMON |I2C_CLASS_SPD ; smbus_cmi->adapter.dev.parent = &device->dev; -if (i2c_add_adapter (&smbus_cmi->adapter)) { + ret =i2c_add_adapter (&smbus_cmi->adapter); +if (ret) {dev_err (&device->dev,"Couldn't register adapter!\n" ); goto err; }
@@ -407,7 +411,7 @@ static int acpi_smbus_cmi_add(struct acpi_device *device) err:kfree (smbus_cmi); device->driver_data =NULL ; -return -EIO ; +return ret; }static int acpi_smbus_cmi_remove (struct acpi_device *device)
drivers/ide/pmac.c +1 -0
@@ -920,6 +920,7 @@ static u8 pmac_ide_cable_detect(ide_hwif_t *hwif)struct device_node *root =of_find_node_by_path ("/" );const char *model =of_get_property (root,"model" ,NULL ); +of_node_put (root);/* Get cable type from device-tree. */ if (cable && !strncmp (cable,"80-" ,3 )) {/* Some drives fail to detect 80c cable in PowerBook */
drivers/infiniband/hw/hfi1/user_sdma.c +10 -18
@@ -151,10 +151,6 @@ MODULE_PARM_DESC(sdma_comp_size, "Size of User SDMA completion ring. Default: 12#define SDMA_REQ_HAVE_AHG 1#define SDMA_REQ_HAS_ERROR 2 -#define SDMA_PKT_Q_INACTIVE BIT(0) -#define SDMA_PKT_Q_ACTIVE BIT(1) -#define SDMA_PKT_Q_DEFERRED BIT(2) -/* * Maximum retry attempts to submit a TX request * before putting the process to sleep.
@@ -408,7 +404,6 @@ int hfi1_user_sdma_alloc_queues(struct hfi1_ctxtdata *uctxt, struct file *fp) pq->ctxt = uctxt->ctxt; pq->subctxt = fd->subctxt; pq->n_max_reqs = hfi1_sdma_comp_ring_size; - pq->state =SDMA_PKT_Q_INACTIVE ;atomic_set (&pq->n_reqs,0 );init_waitqueue_head (&pq->wait);atomic_set (&pq->n_locked,0 );
@@ -491,7 +486,7 @@ int hfi1_user_sdma_free_queues(struct hfi1_filedata *fd)/* Wait until all requests have been freed. */ wait_event_interruptible ( pq->wait, - (ACCESS_ONCE (pq->state) ==SDMA_PKT_Q_INACTIVE )); + !atomic_read (&pq->n_reqs));kfree (pq->reqs);kfree (pq->req_in_use);kmem_cache_destroy (pq->txreq_cache);
@@ -527,6 +522,13 @@ static u8 dlid_to_selector(u16 dlid)return mapping[hash]; } +/** +* hfi1_user_sdma_process_request() - Process and start a user sdma request +* @fp: valid file pointer +* @iovec: array of io vectors to process +* @dim: overall iovec array size +* @count: number of io vector array entries processed +*/ int hfi1_user_sdma_process_request (struct file *fp,struct iovec *iovec,unsigned long dim,unsigned long *count) {
@@ -768,20 +770,12 @@ int hfi1_user_sdma_process_request(struct file *fp, struct iovec *iovec, }set_comp_state (pq, cq, info.comp_idx,QUEUED ,0 ); + pq->state =SDMA_PKT_Q_ACTIVE ;/* Send the first N packets in the request to buy us some time */ ret =user_sdma_send_pkts (req, pcount);if (unlikely (ret <0 && ret != -EBUSY )) goto free_req; -/* -* It is possible that the SDMA engine would have processed all the -* submitted packets by the time we get here. Therefore, only set -* packet queue state to ACTIVE if there are still uncompleted -* requests. -*/ -if (atomic_read (&pq->n_reqs)) -xchg (&pq->state,SDMA_PKT_Q_ACTIVE ); -/* * This is a somewhat blocking send implementation. * The driver will block the caller until all packets of the
@@ -1526,10 +1520,8 @@ static void user_sdma_txreq_cb(struct sdma_txreq *txreq, int status)static inline void pq_update (struct hfi1_user_sdma_pkt_q *pq) { -if (atomic_dec_and_test (&pq->n_reqs)) { -xchg (&pq->state,SDMA_PKT_Q_INACTIVE ); +if (atomic_dec_and_test (&pq->n_reqs))wake_up (&pq->wait); - } }static void user_sdma_free_request (struct user_sdma_request *req,bool unpin)
drivers/infiniband/hw/hfi1/user_sdma.h +6 -1
@@ -53,6 +53,11 @@extern uint extended_psn; +enum pkt_q_sdma_state { +SDMA_PKT_Q_ACTIVE , +SDMA_PKT_Q_DEFERRED , +}; +struct hfi1_user_sdma_pkt_q {struct list_head list;unsigned ctxt;
@@ -65,7 +70,7 @@ struct hfi1_user_sdma_pkt_q {struct user_sdma_request *reqs;unsigned long *req_in_use;struct iowait busy; -unsigned state; +enum pkt_q_sdma_state state;wait_queue_head_t wait;unsigned long unpinned;struct mmu_rb_handler *handler;
drivers/input/keyboard/omap4-keypad.c +14 -4
@@ -60,8 +60,18 @@/* OMAP4 values */ #define OMAP4_VAL_IRQDISABLE 0x0 -#define OMAP4_VAL_DEBOUNCINGTIME 0x7 -#define OMAP4_VAL_PVT 0x7 + +/* +* Errata i689: If a key is released for a time shorter than debounce time, +* the keyboard will idle and never detect the key release. The workaround +* is to use at least a 12ms debounce time. See omap5432 TRM chapter +* "26.4.6.2 Keyboard Controller Timer" for more information. +*/ +#define OMAP4_KEYPAD_PTV_DIV_128 0x6 +#define OMAP4_KEYPAD_DEBOUNCINGTIME_MS (dbms, ptv) \ + ((((dbms) * 1000) / ((1 << ((ptv) + 1)) * (1000000 / 32768))) - 1) +#define OMAP4_VAL_DEBOUNCINGTIME_16MS \ + OMAP4_KEYPAD_DEBOUNCINGTIME_MS(16, OMAP4_KEYPAD_PTV_DIV_128)enum {KBD_REVISION_OMAP4 =0 ,
@@ -181,9 +191,9 @@ static int omap4_keypad_open(struct input_dev *input)kbd_writel (keypad_data,OMAP4_KBD_CTRL ,OMAP4_DEF_CTRL_NOSOFTMODE | - (OMAP4_VAL_PVT <<OMAP4_DEF_CTRL_PTV_SHIFT )); + (OMAP4_KEYPAD_PTV_DIV_128 <<OMAP4_DEF_CTRL_PTV_SHIFT ));kbd_writel (keypad_data,OMAP4_KBD_DEBOUNCINGTIME , -OMAP4_VAL_DEBOUNCINGTIME ); +OMAP4_VAL_DEBOUNCINGTIME_16MS );/* clear pending interrupts */ kbd_write_irqreg (keypad_data,OMAP4_KBD_IRQSTATUS ,kbd_read_irqreg (keypad_data,OMAP4_KBD_IRQSTATUS ));
drivers/mmc/host/omap.c +9 -2
@@ -104,6 +104,7 @@ struct mmc_omap_slot {unsigned int vdd;u16 saved_con;u16 bus_mode; +u16 power_mode;unsigned int fclk_freq;struct tasklet_struct cover_tasklet;
@@ -1157,7 +1158,7 @@ static void mmc_omap_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)struct mmc_omap_slot *slot =mmc_priv (mmc);struct mmc_omap_host *host = slot->host;int i, dsor; -int clk_enabled; +int clk_enabled, init_stream;mmc_omap_select_slot (slot,0 );
@@ -1167,6 +1168,7 @@ static void mmc_omap_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) slot->vdd = ios->vdd; clk_enabled =0 ; + init_stream =0 ;switch (ios->power_mode) {case MMC_POWER_OFF :mmc_omap_set_power (slot,0 , ios->vdd);
@@ -1174,13 +1176,17 @@ static void mmc_omap_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)case MMC_POWER_UP :/* Cannot touch dsor yet, just power up MMC */ mmc_omap_set_power (slot,1 , ios->vdd); + slot->power_mode = ios->power_mode; goto exit;case MMC_POWER_ON :mmc_omap_fclk_enable (host,1 ); clk_enabled =1 ; dsor |=1 <<11 ; +if (slot->power_mode !=MMC_POWER_ON ) + init_stream =1 ;break ; } + slot->power_mode = ios->power_mode;if (slot->bus_mode != ios->bus_mode) {if (slot->pdata->set_bus_mode !=NULL )
@@ -1196,7 +1202,7 @@ static void mmc_omap_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)for (i =0 ; i <2 ; i++)OMAP_MMC_WRITE (host,CON , dsor); slot->saved_con = dsor; -if (ios->power_mode ==MMC_POWER_ON ) { +if (init_stream) {/* worst case at 400kHz, 80 cycles makes 200 microsecs */ int usecs =250 ;
@@ -1234,6 +1240,7 @@ static int mmc_omap_new_slot(struct mmc_omap_host *host, int id) slot->host = host; slot->mmc = mmc; slot->id = id; + slot->power_mode =MMC_POWER_UNDEFINED ; slot->pdata = &host->pdata->slots[id]; host->slots[id] = slot;
drivers/net/bonding/bond_3ad.c +3 -0
@@ -2050,6 +2050,9 @@ void bond_3ad_unbind_slave(struct slave *slave) aggregator->aggregator_identifier);/* Tell the partner that this port is not suitable for aggregation */ + port->actor_oper_port_state &= ~AD_STATE_SYNCHRONIZATION ; + port->actor_oper_port_state &= ~AD_STATE_COLLECTING ; + port->actor_oper_port_state &= ~AD_STATE_DISTRIBUTING ; port->actor_oper_port_state &= ~AD_STATE_AGGREGATION ;__update_lacpdu_from_port (port);ad_lacpdu_send (port);
drivers/net/dsa/mv88e6060.c +3 -7
@@ -114,8 +114,7 @@ static int mv88e6060_switch_reset(struct dsa_switch *ds)/* Reset the switch. */ REG_WRITE (REG_GLOBAL ,GLOBAL_ATU_CONTROL ,GLOBAL_ATU_CONTROL_SWRESET | -GLOBAL_ATU_CONTROL_ATUSIZE_1024 | -GLOBAL_ATU_CONTROL_ATE_AGE_5MIN ); +GLOBAL_ATU_CONTROL_LEARNDIS );/* Wait up to one second for reset to complete. */ timeout = jiffies +1 *HZ ;
@@ -140,13 +139,10 @@ static int mv88e6060_setup_global(struct dsa_switch *ds)*/ REG_WRITE (REG_GLOBAL ,GLOBAL_CONTROL ,GLOBAL_CONTROL_MAX_FRAME_1536 ); -/* Enable automatic address learning, set the address -* database size to 1024 entries, and set the default aging -* time to 5 minutes. +/* Disable automatic address learning. */ REG_WRITE (REG_GLOBAL ,GLOBAL_ATU_CONTROL , -GLOBAL_ATU_CONTROL_ATUSIZE_1024 | -GLOBAL_ATU_CONTROL_ATE_AGE_5MIN ); +GLOBAL_ATU_CONTROL_LEARNDIS );return 0 ; }
drivers/net/ethernet/freescale/fman/fman.c +2 -3
@@ -2817,7 +2817,7 @@ static struct fman *read_dts_node(struct platform_device *of_dev)if (!muram_node) {dev_err (&of_dev->dev,"%s: could not find MURAM node\n" , __func__); - goto fman_node_put; + goto fman_free; } err = of_address_to_resource(muram_node, 0,
@@ -2826,11 +2826,10 @@ static struct fman *read_dts_node(struct platform_device *of_dev)of_node_put (muram_node);dev_err (&of_dev->dev,"%s: of_address_to_resource() = %d\n" , __func__, err); - goto fman_node_put; + goto fman_free; }of_node_put (muram_node); -of_node_put (fm_node); err =devm_request_irq (&of_dev->dev, irq, fman_irq,0 ,"fman" , fman);if (err <0 ) {
drivers/net/ethernet/mellanox/mlx4/Kconfig +1 -1
@@ -5,7 +5,7 @@ config MLX4_EN tristate "Mellanox Technologies 1/10/40Gbit Ethernet support" depends on MAY_USE_DEVLINK - depends on PCI + depends on PCI && NETDEVICES && ETHERNET && INET select MLX4_CORE select PTP_1588_CLOCK ---help---
drivers/net/wireless/mac80211_hwsim.c +7 -5
@@ -3403,16 +3403,16 @@ static int __init init_mac80211_hwsim(void)if (err) goto out_unregister_pernet; + err =hwsim_init_netlink (); +if (err) + goto out_unregister_driver; + hwsim_class =class_create (THIS_MODULE ,"mac80211_hwsim" );if (IS_ERR (hwsim_class)) { err =PTR_ERR (hwsim_class); - goto out_unregister_driver; + goto out_exit_netlink; } - err =hwsim_init_netlink (); -if (err <0 ) - goto out_unregister_driver; -for (i =0 ; i < radios; i++) {struct hwsim_new_radio_params param = {0 };
@@ -3518,6 +3518,8 @@ static int __init init_mac80211_hwsim(void)free_netdev (hwsim_mon); out_free_radios:mac80211_hwsim_free (); +out_exit_netlink: +hwsim_exit_netlink (); out_unregister_driver:platform_driver_unregister (&mac80211_hwsim_driver); out_unregister_pernet:
drivers/nvme/target/rdma.c +2 -1
@@ -524,6 +524,7 @@ static void nvmet_rdma_send_done(struct ib_cq *cq, struct ib_wc *wc) {struct nvmet_rdma_rsp *rsp = container_of(wc->wr_cqe, struct nvmet_rdma_rsp, send_cqe); +struct nvmet_rdma_queue *queue = cq->cq_context;nvmet_rdma_release_rsp (rsp);
@@ -531,7 +532,7 @@ static void nvmet_rdma_send_done(struct ib_cq *cq, struct ib_wc *wc) wc->status != IB_WC_WR_FLUSH_ERR)) {pr_err ("SEND for CQE 0x%p failed with status %s (%d).\n" , wc->wr_cqe,ib_wc_status_msg (wc->status), wc->status); -nvmet_rdma_error_comp (rsp->queue); +nvmet_rdma_error_comp (queue); } }
drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c +1 -1
@@ -568,7 +568,7 @@ static const struct sunxi_desc_pin sun8i_a83t_pins[] = {SUNXI_PIN (SUNXI_PINCTRL_PIN (H ,11 ),SUNXI_FUNCTION (0x0 ,"gpio_in" ),SUNXI_FUNCTION (0x1 ,"gpio_out" ), - SUNXI_FUNCTION_IRQ_BANK(0x6, 2, 1)), /* PH_EINT11 */ + SUNXI_FUNCTION_IRQ_BANK(0x6, 2, 11)), /* PH_EINT11 */ };static const struct sunxi_pinctrl_desc sun8i_a83t_pinctrl_data = {
drivers/rtc/rtc-snvs.c +70 -34
138 lines not on this page · raw message
drivers/sbus/char/display7seg.c +1 -0
@@ -221,6 +221,7 @@ static int d7s_probe(struct platform_device *op)dev_set_drvdata (&op->dev, p); d7s_device = p; err =0 ; +of_node_put (opts); out:return err;
drivers/sbus/char/envctrl.c +2 -0
@@ -910,8 +910,10 @@ static void envctrl_init_i2c_child(struct device_node *dp,for (len =0 ; len <PCF8584_MAX_CHANNELS ; ++len) { pchild->mon_type[len] =ENVCTRL_NOMON ; } +of_node_put (root_node);return ; } +of_node_put (root_node); }/* Get the monitor channels. */
drivers/scsi/libiscsi.c +2 -2
@@ -2414,8 +2414,8 @@ int iscsi_eh_session_reset(struct scsi_cmnd *sc) failed:ISCSI_DBG_EH (session,"failing session reset: Could not log back into " -"%s, %s [age %d]\n" , session->targetname, - conn->persistent_address, session->age); +"%s [age %d]\n" , session->targetname, + session->age);spin_unlock_bh (&session->frwd_lock);mutex_unlock (&session->eh_mutex);return FAILED ;
drivers/scsi/vmw_pvscsi.c +2 -2
@@ -1233,8 +1233,6 @@ static void pvscsi_shutdown_intr(struct pvscsi_adapter *adapter)static void pvscsi_release_resources (struct pvscsi_adapter *adapter) { -pvscsi_shutdown_intr (adapter); -if (adapter->workqueue)destroy_workqueue (adapter->workqueue);
@@ -1563,6 +1561,7 @@ static int pvscsi_probe(struct pci_dev *pdev, const struct pci_device_id *id) out_reset_adapter:ll_adapter_reset (adapter); out_release_resources: +pvscsi_shutdown_intr (adapter);pvscsi_release_resources (adapter);scsi_host_put (host); out_disable_device:
@@ -1571,6 +1570,7 @@ static int pvscsi_probe(struct pci_dev *pdev, const struct pci_device_id *id)return error; out_release_resources_and_disable: +pvscsi_shutdown_intr (adapter);pvscsi_release_resources (adapter); goto out_disable_device; }
drivers/tty/serial/suncore.c +1 -0
@@ -111,6 +111,7 @@ void sunserial_console_termios(struct console *con, struct device_node *uart_dp) mode =of_get_property (dp, mode_prop,NULL );if (!mode) mode ="9600,8,n,1,-" ; +of_node_put (dp); } cflag =CREAD |HUPCL |CLOCAL ;
drivers/vhost/vsock.c +15 -7
@@ -559,13 +559,21 @@ static void vhost_vsock_reset_orphans(struct sock *sk)* executing. */ -if (!vhost_vsock_get (vsk->remote_addr.svm_cid)) { -sock_set_flag (sk,SOCK_DONE ); - vsk->peer_shutdown =SHUTDOWN_MASK ; - sk->sk_state =SS_UNCONNECTED ; - sk->sk_err =ECONNRESET ; - sk->sk_error_report (sk); - } +/* If the peer is still valid, no need to reset connection */ +if (vhost_vsock_get (vsk->remote_addr.svm_cid)) +return ; + +/* If the close timeout is pending, let it expire. This avoids races +* with the timeout callback. +*/ +if (vsk->close_work_scheduled) +return ; + +sock_set_flag (sk,SOCK_DONE ); + vsk->peer_shutdown =SHUTDOWN_MASK ; + sk->sk_state =SS_UNCONNECTED ; + sk->sk_err =ECONNRESET ; + sk->sk_error_report (sk); }static int vhost_vsock_dev_release (struct inode *inode,struct file *file)
fs/aio.c +2 -0
@@ -40,6 +40,7 @@#include <linux/ramfs.h> #include <linux/percpu-refcount.h> #include <linux/mount.h> +#include <linux/nospec.h> #include <asm/kmap_types.h> #include <asm/uaccess.h>
@@ -1071,6 +1072,7 @@ static struct kioctx *lookup_ioctx(unsigned long ctx_id)if (!table || id >= table->nr) goto out; + id =array_index_nospec (id, table->nr); ctx =rcu_dereference (table->table[id]);if (ctx && ctx->user_id == ctx_id) {if (percpu_ref_tryget_live (&ctx->users))
fs/cifs/Kconfig +1 -1
@@ -111,7 +111,7 @@ config CIFS_XATTR config CIFS_POSIX bool "CIFS POSIX Extensions" - depends on CIFS_XATTR + depends on CIFS && CIFS_ALLOW_INSECURE_LEGACY && CIFS_XATTR help Enabling this option will cause the cifs client to attempt to negotiate a newer dialect with servers, such as Samba 3.0.5
fs/nfs/direct.c +8 -1
@@ -98,8 +98,11 @@ struct nfs_direct_req {struct pnfs_ds_commit_info ds_cinfo;/* Storage for cinfo */ struct work_struct work;int flags; +/* for write */ #define NFS_ODIRECT_DO_COMMIT (1)/* an unstable reply was received */ #define NFS_ODIRECT_RESCHED_WRITES (2)/* write verification failed */ +/* for read */ +#define NFS_ODIRECT_SHOULD_DIRTY (3)/* dirty user-space page after read */ struct nfs_writeverf verf;/* unstable write verifier */ };
@@ -422,7 +425,8 @@ static void nfs_direct_read_completion(struct nfs_pgio_header *hdr)struct nfs_page *req =nfs_list_entry (hdr->pages.next);struct page *page = req->wb_page; -if (!PageCompound (page) && bytes < hdr->good_bytes) +if (!PageCompound (page) && bytes < hdr->good_bytes && + (dreq->flags ==NFS_ODIRECT_SHOULD_DIRTY ))set_page_dirty (page); bytes += req->wb_bytes;nfs_list_remove_request (req);
@@ -597,6 +601,9 @@ ssize_t nfs_file_direct_read(struct kiocb *iocb, struct iov_iter *iter)if (!is_sync_kiocb (iocb)) dreq->iocb = iocb; +if (iter_is_iovec (iter)) + dreq->flags =NFS_ODIRECT_SHOULD_DIRTY ; +nfs_start_io_direct (inode);NFS_I (inode)->read_io += count;
include/asm-generic/qspinlock_types.h +30 -2
@@ -29,13 +29,41 @@#endif typedef struct qspinlock { -atomic_t val; +union { +atomic_t val; + +/* +* By using the whole 2nd least significant byte for the +* pending bit, we can allow better optimization of the lock +* acquisition for the pending bit holder. +*/ +#ifdef __LITTLE_ENDIAN +struct { +u8 locked; +u8 pending; + }; +struct { +u16 locked_pending; +u16 tail; + }; +#else +struct { +u16 tail; +u16 locked_pending; + }; +struct { +u8 reserved[2 ]; +u8 pending; +u8 locked; + }; +#endif + }; }arch_spinlock_t ;/* * Initializier */ -#define __ARCH_SPIN_LOCK_UNLOCKED { ATOMIC_INIT(0) } +#define __ARCH_SPIN_LOCK_UNLOCKED { { .val = ATOMIC_INIT(0) } }/* * Bitfields in the atomic value:
include/linux/compat.h +3 -0
@@ -67,6 +67,9 @@ typedef struct compat_sigaltstack { compat_size_t ss_size; } compat_stack_t;#endif +#ifndef COMPAT_MINSIGSTKSZ +#define COMPAT_MINSIGSTKSZ MINSIGSTKSZ +#endif #define compat_jiffies_to_clock_t (x) \ (((unsigned long)(x) * COMPAT_USER_HZ) / HZ)
kernel/bpf/verifier.c +3 -0
@@ -2919,6 +2919,9 @@ static int do_check(struct bpf_verifier_env *env) goto process_bpf_exit; } +if (signal_pending (current)) +return -EAGAIN ; +if (need_resched ())cond_resched ();
kernel/locking/qspinlock.c +96 -99
309 lines not on this page · raw message
kernel/locking/qspinlock_paravirt.h +10 -32
126 lines not on this page · raw message
kernel/signal.c +10 -7
@@ -3116,7 +3116,8 @@ int do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact) }static int -do_sigaltstack (const stack_t __user *uss,stack_t __user *uoss,unsigned long sp) +do_sigaltstack (const stack_t __user *uss,stack_t __user *uoss,unsigned long sp, +size_t min_ss_size) {stack_t oss;int error;
@@ -3155,9 +3156,8 @@ do_sigaltstack (const stack_t __user *uss, stack_t __user *uoss, unsigned long s ss_size =0 ; ss_sp =NULL ; }else { - error = -ENOMEM ; -if (ss_size <MINSIGSTKSZ ) - goto out; +if (unlikely (ss_size < min_ss_size)) +return -ENOMEM ; } current->sas_ss_sp = (unsigned long ) ss_sp;
@@ -3180,12 +3180,14 @@ do_sigaltstack (const stack_t __user *uss, stack_t __user *uoss, unsigned long s } SYSCALL_DEFINE2(sigaltstack,const stack_t __user *,uss, stack_t __user *,uoss) { -return do_sigaltstack (uss, uoss,current_user_stack_pointer ()); +return do_sigaltstack (uss, uoss,current_user_stack_pointer (), +MINSIGSTKSZ ); }int restore_altstack (const stack_t __user *uss) { -int err =do_sigaltstack (uss,NULL ,current_user_stack_pointer ()); +int err =do_sigaltstack (uss,NULL ,current_user_stack_pointer (), +MINSIGSTKSZ );/* squash all but EFAULT for now */ return err == -EFAULT ? err :0 ; }
@@ -3226,7 +3228,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,set_fs (KERNEL_DS ); ret =do_sigaltstack ((stack_t __force __user *) (uss_ptr ? &uss :NULL ), (stack_t __force __user *) &uoss, -compat_user_stack_pointer ()); +compat_user_stack_pointer (), +COMPAT_MINSIGSTKSZ );set_fs (seg);if (ret >=0 && uoss_ptr) { if (!access_ok(VERIFY_WRITE, uoss_ptr, sizeof(compat_stack_t)) ||
kernel/time/timer_list.c +1 -1
@@ -399,7 +399,7 @@ static int __init init_timer_list_procfs(void) {struct proc_dir_entry *pe; - pe =proc_create ("timer_list" ,0444 ,NULL , &timer_list_fops); + pe =proc_create ("timer_list" ,0400 ,NULL , &timer_list_fops);if (!pe)return -ENOMEM ;return 0 ;
kernel/trace/ftrace.c +1 -0
@@ -4836,6 +4836,7 @@ void ftrace_destroy_filter_files(struct ftrace_ops *ops)if (ops->flags &FTRACE_OPS_FL_ENABLED )ftrace_shutdown (ops,0 ); ops->flags |=FTRACE_OPS_FL_DELETED ; +ftrace_free_filter (ops);mutex_unlock (&ftrace_lock); }
kernel/trace/trace_events_trigger.c +4 -2
@@ -742,8 +742,10 @@ int set_trigger_filter(char *filter_str,/* The filter is for the 'trigger' event, not the triggered event */ ret =create_event_filter (file->event_call, filter_str, false, &filter); -if (ret) - goto out; +/* +* If create_event_filter() fails, filter still needs to be freed. +* Which the calling code will do with data->filter. +*/ assign: tmp =rcu_access_pointer (data->filter);
lib/interval_tree_test.c +62 -31
153 lines not on this page · raw message
lib/rbtree_test.c +34 -21
124 lines not on this page · raw message
net/mac80211/mlme.c +2 -1
@@ -1867,7 +1867,8 @@ static bool ieee80211_sta_wmm_params(struct ieee80211_local *local, params[ac].acm = acm; params[ac].uapsd = uapsd; -if (params[ac].cw_min > params[ac].cw_max) { +if (params[ac].cw_min ==0 || + params[ac].cw_min > params[ac].cw_max) {sdata_info (sdata,"AP has invalid WMM params (CWmin/max=%d/%d for ACI %d), using defaults\n" , params[ac].cw_min, params[ac].cw_max, aci);
net/sunrpc/xprt.c +9 -2
@@ -778,8 +778,15 @@ void xprt_connect(struct rpc_task *task)return ;if (xprt_test_and_set_connecting (xprt))return ; - xprt->stat.connect_start = jiffies; - xprt->ops->connect (xprt, task); +/* Race breaker */ +if (!xprt_connected (xprt)) { + xprt->stat.connect_start = jiffies; + xprt->ops->connect (xprt, task); + }else { +xprt_clear_connecting (xprt); + task->tk_status =0 ; +rpc_wake_up_queued_task (&xprt->pending, task); + } }xprt_release_write (xprt, task); }