- Linux-stable-mirror - lists.linaro.org

[Linux-stable-mirror] [PATCH 6/6] can: peak/pcie_fd: fix potential bug in restarting tx queue

by Marc Kleine-Budde

From: Stephane Grosjean <s.grosjean(a)peak-system.com> Don't rely on can_get_echo_skb() return value to wake the network tx queue up: can_get_echo_skb() returns 0 if the echo array slot was not occupied, but also when the DLC of the released echo frame was 0. Signed-off-by: Stephane Grosjean <s.grosjean(a)peak-system.com> Cc: linux-stable <stable(a)vger.kernel.org> Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> --- drivers/net/can/peak_canfd/peak_canfd.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/net/can/peak_canfd/peak_canfd.c b/drivers/net/can/peak_canfd/peak_canfd.c index 85268be0c913..55513411a82e 100644 --- a/drivers/net/can/peak_canfd/peak_canfd.c +++ b/drivers/net/can/peak_canfd/peak_canfd.c @@ -258,21 +258,18 @@ static int pucan_handle_can_rx(struct peak_canfd_priv *priv, /* if this frame is an echo, */ if ((rx_msg_flags & PUCAN_MSG_LOOPED_BACK) && !(rx_msg_flags & PUCAN_MSG_SELF_RECEIVE)) { - int n; unsigned long flags; spin_lock_irqsave(&priv->echo_lock, flags); - n = can_get_echo_skb(priv->ndev, msg->client); + can_get_echo_skb(priv->ndev, msg->client); spin_unlock_irqrestore(&priv->echo_lock, flags); /* count bytes of the echo instead of skb */ stats->tx_bytes += cf_len; stats->tx_packets++; - if (n) { - /* restart tx queue only if a slot is free */ - netif_wake_queue(priv->ndev); - } + /* restart tx queue (a slot is free) */ + netif_wake_queue(priv->ndev); return 0; } -- 2.15.0

7 years, 6 months

1
0
0 0

[Linux-stable-mirror] [PATCH 5/6] can: usb_8dev: cancel urb on -EPIPE and -EPROTO

by Marc Kleine-Budde

From: Martin Kelly <mkelly(a)xevo.com> In mcba_usb, we have observed that when you unplug the device, the driver will endlessly resubmit failing URBs, which can cause CPU stalls. This issue is fixed in mcba_usb by catching the codes seen on device disconnect (-EPIPE and -EPROTO). This driver also resubmits in the case of -EPIPE and -EPROTO, so fix it in the same way. Signed-off-by: Martin Kelly <mkelly(a)xevo.com> Cc: linux-stable <stable(a)vger.kernel.org> Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> --- drivers/net/can/usb/usb_8dev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/can/usb/usb_8dev.c b/drivers/net/can/usb/usb_8dev.c index d000cb62d6ae..27861c417c94 100644 --- a/drivers/net/can/usb/usb_8dev.c +++ b/drivers/net/can/usb/usb_8dev.c @@ -524,6 +524,8 @@ static void usb_8dev_read_bulk_callback(struct urb *urb) break; case -ENOENT: + case -EPIPE: + case -EPROTO: case -ESHUTDOWN: return; -- 2.15.0

7 years, 6 months

1
0
0 0

[Linux-stable-mirror] [PATCH 4/6] can: kvaser_usb: cancel urb on -EPIPE and -EPROTO

by Marc Kleine-Budde

From: Martin Kelly <mkelly(a)xevo.com> In mcba_usb, we have observed that when you unplug the device, the driver will endlessly resubmit failing URBs, which can cause CPU stalls. This issue is fixed in mcba_usb by catching the codes seen on device disconnect (-EPIPE and -EPROTO). This driver also resubmits in the case of -EPIPE and -EPROTO, so fix it in the same way. Signed-off-by: Martin Kelly <mkelly(a)xevo.com> Cc: linux-stable <stable(a)vger.kernel.org> Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> --- drivers/net/can/usb/kvaser_usb.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/can/usb/kvaser_usb.c b/drivers/net/can/usb/kvaser_usb.c index f95945915d20..63587b8e6825 100644 --- a/drivers/net/can/usb/kvaser_usb.c +++ b/drivers/net/can/usb/kvaser_usb.c @@ -1326,6 +1326,8 @@ static void kvaser_usb_read_bulk_callback(struct urb *urb) case 0: break; case -ENOENT: + case -EPIPE: + case -EPROTO: case -ESHUTDOWN: return; default: -- 2.15.0

