This is the start of the stable review cycle for the 5.4.53 release.
There are 215 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, 22 Jul 2020 15:27:31 +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.4.53-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-5.4.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.4.53-rc1
Andy Shevchenko <[email protected]>
gpio: pca953x: disable regmap locking for automatic address incrementing
Colin Xu <[email protected]>
drm/i915/gvt: Fix two CFL MMIO handling caused by regression.
Lu Baolu <[email protected]>
iommu/vt-d: Make Intel SVM code 64-bit only
Shannon Nelson <[email protected]>
ionic: export features for vlans to use
Lingling Xu <[email protected]>
spi: sprd: switch the sequence of setting WDG_LOAD_LOW and _HIGH
David Howells <[email protected]>
rxrpc: Fix trace string
Ilya Dryomov <[email protected]>
libceph: don't omit recovery_deletes in target_copy()
Ming Lei <[email protected]>
block: fix get_max_segment_size() overflow on 32bit arch
Ming Lei <[email protected]>
block: fix splitting segments on boundary masks
Chris Wilson <[email protected]>
drm/i915/gt: Ignore irq enabling on the virtual engines
Xiaojie Yuan <[email protected]>
drm/amdgpu/sdma5: fix wptr overwritten in ->get_wptr()
Thomas Gleixner <[email protected]>
genirq/affinity: Handle affinity setting on inactive interrupts correctly
Vincent Guittot <[email protected]>
sched/fair: handle case of task_h_load() returning 0
Mathieu Desnoyers <[email protected]>
sched: Fix unreliable rseq cpu_id for new tasks
Will Deacon <[email protected]>
arm64: compat: Ensure upper 32 bits of x0 are zero on syscall return
Will Deacon <[email protected]>
arm64: ptrace: Consistently use pseudo-singlestep exceptions
Will Deacon <[email protected]>
arm64: ptrace: Override SPSR.SS when single-stepping is enabled
Finley Xiao <[email protected]>
thermal/drivers/cpufreq_cooling: Fix wrong frequency converted from power
Alex Hung <[email protected]>
thermal: int3403_thermal: Downgrade error message
Michał Mirosław <[email protected]>
misc: atmel-ssc: lock with mutex instead of spinlock
Robin Gong <[email protected]>
dmaengine: fsl-edma-common: correct DSIZE_32BYTE
Krzysztof Kozlowski <[email protected]>
dmaengine: mcf-edma: Fix NULL pointer exception in mcf_edma_tx_handler
Krzysztof Kozlowski <[email protected]>
dmaengine: fsl-edma: Fix NULL pointer exception in fsl_edma_tx_handler
Alexander Shishkin <[email protected]>
intel_th: Fix a NULL dereference when hub driver is not loaded
Alexander Shishkin <[email protected]>
intel_th: pci: Add Emmitsburg PCH support
Alexander Shishkin <[email protected]>
intel_th: pci: Add Tiger Lake PCH-H support
Alexander Shishkin <[email protected]>
intel_th: pci: Add Jasper Lake CPU support
Satheesh Rajendran <[email protected]>
powerpc/pseries/svm: Fix incorrect check for shared_lppaca_size
Aneesh Kumar K.V <[email protected]>
powerpc/book3s64/pkeys: Fix pkey_access_permitted() for execute disable pkey
Vishwas M <[email protected]>
hwmon: (emc2103) fix unable to change fan pwm1_enable attribute
Andreas Schwab <[email protected]>
riscv: use 16KB kernel stack on 64-bit
Frederic Weisbecker <[email protected]>
timer: Fix wheel index calculation on last level
Frederic Weisbecker <[email protected]>
timer: Prevent base->clk from moving backward
Chandrakanth Patil <[email protected]>
scsi: megaraid_sas: Remove undefined ENABLE_IRQ_POLL macro
Esben Haabendal <[email protected]>
uio_pdrv_genirq: fix use without device tree and no interrupt
Esben Haabendal <[email protected]>
uio_pdrv_genirq: Remove warning when irq is not specified
Dave Wang <[email protected]>
Input: elan_i2c - add more hardware ID for Lenovo laptops
David Pedersen <[email protected]>
Input: i8042 - add Lenovo XiaoXin Air 12 to i8042 nomux list
Alexander Usyskin <[email protected]>
mei: bus: don't clean driver pointer
Wade Mealing <[email protected]>
Revert "zram: convert remaining CLASS_ATTR() to CLASS_ATTR_RO()"
Chirantan Ekbote <[email protected]>
fuse: Fix parameter for FS_IOC_{GET,SET}FLAGS
Miklos Szeredi <[email protected]>
fuse: use ->reconfigure() instead of ->remount_fs()
Miklos Szeredi <[email protected]>
fuse: ignore 'data' argument of mount(..., MS_REMOUNT)
Amir Goldstein <[email protected]>
ovl: fix unneeded call to ovl_change_flags()
Amir Goldstein <[email protected]>
ovl: relax WARN_ON() when decoding lower directory file handle
youngjun <[email protected]>
ovl: inode reference leak in ovl_is_inuse true case.
Amir Goldstein <[email protected]>
ovl: fix regression with re-formatted lower squashfs
Chuhong Yuan <[email protected]>
serial: mxs-auart: add missed iounmap() in probe failure and remove
Alexander Lobakin <[email protected]>
virtio: virtio_console: add missing MODULE_DEVICE_TABLE() for rproc serial
Jan Kiszka <[email protected]>
Revert "tty: xilinx_uartps: Fix missing id assignment to the console"
Hans de Goede <[email protected]>
virt: vbox: Fix guest capabilities mask check
Hans de Goede <[email protected]>
virt: vbox: Fix VBGL_IOCTL_VMMDEV_REQUEST_BIG and _LOG req numbers to match upstream
AceLan Kao <[email protected]>
USB: serial: option: add Quectel EG95 LTE modem
Jörgen Storvist <[email protected]>
USB: serial: option: add GosunCn GM500 series
Igor Moura <[email protected]>
USB: serial: ch341: add new Product ID for CH340
James Hilliard <[email protected]>
USB: serial: cypress_m8: enable Simply Automated UPB PIM
Johan Hovold <[email protected]>
USB: serial: iuu_phoenix: fix memory corruption
Zhang Qiang <[email protected]>
usb: gadget: function: fix missing spinlock in f_uac1_legacy
Peter Chen <[email protected]>
usb: chipidea: core: add wakeup support for extcon
Minas Harutyunyan <[email protected]>
usb: dwc2: Fix shutdown callback in platform
Tom Rix <[email protected]>
USB: c67x00: fix use after free in c67x00_giveback_urb
Kailang Yang <[email protected]>
ALSA: hda/realtek - Enable Speaker for ASUS UX563
Kailang Yang <[email protected]>
ALSA: hda/realtek - Enable Speaker for ASUS UX533 and UX534
Jian-Hong Pan <[email protected]>
ALSA: hda/realtek: Enable headset mic of Acer TravelMate B311R-31 with ALC256
Armas Spann <[email protected]>
ALSA: hda/realtek: enable headset mic of ASUS ROG Zephyrus G14(G401) series with ALC289
Kailang Yang <[email protected]>
ALSA: hda/realtek - change to suitable link model for ASUS platform
Takashi Iwai <[email protected]>
ALSA: usb-audio: Fix race against the error recovery URB submission
Takashi Iwai <[email protected]>
ALSA: line6: Sync the pending work cancel at disconnection
Takashi Iwai <[email protected]>
ALSA: line6: Perform sanity check for each URB creation
James Hilliard <[email protected]>
HID: quirks: Ignore Simply Automated UPB PIM
Sebastian Parschauer <[email protected]>
HID: quirks: Always poll Obins Anne Pro 2 keyboard
Dmitry Torokhov <[email protected]>
HID: magicmouse: do not set up autorepeat
Maciej S. Szmigiero <[email protected]>
HID: logitech-hidpp: avoid repeated "multiplier = " log messages
Saravana Kannan <[email protected]>
slimbus: core: Fix mismatch in of_node_get/put
Vinod Koul <[email protected]>
clk: qcom: gcc: Add missing UFS clocks for SM8150
Vinod Koul <[email protected]>
clk: qcom: gcc: Add GPU and NPU clocks for SM8150
Miquel Raynal <[email protected]>
mtd: rawnand: oxnas: Release all devices in the _remove() path
Miquel Raynal <[email protected]>
mtd: rawnand: oxnas: Unregister all devices on error
Miquel Raynal <[email protected]>
mtd: rawnand: oxnas: Keep track of registered devices
Álvaro Fernández Rojas <[email protected]>
mtd: rawnand: brcmnand: fix CS0 layout
Álvaro Fernández Rojas <[email protected]>
mtd: rawnand: brcmnand: correctly verify erased pages
Miquel Raynal <[email protected]>
mtd: rawnand: timings: Fix default tR_max and tCCS_min timings
Miquel Raynal <[email protected]>
mtd: rawnand: marvell: Fix probe error path
Miquel Raynal <[email protected]>
mtd: rawnand: marvell: Use nand_cleanup() when the device is not yet registered
Miquel Raynal <[email protected]>
mtd: rawnand: marvell: Fix the condition on a return code
Aharon Landau <[email protected]>
RDMA/mlx5: Verify that QP is created with RQ or SQ
Maulik Shah <[email protected]>
soc: qcom: rpmh-rsc: Allow using free WAKE TCS for active request
Raju P.L.S.S.S.N <[email protected]>
soc: qcom: rpmh-rsc: Clear active mode configuration for wake TCS
Maulik Shah <[email protected]>
soc: qcom: rpmh: Invalidate SLEEP and WAKE TCSes before flushing new data
Maulik Shah <[email protected]>
soc: qcom: rpmh: Update dirty flag only when data changes
Jin Yao <[email protected]>
perf stat: Zero all the 'ena' and 'run' array slot stats for interval mode
Bjorn Helgaas <[email protected]>
PCI/PM: Call .bridge_d3() hook only if non-NULL
Tomer Tayar <[email protected]>
habanalabs: Align protection bits configuration of all TPCs
John Johansen <[email protected]>
apparmor: ensure that dfa state tables have entries
Srinivas Kandagatla <[email protected]>
soc: qcom: socinfo: add missing soc_id sysfs entry
Sean Wang <[email protected]>
arm: dts: mt7623: add phy-mode property for gmac2
Kevin Buettner <[email protected]>
copy_xstate_to_kernel: Fix typo which caused GDB regression
Douglas Anderson <[email protected]>
regmap: debugfs: Don't sleep while atomic for fast_io regmaps
Wei Yongjun <[email protected]>
keys: asymmetric: fix error return code in software_key_query()
Krzysztof Kozlowski <[email protected]>
arm64: dts: spcfpga: Align GIC, NAND and UART nodenames with dtschema
Krzysztof Kozlowski <[email protected]>
ARM: dts: socfpga: Align L2 cache-controller nodename with dtschema
Colin Ian King <[email protected]>
xprtrdma: fix incorrect header size calculations
Enric Balletbo i Serra <[email protected]>
Revert "thermal: mediatek: fix register index error"
dillon min <[email protected]>
ARM: dts: Fix dcan driver probe failed on am437x platform
Vasily Averin <[email protected]>
fuse: don't ignore errors from fuse_writepages_fill()
Anna Schumaker <[email protected]>
NFS: Fix interrupted slots by sending a solo SEQUENCE operation
Eddie James <[email protected]>
clk: AST2600: Add mux for EMMC clock
Nathan Chancellor <[email protected]>
clk: mvebu: ARMADA_AP_CPU_CLK needs to select ARMADA_AP_CP_HELPER
Dan Carpenter <[email protected]>
staging: comedi: verify array index is correct before using it
Michał Mirosław <[email protected]>
usb: gadget: udc: atmel: fix uninitialized read in debug printk
Marc Kleine-Budde <[email protected]>
spi: spi-sun6i: sun6i_spi_transfer_one(): fix setting of clock rate
Peter Ujfalusi <[email protected]>
dmaengine: dmatest: stop completed threads when running without set channel
Andy Shevchenko <[email protected]>
dmaengine: dw: Initialize channel before each transfer
Christophe JAILLET <[email protected]>
iio: adc: ad7780: Fix a resource handling path in 'ad7780_probe()'
Tony Lindgren <[email protected]>
bus: ti-sysc: Do not disable on suspend for no-idle
Tony Lindgren <[email protected]>
bus: ti-sysc: Fix sleeping function called from invalid context for RTC quirk
Tony Lindgren <[email protected]>
bus: ti-sysc: Fix wakeirq sleeping function called from invalid context
Neil Armstrong <[email protected]>
arm64: dts: meson-gxl-s805x: reduce initial Mali450 core frequency
Jerome Brunet <[email protected]>
arm64: dts: meson: add missing gxl rng clock
Colin Ian King <[email protected]>
phy: sun4i-usb: fix dereference of pointer phy0 before it is null checked
Yoshihiro Shimoda <[email protected]>
dmaengine: sh: usb-dmac: set tx_result parameters
Pierre-Louis Bossart <[email protected]>
soundwire: intel: fix memory leak with devm_kasprintf
Jonathan Cameron <[email protected]>
iio:health:afe4404 Fix timestamp alignment and prevent data leak.
Christoffer Nielsen <[email protected]>
ALSA: usb-audio: Add registration quirk for Kingston HyperX Cloud Flight S
Tony Lindgren <[email protected]>
bus: ti-sysc: Use optional clocks on for enable and wait for softreset bit
Paul Menzel <[email protected]>
ACPI: video: Use native backlight on Acer TravelMate 5735Z
Stephan Gerhold <[email protected]>
Input: mms114 - add extra compatible for mms345l
Gregor Pintar <[email protected]>
ALSA: usb-audio: Add quirk for Focusrite Scarlett 2i2
Emmanuel Pescosta <[email protected]>
ALSA: usb-audio: Add registration quirk for Kingston HyperX Cloud Alpha S
Hans de Goede <[email protected]>
ACPI: video: Use native backlight on Acer Aspire 5783z
Takashi Iwai <[email protected]>
ALSA: usb-audio: Rewrite registration quirk handling
Haibo Chen <[email protected]>
mmc: sdhci: do not enable card detect interrupt for gpio cd type
Neil Armstrong <[email protected]>
doc: dt: bindings: usb: dwc3: Update entries for disabling SS instances in park mode
Chris Wulff <[email protected]>
ALSA: usb-audio: Create a registration quirk for Kingston HyperX Amp (0951:16d8)
Sergei A. Trusov <[email protected]>
Input: goodix - fix touch coordinates on Cube I15-TC
Alexander Tsoy <[email protected]>
ALSA: usb-audio: Add support for MOTU MicroBook IIc
Tony Lindgren <[email protected]>
bus: ti-sysc: Detect EDMA and set quirk flags for tptc
Neil Armstrong <[email protected]>
arm64: dts: g12-common: add parkmode_disable_ss_quirk on DWC3 controller
Tony Lindgren <[email protected]>
bus: ti-sysc: Detect display subsystem related devices
Tony Lindgren <[email protected]>
bus: ti-sysc: Handle module unlock quirk needed for some RTC
Tony Lindgren <[email protected]>
bus: ti-sysc: Consider non-existing registers too when matching quirks
Tony Lindgren <[email protected]>
bus: ti-sysc: Rename clk related quirks to pre_reset and post_reset quirks
Diego Elio Pettenò <[email protected]>
scsi: sr: remove references to BLK_DEV_SR_VENDOR, leave it enabled
Andrey Lebedev <[email protected]>
drm/sun4i: tcon: Separate quirks for tcon0 and tcon1 on A20
Claudiu Beznea <[email protected]>
ARM: at91: pm: add quirk for sam9x60's ulp1
Hans de Goede <[email protected]>
HID: quirks: Remove ITE 8595 entry from hid_have_special_driver
Linus Walleij <[email protected]>
mmc: mmci: Support any block sizes for ux500v2 and qcom variant
Suman Anna <[email protected]>
ARM: OMAP2+: use separate IOMMU pdata to fix DRA7 IPU1 boot
Suman Anna <[email protected]>
ARM: OMAP2+: Add workaround for DRA7 DSP MStandby errata i879
Tero Kristo <[email protected]>
ARM: OMAP4+: remove pdata quirks for omap4+ iommus
Russell King <[email protected]>
net: sfp: add some quirks for GPON modules
Russell King <[email protected]>
net: sfp: add support for module quirks
Sasha Levin <[email protected]>
Revert "usb/xhci-plat: Set PM runtime as active on resume"
Sasha Levin <[email protected]>
Revert "usb/ehci-platform: Set PM runtime as active on resume"
Sasha Levin <[email protected]>
Revert "usb/ohci-platform: Fix a warning when hibernating"
Sascha Hauer <[email protected]>
net: ethernet: mvneta: Add back interface mode validation
Sascha Hauer <[email protected]>
net: ethernet: mvneta: Do not error out in non serdes modes
Sasha Levin <[email protected]>
net: macb: call pm_runtime_put_sync on failure path
Florian Fainelli <[email protected]>
of: of_mdio: Correct loop scanning logic
Florian Fainelli <[email protected]>
net: dsa: bcm_sf2: Fix node reference count
Krzysztof Kozlowski <[email protected]>
spi: spi-fsl-dspi: Fix lockup if device is shutdown during SPI transfer
Jonathan Cameron <[email protected]>
iio:health:afe4403 Fix timestamp alignment and prevent data leak.
Jonathan Cameron <[email protected]>
iio:pressure:ms5611 Fix buffer element alignment
Jonathan Cameron <[email protected]>
iio:humidity:hts221 Fix alignment and data leak issues
Navid Emamdoost <[email protected]>
iio: pressure: zpa2326: handle pm_runtime_get_sync failure
Chuhong Yuan <[email protected]>
iio: mma8452: Add missed iio_device_unregister() call in mma8452_probe()
Matt Ranostay <[email protected]>
iio: core: add missing IIO_MOD_H2/ETHANOL string identifiers
Dinghao Liu <[email protected]>
iio: magnetometer: ak8974: Fix runtime PM imbalance on error
Jonathan Cameron <[email protected]>
iio:humidity:hdc100x Fix alignment and data leak issues
Jonathan Cameron <[email protected]>
iio:magnetometer:ak8974: Fix alignment and data leak issues
Ard Biesheuvel <[email protected]>
arm64/alternatives: don't patch up internal branches
Andy Shevchenko <[email protected]>
i2c: eg20t: Load module automatically if ID matches
Bob Peterson <[email protected]>
gfs2: read-only mounts should grab the sd_freeze_gl glock
Vasily Averin <[email protected]>
tpm_tis: extra chip->ops check on error path in tpm_tis_core_init
Ard Biesheuvel <[email protected]>
arm64/alternatives: use subsections for replacement sequences
Ronnie Sahlberg <[email protected]>
cifs: prevent truncation from long to int in wait_for_free_credits
Kangmin Park <[email protected]>
dt-bindings: mailbox: zynqmp_ipi: fix unit address
Angelo Dureghello <[email protected]>
m68k: mm: fix node memblock init
Mike Rapoport <[email protected]>
m68k: nommu: register start of the memory with memblock
Hou Tao <[email protected]>
blk-mq-debugfs: update blk_queue_flag_name[] accordingly for new flags
Anson Huang <[email protected]>
thermal/drivers: imx: Fix missing of_node_put() at probe time
Petteri Aimonen <[email protected]>
x86/fpu: Reset MXCSR to default in kernel_fpu_begin()
Navid Emamdoost <[email protected]>
drm/exynos: fix ref count leak in mic_pre_enable
Marek Szyprowski <[email protected]>
drm/exynos: Properly propagate return value in drm_iommu_attach_device()
Krishna Manikandan <[email protected]>
drm/msm/dpu: allow initialization of encoder locks during encoder init
Bernard Zhao <[email protected]>
drm/msm: fix potential memleak in error branch
Marc Zyngier <[email protected]>
arm64: arch_timer: Disable the compat vdso for cores affected by ARM64_WORKAROUND_1418040
Marc Zyngier <[email protected]>
arm64: arch_timer: Allow an workaround descriptor to disable compat vdso
Marc Zyngier <[email protected]>
arm64: Introduce a way to disable the 32bit vdso
Willem de Bruijn <[email protected]>
ip: Fix SO_MARK in RST, ACK and ICMP packets
Cong Wang <[email protected]>
cgroup: Fix sock_cgroup_data on big-endian.
Cong Wang <[email protected]>
cgroup: fix cgroup_sk_alloc() for sk_clone_lock()
Eric Dumazet <[email protected]>
tcp: md5: allow changing MD5 keys in all socket states
Eric Dumazet <[email protected]>
tcp: md5: refine tcp_md5_do_add()/tcp_md5_hash_key() barriers
Toke Høiland-Jørgensen <[email protected]>
vlan: consolidate VLAN parsing code and limit max parsing depth
Eric Dumazet <[email protected]>
tcp: md5: do not send silly options in SYNCOOKIES
Eric Dumazet <[email protected]>
tcp: md5: add missing memory barriers in tcp_md5_do_add()/tcp_md5_hash_key()
Christoph Paasch <[email protected]>
tcp: make sure listeners don't initialize congestion-control state
Eric Dumazet <[email protected]>
tcp: fix SO_RCVLOWAT possible hangs under high mem pressure
Toke Høiland-Jørgensen <[email protected]>
sched: consistently handle layer3 header accesses in the presence of VLANs
AceLan Kao <[email protected]>
net: usb: qmi_wwan: add support for Quectel EG95 LTE modem
Cong Wang <[email protected]>
net_sched: fix a memory leak in atm_tc_init()
Codrin Ciubotariu <[email protected]>
net: dsa: microchip: set the correct number of ports
Martin Varghese <[email protected]>
net: Added pointer check for dst->ops->neigh_lookup in dst_neigh_lookup_skb
Eric Dumazet <[email protected]>
llc: make sure applications use ARPHRD_ETHER
Xin Long <[email protected]>
l2tp: remove skb_dst_set() from l2tp_xmit_skb()
David Ahern <[email protected]>
ipv6: Fix use of anycast address with loopback
David Ahern <[email protected]>
ipv6: fib6_select_path can not use out path for nexthop objects
Sabrina Dubroca <[email protected]>
ipv4: fill fl4_icmp_{type,code} in ping_v4_sendmsg
Sean Tranchetti <[email protected]>
genetlink: remove genl_bind
Linus Lüssing <[email protected]>
bridge: mcast: Fix MLD2 Report IPv6 payload length check
Taehee Yoo <[email protected]>
net: rmnet: fix lower interface leak
Dmitry Bogdanov <[email protected]>
net: atlantic: fix ip dst and ipv6 address filters
YueHaibing <[email protected]>
crypto: atmel - Fix build error of CRYPTO_AUTHENC
Tudor Ambarus <[email protected]>
crypto: atmel - Fix selection of CRYPTO_AUTHENC
-------------
Diffstat:
.../bindings/mailbox/xlnx,zynqmp-ipi-mailbox.txt | 2 +-
Documentation/devicetree/bindings/usb/dwc3.txt | 2 +
Makefile | 4 +-
arch/alpha/configs/defconfig | 1 -
arch/arm/boot/dts/am437x-l4.dtsi | 14 +-
arch/arm/boot/dts/mt7623n-rfb-emmc.dts | 1 +
arch/arm/boot/dts/socfpga.dtsi | 2 +-
arch/arm/boot/dts/socfpga_arria10.dtsi | 2 +-
arch/arm/configs/rpc_defconfig | 1 -
arch/arm/configs/s3c2410_defconfig | 1 -
arch/arm/include/asm/clocksource.h | 11 +-
arch/arm/kernel/vdso.c | 2 +-
arch/arm/mach-at91/pm_suspend.S | 4 +
arch/arm/mach-omap2/omap-iommu.c | 43 ++-
arch/arm/mach-omap2/pdata-quirks.c | 35 ++-
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 8 +-
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 1 +
.../dts/amlogic/meson-gxl-s805x-libretech-ac.dts | 2 +-
.../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 2 +-
arch/arm64/boot/dts/amlogic/meson-gxl-s805x.dtsi | 24 ++
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 5 +
arch/arm64/include/asm/alternative.h | 16 +-
arch/arm64/include/asm/arch_timer.h | 1 +
arch/arm64/include/asm/clocksource.h | 5 +-
arch/arm64/include/asm/debug-monitors.h | 2 +
arch/arm64/include/asm/syscall.h | 12 +-
arch/arm64/include/asm/thread_info.h | 1 +
arch/arm64/include/asm/vdso/clocksource.h | 14 +
arch/arm64/include/asm/vdso/compat_gettimeofday.h | 5 +-
arch/arm64/include/asm/vdso/gettimeofday.h | 6 +-
arch/arm64/include/asm/vdso/vsyscall.h | 4 +-
arch/arm64/kernel/alternative.c | 16 +-
arch/arm64/kernel/debug-monitors.c | 20 +-
arch/arm64/kernel/ptrace.c | 29 +-
arch/arm64/kernel/signal.c | 11 +-
arch/arm64/kernel/syscall.c | 5 +-
arch/arm64/kernel/vmlinux.lds.S | 3 -
arch/ia64/configs/zx1_defconfig | 1 -
arch/m68k/configs/amiga_defconfig | 1 -
arch/m68k/configs/apollo_defconfig | 1 -
arch/m68k/configs/atari_defconfig | 1 -
arch/m68k/configs/bvme6000_defconfig | 1 -
arch/m68k/configs/hp300_defconfig | 1 -
arch/m68k/configs/mac_defconfig | 1 -
arch/m68k/configs/multi_defconfig | 1 -
arch/m68k/configs/mvme147_defconfig | 1 -
arch/m68k/configs/mvme16x_defconfig | 1 -
arch/m68k/configs/q40_defconfig | 1 -
arch/m68k/configs/sun3_defconfig | 1 -
arch/m68k/configs/sun3x_defconfig | 1 -
arch/m68k/kernel/setup_no.c | 3 +-
arch/m68k/mm/mcfmmu.c | 2 +-
arch/mips/configs/bigsur_defconfig | 1 -
arch/mips/configs/fuloong2e_defconfig | 1 -
arch/mips/configs/ip27_defconfig | 1 -
arch/mips/configs/ip32_defconfig | 1 -
arch/mips/configs/jazz_defconfig | 1 -
arch/mips/configs/malta_defconfig | 1 -
arch/mips/configs/malta_kvm_defconfig | 1 -
arch/mips/configs/malta_kvm_guest_defconfig | 1 -
arch/mips/configs/maltaup_xpa_defconfig | 1 -
arch/mips/configs/rm200_defconfig | 1 -
arch/powerpc/configs/85xx-hw.config | 1 -
arch/powerpc/configs/amigaone_defconfig | 1 -
arch/powerpc/configs/chrp32_defconfig | 1 -
arch/powerpc/configs/g5_defconfig | 1 -
arch/powerpc/configs/maple_defconfig | 1 -
arch/powerpc/configs/pasemi_defconfig | 1 -
arch/powerpc/configs/pmac32_defconfig | 1 -
arch/powerpc/configs/powernv_defconfig | 1 -
arch/powerpc/configs/ppc64_defconfig | 1 -
arch/powerpc/configs/ppc64e_defconfig | 1 -
arch/powerpc/configs/ppc6xx_defconfig | 1 -
arch/powerpc/configs/pseries_defconfig | 1 -
arch/powerpc/configs/skiroot_defconfig | 1 -
arch/powerpc/kernel/paca.c | 2 +-
arch/powerpc/mm/book3s64/pkeys.c | 12 +-
arch/riscv/include/asm/thread_info.h | 4 +
arch/sh/configs/sh03_defconfig | 1 -
arch/sparc/configs/sparc64_defconfig | 1 -
arch/x86/configs/i386_defconfig | 1 -
arch/x86/configs/x86_64_defconfig | 1 -
arch/x86/include/asm/fpu/internal.h | 5 +
arch/x86/kernel/apic/vector.c | 22 +-
arch/x86/kernel/fpu/core.c | 6 +
arch/x86/kernel/fpu/xstate.c | 2 +-
block/blk-merge.c | 23 +-
block/blk-mq-debugfs.c | 3 +
crypto/asymmetric_keys/public_key.c | 1 +
drivers/acpi/video_detect.c | 19 ++
drivers/base/regmap/regmap-debugfs.c | 52 ++--
drivers/block/zram/zram_drv.c | 3 +-
drivers/bus/ti-sysc.c | 331 ++++++++++++++-------
drivers/char/tpm/tpm_tis_core.c | 2 +-
drivers/char/virtio_console.c | 3 +-
drivers/clk/clk-ast2600.c | 49 ++-
drivers/clk/mvebu/Kconfig | 1 +
drivers/clk/qcom/gcc-sm8150.c | 148 +++++++++
drivers/clocksource/arm_arch_timer.c | 19 +-
drivers/crypto/Kconfig | 8 +-
drivers/dma/dmatest.c | 2 +
drivers/dma/dw/core.c | 12 -
drivers/dma/fsl-edma-common.h | 2 +-
drivers/dma/fsl-edma.c | 7 +
drivers/dma/mcf-edma.c | 7 +
drivers/dma/sh/usb-dmac.c | 2 +
drivers/gpio/gpio-pca953x.c | 1 +
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 26 +-
drivers/gpu/drm/exynos/exynos_drm_dma.c | 4 +-
drivers/gpu/drm/exynos/exynos_drm_mic.c | 4 +-
drivers/gpu/drm/i915/gt/intel_lrc.c | 1 +
drivers/gpu/drm/i915/gvt/handlers.c | 4 +-
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 4 +-
drivers/gpu/drm/msm/msm_submitqueue.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_tcon.c | 2 +
drivers/hid/hid-ids.h | 3 +
drivers/hid/hid-logitech-hidpp.c | 2 +-
drivers/hid/hid-magicmouse.c | 6 +
drivers/hid/hid-quirks.c | 5 +-
drivers/hwmon/emc2103.c | 2 +-
drivers/hwtracing/intel_th/core.c | 21 +-
drivers/hwtracing/intel_th/pci.c | 15 +
drivers/hwtracing/intel_th/sth.c | 4 +-
drivers/i2c/busses/i2c-eg20t.c | 1 +
drivers/iio/accel/mma8452.c | 5 +-
drivers/iio/adc/ad7780.c | 2 +-
drivers/iio/health/afe4403.c | 13 +-
drivers/iio/health/afe4404.c | 8 +-
drivers/iio/humidity/hdc100x.c | 10 +-
drivers/iio/humidity/hts221.h | 7 +-
drivers/iio/humidity/hts221_buffer.c | 9 +-
drivers/iio/industrialio-core.c | 2 +
drivers/iio/magnetometer/ak8974.c | 29 +-
drivers/iio/pressure/ms5611_core.c | 11 +-
drivers/iio/pressure/zpa2326.c | 4 +-
drivers/infiniband/hw/mlx5/qp.c | 2 +
drivers/input/serio/i8042-x86ia64io.h | 7 +
drivers/input/touchscreen/goodix.c | 22 ++
drivers/input/touchscreen/mms114.c | 17 +-
drivers/iommu/Kconfig | 2 +-
drivers/misc/atmel-ssc.c | 24 +-
drivers/misc/habanalabs/goya/goya_security.c | 99 +++++-
drivers/misc/mei/bus.c | 3 +-
drivers/mmc/host/mmci.c | 34 ++-
drivers/mmc/host/mmci.h | 8 +-
drivers/mmc/host/sdhci.c | 2 +-
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 24 +-
drivers/mtd/nand/raw/marvell_nand.c | 27 +-
drivers/mtd/nand/raw/nand_timings.c | 5 +-
drivers/mtd/nand/raw/oxnas_nand.c | 24 +-
drivers/net/dsa/bcm_sf2.c | 2 +
drivers/net/dsa/microchip/ksz8795.c | 3 +
drivers/net/dsa/microchip/ksz9477.c | 3 +
.../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c | 4 +-
.../aquantia/atlantic/hw_atl/hw_atl_llh_internal.h | 2 +-
drivers/net/ethernet/cadence/macb_main.c | 6 +-
drivers/net/ethernet/marvell/mvneta.c | 24 +-
drivers/net/ethernet/pensando/ionic/ionic_lif.c | 1 +
drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 19 +-
drivers/net/phy/sfp-bus.c | 79 +++++
drivers/net/usb/qmi_wwan.c | 1 +
drivers/of/of_mdio.c | 9 +-
drivers/pci/pci.c | 4 +-
drivers/phy/allwinner/phy-sun4i-usb.c | 5 +-
drivers/scsi/Kconfig | 9 -
drivers/scsi/megaraid/megaraid_sas_fusion.c | 2 -
drivers/scsi/sr_vendor.c | 8 -
drivers/slimbus/core.c | 1 +
drivers/soc/qcom/rpmh-rsc.c | 98 +++---
drivers/soc/qcom/rpmh.c | 56 ++--
drivers/soc/qcom/socinfo.c | 2 +
drivers/soundwire/intel.c | 5 +-
drivers/spi/spi-fsl-dspi.c | 15 +-
drivers/spi/spi-sprd-adi.c | 2 +-
drivers/spi/spi-sun6i.c | 14 +-
drivers/staging/comedi/drivers/addi_apci_1500.c | 10 +-
drivers/thermal/cpu_cooling.c | 6 +-
drivers/thermal/imx_thermal.c | 7 +-
.../intel/int340x_thermal/int3403_thermal.c | 2 +-
drivers/thermal/mtk_thermal.c | 6 +-
drivers/tty/serial/mxs-auart.c | 12 +-
drivers/tty/serial/xilinx_uartps.c | 1 -
drivers/uio/uio_pdrv_genirq.c | 4 +-
drivers/usb/c67x00/c67x00-sched.c | 2 +-
drivers/usb/chipidea/core.c | 24 ++
drivers/usb/dwc2/platform.c | 3 +-
drivers/usb/gadget/function/f_uac1_legacy.c | 2 +
drivers/usb/gadget/udc/atmel_usba_udc.c | 2 +-
drivers/usb/host/ehci-platform.c | 4 -
drivers/usb/host/ohci-platform.c | 5 -
drivers/usb/host/xhci-plat.c | 10 +-
drivers/usb/serial/ch341.c | 1 +
drivers/usb/serial/cypress_m8.c | 2 +
drivers/usb/serial/cypress_m8.h | 3 +
drivers/usb/serial/iuu_phoenix.c | 8 +-
drivers/usb/serial/option.c | 6 +
drivers/virt/vboxguest/vboxguest_core.c | 6 +-
drivers/virt/vboxguest/vboxguest_core.h | 15 +
drivers/virt/vboxguest/vboxguest_linux.c | 3 +-
drivers/virt/vboxguest/vmmdev.h | 2 +
fs/cifs/transport.c | 2 +-
fs/fuse/file.c | 14 +-
fs/fuse/inode.c | 15 +-
fs/gfs2/ops_fstype.c | 12 +-
fs/nfs/nfs4proc.c | 20 +-
fs/overlayfs/export.c | 2 +-
fs/overlayfs/file.c | 10 +-
fs/overlayfs/super.c | 23 +-
include/linux/blkdev.h | 1 +
include/linux/cgroup-defs.h | 8 +-
include/linux/cgroup.h | 4 +-
include/linux/if_vlan.h | 29 +-
include/linux/input/elan-i2c-ids.h | 7 +
include/linux/platform_data/ti-sysc.h | 1 +
include/net/dst.h | 10 +-
include/net/genetlink.h | 8 -
include/net/inet_ecn.h | 25 +-
include/net/pkt_sched.h | 11 -
include/trace/events/rxrpc.h | 2 +-
include/uapi/linux/vboxguest.h | 4 +-
kernel/cgroup/cgroup.c | 31 +-
kernel/irq/manage.c | 37 ++-
kernel/sched/core.c | 2 +
kernel/sched/fair.c | 16 +-
kernel/time/timer.c | 21 +-
net/bridge/br_multicast.c | 2 +-
net/ceph/osd_client.c | 1 +
net/core/filter.c | 10 +-
net/core/sock.c | 2 +-
net/ipv4/icmp.c | 4 +-
net/ipv4/ip_output.c | 2 +-
net/ipv4/ping.c | 3 +
net/ipv4/tcp.c | 15 +-
net/ipv4/tcp_cong.c | 2 +-
net/ipv4/tcp_input.c | 2 +
net/ipv4/tcp_ipv4.c | 15 +-
net/ipv4/tcp_output.c | 8 +-
net/ipv6/icmp.c | 4 +-
net/ipv6/route.c | 7 +-
net/l2tp/l2tp_core.c | 5 +-
net/llc/af_llc.c | 10 +-
net/netlink/genetlink.c | 49 ---
net/sched/act_connmark.c | 9 +-
net/sched/act_csum.c | 2 +-
net/sched/act_ct.c | 9 +-
net/sched/act_ctinfo.c | 9 +-
net/sched/act_mpls.c | 2 +-
net/sched/act_skbedit.c | 2 +-
net/sched/cls_api.c | 2 +-
net/sched/cls_flow.c | 8 +-
net/sched/cls_flower.c | 2 +-
net/sched/em_ipset.c | 2 +-
net/sched/em_ipt.c | 2 +-
net/sched/em_meta.c | 2 +-
net/sched/sch_atm.c | 8 +-
net/sched/sch_cake.c | 4 +-
net/sched/sch_dsmark.c | 6 +-
net/sched/sch_teql.c | 2 +-
net/sunrpc/xprtrdma/rpc_rdma.c | 4 +-
security/apparmor/match.c | 5 +
sound/pci/hda/patch_realtek.c | 27 +-
sound/usb/card.c | 12 +-
sound/usb/clock.c | 59 +++-
sound/usb/line6/capture.c | 2 +
sound/usb/line6/driver.c | 2 +-
sound/usb/line6/playback.c | 2 +
sound/usb/midi.c | 17 +-
sound/usb/pcm.c | 7 +-
sound/usb/quirks-table.h | 86 +-----
sound/usb/quirks.c | 67 ++++-
sound/usb/quirks.h | 2 +
tools/perf/util/stat.c | 6 +-
tools/testing/selftests/net/fib_nexthops.sh | 13 +
273 files changed, 2041 insertions(+), 935 deletions(-)
From: Willem de Bruijn <[email protected]>
[ Upstream commit 0da7536fb47f51df89ccfcb1fa09f249d9accec5 ]
When no full socket is available, skbs are sent over a per-netns
control socket. Its sk_mark is temporarily adjusted to match that
of the real (request or timewait) socket or to reflect an incoming
skb, so that the outgoing skb inherits this in __ip_make_skb.
Introduction of the socket cookie mark field broke this. Now the
skb is set through the cookie and cork:
<caller> # init sockc.mark from sk_mark or cmsg
ip_append_data
ip_setup_cork # convert sockc.mark to cork mark
ip_push_pending_frames
ip_finish_skb
__ip_make_skb # set skb->mark to cork mark
But I missed these special control sockets. Update all callers of
__ip(6)_make_skb that were originally missed.
For IPv6, the same two icmp(v6) paths are affected. The third
case is not, as commit 92e55f412cff ("tcp: don't annotate
mark on control socket from tcp_v6_send_response()") replaced
the ctl_sk->sk_mark with passing the mark field directly as a
function argument. That commit predates the commit that
introduced the bug.
Fixes: c6af0c227a22 ("ip: support SO_MARK cmsg")
Signed-off-by: Willem de Bruijn <[email protected]>
Reported-by: Martin KaFai Lau <[email protected]>
Reviewed-by: Martin KaFai Lau <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
net/ipv4/icmp.c | 4 ++--
net/ipv4/ip_output.c | 2 +-
net/ipv6/icmp.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -427,7 +427,7 @@ static void icmp_reply(struct icmp_bxm *
ipcm_init(&ipc);
inet->tos = ip_hdr(skb)->tos;
- sk->sk_mark = mark;
+ ipc.sockc.mark = mark;
daddr = ipc.addr = ip_hdr(skb)->saddr;
saddr = fib_compute_spec_dst(skb);
@@ -709,10 +709,10 @@ void __icmp_send(struct sk_buff *skb_in,
icmp_param.skb = skb_in;
icmp_param.offset = skb_network_offset(skb_in);
inet_sk(sk)->tos = tos;
- sk->sk_mark = mark;
ipcm_init(&ipc);
ipc.addr = iph->saddr;
ipc.opt = &icmp_param.replyopts.opt;
+ ipc.sockc.mark = mark;
rt = icmp_route_lookup(net, &fl4, skb_in, iph, saddr, tos, mark,
type, code, &icmp_param);
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1704,7 +1704,7 @@ void ip_send_unicast_reply(struct sock *
sk->sk_protocol = ip_hdr(skb)->protocol;
sk->sk_bound_dev_if = arg->bound_dev_if;
sk->sk_sndbuf = sysctl_wmem_default;
- sk->sk_mark = fl4.flowi4_mark;
+ ipc.sockc.mark = fl4.flowi4_mark;
err = ip_append_data(sk, &fl4, ip_reply_glue_bits, arg->iov->iov_base,
len, 0, &ipc, &rt, MSG_DONTWAIT);
if (unlikely(err)) {
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -535,7 +535,6 @@ static void icmp6_send(struct sk_buff *s
if (!sk)
goto out_bh_enable;
- sk->sk_mark = mark;
np = inet6_sk(sk);
if (!icmpv6_xrlim_allow(sk, type, &fl6))
@@ -552,6 +551,7 @@ static void icmp6_send(struct sk_buff *s
fl6.flowi6_oif = np->ucast_oif;
ipcm6_init_sk(&ipc6, np);
+ ipc6.sockc.mark = mark;
fl6.flowlabel = ip6_make_flowinfo(ipc6.tclass, fl6.flowlabel);
dst = icmpv6_route_lookup(net, skb, sk, &fl6);
@@ -720,7 +720,6 @@ static void icmpv6_echo_reply(struct sk_
sk = icmpv6_xmit_lock(net);
if (!sk)
goto out_bh_enable;
- sk->sk_mark = mark;
np = inet6_sk(sk);
if (!fl6.flowi6_oif && ipv6_addr_is_multicast(&fl6.daddr))
@@ -748,6 +747,7 @@ static void icmpv6_echo_reply(struct sk_
ipcm6_init_sk(&ipc6, np);
ipc6.hlimit = ip6_sk_dst_hoplimit(np, &fl6, dst);
ipc6.tclass = ipv6_get_dsfield(ipv6_hdr(skb));
+ ipc6.sockc.mark = mark;
if (ip6_append_data(sk, icmpv6_getfrag, &msg,
skb->len + sizeof(struct icmp6hdr),
From: "Toke H?iland-J?rgensen" <[email protected]>
[ Upstream commit 469aceddfa3ed16e17ee30533fae45e90f62efd8 ]
Toshiaki pointed out that we now have two very similar functions to extract
the L3 protocol number in the presence of VLAN tags. And Daniel pointed out
that the unbounded parsing loop makes it possible for maliciously crafted
packets to loop through potentially hundreds of tags.
Fix both of these issues by consolidating the two parsing functions and
limiting the VLAN tag parsing to a max depth of 8 tags. As part of this,
switch over __vlan_get_protocol() to use skb_header_pointer() instead of
pskb_may_pull(), to avoid the possible side effects of the latter and keep
the skb pointer 'const' through all the parsing functions.
v2:
- Use limit of 8 tags instead of 32 (matching XMIT_RECURSION_LIMIT)
Reported-by: Toshiaki Makita <[email protected]>
Reported-by: Daniel Borkmann <[email protected]>
Fixes: d7bf2ebebc2b ("sched: consistently handle layer3 header accesses in the presence of VLANs")
Signed-off-by: Toke Høiland-Jørgensen <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
include/linux/if_vlan.h | 57 ++++++++++++++++++------------------------------
1 file changed, 22 insertions(+), 35 deletions(-)
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -25,6 +25,8 @@
#define VLAN_ETH_DATA_LEN 1500 /* Max. octets in payload */
#define VLAN_ETH_FRAME_LEN 1518 /* Max. octets in frame sans FCS */
+#define VLAN_MAX_DEPTH 8 /* Max. number of nested VLAN tags parsed */
+
/*
* struct vlan_hdr - vlan header
* @h_vlan_TCI: priority and VLAN ID
@@ -308,34 +310,6 @@ static inline bool eth_type_vlan(__be16
}
}
-/* A getter for the SKB protocol field which will handle VLAN tags consistently
- * whether VLAN acceleration is enabled or not.
- */
-static inline __be16 skb_protocol(const struct sk_buff *skb, bool skip_vlan)
-{
- unsigned int offset = skb_mac_offset(skb) + sizeof(struct ethhdr);
- __be16 proto = skb->protocol;
-
- if (!skip_vlan)
- /* VLAN acceleration strips the VLAN header from the skb and
- * moves it to skb->vlan_proto
- */
- return skb_vlan_tag_present(skb) ? skb->vlan_proto : proto;
-
- while (eth_type_vlan(proto)) {
- struct vlan_hdr vhdr, *vh;
-
- vh = skb_header_pointer(skb, offset, sizeof(vhdr), &vhdr);
- if (!vh)
- break;
-
- proto = vh->h_vlan_encapsulated_proto;
- offset += sizeof(vhdr);
- }
-
- return proto;
-}
-
static inline bool vlan_hw_offload_capable(netdev_features_t features,
__be16 proto)
{
@@ -605,10 +579,10 @@ static inline int vlan_get_tag(const str
* Returns the EtherType of the packet, regardless of whether it is
* vlan encapsulated (normal or hardware accelerated) or not.
*/
-static inline __be16 __vlan_get_protocol(struct sk_buff *skb, __be16 type,
+static inline __be16 __vlan_get_protocol(const struct sk_buff *skb, __be16 type,
int *depth)
{
- unsigned int vlan_depth = skb->mac_len;
+ unsigned int vlan_depth = skb->mac_len, parse_depth = VLAN_MAX_DEPTH;
/* if type is 802.1Q/AD then the header should already be
* present at mac_len - VLAN_HLEN (if mac_len > 0), or at
@@ -623,13 +597,12 @@ static inline __be16 __vlan_get_protocol
vlan_depth = ETH_HLEN;
}
do {
- struct vlan_hdr *vh;
+ struct vlan_hdr vhdr, *vh;
- if (unlikely(!pskb_may_pull(skb,
- vlan_depth + VLAN_HLEN)))
+ vh = skb_header_pointer(skb, vlan_depth, sizeof(vhdr), &vhdr);
+ if (unlikely(!vh || !--parse_depth))
return 0;
- vh = (struct vlan_hdr *)(skb->data + vlan_depth);
type = vh->h_vlan_encapsulated_proto;
vlan_depth += VLAN_HLEN;
} while (eth_type_vlan(type));
@@ -648,11 +621,25 @@ static inline __be16 __vlan_get_protocol
* Returns the EtherType of the packet, regardless of whether it is
* vlan encapsulated (normal or hardware accelerated) or not.
*/
-static inline __be16 vlan_get_protocol(struct sk_buff *skb)
+static inline __be16 vlan_get_protocol(const struct sk_buff *skb)
{
return __vlan_get_protocol(skb, skb->protocol, NULL);
}
+/* A getter for the SKB protocol field which will handle VLAN tags consistently
+ * whether VLAN acceleration is enabled or not.
+ */
+static inline __be16 skb_protocol(const struct sk_buff *skb, bool skip_vlan)
+{
+ if (!skip_vlan)
+ /* VLAN acceleration strips the VLAN header from the skb and
+ * moves it to skb->vlan_proto
+ */
+ return skb_vlan_tag_present(skb) ? skb->vlan_proto : skb->protocol;
+
+ return vlan_get_protocol(skb);
+}
+
static inline void vlan_set_encap_proto(struct sk_buff *skb,
struct vlan_hdr *vhdr)
{
From: YueHaibing <[email protected]>
commit aee1f9f3c30e1e20e7f74729ced61eac7d74ca68 upstream.
If CRYPTO_DEV_ATMEL_AUTHENC is m, CRYPTO_DEV_ATMEL_SHA is m,
but CRYPTO_DEV_ATMEL_AES is y, building will fail:
drivers/crypto/atmel-aes.o: In function `atmel_aes_authenc_init_tfm':
atmel-aes.c:(.text+0x670): undefined reference to `atmel_sha_authenc_get_reqsize'
atmel-aes.c:(.text+0x67a): undefined reference to `atmel_sha_authenc_spawn'
drivers/crypto/atmel-aes.o: In function `atmel_aes_authenc_setkey':
atmel-aes.c:(.text+0x7e5): undefined reference to `atmel_sha_authenc_setkey'
Make CRYPTO_DEV_ATMEL_AUTHENC depend on CRYPTO_DEV_ATMEL_AES,
and select CRYPTO_DEV_ATMEL_SHA and CRYPTO_AUTHENC for it under there.
Reported-by: Hulk Robot <[email protected]>
Suggested-by: Herbert Xu <[email protected]>
Fixes: 89a82ef87e01 ("crypto: atmel-authenc - add support to...")
Signed-off-by: YueHaibing <[email protected]>
Reviewed-by: Tudor Ambarus <[email protected]>
Signed-off-by: Herbert Xu <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/crypto/Kconfig | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -491,10 +491,9 @@ if CRYPTO_DEV_UX500
endif # if CRYPTO_DEV_UX500
config CRYPTO_DEV_ATMEL_AUTHENC
- tristate "Support for Atmel IPSEC/SSL hw accelerator"
+ bool "Support for Atmel IPSEC/SSL hw accelerator"
depends on ARCH_AT91 || COMPILE_TEST
- select CRYPTO_DEV_ATMEL_AES
- select CRYPTO_DEV_ATMEL_SHA
+ depends on CRYPTO_DEV_ATMEL_AES
help
Some Atmel processors can combine the AES and SHA hw accelerators
to enhance support of IPSEC/SSL.
@@ -507,7 +506,8 @@ config CRYPTO_DEV_ATMEL_AES
select CRYPTO_AES
select CRYPTO_AEAD
select CRYPTO_BLKCIPHER
- select CRYPTO_AUTHENC
+ select CRYPTO_AUTHENC if CRYPTO_DEV_ATMEL_AUTHENC
+ select CRYPTO_DEV_ATMEL_SHA if CRYPTO_DEV_ATMEL_AUTHENC
help
Some Atmel processors have AES hw accelerator.
Select this if you want to use the Atmel module for
From: AceLan Kao <[email protected]>
[ Upstream commit f815dd5cf48b905eeecf0a2b990e9b7ab048b4f1 ]
Add support for Quectel Wireless Solutions Co., Ltd. EG95 LTE modem
T: Bus=01 Lev=01 Prnt=01 Port=02 Cnt=02 Dev#= 5 Spd=480 MxCh= 0
D: Ver= 2.00 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 1
P: Vendor=2c7c ProdID=0195 Rev=03.18
S: Manufacturer=Android
S: Product=Android
C: #Ifs= 5 Cfg#= 1 Atr=a0 MxPwr=500mA
I: If#=0x0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
I: If#=0x1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)
I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)
I: If#=0x3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)
I: If#=0x4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
Signed-off-by: AceLan Kao <[email protected]>
Acked-by: Bjørn Mork <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/net/usb/qmi_wwan.c | 1 +
1 file changed, 1 insertion(+)
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -1370,6 +1370,7 @@ static const struct usb_device_id produc
{QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)}, /* SIMCom 7100E, 7230E, 7600E ++ */
{QMI_QUIRK_SET_DTR(0x2c7c, 0x0121, 4)}, /* Quectel EC21 Mini PCIe */
{QMI_QUIRK_SET_DTR(0x2c7c, 0x0191, 4)}, /* Quectel EG91 */
+ {QMI_QUIRK_SET_DTR(0x2c7c, 0x0195, 4)}, /* Quectel EG95 */
{QMI_FIXED_INTF(0x2c7c, 0x0296, 4)}, /* Quectel BG96 */
{QMI_QUIRK_SET_DTR(0x2cb7, 0x0104, 4)}, /* Fibocom NL678 series */
{QMI_FIXED_INTF(0x0489, 0xe0b4, 0)}, /* Foxconn T77W968 LTE */
On 7/20/20 9:34 AM, Greg Kroah-Hartman wrote:
> This is the start of the stable review cycle for the 5.4.53 release.
> There are 215 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, 22 Jul 2020 15:27:31 +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.4.53-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-5.4.y
> and the diffstat can be found below.
>
> thanks,
>
> greg k-h
>
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
On Mon, 20 Jul 2020 at 21:27, Greg Kroah-Hartman
<[email protected]> wrote:
>
> This is the start of the stable review cycle for the 5.4.53 release.
> There are 215 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, 22 Jul 2020 15:27:31 +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.4.53-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-5.4.y
> and the diffstat can be found below.
>
> thanks,
>
> greg k-h
Results from Linaro’s test farm.
Regressions detected on arm and arm64 (Juno-r2)
perf test cases failed
perf:
* perf_record_test
* perf_report_test
* Track-with-sched_switch (ignore intermittent failure)
Bad case:
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.002 MB perf-lava-test.data ]
when it was pass it prints number of samples like below,
Good case:
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.004 MB perf-lava-test.data (46 samples) ]
steps to reproduce:
# perf record -e cycles -o perf-lava-test.data ls -a 2>&1 | tee perf-record.log
Link to full test:
https://qa-reports.linaro.org/lkft/linux-stable-rc-5.4-oe/build/v5.4.52-216-g95f1079149bd/testrun/2969631/suite/perf/test/perf_record_test/log
test case:
https://github.com/Linaro/test-definitions/blob/master/automated/linux/perf/perf.sh
Summary
------------------------------------------------------------------------
kernel: 5.4.53-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-5.4.y
git commit: 95f1079149bd5596df492ff3dd12dacdd264e0ea
git describe: v5.4.52-216-g95f1079149bd
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-5.4-oe/build/v5.4.52-216-g95f1079149bd
Regressions (compared to build v5.4.52)
------------------------------------------------------------------------
perf:
* perf_record_test
* perf_report_test
* Track-with-sched_switch (ignore intermittent failure)
No fixes (compared to build v5.4.52)
Ran 36089 total tests in the following environments and test suites.
Environments
--------------
- dragonboard-410c
- hi6220-hikey
- i386
- juno-r2
- juno-r2-compat
- juno-r2-kasan
- nxp-ls2088
- qemu_arm
- qemu_arm64
- qemu_i386
- qemu_x86_64
- x15
- x86
- x86-kasan
Test Suites
-----------
* build
* install-android-platform-tools-r2600
* install-android-platform-tools-r2800
* kselftest
* kselftest/drivers
* kselftest/filesystems
* kselftest/net
* libhugetlbfs
* linux-log-parser
* ltp-cap_bounds-tests
* ltp-containers-tests
* ltp-controllers-tests
* ltp-cpuhotplug-tests
* ltp-crypto-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* perf
* v4l2-compliance
* kvm-unit-tests
* ltp-commands-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fs-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* network-basic-tests
* ltp-open-posix-tests
* kselftest-vsyscall-mode-native
* kselftest-vsyscall-mode-native/drivers
* kselftest-vsyscall-mode-native/filesystems
* kselftest-vsyscall-mode-native/net
* kselftest-vsyscall-mode-none
* kselftest-vsyscall-mode-none/drivers
* kselftest-vsyscall-mode-none/filesystems
* kselftest-vsyscall-mode-none/net
--
Linaro LKFT
https://lkft.linaro.org
On Mon, Jul 20, 2020 at 05:34:42PM +0200, Greg Kroah-Hartman wrote:
> This is the start of the stable review cycle for the 5.4.53 release.
> There are 215 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, 22 Jul 2020 15:27:31 +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.4.53-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-5.4.y
> and the diffstat can be found below.
>
> thanks,
>
> greg k-h
All tests passing for Tegra ...
Test results for stable-v5.4:
11 builds: 11 pass, 0 fail
26 boots: 26 pass, 0 fail
56 tests: 56 pass, 0 fail
Linux version: 5.4.53-rc1-g95f1079149bd
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra20-ventana,
tegra210-p2371-2180, tegra210-p3450-0000,
tegra30-cardhu-a04
Cheers,
Thierry
On Mon, Jul 20, 2020 at 05:34:42PM +0200, Greg Kroah-Hartman wrote:
> This is the start of the stable review cycle for the 5.4.53 release.
> There are 215 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, 22 Jul 2020 15:27:31 +0000.
> Anything received after that time might be too late.
>
Build results:
total: 157 pass: 157 fail: 0
Qemu test results:
total: 430 pass: 430 fail: 0
Guenter