5.15.187-rc1 review
Subsystems (6)
Greg Kroah-Hartman
maintainercover 5.15.187-rc1 review
This is the start of the stable review cycle for the 5.15.187 release. There are 160 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 Thu, 10 Jul 2025 16:22:09 +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.15.187-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.15.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.15.187-rc1
Borislav Petkov (AMD) <[email protected]>
x86/process: Move the buffer clearing before MONITOR
Borislav Petkov (AMD) <[email protected]>
KVM: SVM: Advertise TSA CPUID bits to guests
Paolo Bonzini <[email protected]>
KVM: x86: add support for CPUID leaf 0x80000021
Borislav Petkov (AMD) <[email protected]>
x86/bugs: Add a Transient Scheduler Attacks mitigation
Borislav Petkov (AMD) <[email protected]>
x86/bugs: Rename MDS machinery to something more generic
Andrei Kuchynski <[email protected]>
usb: typec: displayport: Fix potential deadlock
Kurt Borja <[email protected]>
platform/x86: think-lmi: Create ksets consecutively
Oliver Neukum <[email protected]>
Logitech C-270 even more broken
Michael J. Ruhl <[email protected]>
i2c/designware: Fix an initialization issue
Peter Chen <[email protected]>
usb: cdnsp: do not disable slot for disabled slot
Mathias Nyman <[email protected]>
xhci: dbc: Flush queued requests before stopping dbc
Łukasz Bartosik <[email protected]>
xhci: dbctty: disable ECHO flag by default
Kurt Borja <[email protected]>
platform/x86: dell-wmi-sysman: Fix class device unregistration
Kurt Borja <[email protected]>
platform/x86: think-lmi: Fix class device unregistration
Fushuai Wang <[email protected]>
dpaa2-eth: fix xdp_rxq_info leak
Ioana Ciornei <[email protected]>
net: dpaa2-eth: rearrange variable in dpaa2_eth_get_ethtool_stats
Radu Bulie <[email protected]>
dpaa2-eth: Update SINGLE_STEP register access
Radu Bulie <[email protected]>
dpaa2-eth: Update dpni_get_single_step_cfg command
Thomas Fourier <[email protected]>
ethernet: atl1: Add missing DMA mapping error checks and count errors
Trond Myklebust <[email protected]>
NFSv4/flexfiles: Fix handling of NFS level errors in I/O
Maíra Canal <[email protected]>
drm/v3d: Disable interrupts before resetting the GPU
Manivannan Sadhasivam <[email protected]>
regulator: gpio: Fix the out-of-bounds access to drvdata::gpiods
Jerome Neanne <[email protected]>
regulator: gpio: Add input_supply support in gpio_regulator_config
Avri Altman <[email protected]>
mmc: core: sd: Apply BROKEN_SD_DISCARD quirk earlier
Uladzislau Rezki (Sony) <[email protected]>
rcu: Return early if callback is not specified
Pablo Martin-Gomez <[email protected]>
mtd: spinand: fix memory leak of ECC engine conf
Rafael J. Wysocki <[email protected]>
ACPICA: Refuse to evaluate a method if arguments are missing
Johannes Berg <[email protected]>
wifi: ath6kl: remove WARN on bad firmware input
Johannes Berg <[email protected]>
wifi: mac80211: drop invalid source address OCB frames
Maurizio Lombardi <[email protected]>
scsi: target: Fix NULL pointer dereference in core_scsi3_decode_spec_i_port()
Madhavan Srinivasan <[email protected]>
powerpc: Fix struct termio related ioctl macros
Johannes Berg <[email protected]>
ata: pata_cs5536: fix build on 32-bit UML
Takashi Iwai <[email protected]>
ALSA: sb: Force to disable DMAs once when DMA mode is changed
Takashi Iwai <[email protected]>
ALSA: sb: Don't allow changing the DMA mode during operations
Rob Clark <[email protected]>
drm/msm: Fix a fence leak in submit error path
Lion Ackermann <[email protected]>
net/sched: Always pass notifications when child class becomes empty
Thomas Fourier <[email protected]>
nui: Fix dma_mapping_error() check
Kohei Enju <[email protected]>
rose: fix dangling neighbour pointers in rose_rt_device_down()
Alok Tiwari <[email protected]>
enic: fix incorrect MTU comparison in enic_change_mtu()
Raju Rangoju <[email protected]>
amd-xgbe: align CL37 AN sequence as per databook
Dan Carpenter <[email protected]>
lib: test_objagg: Set error message in check_expect_hints_stats()
Vitaly Lifshits <[email protected]>
igc: disable L1.2 PCI-E link substate to avoid performance issue
Janusz Krzysztofik <[email protected]>
drm/i915/gt: Fix timeline left held on VMA alloc error
Kurt Borja <[email protected]>
platform/x86: dell-wmi-sysman: Fix WMI data block retrieval in sysfs callbacks
Dan Carpenter <[email protected]>
drm/i915/selftests: Change mock_request() to return error pointers
James Clark <[email protected]>
spi: spi-fsl-dspi: Clear completion counter before initiating transfer
Marek Szyprowski <[email protected]>
drm/exynos: fimd: Guard display clock control with runtime PM calls
Filipe Manana <[email protected]>
btrfs: fix missing error handling when searching for inode refs during log replay
Patrisious Haddad <[email protected]>
RDMA/mlx5: Fix CC counters query for MPV
Bart Van Assche <[email protected]>
scsi: ufs: core: Fix spelling of a sysfs attribute name
Thomas Fourier <[email protected]>
scsi: qla4xxx: Fix missing DMA mapping error in qla4xxx_alloc_pdu()
Thomas Fourier <[email protected]>
scsi: qla2xxx: Fix DMA mapping test in qla24xx_get_port_database()
Benjamin Coddington <[email protected]>
NFSv4/pNFS: Fix a race to wake on NFS_LAYOUT_DRAIN
Kuniyuki Iwashima <[email protected]>
nfs: Clean up /proc/net/rpc/nfs when nfs_fs_proc_net_init() fails.
Mark Zhang <[email protected]>
RDMA/mlx5: Initialize obj_event->obj_sub_list before xa_insert
David Thompson <[email protected]>
platform/mellanox: mlxbf-tmfifo: fix vring_desc.len assignment
Sergey Senozhatsky <[email protected]>
mtk-sd: reset host->mrq on prepare_data() error
Masami Hiramatsu (Google) <[email protected]>
mtk-sd: Prevent memory corruption from DMA map failure
Masami Hiramatsu (Google) <[email protected]>
mtk-sd: Fix a pagefault in dma_unmap_sg() for not prepared data
RD Babiera <[email protected]>
usb: typec: altmodes/displayport: do not index invalid pin_assignments
Ulf Hansson <[email protected]>
Revert "mmc: sdhci: Disable SD card clock before changing parameters"
Victor Shih <[email protected]>
mmc: sdhci: Add a helper function for dump register in dynamic debug mode
HarshaVardhana S A <[email protected]>
vsock/vmci: Clear the vmci transport packet properly when initializing it
Mateusz Jończyk <[email protected]>
rtc: cmos: use spin_lock_irqsave in cmos_interrupt
Geert Uytterhoeven <[email protected]>
ARM: 9354/1: ptrace: Use bitfield helpers
Josef Bacik <[email protected]>
btrfs: don't drop extent_map for free space inode on write error
Dev Jain <[email protected]>
arm64: Restrict pagetable teardown to avoid false warning
Brett A C Sheffield (Librecast) <[email protected]>
Revert "ipv6: save dontfrag in cork"
Nathan Chancellor <[email protected]>
s390: Add '-std=gnu11' to decompressor and purgatory CFLAGS
Heiko Carstens <[email protected]>
s390/entry: Fix last breaking event handling in case of stack corruption
Ricardo Ribalda <[email protected]>
media: uvcvideo: Rollback non processed entities on error
Dexuan Cui <[email protected]>
PCI: hv: Do not set PCI_COMMAND_MEMORY to reduce VM boot time
Wentao Liang <[email protected]>
drm/amd/display: Add null pointer check for get_first_active_display()
Aradhya Bhatia <[email protected]>
drm/bridge: cdns-dsi: Wait for Clk and Data Lanes to be ready
Aradhya Bhatia <[email protected]>
drm/bridge: cdns-dsi: Check return value when getting default PHY config
Aradhya Bhatia <[email protected]>
drm/bridge: cdns-dsi: Fix connecting to next bridge
Aradhya Bhatia <[email protected]>
drm/bridge: cdns-dsi: Fix the clock variable for mode_valid()
Jay Cornwall <[email protected]>
drm/amdkfd: Fix race in GWS queue scheduling
Thomas Zimmermann <[email protected]>
drm/udl: Unregister device before cleaning up on disconnect
Qiu-ji Chen <[email protected]>
drm/tegra: Fix a possible null pointer dereference
Thierry Reding <[email protected]>
drm/tegra: Assign plane type before registration
Qasim Ijaz <[email protected]>
HID: wacom: fix kobject reference count leak
Qasim Ijaz <[email protected]>
HID: wacom: fix memory leak on sysfs attribute creation failure
Qasim Ijaz <[email protected]>
HID: wacom: fix memory leak on kobject creation failure
Mark Harmstone <[email protected]>
btrfs: update superblock's device bytes_used when dropping chunk
Heinz Mauelshagen <[email protected]>
dm-raid: fix variable in journal device check
Frédéric Danis <[email protected]>
Bluetooth: L2CAP: Fix L2CAP MTU negotiation
Yao Zi <[email protected]>
dt-bindings: serial: 8250: Make clocks and clock-frequency exclusive
Nathan Chancellor <[email protected]>
staging: rtl8723bs: Avoid memset() in aes_cipher() and aes_decipher()
Jakub Kicinski <[email protected]>
net: selftests: fix TCP packet checksum
Kuniyuki Iwashima <[email protected]>
atm: Release atm_dev_mutex after removing procfs in atm_dev_deregister().
Simon Horman <[email protected]>
net: enetc: Correct endianness handling in _enetc_rd_reg64
Tiwei Bie <[email protected]>
um: ubd: Add missing error check in start_io_thread()
Stefano Garzarella <[email protected]>
vsock/uapi: fix linux/vm_sockets.h userspace compilation errors
Kuniyuki Iwashima <[email protected]>
af_unix: Don't set -ECONNRESET for consumed OOB skb.
Lachlan Hodges <[email protected]>
wifi: mac80211: fix beacon interval calculation overflow
Yuan Chen <[email protected]>
libbpf: Fix null pointer dereference in btf_dump__free on allocation failure
Al Viro <[email protected]>
attach_recursive_mnt(): do not lock the covering tree when sliding something under it
Youngjun Lee <[email protected]>
ALSA: usb-audio: Fix out-of-bounds read in snd_usb_get_audioformat_uac3()
Eric Dumazet <[email protected]>
atm: clip: prevent NULL deref in clip_push()
Fedor Pchelkin <[email protected]>
s390/pkey: Prevent overflow in size calculation for memdup_user()
Wolfram Sang <[email protected]>
i2c: robotfuzz-osif: disable zero-length read messages
Wolfram Sang <[email protected]>
i2c: tiny-usb: disable zero-length read messages
Rong Zhang <[email protected]>
platform/x86: ideapad-laptop: use usleep_range() for EC polling
Thomas Zimmermann <[email protected]>
dummycon: Trigger redraw when switching consoles with deferred takeover
Jiri Slaby (SUSE) <[email protected]>
tty: vt: make consw::con_switch() return a bool
Jiri Slaby (SUSE) <[email protected]>
tty: vt: sanitize arguments of consw::con_clear()
Jiri Slaby (SUSE) <[email protected]>
tty: vt: make init parameter of consw::con_init() a bool
Jiri Slaby (SUSE) <[email protected]>
vgacon: remove unneeded forward declarations
Jiri Slaby (SUSE) <[email protected]>
vgacon: switch vgacon_scrolldelta() and vgacon_restore_screen()
Jiri Slaby <[email protected]>
tty/vt: consolemap: rename and document struct uni_pagedir
Daniel Vetter <[email protected]>
fbcon: delete a few unneeded forward decl
Long Li <[email protected]>
uio_hv_generic: Align ring size to system page
Saurabh Sengar <[email protected]>
uio_hv_generic: Query the ringbuffer size for device
Saurabh Sengar <[email protected]>
Drivers: hv: vmbus: Add utility function for querying ring size
Vitaly Kuznetsov <[email protected]>
Drivers: hv: Rename 'alloced' to 'allocated'
Murad Masimov <[email protected]>
fbdev: Fix do_register_framebuffer to prevent null-ptr-deref in fb_videomode_to_var
Daniel Vetter <[email protected]>
fbcon: Move console_lock for register/unlink/unregister
Daniel Vetter <[email protected]>
fbcon: use lock_fb_info in fbcon_open/release
Daniel Vetter <[email protected]>
fbcon: move more common code into fb_open()
Daniel Vetter <[email protected]>
fbcon: Extract fbcon_open/release helpers
Daniel Vetter <[email protected]>
fbcon: Use delayed work for cursor
Chao Yu <[email protected]>
f2fs: don't over-report free space or inodes in statvfs
Krzysztof Kozlowski <[email protected]>
ASoC: codecs: wcd9335: Fix missing free of regulator supplies
Peng Fan <[email protected]>
ASoC: codec: wcd9335: Convert to GPIO descriptors
Krzysztof Kozlowski <[email protected]>
ASoC: codecs: wcd9335: Handle nicer probe deferral and simplify with dev_err_probe()
Matti Vaittinen <[email protected]>
regulator: Add devm helpers for get and enable
Douglas Anderson <[email protected]>
regulator: core: Allow drivers to define their init data as const
Ming Qian <[email protected]>
media: imx-jpeg: Drop the first error frames
Miquel Raynal <[email protected]>
clk: ti: am43xx: Add clkctrl data for am43xx ADC1
Marek Szyprowski <[email protected]>
media: omap3isp: use sgtable-based scatterlist wrappers
Dmitry Nikiforov <[email protected]>
media: davinci: vpif: Fix memory leak in probe error path
Vasiliy Kovalev <[email protected]>
jfs: validate AG parameters in dbMount() to prevent crashes
Dave Kleikamp <[email protected]>
fs/jfs: consolidate sanity checking in dbMount
Kees Cook <[email protected]>
ovl: Check for NULL d_inode() in ovl_dentry_upper()
Dmitry Kandybka <[email protected]>
ceph: fix possible integer overflow in ceph_zero_objects()
Mario Limonciello <[email protected]>
ALSA: usb-audio: Add a quirk for Lenovo Thinkpad Thunderbolt 3 dock
Vijendar Mukunda <[email protected]>
ALSA: hda: Add new pci id for AMD GPU display HD audio controller
Cezary Rojewski <[email protected]>
ALSA: hda: Ignore unsol events for cards being shut down
Jos Wang <[email protected]>
usb: typec: displayport: Receive DP Status Update NAK request exit dp altmode
Robert Hodaszi <[email protected]>
usb: cdc-wdm: avoid setting WDM_READ for ZLP-s
Andy Shevchenko <[email protected]>
usb: Add checks for snprintf() calls in usb_alloc_dev()
Chance Yang <[email protected]>
usb: common: usb-conn-gpio: use a unique name for usb connector device
Jakub Lewalski <[email protected]>
tty: serial: uartlite: register uart driver in init
Chen Yufeng <[email protected]>
usb: potential integer overflow in usbg_make_tpg()
Michael Grzeschik <[email protected]>
usb: dwc2: also exit clock_gating when stopping udc while suspended
James Clark <[email protected]>
coresight: Only check bottom two claim bits
Sami Tolvanen <[email protected]>
um: Add cmpxchg8b_emu and checksum functions to asm-prototypes.h
Jonathan Cameron <[email protected]>
iio: pressure: zpa2326: Use aligned_s64 for the timestamp
Linggang Zeng <[email protected]>
bcache: fix NULL pointer in cache_set_flush()
Yu Kuai <[email protected]>
md/md-bitmap: fix dm-raid max_write_behind setting
Thomas Gessler <[email protected]>
dmaengine: xilinx_dma: Set dma_device directions
Namjae Jeon <[email protected]>
ksmbd: allow a filename to contain special characters on SMB3.1.1 posix extension
Alexis Czezar Torreno <[email protected]>
hwmon: (pmbus/max34440) Fix support for max34451
Sven Schwermer <[email protected]>
leds: multicolor: Fix intensity setting while SW blinking
Krzysztof Kozlowski <[email protected]>
mfd: max14577: Fix wakeup source leaks on device unbind
Peng Fan <[email protected]>
mailbox: Not protect module_put with spin_lock_irqsave
Olga Kornievskaia <[email protected]>
NFSv4.2: fix listxattr to return selinux security label
Han Young <[email protected]>
NFSv4: Always set NLINK even if the server doesn't support it
Pali Rohár <[email protected]>
cifs: Fix cifs_query_path_info() for Windows NT servers
-------------
Diffstat:
Documentation/ABI/testing/sysfs-devices-system-cpu | 1 + Documentation/ABI/testing/sysfs-driver-ufs | 2 +- .../hw-vuln/processor_mmio_stale_data.rst | 4 +- Documentation/admin-guide/kernel-parameters.txt | 13 + Documentation/devicetree/bindings/serial/8250.yaml | 2 +- Makefile | 4 +- arch/arm/include/asm/ptrace.h | 5 +- arch/arm64/mm/mmu.c | 3 +- arch/powerpc/include/uapi/asm/ioctls.h | 8 +- arch/s390/Makefile | 2 +- arch/s390/kernel/entry.S | 2 +- arch/s390/purgatory/Makefile | 2 +- arch/um/drivers/ubd_user.c | 2 +- arch/um/include/asm/asm-prototypes.h | 5 + arch/x86/Kconfig | 9 + arch/x86/entry/entry.S | 8 +- arch/x86/include/asm/cpu.h | 13 + arch/x86/include/asm/cpufeatures.h | 6 + arch/x86/include/asm/irqflags.h | 4 +- arch/x86/include/asm/mwait.h | 19 +- arch/x86/include/asm/nospec-branch.h | 39 ++- arch/x86/kernel/cpu/amd.c | 58 ++++ arch/x86/kernel/cpu/bugs.c | 133 +++++++- arch/x86/kernel/cpu/common.c | 14 +- arch/x86/kernel/cpu/scattered.c | 2 + arch/x86/kernel/process.c | 15 +- arch/x86/kvm/cpuid.c | 25 +- arch/x86/kvm/reverse_cpuid.h | 8 + arch/x86/kvm/svm/vmenter.S | 6 + arch/x86/kvm/vmx/vmx.c | 2 +- arch/x86/um/asm/checksum.h | 3 + drivers/acpi/acpica/dsmethod.c | 7 + drivers/ata/pata_cs5536.c | 2 +- drivers/base/cpu.c | 2 + drivers/clk/ti/clk-43xx.c | 1 + drivers/dma/xilinx/xilinx_dma.c | 2 + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 2 +- .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 3 + drivers/gpu/drm/bridge/cdns-dsi.c | 27 +- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 12 + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 3 +- drivers/gpu/drm/i915/selftests/i915_request.c | 20 +- drivers/gpu/drm/i915/selftests/mock_request.c | 2 +- drivers/gpu/drm/msm/msm_gem_submit.c | 9 + drivers/gpu/drm/tegra/dc.c | 17 +- drivers/gpu/drm/tegra/hub.c | 4 +- drivers/gpu/drm/tegra/hub.h | 3 +- drivers/gpu/drm/udl/udl_drv.c | 2 +- drivers/gpu/drm/v3d/v3d_drv.h | 8 + drivers/gpu/drm/v3d/v3d_gem.c | 2 + drivers/gpu/drm/v3d/v3d_irq.c | 39 ++- drivers/hid/wacom_sys.c | 6 +- drivers/hv/channel_mgmt.c | 33 +- drivers/hv/hyperv_vmbus.h | 19 +- drivers/hv/vmbus_drv.c | 2 +- drivers/hwmon/pmbus/max34440.c | 48 ++- drivers/hwtracing/coresight/coresight-core.c | 3 +- drivers/hwtracing/coresight/coresight-priv.h | 1 + drivers/i2c/busses/i2c-designware-master.c | 1 + drivers/i2c/busses/i2c-robotfuzz-osif.c | 6 + drivers/i2c/busses/i2c-tiny-usb.c | 6 + drivers/iio/pressure/zpa2326.c | 2 +- drivers/infiniband/hw/mlx5/counters.c | 2 +- drivers/infiniband/hw/mlx5/devx.c | 2 +- drivers/leds/led-class-multicolor.c | 3 +- drivers/mailbox/mailbox.c | 2 +- drivers/md/bcache/super.c | 7 +- drivers/md/dm-raid.c | 2 +- drivers/md/md-bitmap.c | 2 +- drivers/media/platform/davinci/vpif.c | 4 +- drivers/media/platform/imx-jpeg/mxc-jpeg.c | 12 +- drivers/media/platform/omap3isp/ispccdc.c | 8 +- drivers/media/platform/omap3isp/ispstat.c | 6 +- drivers/media/usb/uvc/uvc_ctrl.c | 42 ++- drivers/mfd/max14577.c | 1 + drivers/mmc/core/quirks.h | 16 +- drivers/mmc/host/mtk-sd.c | 21 +- drivers/mmc/host/sdhci.c | 9 +- drivers/mmc/host/sdhci.h | 16 + drivers/mtd/nand/spi/core.c | 1 + drivers/net/ethernet/amd/xgbe/xgbe-common.h | 2 + drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 9 + drivers/net/ethernet/amd/xgbe/xgbe.h | 4 +- drivers/net/ethernet/atheros/atlx/atl1.c | 78 +++-- drivers/net/ethernet/cisco/enic/enic_main.c | 4 +- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 115 ++++++- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 14 +- .../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 18 +- drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h | 6 +- drivers/net/ethernet/freescale/dpaa2/dpni.c | 2 + drivers/net/ethernet/freescale/dpaa2/dpni.h | 6 + drivers/net/ethernet/freescale/enetc/enetc_hw.h | 2 +- drivers/net/ethernet/intel/igc/igc_main.c | 10 + drivers/net/ethernet/sun/niu.c | 31 +- drivers/net/ethernet/sun/niu.h | 4 + drivers/net/wireless/ath/ath6kl/bmi.c | 4 +- drivers/pci/controller/pci-hyperv.c | 17 +- drivers/platform/mellanox/mlxbf-tmfifo.c | 3 +- .../x86/dell/dell-wmi-sysman/dell-wmi-sysman.h | 5 + .../x86/dell/dell-wmi-sysman/enum-attributes.c | 5 +- .../x86/dell/dell-wmi-sysman/int-attributes.c | 5 +- .../x86/dell/dell-wmi-sysman/passobj-attributes.c | 5 +- .../x86/dell/dell-wmi-sysman/string-attributes.c | 5 +- drivers/platform/x86/dell/dell-wmi-sysman/sysman.c | 12 +- drivers/platform/x86/ideapad-laptop.c | 19 +- drivers/platform/x86/think-lmi.c | 18 +- drivers/regulator/devres.c | 192 ++++++++++++ drivers/regulator/gpio-regulator.c | 19 +- drivers/rtc/rtc-cmos.c | 10 +- drivers/s390/crypto/pkey_api.c | 2 +- drivers/scsi/qla2xxx/qla_mbx.c | 2 +- drivers/scsi/qla4xxx/ql4_os.c | 2 + drivers/scsi/ufs/ufs-sysfs.c | 4 +- drivers/spi/spi-fsl-dspi.c | 11 +- drivers/staging/rtl8723bs/core/rtw_security.c | 44 +-- drivers/target/target_core_pr.c | 4 +- drivers/tty/serial/uartlite.c | 25 +- drivers/tty/vt/consolemap.c | 47 +-- drivers/tty/vt/vt.c | 12 +- drivers/uio/uio_hv_generic.c | 10 +- drivers/usb/cdns3/cdnsp-ring.c | 4 +- drivers/usb/class/cdc-wdm.c | 23 +- drivers/usb/common/usb-conn-gpio.c | 25 +- drivers/usb/core/quirks.c | 3 +- drivers/usb/core/usb.c | 14 +- drivers/usb/dwc2/gadget.c | 6 + drivers/usb/gadget/function/f_tcm.c | 4 +- drivers/usb/host/xhci-dbgcap.c | 4 + drivers/usb/host/xhci-dbgtty.c | 1 + drivers/usb/typec/altmodes/displayport.c | 5 +- drivers/video/console/dummycon.c | 24 +- drivers/video/console/mdacon.c | 21 +- drivers/video/console/newport_con.c | 12 +- drivers/video/console/sticon.c | 14 +- drivers/video/console/vgacon.c | 38 +-- drivers/video/fbdev/core/fbcon.c | 336 ++++++++++----------- drivers/video/fbdev/core/fbcon.h | 4 +- drivers/video/fbdev/core/fbmem.c | 43 +-- fs/btrfs/inode.c | 19 +- fs/btrfs/tree-log.c | 4 +- fs/btrfs/volumes.c | 6 + fs/ceph/file.c | 2 +- fs/cifs/misc.c | 8 + fs/f2fs/super.c | 30 +- fs/jfs/jfs_dmap.c | 41 +-- fs/ksmbd/smb2pdu.c | 53 ++-- fs/namespace.c | 8 +- fs/nfs/flexfilelayout/flexfilelayout.c | 121 +++++--- fs/nfs/inode.c | 19 +- fs/nfs/nfs4proc.c | 12 +- fs/nfs/pnfs.c | 4 +- fs/overlayfs/util.c | 4 +- include/dt-bindings/clock/am4.h | 1 + include/linux/console.h | 13 +- include/linux/console_struct.h | 6 +- include/linux/cpu.h | 1 + include/linux/hyperv.h | 2 + include/linux/ipv6.h | 1 - include/linux/regulator/consumer.h | 31 ++ include/linux/regulator/gpio-regulator.h | 2 + include/linux/usb/typec_dp.h | 1 + include/uapi/linux/vm_sockets.h | 4 + kernel/rcu/tree.c | 4 + lib/test_objagg.c | 4 +- net/atm/clip.c | 11 +- net/atm/resources.c | 3 +- net/bluetooth/l2cap_core.c | 9 +- net/core/selftests.c | 5 +- net/ipv6/ip6_output.c | 9 +- net/mac80211/rx.c | 4 + net/mac80211/util.c | 2 +- net/rose/rose_route.c | 15 +- net/sched/sch_api.c | 19 +- net/unix/af_unix.c | 18 +- net/vmw_vsock/vmci_transport.c | 4 +- sound/isa/sb/sb16_main.c | 7 + sound/pci/hda/hda_bind.c | 2 +- sound/pci/hda/hda_intel.c | 3 + sound/soc/codecs/wcd9335.c | 62 ++-- sound/usb/quirks.c | 2 + sound/usb/stream.c | 2 + tools/lib/bpf/btf_dump.c | 3 + 182 files changed, 1971 insertions(+), 847 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/160 cifs: Fix cifs_query_path_info() for Windows NT servers
5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pali Rohár <[email protected]>
[ Upstream commit a3e771afbb3bce91c8296828304903e7348003fe ]
For TRANS2 QUERY_PATH_INFO request when the path does not exist, the Windows NT SMB server returns error response STATUS_OBJECT_NAME_NOT_FOUND or ERRDOS/ERRbadfile without the SMBFLG_RESPONSE flag set. Similarly it returns STATUS_DELETE_PENDING when the file is being deleted. And looks like that any error response from TRANS2 QUERY_PATH_INFO does not have SMBFLG_RESPONSE flag set.
So relax check in check_smb_hdr() for detecting if the packet is response for this special case.
This change fixes stat() operation against Windows NT SMB servers and also all operations which depends on -ENOENT result from stat like creat() or mkdir().
--- fs/cifs/misc.c | 8 ++++++++ 1 file changed, 8 insertions(+)
fs/cifs/misc.c +8 -0
@@ -297,6 +297,14 @@ check_smb_hdr(struct smb_hdr *smb)if (smb->Command ==SMB_COM_LOCKING_ANDX )return 0 ; +/* +* Windows NT server returns error resposne (e.g. STATUS_DELETE_PENDING +* or STATUS_OBJECT_NAME_NOT_FOUND or ERRDOS/ERRbadfile or any other) +* for some TRANS2 requests without the RESPONSE flag set in header. +*/ +if (smb->Command ==SMB_COM_TRANSACTION2 && smb->Status.CifsError !=0 ) +return 0 ; +cifs_dbg (VFS ,"Server sent request, not response. mid=%u\n" ,get_mid (smb));return 1 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 2/160 NFSv4: Always set NLINK even if the server doesnt support it
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Han Young <[email protected]>
[ Upstream commit 3a3065352f73381d3a1aa0ccab44aec3a5a9b365 ]
fattr4_numlinks is a recommended attribute, so the client should emulate it even if the server doesn't support it. In decode_attr_nlink function in nfs4xdr.c, nlink is initialized to 1. However, this default value isn't set to the inode due to the check in nfs_fhget.
So if the server doesn't support numlinks, inode's nlink will be zero, the mount will fail with error "Stale file handle". Set the nlink to 1 if the server doesn't support it.
--- fs/nfs/inode.c | 2 ++ 1 file changed, 2 insertions(+)
fs/nfs/inode.c +2 -0
@@ -567,6 +567,8 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr, stset_nlink (inode, fattr->nlink); else if (fattr_supported & NFS_ATTR_FATTR_NLINK) nfs_set_cache_invalid(inode, NFS_INO_INVALID_NLINK); + else + set_nlink(inode, 1);if (fattr->valid &NFS_ATTR_FATTR_OWNER ) inode->i_uid = fattr->uid;else if (fattr_supported &NFS_ATTR_FATTR_OWNER )
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 3/160 NFSv4.2: fix listxattr to return selinux security label
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Olga Kornievskaia <[email protected]>
[ Upstream commit 243fea134633ba3d64aceb4c16129c59541ea2c6 ]
Currently, when NFS is queried for all the labels present on the file via a command example "getfattr -d -m . /mnt/testfile", it does not return the security label. Yet when asked specifically for the label (getfattr -n security.selinux) it will be returned. Include the security label when all attributes are queried.
--- fs/nfs/nfs4proc.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
fs/nfs/nfs4proc.c +10 -2
@@ -10528,7 +10528,7 @@ const struct nfs4_minor_version_ops *nfs_v4_minor_ops[] = {static ssize_t nfs4_listxattr (struct dentry *dentry,char *list,size_t size) { -ssize_t error, error2, error3; +ssize_t error, error2, error3, error4;size_t left = size; error =generic_listxattr (dentry, list, left);
@@ -10551,8 +10551,16 @@ static ssize_t nfs4_listxattr(struct dentry *dentry, char *list, size_t size) error3 =nfs4_listxattr_nfs4_user (d_inode (dentry), list, left);if (error3 <0 )return error3; +if (list) { + list += error3; + left -= error3; + } + + error4 =security_inode_listsecurity (d_inode (dentry), list, left); +if (error4 <0 ) +return error4; - error += error2 + error3; + error += error2 + error3 + error4;if (size && error > size)return -ERANGE ;return error;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 4/160 mailbox: Not protect module_put with spin_lock_irqsave
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peng Fan <[email protected]>
[ Upstream commit dddbd233e67e792bb0a3f9694a4707e6be29b2c6 ]
&chan->lock is not supposed to protect 'chan->mbox'. And in __mbox_bind_client, try_module_get is also not protected by &chan->lock. So move module_put out of the lock protected region.
--- drivers/mailbox/mailbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mailbox/mailbox.c +1 -1
@@ -459,8 +459,8 @@ void mbox_free_channel(struct mbox_chan *chan)if (chan->txdone_method ==TXDONE_BY_ACK ) chan->txdone_method =TXDONE_BY_POLL ; -module_put (chan->mbox->dev->driver->owner);spin_unlock_irqrestore (&chan->lock, flags); +module_put (chan->mbox->dev->driver->owner); }EXPORT_SYMBOL_GPL (mbox_free_channel);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 6/160 leds: multicolor: Fix intensity setting while SW blinking
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sven Schwermer <[email protected]>
[ Upstream commit e35ca991a777ef513040cbb36bc8245a031a2633 ]
When writing to the multi_intensity file, don't unconditionally call led_set_brightness. By only doing this if blinking is inactive we prevent blinking from stopping if the blinking is in its off phase while the file is written.
Instead, if blinking is active, the changed intensity values are applied upon the next blink. This is consistent with changing the brightness on monochrome LEDs with active blinking.
--- drivers/leds/led-class-multicolor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/leds/led-class-multicolor.c +2 -1
@@ -61,7 +61,8 @@ static ssize_t multi_intensity_store(struct device *dev,for (i =0 ; i < mcled_cdev->num_colors; i++) mcled_cdev->subled_info[i].intensity = intensity_value[i]; -led_set_brightness (led_cdev, led_cdev->brightness); +if (!test_bit (LED_BLINK_SW , &led_cdev->work_flags)) +led_set_brightness (led_cdev, led_cdev->brightness); ret = size; err_out:mutex_unlock (&led_cdev->led_access);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 15/160 usb: dwc2: also exit clock_gating when stopping udc while suspended
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Grzeschik <[email protected]>
[ Upstream commit af076a41f8a28faf9ceb9dd2d88aef2c202ef39a ]
It is possible that the gadget will be disabled, while the udc is suspended. When enabling the udc in that case, the clock gating will not be enabled again. Leaving the phy unclocked. Even when the udc is not enabled, connecting this powered but not clocked phy leads to enumeration errors on the host side.
To ensure that the clock gating will be in an valid state, we ensure that the clock gating will be enabled before stopping the udc.
--- drivers/usb/dwc2/gadget.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/usb/dwc2/gadget.c +6 -0
@@ -4602,6 +4602,12 @@ static int dwc2_hsotg_udc_stop(struct usb_gadget *gadget)if (!hsotg)return -ENODEV ; +/* Exit clock gating when driver is stopped. */ +if (hsotg->params.power_down ==DWC2_POWER_DOWN_PARAM_NONE && + hsotg->bus_suspended && !hsotg->params.no_clock_gating) { +dwc2_gadget_exit_clock_gating (hsotg,0 ); + } +/* all endpoints should be shutdown */ for (ep =1 ; ep < hsotg->num_of_eps; ep++) {if (hsotg->eps_in[ep])
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 16/160 usb: potential integer overflow in usbg_make_tpg()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen Yufeng <[email protected]>
[ Upstream commit 153874010354d050f62f8ae25cbb960c17633dc5 ]
The variable tpgt in usbg_make_tpg() is defined as unsigned long and is assigned to tpgt->tport_tpgt, which is defined as u16. This may cause an integer overflow when tpgt is greater than USHRT_MAX (65535). I haven't tried to trigger it myself, but it is possible to trigger it by calling usbg_make_tpg() with a large value for tpgt.
I modified the type of tpgt to match tpgt->tport_tpgt and adjusted the relevant code accordingly.
This patch is similar to commit 59c816c1f24d ("vhost/scsi: potential memory corruption").
--- drivers/usb/gadget/function/f_tcm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/gadget/function/f_tcm.c +2 -2
@@ -1321,14 +1321,14 @@ static struct se_portal_group *usbg_make_tpg(struct se_wwn *wwn, struct usbg_tport *tport = container_of(wwn, struct usbg_tport, tport_wwn);struct usbg_tpg *tpg; -unsigned long tpgt; +u16 tpgt;int ret;struct f_tcm_opts *opts;unsigned i;if (strstr (name,"tpgt_" ) != name)return ERR_PTR (-EINVAL ); -if (kstrtoul (name +5 ,0 , &tpgt) || tpgt >UINT_MAX ) +if (kstrtou16 (name +5 ,0 , &tpgt))return ERR_PTR (-EINVAL ); ret = -ENODEV ;mutex_lock (&tpg_instances_lock);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 17/160 tty: serial: uartlite: register uart driver in init
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Lewalski <[email protected]>
[ Upstream commit 6bd697b5fc39fd24e2aa418c7b7d14469f550a93 ]
When two instances of uart devices are probing, a concurrency race can occur. If one thread calls uart_register_driver function, which first allocates and assigns memory to 'uart_state' member of uart_driver structure, the other instance can bypass uart driver registration and call ulite_assign. This calls uart_add_one_port, which expects the uart driver to be fully initialized. This leads to a kernel panic due to a null pointer dereference:
[ 8.143581] BUG: kernel NULL pointer dereference, address: 00000000000002b8 [ 8.156982] #PF: supervisor write access in kernel mode [ 8.156984] #PF: error_code(0x0002) - not-present page [ 8.156986] PGD 0 P4D 0 ... [ 8.180668] RIP: 0010:mutex_lock+0x19/0x30 [ 8.188624] Call Trace: [ 8.188629] ? __die_body.cold+0x1a/0x1f [ 8.195260] ? page_fault_oops+0x15c/0x290 [ 8.209183] ? __irq_resolve_mapping+0x47/0x80 [ 8.209187] ? exc_page_fault+0x64/0x140 [ 8.209190] ? asm_exc_page_fault+0x22/0x30 [ 8.209196] ? mutex_lock+0x19/0x30 [ 8.223116] uart_add_one_port+0x60/0x440 [ 8.223122] ? proc_tty_register_driver+0x43/0x50 [ 8.223126] ? tty_register_driver+0x1ca/0x1e0 [ 8.246250] ulite_probe+0x357/0x4b0 [uartlite]
To prevent it, move uart driver registration in to init function. This will ensure that uart_driver is always registered when probe function is called.
--- drivers/tty/serial/uartlite.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-)
drivers/tty/serial/uartlite.c +12 -13
@@ -808,16 +808,6 @@ static int ulite_probe(struct platform_device *pdev)pm_runtime_set_active (&pdev->dev);pm_runtime_enable (&pdev->dev); -if (!ulite_uart_driver.state) { -dev_dbg (&pdev->dev,"uartlite: calling uart_register_driver()\n" ); - ret =uart_register_driver (&ulite_uart_driver); -if (ret <0 ) { -dev_err (&pdev->dev,"Failed to register driver\n" ); -clk_disable_unprepare (pdata->clk); -return ret; - } - } - ret =ulite_assign (&pdev->dev, id, res->start, irq, pdata);pm_runtime_mark_last_busy (&pdev->dev);
@@ -859,16 +849,25 @@ static struct platform_driver ulite_platform_driver = {static int __init ulite_init (void ) { +int ret; + +pr_debug ("uartlite: calling uart_register_driver()\n" ); + ret =uart_register_driver (&ulite_uart_driver); +if (ret) +return ret;pr_debug ("uartlite: calling platform_driver_register()\n" ); -return platform_driver_register (&ulite_platform_driver); + ret =platform_driver_register (&ulite_platform_driver); +if (ret) +uart_unregister_driver (&ulite_uart_driver); + +return ret; } static void __exit ulite_exit(void) {platform_driver_unregister (&ulite_platform_driver); -if (ulite_uart_driver.state) -uart_unregister_driver (&ulite_uart_driver); +uart_unregister_driver (&ulite_uart_driver); }module_init (ulite_init);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 18/160 usb: common: usb-conn-gpio: use a unique name for usb connector device
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chance Yang <[email protected]>
[ Upstream commit d4e5b10c55627e2f3fc9e5b337a28b4e2f02a55e ]
The current implementation of the usb-conn-gpio driver uses a fixed "usb-charger" name for all USB connector devices. This causes conflicts in the power supply subsystem when multiple USB connectors are present, as duplicate names are not allowed.
Use IDA to manage unique IDs for naming usb connectors (e.g., usb-charger-0, usb-charger-1).
--- drivers/usb/common/usb-conn-gpio.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-)
drivers/usb/common/usb-conn-gpio.c +22 -3
@@ -20,6 +20,9 @@#include <linux/power_supply.h> #include <linux/regulator/consumer.h> #include <linux/usb/role.h> +#include <linux/idr.h> + +static DEFINE_IDA (usb_conn_ida);#define USB_GPIO_DEB_MS 20/* ms */ #define USB_GPIO_DEB_US ((USB_GPIO_DEB_MS) * 1000)/* us */
@@ -29,6 +32,7 @@struct usb_conn_info {struct device *dev; +int conn_id;/* store the IDA-allocated ID */ struct usb_role_switch *role_sw;enum usb_role last_role;struct regulator *vbus;
@@ -160,7 +164,17 @@ static int usb_conn_psy_register(struct usb_conn_info *info) .of_node = dev->of_node, }; - desc->name ="usb-charger" ; + info->conn_id =ida_alloc (&usb_conn_ida,GFP_KERNEL ); +if (info->conn_id <0 ) +return info->conn_id; + + desc->name =devm_kasprintf (dev,GFP_KERNEL ,"usb-charger-%d" , + info->conn_id); +if (!desc->name) { +ida_free (&usb_conn_ida, info->conn_id); +return -ENOMEM ; + } + desc->properties = usb_charger_properties; desc->num_properties =ARRAY_SIZE (usb_charger_properties); desc->get_property = usb_charger_get_property;
@@ -168,8 +182,10 @@ static int usb_conn_psy_register(struct usb_conn_info *info) cfg.drv_data = info; info->charger =devm_power_supply_register (dev, desc, &cfg); -if (IS_ERR (info->charger)) -dev_err (dev,"Unable to register charger\n" ); +if (IS_ERR (info->charger)) { +dev_err (dev,"Unable to register charger %d\n" , info->conn_id); +ida_free (&usb_conn_ida, info->conn_id); + }return PTR_ERR_OR_ZERO (info->charger); }
@@ -292,6 +308,9 @@ static int usb_conn_remove(struct platform_device *pdev)cancel_delayed_work_sync (&info->dw_det); +if (info->charger) +ida_free (&usb_conn_ida, info->conn_id); +if (info->last_role ==USB_ROLE_HOST && info->vbus)regulator_disable (info->vbus);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 19/160 usb: Add checks for snprintf() calls in usb_alloc_dev()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Shevchenko <[email protected]>
[ Upstream commit 82fe5107fa3d21d6c3fba091c9dbc50495588630 ]
When creating a device path in the driver the snprintf() takes up to 16 characters long argument along with the additional up to 12 characters for the signed integer (as it can't see the actual limits) and tries to pack this into 16 bytes array. GCC complains about that when build with make W=1:
drivers/usb/core/usb.c:705:25: note: ‘snprintf’ output between 3 and 28 bytes into a destination of size 16
Since everything works until now, let's just check for the potential buffer overflow and bail out. It is most likely a never happen situation, but at least it makes GCC happy.
--- drivers/usb/core/usb.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/usb/core/usb.c +10 -4
@@ -750,15 +750,16 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,dev_set_name (&dev->dev,"usb%d" , bus->busnum); root_hub =1 ; }else { +int n; +/* match any labeling on the hubs; it's one-based */ if (parent->devpath[0 ] =='0' ) { -snprintf (dev->devpath,sizeof dev->devpath, -"%d" , port1); + n =snprintf (dev->devpath,sizeof (dev->devpath),"%d" , port1);/* Root ports are not counted in route string */ dev->route =0 ; }else { -snprintf (dev->devpath,sizeof dev->devpath, -"%s.%d" , parent->devpath, port1); + n =snprintf (dev->devpath,sizeof (dev->devpath),"%s.%d" , + parent->devpath, port1);/* Route string assumes hubs have less than 16 ports */ if (port1 <15 ) dev->route = parent->route +
@@ -767,6 +768,11 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent, dev->route = parent->route + (15 << ((parent->level -1 )*4 )); } +if (n >=sizeof (dev->devpath)) { +usb_put_hcd (bus_to_hcd (bus)); +usb_put_dev (dev); +return NULL ; + } dev->dev.parent = &parent->dev;dev_set_name (&dev->dev,"%d-%s" , bus->busnum, dev->devpath);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 20/160 usb: cdc-wdm: avoid setting WDM_READ for ZLP-s
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Robert Hodaszi <[email protected]>
[ Upstream commit 387602d8a75574fafb451b7a8215e78dfd67ee63 ]
Don't set WDM_READ flag in wdm_in_callback() for ZLP-s, otherwise when userspace tries to poll for available data, it might - incorrectly - believe there is something available, and when it tries to non-blocking read it, it might get stuck in the read loop.
For example this is what glib does for non-blocking read (briefly):
1. poll()
2. if poll returns with non-zero, starts a read data loop:
a. loop on poll() (EINTR disabled)
b. if revents was set, reads data
I. if read returns with EINTR or EAGAIN, goto 2.a. II. otherwise return with data
So if ZLP sets WDM_READ (#1), we expect data, and try to read it (#2). But as that was a ZLP, and we are doing non-blocking read, wdm_read() returns with EAGAIN (#2.b.I), so loop again, and try to read again (#2.a.).
With glib, we might stuck in this loop forever, as EINTR is disabled (#2.a).
--- drivers/usb/class/cdc-wdm.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-)
drivers/usb/class/cdc-wdm.c +9 -14
@@ -92,7 +92,6 @@ struct wdm_device {u16 wMaxCommand;u16 wMaxPacketSize;__le16 inum; -int reslength;int length;int read;int count;
@@ -214,6 +213,11 @@ static void wdm_in_callback(struct urb *urb)if (desc->rerr ==0 && status != -EPIPE ) desc->rerr = status; +if (length ==0 ) { +dev_dbg (&desc->intf->dev,"received ZLP\n" ); + goto skip_zlp; + } +if (length + desc->length > desc->wMaxCommand) {/* The buffer would overflow */ set_bit (WDM_OVERFLOW , &desc->flags);
@@ -222,18 +226,18 @@ static void wdm_in_callback(struct urb *urb)if (!test_bit (WDM_OVERFLOW , &desc->flags)) {memmove (desc->ubuf + desc->length, desc->inbuf, length); desc->length += length; - desc->reslength = length; } } skip_error:if (desc->rerr) {/* -* Since there was an error, userspace may decide to not read -* any data after poll'ing. +* If there was a ZLP or an error, userspace may decide to not +* read any data after poll'ing. * We should respond to further attempts from the device to send * data, so that we can get unstuck. */ +skip_zlp:schedule_work (&desc->service_outs_intr); }else {set_bit (WDM_READ , &desc->flags);
@@ -585,15 +589,6 @@ static ssize_t wdm_read goto retry; } -if (!desc->reslength) {/* zero length read */ -dev_dbg (&desc->intf->dev,"zero length - clearing WDM_READ\n" ); -clear_bit (WDM_READ , &desc->flags); - rv =service_outstanding_interrupt (desc); -spin_unlock_irq (&desc->iuspin); -if (rv <0 ) - goto err; - goto retry; - } cntr = desc->length;spin_unlock_irq (&desc->iuspin); }
@@ -1015,7 +1010,7 @@ static void service_interrupt_work(struct work_struct *work)spin_lock_irq (&desc->iuspin);service_outstanding_interrupt (desc); -if (!desc->resp_count) { +if (!desc->resp_count && (desc->length || desc->rerr)) {set_bit (WDM_READ , &desc->flags);wake_up (&desc->wait); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 21/160 usb: typec: displayport: Receive DP Status Update NAK request exit dp altmode
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jos Wang <[email protected]>
[ Upstream commit b4b38ffb38c91afd4dc387608db26f6fc34ed40b ]
Although some Type-C DRD devices that do not support the DP Sink function (such as Huawei Mate 40Pro), the Source Port initiates Enter Mode CMD, but the device responds to Enter Mode ACK, the Source port then initiates DP Status Update CMD, and the device responds to DP Status Update NAK.
As PD2.0 spec ("6.4.4.3.4 Enter Mode Command"),A DR_Swap Message Shall Not be sent during Modal Operation between the Port Partners. At this time, the source port initiates DR_Swap message through the "echo device > /sys/class/typec/port0/data_role" command to switch the data role from host to device. The device will initiate a Hard Reset for recovery, resulting in the failure of data role swap.
Therefore, when DP Status Update NAK is received, Exit Mode CMD is initiated to exit the currently entered DP altmode.
--- drivers/usb/typec/altmodes/displayport.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/typec/altmodes/displayport.c +4 -0
@@ -298,6 +298,10 @@ static int dp_altmode_vdm(struct typec_altmode *alt,break ;case CMDT_RSP_NAK :switch (cmd) { +case DP_CMD_STATUS_UPDATE : +if (typec_altmode_exit (alt)) +dev_err (&dp->alt->dev,"Exit Mode Failed!\n" ); +break ;case DP_CMD_CONFIGURE : dp->data.conf =0 ; ret =dp_altmode_configured (dp);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 22/160 ALSA: hda: Ignore unsol events for cards being shut down
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cezary Rojewski <[email protected]>
[ Upstream commit 3f100f524e75586537e337b34d18c8d604b398e7 ]
For the classic snd_hda_intel driver, codec->card and bus->card point to the exact same thing. When snd_card_diconnect() fires, bus->shutdown is set thanks to azx_dev_disconnect(). card->shutdown is already set when that happens but both provide basically the same functionality.
For the DSP snd_soc_avs driver where multiple codecs are located on multiple cards, bus->shutdown 'shortcut' is not sufficient. One codec card may be unregistered while other codecs are still operational. Proper check in form of card->shutdown must be used to verify whether the codec's card is being shut down.
--- sound/pci/hda/hda_bind.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/hda/hda_bind.c +1 -1
@@ -45,7 +45,7 @@ static void hda_codec_unsol_event(struct hdac_device *dev, unsigned int ev) struct hda_codec *codec = container_of(dev, struct hda_codec, core);/* ignore unsol events during shutdown */ -if (codec->bus->shutdown) +if (codec->card->shutdown || codec->bus->shutdown)return ;/* ignore unsol events during system suspend/resume */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 23/160 ALSA: hda: Add new pci id for AMD GPU display HD audio controller
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vijendar Mukunda <[email protected]>
[ Upstream commit ab72bfce7647522e01a181e3600c3d14ff5c143e ]
Add new pci id for AMD GPU display HD audio controller(device id- 0xab40).
--- sound/pci/hda/hda_intel.c | 3 +++ 1 file changed, 3 insertions(+)
sound/pci/hda/hda_intel.c +3 -0
@@ -2731,6 +2731,9 @@ static const struct pci_device_id azx_ids[] = { { PCI_DEVICE(0x1002, 0xab38), .driver_data =AZX_DRIVER_ATIHDMI_NS |AZX_DCAPS_PRESET_ATI_HDMI_NS | AZX_DCAPS_PM_RUNTIME }, + { PCI_VDEVICE(ATI, 0xab40), + .driver_data =AZX_DRIVER_ATIHDMI_NS |AZX_DCAPS_PRESET_ATI_HDMI_NS | + AZX_DCAPS_PM_RUNTIME }, /* GLENFLY */ { PCI_DEVICE(PCI_VENDOR_ID_GLENFLY, PCI_ANY_ID), .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 24/160 ALSA: usb-audio: Add a quirk for Lenovo Thinkpad Thunderbolt 3 dock
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
[ Upstream commit 4919353c7789b8047e06a9b2b943f775a8f72883 ]
The audio controller in the Lenovo Thinkpad Thunderbolt 3 dock doesn't support reading the sampling rate.
Add a quirk for it.
--- sound/usb/quirks.c | 2 ++ 1 file changed, 2 insertions(+)
sound/usb/quirks.c +2 -0
@@ -1877,6 +1877,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { QUIRK_FLAG_DISABLE_AUTOSUSPEND),DEVICE_FLG (0x17aa ,0x104d ,/* Lenovo ThinkStation P620 Internal Speaker + Front Headset */ QUIRK_FLAG_DISABLE_AUTOSUSPEND ), +DEVICE_FLG (0x17ef ,0x3083 ,/* Lenovo TBT3 dock */ +QUIRK_FLAG_GET_SAMPLE_RATE ),DEVICE_FLG (0x1852 ,0x5062 ,/* Luxman D-08u */ QUIRK_FLAG_ITF_USB_DSD_DAC |QUIRK_FLAG_CTL_MSG_DELAY ), DEVICE_FLG(0x1852, 0x5065, /* Luxman DA-06 */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 7/160 hwmon: (pmbus/max34440) Fix support for max34451
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexis Czezar Torreno <[email protected]>
[ Upstream commit 19932f844f3f51646f762f3eac4744ec3a405064 ]
The max344** family has an issue with some PMBUS address being switched. This includes max34451 however version MAX34451-NA6 and later has this issue fixed and this commit supports that update.
--- drivers/hwmon/pmbus/max34440.c | 48 +++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 4 deletions(-)
drivers/hwmon/pmbus/max34440.c +44 -4
@@ -34,16 +34,21 @@ enum chips { max34440, max34441, max34446, max34451, max34460, max34461 };/* * The whole max344* family have IOUT_OC_WARN_LIMIT and IOUT_OC_FAULT_LIMIT * swapped from the standard pmbus spec addresses. +* For max34451, version MAX34451ETNA6+ and later has this issue fixed. */ #define MAX34440_IOUT_OC_WARN_LIMIT 0x46#define MAX34440_IOUT_OC_FAULT_LIMIT 0x4A +#define MAX34451ETNA6_MFR_REV 0x0012 +#define MAX34451_MFR_CHANNEL_CONFIG 0xe4#define MAX34451_MFR_CHANNEL_CONFIG_SEL_MASK 0x3fstruct max34440_data {int id;struct pmbus_driver_info info; +u8 iout_oc_warn_limit; +u8 iout_oc_fault_limit; };#define to_max34440_data (x) container_of(x, struct max34440_data, info)
@@ -60,11 +65,11 @@ static int max34440_read_word_data(struct i2c_client *client, int page,switch (reg) {case PMBUS_IOUT_OC_FAULT_LIMIT : ret =pmbus_read_word_data (client, page, phase, -MAX34440_IOUT_OC_FAULT_LIMIT ); + data->iout_oc_fault_limit);break ;case PMBUS_IOUT_OC_WARN_LIMIT : ret =pmbus_read_word_data (client, page, phase, -MAX34440_IOUT_OC_WARN_LIMIT ); + data->iout_oc_warn_limit);break ;case PMBUS_VIRT_READ_VOUT_MIN : ret = pmbus_read_word_data(client, page, phase,
@@ -133,11 +138,11 @@ static int max34440_write_word_data(struct i2c_client *client, int page,switch (reg) {case PMBUS_IOUT_OC_FAULT_LIMIT : - ret =pmbus_write_word_data (client, page,MAX34440_IOUT_OC_FAULT_LIMIT , + ret =pmbus_write_word_data (client, page, data->iout_oc_fault_limit, word);break ;case PMBUS_IOUT_OC_WARN_LIMIT : - ret =pmbus_write_word_data (client, page,MAX34440_IOUT_OC_WARN_LIMIT , + ret =pmbus_write_word_data (client, page, data->iout_oc_warn_limit, word);break ;case PMBUS_VIRT_RESET_POUT_HISTORY :
@@ -235,6 +240,25 @@ static int max34451_set_supported_funcs(struct i2c_client *client,*/ int page, rv; +bool max34451_na6 = false; + + rv =i2c_smbus_read_word_data (client,PMBUS_MFR_REVISION ); +if (rv <0 ) +return rv; + +if (rv >=MAX34451ETNA6_MFR_REV ) { + max34451_na6 = true; + data->info.format[PSC_VOLTAGE_IN ] = direct; + data->info.format[PSC_CURRENT_IN ] = direct; + data->info.m[PSC_VOLTAGE_IN ] =1 ; + data->info.b[PSC_VOLTAGE_IN ] =0 ; + data->info.R[PSC_VOLTAGE_IN ] =3 ; + data->info.m[PSC_CURRENT_IN ] =1 ; + data->info.b[PSC_CURRENT_IN ] =0 ; + data->info.R[PSC_CURRENT_IN ] =2 ; + data->iout_oc_fault_limit =PMBUS_IOUT_OC_FAULT_LIMIT ; + data->iout_oc_warn_limit =PMBUS_IOUT_OC_WARN_LIMIT ; + }for (page =0 ; page <16 ; page++) { rv =i2c_smbus_write_byte_data (client,PMBUS_PAGE , page);
@@ -251,16 +275,30 @@ static int max34451_set_supported_funcs(struct i2c_client *client,case 0x20 : data->info.func[page] =PMBUS_HAVE_VOUT |PMBUS_HAVE_STATUS_VOUT ; + +if (max34451_na6) + data->info.func[page] |=PMBUS_HAVE_VIN | +PMBUS_HAVE_STATUS_INPUT ;break ;case 0x21 : data->info.func[page] =PMBUS_HAVE_VOUT ; + +if (max34451_na6) + data->info.func[page] |=PMBUS_HAVE_VIN ;break ;case 0x22 : data->info.func[page] =PMBUS_HAVE_IOUT |PMBUS_HAVE_STATUS_IOUT ; + +if (max34451_na6) + data->info.func[page] |=PMBUS_HAVE_IIN | +PMBUS_HAVE_STATUS_INPUT ;break ;case 0x23 : data->info.func[page] =PMBUS_HAVE_IOUT ; + +if (max34451_na6) + data->info.func[page] |=PMBUS_HAVE_IIN ;break ;default :break ;
@@ -494,6 +532,8 @@ static int max34440_probe(struct i2c_client *client)return -ENOMEM ; data->id =i2c_match_id (max34440_id, client)->driver_data; data->info = max34440_info[data->id]; + data->iout_oc_fault_limit =MAX34440_IOUT_OC_FAULT_LIMIT ; + data->iout_oc_warn_limit =MAX34440_IOUT_OC_WARN_LIMIT ;if (data->id == max34451) { rv =max34451_set_supported_funcs (client, data);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 25/160 ceph: fix possible integer overflow in ceph_zero_objects()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Kandybka <[email protected]>
[ Upstream commit 0abd87942e0c93964e93224836944712feba1d91 ]
In 'ceph_zero_objects', promote 'object_size' to 'u64' to avoid possible integer overflow.
Compile tested only.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- fs/ceph/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ceph/file.c +1 -1
@@ -2032,7 +2032,7 @@ static int ceph_zero_objects(struct inode *inode, loff_t offset, loff_t length)s32 stripe_unit = ci->i_layout.stripe_unit;s32 stripe_count = ci->i_layout.stripe_count;s32 object_size = ci->i_layout.object_size; -u64 object_set_size = object_size * stripe_count; +u64 object_set_size = (u64 ) object_size * stripe_count;u64 nearly, t;/* round offset up to next period boundary */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 26/160 ovl: Check for NULL d_inode() in ovl_dentry_upper()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
[ Upstream commit 8a39f1c870e9d6fbac5638f3a42a6a6363829c49 ]
In ovl_path_type() and ovl_is_metacopy_dentry() GCC notices that it is possible for OVL_E() to return NULL (which implies that d_inode(dentry) may be NULL). This would result in out of bounds reads via container_of(), seen with GCC 15's -Warray-bounds -fdiagnostics-details. For example:
In file included from arch/x86/include/generated/asm/rwonce.h:1,
from include/linux/compiler.h:339, from include/linux/export.h:5,
from include/linux/linkage.h:7,
from include/linux/fs.h:5,
from fs/overlayfs/util.c:7:
In function 'ovl_upperdentry_dereference',
inlined from 'ovl_dentry_upper' at ../fs/overlayfs/util.c:305:9,
inlined from 'ovl_path_type' at ../fs/overlayfs/util.c:216:6:
include/asm-generic/rwonce.h:44:26: error: array subscript 0 is outside array bounds of 'struct inode[7486503276667837]' [-Werror=array-bounds=]
44 | #define __READ_ONCE(x) (*(const volatile __unqual_scalar_typeof(x) *)&(x))
| ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/asm-generic/rwonce.h:50:9: note: in expansion of macro '__READ_ONCE'
50 | __READ_ONCE(x); \
| ^~~~~~~~~~~
fs/overlayfs/ovl_entry.h:195:16: note: in expansion of macro 'READ_ONCE'
195 | return READ_ONCE(oi->__upperdentry);
| ^~~~~~~~~ 'ovl_path_type': event 1
185 | return inode ? OVL_I(inode)->oe : NULL;
'ovl_path_type': event 2
Avoid this by allowing ovl_dentry_upper() to return NULL if d_inode() is NULL, as that means the problematic dereferencing can never be reached. Note that this fixes the over-eager compiler warning in an effort to being able to enable -Warray-bounds globally. There is no known behavioral bug here.
--- fs/overlayfs/util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/overlayfs/util.c +3 -1
@@ -215,7 +215,9 @@ enum ovl_path_type ovl_path_real(struct dentry *dentry, struct path *path)struct dentry *ovl_dentry_upper (struct dentry *dentry) { -return ovl_upperdentry_dereference (OVL_I (d_inode (dentry))); +struct inode *inode =d_inode (dentry); + +return inode ?ovl_upperdentry_dereference (OVL_I (inode)) :NULL ; }struct dentry *ovl_dentry_lower (struct dentry *dentry)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 27/160 fs/jfs: consolidate sanity checking in dbMount
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Kleikamp <[email protected]>
[ Upstream commit 0d250b1c52484d489e31df2cf9118b7c4bd49d31 ]
Sanity checks have been added to dbMount as individual if clauses with identical error handling. Move these all into one clause.
Stable-dep-of: 37bfb464ddca ("jfs: validate AG parameters in dbMount() to prevent crashes")
--- fs/jfs/jfs_dmap.c | 37 +++++++++---------------------------- 1 file changed, 9 insertions(+), 28 deletions(-)
fs/jfs/jfs_dmap.c +9 -28
@@ -178,45 +178,26 @@ int dbMount(struct inode *ipbmap) dbmp_le = (struct dbmap_disk *) mp->data; bmp->db_mapsize =le64_to_cpu (dbmp_le->dn_mapsize); bmp->db_nfree =le64_to_cpu (dbmp_le->dn_nfree); - bmp->db_l2nbperpage =le32_to_cpu (dbmp_le->dn_l2nbperpage); -if (bmp->db_l2nbperpage >L2PSIZE -L2MINBLOCKSIZE || - bmp->db_l2nbperpage <0 ) { - err = -EINVAL ; - goto err_release_metapage; - } - bmp->db_numag =le32_to_cpu (dbmp_le->dn_numag); -if (!bmp->db_numag || bmp->db_numag >MAXAG ) { - err = -EINVAL ; - goto err_release_metapage; - } - bmp->db_maxlevel =le32_to_cpu (dbmp_le->dn_maxlevel); bmp->db_maxag =le32_to_cpu (dbmp_le->dn_maxag); bmp->db_agpref =le32_to_cpu (dbmp_le->dn_agpref); -if (bmp->db_maxag >=MAXAG || bmp->db_maxag <0 || - bmp->db_agpref >=MAXAG || bmp->db_agpref <0 ) { - err = -EINVAL ; - goto err_release_metapage; - } - bmp->db_aglevel =le32_to_cpu (dbmp_le->dn_aglevel); bmp->db_agheight =le32_to_cpu (dbmp_le->dn_agheight); bmp->db_agwidth =le32_to_cpu (dbmp_le->dn_agwidth); -if (!bmp->db_agwidth) { - err = -EINVAL ; - goto err_release_metapage; - } bmp->db_agstart =le32_to_cpu (dbmp_le->dn_agstart); bmp->db_agl2size =le32_to_cpu (dbmp_le->dn_agl2size); -if (bmp->db_agl2size >L2MAXL2SIZE -L2MAXAG || - bmp->db_agl2size <0 ) { - err = -EINVAL ; - goto err_release_metapage; - } -if (((bmp->db_mapsize -1 ) >> bmp->db_agl2size) >MAXAG ) { +if ((bmp->db_l2nbperpage >L2PSIZE -L2MINBLOCKSIZE ) || + (bmp->db_l2nbperpage <0 ) || + !bmp->db_numag || (bmp->db_numag >MAXAG ) || + (bmp->db_maxag >=MAXAG ) || (bmp->db_maxag <0 ) || + (bmp->db_agpref >=MAXAG ) || (bmp->db_agpref <0 ) || + !bmp->db_agwidth || + (bmp->db_agl2size >L2MAXL2SIZE -L2MAXAG ) || + (bmp->db_agl2size <0 ) || + ((bmp->db_mapsize -1 ) >> bmp->db_agl2size) >MAXAG ) { err = -EINVAL ; goto err_release_metapage; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 28/160 jfs: validate AG parameters in dbMount() to prevent crashes
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vasiliy Kovalev <[email protected]>
[ Upstream commit 37bfb464ddca87f203071b5bd562cd91ddc0b40a ]
Validate db_agheight, db_agwidth, and db_agstart in dbMount to catch corrupted metadata early and avoid undefined behavior in dbAllocAG. Limits are derived from L2LPERCTL, LPERCTL/MAXAG, and CTLTREESIZE:
- agheight: 0 to L2LPERCTL/2 (0 to 5) ensures shift (L2LPERCTL - 2*agheight) >= 0.
- agwidth: 1 to min(LPERCTL/MAXAG, 2^(L2LPERCTL - 2*agheight)) ensures agperlev >= 1.
- Ranges: 1-8 (agheight 0-3), 1-4 (agheight 4), 1 (agheight 5).
- LPERCTL/MAXAG = 1024/128 = 8 limits leaves per AG;
2^(10 - 2*agheight) prevents division to 0.- agstart: 0 to CTLTREESIZE-1 - agwidth*(MAXAG-1) keeps ti within stree (size 1365).
- Ranges: 0-1237 (agwidth 1), 0-348 (agwidth 8).
UBSAN: shift-out-of-bounds in fs/jfs/jfs_dmap.c:1400:9 shift exponent -335544310 is negative CPU: 0 UID: 0 PID: 5822 Comm: syz-executor130 Not tainted 6.14.0-rc5-syzkaller #0 Hardware name: Google Compute Engine/Google Compute Engine, BIOS Google 02/12/2025 Call Trace: <TASK> __dump_stack lib/dump_stack.c:94 [inline] dump_stack_lvl+0x241/0x360 lib/dump_stack.c:120 ubsan_epilogue lib/ubsan.c:231 [inline] __ubsan_handle_shift_out_of_bounds+0x3c8/0x420 lib/ubsan.c:468 dbAllocAG+0x1087/0x10b0 fs/jfs/jfs_dmap.c:1400 dbDiscardAG+0x352/0xa20 fs/jfs/jfs_dmap.c:1613 jfs_ioc_trim+0x45a/0x6b0 fs/jfs/jfs_discard.c:105 jfs_ioctl+0x2cd/0x3e0 fs/jfs/ioctl.c:131 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:906 [inline] __se_sys_ioctl+0xf5/0x170 fs/ioctl.c:892 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xf3/0x230 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f
Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
--- fs/jfs/jfs_dmap.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/jfs/jfs_dmap.c +5 -1
@@ -194,7 +194,11 @@ int dbMount(struct inode *ipbmap) !bmp->db_numag || (bmp->db_numag >MAXAG ) || (bmp->db_maxag >=MAXAG ) || (bmp->db_maxag <0 ) || (bmp->db_agpref >=MAXAG ) || (bmp->db_agpref <0 ) || - !bmp->db_agwidth || + (bmp->db_agheight <0 ) || (bmp->db_agheight > (L2LPERCTL >>1 )) || + (bmp->db_agwidth <1 ) || (bmp->db_agwidth > (LPERCTL /MAXAG )) || + (bmp->db_agwidth > (1 << (L2LPERCTL - (bmp->db_agheight <<1 )))) || + (bmp->db_agstart <0 ) || + (bmp->db_agstart > (CTLTREESIZE -1 - bmp->db_agwidth * (MAXAG -1 ))) || (bmp->db_agl2size >L2MAXL2SIZE -L2MAXAG ) || (bmp->db_agl2size <0 ) || ((bmp->db_mapsize - 1) >> bmp->db_agl2size) > MAXAG) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 29/160 media: davinci: vpif: Fix memory leak in probe error path
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Nikiforov <[email protected]>
[ Upstream commit 024bf40edf1155e7a587f0ec46294049777d9b02 ]
If an error occurs during the initialization of pdev_display, the allocated platform device pdev_capture is not released properly, leading to a memory leak.
Adjust error path handling to fix the leak.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/media/platform/davinci/vpif.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/platform/davinci/vpif.c +3 -1
@@ -503,7 +503,7 @@ static int vpif_probe(struct platform_device *pdev) pdev_display =kzalloc (sizeof (*pdev_display),GFP_KERNEL );if (!pdev_display) { ret = -ENOMEM ; - goto err_put_pdev_capture; + goto err_del_pdev_capture; } pdev_display->name ="vpif_display" ;
@@ -526,6 +526,8 @@ static int vpif_probe(struct platform_device *pdev) err_put_pdev_display:platform_device_put (pdev_display); +err_del_pdev_capture: +platform_device_del (pdev_capture); err_put_pdev_capture:platform_device_put (pdev_capture); err_put_rpm:
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 30/160 media: omap3isp: use sgtable-based scatterlist wrappers
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Szyprowski <[email protected]>
[ Upstream commit 3de572fe2189a4a0bd80295e1f478401e739498e ]
Use common wrappers operating directly on the struct sg_table objects to fix incorrect use of scatterlists sync calls. dma_sync_sg_for_*() functions have to be called with the number of elements originally passed to dma_map_sg_*() function, not the one returned in sgtable's nents.
--- drivers/media/platform/omap3isp/ispccdc.c | 8 ++++---- drivers/media/platform/omap3isp/ispstat.c | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-)
drivers/media/platform/omap3isp/ispccdc.c +4 -4
@@ -446,8 +446,8 @@ static int ccdc_lsc_config(struct isp_ccdc_device *ccdc,if (ret <0 ) goto done; -dma_sync_sg_for_cpu (isp->dev, req->table.sgt.sgl, - req->table.sgt.nents,DMA_TO_DEVICE ); +dma_sync_sgtable_for_cpu (isp->dev, &req->table.sgt, +DMA_TO_DEVICE );if (copy_from_user (req->table.addr, config->lsc, req->config.size)) {
@@ -455,8 +455,8 @@ static int ccdc_lsc_config(struct isp_ccdc_device *ccdc, goto done; } -dma_sync_sg_for_device (isp->dev, req->table.sgt.sgl, - req->table.sgt.nents,DMA_TO_DEVICE ); +dma_sync_sgtable_for_device (isp->dev, &req->table.sgt, +DMA_TO_DEVICE ); }spin_lock_irqsave (&ccdc->lsc.req_lock, flags);
drivers/media/platform/omap3isp/ispstat.c +2 -4
@@ -161,8 +161,7 @@ static void isp_stat_buf_sync_for_device(struct ispstat *stat,if (ISP_STAT_USES_DMAENGINE (stat))return ; -dma_sync_sg_for_device (stat->isp->dev, buf->sgt.sgl, - buf->sgt.nents,DMA_FROM_DEVICE ); +dma_sync_sgtable_for_device (stat->isp->dev, &buf->sgt,DMA_FROM_DEVICE ); } static void isp_stat_buf_sync_for_cpu(struct ispstat *stat,
@@ -171,8 +170,7 @@ static void isp_stat_buf_sync_for_cpu(struct ispstat *stat,if (ISP_STAT_USES_DMAENGINE (stat))return ; -dma_sync_sg_for_cpu (stat->isp->dev, buf->sgt.sgl, - buf->sgt.nents,DMA_FROM_DEVICE ); +dma_sync_sgtable_for_cpu (stat->isp->dev, &buf->sgt,DMA_FROM_DEVICE ); }static void isp_stat_buf_clear (struct ispstat *stat)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 31/160 clk: ti: am43xx: Add clkctrl data for am43xx ADC1
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miquel Raynal <[email protected]>
[ Upstream commit 59139ada4a7eacd4db378ee40a3d6ffbf1d0d72f ]
Declare ADC1 clkctrl which feeds the magnetic-reader/ADC1 hardware module.
Stable-dep-of: d52b9b7e2f10 ("media: imx-jpeg: Drop the first error frames")
--- drivers/clk/ti/clk-43xx.c | 1 + include/dt-bindings/clock/am4.h | 1 + 2 files changed, 2 insertions(+)
drivers/clk/ti/clk-43xx.c +1 -0
@@ -116,6 +116,7 @@ static const struct omap_clkctrl_reg_data am4_l3s_clkctrl_regs[] __initconst = { { AM4_L3S_VPFE0_CLKCTRL, NULL, CLKF_SW_SUP, "l3_gclk" }, { AM4_L3S_VPFE1_CLKCTRL, NULL, CLKF_SW_SUP, "l3_gclk" }, { AM4_L3S_GPMC_CLKCTRL, NULL, CLKF_SW_SUP, "l3s_gclk" }, + { AM4_L3S_ADC1_CLKCTRL, NULL, CLKF_SW_SUP, "l3s_gclk" }, { AM4_L3S_MCASP0_CLKCTRL, NULL, CLKF_SW_SUP, "mcasp0_fck" }, { AM4_L3S_MCASP1_CLKCTRL, NULL, CLKF_SW_SUP, "mcasp1_fck" }, { AM4_L3S_MMC3_CLKCTRL, NULL, CLKF_SW_SUP, "mmc_clk" },
include/dt-bindings/clock/am4.h +1 -0
@@ -158,6 +158,7 @@#define AM4_L3S_VPFE0_CLKCTRL AM4_L3S_CLKCTRL_INDEX(0x68)#define AM4_L3S_VPFE1_CLKCTRL AM4_L3S_CLKCTRL_INDEX(0x70)#define AM4_L3S_GPMC_CLKCTRL AM4_L3S_CLKCTRL_INDEX(0x220) +#define AM4_L3S_ADC1_CLKCTRL AM4_L3S_CLKCTRL_INDEX(0x230)#define AM4_L3S_MCASP0_CLKCTRL AM4_L3S_CLKCTRL_INDEX(0x238)#define AM4_L3S_MCASP1_CLKCTRL AM4_L3S_CLKCTRL_INDEX(0x240)#define AM4_L3S_MMC3_CLKCTRL AM4_L3S_CLKCTRL_INDEX(0x248)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 32/160 media: imx-jpeg: Drop the first error frames
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Qian <[email protected]>
[ Upstream commit d52b9b7e2f10d22a49468128540533e8d76910cd ]
When an output buffer contains error frame header, v4l2_jpeg_parse_header() will return error, then driver will mark this buffer and a capture buffer done with error flag in device_run().
But if the error occurs in the first frames, before setup the capture queue, there is no chance to schedule device_run(), and there may be no capture to mark error.
So we need to drop this buffer with error flag, and make the decoding can continue.
--- drivers/media/platform/imx-jpeg/mxc-jpeg.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/media/platform/imx-jpeg/mxc-jpeg.c +11 -1
@@ -1450,9 +1450,19 @@ static void mxc_jpeg_buf_queue(struct vb2_buffer *vb) jpeg_src_buf =vb2_to_mxc_buf (vb); jpeg_src_buf->jpeg_parse_error = false; ret =mxc_jpeg_parse (ctx, vb); -if (ret) +if (ret) { jpeg_src_buf->jpeg_parse_error = true; +/* +* if the capture queue is not setup, the device_run() won't be scheduled, +* need to drop the error buffer, so that the decoding can continue +*/ +if (!vb2_is_streaming (v4l2_m2m_get_dst_vq (ctx->fh.m2m_ctx))) { +v4l2_m2m_buf_done (vbuf,VB2_BUF_STATE_ERROR ); +return ; + } + } + end:v4l2_m2m_buf_queue (ctx->fh.m2m_ctx, vbuf); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 33/160 regulator: core: Allow drivers to define their init data as const
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
[ Upstream commit 1de452a0edda26f1483d1d934f692eab13ba669a ]
Drivers tend to want to define the names of their regulators somewhere in their source file as "static const". This means, inevitable, that every driver out there open codes something like this:
static const char * const supply_names[] = {
"vcc", "vccl",
};
static int get_regulators(struct my_data *data)
{
int i;
data->supplies = devm_kzalloc(...)
if (!data->supplies)
return -ENOMEM;
for (i = 0; i < ARRAY_SIZE(supply_names); i++)
data->supplies[i].supply = supply_names[i];return devm_regulator_bulk_get(data->dev,
ARRAY_SIZE(supply_names), data->supplies); }
Let's make this more convenient by doing providing a helper that does the copy.
I have chosen to have the "const" input structure here be the exact same structure as the normal one passed to devm_regulator_bulk_get(). This is slightly inefficent since the input data can't possibly have anything useful for "ret" or consumer and thus we waste 8 bytes per structure. This seems an OK tradeoff for not introducing an extra structure.
Stable-dep-of: 9079db287fc3 ("ASoC: codecs: wcd9335: Fix missing free of regulator supplies")
--- drivers/regulator/devres.c | 28 ++++++++++++++++++++++++++++ include/linux/regulator/consumer.h | 4 ++++ 2 files changed, 32 insertions(+)
drivers/regulator/devres.c +28 -0
@@ -166,6 +166,34 @@ int devm_regulator_bulk_get(struct device *dev, int num_consumers, }EXPORT_SYMBOL_GPL (devm_regulator_bulk_get); +/** +* devm_regulator_bulk_get_const - devm_regulator_bulk_get() w/ const data +* +* @dev: device to supply +* @num_consumers: number of consumers to register +* @in_consumers: const configuration of consumers +* @out_consumers: in_consumers is copied here and this is passed to +* devm_regulator_bulk_get(). +* +* This is a convenience function to allow bulk regulator configuration +* to be stored "static const" in files. +* +* Return: 0 on success, an errno on failure. +*/ +int devm_regulator_bulk_get_const (struct device *dev,int num_consumers, +const struct regulator_bulk_data *in_consumers, +struct regulator_bulk_data **out_consumers) +{ + *out_consumers =devm_kmemdup (dev, in_consumers, + num_consumers *sizeof (*in_consumers), +GFP_KERNEL ); +if (*out_consumers ==NULL ) +return -ENOMEM ; + +return devm_regulator_bulk_get (dev, num_consumers, *out_consumers); +} +EXPORT_SYMBOL_GPL (devm_regulator_bulk_get_const); +static void devm_rdev_release (struct device *dev,void *res) {regulator_unregister (*(struct regulator_dev **)res);
include/linux/regulator/consumer.h +4 -0
@@ -240,6 +240,10 @@ int __must_check regulator_bulk_get(struct device *dev, int num_consumers, struct regulator_bulk_data *consumers);int __must_check devm_regulator_bulk_get (struct device *dev,int num_consumers,struct regulator_bulk_data *consumers); +int __must_check devm_regulator_bulk_get_const ( +struct device *dev,int num_consumers, +const struct regulator_bulk_data *in_consumers, +struct regulator_bulk_data **out_consumers);int __must_check regulator_bulk_enable (int num_consumers,struct regulator_bulk_data *consumers); int regulator_bulk_disable(int num_consumers,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 34/160 regulator: Add devm helpers for get and enable
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matti Vaittinen <[email protected]>
[ Upstream commit da279e6965b3838e99e5c0ab8f76b87bf86b31a5 ]
A few regulator consumer drivers seem to be just getting a regulator, enabling it and registering a devm-action to disable the regulator at the driver detach and then forget about it.
We can simplify this a bit by adding a devm-helper for this pattern. Add devm_regulator_get_enable() and devm_regulator_get_enable_optional()
Stable-dep-of: 9079db287fc3 ("ASoC: codecs: wcd9335: Fix missing free of regulator supplies")
--- drivers/regulator/devres.c | 164 +++++++++++++++++++++++++++++ include/linux/regulator/consumer.h | 27 +++++ 2 files changed, 191 insertions(+)
drivers/regulator/devres.c +164 -0
@@ -70,6 +70,65 @@ struct regulator *devm_regulator_get_exclusive(struct device *dev, }EXPORT_SYMBOL_GPL (devm_regulator_get_exclusive); +static void regulator_action_disable (void *d) +{ +struct regulator *r = (struct regulator *)d; + +regulator_disable (r); +} + +static int _devm_regulator_get_enable (struct device *dev,const char *id, +int get_type) +{ +struct regulator *r; +int ret; + + r =_devm_regulator_get (dev, id, get_type); +if (IS_ERR (r)) +return PTR_ERR (r); + + ret =regulator_enable (r); +if (!ret) + ret =devm_add_action_or_reset (dev, ®ulator_action_disable, r); + +if (ret) +devm_regulator_put (r); + +return ret; +} + +/** +* devm_regulator_get_enable_optional - Resource managed regulator get and enable +* @dev: device to supply +* @id: supply name or regulator ID. +* +* Get and enable regulator for duration of the device life-time. +* regulator_disable() and regulator_put() are automatically called on driver +* detach. See regulator_get_optional() and regulator_enable() for more +* information. +*/ +int devm_regulator_get_enable_optional (struct device *dev,const char *id) +{ +return _devm_regulator_get_enable (dev, id,OPTIONAL_GET ); +} +EXPORT_SYMBOL_GPL (devm_regulator_get_enable_optional); + +/** +* devm_regulator_get_enable - Resource managed regulator get and enable +* @dev: device to supply +* @id: supply name or regulator ID. +* +* Get and enable regulator for duration of the device life-time. +* regulator_disable() and regulator_put() are automatically called on driver +* detach. See regulator_get() and regulator_enable() for more +* information. +*/ +int devm_regulator_get_enable (struct device *dev,const char *id) +{ +return _devm_regulator_get_enable (dev, id,NORMAL_GET ); +} +EXPORT_SYMBOL_GPL (devm_regulator_get_enable); +/** * devm_regulator_get_optional - Resource managed regulator_get_optional() * @dev: device to supply
@@ -194,6 +253,111 @@ int devm_regulator_bulk_get_const(struct device *dev, int num_consumers, }EXPORT_SYMBOL_GPL (devm_regulator_bulk_get_const); +static int devm_regulator_bulk_match (struct device *dev,void *res, +void *data) +{ +struct regulator_bulk_devres *match = res; +struct regulator_bulk_data *target = data; + +/* +* We check the put uses same consumer list as the get did. +* We _could_ scan all entries in consumer array and check the +* regulators match but ATM I don't see the need. We can change this +* later if needed. +*/ +return match->consumers == target; +} + +/** +* devm_regulator_bulk_put - Resource managed regulator_bulk_put() +* @consumers: consumers to free +* +* Deallocate regulators allocated with devm_regulator_bulk_get(). Normally +* this function will not need to be called and the resource management +* code will ensure that the resource is freed. +*/ +void devm_regulator_bulk_put (struct regulator_bulk_data *consumers) +{ +int rc; +struct regulator *regulator = consumers[0 ].consumer; + + rc =devres_release (regulator->dev, devm_regulator_bulk_release, + devm_regulator_bulk_match, consumers); +if (rc !=0 ) +WARN_ON (rc); +} +EXPORT_SYMBOL_GPL (devm_regulator_bulk_put); + +static void devm_regulator_bulk_disable (void *res) +{ +struct regulator_bulk_devres *devres = res; +int i; + +for (i =0 ; i < devres->num_consumers; i++) +regulator_disable (devres->consumers[i].consumer); +} + +/** +* devm_regulator_bulk_get_enable - managed get'n enable multiple regulators +* +* @dev: device to supply +* @num_consumers: number of consumers to register +* @id: list of supply names or regulator IDs +* +* @return 0 on success, an errno on failure. +* +* This helper function allows drivers to get several regulator +* consumers in one operation with management, the regulators will +* automatically be freed when the device is unbound. If any of the +* regulators cannot be acquired then any regulators that were +* allocated will be freed before returning to the caller. +*/ +int devm_regulator_bulk_get_enable (struct device *dev,int num_consumers, +const char *const *id) +{ +struct regulator_bulk_devres *devres; +struct regulator_bulk_data *consumers; +int i, ret; + + devres =devm_kmalloc (dev,sizeof (*devres),GFP_KERNEL ); +if (!devres) +return -ENOMEM ; + + devres->consumers =devm_kcalloc (dev, num_consumers,sizeof (*consumers), +GFP_KERNEL ); + consumers = devres->consumers; +if (!consumers) +return -ENOMEM ; + + devres->num_consumers = num_consumers; + +for (i =0 ; i < num_consumers; i++) + consumers[i].supply = id[i]; + + ret =devm_regulator_bulk_get (dev, num_consumers, consumers); +if (ret) +return ret; + +for (i =0 ; i < num_consumers; i++) { + ret =regulator_enable (consumers[i].consumer); +if (ret) + goto unwind; + } + + ret =devm_add_action (dev, devm_regulator_bulk_disable, devres); +if (!ret) +return 0 ; + +unwind: +while (--i >=0 ) +regulator_disable (consumers[i].consumer); + +devm_regulator_bulk_put (consumers); + +return ret; +} +EXPORT_SYMBOL_GPL (devm_regulator_bulk_get_enable); +static void devm_rdev_release (struct device *dev,void *res) {regulator_unregister (*(struct regulator_dev **)res);
include/linux/regulator/consumer.h +27 -0
@@ -203,6 +203,8 @@ struct regulator *__must_check regulator_get_optional(struct device *dev, const char *id);struct regulator *__must_check devm_regulator_get_optional (struct device *dev,const char *id); +int devm_regulator_get_enable (struct device *dev,const char *id); +int devm_regulator_get_enable_optional (struct device *dev,const char *id);void regulator_put (struct regulator *regulator);void devm_regulator_put (struct regulator *regulator);
@@ -240,12 +242,15 @@ int __must_check regulator_bulk_get(struct device *dev, int num_consumers, struct regulator_bulk_data *consumers);int __must_check devm_regulator_bulk_get (struct device *dev,int num_consumers,struct regulator_bulk_data *consumers); +void devm_regulator_bulk_put (struct regulator_bulk_data *consumers);int __must_check devm_regulator_bulk_get_const (struct device *dev,int num_consumers,const struct regulator_bulk_data *in_consumers,struct regulator_bulk_data **out_consumers);int __must_check regulator_bulk_enable (int num_consumers,struct regulator_bulk_data *consumers); +int devm_regulator_bulk_get_enable (struct device *dev,int num_consumers, +const char *const *id);int regulator_bulk_disable (int num_consumers,struct regulator_bulk_data *consumers); int regulator_bulk_force_disable(int num_consumers,
@@ -350,6 +355,17 @@ devm_regulator_get_exclusive(struct device *dev, const char *id)return ERR_PTR (-ENODEV ); } +static inline int devm_regulator_get_enable (struct device *dev,const char *id) +{ +return -ENODEV ; +} + +static inline int devm_regulator_get_enable_optional (struct device *dev, +const char *id) +{ +return -ENODEV ; +} +static inline struct regulator *__must_check regulator_get_optional (struct device *dev,const char *id) {
@@ -371,6 +387,10 @@ static inline void devm_regulator_put(struct regulator *regulator) { } +static inline void devm_regulator_bulk_put (struct regulator_bulk_data *consumers) +{ +} + static inline int regulator_register_supply_alias(struct device *dev, const char *id, struct device *alias_dev,
@@ -461,6 +481,13 @@ static inline int regulator_bulk_enable(int num_consumers,return 0 ; } +static inline int devm_regulator_bulk_get_enable (struct device *dev, +int num_consumers, +const char *const *id) +{ +return 0 ; +} +static inline int regulator_bulk_disable (int num_consumers,struct regulator_bulk_data *consumers) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 8/160 ksmbd: allow a filename to contain special characters on SMB3.1.1 posix extension
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <[email protected]>
[ Upstream commit dc3e0f17f74558e8a2fce00608855f050de10230 ]
If client send SMB2_CREATE_POSIX_CONTEXT to ksmbd, Allow a filename to contain special characters.
--- fs/ksmbd/smb2pdu.c | 53 +++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 26 deletions(-)
fs/ksmbd/smb2pdu.c +27 -26
@@ -2679,7 +2679,7 @@ int smb2_open(struct ksmbd_work *work)int req_op_level =0 , open_flags =0 , may_flags =0 , file_info =0 ;int rc =0 ;int contxt_cnt =0 , query_disk_id =0 ; -int maximal_access_ctxt =0 , posix_ctxt =0 ; +bool maximal_access_ctxt = false, posix_ctxt = false;int s_type =0 ;int next_off =0 ;char *name =NULL ;
@@ -2706,6 +2706,27 @@ int smb2_open(struct ksmbd_work *work)return create_smb2_pipe (work); } +if (req->CreateContextsOffset && tcon->posix_extensions) { + context =smb2_find_context_vals (req,SMB2_CREATE_TAG_POSIX ,16 ); +if (IS_ERR (context)) { + rc =PTR_ERR (context); + goto err_out2; + }else if (context) { +struct create_posix *posix = (struct create_posix *)context; + +if (le16_to_cpu (context->DataOffset) + +le32_to_cpu (context->DataLength) < +sizeof (struct create_posix ) -4 ) { + rc = -EINVAL ; + goto err_out2; + } +ksmbd_debug (SMB ,"get posix context\n" ); + + posix_mode =le32_to_cpu (posix->Mode); + posix_ctxt = true; + } + } +if (req->NameLength) {if ((req->CreateOptions &FILE_DIRECTORY_FILE_LE ) && *(char *)req->Buffer =='\\' ) {
@@ -2737,9 +2758,11 @@ int smb2_open(struct ksmbd_work *work) goto err_out2; } - rc =ksmbd_validate_filename (name); -if (rc <0 ) - goto err_out2; +if (posix_ctxt == false) { + rc =ksmbd_validate_filename (name); +if (rc <0 ) + goto err_out2; + }if (ksmbd_share_veto_filename (share, name)) { rc = -ENOENT ;
@@ -2854,28 +2877,6 @@ int smb2_open(struct ksmbd_work *work) rc = -EBADF ; goto err_out2; } - -if (tcon->posix_extensions) { - context =smb2_find_context_vals (req, -SMB2_CREATE_TAG_POSIX ,16 ); -if (IS_ERR (context)) { - rc =PTR_ERR (context); - goto err_out2; - }else if (context) { -struct create_posix *posix = - (struct create_posix *)context; -if (le16_to_cpu (context->DataOffset) + -le32_to_cpu (context->DataLength) < -sizeof (struct create_posix ) -4 ) { - rc = -EINVAL ; - goto err_out2; - } -ksmbd_debug (SMB ,"get posix context\n" ); - - posix_mode =le32_to_cpu (posix->Mode); - posix_ctxt =1 ; - } - } }if (ksmbd_override_fsids (work)) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 35/160 ASoC: codecs: wcd9335: Handle nicer probe deferral and simplify with dev_err_probe()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 4a03b5dbad466c902d522f3405daa4e5d80578c5 ]
wcd9335_parse_dt() function is called only from probe(), so printing errors on resource acquisition is discouraged, because it can pollute dmesg. Use dev_err_probe() to fix this and also make the code a bit simpler.
Stable-dep-of: 9079db287fc3 ("ASoC: codecs: wcd9335: Fix missing free of regulator supplies")
--- sound/soc/codecs/wcd9335.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-)
sound/soc/codecs/wcd9335.c +9 -19
@@ -5028,22 +5028,16 @@ static int wcd9335_parse_dt(struct wcd9335_codec *wcd)int ret; wcd->reset_gpio =of_get_named_gpio (np,"reset-gpios" ,0 ); -if (wcd->reset_gpio <0 ) { -dev_err (dev,"Reset GPIO missing from DT\n" ); -return wcd->reset_gpio; - } +if (wcd->reset_gpio <0 ) +return dev_err_probe (dev, wcd->reset_gpio,"Reset GPIO missing from DT\n" ); wcd->mclk =devm_clk_get (dev,"mclk" ); -if (IS_ERR (wcd->mclk)) { -dev_err (dev,"mclk not found\n" ); -return PTR_ERR (wcd->mclk); - } +if (IS_ERR (wcd->mclk)) +return dev_err_probe (dev,PTR_ERR (wcd->mclk),"mclk not found\n" ); wcd->native_clk =devm_clk_get (dev,"slimbus" ); -if (IS_ERR (wcd->native_clk)) { -dev_err (dev,"slimbus clock not found\n" ); -return PTR_ERR (wcd->native_clk); - } +if (IS_ERR (wcd->native_clk)) +return dev_err_probe (dev,PTR_ERR (wcd->native_clk),"slimbus clock not found\n" ); wcd->supplies[0 ].supply ="vdd-buck" ; wcd->supplies[1 ].supply ="vdd-buck-sido" ;
@@ -5052,10 +5046,8 @@ static int wcd9335_parse_dt(struct wcd9335_codec *wcd) wcd->supplies[4 ].supply ="vdd-io" ; ret =regulator_bulk_get (dev,WCD9335_MAX_SUPPLY , wcd->supplies); -if (ret) { -dev_err (dev,"Failed to get supplies: err = %d\n" , ret); -return ret; - } +if (ret) +return dev_err_probe (dev, ret,"Failed to get supplies\n" );return 0 ; }
@@ -5158,10 +5150,8 @@ static int wcd9335_slim_probe(struct slim_device *slim) wcd->dev = dev; ret =wcd9335_parse_dt (wcd); -if (ret) { -dev_err (dev,"Error parsing DT: %d\n" , ret); +if (ret)return ret; - } ret =wcd9335_power_on_reset (wcd);if (ret)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 9/160 dmaengine: xilinx_dma: Set dma_device directions
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gessler <[email protected]>
[ Upstream commit 7e01511443c30a55a5ae78d3debd46d4d872517e ]
Coalesce the direction bits from the enabled TX and/or RX channels into the directions bit mask of dma_device. Without this mask set, dma_get_slave_caps() in the DMAEngine fails, which prevents the driver from being used with an IIO DMAEngine buffer.
--- drivers/dma/xilinx/xilinx_dma.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/dma/xilinx/xilinx_dma.c +2 -0
@@ -2861,6 +2861,8 @@ static int xilinx_dma_chan_probe(struct xilinx_dma_device *xdev,return -EINVAL ; } + xdev->common.directions |= chan->direction; +/* Request the interrupt */ chan->irq =irq_of_parse_and_map (node, chan->tdest); err = request_irq(chan->irq, xdev->dma_config->irq_handler,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 10/160 md/md-bitmap: fix dm-raid max_write_behind setting
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yu Kuai <[email protected]>
[ Upstream commit 2afe17794cfed5f80295b1b9facd66e6f65e5002 ]
It's supposed to be COUNTER_MAX / 2, not COUNTER_MAX.
--- drivers/md/md-bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/md-bitmap.c +1 -1
@@ -546,7 +546,7 @@ static int md_bitmap_new_disk_sb(struct bitmap *bitmap)* is a good choice? We choose COUNTER_MAX / 2 arbitrarily. */ write_behind = bitmap->mddev->bitmap_info.max_write_behind; -if (write_behind >COUNTER_MAX ) +if (write_behind >COUNTER_MAX /2 ) write_behind =COUNTER_MAX /2 ; sb->write_behind =cpu_to_le32 (write_behind); bitmap->mddev->bitmap_info.max_write_behind = write_behind;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 11/160 bcache: fix NULL pointer in cache_set_flush()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linggang Zeng <[email protected]>
[ Upstream commit 1e46ed947ec658f89f1a910d880cd05e42d3763e ]
1. LINE#1794 - LINE#1887 is some codes about function of bch_cache_set_alloc().
2. LINE#2078 - LINE#2142 is some codes about function of register_cache_set().
3. register_cache_set() will call bch_cache_set_alloc() in LINE#2098.
1794 struct cache_set *bch_cache_set_alloc(struct cache_sb *sb) 1795 {
...
1860 if (!(c->devices = kcalloc(c->nr_uuids, sizeof(void *), GFP_KERNEL)) ||
1861 mempool_init_slab_pool(&c->search, 32, bch_search_cache) ||
1862 mempool_init_kmalloc_pool(&c->bio_meta, 2,
1863 sizeof(struct bbio) + sizeof(struct bio_vec) *
1864 bucket_pages(c)) ||
1865 mempool_init_kmalloc_pool(&c->fill_iter, 1, iter_size) ||
1866 bioset_init(&c->bio_split, 4, offsetof(struct bbio, bio),
1867 BIOSET_NEED_BVECS|BIOSET_NEED_RESCUER) ||
1868 !(c->uuids = alloc_bucket_pages(GFP_KERNEL, c)) ||
1869 !(c->moving_gc_wq = alloc_workqueue("bcache_gc",
1870 WQ_MEM_RECLAIM, 0)) ||
1871 bch_journal_alloc(c) ||
1872 bch_btree_cache_alloc(c) ||
1873 bch_open_buckets_alloc(c) ||
1874 bch_bset_sort_state_init(&c->sort, ilog2(c->btree_pages)))
1875 goto err;
^^^^^^^^
1876
...
1883 return c;
1884 err:
1885 bch_cache_set_unregister(c);
^^^^^^^^^^^^^^^^^^^^^^^^^^^
1886 return NULL;
1887 }
...
2078 static const char *register_cache_set(struct cache *ca)
2079 {
...
2098 c = bch_cache_set_alloc(&ca->sb);
2099 if (!c)
2100 return err;
^^^^^^^^^^
...
2128 ca->set = c;
2129 ca->set->cache[ca->sb.nr_this_dev] = ca;
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ...
2138 return NULL;
2139 err:
2140 bch_cache_set_unregister(c);
2141 return err;
2142 }
(1) If LINE#1860 - LINE#1874 is true, then do 'goto err'(LINE#1875) and
call bch_cache_set_unregister()(LINE#1885).
(2) As (1) return NULL(LINE#1886), LINE#2098 - LINE#2100 would return.
(3) As (2) has returned, LINE#2128 - LINE#2129 would do *not* give the
value to c->cache[], it means that c->cache[] is NULL.LINE#1624 - LINE#1665 is some codes about function of cache_set_flush(). As (1), in LINE#1885 callbch_cache_set_unregister()
---> bch_cache_set_stop()
---> closure_queue()
-.-> cache_set_flush() (as below LINE#1624) 1624 static void cache_set_flush(struct closure *cl) 1625 {
...
1654 for_each_cache(ca, c, i)
1655 if (ca->alloc_thread)
^^
1656 kthread_stop(ca->alloc_thread);
...
1665 }
(4) In LINE#1655 ca is NULL(see (3)) in cache_set_flush() then the kernel crash occurred as below:
[ 846.712887] bcache: register_cache() error drbd6: cannot allocate memory [ 846.713242] bcache: register_bcache() error : failed to register device [ 846.713336] bcache: cache_set_free() Cache set 2f84bdc1-498a-4f2f-98a7-01946bf54287 unregistered [ 846.713768] BUG: unable to handle kernel NULL pointer dereference at 00000000000009f8 [ 846.714790] PGD 0 P4D 0 [ 846.715129] Oops: 0000 [#1] SMP PTI [ 846.715472] CPU: 19 PID: 5057 Comm: kworker/19:16 Kdump: loaded Tainted: G OE --------- - - 4.18.0-147.5.1.el8_1.5es.3.x86_64 #1 [ 846.716082] Hardware name: ESPAN GI-25212/X11DPL-i, BIOS 2.1 06/15/2018 [ 846.716451] Workqueue: events cache_set_flush [bcache] [ 846.716808] RIP: 0010:cache_set_flush+0xc9/0x1b0 [bcache] [ 846.717155] Code: 00 4c 89 a5 b0 03 00 00 48 8b 85 68 f6 ff ff a8 08 0f 84 88 00 00 00 31 db 66 83 bd 3c f7 ff ff 00 48 8b 85 48 ff ff ff 74 28 <48> 8b b8 f8 09 00 00 48 85 ff 74 05 e8 b6 58 a2 e1 0f b7 95 3c f7 [ 846.718026] RSP: 0018:ffffb56dcf85fe70 EFLAGS: 00010202 [ 846.718372] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 [ 846.718725] RDX: 0000000000000001 RSI: 0000000040000001 RDI: 0000000000000000 [ 846.719076] RBP: ffffa0ccc0f20df8 R08: ffffa0ce1fedb118 R09: 000073746e657665 [ 846.719428] R10: 8080808080808080 R11: 0000000000000000 R12: ffffa0ce1fee8700 [ 846.719779] R13: ffffa0ccc0f211a8 R14: ffffa0cd1b902840 R15: ffffa0ccc0f20e00 [ 846.720132] FS: 0000000000000000(0000) GS:ffffa0ce1fec0000(0000) knlGS:0000000000000000 [ 846.720726] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 846.721073] CR2: 00000000000009f8 CR3: 00000008ba00a005 CR4: 00000000007606e0 [ 846.721426] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 846.721778] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 846.722131] PKRU: 55555554 [ 846.722467] Call Trace: [ 846.722814] process_one_work+0x1a7/0x3b0 [ 846.723157] worker_thread+0x30/0x390 [ 846.723501] ? create_worker+0x1a0/0x1a0 [ 846.723844] kthread+0x112/0x130 [ 846.724184] ? kthread_flush_work_fn+0x10/0x10 [ 846.724535] ret_from_fork+0x35/0x40
Now, check whether that ca is NULL in LINE#1655 to fix the issue.
--- drivers/md/bcache/super.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/md/bcache/super.c +6 -1
@@ -1746,7 +1746,12 @@ static void cache_set_flush(struct closure *cl)mutex_unlock (&b->write_lock); } -if (ca->alloc_thread) +/* +* If the register_cache_set() call to bch_cache_set_alloc() failed, +* ca has not been assigned a value and return error. +* So we need check ca is not NULL during bch_cache_set_unregister(). +*/ +if (ca && ca->alloc_thread)kthread_stop (ca->alloc_thread);if (c->journal.cur) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 12/160 iio: pressure: zpa2326: Use aligned_s64 for the timestamp
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonathan Cameron <[email protected]>
[ Upstream commit 886a446b76afddfad307488e95e87f23a08ffd51 ]
On x86_32 s64 fields are only 32-bit aligned. Hence force the alignment of the field and padding in the structure by using aligned_s64 instead.
--- drivers/iio/pressure/zpa2326.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/pressure/zpa2326.c +1 -1
@@ -582,7 +582,7 @@ static int zpa2326_fill_sample_buffer(struct iio_dev *indio_dev,struct {u32 pressure;u16 temperature; -u64 timestamp; +aligned_s64 timestamp; } sample;int err;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 13/160 um: Add cmpxchg8b_emu and checksum functions to asm-prototypes.h
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sami Tolvanen <[email protected]>
[ Upstream commit 674d03f6bd6b0f8327f1a4920ff5893557facfbd ]
With CONFIG_GENDWARFKSYMS, um builds fail due to missing prototypes in asm/asm-prototypes.h. Add declarations for cmpxchg8b_emu and the exported checksum functions, including csum_partial_copy_generic as it's also exported.
--- arch/um/include/asm/asm-prototypes.h | 5 +++++ arch/x86/um/asm/checksum.h | 3 +++ 2 files changed, 8 insertions(+)
arch/um/include/asm/asm-prototypes.h +5 -0
@@ -1 +1,6 @@#include <asm-generic/asm-prototypes.h> +#include <asm/checksum.h> + +#ifdef CONFIG_UML_X86 +extern void cmpxchg8b_emu (void ); +#endif
arch/x86/um/asm/checksum.h +3 -0
@@ -20,6 +20,9 @@*/ extern __wsum csum_partial (const void *buff,int len,__wsum sum); +/* Do not call this directly. Declared for export type visibility. */ +extern __visible __wsum csum_partial_copy_generic(const void *src, void *dst, int len); +/** * csum_fold - Fold and invert a 32bit checksum. * sum: 32bit unfolded sum
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 14/160 coresight: Only check bottom two claim bits
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Clark <[email protected]>
[ Upstream commit a4e65842e1142aa18ef36113fbd81d614eaefe5a ]
The use of the whole register and == could break the claim mechanism if any of the other bits are used in the future. The referenced doc "PSCI - ARM DEN 0022D" also says to only read and clear the bottom two bits.
Use FIELD_GET() to extract only the relevant part.
--- drivers/hwtracing/coresight/coresight-core.c | 3 ++- drivers/hwtracing/coresight/coresight-priv.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/hwtracing/coresight/coresight-core.c +2 -1
@@ -161,7 +161,8 @@ static int coresight_find_link_outport(struct coresight_device *csdev,static inline u32 coresight_read_claim_tags (struct coresight_device *csdev) { -return csdev_access_relaxed_read32 (&csdev->access,CORESIGHT_CLAIMCLR ); +return FIELD_GET (CORESIGHT_CLAIM_MASK , +csdev_access_relaxed_read32 (&csdev->access,CORESIGHT_CLAIMCLR )); }static inline bool coresight_is_claimed_self_hosted (struct coresight_device *csdev)
drivers/hwtracing/coresight/coresight-priv.h +1 -0
@@ -32,6 +32,7 @@* Coresight device CLAIM protocol. * See PSCI - ARM DEN 0022D, Section: 6.8.1 Debug and Trace save and restore. */ +#define CORESIGHT_CLAIM_MASK GENMASK(1, 0)#define CORESIGHT_CLAIM_SELF_HOSTED BIT(1)#define TIMEOUT_US 100
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 5/160 mfd: max14577: Fix wakeup source leaks on device unbind
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit d905d06e64b0eb3da43af6186c132f5282197998 ]
Device can be unbound, so driver must also release memory for the wakeup source.
--- drivers/mfd/max14577.c | 1 + 1 file changed, 1 insertion(+)
drivers/mfd/max14577.c +1 -0
@@ -467,6 +467,7 @@ static int max14577_i2c_remove(struct i2c_client *i2c) {struct max14577 *max14577 =i2c_get_clientdata (i2c); +device_init_wakeup (max14577->dev, false);mfd_remove_devices (max14577->dev);regmap_del_irq_chip (max14577->irq, max14577->irq_data);if (max14577->dev_type ==MAXIM_DEVICE_TYPE_MAX77836 )
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 37/160 ASoC: codecs: wcd9335: Fix missing free of regulator supplies
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 9079db287fc3e38e040b0edeb0a25770bb679c8e ]
Driver gets and enables all regulator supplies in probe path (wcd9335_parse_dt() and wcd9335_power_on_reset()), but does not cleanup in final error paths and in unbind (missing remove() callback). This leads to leaked memory and unbalanced regulator enable count during probe errors or unbind.
Fix this by converting entire code into devm_regulator_bulk_get_enable() which also greatly simplifies the code.
--- sound/soc/codecs/wcd9335.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-)
sound/soc/codecs/wcd9335.c +7 -18
@@ -339,7 +339,6 @@ struct wcd9335_codec {int intr1;struct gpio_desc *reset_gpio; -struct regulator_bulk_data supplies[WCD9335_MAX_SUPPLY ];unsigned int rx_port_value;unsigned int tx_port_value;
@@ -366,6 +365,10 @@ struct wcd9335_irq {char *name; }; +static const char *const wcd9335_supplies[] = { +"vdd-buck" ,"vdd-buck-sido" ,"vdd-tx" ,"vdd-rx" ,"vdd-io" , +}; +static const struct wcd9335_slim_ch wcd9335_tx_chs[WCD9335_TX_MAX ] = {WCD9335_SLIM_TX_CH (0 ),WCD9335_SLIM_TX_CH (1 ),
@@ -5038,30 +5041,16 @@ static int wcd9335_parse_dt(struct wcd9335_codec *wcd)if (IS_ERR (wcd->native_clk))return dev_err_probe (dev,PTR_ERR (wcd->native_clk),"slimbus clock not found\n" ); - wcd->supplies[0 ].supply ="vdd-buck" ; - wcd->supplies[1 ].supply ="vdd-buck-sido" ; - wcd->supplies[2 ].supply ="vdd-tx" ; - wcd->supplies[3 ].supply ="vdd-rx" ; - wcd->supplies[4 ].supply ="vdd-io" ; - - ret =regulator_bulk_get (dev,WCD9335_MAX_SUPPLY , wcd->supplies); + ret =devm_regulator_bulk_get_enable (dev,ARRAY_SIZE (wcd9335_supplies), + wcd9335_supplies);if (ret) -return dev_err_probe (dev, ret,"Failed to get supplies\n" ); +return dev_err_probe (dev, ret,"Failed to get and enable supplies\n" );return 0 ; }static int wcd9335_power_on_reset (struct wcd9335_codec *wcd) { -struct device *dev = wcd->dev; -int ret; - - ret =regulator_bulk_enable (WCD9335_MAX_SUPPLY , wcd->supplies); -if (ret) { -dev_err (dev,"Failed to get supplies: err = %d\n" , ret); -return ret; - } -/* * For WCD9335, it takes about 600us for the Vout_A and * Vout_D to be ready after BUCK_SIDO is powered up.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 46/160 Drivers: hv: vmbus: Add utility function for querying ring size
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Saurabh Sengar <[email protected]>
[ Upstream commit e8c4bd6c6e6b7e7b416c42806981c2a81370001e ]
Add a function to query for the preferred ring buffer size of VMBus device. This will allow the drivers (eg. UIO) to allocate the most optimized ring buffer size for devices.
Stable-dep-of: 0315fef2aff9 ("uio_hv_generic: Align ring size to system page")
--- drivers/hv/channel_mgmt.c | 15 ++++++++++++--- drivers/hv/hyperv_vmbus.h | 5 +++++ include/linux/hyperv.h | 2 ++ 3 files changed, 19 insertions(+), 3 deletions(-)
drivers/hv/channel_mgmt.c +12 -3
@@ -119,7 +119,9 @@ const struct vmbus_device vmbus_devs[] = { },/* File copy */ - { .dev_type = HV_FCOPY, +/* fcopy always uses 16KB ring buffer size and is working well for last many years */ + { .pref_ring_size = 0x4000, + .dev_type =HV_FCOPY ,HV_FCOPY_GUID , .perf_device = false, .allowed_in_isolated = false,
@@ -139,12 +141,19 @@ const struct vmbus_device vmbus_devs[] = { .allowed_in_isolated = false, }, -/* Unknown GUID */ - { .dev_type = HV_UNKNOWN, +/* +* Unknown GUID +* 64 KB ring buffer + 4 KB header should be sufficient size for any Hyper-V device apart +* from HV_NIC and HV_SCSI. This case avoid the fallback for unknown devices to allocate +* much bigger (2 MB) of ring size. +*/ + { .pref_ring_size = 0x11000, + .dev_type = HV_UNKNOWN, .perf_device = false, .allowed_in_isolated = false, }, }; +EXPORT_SYMBOL_GPL (vmbus_devs); static const struct { guid_t guid;
drivers/hv/hyperv_vmbus.h +5 -0
@@ -405,6 +405,11 @@ static inline bool hv_is_perf_channel(struct vmbus_channel *channel)return vmbus_devs[channel->device_id].perf_device; } +static inline size_t hv_dev_ring_size (struct vmbus_channel *channel) +{ +return vmbus_devs[channel->device_id].pref_ring_size; +} +static inline bool hv_is_allocated_cpu (unsigned int cpu) {struct vmbus_channel *channel, *sc;
include/linux/hyperv.h +2 -0
@@ -815,6 +815,8 @@ struct vmbus_requestor {#define VMBUS_RQST_RESET (U64_MAX - 3)struct vmbus_device { +/* preferred ring buffer size in KB, 0 means no preferred size for this device */ +size_t pref_ring_size;u16 dev_type;guid_t guid;bool perf_device;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 47/160 uio_hv_generic: Query the ringbuffer size for device
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Saurabh Sengar <[email protected]>
[ Upstream commit e566ed5b64177a0c07b677568f623ed31d23406d ]
Query the ring buffer size from pre defined table per device and use that value for allocating the ring buffer for that device. Keep the size as current default which is 2 MB if the device doesn't have any preferred ring size.
Stable-dep-of: 0315fef2aff9 ("uio_hv_generic: Align ring size to system page")
--- drivers/uio/uio_hv_generic.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/uio/uio_hv_generic.c +5 -2
@@ -249,6 +249,7 @@ hv_uio_probe(struct hv_device *dev,struct hv_uio_private_data *pdata;void *ring_buffer;int ret; +size_t ring_size =hv_dev_ring_size (channel);/* Communicating with host has to be via shared memory not hypercall */ if (!channel->offermsg.monitor_allocated) {
@@ -256,12 +257,14 @@ hv_uio_probe(struct hv_device *dev,return -ENOTSUPP ; } +if (!ring_size) + ring_size =HV_RING_SIZE *PAGE_SIZE ; + pdata =devm_kzalloc (&dev->device,sizeof (*pdata),GFP_KERNEL );if (!pdata)return -ENOMEM ; - ret =vmbus_alloc_ring (channel,HV_RING_SIZE *PAGE_SIZE , -HV_RING_SIZE *PAGE_SIZE ); + ret =vmbus_alloc_ring (channel, ring_size, ring_size);if (ret)return ret;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 48/160 uio_hv_generic: Align ring size to system page
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Long Li <[email protected]>
[ Upstream commit 0315fef2aff9f251ddef8a4b53db9187429c3553 ]
Following the ring header, the ring data should align to system page boundary. Adjust the size if necessary.
Message-ID: <[email protected]>
--- drivers/uio/uio_hv_generic.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/uio/uio_hv_generic.c +3 -0
@@ -260,6 +260,9 @@ hv_uio_probe(struct hv_device *dev,if (!ring_size) ring_size =HV_RING_SIZE *PAGE_SIZE ; +/* Adjust ring size if necessary to have it page aligned */ + ring_size =VMBUS_RING_SIZE (ring_size); + pdata =devm_kzalloc (&dev->device,sizeof (*pdata),GFP_KERNEL );if (!pdata)return -ENOMEM ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 49/160 fbcon: delete a few unneeded forward decl
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Vetter <[email protected]>
[ Upstream commit 9ad7acdad1d91545b99bf9fda3de4b86cf48b272 ]
I didn't bother with any code movement to fix the others, these just got a bit in the way.
v2: Rebase on top of Helge's reverts.
Stable-dep-of: 03bcbbb3995b ("dummycon: Trigger redraw when switching consoles with deferred takeover")
--- drivers/video/fbdev/core/fbcon.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-)
drivers/video/fbdev/core/fbcon.c +1 -16
@@ -163,29 +163,14 @@ static int fbcon_cursor_noblink;* Interface used by the world */ -static const char *fbcon_startup (void ); -static void fbcon_init (struct vc_data *vc,int init); -static void fbcon_deinit (struct vc_data *vc); -static void fbcon_clear (struct vc_data *vc,int sy,int sx,int height, -int width); -static void fbcon_putc (struct vc_data *vc,int c,int ypos,int xpos); -static void fbcon_putcs (struct vc_data *vc,const unsigned short *s, -int count,int ypos,int xpos);static void fbcon_clear_margins (struct vc_data *vc,int bottom_only); -static void fbcon_cursor (struct vc_data *vc,int mode);static void fbcon_bmove (struct vc_data *vc,int sy,int sx,int dy,int dx,int height,int width); -static int fbcon_switch (struct vc_data *vc); -static int fbcon_blank (struct vc_data *vc,int blank,int mode_switch);static void fbcon_set_palette (struct vc_data *vc,const unsigned char *table);/* * Internal routines */ -static __inline__void ywrap_up (struct vc_data *vc,int count); -static __inline__void ywrap_down (struct vc_data *vc,int count); -static __inline__void ypan_up (struct vc_data *vc,int count); -static __inline__void ypan_down (struct vc_data *vc,int count);static void fbcon_bmove_rec (struct vc_data *vc,struct fbcon_display *p,int sy,int sx,int dy,int dx,int height,int width,u_int y_break); static void fbcon_set_disp(struct fb_info *info, struct fb_var_screeninfo *var,
@@ -194,8 +179,8 @@ static void fbcon_redraw_move(struct vc_data *vc, struct fbcon_display *p, int line, int count, int dy);static void fbcon_modechanged (struct fb_info *info);static void fbcon_set_all_vcs (struct fb_info *info); -static void fbcon_start (void );static void fbcon_exit (void ); +static struct device *fbcon_device;#ifdef CONFIG_FRAMEBUFFER_CONSOLE_ROTATION
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 50/160 tty/vt: consolemap: rename and document struct uni_pagedir
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Slaby <[email protected]>
[ Upstream commit 4173f018aae16b6496d292c234b858241f85254f ]
struct uni_pagedir contains 32 unicode page directories, so the name of the structure is a bit misleading. Rename the structure to uni_pagedict, so it looks like this:
struct uni_pagedict
-> 32 page dirs
-> 32 rows
-> 64 glyphsStable-dep-of: 03bcbbb3995b ("dummycon: Trigger redraw when switching consoles with deferred takeover")
--- drivers/tty/vt/consolemap.c | 47 ++++++++++++++++++++-------------- drivers/video/console/vgacon.c | 4 +-- include/linux/console_struct.h | 6 ++--- 3 files changed, 33 insertions(+), 24 deletions(-)
drivers/tty/vt/consolemap.c +28 -19
@@ -186,17 +186,26 @@ static unsigned short translations[][256] = {static int inv_translate[MAX_NR_CONSOLES ]; -struct uni_pagedir { -u16 **uni_pgdir[32 ]; +/** +* struct uni_pagedict -- unicode directory +* +* @uni_pgdir: 32*32*64 table with glyphs +* @refcount: reference count of this structure +* @sum: checksum +* @inverse_translations: best-effort inverse mapping +* @inverse_trans_unicode: best-effort inverse mapping to unicode +*/ +struct uni_pagedict { +u16 **uni_pgdir[32 ];unsigned long refcount;unsigned long sum;unsigned char *inverse_translations[4 ];u16 *inverse_trans_unicode; }; -static struct uni_pagedir *dflt; +static struct uni_pagedict *dflt; -static void set_inverse_transl (struct vc_data *conp,struct uni_pagedir *p,int i) +static void set_inverse_transl (struct vc_data *conp,struct uni_pagedict *p,int i) {int j, glyph;unsigned short *t = translations[i];
@@ -221,7 +230,7 @@ static void set_inverse_transl(struct vc_data *conp, struct uni_pagedir *p, int }static void set_inverse_trans_unicode (struct vc_data *conp, -struct uni_pagedir *p) +struct uni_pagedict *p) {int i, j, k, glyph;u16 **p1, *p2;
@@ -270,7 +279,7 @@ unsigned short *set_translate(int m, struct vc_data *vc)*/ u16 inverse_translate (const struct vc_data *conp,int glyph,int use_unicode) { -struct uni_pagedir *p; +struct uni_pagedict *p;int m;if (glyph <0 || glyph >=MAX_GLYPH )return 0 ;
@@ -297,7 +306,7 @@ EXPORT_SYMBOL_GPL(inverse_translate);static void update_user_maps (void ) {int i; -struct uni_pagedir *p, *q =NULL ; +struct uni_pagedict *p, *q =NULL ;for (i =0 ; i <MAX_NR_CONSOLES ; i++) {if (!vc_cons_allocated (i))
@@ -393,7 +402,7 @@ int con_get_trans_new(ushort __user * arg)extern u8 dfont_unicount[];/* Defined in console_defmap.c */ extern u16 dfont_unitable[]; -static void con_release_unimap (struct uni_pagedir *p) +static void con_release_unimap (struct uni_pagedict *p) {u16 **p1;int i, j;
@@ -419,7 +428,7 @@ static void con_release_unimap(struct uni_pagedir *p)/* Caller must hold the console lock */ void con_free_unimap (struct vc_data *vc) { -struct uni_pagedir *p; +struct uni_pagedict *p; p = *vc->vc_uni_pagedir_loc;if (!p)
@@ -431,10 +440,10 @@ void con_free_unimap(struct vc_data *vc)kfree (p); } -static int con_unify_unimap (struct vc_data *conp,struct uni_pagedir *p) +static int con_unify_unimap (struct vc_data *conp,struct uni_pagedict *p) {int i, j, k; -struct uni_pagedir *q; +struct uni_pagedict *q;for (i =0 ; i <MAX_NR_CONSOLES ; i++) {if (!vc_cons_allocated (i))
@@ -472,7 +481,7 @@ static int con_unify_unimap(struct vc_data *conp, struct uni_pagedir *p) }static int -con_insert_unipair (struct uni_pagedir *p,u_short unicode,u_short fontpos) +con_insert_unipair (struct uni_pagedict *p,u_short unicode,u_short fontpos) {int i, n;u16 **p1, *p2;
@@ -503,7 +512,7 @@ con_insert_unipair(struct uni_pagedir *p, u_short unicode, u_short fontpos)/* Caller must hold the lock */ static int con_do_clear_unimap (struct vc_data *vc) { -struct uni_pagedir *p, *q; +struct uni_pagedict *p, *q; p = *vc->vc_uni_pagedir_loc;if (!p || --p->refcount) {
@@ -536,7 +545,7 @@ int con_clear_unimap(struct vc_data *vc)int con_set_unimap (struct vc_data *vc,ushort ct,struct unipair __user *list) {int err =0 , err1, i; -struct uni_pagedir *p, *q; +struct uni_pagedict *p, *q;struct unipair *unilist, *plist;if (!ct)
@@ -569,7 +578,7 @@ int con_set_unimap(struct vc_data *vc, ushort ct, struct unipair __user *list)/* * Since refcount was > 1, con_clear_unimap() allocated a -* a new uni_pagedir for this vc. Re: p != q +* a new uni_pagedict for this vc. Re: p != q */ q = *vc->vc_uni_pagedir_loc;
@@ -660,7 +669,7 @@ int con_set_default_unimap(struct vc_data *vc) {int i, j, err =0 , err1;u16 *q; -struct uni_pagedir *p; +struct uni_pagedict *p;if (dflt) { p = *vc->vc_uni_pagedir_loc;
@@ -714,7 +723,7 @@ EXPORT_SYMBOL(con_set_default_unimap);*/ int con_copy_unimap (struct vc_data *dst_vc,struct vc_data *src_vc) { -struct uni_pagedir *q; +struct uni_pagedict *q;if (!*src_vc->vc_uni_pagedir_loc)return -EINVAL ;
@@ -739,7 +748,7 @@ int con_get_unimap(struct vc_data *vc, ushort ct, ushort __user *uct, struct uniint i, j, k, ret =0 ;ushort ect;u16 **p1, *p2; -struct uni_pagedir *p; +struct uni_pagedict *p;struct unipair *unilist; unilist =kvmalloc_array (ct,sizeof (struct unipair ),GFP_KERNEL );
@@ -810,7 +819,7 @@ conv_uni_to_pc(struct vc_data *conp, long ucs) {int h;u16 **p1, *p2; -struct uni_pagedir *p; +struct uni_pagedict *p;/* Only 16-bit codes supported at this time */ if (ucs >0xffff )
drivers/video/console/vgacon.c +2 -2
@@ -75,7 +75,7 @@ static void vgacon_scrolldelta(struct vc_data *c, int lines);static int vgacon_set_origin (struct vc_data *c);static void vgacon_save_screen (struct vc_data *c);static void vgacon_invert_region (struct vc_data *c,u16 * p,int count); -static struct uni_pagedir *vgacon_uni_pagedir; +static struct uni_pagedict *vgacon_uni_pagedir;static int vgacon_refcount;/* Description of the hardware situation */
@@ -363,7 +363,7 @@ static const char *vgacon_startup(void)static void vgacon_init (struct vc_data *c,int init) { -struct uni_pagedir *p; +struct uni_pagedict *p;/* * We cannot be loaded as a module, therefore init will be 1
include/linux/console_struct.h +3 -3
@@ -17,7 +17,7 @@#include <linux/vt.h> #include <linux/workqueue.h> -struct uni_pagedir ; +struct uni_pagedict ;struct uni_screen ;#define NPAR 16
@@ -157,8 +157,8 @@ struct vc_data {unsigned int vc_bell_duration;/* Console bell duration */ unsigned short vc_cur_blink_ms;/* Cursor blink duration */ struct vc_data **vc_display_fg;/* [!] Ptr to var holding fg console for this display */ -struct uni_pagedir *vc_uni_pagedir; -struct uni_pagedir **vc_uni_pagedir_loc;/* [!] Location of uni_pagedir variable for this console */ +struct uni_pagedict *vc_uni_pagedir; +struct uni_pagedict **vc_uni_pagedir_loc;/* [!] Location of uni_pagedict variable for this console */ struct uni_screen *vc_uni_screen;/* unicode screen content */ /* additional information is in vt_kern.h */ };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 51/160 vgacon: switch vgacon_scrolldelta() and vgacon_restore_screen()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Slaby (SUSE) <[email protected]>
[ Upstream commit 03b89a08484a88fb9e0604cab2b3eb0c2f265c74 ]
Switch vgacon_scrolldelta() and vgacon_restore_screen() positions, so that the former is not needed to be forward-declared.
Stable-dep-of: 03bcbbb3995b ("dummycon: Trigger redraw when switching consoles with deferred takeover")
--- drivers/video/console/vgacon.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/video/console/vgacon.c +6 -6
@@ -163,12 +163,6 @@ static inline void vga_set_mem_top(struct vc_data *c)write_vga (12 , (c->vc_visible_origin - vga_vram_base) /2 ); } -static void vgacon_restore_screen (struct vc_data *c) -{ -if (c->vc_origin != c->vc_visible_origin) -vgacon_scrolldelta (c,0 ); -} -static void vgacon_scrolldelta (struct vc_data *c,int lines) { vc_scrolldelta_helper(c, lines, vga_rolled_over, (void *)vga_vram_base,
@@ -176,6 +170,12 @@ static void vgacon_scrolldelta(struct vc_data *c, int lines)vga_set_mem_top (c); } +static void vgacon_restore_screen (struct vc_data *c) +{ +if (c->vc_origin != c->vc_visible_origin) +vgacon_scrolldelta (c,0 ); +} +static const char *vgacon_startup (void ) {const char *display_desc =NULL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 52/160 vgacon: remove unneeded forward declarations
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Slaby (SUSE) <[email protected]>
[ Upstream commit 6ceed69cde8fe4a78fe50d62d7a88a5c1eed4709 ]
Most of the forward declarations in vgacon are not needed. Drop them.
Stable-dep-of: 03bcbbb3995b ("dummycon: Trigger redraw when switching consoles with deferred takeover")
--- drivers/video/console/vgacon.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
drivers/video/console/vgacon.c +1 -9
@@ -65,16 +65,8 @@ static struct vgastate vgastate;* Interface used by the world */ -static const char *vgacon_startup (void ); -static void vgacon_init (struct vc_data *c,int init); -static void vgacon_deinit (struct vc_data *c); -static void vgacon_cursor (struct vc_data *c,int mode); -static int vgacon_switch (struct vc_data *c); -static int vgacon_blank (struct vc_data *c,int blank,int mode_switch); -static void vgacon_scrolldelta (struct vc_data *c,int lines);static int vgacon_set_origin (struct vc_data *c); -static void vgacon_save_screen (struct vc_data *c); -static void vgacon_invert_region (struct vc_data *c,u16 * p,int count); +static struct uni_pagedict *vgacon_uni_pagedir;static int vgacon_refcount;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 53/160 tty: vt: make init parameter of consw::con_init() a bool
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Slaby (SUSE) <[email protected]>
[ Upstream commit dae3e6b6180f1a2394b984c596d39ed2c57d25fe ]
The 'init' parameter of consw::con_init() is true for the first call of the hook on a particular console. So make the parameter a bool.
And document the hook.
Stable-dep-of: 03bcbbb3995b ("dummycon: Trigger redraw when switching consoles with deferred takeover")
--- drivers/tty/vt/vt.c | 8 ++++---- drivers/video/console/dummycon.c | 2 +- drivers/video/console/mdacon.c | 2 +- drivers/video/console/newport_con.c | 2 +- drivers/video/console/sticon.c | 2 +- drivers/video/console/vgacon.c | 4 ++-- drivers/video/fbdev/core/fbcon.c | 2 +- include/linux/console.h | 4 +++- 8 files changed, 14 insertions(+), 12 deletions(-)
drivers/tty/vt/vt.c +4 -4
@@ -1050,7 +1050,7 @@ int vc_cons_allocated(unsigned int i)return (i <MAX_NR_CONSOLES && vc_cons[i].d); } -static void visual_init (struct vc_data *vc,int num,int init) +static void visual_init (struct vc_data *vc,int num,bool init) {/* ++Geert: vc->vc_sw->con_init determines console size */ if (vc->vc_sw)
@@ -1134,7 +1134,7 @@ int vc_allocate(unsigned int currcons) /* return 0 on success */ vc->port.ops = &vc_port_ops;INIT_WORK (&vc_cons[currcons].SAK_work, vc_SAK); -visual_init (vc, currcons,1 ); +visual_init (vc, currcons, true);if (!*vc->vc_uni_pagedir_loc)con_set_default_unimap (vc);
@@ -3521,7 +3521,7 @@ static int __init con_init(void) vc_cons[currcons].d = vc =kzalloc (sizeof (struct vc_data ),GFP_NOWAIT );INIT_WORK (&vc_cons[currcons].SAK_work, vc_SAK);tty_port_init (&vc->port); -visual_init (vc, currcons,1 ); +visual_init (vc, currcons, true);/* Assuming vc->vc_{cols,rows,screenbuf_size} are sane here. */ vc->vc_screenbuf =kzalloc (vc->vc_screenbuf_size,GFP_NOWAIT ); vc_init(vc, vc->vc_rows, vc->vc_cols,
@@ -3692,7 +3692,7 @@ static int do_bind_con_driver(const struct consw *csw, int first, int last, old_was_color = vc->vc_can_do_color; vc->vc_sw->con_deinit (vc); vc->vc_origin = (unsigned long )vc->vc_screenbuf; -visual_init (vc, i,0 ); +visual_init (vc, i, false);set_origin (vc);update_attr (vc);
drivers/video/console/dummycon.c +1 -1
@@ -97,7 +97,7 @@ static const char *dummycon_startup(void)return "dummy device" ; } -static void dummycon_init (struct vc_data *vc,int init) +static void dummycon_init (struct vc_data *vc,bool init) { vc->vc_can_do_color =1 ;if (init) {
drivers/video/console/mdacon.c +1 -1
@@ -352,7 +352,7 @@ static const char *mdacon_startup(void)return "MDA-2" ; } -static void mdacon_init (struct vc_data *c,int init) +static void mdacon_init (struct vc_data *c,bool init) { c->vc_complement_mask =0x0800 ;/* reverse video */ c->vc_display_fg = &mda_display_fg;
drivers/video/console/newport_con.c +1 -1
@@ -324,7 +324,7 @@ static const char *newport_startup(void)return NULL ; } -static void newport_init (struct vc_data *vc,int init) +static void newport_init (struct vc_data *vc,bool init) {int cols, rows;
drivers/video/console/sticon.c +1 -1
@@ -272,7 +272,7 @@ static int sticon_font_set(struct vc_data *vc, struct console_font *font,return sticon_set_font (vc, font); } -static void sticon_init (struct vc_data *c,int init) +static void sticon_init (struct vc_data *c,bool init) {struct sti_struct *sti = sticon_sti;int vc_cols, vc_rows;
drivers/video/console/vgacon.c +2 -2
@@ -353,7 +353,7 @@ static const char *vgacon_startup(void)return display_desc; } -static void vgacon_init (struct vc_data *c,int init) +static void vgacon_init (struct vc_data *c,bool init) {struct uni_pagedict *p;
@@ -370,7 +370,7 @@ static void vgacon_init(struct vc_data *c, int init) c->vc_scan_lines = vga_scan_lines; c->vc_font.height = c->vc_cell_height = vga_video_font_height; -/* set dimensions manually if init != 0 since vc_resize() will fail */ +/* set dimensions manually if init is true since vc_resize() will fail */ if (init) { c->vc_cols = vga_video_num_columns; c->vc_rows = vga_video_num_lines;
drivers/video/fbdev/core/fbcon.c +1 -1
@@ -983,7 +983,7 @@ static const char *fbcon_startup(void)return display_desc; } -static void fbcon_init (struct vc_data *vc,int init) +static void fbcon_init (struct vc_data *vc,bool init) {struct fb_info *info;struct fbcon_ops *ops;
include/linux/console.h +3 -1
@@ -34,6 +34,8 @@ enum vc_intensity;/** * struct consw - callbacks for consoles * +* @con_init: initialize the console on @vc. @init is true for the very first +* call on this @vc. * @con_scroll: move lines from @top to @bottom in direction @dir by @lines. * Return true if no generic handling should be done. * Invoked by csi_M and printing to the console.
@@ -44,7 +46,7 @@ enum vc_intensity;struct consw {struct module *owner;const char *(*con_startup)(void ); -void (*con_init)(struct vc_data *vc,int init); +void (*con_init)(struct vc_data *vc,bool init);void (*con_deinit)(struct vc_data *vc);void (*con_clear)(struct vc_data *vc,int sy,int sx,int height,int width);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 54/160 tty: vt: sanitize arguments of consw::con_clear()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Slaby (SUSE) <[email protected]>
[ Upstream commit 559f01a0ee6d924c6fec3eaf6a5b078b15e71070 ]
In consw::con_clear():
* Height is always 1, so drop it.
* Offsets and width are always unsigned values, so re-type them as such.
This needs a new __fbcon_clear() in the fbcon code to still handle height which might not be 1 when called internally.
Note that tests for negative count/width are left in place -- they are taken care of in the next patches.
And document the hook.
Stable-dep-of: 03bcbbb3995b ("dummycon: Trigger redraw when switching consoles with deferred takeover")
--- drivers/tty/vt/vt.c | 2 +- drivers/video/console/dummycon.c | 4 ++-- drivers/video/console/mdacon.c | 15 +++++--------- drivers/video/console/newport_con.c | 6 +++--- drivers/video/console/sticon.c | 8 ++++---- drivers/video/console/vgacon.c | 4 ++-- drivers/video/fbdev/core/fbcon.c | 32 +++++++++++++++++------------ include/linux/console.h | 5 +++-- 8 files changed, 39 insertions(+), 37 deletions(-)
drivers/tty/vt/vt.c +1 -1
@@ -1628,7 +1628,7 @@ static void csi_X(struct vc_data *vc, unsigned int vpar)vc_uniscr_clear_line (vc, vc->state.x, count);scr_memsetw ((unsigned short *)vc->vc_pos, vc->vc_video_erase_char,2 * count);if (con_should_update (vc)) - vc->vc_sw->con_clear (vc, vc->state.y, vc->state.x,1 , count); + vc->vc_sw->con_clear (vc, vc->state.y, vc->state.x, count); vc->vc_need_wrap =0 ; }
drivers/video/console/dummycon.c +2 -2
@@ -108,8 +108,8 @@ static void dummycon_init(struct vc_data *vc, bool init) }static void dummycon_deinit (struct vc_data *vc) { } -static void dummycon_clear (struct vc_data *vc,int sy,int sx,int height, -int width) { } +static void dummycon_clear (struct vc_data *vc,unsigned int sy,unsigned int sx, +unsigned int width) { }static void dummycon_cursor (struct vc_data *vc,int mode) { } static bool dummycon_scroll(struct vc_data *vc, unsigned int top,
drivers/video/console/mdacon.c +5 -10
@@ -442,23 +442,18 @@ static void mdacon_putcs(struct vc_data *c, const unsigned short *s, } } -static void mdacon_clear (struct vc_data *c,int y,int x, -int height,int width) +static void mdacon_clear (struct vc_data *c,unsigned int y,unsigned int x, +unsigned int width) {u16 *dest =mda_addr (x, y);u16 eattr =mda_convert_attr (c->vc_video_erase_char); -if (width <=0 || height <=0 ) +if (width <=0 )return ; -if (x==0 && width==mda_num_columns) { -scr_memsetw (dest, eattr, height*width*2 ); - }else { -for (; height >0 ; height--, dest+=mda_num_columns) -scr_memsetw (dest, eattr, width*2 ); - } +scr_memsetw (dest, eattr, width *2 ); } - +static int mdacon_switch (struct vc_data *c) {return 1 ;/* redrawing needed */
drivers/video/console/newport_con.c +3 -3
@@ -346,12 +346,12 @@ static void newport_deinit(struct vc_data *c) } } -static void newport_clear (struct vc_data *vc,int sy,int sx,int height, -int width) +static void newport_clear (struct vc_data *vc,unsigned int sy,unsigned int sx, +unsigned int width) {int xend = ((sx + width) <<3 ) -1 ;int ystart = ((sy <<4 ) + topscan) &0x3ff ; -int yend = (((sy + height) <<4 ) + topscan -1 ) &0x3ff ; +int yend = (((sy +1 ) <<4 ) + topscan -1 ) &0x3ff ;if (logo_active)return ;
drivers/video/console/sticon.c +4 -4
@@ -299,13 +299,13 @@ static void sticon_deinit(struct vc_data *c)sticon_set_def_font (i,NULL ); } -static void sticon_clear (struct vc_data *conp,int sy,int sx,int height, -int width) +static void sticon_clear (struct vc_data *conp,unsigned int sy,unsigned int sx, +unsigned int width) { -if (!height || !width) +if (!width)return ; -sti_clear (sticon_sti, sy, sx, height, width, +sti_clear (sticon_sti, sy, sx,1 , width, conp->vc_video_erase_char, font_data[conp->vc_num]); }
drivers/video/console/vgacon.c +2 -2
@@ -1187,8 +1187,8 @@ static bool vgacon_scroll(struct vc_data *c, unsigned int t, unsigned int b,* The console `switch' structure for the VGA based console */ -static void vgacon_clear (struct vc_data *vc,int sy,int sx,int height, -int width) { } +static void vgacon_clear (struct vc_data *vc,unsigned int sy,unsigned int sx, +unsigned int width) { }static void vgacon_putc (struct vc_data *vc,int c,int ypos,int xpos) { }static void vgacon_putcs (struct vc_data *vc,const unsigned short *s,int count,int ypos,int xpos) { }
drivers/video/fbdev/core/fbcon.c +19 -13
@@ -1210,8 +1210,8 @@ static void fbcon_deinit(struct vc_data *vc)* restriction is simplicity & efficiency at the moment. */ -static void fbcon_clear (struct vc_data *vc,int sy,int sx,int height, -int width) +static void __fbcon_clear (struct vc_data *vc,unsigned int sy,unsigned int sx, +unsigned int height,unsigned int width) {struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];struct fbcon_ops *ops = info->fbcon_par;
@@ -1250,6 +1250,12 @@ static void fbcon_clear(struct vc_data *vc, int sy, int sx, int height, ops->clear (vc, info,real_y (p, sy), sx, height, width, fg, bg); } +static void fbcon_clear (struct vc_data *vc,unsigned int sy,unsigned int sx, +unsigned int width) +{ +__fbcon_clear (vc, sy, sx,1 , width); +} +static void fbcon_putcs (struct vc_data *vc,const unsigned short *s,int count,int ypos,int xpos) {
@@ -1673,7 +1679,7 @@ static bool fbcon_scroll(struct vc_data *vc, unsigned int t, unsigned int b,case SCROLL_MOVE :fbcon_redraw_blit (vc, info, p, t, b - t - count, count); -fbcon_clear (vc, b - count,0 , count, vc->vc_cols); +__fbcon_clear (vc, b - count,0 , count, vc->vc_cols); scr_memsetw((unsigned short *) (vc->vc_origin + vc->vc_size_row * (b - count)),
@@ -1696,7 +1702,7 @@ static bool fbcon_scroll(struct vc_data *vc, unsigned int t, unsigned int b, b - t - count, vc->vc_cols); else goto redraw_up; -fbcon_clear (vc, b - count,0 , count, vc->vc_cols); +__fbcon_clear (vc, b - count,0 , count, vc->vc_cols);break ;case SCROLL_PAN_REDRAW :
@@ -1714,7 +1720,7 @@ static bool fbcon_scroll(struct vc_data *vc, unsigned int t, unsigned int b, vc->vc_rows - b, b); }else fbcon_redraw_move (vc, p, t + count, b - t - count, t); -fbcon_clear (vc, b - count,0 , count, vc->vc_cols); +__fbcon_clear (vc, b - count,0 , count, vc->vc_cols);break ;case SCROLL_PAN_MOVE :
@@ -1737,14 +1743,14 @@ static bool fbcon_scroll(struct vc_data *vc, unsigned int t, unsigned int b, b - t - count, vc->vc_cols); else goto redraw_up; -fbcon_clear (vc, b - count,0 , count, vc->vc_cols); +__fbcon_clear (vc, b - count,0 , count, vc->vc_cols);break ;case SCROLL_REDRAW : redraw_up:fbcon_redraw (vc, p, t, b - t - count, count * vc->vc_cols); -fbcon_clear (vc, b - count,0 , count, vc->vc_cols); +__fbcon_clear (vc, b - count,0 , count, vc->vc_cols); scr_memsetw((unsigned short *) (vc->vc_origin + vc->vc_size_row * (b - count)),
@@ -1761,7 +1767,7 @@ static bool fbcon_scroll(struct vc_data *vc, unsigned int t, unsigned int b,case SCROLL_MOVE :fbcon_redraw_blit (vc, info, p, b -1 , b - t - count, -count); -fbcon_clear (vc, t,0 , count, vc->vc_cols); +__fbcon_clear (vc, t,0 , count, vc->vc_cols); scr_memsetw((unsigned short *) (vc->vc_origin + vc->vc_size_row * t),
@@ -1784,7 +1790,7 @@ static bool fbcon_scroll(struct vc_data *vc, unsigned int t, unsigned int b, b - t - count, vc->vc_cols); else goto redraw_down; -fbcon_clear (vc, t,0 , count, vc->vc_cols); +__fbcon_clear (vc, t,0 , count, vc->vc_cols);break ;case SCROLL_PAN_MOVE :
@@ -1806,7 +1812,7 @@ static bool fbcon_scroll(struct vc_data *vc, unsigned int t, unsigned int b, b - t - count, vc->vc_cols); else goto redraw_down; -fbcon_clear (vc, t,0 , count, vc->vc_cols); +__fbcon_clear (vc, t,0 , count, vc->vc_cols);break ;case SCROLL_PAN_REDRAW :
@@ -1823,14 +1829,14 @@ static bool fbcon_scroll(struct vc_data *vc, unsigned int t, unsigned int b,fbcon_redraw_move (vc, p, count, t,0 ); }else fbcon_redraw_move (vc, p, t, b - t - count, t + count); -fbcon_clear (vc, t,0 , count, vc->vc_cols); +__fbcon_clear (vc, t,0 , count, vc->vc_cols);break ;case SCROLL_REDRAW : redraw_down:fbcon_redraw (vc, p, b -1 , b - t - count, -count * vc->vc_cols); -fbcon_clear (vc, t,0 , count, vc->vc_cols); +__fbcon_clear (vc, t,0 , count, vc->vc_cols); scr_memsetw((unsigned short *) (vc->vc_origin + vc->vc_size_row * t),
@@ -2175,7 +2181,7 @@ static void fbcon_generic_blank(struct vc_data *vc, struct fb_info *info, oldc = vc->vc_video_erase_char; vc->vc_video_erase_char &= charmask; -fbcon_clear (vc,0 ,0 , vc->vc_rows, vc->vc_cols); +__fbcon_clear (vc,0 ,0 , vc->vc_rows, vc->vc_cols); vc->vc_video_erase_char = oldc; } }
include/linux/console.h +3 -2
@@ -36,6 +36,7 @@ enum vc_intensity;* * @con_init: initialize the console on @vc. @init is true for the very first * call on this @vc. +* @con_clear: erase @count characters at [@x, @y] on @vc. @count >= 1. * @con_scroll: move lines from @top to @bottom in direction @dir by @lines. * Return true if no generic handling should be done. * Invoked by csi_M and printing to the console.
@@ -48,8 +49,8 @@ struct consw {const char *(*con_startup)(void );void (*con_init)(struct vc_data *vc,bool init);void (*con_deinit)(struct vc_data *vc); -void (*con_clear)(struct vc_data *vc,int sy,int sx,int height, -int width); +void (*con_clear)(struct vc_data *vc,unsigned int y, +unsigned int x,unsigned int count);void (*con_putc)(struct vc_data *vc,int c,int ypos,int xpos);void (*con_putcs)(struct vc_data *vc,const unsigned short *s,int count,int ypos,int xpos);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 55/160 tty: vt: make consw::con_switch() return a bool
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Slaby (SUSE) <[email protected]>
[ Upstream commit 8d5cc8eed738e3202379722295c626cba0849785 ]
The non-zero (true) return value from consw::con_switch() means a redraw is needed. So make this return type a bool explicitly instead of int. The latter might imply that -Eerrors are expected. They are not.
And document the hook.
Stable-dep-of: 03bcbbb3995b ("dummycon: Trigger redraw when switching consoles with deferred takeover")
--- drivers/tty/vt/vt.c | 2 +- drivers/video/console/dummycon.c | 4 ++-- drivers/video/console/mdacon.c | 4 ++-- drivers/video/console/newport_con.c | 4 ++-- drivers/video/console/sticon.c | 4 ++-- drivers/video/console/vgacon.c | 4 ++-- drivers/video/fbdev/core/fbcon.c | 6 +++--- include/linux/console.h | 4 +++- 8 files changed, 17 insertions(+), 15 deletions(-)
drivers/tty/vt/vt.c +1 -1
@@ -1014,7 +1014,7 @@ void redraw_screen(struct vc_data *vc, int is_switch) }if (redraw) { -int update; +bool update;int old_was_color = vc->vc_can_do_color;set_origin (vc);
drivers/video/console/dummycon.c +2 -2
@@ -119,9 +119,9 @@ static bool dummycon_scroll(struct vc_data *vc, unsigned int top,return false; } -static int dummycon_switch (struct vc_data *vc) +static bool dummycon_switch (struct vc_data *vc) { -return 0 ; +return false; }/*
drivers/video/console/mdacon.c +2 -2
@@ -454,9 +454,9 @@ static void mdacon_clear(struct vc_data *c, unsigned int y, unsigned int x,scr_memsetw (dest, eattr, width *2 ); } -static int mdacon_switch (struct vc_data *c) +static bool mdacon_switch (struct vc_data *c) { -return 1 ;/* redrawing needed */ +return true;/* redrawing needed */ }static int mdacon_blank (struct vc_data *c,int blank,int mode_switch)
drivers/video/console/newport_con.c +2 -2
@@ -462,7 +462,7 @@ static void newport_cursor(struct vc_data *vc, int mode) } } -static int newport_switch (struct vc_data *vc) +static bool newport_switch (struct vc_data *vc) {static int logo_drawn =0 ;
@@ -476,7 +476,7 @@ static int newport_switch(struct vc_data *vc) } } -return 1 ; +return true; }static int newport_blank (struct vc_data *c,int blank,int mode_switch)
drivers/video/console/sticon.c +2 -2
@@ -309,9 +309,9 @@ static void sticon_clear(struct vc_data *conp, unsigned int sy, unsigned int sx, conp->vc_video_erase_char, font_data[conp->vc_num]); } -static int sticon_switch (struct vc_data *conp) +static bool sticon_switch (struct vc_data *conp) { -return 1 ;/* needs refreshing */ +return true;/* needs refreshing */ }static int sticon_blank (struct vc_data *c,int blank,int mode_switch)
drivers/video/console/vgacon.c +2 -2
@@ -616,7 +616,7 @@ static int vgacon_doresize(struct vc_data *c,return 0 ; } -static int vgacon_switch (struct vc_data *c) +static bool vgacon_switch (struct vc_data *c) {int x = c->vc_cols *VGA_FONTWIDTH ;int y = c->vc_rows * c->vc_cell_height;
@@ -645,7 +645,7 @@ static int vgacon_switch(struct vc_data *c)vgacon_doresize (c, c->vc_cols, c->vc_rows); } -return 0 ;/* Redrawing not needed */ +return false;/* Redrawing not needed */ }static void vga_set_palette (struct vc_data *vc,const unsigned char *table)
drivers/video/fbdev/core/fbcon.c +3 -3
@@ -2043,7 +2043,7 @@ static int fbcon_resize(struct vc_data *vc, unsigned int width,return 0 ; } -static int fbcon_switch (struct vc_data *vc) +static bool fbcon_switch (struct vc_data *vc) {struct fb_info *info, *old_info =NULL ;struct fbcon_ops *ops;
@@ -2166,9 +2166,9 @@ static int fbcon_switch(struct vc_data *vc) vc->vc_origin + vc->vc_size_row * vc->vc_top, vc->vc_size_row * (vc->vc_bottom - vc->vc_top) / 2); -return 0 ; +return false; } -return 1 ; +return true; } static void fbcon_generic_blank(struct vc_data *vc, struct fb_info *info,
include/linux/console.h +3 -1
@@ -40,6 +40,8 @@ enum vc_intensity;* @con_scroll: move lines from @top to @bottom in direction @dir by @lines. * Return true if no generic handling should be done. * Invoked by csi_M and printing to the console. +* @con_switch: notifier about the console switch; it is supposed to return +* true if a redraw is needed. * @con_set_palette: sets the palette of the console to @table (optional) * @con_scrolldelta: the contents of the console should be scrolled by @lines. * Invoked by user. (optional)
@@ -58,7 +60,7 @@ struct consw {bool (*con_scroll)(struct vc_data *vc,unsigned int top,unsigned int bottom,enum con_scroll dir,unsigned int lines); -int (*con_switch)(struct vc_data *vc); +bool (*con_switch)(struct vc_data *vc);int (*con_blank)(struct vc_data *vc,int blank,int mode_switch);int (*con_font_set)(struct vc_data *vc,struct console_font *font,unsigned int flags);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 38/160 f2fs: dont over-report free space or inodes in statvfs
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit a9201960623287927bf5776de3f70fb2fbde7e02 ]
This fixes an analogus bug that was fixed in modern filesystems:
a) xfs in commit 4b8d867ca6e2 ("xfs: don't over-report free space or inodes in statvfs")
b) ext4 in commit f87d3af74193 ("ext4: don't over-report free space or inodes in statvfs")
where statfs can report misleading / incorrect information where project quota is enabled, and the free space is less than the remaining quota.
This commit will resolve a test failure in generic/762 which tests for this bug.
generic/762 - output mismatch (see /share/git/fstests/results//generic/762.out.bad)
# --- tests/generic/762.out 2025-04-15 10:21:53.371067071 +0800 # +++ /share/git/fstests/results//generic/762.out.bad 2025-05-13 16:13:37.000000000 +0800 # @@ -6,8 +6,10 @@ # root blocks2 is in range # dir blocks2 is in range # root bavail2 is in range # -dir bavail2 is in range # +dir bavail2 has value of 1539066 # +dir bavail2 is NOT in range 304734.87 .. 310891.13
# root blocks3 is in range
# ...
# (Run 'diff -u /share/git/fstests/tests/generic/762.out /share/git/fstests/results//generic/762.out.bad' to see the entire diff)
HINT: You _MAY_ be missing kernel fix:
XXXXXXXXXXXXXX xfs: don't over-report free space or inodes in statvfs
--- fs/f2fs/super.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-)
fs/f2fs/super.c +18 -12
@@ -1737,26 +1737,32 @@ static int f2fs_statfs_project(struct super_block *sb, limit =min_not_zero (dquot->dq_dqb.dqb_bsoftlimit, dquot->dq_dqb.dqb_bhardlimit); -if (limit) - limit >>= sb->s_blocksize_bits; + limit >>= sb->s_blocksize_bits; + +if (limit) { +uint64_t remaining =0 ; -if (limit && buf->f_blocks > limit) { curblock = (dquot->dq_dqb.dqb_curspace + dquot->dq_dqb.dqb_rsvspace) >> sb->s_blocksize_bits; - buf->f_blocks = limit; - buf->f_bfree = buf->f_bavail = - (buf->f_blocks > curblock) ? - (buf->f_blocks - curblock) :0 ; +if (limit > curblock) + remaining = limit - curblock; + + buf->f_blocks =min (buf->f_blocks, limit); + buf->f_bfree =min (buf->f_bfree, remaining); + buf->f_bavail =min (buf->f_bavail, remaining); } limit =min_not_zero (dquot->dq_dqb.dqb_isoftlimit, dquot->dq_dqb.dqb_ihardlimit); -if (limit && buf->f_files > limit) { - buf->f_files = limit; - buf->f_ffree = - (buf->f_files > dquot->dq_dqb.dqb_curinodes) ? - (buf->f_files - dquot->dq_dqb.dqb_curinodes) :0 ; +if (limit) { +uint64_t remaining =0 ; + +if (limit > dquot->dq_dqb.dqb_curinodes) + remaining = limit - dquot->dq_dqb.dqb_curinodes; + + buf->f_files =min (buf->f_files, limit); + buf->f_ffree =min (buf->f_ffree, remaining); }spin_unlock (&dquot->dq_dqb_lock);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 56/160 dummycon: Trigger redraw when switching consoles with deferred takeover
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Zimmermann <[email protected]>
[ Upstream commit 03bcbbb3995ba5df43af9aba45334e35f2dfe27b ]
Signal vt subsystem to redraw console when switching to dummycon with deferred takeover enabled. Makes the console switch to fbcon and displays the available output.
With deferred takeover enabled, dummycon acts as the placeholder until the first output to the console happens. At that point, fbcon takes over. If the output happens while dummycon is not active, it cannot inform fbcon. This is the case if the vt subsystem runs in graphics mode.
A typical graphical boot starts plymouth, a display manager and a compositor; all while leaving out dummycon. Switching to a text-mode console leaves the console with dummycon even if a getty terminal has been started.
Returning true from dummycon's con_switch helper signals the vt subsystem to redraw the screen. If there's output available dummycon's con_putc{s} helpers trigger deferred takeover of fbcon, which sets a display mode and displays the output. If no output is available, dummycon remains active.
v2:
- make the comment slightly more verbose (Javier)
--- drivers/video/console/dummycon.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
drivers/video/console/dummycon.c +13 -5
@@ -82,6 +82,15 @@ static int dummycon_blank(struct vc_data *vc, int blank, int mode_switch)/* Redraw, so that we get putc(s) for output done while blanked */ return 1 ; } + +static bool dummycon_switch (struct vc_data *vc) +{ +/* +* Redraw, so that we get putc(s) for output done while switched +* away. Informs deferred consoles to take over the display. +*/ +return true; +}#else static void dummycon_putc (struct vc_data *vc,int c,int ypos,int xpos) { } static void dummycon_putcs(struct vc_data *vc, const unsigned short *s,
@@ -90,6 +99,10 @@ static int dummycon_blank(struct vc_data *vc, int blank, int mode_switch) {return 0 ; } +static bool dummycon_switch (struct vc_data *vc) +{ +return false; +}#endif static const char *dummycon_startup (void )
@@ -119,11 +132,6 @@ static bool dummycon_scroll(struct vc_data *vc, unsigned int top,return false; } -static bool dummycon_switch (struct vc_data *vc) -{ -return false; -} -/* * The console `switch' structure for the dummy console *
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 57/160 platform/x86: ideapad-laptop: use usleep_range() for EC polling
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rong Zhang <[email protected]>
[ Upstream commit 5808c34216954cd832bd4b8bc52dfa287049122b ]
It was reported that ideapad-laptop sometimes causes some recent (since 2024) Lenovo ThinkBook models shut down when:
- suspending/resuming
- closing/opening the lid
- (dis)connecting a charger
- reading/writing some sysfs properties, e.g., fan_mode, touchpad
- pressing down some Fn keys, e.g., Brightness Up/Down (Fn+F5/F6)
- (seldom) loading the kmod
The issue has existed since the launch day of such models, and there have been some out-of-tree workarounds (see Link:) for the issue. One disables some functionalities, while another one simply shortens IDEAPAD_EC_TIMEOUT. The disabled functionalities have read_ec_data() in their call chains, which calls schedule() between each poll.
It turns out that these models suffer from the indeterminacy of schedule() because of their low tolerance for being polled too frequently. Sometimes schedule() returns too soon due to the lack of ready tasks, causing the margin between two polls to be too short. In this case, the command is somehow aborted, and too many subsequent polls (they poll for "nothing!") may eventually break the state machine in the EC, resulting in a hard shutdown. This explains why shortening IDEAPAD_EC_TIMEOUT works around the issue - it reduces the total number of polls sent to the EC.
Even when it doesn't lead to a shutdown, frequent polls may also disturb the ongoing operation and notably delay (+ 10-20ms) the availability of EC response. This phenomenon is unlikely to be exclusive to the models mentioned above, so dropping the schedule() manner should also slightly improve the responsiveness of various models.
Fix these issues by migrating to usleep_range(150, 300). The interval is chosen to add some margin to the minimal 50us and considering EC responses are usually available after 150-2500us based on my test. It should be enough to fix these issues on all models subject to the EC bug without introducing latency on other models.
Tested on ThinkBook 14 G7+ ASP and solved both issues. No regression was introduced in the test on a model without the EC bug (ThinkBook X IMH, thanks Eric).
--- drivers/platform/x86/ideapad-laptop.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
drivers/platform/x86/ideapad-laptop.c +17 -2
@@ -13,6 +13,7 @@#include <linux/bitops.h> #include <linux/bug.h> #include <linux/debugfs.h> +#include <linux/delay.h> #include <linux/device.h> #include <linux/dmi.h> #include <linux/fb.h>
@@ -158,6 +159,20 @@ MODULE_PARM_DESC(no_bt_rfkill, "No rfkill for bluetooth.");*/ #define IDEAPAD_EC_TIMEOUT 200/* in ms */ +/* +* Some models (e.g., ThinkBook since 2024) have a low tolerance for being +* polled too frequently. Doing so may break the state machine in the EC, +* resulting in a hard shutdown. +* +* It is also observed that frequent polls may disturb the ongoing operation +* and notably delay the availability of EC response. +* +* These values are used as the delay before the first poll and the interval +* between subsequent polls to solve the above issues. +*/ +#define IDEAPAD_EC_POLL_MIN_US 150 +#define IDEAPAD_EC_POLL_MAX_US 300 +static int eval_int (acpi_handle handle,const char *name,unsigned long *res) {unsigned long long result;
@@ -263,7 +278,7 @@ static int read_ec_data(acpi_handle handle, unsigned long cmd, unsigned long *da end_jiffies = jiffies +msecs_to_jiffies (IDEAPAD_EC_TIMEOUT ) +1 ;while (time_before (jiffies, end_jiffies)) { -schedule (); +usleep_range (IDEAPAD_EC_POLL_MIN_US ,IDEAPAD_EC_POLL_MAX_US ); err =eval_vpcr (handle,1 , &val);if (err)
@@ -294,7 +309,7 @@ static int write_ec_cmd(acpi_handle handle, unsigned long cmd, unsigned long dat end_jiffies = jiffies +msecs_to_jiffies (IDEAPAD_EC_TIMEOUT ) +1 ;while (time_before (jiffies, end_jiffies)) { -schedule (); +usleep_range (IDEAPAD_EC_POLL_MIN_US ,IDEAPAD_EC_POLL_MAX_US ); err =eval_vpcr (handle,1 , &val);if (err)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 58/160 i2c: tiny-usb: disable zero-length read messages
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wolfram Sang <[email protected]>
commit cbdb25ccf7566eee0c2b945e35cb98baf9ed0aa6 upstream.
This driver passes the length of an i2c_msg directly to usb_control_msg(). If the message is now a read and of length 0, it violates the USB protocol and a warning will be printed. Enable the I2C_AQ_NO_ZERO_LEN_READ quirk for this adapter thus forbidding 0-length read messages altogether.
--- drivers/i2c/busses/i2c-tiny-usb.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/i2c/busses/i2c-tiny-usb.c +6 -0
@@ -140,6 +140,11 @@ out:return ret; } +/* prevent invalid 0-length usb_control_msg */ +static const struct i2c_adapter_quirks usb_quirks = { + .flags =I2C_AQ_NO_ZERO_LEN_READ , +}; +/* This is the actual algorithm we define */ static const struct i2c_algorithm usb_algorithm = { .master_xfer = usb_xfer,
@@ -244,6 +249,7 @@ static int i2c_tiny_usb_probe(struct usb/* setup i2c adapter description */ dev->adapter.owner =THIS_MODULE ; dev->adapter.class =I2C_CLASS_HWMON ; + dev->adapter.quirks = &usb_quirks; dev->adapter.algo = &usb_algorithm; dev->adapter.algo_data = dev; snprintf(dev->adapter.name, sizeof(dev->adapter.name),
Greg Kroah-Hartman
maintainerPATCH 59/160 i2c: robotfuzz-osif: disable zero-length read messages
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wolfram Sang <[email protected]>
commit 56ad91c1aa9c18064348edf69308080b03c9dc48 upstream.
This driver passes the length of an i2c_msg directly to usb_control_msg(). If the message is now a read and of length 0, it violates the USB protocol and a warning will be printed. Enable the I2C_AQ_NO_ZERO_LEN_READ quirk for this adapter thus forbidding 0-length read messages altogether.
--- drivers/i2c/busses/i2c-robotfuzz-osif.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/i2c/busses/i2c-robotfuzz-osif.c +6 -0
@@ -111,6 +111,11 @@ static u32 osif_func(struct i2c_adapterreturn I2C_FUNC_I2C |I2C_FUNC_SMBUS_EMUL ; } +/* prevent invalid 0-length usb_control_msg */ +static const struct i2c_adapter_quirks osif_quirks = { + .flags =I2C_AQ_NO_ZERO_LEN_READ , +}; +static const struct i2c_algorithm osif_algorithm = { .master_xfer = osif_xfer, .functionality = osif_func,
@@ -143,6 +148,7 @@ static int osif_probe(struct usb_interfa priv->adapter.owner =THIS_MODULE ; priv->adapter.class =I2C_CLASS_HWMON ; + priv->adapter.quirks = &osif_quirks; priv->adapter.algo = &osif_algorithm; priv->adapter.algo_data = priv; snprintf(priv->adapter.name, sizeof(priv->adapter.name),
Greg Kroah-Hartman
maintainerPATCH 60/160 s390/pkey: Prevent overflow in size calculation for memdup_user()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fedor Pchelkin <[email protected]>
commit 7360ee47599af91a1d5f4e74d635d9408a54e489 upstream.
Number of apqn target list entries contained in 'nr_apqns' variable is determined by userspace via an ioctl call so the result of the product in calculation of size passed to memdup_user() may overflow.
In this case the actual size of the allocated area and the value describing it won't be in sync leading to various types of unpredictable behaviour later.
Use a proper memdup_array_user() helper which returns an error if an overflow is detected. Note that it is different from when nr_apqns is initially zero - that case is considered valid and should be handled in subsequent pkey_handler implementations.
Found by Linux Verification Center (linuxtesting.org).
--- drivers/s390/crypto/pkey_api.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/crypto/pkey_api.c +1 -1
@@ -1134,7 +1134,7 @@ static void *_copy_apqns_from_user(voidif (!uapqns || nr_apqns ==0 )return NULL ; -return memdup_user (uapqns, nr_apqns *sizeof (struct pkey_apqn )); +return memdup_array_user (uapqns, nr_apqns,sizeof (struct pkey_apqn )); } static long pkey_unlocked_ioctl(struct file *filp, unsigned int cmd,
Greg Kroah-Hartman
maintainerPATCH 61/160 atm: clip: prevent NULL deref in clip_push()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit b993ea46b3b601915ceaaf3c802adf11e7d6bac6 ]
Blamed commit missed that vcc_destroy_socket() calls clip_push() with a NULL skb.
If clip_devs is NULL, clip_push() then crashes when reading skb->truesize.
--- net/atm/clip.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
net/atm/clip.c +5 -6
@@ -193,12 +193,6 @@ static void clip_push(struct atm_vcc *vcc, struct sk_buff *skb)pr_debug ("\n" ); -if (!clip_devs) { -atm_return (vcc, skb->truesize); -kfree_skb (skb); -return ; - } -if (!skb) {pr_debug ("removing VCC %p\n" , clip_vcc);if (clip_vcc->entry)
@@ -208,6 +202,11 @@ static void clip_push(struct atm_vcc *vcc, struct sk_buff *skb)return ; }atm_return (vcc, skb->truesize); +if (!clip_devs) { +kfree_skb (skb); +return ; + } + skb->dev = clip_vcc->entry ? clip_vcc->entry->neigh->dev : clip_devs;/* clip_vcc->entry == NULL if we don't have an IP address yet */ if (!skb->dev) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 62/160 ALSA: usb-audio: Fix out-of-bounds read in snd_usb_get_audioformat_uac3()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Youngjun Lee <[email protected]>
[ Upstream commit fb4e2a6e8f28a3c0ad382e363aeb9cd822007b8a ]
In snd_usb_get_audioformat_uac3(), the length value returned from snd_usb_ctl_msg() is used directly for memory allocation without validation. This length is controlled by the USB device.
The allocated buffer is cast to a uac3_cluster_header_descriptor and its fields are accessed without verifying that the buffer is large enough. If the device returns a smaller than expected length, this leads to an out-of-bounds read.
Add a length check to ensure the buffer is large enough for uac3_cluster_header_descriptor.
--- sound/usb/stream.c | 2 ++ 1 file changed, 2 insertions(+)
sound/usb/stream.c +2 -0
@@ -982,6 +982,8 @@ snd_usb_get_audioformat_uac3(struct snd_usb_audio *chip,* and request Cluster Descriptor */ wLength =le16_to_cpu (hc_header.wLength); +if (wLength <sizeof (cluster)) +return NULL ; cluster =kzalloc (wLength,GFP_KERNEL );if (!cluster)return ERR_PTR (-ENOMEM );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 63/160 attach_recursive_mnt(): do not lock the covering tree when sliding something under it
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
[ Upstream commit ce7df19686530920f2f6b636e71ce5eb1d9303ef ]
If we are propagating across the userns boundary, we need to lock the mounts added there. However, in case when something has already been mounted there and we end up sliding a new tree under that, the stuff that had been there before should not get locked.
IOW, lock_mnt_tree() should be called before we reparent the preexisting tree on top of what we are adding.
--- fs/namespace.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
fs/namespace.c +4 -4
@@ -2205,14 +2205,14 @@ static int attach_recursive_mnt(struct mount *source_mnt,hlist_for_each_entry_safe (child, n, &tree_list, mnt_hash) {struct mount *q;hlist_del_init (&child->mnt_hash); - q =__lookup_mnt (&child->mnt_parent->mnt, - child->mnt_mountpoint); -if (q) -mnt_change_mountpoint (child, smp, q);/* Notice when we are propagating across user namespaces */ if (child->mnt_parent->mnt_ns->user_ns != user_ns)lock_mnt_tree (child); child->mnt.mnt_flags &= ~MNT_LOCKED ; + q =__lookup_mnt (&child->mnt_parent->mnt, + child->mnt_mountpoint); +if (q) +mnt_change_mountpoint (child, smp, q);commit_tree (child); }put_mountpoint (smp);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 64/160 libbpf: Fix null pointer dereference in btf_dump__free on allocation failure
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuan Chen <[email protected]>
[ Upstream commit aa485e8789d56a4573f7c8d000a182b749eaa64d ]
When btf_dump__new() fails to allocate memory for the internal hashmap (btf_dump->type_names), it returns an error code. However, the cleanup function btf_dump__free() does not check if btf_dump->type_names is NULL before attempting to free it. This leads to a null pointer dereference when btf_dump__free() is called on a btf_dump object.
--- tools/lib/bpf/btf_dump.c | 3 +++ 1 file changed, 3 insertions(+)
tools/lib/bpf/btf_dump.c +3 -0
@@ -220,6 +220,9 @@ static void btf_dump_free_names(struct hashmap *map)size_t bkt;struct hashmap_entry *cur; +if (!map) +return ; +hashmap__for_each_entry (map, cur, bkt)free ((void *)cur->key);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 65/160 wifi: mac80211: fix beacon interval calculation overflow
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lachlan Hodges <[email protected]>
[ Upstream commit 7a3750ff0f2e8fee338a9c168f429f6c37f0e820 ]
As we are converting from TU to usecs, a beacon interval of 100*1024 usecs will lead to integer wrapping. To fix change to use a u32.
--- net/mac80211/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/util.c +1 -1
@@ -4350,7 +4350,7 @@ void ieee80211_recalc_dtim(struct ieee80211_local *local, {u64 tsf =drv_get_tsf (local, sdata);u64 dtim_count =0 ; -u16 beacon_int = sdata->vif.bss_conf.beacon_int *1024 ; +u32 beacon_int = sdata->vif.bss_conf.beacon_int *1024 ;u8 dtim_period = sdata->vif.bss_conf.dtim_period;struct ps_data *ps;u8 bcns_from_dtim;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 39/160 fbcon: Use delayed work for cursor
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Vetter <[email protected]>
[ Upstream commit 3b0fb6ab25dda03f6077bf8fce9407bb0d4db6ea ]
Allows us to delete a bunch of hand-rolled stuff using a timer plus a separate work). Also to simplify the code we initialize the cursor_work completely when we allocate the fbcon_ops structure, instead of trying to cope with console re-initialization.
The motiviation here is that fbcon code stops using the fb_info.queue, which helps with locking issues around cleanup and all that in a later patch.
Also note that this allows us to ditch the hand-rolled work cleanup in fbcon_exit - we already call fbcon_del_cursor_timer, which takes care of everything. Plus this was racy anyway.
v2:
- Only INIT_DELAYED_WORK when kzalloc succeeded (Tetsuo)
- Explain that we replace both the timer and a work with the combined delayed_work (Javier)
Stable-dep-of: 17186f1f90d3 ("fbdev: Fix do_register_framebuffer to prevent null-ptr-deref in fb_videomode_to_var")
--- drivers/video/fbdev/core/fbcon.c | 85 +++++++++++++------------------- drivers/video/fbdev/core/fbcon.h | 4 +- 2 files changed, 35 insertions(+), 54 deletions(-)
drivers/video/fbdev/core/fbcon.c +33 -52
@@ -357,8 +357,8 @@ static int get_color(struct vc_data *vc, struct fb_info *info,static void fb_flashcursor (struct work_struct *work) { - struct fb_info *info = container_of(work, struct fb_info, queue); -struct fbcon_ops *ops = info->fbcon_par; + struct fbcon_ops *ops = container_of(work, struct fbcon_ops, cursor_work.work); +struct fb_info *info;struct vc_data *vc =NULL ;int c;int mode;
@@ -371,7 +371,10 @@ static void fb_flashcursor(struct work_struct *work)if (ret ==0 )return ; -if (ops && ops->currcon !=-1 ) +/* protected by console_lock */ + info = ops->info; + +if (ops->currcon !=-1 ) vc = vc_cons[ops->currcon].d; if (!vc || !con_is_visible(vc) ||
@@ -387,42 +390,25 @@ static void fb_flashcursor(struct work_struct *work) ops->cursor (vc, info, mode,get_color (vc, info, c,1 ),get_color (vc, info, c,0 ));console_unlock (); -} -static void cursor_timer_handler (struct timer_list *t) -{ -struct fbcon_ops *ops =from_timer (ops, t, cursor_timer); -struct fb_info *info = ops->info; - -queue_work (system_power_efficient_wq, &info->queue); -mod_timer (&ops->cursor_timer, jiffies + ops->cur_blink_jiffies); +queue_delayed_work (system_power_efficient_wq, &ops->cursor_work, + ops->cur_blink_jiffies); } -static void fbcon_add_cursor_timer (struct fb_info *info) +static void fbcon_add_cursor_work (struct fb_info *info) {struct fbcon_ops *ops = info->fbcon_par; -if ((!info->queue.func || info->queue.func == fb_flashcursor) && - !(ops->flags &FBCON_FLAGS_CURSOR_TIMER ) && - !fbcon_cursor_noblink) { -if (!info->queue.func) -INIT_WORK (&info->queue, fb_flashcursor); - -timer_setup (&ops->cursor_timer, cursor_timer_handler,0 ); -mod_timer (&ops->cursor_timer, jiffies + ops->cur_blink_jiffies); - ops->flags |=FBCON_FLAGS_CURSOR_TIMER ; - } +if (!fbcon_cursor_noblink) +queue_delayed_work (system_power_efficient_wq, &ops->cursor_work, + ops->cur_blink_jiffies); } -static void fbcon_del_cursor_timer (struct fb_info *info) +static void fbcon_del_cursor_work (struct fb_info *info) {struct fbcon_ops *ops = info->fbcon_par; -if (info->queue.func == fb_flashcursor && - ops->flags &FBCON_FLAGS_CURSOR_TIMER ) { -del_timer_sync (&ops->cursor_timer); - ops->flags &= ~FBCON_FLAGS_CURSOR_TIMER ; - } +cancel_delayed_work_sync (&ops->cursor_work); }#ifndef MODULE
@@ -726,6 +712,8 @@ static int con2fb_acquire_newinfo(struct vc_data *vc, struct fb_info *info, }if (!err) { +INIT_DELAYED_WORK (&ops->cursor_work, fb_flashcursor); + ops->cur_blink_jiffies =HZ /5 ; ops->info = info; info->fbcon_par = ops;
@@ -760,7 +748,7 @@ static int con2fb_release_oldinfo(struct vc_data *vc, struct fb_info *oldinfo, }if (!err) { -fbcon_del_cursor_timer (oldinfo); +fbcon_del_cursor_work (oldinfo);kfree (ops->cursor_state.mask);kfree (ops->cursor_data);kfree (ops->cursor_src);
@@ -876,7 +864,7 @@ static int set_con2fb_map(int unit, int newidx, int user) logo_shown != FBCON_LOGO_DONTSHOW);if (!found) -fbcon_add_cursor_timer (info); +fbcon_add_cursor_work (info); con2fb_map_boot[unit] = newidx;con2fb_init_display (vc, info, unit, show_logo); }
@@ -973,6 +961,8 @@ static const char *fbcon_startup(void)return NULL ; } +INIT_DELAYED_WORK (&ops->cursor_work, fb_flashcursor); + ops->currcon =-1 ; ops->graphics =1 ; ops->cur_rotate =-1 ;
@@ -1013,7 +1003,7 @@ static const char *fbcon_startup(void) info->var.yres, info->var.bits_per_pixel); -fbcon_add_cursor_timer (info); +fbcon_add_cursor_work (info);return display_desc; }
@@ -1199,7 +1189,7 @@ static void fbcon_deinit(struct vc_data *vc) goto finished;if (con_is_visible (vc)) -fbcon_del_cursor_timer (info); +fbcon_del_cursor_work (info); ops->flags &= ~FBCON_FLAGS_INIT ; finished:
@@ -1326,9 +1316,9 @@ static void fbcon_cursor(struct vc_data *vc, int mode)return ;if (vc->vc_cursor_type &CUR_SW ) -fbcon_del_cursor_timer (info); +fbcon_del_cursor_work (info);else -fbcon_add_cursor_timer (info); +fbcon_add_cursor_work (info); ops->cursor_flash = (mode ==CM_ERASE ) ?0 :1 ;
@@ -2134,14 +2124,14 @@ static int fbcon_switch(struct vc_data *vc) }if (old_info != info) -fbcon_del_cursor_timer (old_info); +fbcon_del_cursor_work (old_info); }if (fbcon_is_inactive (vc, info) || ops->blank_state !=FB_BLANK_UNBLANK ) -fbcon_del_cursor_timer (info); +fbcon_del_cursor_work (info);else -fbcon_add_cursor_timer (info); +fbcon_add_cursor_work (info);set_blitting_type (vc, info); ops->cursor_reset =1 ;
@@ -2249,9 +2239,9 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)if (mode_switch ||fbcon_is_inactive (vc, info) || ops->blank_state !=FB_BLANK_UNBLANK ) -fbcon_del_cursor_timer (info); +fbcon_del_cursor_work (info);else -fbcon_add_cursor_timer (info); +fbcon_add_cursor_work (info);return 0 ; }
@@ -3241,7 +3231,7 @@ static ssize_t show_cursor_blink(struct device *device,if (!ops) goto err; - blink = (ops->flags &FBCON_FLAGS_CURSOR_TIMER ) ?1 :0 ; + blink =delayed_work_pending (&ops->cursor_work); err:console_unlock ();return snprintf (buf,PAGE_SIZE ,"%d\n" , blink);
@@ -3270,10 +3260,10 @@ static ssize_t store_cursor_blink(struct device *device,if (blink) { fbcon_cursor_noblink =0 ; -fbcon_add_cursor_timer (info); +fbcon_add_cursor_work (info); }else { fbcon_cursor_noblink =1 ; -fbcon_del_cursor_timer (info); +fbcon_del_cursor_work (info); } err:
@@ -3386,15 +3376,9 @@ static void fbcon_exit(void)#endif for_each_registered_fb (i) { -int pending =0 ; - mapped =0 ; info = registered_fb[i]; -if (info->queue.func) - pending =cancel_work_sync (&info->queue); -pr_debug ("fbcon: %s pending work\n" , (pending ?"canceled" :"no" )); -for (j = first_fb_vc; j <= last_fb_vc; j++) {if (con2fb_map[j] == i) { mapped =1 ;
@@ -3410,15 +3394,12 @@ static void fbcon_exit(void)if (info->fbcon_par) {struct fbcon_ops *ops = info->fbcon_par; -fbcon_del_cursor_timer (info); +fbcon_del_cursor_work (info);kfree (ops->cursor_src);kfree (ops->cursor_state.mask);kfree (info->fbcon_par); info->fbcon_par =NULL ; } - -if (info->queue.func == fb_flashcursor) - info->queue.func =NULL ; } } }
drivers/video/fbdev/core/fbcon.h +2 -2
@@ -14,11 +14,11 @@#include <linux/types.h> #include <linux/vt_buffer.h> #include <linux/vt_kern.h> +#include <linux/workqueue.h> #include <asm/io.h> #define FBCON_FLAGS_INIT 1 -#define FBCON_FLAGS_CURSOR_TIMER 2/* * This is the interface between the low-level console driver and the
@@ -68,7 +68,7 @@ struct fbcon_ops {int (*update_start)(struct fb_info *info);int (*rotate_font)(struct fb_info *info,struct vc_data *vc);struct fb_var_screeninfo var;/* copy of the current fb_var_screeninfo */ -struct timer_list cursor_timer;/* Cursor timer */ +struct delayed_work cursor_work;/* Cursor timer */ struct fb_cursor cursor_state;struct fbcon_display *p;struct fb_info *info;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 66/160 af_unix: Dont set -ECONNRESET for consumed OOB skb.
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 2a5a4841846b079b5fca5752fe94e59346fbda40 ]
Christian Brauner reported that even after MSG_OOB data is consumed, calling close() on the receiver socket causes the peer's recv() to return -ECONNRESET:
1. send() and recv() an OOB data.
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
from socket import *
s1, s2 =socketpair(AF_UNIX, SOCK_STREAM)s1.send(b'x', MSG_OOB)
1
>>> s2.recv(1, MSG_OOB)
b'x' 2. close() for s2 sets ECONNRESET to s1->sk_err even though
s2 consumed the OOB data
>>> s2.close()
>>> s1.recv(10, MSG_DONTWAIT)
...
ConnectionResetError: [Errno 104] Connection reset by peerEven after being consumed, the skb holding the OOB 1-byte data stays in the recv queue to mark the OOB boundary and break recv() at that point.
This must be considered while close()ing a socket.
Let's skip the leading consumed OOB skb while checking the -ECONNRESET condition in unix_release_sock().
--- net/unix/af_unix.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
net/unix/af_unix.c +12 -6
@@ -516,6 +516,11 @@ static void unix_sock_destructor(struct sock *sk)#endif } +static unsigned int unix_skb_len (const struct sk_buff *skb) +{ +return skb->len -UNIXCB (skb).consumed; +} +static void unix_release_sock (struct sock *sk,int embrion) {struct unix_sock *u =unix_sk (sk);
@@ -552,10 +557,16 @@ static void unix_release_sock(struct sock *sk, int embrion)if (skpair !=NULL ) {if (sk->sk_type ==SOCK_STREAM || sk->sk_type ==SOCK_SEQPACKET ) { +struct sk_buff *skb =skb_peek (&sk->sk_receive_queue); + +#if IS_ENABLED (CONFIG_AF_UNIX_OOB ) +if (skb && !unix_skb_len (skb)) + skb =skb_peek_next (skb, &sk->sk_receive_queue); +#endif unix_state_lock (skpair);/* No more writes */ WRITE_ONCE (skpair->sk_shutdown,SHUTDOWN_MASK ); -if (!skb_queue_empty_lockless (&sk->sk_receive_queue) || embrion) +if (skb || embrion)WRITE_ONCE (skpair->sk_err,ECONNRESET );unix_state_unlock (skpair); skpair->sk_state_change (skpair);
@@ -2479,11 +2490,6 @@ static long unix_stream_data_wait(struct sock *sk, long timeo,return timeo; } -static unsigned int unix_skb_len (const struct sk_buff *skb) -{ -return skb->len -UNIXCB (skb).consumed; -} -struct unix_stream_read_state {int (*recv_actor)(struct sk_buff *,int ,int ,struct unix_stream_read_state *);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 67/160 vsock/uapi: fix linux/vm_sockets.h userspace compilation errors
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefano Garzarella <[email protected]>
[ Upstream commit 22bbc1dcd0d6785fb390c41f0dd5b5e218d23bdd ]
If a userspace application just include <linux/vm_sockets.h> will fail to build with the following errors:
/usr/include/linux/vm_sockets.h:182:39: error: invalid application of ‘sizeof’ to incomplete type ‘struct sockaddr’
182 | unsigned char svm_zero[sizeof(struct sockaddr) -
| ^~~~~~
/usr/include/linux/vm_sockets.h:183:39: error: ‘sa_family_t’ undeclared here (not in a function)
183 | sizeof(sa_family_t) -
|
Include <sys/socket.h> for userspace (guarded by ifndef __KERNEL__) where struct sockaddr and sa_family_t are defined.
We already do something similar in <linux/mptcp.h> and <linux/if.h>.
--- include/uapi/linux/vm_sockets.h | 4 ++++ 1 file changed, 4 insertions(+)
include/uapi/linux/vm_sockets.h +4 -0
@@ -17,6 +17,10 @@#ifndef _UAPI_VM_SOCKETS_H#define _UAPI_VM_SOCKETS_H +#ifndef __KERNEL__ +#include <sys/socket.h> /* for struct sockaddr and sa_family_t */ +#endif +#include <linux/socket.h> #include <linux/types.h>
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 40/160 fbcon: Extract fbcon_open/release helpers
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Vetter <[email protected]>
[ Upstream commit bd6026a8c4e6b7edf4bafcb71da885b284b8f4fd ]
There's two minor behaviour changes in here:
- in error paths we now consistently call fb_ops->fb_release
- fb_release really can't fail (fbmem.c ignores it too) and there's no reasonable cleanup we can do anyway.
Note that everything in fbcon.c is protected by the big console_lock() lock (especially all the global variables), so the minor changes in ordering of setup/cleanup do not matter.
v2: Explain a bit better why this is all correct (Sam)
Stable-dep-of: 17186f1f90d3 ("fbdev: Fix do_register_framebuffer to prevent null-ptr-deref in fb_videomode_to_var")
--- drivers/video/fbdev/core/fbcon.c | 107 +++++++++++++++---------------- 1 file changed, 53 insertions(+), 54 deletions(-)
drivers/video/fbdev/core/fbcon.c +53 -54
@@ -691,19 +691,37 @@ static int fbcon_invalid_charcount(struct fb_info *info, unsigned charcount)#endif /* CONFIG_MISC_TILEBLITTING */ +static int fbcon_open (struct fb_info *info) +{ +if (!try_module_get (info->fbops->owner)) +return -ENODEV ; + +if (info->fbops->fb_open && + info->fbops->fb_open (info,0 )) { +module_put (info->fbops->owner); +return -ENODEV ; + } + +return 0 ; +} + +static void fbcon_release (struct fb_info *info) +{ +if (info->fbops->fb_release) + info->fbops->fb_release (info,0 ); + +module_put (info->fbops->owner); +}static int con2fb_acquire_newinfo (struct vc_data *vc,struct fb_info *info,int unit,int oldidx) {struct fbcon_ops *ops =NULL ; -int err =0 ; - -if (!try_module_get (info->fbops->owner)) - err = -ENODEV ; +int err; -if (!err && info->fbops->fb_open && - info->fbops->fb_open (info,0 )) - err = -ENODEV ; + err =fbcon_open (info); +if (err) +return err;if (!err) { ops =kzalloc (sizeof (struct fbcon_ops ),GFP_KERNEL );
@@ -724,7 +742,7 @@ static int con2fb_acquire_newinfo(struct vc_data *vc, struct fb_info *info,if (err) { con2fb_map[unit] = oldidx; -module_put (info->fbops->owner); +fbcon_release (info); }return err;
@@ -735,45 +753,34 @@ static int con2fb_release_oldinfo(struct vc_data *vc, struct fb_info *oldinfo, int oldidx, int found) {struct fbcon_ops *ops = oldinfo->fbcon_par; -int err =0 , ret; +int ret; -if (oldinfo->fbops->fb_release && - oldinfo->fbops->fb_release (oldinfo,0 )) { - con2fb_map[unit] = oldidx; -if (!found && newinfo->fbops->fb_release) - newinfo->fbops->fb_release (newinfo,0 ); -if (!found) -module_put (newinfo->fbops->owner); - err = -ENODEV ; - } +fbcon_release (oldinfo); -if (!err) { -fbcon_del_cursor_work (oldinfo); -kfree (ops->cursor_state.mask); -kfree (ops->cursor_data); -kfree (ops->cursor_src); -kfree (ops->fontbuffer); -kfree (oldinfo->fbcon_par); - oldinfo->fbcon_par =NULL ; -module_put (oldinfo->fbops->owner); -/* -If oldinfo and newinfo are driving the same hardware, -the fb_release() method of oldinfo may attempt to -restore the hardware state. This will leave the -newinfo in an undefined state. Thus, a call to -fb_set_par() may be needed for the newinfo. -*/ -if (newinfo && newinfo->fbops->fb_set_par) { - ret = newinfo->fbops->fb_set_par (newinfo); +fbcon_del_cursor_work (oldinfo); +kfree (ops->cursor_state.mask); +kfree (ops->cursor_data); +kfree (ops->cursor_src); +kfree (ops->fontbuffer); +kfree (oldinfo->fbcon_par); + oldinfo->fbcon_par =NULL ; +/* +If oldinfo and newinfo are driving the same hardware, +the fb_release() method of oldinfo may attempt to +restore the hardware state. This will leave the +newinfo in an undefined state. Thus, a call to +fb_set_par() may be needed for the newinfo. +*/ +if (newinfo && newinfo->fbops->fb_set_par) { + ret = newinfo->fbops->fb_set_par (newinfo); -if (ret) -printk (KERN_ERR "con2fb_release_oldinfo: " -"detected unhandled fb_set_par error, " -"error code %d\n" , ret); - } +if (ret) +printk (KERN_ERR "con2fb_release_oldinfo: " +"detected unhandled fb_set_par error, " +"error code %d\n" , ret); } -return err; +return 0 ; } static void con2fb_init_display(struct vc_data *vc, struct fb_info *info,
@@ -928,7 +935,6 @@ static const char *fbcon_startup(void)struct fbcon_display *p = &fb_display[fg_console];struct vc_data *vc = vc_cons[fg_console].d;const struct font_desc *font =NULL ; -struct module *owner;struct fb_info *info =NULL ;struct fbcon_ops *ops;int rows, cols;
@@ -947,17 +953,12 @@ static const char *fbcon_startup(void)if (!info)return NULL ; - owner = info->fbops->owner; -if (!try_module_get (owner)) +if (fbcon_open (info))return NULL ; -if (info->fbops->fb_open && info->fbops->fb_open (info,0 )) { -module_put (owner); -return NULL ; - } ops =kzalloc (sizeof (struct fbcon_ops ),GFP_KERNEL );if (!ops) { -module_put (owner); +fbcon_release (info);return NULL ; }
@@ -3387,10 +3388,6 @@ static void fbcon_exit(void) }if (mapped) { -if (info->fbops->fb_release) - info->fbops->fb_release (info,0 ); -module_put (info->fbops->owner); -if (info->fbcon_par) {struct fbcon_ops *ops = info->fbcon_par;
@@ -3400,6 +3397,8 @@ static void fbcon_exit(void)kfree (info->fbcon_par); info->fbcon_par =NULL ; } + +fbcon_release (info); } } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 41/160 fbcon: move more common code into fb_open()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Vetter <[email protected]>
[ Upstream commit d443d93864726ad68c0a741d1e7b03934a9af143 ]
No idea why con2fb_acquire_newinfo() initializes much less than fbcon_startup(), but so be it. From a quick look most of the un-initialized stuff should be fairly harmless, but who knows.
Note that the error handling for the con2fb_acquire_newinfo() failure case was very strange: Callers updated con2fb_map to the new value before calling this function, but upon error con2fb_acquire_newinfo reset it to the old value. Since I removed the call to fbcon_release anyway that strange error path was sticking out like a sore thumb, hence I removed it. Which also allows us to remove the oldidx parameter from that function.
v2: Explain what's going on with oldidx and error paths (Sam)
v3: Drop unused variable (0day)
v4: Rebased over bisect fix in previous patch, unchagend end result.
Stable-dep-of: 17186f1f90d3 ("fbdev: Fix do_register_framebuffer to prevent null-ptr-deref in fb_videomode_to_var")
--- drivers/video/fbdev/core/fbcon.c | 75 +++++++++++++------------------- 1 file changed, 30 insertions(+), 45 deletions(-)
drivers/video/fbdev/core/fbcon.c +30 -45
@@ -691,8 +691,18 @@ static int fbcon_invalid_charcount(struct fb_info *info, unsigned charcount)#endif /* CONFIG_MISC_TILEBLITTING */ +static void fbcon_release (struct fb_info *info) +{ +if (info->fbops->fb_release) + info->fbops->fb_release (info,0 ); + +module_put (info->fbops->owner); +} +static int fbcon_open (struct fb_info *info) { +struct fbcon_ops *ops; +if (!try_module_get (info->fbops->owner))return -ENODEV ;
@@ -702,48 +712,31 @@ static int fbcon_open(struct fb_info *info)return -ENODEV ; } -return 0 ; -} + ops =kzalloc (sizeof (struct fbcon_ops ),GFP_KERNEL ); +if (!ops) { +fbcon_release (info); +return -ENOMEM ; + } -static void fbcon_release (struct fb_info *info) -{ -if (info->fbops->fb_release) - info->fbops->fb_release (info,0 ); +INIT_DELAYED_WORK (&ops->cursor_work, fb_flashcursor); + ops->info = info; + info->fbcon_par = ops; + ops->cur_blink_jiffies =HZ /5 ; -module_put (info->fbops->owner); +return 0 ; }static int con2fb_acquire_newinfo (struct vc_data *vc,struct fb_info *info, -int unit,int oldidx) +int unit) { -struct fbcon_ops *ops =NULL ;int err; err =fbcon_open (info);if (err)return err; -if (!err) { - ops =kzalloc (sizeof (struct fbcon_ops ),GFP_KERNEL ); -if (!ops) - err = -ENOMEM ; - } - -if (!err) { -INIT_DELAYED_WORK (&ops->cursor_work, fb_flashcursor); - - ops->cur_blink_jiffies =HZ /5 ; - ops->info = info; - info->fbcon_par = ops; - -if (vc) -set_blitting_type (vc, info); - } - -if (err) { - con2fb_map[unit] = oldidx; -fbcon_release (info); - } +if (vc) +set_blitting_type (vc, info);return err; }
@@ -854,9 +847,11 @@ static int set_con2fb_map(int unit, int newidx, int user) found =search_fb_in_map (newidx); - con2fb_map[unit] = newidx; -if (!err && !found) - err =con2fb_acquire_newinfo (vc, info, unit, oldidx); +if (!err && !found) { + err =con2fb_acquire_newinfo (vc, info, unit); +if (!err) + con2fb_map[unit] = newidx; + }/* * If old fb is not mapped to any of the consoles,
@@ -956,20 +951,10 @@ static const char *fbcon_startup(void)if (fbcon_open (info))return NULL ; - ops =kzalloc (sizeof (struct fbcon_ops ),GFP_KERNEL ); -if (!ops) { -fbcon_release (info); -return NULL ; - } - -INIT_DELAYED_WORK (&ops->cursor_work, fb_flashcursor); - + ops = info->fbcon_par; ops->currcon =-1 ; ops->graphics =1 ; ops->cur_rotate =-1 ; - ops->cur_blink_jiffies =HZ /5 ; - ops->info = info; - info->fbcon_par = ops; p->con_rotate = initial_rotation;if (p->con_rotate ==-1 )
@@ -1037,7 +1022,7 @@ static void fbcon_init(struct vc_data *vc, int init)return ;if (!info->fbcon_par) -con2fb_acquire_newinfo (vc, info, vc->vc_num,-1 ); +con2fb_acquire_newinfo (vc, info, vc->vc_num);/* If we are not the first console on this fb, copy the font from that console */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 42/160 fbcon: use lock_fb_info in fbcon_open/release
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Vetter <[email protected]>
[ Upstream commit 04933a294dacca3aaa480889d53e6195778d4578 ]
Now we get to the real motiviation, because fbmem.c insists that that's the right lock for these.
Ofc fbcon.c has a lot more places where it probably should call lock_fb_info(). But looking at fbmem.c at least most of these seem to be protected by console_lock() too, which is probably what papers over any issues.
Note that this means we're shuffling around a bit the locking sections for some of the console takeover and unbind paths, but not all:
- console binding/unbinding from the console layer never with lock_fb_info
- unbind (as opposed to unlink) never bother with lock_fb_info
Also the real serialization against set_par and set_pan are still doing by wrapping the entire ioctl code in console_lock(). So this shuffling shouldn't be worse than what we had from a "can you trigger races?" pov, but it's at least clearer.
Stable-dep-of: 17186f1f90d3 ("fbdev: Fix do_register_framebuffer to prevent null-ptr-deref in fb_videomode_to_var")
--- drivers/video/fbdev/core/fbcon.c | 5 +++++ drivers/video/fbdev/core/fbmem.c | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-)
drivers/video/fbdev/core/fbcon.c +5 -0
@@ -693,8 +693,10 @@ static int fbcon_invalid_charcount(struct fb_info *info, unsigned charcount)static void fbcon_release (struct fb_info *info) { +lock_fb_info (info);if (info->fbops->fb_release) info->fbops->fb_release (info,0 ); +unlock_fb_info (info);module_put (info->fbops->owner); }
@@ -706,11 +708,14 @@ static int fbcon_open(struct fb_info *info)if (!try_module_get (info->fbops->owner))return -ENODEV ; +lock_fb_info (info);if (info->fbops->fb_open && info->fbops->fb_open (info,0 )) { +unlock_fb_info (info);module_put (info->fbops->owner);return -ENODEV ; } +unlock_fb_info (info); ops =kzalloc (sizeof (struct fbcon_ops ),GFP_KERNEL );if (!ops) {
drivers/video/fbdev/core/fbmem.c +0 -4
@@ -1700,9 +1700,7 @@ static int do_register_framebuffer(struct fb_info *fb_info)console_lock (); else atomic_inc(&ignore_console_lock_warning); -lock_fb_info (fb_info); ret =fbcon_fb_registered (fb_info); -unlock_fb_info (fb_info);if (!lockless_register_fb)console_unlock ();
@@ -1719,9 +1717,7 @@ static void unbind_console(struct fb_info *fb_info)return ;console_lock (); -lock_fb_info (fb_info);fbcon_fb_unbind (fb_info); -unlock_fb_info (fb_info);console_unlock (); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 43/160 fbcon: Move console_lock for register/unlink/unregister
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Vetter <[email protected]>
[ Upstream commit 6e7da3af008b72520f5318507f455f344b27f022 ]
Ideally console_lock becomes an implementation detail of fbcon.c and doesn't show up anywhere in fbmem.c. We're still pretty far from that, but at least the register/unregister code is there now.
With this the do_fb_ioctl() handler is the only code in fbmem.c still calling console_lock().
Stable-dep-of: 17186f1f90d3 ("fbdev: Fix do_register_framebuffer to prevent null-ptr-deref in fb_videomode_to_var")
--- drivers/video/fbdev/core/fbcon.c | 33 ++++++++++++++++++++++++++------ drivers/video/fbdev/core/fbmem.c | 23 ++-------------------- 2 files changed, 29 insertions(+), 27 deletions(-)
drivers/video/fbdev/core/fbcon.c +27 -6
@@ -2823,10 +2823,12 @@ void fbcon_fb_unbind(struct fb_info *info)int i, new_idx =-1 , ret =0 ;int idx = info->node; -WARN_CONSOLE_UNLOCKED (); +console_lock (); -if (!fbcon_has_console_bind) +if (!fbcon_has_console_bind) { +console_unlock ();return ; + }for (i = first_fb_vc; i <= last_fb_vc; i++) { if (con2fb_map[i] != idx &&
@@ -2866,6 +2868,8 @@ void fbcon_fb_unbind(struct fb_info *info) }fbcon_unbind (); } + +console_unlock (); }/* called with console_lock held */
@@ -2873,10 +2877,12 @@ void fbcon_fb_unregistered(struct fb_info *info) {int i, idx; -WARN_CONSOLE_UNLOCKED (); +console_lock (); -if (deferred_takeover) +if (deferred_takeover) { +console_unlock ();return ; + } idx = info->node;for (i = first_fb_vc; i <= last_fb_vc; i++) {
@@ -2905,6 +2911,7 @@ void fbcon_fb_unregistered(struct fb_info *info)if (!num_registered_fb)do_unregister_con_driver (&fb_con); +console_unlock (); }void fbcon_remap_all (struct fb_info *info)
@@ -2962,19 +2969,27 @@ static inline void fbcon_select_primary(struct fb_info *info) }#endif /* CONFIG_FRAMEBUFFER_DETECT_PRIMARY */ +static bool lockless_register_fb; +module_param_named_unsafe (lockless_register_fb, lockless_register_fb, bool,0400 ); +MODULE_PARM_DESC (lockless_register_fb, +"Lockless framebuffer registration for debugging [default=off]" ); +/* called with console_lock held */ int fbcon_fb_registered (struct fb_info *info) {int ret =0 , i, idx; -WARN_CONSOLE_UNLOCKED (); +if (!lockless_register_fb) +console_lock (); +else +atomic_inc (&ignore_console_lock_warning); idx = info->node;fbcon_select_primary (info);if (deferred_takeover) {pr_info ("fbcon: Deferring console take-over\n" ); -return 0 ; + goto out; }if (info_idx ==-1 ) {
@@ -2994,6 +3009,12 @@ int fbcon_fb_registered(struct fb_info *info) } } +out: +if (!lockless_register_fb) +console_unlock (); +else +atomic_dec (&ignore_console_lock_warning); +return ret; }
drivers/video/fbdev/core/fbmem.c +2 -21
@@ -1620,14 +1620,9 @@ static void do_remove_conflicting_framebuffers(struct apertures_struct *a, } } -static bool lockless_register_fb; -module_param_named_unsafe (lockless_register_fb, lockless_register_fb, bool,0400 ); -MODULE_PARM_DESC (lockless_register_fb, -"Lockless framebuffer registration for debugging [default=off]" ); -static int do_register_framebuffer (struct fb_info *fb_info) { -int i, ret; +int i;struct fb_videomode mode;if (fb_check_foreignness (fb_info))
@@ -1696,17 +1691,7 @@ static int do_register_framebuffer(struct fb_info *fb_info) }#endif -if (!lockless_register_fb) -console_lock (); -else -atomic_inc (&ignore_console_lock_warning); - ret =fbcon_fb_registered (fb_info); - -if (!lockless_register_fb) -console_unlock (); -else -atomic_dec (&ignore_console_lock_warning); -return ret; +return fbcon_fb_registered (fb_info); }static void unbind_console (struct fb_info *fb_info)
@@ -1716,9 +1701,7 @@ static void unbind_console(struct fb_info *fb_info)if (WARN_ON (i <0 || i >=FB_MAX || registered_fb[i] != fb_info))return ; -console_lock ();fbcon_fb_unbind (fb_info); -console_unlock (); }static void unlink_framebuffer (struct fb_info *fb_info)
@@ -1758,9 +1741,7 @@ static void do_unregister_framebuffer(struct fb_info *fb_info) fb_notifier_call_chain(FB_EVENT_FB_UNREGISTERED, &event); }#endif -console_lock ();fbcon_fb_unregistered (fb_info); -console_unlock ();/* this may free fb info */ put_fb_info (fb_info);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 44/160 fbdev: Fix do_register_framebuffer to prevent null-ptr-deref in fb_videomode_to_var
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Murad Masimov <[email protected]>
[ Upstream commit 17186f1f90d34fa701e4f14e6818305151637b9e ]
If fb_add_videomode() in do_register_framebuffer() fails to allocate memory for fb_videomode, it will later lead to a null-ptr dereference in fb_videomode_to_var(), as the fb_info is registered while not having the mode in modelist that is expected to be there, i.e. the one that is described in fb_info->var.
================================================================
general protection fault, probably for non-canonical address 0xdffffc0000000001: 0000 [#1] PREEMPT SMP KASAN NOPTI KASAN: null-ptr-deref in range [0x0000000000000008-0x000000000000000f] CPU: 1 PID: 30371 Comm: syz-executor.1 Not tainted 5.10.226-syzkaller #0 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.12.0-1 04/01/2014 RIP: 0010:fb_videomode_to_var+0x24/0x610 drivers/video/fbdev/core/modedb.c:901 Call Trace: display_to_var+0x3a/0x7c0 drivers/video/fbdev/core/fbcon.c:929 fbcon_resize+0x3e2/0x8f0 drivers/video/fbdev/core/fbcon.c:2071 resize_screen drivers/tty/vt/vt.c:1176 [inline] vc_do_resize+0x53a/0x1170 drivers/tty/vt/vt.c:1263 fbcon_modechanged+0x3ac/0x6e0 drivers/video/fbdev/core/fbcon.c:2720 fbcon_update_vcs+0x43/0x60 drivers/video/fbdev/core/fbcon.c:2776 do_fb_ioctl+0x6d2/0x740 drivers/video/fbdev/core/fbmem.c:1128 fb_ioctl+0xe7/0x150 drivers/video/fbdev/core/fbmem.c:1203 vfs_ioctl fs/ioctl.c:48 [inline] __do_sys_ioctl fs/ioctl.c:753 [inline] __se_sys_ioctl fs/ioctl.c:739 [inline] __x64_sys_ioctl+0x19a/0x210 fs/ioctl.c:739 do_syscall_64+0x33/0x40 arch/x86/entry/common.c:46 entry_SYSCALL_64_after_hwframe+0x67/0xd1 ================================================================
Even though fbcon_init() checks beforehand if fb_match_mode() in var_to_display() fails, it can not prevent the panic because fbcon_init() does not return error code. Considering this and the comment in the code about fb_match_mode() returning NULL - "This should not happen" - it is better to prevent registering the fb_info if its mode was not set successfully. Also move fb_add_videomode() closer to the beginning of do_register_framebuffer() to avoid having to do the cleanup on fail.
Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
--- drivers/video/fbdev/core/fbmem.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
drivers/video/fbdev/core/fbmem.c +11 -7
@@ -1622,7 +1622,7 @@ static void do_remove_conflicting_framebuffers(struct apertures_struct *a,static int do_register_framebuffer (struct fb_info *fb_info) { -int i; +int i, err =0 ;struct fb_videomode mode;if (fb_check_foreignness (fb_info))
@@ -1635,10 +1635,18 @@ static int do_register_framebuffer(struct fb_info *fb_info)if (num_registered_fb ==FB_MAX )return -ENXIO ; - num_registered_fb++;for (i =0 ; i <FB_MAX ; i++)if (!registered_fb[i])break ; + +if (!fb_info->modelist.prev || !fb_info->modelist.next) +INIT_LIST_HEAD (&fb_info->modelist); + +fb_var_to_videomode (&mode, &fb_info->var); + err =fb_add_videomode (&mode, &fb_info->modelist); +if (err <0 ) +return err; + fb_info->node = i;refcount_set (&fb_info->count,1 );mutex_init (&fb_info->lock);
@@ -1671,16 +1679,12 @@ static int do_register_framebuffer(struct fb_info *fb_info)if (!fb_info->pixmap.blit_y) fb_info->pixmap.blit_y = ~(u32 )0 ; -if (!fb_info->modelist.prev || !fb_info->modelist.next) -INIT_LIST_HEAD (&fb_info->modelist); -if (fb_info->skip_vt_switch)pm_vt_switch_required (fb_info->dev, false);else pm_vt_switch_required (fb_info->dev, true); -fb_var_to_videomode (&mode, &fb_info->var); -fb_add_videomode (&mode, &fb_info->modelist); + num_registered_fb++; registered_fb[i] = fb_info;#ifdef CONFIG_GUMSTIX_AM200EPD
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 45/160 Drivers: hv: Rename alloced to allocated
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vitaly Kuznetsov <[email protected]>
[ Upstream commit de96e8a09889b35dd8d1cb6d19ef2bb123b05be1 ]
'Alloced' is not a real word and only saves us two letters, let's use 'allocated' instead.
No functional change intended.
Stable-dep-of: 0315fef2aff9 ("uio_hv_generic: Align ring size to system page")
--- drivers/hv/channel_mgmt.c | 18 +++++++++--------- drivers/hv/hyperv_vmbus.h | 14 +++++++------- drivers/hv/vmbus_drv.c | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-)
drivers/hv/channel_mgmt.c +9 -9
@@ -459,7 +459,7 @@ void hv_process_channel_removal(struct vmbus_channel *channel)* init_vp_index() can (re-)use the CPU. */ if (hv_is_perf_channel (channel)) -hv_clear_alloced_cpu (channel->target_cpu); +hv_clear_allocated_cpu (channel->target_cpu);/* * Upon suspend, an in-use hv_sock channel is marked as "rescinded" and
@@ -733,7 +733,7 @@ static void init_vp_index(struct vmbus_channel *channel)bool perf_chn =hv_is_perf_channel (channel);u32 i, ncpu =num_online_cpus ();cpumask_var_t available_mask; -struct cpumask *alloced_mask; +struct cpumask *allocated_mask;u32 target_cpu;int numa_node;
@@ -750,7 +750,7 @@ static void init_vp_index(struct vmbus_channel *channel)*/ channel->target_cpu =VMBUS_CONNECT_CPU ;if (perf_chn) -hv_set_alloced_cpu (VMBUS_CONNECT_CPU ); +hv_set_allocated_cpu (VMBUS_CONNECT_CPU );return ; }
@@ -765,22 +765,22 @@ static void init_vp_index(struct vmbus_channel *channel)continue ;break ; } - alloced_mask = &hv_context.hv_numa_map[numa_node]; + allocated_mask = &hv_context.hv_numa_map[numa_node]; -if (cpumask_weight (alloced_mask) == +if (cpumask_weight (allocated_mask) ==cpumask_weight (cpumask_of_node (numa_node))) {/* * We have cycled through all the CPUs in the node; -* reset the alloced map. +* reset the allocated map. */ -cpumask_clear (alloced_mask); +cpumask_clear (allocated_mask); } -cpumask_xor (available_mask, alloced_mask, +cpumask_xor (available_mask, allocated_mask,cpumask_of_node (numa_node)); target_cpu =cpumask_first (available_mask); -cpumask_set_cpu (target_cpu, alloced_mask); +cpumask_set_cpu (target_cpu, allocated_mask);if (channel->offermsg.offer.sub_channel_index >= ncpu || i > ncpu || !hv_cpuself_used (target_cpu, channel))
drivers/hv/hyperv_vmbus.h +7 -7
@@ -405,7 +405,7 @@ static inline bool hv_is_perf_channel(struct vmbus_channel *channel)return vmbus_devs[channel->device_id].perf_device; } -static inline bool hv_is_alloced_cpu (unsigned int cpu) +static inline bool hv_is_allocated_cpu (unsigned int cpu) {struct vmbus_channel *channel, *sc;
@@ -427,23 +427,23 @@ static inline bool hv_is_alloced_cpu(unsigned int cpu)return false; } -static inline void hv_set_alloced_cpu (unsigned int cpu) +static inline void hv_set_allocated_cpu (unsigned int cpu) {cpumask_set_cpu (cpu, &hv_context.hv_numa_map[cpu_to_node (cpu)]); } -static inline void hv_clear_alloced_cpu (unsigned int cpu) +static inline void hv_clear_allocated_cpu (unsigned int cpu) { -if (hv_is_alloced_cpu (cpu)) +if (hv_is_allocated_cpu (cpu))return ;cpumask_clear_cpu (cpu, &hv_context.hv_numa_map[cpu_to_node (cpu)]); } -static inline void hv_update_alloced_cpus (unsigned int old_cpu, +static inline void hv_update_allocated_cpus (unsigned int old_cpu,unsigned int new_cpu) { -hv_set_alloced_cpu (new_cpu); -hv_clear_alloced_cpu (old_cpu); +hv_set_allocated_cpu (new_cpu); +hv_clear_allocated_cpu (old_cpu); }#ifdef CONFIG_HYPERV_TESTING
drivers/hv/vmbus_drv.c +1 -1
@@ -1878,7 +1878,7 @@ static ssize_t target_cpu_store(struct vmbus_channel *channel,/* See init_vp_index(). */ if (hv_is_perf_channel (channel)) -hv_update_alloced_cpus (origin_cpu, target_cpu); +hv_update_allocated_cpus (origin_cpu, target_cpu);/* Currently set only for storvsc channels. */ if (channel->change_target_cpu_callback) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 36/160 ASoC: codec: wcd9335: Convert to GPIO descriptors
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peng Fan <[email protected]>
[ Upstream commit d5099bc1b56417733f4cccf10c61ee74dadd5562 ]
of_gpio.h is deprecated, update the driver to use GPIO descriptors.
- Use dev_gpiod_get to get GPIO descriptor.
- Use gpiod_set_value to configure output value.
With legacy of_gpio API, the driver set gpio value 0 to assert reset, and 1 to deassert reset. And the reset-gpios use GPIO_ACTIVE_LOW flag in DTS, so set GPIOD_OUT_LOW when get GPIO descriptors, and set value 1 means output low, set value 0 means output high with gpiod API.
The in-tree DTS files have the right polarity set up already so we can expect this to "just work"
Stable-dep-of: 9079db287fc3 ("ASoC: codecs: wcd9335: Fix missing free of regulator supplies")
--- sound/soc/codecs/wcd9335.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
sound/soc/codecs/wcd9335.c +7 -8
@@ -16,7 +16,7 @@#include <sound/soc.h> #include <sound/pcm_params.h> #include <sound/soc-dapm.h> -#include <linux/of_gpio.h> +#include <linux/gpio/consumer.h> #include <linux/of.h> #include <linux/of_irq.h> #include <sound/tlv.h>
@@ -338,7 +338,7 @@ struct wcd9335_codec {int comp_enabled[COMPANDER_MAX ];int intr1; -int reset_gpio; +struct gpio_desc *reset_gpio;struct regulator_bulk_data supplies[WCD9335_MAX_SUPPLY ];unsigned int rx_port_value;
@@ -5024,12 +5024,11 @@ static const struct regmap_irq_chip wcd9335_regmap_irq1_chip = {static int wcd9335_parse_dt (struct wcd9335_codec *wcd) {struct device *dev = wcd->dev; -struct device_node *np = dev->of_node;int ret; - wcd->reset_gpio =of_get_named_gpio (np,"reset-gpios" ,0 ); -if (wcd->reset_gpio <0 ) -return dev_err_probe (dev, wcd->reset_gpio,"Reset GPIO missing from DT\n" ); + wcd->reset_gpio =devm_gpiod_get (dev,"reset" ,GPIOD_OUT_LOW ); +if (IS_ERR (wcd->reset_gpio)) +return dev_err_probe (dev,PTR_ERR (wcd->reset_gpio),"Reset GPIO missing from DT\n" ); wcd->mclk =devm_clk_get (dev,"mclk" );if (IS_ERR (wcd->mclk))
@@ -5072,9 +5071,9 @@ static int wcd9335_power_on_reset(struct wcd9335_codec *wcd)*/ usleep_range (600 ,650 ); -gpio_direction_output (wcd->reset_gpio,0 ); +gpiod_set_value (wcd->reset_gpio,1 );msleep (20 ); -gpio_set_value (wcd->reset_gpio,1 ); +gpiod_set_value (wcd->reset_gpio,0 );msleep (20 );return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 69/160 net: enetc: Correct endianness handling in _enetc_rd_reg64
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Simon Horman <[email protected]>
[ Upstream commit 7b515f35a911fdc31fbde6531828dcd6ae9803d3 ]
enetc_hw.h provides two versions of _enetc_rd_reg64. One which simply calls ioread64() when available.
And another that composes the 64-bit result from ioread32() calls.
In the second case the code appears to assume that each ioread32() call returns a little-endian value. However both the shift and logical or used to compose the return value would not work correctly on big endian systems if this were the case. Moreover, this is inconsistent with the first case where the return value of ioread64() is assumed to be in host byte order.
It appears that the correct approach is for both versions to treat the return value of ioread*() functions as being in host byte order. And this patch corrects the ioread32()-based version to do so.
This is a bug but would only manifest on big endian systems that make use of the ioread32-based implementation of _enetc_rd_reg64. While all in-tree users of this driver are little endian and make use of the ioread64-based implementation of _enetc_rd_reg64. Thus, no in-tree user of this driver is affected by this bug.
Flagged by Sparse.
Compile tested only.
--- drivers/net/ethernet/freescale/enetc/enetc_hw.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/freescale/enetc/enetc_hw.h +1 -1
@@ -459,7 +459,7 @@ static inline u64 _enetc_rd_reg64(void __iomem *reg) tmp = ioread32(reg + 4); }while (high != tmp); -return le64_to_cpu ((__le64 )high <<32 | low); +return (u64 )high <<32 | low; }#endif
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 78/160 HID: wacom: fix memory leak on sysfs attribute creation failure
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qasim Ijaz <[email protected]>
commit 1a19ae437ca5d5c7d9ec2678946fb339b1c706bf upstream.
When sysfs_create_files() fails during wacom_initialize_remotes() the fifo buffer is not freed leading to a memory leak.
Fix this by calling kfifo_free() before returning.
--- drivers/hid/wacom_sys.c | 1 + 1 file changed, 1 insertion(+)
drivers/hid/wacom_sys.c +1 -0
@@ -2030,6 +2030,7 @@ static int wacom_initialize_remotes(struif (error) {hid_err (wacom->hdev,"cannot create sysfs group err: %d\n" , error); +kfifo_free (&remote->remote_fifo);return error; }
Greg Kroah-Hartman
maintainerPATCH 79/160 HID: wacom: fix kobject reference count leak
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qasim Ijaz <[email protected]>
commit 85a720f4337f0ddf1603c8b75a8f1ffbbe022ef9 upstream.
When sysfs_create_files() fails in wacom_initialize_remotes() the error is returned and the cleanup action will not have been registered yet.
As a result the kobject???s refcount is never dropped, so the kobject can never be freed leading to a reference leak.
Fix this by calling kobject_put() before returning.
--- drivers/hid/wacom_sys.c | 1 + 1 file changed, 1 insertion(+)
drivers/hid/wacom_sys.c +1 -0
@@ -2031,6 +2031,7 @@ static int wacom_initialize_remotes(struhid_err (wacom->hdev,"cannot create sysfs group err: %d\n" , error);kfifo_free (&remote->remote_fifo); +kobject_put (remote->remote_dir);return error; }
Greg Kroah-Hartman
maintainerPATCH 80/160 drm/tegra: Assign plane type before registration
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thierry Reding <[email protected]>
commit 9ff4fdf4f44b69237c0afc1d3a8dac916ce66f3e upstream.
Changes to a plane's type after it has been registered aren't propagated to userspace automatically. This could possibly be achieved by updating the property, but since we can already determine which type this should be before the registration, passing in the right type from the start is a much better solution.
--- drivers/gpu/drm/tegra/dc.c | 12 ++++++++---- drivers/gpu/drm/tegra/hub.c | 4 ++-- drivers/gpu/drm/tegra/hub.h | 3 ++- 3 files changed, 12 insertions(+), 7 deletions(-)
drivers/gpu/drm/tegra/dc.c +8 -4
@@ -1221,10 +1221,16 @@ static struct drm_plane *tegra_dc_add_shif (wgrp->dc == dc->pipe) {for (j =0 ; j < wgrp->num_windows; j++) {unsigned int index = wgrp->windows[j]; +enum drm_plane_type type; + +if (primary) + type =DRM_PLANE_TYPE_OVERLAY ; +else + type =DRM_PLANE_TYPE_PRIMARY ; plane =tegra_shared_plane_create (drm, dc, wgrp->index, - index); + index, type);if (IS_ERR (plane))return plane;
@@ -1232,10 +1238,8 @@ static struct drm_plane *tegra_dc_add_sh* Choose the first shared plane owned by this * head as the primary plane. */ -if (!primary) { - plane->type =DRM_PLANE_TYPE_PRIMARY ; +if (!primary) primary = plane; - } } } }
drivers/gpu/drm/tegra/hub.c +2 -2
@@ -747,9 +747,9 @@ static const struct drm_plane_helper_funstruct drm_plane *tegra_shared_plane_create (struct drm_device *drm,struct tegra_dc *dc,unsigned int wgrp, -unsigned int index) +unsigned int index, +enum drm_plane_type type) { -enum drm_plane_type type =DRM_PLANE_TYPE_OVERLAY ;struct tegra_drm *tegra = drm->dev_private;struct tegra_display_hub *hub = tegra->hub;struct tegra_shared_plane *plane;
drivers/gpu/drm/tegra/hub.h +2 -1
@@ -81,7 +81,8 @@ void tegra_display_hub_cleanup(struct testruct drm_plane *tegra_shared_plane_create (struct drm_device *drm,struct tegra_dc *dc,unsigned int wgrp, -unsigned int index); +unsigned int index, +enum drm_plane_type type);int tegra_display_hub_atomic_check (struct drm_device *drm,struct drm_atomic_state *state);
Greg Kroah-Hartman
maintainerPATCH 81/160 drm/tegra: Fix a possible null pointer dereference
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qiu-ji Chen <[email protected]>
commit 780351a5f61416ed2ba1199cc57e4a076fca644d upstream.
In tegra_crtc_reset(), new memory is allocated with kzalloc(), but no check is performed. Before calling __drm_atomic_helper_crtc_reset, state should be checked to prevent possible null pointer dereference.
--- drivers/gpu/drm/tegra/dc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/tegra/dc.c +4 -1
@@ -1293,7 +1293,10 @@ static void tegra_crtc_reset(struct drm_if (crtc->state)tegra_crtc_atomic_destroy_state (crtc, crtc->state); -__drm_atomic_helper_crtc_reset (crtc, &state->base); +if (state) +__drm_atomic_helper_crtc_reset (crtc, &state->base); +else +__drm_atomic_helper_crtc_reset (crtc,NULL ); } static struct drm_crtc_state *
Greg Kroah-Hartman
maintainerPATCH 82/160 drm/udl: Unregister device before cleaning up on disconnect
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Zimmermann <[email protected]>
commit ff9cb6d2035c586ea7c8f1754d4409eec7a2d26d upstream.
Disconnecting a DisplayLink device results in the following kernel error messages
[ 93.041748] [drm:udl_urb_completion [udl]] *ERROR* udl_urb_completion - nonzero write bulk status received: -115 [ 93.055299] [drm:udl_submit_urb [udl]] *ERROR* usb_submit_urb error fffffffe [ 93.065363] [drm:udl_urb_completion [udl]] *ERROR* udl_urb_completion - nonzero write bulk status received: -115 [ 93.078207] [drm:udl_submit_urb [udl]] *ERROR* usb_submit_urb error fffffffe
coming from KMS poll helpers. Shutting down poll helpers runs them one final time when the USB device is already gone.
Run drm_dev_unplug() first in udl's USB disconnect handler. Udl's polling code already handles disconnects gracefully if the device has been marked as unplugged.
--- drivers/gpu/drm/udl/udl_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/udl/udl_drv.c +1 -1
@@ -110,9 +110,9 @@ static void udl_usb_disconnect(struct us {struct drm_device *dev =usb_get_intfdata (interface); +drm_dev_unplug (dev);drm_kms_helper_poll_fini (dev);udl_drop_usb (dev); -drm_dev_unplug (dev); }/*
Greg Kroah-Hartman
maintainerPATCH 83/160 drm/amdkfd: Fix race in GWS queue scheduling
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jay Cornwall <[email protected]>
commit cfb05257ae168a0496c7637e1d9e3ab8a25cbffe upstream.
q->gws is not updated atomically with qpd->mapped_gws_queue. If a runlist is created between pqm_set_gws and update_queue it will contain a queue which uses GWS in a process with no GWS allocated. This will result in a scheduler hang.
Use q->properties.is_gws which is changed while holding the DQM lock.
--- drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c +1 -1
@@ -195,7 +195,7 @@ static int pm_map_queues_v9(struct packe packet->bitfields2.engine_sel = engine_sel__mes_map_queues__compute_vi; - packet->bitfields2.gws_control_queue = q->gws ?1 :0 ; + packet->bitfields2.gws_control_queue = q->properties.is_gws ?1 :0 ; packet->bitfields2.extended_engine_sel = extended_engine_sel__mes_map_queues__legacy_engine_sel; packet->bitfields2.queue_type =
Greg Kroah-Hartman
maintainerPATCH 84/160 drm/bridge: cdns-dsi: Fix the clock variable for mode_valid()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aradhya Bhatia <[email protected]>
commit 132bdcec399be6ae947582249a134b38cf56731c upstream.
The crtc_* mode parameters do not get generated (duplicated in this case) from the regular parameters before the mode validation phase begins.
The rest of the code conditionally uses the crtc_* parameters only during the bridge enable phase, but sticks to the regular parameters for mode validation. In this singular instance, however, the driver tries to use the crtc_clock parameter even during the mode validation, causing the validation to fail.
Allow the D-Phy config checks to use mode->clock instead of mode->crtc_clock during mode_valid checks, like everywhere else in the driver.
--- drivers/gpu/drm/bridge/cdns-dsi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/bridge/cdns-dsi.c +2 -1
@@ -608,13 +608,14 @@ static int cdns_dsi_check_conf(struct cdstruct phy_configure_opts_mipi_dphy *phy_cfg = &output->phy_opts.mipi_dphy;unsigned long dsi_hss_hsa_hse_hbp;unsigned int nlanes = output->dev->lanes; +int mode_clock = (mode_valid_check ? mode->clock : mode->crtc_clock);int ret; ret =cdns_dsi_mode2cfg (dsi, mode, dsi_cfg, mode_valid_check);if (ret)return ret; -phy_mipi_dphy_get_default_config (mode->crtc_clock *1000 , +phy_mipi_dphy_get_default_config (mode_clock *1000 ,mipi_dsi_pixel_format_to_bpp (output->dev->format), nlanes, phy_cfg);
Greg Kroah-Hartman
maintainerPATCH 85/160 drm/bridge: cdns-dsi: Fix connecting to next bridge
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aradhya Bhatia <[email protected]>
commit 688eb4d465484bc2a3471a6a6f06f833b58c7867 upstream.
Fix the OF node pointer passed to the of_drm_find_bridge() call to find the next bridge in the display chain.
The code to find the next panel (and create its panel-bridge) works fine, but to find the next (non-panel) bridge does not.
To find the next bridge in the pipeline, we need to pass "np" - the OF node pointer of the next entity in the devicetree chain. Passing "of_node" to of_drm_find_bridge (which is what the code does currently) will fetch the bridge for the cdns-dsi which is not what's required.
Fix that.
--- drivers/gpu/drm/bridge/cdns-dsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/cdns-dsi.c +1 -1
@@ -961,7 +961,7 @@ static int cdns_dsi_attach(struct mipi_d bridge =drm_panel_bridge_add_typed (panel,DRM_MODE_CONNECTOR_DSI ); }else { - bridge =of_drm_find_bridge (dev->dev.of_node); + bridge =of_drm_find_bridge (np);if (!bridge) bridge =ERR_PTR (-EINVAL ); }
Greg Kroah-Hartman
maintainerPATCH 86/160 drm/bridge: cdns-dsi: Check return value when getting default PHY config
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aradhya Bhatia <[email protected]>
commit c6a7ef0d4856b9629df390e9935d7fd67fe39f81 upstream.
Check for the return value of the phy_mipi_dphy_get_default_config() call, and in case of an error, return back the same.
--- drivers/gpu/drm/bridge/cdns-dsi.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/bridge/cdns-dsi.c +5 -3
@@ -615,9 +615,11 @@ static int cdns_dsi_check_conf(struct cdif (ret)return ret; -phy_mipi_dphy_get_default_config (mode_clock *1000 , -mipi_dsi_pixel_format_to_bpp (output->dev->format), - nlanes, phy_cfg); + ret =phy_mipi_dphy_get_default_config (mode_clock *1000 , +mipi_dsi_pixel_format_to_bpp (output->dev->format), + nlanes, phy_cfg); +if (ret) +return ret; ret =cdns_dsi_adjust_phy_config (dsi, dsi_cfg, phy_cfg, mode, mode_valid_check);if (ret)
Greg Kroah-Hartman
maintainerPATCH 87/160 drm/bridge: cdns-dsi: Wait for Clk and Data Lanes to be ready
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aradhya Bhatia <[email protected]>
commit 47c03e6660e96cbba0239125b1d4a9db3c724b1d upstream.
Once the DSI Link and DSI Phy are initialized, the code needs to wait for Clk and Data Lanes to be ready, before continuing configuration. This is in accordance with the DSI Start-up procedure, found in the Technical Reference Manual of Texas Instrument's J721E SoC[0] which houses this DSI TX controller.
If the previous bridge (or crtc/encoder) are configured pre-maturely, the input signal FIFO gets corrupt. This introduces a color-shift on the display.
Allow the driver to wait for the clk and data lanes to get ready during DSI enable.
[0]: See section 12.6.5.7.3 "Start-up Procedure" in J721E SoC TRM
TRM Link: http://www.ti.com/lit/pdf/spruil1
--- drivers/gpu/drm/bridge/cdns-dsi.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
drivers/gpu/drm/bridge/cdns-dsi.c +15 -1
@@ -789,8 +789,9 @@ static void cdns_dsi_bridge_enable(strucstruct phy_configure_opts_mipi_dphy *phy_cfg = &output->phy_opts.mipi_dphy;unsigned long tx_byte_period;struct cdns_dsi_cfg dsi_cfg; -u32 tmp, reg_wakeup, div; +u32 tmp, reg_wakeup, div, status;int nlanes; +int i;if (WARN_ON (pm_runtime_get_sync (dsi->base.dev) <0 ))return ;
@@ -803,6 +804,19 @@ static void cdns_dsi_bridge_enable(struccdns_dsi_hs_init (dsi);cdns_dsi_init_link (dsi); +/* +* Now that the DSI Link and DSI Phy are initialized, +* wait for the CLK and Data Lanes to be ready. +*/ + tmp =CLK_LANE_RDY ; +for (i =0 ; i < nlanes; i++) + tmp |=DATA_LANE_RDY (i); + +if (readl_poll_timeout (dsi->regs +MCTL_MAIN_STS , status, + (tmp == (status & tmp)),100 ,500000 )) +dev_err (dsi->base.dev, +"Timed Out: DSI-DPhy Clock and Data Lanes not ready.\n" ); +writel (HBP_LEN (dsi_cfg.hbp) |HSA_LEN (dsi_cfg.hsa), dsi->regs +VID_HSIZE1 ); writel(HFP_LEN(dsi_cfg.hfp) | HACT_LEN(dsi_cfg.hact),
Greg Kroah-Hartman
maintainerPATCH 70/160 atm: Release atm_dev_mutex after removing procfs in atm_dev_deregister().
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit a433791aeaea6e84df709e0b9584b9bbe040cd1c ]
syzbot reported a warning below during atm_dev_register(). [0]
Before creating a new device and procfs/sysfs for it, atm_dev_register() looks up a duplicated device by __atm_dev_lookup(). These operations are done under atm_dev_mutex.
However, when removing a device in atm_dev_deregister(), it releases the mutex just after removing the device from the list that __atm_dev_lookup() iterates over.
So, there will be a small race window where the device does not exist on the device list but procfs/sysfs are still not removed, triggering the splat.
Let's hold the mutex until procfs/sysfs are removed in atm_dev_deregister().
[0]:proc_dir_entry 'atm/atmtcp:0' already registered
WARNING: CPU: 0 PID: 5919 at fs/proc/generic.c:377 proc_register+0x455/0x5f0 fs/proc/generic.c:377 Modules linked in: CPU: 0 UID: 0 PID: 5919 Comm: syz-executor284 Not tainted 6.16.0-rc2-syzkaller-00047-g52da431bf03b #0 PREEMPT(full) Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 05/07/2025 RIP: 0010:proc_register+0x455/0x5f0 fs/proc/generic.c:377 Code: 48 89 f9 48 c1 e9 03 80 3c 01 00 0f 85 a2 01 00 00 48 8b 44 24 10 48 c7 c7 20 c0 c2 8b 48 8b b0 d8 00 00 00 e8 0c 02 1c ff 90 <0f> 0b 90 90 48 c7 c7 80 f2 82 8e e8 0b de 23 09 48 8b 4c 24 28 48 RSP: 0018:ffffc9000466fa30 EFLAGS: 00010282 RAX: 0000000000000000 RBX: 0000000000000000 RCX: ffffffff817ae248 RDX: ffff888026280000 RSI: ffffffff817ae255 RDI: 0000000000000001 RBP: ffff8880232bed48 R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000001 R12: ffff888076ed2140 R13: dffffc0000000000 R14: ffff888078a61340 R15: ffffed100edda444 FS: 00007f38b3b0c6c0(0000) GS:ffff888124753000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f38b3bdf953 CR3: 0000000076d58000 CR4: 00000000003526f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> proc_create_data+0xbe/0x110 fs/proc/generic.c:585 atm_proc_dev_register+0x112/0x1e0 net/atm/proc.c:361 atm_dev_register+0x46d/0x890 net/atm/resources.c:113 atmtcp_create+0x77/0x210 drivers/atm/atmtcp.c:369 atmtcp_attach drivers/atm/atmtcp.c:403 [inline] atmtcp_ioctl+0x2f9/0xd60 drivers/atm/atmtcp.c:464 do_vcc_ioctl+0x12c/0x930 net/atm/ioctl.c:159 sock_do_ioctl+0x115/0x280 net/socket.c:1190 sock_ioctl+0x227/0x6b0 net/socket.c:1311 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:907 [inline] __se_sys_ioctl fs/ioctl.c:893 [inline] __x64_sys_ioctl+0x18b/0x210 fs/ioctl.c:893 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0xcd/0x4c0 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7f38b3b74459 Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 51 18 00 00 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 b0 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007f38b3b0c198 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 RAX: ffffffffffffffda RBX: 00007f38b3bfe318 RCX: 00007f38b3b74459 RDX: 0000000000000000 RSI: 0000000000006180 RDI: 0000000000000005 RBP: 00007f38b3bfe310 R08: 65732f636f72702f R09: 65732f636f72702f R10: 65732f636f72702f R11: 0000000000000246 R12: 00007f38b3bcb0ac R13: 00007f38b3b0c1a0 R14: 0000200000000200 R15: 00007f38b3bcb03b </TASK>
--- net/atm/resources.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/atm/resources.c +1 -2
@@ -146,11 +146,10 @@ void atm_dev_deregister(struct atm_dev *dev)*/ mutex_lock (&atm_dev_mutex);list_del (&dev->dev_list); -mutex_unlock (&atm_dev_mutex); -atm_dev_release_vccs (dev);atm_unregister_sysfs (dev);atm_proc_dev_deregister (dev); +mutex_unlock (&atm_dev_mutex);atm_dev_put (dev); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 88/160 drm/amd/display: Add null pointer check for get_first_active_display()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wentao Liang <[email protected]>
commit c3e9826a22027a21d998d3e64882fa377b613006 upstream.
The function mod_hdcp_hdcp1_enable_encryption() calls the function get_first_active_display(), but does not check its return value. The return value is a null pointer if the display list is empty. This will lead to a null pointer dereference in mod_hdcp_hdcp2_enable_encryption().
Add a null pointer check for get_first_active_display() and return MOD_HDCP_STATUS_DISPLAY_NOT_FOUND if the function return null.
--- drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c +3 -0
@@ -364,6 +364,9 @@ enum mod_hdcp_status mod_hdcp_hdcp1_enabstruct mod_hdcp_display *display =get_first_active_display (hdcp);enum mod_hdcp_status status =MOD_HDCP_STATUS_SUCCESS ; +if (!display) +return MOD_HDCP_STATUS_DISPLAY_NOT_FOUND ; +mutex_lock (&psp->hdcp_context.mutex); hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.context.mem_context.shared_buf;memset (hdcp_cmd,0 ,sizeof (struct ta_hdcp_shared_memory ));
Greg Kroah-Hartman
maintainerPATCH 89/160 PCI: hv: Do not set PCI_COMMAND_MEMORY to reduce VM boot time
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dexuan Cui <[email protected]>
commit 23e118a48acf7be223e57d98e98da8ac5a4071ac upstream.
Currently when the pci-hyperv driver finishes probing and initializing the PCI device, it sets the PCI_COMMAND_MEMORY bit; later when the PCI device is registered to the core PCI subsystem, the core PCI driver's BAR detection and initialization code toggles the bit multiple times, and each toggling of the bit causes the hypervisor to unmap/map the virtual BARs from/to the physical BARs, which can be slow if the BAR sizes are huge, e.g., a Linux VM with 14 GPU devices has to spend more than 3 minutes on BAR detection and initialization, causing a long boot time.
Reduce the boot time by not setting the PCI_COMMAND_MEMORY bit when we register the PCI device (there is no need to have it set in the first place). The bit stays off till the PCI device driver calls pci_enable_device(). With this change, the boot time of such a 14-GPU VM is reduced by almost 3 minutes.
--- drivers/pci/controller/pci-hyperv.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
drivers/pci/controller/pci-hyperv.c +11 -6
@@ -1882,12 +1882,17 @@ static void prepopulate_bars(struct hv_p } }if (high_size <=1 && low_size <=1 ) { -/* Set the memory enable bit. */ -_hv_pcifront_read_config (hpdev,PCI_COMMAND ,2 , - &command); - command |=PCI_COMMAND_MEMORY ; -_hv_pcifront_write_config (hpdev,PCI_COMMAND ,2 , - command); +/* +* No need to set the PCI_COMMAND_MEMORY bit as +* the core PCI driver doesn't require the bit +* to be pre-set. Actually here we intentionally +* keep the bit off so that the PCI BAR probing +* in the core PCI driver doesn't cause Hyper-V +* to unnecessarily unmap/map the virtual BARs +* from/to the physical BARs multiple times. +* This reduces the VM boot time significantly +* if the BAR sizes are huge. +*/ break ; } }
Greg Kroah-Hartman
maintainerPATCH 90/160 media: uvcvideo: Rollback non processed entities on error
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo Ribalda <[email protected]>
commit a70705d3c020d0d5c3ab6a5cc93e011ac35e7d48 upstream.
If we fail to commit an entity, we need to restore the UVC_CTRL_DATA_BACKUP for the other uncommitted entities. Otherwise the control cache and the device would be out of sync.
Message-ID: <[email protected]>
--- drivers/media/usb/uvc/uvc_ctrl.c | 40 +++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-)
drivers/media/usb/uvc/uvc_ctrl.c +26 -14
@@ -1697,7 +1697,7 @@ static int uvc_ctrl_commit_entity(structunsigned int processed_ctrls =0 ;struct uvc_control *ctrl;unsigned int i; -int ret; +int ret =0 ;if (entity ==NULL )return 0 ;
@@ -1725,8 +1725,6 @@ static int uvc_ctrl_commit_entity(struct dev->intfnum, ctrl->info.selector,uvc_ctrl_data (ctrl,UVC_CTRL_DATA_CURRENT ), ctrl->info.size); - else - ret =0 ;if (!ret) processed_ctrls++;
@@ -1738,17 +1736,24 @@ static int uvc_ctrl_commit_entity(struct ctrl->dirty =0 ; -if (ret <0 ) { +if (!rollback && handle && !ret && + ctrl->info.flags &UVC_CTRL_FLAG_ASYNCHRONOUS ) +uvc_ctrl_set_handle (handle, ctrl, handle); + +if (ret <0 && !rollback) {if (err_ctrl) *err_ctrl = ctrl; -return ret; +/* +* If we fail to set a control, we need to rollback +* the next ones. +*/ + rollback =1 ; } - -if (!rollback && handle && - ctrl->info.flags &UVC_CTRL_FLAG_ASYNCHRONOUS ) -uvc_ctrl_set_handle (handle, ctrl, handle); } +if (ret) +return ret; +return processed_ctrls; }
@@ -1779,7 +1784,8 @@ int __uvc_ctrl_commit(struct uvc_fh *hanstruct uvc_video_chain *chain = handle->chain;struct uvc_control *err_ctrl;struct uvc_entity *entity; -int ret =0 ; +int ret_out =0 ; +int ret;/* Find the control. */ list_for_each_entry (entity, &chain->entities, chain) {
@@ -1790,17 +1796,23 @@ int __uvc_ctrl_commit(struct uvc_fh *han ctrls->error_idx =uvc_ctrl_find_ctrl_idx (entity, ctrls, err_ctrl); - goto done; +/* +* When we fail to commit an entity, we need to +* restore the UVC_CTRL_DATA_BACKUP for all the +* controls in the other entities, otherwise our cache +* and the hardware will be out of sync. +*/ + rollback =1 ; + + ret_out = ret; }else if (ret >0 && !rollback) {uvc_ctrl_send_events (handle, entity, ctrls->controls, ctrls->count); } } - ret =0 ; -done:mutex_unlock (&chain->ctrl_mutex); -return ret; +return ret_out; } int uvc_ctrl_get(struct uvc_video_chain *chain,
Greg Kroah-Hartman
maintainerPATCH 91/160 s390/entry: Fix last breaking event handling in case of stack corruption
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiko Carstens <[email protected]>
commit ae952eea6f4a7e2193f8721a5366049946e012e7 upstream.
In case of stack corruption stack_invalid() is called and the expectation is that register r10 contains the last breaking event address. This dependency is quite subtle and broke a couple of years ago without that anybody noticed.
Fix this by getting rid of the dependency and read the last breaking event address from lowcore.
--- arch/s390/kernel/entry.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/kernel/entry.S +1 -1
@@ -676,7 +676,7 @@ ENTRY(stack_overflow) stmg %r0,%r7,__PT_R0(%r11) stmg %r8,%r9,__PT_PSW(%r11) mvc __PT_R8(64,%r11),0(%r14) - stg %r10,__PT_ORIG_GPR2(%r11) # store last break to orig_gpr2 + mvc __PT_ORIG_GPR2(8,%r11),__LC_LAST_BREAK xc __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15) lgr %r2,%r11 # pass pointer to pt_regs jg kernel_stack_overflow
Greg Kroah-Hartman
maintainerPATCH 92/160 s390: Add -std=gnu11 to decompressor and purgatory CFLAGS
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Chancellor <[email protected]>
commit 3b8b80e993766dc96d1a1c01c62f5d15fafc79b9 upstream.
GCC changed the default C standard dialect from gnu17 to gnu23, which should not have impacted the kernel because it explicitly requests the gnu11 standard in the main Makefile. However, there are certain places in the s390 code that use their own CFLAGS without a '-std=' value, which break with this dialect change because of the kernel's own definitions of bool, false, and true conflicting with the C23 reserved keywords.
include/linux/stddef.h:11:9: error: cannot use keyword 'false' as enumeration constant
11 | false = 0,
| ^~~~~
include/linux/stddef.h:11:9: note: 'false' is a keyword with '-std=c23' onwards
include/linux/types.h:35:33: error: 'bool' cannot be defined via 'typedef'
35 | typedef _Bool bool;
| ^~~~ include/linux/types.h:35:33: note: 'bool' is a keyword with '-std=c23' onwards
Add '-std=gnu11' to the decompressor and purgatory CFLAGS to eliminate these errors and make the C standard version of these areas match the rest of the kernel.
--- arch/s390/Makefile | 2 +- arch/s390/purgatory/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/s390/Makefile +1 -1
@@ -23,7 +23,7 @@ endif aflags_dwarf := -Wa,-gdwarf-2 KBUILD_AFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -D__ASSEMBLY__ KBUILD_AFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),$(aflags_dwarf)) -KBUILD_CFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -O2 +KBUILD_CFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -O2 -std=gnu11 KBUILD_CFLAGS_DECOMPRESSOR += -DDISABLE_BRANCH_PROFILING -D__NO_FORTIFY KBUILD_CFLAGS_DECOMPRESSOR += -fno-delete-null-pointer-checks -msoft-float -mbackchain KBUILD_CFLAGS_DECOMPRESSOR += -fno-asynchronous-unwind-tables
arch/s390/purgatory/Makefile +1 -1
@@ -21,7 +21,7 @@ UBSAN_SANITIZE := n KASAN_SANITIZE := n KCSAN_SANITIZE := n -KBUILD_CFLAGS := -fno-strict-aliasing -Wall -Wstrict-prototypes +KBUILD_CFLAGS := -std=gnu11 -fno-strict-aliasing -Wall -Wstrict-prototypes KBUILD_CFLAGS += -Wno-pointer-sign -Wno-sign-compare KBUILD_CFLAGS += -fno-zero-initialized-in-bss -fno-builtin -ffreestanding KBUILD_CFLAGS += -c -MD -Os -m64 -msoft-float -fno-common
Greg Kroah-Hartman
maintainerPATCH 93/160 Revert "ipv6: save dontfrag in cork"
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brett A C Sheffield (Librecast) <[email protected]>
This reverts commit 2b572c40981138349c04b3f69220ac878a36c561 which is commit a18dfa9925b9ef6107ea3aa5814ca3c704d34a8a upstream.
A regression was introduced when backporting this to the stable kernels without applying previous commits in this series.
When sending IPv6 UDP packets larger than MTU, EMSGSIZE was returned instead of fragmenting the packets as expected.
As there is no compelling reason for this commit to be present in the stable kernels it should be reverted.
--- include/linux/ipv6.h | 1 - net/ipv6/ip6_output.c | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-)
include/linux/ipv6.h +0 -1
@@ -195,7 +195,6 @@ struct inet6_cork {struct ipv6_txoptions *opt;u8 hop_limit;u8 tclass; - u8 dontfrag:1; };/**
net/ipv6/ip6_output.c +4 -5
@@ -1428,7 +1428,6 @@ static int ip6_setup_cork(struct sock *s cork->fl.u.ip6 = *fl6; v6_cork->hop_limit = ipc6->hlimit; v6_cork->tclass = ipc6->tclass; - v6_cork->dontfrag = ipc6->dontfrag;if (rt->dst.flags &DST_XFRM_TUNNEL ) mtu = np->pmtudisc >=IPV6_PMTUDISC_PROBE ?READ_ONCE (rt->dst.dev->mtu) :dst_mtu (&rt->dst);
@@ -1463,7 +1462,7 @@ static int __ip6_append_data(struct sockint getfrag (void *from,char *to,int offset,int len,int odd,struct sk_buff *skb), void *from, size_t length, int transhdrlen, - unsigned int flags) + unsigned int flags, struct ipcm6_cookie *ipc6) { struct sk_buff *skb, *skb_prev = NULL;unsigned int maxfraglen, fragheaderlen, mtu, orig_mtu, pmtu;
@@ -1520,7 +1519,7 @@ static int __ip6_append_data(struct sockif (headersize + transhdrlen > mtu) goto emsgsize; -if (cork->length + length > mtu - headersize && v6_cork->dontfrag && +if (cork->length + length > mtu - headersize && ipc6->dontfrag && (sk->sk_protocol ==IPPROTO_UDP || sk->sk_protocol ==IPPROTO_RAW )) { ipv6_local_rxpmtu(sk, fl6, mtu - headersize +
@@ -1837,7 +1836,7 @@ int ip6_append_data(struct sock *sk,return __ip6_append_data (sk, fl6, &sk->sk_write_queue, &inet->cork.base, &np->cork,sk_page_frag (sk), getfrag, - from, length, transhdrlen, flags); + from, length, transhdrlen, flags, ipc6); }EXPORT_SYMBOL_GPL (ip6_append_data);
@@ -2032,7 +2031,7 @@ struct sk_buff *ip6_make_skb(struct sock err =__ip6_append_data (sk, fl6, &queue, &cork->base, &v6_cork, ¤t->task_frag, getfrag, from, length + exthdrlen, transhdrlen + exthdrlen, - flags); + flags, ipc6);if (err) {__ip6_flush_pending_frames (sk, &queue, cork, &v6_cork);return ERR_PTR (err);
Greg Kroah-Hartman
maintainerPATCH 94/160 arm64: Restrict pagetable teardown to avoid false warning
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dev Jain <[email protected]>
commit 650768c512faba8070bf4cfbb28c95eb5cd203f3 upstream.
Commit 9c006972c3fe ("arm64: mmu: drop pXd_present() checks from pXd_free_pYd_table()") removes the pxd_present() checks because the caller checks pxd_present(). But, in case of vmap_try_huge_pud(), the caller only checks pud_present(); pud_free_pmd_page() recurses on each pmd through pmd_free_pte_page(), wherein the pmd may be none. Thus it is possible to hit a warning in the latter, since pmd_none => !pmd_table(). Thus, add a pmd_present() check in pud_free_pmd_page().
This problem was found by code inspection.
--- arch/arm64/mm/mmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/mm/mmu.c +2 -1
@@ -1466,7 +1466,8 @@ int pud_free_pmd_page(pud_t *pudp, unsig next = addr; end = addr +PUD_SIZE ;do { -pmd_free_pte_page (pmdp, next); +if (pmd_present (READ_ONCE (*pmdp))) +pmd_free_pte_page (pmdp, next); }while (pmdp++, next +=PMD_SIZE , next != end);pud_clear (pudp);
Greg Kroah-Hartman
maintainerPATCH 95/160 btrfs: dont drop extent_map for free space inode on write error
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josef Bacik <[email protected]>
commit 5571e41ec6e56e35f34ae9f5b3a335ef510e0ade upstream.
While running the CI for an unrelated change I hit the following panic with generic/648 on btrfs_holes_spacecache.
assertion failed: block_start != EXTENT_MAP_HOLE, in fs/btrfs/extent_io.c:1385
------------[ cut here ]------------ kernel BUG at fs/btrfs/extent_io.c:1385! invalid opcode: 0000 [#1] PREEMPT SMP NOPTI CPU: 1 PID: 2695096 Comm: fsstress Kdump: loaded Tainted: G W 6.8.0-rc2+ #1 RIP: 0010:__extent_writepage_io.constprop.0+0x4c1/0x5c0 Call Trace: <TASK> extent_write_cache_pages+0x2ac/0x8f0 extent_writepages+0x87/0x110 do_writepages+0xd5/0x1f0 filemap_fdatawrite_wbc+0x63/0x90 __filemap_fdatawrite_range+0x5c/0x80 btrfs_fdatawrite_range+0x1f/0x50 btrfs_write_out_cache+0x507/0x560 btrfs_write_dirty_block_groups+0x32a/0x420 commit_cowonly_roots+0x21b/0x290 btrfs_commit_transaction+0x813/0x1360 btrfs_sync_file+0x51a/0x640 __x64_sys_fdatasync+0x52/0x90 do_syscall_64+0x9c/0x190 entry_SYSCALL_64_after_hwframe+0x6e/0x76
This happens because we fail to write out the free space cache in one instance, come back around and attempt to write it again. However on the second pass through we go to call btrfs_get_extent() on the inode to get the extent mapping. Because this is a new block group, and with the free space inode we always search the commit root to avoid deadlocking with the tree, we find nothing and return a EXTENT_MAP_HOLE for the requested range.
This happens because the first time we try to write the space cache out we hit an error, and on an error we drop the extent mapping. This is normal for normal files, but the free space cache inode is special. We always expect the extent map to be correct. Thus the second time through we end up with a bogus extent map.
Since we're deprecating this feature, the most straightforward way to fix this is to simply skip dropping the extent map range for this failed range.
I shortened the test by using error injection to stress the area to make it easier to reproduce. With this patch in place we no longer panic with my error injection test.
[ Larry: backport to 5.15.y. Minor conflict resolved due to missing commit 4c0c8cfc8433
btrfs: move btrfs_drop_extent_cache() to extent_map.c ]
--- fs/btrfs/inode.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
fs/btrfs/inode.c +17 -2
@@ -3197,8 +3197,23 @@ out: unwritten_start += logical_len;clear_extent_uptodate (io_tree, unwritten_start, end,NULL ); -/* Drop the cache for the part of the extent we didn't write. */ -btrfs_drop_extent_cache (inode, unwritten_start, end,0 ); +/* +* Drop extent maps for the part of the extent we didn't write. +* +* We have an exception here for the free_space_inode, this is +* because when we do btrfs_get_extent() on the free space inode +* we will search the commit root. If this is a new block group +* we won't find anything, and we will trip over the assert in +* writepage where we do ASSERT(em->block_start != +* EXTENT_MAP_HOLE). +* +* Theoretically we could also skip this for any NOCOW extent as +* we don't mess with the extent map tree in the NOCOW case, but +* for now simply skip this if we are the free space inode. +*/ +if (!btrfs_is_free_space_inode (inode)) +btrfs_drop_extent_cache (inode, unwritten_start, + end,0 );/* * If the ordered extent had an IOERR or something else went
Greg Kroah-Hartman
maintainerPATCH 96/160 ARM: 9354/1: ptrace: Use bitfield helpers
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
commit b36e78b216e632d90138751e4ff80044de303656 upstream.
The isa_mode() macro extracts two fields, and recombines them into a single value.
Make this more obvious by using the FIELD_GET() helper, and shifting the result into its final resting place.
--- arch/arm/include/asm/ptrace.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/arm/include/asm/ptrace.h +3 -2
@@ -10,6 +10,7 @@#include <uapi/asm/ptrace.h> #ifndef __ASSEMBLY__ +#include <linux/bitfield.h> #include <linux/types.h> struct pt_regs {
@@ -35,8 +36,8 @@ struct svc_pt_regs {#ifndef CONFIG_CPU_V7M #define isa_mode (regs) \ - ((((regs)->ARM_cpsr & PSR_J_BIT) >> (__ffs(PSR_J_BIT) - 1)) | \ - (((regs)->ARM_cpsr & PSR_T_BIT) >> (__ffs(PSR_T_BIT)))) + (FIELD_GET(PSR_J_BIT, (regs)->ARM_cpsr) << 1 | \ + FIELD_GET(PSR_T_BIT, (regs)->ARM_cpsr))#else #define isa_mode (regs) 1/* Thumb */ #endif
Greg Kroah-Hartman
maintainerPATCH 97/160 rtc: cmos: use spin_lock_irqsave in cmos_interrupt
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mateusz Jończyk <[email protected]>
commit 00a39d8652ff9088de07a6fe6e9e1893452fe0dd upstream.
cmos_interrupt() can be called in a non-interrupt context, such as in an ACPI event handler (which runs in an interrupt thread). Therefore, usage of spin_lock(&rtc_lock) is insecure. Use spin_lock_irqsave() / spin_unlock_irqrestore() instead.
Before a misguided
commit 6950d046eb6e ("rtc: cmos: Replace spin_lock_irqsave with spin_lock in hard IRQ") the cmos_interrupt() function used spin_lock_irqsave(). That commit
changed it to spin_lock() and broke locking, which was partially fixed in commit 13be2efc390a ("rtc: cmos: Disable irq around direct invocation of cmos_interrupt()")
That second commit did not take account of the ACPI fixed event handler pathway, however. It introduced local_irq_disable() workarounds in cmos_check_wkalrm(), which can cause problems on PREEMPT_RT kernels and are now unnecessary.
Add an explicit comment so that this change will not be reverted by mistake.
--- drivers/rtc/rtc-cmos.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/rtc/rtc-cmos.c +6 -4
@@ -698,8 +698,12 @@ static irqreturn_t cmos_interrupt(int ir {u8 irqstat;u8 rtc_control; +unsigned long flags; -spin_lock (&rtc_lock); +/* We cannot use spin_lock() here, as cmos_interrupt() is also called +* in a non-irq context. +*/ +spin_lock_irqsave (&rtc_lock, flags);/* When the HPET interrupt handler calls us, the interrupt * status is passed as arg1 instead of the irq number. But
@@ -733,7 +737,7 @@ static irqreturn_t cmos_interrupt(int irhpet_mask_rtc_irq_bit (RTC_AIE );CMOS_READ (RTC_INTR_FLAGS ); } -spin_unlock (&rtc_lock); +spin_unlock_irqrestore (&rtc_lock, flags);if (is_intr (irqstat)) {rtc_update_irq (p,1 , irqstat);
@@ -1284,9 +1288,7 @@ static void cmos_check_wkalrm(struct dev* ACK the rtc irq here */ if (t_now >= cmos->alarm_expires &&cmos_use_acpi_alarm ()) { -local_irq_disable ();cmos_interrupt (0 , (void *)cmos->rtc); -local_irq_enable ();return ; }
Greg Kroah-Hartman
maintainerPATCH 71/160 net: selftests: fix TCP packet checksum
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 8d89661a36dd3bb8c9902cff36dc0c144dce3faf ]
The length in the pseudo header should be the length of the L3 payload AKA the L4 header+payload. The selftest code builds the packet from the lower layers up, so all the headers are pushed already when it constructs L4. We need to subtract the lower layer headers from skb->len.
--- net/core/selftests.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/core/selftests.c +3 -2
@@ -160,8 +160,9 @@ static struct sk_buff *net_test_get_skb(struct net_device *ndev, skb->csum =0 ; skb->ip_summed =CHECKSUM_PARTIAL ;if (attr->tcp) { - thdr->check = ~tcp_v4_check (skb->len, ihdr->saddr, - ihdr->daddr,0 ); +int l4len = skb->len -skb_transport_offset (skb); + + thdr->check = ~tcp_v4_check (l4len, ihdr->saddr, ihdr->daddr,0 ); skb->csum_start =skb_transport_header (skb) - skb->head; skb->csum_offset = offsetof(struct tcphdr , check); }else {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 98/160 vsock/vmci: Clear the vmci transport packet properly when initializing it
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: HarshaVardhana S A <[email protected]>
commit 223e2288f4b8c262a864e2c03964ffac91744cd5 upstream.
In vmci_transport_packet_init memset the vmci_transport_packet before populating the fields to avoid any uninitialised data being left in the structure.
--- net/vmw_vsock/vmci_transport.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/vmw_vsock/vmci_transport.c +2 -2
@@ -119,6 +119,8 @@ vmci_transport_packet_init(struct vmci_tu16 proto, struct vmci_handle handle) { + memset(pkt, 0, sizeof(*pkt)); +/* We register the stream control handler as an any cid handle so we * must always send from a source address of VMADDR_CID_ANY */
@@ -131,8 +133,6 @@ vmci_transport_packet_init(struct vmci_t pkt->type = type; pkt->src_port = src->svm_port; pkt->dst_port = dst->svm_port; -memset (&pkt->proto,0 ,sizeof (pkt->proto)); -memset (&pkt->_reserved2,0 ,sizeof (pkt->_reserved2));switch (pkt->type) {case VMCI_TRANSPORT_PACKET_TYPE_INVALID :
Greg Kroah-Hartman
maintainerPATCH 99/160 mmc: sdhci: Add a helper function for dump register in dynamic debug mode
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Victor Shih <[email protected]>
commit 2881ba9af073faa8ee7408a8d1e0575e50eb3f6c upstream.
Add a helper function for dump register in dynamic debug mode.
--- drivers/mmc/host/sdhci.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/mmc/host/sdhci.h +16 -0
@@ -816,4 +816,20 @@ void sdhci_switch_external_dma(struct sdvoid sdhci_set_data_timeout_irq (struct sdhci_host *host,bool enable);void __sdhci_set_timeout (struct sdhci_host *host,struct mmc_command *cmd); +#if defined(CONFIG_DYNAMIC_DEBUG ) || \ + (defined(CONFIG_DYNAMIC_DEBUG_CORE ) && defined(DYNAMIC_DEBUG_MODULE )) +#define SDHCI_DBG_ANYWAY 0 +#elif defined(DEBUG ) +#define SDHCI_DBG_ANYWAY 1 +#else +#define SDHCI_DBG_ANYWAY 0 +#endif + +#define sdhci_dbg_dumpregs (host, fmt) \ +do { \ + DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt); \ + if (DYNAMIC_DEBUG_BRANCH(descriptor) || SDHCI_DBG_ANYWAY) \ + sdhci_dumpregs(host); \ +} while (0) +#endif /* __SDHCI_HW_H */
Greg Kroah-Hartman
maintainerPATCH 72/160 staging: rtl8723bs: Avoid memset() in aes_cipher() and aes_decipher()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Chancellor <[email protected]>
commit a55bc4ffc06d8c965a7d6f0a01ed0ed41380df28 upstream.
After commit 6f110a5e4f99 ("Disable SLUB_TINY for build testing"), which causes CONFIG_KASAN to be enabled in allmodconfig again, arm64 allmodconfig builds with older versions of clang (15 through 17) show an instance of -Wframe-larger-than (which breaks the build with CONFIG_WERROR=y):
drivers/staging/rtl8723bs/core/rtw_security.c:1287:5: error: stack frame size (2208) exceeds limit (2048) in 'rtw_aes_decrypt' [-Werror,-Wframe-larger-than]
1287 | u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
| ^
This comes from aes_decipher() being inlined in rtw_aes_decrypt(). Running the same build with CONFIG_FRAME_WARN=128 shows aes_cipher() also uses a decent amount of stack, just under the limit of 2048:
drivers/staging/rtl8723bs/core/rtw_security.c:864:19: warning: stack frame size (1952) exceeds limit (128) in 'aes_cipher' [-Wframe-larger-than]
864 | static signed int aes_cipher(u8 *key, uint hdrlen,
| ^
-Rpass-analysis=stack-frame-layout only shows one large structure on the stack, which is the ctx variable inlined from aes128k128d(). A good number of the other variables come from the additional checks of fortified string routines, which are present in memset(), which both aes_cipher() and aes_decipher() use to initialize some temporary buffers. In this case, since the size is known at compile time, these additional checks should not result in any code generation changes but allmodconfig has several sanitizers enabled, which may make it harder for the compiler to eliminate the compile time checks and the variables that come about from them.
The memset() calls are just initializing these buffers to zero, so use '= {}' instead, which is used all over the kernel and does the exact same thing as memset() without the fortify checks, which drops the stack usage of these functions by a few hundred kilobytes.
drivers/staging/rtl8723bs/core/rtw_security.c:864:19: warning: stack frame size (1584) exceeds limit (128) in 'aes_cipher' [-Wframe-larger-than]
864 | static signed int aes_cipher(u8 *key, uint hdrlen,
| ^
drivers/staging/rtl8723bs/core/rtw_security.c:1271:5: warning: stack frame size (1456) exceeds limit (128) in 'rtw_aes_decrypt' [-Wframe-larger-than]
1271 | u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
| ^
--- drivers/staging/rtl8723bs/core/rtw_security.c | 44 ++++++++------------------ 1 file changed, 14 insertions(+), 30 deletions(-)
drivers/staging/rtl8723bs/core/rtw_security.c +14 -30
@@ -869,29 +869,21 @@ static signed int aes_cipher(u8 *key, ui num_blocks, payload_index;u8 pn_vector[6 ]; -u8 mic_iv[16 ]; -u8 mic_header1[16 ]; -u8 mic_header2[16 ]; -u8 ctr_preload[16 ]; +u8 mic_iv[16 ] = {}; +u8 mic_header1[16 ] = {}; +u8 mic_header2[16 ] = {}; +u8 ctr_preload[16 ] = {};/* Intermediate Buffers */ -u8 chain_buffer[16 ]; -u8 aes_out[16 ]; -u8 padded_buffer[16 ]; +u8 chain_buffer[16 ] = {}; +u8 aes_out[16 ] = {}; +u8 padded_buffer[16 ] = {};u8 mic[8 ];uint frtype =GetFrameType (pframe);uint frsubtype =GetFrameSubType (pframe); frsubtype = frsubtype>>4 ; -memset ((void *)mic_iv,0 ,16 ); -memset ((void *)mic_header1,0 ,16 ); -memset ((void *)mic_header2,0 ,16 ); -memset ((void *)ctr_preload,0 ,16 ); -memset ((void *)chain_buffer,0 ,16 ); -memset ((void *)aes_out,0 ,16 ); -memset ((void *)padded_buffer,0 ,16 ); -if ((hdrlen ==WLAN_HDR_A3_LEN ) || (hdrlen ==WLAN_HDR_A3_QOS_LEN )) a4_exists =0 ;else
@@ -1081,15 +1073,15 @@ static signed int aes_decipher(u8 *key, num_blocks, payload_index;signed int res = _SUCCESS;u8 pn_vector[6 ]; -u8 mic_iv[16 ]; -u8 mic_header1[16 ]; -u8 mic_header2[16 ]; -u8 ctr_preload[16 ]; +u8 mic_iv[16 ] = {}; +u8 mic_header1[16 ] = {}; +u8 mic_header2[16 ] = {}; +u8 ctr_preload[16 ] = {};/* Intermediate Buffers */ -u8 chain_buffer[16 ]; -u8 aes_out[16 ]; -u8 padded_buffer[16 ]; +u8 chain_buffer[16 ] = {}; +u8 aes_out[16 ] = {}; +u8 padded_buffer[16 ] = {};u8 mic[8 ];uint frtype =GetFrameType (pframe);
@@ -1097,14 +1089,6 @@ static signed int aes_decipher(u8 *key, frsubtype = frsubtype>>4 ; -memset ((void *)mic_iv,0 ,16 ); -memset ((void *)mic_header1,0 ,16 ); -memset ((void *)mic_header2,0 ,16 ); -memset ((void *)ctr_preload,0 ,16 ); -memset ((void *)chain_buffer,0 ,16 ); -memset ((void *)aes_out,0 ,16 ); -memset ((void *)padded_buffer,0 ,16 ); -/* start to decrypt the payload */ num_blocks = (plen-8 ) /16 ;/* plen including LLC, payload_length and mic) */
Greg Kroah-Hartman
maintainerPATCH 73/160 dt-bindings: serial: 8250: Make clocks and clock-frequency exclusive
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yao Zi <[email protected]>
commit 09812134071b3941fb81def30b61ed36d3a5dfb5 upstream.
The 8250 binding before converting to json-schema states,
- clock-frequency : the input clock frequency for the UART
or
- clocks phandle to refer to the clk used as per Documentation/devicetree
for clock-related properties, where "or" indicates these properties shouldn't exist at the same time.
Additionally, the behavior of Linux's driver is strange when both clocks and clock-frequency are specified: it ignores clocks and obtains the frequency from clock-frequency, left the specified clocks unclaimed. It may even be disabled, which is undesired most of the time.
But "anyOf" doesn't prevent these two properties from coexisting, as it considers the object valid as long as there's at LEAST one match.
Let's switch to "oneOf" and disallows the other property if one exists, precisely matching the original binding and avoiding future confusion on the driver's behavior.
--- Documentation/devicetree/bindings/serial/8250.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/serial/8250.yaml +1 -1
@@ -44,7 +44,7 @@ allOf: - ns16550 - ns16550a then: - anyOf: + oneOf: - required: [ clock-frequency ] - required: [ clocks ]
Greg Kroah-Hartman
maintainerPATCH 74/160 Bluetooth: L2CAP: Fix L2CAP MTU negotiation
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frédéric Danis <[email protected]>
commit 042bb9603c44620dce98717a2d23235ca57a00d7 upstream.
OBEX download from iPhone is currently slow due to small packet size used to transfer data which doesn't follow the MTU negotiated during L2CAP connection, i.e. 672 bytes instead of 32767:
< ACL Data TX: Handle 11 flags 0x00 dlen 12
L2CAP: Connection Request (0x02) ident 18 len 4
PSM: 4103 (0x1007)
Source CID: 72Quoted 1 line
ACL Data RX: Handle 11 flags
0x02dlen 16
L2CAP: Connection Response (0x03) ident 18 len 8
Destination CID: 14608
Source CID: 72
Result: Connection successful (0x0000)
Status: No further information available (0x0000)
< ACL Data TX: Handle 11 flags 0x00 dlen 27
L2CAP: Configure Request (0x04) ident 20 len 19
Destination CID: 14608
Flags: 0x0000
Option: Maximum Transmission Unit (0x01) [mandatory]
MTU: 32767
Option: Retransmission and Flow Control (0x04) [mandatory]
Mode: Enhanced Retransmission (0x03)
TX window size: 63
Max transmit: 3
Retransmission timeout: 2000
Monitor timeout: 12000
Maximum PDU size: 1009Quoted 1 line
ACL Data RX: Handle 11 flags
0x02dlen 26
L2CAP: Configure Request (0x04) ident 72 len 18
Destination CID: 72
Flags: 0x0000
Option: Retransmission and Flow Control (0x04) [mandatory]
Mode: Enhanced Retransmission (0x03)
TX window size: 32
Max transmit: 255
Retransmission timeout: 0
Monitor timeout: 0
Maximum PDU size: 65527
Option: Frame Check Sequence (0x05) [mandatory]
FCS: 16-bit FCS (0x01)
< ACL Data TX: Handle 11 flags 0x00 dlen 29
L2CAP: Configure Response (0x05) ident 72 len 21
Source CID: 14608
Flags: 0x0000
Result: Success (0x0000)
Option: Maximum Transmission Unit (0x01) [mandatory]
MTU: 672
Option: Retransmission and Flow Control (0x04) [mandatory]
Mode: Enhanced Retransmission (0x03)
TX window size: 32
Max transmit: 255
Retransmission timeout: 2000
Monitor timeout: 12000
Maximum PDU size: 1009Quoted 1 line
ACL Data RX: Handle 11 flags
0x02dlen 32
L2CAP: Configure Response (0x05) ident 20 len 24
Source CID: 72
Flags: 0x0000
Result: Success (0x0000)
Option: Maximum Transmission Unit (0x01) [mandatory]
MTU: 32767
Option: Retransmission and Flow Control (0x04) [mandatory]
Mode: Enhanced Retransmission (0x03)
TX window size: 63
Max transmit: 3
Retransmission timeout: 2000
Monitor timeout: 12000
Maximum PDU size: 1009
Option: Frame Check Sequence (0x05) [mandatory]
FCS: 16-bit FCS (0x01)...
Quoted 1 line
ACL Data RX: Handle 11 flags
0x02dlen 680
Channel: 72 len 676 ctrl 0x0202 [PSM 4103 mode Enhanced Retransmission (0x03)] {chan 8}
I-frame: Unsegmented TxSeq 1 ReqSeq 2
< ACL Data TX: Handle 11 flags 0x00 dlen 13
Channel: 14608 len 9 ctrl 0x0204 [PSM 4103 mode Enhanced Retransmission (0x03)] {chan 8}
I-frame: Unsegmented TxSeq 2 ReqSeq 2
Quoted 1 line
ACL Data RX: Handle 11 flags
0x02dlen 680
Channel: 72 len 676 ctrl 0x0304 [PSM 4103 mode Enhanced Retransmission (0x03)] {chan 8}
I-frame: Unsegmented TxSeq 2 ReqSeq 3
The MTUs are negotiated for each direction. In this traces 32767 for iPhone->localhost and no MTU for localhost->iPhone, which based on '4.4 L2CAP_CONFIGURATION_REQ' (Core specification v5.4, Vol. 3, Part A):
The only parameters that should be included in the L2CAP_CONFIGURATION_REQ packet are those that require different values than the default or previously agreed values.
...
Any missing configuration parameters are assumed to have their most recently explicitly or implicitly accepted values.
and '5.1 Maximum transmission unit (MTU)':
If the remote device sends a positive L2CAP_CONFIGURATION_RSP packet it should include the actual MTU to be used on this channel for traffic flowing into the local device.
...
The default value is 672 octets.
is set by BlueZ to 672 bytes.
It seems that the iPhone used the lowest negotiated value to transfer data to the localhost instead of the negotiated one for the incoming direction.
This could be fixed by using the MTU negotiated for the other direction, if exists, in the L2CAP_CONFIGURATION_RSP. This allows to use segmented packets as in the following traces:
< ACL Data TX: Handle 11 flags 0x00 dlen 12
L2CAP: Connection Request (0x02) ident 22 len 4
PSM: 4103 (0x1007)
Source CID: 72
< ACL Data TX: Handle 11 flags 0x00 dlen 27
L2CAP: Configure Request (0x04) ident 24 len 19
Destination CID: 2832
Flags: 0x0000
Option: Maximum Transmission Unit (0x01) [mandatory]
MTU: 32767
Option: Retransmission and Flow Control (0x04) [mandatory]
Mode: Enhanced Retransmission (0x03)
TX window size: 63
Max transmit: 3
Retransmission timeout: 2000
Monitor timeout: 12000
Maximum PDU size: 1009Quoted 1 line
ACL Data RX: Handle 11 flags
0x02dlen 26
L2CAP: Configure Request (0x04) ident 15 len 18
Destination CID: 72
Flags: 0x0000
Option: Retransmission and Flow Control (0x04) [mandatory]
Mode: Enhanced Retransmission (0x03)
TX window size: 32
Max transmit: 255
Retransmission timeout: 0
Monitor timeout: 0
Maximum PDU size: 65527
Option: Frame Check Sequence (0x05) [mandatory]
FCS: 16-bit FCS (0x01)
< ACL Data TX: Handle 11 flags 0x00 dlen 29
L2CAP: Configure Response (0x05) ident 15 len 21
Source CID: 2832
Flags: 0x0000
Result: Success (0x0000)
Option: Maximum Transmission Unit (0x01) [mandatory]
MTU: 32767
Option: Retransmission and Flow Control (0x04) [mandatory]
Mode: Enhanced Retransmission (0x03)
TX window size: 32
Max transmit: 255
Retransmission timeout: 2000
Monitor timeout: 12000
Maximum PDU size: 1009Quoted 1 line
ACL Data RX: Handle 11 flags
0x02dlen 32
L2CAP: Configure Response (0x05) ident 24 len 24
Source CID: 72
Flags: 0x0000
Result: Success (0x0000)
Option: Maximum Transmission Unit (0x01) [mandatory]
MTU: 32767
Option: Retransmission and Flow Control (0x04) [mandatory]
Mode: Enhanced Retransmission (0x03)
TX window size: 63
Max transmit: 3
Retransmission timeout: 2000
Monitor timeout: 12000
Maximum PDU size: 1009
Option: Frame Check Sequence (0x05) [mandatory]
FCS: 16-bit FCS (0x01)...
Quoted 1 line
ACL Data RX: Handle 11 flags
0x02dlen 1009
Channel: 72 len 1005 ctrl 0x4202 [PSM 4103 mode Enhanced Retransmission (0x03)] {chan 8}
I-frame: Start (len 21884) TxSeq 1 ReqSeq 2Quoted 1 line
ACL Data RX: Handle 11 flags
0x02dlen 1009
Channel: 72 len 1005 ctrl 0xc204 [PSM 4103 mode Enhanced Retransmission (0x03)] {chan 8}
I-frame: Continuation TxSeq 2 ReqSeq 2
This has been tested with kernel 5.4 and BlueZ 5.77.
--- net/bluetooth/l2cap_core.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
net/bluetooth/l2cap_core.c +8 -1
@@ -3576,7 +3576,7 @@ static int l2cap_parse_conf_req(struct lstruct l2cap_conf_rfc rfc = { .mode =L2CAP_MODE_BASIC };struct l2cap_conf_efs efs;u8 remote_efs =0 ; -u16 mtu =L2CAP_DEFAULT_MTU ; +u16 mtu =0 ;u16 result =L2CAP_CONF_SUCCESS ;u16 size;
@@ -3687,6 +3687,13 @@ done:/* Configure output options and let the other side know * which ones we don't like. */ +/* If MTU is not provided in configure request, use the most recently +* explicitly or implicitly accepted value for the other direction, +* or the default value. +*/ +if (mtu ==0 ) + mtu = chan->imtu ? chan->imtu :L2CAP_DEFAULT_MTU ; +if (mtu <L2CAP_DEFAULT_MIN_MTU ) result =L2CAP_CONF_UNACCEPT ;else {
Greg Kroah-Hartman
maintainerPATCH 75/160 dm-raid: fix variable in journal device check
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heinz Mauelshagen <[email protected]>
commit db53805156f1e0aa6d059c0d3f9ac660d4ef3eb4 upstream.
Replace "rdev" with correct loop variable name "r".
--- drivers/md/dm-raid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-raid.c +1 -1
@@ -2381,7 +2381,7 @@ static int super_init_validation(struct*/ sb_retrieve_failed_devices (sb, failed_devices);rdev_for_each (r, mddev) { -if (test_bit (Journal, &rdev->flags) || +if (test_bit (Journal, &r->flags) || !r->sb_page)continue ; sb2 =page_address (r->sb_page);
Greg Kroah-Hartman
maintainerPATCH 76/160 btrfs: update superblocks device bytes_used when dropping chunk
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Harmstone <[email protected]>
commit ae4477f937569d097ca5dbce92a89ba384b49bc6 upstream.
Each superblock contains a copy of the device item for that device. In a transaction which drops a chunk but doesn't create any new ones, we were correctly updating the device item in the chunk tree but not copying over the new bytes_used value to the superblock.
This can be seen by doing the following:
# dd if=/dev/zero of=test bs=4096 count=2621440 # mkfs.btrfs test # mount test /root/temp
# cd /root/temp
# for i in {00..10}; do dd if=/dev/zero of=$i bs=4096 count=32768; done
# sync
# rm *
# sync
# btrfs balance start -dusage=0 .
# sync# cd # umount /root/temp # btrfs check test
For btrfs-check to detect this, you will also need my patch at
https://github.com/kdave/btrfs-progs/pull/991.
Change btrfs_remove_dev_extents() so that it adds the devices to the fs_info->post_commit_list if they're not there already. This causes btrfs_commit_device_sizes() to be called, which updates the bytes_used value in the superblock.
--- fs/btrfs/volumes.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/btrfs/volumes.c +6 -0
@@ -3197,6 +3197,12 @@ int btrfs_remove_chunk(struct btrfs_tran device->bytes_used - dev_extent_len);atomic64_add (dev_extent_len, &fs_info->free_chunk_space);btrfs_clear_space_info_full (fs_info); + +if (list_empty (&device->post_commit_list)) { +list_add_tail (&device->post_commit_list, + &trans->transaction->dev_update_list); + } +mutex_unlock (&fs_info->chunk_mutex); } }
Greg Kroah-Hartman
maintainerPATCH 77/160 HID: wacom: fix memory leak on kobject creation failure
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qasim Ijaz <[email protected]>
commit 5ae416c5b1e2e816aee7b3fc8347adf70afabb4c upstream.
During wacom_initialize_remotes() a fifo buffer is allocated with kfifo_alloc() and later a cleanup action is registered during devm_add_action_or_reset() to clean it up.
However if the code fails to create a kobject and register it with sysfs the code simply returns -ENOMEM before the cleanup action is registered leading to a memory leak.
Fix this by ensuring the fifo is freed when the kobject creation and registration process fails.
--- drivers/hid/wacom_sys.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/hid/wacom_sys.c +3 -1
@@ -2020,8 +2020,10 @@ static int wacom_initialize_remotes(stru remote->remote_dir =kobject_create_and_add ("wacom_remote" , &wacom->hdev->dev.kobj); -if (!remote->remote_dir) +if (!remote->remote_dir) { +kfifo_free (&remote->remote_fifo);return -ENOMEM ; + } error =sysfs_create_files (remote->remote_dir, remote_unpair_attrs);
Greg Kroah-Hartman
maintainerPATCH 68/160 um: ubd: Add missing error check in start_io_thread()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tiwei Bie <[email protected]>
[ Upstream commit c55c7a85e02a7bfee20a3ffebdff7cbeb41613ef ]
The subsequent call to os_set_fd_block() overwrites the previous return value. OR the two return values together to fix it.
--- arch/um/drivers/ubd_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/um/drivers/ubd_user.c +1 -1
@@ -41,7 +41,7 @@ int start_io_thread(unsigned long sp, int *fd_out) *fd_out = fds[1 ]; err =os_set_fd_block (*fd_out,0 ); - err =os_set_fd_block (kernel_fd,0 ); + err |=os_set_fd_block (kernel_fd,0 );if (err) {printk ("start_io_thread - failed to set nonblocking I/O.\n" ); goto out_close;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 101/160 usb: typec: altmodes/displayport: do not index invalid pin_assignments
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: RD Babiera <[email protected]>
commit af4db5a35a4ef7a68046883bfd12468007db38f1 upstream.
A poorly implemented DisplayPort Alt Mode port partner can indicate that its pin assignment capabilities are greater than the maximum value, DP_PIN_ASSIGN_F. In this case, calls to pin_assignment_show will cause a BRK exception due to an out of bounds array access.
Prevent for loop in pin_assignment_show from accessing invalid values in pin_assignments by adding DP_PIN_ASSIGN_MAX value in typec_dp.h and using i < DP_PIN_ASSIGN_MAX as a loop condition.
--- drivers/usb/typec/altmodes/displayport.c | 2 +- include/linux/usb/typec_dp.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/usb/typec/altmodes/displayport.c +1 -1
@@ -503,7 +503,7 @@ static ssize_t pin_assignment_show(struc assignments =get_current_pin_assignments (dp); -for (i =0 ; assignments; assignments >>=1 , i++) { +for (i =0 ; assignments && i <DP_PIN_ASSIGN_MAX ; assignments >>=1 , i++) {if (assignments &1 ) {if (i == cur) len += sprintf(buf + len, "[%s] ",
include/linux/usb/typec_dp.h +1 -0
@@ -56,6 +56,7 @@ enum {DP_PIN_ASSIGN_D ,DP_PIN_ASSIGN_E ,DP_PIN_ASSIGN_F ,/* Not supported after v1.0b */ + DP_PIN_ASSIGN_MAX, };/* DisplayPort alt mode specific commands */
Greg Kroah-Hartman
maintainerPATCH 110/160 scsi: qla4xxx: Fix missing DMA mapping error in qla4xxx_alloc_pdu()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Fourier <[email protected]>
[ Upstream commit 00f452a1b084efbe8dcb60a29860527944a002a1 ]
dma_map_XXX() can fail and should be tested for errors with dma_mapping_error().
--- drivers/scsi/qla4xxx/ql4_os.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/scsi/qla4xxx/ql4_os.c +2 -0
@@ -3420,6 +3420,8 @@ static int qla4xxx_alloc_pdu(struct iscsi_task *task, uint8_t opcode) task_data->data_dma =dma_map_single (&ha->pdev->dev, task->data, task->data_count,DMA_TO_DEVICE ); +if (dma_mapping_error (&ha->pdev->dev, task_data->data_dma)) +return -ENOMEM ; } DEBUG2(ql4_printk(KERN_INFO, ha, "%s: MaxRecvLen %u, iscsi hrd %d\n",
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 111/160 scsi: ufs: core: Fix spelling of a sysfs attribute name
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bart Van Assche <[email protected]>
[ Upstream commit 021f243627ead17eb6500170256d3d9be787dad8 ]
Change "resourse" into "resource" in the name of a sysfs attribute.
--- Documentation/ABI/testing/sysfs-driver-ufs | 2 +- drivers/scsi/ufs/ufs-sysfs.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
Documentation/ABI/testing/sysfs-driver-ufs +1 -1
@@ -655,7 +655,7 @@ Description: This file shows the thin provisioning type. This is one of The file is read only. -What: /sys/class/scsi_device/*/device/unit_descriptor/physical_memory_resourse_count +What: /sys/class/scsi_device/*/device/unit_descriptor/physical_memory_resource_count Date: February 2018 Contact: Stanislav Nijnikov <[email protected]> Description: This file shows the total physical memory resources. This is
drivers/scsi/ufs/ufs-sysfs.c +2 -2
@@ -1180,7 +1180,7 @@ UFS_UNIT_DESC_PARAM(logical_block_size, _LOGICAL_BLK_SIZE, 1);UFS_UNIT_DESC_PARAM (logical_block_count, _LOGICAL_BLK_COUNT,8 );UFS_UNIT_DESC_PARAM (erase_block_size, _ERASE_BLK_SIZE,4 );UFS_UNIT_DESC_PARAM (provisioning_type, _PROVISIONING_TYPE,1 ); -UFS_UNIT_DESC_PARAM (physical_memory_resourse_count, _PHY_MEM_RSRC_CNT,8 ); +UFS_UNIT_DESC_PARAM (physical_memory_resource_count, _PHY_MEM_RSRC_CNT,8 );UFS_UNIT_DESC_PARAM (context_capabilities, _CTX_CAPABILITIES,2 );UFS_UNIT_DESC_PARAM (large_unit_granularity, _LARGE_UNIT_SIZE_M1,1 );UFS_UNIT_DESC_PARAM (hpb_lu_max_active_regions, _HPB_LU_MAX_ACTIVE_RGNS,2 );
@@ -1200,7 +1200,7 @@ static struct attribute *ufs_sysfs_unit_descriptor[] = { &dev_attr_logical_block_count.attr, &dev_attr_erase_block_size.attr, &dev_attr_provisioning_type.attr, - &dev_attr_physical_memory_resourse_count.attr, + &dev_attr_physical_memory_resource_count.attr, &dev_attr_context_capabilities.attr, &dev_attr_large_unit_granularity.attr, &dev_attr_hpb_lu_max_active_regions.attr,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 112/160 RDMA/mlx5: Fix CC counters query for MPV
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Patrisious Haddad <[email protected]>
[ Upstream commit acd245b1e33fc4b9d0f2e3372021d632f7ee0652 ]
In case, CC counters are querying for the second port use the correct core device for the query instead of always using the master core device.
--- drivers/infiniband/hw/mlx5/counters.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/mlx5/counters.c +1 -1
@@ -279,7 +279,7 @@ static int mlx5_ib_get_hw_stats(struct ib_device *ibdev,*/ goto done; } - ret = mlx5_lag_query_cong_counters(dev->mdev, + ret = mlx5_lag_query_cong_counters(mdev, stats->value + cnts->num_q_counters, cnts->num_cong_counters,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 113/160 btrfs: fix missing error handling when searching for inode refs during log replay
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
[ Upstream commit 6561a40ceced9082f50c374a22d5966cf9fc5f5c ]
During log replay, at __add_inode_ref(), when we are searching for inode ref keys we totally ignore if btrfs_search_slot() returns an error. This may make a log replay succeed when there was an actual error and leave some metadata inconsistency in a subvolume tree. Fix this by checking if an error was returned from btrfs_search_slot() and if so, return it to the caller.
--- fs/btrfs/tree-log.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/btrfs/tree-log.c +3 -1
@@ -1066,7 +1066,9 @@ static inline int __add_inode_ref(struct btrfs_trans_handle *trans, search_key.type =BTRFS_INODE_REF_KEY ; search_key.offset = parent_objectid; ret =btrfs_search_slot (NULL , root, &search_key, path,0 ,0 ); -if (ret ==0 ) { +if (ret <0 ) { +return ret; + }else if (ret ==0 ) {struct btrfs_inode_ref *victim_ref;unsigned long ptr;unsigned long ptr_end;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 114/160 drm/exynos: fimd: Guard display clock control with runtime PM calls
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Szyprowski <[email protected]>
[ Upstream commit 5d91394f236167ac624b823820faf4aa928b889e ]
Commit c9b1150a68d9 ("drm/atomic-helper: Re-order bridge chain pre-enable and post-disable") changed the call sequence to the CRTC enable/disable and bridge pre_enable/post_disable methods, so those bridge methods are now called when CRTC is not yet enabled.
This causes a lockup observed on Samsung Peach-Pit/Pi Chromebooks. The source of this lockup is a call to fimd_dp_clock_enable() function, when FIMD device is not yet runtime resumed. It worked before the mentioned commit only because the CRTC implemented by the FIMD driver was always enabled what guaranteed the FIMD device to be runtime resumed.
This patch adds runtime PM guards to the fimd_dp_clock_enable() function to enable its proper operation also when the CRTC implemented by FIMD is not yet enabled.
--- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/gpu/drm/exynos/exynos_drm_fimd.c +12 -0
@@ -182,6 +182,7 @@ struct fimd_context {u32 i80ifcon;bool i80_if;bool suspended; +bool dp_clk_enabled;wait_queue_head_t wait_vsync_queue;atomic_t wait_vsync_event;atomic_t win_updated;
@@ -1014,7 +1015,18 @@ static void fimd_dp_clock_enable(struct exynos_drm_clk *clk, bool enable) struct fimd_context *ctx = container_of(clk, struct fimd_context, dp_clk);u32 val = enable ?DP_MIE_CLK_DP_ENABLE :DP_MIE_CLK_DISABLE ; + +if (enable == ctx->dp_clk_enabled) +return ; + +if (enable) +pm_runtime_resume_and_get (ctx->dev); + + ctx->dp_clk_enabled = enable;writel (val, ctx->regs +DP_MIE_CLKCON ); + +if (!enable) +pm_runtime_put (ctx->dev); }static const struct exynos_drm_crtc_ops fimd_crtc_ops = {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 115/160 spi: spi-fsl-dspi: Clear completion counter before initiating transfer
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: James Clark <[email protected]>
[ Upstream commit fa60c094c19b97e103d653f528f8d9c178b6a5f5 ]
In target mode, extra interrupts can be received between the end of a transfer and halting the module if the host continues sending more data. If the interrupt from this occurs after the reinit_completion() then the completion counter is left at a non-zero value. The next unrelated transfer initiated by userspace will then complete immediately without waiting for the interrupt or writing to the RX buffer.
Fix it by resetting the counter before the transfer so that lingering values are cleared. This is done after clearing the FIFOs and the status register but before the transfer is initiated, so no interrupts should be received at this point resulting in other race conditions.
--- drivers/spi/spi-fsl-dspi.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/spi/spi-fsl-dspi.c +10 -1
@@ -964,11 +964,20 @@ static int dspi_transfer_one_message(struct spi_controller *ctlr,if (dspi->devtype_data->trans_mode ==DSPI_DMA_MODE ) { status =dspi_dma_xfer (dspi); }else { +/* +* Reinitialize the completion before transferring data +* to avoid the case where it might remain in the done +* state due to a spurious interrupt from a previous +* transfer. This could falsely signal that the current +* transfer has completed. +*/ +if (dspi->irq) +reinit_completion (&dspi->xfer_done); +dspi_fifo_write (dspi);if (dspi->irq) {wait_for_completion (&dspi->xfer_done); -reinit_completion (&dspi->xfer_done); }else { do { status = dspi_poll(dspi);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 116/160 drm/i915/selftests: Change mock_request() to return error pointers
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit caa7c7a76b78ce41d347003f84975125383e6b59 ]
There was an error pointer vs NULL bug in __igt_breadcrumbs_smoketest(). The __mock_request_alloc() function implements the smoketest->request_alloc() function pointer. It was supposed to return error pointers, but it propogates the NULL return from mock_request() so in the event of a failure, it would lead to a NULL pointer dereference.
To fix this, change the mock_request() function to return error pointers and update all the callers to expect that.
--- drivers/gpu/drm/i915/selftests/i915_request.c | 20 +++++++++---------- drivers/gpu/drm/i915/selftests/mock_request.c | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/selftests/i915_request.c +10 -10
@@ -72,8 +72,8 @@ static int igt_add_request(void *arg)/* Basic preliminary test to create a request and let it loose! */ request =mock_request (rcs0 (i915)->kernel_context,HZ /10 ); -if (!request) -return -ENOMEM ; +if (IS_ERR (request)) +return PTR_ERR (request);i915_request_add (request);
@@ -90,8 +90,8 @@ static int igt_wait_request(void *arg)/* Submit a request, then wait upon it */ request =mock_request (rcs0 (i915)->kernel_context,T ); -if (!request) -return -ENOMEM ; +if (IS_ERR (request)) +return PTR_ERR (request);i915_request_get (request);
@@ -159,8 +159,8 @@ static int igt_fence_wait(void *arg)/* Submit a request, treat it as a fence and wait upon it */ request =mock_request (rcs0 (i915)->kernel_context,T ); -if (!request) -return -ENOMEM ; +if (IS_ERR (request)) +return PTR_ERR (request);if (dma_fence_wait_timeout (&request->fence, false,T ) != -ETIME ) {pr_err ("fence wait success before submit (expected timeout)!\n" );
@@ -214,8 +214,8 @@ static int igt_request_rewind(void *arg)GEM_BUG_ON (IS_ERR (ce)); request =mock_request (ce,2 *HZ );intel_context_put (ce); -if (!request) { - err = -ENOMEM ; +if (IS_ERR (request)) { + err =PTR_ERR (request); goto err_context_0; }
@@ -228,8 +228,8 @@ static int igt_request_rewind(void *arg)GEM_BUG_ON (IS_ERR (ce)); vip =mock_request (ce,0 );intel_context_put (ce); -if (!vip) { - err = -ENOMEM ; +if (IS_ERR (vip)) { + err =PTR_ERR (vip); goto err_context_1; }
drivers/gpu/drm/i915/selftests/mock_request.c +1 -1
@@ -35,7 +35,7 @@ mock_request(struct intel_context *ce, unsigned long delay)/* NB the i915->requests slab cache is enlarged to fit mock_request */ request =intel_context_create_request (ce);if (IS_ERR (request)) -return NULL ; +return request; request->mock.delay = delay;return request;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 117/160 platform/x86: dell-wmi-sysman: Fix WMI data block retrieval in sysfs callbacks
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kurt Borja <[email protected]>
[ Upstream commit eb617dd25ca176f3fee24f873f0fd60010773d67 ]
After retrieving WMI data blocks in sysfs callbacks, check for the validity of them before dereferencing their content.
--- .../platform/x86/dell/dell-wmi-sysman/dell-wmi-sysman.h | 5 +++++ .../platform/x86/dell/dell-wmi-sysman/enum-attributes.c | 5 +++-- .../platform/x86/dell/dell-wmi-sysman/int-attributes.c | 5 +++-- .../x86/dell/dell-wmi-sysman/passobj-attributes.c | 5 +++-- .../platform/x86/dell/dell-wmi-sysman/string-attributes.c | 5 +++-- drivers/platform/x86/dell/dell-wmi-sysman/sysman.c | 8 ++++---- 6 files changed, 21 insertions(+), 12 deletions(-)
drivers/platform/x86/dell/dell-wmi-sysman/dell-wmi-sysman.h +5 -0
@@ -89,6 +89,11 @@ extern struct wmi_sysman_priv wmi_priv;enum {ENUM ,INT ,STR ,PO }; +#define ENUM_MIN_ELEMENTS 8 +#define INT_MIN_ELEMENTS 9 +#define STR_MIN_ELEMENTS 8 +#define PO_MIN_ELEMENTS 4 +enum {ATTR_NAME ,DISPL_NAME_LANG_CODE ,
drivers/platform/x86/dell/dell-wmi-sysman/enum-attributes.c +3 -2
@@ -23,9 +23,10 @@ static ssize_t current_value_show(struct kobject *kobj, struct kobj_attribute *a obj =get_wmiobj_pointer (instance_id,DELL_WMI_BIOS_ENUMERATION_ATTRIBUTE_GUID );if (!obj)return -EIO ; -if (obj->package.elements[CURRENT_VAL ].type !=ACPI_TYPE_STRING ) { +if (obj->type !=ACPI_TYPE_PACKAGE || obj->package.count <ENUM_MIN_ELEMENTS || + obj->package.elements[CURRENT_VAL ].type !=ACPI_TYPE_STRING ) {kfree (obj); -return -EINVAL ; +return -EIO ; } ret =snprintf (buf,PAGE_SIZE ,"%s\n" , obj->package.elements[CURRENT_VAL ].string.pointer);kfree (obj);
drivers/platform/x86/dell/dell-wmi-sysman/int-attributes.c +3 -2
@@ -25,9 +25,10 @@ static ssize_t current_value_show(struct kobject *kobj, struct kobj_attribute *a obj =get_wmiobj_pointer (instance_id,DELL_WMI_BIOS_INTEGER_ATTRIBUTE_GUID );if (!obj)return -EIO ; -if (obj->package.elements[CURRENT_VAL ].type !=ACPI_TYPE_INTEGER ) { +if (obj->type !=ACPI_TYPE_PACKAGE || obj->package.count <INT_MIN_ELEMENTS || + obj->package.elements[CURRENT_VAL ].type !=ACPI_TYPE_INTEGER ) {kfree (obj); -return -EINVAL ; +return -EIO ; } ret =snprintf (buf,PAGE_SIZE ,"%lld\n" , obj->package.elements[CURRENT_VAL ].integer.value);kfree (obj);
drivers/platform/x86/dell/dell-wmi-sysman/passobj-attributes.c +3 -2
@@ -26,9 +26,10 @@ static ssize_t is_enabled_show(struct kobject *kobj, struct kobj_attribute *attr obj =get_wmiobj_pointer (instance_id,DELL_WMI_BIOS_PASSOBJ_ATTRIBUTE_GUID );if (!obj)return -EIO ; -if (obj->package.elements[IS_PASS_SET ].type !=ACPI_TYPE_INTEGER ) { +if (obj->type !=ACPI_TYPE_PACKAGE || obj->package.count <PO_MIN_ELEMENTS || + obj->package.elements[IS_PASS_SET ].type !=ACPI_TYPE_INTEGER ) {kfree (obj); -return -EINVAL ; +return -EIO ; } ret =snprintf (buf,PAGE_SIZE ,"%lld\n" , obj->package.elements[IS_PASS_SET ].integer.value);kfree (obj);
drivers/platform/x86/dell/dell-wmi-sysman/string-attributes.c +3 -2
@@ -25,9 +25,10 @@ static ssize_t current_value_show(struct kobject *kobj, struct kobj_attribute *a obj =get_wmiobj_pointer (instance_id,DELL_WMI_BIOS_STRING_ATTRIBUTE_GUID );if (!obj)return -EIO ; -if (obj->package.elements[CURRENT_VAL ].type !=ACPI_TYPE_STRING ) { +if (obj->type !=ACPI_TYPE_PACKAGE || obj->package.count <STR_MIN_ELEMENTS || + obj->package.elements[CURRENT_VAL ].type !=ACPI_TYPE_STRING ) {kfree (obj); -return -EINVAL ; +return -EIO ; } ret =snprintf (buf,PAGE_SIZE ,"%s\n" , obj->package.elements[CURRENT_VAL ].string.pointer);kfree (obj);
drivers/platform/x86/dell/dell-wmi-sysman/sysman.c +4 -4
@@ -411,10 +411,10 @@ static int init_bios_attributes(int attr_type, const char *guid)return retval;switch (attr_type) { -case ENUM : min_elements =8 ;break ; -case INT : min_elements =9 ;break ; -case STR : min_elements =8 ;break ; -case PO : min_elements =4 ;break ; +case ENUM : min_elements =ENUM_MIN_ELEMENTS ;break ; +case INT : min_elements =INT_MIN_ELEMENTS ;break ; +case STR : min_elements =STR_MIN_ELEMENTS ;break ; +case PO : min_elements =PO_MIN_ELEMENTS ;break ;default :pr_err ("Error: Unknown attr_type: %d\n" , attr_type);return -EINVAL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 118/160 drm/i915/gt: Fix timeline left held on VMA alloc error
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Janusz Krzysztofik <[email protected]>
[ Upstream commit a5aa7bc1fca78c7fa127d9e33aa94a0c9066c1d6 ]
The following error has been reported sporadically by CI when a test unbinds the i915 driver on a ring submission platform:
<4> [239.330153] ------------[ cut here ]------------
<4> [239.330166] i915 0000:00:02.0: [drm] drm_WARN_ON(dev_priv->mm.shrink_count)
<4> [239.330196] WARNING: CPU: 1 PID: 18570 at drivers/gpu/drm/i915/i915_gem.c:1309 i915_gem_cleanup_early+0x13e/0x150 [i915]
...
<4> [239.330640] RIP: 0010:i915_gem_cleanup_early+0x13e/0x150 [i915]
...
<4> [239.330942] Call Trace:
<4> [239.330944] <TASK> <4> [239.330949] i915_driver_late_release+0x2b/0xa0 [i915] <4> [239.331202] i915_driver_release+0x86/0xa0 [i915] <4> [239.331482] devm_drm_dev_init_release+0x61/0x90 <4> [239.331494] devm_action_release+0x15/0x30 <4> [239.331504] release_nodes+0x3d/0x120 <4> [239.331517] devres_release_all+0x96/0xd0 <4> [239.331533] device_unbind_cleanup+0x12/0x80 <4> [239.331543] device_release_driver_internal+0x23a/0x280 <4> [239.331550] ? bus_find_device+0xa5/0xe0 <4> [239.331563] device_driver_detach+0x14/0x20
...
<4> [357.719679] ---[ end trace 0000000000000000 ]---
If the test also unloads the i915 module then that's followed with:
<3> [357.787478] =============================================================================
<3> [357.788006] BUG i915_vma (Tainted: G U W N ): Objects remaining on __kmem_cache_shutdown()
<3> [357.788031] ----------------------------------------------------------------------------- <3> [357.788204] Object 0xffff888109e7f480 @offset=29824
<3> [357.788670] Allocated in i915_vma_instance+0xee/0xc10 [i915] age=292729 cpu=4 pid=2244
<4> [357.788994] i915_vma_instance+0xee/0xc10 [i915] <4> [357.789290] init_status_page+0x7b/0x420 [i915] <4> [357.789532] intel_engines_init+0x1d8/0x980 [i915] <4> [357.789772] intel_gt_init+0x175/0x450 [i915] <4> [357.790014] i915_gem_init+0x113/0x340 [i915] <4> [357.790281] i915_driver_probe+0x847/0xed0 [i915] <4> [357.790504] i915_pci_probe+0xe6/0x220 [i915]
...
Closer analysis of CI results history has revealed a dependency of the error on a few IGT tests, namely:
- igt@api_intel_allocator@fork-simple-stress-signal,
- igt@api_intel_allocator@two-level-inception-interruptible,
- igt@gem_linear_blits@interruptible,
- igt@prime_mmap_coherency@ioctl-errors,
which invisibly trigger the issue, then exhibited with first driver unbind attempt.
All of the above tests perform actions which are actively interrupted with signals. Further debugging has allowed to narrow that scope down to DRM_IOCTL_I915_GEM_EXECBUFFER2, and ring_context_alloc(), specific to ring submission, in particular.
If successful then that function, or its execlists or GuC submission equivalent, is supposed to be called only once per GEM context engine, followed by raise of a flag that prevents the function from being called again. The function is expected to unwind its internal errors itself, so it may be safely called once more after it returns an error.
In case of ring submission, the function first gets a reference to the engine's legacy timeline and then allocates a VMA. If the VMA allocation fails, e.g. when i915_vma_instance() called from inside is interrupted with a signal, then ring_context_alloc() fails, leaving the timeline held referenced. On next I915_GEM_EXECBUFFER2 IOCTL, another reference to the timeline is got, and only that last one is put on successful completion. As a consequence, the legacy timeline, with its underlying engine status page's VMA object, is still held and not released on driver unbind.
Get the legacy timeline only after successful allocation of the context engine's VMA.
v2: Add a note on other submission methods (Krzysztof Karas):
Both execlists and GuC submission use lrc_alloc() which seems free from a similar issue.
--- drivers/gpu/drm/i915/gt/intel_ring_submission.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gt/intel_ring_submission.c +2 -1
@@ -563,7 +563,6 @@ static int ring_context_alloc(struct intel_context *ce)/* One ringbuffer to rule them all */ GEM_BUG_ON (!engine->legacy.ring); ce->ring = engine->legacy.ring; - ce->timeline =intel_timeline_get (engine->legacy.timeline);GEM_BUG_ON (ce->state);if (engine->context_size) {
@@ -576,6 +575,8 @@ static int ring_context_alloc(struct intel_context *ce) ce->state = vma; } + ce->timeline =intel_timeline_get (engine->legacy.timeline); +return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 119/160 igc: disable L1.2 PCI-E link substate to avoid performance issue
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vitaly Lifshits <[email protected]>
[ Upstream commit 0325143b59c6c6d79987afc57d2456e7a20d13b7 ]
I226 devices advertise support for the PCI-E link L1.2 substate. However, due to a hardware limitation, the exit latency from this low-power state is longer than the packet buffer can tolerate under high traffic conditions. This can lead to packet loss and degraded performance.
To mitigate this, disable the L1.2 substate. The increased power draw between L1.1 and L1.2 is insignificant.
--- drivers/net/ethernet/intel/igc/igc_main.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/net/ethernet/intel/igc/igc_main.c +10 -0
@@ -6549,6 +6549,10 @@ static int igc_probe(struct pci_dev *pdev, adapter->port_num = hw->bus.func; adapter->msg_enable =netif_msg_init (debug,DEFAULT_MSG_ENABLE ); +/* Disable ASPM L1.2 on I226 devices to avoid packet loss */ +if (igc_is_device_id_i226 (hw)) +pci_disable_link_state (pdev,PCIE_LINK_STATE_L1_2 ); + err =pci_save_state (pdev);if (err) goto err_ioremap;
@@ -6914,6 +6918,9 @@ static int __maybe_unused igc_resume(struct device *dev)pci_enable_wake (pdev, PCI_D3hot,0 );pci_enable_wake (pdev, PCI_D3cold,0 ); +if (igc_is_device_id_i226 (hw)) +pci_disable_link_state (pdev,PCIE_LINK_STATE_L1_2 ); +if (igc_init_interrupt_scheme (adapter, true)) {netdev_err (netdev,"Unable to allocate memory for queues\n" );return -ENOMEM ;
@@ -7029,6 +7036,9 @@ static pci_ers_result_t igc_io_slot_reset(struct pci_dev *pdev)pci_enable_wake (pdev, PCI_D3hot,0 );pci_enable_wake (pdev, PCI_D3cold,0 ); +if (igc_is_device_id_i226 (hw)) +pci_disable_link_state_locked (pdev,PCIE_LINK_STATE_L1_2 ); +/* In case of PCI error, adapter loses its HW address * so we should re-assign it here. */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 102/160 mtk-sd: Fix a pagefault in dma_unmap_sg() for not prepared data
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masami Hiramatsu (Google) <[email protected]>
commit 539d80575b810c7a5987c7ac8915e3bc99c03695 upstream.
When swiotlb buffer is full, the dma_map_sg() returns 0 to msdc_prepare_data(), but it does not check it and sets the MSDC_PREPARE_FLAG.
swiotlb_tbl_map_single() /* prints "swiotlb buffer is full" */
<-swiotlb_map()
<-dma_direct_map_page()
<-dma_direct_map_sg()
<-__dma_map_sg_attrs()
<-dma_map_sg_attrs()
<-dma_map_sg() /* returns 0 (pages mapped) */
<-msdc_prepare_data()Then, the msdc_unprepare_data() checks MSDC_PREPARE_FLAG and calls dma_unmap_sg() with unmapped pages. It causes a page fault.
To fix this problem, Do not set MSDC_PREPARE_FLAG if dma_map_sg() fails because this is not prepared.
--- drivers/mmc/host/mtk-sd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/host/mtk-sd.c +2 -1
@@ -727,9 +727,10 @@ static inline void msdc_dma_setup(structstatic void msdc_prepare_data (struct msdc_host *host,struct mmc_data *data) {if (!(data->host_cookie &MSDC_PREPARE_FLAG )) { - data->host_cookie |=MSDC_PREPARE_FLAG ; data->sg_count =dma_map_sg (host->dev, data->sg, data->sg_len,mmc_get_dma_dir (data)); +if (data->sg_count) + data->host_cookie |=MSDC_PREPARE_FLAG ; } }
Greg Kroah-Hartman
maintainerPATCH 120/160 lib: test_objagg: Set error message in check_expect_hints_stats()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit e6ed134a4ef592fe1fd0cafac9683813b3c8f3e8 ]
Smatch complains that the error message isn't set in the caller:
lib/test_objagg.c:923 test_hints_case2()
error: uninitialized symbol 'errmsg'.
This static checker warning only showed up after a recent refactoring but the bug dates back to when the code was originally added. This likely doesn't affect anything in real life.
--- lib/test_objagg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
lib/test_objagg.c +3 -1
@@ -899,8 +899,10 @@ static int check_expect_hints_stats(struct objagg_hints *objagg_hints,int err; stats =objagg_hints_stats_get (objagg_hints); -if (IS_ERR (stats)) +if (IS_ERR (stats)) { + *errmsg ="objagg_hints_stats_get() failed." ;return PTR_ERR (stats); + } err =__check_expect_stats (stats, expect_stats, errmsg);objagg_stats_put (stats);return err;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 121/160 amd-xgbe: align CL37 AN sequence as per databook
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Raju Rangoju <[email protected]>
[ Upstream commit 42fd432fe6d320323215ebdf4de4d0d7e56e6792 ]
Update the Clause 37 Auto-Negotiation implementation to properly align with the PCS hardware specifications:
- Fix incorrect bit settings in Link Status and Link Duplex fields
- Implement missing sequence steps 2 and 7
These changes ensure CL37 auto-negotiation protocol follows the exact sequence patterns as specified in the hardware databook.
--- drivers/net/ethernet/amd/xgbe/xgbe-common.h | 2 ++ drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 9 +++++++++ drivers/net/ethernet/amd/xgbe/xgbe.h | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-)
drivers/net/ethernet/amd/xgbe/xgbe-common.h +2 -0
@@ -1355,6 +1355,8 @@#define MDIO_VEND2_CTRL1_SS13 BIT(13)#endif +#define XGBE_VEND2_MAC_AUTO_SW BIT(9) +/* MDIO mask values */ #define XGBE_AN_CL73_INT_CMPLT BIT(0)#define XGBE_AN_CL73_INC_LINK BIT(1)
drivers/net/ethernet/amd/xgbe/xgbe-mdio.c +9 -0
@@ -363,6 +363,10 @@ static void xgbe_an37_set(struct xgbe_prv_data *pdata, bool enable, reg |=MDIO_VEND2_CTRL1_AN_RESTART ;XMDIO_WRITE (pdata,MDIO_MMD_VEND2 ,MDIO_CTRL1 , reg); + + reg =XMDIO_READ (pdata,MDIO_MMD_VEND2 ,MDIO_PCS_DIG_CTRL ); + reg |=XGBE_VEND2_MAC_AUTO_SW ; +XMDIO_WRITE (pdata,MDIO_MMD_VEND2 ,MDIO_PCS_DIG_CTRL , reg); }static void xgbe_an37_restart (struct xgbe_prv_data *pdata)
@@ -991,6 +995,11 @@ static void xgbe_an37_init(struct xgbe_prv_data *pdata)netif_dbg (pdata, link, pdata->netdev,"CL37 AN (%s) initialized\n" , (pdata->an_mode ==XGBE_AN_MODE_CL37 ) ?"BaseX" :"SGMII" ); + + reg =XMDIO_READ (pdata,MDIO_MMD_AN ,MDIO_CTRL1 ); + reg &= ~MDIO_AN_CTRL1_ENABLE ; +XMDIO_WRITE (pdata,MDIO_MMD_AN ,MDIO_CTRL1 , reg); + }static void xgbe_an73_init (struct xgbe_prv_data *pdata)
drivers/net/ethernet/amd/xgbe/xgbe.h +2 -2
@@ -291,11 +291,11 @@#define XGBE_LINK_TIMEOUT 5#define XGBE_KR_TRAINING_WAIT_ITER 50 -#define XGBE_SGMII_AN_LINK_STATUS BIT(1) +#define XGBE_SGMII_AN_LINK_DUPLEX BIT(1)#define XGBE_SGMII_AN_LINK_SPEED (BIT(2) | BIT(3))#define XGBE_SGMII_AN_LINK_SPEED_100 0x04#define XGBE_SGMII_AN_LINK_SPEED_1000 0x08 -#define XGBE_SGMII_AN_LINK_DUPLEX BIT(4) +#define XGBE_SGMII_AN_LINK_STATUS BIT(4)/* ECC correctable error notification window (seconds) */ #define XGBE_ECC_LIMIT 60
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 122/160 enic: fix incorrect MTU comparison in enic_change_mtu()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alok Tiwari <[email protected]>
[ Upstream commit aaf2b2480375099c022a82023e1cd772bf1c6a5d ]
The comparison in enic_change_mtu() incorrectly used the current netdev->mtu instead of the new new_mtu value when warning about an MTU exceeding the port MTU. This could suppress valid warnings or issue incorrect ones.
Fix the condition and log to properly reflect the new_mtu.
--- drivers/net/ethernet/cisco/enic/enic_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/cisco/enic/enic_main.c +2 -2
@@ -2058,10 +2058,10 @@ static int enic_change_mtu(struct net_device *netdev, int new_mtu)if (enic_is_dynamic (enic) ||enic_is_sriov_vf (enic))return -EOPNOTSUPP ; -if (netdev->mtu > enic->port_mtu) +if (new_mtu > enic->port_mtu)netdev_warn (netdev,"interface MTU (%d) set higher than port MTU (%d)\n" , - netdev->mtu, enic->port_mtu); + new_mtu, enic->port_mtu);return _enic_change_mtu (netdev, new_mtu); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 123/160 rose: fix dangling neighbour pointers in rose_rt_device_down()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kohei Enju <[email protected]>
[ Upstream commit 34a500caf48c47d5171f4aa1f237da39b07c6157 ]
There are two bugs in rose_rt_device_down() that can cause use-after-free:
1. The loop bound t->count is modified within the loop, which can cause the loop to terminate early and miss some entries.
2. When removing an entry from the neighbour array, the subsequent entries are moved up to fill the gap, but the loop index i is still incremented, causing the next entry to be skipped.
For example, if a node has three neighbours (A, A, B) with count=3 and A is being removed, the second A is not checked.
i=0: (A, A, B) -> (A, B) with count=2
^ checked
i=1: (A, B) -> (A, B) with count=2
^ checked (B, not A!)
i=2: (doesn't occur because i < count is false)
This leaves the second A in the array with count=2, but the rose_neigh structure has been freed. Code that accesses these entries assumes that the first count entries are valid pointers, causing a use-after-free when it accesses the dangling pointer.
Fix both issues by iterating over the array in reverse order with a fixed loop bound. This ensures that all entries are examined and that the removal of an entry doesn't affect subsequent iterations.
--- net/rose/rose_route.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
net/rose/rose_route.c +4 -11
@@ -497,22 +497,15 @@ void rose_rt_device_down(struct net_device *dev) t = rose_node; rose_node = rose_node->next; -for (i =0 ; i < t->count; i++) { +for (i = t->count -1 ; i >=0 ; i--) {if (t->neighbour[i] != s)continue ; t->count--; -switch (i) { -case 0 : - t->neighbour[0 ] = t->neighbour[1 ]; - fallthrough; -case 1 : - t->neighbour[1 ] = t->neighbour[2 ]; -break ; -case 2 : -break ; - } +memmove (&t->neighbour[i], &t->neighbour[i +1 ], +sizeof (t->neighbour[0 ]) * + (t->count - i)); }if (t->count <=0 )
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 124/160 nui: Fix dma_mapping_error() check
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Fourier <[email protected]>
[ Upstream commit 561aa0e22b70a5e7246b73d62a824b3aef3fc375 ]
dma_map_XXX() functions return values DMA_MAPPING_ERROR as error values which is often ~0. The error value should be tested with dma_mapping_error().
This patch creates a new function in niu_ops to test if the mapping failed. The test is fixed in niu_rbr_add_page(), added in niu_start_xmit() and the successfully mapped pages are unmaped upon error.
--- drivers/net/ethernet/sun/niu.c | 31 ++++++++++++++++++++++++++++++- drivers/net/ethernet/sun/niu.h | 4 ++++ 2 files changed, 34 insertions(+), 1 deletion(-)
drivers/net/ethernet/sun/niu.c +30 -1
@@ -3317,7 +3317,7 @@ static int niu_rbr_add_page(struct niu *np, struct rx_ring_info *rp, addr = np->ops->map_page (np->device, page,0 ,PAGE_SIZE ,DMA_FROM_DEVICE ); -if (!addr) { +if (np->ops->mapping_error (np->device, addr)) {__free_page (page);return -ENOMEM ; }
@@ -6654,6 +6654,8 @@ static netdev_tx_t niu_start_xmit(struct sk_buff *skb, len =skb_headlen (skb); mapping = np->ops->map_single (np->device, skb->data, len,DMA_TO_DEVICE ); +if (np->ops->mapping_error (np->device, mapping)) + goto out_drop; prod = rp->prod;
@@ -6695,6 +6697,8 @@ static netdev_tx_t niu_start_xmit(struct sk_buff *skb, mapping = np->ops->map_page (np->device,skb_frag_page (frag),skb_frag_off (frag), len,DMA_TO_DEVICE ); +if (np->ops->mapping_error (np->device, mapping)) + goto out_unmap; rp->tx_buffs[prod].skb =NULL ; rp->tx_buffs[prod].mapping = mapping;
@@ -6719,6 +6723,19 @@ static netdev_tx_t niu_start_xmit(struct sk_buff *skb, out:return NETDEV_TX_OK ; +out_unmap: +while (i--) { +const skb_frag_t *frag; + + prod =PREVIOUS_TX (rp, prod); + frag = &skb_shinfo (skb)->frags[i]; + np->ops->unmap_page (np->device, rp->tx_buffs[prod].mapping, +skb_frag_size (frag),DMA_TO_DEVICE ); + } + + np->ops->unmap_single (np->device, rp->tx_buffs[rp->prod].mapping, +skb_headlen (skb),DMA_TO_DEVICE ); + out_drop: rp->tx_errors++;kfree_skb (skb);
@@ -9612,6 +9629,11 @@ static void niu_pci_unmap_single(struct device *dev, u64 dma_address,dma_unmap_single (dev, dma_address, size, direction); } +static int niu_pci_mapping_error (struct device *dev,u64 addr) +{ +return dma_mapping_error (dev, addr); +} +static const struct niu_ops niu_pci_ops = { .alloc_coherent = niu_pci_alloc_coherent, .free_coherent = niu_pci_free_coherent,
@@ -9619,6 +9641,7 @@ static const struct niu_ops niu_pci_ops = { .unmap_page = niu_pci_unmap_page, .map_single = niu_pci_map_single, .unmap_single = niu_pci_unmap_single, + .mapping_error = niu_pci_mapping_error, };static void niu_driver_version (void )
@@ -9985,6 +10008,11 @@ static void niu_phys_unmap_single(struct device *dev, u64 dma_address,/* Nothing to do. */ } +static int niu_phys_mapping_error (struct device *dev,u64 dma_address) +{ +return false; +} +static const struct niu_ops niu_phys_ops = { .alloc_coherent = niu_phys_alloc_coherent, .free_coherent = niu_phys_free_coherent,
@@ -9992,6 +10020,7 @@ static const struct niu_ops niu_phys_ops = { .unmap_page = niu_phys_unmap_page, .map_single = niu_phys_map_single, .unmap_single = niu_phys_unmap_single, + .mapping_error = niu_phys_mapping_error, };static int niu_of_probe (struct platform_device *op)
drivers/net/ethernet/sun/niu.h +4 -0
@@ -2879,6 +2879,9 @@ struct tx_ring_info {#define NEXT_TX (tp, index) \ (((index) + 1) < (tp)->pending ? ((index) + 1) : 0) +#define PREVIOUS_TX (tp, index) \ + (((index) - 1) >= 0 ? ((index) - 1) : (((tp)->pending) - 1)) +static inline u32 niu_tx_avail (struct tx_ring_info *tp) { return (tp->pending -
@@ -3140,6 +3143,7 @@ struct niu_ops { enum dma_data_direction direction);void (*unmap_single)(struct device *dev,u64 dma_address,size_t size,enum dma_data_direction direction); +int (*mapping_error)(struct device *dev,u64 dma_address); };struct niu_link_config {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 125/160 net/sched: Always pass notifications when child class becomes empty
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lion Ackermann <[email protected]>
[ Upstream commit 103406b38c600fec1fe375a77b27d87e314aea09 ]
Certain classful qdiscs may invoke their classes' dequeue handler on an enqueue operation. This may unexpectedly empty the child qdisc and thus make an in-flight class passive via qlen_notify(). Most qdiscs do not expect such behaviour at this point in time and may re-activate the class eventually anyways which will lead to a use-after-free.
The referenced fix commit attempted to fix this behavior for the HFSC case by moving the backlog accounting around, though this turned out to be incomplete since the parent's parent may run into the issue too. The following reproducer demonstrates this use-after-free:
tc qdisc add dev lo root handle 1: drr
tc filter add dev lo parent 1: basic classid 1:1
tc class add dev lo parent 1: classid 1:1 drr
tc qdisc add dev lo parent 1:1 handle 2: hfsc def 1 tc class add dev lo parent 2: classid 2:1 hfsc rt m1 8 d 1 m2 0 tc qdisc add dev lo parent 2:1 handle 3: netem
tc qdisc add dev lo parent 3:1 handle 4: blackhole
echo 1 | socat -u STDIN UDP4-DATAGRAM:127.0.0.1:8888 tc class delete dev lo classid 1:1
echo 1 | socat -u STDIN UDP4-DATAGRAM:127.0.0.1:8888
Since backlog accounting issues leading to a use-after-frees on stale class pointers is a recurring pattern at this point, this patch takes a different approach. Instead of trying to fix the accounting, the patch ensures that qdisc_tree_reduce_backlog always calls qlen_notify when the child qdisc is empty. This solves the problem because deletion of qdiscs always involves a call to qdisc_reset() and / or qdisc_purge_queue() which ultimately resets its qlen to 0 thus causing the following qdisc_tree_reduce_backlog() to report to the parent. Note that this may call qlen_notify on passive classes multiple times. This is not a problem after the recent patch series that made all the classful qdiscs qlen_notify() handlers idempotent.
--- net/sched/sch_api.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-)
net/sched/sch_api.c +5 -14
@@ -768,15 +768,12 @@ static u32 qdisc_alloc_handle(struct net_device *dev)void qdisc_tree_reduce_backlog (struct Qdisc *sch,int n,int len) { -bool qdisc_is_offloaded = sch->flags &TCQ_F_OFFLOADED ;const struct Qdisc_class_ops *cops;unsigned long cl;u32 parentid;bool notify;int drops; -if (n ==0 && len ==0 ) -return ; drops =max_t (int, n,0 );rcu_read_lock ();while ((parentid = sch->parent)) {
@@ -785,17 +782,8 @@ void qdisc_tree_reduce_backlog(struct Qdisc *sch, int n, int len)if (sch->flags &TCQ_F_NOPARENT )break ; -/* Notify parent qdisc only if child qdisc becomes empty. -* -* If child was empty even before update then backlog -* counter is screwed and we skip notification because -* parent class is already passive. -* -* If the original child was offloaded then it is allowed -* to be seem as empty, so the parent is notified anyway. -*/ - notify = !sch->q.qlen && !WARN_ON_ONCE (!n && - !qdisc_is_offloaded); +/* Notify parent qdisc only if child qdisc becomes empty. */ + notify = !sch->q.qlen;/* TODO: perform the search on a per txq basis */ sch =qdisc_lookup (qdisc_dev (sch),TC_H_MAJ (parentid));if (sch ==NULL ) {
@@ -804,6 +792,9 @@ void qdisc_tree_reduce_backlog(struct Qdisc *sch, int n, int len) } cops = sch->ops->cl_ops;if (notify && cops->qlen_notify) { +/* Note that qlen_notify must be idempotent as it may get called +* multiple times. +*/ cl = cops->find (sch, parentid); cops->qlen_notify (sch, cl); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 126/160 drm/msm: Fix a fence leak in submit error path
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rob Clark <[email protected]>
[ Upstream commit 5d319f75ccf7f0927425a7545aa1a22b3eedc189 ]
In error paths, we could unref the submit without calling drm_sched_entity_push_job(), so msm_job_free() will never get called. Since drm_sched_job_cleanup() will NULL out the s_fence, we can use that to detect this case.
Patchwork: https://patchwork.freedesktop.org/patch/653584/
--- drivers/gpu/drm/msm/msm_gem_submit.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/gpu/drm/msm/msm_gem_submit.c +9 -0
@@ -76,6 +76,15 @@ void __msm_gem_submit_destroy(struct kref *kref)struct dma_fence *fence;unsigned i; +/* +* In error paths, we could unref the submit without calling +* drm_sched_entity_push_job(), so msm_job_free() will never +* get called. Since drm_sched_job_cleanup() will NULL out +* s_fence, we can use that to detect this case. +*/ +if (submit->base.s_fence) +drm_sched_job_cleanup (&submit->base); +if (submit->fence_id) {mutex_lock (&submit->queue->lock);idr_remove (&submit->queue->fence_idr, submit->fence_id);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 127/160 ALSA: sb: Dont allow changing the DMA mode during operations
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit ed29e073ba93f2d52832804cabdd831d5d357d33 ]
When a PCM stream is already running, one shouldn't change the DMA mode via kcontrol, which may screw up the hardware. Return -EBUSY instead.
--- sound/isa/sb/sb16_main.c | 3 +++ 1 file changed, 3 insertions(+)
sound/isa/sb/sb16_main.c +3 -0
@@ -703,6 +703,9 @@ static int snd_sb16_dma_control_put(struct snd_kcontrol *kcontrol, struct snd_ctunsigned char nval, oval;int change; +if (chip->mode & (SB_MODE_PLAYBACK |SB_MODE_CAPTURE )) +return -EBUSY ; + nval = ucontrol->value.enumerated.item[0 ];if (nval >2 )return -EINVAL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 128/160 ALSA: sb: Force to disable DMAs once when DMA mode is changed
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 4c267ae2ef349639b4d9ebf00dd28586a82fdbe6 ]
When the DMA mode is changed on the (still real!) SB AWE32 after playing a stream and closing, the previous DMA setup was still silently kept, and it can confuse the hardware, resulting in the unexpected noises. As a workaround, enforce the disablement of DMA setups when the DMA setup is changed by the kcontrol.
https://bugzilla.kernel.org/show_bug.cgi?id=218185
--- sound/isa/sb/sb16_main.c | 4 ++++ 1 file changed, 4 insertions(+)
sound/isa/sb/sb16_main.c +4 -0
@@ -714,6 +714,10 @@ static int snd_sb16_dma_control_put(struct snd_kcontrol *kcontrol, struct snd_ct change = nval != oval;snd_sb16_set_dma_mode (chip, nval);spin_unlock_irqrestore (&chip->reg_lock, flags); +if (change) { +snd_dma_disable (chip->dma8); +snd_dma_disable (chip->dma16); + }return change; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 129/160 ata: pata_cs5536: fix build on 32-bit UML
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit fe5b391fc56f77cf3c22a9dd4f0ce20db0e3533f ]
On 32-bit ARCH=um, CONFIG_X86_32 is still defined, so it doesn't indicate building on real X86 machines. There's no MSR on UML though, so add a check for CONFIG_X86.
--- drivers/ata/pata_cs5536.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ata/pata_cs5536.c +1 -1
@@ -27,7 +27,7 @@#include <scsi/scsi_host.h> #include <linux/dmi.h> -#ifdef CONFIG_X86_32 +#if defined(CONFIG_X86 ) && defined(CONFIG_X86_32 )#include <asm/msr.h> static int use_msr;module_param_named (msr, use_msr, int,0644 );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 103/160 mtk-sd: Prevent memory corruption from DMA map failure
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masami Hiramatsu (Google) <[email protected]>
commit f5de469990f19569627ea0dd56536ff5a13beaa3 upstream.
If msdc_prepare_data() fails to map the DMA region, the request is not prepared for data receiving, but msdc_start_data() proceeds the DMA with previous setting.
Since this will lead a memory corruption, we have to stop the request operation soon after the msdc_prepare_data() fails to prepare it.
--- drivers/mmc/host/mtk-sd.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
drivers/mmc/host/mtk-sd.c +16 -1
@@ -734,6 +734,11 @@ static void msdc_prepare_data(struct msd } } +static bool msdc_data_prepared (struct mmc_data *data) +{ +return data->host_cookie &MSDC_PREPARE_FLAG ; +} +static void msdc_unprepare_data (struct msdc_host *host,struct mmc_data *data) {if (data->host_cookie &MSDC_ASYNC_FLAG )
@@ -1306,8 +1311,18 @@ static void msdc_ops_request(struct mmc_WARN_ON (host->mrq); host->mrq = mrq; -if (mrq->data) +if (mrq->data) {msdc_prepare_data (host, mrq->data); +if (!msdc_data_prepared (mrq->data)) { +/* +* Failed to prepare DMA area, fail fast before +* starting any commands. +*/ + mrq->cmd->error = -ENOSPC ; +mmc_request_done (mmc_from_priv (host), mrq); +return ; + } + }/* if SBC is required, we have HW option and SW option. * if HW option is enabled, and SBC does not have "special" flags,
Greg Kroah-Hartman
maintainerPATCH 130/160 powerpc: Fix struct termio related ioctl macros
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Madhavan Srinivasan <[email protected]>
[ Upstream commit ab107276607af90b13a5994997e19b7b9731e251 ]
Since termio interface is now obsolete, include/uapi/asm/ioctls.h has some constant macros referring to "struct termio", this caused build failure at userspace.
In file included from /usr/include/asm/ioctl.h:12,
from /usr/include/asm/ioctls.h:5,
from tst-ioctls.c:3:tst-ioctls.c: In function 'get_TCGETA':
tst-ioctls.c:12:10: error: invalid application of 'sizeof' to incomplete type 'struct termio'
12 | return TCGETA;
| ^~~~~~Even though termios.h provides "struct termio", trying to juggle definitions around to make it compile could introduce regressions. So better to open code it.
--- arch/powerpc/include/uapi/asm/ioctls.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/powerpc/include/uapi/asm/ioctls.h +4 -4
@@ -23,10 +23,10 @@#define TCSETSW _IOW('t', 21, struct termios)#define TCSETSF _IOW('t', 22, struct termios) -#define TCGETA _IOR('t', 23, struct termio) -#define TCSETA _IOW('t', 24, struct termio) -#define TCSETAW _IOW('t', 25, struct termio) -#define TCSETAF _IOW('t', 28, struct termio) +#define TCGETA 0x40147417/* _IOR('t', 23, struct termio) */ +#define TCSETA 0x80147418/* _IOW('t', 24, struct termio) */ +#define TCSETAW 0x80147419/* _IOW('t', 25, struct termio) */ +#define TCSETAF 0x8014741c/* _IOW('t', 28, struct termio) */ #define TCSBRK _IO('t', 29)#define TCXONC _IO('t', 30)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 131/160 scsi: target: Fix NULL pointer dereference in core_scsi3_decode_spec_i_port()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maurizio Lombardi <[email protected]>
[ Upstream commit d8ab68bdb294b09a761e967dad374f2965e1913f ]
The function core_scsi3_decode_spec_i_port(), in its error code path, unconditionally calls core_scsi3_lunacl_undepend_item() passing the dest_se_deve pointer, which may be NULL.
This can lead to a NULL pointer dereference if dest_se_deve remains unset.
SPC-3 PR SPEC_I_PT: Unable to locate dest_tpg
Unable to handle kernel paging request at virtual address dfff800000000012 Call trace: core_scsi3_lunacl_undepend_item+0x2c/0xf0 [target_core_mod] (P) core_scsi3_decode_spec_i_port+0x120c/0x1c30 [target_core_mod] core_scsi3_emulate_pro_register+0x6b8/0xcd8 [target_core_mod] target_scsi3_emulate_pr_out+0x56c/0x840 [target_core_mod]
Fix this by adding a NULL check before callingcore_scsi3_lunacl_undepend_item()
--- drivers/target/target_core_pr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/target/target_core_pr.c +3 -1
@@ -1852,7 +1852,9 @@ core_scsi3_decode_spec_i_port( }kmem_cache_free (t10_pr_reg_cache, dest_pr_reg); -core_scsi3_lunacl_undepend_item (dest_se_deve); + +if (dest_se_deve) +core_scsi3_lunacl_undepend_item (dest_se_deve);if (is_local)continue ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 132/160 wifi: mac80211: drop invalid source address OCB frames
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit d1b1a5eb27c4948e8811cf4dbb05aaf3eb10700c ]
In OCB, don't accept frames from invalid source addresses (and in particular don't try to create stations for them), drop the frames instead.
--- net/mac80211/rx.c | 4 ++++ 1 file changed, 4 insertions(+)
net/mac80211/rx.c +4 -0
@@ -4168,6 +4168,10 @@ static bool ieee80211_accept_frame(struct ieee80211_rx_data *rx)if (!multicast && !ether_addr_equal (sdata->dev->dev_addr, hdr->addr1))return false; +/* reject invalid/our STA address */ +if (!is_valid_ether_addr (hdr->addr2) || +ether_addr_equal (sdata->dev->dev_addr, hdr->addr2)) +return false;if (!rx->sta) {int rate_idx;if (status->encoding !=RX_ENC_LEGACY )
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 104/160 mtk-sd: reset host->mrq on prepare_data() error
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sergey Senozhatsky <[email protected]>
commit ec54c0a20709ed6e56f40a8d59eee725c31a916b upstream.
Do not leave host with dangling ->mrq pointer if we hit the msdc_prepare_data() error out path.
--- drivers/mmc/host/mtk-sd.c | 1 + 1 file changed, 1 insertion(+)
drivers/mmc/host/mtk-sd.c +1 -0
@@ -1314,6 +1314,7 @@ static void msdc_ops_request(struct mmc_if (mrq->data) {msdc_prepare_data (host, mrq->data);if (!msdc_data_prepared (mrq->data)) { + host->mrq =NULL ;/* * Failed to prepare DMA area, fail fast before * starting any commands.
Greg Kroah-Hartman
maintainerPATCH 105/160 platform/mellanox: mlxbf-tmfifo: fix vring_desc.len assignment
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Thompson <[email protected]>
[ Upstream commit 109f4d29dade8ae5b4ac6325af9d1bc24b4230f8 ]
Fix warnings reported by sparse, related to incorrect type:drivers/platform/mellanox/mlxbf-tmfifo.c:284:38: warning: incorrect type in assignment (different base types)drivers/platform/mellanox/mlxbf-tmfifo.c:284:38: expected restricted __virtio32 [usertype] lendrivers/platform/mellanox/mlxbf-tmfifo.c:284:38: got unsigned long
--- drivers/platform/mellanox/mlxbf-tmfifo.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/platform/mellanox/mlxbf-tmfifo.c +2 -1
@@ -253,7 +253,8 @@ static int mlxbf_tmfifo_alloc_vrings(struct mlxbf_tmfifo *fifo, vring->align =SMP_CACHE_BYTES ; vring->index = i; vring->vdev_id = tm_vdev->vdev.id.device; - vring->drop_desc.len =VRING_DROP_DESC_MAX_LEN ; + vring->drop_desc.len =cpu_to_virtio32 (&tm_vdev->vdev, +VRING_DROP_DESC_MAX_LEN ); dev = &tm_vdev->vdev.dev; size =vring_size (vring->num, vring->align);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 106/160 RDMA/mlx5: Initialize obj_event->obj_sub_list before xa_insert
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Zhang <[email protected]>
[ Upstream commit 8edab8a72d67742f87e9dc2e2b0cdfddda5dc29a ]
The obj_event may be loaded immediately after inserted, then if the list_head is not initialized then we may get a poisonous pointer. This fixes the crash below:
mlx5_core 0000:03:00.0: MLX5E: StrdRq(1) RqSz(8) StrdSz(2048) RxCqeCmprss(0 enhanced) mlx5_core.sf mlx5_core.sf.4: firmware version: 32.38.3056
mlx5_core 0000:03:00.0 en3f0pf0sf2002: renamed from eth0
mlx5_core.sf mlx5_core.sf.4: Rate limit: 127 rates are supported, range: 0Mbps to 195312Mbps
IPv6: ADDRCONF(NETDEV_CHANGE): en3f0pf0sf2002: link becomes ready
Unable to handle kernel NULL pointer dereference at virtual address 0000000000000060 Mem abort info: ESR = 0x96000006 EC = 0x25: DABT (current EL), IL = 32 bits SET = 0, FnV = 0 EA = 0, S1PTW = 0 Data abort info: ISV = 0, ISS = 0x00000006 CM = 0, WnR = 0 user pgtable: 4k pages, 48-bit VAs, pgdp=00000007760fb000 [0000000000000060] pgd=000000076f6d7003, p4d=000000076f6d7003, pud=0000000777841003, pmd=0000000000000000 Internal error: Oops: 96000006 [#1] SMP Modules linked in: ipmb_host(OE) act_mirred(E) cls_flower(E) sch_ingress(E) mptcp_diag(E) udp_diag(E) raw_diag(E) unix_diag(E) tcp_diag(E) inet_diag(E) binfmt_misc(E) bonding(OE) rdma_ucm(OE) rdma_cm(OE) iw_cm(OE) ib_ipoib(OE) ib_cm(OE) isofs(E) cdrom(E) mst_pciconf(OE) ib_umad(OE) mlx5_ib(OE) ipmb_dev_int(OE) mlx5_core(OE) kpatch_15237886(OEK) mlxdevm(OE) auxiliary(OE) ib_uverbs(OE) ib_core(OE) psample(E) mlxfw(OE) tls(E) sunrpc(E) vfat(E) fat(E) crct10dif_ce(E) ghash_ce(E) sha1_ce(E) sbsa_gwdt(E) virtio_console(E) ext4(E) mbcache(E) jbd2(E) xfs(E) libcrc32c(E) mmc_block(E) virtio_net(E) net_failover(E) failover(E) sha2_ce(E) sha256_arm64(E) nvme(OE) nvme_core(OE) gpio_mlxbf3(OE) mlx_compat(OE) mlxbf_pmc(OE) i2c_mlxbf(OE) sdhci_of_dwcmshc(OE) pinctrl_mlxbf3(OE) mlxbf_pka(OE) gpio_generic(E) i2c_core(E) mmc_core(E) mlxbf_gige(OE) vitesse(E) pwr_mlxbf(OE) mlxbf_tmfifo(OE) micrel(E) mlxbf_bootctl(OE) virtio_ring(E) virtio(E) ipmi_devintf(E) ipmi_msghandler(E) [last unloaded: mst_pci] CPU: 11 PID: 20913 Comm: rte-worker-11 Kdump: loaded Tainted: G OE K 5.10.134-13.1.an8.aarch64 #1 Hardware name: https://www.mellanox.com BlueField-3 SmartNIC Main Card/BlueField-3 SmartNIC Main Card, BIOS 4.2.2.12968 Oct 26 2023 pstate: a0400089 (NzCv daIf +PAN -UAO -TCO BTYPE=--) pc : dispatch_event_fd+0x68/0x300 [mlx5_ib] lr : devx_event_notifier+0xcc/0x228 [mlx5_ib] sp : ffff80001005bcf0 x29: ffff80001005bcf0 x28: 0000000000000001 x27: ffff244e0740a1d8 x26: ffff244e0740a1d0 x25: ffffda56beff5ae0 x24: ffffda56bf911618 x23: ffff244e0596a480 x22: ffff244e0596a480 x21: ffff244d8312ad90 x20: ffff244e0596a480 x19: fffffffffffffff0 x18: 0000000000000000 x17: 0000000000000000 x16: ffffda56be66d620 x15: 0000000000000000 x14: 0000000000000000 x13: 0000000000000000 x12: 0000000000000000 x11: 0000000000000040 x10: ffffda56bfcafb50 x9 : ffffda5655c25f2c x8 : 0000000000000010 x7 : 0000000000000000 x6 : ffff24545a2e24b8 x5 : 0000000000000003 x4 : ffff80001005bd28 x3 : 0000000000000000 x2 : 0000000000000000 x1 : ffff244e0596a480 x0 : ffff244d8312ad90 Call trace: dispatch_event_fd+0x68/0x300 [mlx5_ib] devx_event_notifier+0xcc/0x228 [mlx5_ib] atomic_notifier_call_chain+0x58/0x80 mlx5_eq_async_int+0x148/0x2b0 [mlx5_core] atomic_notifier_call_chain+0x58/0x80 irq_int_handler+0x20/0x30 [mlx5_core] __handle_irq_event_percpu+0x60/0x220 handle_irq_event_percpu+0x3c/0x90 handle_irq_event+0x58/0x158 handle_fasteoi_irq+0xfc/0x188 generic_handle_irq+0x34/0x48 ...
--- drivers/infiniband/hw/mlx5/devx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/mlx5/devx.c +1 -1
@@ -1907,6 +1907,7 @@ subscribe_event_xa_alloc(struct mlx5_devx_event_table *devx_event_table,/* Level1 is valid for future use, no need to free */ return -ENOMEM ; +INIT_LIST_HEAD (&obj_event->obj_sub_list); err = xa_insert(&event->object_ids, key_level2, obj_event,
@@ -1915,7 +1916,6 @@ subscribe_event_xa_alloc(struct mlx5_devx_event_table *devx_event_table,kfree (obj_event);return err; } -INIT_LIST_HEAD (&obj_event->obj_sub_list); }return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 107/160 nfs: Clean up /proc/net/rpc/nfs when nfs_fs_proc_net_init() fails.
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit e8d6f3ab59468e230f3253efe5cb63efa35289f7 ]
syzbot reported a warning below [1] following a fault injection in nfs_fs_proc_net_init(). [0]
When nfs_fs_proc_net_init() fails, /proc/net/rpc/nfs is not removed.
Later, rpc_proc_exit() tries to remove /proc/net/rpc, and the warning is logged as the directory is not empty.
Let's handle the error of nfs_fs_proc_net_init() properly.
[0]:FAULT_INJECTION: forcing a failure.
name failslab, interval 1, probability 0, space 0, times 0
CPU: 1 UID: 0 PID: 6120 Comm: syz.2.27 Not tainted 6.16.0-rc1-syzkaller-00010-g2c4a1f3fe03e #0 PREEMPT(full) Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 05/07/2025 Call Trace: <TASK> dump_stack_lvl (lib/dump_stack.c:123) should_fail_ex (lib/fault-inject.c:73 lib/fault-inject.c:174) should_failslab (mm/failslab.c:46) kmem_cache_alloc_noprof (mm/slub.c:4178 mm/slub.c:4204) __proc_create (fs/proc/generic.c:427) proc_create_reg (fs/proc/generic.c:554) proc_create_net_data (fs/proc/proc_net.c:120) nfs_fs_proc_net_init (fs/nfs/client.c:1409) nfs_net_init (fs/nfs/inode.c:2600) ops_init (net/core/net_namespace.c:138) setup_net (net/core/net_namespace.c:443) copy_net_ns (net/core/net_namespace.c:576) create_new_namespaces (kernel/nsproxy.c:110) unshare_nsproxy_namespaces (kernel/nsproxy.c:218 (discriminator 4)) ksys_unshare (kernel/fork.c:3123) __x64_sys_unshare (kernel/fork.c:3190) do_syscall_64 (arch/x86/entry/syscall_64.c:63 arch/x86/entry/syscall_64.c:94) entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:130) </TASK>
[1]:remove_proc_entry: removing non-empty directory 'net/rpc', leaking at least 'nfs'
WARNING: CPU: 1 PID: 6120 at fs/proc/generic.c:727 remove_proc_entry+0x45e/0x530 fs/proc/generic.c:727 Modules linked in: CPU: 1 UID: 0 PID: 6120 Comm: syz.2.27 Not tainted 6.16.0-rc1-syzkaller-00010-g2c4a1f3fe03e #0 PREEMPT(full) Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 05/07/2025 RIP: 0010:remove_proc_entry+0x45e/0x530 fs/proc/generic.c:727 Code: 3c 02 00 0f 85 85 00 00 00 48 8b 93 d8 00 00 00 4d 89 f0 4c 89 e9 48 c7 c6 40 ba a2 8b 48 c7 c7 60 b9 a2 8b e8 33 81 1d ff 90 <0f> 0b 90 90 e9 5f fe ff ff e8 04 69 5e ff 90 48 b8 00 00 00 00 00 RSP: 0018:ffffc90003637b08 EFLAGS: 00010282 RAX: 0000000000000000 RBX: ffff88805f534140 RCX: ffffffff817a92c8 RDX: ffff88807da99e00 RSI: ffffffff817a92d5 RDI: 0000000000000001 RBP: ffff888033431ac0 R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000001 R11: 0000000000000001 R12: ffff888033431a00 R13: ffff888033431ae4 R14: ffff888033184724 R15: dffffc0000000000 FS: 0000555580328500(0000) GS:ffff888124a62000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f71733743e0 CR3: 000000007f618000 CR4: 00000000003526f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> sunrpc_exit_net+0x46/0x90 net/sunrpc/sunrpc_syms.c:76 ops_exit_list net/core/net_namespace.c:200 [inline] ops_undo_list+0x2eb/0xab0 net/core/net_namespace.c:253 setup_net+0x2e1/0x510 net/core/net_namespace.c:457 copy_net_ns+0x2a6/0x5f0 net/core/net_namespace.c:574 create_new_namespaces+0x3ea/0xa90 kernel/nsproxy.c:110 unshare_nsproxy_namespaces+0xc0/0x1f0 kernel/nsproxy.c:218 ksys_unshare+0x45b/0xa40 kernel/fork.c:3121 __do_sys_unshare kernel/fork.c:3192 [inline] __se_sys_unshare kernel/fork.c:3190 [inline] __x64_sys_unshare+0x31/0x40 kernel/fork.c:3190 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0xcd/0x490 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7fa1a6b8e929 Code: ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 a8 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007fff3a090368 EFLAGS: 00000246 ORIG_RAX: 0000000000000110 RAX: ffffffffffffffda RBX: 00007fa1a6db5fa0 RCX: 00007fa1a6b8e929 RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000040000080 RBP: 00007fa1a6c10b39 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 00007fa1a6db5fa0 R14: 00007fa1a6db5fa0 R15: 0000000000000001 </TASK>
--- fs/nfs/inode.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
fs/nfs/inode.c +14 -3
@@ -2457,15 +2457,26 @@ EXPORT_SYMBOL_GPL(nfs_net_id);static int nfs_net_init (struct net *net) {struct nfs_net *nn =net_generic (net, nfs_net_id); +int err;nfs_clients_init (net);if (!rpc_proc_register (net, &nn->rpcstats)) { -nfs_clients_exit (net); -return -ENOMEM ; + err = -ENOMEM ; + goto err_proc_rpc; } -return nfs_fs_proc_net_init (net); + err =nfs_fs_proc_net_init (net); +if (err) + goto err_proc_nfs; + +return 0 ; + +err_proc_nfs: +rpc_proc_unregister (net,"nfs" ); +err_proc_rpc: +nfs_clients_exit (net); +return err; }static void nfs_net_exit (struct net *net)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 108/160 NFSv4/pNFS: Fix a race to wake on NFS_LAYOUT_DRAIN
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Coddington <[email protected]>
[ Upstream commit c01776287414ca43412d1319d2877cbad65444ac ]
We found a few different systems hung up in writeback waiting on the same page lock, and one task waiting on the NFS_LAYOUT_DRAIN bit in pnfs_update_layout(), however the pnfs_layout_hdr's plh_outstanding count was zero.
It seems most likely that this is another race between the waiter and waker similar to commit ed0172af5d6f ("SUNRPC: Fix a race to wake a sync task"). Fix it up by applying the advised barrier.
--- fs/nfs/pnfs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/nfs/pnfs.c +3 -1
@@ -1927,8 +1927,10 @@ static void nfs_layoutget_begin(struct pnfs_layout_hdr *lo)static void nfs_layoutget_end (struct pnfs_layout_hdr *lo) {if (atomic_dec_and_test (&lo->plh_outstanding) && -test_and_clear_bit (NFS_LAYOUT_DRAIN , &lo->plh_flags)) +test_and_clear_bit (NFS_LAYOUT_DRAIN , &lo->plh_flags)) { +smp_mb__after_atomic ();wake_up_bit (&lo->plh_flags,NFS_LAYOUT_DRAIN ); + } }static bool pnfs_is_first_layoutget (struct pnfs_layout_hdr *lo)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 109/160 scsi: qla2xxx: Fix DMA mapping test in qla24xx_get_port_database()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Fourier <[email protected]>
[ Upstream commit c3b214719a87735d4f67333a8ef3c0e31a34837c ]
dma_map_XXX() functions return as error values DMA_MAPPING_ERROR which is often ~0. The error value should be tested with dma_mapping_error() like it was done in qla26xx_dport_diagnostics().
--- drivers/scsi/qla2xxx/qla_mbx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_mbx.c +1 -1
@@ -2141,7 +2141,7 @@ qla24xx_get_port_database(scsi_qla_host_t *vha, u16 nport_handle, pdb_dma =dma_map_single (&vha->hw->pdev->dev, pdb,sizeof (*pdb),DMA_FROM_DEVICE ); -if (!pdb_dma) { +if (dma_mapping_error (&vha->hw->pdev->dev, pdb_dma)) {ql_log (ql_log_warn, vha,0x1116 ,"Failed to map dma buffer.\n" );return QLA_MEMORY_ALLOC_FAILED ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 100/160 Revert "mmc: sdhci: Disable SD card clock before changing parameters"
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ulf Hansson <[email protected]>
commit dcc3bcfc5b50c625b475dcc25d167b6b947a6637 upstream.
It has turned out the trying to strictly conform to the SDHCI specification is causing problems. Let's revert and start over.
This reverts commit fb3bbc46c94f261b6156ee863c1b06c84cf157dc.
--- drivers/mmc/host/sdhci.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/mmc/host/sdhci.c +2 -7
@@ -2009,15 +2009,10 @@ void sdhci_set_clock(struct sdhci_host * host->mmc->actual_clock =0 ; - clk =sdhci_readw (host,SDHCI_CLOCK_CONTROL ); -if (clk &SDHCI_CLOCK_CARD_EN ) -sdhci_writew (host, clk & ~SDHCI_CLOCK_CARD_EN , -SDHCI_CLOCK_CONTROL ); +sdhci_writew (host,0 ,SDHCI_CLOCK_CONTROL ); -if (clock ==0 ) { -sdhci_writew (host,0 ,SDHCI_CLOCK_CONTROL ); +if (clock ==0 )return ; - } clk =sdhci_calc_clk (host, clock, &host->mmc->actual_clock);sdhci_enable_clk (host, clk);
Greg Kroah-Hartman
maintainerPATCH 134/160 ACPICA: Refuse to evaluate a method if arguments are missing
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafael J. Wysocki <[email protected]>
[ Upstream commit 6fcab2791543924d438e7fa49276d0998b0a069f ]
As reported in [1], a platform firmware update that increased the number of method parameters and forgot to update a least one of its callers, caused ACPICA to crash due to use-after-free.
Since this a result of a clear AML issue that arguably cannot be fixed up by the interpreter (it cannot produce missing data out of thin air), address it by making ACPICA refuse to evaluate a method if the caller attempts to pass fewer arguments than expected to it.
--- drivers/acpi/acpica/dsmethod.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/acpi/acpica/dsmethod.c +7 -0
@@ -483,6 +483,13 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,return_ACPI_STATUS (AE_NULL_OBJECT ); } +if (this_walk_state->num_operands < obj_desc->method.param_count) { +ACPI_ERROR ((AE_INFO ,"Missing argument for method [%4.4s]" , +acpi_ut_get_node_name (method_node))); + +return_ACPI_STATUS (AE_AML_UNINITIALIZED_ARG ); + } +/* Init for new method, possibly wait on method mutex */ status =
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 143/160 dpaa2-eth: Update dpni_get_single_step_cfg command
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Radu Bulie <[email protected]>
[ Upstream commit 9572594ecf027a2b1828e42c26fb55cbd3219708 ]
dpni_get_single_step_cfg is an MC firmware command used for retrieving the contents of SINGLE_STEP 1588 register available in a DPMAC.
This patch adds a new version of this command that returns as an extra argument the physical base address of the aforementioned register. The address will be used to directly modify the contents of the SINGLE_STEP register instead of invoking the MC command dpni_set_single_step_cgf. The former approach introduced huge delays on the TX datapath when one step PTP events were transmitted. This led to low throughput and high latencies observed in the PTP correction field.
Stable-dep-of: 2def09ead4ad ("dpaa2-eth: fix xdp_rxq_info leak")
--- drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h | 6 +++++- drivers/net/ethernet/freescale/dpaa2/dpni.c | 2 ++ drivers/net/ethernet/freescale/dpaa2/dpni.h | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-)
drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h +5 -1
@@ -98,7 +98,7 @@#define DPNI_CMDID_GET_LINK_CFG DPNI_CMD(0x278)#define DPNI_CMDID_SET_SINGLE_STEP_CFG DPNI_CMD(0x279) -#define DPNI_CMDID_GET_SINGLE_STEP_CFG DPNI_CMD(0x27a) +#define DPNI_CMDID_GET_SINGLE_STEP_CFG DPNI_CMD_V2(0x27a)/* Macros for accessing command fields smaller than 1byte */ #define DPNI_MASK (field) \
@@ -658,12 +658,16 @@ struct dpni_cmd_single_step_cfg {__le16 flags;__le16 offset;__le32 peer_delay; +__le32 ptp_onestep_reg_base; +__le32 pad0; };struct dpni_rsp_single_step_cfg {__le16 flags;__le16 offset;__le32 peer_delay; +__le32 ptp_onestep_reg_base; +__le32 pad0; };struct dpni_cmd_enable_vlan_filter {
drivers/net/ethernet/freescale/dpaa2/dpni.c +2 -0
@@ -2136,6 +2136,8 @@ int dpni_get_single_step_cfg(struct fsl_mc_io *mc_io, ptp_cfg->ch_update =dpni_get_field (le16_to_cpu (rsp_params->flags),PTP_CH_UPDATE ) ?1 :0 ; ptp_cfg->peer_delay =le32_to_cpu (rsp_params->peer_delay); + ptp_cfg->ptp_onestep_reg_base = +le32_to_cpu (rsp_params->ptp_onestep_reg_base);return err; }
drivers/net/ethernet/freescale/dpaa2/dpni.h +6 -0
@@ -1074,12 +1074,18 @@ int dpni_set_tx_shaping(struct fsl_mc_io *mc_io,* @peer_delay: For peer-to-peer transparent clocks add this value to the * correction field in addition to the transient time update. * The value expresses nanoseconds. +* @ptp_onestep_reg_base: 1588 SINGLE_STEP register base address. This address +* is used to update directly the register contents. +* User has to create an address mapping for it. +* +* */ struct dpni_single_step_cfg {u8 en;u8 ch_update;u16 offset;u32 peer_delay; +u32 ptp_onestep_reg_base; }; int dpni_set_single_step_cfg(struct fsl_mc_io *mc_io,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 144/160 dpaa2-eth: Update SINGLE_STEP register access
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Radu Bulie <[email protected]>
[ Upstream commit c4680c978567328a696fd2400bbf58a36cff95d1 ]
DPAA2 MAC supports 1588 one step timestamping.
If this option is enabled then for each transmitted PTP event packet, the 1588 SINGLE_STEP register is accessed to modify the following fields:
-offset of the correction field inside the PTP packet -UDP checksum update bit, in case the PTP event packet has
UDP encapsulation
These values can change any time, because there may be multiple PTP clients connected, that receive various 1588 frame types:
- L2 only frame
- UDP / Ipv4
- UDP / Ipv6
- other
The current implementation uses dpni_set_single_step_cfg to update the SINLGE_STEP register.
Using an MC command on the Tx datapath for each transmitted 1588 message introduces high delays, leading to low throughput and consequently to a small number of supported PTP clients. Besides these, the nanosecond correction field from the PTP packet will contain the high delay from the driver which together with the originTimestamp will render timestamp values that are unacceptable in a GM clock implementation.
This patch updates the Tx datapath for 1588 messages when single step timestamp is enabled and provides direct access to SINGLE_STEP register, eliminating the overhead caused by the dpni_set_single_step_cfg MC command. MC version >= 10.32 implements this functionality. If the MC version does not have support for returning the single step register base address, the driver will use dpni_set_single_step_cfg command for updates operations.
All the delay introduced by dpni_set_single_step_cfg function will be eliminated (if MC version has support for returning the base address of the single step register), improving the egress driver performance for PTP packets when single step timestamping is enabled.
Before these changes the maximum throughput for 1588 messages with single step hardware timestamp enabled was around 2000pps. After the updates the throughput increased up to 32.82 Mbps / 46631.02 pps.
Stable-dep-of: 2def09ead4ad ("dpaa2-eth: fix xdp_rxq_info leak")
--- .../net/ethernet/freescale/dpaa2/dpaa2-eth.c | 89 +++++++++++++++++-- .../net/ethernet/freescale/dpaa2/dpaa2-eth.h | 14 ++- 2 files changed, 93 insertions(+), 10 deletions(-)
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +81 -8
@@ -34,6 +34,75 @@ MODULE_DESCRIPTION("Freescale DPAA2 Ethernet Driver");struct ptp_qoriq *dpaa2_ptp;EXPORT_SYMBOL (dpaa2_ptp); +static void dpaa2_eth_detect_features (struct dpaa2_eth_priv *priv) +{ + priv->features =0 ; + +if (dpaa2_eth_cmp_dpni_ver (priv,DPNI_PTP_ONESTEP_VER_MAJOR , +DPNI_PTP_ONESTEP_VER_MINOR ) >=0 ) + priv->features |=DPAA2_ETH_FEATURE_ONESTEP_CFG_DIRECT ; +} + +static void dpaa2_update_ptp_onestep_indirect (struct dpaa2_eth_priv *priv, +u32 offset,u8 udp) +{ +struct dpni_single_step_cfg cfg; + + cfg.en =1 ; + cfg.ch_update = udp; + cfg.offset = offset; + cfg.peer_delay =0 ; + +if (dpni_set_single_step_cfg (priv->mc_io,0 , priv->mc_token, &cfg)) +WARN_ONCE (1 ,"Failed to set single step register" ); +} + +static void dpaa2_update_ptp_onestep_direct (struct dpaa2_eth_priv *priv, +u32 offset,u8 udp) +{ +u32 val =0 ; + + val =DPAA2_PTP_SINGLE_STEP_ENABLE | +DPAA2_PTP_SINGLE_CORRECTION_OFF (offset); + +if (udp) + val |=DPAA2_PTP_SINGLE_STEP_CH ; + +if (priv->onestep_reg_base) +writel (val, priv->onestep_reg_base); +} + +static void dpaa2_ptp_onestep_reg_update_method (struct dpaa2_eth_priv *priv) +{ +struct device *dev = priv->net_dev->dev.parent; +struct dpni_single_step_cfg ptp_cfg; + + priv->dpaa2_set_onestep_params_cb = dpaa2_update_ptp_onestep_indirect; + +if (!(priv->features &DPAA2_ETH_FEATURE_ONESTEP_CFG_DIRECT )) +return ; + +if (dpni_get_single_step_cfg (priv->mc_io,0 , + priv->mc_token, &ptp_cfg)) { +dev_err (dev,"dpni_get_single_step_cfg cannot retrieve onestep reg, falling back to indirect update\n" ); +return ; + } + +if (!ptp_cfg.ptp_onestep_reg_base) { +dev_err (dev,"1588 onestep reg not available, falling back to indirect update\n" ); +return ; + } + + priv->onestep_reg_base =ioremap (ptp_cfg.ptp_onestep_reg_base, +sizeof (u32)); +if (!priv->onestep_reg_base) { +dev_err (dev,"1588 onestep reg cannot be mapped, falling back to indirect update\n" ); +return ; + } + + priv->dpaa2_set_onestep_params_cb = dpaa2_update_ptp_onestep_direct; +} +static void *dpaa2_iova_to_virt (struct iommu_domain *domain,dma_addr_t iova_addr) {
@@ -693,7 +762,6 @@ static void dpaa2_eth_enable_tx_tstamp(struct dpaa2_eth_priv *priv, struct sk_buff *skb) {struct ptp_tstamp origin_timestamp; -struct dpni_single_step_cfg cfg;u8 msgtype, twostep, udp;struct dpaa2_faead *faead;struct dpaa2_fas *fas;
@@ -747,14 +815,12 @@ static void dpaa2_eth_enable_tx_tstamp(struct dpaa2_eth_priv *priv,htonl (origin_timestamp.sec_lsb); *(__be32 *)(data + offset2 +6 ) =htonl (origin_timestamp.nsec); - cfg.en =1 ; - cfg.ch_update = udp; - cfg.offset = offset1; - cfg.peer_delay =0 ; +if (priv->ptp_correction_off == offset1) +return ; + + priv->dpaa2_set_onestep_params_cb (priv, offset1, udp); + priv->ptp_correction_off = offset1; -if (dpni_set_single_step_cfg (priv->mc_io,0 , priv->mc_token, - &cfg)) -WARN_ONCE (1 ,"Failed to set single step register" ); } }
@@ -2199,6 +2265,9 @@ static int dpaa2_eth_ts_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) config.rx_filter =HWTSTAMP_FILTER_ALL ; } +if (priv->tx_tstamp_type ==HWTSTAMP_TX_ONESTEP_SYNC ) +dpaa2_ptp_onestep_reg_update_method (priv); +return copy_to_user (rq->ifr_data, &config,sizeof (config)) ? -EFAULT :0 ; }
@@ -4096,6 +4165,8 @@ static int dpaa2_eth_netdev_init(struct net_device *net_dev)return err; } +dpaa2_eth_detect_features (priv); +/* Capabilities listing */ supported |=IFF_LIVE_ADDR_CHANGE ;
@@ -4542,6 +4613,8 @@ static int dpaa2_eth_remove(struct fsl_mc_device *ls_dev)dpaa2_eth_free_dpbp (priv);dpaa2_eth_free_dpio (priv);dpaa2_eth_free_dpni (priv); +if (priv->onestep_reg_base) +iounmap (priv->onestep_reg_base);fsl_mc_portal_free (priv->mc_io);
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h +12 -2
@@ -506,12 +506,15 @@ struct dpaa2_eth_priv {u8 num_channels;struct dpaa2_eth_channel *channel[DPAA2_ETH_MAX_DPCONS ];struct dpaa2_eth_sgt_cache __percpu *sgt_cache; - +unsigned long features;struct dpni_attr dpni_attrs;u16 dpni_ver_major;u16 dpni_ver_minor;u16 tx_data_offset; - +void __iomem *onestep_reg_base; +u8 ptp_correction_off; +void (*dpaa2_set_onestep_params_cb)(struct dpaa2_eth_priv *priv, +u32 offset,u8 udp);struct fsl_mc_device *dpbp_dev;u16 rx_buf_size;u16 bpid;
@@ -651,6 +654,13 @@ enum dpaa2_eth_rx_dist {#define DPAA2_ETH_DIST_L4DST BIT(8)#define DPAA2_ETH_DIST_ALL (~0ULL) +#define DPNI_PTP_ONESTEP_VER_MAJOR 8 +#define DPNI_PTP_ONESTEP_VER_MINOR 2 +#define DPAA2_ETH_FEATURE_ONESTEP_CFG_DIRECT BIT(0) +#define DPAA2_PTP_SINGLE_STEP_ENABLE BIT(31) +#define DPAA2_PTP_SINGLE_STEP_CH BIT(7) +#define DPAA2_PTP_SINGLE_CORRECTION_OFF (v) ((v) << 8) +#define DPNI_PAUSE_VER_MAJOR 7#define DPNI_PAUSE_VER_MINOR 13#define dpaa2_eth_has_pause_support (priv) \
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 145/160 net: dpaa2-eth: rearrange variable in dpaa2_eth_get_ethtool_stats
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ioana Ciornei <[email protected]>
[ Upstream commit 3313206827678f6f036eca601a51f6c4524b559a ]
Rearrange the variables in the dpaa2_eth_get_ethtool_stats() function so that we adhere to the reverse Christmas tree rule.
Also, in the next patch we are adding more variables and I didn't know where to place them with the current ordering.
Stable-dep-of: 2def09ead4ad ("dpaa2-eth: fix xdp_rxq_info leak")
--- .../ethernet/freescale/dpaa2/dpaa2-ethtool.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c +8 -10
@@ -225,17 +225,8 @@ static void dpaa2_eth_get_ethtool_stats(struct net_device *net_dev,struct ethtool_stats *stats, u64 *data) { - int i = 0; -int j, k, err; -int num_cnt; -union dpni_statistics dpni_stats; -u32 fcnt, bcnt; -u32 fcnt_rx_total =0 , fcnt_tx_total =0 ; -u32 bcnt_rx_total =0 , bcnt_tx_total =0 ; -u32 buf_cnt; struct dpaa2_eth_priv *priv = netdev_priv(net_dev); -struct dpaa2_eth_drv_stats *extras; -struct dpaa2_eth_ch_stats *ch_stats; +union dpni_statistics dpni_stats; int dpni_stats_page_size[DPNI_STATISTICS_CNT] = { sizeof(dpni_stats.page_0), sizeof(dpni_stats.page_1),
@@ -245,6 +236,13 @@ static void dpaa2_eth_get_ethtool_stats(struct net_device *net_dev,sizeof (dpni_stats.page_5), sizeof(dpni_stats.page_6), }; +u32 fcnt_rx_total =0 , fcnt_tx_total =0 ; +u32 bcnt_rx_total =0 , bcnt_tx_total =0 ; +struct dpaa2_eth_ch_stats *ch_stats; +struct dpaa2_eth_drv_stats *extras; +int j, k, err, num_cnt, i =0 ; +u32 fcnt, bcnt; +u32 buf_cnt;memset (data,0 ,sizeof (u64) * (DPAA2_ETH_NUM_STATS +DPAA2_ETH_NUM_EXTRA_STATS ));
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 146/160 dpaa2-eth: fix xdp_rxq_info leak
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fushuai Wang <[email protected]>
[ Upstream commit 2def09ead4ad5907988b655d1e1454003aaf8297 ]
The driver registered xdp_rxq_info structures via xdp_rxq_info_reg() but failed to properly unregister them in error paths and during removal.
--- .../net/ethernet/freescale/dpaa2/dpaa2-eth.c | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-)
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +24 -2
@@ -3512,6 +3512,7 @@ static int dpaa2_eth_setup_rx_flow(struct dpaa2_eth_priv *priv, MEM_TYPE_PAGE_ORDER0, NULL);if (err) {dev_err (dev,"xdp_rxq_info_reg_mem_model failed\n" ); +xdp_rxq_info_unreg (&fq->channel->xdp_rxq);return err; }
@@ -4004,17 +4005,25 @@ static int dpaa2_eth_bind_dpni(struct dpaa2_eth_priv *priv)return -EINVAL ; }if (err) -return err; + goto out; } err =dpni_get_qdid (priv->mc_io,0 , priv->mc_token,DPNI_QUEUE_TX , &priv->tx_qdid);if (err) {dev_err (dev,"dpni_get_qdid() failed\n" ); -return err; + goto out; }return 0 ; + +out: +while (i--) { +if (priv->fq[i].type ==DPAA2_RX_FQ && +xdp_rxq_info_is_reg (&priv->fq[i].channel->xdp_rxq)) +xdp_rxq_info_unreg (&priv->fq[i].channel->xdp_rxq); + } +return err; }/* Allocate rings for storing incoming frame descriptors */
@@ -4371,6 +4380,17 @@ static void dpaa2_eth_del_ch_napi(struct dpaa2_eth_priv *priv) } } +static void dpaa2_eth_free_rx_xdp_rxq (struct dpaa2_eth_priv *priv) +{ +int i; + +for (i =0 ; i < priv->num_fqs; i++) { +if (priv->fq[i].type ==DPAA2_RX_FQ && +xdp_rxq_info_is_reg (&priv->fq[i].channel->xdp_rxq)) +xdp_rxq_info_unreg (&priv->fq[i].channel->xdp_rxq); + } +} +static int dpaa2_eth_probe (struct fsl_mc_device *dpni_dev) {struct device *dev;
@@ -4559,6 +4579,7 @@ static int dpaa2_eth_probe(struct fsl_mc_device *dpni_dev)free_percpu (priv->percpu_stats); err_alloc_percpu_stats:dpaa2_eth_del_ch_napi (priv); +dpaa2_eth_free_rx_xdp_rxq (priv); err_bind:dpaa2_eth_free_dpbp (priv); err_dpbp_setup:
@@ -4610,6 +4631,7 @@ static int dpaa2_eth_remove(struct fsl_mc_device *ls_dev)free_percpu (priv->percpu_extras);dpaa2_eth_del_ch_napi (priv); +dpaa2_eth_free_rx_xdp_rxq (priv);dpaa2_eth_free_dpbp (priv);dpaa2_eth_free_dpio (priv);dpaa2_eth_free_dpni (priv);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 147/160 platform/x86: think-lmi: Fix class device unregistration
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kurt Borja <[email protected]>
[ Upstream commit 5ff1fbb3059730700b4823f43999fc1315984632 ]
Devices under the firmware_attributes_class do not have unique a dev_t. Therefore, device_unregister() should be used instead of device_destroy(), since the latter may match any device with a given dev_t.
--- drivers/platform/x86/think-lmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/platform/x86/think-lmi.c +2 -2
@@ -892,7 +892,7 @@ static int tlmi_sysfs_init(void) fail_create_attr:tlmi_release_attr (); fail_device_created: -device_destroy (fw_attr_class,MKDEV (0 ,0 )); +device_unregister (tlmi_priv.class_dev); fail_class_created:fw_attributes_class_put ();return ret;
@@ -1055,7 +1055,7 @@ static int tlmi_analyze(void)static void tlmi_remove (struct wmi_device *wdev) {tlmi_release_attr (); -device_destroy (fw_attr_class,MKDEV (0 ,0 )); +device_unregister (tlmi_priv.class_dev);fw_attributes_class_put (); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 148/160 platform/x86: dell-wmi-sysman: Fix class device unregistration
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kurt Borja <[email protected]>
[ Upstream commit 314e5ad4782d08858b3abc325c0487bd2abc23a1 ]
Devices under the firmware_attributes_class do not have unique a dev_t. Therefore, device_unregister() should be used instead of device_destroy(), since the latter may match any device with a given dev_t.
--- drivers/platform/x86/dell/dell-wmi-sysman/sysman.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/platform/x86/dell/dell-wmi-sysman/sysman.c +2 -2
@@ -605,7 +605,7 @@ static int __init sysman_init(void)release_attributes_data (); err_destroy_classdev: -device_destroy (fw_attr_class,MKDEV (0 ,0 )); +device_unregister (wmi_priv.class_dev); err_unregister_class:fw_attributes_class_put ();
@@ -622,7 +622,7 @@ static int __init sysman_init(void) static void __exit sysman_exit(void) {release_attributes_data (); -device_destroy (fw_attr_class,MKDEV (0 ,0 )); +device_unregister (wmi_priv.class_dev);fw_attributes_class_put ();exit_bios_attr_set_interface ();exit_bios_attr_pass_interface ();
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 149/160 xhci: dbctty: disable ECHO flag by default
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Łukasz Bartosik <[email protected]>
commit 2b857d69a5e116150639a0c6c39c86cc329939ee upstream.
When /dev/ttyDBC0 device is created then by default ECHO flag is set for the terminal device. However if data arrives from a peer before application using /dev/ttyDBC0 applies its set of terminal flags then the arriving data will be echoed which might not be desired behavior.
--- drivers/usb/host/xhci-dbgtty.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/host/xhci-dbgtty.c +1 -0
@@ -537,6 +537,7 @@ static int dbc_tty_init(void) dbc_tty_driver->type =TTY_DRIVER_TYPE_SERIAL ; dbc_tty_driver->subtype =SERIAL_TYPE_NORMAL ; dbc_tty_driver->init_termios = tty_std_termios; + dbc_tty_driver->init_termios.c_lflag &= ~ECHO ; dbc_tty_driver->init_termios.c_cflag =B9600 |CS8 |CREAD |HUPCL |CLOCAL ; dbc_tty_driver->init_termios.c_ispeed =9600 ;
Greg Kroah-Hartman
maintainerPATCH 150/160 xhci: dbc: Flush queued requests before stopping dbc
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mathias Nyman <[email protected]>
commit efe3e3ae5a66cb38ef29c909e951b4039044bae9 upstream.
Flush dbc requests when dbc is stopped and transfer rings are freed. Failure to flush them lead to leaking memory and dbc completing odd requests after resuming from suspend, leading to error messages such as:
[ 95.344392] xhci_hcd 0000:00:0d.0: no matched request
--- drivers/usb/host/xhci-dbgcap.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/host/xhci-dbgcap.c +4 -0
@@ -639,6 +639,10 @@ static void xhci_dbc_stop(struct xhci_dbcase DS_DISABLED :return ;case DS_CONFIGURED : +spin_lock (&dbc->lock); +xhci_dbc_flush_requests (dbc); +spin_unlock (&dbc->lock); +if (dbc->driver->disconnect) dbc->driver->disconnect (dbc);break ;
Greg Kroah-Hartman
maintainerPATCH 151/160 usb: cdnsp: do not disable slot for disabled slot
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Chen <[email protected]>
commit 7e2c421ef88e9da9c39e01496b7f5b0b354b42bc upstream.
It doesn't need to do it, and the related command event returns 'Slot Not Enabled Error' status.
--- drivers/usb/cdns3/cdnsp-ring.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/cdns3/cdnsp-ring.c +3 -1
@@ -772,7 +772,9 @@ static int cdnsp_update_port_id(struct c }if (port_id != old_port) { -cdnsp_disable_slot (pdev); +if (pdev->slot_id) +cdnsp_disable_slot (pdev); + pdev->active_port = port;cdnsp_enable_slot (pdev); }
Greg Kroah-Hartman
maintainerPATCH 152/160 i2c/designware: Fix an initialization issue
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael J. Ruhl <[email protected]>
commit 3d30048958e0d43425f6d4e76565e6249fa71050 upstream.
The i2c_dw_xfer_init() function requires msgs and msg_write_idx from the dev context to be initialized.
amd_i2c_dw_xfer_quirk() inits msgs and msgs_num, but not msg_write_idx.
This could allow an out of bounds access (of msgs).
Initialize msg_write_idx before calling i2c_dw_xfer_init().
--- drivers/i2c/busses/i2c-designware-master.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/busses/i2c-designware-master.c +1 -0
@@ -298,6 +298,7 @@ static int amd_i2c_dw_xfer_quirk(struct dev->msgs = msgs; dev->msgs_num = num_msgs; + dev->msg_write_idx =0 ;i2c_dw_xfer_init (dev);i2c_dw_disable_int (dev);
Greg Kroah-Hartman
maintainerPATCH 135/160 mtd: spinand: fix memory leak of ECC engine conf
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Martin-Gomez <[email protected]>
[ Upstream commit 6463cbe08b0cbf9bba8763306764f5fd643023e1 ]
Memory allocated for the ECC engine conf is not released during spinand cleanup. Below kmemleak trace is seen for this memory leak:
unreferenced object 0xffffff80064f00e0 (size 8):
comm "swapper/0", pid 1, jiffies 4294937458
hex dump (first 8 bytes):
00 00 00 00 00 00 00 00 ........
backtrace (crc 0):
kmemleak_alloc+0x30/0x40
__kmalloc_cache_noprof+0x208/0x3c0
spinand_ondie_ecc_init_ctx+0x114/0x200
nand_ecc_init_ctx+0x70/0xa8
nanddev_ecc_engine_init+0xec/0x27c
spinand_probe+0xa2c/0x1620
spi_mem_probe+0x130/0x21c
spi_probe+0xf0/0x170
really_probe+0x17c/0x6e8
__driver_probe_device+0x17c/0x21c
driver_probe_device+0x58/0x180
__device_attach_driver+0x15c/0x1f8
bus_for_each_drv+0xec/0x150
__device_attach+0x188/0x24c
device_initial_probe+0x10/0x20
bus_probe_device+0x11c/0x160Fix the leak by calling nanddev_ecc_engine_cleanup() inside spinand_cleanup().
--- drivers/mtd/nand/spi/core.c | 1 + 1 file changed, 1 insertion(+)
drivers/mtd/nand/spi/core.c +1 -0
@@ -1271,6 +1271,7 @@ static void spinand_cleanup(struct spinand_device *spinand) {struct nand_device *nand =spinand_to_nand (spinand); +nanddev_ecc_engine_cleanup (nand);nanddev_cleanup (nand);spinand_manufacturer_cleanup (spinand);kfree (spinand->databuf);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 153/160 Logitech C-270 even more broken
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
commit cee4392a57e14a799fbdee193bc4c0de65b29521 upstream.
Some varieties of this device don't work withRESET_RESUME alone.
--- drivers/usb/core/quirks.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/core/quirks.c +2 -1
@@ -224,7 +224,8 @@ static const struct usb_device_id usb_qu { USB_DEVICE(0x046a, 0x0023), .driver_info = USB_QUIRK_RESET_RESUME }, /* Logitech HD Webcam C270 */ - { USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME }, + { USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME | + USB_QUIRK_NO_LPM}, /* Logitech HD Pro Webcams C920, C920-C, C922, C925e and C930e */ { USB_DEVICE(0x046d, 0x082d), .driver_info = USB_QUIRK_DELAY_INIT },