7 years, 6 months

1
0
0 0

[Linux-stable-mirror] [PATCH 3/6] can: esd_usb2: cancel urb on -EPIPE and -EPROTO

by Marc Kleine-Budde

From: Martin Kelly <mkelly(a)xevo.com> In mcba_usb, we have observed that when you unplug the device, the driver will endlessly resubmit failing URBs, which can cause CPU stalls. This issue is fixed in mcba_usb by catching the codes seen on device disconnect (-EPIPE and -EPROTO). This driver also resubmits in the case of -EPIPE and -EPROTO, so fix it in the same way. Signed-off-by: Martin Kelly <mkelly(a)xevo.com> Cc: linux-stable <stable(a)vger.kernel.org> Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> --- drivers/net/can/usb/esd_usb2.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/can/usb/esd_usb2.c b/drivers/net/can/usb/esd_usb2.c index 9fdb0f0bfa06..c6dcf93675c0 100644 --- a/drivers/net/can/usb/esd_usb2.c +++ b/drivers/net/can/usb/esd_usb2.c @@ -393,6 +393,8 @@ static void esd_usb2_read_bulk_callback(struct urb *urb) break; case -ENOENT: + case -EPIPE: + case -EPROTO: case -ESHUTDOWN: return; -- 2.15.0

7 years, 6 months

1
0
0 0

[Linux-stable-mirror] [PATCH 2/6] can: ems_usb: cancel urb on -EPIPE and -EPROTO

by Marc Kleine-Budde

From: Martin Kelly <mkelly(a)xevo.com> In mcba_usb, we have observed that when you unplug the device, the driver will endlessly resubmit failing URBs, which can cause CPU stalls. This issue is fixed in mcba_usb by catching the codes seen on device disconnect (-EPIPE and -EPROTO). This driver also resubmits in the case of -EPIPE and -EPROTO, so fix it in the same way. Signed-off-by: Martin Kelly <mkelly(a)xevo.com> Cc: linux-stable <stable(a)vger.kernel.org> Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> --- drivers/net/can/usb/ems_usb.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c index b3d02759c226..b00358297424 100644 --- a/drivers/net/can/usb/ems_usb.c +++ b/drivers/net/can/usb/ems_usb.c @@ -288,6 +288,8 @@ static void ems_usb_read_interrupt_callback(struct urb *urb) case -ECONNRESET: /* unlink */ case -ENOENT: + case -EPIPE: + case -EPROTO: case -ESHUTDOWN: return; -- 2.15.0

7 years, 6 months

1
0
0 0

[Linux-stable-mirror] [PATCH 1/6] can: mcba_usb: cancel urb on -EPROTO

by Marc Kleine-Budde

From: Martin Kelly <mkelly(a)xevo.com> When we unplug the device, we can see both -EPIPE and -EPROTO depending on exact timing and what system we run on. If we continue to resubmit URBs, they will immediately fail, and they can cause stalls, especially on slower CPUs. Fix this by not resubmitting on -EPROTO, as we already do on -EPIPE. Signed-off-by: Martin Kelly <mkelly(a)xevo.com> Cc: linux-stable <stable(a)vger.kernel.org> Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> --- drivers/net/can/usb/mcba_usb.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/can/usb/mcba_usb.c b/drivers/net/can/usb/mcba_usb.c index ef417dcddbf7..8d8c2086424d 100644 --- a/drivers/net/can/usb/mcba_usb.c +++ b/drivers/net/can/usb/mcba_usb.c @@ -593,6 +593,7 @@ static void mcba_usb_read_bulk_callback(struct urb *urb) case -ENOENT: case -EPIPE: + case -EPROTO: case -ESHUTDOWN: return; -- 2.15.0

