This is the start of the stable review cycle for the 5.11.17 release.
There are 41 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 Wed, 28 Apr 2021 07:28:08 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.11.17-rc…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.11.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 5.11.17-rc1
Mike Galbraith <efault(a)gmx.de>
x86/crash: Fix crash_setup_memmap_entries() out-of-bounds access
John Paul Adrian Glaubitz <glaubitz(a)physik.fu-berlin.de>
ia64: tools: remove duplicate definition of ia64_mf() on ia64
Randy Dunlap <rdunlap(a)infradead.org>
ia64: fix discontig.c section mismatches
Randy Dunlap <rdunlap(a)infradead.org>
csky: change a Kconfig symbol name to fix e1000 build error
Wan Jiabing <wanjiabing(a)vivo.com>
cavium/liquidio: Fix duplicate argument
Michael Brown <mbrown(a)fensystems.co.uk>
xen-netback: Check for hotplug-status existence before watching
Jisheng Zhang <Jisheng.Zhang(a)synaptics.com>
arm64: kprobes: Restore local irqflag if kprobes is cancelled
Vasily Gorbik <gor(a)linux.ibm.com>
s390/entry: save the caller of psw_idle
Dinghao Liu <dinghao.liu(a)zju.edu.cn>
dmaengine: tegra20: Fix runtime PM imbalance on error
Phillip Potter <phil(a)philpotter.co.uk>
net: geneve: check skb is large enough for IPv4/IPv6 header
Angelo Dureghello <angelo(a)kernel-space.org>
m68k: fix flatmem memory model setup
Tony Lindgren <tony(a)atomide.com>
ARM: dts: Fix swapped mmc order for omap3
Laurent Pinchart <laurent.pinchart(a)ideasonboard.com>
dmaengine: xilinx: dpdma: Fix race condition in done IRQ
Laurent Pinchart <laurent.pinchart(a)ideasonboard.com>
dmaengine: xilinx: dpdma: Fix descriptor issuing on video group
Shawn Guo <shawn.guo(a)linaro.org>
soc: qcom: geni: shield geni_icc_get() for ACPI boot
Jiapeng Zhong <abaci-bugfix(a)linux.alibaba.com>
HID: wacom: Assign boolean values to a bool variable
Douglas Gilbert <dgilbert(a)interlog.com>
HID cp2112: fix support for multiple gpiochips
Jia-Ju Bai <baijiaju1990(a)gmail.com>
HID: alps: fix error return code in alps_input_configured()
Luke D Jones <luke(a)ljones.dev>
HID: asus: Add support for 2021 ASUS N-Key keyboard
Shou-Chieh Hsu <shouchieh(a)chromium.org>
HID: google: add don USB id
Zhen Lei <thunder.leizhen(a)huawei.com>
perf map: Fix error return code in maps__clone()
Leo Yan <leo.yan(a)linaro.org>
perf auxtrace: Fix potential NULL pointer dereference
Jim Mattson <jmattson(a)google.com>
perf/x86/kvm: Fix Broadwell Xeon stepping in isolation_ucodes[]
Kan Liang <kan.liang(a)linux.intel.com>
perf/x86/intel/uncore: Remove uncore extra PCI dev HSWEP_PCI_PCU_3
Ali Saidi <alisaidi(a)amazon.com>
locking/qrwlock: Fix ordering in queued_write_lock_slowpath()
Daniel Borkmann <daniel(a)iogearbox.net>
bpf: Tighten speculative pointer arithmetic mask
Daniel Borkmann <daniel(a)iogearbox.net>
bpf: Refactor and streamline bounds check into helper
Andrei Matei <andreimatei1(a)gmail.com>
bpf: Allow variable-offset stack access
Andre Przywara <andre.przywara(a)arm.com>
arm64: dts: allwinner: Revert SD card CD GPIO for Pine64-LTS
Andy Shevchenko <andriy.shevchenko(a)linux.intel.com>
pinctrl: core: Show pin numbers for the controllers with base = 0
Christoph Hellwig <hch(a)lst.de>
block: return -EBUSY when there are open partitions in blkdev_reread_part
Yuanyuan Zhong <yzhong(a)purestorage.com>
pinctrl: lewisburg: Update number of pins in community
Eli Cohen <elic(a)nvidia.com>
vdpa/mlx5: Set err = -ENOMEM in case dma_map_sg_attrs fails
James Bottomley <James.Bottomley(a)HansenPartnership.com>
KEYS: trusted: Fix TPM reservation for seal/unseal
Tony Lindgren <tony(a)atomide.com>
gpio: omap: Save and restore sysconfig
Jiansong Chen <Jiansong.Chen(a)amd.com>
drm/amdgpu: fix GCR_GENERAL_CNTL offset for dimgrey_cavefish
Philip Yang <Philip.Yang(a)amd.com>
drm/amdgpu: reserve fence slot to update page table
Simon Ser <contact(a)emersion.fr>
amd/display: allow non-linear multi-planar formats
Christian König <christian.koenig(a)amd.com>
coda: fix reference counting in coda_file_mmap error path
Christian König <christian.koenig(a)amd.com>
ovl: fix reference counting in ovl_mmap error path
Xie Yongji <xieyongji(a)bytedance.com>
vhost-vdpa: protect concurrent access to vhost device iotlb
-------------
Diffstat:
Makefile | 4 +-
arch/arm/boot/dts/omap3.dtsi | 3 +
.../boot/dts/allwinner/sun50i-a64-pine64-lts.dts | 2 +-
arch/arm64/kernel/probes/kprobes.c | 6 +-
arch/csky/Kconfig | 2 +-
arch/csky/include/asm/page.h | 2 +-
arch/ia64/mm/discontig.c | 6 +-
arch/m68k/include/asm/page_mm.h | 2 +-
arch/s390/kernel/entry.S | 1 +
arch/x86/events/intel/core.c | 2 +-
arch/x86/events/intel/uncore_snbep.c | 61 +-
arch/x86/kernel/crash.c | 2 +-
block/ioctl.c | 2 +
drivers/dma/tegra20-apb-dma.c | 4 +-
drivers/dma/xilinx/xilinx_dpdma.c | 31 +-
drivers/gpio/gpio-omap.c | 9 +
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 10 +-
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 2 +-
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 11 +-
drivers/hid/hid-alps.c | 1 +
drivers/hid/hid-asus.c | 3 +
drivers/hid/hid-cp2112.c | 22 +-
drivers/hid/hid-google-hammer.c | 2 +
drivers/hid/hid-ids.h | 2 +
drivers/hid/wacom_wac.c | 2 +-
drivers/net/ethernet/cavium/liquidio/cn66xx_regs.h | 2 +-
drivers/net/geneve.c | 6 +
drivers/net/xen-netback/xenbus.c | 12 +-
drivers/pinctrl/core.c | 14 +-
drivers/pinctrl/intel/pinctrl-lewisburg.c | 6 +-
drivers/soc/qcom/qcom-geni-se.c | 3 +
drivers/vdpa/mlx5/core/mr.c | 4 +-
drivers/vhost/vdpa.c | 6 +-
fs/coda/file.c | 6 +-
fs/overlayfs/file.c | 11 +-
include/linux/bpf.h | 5 +
include/linux/bpf_verifier.h | 3 +-
include/linux/platform_data/gpio-omap.h | 3 +
kernel/bpf/verifier.c | 771 ++++++++++++++++-----
kernel/locking/qrwlock.c | 7 +-
security/keys/trusted-keys/trusted_tpm2.c | 2 +-
tools/arch/ia64/include/asm/barrier.h | 3 -
tools/perf/util/auxtrace.c | 2 +-
tools/perf/util/map.c | 7 +-
44 files changed, 756 insertions(+), 311 deletions(-)
From: Tony Lindgren <tony(a)atomide.com>
[ Upstream commit a1ebdb3741993f853865d1bd8f77881916ad53a7 ]
Also some omap3 devices like n900 seem to have eMMC and micro-sd swapped
around with commit 21b2cec61c04 ("mmc: Set PROBE_PREFER_ASYNCHRONOUS for
drivers that existed in v4.4").
Let's fix the issue with aliases as discussed on the mailing lists. While
the mmc aliases should be board specific, let's first fix the issue with
minimal changes.
Cc: Aaro Koskinen <aaro.koskinen(a)iki.fi>
Cc: Peter Ujfalusi <peter.ujfalusi(a)gmail.com>
Signed-off-by: Tony Lindgren <tony(a)atomide.com>
Signed-off-by: Sasha Levin <sashal(a)kernel.org>
---
arch/arm/boot/dts/omap3.dtsi | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 8a2b25332b8c..a2e41d79e829 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -22,6 +22,9 @@ aliases {
i2c0 = &i2c1;
i2c1 = &i2c2;
i2c2 = &i2c3;
+ mmc0 = &mmc1;
+ mmc1 = &mmc2;
+ mmc2 = &mmc3;
serial0 = &uart1;
serial1 = &uart2;
serial2 = &uart3;
--
2.30.2
Commit 8a12f8836145 ("net: hso: fix null-ptr-deref during tty device
unregistration") fixed the racy minor allocation reported by syzbot, but
introduced an unconditional NULL-pointer dereference on every disconnect
instead.
Specifically, the serial device table must no longer be accessed after
the minor has been released by hso_serial_tty_unregister().
Fixes: 8a12f8836145 ("net: hso: fix null-ptr-deref during tty device unregistration")
Cc: stable(a)vger.kernel.org
Cc: Anirudh Rayabharam <mail(a)anirudhrb.com>
Reported-by: Leonardo Antoniazzi <leoanto(a)aruba.it>
Signed-off-by: Johan Hovold <johan(a)kernel.org>
---
drivers/net/usb/hso.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 9bc58e64b5b7..3ef4b2841402 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -3104,7 +3104,7 @@ static void hso_free_interface(struct usb_interface *interface)
cancel_work_sync(&serial_table[i]->async_put_intf);
cancel_work_sync(&serial_table[i]->async_get_intf);
hso_serial_tty_unregister(serial);
- kref_put(&serial_table[i]->ref, hso_serial_ref_free);
+ kref_put(&serial->parent->ref, hso_serial_ref_free);
}
}
--
2.26.3
From: Pali Rohár <pali(a)kernel.org>
Move the turris-mox-rwtm firmware node from Turris MOX' device tree into
the generic armada-37xx.dtsi file.
The Turris MOX rWTM firmware can be used on any Armada 37xx device,
giving them access to the rWTM hardware random number generator, which
is otherwise unavailable.
This change allows Linux to load the turris-mox-rwtm.ko module on these
boards.
Tested on ESPRESSObin v5 with both default Marvell WTMI firmware and
CZ.NIC's firmware. With default WTMI firmware the turris-mox-rwtm fails
to probe, while with CZ.NIC's firmware it registers the HW random number
generator.
Signed-off-by: Pali Rohár <pali(a)kernel.org>
Signed-off-by: Marek Behún <kabel(a)kernel.org>
Cc: <stable(a)vger.kernel.org> # 5.4+: 46d2f6d0c99f ("arm64: dts: armada-3720-turris-mox: add firmware node")
---
arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 8 --------
arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 8 ++++++++
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
index d239ab70ed99..8447f303a294 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
@@ -107,14 +107,6 @@ sfp: sfp {
/* enabled by U-Boot if SFP module is present */
status = "disabled";
};
-
- firmware {
- turris-mox-rwtm {
- compatible = "cznic,turris-mox-rwtm";
- mboxes = <&rwtm 0>;
- status = "okay";
- };
- };
};
&i2c0 {
diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
index 7a2df148c6a3..31126f1ffe5b 100644
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
@@ -503,4 +503,12 @@ pcie_intc: interrupt-controller {
};
};
};
+
+ firmware {
+ turris-mox-rwtm {
+ compatible = "cznic,turris-mox-rwtm";
+ mboxes = <&rwtm 0>;
+ status = "okay";
+ };
+ };
};
--
2.26.2
This reverts commit c85be041065c0be8bc48eda4c45e0319caf1d0e5.
Commits from @umn.edu addresses have been found to be submitted in "bad
faith" to try to test the kernel community's ability to review "known
malicious" changes. The result of these submissions can be found in a
paper published at the 42nd IEEE Symposium on Security and Privacy
entitled, "Open Source Insecurity: Stealthily Introducing
Vulnerabilities via Hypocrite Commits" written by Qiushi Wu (University
of Minnesota) and Kangjie Lu (University of Minnesota).
Because of this, all submissions from this group must be reverted from
the kernel tree and will need to be re-reviewed again to determine if
they actually are a valid fix. Until that work is complete, remove this
change to ensure that no problems are being introduced into the
codebase.
Cc: Kangjie Lu <kjlu(a)umn.edu>
Cc: Richard Genoud <richard.genoud(a)gmail.com>
Cc: stable <stable(a)vger.kernel.org>
Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
---
drivers/tty/serial/atmel_serial.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index a24e5c2b30bc..9786d8e5f04f 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -1256,10 +1256,6 @@ static int atmel_prepare_rx_dma(struct uart_port *port)
sg_dma_len(&atmel_port->sg_rx)/2,
DMA_DEV_TO_MEM,
DMA_PREP_INTERRUPT);
- if (!desc) {
- dev_err(port->dev, "Preparing DMA cyclic failed\n");
- goto chan_err;
- }
desc->callback = atmel_complete_rx_dma;
desc->callback_param = port;
atmel_port->desc_rx = desc;
--
2.31.1
This reverts commit 6734330654dac550f12e932996b868c6d0dcb421.
Commits from @umn.edu addresses have been found to be submitted in "bad
faith" to try to test the kernel community's ability to review "known
malicious" changes. The result of these submissions can be found in a
paper published at the 42nd IEEE Symposium on Security and Privacy
entitled, "Open Source Insecurity: Stealthily Introducing
Vulnerabilities via Hypocrite Commits" written by Qiushi Wu (University
of Minnesota) and Kangjie Lu (University of Minnesota).
Because of this, all submissions from this group must be reverted from
the kernel tree and will need to be re-reviewed again to determine if
they actually are a valid fix. Until that work is complete, remove this
change to ensure that no problems are being introduced into the
codebase.
Cc: Kangjie Lu <kjlu(a)umn.edu>
Cc: stable <stable(a)vger.kernel.org>
Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
---
drivers/tty/serial/mxs-auart.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
index f414d6acad69..edad6ebbdfd5 100644
--- a/drivers/tty/serial/mxs-auart.c
+++ b/drivers/tty/serial/mxs-auart.c
@@ -1644,10 +1644,6 @@ static int mxs_auart_probe(struct platform_device *pdev)
s->port.mapbase = r->start;
s->port.membase = ioremap(r->start, resource_size(r));
- if (!s->port.membase) {
- ret = -ENOMEM;
- goto out_disable_clks;
- }
s->port.ops = &mxs_auart_ops;
s->port.iotype = UPIO_MEM;
s->port.fifosize = MXS_AUART_FIFO_SIZE;
--
2.31.1