7 years, 6 months

1
0
0 0

[Linux-stable-mirror] [PATCH v3 3/4] x86/xen: fix boot loader version reported for pvh guests

by Juergen Gross

The boot loader version reported via sysfs is wrong in case of the kernel being booted via the Xen PVH boot entry. it should be 2.12 (0x020c), but it is reported to be 2.18 (0x0212). As the current way to set the version is error prone use the more readable variant (2 << 8) | 12. Cc: <stable(a)vger.kernel.org> # 4.12 Signed-off-by: Juergen Gross <jgross(a)suse.com> --- arch/x86/xen/enlighten_pvh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/xen/enlighten_pvh.c b/arch/x86/xen/enlighten_pvh.c index 436c4f003e17..6e6430cb5e3f 100644 --- a/arch/x86/xen/enlighten_pvh.c +++ b/arch/x86/xen/enlighten_pvh.c @@ -69,7 +69,7 @@ static void __init init_pvh_bootparams(void) * Version 2.12 supports Xen entry point but we will use default x86/PC * environment (i.e. hardware_subarch 0). */ - pvh_bootparams.hdr.version = 0x212; + pvh_bootparams.hdr.version = (2 << 8) | 12; pvh_bootparams.hdr.type_of_loader = (9 << 4) | 0; /* Xen loader */ } -- 2.12.3

7 years, 6 months

1
0
0 0

[Linux-stable-mirror] [PATCH 4.9 000/109] 4.9.68-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.9.68 release. There are 109 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Sat Dec 9 12:56:03 UTC 2017. Anything received after that time might be too late. The whole patch series can be found in one patch at: kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.68-rc1.gz or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.9.68-rc1 Colin Ian King <colin.king(a)canonical.com> usb: host: fix incorrect updating of offset Oliver Neukum <oneukum(a)suse.com> USB: usbfs: Filter flags passed in from user space Dan Carpenter <dan.carpenter(a)oracle.com> USB: devio: Prevent integer overflow in proc_do_submiturb() Mateusz Berezecki <mateuszb(a)fastmail.fm> USB: Increase usbfs transfer limit Masakazu Mokuno <masakazu.mokuno(a)gmail.com> USB: core: Add type-specific length check of BOS descriptors Yu Chen <chenyu56(a)huawei.com> usb: xhci: fix panic in xhci_free_virt_devices_depth_first Mike Looijmans <mike.looijmans(a)topic.nl> usb: hub: Cycle HUB power when initialization fails Daniel Vetter <daniel.vetter(a)ffwll.ch> dma-buf: Update kerneldoc for sync_file_create Gustavo Padovan <gustavo.padovan(a)collabora.co.uk> dma-buf/sync_file: hold reference to fence when creating sync_file Dominik Behr <dbehr(a)chromium.org> dma-buf/sw_sync: force signal all unsignaled fences on dying timeline Chris Wilson <chris(a)chris-wilson.co.uk> dma-fence: Introduce drm_fence_set_error() helper Chris Wilson <chris(a)chris-wilson.co.uk> dma-fence: Wrap querying the fence->status Chris Wilson <chris(a)chris-wilson.co.uk> dma-fence: Clear fence->status during dma_fence_init() Gustavo Padovan <gustavo.padovan(a)collabora.com> dma-buf/sw_sync: clean up list before signaling the fence Gustavo Padovan <gustavo.padovan(a)collabora.com> dma-buf/sw_sync: move timeline_fence_ops around Chris Wilson <chris(a)chris-wilson.co.uk> dma-buf/sw-sync: Use an rbtree to sort fences in the timeline Chris Wilson <chris(a)chris-wilson.co.uk> dma-buf/sw-sync: Fix locking around sync_timeline lists Chris Wilson <chris(a)chris-wilson.co.uk> dma-buf/sw-sync: sync_pt is private and of fixed size Chris Wilson <chris(a)chris-wilson.co.uk> dma-buf/sw-sync: Reduce irqsave/irqrestore from known context Chris Wilson <chris(a)chris-wilson.co.uk> dma-buf/sw-sync: Prevent user overflow on timeline advance Chris Wilson <chris(a)chris-wilson.co.uk> dma-buf/sw-sync: Fix the is-signaled test to handle u32 wraparound Chris Wilson <chris(a)chris-wilson.co.uk> dma-buf/dma-fence: Extract __dma_fence_is_later() Rui Sousa <rui.sousa(a)nxp.com> net: fec: fix multicast filtering hardware setup Mart van Santen <mart(a)greenhost.nl> xen-netback: vif counters from int/long to u64 Hans Verkuil <hverkuil(a)xs4all.nl> cec: initiator should be the same as the destination for, poll Ross Lagerwall <ross.lagerwall(a)citrix.com> xen-netfront: Improve error handling during initialization Jan Kara <jack(a)suse.cz> mm: avoid returning VM_FAULT_RETRY from ->page_mkwrite handlers Alexey Kardashevskiy <aik(a)ozlabs.ru> vfio/spapr: Fix missing mutex unlock when creating a window Ivan Vecera <cera(a)cera.cz> be2net: fix initial MAC setting Vincent <vincent.stehle(a)laposte.net> net: thunderx: avoid dereferencing xcv when NULL Sean Nyekjaer <sean.nyekjaer(a)prevas.dk> net: phy: micrel: KSZ8795 do not set SUPPORTED_[Asym_]Pause Andreas Schultz <aschultz(a)tpip.net> gtp: fix cross netns recv on gtp socket Andreas Schultz <aschultz(a)tpip.net> gtp: clear DF bit on GTP packet tx Sagi Grimberg <sagi(a)grimberg.me> nvmet: cancel fatal error and flush async work before free controller Mike Looijmans <mike.looijmans(a)topic.nl> i2c: i2c-cadence: Initialize configuration before probing devices Jason Baron <jbaron(a)akamai.com> tcp: correct memory barrier usage in tcp_check_space() Iago Abal <mail(a)iagoabal.eu> dmaengine: pl330: fix double lock Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan(a)ericsson.com> tipc: fix cleanup at module unload Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan(a)ericsson.com> tipc: fix nametbl_lock soft lockup at module exit Ram Amrani <Ram.Amrani(a)Cavium.com> RDMA/qedr: Fix RDMA CM loopback Ram Amrani <Ram.Amrani(a)Cavium.com> RDMA/qedr: Return success when not changing QP state Johannes Berg <johannes.berg(a)intel.com> mac80211: don't try to sleep in rate_control_rate_init() Xiangliang Yu <Xiangliang.Yu(a)amd.com> drm/amdgpu: fix unload driver issue for virtual display Kevin Hao <haokexin(a)gmail.com> x86/fpu: Set the xcomp_bv when we fake up a XSAVES area Colin Ian King <colin.king(a)canonical.com> net: sctp: fix array overrun read on sctp_timer_tbl Andrzej Hajda <a.hajda(a)samsung.com> drm/exynos/decon5433: set STANDALONE_UPDATE_F on output enablement Rex Zhu <Rex.Zhu(a)amd.com> drm/amdgpu: fix bug set incorrect value to vce register Quinn Tran <quinn.tran(a)cavium.com> qla2xxx: Fix wrong IOCB type assumption Reza Arbab <arbab(a)linux.vnet.ibm.com> powerpc/mm: Fix memory hotplug BUG() on radix Jiri Olsa <jolsa(a)kernel.org> perf/x86/intel: Account interrupts for PEBS errors Trond Myklebust <trond.myklebust(a)primarydata.com> NFSv4: Fix client recovery when server reboots multiple times Michal Kazior <michal.kazior(a)tieto.com> mac80211: prevent skb/txq mismatch Christoffer Dall <christoffer.dall(a)linaro.org> KVM: arm/arm64: Fix occasional warning from the timer work function Andrzej Hajda <a.hajda(a)samsung.com> drm/exynos/decon5433: set STANDALONE_UPDATE_F also if planes are disabled Andrzej Hajda <a.hajda(a)samsung.com> drm/exynos/decon5433: update shadow registers iff there are active windows Benjamin Coddington <bcodding(a)redhat.com> nfs: Don't take a reference on fl->fl_file for LOCK operation Kazuya Mizuguchi <kazuya.mizuguchi.ks(a)renesas.com> ravb: Remove Rx overflow log messages Johannes Berg <johannes.berg(a)intel.com> mac80211: calculate min channel width correctly Michal Hocko <mhocko(a)suse.com> mm: fix remote numa hits statistics Stephen Boyd <sboyd(a)codeaurora.org> net: qrtr: Mark 'buf' as little endian Eric W. Biederman <ebiederm(a)xmission.com> libfs: Modify mount_pseudo_xattr to be clear it is not a userspace mount Vlad Tsyrklevich <vlad(a)tsyrklevich.net> net/appletalk: Fix kernel memory disclosure Ivan Vecera <cera(a)cera.cz> be2net: fix unicast list filling Ivan Vecera <cera(a)cera.cz> be2net: fix accesses to unicast list David Forster <dforster(a)brocade.com> vti6: fix device register to report IFLA_INFO_KIND Peter Ujfalusi <peter.ujfalusi(a)ti.com> ARM: OMAP1: DMA: Correct the number of logical channels Adam Ford <aford173(a)gmail.com> ARM: OMAP2+: Fix WL1283 Bluetooth Baud Rate Florian Fainelli <f.fainelli(a)gmail.com> net: systemport: Pad packet before inserting TSB Florian Fainelli <f.fainelli(a)gmail.com> net: systemport: Utilize skb_put_padto() Varun Prakash <varun(a)chelsio.com> libcxgb: fix error check for ip6_route_output() Vincent Pelletier <plr.vincent(a)gmail.com> usb: gadget: f_fs: Fix ExtCompat descriptor validation M'boumba Cedric Madianga <cedric.madianga(a)gmail.com> dmaengine: stm32-dma: Fix null pointer dereference in stm32_dma_tx_status M'boumba Cedric Madianga <cedric.madianga(a)gmail.com> dmaengine: stm32-dma: Set correct args number for DMA request from DT Guillaume Nault <g.nault(a)alphalink.fr> l2tp: take remote address into account in l2tp_ip and l2tp_ip6 socket lookups Slava Shwartsman <slavash(a)mellanox.com> net/mlx4_en: Fix type mismatch for 32-bit systems Jan Kara <jack(a)suse.cz> dax: Avoid page invalidation races and unnecessary radix tree traversals Ladislav Michl <ladis(a)linux-mips.org> iio: adc: ti-ads1015: add 10% to conversion wait time Arnaldo Carvalho de Melo <acme(a)redhat.com> tools include: Do not use poison with C++ Masami Hiramatsu <mhiramat(a)kernel.org> kprobes/x86: Disable preemption in ftrace-based jprobes Thomas Richter <tmricht(a)linux.vnet.ibm.com> perf test attr: Fix ignored test case result Ben Hutchings <ben(a)decadent.org.uk> usbip: tools: Install all headers needed for libusbip development Jibin Xu <jibin.xu(a)windriver.com> sysrq : fix Show Regs call trace on ARM Gustavo A. R. Silva <garsilva(a)embeddedor.com> EDAC, sb_edac: Fix missing break in switch Dave Hansen <dave.hansen(a)linux.intel.com> x86/entry: Use SYSCALL_DEFINE() macros for sys_modify_ldt() Aaron Sierra <asierra(a)xes-inc.com> serial: 8250: Preserve DLD[7:4] for PORT_XR17V35X Alexey Khoroshilov <khoroshilov(a)ispras.ru> usb: phy: tahvo: fix error handling in tahvo_usb_probe() John Stultz <john.stultz(a)linaro.org> usb: dwc2: Error out of dwc2_hsotg_ep_disable() if we're in host mode John Stultz <john.stultz(a)linaro.org> usb: dwc2: Fix UDC state tracking Subhash Jadavani <subhashj(a)codeaurora.org> mmc: sdhci-msm: fix issue with power irq Johan Hovold <johan(a)kernel.org> spi: spi-axi: fix potential use-after-free after deregistration Hiromitsu Yamasaki <hiromitsu.yamasaki.ym(a)renesas.com> spi: sh-msiof: Fix DMA transfer size check Colin Ian King <colin.king(a)canonical.com> staging: rtl8188eu: avoid a null dereference on pmlmepriv Lukas Wunner <lukas(a)wunner.de> serial: 8250_fintek: Fix rs485 disablement on invalid ioctl() Greg Ungerer <gerg(a)linux-m68k.org> m68k: fix ColdFire node shift size calculation Bryan O'Donoghue <pure.logic(a)nexus-software.ie> staging: greybus: loopback: Fix iteration count on async path Andy Lutomirski <luto(a)kernel.org> selftests/x86/ldt_get: Add a few additional tests for limits Christian Borntraeger <borntraeger(a)de.ibm.com> s390/pci: do not require AIS facility Boshi Wang <wangboshi(a)huawei.com> ima: fix hash algorithm initialization Sebastian Sjoholm <ssjoholm(a)mac.com> USB: serial: option: add Quectel BG96 id Heiko Carstens <heiko.carstens(a)de.ibm.com> s390/runtime instrumentation: simplify task exit handling Matt Wilson <msw(a)amazon.com> serial: 8250_pci: Add Amazon PCI serial device ID Kai-Heng Feng <kai.heng.feng(a)canonical.com> usb: quirks: Add no-lpm quirk for KY-688 USB 3.1 Type-C Hub Hans de Goede <hdegoede(a)redhat.com> uas: Always apply US_FL_NO_ATA_1X quirk to Seagate devices Wang Nan <wangnan0(a)huawei.com> mm, oom_reaper: gather each vma to prevent leaking TLB entry Horia Geantă <horia.geanta(a)nxp.com> Revert "crypto: caam - get rid of tasklet" Stefan Agner <stefan(a)agner.ch> drm/fsl-dcu: enable IRQ before drm_atomic_helper_resume() Stefan Agner <stefan(a)agner.ch> drm/fsl-dcu: avoid disabling pixel clock twice on suspend Rui Hua <huarui.dev(a)gmail.com> bcache: recover data from backing when data is clean Coly Li <colyli(a)suse.de> bcache: only permit to recovery read error when cache device is clean ------------- Diffstat: Makefile | 4 +- arch/arm/mach-omap1/dma.c | 16 +- arch/arm/mach-omap2/pdata-quirks.c | 2 +- arch/m68k/mm/mcfmmu.c | 2 +- arch/powerpc/include/asm/book3s/64/hash.h | 4 + arch/powerpc/mm/hash_utils_64.c | 4 +- arch/powerpc/mm/pgtable-book3s64.c | 18 ++ arch/s390/include/asm/pci_insn.h | 2 +- arch/s390/include/asm/runtime_instr.h | 4 +- arch/s390/kernel/process.c | 3 +- arch/s390/kernel/runtime_instr.c | 30 +-- arch/s390/pci/pci.c | 5 +- arch/s390/pci/pci_insn.c | 6 +- arch/x86/events/intel/ds.c | 6 +- arch/x86/include/asm/syscalls.h | 2 +- arch/x86/kernel/fpu/xstate.c | 1 + arch/x86/kernel/kprobes/ftrace.c | 23 ++- arch/x86/kernel/ldt.c | 16 +- arch/x86/um/ldt.c | 7 +- drivers/crypto/caam/intern.h | 1 + drivers/crypto/caam/jr.c | 25 ++- drivers/dma-buf/fence.c | 26 +++ drivers/dma-buf/sw_sync.c | 211 +++++++++++++--------- drivers/dma-buf/sync_debug.c | 39 ++-- drivers/dma-buf/sync_debug.h | 27 ++- drivers/dma-buf/sync_file.c | 22 +-- drivers/dma/pl330.c | 19 +- drivers/dma/stm32-dma.c | 17 +- drivers/edac/sb_edac.c | 1 + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 5 +- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +- drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 9 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 3 +- drivers/i2c/busses/i2c-cadence.c | 8 +- drivers/iio/adc/ti-ads1015.c | 1 + drivers/infiniband/hw/qedr/qedr_cm.c | 4 +- drivers/infiniband/hw/qedr/verbs.c | 2 +- drivers/md/bcache/request.c | 9 +- drivers/mmc/host/sdhci-msm.c | 18 ++ drivers/net/appletalk/ipddp.c | 2 +- drivers/net/ethernet/broadcom/bcmsysport.c | 23 ++- drivers/net/ethernet/cavium/thunder/thunder_xcv.c | 3 +- drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.c | 12 +- drivers/net/ethernet/emulex/benet/be_main.c | 45 +++-- drivers/net/ethernet/freescale/fec_main.c | 23 +-- drivers/net/ethernet/mellanox/mlx4/en_clock.c | 8 +- drivers/net/ethernet/renesas/ravb_main.c | 8 +- drivers/net/gtp.c | 12 +- drivers/net/phy/micrel.c | 2 +- drivers/net/xen-netback/common.h | 8 +- drivers/net/xen-netback/interface.c | 8 +- drivers/net/xen-netfront.c | 29 ++- drivers/nvme/target/core.c | 3 + drivers/scsi/qla2xxx/qla_target.c | 8 +- drivers/spi/spi-axi-spi-engine.c | 4 +- drivers/spi/spi-sh-msiof.c | 2 +- drivers/staging/greybus/loopback.c | 4 +- drivers/staging/lustre/lustre/llite/llite_mmap.c | 4 +- drivers/staging/media/cec/cec-adap.c | 7 +- drivers/staging/rtl8188eu/core/rtw_mlme.c | 6 +- drivers/tty/serial/8250/8250_fintek.c | 2 +- drivers/tty/serial/8250/8250_pci.c | 3 + drivers/tty/serial/8250/8250_port.c | 5 +- drivers/tty/sysrq.c | 9 +- drivers/usb/core/config.c | 28 ++- drivers/usb/core/devio.c | 56 +++--- drivers/usb/core/hub.c | 9 + drivers/usb/core/quirks.c | 3 + drivers/usb/dwc2/gadget.c | 7 + drivers/usb/gadget/function/f_fs.c | 2 +- drivers/usb/host/ehci-dbg.c | 2 +- drivers/usb/host/xhci-mem.c | 7 + drivers/usb/phy/phy-tahvo.c | 3 +- drivers/usb/serial/option.c | 3 + drivers/usb/storage/uas-detect.h | 4 + drivers/vfio/vfio_iommu_spapr_tce.c | 11 +- fs/dax.c | 28 ++- fs/libfs.c | 3 +- fs/nfs/nfs4proc.c | 3 - fs/nfs/nfs4state.c | 1 - include/linux/buffer_head.h | 4 +- include/linux/fence.h | 67 ++++++- include/linux/perf_event.h | 1 + include/uapi/linux/usb/ch9.h | 3 + kernel/events/core.c | 47 +++-- mm/oom_kill.c | 7 +- mm/page_alloc.c | 15 +- net/ipv4/tcp_input.c | 2 +- net/ipv6/ip6_vti.c | 2 +- net/l2tp/l2tp_ip.c | 19 +- net/l2tp/l2tp_ip6.c | 20 +- net/mac80211/chan.c | 3 - net/mac80211/tx.c | 17 +- net/qrtr/qrtr.c | 4 +- net/sctp/debug.c | 2 +- net/tipc/server.c | 20 +- security/integrity/ima/ima_main.c | 4 + tools/include/linux/poison.h | 5 + tools/perf/tests/attr.c | 2 +- tools/testing/selftests/x86/ldt_gdt.c | 17 +- tools/usb/usbip/Makefile.am | 3 +- virt/kvm/arm/arch_timer.c | 3 - 102 files changed, 759 insertions(+), 522 deletions(-)

7 years, 6 months

8
119
0 0

Re: [Linux-stable-mirror] URGENT PLEASE

by Office Contact

7 years, 6 months

1
0
0 0

Re: [Linux-stable-mirror] [PATCH 1/2] ARM: BUG if jumping to usermode address in kernel mode

by Alex Shi

CC GregKH, since this patch would better to get to stable kernel. This patch also expose a qemu issue which fixed by upstream commit: 3aaf33bebda8d4ffcc0f ARM: avoid faulting on qemu Both of patches are tested in linaro's kernelci and LKFT on stable kernel 4.4/4.9/4.14, no regressions. The lts 3.18 isn't applicable for this patches. Regards Alex On 11/25/2017 07:33 PM, Russell King wrote: > Detect if we are returning to usermode via the normal kernel exit paths > but the saved PSR value indicates that we are in kernel mode. This > could occur due to corrupted stack state, which has been observed with > "ftracetest". > > This ensures that we catch the problem case before we get to user code. > > Signed-off-by: Russell King <rmk+kernel(a)armlinux.org.uk> > --- > arch/arm/include/asm/assembler.h | 18 ++++++++++++++++++ > arch/arm/kernel/entry-header.S | 6 ++++++ > 2 files changed, 24 insertions(+) > > diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h > index ad301f107dd2..bc8d4bbd82e2 100644 > --- a/arch/arm/include/asm/assembler.h > +++ b/arch/arm/include/asm/assembler.h > @@ -518,4 +518,22 @@ THUMB( orr \reg , \reg , #PSR_T_BIT ) > #endif > .endm > > + .macro bug, msg, line > +#ifdef CONFIG_THUMB2_KERNEL > +1: .inst 0xde02 > +#else > +1: .inst 0xe7f001f2 > +#endif > +#ifdef CONFIG_DEBUG_BUGVERBOSE > + .pushsection .rodata.str, "aMS", %progbits, 1 > +2: .asciz "\msg" > + .popsection > + .pushsection __bug_table, "aw" > + .align 2 > + .word 1b, 2b > + .hword \line > + .popsection > +#endif > + .endm > + > #endif /* __ASM_ASSEMBLER_H__ */ > diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S > index d523cd8439a3..7f4d80c2db6b 100644 > --- a/arch/arm/kernel/entry-header.S > +++ b/arch/arm/kernel/entry-header.S > @@ -300,6 +300,8 @@ > mov r2, sp > ldr r1, [r2, #\offset + S_PSR] @ get calling cpsr > ldr lr, [r2, #\offset + S_PC]! @ get pc > + tst r1, #0xcf > + bne 1f > msr spsr_cxsf, r1 @ save in spsr_svc > #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K) > @ We must avoid clrex due to Cortex-A15 erratum #830321 > @@ -314,6 +316,7 @@ > @ after ldm {}^ > add sp, sp, #\offset + PT_REGS_SIZE > movs pc, lr @ return & move spsr_svc into cpsr > +1: bug "Returning to usermode but unexpected PSR bits set?", \@ > #elif defined(CONFIG_CPU_V7M) > @ V7M restore. > @ Note that we don't need to do clrex here as clearing the local > @@ -329,6 +332,8 @@ > ldr r1, [sp, #\offset + S_PSR] @ get calling cpsr > ldr lr, [sp, #\offset + S_PC] @ get pc > add sp, sp, #\offset + S_SP > + tst r1, #0xcf > + bne 1f > msr spsr_cxsf, r1 @ save in spsr_svc > > @ We must avoid clrex due to Cortex-A15 erratum #830321 > @@ -341,6 +346,7 @@ > .endif > add sp, sp, #PT_REGS_SIZE - S_SP > movs pc, lr @ return & move spsr_svc into cpsr > +1: bug "Returning to usermode but unexpected PSR bits set?", \@ > #endif /* !CONFIG_THUMB2_KERNEL */ > .endm > >

7 years, 6 months

2
1
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror