6.18.34-rc1 review
Subsystems (3)
Greg Kroah-Hartman
maintainercover 6.18.34-rc1 review
This is the start of the stable review cycle for the 6.18.34 release. There are 377 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 30 May 2026 19:45:50 +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/v6.x/stable-review/patch-6.18.34-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-6.18.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 6.18.34-rc1
Tiezhu Yang <[email protected]>
LoongArch: kprobes: Fix handling of fatal unrecoverable recursions
Junyi Liu <[email protected]>
ksmbd: fix durable reconnect error path file lifetime
Alexander A. Klimov <[email protected]>
io_uring/nop: pass all errors to userspace
Sabrina Dubroca <[email protected]>
net: gro: don't merge zcopy skbs
Nikhil P. Rao <[email protected]>
pds_core: ensure null-termination for firmware version strings
Lorenzo Bianconi <[email protected]>
net: airoha: Disable GDM2 forwarding before configuring GDM2 loopback
Weiming Shi <[email protected]>
tap: fix stack info leak in tap_ioctl() SIOCGIFHWADDR
Aditya Garg <[email protected]>
net: mana: validate rx_req_idx to prevent out-of-bounds array access
Ratheesh Kannoth <[email protected]>
octeontx2-af: npc: Fix allmulticast skip logic for LBK and SDP VFs
Nimrod Oren <[email protected]>
selftests: net: Fix checksums in xdp_native
Shuicheng Lin <[email protected]>
drm/xe/oa: Fix exec_queue leak on width check in stream open
Richard Fitzgerald <[email protected]>
ASoC: cs35l56: Fix flushing of IRQ work in cs35l56_sdw_remove()
Bartosz Golaszewski <[email protected]>
gpio: aggregator: lock device when calling device_is_bound()
Bartosz Golaszewski <[email protected]>
gpio: aggregator: remove the software node when deactivating the aggregator
Bartosz Golaszewski <[email protected]>
gpio: aggregator: stop using dev-sync-probe
Bartosz Golaszewski <[email protected]>
gpio: aggregator: fix a potential use-after-free
Bartosz Golaszewski <[email protected]>
gpio: cdev: check if uAPI v2 config attributes are correctly zeroed
Eric Dumazet <[email protected]>
tcp: fix stale per-CPU tcp_tw_isn leak enabling ISN prediction
Xingwang Xiang <[email protected]>
bpf, skmsg: fix verdict sk_data_ready racing with ktls rx
Rosen Penev <[email protected]>
net: ag71xx: check error for platform_get_irq
David Howells <[email protected]>
crypto/krb5, rxrpc: Fix lack of pre-decrypt/pre-verify length checks
Jakub Kicinski <[email protected]>
net: shaper: rework the VALID marking (again)
Jakub Kicinski <[email protected]>
net: shaper: annotate the data races
Prathamesh Deshpande <[email protected]>
net/mlx5e: Fix eswitch mode block underflow on IPsec acquire SA
Jiajia Liu <[email protected]>
Bluetooth: btmtk: fix urb->setup_packet leak in error paths
Kiran K <[email protected]>
Bluetooth: btintel_pcie: Fix incorrect MAC access programming
David Carlier <[email protected]>
tracing: Avoid NULL return from hist_field_name() on truncation
Cunlong Li <[email protected]>
cgroup: rstat: relax NMI guard after switch to try_cmpxchg
Zhang Cen <[email protected]>
ALSA: seq: Serialize UMP output teardown with event_input
Shitalkumar Gandhi <[email protected]>
wifi: wilc1000: fix dma_buffer leak on bus acquire failure
Johannes Berg <[email protected]>
wifi: mac80211: fix MLE defragmentation
Alexandru Hossu <[email protected]>
wifi: mac80211: bounds-check link_id in ieee80211_ml_epcs
Gao Xiang <[email protected]>
erofs: fix managed cache race for unaligned extents
Nikhil P. Rao <[email protected]>
pds_core: fix debugfs_lookup dentry leak and error handling
Nikhil P. Rao <[email protected]>
pds_core: fix error handling in pdsc_devcmd_wait
Christian Marangi <[email protected]>
net: airoha: Fix NPU RX DMA descriptor bits
Nicolai Buchwitz <[email protected]>
net: phy: honor eee_disabled_modes in phy_advertise_eee_all()
Nicolai Buchwitz <[email protected]>
net: phy: honor eee_disabled_modes in phy_support_eee()
Ido Schimmel <[email protected]>
bridge: mcast: Fix a possible use-after-free when removing a bridge port
Petr Machata <[email protected]>
net: bridge: Flush multicast groups when snooping is disabled
Guangshuo Li <[email protected]>
RDMA/rtrs: Fix use-after-free in path file creation cleanup
Shiraz Saleem <[email protected]>
RDMA/mana_ib: Report max_msg_sz in mana_ib_query_port
Robertus Diawan Chris <[email protected]>
ASoC: soc-utils: Add missing va_end in snd_soc_ret()
Rafael J. Wysocki <[email protected]>
platform/x86: intel-vbtn: Check ACPI_HANDLE() against NULL
Rafael J. Wysocki <[email protected]>
platform/x86: intel-hid: Check ACPI_HANDLE() against NULL
Rafael J. Wysocki <[email protected]>
platform/x86: hp_accel: Check ACPI_COMPANION() against NULL
Rafael J. Wysocki <[email protected]>
platform/x86: adv_swbutton: Check ACPI_HANDLE() against NULL
Oliver White <[email protected]>
platform/surface: aggregator_registry: omit battery & AC nodes on Surface Laptop 7
Erni Sri Satya Vennela <[email protected]>
net: mana: Fix TOCTOU double-fetch of hwc_msg_id from DMA buffer
Daniel Golle <[email protected]>
net: dsa: mt7530: preserve VLAN tags on trapped link-local frames
Daniel Golle <[email protected]>
net: dsa: mt7530: fix FDB entries not aging out with short timeout
Viktor Jägersküpper <[email protected]>
kbuild: pacman-pkg: make "rc" releases adhere to pacman versioning scheme
Ankit Nautiyal <[email protected]>
drm/i915/dp: Fix readback for target_rr in Adaptive Sync SDP
Kohei Enju <[email protected]>
igc: set tx buffer type for SMD frames
Grzegorz Nitka <[email protected]>
ice: ptp: use primary NAC semaphore on E825
Grzegorz Nitka <[email protected]>
ice: ptp: serialize E825 PHY timer start with PTP lock
Qing Ming <[email protected]>
cgroup/rstat: validate cpu before css_rstat_cpu() access
Louis-Alexis Eyraud <[email protected]>
drm/mediatek: mtk_hdmi_ddc: Fix non-static global variable
Louis-Alexis Eyraud <[email protected]>
drm/mediatek: mtk_cec: Fix non-static global variable
Matthew Leach <[email protected]>
wifi: ath11k: fix peer resolution on rx path when peer_id=0
Mohanram Meenakshisundaram <[email protected]>
drm/xe/pf: Fix CFI failure in debugfs access
Michal Wajdeczko <[email protected]>
drm/xe/vf: Fix signature of print functions
Shuicheng Lin <[email protected]>
drm/xe/gsc: Fix double-free of managed BO in error path
Jianpeng Chang <[email protected]>
dma-mapping: move dma_map_resource() sanity check into debug code
Miri Korenblit <[email protected]>
wifi: iwlwifi: mld: don't dereference a pointer before NULL checking it
Cole Leavitt <[email protected]>
wifi: iwlwifi: mld: fix TSO segmentation explosion when AMSDU is disabled
Guenter Roeck <[email protected]>
hwmon: (lm90) Add lock protection to lm90_alert
Guenter Roeck <[email protected]>
hwmon: (lm90) Stop work before releasing hwmon device
Dmitry Baryshkov <[email protected]>
drm/msm/snapshot: fix dumping of the unaligned regions
Eric Naim <[email protected]>
ALSA: hda/realtek: Use ALC287_FIXUP_TXNW2781_I2C for ASUS Strix Gxx5
Florian Westphal <[email protected]>
netfilter: nft_inner: release local_lock before re-enabling softirqs
Felix Gu <[email protected]>
spi: mtk-snfi: Fix resource leak in mtk_snand_read_page_cache()
Cássio Gabriel <[email protected]>
ASoC: amd: acp-sdw-legacy: check CPU DAI name before logging
Boris Burkov <[email protected]>
btrfs: fix squota accounting during enable generation
Boris Burkov <[email protected]>
btrfs: check for subvolume before deleting squota qgroup
Boris Burkov <[email protected]>
btrfs: relax squota parent qgroup deletion rule
Boris Burkov <[email protected]>
btrfs: check squota parent usage on membership change
David Sterba <[email protected]>
btrfs: remaining BTRFS_PATH_AUTO_FREE conversions
Josef Bacik <[email protected]>
btrfs: don't search back for dir inode item in INO_LOOKUP_USER
Filipe Manana <[email protected]>
btrfs: use the key format macros when printing keys
Filipe Manana <[email protected]>
btrfs: add macros to facilitate printing of keys
Stefano Garzarella <[email protected]>
vsock/virtio: fix zerocopy completion for multi-skb sends
Jens Axboe <[email protected]>
io_uring/net: punt IORING_OP_BIND async if it needs file create
Robertus Diawan Chris <[email protected]>
ALSA: scarlett2: Add missing error check when initialise Autogain Status
Alexander A. Klimov <[email protected]>
ASoC: codecs: fs210x: fix possible buffer overflow
Mike Christie <[email protected]>
scsi: sd: Fix return code handling in sd_spinup_disk()
Jeroen Massar <[email protected]>
net/mlx5: Do not restore destination-less TC rules
Chuck Lever <[email protected]>
tls: Preserve sk_err across recvmsg() when data has been copied
Ralf Lici <[email protected]>
ovpn: disable BHs when updating device stats
Juergen Gross <[email protected]>
x86/xen: Fix xen_e820_swap_entry_with_ram()
Kees Cook <[email protected]>
gcc-plugins: Always define CONST_CAST_GIMPLE and CONST_CAST_TREE
Antonio Quartulli <[email protected]>
ovpn: fix race between deleting interface and adding new peer
David Carlier <[email protected]>
ovpn: respect peer refcount in CMD_NEW_PEER error path
David Carlier <[email protected]>
ovpn: tcp - use cached peer pointer in ovpn_tcp_close()
Sven Schuchmann <[email protected]>
net: phy: DP83TC811: add reading of abilities
Jakub Kicinski <[email protected]>
net: tls: prevent chain-after-chain in plain text SG
Jakub Kicinski <[email protected]>
net: tls: fix off-by-one in sg_chain entry count for wrapped sk_msg ring
Xiang Mei <[email protected]>
net/smc: reject CHID-0 ACCEPT that matches an empty ism_dev slot
Sayali Patil <[email protected]>
powerpc/time: Remove redundant preempt_disable|enable() calls from arch_irq_work_raise()
Mikko Perttunen <[email protected]>
drm/msm: Fix iommu_map_sgtable() return value check and avoid WARN
Dmitry Baryshkov <[email protected]>
drm/msm/adreno: fix userspace-triggered crash on a2xx-a4xx
Ricardo Neri <[email protected]>
Documentation: intel_pstate: Fix description of asymmetric packing with SMT
Borislav Petkov (AMD) <[email protected]>
x86/mce: Restore MCA polling interval halving
Ming Lei <[email protected]>
selftests: ublk: cap nthreads to kernel's actual nr_hw_queues
Dmitry Baryshkov <[email protected]>
drm/msm/dpu: don't mix devm and drmm functions
Dmitry Baryshkov <[email protected]>
drm/msm/dsi: don't dump registers past the mapped region
Chenguang Zhao <[email protected]>
ethtool: fix ethnl_bitmap32_not_zero() bit interval semantics
Xiang Mei <[email protected]>
net/smc: avoid NULL deref of conn->lnk in smc_msg_event tracepoint
Zack McKevitt <[email protected]>
accel/qaic: Add overflow check to remap_pfn_range during mmap
Sungwoo Kim <[email protected]>
block: bio-integrity: Fix null-ptr-deref in bio_integrity_map_user()
Lukas Bulwahn <[email protected]>
HID: quirks: really enable the intended work around for appledisplay
Casey Chen <[email protected]>
block: recompute nr_integrity_segments in blk_insert_cloned_request
David Carlier <[email protected]>
block: don't overwrite bip_vcnt in bio_integrity_copy_user()
Jakub Kicinski <[email protected]>
net: shaper: reject QUEUE scope handle with missing id
Jakub Kicinski <[email protected]>
net: shaper: enforce singleton NETDEV scope with id 0
Jakub Kicinski <[email protected]>
net: shaper: reject handle IDs exceeding internal bit-width
Jakub Kicinski <[email protected]>
net: shaper: fix undersized reply skb allocation in GROUP command
Jakub Kicinski <[email protected]>
net: shaper: set ret to -ENOMEM when genlmsg_new() fails in group_doit
Jakub Kicinski <[email protected]>
net: shaper: reject duplicate leaves in GROUP request
Jakub Kicinski <[email protected]>
net: shaper: fix trivial ordering issue in net_shaper_commit()
Jakub Kicinski <[email protected]>
net: shaper: flip the polarity of the valid flag
Kang Yang <[email protected]>
wifi: ath10k: skip WMI and beacon transmission when device is wedged
Nicolas Escande <[email protected]>
wifi: ath11k: fix error path leak in ath11k_tm_cmd_wmi_ftm()
Nicolas Escande <[email protected]>
wifi: ath11k: fix error path leaks in some WMI WOW calls
Ethan Nelson-Moore <[email protected]>
net: ethernet: cs89x0: remove stale CONFIG_MACH_MX31ADS reference
Linus Walleij <[email protected]>
net: ethernet: cortina: Carry over frag counter
Andreas Haarmann-Thiemann <[email protected]>
net: ethernet: cortina: Drop half-assembled SKB
Linus Walleij <[email protected]>
net: ethernet: cortina: Make RX SKB per-port
David Howells <[email protected]>
netfs, afs: Fix write skipping in dir/link writepages
David Howells <[email protected]>
netfs: Fix netfs_read_folio() to wait on writeback
David Howells <[email protected]>
netfs: Fix folio->private handling in netfs_perform_write()
David Howells <[email protected]>
netfs: Fix partial invalidation of streaming-write folio
David Howells <[email protected]>
netfs: Fix potential UAF in netfs_unlock_abandoned_read_pages()
David Howells <[email protected]>
netfs: Fix leak of request in netfs_write_begin() error handling
David Howells <[email protected]>
netfs: Fix early put of sink folio in netfs_read_gaps()
David Howells <[email protected]>
netfs: Fix write streaming disablement if fd open O_RDWR
David Howells <[email protected]>
netfs: Fix read-gaps to remove netfs_folio from filled folio
David Howells <[email protected]>
netfs: Fix potential deadlock in write-through mode
David Howells <[email protected]>
netfs: Fix streaming write being overwritten
David Howells <[email protected]>
netfs: Defer the emission of trace_netfs_folio()
David Howells <[email protected]>
netfs: Fix netfs_invalidate_folio() to clear dirty bit if all changes gone
David Howells <[email protected]>
netfs: Fix overrun check in netfs_extract_user_iter()
Viacheslav Dubeyko <[email protected]>
netfs: fix VM_BUG_ON_FOLIO() issue in netfs_write_begin() call
David Howells <[email protected]>
netfs: Fix netfs_read_to_pagecache() to pause on subreq failure
David Howells <[email protected]>
netfs: Fix cancellation of a DIO and single read subrequests
Julian Braha <[email protected]>
powerpc: fix dead default for GUEST_STATE_BUFFER_TEST
Ally Heev <[email protected]>
powerpc: 82xx: fix uninitialized pointers with free attribute
Mario Limonciello <[email protected]>
ASoC: SOF: amd: Fix error code handling in psp_send_cmd()
Kuniyuki Iwashima <[email protected]>
tcp: Fix out-of-bounds access for twsk in tcp_ao_established_key().
Johannes Thumshirn <[email protected]>
zonefs: handle integer overflow in zonefs_fname_to_fno
Chia-Lin Kao (AceLan) <[email protected]>
nvme-pci: fix use-after-free in nvme_free_host_mem()
Keith Busch <[email protected]>
nvme: fix bio leak on mapping failure
Jiayuan Chen <[email protected]>
irq_work: Fix use-after-free in irq_work_single() on PREEMPT_RT
Zhihao Cheng <[email protected]>
nsfs: fix wrong error code returned for pidns ioctls
Ming Lei <[email protected]>
ublk: reject max_sectors smaller than PAGE_SECTORS in parameter validation
Rosen Penev <[email protected]>
irqchip/ath79-cpu: Remove unused function
Hongling Zeng <[email protected]>
fs: Fix return in jfs_mkdir and orangefs_mkdir
Junyoung Jang <[email protected]>
fs/statmount: fix slab out-of-bounds write in statmount_mnt_idmap
Masami Hiramatsu (Google) <[email protected]>
fprobe: Fix unregister_fprobe() to wait for RCU grace period
Mac Chiang <[email protected]>
ASoC: sdw_utils: Add quirk to ignore RT721 CODEC_MIC
Mac Chiang <[email protected]>
ASoC: sdw_utils: Add quirk to ignore RT712 CODEC_MIC
Chuck Lever <[email protected]>
NFSD: Fix infinite loop in layout state revocation
Gabor Juhos <[email protected]>
phy: marvell: mvebu-a3700-utmi: fix incorrect USB2_PHY_CTRL register access
Shitalkumar Gandhi <[email protected]>
net: ti: icssm-prueth: fix eth_ports_node leak in probe
Myeonghun Pak <[email protected]>
net: lan966x: avoid unregistering netdev on register failure
Bart Van Assche <[email protected]>
ice: fix locking in ice_dcb_rebuild()
Marcin Szycik <[email protected]>
ice: fix setting RSS VSI hash for E830
Emil Tantilov <[email protected]>
idpf: fix read_dev_clk_lock spinlock init in idpf_ptp_init()
Mohsin Bashir <[email protected]>
net: shaper: Reject reparenting of existing nodes
Dragos Tatulea <[email protected]>
net: napi: Avoid gro timer misfiring at end of busypoll
Kuniyuki Iwashima <[email protected]>
tcp: Fix imbalanced icsk_accept_queue count.
Martin Kaiser <[email protected]>
test_kprobes: clear kprobes between test runs
Jianpeng Chang <[email protected]>
kprobes: skip non-symbol addresses in kprobe_add_ksym_blacklist()
Florian Westphal <[email protected]>
netfilter: bridge: eb_tables: close module init race
Florian Westphal <[email protected]>
netfilter: x_tables: close dangling table module init race
Florian Westphal <[email protected]>
netfilter: ebtables: close dangling table module init race
Florian Westphal <[email protected]>
netfilter: ebtables: move to two-stage removal scheme
Florian Westphal <[email protected]>
netfilter: x_tables: add and use xtables_unregister_table_exit
Florian Westphal <[email protected]>
netfilter: x_tables: add and use xt_unregister_table_pre_exit
Florian Westphal <[email protected]>
netfilter: x_tables: unregister the templates first
Filipe Manana <[email protected]>
btrfs: tracepoints: fix sleep while in atomic context in btrfs_sync_file()
Shuhao Fu <[email protected]>
ALSA: hda: cs35l41: Put ACPI device on missing physical node
Shuhao Fu <[email protected]>
ALSA: hda: cs35l56: Put ACPI device after setting companion
Guenter Roeck <[email protected]>
ARM: integrator: Fix early initialization
Sudeep Holla <[email protected]>
firmware: arm_ffa: Fix sched-recv callback partition lookup
Sudeep Holla <[email protected]>
firmware: arm_ffa: Snapshot notifier callbacks under lock
Sudeep Holla <[email protected]>
firmware: arm_ffa: Align RxTx buffer size before mapping
Sudeep Holla <[email protected]>
firmware: arm_ffa: Validate framework notification message layout
Sudeep Holla <[email protected]>
firmware: arm_ffa: Keep framework RX release under lock
Sudeep Holla <[email protected]>
firmware: arm_ffa: Bound PARTITION_INFO_GET_REGS copies
Maulik Shah <[email protected]>
pinctrl: qcom: Fix wakeirq map by removing disconnected irqs for sm8150
David Gow <[email protected]>
kunit: config: KUNIT_DEBUGFS should depend on DEBUG_FS
David Gow <[email protected]>
kunit: config: Enable KUNIT_DEBUGFS by default
Guo Ren (Alibaba DAMO Academy) <[email protected]>
riscv: mm: Fixup no5lvl failure when vaddr is invalid
Michael Neuling <[email protected]>
riscv: errata: Fix bitwise vs logical AND in MIPS errata patching
Sudeep Holla <[email protected]>
firmware: arm_ffa: Unregister bus notifier on teardown for FF-A v1.0
Sudeep Holla <[email protected]>
firmware: arm_ffa: Fix per-vcpu self notifications handling in workqueue
Sudeep Holla <[email protected]>
firmware: arm_ffa: Skip free_pages on RX buffer alloc failure
Sudeep Holla <[email protected]>
firmware: arm_ffa: Check for NULL FF-A ID table while driver registration
Takashi Iwai <[email protected]>
HID: uclogic: Fix regression of input name assignment
Dan Carpenter <[email protected]>
HID: intel-thc-hid: Intel-quickspi: Fix some error codes
Maulik Shah <[email protected]>
pinctrl: qcom: Fix GPIO to PDC wake irq map for qcs615
Xianwei Zhao <[email protected]>
pinctrl: meson: amlogic-a4: fix deadlock issue
Lad Prabhakar <[email protected]>
pinctrl: renesas: rzg2l: Fix SMT register cache handling
Biju Das <[email protected]>
pinctrl: renesas: rzg2l: Fix incorrect PUPD register offset for high pins during suspend/resume
Marek Vasut <[email protected]>
ARM: dts: renesas: rskrza1: Drop superfluous cells
Marek Vasut <[email protected]>
ARM: dts: renesas: genmai: Drop superfluous cells
Til Kaiser <[email protected]>
pinctrl: qcom: ipq4019: mark gpio as a GPIO pin function
Abdurrahman Hussain <[email protected]>
hwmon: (pmbus/adm1266) reject short block-read responses in the GPIO accessors
Abdurrahman Hussain <[email protected]>
hwmon: (pmbus/adm1266) register the nvmem device after pmbus_do_probe()
Abdurrahman Hussain <[email protected]>
hwmon: (pmbus/adm1266) register the gpio_chip after pmbus_do_probe()
Abdurrahman Hussain <[email protected]>
hwmon: (pmbus/adm1266) don't clobber GPIO bits before PDIO read in get_multiple
Abdurrahman Hussain <[email protected]>
hwmon: (pmbus/adm1266) cap PDIO scan in get_multiple at ADM1266_PDIO_NR
Abdurrahman Hussain <[email protected]>
hwmon: (pmbus/adm1266) bounce blackbox records through a protocol-sized buffer
Abdurrahman Hussain <[email protected]>
hwmon: (pmbus/adm1266) include PEC byte in pmbus_block_xfer read buffer
Abdurrahman Hussain <[email protected]>
hwmon: (pmbus/adm1266) reject implausible blackbox record_count
Abdurrahman Hussain <[email protected]>
hwmon: (pmbus/adm1266) seed timestamp from the real-time clock
Sven Eckelmann <[email protected]>
batman-adv: tt: prevent TVLV entry number overflow
Sven Eckelmann <[email protected]>
batman-adv: tt: fix negative tt_buff_len
Sven Eckelmann <[email protected]>
batman-adv: tt: fix negative last_changeset_len
Sven Eckelmann <[email protected]>
batman-adv: tt: avoid empty VLAN responses
Sven Eckelmann <[email protected]>
batman-adv: tt: reject oversized local TVLV buffers
Sven Eckelmann <[email protected]>
batman-adv: tt: fix TOCTOU race for reported vlans
Sven Eckelmann <[email protected]>
batman-adv: tp_meter: avoid role confusion in tp_list
Sven Eckelmann <[email protected]>
batman-adv: tp_meter: fix race condition in send error reporting
Sven Eckelmann <[email protected]>
batman-adv: tp_meter: fix tp_vars reference leak in receiver shutdown
Sven Eckelmann <[email protected]>
batman-adv: tp_meter: directly shut down timer on cleanup
Sven Eckelmann <[email protected]>
batman-adv: tp_meter: avoid use of uninit sender vars
Sven Eckelmann <[email protected]>
batman-adv: bla: avoid NULL-ptr deref for claim via dropped interface
Sven Eckelmann <[email protected]>
batman-adv: bla: avoid double decrement of bla.num_requests
Sven Eckelmann <[email protected]>
batman-adv: bla: fix report_work leak on backbone_gw purge
Sven Eckelmann <[email protected]>
batman-adv: frag: disallow unicast fragment in fragment
Luxiao Xu <[email protected]>
batman-adv: fix tp_meter counter underflow during shutdown
Ruide Cao <[email protected]>
batman-adv: fix fragment reassembly length accounting
Sven Eckelmann <[email protected]>
batman-adv: dat: handle forward allocation error
Ruijie Li <[email protected]>
batman-adv: clear current gateway during teardown
Sven Eckelmann <[email protected]>
batman-adv: mcast: fix use-after-free in orig_node RCU release
Sven Eckelmann <[email protected]>
batman-adv: iv: recover OGM scheduling after forward packet error
Sven Eckelmann <[email protected]>
batman-adv: tvlv: reject oversized TVLV packets
Sven Eckelmann <[email protected]>
batman-adv: tvlv: abort OGM send on tvlv append failure
Sven Eckelmann <[email protected]>
batman-adv: v: stop OGMv2 on disabled interface
Harry Wentland <[email protected]>
drm/amd/display: Validate payload length and link_index in dc_process_dmub_aux_transfer_async
Harry Wentland <[email protected]>
drm/amd/display: Validate GPIO pin LUT table size before iterating
Harry Wentland <[email protected]>
drm/amd/display: Fix integer overflow in bios_get_image()
Osama Abdelkader <[email protected]>
drm/bridge: megachips: remove bridge when irq request fails
Julien Chauveau <[email protected]>
drm/bridge: it66121: acquire reset GPIO in probe
Alan Liu <[email protected]>
drm/amdgpu/vpe: Force collaborate sync after TRAP
Deepanshu Kartikey <[email protected]>
drm/virtio: use uninterruptible resv lock for plane updates
Maíra Canal <[email protected]>
drm/v3d: Release indirect CSD GEM reference on CPU job free
Maíra Canal <[email protected]>
drm/v3d: Fix use-after-free of CPU job query arrays on error path
Daniel J Blueman <[email protected]>
drm/msm: Fix shrinker deadlock
Bartosz Golaszewski <[email protected]>
device property: set fwnode->secondary to NULL in fwnode_init()
Huacai Chen <[email protected]>
LoongArch: Remove unused code to avoid build warning
Tiezhu Yang <[email protected]>
LoongArch: kprobes: Use larch_insn_text_copy() to patch instructions
Heechan Kang <[email protected]>
fwctl: pds: Validate RPC input size before parsing
Michael Bommarito <[email protected]>
RDMA/siw: Reject MPA FPDU length underflow before signed receive math
Johan Hovold <[email protected]>
spi: ti-qspi: fix use-after-free after DMA setup failure
Johan Hovold <[email protected]>
spi: sprd: fix error pointer deref after DMA setup failure
Johan Hovold <[email protected]>
spi: ep93xx: fix error pointer deref after DMA setup failure
Michael Bommarito <[email protected]>
scsi: isci: Fix use-after-free in device removal path
Nitin Rawat <[email protected]>
phy: qcom-qmp-ufs: Fix kaanapali PHY PLL lock failure after SM8650 G4 fix
Wayne Chang <[email protected]>
phy: tegra: xusb: Fix per-pad high-speed termination calibration
Łukasz Lebiedziński <[email protected]>
phy: exynos5-usbdrd: fix USB 2.0 HS PHY tuning values for Exynos7870
Johan Hovold <[email protected]>
spi: qup: fix error pointer deref after DMA setup failure
Osama Abdelkader <[email protected]>
drm/bridge: chipone-icn6211: use devm_drm_bridge_add in i2c probe
Carlos López <[email protected]>
virt: sev-guest: Explicitly leak pages in unknown state
Osama Abdelkader <[email protected]>
riscv: kvm: return SBI_ERR_FAILURE for pmu_event_info() when OOM
Osama Abdelkader <[email protected]>
riscv: kvm: return SBI_ERR_FAILURE for pmu_snapshot_set_shmem() when OOM
Tina Zhang <[email protected]>
KVM: SVM: Disable AVIC IPI virtualization on Hygon Family 18h (erratum #1235)
Michael Bommarito <[email protected]>
KVM: arm64: vgic: Free private_irqs when init fails after allocation
Michael Bommarito <[email protected]>
KVM: arm64: vgic-its: Reject restored DTE with out-of-range num_eventid_bits
Vladimir Murzin <[email protected]>
arm64: probes: Handle probes on hinted conditional branch instructions
Masami Hiramatsu (Google) <[email protected]>
tracing: Do not call map->ops->elt_free() if elt_alloc() fails
Zhihao Cheng <[email protected]>
cifs: Fix busy dentry used after unmounting
Michael Bommarito <[email protected]>
wifi: mac80211: consume only present negotiated TTLM maps
Jann Horn <[email protected]>
af_unix: Fix UAF read of tail->len in unix_stream_data_wait()
John Walker <[email protected]>
wifi: cfg80211: advance loop vars in cfg80211_merge_profile()
Grzegorz Nitka <[email protected]>
ice: restore PTP Rx timestamp config after ethtool set-channels
Marcin Szycik <[email protected]>
ice: fix setting promisc mode while adding VID filter
Jacob Keller <[email protected]>
ice: fix locking around wait_event_interruptible_locked_irq
Kohei Enju <[email protected]>
igc: fix potential skb leak in igc_fpe_xmit_smd_frame()
Dawei Feng <[email protected]>
octeontx2-pf: fix double free in rvu_rep_rsrc_init()
Sam Daly <[email protected]>
octeontx2-af: CGX: add bounds check to cgx_speed_mbps index
Stephen Smalley <[email protected]>
lsm: hold cred_guard_mutex for lsm_set_self_attr()
Ilya Dryomov <[email protected]>
rbd: eliminate a race in lock_dwork draining on unmap
Michael Bommarito <[email protected]>
ixgbevf: fix use-after-free in VEPA multicast source pruning
Michael Bommarito <[email protected]>
ipv4: raw: reject IP_HDRINCL packets with ihl < 5
Sheroz Juraev <[email protected]>
wifi: iwlwifi: mld: stop TX during firmware restart
Johannes Berg <[email protected]>
wifi: iwlwifi: mvm: fix driver-set TX rates on old devices
Kyle Farnung <[email protected]>
wifi: ath11k: clear shared SRNG pointer state on restart
Jose Ignacio Tornos Martinez <[email protected]>
ice: fix VF queue configuration with low MTU values
Stefano Garzarella <[email protected]>
vsock/virtio: reset connection on receiving queue overflow
Minh Nguyen <[email protected]>
vsock/vmci: fix UAF when peer resets connection during handshake
Li Xiasong <[email protected]>
mptcp: pm: fix ADD_ADDR timer infinite retry on option space insufficient
Justin Iurman <[email protected]>
ipv6: ioam: add NULL check for idev in ipv6_hop_ioam()
Masami Hiramatsu (Google) <[email protected]>
ring-buffer: Flush and stop persistent ring buffer on panic
Steven Rostedt <[email protected]>
ring-buffer: Fix reporting of missed events in iterator
Dawei Feng <[email protected]>
qed: fix double free in qed_cxt_tables_alloc()
Michael Bommarito <[email protected]>
l2tp: use list_del_rcu in l2tp_session_unhash
Konstantin Komarov <[email protected]>
fs/ntfs3: handle attr_set_size() errors when truncating files
David Carlier <[email protected]>
net: ethtool: phy: avoid NULL deref when PHY driver is unbound
Quan Sun <[email protected]>
net: ethtool: fix NULL pointer dereference in phy_reply_size
Guopeng Zhang <[email protected]>
cgroup/cpuset: Reset DL migration state on can_attach() failure
Masami Hiramatsu (Google) <[email protected]>
tracing/fprobe: Check the same type fprobe on table as the unregistered one
Masami Hiramatsu (Google) <[email protected]>
tracing/fprobe: Avoid kcalloc() in rcu_read_lock section
Menglong Dong <[email protected]>
tracing: fprobe: use ftrace if CONFIG_DYNAMIC_FTRACE_WITH_ARGS
Masami Hiramatsu (Google) <[email protected]>
tracing: fprobe: Remove unused local variable
Tejun Heo <[email protected]>
sched_ext: Avoid UAF in scx_root_enable_workfn() init failure path
Samuele Mariotti <[email protected]>
sched_ext: Fix missing warning in scx_set_task_state() default case
Yizhou Zhao <[email protected]>
netfilter: nft_inner: Fix IPv6 inner_thoff desync
Nan Li <[email protected]>
netfilter: ipset: stop hash:* range iteration at end
Haoze Xie <[email protected]>
netfilter: nf_queue: hold bridge skb->dev while queued
Zhengchuan Liang <[email protected]>
netfilter: ip6t_hbh: reject oversized option lists
Jonas Jelonek <[email protected]>
net: pse-pd: fix sign on -ENOENT check in of_load_pse_pis()
Michael Bommarito <[email protected]>
net: ifb: report ethtool stats over num_tx_queues
Matt Fleming <[email protected]>
net/mlx5e: Fix use-after-free in mlx5e_tx_reporter_timeout_recover
Nerijus Bendžiūnas <[email protected]>
net: phy: skip EEE advertisement write when autoneg is disabled
Nicolai Buchwitz <[email protected]>
net: bcmgenet: keep RBUF EEE/PM disabled
Zijing Yin <[email protected]>
phonet/pep: disable BH around forwarded sk_receive_skb()
Jiexun Wang <[email protected]>
Bluetooth: serialize accept_q access
Michael Bommarito <[email protected]>
Bluetooth: MGMT: validate Add Extended Advertising Data length
Michael Bommarito <[email protected]>
Bluetooth: L2CAP: ecred_reconfigure: send packed pdu, not stack pointer
Mingyu Wang <[email protected]>
Bluetooth: hci_uart: fix UAFs and race conditions in close and init paths
Jann Horn <[email protected]>
Bluetooth: bnep: Fix UAF read of dev->name
David Carlier <[email protected]>
Bluetooth: ISO: drop ISO_END frames received without prior ISO_START
Safa Karakuş <[email protected]>
Bluetooth: fix UAF in l2cap_sock_cleanup_listen() vs l2cap_conn_del()
Abdun Nihaal <[email protected]>
net: wwan: iosm: fix potential memory leaks in ipc_imem_init()
Luiz Capitulino <[email protected]>
selftests/mm: run_vmtests.sh: fix destructive tests invocation
David Hildenbrand (Arm) <[email protected]>
mm/page_alloc: fix initialization of tags of the huge zero folio with init_on_free
Muchun Song <[email protected]>
mm/memory_hotplug: fix memory block reference leak on remove
David Hildenbrand (Arm) <[email protected]>
mm: fix __vm_normal_page() to handle missing support for pmd_special()/pud_special()
Alistair Popple <[email protected]>
mm/memory: fix spurious warning when unmapping device-private/exclusive pages
Justin Iurman <[email protected]>
ipv6: ioam: refresh hdr pointer before ioam6_event()
Muchun Song <[email protected]>
drivers/base/memory: fix memory block reference leak in poison accounting
Heechan Kang <[email protected]>
io_uring/waitid: clear waitid info before copying it to userspace
Krishnamoorthi M <[email protected]>
spi: amd: Set correct bus number in ACPI probe path
Ard Biesheuvel <[email protected]>
efi: Allocate runtime workqueue before ACPI init
Cássio Gabriel <[email protected]>
ALSA: scarlett2: Allow flash writes ending at segment boundary
Takashi Iwai <[email protected]>
ALSA: asihpi: Fix potential OOB array access at reading cache
Takashi Iwai <[email protected]>
ALSA: pcm: Don't setup bogus iov_iter for silencing
Cássio Gabriel <[email protected]>
ALSA: ua101: Reject too-short USB descriptors
Abdurrahman Hussain <[email protected]>
hwmon: (pmbus/adm1266) widen blackbox-info buffer to I2C_SMBUS_BLOCK_MAX
ChenXiaoSong <[email protected]>
smb/server: promote S_DEL_ON_CLS to S_DEL_PENDING when close
Jeremy Erazo <[email protected]>
smb: client: use data_len for SMB2 READ encrypted folioq copy
Henrique Carvalho <[email protected]>
smb: client: protect tc_count increment in smb2_find_smb_sess_tcon_unlocked()
Michael Bommarito <[email protected]>
smb: client: require net admin for CIFS SWN netlink
Alexander Sverdlin <[email protected]>
regulator: tps65219: fix irq_data.rdev not being assigned
Junyi Liu <[email protected]>
ksmbd: validate SID in parent security descriptor during ACL inheritance
Ferry Meng <[email protected]>
ksmbd: fix SID memory leak in set_posix_acl_entries_dacl() on overflow
Jeremy Laratro <[email protected]>
ksmbd: fix null pointer dereference in compare_guid_key()
SeongJae Park <[email protected]>
mm/damon/sysfs-schemes: call missing mem_cgroup_iter_break()
Greg Kroah-Hartman <[email protected]>
sysfs: don't remove existing directory on update failure
Thomas Zimmermann <[email protected]>
drm/vblank: Fix kernel docs for vblank timer
Thomas Zimmermann <[email protected]>
drm/atomic: Increase timeout in drm_atomic_helper_wait_for_vblanks()
Thomas Zimmermann <[email protected]>
drm/vkms: Convert to DRM's vblank timer
Thomas Zimmermann <[email protected]>
drm/vblank: Add CRTC helpers for simple use cases
Thomas Zimmermann <[email protected]>
drm/vblank: Add vblank timer
Sasha Levin <[email protected]>
Revert "ice: Remove jumbo_remove step from TX path"
Sasha Levin <[email protected]>
Revert "ice: fix double-free of tx_buf skb"
Niklas Cassel <[email protected]>
ata: libata-scsi: do not needlessly defer commands when using PMP with FBS
Niklas Cassel <[email protected]>
ata: libata-scsi: do not use the deferred QC feature on PMPs with CBS
Niklas Cassel <[email protected]>
ata: libata-scsi: do not use the deferred QC feature for ATA_DEFER_PORT
Niklas Cassel <[email protected]>
ata: libata-scsi: improve readability of ata_scsi_qc_issue()
Stanimir Varbanov <[email protected]>
mfd: bcm2835-pm: Add support for BCM2712
Stanimir Varbanov <[email protected]>
arm64: dts: broadcom: bcm2712: Add watchdog DT node
Stanimir Varbanov <[email protected]>
dt-bindings: soc: bcm: Add bcm2712 compatible
Asim Viladi Oglu Manizada <[email protected]>
smb: client: reject userspace cifs.spnego descriptions
DaeMyung Kang <[email protected]>
ksmbd: close durable scavenger races against m_fp_list lookups
Vladimir Yakovlev <[email protected]>
spi: spi-dw-dma: fix print error log when wait finish transaction
Xiang Mei <[email protected]>
bridge: mrp: reject zero test interval to avoid OOM panic
Juri Lelli <[email protected]>
sched/deadline: Fix missing ENQUEUE_REPLENISH during PI de-boosting
Peter Zijlstra <[email protected]>
sched: Employ sched_change guards
Davidlohr Bueso <[email protected]>
cxl/mbox: validate payload size before accessing contents in cxl_payload_from_user_allowed()
Luis Henriques <[email protected]>
fuse: fix uninit-value in fuse_dentry_revalidate()
Eder Zulian <[email protected]>
iommu/amd: Remove latent out-of-bounds access in IOMMU debugfs
Guanghui Feng <[email protected]>
iommu/amd: Fix illegal cap/mmio access in IOMMU debugfs
Gustavo Sousa <[email protected]>
drm/xe/hdcp: Add NULL check for media_gt in intel_hdcp_gsc_check_status()
-------------
Diffstat:
Documentation/admin-guide/pm/intel_pstate.rst | 11 +- Documentation/crypto/krb5.rst | 17 +- .../bindings/soc/bcm/brcm,bcm2835-pm.yaml | 38 ++- Documentation/gpu/drm-kms-helpers.rst | 12 + Documentation/netlink/specs/net_shaper.yaml | 7 + Makefile | 4 +- arch/alpha/include/asm/Kbuild | 1 + arch/arc/include/asm/Kbuild | 1 + arch/arm/boot/dts/renesas/r7s72100-genmai.dts | 3 - arch/arm/boot/dts/renesas/r7s72100-rskrza1.dts | 2 - arch/arm/include/asm/Kbuild | 1 + arch/arm/mach-versatile/integrator_cp.c | 13 +- arch/arm64/boot/dts/broadcom/bcm2712.dtsi | 9 + arch/arm64/include/asm/insn.h | 2 +- arch/arm64/include/asm/page.h | 2 +- arch/arm64/include/asm/ring_buffer.h | 10 + arch/arm64/kvm/arm.c | 4 +- arch/arm64/kvm/vgic/vgic-its.c | 4 + arch/arm64/mm/fault.c | 11 +- arch/csky/include/asm/Kbuild | 1 + arch/hexagon/include/asm/Kbuild | 1 + arch/loongarch/include/asm/Kbuild | 1 + arch/loongarch/kernel/kprobes.c | 14 +- arch/loongarch/mm/init.c | 4 - arch/m68k/include/asm/Kbuild | 1 + arch/microblaze/include/asm/Kbuild | 1 + arch/mips/include/asm/Kbuild | 1 + arch/nios2/include/asm/Kbuild | 1 + arch/openrisc/include/asm/Kbuild | 1 + arch/parisc/include/asm/Kbuild | 1 + arch/powerpc/Kconfig.debug | 3 +- arch/powerpc/include/asm/Kbuild | 1 + arch/powerpc/kernel/time.c | 6 +- arch/powerpc/platforms/82xx/km82xx.c | 4 +- arch/riscv/errata/mips/errata.c | 2 +- arch/riscv/include/asm/Kbuild | 1 + arch/riscv/kvm/vcpu_pmu.c | 12 +- arch/riscv/mm/init.c | 25 ++ arch/s390/include/asm/Kbuild | 1 + arch/sh/include/asm/Kbuild | 1 + arch/sparc/include/asm/Kbuild | 1 + arch/um/include/asm/Kbuild | 1 + arch/x86/include/asm/Kbuild | 1 + arch/x86/kernel/cpu/mce/core.c | 33 +-- arch/x86/kvm/svm/avic.c | 12 +- arch/x86/xen/setup.c | 2 +- arch/xtensa/include/asm/Kbuild | 1 + block/bio-integrity.c | 19 +- block/blk-cgroup.c | 2 +- block/blk-mq.c | 19 ++ crypto/krb5/krb5_api.c | 54 +++- drivers/accel/qaic/qaic_data.c | 23 +- drivers/ata/libata-core.c | 9 +- drivers/ata/libata-eh.c | 8 +- drivers/ata/libata-pmp.c | 18 +- drivers/ata/libata-scsi.c | 102 ++++---- drivers/ata/sata_sil24.c | 6 +- drivers/base/memory.c | 8 +- drivers/block/rbd.c | 20 +- drivers/block/ublk_drv.c | 3 + drivers/bluetooth/btintel_pcie.c | 20 +- drivers/bluetooth/btintel_pcie.h | 3 - drivers/bluetooth/btmtk.c | 2 + drivers/bluetooth/hci_ldisc.c | 48 +++- drivers/cxl/core/mbox.c | 11 +- drivers/firmware/arm_ffa/bus.c | 4 +- drivers/firmware/arm_ffa/driver.c | 133 +++++++--- drivers/firmware/efi/efi.c | 28 ++- drivers/fwctl/pds/main.c | 3 + drivers/gpio/Kconfig | 1 - drivers/gpio/gpio-aggregator.c | 47 ++-- drivers/gpio/gpiolib-cdev.c | 13 + drivers/gpu/drm/Makefile | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 7 +- drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 9 + .../drm/amd/display/dc/bios/bios_parser_helper.c | 9 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 6 +- drivers/gpu/drm/bridge/chipone-icn6211.c | 4 +- drivers/gpu/drm/bridge/ite-it66121.c | 5 + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 16 +- drivers/gpu/drm/drm_atomic_helper.c | 2 +- drivers/gpu/drm/drm_vblank.c | 172 ++++++++++++- drivers/gpu/drm/drm_vblank_helper.c | 176 +++++++++++++ drivers/gpu/drm/i915/display/intel_dp.c | 2 +- drivers/gpu/drm/mediatek/mtk_cec.c | 2 +- drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c | 2 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 6 + drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c | 3 +- drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c | 24 +- drivers/gpu/drm/msm/dsi/dsi_host.c | 1 + drivers/gpu/drm/msm/msm_gem_shrinker.c | 40 ++- drivers/gpu/drm/msm/msm_iommu.c | 5 +- drivers/gpu/drm/v3d/v3d_sched.c | 16 +- drivers/gpu/drm/v3d/v3d_submit.c | 22 +- drivers/gpu/drm/virtio/virtgpu_drv.h | 1 + drivers/gpu/drm/virtio/virtgpu_gem.c | 17 ++ drivers/gpu/drm/virtio/virtgpu_plane.c | 10 +- drivers/gpu/drm/vkms/vkms_crtc.c | 83 +------ drivers/gpu/drm/vkms/vkms_drv.h | 2 - drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 12 +- drivers/gpu/drm/xe/xe_gsc.c | 5 +- drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor.c | 6 +- drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor.h | 2 +- drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 24 +- drivers/gpu/drm/xe/xe_gt_sriov_vf.h | 6 +- drivers/gpu/drm/xe/xe_oa.c | 6 +- drivers/hid/hid-quirks.c | 2 +- drivers/hid/hid-uclogic-core.c | 4 +- .../intel-quickspi/quickspi-protocol.c | 4 +- drivers/hwmon/lm90.c | 26 +- drivers/hwmon/pmbus/adm1266.c | 32 ++- drivers/infiniband/hw/mana/main.c | 1 + drivers/infiniband/sw/siw/siw_qp_rx.c | 15 ++ drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 2 +- drivers/iommu/amd/debugfs.c | 43 ++-- drivers/irqchip/irq-ath79-cpu.c | 7 - drivers/mfd/bcm2835-pm.c | 1 + drivers/net/dsa/mt7530.c | 47 ++-- drivers/net/ethernet/airoha/airoha_eth.c | 10 +- drivers/net/ethernet/amd/pds_core/debugfs.c | 7 +- drivers/net/ethernet/amd/pds_core/dev.c | 11 +- drivers/net/ethernet/amd/pds_core/devlink.c | 6 +- drivers/net/ethernet/atheros/ag71xx.c | 3 + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 9 +- drivers/net/ethernet/cirrus/cs89x0.c | 2 - drivers/net/ethernet/cortina/gemini.c | 21 +- drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 4 +- drivers/net/ethernet/intel/ice/ice_main.c | 10 +- drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 33 ++- drivers/net/ethernet/intel/ice/ice_txrx.c | 7 +- drivers/net/ethernet/intel/ice/virt/queues.c | 2 +- drivers/net/ethernet/intel/idpf/idpf_ptp.c | 4 +- drivers/net/ethernet/intel/igc/igc_tsn.c | 9 +- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 1 + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 7 +- .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 2 +- drivers/net/ethernet/marvell/octeontx2/nic/rep.c | 3 +- .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 6 +- .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 7 +- .../net/ethernet/mellanox/mlx5/core/esw/ipsec_fs.c | 3 +- .../net/ethernet/microchip/lan966x/lan966x_main.c | 8 +- drivers/net/ethernet/microsoft/mana/hw_channel.c | 35 ++- drivers/net/ethernet/qlogic/qed/qed_cxt.c | 2 + drivers/net/ethernet/ti/icssm/icssm_prueth.c | 1 + drivers/net/ifb.c | 11 +- drivers/net/ovpn/io.c | 12 +- drivers/net/ovpn/main.c | 12 +- drivers/net/ovpn/netlink.c | 8 +- drivers/net/ovpn/peer.c | 23 +- drivers/net/ovpn/peer.h | 1 - drivers/net/ovpn/stats.h | 16 ++ drivers/net/ovpn/tcp.c | 19 +- drivers/net/ovpn/udp.c | 2 +- drivers/net/phy/dp83tc811.c | 1 + drivers/net/phy/phy-c45.c | 8 + drivers/net/phy/phy_device.c | 6 +- drivers/net/pse-pd/pse_core.c | 2 +- drivers/net/tap.c | 2 +- drivers/net/wireless/ath/ath10k/wmi.c | 17 +- drivers/net/wireless/ath/ath11k/dp_rx.c | 3 +- drivers/net/wireless/ath/ath11k/hal.c | 14 +- drivers/net/wireless/ath/ath11k/hal_rx.c | 5 +- drivers/net/wireless/ath/ath11k/testmode.c | 1 + drivers/net/wireless/ath/ath11k/wmi.c | 19 +- drivers/net/wireless/intel/iwlwifi/mld/link.c | 13 +- drivers/net/wireless/intel/iwlwifi/mld/tx.c | 15 +- drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 27 +- drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 14 +- drivers/net/wireless/microchip/wilc1000/wlan.c | 2 +- drivers/net/wwan/iosm/iosm_ipc_imem.c | 2 + drivers/nvme/host/ioctl.c | 5 +- drivers/nvme/host/pci.c | 6 +- drivers/phy/marvell/phy-mvebu-a3700-utmi.c | 5 +- drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 1 + drivers/phy/samsung/phy-exynos5-usbdrd.c | 7 +- drivers/phy/tegra/xusb-tegra186.c | 33 ++- drivers/phy/tegra/xusb.h | 1 + drivers/pinctrl/meson/pinctrl-amlogic-a4.c | 6 +- drivers/pinctrl/qcom/pinctrl-ipq4019.c | 2 +- drivers/pinctrl/qcom/pinctrl-msm.h | 5 + drivers/pinctrl/qcom/pinctrl-qcs615.c | 6 +- drivers/pinctrl/qcom/pinctrl-sm8150.c | 8 +- drivers/pinctrl/renesas/pinctrl-rzg2l.c | 23 +- .../platform/surface/surface_aggregator_registry.c | 2 - drivers/platform/x86/adv_swbutton.c | 6 +- drivers/platform/x86/hp/hp_accel.c | 3 + drivers/platform/x86/intel/hid.c | 6 +- drivers/platform/x86/intel/vbtn.c | 6 +- drivers/regulator/tps65219-regulator.c | 135 +++++++--- drivers/scsi/isci/host.c | 3 + drivers/scsi/sd.c | 3 +- drivers/spi/spi-amd.c | 2 +- drivers/spi/spi-dw-dma.c | 2 +- drivers/spi/spi-ep93xx.c | 2 + drivers/spi/spi-mtk-snfi.c | 2 +- drivers/spi/spi-qup.c | 3 + drivers/spi/spi-sprd.c | 3 +- drivers/spi/spi-ti-qspi.c | 1 + drivers/virt/coco/sev-guest/sev-guest.c | 10 +- fs/afs/dir.c | 11 +- fs/btrfs/backref.c | 11 +- fs/btrfs/block-group.c | 3 +- fs/btrfs/ctree.c | 17 +- fs/btrfs/dir-item.c | 3 +- fs/btrfs/extent-tree.c | 55 ++--- fs/btrfs/free-space-tree.c | 29 +-- fs/btrfs/fs.h | 4 + fs/btrfs/inode-item.c | 3 +- fs/btrfs/inode.c | 7 +- fs/btrfs/ioctl.c | 60 ++--- fs/btrfs/print-tree.c | 14 +- fs/btrfs/qgroup.c | 272 ++++++++++++--------- fs/btrfs/relocation.c | 4 +- fs/btrfs/root-tree.c | 4 +- fs/btrfs/send.c | 10 +- fs/btrfs/super.c | 10 +- fs/btrfs/tree-checker.c | 21 +- fs/btrfs/tree-log.c | 42 ++-- fs/btrfs/volumes.c | 3 +- fs/btrfs/xattr.c | 3 +- fs/erofs/zdata.c | 15 +- fs/fuse/dir.c | 20 +- fs/jfs/namei.c | 2 +- fs/mnt_idmapping.c | 2 + fs/netfs/buffered_read.c | 64 ++--- fs/netfs/buffered_write.c | 172 ++++++++----- fs/netfs/direct_read.c | 42 +--- fs/netfs/internal.h | 3 + fs/netfs/iterator.c | 26 +- fs/netfs/misc.c | 8 +- fs/netfs/read_collect.c | 13 +- fs/netfs/read_retry.c | 11 +- fs/netfs/read_single.c | 23 +- fs/netfs/write_issue.c | 48 ++-- fs/nfsd/nfs4state.c | 7 + fs/nsfs.c | 2 +- fs/ntfs3/file.c | 12 +- fs/orangefs/namei.c | 2 +- fs/smb/client/cifs_spnego.c | 16 ++ fs/smb/client/cifsfs.c | 2 + fs/smb/client/netlink.c | 6 +- fs/smb/client/smb2ops.c | 4 +- fs/smb/client/smb2transport.c | 2 + fs/smb/server/oplock.c | 6 +- fs/smb/server/smb2pdu.c | 15 +- fs/smb/server/smbacl.c | 78 ++++-- fs/smb/server/vfs_cache.c | 118 ++++++--- fs/sysfs/group.c | 2 +- fs/zonefs/super.c | 6 +- include/asm-generic/kprobes.h | 2 +- include/asm-generic/ring_buffer.h | 13 + include/crypto/krb5.h | 9 +- include/drm/drm_modeset_helper_vtables.h | 12 + include/drm/drm_vblank.h | 32 +++ include/drm/drm_vblank_helper.h | 56 +++++ include/linux/cgroup.h | 1 + include/linux/cleanup.h | 5 + include/linux/fprobe.h | 5 + include/linux/fwnode.h | 1 + include/linux/gfp_types.h | 10 +- include/linux/highmem.h | 7 +- include/linux/libata.h | 7 +- include/linux/netfilter/x_tables.h | 3 +- include/linux/netfilter_arp/arp_tables.h | 1 - include/linux/netfilter_ipv4/ip_tables.h | 1 - include/linux/netfilter_ipv6/ip6_tables.h | 1 - include/linux/netfs.h | 2 +- include/linux/soc/airoha/airoha_offload.h | 6 +- include/net/bluetooth/bluetooth.h | 1 + include/net/net_shaper.h | 1 + include/net/netfilter/nf_queue.h | 1 + include/net/tcp.h | 7 +- include/trace/events/btrfs.h | 4 +- include/trace/events/netfs.h | 8 + include/trace/events/rxrpc.h | 1 + io_uring/net.c | 26 +- io_uring/nop.c | 4 +- io_uring/waitid.c | 1 + kernel/cgroup/cpuset.c | 8 +- kernel/cgroup/rstat.c | 37 +-- kernel/dma/debug.c | 9 +- kernel/dma/mapping.c | 4 - kernel/irq_work.c | 7 + kernel/sched/core.c | 163 +++++------- kernel/sched/ext.c | 44 ++-- kernel/sched/sched.h | 33 ++- kernel/sched/syscalls.c | 97 ++++---- kernel/trace/bpf_trace.c | 3 +- kernel/trace/fprobe.c | 200 ++++++++++----- kernel/trace/ring_buffer.c | 30 ++- kernel/trace/trace_events_hist.c | 6 +- kernel/trace/tracing_map.c | 17 +- lib/kunit/Kconfig | 5 +- lib/tests/test_kprobes.c | 29 ++- mm/damon/sysfs-schemes.c | 1 + mm/memcontrol.c | 6 +- mm/memory.c | 24 +- mm/memory_hotplug.c | 2 + mm/page_alloc.c | 8 +- net/batman-adv/bat_iv_ogm.c | 82 +++++-- net/batman-adv/bat_v_ogm.c | 59 +++-- net/batman-adv/bridge_loop_avoidance.c | 109 ++++++--- net/batman-adv/distributed-arp-table.c | 3 + net/batman-adv/fragmentation.c | 58 ++++- net/batman-adv/gateway_client.c | 4 + net/batman-adv/mesh-interface.c | 1 + net/batman-adv/originator.c | 4 +- net/batman-adv/tp_meter.c | 117 +++++---- net/batman-adv/translation-table.c | 55 ++++- net/batman-adv/tvlv.c | 28 ++- net/batman-adv/tvlv.h | 2 +- net/batman-adv/types.h | 59 +++-- net/bluetooth/af_bluetooth.c | 99 ++++++-- net/bluetooth/bnep/core.c | 2 +- net/bluetooth/iso.c | 14 +- net/bluetooth/l2cap_core.c | 2 +- net/bluetooth/l2cap_sock.c | 51 +++- net/bluetooth/mgmt.c | 6 + net/bluetooth/rfcomm/sock.c | 9 +- net/bluetooth/sco.c | 9 +- net/bridge/br_mrp_netlink.c | 4 +- net/bridge/br_multicast.c | 27 +- net/bridge/netfilter/ebtable_broute.c | 14 +- net/bridge/netfilter/ebtable_filter.c | 14 +- net/bridge/netfilter/ebtable_nat.c | 12 +- net/bridge/netfilter/ebtables.c | 71 +++--- net/core/dev.c | 21 +- net/core/gro.c | 3 + net/core/skmsg.c | 9 +- net/ethtool/bitset.c | 8 +- net/ethtool/phy.c | 36 ++- net/ipv4/inet_connection_sock.c | 2 +- net/ipv4/netfilter/arp_tables.c | 18 +- net/ipv4/netfilter/arptable_filter.c | 27 +- net/ipv4/netfilter/ip_tables.c | 18 +- net/ipv4/netfilter/iptable_filter.c | 27 +- net/ipv4/netfilter/iptable_mangle.c | 29 +-- net/ipv4/netfilter/iptable_nat.c | 6 +- net/ipv4/netfilter/iptable_raw.c | 26 +- net/ipv4/netfilter/iptable_security.c | 27 +- net/ipv4/raw.c | 2 +- net/ipv4/tcp.c | 3 - net/ipv4/tcp_ao.c | 3 +- net/ipv4/tcp_input.c | 15 +- net/ipv4/tcp_ipv4.c | 3 +- net/ipv6/exthdrs.c | 21 +- net/ipv6/netfilter/ip6_tables.c | 18 +- net/ipv6/netfilter/ip6t_hbh.c | 4 + net/ipv6/netfilter/ip6table_filter.c | 26 +- net/ipv6/netfilter/ip6table_mangle.c | 27 +- net/ipv6/netfilter/ip6table_nat.c | 6 +- net/ipv6/netfilter/ip6table_raw.c | 24 +- net/ipv6/netfilter/ip6table_security.c | 27 +- net/ipv6/tcp_ipv6.c | 3 +- net/l2tp/l2tp_core.c | 2 +- net/mac80211/mlme.c | 5 +- net/mac80211/parse.c | 71 +++--- net/mptcp/pm.c | 56 ++++- net/netfilter/ipset/ip_set_hash_ipmark.c | 6 +- net/netfilter/ipset/ip_set_hash_ipport.c | 5 +- net/netfilter/ipset/ip_set_hash_ipportip.c | 5 +- net/netfilter/ipset/ip_set_hash_ipportnet.c | 5 +- net/netfilter/nf_queue.c | 4 +- net/netfilter/nfnetlink_queue.c | 2 + net/netfilter/nft_inner.c | 3 +- net/netfilter/x_tables.c | 100 ++++++-- net/phonet/pep.c | 19 +- net/rxrpc/rxgk.c | 15 +- net/shaper/shaper.c | 224 ++++++++++++----- net/shaper/shaper_nl_gen.c | 7 +- net/shaper/shaper_nl_gen.h | 2 + net/smc/af_smc.c | 3 +- net/smc/smc_tracepoint.h | 2 +- net/tls/tls_sw.c | 46 ++-- net/unix/af_unix.c | 11 +- net/vmw_vsock/virtio_transport_common.c | 103 ++++---- net/vmw_vsock/vmci_transport.c | 2 +- net/wireless/scan.c | 3 + scripts/gcc-plugins/gcc-common.h | 4 +- scripts/package/PKGBUILD | 2 +- security/lsm_syscalls.c | 9 +- sound/core/pcm_lib.c | 3 + sound/core/seq/seq_ump_client.c | 22 +- sound/hda/codecs/realtek/alc269.c | 12 +- sound/hda/codecs/side-codecs/cs35l41_hda.c | 4 +- sound/hda/codecs/side-codecs/cs35l56_hda.c | 1 + sound/pci/asihpi/hpicmn.c | 6 + sound/soc/amd/acp/acp-sdw-legacy-mach.c | 2 +- sound/soc/codecs/cs35l56-sdw.c | 3 +- sound/soc/codecs/fs210x.c | 2 +- sound/soc/sdw_utils/soc_sdw_utils.c | 4 + sound/soc/soc-utils.c | 1 + sound/soc/sof/amd/acp.c | 2 +- sound/usb/misc/ua101.c | 5 +- sound/usb/mixer_scarlett2.c | 9 +- tools/testing/selftests/mm/hmm-tests.c | 50 ++++ tools/testing/selftests/mm/run_vmtests.sh | 2 +- tools/testing/selftests/net/lib/xdp_native.bpf.c | 55 +++-- tools/testing/selftests/ublk/kublk.c | 11 + 399 files changed, 4735 insertions(+), 2348 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/377 drm/xe/hdcp: Add NULL check for media_gt in intel_hdcp_gsc_check_status()
6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gustavo Sousa <[email protected]>
commit 60a1e131a811b68703da58fd805ab359b704ab03 upstream.
When media GT is disabled via configfs, there is no allocation for media_gt, which is kept as NULL. In such scenario, intel_hdcp_gsc_check_status() results in a kernel pagefault error due to >->uc.gsc being evaluated as an invalid memory address.
Fix that by introducing a NULL check on media_gt and bailing out early if so.
While at it, also drop the NULL check for gsc, since it can't be NULL if media_gt is not NULL.
v2:
- Get address for gsc only after checking that gt is not NULL. (Shuicheng)
- Drop the NULL check for gsc. (Shuicheng)
v3:
- Add "Fixes" and "Cc: <stable...>" tags. (Matt)
--- drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/gpu/drm/xe/display/xe_hdcp_gsc.c +10 -2
@@ -35,11 +35,19 @@ bool intel_hdcp_gsc_check_status(struct drm_device *drm)struct xe_device *xe =to_xe_device (drm);struct xe_tile *tile =xe_device_get_root_tile (xe);struct xe_gt *gt = tile->media_gt; -struct xe_gsc *gsc = >->uc.gsc; +struct xe_gsc *gsc;bool ret = true;unsigned int fw_ref; -if (!gsc || !xe_uc_fw_is_enabled (&gsc->fw)) { +if (!gt) { +drm_dbg_kms (&xe->drm, +"not checking GSC status for HDCP2.x: media GT not present or disabled\n" ); +return false; + } + + gsc = >->uc.gsc; + +if (!xe_uc_fw_is_enabled (&gsc->fw)) {drm_dbg_kms (&xe->drm,"GSC Components not ready for HDCP2.x\n" );return false;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 2/377 iommu/amd: Fix illegal cap/mmio access in IOMMU debugfs
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guanghui Feng <[email protected]>
[ Upstream commit 0e59645683b7b6fa20eceb21a6f420e4f7412943 ]
In the current AMD IOMMU debugfs, when multiple processes simultaneously access the IOMMU mmio/cap registers using the IOMMU debugfs, illegal access issues can occur in the following execution flow:
1. CPU1: Sets a valid access address using iommu_mmio/capability_write, and verifies the access address's validity in iommu_mmio/capability_show
2. CPU2: Sets an invalid address using iommu_mmio/capability_write
3. CPU1: accesses the IOMMU mmio/cap registers based on the invalid address, resulting in an illegal access.
This patch modifies the execution process to first verify the address's validity and then access it based on the same address, ensuring correctness and robustness.
Stable-dep-of: 8dfd3d8d7443 ("iommu/amd: Remove latent out-of-bounds access in IOMMU debugfs")
--- drivers/iommu/amd/debugfs.c | 42 +++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 23 deletions(-)
drivers/iommu/amd/debugfs.c +19 -23
@@ -26,22 +26,19 @@ static ssize_t iommu_mmio_write(struct file *filp, const char __user *ubuf, {struct seq_file *m = filp->private_data;struct amd_iommu *iommu = m->private; -int ret; - - iommu->dbg_mmio_offset =-1 ; +int ret, dbg_mmio_offset = iommu->dbg_mmio_offset =-1 ;if (cnt >OFS_IN_SZ )return -EINVAL ; - ret =kstrtou32_from_user (ubuf, cnt,0 , &iommu->dbg_mmio_offset); + ret =kstrtou32_from_user (ubuf, cnt,0 , &dbg_mmio_offset);if (ret)return ret; -if (iommu->dbg_mmio_offset > iommu->mmio_phys_end -sizeof (u64)) { - iommu->dbg_mmio_offset =-1 ; -return -EINVAL ; - } +if (dbg_mmio_offset > iommu->mmio_phys_end -sizeof (u64)) +return -EINVAL ; + iommu->dbg_mmio_offset = dbg_mmio_offset;return cnt; }
@@ -49,14 +46,16 @@ static int iommu_mmio_show(struct seq_file *m, void *unused) {struct amd_iommu *iommu = m->private;u64 value; +int dbg_mmio_offset = iommu->dbg_mmio_offset; -if (iommu->dbg_mmio_offset <0 ) { +if (dbg_mmio_offset <0 || dbg_mmio_offset > + iommu->mmio_phys_end -sizeof (u64)) {seq_puts (m,"Please provide mmio register's offset\n" );return 0 ; } - value =readq (iommu->mmio_base + iommu->dbg_mmio_offset); -seq_printf (m,"Offset:0x%x Value:0x%016llx\n" , iommu->dbg_mmio_offset, value); + value =readq (iommu->mmio_base + dbg_mmio_offset); +seq_printf (m,"Offset:0x%x Value:0x%016llx\n" , dbg_mmio_offset, value);return 0 ; }
@@ -67,23 +66,20 @@ static ssize_t iommu_capability_write(struct file *filp, const char __user *ubuf {struct seq_file *m = filp->private_data;struct amd_iommu *iommu = m->private; -int ret; - - iommu->dbg_cap_offset =-1 ; +int ret, dbg_cap_offset = iommu->dbg_cap_offset =-1 ;if (cnt >OFS_IN_SZ )return -EINVAL ; - ret =kstrtou32_from_user (ubuf, cnt,0 , &iommu->dbg_cap_offset); + ret =kstrtou32_from_user (ubuf, cnt,0 , &dbg_cap_offset);if (ret)return ret;/* Capability register at offset 0x14 is the last IOMMU capability register. */ -if (iommu->dbg_cap_offset >0x14 ) { - iommu->dbg_cap_offset =-1 ; +if (dbg_cap_offset >0x14 )return -EINVAL ; - } + iommu->dbg_cap_offset = dbg_cap_offset;return cnt; }
@@ -91,21 +87,21 @@ static int iommu_capability_show(struct seq_file *m, void *unused) {struct amd_iommu *iommu = m->private;u32 value; -int err; +int err, dbg_cap_offset = iommu->dbg_cap_offset; -if (iommu->dbg_cap_offset <0 ) { +if (dbg_cap_offset <0 || dbg_cap_offset >0x14 ) {seq_puts (m,"Please provide capability register's offset in the range [0x00 - 0x14]\n" );return 0 ; } - err =pci_read_config_dword (iommu->dev, iommu->cap_ptr + iommu->dbg_cap_offset, &value); + err =pci_read_config_dword (iommu->dev, iommu->cap_ptr + dbg_cap_offset, &value);if (err) {seq_printf (m,"Not able to read capability register at 0x%x\n" , - iommu->dbg_cap_offset); + dbg_cap_offset);return 0 ; } -seq_printf (m,"Offset:0x%x Value:0x%08x\n" , iommu->dbg_cap_offset, value); +seq_printf (m,"Offset:0x%x Value:0x%08x\n" , dbg_cap_offset, value);return 0 ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 3/377 iommu/amd: Remove latent out-of-bounds access in IOMMU debugfs
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eder Zulian <[email protected]>
[ Upstream commit 8dfd3d8d74435344ee8dc9237596959c8b2a6cbe ]
In iommu_mmio_write() and iommu_capability_write(), the variables dbg_mmio_offset and dbg_cap_offset are declared as int. However, they are populated using kstrtou32_from_user(). If a user provides a sufficiently large value, it can become a negative integer.
Prior to this patch, the AMD IOMMU debugfs implementation was already protected by different mechanisms.
1. #define OFS_IN_SZ 8 ensures the user string <= 8 bytes, so e.g. 0xffffffff isn't a valid input.
if (cnt > OFS_IN_SZ)
return -EINVAL;
2. Implicit type promotion in iommu_mmio_write(), dbg_mmio_offset is int and iommu->mmio_phys_end is u64
if (dbg_mmio_offset > iommu->mmio_phys_end - sizeof(u64))
return -EINVAL;
3. The show handlers would currently catch the negative number and refuse to perform the read.
Replace kstrtou32_from_user() with kstrtos32_from_user() to parse the input, and check for negative values to explicitly prevent out-of-bounds memory accesses directly in iommu_mmio_write() and iommu_capability_write().
--- drivers/iommu/amd/debugfs.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/iommu/amd/debugfs.c +5 -4
@@ -31,11 +31,12 @@ static ssize_t iommu_mmio_write(struct file *filp, const char __user *ubuf,if (cnt >OFS_IN_SZ )return -EINVAL ; - ret =kstrtou32_from_user (ubuf, cnt,0 , &dbg_mmio_offset); + ret =kstrtos32_from_user (ubuf, cnt,0 , &dbg_mmio_offset);if (ret)return ret; -if (dbg_mmio_offset > iommu->mmio_phys_end -sizeof (u64)) +if (dbg_mmio_offset <0 || dbg_mmio_offset > + iommu->mmio_phys_end -sizeof (u64))return -EINVAL ; iommu->dbg_mmio_offset = dbg_mmio_offset;
@@ -71,12 +72,12 @@ static ssize_t iommu_capability_write(struct file *filp, const char __user *ubufif (cnt >OFS_IN_SZ )return -EINVAL ; - ret =kstrtou32_from_user (ubuf, cnt,0 , &dbg_cap_offset); + ret =kstrtos32_from_user (ubuf, cnt,0 , &dbg_cap_offset);if (ret)return ret;/* Capability register at offset 0x14 is the last IOMMU capability register. */ -if (dbg_cap_offset >0x14 ) +if (dbg_cap_offset <0 || dbg_cap_offset >0x14 )return -EINVAL ; iommu->dbg_cap_offset = dbg_cap_offset;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 4/377 fuse: fix uninit-value in fuse_dentry_revalidate()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luis Henriques <[email protected]>
commit 5a6baf204610589f8a5b5a1cd69d1fe661d9d3cd upstream.
fuse_dentry_revalidate() may be called with a dentry that didn't had ->d_time initialised. The issue was found with KMSAN, where lookup_open() calls __d_alloc(), followed by d_revalidate(), as shown below:
=====================================================
BUG: KMSAN: uninit-value in fuse_dentry_revalidate+0x150/0x13d0 fs/fuse/dir.c:394 fuse_dentry_revalidate+0x150/0x13d0 fs/fuse/dir.c:394 d_revalidate fs/namei.c:1030 [inline] lookup_open fs/namei.c:4405 [inline] open_last_lookups fs/namei.c:4583 [inline] path_openat+0x1614/0x64c0 fs/namei.c:4827 do_file_open+0x2aa/0x680 fs/namei.c:4859
[...]
Uninit was created at:
slab_post_alloc_hook mm/slub.c:4466 [inline] slab_alloc_node mm/slub.c:4788 [inline] kmem_cache_alloc_lru_noprof+0x382/0x1280 mm/slub.c:4807 __d_alloc+0x55/0xa00 fs/dcache.c:1740 d_alloc_parallel+0x99/0x2740 fs/dcache.c:2604 lookup_open fs/namei.c:4398 [inline] open_last_lookups fs/namei.c:4583 [inline] path_openat+0x135f/0x64c0 fs/namei.c:4827 do_file_open+0x2aa/0x680 fs/namei.c:4859
[...]
=====================================================
--- fs/fuse/dir.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
fs/fuse/dir.c +15 -5
@@ -283,21 +283,33 @@ static int fuse_dentry_revalidate(struct inode *dir, const struct qstr *name, goto out; } -#if BITS_PER_LONG <64 static int fuse_dentry_init (struct dentry *dentry) { +int ret =0 ; + +/* +* Initialising d_time (epoch) to '0' ensures the dentry is invalid +* if compared to fc->epoch, which is initialized to '1'. +*/ + dentry->d_time =0 ; + +#if BITS_PER_LONG <64 dentry->d_fsdata =kzalloc (sizeof (union fuse_dentry ),GFP_KERNEL_ACCOUNT | __GFP_RECLAIMABLE); -return dentry->d_fsdata ?0 : -ENOMEM ; + ret = dentry->d_fsdata ?0 : -ENOMEM ; +#endif + +return ret; }static void fuse_dentry_release (struct dentry *dentry) { +#if BITS_PER_LONG <64 union fuse_dentry *fd = dentry->d_fsdata;kfree_rcu (fd, rcu); -}#endif +}static int fuse_dentry_delete (const struct dentry *dentry) {
@@ -331,10 +343,8 @@ static struct vfsmount *fuse_dentry_automount(struct path *path)const struct dentry_operations fuse_dentry_operations = { .d_revalidate = fuse_dentry_revalidate, .d_delete = fuse_dentry_delete, -#if BITS_PER_LONG < 64 .d_init = fuse_dentry_init, .d_release = fuse_dentry_release, -#endif .d_automount = fuse_dentry_automount, };
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 5/377 cxl/mbox: validate payload size before accessing contents in cxl_payload_from_user_allowed()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Davidlohr Bueso <[email protected]>
[ Upstream commit 60b5d1f68338aff2c5af0113f04aefa7169c50c2 ]
cxl_payload_from_user_allowed() casts and dereferences the input payload without first verifying its size. When a raw mailbox command is sent with an undersized payload (ie: 1 byte for CXL_MBOX_OP_CLEAR_LOG, which expects a 16-byte UUID), uuid_equal() reads past the allocated buffer, triggering a KASAN splat:
BUG: KASAN: slab-out-of-bounds in memcmp+0x176/0x1d0 lib/string.c:683 Read of size 8 at addr ffff88810130f5c0 by task syz.1.62/2258 CPU: 2 UID: 0 PID: 2258 Comm: syz.1.62 Not tainted 6.19.0-dirty #3 PREEMPT(voluntary) Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.17.0-0-gb52ca86e094d-prebuilt.qemu.org 04/01/2014 Call Trace: <TASK> __dump_stack lib/dump_stack.c:94 [inline] dump_stack_lvl+0xab/0xe0 lib/dump_stack.c:120 print_address_description mm/kasan/report.c:378 [inline] print_report+0xce/0x650 mm/kasan/report.c:482 kasan_report+0xce/0x100 mm/kasan/report.c:595 memcmp+0x176/0x1d0 lib/string.c:683 uuid_equal include/linux/uuid.h:73 [inline] cxl_payload_from_user_allowed drivers/cxl/core/mbox.c:345 [inline] cxl_mbox_cmd_ctor drivers/cxl/core/mbox.c:368 [inline] cxl_validate_cmd_from_user drivers/cxl/core/mbox.c:522 [inline] cxl_send_cmd+0x9c0/0xb50 drivers/cxl/core/mbox.c:643 __cxl_memdev_ioctl drivers/cxl/core/memdev.c:698 [inline] cxl_memdev_ioctl+0x14f/0x190 drivers/cxl/core/memdev.c:713 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:597 [inline] __se_sys_ioctl fs/ioctl.c:583 [inline] __x64_sys_ioctl+0x18e/0x210 fs/ioctl.c:583 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0xa8/0x330 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7fdaf331ba79 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:00007fdaf1d77038 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 RAX: ffffffffffffffda RBX: 00007fdaf3585fa0 RCX: 00007fdaf331ba79 RDX: 00002000000001c0 RSI: 00000000c030ce02 RDI: 0000000000000003 RBP: 00007fdaf33749df R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 00007fdaf3586038 R14: 00007fdaf3585fa0 R15: 00007ffced2af768 </TASK>
Add 'in_size' parameter to cxl_payload_from_user_allowed() and validate the payload is large enough.
--- drivers/cxl/core/mbox.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/cxl/core/mbox.c +9 -2
@@ -311,6 +311,7 @@ static bool cxl_mem_raw_command_allowed(u16 opcode)* cxl_payload_from_user_allowed() - Check contents of in_payload. * @opcode: The mailbox command opcode. * @payload_in: Pointer to the input payload passed in from user space. +* @in_size: Size of @payload_in in bytes. * * Return: * * true - payload_in passes check for @opcode.
@@ -325,12 +326,15 @@ static bool cxl_mem_raw_command_allowed(u16 opcode)* * The specific checks are determined by the opcode. */ -static bool cxl_payload_from_user_allowed (u16 opcode,void *payload_in) +static bool cxl_payload_from_user_allowed (u16 opcode,void *payload_in, +size_t in_size) {switch (opcode) {case CXL_MBOX_OP_SET_PARTITION_INFO : {struct cxl_mbox_set_partition_info *pi = payload_in; +if (in_size <sizeof (*pi)) +return false;if (pi->flags &CXL_SET_PARTITION_IMMEDIATE_FLAG )return false;break ;
@@ -338,6 +342,8 @@ static bool cxl_payload_from_user_allowed(u16 opcode, void *payload_in)case CXL_MBOX_OP_CLEAR_LOG : {const uuid_t *uuid = (uuid_t *)payload_in; +if (in_size <sizeof (uuid_t)) +return false;/* * Restrict the ‘Clear log’ action to only apply to * Vendor debug logs.
@@ -365,7 +371,8 @@ static int cxl_mbox_cmd_ctor(struct cxl_mbox_cmd *mbox_cmd,if (IS_ERR (mbox_cmd->payload_in))return PTR_ERR (mbox_cmd->payload_in); -if (!cxl_payload_from_user_allowed (opcode, mbox_cmd->payload_in)) { +if (!cxl_payload_from_user_allowed (opcode, mbox_cmd->payload_in, + in_size)) {dev_dbg (cxl_mbox->host,"%s: input payload not allowed\n" ,cxl_mem_opcode_to_name (opcode));kvfree (mbox_cmd->payload_in);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 6/377 sched: Employ sched_change guards
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra <[email protected]>
[ Upstream commit e9139f765ac7048cadc9981e962acdf8b08eabf3 ]
As proposed a long while ago -- and half done by scx -- wrap the scheduler's 'change' pattern in a guard helper.
Stable-dep-of: d658686a1331 ("sched/deadline: Fix missing ENQUEUE_REPLENISH during PI de-boosting")
--- include/linux/cleanup.h | 5 ++ kernel/sched/core.c | 159 +++++++++++++++------------------------- kernel/sched/ext.c | 39 +++++----- kernel/sched/sched.h | 33 ++++++--- kernel/sched/syscalls.c | 65 ++++++---------- 5 files changed, 131 insertions(+), 170 deletions(-)
include/linux/cleanup.h +5 -0
@@ -341,6 +341,11 @@ _label: \#define __DEFINE_CLASS_IS_CONDITIONAL (_name, _is_cond) \ static __maybe_unused const bool class_##_name##_is_conditional = _is_cond +#define DEFINE_CLASS_IS_UNCONDITIONAL (_name) \ + __DEFINE_CLASS_IS_CONDITIONAL(_name, false); \ + static inline void * class_##_name##_lock_ptr(class_##_name##_t *_T) \ + { return (void *)1; } +#define __GUARD_IS_ERR (_ptr) \ ({ \ unsigned long _rc = (__force unsigned long)(_ptr); \
kernel/sched/core.c +61 -98
220 lines not on this page · raw message
kernel/sched/ext.c +18 -21
@@ -3866,11 +3866,10 @@ static void scx_bypass(bool bypass)*/ list_for_each_entry_safe_reverse (p, n, &rq->scx.runnable_list, scx.runnable_node) { -struct sched_enq_and_set_ctx ctx; -/* cycling deq/enq is enough, see the function comment */ -sched_deq_and_put_task (p,DEQUEUE_SAVE |DEQUEUE_MOVE , &ctx); -sched_enq_and_set_task (&ctx); + scoped_guard (sched_change, p, DEQUEUE_SAVE | DEQUEUE_MOVE) { +/* nothing */ ; + } }/* resched to restore ticks and idle state */
@@ -4021,17 +4020,16 @@ static void scx_disable_workfn(struct kthread_work *work)while ((p =scx_task_iter_next_locked (&sti))) {const struct sched_class *old_class = p->sched_class;const struct sched_class *new_class =scx_setscheduler_class (p); -struct sched_enq_and_set_ctx ctx; -if (old_class != new_class && p->se.sched_delayed) -dequeue_task (task_rq (p), p,DEQUEUE_SLEEP |DEQUEUE_DELAYED ); +update_rq_clock (task_rq (p)); -sched_deq_and_put_task (p,DEQUEUE_SAVE |DEQUEUE_MOVE , &ctx); - - p->sched_class = new_class; -check_class_changing (task_rq (p), p, old_class); +if (old_class != new_class && p->se.sched_delayed) +dequeue_task (task_rq (p), p,DEQUEUE_SLEEP |DEQUEUE_DELAYED |DEQUEUE_NOCLOCK ); -sched_enq_and_set_task (&ctx); + scoped_guard (sched_change, p, DEQUEUE_SAVE | DEQUEUE_MOVE | DEQUEUE_NOCLOCK) { + p->sched_class = new_class; +check_class_changing (task_rq (p), p, old_class); + }check_class_changed (task_rq (p), p, old_class, p->prio);scx_exit_task (p);
@@ -4845,21 +4843,20 @@ static void scx_enable_workfn(struct kthread_work *work)while ((p =scx_task_iter_next_locked (&sti))) {const struct sched_class *old_class = p->sched_class;const struct sched_class *new_class =scx_setscheduler_class (p); -struct sched_enq_and_set_ctx ctx;if (!tryget_task_struct (p))continue ; -if (old_class != new_class && p->se.sched_delayed) -dequeue_task (task_rq (p), p,DEQUEUE_SLEEP |DEQUEUE_DELAYED ); - -sched_deq_and_put_task (p,DEQUEUE_SAVE |DEQUEUE_MOVE , &ctx); +update_rq_clock (task_rq (p)); - p->scx.slice =SCX_SLICE_DFL ; - p->sched_class = new_class; -check_class_changing (task_rq (p), p, old_class); +if (old_class != new_class && p->se.sched_delayed) +dequeue_task (task_rq (p), p,DEQUEUE_SLEEP |DEQUEUE_DELAYED |DEQUEUE_NOCLOCK ); -sched_enq_and_set_task (&ctx); + scoped_guard (sched_change, p, DEQUEUE_SAVE | DEQUEUE_MOVE | DEQUEUE_NOCLOCK) { + p->scx.slice =SCX_SLICE_DFL ; + p->sched_class = new_class; +check_class_changing (task_rq (p), p, old_class); + }check_class_changed (task_rq (p), p, old_class, p->prio);put_task_struct (p);
kernel/sched/sched.h +24 -9
@@ -3891,23 +3891,38 @@ extern void check_class_changed(struct rq *rq, struct task_struct *p,extern struct balance_callback *splice_balance_callbacks (struct rq *rq);extern void balance_callbacks (struct rq *rq,struct balance_callback *head); -#ifdef CONFIG_SCHED_CLASS_EXT /* -* Used by SCX in the enable/disable paths to move tasks between sched_classes -* and establish invariants. +* The 'sched_change' pattern is the safe, easy and slow way of changing a +* task's scheduling properties. It dequeues a task, such that the scheduler +* is fully unaware of it; at which point its properties can be modified; +* after which it is enqueued again. +* +* Typically this must be called while holding task_rq_lock, since most/all +* properties are serialized under those locks. There is currently one +* exception to this rule in sched/ext which only holds rq->lock. +*/ + +/* +* This structure is a temporary, used to preserve/convey the queueing state +* of the task between sched_change_begin() and sched_change_end(). Ensuring +* the task's queueing state is idempotent across the operation. */ -struct sched_enq_and_set_ctx { +struct sched_change_ctx {struct task_struct *p; -int queue_flags; +int flags;bool queued;bool running; }; -void sched_deq_and_put_task (struct task_struct *p,int queue_flags, -struct sched_enq_and_set_ctx *ctx); -void sched_enq_and_set_task (struct sched_enq_and_set_ctx *ctx); +struct sched_change_ctx *sched_change_begin (struct task_struct *p,unsigned int flags); +void sched_change_end (struct sched_change_ctx *ctx); -#endif /* CONFIG_SCHED_CLASS_EXT */ +DEFINE_CLASS(sched_change, struct sched_change_ctx *, +sched_change_end (_T), +sched_change_begin (p, flags), + struct task_struct *p, unsigned int flags) + +DEFINE_CLASS_IS_UNCONDITIONAL(sched_change)#include "ext.h"
kernel/sched/syscalls.c +23 -42
92 lines not on this page · raw message
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 7/377 sched/deadline: Fix missing ENQUEUE_REPLENISH during PI de-boosting
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Juri Lelli <[email protected]>
[ Upstream commit d658686a1331db3bb108ca079d76deb3208ed949 ]
Running stress-ng --schedpolicy 0 on an RT kernel on a big machine might lead to the following WARNINGs (edited).
sched: DL de-boosted task PID 22725: REPLENISH flag missing
WARNING: CPU: 93 PID: 0 at kernel/sched/deadline.c:239 dequeue_task_dl+0x15c/0x1f8 ... (running_bw underflow) Call trace: dequeue_task_dl+0x15c/0x1f8 (P) dequeue_task+0x80/0x168 deactivate_task+0x24/0x50 push_dl_task+0x264/0x2e0 dl_task_timer+0x1b0/0x228 __hrtimer_run_queues+0x188/0x378 hrtimer_interrupt+0xfc/0x260 ...
The problem is that when a SCHED_DEADLINE task (lock holder) is changed to a lower priority class via sched_setscheduler(), it may fail to properly inherit the parameters of potential DEADLINE donors if it didn't already inherit them in the past (shorter deadline than donor's at that time). This might lead to bandwidth accounting corruption, as enqueue_task_dl() won't recognize the lock holder as boosted.
The scenario occurs when:
1. A DEADLINE task (donor) blocks on a PI mutex held by another DEADLINE task (holder), but the holder doesn't inherit parameters (e.g., it already has a shorter deadline)
2. sched_setscheduler() changes the holder from DEADLINE to a lower class while still holding the mutex
3. The holder should now inherit DEADLINE parameters from the donor and be enqueued with ENQUEUE_REPLENISH, but this doesn't happen
Fix the issue by introducing __setscheduler_dl_pi(), which detects when a DEADLINE (proper or boosted) task gets setscheduled to a lower priority class. In case, the function makes the task inherit DEADLINE parameters of the donoer (pi_se) and sets ENQUEUE_REPLENISH flag to ensure proper bandwidth accounting during the next enqueue operation.
--- kernel/sched/syscalls.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
kernel/sched/syscalls.c +30 -0
@@ -322,6 +322,35 @@ static bool check_same_owner(struct task_struct *p) uid_eq(cred->euid, pcred->uid)); } +#ifdef CONFIG_RT_MUTEXES +static inline void __setscheduler_dl_pi (int newprio,int policy, +struct task_struct *p, +struct sched_change_ctx *scope) +{ +/* +* In case a DEADLINE task (either proper or boosted) gets +* setscheduled to a lower priority class, check if it neeeds to +* inherit parameters from a potential pi_task. In that case make +* sure replenishment happens with the next enqueue. +*/ + +if (dl_prio (newprio) && !dl_policy (policy)) { +struct task_struct *pi_task =rt_mutex_get_top_task (p); + +if (pi_task) { + p->dl.pi_se = pi_task->dl.pi_se; + scope->flags |=ENQUEUE_REPLENISH ; + } + } +} +#else /* !CONFIG_RT_MUTEXES */ +static inline void __setscheduler_dl_pi (int newprio,int policy, +struct task_struct *p, +struct sched_change_ctx *scope) +{ +} +#endif /* !CONFIG_RT_MUTEXES */ +#ifdef CONFIG_UCLAMP_TASK static int uclamp_validate(struct task_struct *p,
@@ -693,6 +722,7 @@ int __sched_setscheduler(struct task_struct *p,__setscheduler_params (p, attr); p->sched_class = next_class; p->prio = newprio; +__setscheduler_dl_pi (newprio, policy, p, scope); }__setscheduler_uclamp (p, attr);check_class_changing (rq, p, prev_class);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 8/377 bridge: mrp: reject zero test interval to avoid OOM panic
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiang Mei <[email protected]>
[ Upstream commit fa6e24963342de4370e3a3c9af41e38277b74cf3 ]
br_mrp_start_test() and br_mrp_start_in_test() accept the user-supplied interval value from netlink without validation. When interval is 0, usecs_to_jiffies(0) yields 0, causing the delayed work (br_mrp_test_work_expired / br_mrp_in_test_work_expired) to reschedule itself with zero delay. This creates a tight loop on system_percpu_wq that allocates and transmits MRP test frames at maximum rate, exhausting all system memory and causing a kernel panic via OOM deadlock.
The same zero-interval issue applies to br_mrp_start_in_test_parse() for interconnect test frames.
Use NLA_POLICY_MIN(NLA_U32, 1) in the nla_policy tables for both IFLA_BRIDGE_MRP_START_TEST_INTERVAL and IFLA_BRIDGE_MRP_START_IN_TEST_INTERVAL, so zero is rejected at the netlink attribute parsing layer before the value ever reaches the workqueue scheduling code. This is consistent with how other bridge subsystems (br_fdb, br_mst) enforce range constraints on netlink attributes.
--- net/bridge/br_mrp_netlink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/bridge/br_mrp_netlink.c +2 -2
@@ -196,7 +196,7 @@ static const struct nla_policy br_mrp_start_test_policy[IFLA_BRIDGE_MRP_START_TEST_MAX + 1] = { [IFLA_BRIDGE_MRP_START_TEST_UNSPEC] = { .type = NLA_REJECT }, [IFLA_BRIDGE_MRP_START_TEST_RING_ID] = { .type = NLA_U32 }, - [IFLA_BRIDGE_MRP_START_TEST_INTERVAL] = { .type = NLA_U32 }, + [IFLA_BRIDGE_MRP_START_TEST_INTERVAL] = NLA_POLICY_MIN(NLA_U32, 1), [IFLA_BRIDGE_MRP_START_TEST_MAX_MISS] = { .type = NLA_U32 }, [IFLA_BRIDGE_MRP_START_TEST_PERIOD] = { .type = NLA_U32 }, [IFLA_BRIDGE_MRP_START_TEST_MONITOR] = { .type = NLA_U32 },
@@ -316,7 +316,7 @@ static const struct nla_policy br_mrp_start_in_test_policy[IFLA_BRIDGE_MRP_START_IN_TEST_MAX + 1] = { [IFLA_BRIDGE_MRP_START_IN_TEST_UNSPEC] = { .type = NLA_REJECT }, [IFLA_BRIDGE_MRP_START_IN_TEST_IN_ID] = { .type = NLA_U32 }, - [IFLA_BRIDGE_MRP_START_IN_TEST_INTERVAL] = { .type = NLA_U32 }, + [IFLA_BRIDGE_MRP_START_IN_TEST_INTERVAL] = NLA_POLICY_MIN(NLA_U32, 1), [IFLA_BRIDGE_MRP_START_IN_TEST_MAX_MISS] = { .type = NLA_U32 }, [IFLA_BRIDGE_MRP_START_IN_TEST_PERIOD] = { .type = NLA_U32 }, };
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 9/377 spi: spi-dw-dma: fix print error log when wait finish transaction
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Yakovlev <[email protected]>
[ Upstream commit 3b46d61890632c8f8b117147b6923bff4b42ccb7 ]
If an error occurs, the device may not have a current message. In this case, the system will crash.
In this case, it's better to use dev from the struct ctlr (struct spi_controller*).
--- drivers/spi/spi-dw-dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-dw-dma.c +1 -1
@@ -271,7 +271,7 @@ static int dw_spi_dma_wait(struct dw_spi *dws, unsigned int len, u32 speed) msecs_to_jiffies(ms));if (ms ==0 ) { -dev_err (&dws->host->cur_msg->spi->dev, +dev_err (&dws->host->dev,"DMA transaction timed out\n" );return -ETIMEDOUT ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 10/377 ksmbd: close durable scavenger races against m_fp_list lookups
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: DaeMyung Kang <[email protected]>
[ Upstream commit bf736184d063da1a552ffeff0481813599a182cc ]
ksmbd_durable_scavenger() has two related races against any walker that iterates f_ci->m_fp_list, including ksmbd_lookup_fd_inode() (used by ksmbd_vfs_rename) and the share-mode checks in fs/smb/server/smb_common.c.
(1) fp->node list-head reuse. Durable-preserved handles can remain linked on f_ci->m_fp_list after session teardown so share-mode checks still see them while the handle is reconnectable. The scavenger collected expired handles by adding fp->node to a local scavenger_list after removing them from the global durable idr. Because fp->node is the same list_head used by m_fp_list, list_add(&fp->node, &scavenger_list) overwrites the m_fp_list links and corrupts both lists. CONFIG_DEBUG_LIST can report this on the share-mode walk path.
(2) Refcount race against m_fp_list walkers. The scavenger qualifies an expired durable handle with atomic_read(&fp->refcount) > 1 and fp->conn under global_ft.lock, removes fp from global_ft, then drops global_ft.lock before unlinking fp from m_fp_list and freeing it. During that gap fp is still linked on m_fp_list with f_state == FP_INITED. ksmbd_lookup_fd_inode() under m_lock read calls ksmbd_fp_get() (atomic_inc_not_zero on refcount that is still 1) and takes a live reference; the scavenger then unlinks and frees fp while the holder owns a reference, leading to UAF on the holder's subsequent ksmbd_fd_put() and on any field reads performed by a concurrent share-mode walker that iterates m_fp_list without taking ksmbd_fp_get() (smb_check_perm_dleases-like paths).
Fix both:
* Stop reusing fp->node as a scavenger-private list node. Remove one expired handle from global_ft under global_ft.lock, take an explicit transient reference, drop the lock, unlink fp->node from m_fp_list under f_ci->m_lock, then drop both the durable lifetime and transient references with atomic_sub_and_test(2, &fp->refcount). If the scavenger is the last putter the close runs there; otherwise an in-flight holder that already raced through the m_fp_list lookup owns the final close via its ksmbd_fd_put() path. The one-at-a-time disposal can rescan the durable idr when multiple handles expire in the same pass, but durable scavenging is a background expiration path and the final full scan recomputes min_timeout before the next wait.
* Clear fp->persistent_id inside __ksmbd_remove_durable_fd() right after idr_remove(), so a delayed final close from a holder that snatched fp does not re-issue idr_remove() on a persistent id that idr_alloc_cyclic() in ksmbd_open_durable_fd() may have already handed out to a brand-new durable handle.
* Bypass the per-conn open_files_count decrement in __put_fd_final() when fp is detached from any session table (fp->conn cleared by session_fd_check() at durable preserve -- paired with the volatile_id clear at unpublish, so checking fp->conn alone is sufficient). The walker that owns the final close runs from an unrelated work->conn whose stats.open_files_count never tracked this durable fp; without this guard the holder would underflow that unrelated counter.
The two races are folded into one patch because patch (1) alone cleans up the corrupted list but leaves a deterministic UAF window for m_fp_list walkers that the transient-reference and persistent_id discipline in (2) close; bisecting onto an intermediate state would land on a UAF that pre-patch chaos merely made less reproducible.
Validation:
* CONFIG_DEBUG_LIST coverage for the list_head reuse path.
* KASAN-enabled direct SMB2 durable-handle coverage that exercised ksmbd_durable_scavenger() and non-NULL ksmbd_lookup_fd_inode() returns while durable handles expired under concurrent rename lookups, with no KASAN, UAF, list-corruption, ODEBUG, or WARNING reports.
* checkpatch --strict
* make -j$(nproc) M=fs/smb/server
--- fs/smb/server/vfs_cache.c | 104 ++++++++++++++++++++++++++++---------- 1 file changed, 77 insertions(+), 27 deletions(-)
fs/smb/server/vfs_cache.c +77 -27
@@ -325,6 +325,14 @@ static void __ksmbd_remove_durable_fd(struct ksmbd_file *fp)return ;idr_remove (global_ft.idr, fp->persistent_id); +/* +* Clear persistent_id so a later __ksmbd_close_fd() that runs from a +* delayed putter (e.g. when a concurrent ksmbd_lookup_fd_inode() +* walker held the final reference) does not re-issue idr_remove() on +* an id that idr_alloc_cyclic() may have already handed out to a new +* durable handle. +*/ + fp->persistent_id =KSMBD_NO_FID ; }static void ksmbd_remove_durable_fd (struct ksmbd_file *fp)
@@ -417,6 +425,20 @@ static struct ksmbd_file *__ksmbd_lookup_fd(struct ksmbd_file_table *ft,static void __put_fd_final (struct ksmbd_work *work,struct ksmbd_file *fp) { +/* +* Detached durable fp -- session_fd_check() cleared fp->conn at +* preserve, so this fp is no longer tracked by any conn's +* stats.open_files_count. This happens when +* ksmbd_scavenger_dispose_dh() hands the final close off to an +* m_fp_list walker (e.g. ksmbd_lookup_fd_inode()) whose work->conn +* is unrelated to the conn that originally opened the handle; close +* via the NULL-ft path so we do not underflow that unrelated +* counter. +*/ +if (!fp->conn) { +__ksmbd_close_fd (NULL , fp); +return ; + }__ksmbd_close_fd (&work->sess->file_table, fp);atomic_dec (&work->conn->stats.open_files_count); }
@@ -788,24 +810,37 @@ static bool ksmbd_durable_scavenger_alive(void)return true; } -static void ksmbd_scavenger_dispose_dh (struct list_head *head) +static void ksmbd_scavenger_dispose_dh (struct ksmbd_file *fp) { -while (!list_empty (head)) { -struct ksmbd_file *fp; +/* +* Durable-preserved fp can remain linked on f_ci->m_fp_list for +* share-mode checks. Unlink it before final close; fp->node is not +* available as a scavenger-private list node because re-adding it to +* another list corrupts m_fp_list. +*/ +down_write (&fp->f_ci->m_lock); +list_del_init (&fp->node); +up_write (&fp->f_ci->m_lock); - fp = list_first_entry(head, struct ksmbd_file, node); -list_del_init (&fp->node); +/* +* Drop both the durable lifetime reference and the transient reference +* taken by the scavenger under global_ft.lock. If a concurrent +* ksmbd_lookup_fd_inode() (or any other m_fp_list walker) snatched fp +* before the unlink above, that holder owns the final close via +* ksmbd_fd_put() -> __ksmbd_close_fd(). Otherwise the scavenger is +* the last putter and finalises fp here. +*/ +if (atomic_sub_and_test (2 , &fp->refcount))__ksmbd_close_fd (NULL , fp); - } }static int ksmbd_durable_scavenger (void *dummy) {struct ksmbd_file *fp =NULL ; +struct ksmbd_file *expired_fp;unsigned int id;unsigned int min_timeout =1 ;bool found_fp_timeout; -LIST_HEAD (scavenger_list);unsigned long remaining_jiffies;__module_get (THIS_MODULE );
@@ -815,8 +850,6 @@ static int ksmbd_durable_scavenger(void *dummy)if (try_to_freeze ())continue ; - found_fp_timeout = false; - remaining_jiffies =wait_event_timeout (dh_wq,ksmbd_durable_scavenger_alive () == false,__msecs_to_jiffies (min_timeout));
@@ -825,23 +858,39 @@ static int ksmbd_durable_scavenger(void *dummy)else min_timeout =DURABLE_HANDLE_MAX_TIMEOUT ; -write_lock (&global_ft.lock); -idr_for_each_entry (global_ft.idr, fp, id) { -if (!fp->durable_timeout) -continue ; - -if (atomic_read (&fp->refcount) >1 || - fp->conn) -continue ; - - found_fp_timeout = true; -if (fp->durable_scavenger_timeout <= -jiffies_to_msecs (jiffies)) { -__ksmbd_remove_durable_fd (fp); -list_add (&fp->node, &scavenger_list); - }else { + do { + expired_fp = NULL; + found_fp_timeout = false; + + write_lock(&global_ft.lock); + idr_for_each_entry(global_ft.idr, fp, id) { unsigned long durable_timeout; + if (!fp->durable_timeout) + continue; + + if (atomic_read(&fp->refcount) > 1 || + fp->conn) + continue; + + found_fp_timeout = true; + if (fp->durable_scavenger_timeout <= + jiffies_to_msecs(jiffies)) { + __ksmbd_remove_durable_fd(fp); + /* + * Take a transient reference so fp + * cannot be freed by an in-flight + * ksmbd_lookup_fd_inode() that found + * it through f_ci->m_fp_list while we + * drop global_ft.lock and reach the + * m_fp_list unlink in + * ksmbd_scavenger_dispose_dh(). + */ + atomic_inc(&fp->refcount); + expired_fp = fp; + break; + } + durable_timeout = fp->durable_scavenger_timeout - jiffies_to_msecs(jiffies);
@@ -849,10 +898,11 @@ static int ksmbd_durable_scavenger(void *dummy)if (min_timeout > durable_timeout) min_timeout = durable_timeout; } - } -write_unlock (&global_ft.lock); +write_unlock (&global_ft.lock); -ksmbd_scavenger_dispose_dh (&scavenger_list); +if (expired_fp) +ksmbd_scavenger_dispose_dh (expired_fp); + }while (expired_fp);if (found_fp_timeout == false)break ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 11/377 smb: client: reject userspace cifs.spnego descriptions
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Asim Viladi Oglu Manizada <[email protected]>
commit 3da1fdf4efbc490041eb4f836bf596201203f8f2 upstream.
cifs.spnego key descriptions contain authority-bearing fields such as pid, uid, creduid, and upcall_target that cifs.upcall treats as kernel-originating inputs. However, userspace can also create keys of this type through request_key(2) or add_key(2), allowing those fields to be supplied without CIFS origin.
Only accept cifs.spnego descriptions while CIFS is using its private spnego_cred to request the key.
--- fs/smb/client/cifs_spnego.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
fs/smb/client/cifs_spnego.c +16 -0
@@ -8,6 +8,7 @@*/ #include <linux/list.h> +#include <linux/cred.h> #include <linux/slab.h> #include <linux/string.h> #include <keys/user-type.h>
@@ -40,12 +41,27 @@ cifs_spnego_key_destroy(struct key *key)kfree (key->payload.data[0 ]); } +static int +cifs_spnego_key_vet_description (const char *description) +{ +/* +* cifs.spnego descriptions are authority-bearing inputs to cifs.upcall. +* They are only valid when produced by CIFS while using the private +* spnego_cred installed below. Do not let userspace create this type +* of key through request_key(2)/add_key(2), since the helper treats +* pid/uid/creduid/upcall_target as kernel-originating fields. +*/ +if (current_cred () != spnego_cred) +return -EPERM ; +return 0 ; +}/* * keytype for CIFS spnego keys */ struct key_type cifs_spnego_key_type = { .name ="cifs.spnego" , + .vet_description = cifs_spnego_key_vet_description, .instantiate = cifs_spnego_key_instantiate, .destroy = cifs_spnego_key_destroy, .describe = user_describe,
Greg Kroah-Hartman
maintainerPATCH 12/377 dt-bindings: soc: bcm: Add bcm2712 compatible
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stanimir Varbanov <[email protected]>
commit 34194cb385033656d347ebe45c241e4739a58125 upstream.
Add bcm2712-pm compatible and update the bindings to satisfy it's requirements. The PM hardware block inside bcm2712 lacks the "asb" and "rpivid_asb" register ranges and also does not have clocks, update the bindings accordingly.
--- Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.yaml | 38 ++++++++-- 1 file changed, 32 insertions(+), 6 deletions(-)
Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.yaml +32 -6
@@ -13,23 +13,21 @@ description: | maintainers: - Nicolas Saenz Julienne <[email protected]> -allOf: - - $ref: /schemas/watchdog/watchdog.yaml# - properties: compatible: items: - enum: - brcm,bcm2835-pm - brcm,bcm2711-pm + - brcm,bcm2712-pm - const: brcm,bcm2835-pm-wdt reg: - minItems: 2 + minItems: 1 maxItems: 3 reg-names: - minItems: 2 + minItems: 1 items: - const: pm - const: asb
@@ -62,7 +60,35 @@ required: - reg - "#power-domain-cells" - "#reset-cells" - - clocks + +allOf: + - $ref: /schemas/watchdog/watchdog.yaml# + + - if: + properties: + compatible: + contains: + enum: + - brcm,bcm2835-pm + - brcm,bcm2711-pm + then: + required: + - clocks + + properties: + reg: + minItems: 2 + + reg-names: + minItems: 2 + + else: + properties: + reg: + maxItems: 1 + + reg-names: + maxItems: 1 additionalProperties: false
Greg Kroah-Hartman
maintainerPATCH 13/377 arm64: dts: broadcom: bcm2712: Add watchdog DT node
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stanimir Varbanov <[email protected]>
commit 37c3a91e9730e274fe2eca9703033ae0f154cb62 upstream.
Add watchdog device-tree node for bcm2712 SoC.
--- arch/arm64/boot/dts/broadcom/bcm2712.dtsi | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/arm64/boot/dts/broadcom/bcm2712.dtsi +9 -0
@@ -250,6 +250,15 @@ status = "disabled"; }; + pm: watchdog@7d200000 { + compatible = "brcm,bcm2712-pm", "brcm,bcm2835-pm-wdt"; + reg = <0x7d200000 0x604>; + reg-names = "pm"; + #power-domain-cells = <1>; + #reset-cells = <1>; + system-power-controller; + }; + pinctrl: pinctrl@7d504100 { compatible = "brcm,bcm2712c0-pinctrl"; reg = <0x7d504100 0x30>;
Greg Kroah-Hartman
maintainerPATCH 14/377 mfd: bcm2835-pm: Add support for BCM2712
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stanimir Varbanov <[email protected]>
commit 30ed024fb0768e9353f21d1d9e6960b7028acdfa upstream.
The BCM2712 SoC has PM block but lacks the "asb" and "rpivid_asb" register spaces, and doesn't need clock(s). Add a compatible string for bcm2712 to allow probe of bcm2835-wdt and bcm2835-power drivers.
--- drivers/mfd/bcm2835-pm.c | 1 + 1 file changed, 1 insertion(+)
drivers/mfd/bcm2835-pm.c +1 -0
@@ -108,6 +108,7 @@ static const struct of_device_id bcm2835 { .compatible = "brcm,bcm2835-pm-wdt", }, { .compatible = "brcm,bcm2835-pm", }, { .compatible = "brcm,bcm2711-pm", }, + { .compatible = "brcm,bcm2712-pm", }, {}, }; MODULE_DEVICE_TABLE(of, bcm2835_pm_of_match);
Greg Kroah-Hartman
maintainerPATCH 15/377 ata: libata-scsi: improve readability of ata_scsi_qc_issue()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Cassel <[email protected]>
commit 360190bd965f93794d5f5685a6de22ce6da2b672 upstream.
Improve readability of ata_scsi_qc_issue().
No functional changes.
--- drivers/ata/libata-scsi.c | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-)
drivers/ata/libata-scsi.c +21 -22
@@ -1767,7 +1767,7 @@ static int ata_scsi_qc_issue(struct ata_int ret;if (!ap->ops->qc_defer) - goto issue; + goto issue_qc;/* * If we already have a deferred qc, then rely on the SCSI layer to
@@ -1786,38 +1786,37 @@ static int ata_scsi_qc_issue(struct ata_break ;case ATA_DEFER_LINK : ret =SCSI_MLQUEUE_DEVICE_BUSY ; -break ; + goto defer_qc;case ATA_DEFER_PORT : ret =SCSI_MLQUEUE_HOST_BUSY ; -break ; + goto defer_qc;default :WARN_ON_ONCE (1 ); ret =SCSI_MLQUEUE_HOST_BUSY ; -break ; + goto defer_qc; } -if (ret) { -/* -* We must defer this qc: if this is not an NCQ command, keep -* this qc as a deferred one and report to the SCSI layer that -* we issued it so that it is not requeued. The deferred qc will -* be issued with the port deferred_qc_work once all on-going -* commands complete. -*/ -if (!ata_is_ncq (qc->tf.protocol)) { - ap->deferred_qc = qc; -return 0 ; - } +issue_qc: +ata_qc_issue (qc); +return 0 ; -/* Force a requeue of the command to defer its execution. */ -ata_qc_free (qc); -return ret; +defer_qc: +/* +* We must defer this qc: if this is not an NCQ command, keep +* this qc as a deferred one and report to the SCSI layer that +* we issued it so that it is not requeued. The deferred qc will +* be issued with the port deferred_qc_work once all on-going +* commands complete. +*/ +if (!ata_is_ncq (qc->tf.protocol)) { + ap->deferred_qc = qc; +return 0 ; } -issue: -ata_qc_issue (qc); +/* Force a requeue of the command to defer its execution. */ +ata_qc_free (qc); -return 0 ; +return ret; }/**
Greg Kroah-Hartman
maintainerPATCH 16/377 ata: libata-scsi: do not use the deferred QC feature for ATA_DEFER_PORT
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Cassel <[email protected]>
commit ce4548807d2e4ae48fd0dbe38865467369877913 upstream.
The deferred QC feature was meant to handle mixed NCQ and non-NCQ commands, i.e. for return value ATA_DEFER_LINK.
ATA_DEFER_PORT is returned by PATA drivers, but also certain SATA drivers like sata_mv and sata_sil24 that uses ap->excl_link to workaround hardware bugs in these HBAs. Regardless of the reason, using the deferred QC feature for ATA_DEFER_PORT is always wrong, and will break the ap->excl_link usage of the SATA drivers that rely on that feature.
Modify ata_scsi_qc_issue() to only use the deferred QC feature when mixing NCQ and non-NCQ commands, i.e. ATA_DEFER_LINK.
--- drivers/ata/libata-scsi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/ata/libata-scsi.c +3 -2
@@ -1789,11 +1789,11 @@ static int ata_scsi_qc_issue(struct ata_ goto defer_qc;case ATA_DEFER_PORT : ret =SCSI_MLQUEUE_HOST_BUSY ; - goto defer_qc; + goto free_qc;default :WARN_ON_ONCE (1 ); ret =SCSI_MLQUEUE_HOST_BUSY ; - goto defer_qc; + goto free_qc; } issue_qc:
@@ -1813,6 +1813,7 @@ defer_qc:return 0 ; } +free_qc:/* Force a requeue of the command to defer its execution. */ ata_qc_free (qc);
Greg Kroah-Hartman
maintainerPATCH 17/377 ata: libata-scsi: do not use the deferred QC feature on PMPs with CBS
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Cassel <[email protected]>
commit f233124fb36cd57ef09f96d517a38ab4b902e15e upstream.
When using Port Multipliers (PMPs) with Command-Based Switching (CBS), you can only issue commands to one link at a time. For PMPs with CBS, there is already code to handle commands being sent to different links in sata_pmp_qc_defer_cmd_switch() using ap->excl_link. sata_sil24 also makes use of ap->excl_link.
A user on the list reported that commit 0ea84089dbf6 ("ata: libata-scsi:
avoid Non-NCQ command starvation") broke PMPs with CBS. The commit introduced code that stores a deferred qc in ap->deferred_qc, to later be issued via a workqueue. It turns out that this change is incompatible with the existing ap->excl_link handling used by PMPs with CBS.
Thus, modify sata_pmp_qc_defer_cmd_switch() and sil24_qc_defer() to return ATA_DEFER_LINK_EXCL, and make sure that the deferred QC handling via workqueue is not used for this return value.
This way, PMPs with CBS will work once again. Note that the starvation referenced in commit 0ea84089dbf6 ("ata: libata-scsi: avoid Non-NCQ command starvation") can only happen on libsas ports, and libsas does not support Port Multipliers, thus there is no harm of reverting back to the previous way of deferring commands for PMPs with CBS.
Non-libsas ports connected to anything but a PMP with CBS (e.g. a normal drive or a PMP with FBS) will continue using the deferred workqueue, since it does result in lower completion latencies for non-NCQ commands, even though the workqueue is not strictly needed to avoid starvation for non-libsas ports.
If we want to modify the scope of the workqueue issuing to also handle PMPs with CBS, then we should ensure that we can save both NCQ and non-NCQ commands in ap->deferred_qc, while also removing the existing PMP CBS handling using ap->excl_link, such that we don't duplicate features.
While at it, also add a comment explaining how the ap->excl_link mechanism works.
--- drivers/ata/libata-pmp.c | 13 ++++++++++++- drivers/ata/libata-scsi.c | 8 ++++++++ drivers/ata/sata_sil24.c | 6 +++++- include/linux/libata.h | 1 + 4 files changed, 26 insertions(+), 2 deletions(-)
drivers/ata/libata-pmp.c +12 -1
@@ -110,13 +110,24 @@ int sata_pmp_qc_defer_cmd_switch(struct {struct ata_link *link = qc->dev->link;struct ata_port *ap = link->ap; +int ret;if (ap->excl_link ==NULL || ap->excl_link == link) {if (ap->nr_active_links ==0 ||ata_link_active (link)) { qc->flags |=ATA_QCFLAG_CLEAR_EXCL ; -return ata_std_qc_defer (qc); + ret =ata_std_qc_defer (qc); +if (ret ==ATA_DEFER_LINK ) +return ATA_DEFER_LINK_EXCL ; +return ret; } +/* +* Note: ap->excl_link contains the link that is next in line, +* i.e. implicit round robin. If there is only one link +* dispatching, ap->excl_link will be left unclaimed, allowing +* other links to set ap->excl_link, ensuring that the currently +* active link cannot queue any more. +*/ ap->excl_link = link; }
drivers/ata/libata-scsi.c +8 -0
@@ -1787,6 +1787,14 @@ static int ata_scsi_qc_issue(struct ata_case ATA_DEFER_LINK : ret =SCSI_MLQUEUE_DEVICE_BUSY ; goto defer_qc; +case ATA_DEFER_LINK_EXCL : +/* +* Drivers making use of ap->excl_link cannot store the QC in +* ap->deferred_qc, because the ap->excl_link handling is +* incompatible with the ap->deferred_qc workqueue handling. +*/ + ret =SCSI_MLQUEUE_DEVICE_BUSY ; + goto free_qc;case ATA_DEFER_PORT : ret =SCSI_MLQUEUE_HOST_BUSY ; goto free_qc;
drivers/ata/sata_sil24.c +5 -1
@@ -789,6 +789,7 @@ static int sil24_qc_defer(struct ata_questruct ata_link *link = qc->dev->link;struct ata_port *ap = link->ap;u8 prot = qc->tf.protocol; +int ret;/* * There is a bug in the chip:
@@ -826,7 +827,10 @@ static int sil24_qc_defer(struct ata_que qc->flags |=ATA_QCFLAG_CLEAR_EXCL ; } -return ata_std_qc_defer (qc); + ret =ata_std_qc_defer (qc); +if (ret ==ATA_DEFER_LINK ) +return ATA_DEFER_LINK_EXCL ; +return ret; }static enum ata_completion_errors sil24_qc_prep (struct ata_queued_cmd *qc)
include/linux/libata.h +1 -0
@@ -335,6 +335,7 @@ enum {/* return values for ->qc_defer */ ATA_DEFER_LINK =1 ,ATA_DEFER_PORT =2 , +ATA_DEFER_LINK_EXCL =3 ,/* desc_len for ata_eh_info and context */ ATA_EH_DESC_LEN = 80,
Greg Kroah-Hartman
maintainerPATCH 18/377 ata: libata-scsi: do not needlessly defer commands when using PMP with FBS
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Cassel <[email protected]>
commit 759e8756da00aa115d504a18155b1d1ee1cc12e8 upstream.
The ACS specification does not allow a non-NCQ command to be issued while an NCQ command is outstanding.
Commit 0ea84089dbf6 ("ata: libata-scsi: avoid Non-NCQ command starvation") introduced a feature where a deferred non-NCQ command gets issued from a workqueue. The design stores a single non-NCQ command per port.
However, when using Port Multipliers (PMPs), specifically PMPs that support FIS-Based Switching (FBS), non-NCQ and NCQ commands can be mixed on the same port, just not for the same link, see e.g. ata_std_qc_defer() which is, and always has operated on a per-link basis.
Therefore, move the deferred_qc from struct ata_port to struct ata_link. This way, when using a PMP with FBS, we will not needlessly defer commands to all other links, just because one link issued a non-NCQ command while having an NCQ command outstanding. Only commands for that specific link will be deferred. This is in line with how PMPs with FBS worked before commit 0ea84089dbf6 ("ata: libata-scsi: avoid Non-NCQ command starvation").
--- drivers/ata/libata-core.c | 9 +++++-- drivers/ata/libata-eh.c | 8 +++--- drivers/ata/libata-pmp.c | 5 +++- drivers/ata/libata-scsi.c | 54 +++++++++++++++++++++++++--------------------- include/linux/libata.h | 6 ++--- 5 files changed, 47 insertions(+), 35 deletions(-)
drivers/ata/libata-core.c +6 -3
@@ -5499,6 +5499,7 @@ void ata_link_init(struct ata_port *ap, link->pmp = pmp; link->active_tag =ATA_TAG_POISON ; link->hw_sata_spd_limit =UINT_MAX ; +INIT_WORK (&link->deferred_qc_work, ata_scsi_deferred_qc_work);/* can't use iterator, ap isn't initialized yet */ for (i =0 ; i <ATA_MAX_DEVICES ; i++) {
@@ -5581,7 +5582,6 @@ struct ata_port *ata_port_alloc(struct amutex_init (&ap->scsi_scan_mutex);INIT_DELAYED_WORK (&ap->hotplug_task, ata_scsi_hotplug);INIT_DELAYED_WORK (&ap->scsi_rescan_task, ata_scsi_dev_rescan); -INIT_WORK (&ap->deferred_qc_work, ata_scsi_deferred_qc_work);INIT_LIST_HEAD (&ap->eh_done_q);init_waitqueue_head (&ap->eh_wait_q);init_completion (&ap->park_req_pending);
@@ -6204,12 +6204,15 @@ static void ata_port_detach(struct ata_p/* It better be dead now and not have any remaining deferred qc. */ WARN_ON (!(ap->pflags &ATA_PFLAG_UNLOADED )); -WARN_ON (ap->deferred_qc); -cancel_work_sync (&ap->deferred_qc_work);cancel_delayed_work_sync (&ap->hotplug_task);cancel_delayed_work_sync (&ap->scsi_rescan_task); +ata_for_each_link (link, ap,PMP_FIRST ) { +WARN_ON (link->deferred_qc); +cancel_work_sync (&link->deferred_qc_work); + } +/* Delete port multiplier link transport devices */ if (ap->pmp_link) {int i;
drivers/ata/libata-eh.c +4 -4
@@ -643,11 +643,11 @@ void ata_scsi_cmd_error_handler(struct Sif (qc->scsicmd != scmd)continue ;if ((qc->flags &ATA_QCFLAG_ACTIVE ) || - qc == ap->deferred_qc) + qc == qc->dev->link->deferred_qc)break ; } -if (i <ATA_MAX_QUEUE && qc == ap->deferred_qc) { +if (i <ATA_MAX_QUEUE && qc == qc->dev->link->deferred_qc) {/* * This is a deferred command that timed out while * waiting for the command queue to drain. Since the qc
@@ -658,8 +658,8 @@ void ata_scsi_cmd_error_handler(struct S* deferred qc work from issuing this qc. */ WARN_ON_ONCE (qc->flags &ATA_QCFLAG_ACTIVE ); - ap->deferred_qc =NULL ; -cancel_work (&ap->deferred_qc_work); + qc->dev->link->deferred_qc =NULL ; +cancel_work (&qc->dev->link->deferred_qc_work);set_host_byte (scmd,DID_TIME_OUT );scsi_eh_finish_cmd (scmd, &ap->eh_done_q); }else if (i <ATA_MAX_QUEUE ) {
drivers/ata/libata-pmp.c +4 -1
@@ -582,8 +582,11 @@ static void sata_pmp_detach(struct ata_dif (ap->ops->pmp_detach) ap->ops->pmp_detach (ap); -ata_for_each_link (tlink, ap,EDGE ) +ata_for_each_link (tlink, ap,EDGE ) { +WARN_ON (tlink->deferred_qc); +cancel_work_sync (&tlink->deferred_qc_work);ata_eh_detach_dev (tlink->device); + }spin_lock_irqsave (ap->lock, flags); ap->nr_pmp_links =0 ;
drivers/ata/libata-scsi.c +30 -24
121 lines not on this page · raw message
include/linux/libata.h +3 -3
@@ -855,6 +855,9 @@ struct ata_link {unsigned int sata_spd;/* current SATA PHY speed */ enum ata_lpm_policy lpm_policy; +struct work_struct deferred_qc_work; +struct ata_queued_cmd *deferred_qc; +/* record runtime error info, protected by host_set lock */ struct ata_eh_info eh_info;/* EH context */
@@ -900,9 +903,6 @@ struct ata_port {u64 qc_active;int nr_active_links;/* #links with active qcs */ -struct work_struct deferred_qc_work; -struct ata_queued_cmd *deferred_qc; -struct ata_link link;/* host default link */ struct ata_link *slave_link;/* see ata_slave_link_init() */
Greg Kroah-Hartman
maintainerPATCH 19/377 Revert "ice: fix double-free of tx_buf skb"
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
This reverts commit 7cb19ec8ac087f33bee60f5d6054b284a5b9bb6f.
--- drivers/net/ethernet/intel/ice/ice_txrx.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/ice/ice_txrx.c +2 -4
@@ -2594,9 +2594,6 @@ ice_xmit_frame_ring(struct sk_buff *skb, struct ice_tx_ring *tx_ring)ice_trace (xmit_frame_ring, tx_ring, skb); -/* record the location of the first descriptor for this packet */ - first = &tx_ring->tx_buf[tx_ring->next_to_use]; - count =ice_xmit_desc_count (skb);if (ice_chk_linearize (skb, count)) {if (__skb_linearize (skb))
@@ -2622,6 +2619,8 @@ ice_xmit_frame_ring(struct sk_buff *skb, struct ice_tx_ring *tx_ring) offload.tx_ring = tx_ring; +/* record the location of the first descriptor for this packet */ + first = &tx_ring->tx_buf[tx_ring->next_to_use]; first->skb = skb; first->type =ICE_TX_BUF_SKB ; first->bytecount = max_t(unsigned int, skb->len, ETH_ZLEN);
@@ -2686,7 +2685,6 @@ ice_xmit_frame_ring(struct sk_buff *skb, struct ice_tx_ring *tx_ring) out_drop:ice_trace (xmit_frame_ring_drop, tx_ring, skb);dev_kfree_skb_any (skb); - first->type =ICE_TX_BUF_EMPTY ;return NETDEV_TX_OK ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 20/377 Revert "ice: Remove jumbo_remove step from TX path"
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
This reverts commit 55500245ec0420df96b2a89444aabf0cff2c60bc.
--- drivers/net/ethernet/intel/ice/ice_txrx.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/intel/ice/ice_txrx.c +3 -0
@@ -2594,6 +2594,9 @@ ice_xmit_frame_ring(struct sk_buff *skb, struct ice_tx_ring *tx_ring)ice_trace (xmit_frame_ring, tx_ring, skb); +if (unlikely (ipv6_hopopt_jumbo_remove (skb))) + goto out_drop; + count =ice_xmit_desc_count (skb);if (ice_chk_linearize (skb, count)) {if (__skb_linearize (skb))
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 21/377 drm/vblank: Add vblank timer
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Zimmermann <[email protected]>
[ Upstream commit 74afeb8128502a529041a2566febd26053a7be11 ]
The vblank timer simulates a vblank interrupt for hardware without support. Rate-limits the display update frequency.
DRM drivers for hardware without vblank support apply display updates ASAP. A vblank event informs DRM clients of the completed update. Userspace compositors immediately schedule the next update, which creates significant load on virtualization outputs. Display updates are usually fast on virtualization outputs, as their framebuffers are in regular system memory and there's no hardware vblank interrupt to throttle the update rate.
The vblank timer is a HR timer that signals the vblank in software. It limits the update frequency of a DRM driver similar to a hardware vblank interrupt. The timer is not synchronized to the actual vblank interval of the display.
The code has been adopted from vkms, which added the funtionality in commit 3a0709928b17 ("drm/vkms: Add vblank events simulated by hrtimers").
The new implementation is part of the existing vblank support, which sets up the timer automatically. Drivers only have to start and cancel the vblank timer as part of enabling and disabling the CRTC. The new vblank helper library provides callbacks for struct drm_crtc_funcs.
The standard way for handling vblank is to call drm_crtc_handle_vblank(). Drivers that require additional processing, such as vkms, can init handle_vblank_timeout in struct drm_crtc_helper_funcs to refer to their timeout handler.
There's a possible deadlock between drm_crtc_handle_vblank() and hrtimer_cancel(). [1] The implementation avoids to call hrtimer_cancel() directly and instead signals to the timer function to not restart itself.
v4:
- fix possible race condition between timeout and atomic commit (Michael) v3:
- avoid deadlock when cancelling timer (Ville, Lyude)
v2:
- implement vblank timer entirely in vblank helpers
- downgrade overrun warning to debug
- fix docs
--- Documentation/gpu/drm-kms-helpers.rst | 12 ++ drivers/gpu/drm/Makefile | 3 +- drivers/gpu/drm/drm_vblank.c | 172 ++++++++++++++++++++++- drivers/gpu/drm/drm_vblank_helper.c | 96 +++++++++++++ include/drm/drm_modeset_helper_vtables.h | 12 ++ include/drm/drm_vblank.h | 32 +++++ include/drm/drm_vblank_helper.h | 33 +++++ 7 files changed, 357 insertions(+), 3 deletions(-) create mode 100644 drivers/gpu/drm/drm_vblank_helper.c create mode 100644 include/drm/drm_vblank_helper.h
Documentation/gpu/drm-kms-helpers.rst +12 -0
@@ -92,6 +92,18 @@ GEM Atomic Helper Reference .. kernel-doc:: drivers/gpu/drm/drm_gem_atomic_helper.c :export: +VBLANK Helper Reference +----------------------- + +.. kernel-doc:: drivers/gpu/drm/drm_vblank_helper.c + :doc: overview + +.. kernel-doc:: include/drm/drm_vblank_helper.h + :internal: + +.. kernel-doc:: drivers/gpu/drm/drm_vblank_helper.c + :export: + Simple KMS Helper Reference ===========================
drivers/gpu/drm/Makefile +2 -1
@@ -152,7 +152,8 @@ drm_kms_helper-y := \ drm_plane_helper.o \ drm_probe_helper.o \ drm_self_refresh_helper.o \ - drm_simple_kms_helper.o + drm_simple_kms_helper.o \ + drm_vblank_helper.o drm_kms_helper-$(CONFIG_DRM_PANEL_BRIDGE) += bridge/panel.o drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fb_helper.o obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o
drivers/gpu/drm/drm_vblank.c +170 -2
187 lines not on this page · raw message
drivers/gpu/drm/drm_vblank_helper.c new file +96 -0
96 lines not on this page · raw message
include/drm/drm_modeset_helper_vtables.h +12 -0
@@ -490,6 +490,18 @@ struct drm_crtc_helper_funcs { bool in_vblank_irq, int *vpos, int *hpos, ktime_t *stime, ktime_t *etime, const struct drm_display_mode *mode); + +/** +* @handle_vblank_timeout: Handles timeouts of the vblank timer. +* +* Called by CRTC's the vblank timer on each timeout. Semantics is +* equivalient to drm_crtc_handle_vblank(). Implementations should +* invoke drm_crtc_handle_vblank() as part of processing the timeout. +* +* This callback is optional. If unset, the vblank timer invokes +* drm_crtc_handle_vblank() directly. +*/ +bool (*handle_vblank_timeout)(struct drm_crtc *crtc); };/**
include/drm/drm_vblank.h +32 -0
@@ -25,6 +25,7 @@#define _DRM_VBLANK_H_#include <linux/seqlock.h> +#include <linux/hrtimer.h> #include <linux/idr.h> #include <linux/poll.h> #include <linux/kthread.h>
@@ -103,6 +104,28 @@ struct drm_vblank_crtc_config {bool disable_immediate; }; +/** +* struct drm_vblank_crtc_timer - vblank timer for a CRTC +*/ +struct drm_vblank_crtc_timer { +/** +* @timer: The vblank's high-resolution timer +*/ +struct hrtimer timer; +/** +* @interval_lock: Protects @interval +*/ +spinlock_t interval_lock; +/** +* @interval: Duration between two vblanks +*/ +ktime_t interval; +/** +* @crtc: The timer's CRTC +*/ +struct drm_crtc *crtc; +}; +/** * struct drm_vblank_crtc - vblank tracking for a CRTC *
@@ -254,6 +277,11 @@ struct drm_vblank_crtc {* cancelled. */ wait_queue_head_t work_wait_queue; + +/** +* @vblank_timer: Holds the state of the vblank timer +*/ +struct drm_vblank_crtc_timer vblank_timer; };struct drm_vblank_crtc *drm_crtc_vblank_crtc (struct drm_crtc *crtc);
@@ -290,6 +318,10 @@ wait_queue_head_t *drm_crtc_vblank_waitqueue(struct drm_crtc *crtc);void drm_crtc_set_max_vblank_count (struct drm_crtc *crtc,u32 max_vblank_count); +int drm_crtc_vblank_start_timer (struct drm_crtc *crtc); +void drm_crtc_vblank_cancel_timer (struct drm_crtc *crtc); +void drm_crtc_vblank_get_vblank_timeout (struct drm_crtc *crtc,ktime_t *vblank_time); +/* * Helpers for struct drm_crtc_funcs */
include/drm/drm_vblank_helper.h new file +33 -0
@@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ + +#ifndef _DRM_VBLANK_HELPER_H_ +#define _DRM_VBLANK_HELPER_H_ + +#include <linux/hrtimer_types.h> +#include <linux/types.h> + +struct drm_crtc ; + +/* +* VBLANK timer +*/ + +int drm_crtc_vblank_helper_enable_vblank_timer (struct drm_crtc *crtc); +void drm_crtc_vblank_helper_disable_vblank_timer (struct drm_crtc *crtc); +bool drm_crtc_vblank_helper_get_vblank_timestamp_from_timer (struct drm_crtc *crtc, +int *max_error, +ktime_t *vblank_time, +bool in_vblank_irq); + +/** +* DRM_CRTC_VBLANK_TIMER_FUNCS - Default implementation for VBLANK timers +* +* This macro initializes struct &drm_crtc_funcs to default helpers for +* VBLANK timers. +*/ +#define DRM_CRTC_VBLANK_TIMER_FUNCS \ + .enable_vblank = drm_crtc_vblank_helper_enable_vblank_timer, \ + .disable_vblank = drm_crtc_vblank_helper_disable_vblank_timer, \ + .get_vblank_timestamp = drm_crtc_vblank_helper_get_vblank_timestamp_from_timer + +#endif
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 22/377 drm/vblank: Add CRTC helpers for simple use cases
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Zimmermann <[email protected]>
[ Upstream commit d54dbb5963bdbdf8559903fe2b2343e871adcb30 ]
Implement atomic_flush, atomic_enable and atomic_disable of struct drm_crtc_helper_funcs for vblank handling. Driver with no further requirements can use these functions instead of adding their own. Also simplifies the use of vblank timers.
The code has been adopted from vkms, which added the funtionality in commit 3a0709928b17 ("drm/vkms: Add vblank events simulated by hrtimers").
v3:
- mention vkms (Javier)
v2:
- fix docs
--- drivers/gpu/drm/drm_vblank_helper.c | 80 +++++++++++++++++++++++++++++ include/drm/drm_vblank_helper.h | 23 +++++++++ 2 files changed, 103 insertions(+)
drivers/gpu/drm/drm_vblank_helper.c +80 -0
@@ -1,5 +1,6 @@// SPDX-License-Identifier: MIT +#include <drm/drm_atomic.h> #include <drm/drm_crtc.h> #include <drm/drm_managed.h> #include <drm/drm_modeset_helper_vtables.h>
@@ -17,6 +18,12 @@* Drivers enable support for vblank timers by setting the vblank callbacks * in struct &drm_crtc_funcs to the helpers provided by this library. The * initializer macro DRM_CRTC_VBLANK_TIMER_FUNCS does this conveniently. +* The driver further has to send the VBLANK event from its atomic_flush +* callback and control vblank from the CRTC's atomic_enable and atomic_disable +* callbacks. The callbacks are located in struct &drm_crtc_helper_funcs. +* The vblank helper library provides implementations of these callbacks +* for drivers without further requirements. The initializer macro +* DRM_CRTC_HELPER_VBLANK_FUNCS sets them coveniently. * * Once the driver enables vblank support with drm_vblank_init(), each * CRTC's vblank timer fires according to the programmed display mode. By
@@ -25,6 +32,79 @@* struct &drm_crtc_helper_funcs.handle_vblank_timeout. */ +/* +* VBLANK helpers +*/ + +/** +* drm_crtc_vblank_atomic_flush - +* Implements struct &drm_crtc_helper_funcs.atomic_flush +* @crtc: The CRTC +* @state: The atomic state to apply +* +* The helper drm_crtc_vblank_atomic_flush() implements atomic_flush of +* struct drm_crtc_helper_funcs for CRTCs that only need to send out a +* VBLANK event. +* +* See also struct &drm_crtc_helper_funcs.atomic_flush. +*/ +void drm_crtc_vblank_atomic_flush (struct drm_crtc *crtc, +struct drm_atomic_state *state) +{ +struct drm_device *dev = crtc->dev; +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, crtc); +struct drm_pending_vblank_event *event; + +spin_lock_irq (&dev->event_lock); + + event = crtc_state->event; + crtc_state->event =NULL ; + +if (event) { +if (drm_crtc_vblank_get (crtc) ==0 ) +drm_crtc_arm_vblank_event (crtc, event); +else +drm_crtc_send_vblank_event (crtc, event); + } + +spin_unlock_irq (&dev->event_lock); +} +EXPORT_SYMBOL (drm_crtc_vblank_atomic_flush); + +/** +* drm_crtc_vblank_atomic_enable - Implements struct &drm_crtc_helper_funcs.atomic_enable +* @crtc: The CRTC +* @state: The atomic state +* +* The helper drm_crtc_vblank_atomic_enable() implements atomic_enable +* of struct drm_crtc_helper_funcs for CRTCs the only need to enable VBLANKs. +* +* See also struct &drm_crtc_helper_funcs.atomic_enable. +*/ +void drm_crtc_vblank_atomic_enable (struct drm_crtc *crtc, +struct drm_atomic_state *state) +{ +drm_crtc_vblank_on (crtc); +} +EXPORT_SYMBOL (drm_crtc_vblank_atomic_enable); + +/** +* drm_crtc_vblank_atomic_disable - Implements struct &drm_crtc_helper_funcs.atomic_disable +* @crtc: The CRTC +* @state: The atomic state +* +* The helper drm_crtc_vblank_atomic_disable() implements atomic_disable +* of struct drm_crtc_helper_funcs for CRTCs the only need to disable VBLANKs. +* +* See also struct &drm_crtc_funcs.atomic_disable. +*/ +void drm_crtc_vblank_atomic_disable (struct drm_crtc *crtc, +struct drm_atomic_state *state) +{ +drm_crtc_vblank_off (crtc); +} +EXPORT_SYMBOL (drm_crtc_vblank_atomic_disable); +/* * VBLANK timer */
include/drm/drm_vblank_helper.h +23 -0
@@ -6,8 +6,31 @@#include <linux/hrtimer_types.h> #include <linux/types.h> +struct drm_atomic_state ;struct drm_crtc ; +/* +* VBLANK helpers +*/ + +void drm_crtc_vblank_atomic_flush (struct drm_crtc *crtc, +struct drm_atomic_state *state); +void drm_crtc_vblank_atomic_enable (struct drm_crtc *crtc, +struct drm_atomic_state *state); +void drm_crtc_vblank_atomic_disable (struct drm_crtc *crtc, +struct drm_atomic_state *crtc_state); + +/** +* DRM_CRTC_HELPER_VBLANK_FUNCS - Default implementation for VBLANK helpers +* +* This macro initializes struct &drm_crtc_helper_funcs to default helpers +* for VBLANK handling. +*/ +#define DRM_CRTC_HELPER_VBLANK_FUNCS \ + .atomic_flush = drm_crtc_vblank_atomic_flush, \ + .atomic_enable = drm_crtc_vblank_atomic_enable, \ + .atomic_disable = drm_crtc_vblank_atomic_disable +/* * VBLANK timer */
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 23/377 drm/vkms: Convert to DRMs vblank timer
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Zimmermann <[email protected]>
[ Upstream commit 02e2681ffe1addde1fc8c35d05657b16bfa79613 ]
Replace vkms' vblank timer with the DRM implementation. The DRM code is identical in concept, but differs in implementation.
Vblank timers are covered in vblank helpers and initializer macros, so remove the corresponding hrtimer in struct vkms_output. The vblank timer calls vkms' custom timeout code via handle_vblank_timeout in struct drm_crtc_helper_funcs.
--- drivers/gpu/drm/vkms/vkms_crtc.c | 83 +++----------------------------- drivers/gpu/drm/vkms/vkms_drv.h | 2 - 2 files changed, 7 insertions(+), 78 deletions(-)
drivers/gpu/drm/vkms/vkms_crtc.c +7 -76
@@ -7,25 +7,18 @@#include <drm/drm_managed.h> #include <drm/drm_probe_helper.h> #include <drm/drm_vblank.h> +#include <drm/drm_vblank_helper.h> #include "vkms_drv.h" -static enum hrtimer_restart vkms_vblank_simulate (struct hrtimer *timer) +static bool vkms_crtc_handle_vblank_timeout (struct drm_crtc *crtc) { - struct vkms_output *output = container_of(timer, struct vkms_output, - vblank_hrtimer); -struct drm_crtc *crtc = &output->crtc; +struct vkms_output *output =drm_crtc_to_vkms_output (crtc);struct vkms_crtc_state *state; -u64 ret_overrun;bool ret, fence_cookie; fence_cookie =dma_fence_begin_signalling (); - ret_overrun =hrtimer_forward_now (&output->vblank_hrtimer, - output->period_ns); -if (ret_overrun !=1 ) -pr_warn ("%s: vblank timer overrun\n" , __func__); -spin_lock (&output->lock); ret =drm_crtc_handle_vblank (crtc);if (!ret)
@@ -57,55 +50,6 @@ static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer)dma_fence_end_signalling (fence_cookie); -return HRTIMER_RESTART ; -} - -static int vkms_enable_vblank (struct drm_crtc *crtc) -{ -struct drm_vblank_crtc *vblank =drm_crtc_vblank_crtc (crtc); -struct vkms_output *out =drm_crtc_to_vkms_output (crtc); - -hrtimer_setup (&out->vblank_hrtimer, &vkms_vblank_simulate,CLOCK_MONOTONIC , -HRTIMER_MODE_REL ); - out->period_ns =ktime_set (0 , vblank->framedur_ns); -hrtimer_start (&out->vblank_hrtimer, out->period_ns,HRTIMER_MODE_REL ); - -return 0 ; -} - -static void vkms_disable_vblank (struct drm_crtc *crtc) -{ -struct vkms_output *out =drm_crtc_to_vkms_output (crtc); - -hrtimer_cancel (&out->vblank_hrtimer); -} - -static bool vkms_get_vblank_timestamp (struct drm_crtc *crtc, -int *max_error,ktime_t *vblank_time, -bool in_vblank_irq) -{ -struct vkms_output *output =drm_crtc_to_vkms_output (crtc); -struct drm_vblank_crtc *vblank =drm_crtc_vblank_crtc (crtc); - -if (!READ_ONCE (vblank->enabled)) { - *vblank_time =ktime_get (); -return true; - } - - *vblank_time =READ_ONCE (output->vblank_hrtimer.node.expires); - -if (WARN_ON (*vblank_time == vblank->time)) -return true; - -/* -* To prevent races we roll the hrtimer forward before we do any -* interrupt processing - this is how real hw works (the interrupt is -* only generated after all the vblank registers are updated) and what -* the vblank core expects. Therefore we need to always correct the -* timestampe by one frame. -*/ - *vblank_time -= output->period_ns; -return true; }
@@ -159,9 +103,7 @@ static const struct drm_crtc_funcs vkms_crtc_funcs = { .reset = vkms_atomic_crtc_reset, .atomic_duplicate_state = vkms_atomic_crtc_duplicate_state, .atomic_destroy_state = vkms_atomic_crtc_destroy_state, - .enable_vblank = vkms_enable_vblank, - .disable_vblank = vkms_disable_vblank, - .get_vblank_timestamp = vkms_get_vblank_timestamp, +DRM_CRTC_VBLANK_TIMER_FUNCS , .get_crc_sources = vkms_get_crc_sources, .set_crc_source = vkms_set_crc_source, .verify_crc_source = vkms_verify_crc_source,
@@ -213,18 +155,6 @@ static int vkms_crtc_atomic_check(struct drm_crtc *crtc,return 0 ; } -static void vkms_crtc_atomic_enable (struct drm_crtc *crtc, -struct drm_atomic_state *state) -{ -drm_crtc_vblank_on (crtc); -} - -static void vkms_crtc_atomic_disable (struct drm_crtc *crtc, -struct drm_atomic_state *state) -{ -drm_crtc_vblank_off (crtc); -} - static void vkms_crtc_atomic_begin(struct drm_crtc *crtc, struct drm_atomic_state *state) __acquires(&vkms_output->lock)
@@ -265,8 +195,9 @@ static const struct drm_crtc_helper_funcs vkms_crtc_helper_funcs = { .atomic_check = vkms_crtc_atomic_check, .atomic_begin = vkms_crtc_atomic_begin, .atomic_flush = vkms_crtc_atomic_flush, - .atomic_enable = vkms_crtc_atomic_enable, - .atomic_disable = vkms_crtc_atomic_disable, + .atomic_enable = drm_crtc_vblank_atomic_enable, + .atomic_disable = drm_crtc_vblank_atomic_disable, + .handle_vblank_timeout = vkms_crtc_handle_vblank_timeout, }; struct vkms_output *vkms_crtc_init(struct drm_device *dev, struct drm_plane *primary,
drivers/gpu/drm/vkms/vkms_drv.h +0 -2
@@ -215,8 +215,6 @@ struct vkms_output {struct drm_crtc crtc;struct drm_writeback_connector wb_connector;struct drm_encoder wb_encoder; -struct hrtimer vblank_hrtimer; -ktime_t period_ns;struct workqueue_struct *composer_workq;spinlock_t lock;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 24/377 drm/atomic: Increase timeout in drm_atomic_helper_wait_for_vblanks()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Zimmermann <[email protected]>
[ Upstream commit 79ae8510b5b81b9500370f89c619b50ca9c0990f ]
Increase the timeout for vblank events from 100 ms to 1000 ms. This is the same fix as in commit f050da08a4ed ("drm/vblank: Increase timeout in drm_wait_one_vblank()") for another vblank timeout.
After merging generic DRM vblank timers [1] and converting several DRM drivers for virtual hardware, these drivers synchronize their vblank events to the display refresh rate. This can trigger timeouts within the DRM framework.
--- drivers/gpu/drm/drm_atomic_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_atomic_helper.c +1 -1
@@ -1913,7 +1913,7 @@ drm_atomic_helper_wait_for_vblanks(struct drm_device *dev, ret =wait_event_timeout (dev->vblank[i].queue, state->crtcs[i].last_vblank_count !=drm_crtc_vblank_count (crtc), -msecs_to_jiffies (100 )); +msecs_to_jiffies (1000 ));WARN (!ret,"[CRTC:%d:%s] vblank wait timed out\n" , crtc->base.id, crtc->name);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 25/377 drm/vblank: Fix kernel docs for vblank timer
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Zimmermann <[email protected]>
[ Upstream commit 3946d3ba99342f3b9996e621f05e7003d4308171 ]
Fix documentation for drm_crtc_vblank_start_timer(), which referred to drm_crtc_vblank_cancel_timer().
--- drivers/gpu/drm/drm_vblank.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_vblank.c +1 -1
@@ -2258,7 +2258,7 @@ int drm_crtc_vblank_start_timer(struct drm_crtc *crtc)EXPORT_SYMBOL (drm_crtc_vblank_start_timer);/** -* drm_crtc_vblank_start_timer - Cancels the given CRTC's vblank timer +* drm_crtc_vblank_cancel_timer - Cancels the given CRTC's vblank timer * @crtc: the CRTC * * Drivers should call this function from their CRTC's disable_vblank
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 26/377 sysfs: dont remove existing directory on update failure
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 237557b8a81ab948e8332f7c0058e758f081c0a3 upstream.
When sysfs_update_group() is called for a named group and create_files() fails (e.g. -ENOMEM), internal_create_group() calls kernfs_remove(kn) on the group directory. In the update path, kn was obtained via kernfs_find_and_get() and refers to a directory that already existed before this call. Removing it silently destroys a sysfs group that the caller did not create.
Only remove the directory if we created it ourselves. On update failure the directory remains as it is left empty by remove_files() inside create_files(), but can be repopulated by a retry.
--- fs/sysfs/group.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/sysfs/group.c +1 -1
@@ -182,7 +182,7 @@ static int internal_create_group(structkernfs_get (kn); error =create_files (kn, kobj, uid, gid, grp, update);if (error) { -if (grp->name) +if (grp->name && !update)kernfs_remove (kn); }kernfs_put (kn);
Greg Kroah-Hartman
maintainerPATCH 27/377 mm/damon/sysfs-schemes: call missing mem_cgroup_iter_break()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: SeongJae Park <[email protected]>
commit d4e7b5c4cc353f154d5ab8bb2e1ce7714d77a6e9 upstream.
damon_sysfs_memcg_path_to_id() breaks mem_cgroup_iter() loop without calling mem_cgroup_iter_break(). This leaks the cgroup reference. Fix the issue by calling mem_cgroup_iter_break() before the break.
The issue was discovered [1] by Sashiko.
--- mm/damon/sysfs-schemes.c | 1 + 1 file changed, 1 insertion(+)
mm/damon/sysfs-schemes.c +1 -0
@@ -2444,6 +2444,7 @@ static int damon_sysfs_memcg_path_to_id(if (damon_sysfs_memcg_path_eq (memcg, path, memcg_path)) { *id =mem_cgroup_id (memcg); found = true; +mem_cgroup_iter_break (NULL , memcg);break ; } }
Greg Kroah-Hartman
maintainerPATCH 28/377 ksmbd: fix null pointer dereference in compare_guid_key()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeremy Laratro <[email protected]>
commit 4b83cbc4c15f09b000cc06f033f64b0824b6dc87 upstream.
session_fd_check() walks the per-inode m_op_list during durable-handle session teardown and sets op->conn = NULL for every opinfo whose conn matched the closing session's connection. The matching opinfo, however, stays linked in its per-ClientGuid lease_table_list entry's lb->lease_list because destroy_lease_table() only runs on full TCP-connection teardown, not on SESSION_LOGOFF.
If the same TCP connection then negotiates a fresh session with the same ClientGuid (ClientGuid is bound to NEGOTIATE, not the session, and is unchanged across LOGOFF + SETUP) and issues a SMB2 CREATE with a lease context on a different inode, find_same_lease_key() walks lb->lease_list, reaches the stale opinfo, and calls compare_guid_key(), which unconditionally dereferences opinfo->conn->ClientGUID. The conn pointer is NULL and the kernel panics.
Reproducer requires only a successful SMB2 SESSION_SETUP and a share configured with 'durable handles = yes'. KASAN report on mainline 70390501d194:
general protection fault, probably for non-canonical address 0xdffffc0000000069: 0000 [#1] SMP KASAN PTI KASAN: null-ptr-deref in range [0x0000000000000348-0x000000000000034f] Workqueue: ksmbd-io handle_ksmbd_work RIP: 0010:bcmp+0x5b/0x230 Call Trace: compare_guid_key+0x4b/0xd0 find_same_lease_key+0x324/0x690 smb2_open+0x6aea/0x8e60 handle_ksmbd_work+0x796/0xee0 ...
Faulting address 0x348 is the offset of ClientGUID within struct ksmbd_conn, confirming opinfo->conn was NULL.
Read opinfo->conn once and bail out if it has been cleared by a concurrent session_fd_check(). A half-detached opinfo cannot be the owner of an active lease, so returning 0 is the correct match result.
--- fs/smb/server/oplock.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/smb/server/oplock.c +5 -1
@@ -484,8 +484,12 @@ static inline int compare_guid_key(struc const char *guid1, const char *key1) { const char *guid2, *key2; +struct ksmbd_conn *conn; - guid2 = opinfo->conn->ClientGUID; + conn =READ_ONCE (opinfo->conn); +if (!conn) +return 0 ; + guid2 = conn->ClientGUID; key2 = opinfo->o_lease->lease_key;if (!memcmp (guid1, guid2,SMB2_CLIENT_GUID_SIZE ) && !memcmp (key1, key2,SMB2_LEASE_KEY_SIZE ))
Greg Kroah-Hartman
maintainerPATCH 29/377 ksmbd: fix SID memory leak in set_posix_acl_entries_dacl() on overflow
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ferry Meng <[email protected]>
commit af92ee994cc7f7e83a41c2025f32257a2f82a7ef upstream.
Commit 299f962c0b02 ("ksmbd: use check_add_overflow() to prevent u16 DACL size overflow") added check_add_overflow() guards that break out of the ACE-building loops in set_posix_acl_entries_dacl() when the accumulated DACL size would wrap past 65535.
However, each iteration allocates a struct smb_sid via kmalloc_obj() at the top of the loop and relies on the kfree(sid) call at the end of the loop body (the 'pass_same_sid' label in the first loop, and the explicit kfree at the tail of the second loop) to release it. The newly introduced 'break' statements bypass those kfree() calls, leaking the sid buffer every time an overflow is detected.
A malicious or malformed file with enough POSIX ACL entries to trip the overflow check will leak one or more struct smb_sid allocations on every request that touches the file's DACL, providing a trivial kernel memory exhaustion vector.
Free sid before breaking out of the loops to plug the leak.
--- fs/smb/server/smbacl.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
fs/smb/server/smbacl.c +9 -3
@@ -643,8 +643,10 @@ static void set_posix_acl_entries_dacl(s ntace = (struct smb_ace *)((char *)pndace + *size); ace_sz =fill_ace_for_sid (ntace, sid,ACCESS_ALLOWED , flags, pace->e_perm,0777 ); -if (check_add_overflow (*size, ace_sz, size)) +if (check_add_overflow (*size, ace_sz, size)) { +kfree (sid);break ; + } (*num_aces)++;if (pace->e_tag ==ACL_USER ) ntace->access_req |=
@@ -655,8 +657,10 @@ static void set_posix_acl_entries_dacl(s ntace = (struct smb_ace *)((char *)pndace + *size); ace_sz =fill_ace_for_sid (ntace, sid,ACCESS_ALLOWED ,0x03 , pace->e_perm,0777 ); -if (check_add_overflow (*size, ace_sz, size)) +if (check_add_overflow (*size, ace_sz, size)) { +kfree (sid);break ; + } (*num_aces)++;if (pace->e_tag ==ACL_USER ) ntace->access_req |=
@@ -698,8 +702,10 @@ posix_default_acl: ntace = (struct smb_ace *)((char *)pndace + *size); ace_sz =fill_ace_for_sid (ntace, sid,ACCESS_ALLOWED ,0x0b , pace->e_perm,0777 ); -if (check_add_overflow (*size, ace_sz, size)) +if (check_add_overflow (*size, ace_sz, size)) { +kfree (sid);break ; + } (*num_aces)++;if (pace->e_tag ==ACL_USER ) ntace->access_req |=
Greg Kroah-Hartman
maintainerPATCH 30/377 ksmbd: validate SID in parent security descriptor during ACL inheritance
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Junyi Liu <[email protected]>
commit 69f030cf95488ae1186c72ac8c66fd279664ea7f upstream.
Introduce smb_validate_ntsd_sid() helper to safely validate Owner SID and Group SID inside the NT Security Descriptor (smb_ntsd) retrieved from the parent directory.
--- fs/smb/server/smbacl.c | 66 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 50 insertions(+), 16 deletions(-)
fs/smb/server/smbacl.c +50 -16
@@ -1096,6 +1096,40 @@ static int smb_append_inherited_ace(strureturn 0 ; } +static int smb_validate_ntsd_sid (struct smb_ntsd *pntsd,size_t pntsd_size, +unsigned int sid_offset,struct smb_sid **sid, +size_t *sid_size) +{ +size_t sid_end; + + *sid =NULL ; + *sid_size =0 ; + +if (!sid_offset) +return 0 ; + +if (sid_offset <sizeof (struct smb_ntsd ) || +check_add_overflow (sid_offset, (size_t )CIFS_SID_BASE_SIZE , + &sid_end) || + sid_end > pntsd_size) +return -EINVAL ; + + *sid = (struct smb_sid *)((char *)pntsd + sid_offset); +if ((*sid)->num_subauth >SID_MAX_SUB_AUTHORITIES ) +return -EINVAL ; + +if (check_add_overflow ((size_t )CIFS_SID_BASE_SIZE , +sizeof (__le32) * (size_t )(*sid)->num_subauth, + &sid_end)) +return -EINVAL ; + +if (sid_offset > pntsd_size || sid_end > pntsd_size - sid_offset) +return -EINVAL ; + + *sid_size = sid_end; +return 0 ; +} +int smb_inherit_dacl (struct ksmbd_conn *conn,const struct path *path,unsigned int uid,unsigned int gid)
@@ -1108,28 +1142,28 @@ int smb_inherit_dacl(struct ksmbd_conn *struct dentry *parent = path->dentry->d_parent;struct mnt_idmap *idmap =mnt_idmap (path->mnt);int inherited_flags =0 , flags =0 , i, nt_size =0 , pdacl_size; -int rc =0 , pntsd_type, pntsd_size, acl_len, aces_size; +int rc =0 , pntsd_type, ppntsd_size, acl_len, aces_size;unsigned int dacloffset;size_t dacl_struct_end;u16 num_aces, ace_cnt =0 ;char *aces_base;bool is_dir =S_ISDIR (d_inode (path->dentry)->i_mode); - pntsd_size =ksmbd_vfs_get_sd_xattr (conn, idmap, + ppntsd_size =ksmbd_vfs_get_sd_xattr (conn, idmap, parent, &parent_pntsd); -if (pntsd_size <=0 ) +if (ppntsd_size <=0 )return -ENOENT ; dacloffset =le32_to_cpu (parent_pntsd->dacloffset);if (!dacloffset ||check_add_overflow (dacloffset,sizeof (struct smb_acl ), &dacl_struct_end) || - dacl_struct_end > (size_t )pntsd_size) { + dacl_struct_end > (size_t )ppntsd_size) { rc = -EINVAL ; goto free_parent_pntsd; } parent_pdacl = (struct smb_acl *)((char *)parent_pntsd + dacloffset); - acl_len = pntsd_size - dacloffset; + acl_len = ppntsd_size - dacloffset; num_aces =le16_to_cpu (parent_pdacl->num_aces); pntsd_type =le16_to_cpu (parent_pntsd->type); pdacl_size =le16_to_cpu (parent_pdacl->size);
@@ -1243,19 +1277,19 @@ pass:struct smb_ntsd *pntsd;struct smb_acl *pdacl;struct smb_sid *powner_sid =NULL , *pgroup_sid =NULL ; -int powner_sid_size =0 , pgroup_sid_size =0 , pntsd_size; +size_t powner_sid_size =0 , pgroup_sid_size =0 , pntsd_size;size_t pntsd_alloc_size; -if (parent_pntsd->osidoffset) { - powner_sid = (struct smb_sid *)((char *)parent_pntsd + -le32_to_cpu (parent_pntsd->osidoffset)); - powner_sid_size =1 +1 +6 + (powner_sid->num_subauth *4 ); - } -if (parent_pntsd->gsidoffset) { - pgroup_sid = (struct smb_sid *)((char *)parent_pntsd + -le32_to_cpu (parent_pntsd->gsidoffset)); - pgroup_sid_size =1 +1 +6 + (pgroup_sid->num_subauth *4 ); - } + rc =smb_validate_ntsd_sid (parent_pntsd, ppntsd_size, +le32_to_cpu (parent_pntsd->osidoffset), + &powner_sid, &powner_sid_size); +if (rc) + goto free_aces_base; + rc =smb_validate_ntsd_sid (parent_pntsd, ppntsd_size, +le32_to_cpu (parent_pntsd->gsidoffset), + &pgroup_sid, &pgroup_sid_size); +if (rc) + goto free_aces_base; if (check_add_overflow(sizeof(struct smb_ntsd), (size_t)powner_sid_size,
Greg Kroah-Hartman
maintainerPATCH 31/377 regulator: tps65219: fix irq_data.rdev not being assigned
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Sverdlin <[email protected]>
commit f9b2d3b703d13df50c630997dfdc25648e96db0d upstream.
Commit 64a6b577490c ("regulator: tps65219: Remove debugging helper function") removed the tps65219_get_rdev_by_name() helper along with the irq_data.rdev assignment that depended on it. This left irq_data.rdev uninitialized for all IRQs, causing undefined behavior when regulator_notifier_call_chain() is called from the IRQ handler:
Internal error: Oops: 0000000096000004 pc : regulator_notifier_call_chain lr : tps65219_regulator_irq_handler Call trace: regulator_notifier_call_chain tps65219_regulator_irq_handler handle_nested_irq regmap_irq_thread irq_thread_fn irq_thread kthread ret_from_fork
Instead of restoring a dedicated lookup array, restructure the probe function to combine regulator registration with IRQ registration in the same loop. This way the rdev returned by devm_regulator_register() is naturally available for assigning to irq_data.rdev without any auxiliary data structure.
Non-regulator IRQs (SENSOR, TIMEOUT) that don't correspond to any registered regulator are registered with rdev=NULL, and the IRQ handler is protected with a NULL check to avoid crashing.
--- drivers/regulator/tps65219-regulator.c | 135 +++++++++++++++++++++++---------- 1 file changed, 95 insertions(+), 40 deletions(-)
drivers/regulator/tps65219-regulator.c +95 -40
@@ -346,8 +346,9 @@ static irqreturn_t tps65219_regulator_irreturn IRQ_HANDLED ; } -regulator_notifier_call_chain (irq_data->rdev, - irq_data->type->event,NULL ); +if (irq_data->rdev) +regulator_notifier_call_chain (irq_data->rdev, + irq_data->type->event,NULL );dev_err (irq_data->dev,"Error IRQ trap %s for %s\n" , irq_data->type->event_name, irq_data->type->regulator_name);
@@ -398,14 +399,65 @@ static struct tps65219_chip_data chip_in }, }; -static int tps65219_regulator_probe (struct platform_device *pdev) +static bool tps65219_is_regulator_name (const struct tps65219_chip_data *pmic, +const char *name) +{ +int i; + +for (i =0 ; i < pmic->common_rdesc_size; i++) +if (!strcmp (pmic->common_rdesc[i].name, name)) +return true; +for (i =0 ; i < pmic->rdesc_size; i++) +if (!strcmp (pmic->rdesc[i].name, name)) +return true; +return false; +} + +static int tps65219_register_irqs (struct platform_device *pdev, +struct tps65219 *tps, +struct regulator_dev *rdev, +struct tps65219_regulator_irq_type *irq_types, +int nirqs, +const char *regulator_name) {struct tps65219_regulator_irq_data *irq_data; +int i, irq, error; + +for (i =0 ; i < nirqs; i++) { +if (strcmp (irq_types[i].regulator_name, regulator_name)) +continue ; + + irq =platform_get_irq_byname (pdev, irq_types[i].irq_name); +if (irq <0 ) +return -EINVAL ; + + irq_data =devm_kmalloc (tps->dev,sizeof (*irq_data),GFP_KERNEL ); +if (!irq_data) +return -ENOMEM ; + + irq_data->dev = tps->dev; + irq_data->type = &irq_types[i]; + irq_data->rdev = rdev; + + error =devm_request_threaded_irq (tps->dev, irq,NULL , + tps65219_regulator_irq_handler, +IRQF_ONESHOT , + irq_types[i].irq_name, + irq_data); +if (error) +return dev_err_probe (tps->dev, error, +"Failed to request %s IRQ %d\n" , + irq_types[i].irq_name, irq); + } +return 0 ; +} + +static int tps65219_regulator_probe (struct platform_device *pdev) +{struct tps65219_regulator_irq_type *irq_type;struct tps65219_chip_data *pmic;struct regulator_dev *rdev;int error; -int irq;int i;struct tps65219 *tps =dev_get_drvdata (pdev->dev.parent);
@@ -425,6 +477,19 @@ static int tps65219_regulator_probe(strureturn dev_err_probe (tps->dev,PTR_ERR (rdev),"Failed to register %s regulator\n" , pmic->common_rdesc[i].name); + + error =tps65219_register_irqs (pdev, tps, rdev, + pmic->common_irq_types, + pmic->common_irq_size, + pmic->common_rdesc[i].name); +if (error) +return error; + error =tps65219_register_irqs (pdev, tps, rdev, + pmic->irq_types, + pmic->dev_irq_size, + pmic->common_rdesc[i].name); +if (error) +return error; }for (i =0 ; i < pmic->rdesc_size; i++) {
@@ -434,52 +499,42 @@ static int tps65219_regulator_probe(strureturn dev_err_probe (tps->dev,PTR_ERR (rdev),"Failed to register %s regulator\n" , pmic->rdesc[i].name); + + error =tps65219_register_irqs (pdev, tps, rdev, + pmic->common_irq_types, + pmic->common_irq_size, + pmic->rdesc[i].name); +if (error) +return error; + error =tps65219_register_irqs (pdev, tps, rdev, + pmic->irq_types, + pmic->dev_irq_size, + pmic->rdesc[i].name); +if (error) +return error; } +/* Register non-regulator IRQs (TIMEOUT, SENSOR) with rdev=NULL */ for (i =0 ; i < pmic->common_irq_size; ++i) { irq_type = &pmic->common_irq_types[i]; - irq =platform_get_irq_byname (pdev, irq_type->irq_name); -if (irq <0 ) -return -EINVAL ; - - irq_data =devm_kmalloc (tps->dev,sizeof (*irq_data),GFP_KERNEL ); -if (!irq_data) -return -ENOMEM ; - - irq_data->dev = tps->dev; - irq_data->type = irq_type; - error =devm_request_threaded_irq (tps->dev, irq,NULL , - tps65219_regulator_irq_handler, -IRQF_ONESHOT , - irq_type->irq_name, - irq_data); +if (tps65219_is_regulator_name (pmic, irq_type->regulator_name)) +continue ; + error =tps65219_register_irqs (pdev, tps,NULL , + irq_type,1 , + irq_type->regulator_name);if (error) -return dev_err_probe (tps->dev, error, -"Failed to request %s IRQ %d\n" , - irq_type->irq_name, irq); +return error; }for (i =0 ; i < pmic->dev_irq_size; ++i) { irq_type = &pmic->irq_types[i]; - irq =platform_get_irq_byname (pdev, irq_type->irq_name); -if (irq <0 ) -return -EINVAL ; - - irq_data =devm_kmalloc (tps->dev,sizeof (*irq_data),GFP_KERNEL ); -if (!irq_data) -return -ENOMEM ; - - irq_data->dev = tps->dev; - irq_data->type = irq_type; - error =devm_request_threaded_irq (tps->dev, irq,NULL , - tps65219_regulator_irq_handler, -IRQF_ONESHOT , - irq_type->irq_name, - irq_data); +if (tps65219_is_regulator_name (pmic, irq_type->regulator_name)) +continue ; + error =tps65219_register_irqs (pdev, tps,NULL , + irq_type,1 , + irq_type->regulator_name);if (error) -return dev_err_probe (tps->dev, error, -"Failed to request %s IRQ %d\n" , - irq_type->irq_name, irq); +return error; }return 0 ;
Greg Kroah-Hartman
maintainerPATCH 32/377 smb: client: require net admin for CIFS SWN netlink
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Bommarito <[email protected]>
commit d1ebfce2c1d161186a82e77590bf7da2ea1bce91 upstream.
CIFS_GENL_CMD_SWN_NOTIFY is the userspace witness-notify command. The intended sender is the cifs.witness helper, but the generic-netlink operation currently has no capability flag, so any local process can send RESOURCE_CHANGE or CLIENT_MOVE notifications to the in-kernel witness handler.
The same family exposes CIFS_GENL_MCGRP_SWN without multicast-group capability flags. Register messages sent to that group include the witness registration id and, for NTLM-authenticated mounts, the username, domain, and password attributes copied from the CIFS session. An unprivileged local process should not be able to join that group and receive those messages.
Require CAP_NET_ADMIN for incoming SWN_NOTIFY commands with GENL_ADMIN_PERM, and require CAP_NET_ADMIN over the network namespace for joining the SWN multicast group with GENL_MCAST_CAP_NET_ADMIN. The cifs.witness service runs with the privileges needed for both operations.
--- fs/smb/client/netlink.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/smb/client/netlink.c +5 -1
@@ -33,13 +33,17 @@ static const struct nla_policy cifs_genlstatic const struct genl_ops cifs_genl_ops[] = { { .cmd =CIFS_GENL_CMD_SWN_NOTIFY , + .flags =GENL_ADMIN_PERM , .validate =GENL_DONT_VALIDATE_STRICT |GENL_DONT_VALIDATE_DUMP , .doit = cifs_swn_notify, }, };static const struct genl_multicast_group cifs_genl_mcgrps[] = { - [CIFS_GENL_MCGRP_SWN ] = { .name =CIFS_GENL_MCGRP_SWN_NAME }, + [CIFS_GENL_MCGRP_SWN ] = { + .name =CIFS_GENL_MCGRP_SWN_NAME , + .flags =GENL_MCAST_CAP_NET_ADMIN , + }, };struct genl_family cifs_genl_family = {
Greg Kroah-Hartman
maintainerPATCH 33/377 smb: client: protect tc_count increment in smb2_find_smb_sess_tcon_unlocked()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Henrique Carvalho <[email protected]>
commit 4d8690dace005a38e6dbde9ecce2da3ad85c7c41 upstream.
Commit 96c4af418586 ("cifs: Fix locking usage for tcon fields") refactored cifs code to change cifs_tcp_ses_lock for tc_lock around tc_count changes.
There was missing lock around tc_count increment inside smb2_find_smb_sess_tcon_unlocked().
--- fs/smb/client/smb2transport.c | 2 ++ 1 file changed, 2 insertions(+)
fs/smb/client/smb2transport.c +2 -0
@@ -176,7 +176,9 @@ smb2_find_smb_sess_tcon_unlocked(structlist_for_each_entry (tcon, &ses->tcon_list, tcon_list) {if (tcon->tid != tid)continue ; +spin_lock (&tcon->tc_lock); ++tcon->tc_count; +spin_unlock (&tcon->tc_lock);trace_smb3_tcon_ref (tcon->debug_id, tcon->tc_count, netfs_trace_tcon_ref_get_find_sess_tcon);return tcon;
Greg Kroah-Hartman
maintainerPATCH 34/377 smb: client: use data_len for SMB2 READ encrypted folioq copy
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeremy Erazo <[email protected]>
commit d4d76c9ee1997cc8c977a63f6c43551c253c1066 upstream.
In handle_read_data() the encrypted/folioq branch (buf_len <= data_offset, reached via receive_encrypted_read for transform PDUs > CIFSMaxBufSize + MAX_HEADER_SIZE) copies the READ payload using buffer_len rather than data_len:
rdata->result = cifs_copy_folioq_to_iter(buffer, buffer_len, cur_off, &rdata->subreq.io_iter); ... rdata->got_bytes = buffer_len;
buffer_len comes from the SMB3 transform header OriginalMessageSize field (OriginalMessageSize - read_rsp_size); it represents the size of the decrypted message after the SMB2 header. data_len comes from the SMB2 READ response DataLength field; it represents the actual READ payload size and may be smaller than buffer_len when the decrypted message contains padding or other trailing bytes after the READ payload. The existing check data_len > buffer_len - pad_len only enforces an upper bound, so a server that emits OriginalMessageSize larger than read_rsp_size + pad_len + data_len passes the check and the kernel copies buffer_len bytes per response, ignoring the server-asserted DataLength.
Two observable failures with a crafted server (DataLength=4, buffer_len=20000):
- the kernel returns 20000 bytes per sub-request to userspace and sets got_bytes = buffer_len, even though the response claimed only 4 bytes of payload;
- on a partial netfs sub-request whose iterator is sized to data_len, the over-large copy_folio_to_iter() short-reads, cifs_copy_folioq_to_iter() returns -EIO via the n != len path, and the entire netfs read collapses to -EIO even though the leading sub-requests succeeded.
Use data_len for the copy length and for got_bytes so the kernel honours the server-asserted READ payload size. For well-formed servers (where buffer_len == pad_len + data_len) the change is behaviour-equivalent.
--- fs/smb/client/smb2ops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/smb/client/smb2ops.c +2 -2
@@ -4842,7 +4842,7 @@ handle_read_data(struct TCP_Server_Info }/* Copy the data to the output I/O iterator. */ - rdata->result =cifs_copy_folioq_to_iter (buffer, buffer_len, + rdata->result =cifs_copy_folioq_to_iter (buffer, data_len, cur_off, &rdata->subreq.io_iter);if (rdata->result !=0 ) {if (is_offloaded)
@@ -4851,7 +4851,7 @@ handle_read_data(struct TCP_Server_Infodequeue_mid (mid, rdata->result);return 0 ; } - rdata->got_bytes = buffer_len; + rdata->got_bytes = data_len; }else if (buf_len >= data_offset + data_len) {/* read response payload is in buf */
Greg Kroah-Hartman
maintainerPATCH 35/377 smb/server: promote S_DEL_ON_CLS to S_DEL_PENDING when close
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: ChenXiaoSong <[email protected]>
commit 4ec9c8e023c79f613fe4d5ad8cc737112efb2e44 upstream.
Reproducer:
1. server: systemctl start ksmbd
2. client: mount -t cifs //${server_ip}/export /mnt
3. client: C program: openat(AT_FDCWD, "/mnt", O_RDWR | O_TMPFILE, 0600)
Do not treat FILE_DELETE_ON_CLOSE_LE as delete pending while files remain open.
This patch fixes xfstests generic/004.
--- fs/smb/server/vfs_cache.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
fs/smb/server/vfs_cache.c +12 -4
@@ -118,7 +118,7 @@ int ksmbd_query_inode_status(struct dentreturn ret;down_read (&ci->m_lock); -if (ci->m_flags & (S_DEL_PENDING |S_DEL_ON_CLS )) +if (ci->m_flags &S_DEL_PENDING ) ret =KSMBD_INODE_STATUS_PENDING_DELETE ;else ret =KSMBD_INODE_STATUS_OK ;
@@ -134,7 +134,7 @@ bool ksmbd_inode_pending_delete(struct kint ret;down_read (&ci->m_lock); - ret = (ci->m_flags & (S_DEL_PENDING |S_DEL_ON_CLS )); + ret = (ci->m_flags &S_DEL_PENDING );up_read (&ci->m_lock);return ret;
@@ -302,12 +302,20 @@ static void __ksmbd_inode_close(struct k } } +down_write (&ci->m_lock); +/* Promote S_DEL_ON_CLS to S_DEL_PENDING when close */ +if (ci->m_flags &S_DEL_ON_CLS ) { + ci->m_flags &= ~S_DEL_ON_CLS ; + ci->m_flags |=S_DEL_PENDING ; + } +up_write (&ci->m_lock); +if (atomic_dec_and_test (&ci->m_count)) {bool do_unlink = false;down_write (&ci->m_lock); -if (ci->m_flags & (S_DEL_ON_CLS |S_DEL_PENDING )) { - ci->m_flags &= ~(S_DEL_ON_CLS |S_DEL_PENDING ); +if (ci->m_flags &S_DEL_PENDING ) { + ci->m_flags &= ~S_DEL_PENDING ; do_unlink = true; }up_write (&ci->m_lock);
Greg Kroah-Hartman
maintainerPATCH 36/377 hwmon: (pmbus/adm1266) widen blackbox-info buffer to I2C_SMBUS_BLOCK_MAX
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Abdurrahman Hussain <[email protected]>
commit eee213daa1e1b402eb631bcd1b8c5aa340a6b081 upstream.
adm1266_nvmem_read_blackbox() declares a 5-byte stack buffer and passes it to i2c_smbus_read_block_data() to retrieve the 4-byte BLACKBOX_INFO response. i2c_smbus_read_block_data() does not honour caller buffer sizes -- it memcpy()s data.block[0] bytes from the SMBus transaction (where data.block[0] is the length byte returned by the slave device, up to I2C_SMBUS_BLOCK_MAX = 32):
memcpy(values, &data.block[1], data.block[0]);
If the device returns any block length above 5, the call overflows the caller's 5-byte stack buffer before the post-call
if (ret != 4) return -EIO;
check has a chance to reject the response.
Widen the local buffer to I2C_SMBUS_BLOCK_MAX so the helper has room for any well-formed SMBus block response, matching the convention used by the other i2c_smbus_read_block_data() callers in this driver.
--- drivers/hwmon/pmbus/adm1266.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/pmbus/adm1266.c +1 -1
@@ -349,7 +349,7 @@ static int adm1266_nvmem_read_blackbox(s {int record_count;char index; -u8 buf[5 ]; +u8 buf[I2C_SMBUS_BLOCK_MAX ];int ret; ret =i2c_smbus_read_block_data (data->client,ADM1266_BLACKBOX_INFO , buf);
Greg Kroah-Hartman
maintainerPATCH 37/377 ALSA: ua101: Reject too-short USB descriptors
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cássio Gabriel <[email protected]>
commit b59d5c51bb328a60749b4dd5fe7e649bfb4089b4 upstream.
find_format_descriptor() walks the class-specific interface extras by advancing with bLength. It rejects descriptors that extend past the remaining buffer, but it does not reject descriptor lengths smaller than a USB descriptor header.
Reject too-short descriptors before using bLength to advance the local scan. This keeps the UA-101 parser robust against malformed descriptor data and matches the usual USB descriptor walking rules.
--- sound/usb/misc/ua101.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
sound/usb/misc/ua101.c +3 -2
@@ -894,8 +894,9 @@ find_format_descriptor(struct usb_interfstruct uac_format_type_i_discrete_descriptor *desc; desc = (struct uac_format_type_i_discrete_descriptor *)extra; -if (desc->bLength > extralen) { -dev_err (&interface->dev,"descriptor overflow\n" ); +if (desc->bLength <sizeof (struct usb_descriptor_header ) || + desc->bLength > extralen) { +dev_err (&interface->dev,"invalid descriptor length\n" );return NULL ; } if (desc->bLength == UAC_FORMAT_TYPE_I_DISCRETE_DESC_SIZE(1) &&
Greg Kroah-Hartman
maintainerPATCH 38/377 ALSA: pcm: Dont setup bogus iov_iter for silencing
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit e4d3386b74fba8e01280484b67ee481ece00201e upstream.
At transition to the iov_iter for PCM data transfer, we blindly applied the iov_iter setup also for silencing (i.e. data = NULL), and it leads to a calculation of bogus iov_iter. Fortunately this didn't cause troubles on most of architectures but it goes wrong on RISC-V now, causing a NULL dereference.
Handle the NULL data case to treat the silencing in interleaved_copy() for addressing the bug above. noninterleaved_copy() has already the NULL data handling, so it doesn't need changes.
--- sound/core/pcm_lib.c | 3 +++ 1 file changed, 3 insertions(+)
sound/core/pcm_lib.c +3 -0
@@ -2138,6 +2138,9 @@ static int interleaved_copy(struct snd_p off =frames_to_bytes (runtime, off); frames =frames_to_bytes (runtime, frames); +if (!data) +return fill_silence (substream,0 , hwoff,NULL , frames); +return do_transfer (substream,0 , hwoff, data + off, frames, transfer, in_kernel); }
Greg Kroah-Hartman
maintainerPATCH 39/377 ALSA: asihpi: Fix potential OOB array access at reading cache
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 7b7d6572145c1dab2dd9bfb550b188e5f0ff3c3f upstream.
find_control() to retrieve a cached info accesses the array with the given index blindly, which may lead to an OOB array access. Add a sanity check for avoiding it.
--- sound/pci/asihpi/hpicmn.c | 6 ++++++ 1 file changed, 6 insertions(+)
sound/pci/asihpi/hpicmn.c +6 -0
@@ -276,6 +276,12 @@ static short find_control(u16 control_inreturn 0 ; } +if (control_index >= p_cache->control_count) { +HPI_DEBUG_LOG (VERBOSE ,"control_index out of bounce %d\n" , + control_index); +return 0 ; + } + *pI = p_cache->p_info[control_index];if (!*pI) { HPI_DEBUG_LOG(VERBOSE, "Uncached Control %d\n",
Greg Kroah-Hartman
maintainerPATCH 40/377 ALSA: scarlett2: Allow flash writes ending at segment boundary
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cássio Gabriel <[email protected]>
commit a69b677e47a80319ce148d61cc29a2b57006e78d upstream.
scarlett2_hwdep_write() rejects writes when offset + count is greater than or equal to the selected flash segment size. That incorrectly treats a write ending exactly at the end of the segment as out of space, although the last byte written is still within the segment.
Split invalid argument checks from the segment-space check, keep zero-length writes as no-ops, and compare count against the remaining segment size. This permits exact-end writes and avoids relying on offset + count before deciding whether the request is in bounds.
--- sound/usb/mixer_scarlett2.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
sound/usb/mixer_scarlett2.c +5 -2
@@ -9186,12 +9186,15 @@ static long scarlett2_hwdep_write(struct flash_size = private->flash_segment_blocks[segment_id] *SCARLETT2_FLASH_BLOCK_SIZE ; -if (count <0 || *offset <0 || *offset + count >= flash_size) -return -ENOSPC ; +if (count <0 || *offset <0 ) +return -EINVAL ;if (!count)return 0 ; +if (*offset >= flash_size || count > flash_size - *offset) +return -ENOSPC ; +/* Limit the *req size to SCARLETT2_FLASH_RW_MAX */ if (count > max_data_size) count = max_data_size;
Greg Kroah-Hartman
maintainerPATCH 41/377 efi: Allocate runtime workqueue before ACPI init
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ard Biesheuvel <[email protected]>
commit 13c6da02e767152c9ac4330962247a5e47011035 upstream.
Since commit
5894cf571e14 ("acpi/prmt: Use EFI runtime sandbox to invoke PRM handlers")
ACPI PRM calls are delegated to a workqueue which runs in a kernel thread, making it easier to detect and mitigate faulting memory accesses performed by the firmware.
Rafael reports that such PRM accesses may occur before efisubsys_init() executes, which is where the workqueue is allocated, leading to NULL pointer dereferences. Since acpi_init() [which triggers the early PRM accesses] executes as a subsys_initcall() as well, and has its own dependencies that may be sensitive to initcall ordering, deferring acpi_init() is not an option.
So instead, split off the workqueue allocation into its own postcore initcall, as this is the only missing piece to allow EFI runtime calls to be made. This ensures that EFI runtime call (including PRM calls) are accessible to all code running at subsys_initcall() level.
--- drivers/firmware/efi/efi.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)
drivers/firmware/efi/efi.c +16 -12
@@ -401,21 +401,11 @@ static void __init efi_debugfs_init(voidstatic inline void efi_debugfs_init (void ) {}#endif -/* -* We register the efi subsystem with the firmware subsystem and the -* efivars subsystem with the efi subsystem, if the system was booted with -* EFI. -*/ -static int __init efisubsys_init (void ) +static int __init efipostcore_init (void ) { -int error; -if (!efi_enabled (EFI_RUNTIME_SERVICES )) efi.runtime_supported_mask =0 ; -if (!efi_enabled (EFI_BOOT )) -return 0 ; -if (efi.runtime_supported_mask) {/* * Since we process only one efi_runtime_service() at a time, an
@@ -427,9 +417,23 @@ static int __init efisubsys_init(void)pr_err ("Creating efi_rts_wq failed, EFI runtime services disabled.\n" );clear_bit (EFI_RUNTIME_SERVICES , &efi.flags); efi.runtime_supported_mask =0 ; -return 0 ; } } +return 0 ; +} +postcore_initcall (efipostcore_init); + +/* +* We register the efi subsystem with the firmware subsystem and the +* efivars subsystem with the efi subsystem, if the system was booted with +* EFI. +*/ +static int __init efisubsys_init (void ) +{ +int error; + +if (!efi_enabled (EFI_BOOT )) +return 0 ;if (efi_rt_services_supported (EFI_RT_SUPPORTED_TIME_SERVICES ))platform_device_register_simple ("rtc-efi" ,0 ,NULL ,0 );
Greg Kroah-Hartman
maintainerPATCH 42/377 spi: amd: Set correct bus number in ACPI probe path
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krishnamoorthi M <[email protected]>
commit 422bd00b71ab42163aa3b8f8370276fe4c1581e7 upstream.
On platforms where the HID2 SPI controller (AMDI0063) is enumerated via ACPI instead of PCI, amd_spi_probe() unconditionally sets bus_num to 0, while the PCI probe path assigns bus_num 2 for HID2 controller.
Align the ACPI probe path to use the same bus number so that userspace and SPI client drivers see a consistent bus assignment regardless of the enumeration method.
--- drivers/spi/spi-amd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-amd.c +1 -1
@@ -868,7 +868,7 @@ static int amd_spi_probe(struct platform_device *pdev)dev_dbg (dev,"io_remap_address: %p\n" , amd_spi->io_remap_addr); amd_spi->version = (uintptr_t )device_get_match_data (dev); - host->bus_num =0 ; + host->bus_num = (amd_spi->version ==AMD_HID2_SPI ) ?2 :0 ;return amd_spi_probe_common (dev, host); }
Signature · 1 line
2.54.0
Greg Kroah-Hartman
maintainerPATCH 43/377 io_uring/waitid: clear waitid info before copying it to userspace
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heechan Kang <[email protected]>
commit 93d93f5f8da791e98159795c6ef683f45bd95d13 upstream.
IORING_OP_WAITID stores its result fields in struct io_waitid::info and later copies them to userspace siginfo. The prep path initializes the request arguments, but it does not initialize info itself.
If the wait operation completes without reporting a child event, the common wait code can return without writing wo_info. In that case io_waitid_finish() still copies iw->info to userspace, exposing stale bytes from the reused io_kiocb command storage.
Clear the result storage during prep so the io_uring path matches the regular waitid syscall, which uses a zero-initialized struct waitid_info.
--- io_uring/waitid.c | 1 + 1 file changed, 1 insertion(+)
io_uring/waitid.c +1 -0
@@ -258,6 +258,7 @@ int io_waitid_prep(struct io_kiocb *req, iw->upid =READ_ONCE (sqe->fd); iw->options =READ_ONCE (sqe->file_index); iw->infop =u64_to_user_ptr (READ_ONCE (sqe->addr2)); +memset (&iw->info,0 ,sizeof (iw->info));return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 44/377 drivers/base/memory: fix memory block reference leak in poison accounting
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Muchun Song <[email protected]>
commit 03a2cc1756a0570f887d624cd6c535ea0cbd4951 upstream.
memblk_nr_poison_inc() and memblk_nr_poison_sub() look up a memory block via find_memory_block_by_id(), which acquires a reference to the memory block device.
Both helpers use the returned memory block without dropping that reference, leaking the device reference on each successful lookup. Drop the reference after updating nr_hwpoison.
--- drivers/base/memory.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/base/memory.c +6 -2
@@ -1251,8 +1251,10 @@ void memblk_nr_poison_inc(unsigned longconst unsigned long block_id =pfn_to_block_id (pfn);struct memory_block *mem =find_memory_block_by_id (block_id); -if (mem) +if (mem) {atomic_long_inc (&mem->nr_hwpoison); +put_device (&mem->dev); + } }void memblk_nr_poison_sub (unsigned long pfn,long i)
@@ -1260,8 +1262,10 @@ void memblk_nr_poison_sub(unsigned longconst unsigned long block_id =pfn_to_block_id (pfn);struct memory_block *mem =find_memory_block_by_id (block_id); -if (mem) +if (mem) {atomic_long_sub (i, &mem->nr_hwpoison); +put_device (&mem->dev); + } }static unsigned long memblk_nr_poison (struct memory_block *mem)
Greg Kroah-Hartman
maintainerPATCH 45/377 ipv6: ioam: refresh hdr pointer before ioam6_event()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Justin Iurman <[email protected]>
commit e46e6bc97fb1f339730ff1ba74267fbf48e7a422 upstream.
Reported by Sashiko:
In ipv6_hop_ioam(), the hdr pointer is initialized to point into the skb's linear data buffer. Later, the code calls skb_ensure_writable(), which might reallocate the buffer:
if (skb_ensure_writable(skb, optoff + 2 + hdr->opt_len)) goto drop; /* Trace pointer may have changed */ trace = (struct ioam6_trace_hdr *)(skb_network_header(skb) + optoff + sizeof(*hdr)); ioam6_fill_trace_data(skb, ns, trace, true); ioam6_event(IOAM6_EVENT_TRACE, dev_net(skb->dev), GFP_ATOMIC, (void *)trace, hdr->opt_len - 2);
If the skb is cloned or lacks sufficient linear headroom, skb_ensure_writable() will invoke pskb_expand_head(), which reallocates the skb's data buffer and frees the old one, invalidating pointers to it. While the code recalculates the trace pointer immediately after the call to skb_ensure_writable(), it fails to recalculate the hdr pointer.
This patch fixes the above by recalculating the hdr pointer before passing hdr->opt_len to ioam6_event(), so that we avoid any UaF.
--- net/ipv6/exthdrs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/ipv6/exthdrs.c +3 -3
@@ -955,9 +955,9 @@ static bool ipv6_hop_ioam(struct sk_buffif (skb_ensure_writable (skb, optoff +2 + hdr->opt_len)) goto drop; -/* Trace pointer may have changed */ - trace = (struct ioam6_trace_hdr *)(skb_network_header (skb) - + optoff +sizeof (*hdr)); +/* Trace and hdr pointers may have changed */ + hdr = (struct ioam6_hdr *)(skb_network_header (skb) + optoff); + trace = (struct ioam6_trace_hdr *)((u8 *)hdr +sizeof (*hdr));ioam6_fill_trace_data (skb, ns, trace, true);
Greg Kroah-Hartman
maintainerPATCH 46/377 mm/memory: fix spurious warning when unmapping device-private/exclusive pages
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alistair Popple <[email protected]>
commit be3f38d05cc5a7c3f13e51994c5dd043ab604d28 upstream.
Device private and exclusive entries are only supported for anonymous folios. This condition is tested in __migrate_device_pages() and make_device_exclusive() using folio_test_anon(). However the unmap path tests this assumption using vma_is_anonymous().
This is wrong because whilst anonymous VMAs can only contain folios where folio_test_anon() is true the opposite relation does not hold. A folio for which folio_test_anon() is true does not imply vma_is_anonymous() is true. Such a condition can occur if for example a folio is part of a private filebacked mapping.
In this case vma_is_anonymous() is false as the mapping is filebacked, but folio_test_anon() may be true, thus permitting devices to migrate the folio to device private memory. This can lead to the following spurious warnings during process teardown:
[ 772.737706] ------------[ cut here ]------------ [ 772.739201] WARNING: mm/memory.c:1754 at unmap_page_range.cold+0x26/0x18a, CPU#17: hmm-tests/2041 [ 772.742050] Modules linked in: test_hmm nvidia_uvm(O) nvidia(O) [ 772.743959] CPU: 17 UID: 0 PID: 2041 Comm: hmm-tests Tainted: G W O 7.0.0+ #387 PREEMPT(full) [ 772.747104] Tainted: [W]=WARN, [O]=OOT_MODULE [ 772.748509] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.17.0-0-gb52ca86e094d-prebuilt.qemu.org 04/01/2014 [ 772.752117] RIP: 0010:unmap_page_range.cold+0x26/0x18a [ 772.753780] Code: 7e fe ff ff 48 89 4c 24 78 4c 89 44 24 38 e8 f2 ff b1 00 48 8b 4c 24 78 4c 8b 44 24 38 48 8b 44 24 18 48 83 78 48 00 74 04 90 <0f> 0b 90 48 89 ca b8 ff ff 37 00 48 c1 ea 03 48 c1 e0 2a 80 3c 02 [ 772.759602] RSP: 0018:ffff888112607550 EFLAGS: 00010286 [ 772.761310] RAX: ffff88811bbf4dc0 RBX: dffffc0000000000 RCX: ffffea03e9bfffd8 [ 772.763583] RDX: 1ffff1102377e9c1 RSI: 0000000000000008 RDI: ffff88811bbf4e08 [ 772.765914] RBP: 0000000000000006 R08: ffff8881059f7448 R09: ffffed10224c0e68 [ 772.768184] R10: ffff888112607347 R11: 0000000000000001 R12: 0000000000000001 [ 772.770461] R13: ffffea03e9bfffc0 R14: ffff888112607908 R15: ffffea03e9bfffc0 [ 772.772782] FS: 00007f327caa2780(0000) GS:ffff888427b7d000(0000) knlGS:0000000000000000 [ 772.775328] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 772.777187] CR2: 00007f327ca89000 CR3: 00000001994d5000 CR4: 00000000000006f0 [ 772.779135] Call Trace: [ 772.779792] <TASK> [ 772.780317] ? dmirror_interval_invalidate+0x1a3/0x290 [test_hmm] [ 772.781873] ? vm_normal_page_pud+0x2b0/0x2b0 [ 772.782992] ? __rwlock_init+0x150/0x150 [ 772.784006] ? lock_release+0x216/0x2b0 [ 772.785008] ? __mmu_notifier_invalidate_range_start+0x505/0x6e0 [ 772.786522] ? lock_release+0x216/0x2b0 [ 772.787498] ? unmap_single_vma+0xb6/0x210 [ 772.788573] unmap_vmas+0x27d/0x520 [ 772.789506] ? unmap_single_vma+0x210/0x210 [ 772.790607] ? mas_update_gap.part.0+0x620/0x620 [ 772.791834] unmap_region+0x19e/0x350 [ 772.792769] ? remove_vma+0x130/0x130 [ 772.793684] ? mas_alloc_nodes+0x1f2/0x300 [ 772.794730] vms_complete_munmap_vmas+0x8c1/0xe20 [ 772.795926] ? unmap_region+0x350/0x350 [ 772.796917] do_vmi_align_munmap+0x36a/0x4e0 [ 772.798018] ? lock_release+0x216/0x2b0 [ 772.799024] ? vma_shrink+0x620/0x620 [ 772.799983] do_vmi_munmap+0x150/0x2c0 [ 772.800939] __vm_munmap+0x161/0x2c0 [ 772.801872] ? expand_downwards+0xd60/0xd60 [ 772.802948] ? clockevents_program_event+0x1ef/0x540 [ 772.804217] ? lock_release+0x216/0x2b0 [ 772.805158] __x64_sys_munmap+0x59/0x80 [ 772.805776] do_syscall_64+0xfc/0x670 [ 772.806336] ? irqentry_exit+0xda/0x580 [ 772.806976] entry_SYSCALL_64_after_hwframe+0x4b/0x53 [ 772.807772] RIP: 0033:0x7f327cbb2717 [ 772.808323] Code: 73 01 c3 48 8b 0d f9 76 0d 00 f7 d8 64 89 01 48 83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 b8 0b 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d c9 76 0d 00 f7 d8 64 89 01 48 [ 772.811337] RSP: 002b:00007ffde7f57d38 EFLAGS: 00000202 ORIG_RAX: 000000000000000b [ 772.812564] RAX: ffffffffffffffda RBX: 00007f327cc9c000 RCX: 00007f327cbb2717 [ 772.813733] RDX: 0000000000000000 RSI: 0000000000400000 RDI: 00007f327c289000 [ 772.814867] RBP: 0000000000421360 R08: 000000000000001a R09: 0000000000000000 [ 772.815991] R10: 0000000000000003 R11: 0000000000000202 R12: 00007ffde7f57d74 [ 772.817121] R13: 00007f327c689010 R14: 0000000000100000 R15: 00007f327c289000 [ 772.818272] </TASK> [ 772.818614] irq event stamp: 0 [ 772.819159] hardirqs last enabled at (0): [<0000000000000000>] 0x0 [ 772.820174] hardirqs last disabled at (0): [<ffffffff82a57ab3>] copy_process+0x19f3/0x6440 [ 772.821511] softirqs last enabled at (0): [<ffffffff82a57b00>] copy_process+0x1a40/0x6440 [ 772.822869] softirqs last disabled at (0): [<0000000000000000>] 0x0 [ 772.823871] ---[ end trace 0000000000000000 ]---
Fix this by using the same check for folio_test_anon() in zap_nonpresent_ptes(). Also add a hmm-test case for this.
--- mm/memory.c | 2 - tools/testing/selftests/mm/hmm-tests.c | 50 +++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-)
mm/memory.c +1 -1
@@ -1735,7 +1735,7 @@ static inline int zap_nonpresent_ptes(st* consider uffd-wp bit when zap. For more information, * see zap_install_uffd_wp_if_needed(). */ -WARN_ON_ONCE (!vma_is_anonymous (vma)); +WARN_ON_ONCE (!folio_test_anon (folio)); rss[mm_counter (folio)]--;folio_remove_rmap_pte (folio, page, vma);folio_put (folio);
tools/testing/selftests/mm/hmm-tests.c +50 -0
56 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 47/377 mm: fix __vm_normal_page() to handle missing support for pmd_special()/pud_special()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Hildenbrand (Arm) <[email protected]>
commit c0c6ccd9828c3a1950623b546fa57292a77b5c73 upstream.
On x86 32-bit with THP enabled, zap_huge_pmd() is seen to generate a "WARNING: mm/memory.c:735 at __vm_normal_page+0x6a/0x7d", from the VM_WARN_ON_ONCE(is_zero_pfn(pfn) || is_huge_zero_pfn(pfn)); followed by "BUG: Bad rss-counter state"s, then later "BUG: Bad page state"s when reclaim gets to call shrink_huge_zero_folio_scan().
It's as if the _PAGE_SPECIAL bit never got set in the huge_zero pmd: and indeed, whereas pte_special() and pte_mkspecial() are subject to a dedicated CONFIG_ARCH_HAS_PTE_SPECIAL, pmd_special() and pmd_mkspecial() are subject to CONFIG_ARCH_SUPPORTS_PMD_PFNMAP, which is never enabled on any 32-bit architecture.
While the problem was exposed through commit d80a9cb1a64a ("mm/huge_memory: add and use normal_or_softleaf_folio_pmd()"), it was an oversight in commit af38538801c6 ("mm/memory: factor out common code from vm_normal_page_*()") and would result in other problems:
* huge zero folio accounted in smaps, pagemap (PAGE_IS_FILE) and numamaps as file-backed THP
* folio_walk_start() returning the folio even without FW_ZEROPAGE set. Callers seem to tolerate that, though.
... and triggering the VM_WARN_ON_ONE(), although never reported so far.
To fix it, teach vm_normal_page_pmd()/vm_normal_page_pud() to consider whether pmd_special/pud_special is actually implemented.
--- mm/memory.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)
mm/memory.c +19 -3
@@ -612,6 +612,21 @@ static void print_bad_page_map(struct vmdump_stack ();add_taint (TAINT_BAD_PAGE ,LOCKDEP_NOW_UNRELIABLE ); } + +static inline bool pgtable_level_has_pxx_special (enum pgtable_level level) +{ +switch (level) { +case PGTABLE_LEVEL_PTE : +return IS_ENABLED (CONFIG_ARCH_HAS_PTE_SPECIAL ); +case PGTABLE_LEVEL_PMD : +return IS_ENABLED (CONFIG_ARCH_SUPPORTS_PMD_PFNMAP ); +case PGTABLE_LEVEL_PUD : +return IS_ENABLED (CONFIG_ARCH_SUPPORTS_PUD_PFNMAP ); +default : +return false; + } +} +#define print_bad_pte (vma, addr, pte, page) \ print_bad_page_map(vma, addr, pte_val(pte), page, PGTABLE_LEVEL_PTE)
@@ -684,7 +699,7 @@ static inline struct page *__vm_normal_p unsigned long addr, unsigned long pfn, bool special, unsigned long long entry, enum pgtable_level level) { - if (IS_ENABLED(CONFIG_ARCH_HAS_PTE_SPECIAL)) { + if (pgtable_level_has_pxx_special(level)) { if (unlikely(special)) { #ifdef CONFIG_FIND_NORMAL_PAGE if (vma->vm_ops && vma->vm_ops->find_normal_page)
@@ -699,8 +714,9 @@ static inline struct page *__vm_normal_preturn NULL ; }/* -* With CONFIG_ARCH_HAS_PTE_SPECIAL, any special page table -* mappings (incl. shared zero folios) are marked accordingly. +* With working pte_special()/pmd_special()..., any special page +* table mappings (incl. shared zero folios) are marked +* accordingly. */ }else {if (unlikely (vma->vm_flags & (VM_PFNMAP |VM_MIXEDMAP ))) {
Greg Kroah-Hartman
maintainerPATCH 48/377 mm/memory_hotplug: fix memory block reference leak on remove
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Muchun Song <[email protected]>
commit 93866f55f7e292fe3d47d36c9efe5ee10213a06b upstream.
Patch series "mm: Fix memory block leaks and locking", v2.
This series fixes two memory block device reference leaks and one locking issue around the per-memory_block hwpoison counter.
This patch (of 2):
remove_memory_blocks_and_altmaps() looks up each memory block with find_memory_block(), which acquires a reference to the memory block device.
That reference is never dropped on this path, resulting in a leaked device reference when removing memory blocks and their altmaps. Drop the reference after retrieving mem->altmap and clearing mem->altmap, before removing the memory block device.
--- mm/memory_hotplug.c | 2 ++ 1 file changed, 2 insertions(+)
mm/memory_hotplug.c +2 -0
@@ -1439,6 +1439,8 @@ static void remove_memory_blocks_and_alt altmap = mem->altmap; mem->altmap =NULL ; +/* drop the ref. we got via find_memory_block() */ +put_device (&mem->dev);remove_memory_block_devices (cur_start, memblock_size);
Greg Kroah-Hartman
maintainerPATCH 49/377 mm/page_alloc: fix initialization of tags of the huge zero folio with init_on_free
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Hildenbrand (Arm) <[email protected]>
commit 6a288a4ddb4a994490505ab5f41c445f8e6b6467 upstream.
__GFP_ZEROTAGS semantics are currently a bit weird, but effectively this flag is only ever set alongside __GFP_ZERO and __GFP_SKIP_KASAN.
If we run with init_on_free, we will zero out pages during __free_pages_prepare(), to skip zeroing on the allocation path.
However, when allocating with __GFP_ZEROTAG set, post_alloc_hook() will consequently not only skip clearing page content, but also skip clearing tag memory.
Not clearing tags through __GFP_ZEROTAGS is irrelevant for most pages that will get mapped to user space through set_pte_at() later: set_pte_at() and friends will detect that the tags have not been initialized yet (PG_mte_tagged not set), and initialize them.
However, for the huge zero folio, which will be mapped through a PMD marked as special, this initialization will not be performed, ending up exposing whatever tags were still set for the pages.
The docs (Documentation/arch/arm64/memory-tagging-extension.rst) state that allocation tags are set to 0 when a page is first mapped to user space. That no longer holds with the huge zero folio when init_on_free is enabled.
Fix it by decoupling __GFP_ZEROTAGS from __GFP_ZERO, passing to tag_clear_highpages() whether we want to also clear page content.
Invert the meaning of the tag_clear_highpages() return value to have clearer semantics.
Reproduced with the huge zero folio by modifying the check_buffer_fill arm64/mte selftest to use a 2 MiB area, after making sure that pages have a non-0 tag set when freeing (note that, during boot, we will not actually initialize tags, but only set KASAN_TAG_KERNEL in the page flags).
$ ./check_buffer_fill 1..20 ... not ok 17 Check initial tags with private mapping, sync error mode and mmap memory not ok 18 Check initial tags with private mapping, sync error mode and mmap/mprotect memory ...
This code needs more cleanups; we'll tackle that next, like decoupling __GFP_ZEROTAGS from __GFP_SKIP_KASAN.
--- arch/arm64/include/asm/page.h | 2 +- arch/arm64/mm/fault.c | 11 +++++++---- include/linux/gfp_types.h | 10 +++++----- include/linux/highmem.h | 7 ++++--- mm/page_alloc.c | 8 ++++---- 5 files changed, 21 insertions(+), 17 deletions(-)
arch/arm64/include/asm/page.h +1 -1
@@ -33,7 +33,7 @@ struct folio *vma_alloc_zeroed_movable_f unsigned long vaddr);#define vma_alloc_zeroed_movable_folio vma_alloc_zeroed_movable_folio -bool tag_clear_highpages (struct page *to,int numpages); +bool tag_clear_highpages (struct page *to,int numpages,bool clear_pages);#define __HAVE_ARCH_TAG_CLEAR_HIGHPAGES#define clear_user_page (page, vaddr, pg) clear_page(page)
arch/arm64/mm/fault.c +7 -4
@@ -967,7 +967,7 @@ struct folio *vma_alloc_zeroed_movable_freturn vma_alloc_folio (flags,0 , vma, vaddr); } -bool tag_clear_highpages (struct page *page,int numpages) +bool tag_clear_highpages (struct page *page,int numpages,bool clear_pages) {/* * Check if MTE is supported and fall back to clear_highpage().
@@ -975,13 +975,16 @@ bool tag_clear_highpages(struct page *pa* post_alloc_hook() will invoke tag_clear_highpages(). */ if (!system_supports_mte ()) -return false; +return clear_pages;/* Newly allocated pages, shouldn't have been tagged yet */ for (int i =0 ; i < numpages; i++, page++) {WARN_ON_ONCE (!try_page_mte_tagging (page)); -mte_zero_clear_page_tags (page_address (page)); +if (clear_pages) +mte_zero_clear_page_tags (page_address (page)); +else +mte_clear_page_tags (page_address (page));set_page_mte_tagged (page); } -return true; +return false; }
include/linux/gfp_types.h +5 -5
@@ -277,11 +277,11 @@ enum {* * %__GFP_ZERO returns a zeroed page on success. * -* %__GFP_ZEROTAGS zeroes memory tags at allocation time if the memory itself -* is being zeroed (either via __GFP_ZERO or via init_on_alloc, provided that -* __GFP_SKIP_ZERO is not set). This flag is intended for optimization: setting -* memory tags at the same time as zeroing memory has minimal additional -* performance impact. +* %__GFP_ZEROTAGS zeroes memory tags at allocation time. Setting memory tags at +* the same time as zeroing memory (e.g., with __GFP_ZERO) has minimal +* additional performance impact. However, __GFP_ZEROTAGS also zeroes the tags +* even if memory is not getting zeroed at allocation time (e.g., +* with init_on_free). * * %__GFP_SKIP_KASAN makes KASAN skip unpoisoning on page allocation. * Used for userspace and vmalloc pages; the latter are unpoisoned by
include/linux/highmem.h +4 -3
@@ -251,10 +251,11 @@ static inline void clear_highpage_kasan_#ifndef __HAVE_ARCH_TAG_CLEAR_HIGHPAGES -/* Return false to let people know we did not initialize the pages */ -static inline bool tag_clear_highpages (struct page *page,int numpages) +/* Returns true if the caller has to initialize the pages */ +static inline bool tag_clear_highpages (struct page *page,int numpages, +bool clear_pages) { -return false; +return clear_pages; }#endif
mm/page_alloc.c +4 -4
@@ -1847,9 +1847,9 @@ static inline bool should_skip_init(gfp_inline void post_alloc_hook (struct page *page,unsigned int order,gfp_t gfp_flags) { +const bool zero_tags = gfp_flags & __GFP_ZEROTAGS;bool init = !want_init_on_free () &&want_init_on_alloc (gfp_flags) && !should_skip_init (gfp_flags); -bool zero_tags = init && (gfp_flags & __GFP_ZEROTAGS);int i;set_page_private (page,0 );
@@ -1871,11 +1871,11 @@ inline void post_alloc_hook(struct page*/ /* -* If memory tags should be zeroed -* (which happens only when memory should be initialized as well). +* Clearing tags can efficiently clear the memory for us as well, if +* required. */ if (zero_tags) - init = !tag_clear_highpages (page,1 << order); + init =tag_clear_highpages (page,1 << order,/* clear_pages= */ init);if (!should_skip_kasan_unpoison (gfp_flags) &&kasan_unpoison_pages (page, order, init)) {
Greg Kroah-Hartman
maintainerPATCH 50/377 selftests/mm: run_vmtests.sh: fix destructive tests invocation
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luiz Capitulino <[email protected]>
commit 3432cbb291aabf85f8af4b9d1ec37179168ff999 upstream.
Destructive tests should be invoked with -d command-line option, but this won't work today since 'd' is missing in getopts command-line. This commit fixes it.
--- tools/testing/selftests/mm/run_vmtests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/mm/run_vmtests.sh +1 -1
@@ -97,7 +97,7 @@ RUN_ALL=false RUN_DESTRUCTIVE=false TAP_PREFIX="# " -while getopts "aht:n" OPT; do +while getopts "aht:nd" OPT; do case ${OPT} in "a") RUN_ALL=true ;; "h") usage ;;
Greg Kroah-Hartman
maintainerPATCH 51/377 net: wwan: iosm: fix potential memory leaks in ipc_imem_init()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Abdun Nihaal <[email protected]>
commit c5d93b2c40355e999715262a824965aac025a427 upstream.
The memory allocated in ipc_protocol_init() is not freed on the error paths that follow in ipc_imem_init(). Fix that by calling the corresponding release function ipc_protocol_deinit() in the error path.
--- drivers/net/wwan/iosm/iosm_ipc_imem.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wwan/iosm/iosm_ipc_imem.c +2 -0
@@ -1426,6 +1426,8 @@ imem_config_fail: protocol_init_fail:cancel_work_sync (&ipc_imem->run_state_worker);ipc_task_deinit (ipc_imem->ipc_task); +if (ipc_imem->ipc_protocol) +ipc_protocol_deinit (ipc_imem->ipc_protocol); ipc_task_init_fail:kfree (ipc_imem->ipc_task); ipc_task_fail:
Greg Kroah-Hartman
maintainerPATCH 52/377 Bluetooth: fix UAF in l2cap_sock_cleanup_listen() vs l2cap_conn_del()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Safa Karakuş <[email protected]>
commit ab1513597c6cf17cd1ad2a21e3b045421b48e022 upstream.
bt_accept_dequeue() unlinks a not-yet-accepted child from the parent accept queue and release_sock()s it before returning, so the returned sk has no caller reference and is unlocked.
l2cap_sock_cleanup_listen() walks these children on listening-socket close. A concurrent HCI disconnect drives hci_rx_work -> l2cap_conn_del() which runs l2cap_chan_del() + l2cap_sock_kill() and frees the child sk and its l2cap_chan; cleanup_listen() then uses both:
BUG: KASAN: slab-use-after-free in l2cap_sock_kill
l2cap_sock_kill / l2cap_sock_cleanup_listen / __x64_sys_close
Freed by: l2cap_conn_del -> l2cap_sock_close_cb -> l2cap_sock_killThis is distinct from the two fixes already in this area: commit e83f5e24da741 ("Bluetooth: serialize accept_q access") serialises the accept_q list/poll and takes temporary refs inside bt_accept_dequeue(), and CVE-2025-39860 serialises the userspace close()/accept() race by calling cleanup_listen() under lock_sock() in l2cap_sock_release(). Neither covers l2cap_conn_del() running from hci_rx_work, so this UAF still reproduces on current bluetooth/master.
Take the reference at the source: bt_accept_dequeue() does sock_hold() while sk is still locked, before release_sock(); callers sock_put(). cleanup_listen() pins the chan with l2cap_chan_hold_unless_zero() under a brief child sk lock (serialising vs l2cap_sock_teardown_cb()), drops it before l2cap_chan_lock(), and skips a duplicate l2cap_sock_kill() on SOCK_DEAD. conn->lock is not taken here: cleanup_listen() runs under the parent sk lock and that would invertconn->lock -> chan->lock -> sk_lock (lockdep).
KASAN/SMP: an unprivileged listen/close vs HCI-disconnect race produced 12 use-after-free reports per run before this change; 0, and no lockdep report, over 1600+ raced iterations after it on bluetooth/master.
--- net/bluetooth/af_bluetooth.c | 10 ++++++++ net/bluetooth/iso.c | 9 ++++++- net/bluetooth/l2cap_sock.c | 51 +++++++++++++++++++++++++++++++++++++------ net/bluetooth/rfcomm/sock.c | 9 ++++++- net/bluetooth/sco.c | 9 ++++++- 5 files changed, 78 insertions(+), 10 deletions(-)
net/bluetooth/af_bluetooth.c +10 -0
@@ -309,6 +309,16 @@ restart:if (newsock)sock_graft (sk, newsock); +/* Hand the caller a reference taken while sk is +* still locked. bt_accept_unlink() just dropped +* the accept-queue reference; without this hold a +* concurrent teardown (e.g. l2cap_conn_del() -> +* l2cap_sock_kill()) could free sk between +* release_sock() and the caller using it. Every +* caller drops this with sock_put() when done. +*/ +sock_hold (sk); +release_sock (sk);return sk; }
net/bluetooth/iso.c +8 -1
@@ -741,6 +741,8 @@ static void iso_sock_cleanup_listen(struwhile ((sk =bt_accept_dequeue (parent,NULL ))) {iso_sock_close (sk);iso_sock_kill (sk); +/* Drop the reference handed back by bt_accept_dequeue(). */ +sock_put (sk); }/* If listening socket has a hcon, properly disconnect it */
@@ -1282,8 +1284,13 @@ static int iso_sock_accept(struct socket } ch =bt_accept_dequeue (sk, newsock); -if (ch) +if (ch) { +/* Drop the bridging ref from bt_accept_dequeue(); +* the grafted socket keeps ch alive from here. +*/ +sock_put (ch);break ; + }if (!timeo) { err = -EAGAIN ;
net/bluetooth/l2cap_sock.c +44 -7
74 lines not on this page · raw message
net/bluetooth/rfcomm/sock.c +8 -1
@@ -180,6 +180,8 @@ static void rfcomm_sock_cleanup_listen(swhile ((sk =bt_accept_dequeue (parent,NULL ))) {rfcomm_sock_close (sk);rfcomm_sock_kill (sk); +/* Drop the reference handed back by bt_accept_dequeue(). */ +sock_put (sk); } parent->sk_state =BT_CLOSED ;
@@ -496,8 +498,13 @@ static int rfcomm_sock_accept(struct soc } nsk =bt_accept_dequeue (sk, newsock); -if (nsk) +if (nsk) { +/* Drop the bridging ref from bt_accept_dequeue(); +* the grafted socket keeps nsk alive from here. +*/ +sock_put (nsk);break ; + }if (!timeo) { err = -EAGAIN ;
net/bluetooth/sco.c +8 -1
@@ -498,6 +498,8 @@ static void sco_sock_cleanup_listen(struwhile ((sk =bt_accept_dequeue (parent,NULL ))) {sco_sock_close (sk);sco_sock_kill (sk); +/* Drop the reference handed back by bt_accept_dequeue(). */ +sock_put (sk); } parent->sk_state =BT_CLOSED ;
@@ -759,8 +761,13 @@ static int sco_sock_accept(struct socket } ch =bt_accept_dequeue (sk, newsock); -if (ch) +if (ch) { +/* Drop the bridging ref from bt_accept_dequeue(); +* the grafted socket keeps ch alive from here. +*/ +sock_put (ch);break ; + }if (!timeo) { err = -EAGAIN ;
Greg Kroah-Hartman
maintainerPATCH 53/377 Bluetooth: ISO: drop ISO_END frames received without prior ISO_START
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Carlier <[email protected]>
commit 84c24fb151fc1179355296d7ff29129ac7c42129 upstream.
ISO data PDUs carry a packet-boundary flag indicating START, CONT, END or SINGLE. The ISO_CONT branch of iso_recv() guards against a missing ISO_START by checking conn->rx_len before touching conn->rx_skb, but ISO_END does not.
If a peer sends an ISO_END as the first packet on a fresh ISO connection, conn->rx_skb is still NULL and conn->rx_len is zero, so skb_put(conn->rx_skb, ...) dereferences NULL and oopses. For BIS, where receivers sync to a broadcaster without pairing, any broadcaster on the air can trigger this.
Mirror the ISO_CONT check at the top of ISO_END so a stray end fragment is logged and dropped instead of crashing the host.
--- net/bluetooth/iso.c | 5 +++++ 1 file changed, 5 insertions(+)
net/bluetooth/iso.c +5 -0
@@ -2461,6 +2461,11 @@ int iso_recv(struct hci_dev *hdev, u16 hbreak ;case ISO_END : +if (!conn->rx_len) { +BT_ERR ("Unexpected end frame (len %d)" , skb->len); + goto drop; + } +skb_copy_from_linear_data (skb,skb_put (conn->rx_skb, skb->len), skb->len); conn->rx_len -= skb->len;
Greg Kroah-Hartman
maintainerPATCH 54/377 Bluetooth: bnep: Fix UAF read of dev->name
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jann Horn <[email protected]>
commit 59e932ded949fa6f0340bf7c6d7818f962fa4fd2 upstream.
bnep_add_connection() needs to keep holding the bnep_session_sem while reading dev->name (just like bnep_get_connlist() does); otherwise the bnep_session() thread can concurrently free the net_device, which can for example be triggered by a concurrent bnep_del_connection().
(This UAF is fairly uninteresting from a security perspective; calling bnep_add_connection() requires passing a capable(CAP_NET_ADMIN) check. It also requires completely tearing down a netdev during a fairly tight race window.)
--- net/bluetooth/bnep/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/bluetooth/bnep/core.c +1 -1
@@ -638,8 +638,8 @@ int bnep_add_connection(struct bnep_conn goto failed; } -up_write (&bnep_session_sem);strcpy (req->device, dev->name); +up_write (&bnep_session_sem);return 0 ; failed:
Greg Kroah-Hartman
maintainerPATCH 55/377 Bluetooth: hci_uart: fix UAFs and race conditions in close and init paths
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mingyu Wang <[email protected]>
commit c1bb9336ae6b54a5f6a353c4bd4ed9a4307e429b upstream.
Vulnerabilities leading to Use-After-Free (UAF) and Null Pointer Dereference (NPD) conditions were observed in the lifecycle management of hci_uart.
The primary issue arises because the workqueues (init_ready and write_work) are only flushed/cancelled if the HCI_UART_PROTO_READY flag is set during TTY close. If a hangup occurs before setup completes, hci_uart_tty_close() skips the teardown of these workqueues and proceeds to free the hu struct. When the scheduled work executes later, it blindly dereferences the freed hu struct.
Furthermore, several data races and UAFs were identified in the teardown sequence:
1. Calling hci_uart_flush() from hci_uart_close() without effectively disabling write_work causes a race condition where both can concurrently double-free hu->tx_skb. This happens because protocol timers can concurrently invoke hci_uart_tx_wakeup() and requeue write_work.
2. Calling hci_free_dev(hdev) before hu->proto->close(hu) causes a UAF when vendor specific protocol close callbacks dereference hu->hdev.
3. In the initialization error paths, failing to take the proto_lock write lock before clearing PROTO_READY leads to races with active readers. Additionally, hci_uart_tty_receive() accesses hu->hdev outside the read lock, leading to UAFs if the initialization error path frees hdev concurrently.
Fix these synchronization and lifecycle issues by:
1. Re-ordering hci_uart_tty_close() to clear HCI_UART_PROTO_READY first, followed immediately by a cancel_work_sync(&hu->write_work). Clearing the flag locks out concurrent protocol timers from successfully invoking hci_uart_tx_wakeup(), effectively rendering the cancellation permanent and preventing the tx_skb double-free.
2. Note: Clearing PROTO_READY early causes hci_uart_close() to skip hu->proto->flush(). This is perfectly safe in the tty_close path because hu->proto->close() executes shortly after, which intrinsically purges all protocol SKB queues and tears down the state.
3. Relocating hu->proto->close(hu) strictly prior to hci_free_dev(hdev) across all close and error paths to prevent vendor-level UAFs.
4. Moving the hdev->stat.byte_rx increment in hci_uart_tty_receive() inside the proto_lock read-side critical section to safely synchronize with device unregistration.
5. Adding cancel_work_sync(&hu->write_work) to hci_uart_close() to safely flush the workqueue before hci_uart_flush() is invoked via the HCI core.
6. Utilizing cancel_work_sync() instead of disable_work_sync() across all paths to prevent permanently breaking user-space retry capabilities.
--- drivers/bluetooth/hci_ldisc.c | 48 +++++++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 8 deletions(-)
drivers/bluetooth/hci_ldisc.c +40 -8
@@ -194,7 +194,15 @@ void hci_uart_init_work(struct work_stru err =hci_register_dev (hu->hdev);if (err <0 ) {BT_ERR ("Can't register HCI device" ); + +percpu_down_write (&hu->proto_lock);clear_bit (HCI_UART_PROTO_READY , &hu->flags); +percpu_up_write (&hu->proto_lock); + +/* Safely cancel work after clearing flags */ +cancel_work_sync (&hu->write_work); + +/* Close protocol before freeing hdev */ hu->proto->close (hu); hdev = hu->hdev; hu->hdev =NULL ;
@@ -263,8 +271,12 @@ static int hci_uart_open(struct hci_dev/* Close device */ static int hci_uart_close (struct hci_dev *hdev) { +struct hci_uart *hu =hci_get_drvdata (hdev); +BT_DBG ("hdev %p" , hdev); +cancel_work_sync (&hu->write_work); +hci_uart_flush (hdev); hdev->flush =NULL ;return 0 ;
@@ -531,6 +543,7 @@ static void hci_uart_tty_close(struct tt {struct hci_uart *hu = tty->disc_data;struct hci_dev *hdev; +bool proto_ready;BT_DBG ("tty %p" , tty);
@@ -540,24 +553,38 @@ static void hci_uart_tty_close(struct ttif (!hu)return ; - hdev = hu->hdev; -if (hdev) -hci_uart_close (hdev); +/* Wait for init_ready to finish to prevent registration races */ +cancel_work_sync (&hu->init_ready); -if (test_bit (HCI_UART_PROTO_READY , &hu->flags)) { + proto_ready =test_bit (HCI_UART_PROTO_READY , &hu->flags); +if (proto_ready) {percpu_down_write (&hu->proto_lock);clear_bit (HCI_UART_PROTO_READY , &hu->flags);percpu_up_write (&hu->proto_lock); + } -cancel_work_sync (&hu->init_ready); -cancel_work_sync (&hu->write_work); +/* +* Unconditionally cancel write_work AFTER clearing PROTO_READY. +* This ensures that concurrent protocol timers cannot requeue +* write_work via hci_uart_tx_wakeup(), permanently preventing +* double-free races and UAFs. +*/ +cancel_work_sync (&hu->write_work); + + hdev = hu->hdev; +if (hdev) +hci_uart_close (hdev);/* proto->flush is safely skipped */ +if (proto_ready) {if (hdev) {if (test_bit (HCI_UART_REGISTERED , &hu->flags))hci_unregister_dev (hdev); -hci_free_dev (hdev); } +/* Close protocol before freeing hdev (intrinsically purges queues) */ hu->proto->close (hu); + +if (hdev) +hci_free_dev (hdev); }clear_bit (HCI_UART_PROTO_SET , &hu->flags);
@@ -625,11 +652,12 @@ static void hci_uart_tty_receive(struct* tty caller */ hu->proto->recv (hu, data, count); -percpu_up_read (&hu->proto_lock);if (hu->hdev) hu->hdev->stat.byte_rx += count; +percpu_up_read (&hu->proto_lock); +tty_unthrottle (tty); }
@@ -695,6 +723,10 @@ static int hci_uart_register_dev(structpercpu_down_write (&hu->proto_lock);clear_bit (HCI_UART_PROTO_INIT , &hu->flags);percpu_up_write (&hu->proto_lock); +/* Cancel work after clearing flags */ +cancel_work_sync (&hu->write_work); + +/* Close protocol before freeing hdev */ hu->proto->close (hu); hu->hdev =NULL ;hci_free_dev (hdev);
Greg Kroah-Hartman
maintainerPATCH 56/377 Bluetooth: L2CAP: ecred_reconfigure: send packed pdu, not stack pointer
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Bommarito <[email protected]>
commit 3374ef8cf99368a40f7efd51a2a375a4c5dc6f0d upstream.
Commit 1c08108f3014 ("Bluetooth: L2CAP: Avoid -Wflex-array-member-not-at-end warnings") converted the on-stack request PDU in l2cap_ecred_reconfigure() from an explicit packed struct to DEFINE_RAW_FLEX(), but did not adjust the size and source-pointer arguments to l2cap_send_cmd():
- struct {
- struct l2cap_ecred_reconf_req req;
- __le16 scid;
- } pdu;
+ DEFINE_RAW_FLEX(struct l2cap_ecred_reconf_req, pdu, scid, 1);
...
l2cap_send_cmd(conn, chan->ident, L2CAP_ECRED_RECONF_REQ,
sizeof(pdu), &pdu);After the conversion, DEFINE_RAW_FLEX() expands to declare an anonymous union pdu_u plus a local pointer "pdu" pointing at it. Therefore:
- sizeof(pdu) is now sizeof(struct l2cap_ecred_reconf_req *) = 8 on
64-bit (4 on 32-bit), not the 6 bytes of (mtu, mps, scid[1]).
- &pdu is the address of the local pointer's stack storage, not the address of the request payload.
l2cap_send_cmd() forwards (data, count) to l2cap_build_cmd(), which calls skb_put_data(skb, data, count). The L2CAP_ECRED_RECONFIGURE_REQ packet body therefore contains 8 bytes copied from the kernel stack starting at &pdu -- the 8 bytes overlap the pdu pointer's value, leaking a kernel stack address to the paired Bluetooth peer. The intended (mtu, mps, scid) fields are not transmitted at all, so the peer rejects the request as malformed and the L2CAP_ECRED_RECONFIGURE feature itself has been broken for the local-side initiator since the introducing commit landed.
The sibling site l2cap_ecred_conn_req() in the same commit was converted correctly (sizeof(*pdu) + len, pdu); only this site was missed.
Restore the original semantics: pass the full flex-struct size via struct_size(pdu, scid, 1) and the pdu pointer (the struct address) as the source.
Validated on a stock 7.0-based host kernel via the real call path:setsockopt(SOL_BLUETOOTH, BT_RCVMTU, ...) on a BT_CONNECTED L2CAP_MODE_EXT_FLOWCTL socket emits an L2CAP_ECRED_RECONFIGURE_REQ whose body is 8 bytes (the on-stack pdu local's value) rather than the expected 6. Three captures from fresh socket / fresh hciemu peer on the same host -- low bytes vary per call, high 0xffff confirms a kernel virtual address (KASLR-randomised stack slot, not a fixed string):
RECONF_REQ body (ident=0x02 len=8): 42 fb 54 af 0e ca ff ff RECONF_REQ body (ident=0x02 len=8): 52 3d 2e af 0e ca ff ff RECONF_REQ body (ident=0x02 len=8): b2 fc 5b af 0e ca ff ff
After this patch the body is 6 bytes carrying the expected little-endian (mtu, mps, scid).
--- net/bluetooth/l2cap_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/bluetooth/l2cap_core.c +1 -1
@@ -7275,7 +7275,7 @@ static void l2cap_ecred_reconfigure(stru chan->ident =l2cap_get_ident (conn);l2cap_send_cmd (conn, chan->ident,L2CAP_ECRED_RECONF_REQ , -sizeof (pdu), &pdu); +struct_size (pdu, scid,1 ), pdu); }int l2cap_chan_reconfigure (struct l2cap_chan *chan,__u16 mtu)
Greg Kroah-Hartman
maintainerPATCH 57/377 Bluetooth: MGMT: validate Add Extended Advertising Data length
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Bommarito <[email protected]>
commit d3f7d17960ed50df3a6709c5158caff989c8c905 upstream.
MGMT_OP_ADD_EXT_ADV_DATA is registered as a variable-length command, with MGMT_ADD_EXT_ADV_DATA_SIZE as the fixed header size. The handler then uses cp->adv_data_len and cp->scan_rsp_len to validate and copy cp->data, but it never checks that those bytes are part of the mgmt command payload.
A short command can therefore make add_ext_adv_data() pass an out-of-bounds pointer into tlv_data_is_valid(). If the bytes beyond the command buffer are addressable, they can also be copied into the advertising instance as scan response data, where the caller can read them back via MGMT_OP_GET_ADV_INSTANCE. The trigger requires CAP_NET_ADMIN in the initial user namespace; KASAN reports an 8-byte slab-out-of-bounds read.
Reject commands whose length does not match the fixed header plus both advertising data lengths before parsing cp->data.
--- net/bluetooth/mgmt.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/bluetooth/mgmt.c +6 -0
@@ -9094,9 +9094,15 @@ static int add_ext_adv_data(struct sockstruct adv_info *adv_instance;int err =0 ;struct mgmt_pending_cmd *cmd; +u16 expected_len;BT_DBG ("%s" , hdev->name); + expected_len =struct_size (cp, data, cp->adv_data_len + cp->scan_rsp_len); +if (expected_len != data_len) +return mgmt_cmd_status (sk, hdev->id,MGMT_OP_ADD_EXT_ADV_DATA , +MGMT_STATUS_INVALID_PARAMS ); +hci_dev_lock (hdev); adv_instance =hci_find_adv_instance (hdev, cp->instance);
Greg Kroah-Hartman
maintainerPATCH 58/377 Bluetooth: serialize accept_q access
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiexun Wang <[email protected]>
commit e83f5e24da741fa9405aeeff00b08c5ee7c37b88 upstream.
bt_sock_poll() walks the accept queue without synchronization, while child teardown can unlink the same socket and drop its last reference. The unsynchronized accept queue walk has existed since the initial Bluetooth import.
Protect accept_q with a dedicated lock for queue updates and polling. Also rework bt_accept_dequeue() to take temporary child references under the queue lock before dropping it and locking the child socket.
--- include/net/bluetooth/bluetooth.h | 1 net/bluetooth/af_bluetooth.c | 87 ++++++++++++++++++++++++++++---------- 2 files changed, 66 insertions(+), 22 deletions(-)
include/net/bluetooth/bluetooth.h +1 -0
@@ -389,6 +389,7 @@ void baswap(bdaddr_t *dst, const bdaddr_struct bt_sock {struct sock sk;struct list_head accept_q; +spinlock_t accept_q_lock;/* protects accept_q */ struct sock *parent;unsigned long flags;void (*skb_msg_name)(struct sk_buff *,void *,int *);
net/bluetooth/af_bluetooth.c +65 -22
163 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 59/377 phonet/pep: disable BH around forwarded sk_receive_skb()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zijing Yin <[email protected]>
commit dbc81608e3a653dea6cf403f20cae35468b8ab9c upstream.
The networking receive path is usually run from softirq context, but protocols that take the socket lock may have packets stored in the backlog and processed later from process context. In that case release_sock() -> __release_sock() drops the slock with spin_unlock_bh() and then calls sk->sk_backlog_rcv() with bottom halves enabled.
Typical sk_backlog_rcv handlers process the socket whose backlog is being drained, so the BH state at entry is irrelevant for the slocks they touch. pep_do_rcv() is different: when the inbound skb targets an existing PEP pipe, it forwards the skb to a different *child* socket via sk_receive_skb(). That helper takes the child slock with bh_lock_sock_nested(), which is just spin_lock_nested() and assumes BH is already off. The same child slock therefore ends up acquired with BH on (process path) and with BH off (softirq path):
process context softirq context
--------------- ---------------
release_sock(listener) __netif_receive_skb()
__release_sock() phonet_rcv()
spin_unlock_bh() __sk_receive_skb(listener)
[BH now ENABLED] [BH already disabled]
sk_backlog_rcv: sk_backlog_rcv: pep_do_rcv() pep_do_rcv()
sk_receive_skb(child) sk_receive_skb(child)
bh_lock_sock_nested(child) bh_lock_sock_nested(child)
=> SOFTIRQ-ON-W => IN-SOFTIRQ-W
Lockdep flags this as inconsistent lock state, and it can become a real self-deadlock if a softirq on the same CPU tries to receive to the same child socket while its slock is held in the BH-enabled path:
WARNING: inconsistent lock state
inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage.
(slock-AF_PHONET/1){+.?.}-{3:3}, at: __sk_receive_skb+0x1cf/0x900
__sk_receive_skb net/core/sock.c:563
sk_receive_skb include/net/sock.h:2022 [inline]
pep_do_rcv net/phonet/pep.c:675
sk_backlog_rcv include/net/sock.h:1190
__release_sock net/core/sock.c:3216
release_sock net/core/sock.c:3815
pep_sock_accept net/phonet/pep.c:879Wrap the forwarded sk_receive_skb() in local_bh_disable() / local_bh_enable() so the child slock is always acquired with BH off. local_bh_disable() nests safely on the softirq path.
Discovered via in-house syzkaller fuzzing; the same root cause also on the linux-6.1.y syzbot dashboard as extid 44f0626dd6284f02663c. Reproduced under KASAN + LOCKDEP + PROVE_LOCKING, reproducer:
https://pastebin.com/A3t8xzCR
--- net/phonet/pep.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
net/phonet/pep.c +17 -2
@@ -671,8 +671,23 @@ static int pep_do_rcv(struct sock *sk, s/* Look for an existing pipe handle */ sknode =pep_find_pipe (&pn->hlist, &dst, pipe_handle); -if (sknode) -return sk_receive_skb (sknode, skb,1 ); +if (sknode) { +int rc; + +/* pep_do_rcv() runs from two contexts: from softirq via +* phonet_rcv() -> __sk_receive_skb() with BH disabled, +* and from process context via +* release_sock() -> __release_sock(), which drops +* the listener slock with spin_unlock_bh() before draining +* the backlog. The child pipe slock is taken below via +* bh_lock_sock_nested(), which does not itself disable BH, so +* disable BH here to keep both acquire contexts consistent. +*/ +local_bh_disable (); + rc =sk_receive_skb (sknode, skb,1 ); +local_bh_enable (); +return rc; + }switch (hdr->message_id) {case PNS_PEP_CONNECT_REQ :
Greg Kroah-Hartman
maintainerPATCH 60/377 net: bcmgenet: keep RBUF EEE/PM disabled
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolai Buchwitz <[email protected]>
commit 9a1730245e416d11ad5c0f2c100061d61cc43f60 upstream.
Setting RBUF_EEE_EN | RBUF_PM_EN in RBUF_ENERGY_CTRL breaks the RX path on GENET hardware once MAC EEE becomes active. RX traffic stops flowing while the link stays up and the usual descriptor/RX error counters remain quiet. In that state the MAC still accepts frames (rbuf_ovflow_cnt keeps climbing) but RBUF no longer forwards them to DMA, so rx_packets is no longer incremented at the netdev level. On some boards the corruption ends up as a paging fault in skb_release_data via bcmgenet_rx_poll on an LPI exit.
Reproduced on Pi 4B (BCM2711 + BCM54213PE) and confirmed by Florian Fainelli on an internal Broadcom 4908-family board with the same crash signature. RBUF_PM_EN is not publicly documented.
This shows up more often now that phy_support_eee() enables EEE by default, but it also affects older kernels as soon as TX LPI is turned on via ethtool, so it is not specific to recent changes.
Always clear RBUF_EEE_EN | RBUF_PM_EN in bcmgenet_eee_enable_set so the bits stay off across resets. UMAC and TBUF setup is left alone so TX-side EEE keeps working.
--- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/net/ethernet/broadcom/genet/bcmgenet.c +4 -5
@@ -1369,13 +1369,12 @@ void bcmgenet_eee_enable_set(struct net_ reg &= ~(TBUF_EEE_EN |TBUF_PM_EN );bcmgenet_writel (reg, priv->base + off); -/* Do the same for thing for RBUF */ +/* RBUF EEE/PM can break the RX path on GENET. Keep it disabled. */ reg =bcmgenet_rbuf_readl (priv,RBUF_ENERGY_CTRL ); -if (enable) - reg |=RBUF_EEE_EN |RBUF_PM_EN ; -else +if (reg & (RBUF_EEE_EN |RBUF_PM_EN )) { reg &= ~(RBUF_EEE_EN |RBUF_PM_EN ); -bcmgenet_rbuf_writel (priv, reg,RBUF_ENERGY_CTRL ); +bcmgenet_rbuf_writel (priv, reg,RBUF_ENERGY_CTRL ); + }if (!enable && priv->clk_eee_enabled) {clk_disable_unprepare (priv->clk_eee);
Greg Kroah-Hartman
maintainerPATCH 61/377 net: phy: skip EEE advertisement write when autoneg is disabled
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nerijus Bendžiūnas <[email protected]>
commit 960e77ce14a83ef7f226e8e4b4d75765633ba48b upstream.
genphy_c45_an_config_eee_aneg() writes the EEE advertisement to the auto-negotiation device's MMD register space (MDIO_MMD_AN, register MDIO_AN_EEE_ADV). These registers are read by the link partner only during auto-negotiation, so writing them while autoneg is disabled cannot influence the link. On some PHYs (e.g. Broadcom BCM54213PE) the write nevertheless reaches the chip and disturbs the receive datapath.
Concretely, running
ethtool -s eth0 speed 100 duplex full autoneg off ethtool --set-eee eth0 eee off
leaves eth0 with TX working and RX completely silent on a Raspberry Pi 4 / CM4 board (bcmgenet + BCM54213PE in rgmii-rxid). Switching back to autoneg recovers the link.
Prior to commit f26a29a038ee ("net: phy: ensure that genphy_c45_an_config_eee_aneg() sees new value of phydev->eee_cfg.eee_enabled"), the disable path was effectively a no-op because the helper read
the stale eee_cfg.eee_enabled, so the underlying PHY behavior never
surfaced.
Bisected on rpi-6.12.y between commits 83943264 (good) and effcbc88 (bad) to f26a29a038ee.
--- drivers/net/phy/phy-c45.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/phy/phy-c45.c +8 -0
@@ -939,6 +939,14 @@ EXPORT_SYMBOL_GPL(genphy_c45_read_eee_ab*/ int genphy_c45_an_config_eee_aneg (struct phy_device *phydev) { +/* Writing MMD AN advertisements while autoneg is disabled has no +* effect on link-partner negotiation, but on some PHYs (e.g. the +* Broadcom BCM54213PE) the write itself disturbs the receive +* datapath. Skip it. +*/ +if (phydev->autoneg ==AUTONEG_DISABLE ) +return 0 ; +if (!phydev->eee_cfg.eee_enabled) {__ETHTOOL_DECLARE_LINK_MODE_MASK (adv) = {};
Greg Kroah-Hartman
maintainerPATCH 62/377 net/mlx5e: Fix use-after-free in mlx5e_tx_reporter_timeout_recover
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matt Fleming <[email protected]>
commit 7d260c5d2d89eb2c8c528d54b576b3aae3e20231 upstream.
mlx5e_tx_reporter_timeout_recover() accesses sq->netdev after mlx5e_safe_reopen_channels() has torn down and freed the channel (and its embedded SQs). Replace the three sq->netdev references with priv->netdev which is safe because priv outlives channel teardown.
The netdev_err() call already used priv->netdev for this reason; make the trylock/unlock and health_channel_eq_recover calls consistent.
This fixes the following KASAN splat:
BUG: KASAN: use-after-free in mlx5e_tx_reporter_timeout_recover+0x1dd/0x360 [mlx5_core] Read of size 8 at addr ffff889860ed0b28 by task kworker/u113:2/5277 Call Trace: mlx5e_tx_reporter_timeout_recover+0x1dd/0x360 [mlx5_core] devlink_health_reporter_recover+0xa2/0x150 devlink_health_report+0x254/0x7c0 mlx5e_reporter_tx_timeout+0x297/0x380 [mlx5_core] mlx5e_tx_timeout_work+0x109/0x170 [mlx5_core] process_one_work+0x677/0xf20 worker_thread+0x51f/0xd90 kthread+0x3a5/0x810 ret_from_fork+0x208/0x400 ret_from_fork_asm+0x1a/0x30
--- drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c +3 -3
@@ -159,13 +159,13 @@ static int mlx5e_tx_reporter_timeout_rec* channels are being closed for other reason and this work is not * relevant anymore. */ -while (!netdev_trylock (sq->netdev)) { +while (!netdev_trylock (priv->netdev)) {if (!test_bit (MLX5E_STATE_CHANNELS_ACTIVE , &priv->state))return 0 ;msleep (20 ); } - err =mlx5e_health_channel_eq_recover (sq->netdev, eq, sq->cq.ch_stats); + err =mlx5e_health_channel_eq_recover (priv->netdev, eq, sq->cq.ch_stats);if (!err) { to_ctx->status =0 ;/* this sq recovered */ goto out;
@@ -185,7 +185,7 @@ static int mlx5e_tx_reporter_timeout_rec"mlx5e_safe_reopen_channels failed recovering from a tx_timeout, err(%d).\n" , err); out: -netdev_unlock (sq->netdev); +netdev_unlock (priv->netdev);return err; }
Greg Kroah-Hartman
maintainerPATCH 63/377 net: ifb: report ethtool stats over num_tx_queues
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Bommarito <[email protected]>
commit 5db89c99566fc4728cc92e941d8e1975711e24b5 upstream.
ifb_dev_init() allocates dp->tx_private to dev->num_tx_queues entries via kzalloc_objs(*txp, dev->num_tx_queues). Both IFB per-queue RX and TX stats live in those entries: ifb_xmit() updates txp->rx_stats using the skb queue mapping, ifb_ri_tasklet() updates txp->tx_stats, and ifb_stats64() aggregates both over dev->num_tx_queues.
The ethtool stats callbacks instead size and walk the per-queue stats with dev->real_num_rx_queues and dev->real_num_tx_queues. With an asymmetric device where the RX queue count exceeds the TX queue count, for example:
ip link add name ifb10 numtxqueues 1 numrxqueues 8 type ifb ethtool -S ifb10
ifb_get_ethtool_stats() indexes past the tx_private allocation and copies adjacent slab data through ETHTOOL_GSTATS.
Use dev->num_tx_queues consistently for the stats strings, the stats count, and the stats data walks. This reports one RX stats group and one TX stats group for each backing ifb_q_private entry, which is the queue set IFB can actually populate.
Reproduced under UML+KASAN at v7.1-rc2:
BUG: KASAN: slab-out-of-bounds in ifb_fill_stats_data+0x3c/0xae Read of size 8 at addr 0000000062dbd228 by task ethtool/36 ifb_fill_stats_data+0x3c/0xae ifb_get_ethtool_stats+0xc0/0x129 __dev_ethtool+0x1ca5/0x363c dev_ethtool+0x123/0x1b3 dev_ioctl+0x56c/0x744 sock_do_ioctl+0x15f/0x1b2 sock_ioctl+0x4d5/0x50a sys_ioctl+0xd8b/0xde9
With the patch applied, the same UML+KASAN repro is silent and ethtool -S ifb10 reports only the stats backed by the single allocated tx_private entry.
--- drivers/net/ifb.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/net/ifb.c +5 -6
@@ -211,12 +211,12 @@ static void ifb_get_strings(struct net_dswitch (stringset) {case ETH_SS_STATS : -for (i =0 ; i < dev->real_num_rx_queues; i++) +for (i =0 ; i < dev->num_tx_queues; i++)for (j =0 ; j <IFB_Q_STATS_LEN ; j++)ethtool_sprintf (&p,"rx_queue_%u_%.18s" , i, ifb_q_stats_desc[j].desc); -for (i =0 ; i < dev->real_num_tx_queues; i++) +for (i =0 ; i < dev->num_tx_queues; i++)for (j =0 ; j <IFB_Q_STATS_LEN ; j++)ethtool_sprintf (&p,"tx_queue_%u_%.18s" , i, ifb_q_stats_desc[j].desc);
@@ -229,8 +229,7 @@ static int ifb_get_sset_count(struct net {switch (sset) {case ETH_SS_STATS : -return IFB_Q_STATS_LEN * (dev->real_num_rx_queues + - dev->real_num_tx_queues); +return IFB_Q_STATS_LEN * dev->num_tx_queues *2 ;default :return -EOPNOTSUPP ; }
@@ -262,12 +261,12 @@ static void ifb_get_ethtool_stats(structstruct ifb_q_private *txp;int i; -for (i =0 ; i < dev->real_num_rx_queues; i++) { +for (i =0 ; i < dev->num_tx_queues; i++) { txp = dp->tx_private + i;ifb_fill_stats_data (&data, &txp->rx_stats); } -for (i =0 ; i < dev->real_num_tx_queues; i++) { +for (i =0 ; i < dev->num_tx_queues; i++) { txp = dp->tx_private + i;ifb_fill_stats_data (&data, &txp->tx_stats); }
Greg Kroah-Hartman
maintainerPATCH 64/377 net: pse-pd: fix sign on -ENOENT check in of_load_pse_pis()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonas Jelonek <[email protected]>
commit 33d35975cbead3fa6b738ee57e5e45e14fbe0886 upstream.
of_count_phandle_with_args() returns the count on success and a negative errno on failure, including -ENOENT when the "pairsets" property is absent. The existing comparison in of_load_pse_pis() checks against ENOENT (positive 2) instead of -ENOENT, so the branch is taken for any error return: legitimate DTs that omit "pairsets" trigger a spurious "wrong number of pairsets" error and probe fails with -EINVAL.
Compare against -ENOENT so a missing "pairsets" property is correctly treated as "this PI has no pairsets, continue".
--- drivers/net/pse-pd/pse_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/pse-pd/pse_core.c +1 -1
@@ -210,7 +210,7 @@ static int of_load_pse_pis(struct pse_co ret =of_load_pse_pi_pairsets (node, &pi, ret);if (ret) goto out; - }else if (ret !=ENOENT ) { + }else if (ret != -ENOENT ) {dev_err (pcdev->dev,"error: wrong number of pairsets. Should be 1 or 2, got %d (%pOF)\n" , ret, node);
Greg Kroah-Hartman
maintainerPATCH 65/377 netfilter: ip6t_hbh: reject oversized option lists
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhengchuan Liang <[email protected]>
commit 4322dcde6b4173c2d8e8e6118ed290794263bcc8 upstream.
struct ip6t_opts stores at most IP6T_OPTS_OPTSNR option descriptors, but hbh_mt6_check() does not reject larger optsnr values supplied from userspace.
Validate optsnr in the rule setup path so only match data that fits the fixed-size opts array can be installed. This follows the existing xtables pattern of rejecting invalid user-provided counts in checkentry() and keeps the packet matching path unchanged.
struct ip6t_opts has a fixed opts[IP6T_OPTS_OPTSNR] array, where IP6T_OPTS_OPTSNR is 16, then off-by-one array access is possible:
[ 137.924693][ T8692] UBSAN: array-index-out-of-bounds in ../net/ipv6/netfilter/ip6t_hbh.c:110:29 [ 137.926167][ T8692] index 16 is out of range for type '__u16 [16]'
--- net/ipv6/netfilter/ip6t_hbh.c | 4 ++++ 1 file changed, 4 insertions(+)
net/ipv6/netfilter/ip6t_hbh.c +4 -0
@@ -168,6 +168,10 @@ static int hbh_mt6_check(const struct xtpr_debug ("unknown flags %X\n" , optsinfo->invflags);return -EINVAL ; } +if (optsinfo->optsnr >IP6T_OPTS_OPTSNR ) { +pr_debug ("too many supported opts specified\n" ); +return -EINVAL ; + }if (optsinfo->flags &IP6T_OPTS_NSTRICT ) {pr_debug ("Not strict - not implemented" );
Greg Kroah-Hartman
maintainerPATCH 66/377 netfilter: nf_queue: hold bridge skb->dev while queued
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haoze Xie <[email protected]>
commit e196115ec330a18de415bdb9f5071aa9f08e53ce upstream.
br_pass_frame_up() rewrites skb->dev from the ingress port to the bridge master before queueing bridge LOCAL_IN packets. NFQUEUE only holds references on state.in/out and bridge physdevs, so a queued bridge packet can retain a freed bridge master in skb->dev until reinjection.
When the verdict is reinjected later, br_netif_receive_skb() re-enters the receive path with skb->dev still pointing at the freed bridge master, triggering a use-after-free.
Store skb->dev in the queue entry, hold a reference on it for the queue lifetime, and use the saved device when dropping queued packets during NETDEV_DOWN handling.
--- include/net/netfilter/nf_queue.h | 1 + net/netfilter/nf_queue.c | 4 +++- net/netfilter/nfnetlink_queue.c | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-)
include/net/netfilter/nf_queue.h +1 -0
@@ -14,6 +14,7 @@ struct nf_queue_entry {struct list_head list;struct rhash_head hash_node;struct sk_buff *skb; +struct net_device *skb_dev;unsigned int id;unsigned int hook_index;/* index in hook_entries->hook[] */ #if IS_ENABLED (CONFIG_BRIDGE_NETFILTER )
net/netfilter/nf_queue.c +3 -1
@@ -60,6 +60,7 @@ static void nf_queue_entry_release_refs(struct nf_hook_state *state = &entry->state;/* Release those devices we held, or Alexey will kill me. */ +dev_put (entry->skb_dev);dev_put (state->in);dev_put (state->out);if (state->sk)
@@ -101,6 +102,7 @@ bool nf_queue_entry_get_refs(struct nf_qif (state->sk && !refcount_inc_not_zero (&state->sk->sk_refcnt))return false; +dev_hold (entry->skb_dev);dev_hold (state->in);dev_hold (state->out);
@@ -201,11 +203,11 @@ static int __nf_queue(struct sk_buff *sk *entry = (struct nf_queue_entry ) { .skb = skb, + .skb_dev = skb->dev, .state = *state, .hook_index = index, .size =sizeof (*entry) + route_key_size, }; -__nf_queue_entry_init_physdevs (entry);if (!nf_queue_entry_get_refs (entry)) {
net/netfilter/nfnetlink_queue.c +2 -0
@@ -1198,6 +1198,8 @@ dev_cmp(struct nf_queue_entry *entry, unif (physinif == ifindex || physoutif == ifindex)return 1 ;#endif +if (entry->skb_dev && entry->skb_dev->ifindex == ifindex) +return 1 ;if (entry->state.in)if (entry->state.in->ifindex == ifindex)return 1 ;
Greg Kroah-Hartman
maintainerPATCH 67/377 netfilter: ipset: stop hash:* range iteration at end
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nan Li <[email protected]>
commit 0d3a282ab5f165fc207ff49ea5b6ad8f54616bd6 upstream.
The following hash set variants:
hash:ip,mark
hash:ip,port
hash:ip,port,ip
hash:ip,port,net
iterate IPv4 ranges with a 32-bit iterator.
The iterator must stop once the last address in the requested range has been processed. Advancing it once more can move the traversal state past the end of the request, so a later retry may continue from an unintended position.
Handle the iterator increment explicitly at the end of the loop and stop once the upper bound has been processed. This keeps the existing retry behaviour intact for valid ranges while preventing traversal from continuing past the original boundary.
--- net/netfilter/ipset/ip_set_hash_ipmark.c | 6 +++++- net/netfilter/ipset/ip_set_hash_ipport.c | 5 ++++- net/netfilter/ipset/ip_set_hash_ipportip.c | 5 ++++- net/netfilter/ipset/ip_set_hash_ipportnet.c | 5 ++++- 4 files changed, 17 insertions(+), 4 deletions(-)
net/netfilter/ipset/ip_set_hash_ipmark.c +5 -1
@@ -150,7 +150,7 @@ hash_ipmark4_uadt(struct ip_set *set, stif (retried) ip =ntohl (h->next.ip); -for (; ip <= ip_to; ip++, i++) { +for (; ip <= ip_to; i++) { e.ip =htonl (ip);if (i >IPSET_MAX_RANGE ) {hash_ipmark4_data_next (&h->next, &e);
@@ -162,6 +162,10 @@ hash_ipmark4_uadt(struct ip_set *set, streturn ret; ret =0 ; + +if (ip == ip_to) +break ; + ip++; }return ret; }
net/netfilter/ipset/ip_set_hash_ipport.c +4 -1
@@ -186,7 +186,7 @@ hash_ipport4_uadt(struct ip_set *set, stif (retried) ip =ntohl (h->next.ip); -for (; ip <= ip_to; ip++) { +for (; ip <= ip_to;) { p = retried && ip ==ntohl (h->next.ip) ?ntohs (h->next.port) : port;for (; p <= port_to; p++, i++) {
@@ -203,6 +203,9 @@ hash_ipport4_uadt(struct ip_set *set, st ret =0 ; } +if (ip == ip_to) +break ; + ip++; }return ret; }
net/netfilter/ipset/ip_set_hash_ipportip.c +4 -1
@@ -182,7 +182,7 @@ hash_ipportip4_uadt(struct ip_set *set,if (retried) ip =ntohl (h->next.ip); -for (; ip <= ip_to; ip++) { +for (; ip <= ip_to;) { p = retried && ip ==ntohl (h->next.ip) ?ntohs (h->next.port) : port;for (; p <= port_to; p++, i++) {
@@ -199,6 +199,9 @@ hash_ipportip4_uadt(struct ip_set *set, ret =0 ; } +if (ip == ip_to) +break ; + ip++; }return ret; }
net/netfilter/ipset/ip_set_hash_ipportnet.c +4 -1
@@ -274,7 +274,7 @@ hash_ipportnet4_uadt(struct ip_set *set, p = port; ip2 = ip2_from; } -for (; ip <= ip_to; ip++) { +for (; ip <= ip_to;) { e.ip =htonl (ip);for (; p <= port_to; p++) { e.port =htons (p);
@@ -298,6 +298,9 @@ hash_ipportnet4_uadt(struct ip_set *set, ip2 = ip2_from; } p = port; +if (ip == ip_to) +break ; + ip++; }return ret; }
Greg Kroah-Hartman
maintainerPATCH 68/377 netfilter: nft_inner: Fix IPv6 inner_thoff desync
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yizhou Zhao <[email protected]>
commit b6a91f68ebfed9c38e0e9150f58a9b85da07181c upstream.
In nft_inner_parse_l2l3(), when processing inner IPv6 packets, ipv6_find_hdr() correctly computes the transport header offset traversing all extension headers, but the result is immediately overwritten with nhoff + sizeof(_ip6h) (40 bytes), which only accounts for the IPv6 base header. This creates a desync between inner_thoff (wrong — points to extension header start) and l4proto (correct — e.g., IPPROTO_TCP), enabling transport header forgery and potential firewall bypass. This issue affects stable versions from Linux 6.2.
For comparison, the normal (non-inner) IPv6 path correctly preserves ipv6_find_hdr()'s result. Removing the incorrect overwrite ensures that ipv6_find_hdr()'s calculated transport header offset is preserved, thereby fixing the desynchronization.
--- net/netfilter/nft_inner.c | 1 - 1 file changed, 1 deletion(-)
net/netfilter/nft_inner.c +0 -1
@@ -163,7 +163,6 @@ static int nft_inner_parse_l2l3(const streturn -1 ;if (fragoff ==0 ) { - thoff = nhoff +sizeof (_ip6h); ctx->flags |=NFT_PAYLOAD_CTX_INNER_TH ; ctx->inner_thoff = thoff; ctx->l4proto = l4proto;
Greg Kroah-Hartman
maintainerPATCH 69/377 sched_ext: Fix missing warning in scx_set_task_state() default case
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Samuele Mariotti <[email protected]>
[ Upstream commit b905ee77d5f557a83a485b4146210f54f13365fc ]
In scx_set_task_state(), the default case was setting the warn flag, but then returning immediately. This is problematic because the only purpose of the warn flag is to trigger WARN_ONCE, but the early return prevented it from ever firing, leaving invalid task states undetected and untraced.
To fix this, a WARN_ONCE call is now added directly in the default case.
The fix addresses two aspects:
- Guarantees the invalid task states are properly logged and traced.
- Provides a distinct warning message ("sched_ext: Invalid task state") specifically for states outside the defined scx_task_state enum values, making it easier to distinguish from other transition warnings.
This ensures proper detection and reporting of invalid states.
Stable-dep-of: 9a415cc53711 ("sched_ext: Avoid UAF in scx_root_enable_workfn() init failure path")
--- kernel/sched/ext.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/sched/ext.c +2 -1
@@ -2800,7 +2800,8 @@ static void scx_set_task_state(struct ta warn = prev_state !=SCX_TASK_READY ;break ;default : - warn = true; +WARN_ONCE (1 ,"sched_ext: Invalid task state %d -> %d for %s[%d]" , + prev_state, state, p->comm, p->pid);return ; }
Greg Kroah-Hartman
maintainerPATCH 70/377 sched_ext: Avoid UAF in scx_root_enable_workfn() init failure path
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tejun Heo <[email protected]>
[ Upstream commit 9a415cc53711f2238e0f0ca8a6bcc796c003b127 ]
In scx_root_enable_workfn(), put_task_struct(p) is called before scx_error() dereferences p->comm and p->pid. If the iterator's reference is the last drop, the task is freed synchronously and the deref becomes a UAF.
Move put_task_struct() past scx_error().
--- kernel/sched/ext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/sched/ext.c +1 -1
@@ -4812,10 +4812,10 @@ static void scx_enable_workfn(struct kth ret =scx_init_task (p,task_group (p), false);if (ret) { -put_task_struct (p);scx_task_iter_stop (&sti);scx_error (sch,"ops.init_task() failed (%d) for %s[%d]" , ret, p->comm, p->pid); +put_task_struct (p); goto err_disable_unlock_all; }
Greg Kroah-Hartman
maintainerPATCH 71/377 tracing: fprobe: Remove unused local variable
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Masami Hiramatsu (Google)" <[email protected]>
[ Upstream commit 90e69d291d195d35215b578d210fd3ce0e5a3f42 ]
The 'ret' local variable in fprobe_remove_node_in_module() was used for checking the error state in the loop, but commit dfe0d675df82 ("tracing: fprobe: use rhltable for fprobe_ip_table") removed the loop. So we don't need it anymore.
Stable-dep-of: 0ac0058a74ac ("tracing/fprobe: Check the same type fprobe on table as the unregistered one")
--- kernel/trace/fprobe.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
kernel/trace/fprobe.c +1 -4
@@ -561,8 +561,6 @@ static int fprobe_addr_list_add(struct fstatic void fprobe_remove_node_in_module (struct module *mod,struct fprobe_hlist_node *node,struct fprobe_addr_list *alist) { -int ret =0 ; -if (!within_module (node->addr, mod))return ;if (delete_fprobe_node (node))
@@ -571,8 +569,7 @@ static void fprobe_remove_node_in_module* If failed to update alist, just continue to update hlist. * Therefore, at list user handler will not hit anymore. */ -if (!ret) - ret =fprobe_addr_list_add (alist, node->addr); +fprobe_addr_list_add (alist, node->addr); }/* Handle module unloading to manage fprobe_ip_table. */
Greg Kroah-Hartman
maintainerPATCH 72/377 tracing: fprobe: use ftrace if CONFIG_DYNAMIC_FTRACE_WITH_ARGS
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Menglong Dong <[email protected]>
[ Upstream commit cd06078a38aaedfebbf8fa0c009da0f99f4473fb ]
For now, we will use ftrace for the fprobe if fp->exit_handler not exists and CONFIG_DYNAMIC_FTRACE_WITH_REGS is enabled.
However, CONFIG_DYNAMIC_FTRACE_WITH_REGS is not supported by some arch, such as arm. What we need in the fprobe is the function arguments, so we can use ftrace for fprobe if CONFIG_DYNAMIC_FTRACE_WITH_ARGS is enabled.
Therefore, use ftrace if CONFIG_DYNAMIC_FTRACE_WITH_REGS or CONFIG_DYNAMIC_FTRACE_WITH_ARGS enabled.
Stable-dep-of: 0ac0058a74ac ("tracing/fprobe: Check the same type fprobe on table as the unregistered one")
--- kernel/trace/fprobe.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-)
kernel/trace/fprobe.c +22 -10
@@ -45,6 +45,7 @@static struct hlist_head fprobe_table[FPROBE_TABLE_SIZE ];static struct rhltable fprobe_ip_table;static DEFINE_MUTEX (fprobe_mutex); +static struct fgraph_ops fprobe_graph_ops;static u32 fprobe_node_hashfn (const void *data,u32 len,u32 seed) {
@@ -259,7 +260,7 @@ static inline int __fprobe_kprobe_handlereturn ret; } -#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS +#if defined(CONFIG_DYNAMIC_FTRACE_WITH_ARGS ) || defined(CONFIG_DYNAMIC_FTRACE_WITH_REGS )/* ftrace_ops callback, this processes fprobes which have only entry_handler. */ static void fprobe_ftrace_entry (unsigned long ip,unsigned long parent_ip,struct ftrace_ops *ops,struct ftrace_regs *fregs)
@@ -300,7 +301,7 @@ NOKPROBE_SYMBOL(fprobe_ftrace_entry);static struct ftrace_ops fprobe_ftrace_ops = { .func = fprobe_ftrace_entry, - .flags =FTRACE_OPS_FL_SAVE_REGS , + .flags =FTRACE_OPS_FL_SAVE_ARGS , };static int fprobe_ftrace_active;
@@ -341,6 +342,15 @@ static bool fprobe_is_ftrace(struct fpro {return !fp->exit_handler; } + +#ifdef CONFIG_MODULES +static void fprobe_set_ips (unsigned long *ips,unsigned int cnt,int remove, +int reset) +{ +ftrace_set_filter_ips (&fprobe_graph_ops.ops, ips, cnt, remove, reset); +ftrace_set_filter_ips (&fprobe_ftrace_ops, ips, cnt, remove, reset); +} +#endif #else static int fprobe_ftrace_add_ips (unsigned long *addrs,int num) {
@@ -355,7 +365,15 @@ static bool fprobe_is_ftrace(struct fpro {return false; } + +#ifdef CONFIG_MODULES +static void fprobe_set_ips (unsigned long *ips,unsigned int cnt,int remove, +int reset) +{ +ftrace_set_filter_ips (&fprobe_graph_ops.ops, ips, cnt, remove, reset); +}#endif +#endif /* !CONFIG_DYNAMIC_FTRACE_WITH_ARGS && !CONFIG_DYNAMIC_FTRACE_WITH_REGS */ /* fgraph_ops callback, this processes fprobes which have exit_handler. */ static int fprobe_fgraph_entry(struct ftrace_graph_ent *trace, struct fgraph_ops *gops,
@@ -601,14 +619,8 @@ static int fprobe_module_callback(struct }while (node ==ERR_PTR (-EAGAIN ));rhashtable_walk_exit (&iter); -if (alist.index >0 ) { -ftrace_set_filter_ips (&fprobe_graph_ops.ops, - alist.addrs, alist.index,1 ,0 ); -#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS -ftrace_set_filter_ips (&fprobe_ftrace_ops, - alist.addrs, alist.index,1 ,0 ); -#endif - } +if (alist.index >0 ) +fprobe_set_ips (alist.addrs, alist.index,1 ,0 );mutex_unlock (&fprobe_mutex);kfree (alist.addrs);
Greg Kroah-Hartman
maintainerPATCH 73/377 tracing/fprobe: Avoid kcalloc() in rcu_read_lock section
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Masami Hiramatsu (Google)" <[email protected]>
[ Upstream commit aa72812b49104bb5a38272fc9541feb62ca6fd32 ]
fprobe_remove_node_in_module() is called under RCU read locked, but this invokes kcalloc() if there are more than 8 fprobes installed on the module. Sashiko warns it because kcalloc() can sleep [1].
To fix this issue, expand the batch size to 128 and do not expand the fprobe_addr_list, but just cancel walking on fprobe_ip_table, update fgraph/ftrace_ops and retry the loop again.
Stable-dep-of: 0ac0058a74ac ("tracing/fprobe: Check the same type fprobe on table as the unregistered one")
--- kernel/trace/fprobe.c | 92 ++++++++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 47 deletions(-)
kernel/trace/fprobe.c +45 -47
@@ -344,11 +344,10 @@ static bool fprobe_is_ftrace(struct fpro }#ifdef CONFIG_MODULES -static void fprobe_set_ips (unsigned long *ips,unsigned int cnt,int remove, -int reset) +static void fprobe_remove_ips (unsigned long *ips,unsigned int cnt) { -ftrace_set_filter_ips (&fprobe_graph_ops.ops, ips, cnt, remove, reset); -ftrace_set_filter_ips (&fprobe_ftrace_ops, ips, cnt, remove, reset); +ftrace_set_filter_ips (&fprobe_graph_ops.ops, ips, cnt,1 ,0 ); +ftrace_set_filter_ips (&fprobe_ftrace_ops, ips, cnt,1 ,0 ); }#endif #else
@@ -367,10 +366,9 @@ static bool fprobe_is_ftrace(struct fpro }#ifdef CONFIG_MODULES -static void fprobe_set_ips (unsigned long *ips,unsigned int cnt,int remove, -int reset) +static void fprobe_remove_ips (unsigned long *ips,unsigned int cnt) { -ftrace_set_filter_ips (&fprobe_graph_ops.ops, ips, cnt, remove, reset); +ftrace_set_filter_ips (&fprobe_graph_ops.ops, ips, cnt,1 ,0 ); }#endif #endif /* !CONFIG_DYNAMIC_FTRACE_WITH_ARGS && !CONFIG_DYNAMIC_FTRACE_WITH_REGS */
@@ -543,7 +541,7 @@ static void fprobe_graph_remove_ips(unsi #ifdef CONFIG_MODULES -#define FPROBE_IPS_BATCH_INIT 8 +#define FPROBE_IPS_BATCH_INIT 128 /* instruction pointer address list */ struct fprobe_addr_list { int index;
@@ -551,45 +549,24 @@ struct fprobe_addr_list {unsigned long *addrs; }; -static int fprobe_addr_list_add (struct fprobe_addr_list *alist,unsigned long addr) +static int fprobe_remove_node_in_module (struct module *mod,struct fprobe_hlist_node *node, +struct fprobe_addr_list *alist) { -unsigned long *addrs; - -/* Previously we failed to expand the list. */ -if (alist->index == alist->size) -return -ENOSPC ; - - alist->addrs[alist->index++] = addr; -if (alist->index < alist->size) +if (!within_module (node->addr, mod))return 0 ; -/* Expand the address list */ - addrs =kcalloc (alist->size *2 ,sizeof (*addrs),GFP_KERNEL ); -if (!addrs) -return -ENOMEM ; - -memcpy (addrs, alist->addrs, alist->size *sizeof (*addrs)); - alist->size *=2 ; -kfree (alist->addrs); - alist->addrs = addrs; +if (delete_fprobe_node (node)) +return 0 ; +/* If no address list is available, we can't track this address. */ +if (!alist->addrs) +return 0 ; + alist->addrs[alist->index++] = node->addr; +if (alist->index == alist->size) +return -ENOSPC ;return 0 ; } -static void fprobe_remove_node_in_module (struct module *mod,struct fprobe_hlist_node *node, -struct fprobe_addr_list *alist) -{ -if (!within_module (node->addr, mod)) -return ; -if (delete_fprobe_node (node)) -return ; -/* -* If failed to update alist, just continue to update hlist. -* Therefore, at list user handler will not hit anymore. -*/ -fprobe_addr_list_add (alist, node->addr); -} -/* Handle module unloading to manage fprobe_ip_table. */ static int fprobe_module_callback (struct notifier_block *nb,unsigned long val,void *data)
@@ -598,29 +575,50 @@ static int fprobe_module_callback(structstruct fprobe_hlist_node *node;struct rhashtable_iter iter;struct module *mod = data; +bool retry;if (val !=MODULE_STATE_GOING )return NOTIFY_DONE ; alist.addrs =kcalloc (alist.size,sizeof (*alist.addrs),GFP_KERNEL ); -/* If failed to alloc memory, we can not remove ips from hash. */ -if (!alist.addrs) -return NOTIFY_DONE ; +/* +* If failed to alloc memory, ftrace_ops will not be able to remove ips from +* hash, but we can still remove nodes from fprobe_ip_table, so we can avoid +* the potential wrong callback. So just print a warning here and try to +* continue without address list. +*/ +WARN_ONCE (!alist.addrs, +"Failed to allocate memory for fprobe_addr_list, ftrace_ops will not be updated" );mutex_lock (&fprobe_mutex); +again: + retry = false; + alist.index =0 ;rhltable_walk_enter (&fprobe_ip_table, &iter);do {rhashtable_walk_start (&iter);while ((node =rhashtable_walk_next (&iter)) && !IS_ERR (node)) -fprobe_remove_node_in_module (mod, node, &alist); +if (fprobe_remove_node_in_module (mod, node, &alist) <0 ) { + retry = true; +break ; + }rhashtable_walk_stop (&iter); - }while (node ==ERR_PTR (-EAGAIN )); + }while (node ==ERR_PTR (-EAGAIN ) && !retry);rhashtable_walk_exit (&iter); +/* Remove any ips from hash table(s) */ +if (alist.index >0 ) { +fprobe_remove_ips (alist.addrs, alist.index); +/* +* If we break rhashtable walk loop except for -EAGAIN, we need +* to restart looping from start for safety. Anyway, this is +* not a hotpath. +*/ +if (retry) + goto again; + } -if (alist.index >0 ) -fprobe_set_ips (alist.addrs, alist.index,1 ,0 );mutex_unlock (&fprobe_mutex);kfree (alist.addrs);
Greg Kroah-Hartman
maintainerPATCH 74/377 tracing/fprobe: Check the same type fprobe on table as the unregistered one
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Masami Hiramatsu (Google)" <[email protected]>
[ Upstream commit 0ac0058a74ac5765c7ce09ea630f4fdeaf4d80fa ]
Commit 2c67dc457bc6 ("tracing: fprobe: optimization for entry only case") introduced a different ftrace_ops for entry-only fprobes.
However, when unregistering an fprobe, the kernel only checks if another fprobe exists at the same address, without checking which type of fprobe it is.
If different fprobes are registered at the same address, the same address will be registered in both fgraph_ops and ftrace_ops, but only one of them will be deleted when unregistering. (the one removed first will not be deleted from the ops).
This results in junk entries remaining in either fgraph_ops or ftrace_ops. For example:
=======
cd /sys/kernel/tracing
# 'Add entry and exit events on the same place' echo 'f:event1 vfs_read' >> dynamic_events echo 'f:event2 vfs_read%return' >> dynamic_events
# 'Enable both of them'
echo 1 > events/fprobes/enable
cat enabled_functionsvfs_read (2) ->arch_ftrace_ops_list_func+0x0/0x210
# 'Disable and remove exit event'
echo 0 > events/fprobes/event2/enable
echo -:event2 >> dynamic_events
# 'Disable and remove all events'
echo 0 > events/fprobes/enable
echo > dynamic_events
# 'Add another event'
echo 'f:event3 vfs_open%return' > dynamic_events
cat dynamic_events
f:fprobes/event3 vfs_open%return
echo 1 > events/fprobes/enable
cat enabled_functionsvfs_open (1) tramp: 0xffffffffa0001000 (ftrace_graph_func+0x0/0x60) ->ftrace_graph_func+0x0/0x60 subops: {ent:fprobe_fgraph_entry+0x0/0x620 ret:fprobe_return+0x0/0x150}vfs_read (1) tramp: 0xffffffffa0001000 (ftrace_graph_func+0x0/0x60) ->ftrace_graph_func+0x0/0x60 subops: {ent:fprobe_fgraph_entry+0x0/0x620 ret:fprobe_return+0x0/0x150}
=======
As you can see, an entry for the vfs_read remains.
To fix this issue, when unregistering, the kernel should also check if there is the same type of fprobes still exist at the same address, and if not, delete its entry from either fgraph_ops or ftrace_ops.
--- kernel/trace/fprobe.c | 82 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 65 insertions(+), 17 deletions(-)
kernel/trace/fprobe.c +65 -17
@@ -92,11 +92,8 @@ static int insert_fprobe_node(struct fprreturn ret; } -/* Return true if there are synonims */ -static bool delete_fprobe_node (struct fprobe_hlist_node *node) +static void delete_fprobe_node (struct fprobe_hlist_node *node) { -bool ret; -lockdep_assert_held (&fprobe_mutex);/* Avoid double deleting and non-inserted nodes */
@@ -105,13 +102,6 @@ static bool delete_fprobe_node(struct fprhltable_remove (&fprobe_ip_table, &node->hlist, fprobe_rht_params); } - -rcu_read_lock (); - ret = !!rhltable_lookup (&fprobe_ip_table, &node->addr, - fprobe_rht_params); -rcu_read_unlock (); - -return ret; }/* Check existence of the fprobe */
@@ -343,6 +333,32 @@ static bool fprobe_is_ftrace(struct fproreturn !fp->exit_handler; } +static bool fprobe_exists_on_hash (unsigned long ip,bool ftrace) +{ +struct rhlist_head *head, *pos; +struct fprobe_hlist_node *node; +struct fprobe *fp; + +guard (rcu)(); + head =rhltable_lookup (&fprobe_ip_table, &ip, + fprobe_rht_params); +if (!head) +return false; +/* We have to check the same type on the list. */ +rhl_for_each_entry_rcu (node, pos, head, hlist) { +if (node->addr != ip) +break ; + fp =READ_ONCE (node->fp); +if (likely (fp)) { +if ((!ftrace && fp->exit_handler) || + (ftrace && !fp->exit_handler)) +return true; + } + } + +return false; +} +#ifdef CONFIG_MODULES static void fprobe_remove_ips (unsigned long *ips,unsigned int cnt) {
@@ -365,6 +381,29 @@ static bool fprobe_is_ftrace(struct fproreturn false; } +static bool fprobe_exists_on_hash (unsigned long ip,bool ftrace__maybe_unused ) +{ +struct rhlist_head *head, *pos; +struct fprobe_hlist_node *node; +struct fprobe *fp; + +guard (rcu)(); + head =rhltable_lookup (&fprobe_ip_table, &ip, + fprobe_rht_params); +if (!head) +return false; +/* We only need to check fp is there. */ +rhl_for_each_entry_rcu (node, pos, head, hlist) { +if (node->addr != ip) +break ; + fp =READ_ONCE (node->fp); +if (likely (fp)) +return true; + } + +return false; +} +#ifdef CONFIG_MODULES static void fprobe_remove_ips (unsigned long *ips,unsigned int cnt) {
@@ -552,18 +591,25 @@ struct fprobe_addr_list {static int fprobe_remove_node_in_module (struct module *mod,struct fprobe_hlist_node *node,struct fprobe_addr_list *alist) { +lockdep_assert_in_rcu_read_lock (); +if (!within_module (node->addr, mod))return 0 ; -if (delete_fprobe_node (node)) -return 0 ; +delete_fprobe_node (node);/* If no address list is available, we can't track this address. */ if (!alist->addrs)return 0 ; +/* +* Don't care the type here, because all fprobes on the same +* address must be removed eventually. +*/ +if (!rhltable_lookup (&fprobe_ip_table, &node->addr, fprobe_rht_params)) { + alist->addrs[alist->index++] = node->addr; +if (alist->index == alist->size) +return -ENOSPC ; + } - alist->addrs[alist->index++] = node->addr; -if (alist->index == alist->size) -return -ENOSPC ;return 0 ; }
@@ -934,7 +980,9 @@ static int unregister_fprobe_nolock(stru/* Remove non-synonim ips from table and hash */ count =0 ;for (i =0 ; i < hlist_array->size; i++) { -if (!delete_fprobe_node (&hlist_array->array[i]) && addrs) +delete_fprobe_node (&hlist_array->array[i]); +if (addrs && !fprobe_exists_on_hash (hlist_array->array[i].addr, +fprobe_is_ftrace (fp))) addrs[count++] = hlist_array->array[i].addr; }del_fprobe_hash (fp);
Greg Kroah-Hartman
maintainerPATCH 75/377 cgroup/cpuset: Reset DL migration state on can_attach() failure
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guopeng Zhang <[email protected]>
[ Upstream commit 4a39eda5fdd867fc39f3c039714dd432cee00268 ]
cpuset_can_attach() accumulates temporary SCHED_DEADLINE migration state in the destination cpuset while walking the taskset.
If a later task_can_attach() or security_task_setscheduler() check fails, cgroup_migrate_execute() treats cpuset as the failing subsystem and does not call cpuset_cancel_attach() for it. The partially accumulated state is then left behind and can be consumed by a later attach, corrupting cpuset DL task accounting and pending DL bandwidth accounting.
Reset the pending DL migration state from the common error exit when ret is non-zero. Successful can_attach() keeps the state for cpuset_attach() or cpuset_cancel_attach().
--- kernel/cgroup/cpuset.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/cgroup/cpuset.c +4 -4
@@ -3163,16 +3163,13 @@ static int cpuset_can_attach(struct cgroint cpu =cpumask_any_and (cpu_active_mask, cs->effective_cpus);if (unlikely (cpu >= nr_cpu_ids)) { -reset_migrate_dl_data (cs); ret = -EINVAL ; goto out_unlock; } ret =dl_bw_alloc (cpu, cs->sum_migrate_dl_bw); -if (ret) { -reset_migrate_dl_data (cs); +if (ret) goto out_unlock; - } } out_success:
@@ -3181,7 +3178,10 @@ out_success:* changes which zero cpus/mems_allowed. */ cs->attach_in_progress++; + out_unlock: +if (ret) +reset_migrate_dl_data (cs);mutex_unlock (&cpuset_mutex);return ret; }
Greg Kroah-Hartman
maintainerPATCH 76/377 net: ethtool: fix NULL pointer dereference in phy_reply_size
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Quan Sun <[email protected]>
[ Upstream commit 4908f1395fb1b832ceec11584af649874a2732ea ]
In phy_prepare_data(), several strings such as 'name', 'drvname', 'upstream_sfp_name', and 'downstream_sfp_name' are allocated using kstrdup(). However, these allocations were not checked for failure.
If kstrdup() fails for 'name', it returns NULL while the function continues. This leads to a kernel NULL pointer dereference and panic later in phy_reply_size() when it unconditionally calls strlen() on the NULL pointer.
While other strings like 'upstream_sfp_name' might be checked before access in certain code paths, failing to handle these allocations consistently can lead to incomplete data reporting or hidden bugs.
Fix this by adding proper NULL checks for all kstrdup() calls in phy_prepare_data() and implement a centralized error handling path using goto labels to ensure all previously allocated resources are freed on failure.
Stable-dep-of: e3adf69f8eb1 ("net: ethtool: phy: avoid NULL deref when PHY driver is unbound")
--- net/ethtool/phy.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-)
net/ethtool/phy.c +30 -2
@@ -76,6 +76,7 @@ static int phy_prepare_data(const structstruct nlattr **tb = info->attrs;struct phy_device_node *pdn;struct phy_device *phydev; +int ret;/* RTNL is held by the caller */ phydev = ethnl_req_get_phydev(req_info, tb, ETHTOOL_A_PHY_HEADER,
@@ -88,8 +89,17 @@ static int phy_prepare_data(const structreturn -EOPNOTSUPP ; rep_data->phyindex = phydev->phyindex; + rep_data->name =kstrdup (dev_name (&phydev->mdio.dev),GFP_KERNEL ); +if (!rep_data->name) +return -ENOMEM ; + rep_data->drvname =kstrdup (phydev->drv->name,GFP_KERNEL ); +if (!rep_data->drvname) { + ret = -ENOMEM ; + goto err_free_name; + } + rep_data->upstream_type = pdn->upstream_type;if (pdn->upstream_type ==PHY_UPSTREAM_PHY ) {
@@ -97,15 +107,33 @@ static int phy_prepare_data(const struct rep_data->upstream_index = upstream->phyindex; } -if (pdn->parent_sfp_bus) +if (pdn->parent_sfp_bus) { rep_data->upstream_sfp_name =kstrdup (sfp_get_name (pdn->parent_sfp_bus),GFP_KERNEL ); +if (!rep_data->upstream_sfp_name) { + ret = -ENOMEM ; + goto err_free_drvname; + } + } -if (phydev->sfp_bus) +if (phydev->sfp_bus) { rep_data->downstream_sfp_name =kstrdup (sfp_get_name (phydev->sfp_bus),GFP_KERNEL ); +if (!rep_data->downstream_sfp_name) { + ret = -ENOMEM ; + goto err_free_upstream_sfp; + } + }return 0 ; + +err_free_upstream_sfp: +kfree (rep_data->upstream_sfp_name); +err_free_drvname: +kfree (rep_data->drvname); +err_free_name: +kfree (rep_data->name); +return ret; } static int phy_fill_reply(struct sk_buff *skb,
Greg Kroah-Hartman
maintainerPATCH 77/377 net: ethtool: phy: avoid NULL deref when PHY driver is unbound
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Carlier <[email protected]>
[ Upstream commit e3adf69f8eb121a9128c2b0029efd050d3649153 ]
phydev->drv can become NULL while the phy_device is still attached to its net_device, namely after the PHY driver is unbound via sysfs:
echo <mdio_id> > /sys/bus/mdio_bus/drivers/<phy_drv>/unbind
phy_remove() clears phydev->drv but doesn't call phy_detach(), so the phy_device stays in the link topology xarray and ethnl_req_get_phydev() still hands it back. ETHTOOL_MSG_PHY_GET then oopses on:
rep_data->drvname = kstrdup(phydev->drv->name, GFP_KERNEL);
drvname is already treated as optional by phy_reply_size(), phy_fill_reply() and phy_cleanup_data(), so just skip the allocation when there is no driver bound.
--- net/ethtool/phy.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
net/ethtool/phy.c +6 -4
@@ -94,10 +94,12 @@ static int phy_prepare_data(const structif (!rep_data->name)return -ENOMEM ; - rep_data->drvname =kstrdup (phydev->drv->name,GFP_KERNEL ); -if (!rep_data->drvname) { - ret = -ENOMEM ; - goto err_free_name; +if (phydev->drv) { + rep_data->drvname =kstrdup (phydev->drv->name,GFP_KERNEL ); +if (!rep_data->drvname) { + ret = -ENOMEM ; + goto err_free_name; + } } rep_data->upstream_type = pdn->upstream_type;
Greg Kroah-Hartman
maintainerPATCH 78/377 fs/ntfs3: handle attr_set_size() errors when truncating files
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Komarov <[email protected]>
[ Upstream commit 576248a34b927e93b2fd3fff7df735ba73ad7d01 ]
If attr_set_size() fails while truncating down, the error is silently ignored and the inode may be left in an inconsistent state.
--- fs/ntfs3/file.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
fs/ntfs3/file.c +4 -8
@@ -458,8 +458,8 @@ static int ntfs_truncate(struct inode *i {struct super_block *sb = inode->i_sb;struct ntfs_inode *ni =ntfs_i (inode); -int err, dirty =0 ;u64 new_valid; +int err;if (!S_ISREG (inode->i_mode))return 0 ;
@@ -475,7 +475,6 @@ static int ntfs_truncate(struct inode *i } new_valid =ntfs_up_block (sb,min_t (u64, ni->i_valid, new_size)); -truncate_setsize (inode, new_size);ni_lock (ni);
@@ -489,22 +488,19 @@ static int ntfs_truncate(struct inode *i ni->i_valid = new_valid;ni_unlock (ni); +if (unlikely (err)) +return err; ni->std_fa |=FILE_ATTRIBUTE_ARCHIVE ;inode_set_mtime_to_ts (inode,inode_set_ctime_current (inode));if (!IS_DIRSYNC (inode)) { - dirty =1 ; +mark_inode_dirty (inode); }else { err =ntfs_sync_inode (inode);if (err)return err; } -if (dirty) -mark_inode_dirty (inode); - -/*ntfs_flush_inodes(inode->i_sb, inode, NULL);*/ -return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 79/377 l2tp: use list_del_rcu in l2tp_session_unhash
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Bommarito <[email protected]>
commit 979c017803c40829b03acd9e5236e354b7622360 upstream.
An unprivileged local user can pin a host CPU indefinitely in l2tp_session_get_by_ifname() by issuing L2TP_CMD_SESSION_GET on L2TP_ATTR_IFNAME concurrently with L2TP_CMD_SESSION_CREATE and L2TP_CMD_SESSION_DELETE on the same tunnel. All three commands take GENL_UNS_ADMIN_PERM, so CAP_NET_ADMIN in the netns user namespace suffices; on any host that has l2tp_core loaded the trigger is reachable from a standard unshare -Urn sandbox.
l2tp_session_unhash() removes a session from tunnel->session_list with list_del_init(), but that list is walked by l2tp_session_get_by_ifname() with list_for_each_entry_rcu() under rcu_read_lock_bh(). list_del_init() leaves the deleted entry's next/prev self-pointing; a reader that has loaded the entry and then advances pos->list.next reads &session->list, container_of()s back to the same session, and list_for_each_entry_rcu() never reaches the list head. The CPU stays in strcmp() inside the walker, with BH and preemption disabled, so RCU grace periods on the host stall behind it and the wedged thread cannot be killed (SIGKILL is delivered on syscall return).
Use list_del_rcu() to match the existing list_add_rcu() in l2tp_session_register(); the deleted session remains visible to in-flight walkers with consistent next/prev pointers until kfree_rcu() in l2tp_session_free() releases it. tunnel->session_list has exactly one list_del_init() call site; the list_del_init (&session->clist) at l2tp_core.c:533 operates on the per-collision list, which is not walked under RCU. list_empty(&session->list) is not used anywhere in net/l2tp/ after the unhash point, so dropping the post-delete self-init is safe; the fix has no userspace-visible behavior change.
--- net/l2tp/l2tp_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/l2tp/l2tp_core.c +1 -1
@@ -1360,7 +1360,7 @@ static void l2tp_session_unhash(struct lspin_lock_bh (&pn->l2tp_session_idr_lock);/* Remove from the per-tunnel list */ -list_del_init (&session->list); +list_del_rcu (&session->list);/* Remove from per-net IDR */ if (tunnel->version ==L2TP_HDR_VER_3 ) {
Greg Kroah-Hartman
maintainerPATCH 80/377 qed: fix double free in qed_cxt_tables_alloc()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dawei Feng <[email protected]>
commit 2bccfb8476ca5f3548afbd623dc7a6980d4e77de upstream.
If one of the later PF or VF CID bitmap allocations fails, qed_cid_map_alloc() jumps to cid_map_fail and frees the previously allocated CID bitmaps before returning an error. qed_cxt_tables_alloc() then calls qed_cxt_mngr_free(), which invokes qed_cid_map_free() again.
Fix this by setting each CID bitmap pointer to NULL after bitmap_free() to avoid double free.
The bug was first flagged by an experimental analysis tool we are developing for kernel memory-management bugs while analyzing v6.13-rc1. The tool is still under development and is not yet publicly available. Manual inspection confirms that the bug is still present in v7.1-rc3.
Runtime reproduction was not attempted because exercising the failing allocation path requires device-specific setup.
--- drivers/net/ethernet/qlogic/qed/qed_cxt.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/qlogic/qed/qed_cxt.c +2 -0
@@ -1038,11 +1038,13 @@ static void qed_cid_map_free(struct qed_for (type =0 ; type <MAX_CONN_TYPES ; type++) {bitmap_free (p_mngr->acquired[type].cid_map); + p_mngr->acquired[type].cid_map =NULL ; p_mngr->acquired[type].max_count =0 ; p_mngr->acquired[type].start_cid =0 ;for (vf =0 ; vf <MAX_NUM_VFS ; vf++) {bitmap_free (p_mngr->acquired_vf[type][vf].cid_map); + p_mngr->acquired_vf[type][vf].cid_map =NULL ; p_mngr->acquired_vf[type][vf].max_count =0 ; p_mngr->acquired_vf[type][vf].start_cid =0 ; }
Greg Kroah-Hartman
maintainerPATCH 81/377 ring-buffer: Fix reporting of missed events in iterator
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt <[email protected]>
commit a254b6d13b0edd6272926674d2afc46d46e496b7 upstream.
When tracing is active while reading the trace file, if the iterator reading the buffer detects that the writer has passed the iterator head, it will reset and set a "missed events" flag. This flag is passed to the output processing to show the user that events were missed:
CPU:4 [LOST EVENTS]
The problem is that the flag is reset after it is checked in ring_buffer_iter_dropped(). But the "trace" file iterates over all the CPU ring buffers and it will check if they are dropped when figuring out which buffer to print next. This prematurely clears the missed_events flag if the CPU buffer with the missed events is not the one that is printed next.
On the iteration where the CPU buffer with the missed events is printed, the check if it had missed events would return false and the output does not show that events were missed.
Do not reset the missed_events flag when checking if there were missed events, but instead clear it when moving the iterator head to the next event.
--- kernel/trace/ring_buffer.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
kernel/trace/ring_buffer.c +3 -5
@@ -5249,6 +5249,7 @@ static void rb_iter_reset(struct ring_bu iter->head_page = cpu_buffer->reader_page; iter->head = cpu_buffer->reader_page->read; iter->next_event = iter->head; + iter->missed_events =0 ; iter->cache_reader_page = iter->head_page; iter->cache_read = cpu_buffer->read;
@@ -5863,10 +5864,7 @@ ring_buffer_peek(struct trace_buffer *bu*/ bool ring_buffer_iter_dropped (struct ring_buffer_iter *iter) { -bool ret = iter->missed_events !=0 ; - - iter->missed_events =0 ; -return ret; +return iter->missed_events !=0 ; }EXPORT_SYMBOL_GPL (ring_buffer_iter_dropped);
@@ -6028,7 +6026,7 @@ void ring_buffer_iter_advance(struct rinunsigned long flags;raw_spin_lock_irqsave (&cpu_buffer->reader_lock, flags); - + iter->missed_events =0 ;rb_advance_iter (iter);raw_spin_unlock_irqrestore (&cpu_buffer->reader_lock, flags);
Greg Kroah-Hartman
maintainerPATCH 82/377 ring-buffer: Flush and stop persistent ring buffer on panic
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masami Hiramatsu (Google) <[email protected]>
commit a494d3c8d5392bcdff83c2a593df0c160ff9f322 upstream.
On real hardware, panic and machine reboot may not flush hardware cache to memory. This means the persistent ring buffer, which relies on a coherent state of memory, may not have its events written to the buffer and they may be lost. Moreover, there may be inconsistency with the counters which are used for validation of the integrity of the persistent ring buffer which may cause all data to be discarded.
To avoid this issue, stop recording of the ring buffer on panic and flush the cache of the ring buffer's memory.
--- arch/alpha/include/asm/Kbuild | 1 + arch/arc/include/asm/Kbuild | 1 + arch/arm/include/asm/Kbuild | 1 + arch/arm64/include/asm/ring_buffer.h | 10 ++++++++++ arch/csky/include/asm/Kbuild | 1 + arch/hexagon/include/asm/Kbuild | 1 + arch/loongarch/include/asm/Kbuild | 1 + arch/m68k/include/asm/Kbuild | 1 + arch/microblaze/include/asm/Kbuild | 1 + arch/mips/include/asm/Kbuild | 1 + arch/nios2/include/asm/Kbuild | 1 + arch/openrisc/include/asm/Kbuild | 1 + arch/parisc/include/asm/Kbuild | 1 + arch/powerpc/include/asm/Kbuild | 1 + arch/riscv/include/asm/Kbuild | 1 + arch/s390/include/asm/Kbuild | 1 + arch/sh/include/asm/Kbuild | 1 + arch/sparc/include/asm/Kbuild | 1 + arch/um/include/asm/Kbuild | 1 + arch/x86/include/asm/Kbuild | 1 + arch/xtensa/include/asm/Kbuild | 1 + include/asm-generic/ring_buffer.h | 13 +++++++++++++ kernel/trace/ring_buffer.c | 22 ++++++++++++++++++++++ 23 files changed, 65 insertions(+) create mode 100644 arch/arm64/include/asm/ring_buffer.h create mode 100644 include/asm-generic/ring_buffer.h
arch/alpha/include/asm/Kbuild +1 -0
@@ -5,4 +5,5 @@ generic-y += agp.h generic-y += asm-offsets.h generic-y += kvm_para.h generic-y += mcs_spinlock.h +generic-y += ring_buffer.h generic-y += text-patching.h
arch/arc/include/asm/Kbuild +1 -0
@@ -5,5 +5,6 @@ generic-y += extable.h generic-y += kvm_para.h generic-y += mcs_spinlock.h generic-y += parport.h +generic-y += ring_buffer.h generic-y += user.h generic-y += text-patching.h
arch/arm/include/asm/Kbuild +1 -0
@@ -3,6 +3,7 @@ generic-y += early_ioremap.h generic-y += extable.h generic-y += flat.h generic-y += parport.h +generic-y += ring_buffer.h generated-y += mach-types.h generated-y += unistd-nr.h
arch/arm64/include/asm/ring_buffer.h new file +10 -0
@@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef _ASM_ARM64_RING_BUFFER_H +#define _ASM_ARM64_RING_BUFFER_H + +#include <asm/cacheflush.h> + +/* Flush D-cache on persistent ring buffer */ +#define arch_ring_buffer_flush_range (start, end) dcache_clean_pop(start, end) + +#endif /* _ASM_ARM64_RING_BUFFER_H */
arch/csky/include/asm/Kbuild +1 -0
@@ -9,6 +9,7 @@ generic-y += qrwlock.h generic-y += qrwlock_types.h generic-y += qspinlock.h generic-y += parport.h +generic-y += ring_buffer.h generic-y += user.h generic-y += vmlinux.lds.h generic-y += text-patching.h
arch/hexagon/include/asm/Kbuild +1 -0
@@ -5,4 +5,5 @@ generic-y += extable.h generic-y += iomap.h generic-y += kvm_para.h generic-y += mcs_spinlock.h +generic-y += ring_buffer.h generic-y += text-patching.h
arch/loongarch/include/asm/Kbuild +1 -0
@@ -9,5 +9,6 @@ generic-y += qrwlock.h generic-y += user.h generic-y += ioctl.h generic-y += mmzone.h +generic-y += ring_buffer.h generic-y += statfs.h generic-y += text-patching.h
arch/m68k/include/asm/Kbuild +1 -0
@@ -3,5 +3,6 @@ generated-y += syscall_table.h generic-y += extable.h generic-y += kvm_para.h generic-y += mcs_spinlock.h +generic-y += ring_buffer.h generic-y += spinlock.h generic-y += text-patching.h
arch/microblaze/include/asm/Kbuild +1 -0
@@ -5,6 +5,7 @@ generic-y += extable.h generic-y += kvm_para.h generic-y += mcs_spinlock.h generic-y += parport.h +generic-y += ring_buffer.h generic-y += syscalls.h generic-y += tlb.h generic-y += user.h
arch/mips/include/asm/Kbuild +1 -0
@@ -12,5 +12,6 @@ generic-y += mcs_spinlock.h generic-y += parport.h generic-y += qrwlock.h generic-y += qspinlock.h +generic-y += ring_buffer.h generic-y += user.h generic-y += text-patching.h
arch/nios2/include/asm/Kbuild +1 -0
@@ -5,6 +5,7 @@ generic-y += cmpxchg.h generic-y += extable.h generic-y += kvm_para.h generic-y += mcs_spinlock.h +generic-y += ring_buffer.h generic-y += spinlock.h generic-y += user.h generic-y += text-patching.h
arch/openrisc/include/asm/Kbuild +1 -0
@@ -8,4 +8,5 @@ generic-y += spinlock_types.h generic-y += spinlock.h generic-y += qrwlock_types.h generic-y += qrwlock.h +generic-y += ring_buffer.h generic-y += user.h
arch/parisc/include/asm/Kbuild +1 -0
@@ -4,4 +4,5 @@ generated-y += syscall_table_64.h generic-y += agp.h generic-y += kvm_para.h generic-y += mcs_spinlock.h +generic-y += ring_buffer.h generic-y += user.h
arch/powerpc/include/asm/Kbuild +1 -0
@@ -5,4 +5,5 @@ generated-y += syscall_table_spu.h generic-y += agp.h generic-y += mcs_spinlock.h generic-y += qrwlock.h +generic-y += ring_buffer.h generic-y += early_ioremap.h
arch/riscv/include/asm/Kbuild +1 -0
@@ -14,5 +14,6 @@ generic-y += ticket_spinlock.h generic-y += qrwlock.h generic-y += qrwlock_types.h generic-y += qspinlock.h +generic-y += ring_buffer.h generic-y += user.h generic-y += vmlinux.lds.h
arch/s390/include/asm/Kbuild +1 -0
@@ -8,3 +8,4 @@ generic-y += asm-offsets.h generic-y += kvm_types.h generic-y += mcs_spinlock.h generic-y += mmzone.h +generic-y += ring_buffer.h
arch/sh/include/asm/Kbuild +1 -0
@@ -3,4 +3,5 @@ generated-y += syscall_table.h generic-y += kvm_para.h generic-y += mcs_spinlock.h generic-y += parport.h +generic-y += ring_buffer.h generic-y += text-patching.h
arch/sparc/include/asm/Kbuild +1 -0
@@ -4,4 +4,5 @@ generated-y += syscall_table_64.h generic-y += agp.h generic-y += kvm_para.h generic-y += mcs_spinlock.h +generic-y += ring_buffer.h generic-y += text-patching.h
arch/um/include/asm/Kbuild +1 -0
@@ -18,6 +18,7 @@ generic-y += module.lds.h generic-y += parport.h generic-y += percpu.h generic-y += preempt.h +generic-y += ring_buffer.h generic-y += runtime-const.h generic-y += softirq_stack.h generic-y += switch_to.h
arch/x86/include/asm/Kbuild +1 -0
@@ -14,3 +14,4 @@ generic-y += early_ioremap.h generic-y += fprobe.h generic-y += mcs_spinlock.h generic-y += mmzone.h +generic-y += ring_buffer.h
arch/xtensa/include/asm/Kbuild +1 -0
@@ -6,5 +6,6 @@ generic-y += mcs_spinlock.h generic-y += parport.h generic-y += qrwlock.h generic-y += qspinlock.h +generic-y += ring_buffer.h generic-y += user.h generic-y += text-patching.h
include/asm-generic/ring_buffer.h new file +13 -0
@@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Generic arch dependent ring_buffer macros. +*/ +#ifndef __ASM_GENERIC_RING_BUFFER_H__ +#define __ASM_GENERIC_RING_BUFFER_H__ + +#include <linux/cacheflush.h> + +/* Flush cache on ring buffer range if needed. Do nothing by default. */ +#define arch_ring_buffer_flush_range (start, end) do { } while (0) + +#endif /* __ASM_GENERIC_RING_BUFFER_H__ */
kernel/trace/ring_buffer.c +22 -0
@@ -5,6 +5,7 @@* Copyright (C) 2008 Steven Rostedt <[email protected]> */ #include <linux/trace_recursion.h> +#include <linux/panic_notifier.h> #include <linux/trace_events.h> #include <linux/ring_buffer.h> #include <linux/trace_clock.h>
@@ -29,6 +30,7 @@#include <linux/oom.h> #include <linux/mm.h> +#include <asm/ring_buffer.h> #include <asm/local64.h> #include <asm/local.h> #include <asm/setup.h>
@@ -553,6 +555,7 @@ struct trace_buffer {unsigned long range_addr_start;unsigned long range_addr_end; +struct notifier_block flush_nb;struct ring_buffer_meta *meta;
@@ -2455,6 +2458,16 @@ static void rb_free_cpu_buffer(struct rikfree (cpu_buffer); } +/* Stop recording on a persistent buffer and flush cache if needed. */ +static int rb_flush_buffer_cb (struct notifier_block *nb,unsigned long event,void *data) +{ + struct trace_buffer *buffer = container_of(nb, struct trace_buffer, flush_nb); + +ring_buffer_record_off (buffer); +arch_ring_buffer_flush_range (buffer->range_addr_start, buffer->range_addr_end); +return NOTIFY_DONE ; +} + static struct trace_buffer *alloc_buffer(unsigned long size, unsigned flags, int order, unsigned long start, unsigned long end,
@@ -2574,6 +2587,12 @@ static struct trace_buffer *alloc_buffermutex_init (&buffer->mutex); +/* Persistent ring buffer needs to flush cache before reboot. */ +if (start && end) { + buffer->flush_nb.notifier_call = rb_flush_buffer_cb; +atomic_notifier_chain_register (&panic_notifier_list, &buffer->flush_nb); + } +return_ptr (buffer); fail_free_buffers:
@@ -2661,6 +2680,9 @@ ring_buffer_free(struct trace_buffer *bu {int cpu; +if (buffer->range_addr_start && buffer->range_addr_end) +atomic_notifier_chain_unregister (&panic_notifier_list, &buffer->flush_nb); +cpuhp_state_remove_instance (CPUHP_TRACE_RB_PREPARE , &buffer->node);irq_work_sync (&buffer->irq_work.work);
Greg Kroah-Hartman
maintainerPATCH 83/377 ipv6: ioam: add NULL check for idev in ipv6_hop_ioam()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Justin Iurman <[email protected]>
commit d4ea0dfd75011b78cebf3808f98ac4c4f51a6fb9 upstream.
Reported by Sashiko:
The function ipv6_hop_ioam() accesses __in6_dev_get(skb->dev)->cnf.ioam6_enabled without validating the returned idev pointer. Because addrconf_ifdown() can concurrently clear dev->ip6_ptr via RCU, __in6_dev_get() can return NULL during interface teardown, which could cause a NULL pointer dereference when processing an IOAM Hop-by-Hop option.
Let's add a check and use SKB_DROP_REASON_IPV6DISABLED accordingly.
--- net/ipv6/exthdrs.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
net/ipv6/exthdrs.c +13 -2
@@ -910,16 +910,27 @@ static bool ipv6_hop_ra(struct sk_buff *static bool ipv6_hop_ioam (struct sk_buff *skb,int optoff) { +enum skb_drop_reason drop_reason;struct ioam6_trace_hdr *trace;struct ioam6_namespace *ns; +struct inet6_dev *idev;struct ioam6_hdr *hdr; + drop_reason =SKB_DROP_REASON_IP_INHDR ; +/* Bad alignment (must be 4n-aligned) */ if (optoff &3 ) goto drop; +/* Does the device still have IPv6 configuration? */ + idev =__in6_dev_get (skb->dev); +if (!idev) { + drop_reason =SKB_DROP_REASON_IPV6DISABLED ; + goto drop; + } +/* Ignore if IOAM is not enabled on ingress */ -if (!READ_ONCE (__in6_dev_get (skb->dev)->cnf.ioam6_enabled)) +if (!READ_ONCE (idev->cnf.ioam6_enabled)) goto ignore;/* Truncated Option header */
@@ -972,7 +983,7 @@ ignore:return true; drop: -kfree_skb_reason (skb,SKB_DROP_REASON_IP_INHDR ); +kfree_skb_reason (skb, drop_reason);return false; }
Greg Kroah-Hartman
maintainerPATCH 84/377 mptcp: pm: fix ADD_ADDR timer infinite retry on option space insufficient
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li Xiasong <[email protected]>
commit 51e398a3b8961b26a8c0a4ba9a777c5339791707 upstream.
When TCP option space is insufficient (e.g., when sending ADD_ADDR with an IPv6 address and port while tcp_timestamps is enabled), the original code jumped to out_unlock without clearing the addr_signal flag. This caused mptcp_pm_add_timer to keep rescheduling indefinitely, not sending ADD_ADDR, preventing subsequent addresses in the endpoint list from being announced.
Handle this case by clearing the ADD_ADDR signal and skipping the matching ADD_ADDR retransmission entry. The skip path cancels the matching timer (with id check) and advances PM state progression, preserving forward progress to subsequent PM work.
This cancellation is inherently best-effort. A concurrent add_timer callback may already be running and may acquire pm.lock before the cancel path updates entry state. In that case, one final ADD_ADDR transmit attempt can still be executed.
Once the cancel path sets entry->retrans_times to ADD_ADDR_RETRANS_MAX, the callback-side retrans_times check suppresses further ADD_ADDR retransmissions.
Note that when an ADD_ADDR is being prepared, a pure-ACK is queued. On the output side, it means that it is fine to skip non-pure-ACK packets, when drop_other_suboptions is set: a pure-ACK will be processed soon after.
--- net/mptcp/pm.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 46 insertions(+), 10 deletions(-)
net/mptcp/pm.c +46 -10
@@ -364,7 +364,13 @@ static void mptcp_pm_add_timer(struct tispin_lock_bh (&msk->pm.lock); -if (!mptcp_pm_should_add_signal_addr (msk)) { +/* The cancel path (mptcp_pm_del_add_timer()) can race with this +* callback. Once cancel updates retrans_times to MAX, suppress further +* retransmissions here. If this callback acquires pm.lock first, one +* final transmit attempt is still possible. +*/ +if (entry->retrans_times <ADD_ADDR_RETRANS_MAX && + !mptcp_pm_should_add_signal_addr (msk)) {pr_debug ("retransmit ADD_ADDR id=%d\n" , entry->addr.id);mptcp_pm_announce_addr (msk, &entry->addr, false);mptcp_pm_add_addr_send_ack (msk);
@@ -414,8 +420,12 @@ mptcp_pm_del_add_timer(struct mptcp_sock/* Note: entry might have been removed by another thread. * We hold rcu_read_lock() to ensure it is not freed under us. */ -if (stop_timer) -sk_stop_timer_sync (sk, &entry->add_timer); +if (stop_timer) { +if (check_id) +sk_stop_timer (sk, &entry->add_timer); +else +sk_stop_timer_sync (sk, &entry->add_timer); + }rcu_read_unlock ();return entry;
@@ -880,6 +890,7 @@ bool mptcp_pm_add_addr_signal(struct mpt struct mptcp_addr_info *addr, bool *echo, bool *drop_other_suboptions) { + bool skip_add_addr = false;int ret = false;u8 add_addr;u8 family;
@@ -901,24 +912,49 @@ bool mptcp_pm_add_addr_signal(struct mpt } *echo =mptcp_pm_should_add_signal_echo (msk); - port = !!(*echo ? msk->pm.remote.port : msk->pm.local.port); - - family = *echo ? msk->pm.remote.family : msk->pm.local.family; -if (remaining <mptcp_add_addr_len (family, *echo, port)) - goto out_unlock; -if (*echo) { *addr = msk->pm.remote; add_addr = msk->pm.addr_signal & ~BIT (MPTCP_ADD_ADDR_ECHO ); + port = !!msk->pm.remote.port; + family = msk->pm.remote.family; }else { *addr = msk->pm.local; add_addr = msk->pm.addr_signal & ~BIT (MPTCP_ADD_ADDR_SIGNAL ); + port = !!msk->pm.local.port; + family = msk->pm.local.family; } -WRITE_ONCE (msk->pm.addr_signal, add_addr); + +if (remaining <mptcp_add_addr_len (family, *echo, port)) { +struct net *net =sock_net ((struct sock *)msk); + +if (!*drop_other_suboptions) + goto out_unlock; + +if (*echo) { +MPTCP_INC_STATS (net,MPTCP_MIB_ECHOADDTXDROP ); + }else { + skip_add_addr = true; +MPTCP_INC_STATS (net,MPTCP_MIB_ADDADDRTXDROP ); + } + goto drop_signal_mark; + } + ret = true; +drop_signal_mark: +WRITE_ONCE (msk->pm.addr_signal, add_addr); + out_unlock:spin_unlock_bh (&msk->pm.lock); + +/* On pure-ACK option-space exhaustion, stop retrying this ADD_ADDR: +* clear the signal bit, cancel the matching retransmission timer, and +* let the PM state machine progress. +*/ +if (skip_add_addr) { +mptcp_pm_del_add_timer (msk, addr, true); +mptcp_pm_subflow_established (msk); + }return ret; }
Greg Kroah-Hartman
maintainerPATCH 85/377 vsock/vmci: fix UAF when peer resets connection during handshake
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Minh Nguyen <[email protected]>
commit 99e22ddf4edb63dc8382bc028af928056d3450cf upstream.
vmci_transport_recv_connecting_server() returned err = 0 for a peer RST in its default switch arm:
err = pkt->type == VMCI_TRANSPORT_PACKET_TYPE_RST ? 0 : -EINVAL;
That made vmci_transport_recv_listen() skip vsock_remove_pending(), leaving the pending socket on the listener's pending_links with sk_state = TCP_CLOSE while destroy: still dropped the explicit reference taken before schedule_delayed_work().
One second later vsock_pending_work() observed is_pending=true and performed full cleanup: vsock_remove_pending() then the two trailing sock_put(sk) calls -- the first reached refcount 0 and __sk_freed the socket, and the second wrote into the freed object:
BUG: KASAN: slab-use-after-free in refcount_warn_saturate Write of size 4 at addr ffff88800b1cac80 by task kworker Workqueue: events vsock_pending_work
Treat peer RST like any other unexpected packet type (err = -EINVAL). All destroy: arms now return err < 0, so vmci_transport_recv_listen() removes pending from pending_links synchronously and vsock_pending_work() takes the is_pending=false / !rejected branch, dropping only its own work reference. This also closes the multi-packet race Sashiko reported on v2: pending is removed from the list before any subsequent packet can find it.
The pre-existing sk_acceptq_removed() gap on the err < 0 path of vmci_transport_recv_listen() that Sashiko also noted is not introduced or changed by this patch.
Tested on lts-6.12.79 with KASAN: 52/100 unpatched -> 0/100 patched.
--- net/vmw_vsock/vmci_transport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/vmw_vsock/vmci_transport.c +1 -1
@@ -1156,7 +1156,7 @@ vmci_transport_recv_connecting_server(st/* Close and cleanup the connection. */ vmci_transport_send_reset (pending, pkt); skerr =EPROTO ; - err = pkt->type ==VMCI_TRANSPORT_PACKET_TYPE_RST ?0 : -EINVAL ; + err = -EINVAL ; goto destroy; }
Greg Kroah-Hartman
maintainerPATCH 86/377 vsock/virtio: reset connection on receiving queue overflow
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefano Garzarella <[email protected]>
commit a4f0b001782b21663d10df983b4b208195bec66c upstream.
When there is no more space to queue an incoming packet, the packet is silently dropped. This causes data loss without any notification to either peer, since there is no retransmission.
Under normal circumstances, this should never happen. However, it could happen if the other peer doesn't respect the credit, or if the skb overhead, which we recently began to take into account with commit 059b7dbd20a6 ("vsock/virtio: fix potential unbounded skb queue"), is too high.
Fix this by resetting the connection and setting the local socket error to ENOBUFS when virtio_transport_recv_enqueue() can no longer queue a packet, so both peers are explicitly notified of the failure rather than silently losing data.
--- net/vmw_vsock/virtio_transport_common.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
net/vmw_vsock/virtio_transport_common.c +15 -5
@@ -1335,7 +1335,7 @@ destroy:return err; } -static void +static bool virtio_transport_recv_enqueue (struct vsock_sock *vsk,struct sk_buff *skb) {
@@ -1350,10 +1350,8 @@ virtio_transport_recv_enqueue(struct vsospin_lock_bh (&vvs->rx_lock); can_enqueue =virtio_transport_inc_rx_pkt (vvs, len); -if (!can_enqueue) { - free_pkt = true; +if (!can_enqueue) goto out; - }if (le32_to_cpu (hdr->flags) &VIRTIO_VSOCK_SEQ_EOM ) vvs->msg_count++;
@@ -1393,6 +1391,8 @@ out:spin_unlock_bh (&vvs->rx_lock);if (free_pkt)kfree_skb (skb); + +return can_enqueue; } static int
@@ -1405,7 +1405,17 @@ virtio_transport_recv_connected(struct sswitch (le16_to_cpu (hdr->op)) {case VIRTIO_VSOCK_OP_RW : -virtio_transport_recv_enqueue (vsk, skb); +if (!virtio_transport_recv_enqueue (vsk, skb)) { +/* There is no more space to queue the packet, so let's +* close the connection; otherwise, we'll lose data. +*/ + (void )virtio_transport_reset (vsk, skb); +virtio_transport_do_close (vsk, true); + sk->sk_err =ENOBUFS ; +sk_error_report (sk); +vsock_remove_sock (vsk); +break ; + }vsock_data_ready (sk);return err;case VIRTIO_VSOCK_OP_CREDIT_REQUEST :
Greg Kroah-Hartman
maintainerPATCH 87/377 ice: fix VF queue configuration with low MTU values
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jose Ignacio Tornos Martinez <[email protected]>
commit 3ba4dd024d26372733d1c02e13e076c6016e3320 upstream.
The ice driver's VF queue configuration validation rejects databuffer_size values below 1024 bytes, which prevents VFs from using MTU values below 871 bytes.
The iavf driver calculates databuffer_size based on the MTU using:
databuffer_size = ALIGN(MTU + LIBETH_RX_LL_LEN, 128)
where LIBETH_RX_LL_LEN = 26 (ETH_HLEN + 2*VLAN_HLEN + ETH_FCS_LEN).
For MTU values below 871:
MTU 870: 870 + 26 = 896, aligned to 128 = 896 (< 1024, rejected) MTU 871: 871 + 26 = 897, aligned to 128 = 1024 (>= 1024, accepted)
The 1024-byte minimum seems unnecessarily restrictive, because the hardware supports databuffer_size as low as 128 bytes (the alignment boundary), which should allow MTU values down to the standard minimum of 68 bytes.
I haven't found the reason why the limit was configured in the commit 9c7dd7566d18 ("ice: add validation in OP_CONFIG_VSI_QUEUES VF message"), so with no more information and since it is working, change the minimum databuffer_size validation from 1024 to 128 bytes to allow standard low MTU values while still preventing invalid configurations.
--- drivers/net/ethernet/intel/ice/virt/queues.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/ice/virt/queues.c +1 -1
@@ -840,7 +840,7 @@ int ice_vc_cfg_qs_msg(struct ice_vf *vf,if (qpi->rxq.databuffer_size !=0 && (qpi->rxq.databuffer_size > ((16 *1024 ) -128 ) || - qpi->rxq.databuffer_size <1024 )) + qpi->rxq.databuffer_size <128 )) goto error_param; ring->rx_buf_len = qpi->rxq.databuffer_size; if (qpi->rxq.max_pkt_size > max_frame_size ||
Greg Kroah-Hartman
maintainerPATCH 88/377 wifi: ath11k: clear shared SRNG pointer state on restart
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kyle Farnung <[email protected]>
commit f51e4b3b5574ad8cb5b16b11f8a1452147ece87a upstream.
LMAC rings reuse the shared rdp/wrp pointer buffers without going through the normal SRNG hw-init path that zeros non-LMAC ring pointers. After restart, ath11k_hal_srng_clear() can therefore hand stale hp/tp state from the previous firmware instance back to the new one.
Clear the shared pointer buffers while keeping the allocations in place so restart still avoids reallocating SRNG DMA memory, but starts with fresh ring-pointer state.
--- drivers/net/wireless/ath/ath11k/hal.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath11k/hal.c +11 -3
@@ -1388,14 +1388,22 @@ EXPORT_SYMBOL(ath11k_hal_srng_deinit);void ath11k_hal_srng_clear (struct ath11k_base *ab) { -/* No need to memset rdp and wrp memory since each individual -* segment would get cleared in ath11k_hal_srng_src_hw_init() -* and ath11k_hal_srng_dst_hw_init(). +/* +* Preserve the shared pointer buffers, but clear the previous +* firmware instance's hp/tp state before handing them back to FW. +* LMAC rings reuse this shared memory without going through the +* normal SRNG hw-init path that zeros non-LMAC ring pointers. */ memset (ab->hal.srng_list,0 ,sizeof (ab->hal.srng_list));memset (ab->hal.shadow_reg_addr,0 ,sizeof (ab->hal.shadow_reg_addr)); +if (ab->hal.rdp.vaddr) +memset (ab->hal.rdp.vaddr,0 , +sizeof (*ab->hal.rdp.vaddr) *HAL_SRNG_RING_ID_MAX ); +if (ab->hal.wrp.vaddr) +memset (ab->hal.wrp.vaddr,0 , +sizeof (*ab->hal.wrp.vaddr) *HAL_SRNG_NUM_LMAC_RINGS ); ab->hal.avail_blk_resource =0 ; ab->hal.current_blk_index =0 ; ab->hal.num_shadow_reg_configured =0 ;
Greg Kroah-Hartman
maintainerPATCH 89/377 wifi: iwlwifi: mvm: fix driver-set TX rates on old devices
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
commit fb84b5cbcaab3ca0f4e961d92a40ed7f3aac483b upstream.
On old devices such as 7265D, rates are still encoded in version 1 format, which doesn't use the CCK/OFDM rate index (0-3/0-7) but rather their PLCP value (e.g. 10 for 1 Mbps CCK rate.)
While introducing v3 rates, I changed the driver from internally handling v1 rates and converting to v2, to internally handling v3 and converting to v1 or v2 according to the firmware. I accordingly changed the code in iwl_mvm_mac80211_idx_to_hwrate() to no longer have different values for different APIs. This was correct.
However, I later reverted this part of the change, because it was reported that I had broken beacon rates, causing a FW assert/crash. This caused TX_CMD rates to be set incorrectly, potentially causing a warning when reported back from the device as having been used.
Fix this (hopefully correctly now) by handling beacon rates in the TX_CMD that's embedded in the beacon template command separately. Restore iwl_mvm_mac80211_idx_to_hwrate() to return only the rate index, not PLCP value, fixing the real TX_CMD.
--- drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 27 ++++++++++++++-------- drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 14 +++-------- 2 files changed, 22 insertions(+), 19 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c +18 -9
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* -* Copyright (C) 2012-2014, 2018-2025 Intel Corporation +* Copyright (C) 2012-2014, 2018-2026 Intel Corporation * Copyright (C) 2013-2014 Intel Mobile Communications GmbH * Copyright (C) 2015-2017 Intel Deutschland GmbH */
@@ -938,13 +938,18 @@ u8 iwl_mvm_mac_ctxt_get_lowest_rate(struu16 iwl_mvm_mac_ctxt_get_beacon_flags (const struct iwl_fw *fw,u8 rate_idx) { -u16 flags =iwl_mvm_mac80211_idx_to_hwrate (fw, rate_idx);bool is_new_rate =iwl_fw_lookup_cmd_ver (fw,BEACON_TEMPLATE_CMD ,0 ) >10 ; +u16 flags =0 ;if (rate_idx <=IWL_LAST_CCK_RATE ) flags |= is_new_rate ?IWL_MAC_BEACON_CCK :IWL_MAC_BEACON_CCK_V1 ; +if (iwl_fw_lookup_cmd_ver (fw,TX_CMD ,0 ) >8 ) + flags |=iwl_mvm_mac80211_idx_to_hwrate (fw, rate_idx); +else + flags |=iwl_fw_rate_idx_to_plcp (rate_idx); +return flags; }
@@ -973,6 +978,7 @@ static void iwl_mvm_mac_ctxt_set_tx(stru {struct iwl_mvm_vif *mvmvif =iwl_mvm_vif_from_mac80211 (vif);struct ieee80211_tx_info *info; +u32 rate_n_flags =0 ;u8 rate;u32 tx_flags;
@@ -992,18 +998,21 @@ static void iwl_mvm_mac_ctxt_set_tx(stru IWL_UCODE_TLV_CAPA_BEACON_ANT_SELECTION)) {iwl_mvm_toggle_tx_ant (mvm, &mvm->mgmt_last_antenna_idx); - tx_params->rate_n_flags = -cpu_to_le32 (BIT (mvm->mgmt_last_antenna_idx) << -RATE_MCS_ANT_POS ); + rate_n_flags |=BIT (mvm->mgmt_last_antenna_idx) << +RATE_MCS_ANT_POS ; } rate =iwl_mvm_mac_ctxt_get_beacon_rate (mvm, info, vif); - tx_params->rate_n_flags |= -cpu_to_le32 (iwl_mvm_mac80211_idx_to_hwrate (mvm->fw, rate)); -if (rate ==IWL_FIRST_CCK_RATE ) - tx_params->rate_n_flags |=cpu_to_le32 (RATE_MCS_CCK_MSK_V1 ); +if (rate <IWL_FIRST_OFDM_RATE ) + rate_n_flags |=RATE_MCS_MOD_TYPE_CCK ; +else + rate_n_flags |=RATE_MCS_MOD_TYPE_LEGACY_OFDM ; + + rate_n_flags |=iwl_mvm_mac80211_idx_to_hwrate (mvm->fw, rate); + tx_params->rate_n_flags =iwl_mvm_v3_rate_to_fw (rate_n_flags, + mvm->fw_rates_ver); } int iwl_mvm_mac_ctxt_send_beacon_cmd(struct iwl_mvm *mvm,
drivers/net/wireless/intel/iwlwifi/mvm/utils.c +4 -10
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* -* Copyright (C) 2012-2014, 2018-2025 Intel Corporation +* Copyright (C) 2012-2014, 2018-2026 Intel Corporation * Copyright (C) 2013-2014 Intel Mobile Communications GmbH * Copyright (C) 2015-2017 Intel Deutschland GmbH */
@@ -159,15 +159,9 @@ int iwl_mvm_legacy_rate_to_mac80211_idx(u8 iwl_mvm_mac80211_idx_to_hwrate (const struct iwl_fw *fw,int rate_idx) { -if (iwl_fw_lookup_cmd_ver (fw,TX_CMD ,0 ) >8 ) -/* In the new rate legacy rates are indexed: -* 0 - 3 for CCK and 0 - 7 for OFDM. -*/ -return (rate_idx >=IWL_FIRST_OFDM_RATE ? - rate_idx -IWL_FIRST_OFDM_RATE : - rate_idx); - -return iwl_fw_rate_idx_to_plcp (rate_idx); +return rate_idx >=IWL_FIRST_OFDM_RATE ? + rate_idx -IWL_FIRST_OFDM_RATE : + rate_idx; }u8 iwl_mvm_mac80211_ac_to_ucode_ac (enum ieee80211_ac_numbers ac)
Greg Kroah-Hartman
maintainerPATCH 90/377 wifi: iwlwifi: mld: stop TX during firmware restart
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sheroz Juraev <[email protected]>
commit 2becb38a3e217ef2b2f42fddd7db7a25905ec291 upstream.
When iwlwifi firmware crashes (e.g., NMI_INTERRUPT_UNKNOWN on Intel BE201/Wi-Fi 7), iwl_mld_nic_error() sets mld->fw_status.in_hw_restart to true. However, iwl_mld_tx_from_txq() does not check this flag before dequeuing frames from mac80211 and pushing them to the transport layer.
Since the firmware is dead, iwl_trans_tx() returns -EIO for each frame, which then gets freed immediately. Under high-throughput conditions (e.g., Tailscale UDP traffic or active SSH sessions), this creates a tight dequeue-send-fail-free loop that wastes CPU cycles and generates rapid skb allocation churn, leading to memory pressure from slab fragmentation.
The RX path already has this guard (iwl_mld_rx_mpdu checks in_hw_restart at rx.c:1906), and so does the TXQ allocation worker (iwl_mld_add_txqs_wk at tx.c:156). Add the same guard to iwl_mld_tx_from_txq() to stop all TX during firmware restart.
Frames left in mac80211's TXQs are naturally drained after restart completes, when queue reallocation triggers iwl_mld_tx_from_txq() via iwl_mld_add_txq_list(), or when new upper-layer traffic invokes wake_tx_queue.
Tested on ASUS Zenbook 14 UX3405CA with Intel BE201 (Wi-Fi 7) on kernel 6.19.5 where the firmware crashes approximately every 10-15 minutes under Tailscale traffic.
--- drivers/net/wireless/intel/iwlwifi/mld/tx.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/net/wireless/intel/iwlwifi/mld/tx.c +10 -0
@@ -965,6 +965,16 @@ void iwl_mld_tx_from_txq(struct iwl_mldu8 zero_addr[ETH_ALEN ] = {};/* +* Don't transmit during firmware restart. The firmware is dead, +* so iwl_trans_tx() would return -EIO for each frame. Avoid the +* overhead of dequeuing from mac80211 only to immediately free +* the skbs, and the potential memory pressure from rapid skb +* allocation churn during high-throughput restart scenarios. +*/ +if (unlikely (mld->fw_status.in_hw_restart)) +return ; + +/* * No need for threads to be pending here, they can leave the first * taker all the work. *
Greg Kroah-Hartman
maintainerPATCH 91/377 ipv4: raw: reject IP_HDRINCL packets with ihl < 5
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Bommarito <[email protected]>
commit 915fab69823a14c170dbaa3b41978768e0fe62fc upstream.
raw_send_hdrinc() validates that the caller-supplied IPv4 header fits within the message length:
iphlen = iph->ihl * 4;
err = -EINVAL;
if (iphlen > length)
goto error_free;
if (iphlen >= sizeof(*iph)) {
/* fix up saddr, tot_len, id, csum, transport_header */
}It does not, however, reject ihl < 5. For such a packet the "if (iphlen >= sizeof(*iph))" branch is skipped, leaving the crafted iphdr untouched, but the packet is still handed to __ip_local_out() and onward. Downstream consumers that read iph->ihl assume a sane value: net/ipv4/ah4.c:ah_output() in particular subtracts sizeof(struct iphdr) from top_iph->ihl * 4 and passes the (signed-int-negative, then cast to size_t) result to memcpy(), producing an OOB access of length close to SIZE_MAX and a host kernel panic.
An IPv4 header with ihl < 5 is malformed by definition (RFC 791:
"Internet Header Length is the length of the internet header in 32 bit words ... Note that the minimum value for a correct header is 5."). The kernel should not be willing to inject such a packet into its own output path.
Reject "iphlen < sizeof(*iph)" alongside the existing "iphlen > length" check. This matches the principle that locally constructed packets that re-enter the IP stack must pass the same basic sanity tests that a foreign packet would be subjected to.
Once this lands, the "if (iphlen >= sizeof(*iph))" wrapper around the fixup branch becomes redundant; left in place to keep the patch minimal and backport-friendly. A follow-up can unwrap it.
Note that commit 86f4c90a1c5c ("ipv4, ipv6: ensure raw socket message is big enough to hold an IP header") ensures the message buffer is large enough to hold an iphdr, but does not constrain the self-reported iph->ihl.
Reachability: the malformed packet source is any caller with CAP_NET_RAW, including an unprivileged process in a user+net namespace on a kernel with CONFIG_USER_NS=y. The reproduced AH crash also requires a matching xfrm AH policy on the outgoing route; a container granted CAP_NET_ADMIN can install that state and policy in its netns. Loopback bypasses xfrm_output, so the trigger uses a real netdev.
Reproduced on UML + KASAN: kernel-mode fault at addr 0x0 with memcpy_orig at the crash site. Same shape reproduces inside a rootless Docker container with --cap-add NET_ADMIN on a stock distro kernel.
--- net/ipv4/raw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/raw.c +1 -1
@@ -390,7 +390,7 @@ static int raw_send_hdrinc(struct sock ** in, reject the frame as invalid */ err = -EINVAL ; -if (iphlen > length) +if (iphlen > length || iphlen <sizeof (*iph)) goto error_free;if (iphlen >=sizeof (*iph)) {
Greg Kroah-Hartman
maintainerPATCH 92/377 ixgbevf: fix use-after-free in VEPA multicast source pruning
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Bommarito <[email protected]>
commit 5d49b568c188dc77199d8d2b959c91da8cc27cf1 upstream.
ixgbevf_clean_rx_irq() prunes frames whose source MAC matches the VF's own address (VEPA multicast workaround) by freeing the skb and continuing to the next descriptor:
dev_kfree_skb_irq(skb);
continue;The skb pointer is declared outside the while loop and persists across iterations. Because the continue skips the "skb = NULL" reset at the bottom of the loop, the next iteration enters the "else if (skb)" path and calls ixgbevf_add_rx_frag() on the freed skb, dereferencing skb_shinfo(skb)->nr_frags - a use-after-free in NAPI softirq context.
The sibling driver iavf already handles this correctly by nulling the pointer before continuing. Apply the same pattern here.
I do not have ixgbevf hardware; the bug was found by static analysis (scan_drop_continue_loops.py + semgrep drop_continue_in_loop, multi-tool corroboration with the highest score in the scan). The UAF was confirmed under KASAN by loading a test module that reproduces the exact code pattern (alloc skb, kfree_skb, then read skb_shinfo(skb)->nr_frags):
BUG: KASAN: slab-use-after-free in ixgbevf_uaf_test_init+0x100/0x1000 Read of size 8 at addr 000000006163ae78 by task insmod/30 freed 208-byte region [000000006163adc0, 000000006163ae90)
QEMU emulates igb (82576) but not ixgbe (82599), and the igbvf VF driver does not include the VEPA source pruning path, so a full end-to-end reproduction with emulated hardware was not possible.
--- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +1 -0
@@ -1221,6 +1221,7 @@ static int ixgbevf_clean_rx_irq(struct i ether_addr_equal(rx_ring->netdev->dev_addr, eth_hdr(skb)->h_source)) {dev_kfree_skb_irq (skb); + skb =NULL ;continue ; }
Greg Kroah-Hartman
maintainerPATCH 93/377 rbd: eliminate a race in lock_dwork draining on unmap
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilya Dryomov <[email protected]>
commit 9fc75b71fdd38465c76c6f6a884cdd4ae3c72d90 upstream.
Given how rbd_lock_add_request() and rbd_img_exclusive_lock() are written, lock_dwork may be (re)queued more than it's actually needed:
for example in case a new I/O request comes in while we are in the middle of rbd_acquire_lock() on behalf of another I/O request. This is expected and with rbd_release_lock() preemptively canceling lock_dwork is benign under normal operation.
A more problematic example is maybe_kick_acquire():
if (have_requests || delayed_work_pending(&rbd_dev->lock_dwork)) {
dout("%s rbd_dev %p kicking lock_dwork\n", __func__, rbd_dev);
mod_delayed_work(rbd_dev->task_wq, &rbd_dev->lock_dwork, 0);
}It's not unrealistic for lock_dwork to get canceled right after delayed_work_pending() returns true and for mod_delayed_work() to requeue it right there anyway. This is a classic TOCTOU race.
When it comes to unmapping the image, there is an implicit assumption of no self-initiated exclusive lock activity past the point of return from rbd_dev_image_unlock() which unlocks the lock if it happens to be held. This unlock is assumed to be final and lock_dwork (as well as all other exclusive lock tasks, really) isn't expected to get queued again. However, lock_dwork is canceled only in cancel_tasks_sync() (i.e. later in the unmap sequence) and on top of that the cancellation can get in effect nullified by maybe_kick_acquire(). This may result in rbd_acquire_lock() executing after rbd_dev_device_release() and rbd_dev_image_release() run and free and/or reset a bunch of things. One of the possible failure modes then is a violated
rbd_assert(rbd_image_format_valid(rbd_dev->image_format));
in rbd_dev_header_info() which is called via rbd_dev_refresh() from rbd_post_acquire_action().
Redo exclusive lock task draining to provide saner semantics and try to meet the assumptions around rbd_dev_image_unlock().
--- drivers/block/rbd.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
drivers/block/rbd.c +8 -12
@@ -4565,24 +4565,12 @@ out:return ret; } -static void cancel_tasks_sync (struct rbd_device *rbd_dev) -{ -dout ("%s rbd_dev %p\n" , __func__, rbd_dev); - -cancel_work_sync (&rbd_dev->acquired_lock_work); -cancel_work_sync (&rbd_dev->released_lock_work); -cancel_delayed_work_sync (&rbd_dev->lock_dwork); -cancel_work_sync (&rbd_dev->unlock_work); -} -/* * header_rwsem must not be held to avoid a deadlock with * rbd_dev_refresh() when flushing notifies. */ static void rbd_unregister_watch (struct rbd_device *rbd_dev) { -cancel_tasks_sync (rbd_dev); -mutex_lock (&rbd_dev->watch_mutex);if (rbd_dev->watch_state ==RBD_WATCH_STATE_REGISTERED )__rbd_unregister_watch (rbd_dev);
@@ -6548,10 +6536,18 @@ out_err:static void rbd_dev_image_unlock (struct rbd_device *rbd_dev) { +dout ("%s rbd_dev %p\n" , __func__, rbd_dev); + +disable_delayed_work_sync (&rbd_dev->lock_dwork); +disable_work_sync (&rbd_dev->unlock_work); +down_write (&rbd_dev->lock_rwsem);if (__rbd_is_lock_owner (rbd_dev))__rbd_release_lock (rbd_dev);up_write (&rbd_dev->lock_rwsem); + +flush_work (&rbd_dev->acquired_lock_work); +flush_work (&rbd_dev->released_lock_work); }/*
Greg Kroah-Hartman
maintainerPATCH 94/377 lsm: hold cred_guard_mutex for lsm_set_self_attr()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stephen Smalley <[email protected]>
commit 4a9b16541ad3faf8bccb398532bf3f8b6bbf1188 upstream.
Just as proc_pid_attr_write() already does before calling the LSM hook. This only matters for SELinux and AppArmor which check whether the process is being ptraced and if so, whether to allow the transition.
--- security/lsm_syscalls.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
security/lsm_syscalls.c +8 -1
@@ -55,7 +55,14 @@ u64 lsm_name_to_attr(const char *name) SYSCALL_DEFINE4(lsm_set_self_attr, unsigned int, attr, struct lsm_ctx __user *, ctx, u32, size, u32, flags) { -return security_setselfattr (attr, ctx, size, flags); +int rc; + + rc =mutex_lock_interruptible (¤t->signal->cred_guard_mutex); +if (rc <0 ) +return rc; + rc =security_setselfattr (attr, ctx, size, flags); +mutex_unlock (¤t->signal->cred_guard_mutex); +return rc; }/**
Greg Kroah-Hartman
maintainerPATCH 95/377 octeontx2-af: CGX: add bounds check to cgx_speed_mbps index
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sam Daly <[email protected]>
commit c0bf0a4f3f1f5f57aa83e1400ba4f56f0abfd542 upstream.
cgx_speed_mbps has 13 elements but RESP_LINKSTAT_SPEED can yield values 0-15. If it returns a value >= 13, this causes an out-of-bounds array access. Add a bounds check and default to speed 0 if the index is out of range.
--- drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/ethernet/marvell/octeontx2/af/cgx.c +6 -1
@@ -1294,13 +1294,18 @@ static inline void link_status_user_formstruct cgx_link_user_info *linfo, struct cgx *cgx, u8 lmac_id) { + unsigned int speed; + linfo->link_up =FIELD_GET (RESP_LINKSTAT_UP , lstat); linfo->full_duplex =FIELD_GET (RESP_LINKSTAT_FDUPLEX , lstat); - linfo->speed = cgx_speed_mbps[FIELD_GET (RESP_LINKSTAT_SPEED , lstat)]; linfo->an =FIELD_GET (RESP_LINKSTAT_AN , lstat); linfo->fec =FIELD_GET (RESP_LINKSTAT_FEC , lstat); linfo->lmac_type_id =FIELD_GET (RESP_LINKSTAT_LMAC_TYPE , lstat); + speed =FIELD_GET (RESP_LINKSTAT_SPEED , lstat); + linfo->speed = speed <ARRAY_SIZE (cgx_speed_mbps) ? + cgx_speed_mbps[speed] :0 ; +if (linfo->lmac_type_id >=LMAC_MODE_MAX ) {dev_err (&cgx->pdev->dev,"Unknown lmac_type_id %d reported by firmware on cgx port%d:%d" , linfo->lmac_type_id, cgx->cgx_id, lmac_id);
Greg Kroah-Hartman
maintainerPATCH 96/377 octeontx2-pf: fix double free in rvu_rep_rsrc_init()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dawei Feng <[email protected]>
commit e8fb3de2a8effcaf62bec2c56b93d8bb480371d1 upstream.
rvu_rep_rsrc_init() allocates queue memory before calling otx2_init_hw_resources(). When hardware resource setup fails, otx2_init_hw_resources() already unwinds the partially initialized SQ, CQ, and aura state before returning an error. The representor error path then calls otx2_free_hw_resources() again and can free the same resources a second time.
Fix this by splitting the cleanup labels so that a failure from otx2_init_hw_resources() only releases queue memory. Keep the otx2_free_hw_resources() call for failures that happen after hardware resource initialization completed successfully.
The bug was first flagged by an experimental analysis tool we are developing for kernel memory-management bugs while analyzing v6.13-rc1. The tool is still under development and is not yet publicly available. Manual inspection confirms that the bug is still present in v7.1-rc3.
Runtime validation was not performed because reproducing this path requires OcteonTX2 representor hardware.
--- drivers/net/ethernet/marvell/octeontx2/nic/rep.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/marvell/octeontx2/nic/rep.c +2 -1
@@ -609,7 +609,7 @@ static int rvu_rep_rsrc_init(struct otx2 err =otx2_init_hw_resources (priv);if (err) - goto err_free_rsrc; + goto err_free_mem;/* Set maximum frame size allowed in HW */ err =otx2_hw_set_mtu (priv, priv->hw.max_mtu);
@@ -621,6 +621,7 @@ static int rvu_rep_rsrc_init(struct otx2 err_free_rsrc:otx2_free_hw_resources (priv); +err_free_mem:otx2_free_queue_mem (qset);return err; }
Greg Kroah-Hartman
maintainerPATCH 97/377 igc: fix potential skb leak in igc_fpe_xmit_smd_frame()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kohei Enju <[email protected]>
commit e935c37b8a94bb256fada6395a5d05e1c0c6bdaf upstream.
When igc_fpe_init_tx_descriptor() fails, no one takes care of an allocated skb, leaking it. [1]
Use dev_kfree_skb_any() on failure.
Tested on an I226 adapter with the following command, while injecting faults in igc_fpe_init_tx_descriptor() to trigger the error path.
# ethtool --set-mm $DEV verify-enabled on tx-enabled on pmac-enabled on
[1]
unreferenced object 0xffff888113c6cdc0 (size 224):
...
backtrace (crc be3d3fda):
kmem_cache_alloc_node_noprof+0x3b1/0x410
__alloc_skb+0xde/0x830
igc_fpe_xmit_smd_frame.isra.0+0xad/0x1b0
igc_fpe_send_mpacket+0x37/0x90
ethtool_mmsv_verify_timer+0x15e/0x300--- drivers/net/ethernet/intel/igc/igc_tsn.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/igc/igc_tsn.c +7 -1
@@ -109,10 +109,16 @@ static int igc_fpe_xmit_smd_frame(struct__netif_tx_lock (nq, cpu); err =igc_fpe_init_tx_descriptor (ring, skb, type); -igc_flush_tx_descriptors (ring); +if (err) + goto err_free_skb_any; +igc_flush_tx_descriptors (ring);__netif_tx_unlock (nq); +return 0 ; +err_free_skb_any: +__netif_tx_unlock (nq); +dev_kfree_skb_any (skb);return err; }
Greg Kroah-Hartman
maintainerPATCH 98/377 ice: fix locking around wait_event_interruptible_locked_irq
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jacob Keller <[email protected]>
commit 89bbff099bfc94888eb942d5b981592bbbe0c856 upstream.
Commit 50327223a8bb ("ice: add lock to protect low latency interface") introduced a wait queue used to protect the low latency timer interface. The queue is used with the wait_event_interruptible_locked_irq macro, which unlocks the wait queue lock while sleeping. The irq variant uses spin_lock_irq and spin_unlock_irq to manage this. The wait queue lock was previously locked using spin_lock_irqsave. This difference in lock variants could lead to issues, since wait_event would unlock the wait queue and restore interrupts while sleeping.
The ice_read_phy_tstamp_ll_e810() function is ultimately called through ice_read_phy_tstamp, which is called from ice_ptp_process_tx_tstamp or ice_ptp_clear_unexpected_tx_ready. The former is called through the miscellaneous IRQ thread function, while the latter is called from the service task work queue thread. Neither of these functions has interrupts disabled, so use spin_lock_irq instead of spin_lock_irqsave.
--- drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/net/ethernet/intel/ice/ice_ptp_hw.c +4 -5
@@ -4503,18 +4503,17 @@ static int ice_read_phy_tstamp_ll_e810(struct ice_hw *hw, u8 idx, u8 *hi, u32 *lo) { struct ice_e810_params *params = &hw->ptp.phy.e810; -unsigned long flags;u32 val;int err; -spin_lock_irqsave (¶ms->atqbal_wq.lock, flags); +spin_lock_irq (¶ms->atqbal_wq.lock);/* Wait for any pending in-progress low latency interrupt */ err =wait_event_interruptible_locked_irq (params->atqbal_wq, !(params->atqbal_flags &ATQBAL_FLAGS_INTR_IN_PROGRESS ));if (err) { -spin_unlock_irqrestore (¶ms->atqbal_wq.lock, flags); +spin_unlock_irq (¶ms->atqbal_wq.lock);return err; }
@@ -4529,7 +4528,7 @@ ice_read_phy_tstamp_ll_e810(struct ice_h REG_LL_PROXY_H);if (err) {ice_debug (hw,ICE_DBG_PTP ,"Failed to read PTP timestamp using low latency read\n" ); -spin_unlock_irqrestore (¶ms->atqbal_wq.lock, flags); +spin_unlock_irq (¶ms->atqbal_wq.lock);return err; }
@@ -4539,7 +4538,7 @@ ice_read_phy_tstamp_ll_e810(struct ice_h/* Read the low 32 bit value and set the TS valid bit */ *lo =rd32 (hw,REG_LL_PROXY_L ) |TS_VALID ; -spin_unlock_irqrestore (¶ms->atqbal_wq.lock, flags); +spin_unlock_irq (¶ms->atqbal_wq.lock);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 99/377 ice: fix setting promisc mode while adding VID filter
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marcin Szycik <[email protected]>
commit ebc8de716c9ec2be384abdc2dd866da26c6580d1 upstream.
There are at least two paths through which VSI promiscuous mode can be independently configured via ice_fltr_set_vsi_promisc():
- ice_vlan_rx_add_vid() (netdev op)
- ice_service_task() -> ... -> ice_set_promisc()
Both paths may try to program promiscuous mode concurrently. One such scenario is:
1. Add ice netdev to bond
2. Add the bond netdev to bridge
3. ice netdev enters allmulticast mode (IFF_ALLMULTI)
4. Service task programs promisc mode filter
5. Bridge -> bond calls ice_vlan_rx_add_vid()
Crucially, ice_vlan_rx_add_vid() fails if ice_fltr_set_vsi_promisc() returns any error, including -EEXIST. This causes VLAN filtering setup to fail on the bond interface. ice_set_promisc() already handles -EEXIST correctly.
Fix by adding the same -EEXIST check to ice_vlan_rx_add_vid(): if the promisc filter is already programmed, continue without returning error.
--- drivers/net/ethernet/intel/ice/ice_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/ice/ice_main.c +1 -1
@@ -3764,7 +3764,7 @@ int ice_vlan_rx_add_vid(struct net_devic ret =ice_fltr_set_vsi_promisc (&vsi->back->hw, vsi->idx,ICE_MCAST_VLAN_PROMISC_BITS , vid); -if (ret) +if (ret && ret != -EEXIST ) goto finish; }
Greg Kroah-Hartman
maintainerPATCH 100/377 ice: restore PTP Rx timestamp config after ethtool set-channels
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Grzegorz Nitka <[email protected]>
commit 975b564d195b13ca6ee1ef5e6a9561734898eb17 upstream.
When ethtool -L changes queue counts, ice_vsi_recfg_qs() closes and rebuilds the VSI, reallocating Rx rings. The newly allocated rings have ptp_rx cleared, so RX hardware timestamps are no longer attached to skb until hwtstamp configuration is applied again.
Restore timestamp mode after ice_vsi_open() in the queue reconfiguration path, matching reset/rebuild behavior and ensuring newly rebuilt Rx rings have PTP RX timestamping re-enabled.
Testing hints:
- run ptp4l application in client synchronization mode:
ptp4l -i ethX -m -s
- run PTP traffic
- change queue number on ethX netdev interface:
ethtool -L ethX combined new_queue_size
- observe ptp4l output
- expected result: no "received DELAY_REQ without timestamp" messages
--- drivers/net/ethernet/intel/ice/ice_main.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/ethernet/intel/ice/ice_main.c +6 -0
@@ -4186,6 +4186,12 @@ int ice_vsi_recfg_qs(struct ice_vsi *vsi }ice_pf_dcb_recfg (pf, locked);ice_vsi_open (vsi); +/* Rx rings are reallocated during VSI rebuild and lose their ptp_rx +* flag. Restore timestamp mode so newly allocated rings are set up +* for hardware Rx timestamping. +*/ +if (test_bit (ICE_FLAG_PTP_SUPPORTED , pf->flags)) +ice_ptp_restore_timestamp_mode (pf); goto done; rebuild_err:
Greg Kroah-Hartman
maintainerPATCH 101/377 wifi: cfg80211: advance loop vars in cfg80211_merge_profile()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: John Walker <[email protected]>
commit 7666dbb1bacc4ba522b96740cba7283d243d16e1 upstream.
cfg80211_merge_profile() reassembles a Multi-BSSID non-transmitted BSS profile that has been split across multiple consecutive MBSSID elements. Its while-loop calls
cfg80211_get_profile_continuation(ie, ielen, mbssid_elem, sub_elem)
but never advances mbssid_elem or sub_elem inside the body. Each iteration therefore searches for a continuation that follows the same fixed pair; the helper returns the same next_mbssid; and the same next_sub bytes are memcpy()'d into merged_ie at a growing offset until the buffer fills.
Advance both mbssid_elem and sub_elem to the just-consumed continuation so the next call to cfg80211_get_profile_continuation() searches for a further continuation beyond it (or returns NULL when none exists).
A specially-crafted malicious beacon can take advantage of this bug to cause the kernel to spend an excessive amount of time in cfg80211_merge_profile (up to as much as 2ms per beacon received), which could theoretically be abused in some way.
--- net/wireless/scan.c | 3 +++ 1 file changed, 3 insertions(+)
net/wireless/scan.c +3 -0
@@ -2475,6 +2475,9 @@ size_t cfg80211_merge_profile(const u8 *memcpy (merged_ie + copied_len, next_sub->data, next_sub->datalen); copied_len += next_sub->datalen; + + mbssid_elem = next_mbssid; + sub_elem = next_sub; }return copied_len;
Greg Kroah-Hartman
maintainerPATCH 102/377 af_unix: Fix UAF read of tail->len in unix_stream_data_wait()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jann Horn <[email protected]>
commit be309f8eae8b474a4a617eaae01324da996fc719 upstream.
unix_stream_data_wait() does skb_peek_tail(&sk->sk_receive_queue) without holding any lock that prevents SKBs on that queue from being dequeued and freed.
This has been the case since commit 79f632c71bea ("unix/stream: fix peeking with an offset larger than data in queue").
The first consequence of this is that the pointer comparison tail != last can be false even if last semantically refers to an already-freed SKB while tail is a new SKB allocated at the same address; which can cause unix_stream_data_wait() to wrongly keep blocking after new data has arrived, but only in a weird scenario where a peeking recv() and a normal recv() on the same socket are racing, which is probably not a real problem.
But since commit 2b514574f7e8 ("net: af_unix: implement splice for stream af_unix sockets"), tail is actually dereferenced, which can cause UAF in the following race scenario (where test_setup() runs single-threaded, and afterwards, test_thread1() and test_thread2() run concurrently in two threads:
```
static int socks[2];
void test_setup(void) {
socketpair(AF_UNIX, SOCK_STREAM, 0, socks);
send(socks[1], "A", 1, 0);
int peekoff = 1;
setsockopt(socks[0], SOL_SOCKET, SO_PEEK_OFF, &peekoff, sizeof(peekoff));
}
void test_thread1(void) {
char dummy;
recv(socks[0], &dummy, 1, MSG_PEEK);
}
void test_thread2(void) {
char dummy;
recv(socks[0], &dummy, 1, 0);
shutdown(socks[1], SHUT_WR);
}
```when racing like this:
```
thread1 thread2
unix_stream_read_generic
mutex_lock(&u->iolock)
skb_peek(&sk->sk_receive_queue)
skb_peek_next(skb, &sk->sk_receive_queue)
mutex_unlock(&u->iolock)
unix_stream_read_generic
unix_state_lock(sk)
skb_peek(&sk->sk_receive_queue)
unix_state_unlock(sk)
unix_stream_data_wait
unix_state_lock(sk)
tail = skb_peek_tail(&sk->sk_receive_queue)
spin_lock(&sk->sk_receive_queue.lock)
__skb_unlink(skb, &sk->sk_receive_queue)
spin_unlock(&sk->sk_receive_queue.lock)
consume_skb(skb) [frees the SKB]
`tail != last`: false
`tail`: true
`tail->len != last_len` ***UAF***
```Fix the UAF by removing the read of tail->len; checking tail->len would only make sense if SKBs in the receive queue of a UNIX socket could grow, which can no longer happen.
Kuniyuki explained:
Quoted 11 lines
When commit
869e7c62486e("net:af_unix: implement stream sendpage support") addedsendpage()support, data could be appended to the last skb in the receiver's queue.That's why we needed to check if the length of the last skb was changed while waiting for new data in
unix_stream_data_wait().However, commit
a0dbf5f818f9("af_unix: SupportMSG_SPLICE_PAGES") and commit57d44a354a43("unix: Convertunix_stream_sendpage()to useMSG_SPLICE_PAGES") refactoredsendmsg(), and now data is always added to a new skb.
That means this fix is not suitable for kernels before 6.5.
--- net/unix/af_unix.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
net/unix/af_unix.c +2 -9
@@ -2716,8 +2716,7 @@ static int unix_read_skb(struct sock *sk* Sleep until more data has arrived. But check for races.. */ static long unix_stream_data_wait (struct sock *sk,long timeo, -struct sk_buff *last,unsigned int last_len, -bool freezable) +struct sk_buff *last,bool freezable) {unsigned int state =TASK_INTERRUPTIBLE | freezable *TASK_FREEZABLE ;struct sk_buff *tail;
@@ -2730,7 +2729,6 @@ static long unix_stream_data_wait(struct tail =skb_peek_tail (&sk->sk_receive_queue); if (tail != last || - (tail && tail->len != last_len) || sk->sk_err || (sk->sk_shutdown & RCV_SHUTDOWN) || signal_pending(current) ||
@@ -2923,7 +2921,6 @@ static int unix_stream_read_generic(struint flags = state->flags;bool check_creds = false;struct scm_cookie scm; -unsigned int last_len;struct unix_sock *u;int copied =0 ;int err =0 ;
@@ -2969,7 +2966,6 @@ redo: goto unlock; } last = skb =skb_peek (&sk->sk_receive_queue); - last_len = last ? last->len :0 ; again: #if IS_ENABLED(CONFIG_AF_UNIX_OOB)
@@ -3003,8 +2999,7 @@ again:mutex_unlock (&u->iolock); - timeo =unix_stream_data_wait (sk, timeo, last, - last_len, freezable); + timeo =unix_stream_data_wait (sk, timeo, last, freezable);if (signal_pending (current)) { err =sock_intr_errno (timeo);
@@ -3021,7 +3016,6 @@ unlock:while (skip >=unix_skb_len (skb)) { skip -=unix_skb_len (skb); last = skb; - last_len = skb->len; skb =skb_peek_next (skb, &sk->sk_receive_queue);if (!skb) goto again;
@@ -3096,7 +3090,6 @@ unlock: skip =0 ; last = skb; - last_len = skb->len;unix_state_lock (sk); skb =skb_peek_next (skb, &sk->sk_receive_queue);if (skb)
Greg Kroah-Hartman
maintainerPATCH 103/377 wifi: mac80211: consume only present negotiated TTLM maps
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Bommarito <[email protected]>
commit a6e6ccd5bd07155c2add6c74ce1a5e68ad3b95ea upstream.
ieee80211_tid_to_link_map_size_ok() validates negotiated TTLM elements against the number of link-map entries indicated by link_map_presence. ieee80211_parse_neg_ttlm() must consume the same layout.
The parser advanced its cursor for every TID, including TIDs whose presence bit is clear and therefore have no map bytes in the element. A sparse map can then make a later present TID read past the validated element.
The bad bytes land in neg_ttlm->{up,down}link[tid] but are gated by valid_links before being applied to driver state, so a peer cannot turn the read into a policy change. Under KUnit + KASAN with an exact-sized element allocation the OOB read is reported as a slab-out-of-bounds; whether the same trigger fires under the production RX path depends on surrounding allocator state.
Advance the cursor only when the current TID has a map present.
--- net/mac80211/mlme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/mlme.c +1 -1
@@ -7959,6 +7959,7 @@ ieee80211_parse_neg_ttlm(struct ieee8021 "No active links for TID %d", tid);return -EINVAL ; } + pos += map_size; }else { map =0 ; }
@@ -7977,7 +7978,6 @@ ieee80211_parse_neg_ttlm(struct ieee8021default :return -EINVAL ; } - pos += map_size; }return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 104/377 cifs: Fix busy dentry used after unmounting
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhihao Cheng <[email protected]>
commit c68337442f03953237a94577beb468ab2662a851 upstream.
Since commit 340cea84f691c ("cifs: open files should not hold ref on superblock"), cifs file only holds the dentry ref_cnt, the cifs file close work(cfile->deferred) could be executed after unmounting, which will trigger a warning in generic_shutdown_super:
BUG: Dentry 00000000a14a6845{i=c,n=file} still in use (1) [unmount of
cifs cifs]The detailed processs is:
process A process B kworker
fd = open(PATH)
vfs_open
file->__f_path = *path // dentry->d_lockref.count = 1 cifs_open
cifs_new_fileinfo
cfile->dentry = dget(dentry) // dentry->d_lockref.count = 2
close(fd)
__fput
cifs_close
queue_delayed_work(deferredclose_wq, cfile->deferred)
dput(dentry) // dentry->d_lockref.count = 1
smb2_deferred_work_close
_cifsFileInfo_put
list_del(&cifs_file->flist)
umount
cleanup_mnt
deactivate_super
cifs_kill_sb
cifs_close_all_deferred_files_sb
cifs_close_all_deferred_files
// cannot find cfile, skip _cifsFileInfo_put
kill_anon_super
generic_shutdown_super
shrink_dcache_for_umount
umount_check
WARN ! // dentry->d_lockref.count = 1
cifsFileInfo_put_final
dput(cifs_file->dentry)
// dentry->d_lockref.count = 0Fix it by flushing 'deferredclose_wq' before calling kill_anon_super.
Fetch a reproducer in https://bugzilla.kernel.org/show_bug.cgi?id=221548.
--- fs/smb/client/cifsfs.c | 2 ++ 1 file changed, 2 insertions(+)
fs/smb/client/cifsfs.c +2 -0
@@ -338,6 +338,8 @@ static void cifs_kill_sb(struct super_bl/* Wait for all pending oplock breaks to complete */ flush_workqueue (cifsoplockd_wq); +/* Wait for all opened files to release */ +flush_workqueue (deferredclose_wq);/* finally release root dentry */ dput (cifs_sb->root);
Greg Kroah-Hartman
maintainerPATCH 105/377 tracing: Do not call map->ops->elt_free() if elt_alloc() fails
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masami Hiramatsu (Google) <[email protected]>
commit 8f0f5c4fb9df0e19a341e0c6ed8dc4fda9124f03 upstream.
In paths where tracing_map_elt_alloc() failed to allocate objects, the map->ops->elt_alloc() call was never successful. In this case, map->ops->elt_free() should not be called.
--- kernel/trace/tracing_map.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
kernel/trace/tracing_map.c +13 -4
@@ -386,13 +386,11 @@ static void tracing_map_elt_init_fields( } } -static void tracing_map_elt_free (struct tracing_map_elt *elt) +static void __tracing_map_elt_free (struct tracing_map_elt *elt) {if (!elt)return ; -if (elt->map->ops && elt->map->ops->elt_free) - elt->map->ops->elt_free (elt);kfree (elt->fields);kfree (elt->vars);kfree (elt->var_set);
@@ -400,6 +398,17 @@ static void tracing_map_elt_free(structkfree (elt); } +static void tracing_map_elt_free (struct tracing_map_elt *elt) +{ +if (!elt) +return ; + +/* Only objects initialized with alloc_elt() should be passed to free_elt().*/ +if (elt->map->ops && elt->map->ops->elt_free) + elt->map->ops->elt_free (elt); +__tracing_map_elt_free (elt); +} +static struct tracing_map_elt *tracing_map_elt_alloc (struct tracing_map *map) {struct tracing_map_elt *elt;
@@ -444,7 +453,7 @@ static struct tracing_map_elt *tracing_m }return elt; free: -tracing_map_elt_free (elt); +__tracing_map_elt_free (elt);return ERR_PTR (err); }
Greg Kroah-Hartman
maintainerPATCH 106/377 arm64: probes: Handle probes on hinted conditional branch instructions
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Murzin <[email protected]>
commit 2ccd8ff980b50e842481bae71102fa3883fc4377 upstream.
BC.cond instructions introduced by FEAT_HBC cannot be executed out-of-line, like other branch instructions. However, they can be simulated in the same way as B.cond instructions.
Extend the B.cond decoder mask to match BC.cond instructions as well, and handle them using the existing B.cond simulation path.
--- arch/arm64/include/asm/insn.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/include/asm/insn.h +1 -1
@@ -409,7 +409,7 @@ __AARCH64_INSN_FUNCS(cbz, 0x7F000000, 0x __AARCH64_INSN_FUNCS(cbnz, 0x7F000000, 0x35000000) __AARCH64_INSN_FUNCS(tbz, 0x7F000000, 0x36000000) __AARCH64_INSN_FUNCS(tbnz, 0x7F000000, 0x37000000) -__AARCH64_INSN_FUNCS(bcond, 0xFF000010, 0x54000000) +__AARCH64_INSN_FUNCS(bcond, 0xFF000000, 0x54000000) __AARCH64_INSN_FUNCS(svc, 0xFFE0001F, 0xD4000001) __AARCH64_INSN_FUNCS(hvc, 0xFFE0001F, 0xD4000002)__AARCH64_INSN_FUNCS (smc,0xFFE0001F ,0xD4000003 )
Greg Kroah-Hartman
maintainerPATCH 107/377 KVM: arm64: vgic-its: Reject restored DTE with out-of-range num_eventid_bits
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Bommarito <[email protected]>
commit 9ce754ed8e7ab4e3999767ce1505f85c449ccb07 upstream.
Userspace can restore an ITS Device Table Entry whose Size field encodes more EventID bits than the virtual ITS supports. The live MAPD path rejects that state, but vgic_its_restore_dte() accepts it and stores the out-of-range value in dev->num_eventid_bits.
Reject restored DTEs with num_eventid_bits > VITS_TYPER_IDBITS before allocating the device. This mirrors the MAPD check and prevents the restored state from reaching vgic_its_restore_itt(), where the unchecked value can be converted into an oversized scan_its_table() range.
--- arch/arm64/kvm/vgic/vgic-its.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm64/kvm/vgic/vgic-its.c +4 -0
@@ -2307,6 +2307,10 @@ static int vgic_its_restore_dte(struct v/* dte entry is valid */ offset = (entry &KVM_ITS_DTE_NEXT_MASK ) >>KVM_ITS_DTE_NEXT_SHIFT ; +/* Mimic the MAPD behaviour and reject invalid EID bits. */ +if (num_eventid_bits >VITS_TYPER_IDBITS ) +return -EINVAL ; +if (!vgic_its_check_id (its, baser, id,NULL ))return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 108/377 KVM: arm64: vgic: Free private_irqs when init fails after allocation
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Bommarito <[email protected]>
commit f19c354dbd457759dfcf1195ab4bdba2bb568323 upstream.
Companion to commit 250f25367b58 ("KVM: arm64: Tear down vGIC on failed vCPU creation"), which added the missing kvm_vgic_vcpu_destroy() call to the kvm_share_hyp() failure path in kvm_arch_vcpu_create(). The kvm_vgic_vcpu_init() failure path immediately above it has the same shape and still needs the same cleanup.
Call kvm_vgic_vcpu_destroy() when kvm_vgic_vcpu_init() fails so private IRQs allocated before a redistributor iodev registration failure are released before the failed vCPU is freed.
--- arch/arm64/kvm/arm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm64/kvm/arm.c +3 -1
@@ -490,8 +490,10 @@ int kvm_arch_vcpu_create(struct kvm_vcpukvm_destroy_mpidr_data (vcpu->kvm); err =kvm_vgic_vcpu_init (vcpu); -if (err) +if (err) { +kvm_vgic_vcpu_destroy (vcpu);return err; + } err =kvm_share_hyp (vcpu, vcpu +1 );if (err)
Greg Kroah-Hartman
maintainerPATCH 109/377 KVM: SVM: Disable AVIC IPI virtualization on Hygon Family 18h (erratum #1235)
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tina Zhang <[email protected]>
commit 9a12fa5213cfc391e0eed63902d3be98f0913765 upstream.
Hygon Family 18h CPUs are derived from AMD Family 17h (Zen1) silicon and share the same erratum #1235: hardware may read a stale IsRunning=1 bit during ICR write emulation and silently fail to generate an AVIC_IPI_FAILURE_TARGET_NOT_RUNNING VM-Exit on the sending vCPU.
The absence of the VM-Exit causes KVM to miss the required wakeup of blocking target vCPUs, leading to hung vCPUs and unbounded delays in guest execution.
Extend the existing AMD Family 17h erratum #1235 workaround to also cover Hygon Family 18h. With IPI virtualization disabled, KVM never sets IsRunning=1 in the Physical ID table, so every non-self IPI generates a VM-Exit and is correctly emulated.
Message-ID: <[email protected]>
--- arch/x86/kvm/svm/avic.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
arch/x86/kvm/svm/avic.c +7 -5
@@ -1252,12 +1252,14 @@ bool __init avic_hardware_setup(void) svm_x86_ops.allow_apicv_in_x2apic_without_x2apic_virtualization = true;/* -* Disable IPI virtualization for AMD Family 17h CPUs (Zen1 and Zen2) -* due to erratum 1235, which results in missed VM-Exits on the sender -* and thus missed wake events for blocking vCPUs due to the CPU -* failing to see a software update to clear IsRunning. +* Disable IPI virtualization for AMD Family 17h (Zen1 and Zen2) and +* Hygon Family 18h (derived from AMD Zen1) CPUs due to erratum 1235, +* which results in missed VM-Exits on the sender and thus missed wake +* events for blocking vCPUs due to the CPU failing to see a software +* update to clear IsRunning. */ - enable_ipiv = enable_ipiv && boot_cpu_data.x86 !=0x17 ; +if (boot_cpu_data.x86 ==0x17 || boot_cpu_data.x86 ==0x18 ) + enable_ipiv = false;amd_iommu_register_ga_log_notifier (&avic_ga_log_notifier);
Greg Kroah-Hartman
maintainerPATCH 110/377 riscv: kvm: return SBI_ERR_FAILURE for pmu_snapshot_set_shmem() when OOM
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Osama Abdelkader <[email protected]>
commit 0835ee26938e15eccd70f7d33da386b6490f9449 upstream.
kvm_riscv_vcpu_pmu_snapshot_set_shmem() returned -ENOMEM from the SBI extension handler, which caused kvm_riscv_vcpu_sbi_ecall() to abort KVM_RUN and surface the error to userspace instead of ompleting the ECALL with a negative SBI error in a0.
Use SBI_ERR_FAILURE and the normal retdata path, matching other PMU handlers and kvm_sbi_ext_pmu_handler comment.
--- arch/riscv/kvm/vcpu_pmu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/riscv/kvm/vcpu_pmu.c +4 -2
@@ -431,8 +431,10 @@ int kvm_riscv_vcpu_pmu_snapshot_set_shme } kvpmu->sdata =kzalloc (snapshot_area_size,GFP_ATOMIC ); -if (!kvpmu->sdata) -return -ENOMEM ; +if (!kvpmu->sdata) { + sbiret =SBI_ERR_FAILURE ; + goto out; + }/* No need to check writable slot explicitly as kvm_vcpu_write_guest does it internally */ if (kvm_vcpu_write_guest (vcpu, saddr, kvpmu->sdata, snapshot_area_size)) {
Greg Kroah-Hartman
maintainerPATCH 111/377 riscv: kvm: return SBI_ERR_FAILURE for pmu_event_info() when OOM
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Osama Abdelkader <[email protected]>
commit 0e9d0e7a7c78db7aa1c13796c65cfe0aefa54a5b upstream.
kvm_riscv_vcpu_pmu_event_info() returned -ENOMEM from the SBI extension handler, which caused kvm_riscv_vcpu_sbi_ecall() to abort KVM_RUN and surface the error to userspace instead of completing the ECALL with a negative SBI error in a0. Use SBI_ERR_FAILURE and the normal retdata path, matching other PMU handlers and kvm_sbi_ext_pmu_handler comment.
--- arch/riscv/kvm/vcpu_pmu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/riscv/kvm/vcpu_pmu.c +4 -2
@@ -478,8 +478,10 @@ int kvm_riscv_vcpu_pmu_event_info(struct } einfo =kzalloc (shmem_size,GFP_KERNEL ); -if (!einfo) -return -ENOMEM ; +if (!einfo) { + ret =SBI_ERR_FAILURE ; + goto out; + } ret =kvm_vcpu_read_guest (vcpu, shmem, einfo, shmem_size);if (ret) {
Greg Kroah-Hartman
maintainerPATCH 112/377 virt: sev-guest: Explicitly leak pages in unknown state
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Carlos López <[email protected]>
commit fd948c3f96b18ff9ba7d3e8eae13d196593e1aaf upstream.
When set_memory_{encrypted,decrypted}() fail, the user cannot know at which point the function failed, meaning that the pages are left in an unknown state from the point of view of the caller.
Since the pages may be left in an unencrypted state, they are not suitable for general use, and cannot be returned safely to the buddy allocator. Avoid the issue by never freeing the pages, and then do the proper accounting by calling snp_leak_pages().
--- drivers/virt/coco/sev-guest/sev-guest.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/virt/coco/sev-guest/sev-guest.c +7 -3
@@ -176,6 +176,7 @@ static int get_ext_report(struct snp_guestruct snp_guest_req req = {};int ret, npages =0 , resp_len;sockptr_t certs_address; +u64 pfn;if (sockptr_is_null (io->req_data) ||sockptr_is_null (io->resp_data))return -EINVAL ;
@@ -215,10 +216,11 @@ static int get_ext_report(struct snp_gueif (!req.certs_data)return -ENOMEM ; + pfn =PHYS_PFN (virt_to_phys (req.certs_data)); ret =set_memory_decrypted ((unsigned long )req.certs_data, npages);if (ret) {pr_err ("failed to mark page shared, ret=%d\n" , ret); -free_pages_exact (req.certs_data, npages <<PAGE_SHIFT ); +snp_leak_pages (pfn, npages);return -EFAULT ; }
@@ -272,10 +274,12 @@ e_free:kfree (report_resp); e_free_data:if (npages) { -if (set_memory_encrypted ((unsigned long )req.certs_data, npages)) +if (set_memory_encrypted ((unsigned long )req.certs_data, npages)) {WARN_ONCE (ret,"failed to restore encryption mask (leak it)\n" ); -else +snp_leak_pages (pfn, npages); + }else {free_pages_exact (req.certs_data, npages <<PAGE_SHIFT ); + } }return ret; }
Greg Kroah-Hartman
maintainerPATCH 113/377 drm/bridge: chipone-icn6211: use devm_drm_bridge_add in i2c probe
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Osama Abdelkader <[email protected]>
commit 73d01051e8040c0b1de7fd26b3b8d0c2ffa6895c upstream.
Use devm_drm_bridge_add() so the bridge is released if probe fails after registration, and drop drm_bridge_remove() in chipone_i2c_probe.
--- drivers/gpu/drm/bridge/chipone-icn6211.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/bridge/chipone-icn6211.c +3 -1
@@ -758,7 +758,9 @@ static int chipone_i2c_probe(struct i2c_dev_set_drvdata (dev, icn);i2c_set_clientdata (client, icn); -drm_bridge_add (&icn->bridge); + ret =devm_drm_bridge_add (dev, &icn->bridge); +if (ret) +return ret;return chipone_dsi_host_attach (icn); }
Greg Kroah-Hartman
maintainerPATCH 114/377 spi: qup: fix error pointer deref after DMA setup failure
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit a7e8f3efd50a165ba0189f6dc57f7e51a7d149db upstream.
The driver falls back to PIO mode if DMA setup fails during probe.
Make sure to the clear the DMA channel pointers on setup failure to avoid dereferencing an error pointer (or attempting to release a channel a second time) on later probe errors or driver unbind.
This issue was flagged by Sashiko when reviewing a devres allocation conversion patch.
--- drivers/spi/spi-qup.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/spi/spi-qup.c +3 -0
@@ -996,8 +996,11 @@ static int spi_qup_init_dma(struct spi_c err:dma_release_channel (host->dma_tx); + host->dma_tx =NULL ; err_tx:dma_release_channel (host->dma_rx); + host->dma_rx =NULL ; +return ret; }
Greg Kroah-Hartman
maintainerPATCH 115/377 phy: exynos5-usbdrd: fix USB 2.0 HS PHY tuning values for Exynos7870
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Łukasz Lebiedziński <[email protected]>
commit 5a759b120e31aa3ed914d98b51eb1755235250f2 upstream.
The existing PHYPARAM0 tuning values for Exynos7870 are incorrect, causing the USB 2.0 PHY to fail high-speed negotiation and fall back to full-speed (12Mbps) operation.
Fix TXVREFTUNE (transmitter voltage reference) from 14 to 3, TXRESTUNE (transmitter impedance) from 3 to 2, and SQRXTUNE (squelch threshold) from 6 to 5. Also explicitly set TXPREEMPPULSETUNE to 0, which was previously missing from the tuning table despite being included in the register mask.
All values are derived from the vendor kernel for the Samsung Galaxy A6 (SM-A600FN), as no public hardware documentation is available for the Exynos7870 USB DRD PHY. With these corrections, the PHY successfully negotiates high-speed (480Mbps) operation.
--- drivers/phy/samsung/phy-exynos5-usbdrd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/phy/samsung/phy-exynos5-usbdrd.c +4 -3
@@ -1905,13 +1905,14 @@ const struct exynos5_usbdrd_phy_tuning ePHYPARAM0_TXPREEMPAMPTUNE |PHYPARAM0_TXHSXVTUNE |PHYPARAM0_TXFSLSTUNE |PHYPARAM0_SQRXTUNE | PHYPARAM0_OTGTUNE | PHYPARAM0_COMPDISTUNE), - (FIELD_PREP_CONST (PHYPARAM0_TXVREFTUNE ,14 ) | + (FIELD_PREP_CONST (PHYPARAM0_TXVREFTUNE ,3 ) |FIELD_PREP_CONST (PHYPARAM0_TXRISETUNE ,1 ) | -FIELD_PREP_CONST (PHYPARAM0_TXRESTUNE ,3 ) | +FIELD_PREP_CONST (PHYPARAM0_TXRESTUNE ,2 ) | +FIELD_PREP_CONST (PHYPARAM0_TXPREEMPPULSETUNE ,0 ) |FIELD_PREP_CONST (PHYPARAM0_TXPREEMPAMPTUNE ,0 ) |FIELD_PREP_CONST (PHYPARAM0_TXHSXVTUNE ,0 ) |FIELD_PREP_CONST (PHYPARAM0_TXFSLSTUNE ,3 ) | -FIELD_PREP_CONST (PHYPARAM0_SQRXTUNE ,6 ) | +FIELD_PREP_CONST (PHYPARAM0_SQRXTUNE ,5 ) |FIELD_PREP_CONST (PHYPARAM0_OTGTUNE ,2 ) | FIELD_PREP_CONST(PHYPARAM0_COMPDISTUNE, 3))), PHY_TUNING_ENTRY_LAST
Greg Kroah-Hartman
maintainerPATCH 116/377 phy: tegra: xusb: Fix per-pad high-speed termination calibration
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wayne Chang <[email protected]>
commit da110228b54f2e2143d97ea7151e0dc22e539d67 upstream.
The existing code reads a single hs_term_range_adj value from bit field [10:7] of FUSE_SKU_CALIB_0 and applies it to all USB2 pads uniformly. However, on SoCs that support per-pad termination, each pad has its own hs_term_range_adj field: pad 0 in FUSE_SKU_CALIB_0[10:7], and pads 1-3 in FUSE_USB_CALIB_EXT_0 at bit offsets [8:5], [12:9], and [16:13] respectively.
Fix the calibration by reading per-pad values from the appropriate fuse registers. For SoCs that do not support per-pad termination, replicate pad 0's value to all pads to maintain existing behavior.
Add a has_per_pad_term flag to the SoC data to indicate whether per-pad termination values are available in FUSE_USB_CALIB_EXT_0.
--- drivers/phy/tegra/xusb-tegra186.c | 33 ++++++++++++++++++++++++++------- drivers/phy/tegra/xusb.h | 1 + 2 files changed, 27 insertions(+), 7 deletions(-)
drivers/phy/tegra/xusb-tegra186.c +26 -7
@@ -20,8 +20,8 @@/* FUSE USB_CALIB registers */ #define HS_CURR_LEVEL_PADX_SHIFT (x) ((x) ? (11 + (x - 1) * 6) : 0)#define HS_CURR_LEVEL_PAD_MASK 0x3f -#define HS_TERM_RANGE_ADJ_SHIFT 7 -#define HS_TERM_RANGE_ADJ_MASK 0xf +#define HS_TERM_RANGE_ADJ_PADX_SHIFT (x) ((x) ? (5 + (x - 1) * 4) : 7) +#define HS_TERM_RANGE_ADJ_PAD_MASK 0xf#define HS_SQUELCH_SHIFT 29#define HS_SQUELCH_MASK 0x7
@@ -253,7 +253,7 @@struct tegra_xusb_fuse_calibration {u32 *hs_curr_level;u32 hs_squelch; -u32 hs_term_range_adj; +u32 *hs_term_range_adj;u32 rpd_ctrl; };
@@ -930,7 +930,7 @@ static int tegra186_utmi_phy_power_on(st value =padctl_readl (padctl,XUSB_PADCTL_USB2_OTG_PADX_CTL1 (index)); value &= ~TERM_RANGE_ADJ (~0 ); - value |=TERM_RANGE_ADJ (priv->calib.hs_term_range_adj); + value |=TERM_RANGE_ADJ (priv->calib.hs_term_range_adj[index]); value &= ~RPD_CTRL (~0 ); value |=RPD_CTRL (priv->calib.rpd_ctrl);padctl_writel (padctl, value,XUSB_PADCTL_USB2_OTG_PADX_CTL1 (index));
@@ -1464,17 +1464,23 @@ static const char * const tegra186_usb3_static int tegra186_xusb_read_fuse_calibration (struct tegra186_xusb_padctl *padctl) { +const struct tegra_xusb_padctl_soc *soc = padctl->base.soc;struct device *dev = padctl->base.dev;unsigned int i, count;u32 value, *level; +u32 *hs_term_range_adj;int err; - count = padctl->base.soc->ports.usb2.count; + count = soc->ports.usb2.count; level =devm_kcalloc (dev, count,sizeof (u32),GFP_KERNEL );if (!level)return -ENOMEM ; + hs_term_range_adj =devm_kcalloc (dev, count,sizeof (u32),GFP_KERNEL ); +if (!hs_term_range_adj) +return -ENOMEM ; + err =tegra_fuse_readl (TEGRA_FUSE_SKU_CALIB_0 , &value);if (err) return dev_err_probe(dev, err,
@@ -1490,8 +1496,8 @@ tegra186_xusb_read_fuse_calibration(stru padctl->calib.hs_squelch = (value >>HS_SQUELCH_SHIFT ) &HS_SQUELCH_MASK ; - padctl->calib.hs_term_range_adj = (value >>HS_TERM_RANGE_ADJ_SHIFT ) & -HS_TERM_RANGE_ADJ_MASK ; + hs_term_range_adj[0 ] = (value >>HS_TERM_RANGE_ADJ_PADX_SHIFT (0 )) & +HS_TERM_RANGE_ADJ_PAD_MASK ; err =tegra_fuse_readl (TEGRA_FUSE_USB_CALIB_EXT_0 , &value);if (err) {
@@ -1503,6 +1509,17 @@ tegra186_xusb_read_fuse_calibration(stru padctl->calib.rpd_ctrl = (value >>RPD_CTRL_SHIFT ) &RPD_CTRL_MASK ; +for (i =1 ; i < count; i++) { +if (soc->has_per_pad_term) + hs_term_range_adj[i] = + (value >>HS_TERM_RANGE_ADJ_PADX_SHIFT (i)) & +HS_TERM_RANGE_ADJ_PAD_MASK ; +else + hs_term_range_adj[i] = hs_term_range_adj[0 ]; + } + + padctl->calib.hs_term_range_adj = hs_term_range_adj; +return 0 ; }
@@ -1708,6 +1725,7 @@ const struct tegra_xusb_padctl_soc tegra .num_supplies = ARRAY_SIZE(tegra194_xusb_padctl_supply_names), .supports_gen2 = true, .poll_trk_completed = true, + .has_per_pad_term = true, };EXPORT_SYMBOL_GPL (tegra194_xusb_padctl_soc);
@@ -1732,6 +1750,7 @@ const struct tegra_xusb_padctl_soc tegra .trk_hw_mode = false, .trk_update_on_idle = true, .supports_lp_cfg_en = true, + .has_per_pad_term = true, };EXPORT_SYMBOL_GPL (tegra234_xusb_padctl_soc);#endif
drivers/phy/tegra/xusb.h +1 -0
@@ -436,6 +436,7 @@ struct tegra_xusb_padctl_soc {bool trk_hw_mode;bool trk_update_on_idle;bool supports_lp_cfg_en; +bool has_per_pad_term; };struct tegra_xusb_padctl {
Greg Kroah-Hartman
maintainerPATCH 117/377 phy: qcom-qmp-ufs: Fix kaanapali PHY PLL lock failure after SM8650 G4 fix
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nitin Rawat <[email protected]>
commit 80305760d7a55b884fb9023c490b75568d1ea0b1 upstream.
Commit 81af9e40e2e4 ("phy: qcom: qmp-ufs: Fix SM8650 PCS table for Gear 4") moved QPHY_V6_PCS_UFS_PLL_CNTL register configuration from the shared sm8650_ufsphy_g5_pcs table to the SM8650-specific sm8650_ufsphy_pcs base table to fix Gear 4 operation on SM8650.
However, this change inadvertently broke kaanapali and SM8750 SoCs which also rely on the shared sm8650_ufsphy_g5_pcs table for Gear 5 configuration but use their own sm8750_ufsphy_pcs base table. After the change, kaanapali PHYs are left without the required PLL_CNTL = 0x33 setting, causing the PHY PLL to remain at its hardware reset default value, preventing PLL lock and resulting in DME_LINKSTARTUP timeouts.
Fix this by adding the missing QPHY_V6_PCS_UFS_PLL_CNTL = 0x33 entry to the sm8750_ufsphy_pcs table, mirroring what the original commit already did for sm8650_ufsphy_pcs.
--- drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 1 + 1 file changed, 1 insertion(+)
drivers/phy/qualcomm/phy-qcom-qmp-ufs.c +1 -0
@@ -1050,6 +1050,7 @@ static const struct qmp_phy_init_tbl sm8QMP_PHY_INIT_CFG (QPHY_V6_PCS_UFS_MULTI_LANE_CTRL1 ,0x02 ),QMP_PHY_INIT_CFG (QPHY_V6_PCS_UFS_TX_MID_TERM_CTRL1 ,0x43 ),QMP_PHY_INIT_CFG (QPHY_V6_PCS_UFS_PCS_CTRL1 ,0x40 ), +QMP_PHY_INIT_CFG (QPHY_V6_PCS_UFS_PLL_CNTL ,0x33 ),QMP_PHY_INIT_CFG (QPHY_V6_PCS_UFS_TX_LARGE_AMP_DRV_LVL ,0x0f ),QMP_PHY_INIT_CFG (QPHY_V6_PCS_UFS_RX_SIGDET_CTRL2 ,0x68 ), QMP_PHY_INIT_CFG(QPHY_V6_PCS_UFS_TX_POST_EMP_LVL_S4, 0x0e),
Greg Kroah-Hartman
maintainerPATCH 118/377 scsi: isci: Fix use-after-free in device removal path
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Bommarito <[email protected]>
commit b52a8d52c3125ec9a93106ed816582368de34426 upstream.
The ISCI completion tasklet is initialized in isci_host_alloc() (drivers/scsi/isci/init.c:496) and scheduled from both MSI-X and legacy interrupt handlers (drivers/scsi/isci/host.c:223,613).
isci_host_deinit() stops the controller and waits for stop completion, but it never kills completion_tasklet before teardown continues. A top-of-function tasklet_kill() is not sufficient here: interrupts are only disabled when isci_host_stop_complete() runs, so until wait_for_stop() returns the IRQ handlers can still requeue the tasklet. The tasklet callback also re-enables interrupts after draining completions, so killing the tasklet before the source is quiesced leaves the same race open.
Once wait_for_stop() returns, no further IRQ-driven scheduling can occur. Kill completion_tasklet there so teardown cannot race a queued tasklet running on a dead ihost. On remove or unload, the stale callback can otherwise dereference ihost and touch ihost->smu_registers after the host lifetime ends.
A UML + KASAN analogue reproduced the failure class both with no tasklet_kill() and with tasklet_kill() placed before source quiesce, and stayed clean once the kill happened after quiescing the scheduling source.
This mirrors commit f6ab594672d4 ("scsi: aic94xx: fix use-after-free in device removal path"), but ISCI needs the kill after wait_for_stop().
--- drivers/scsi/isci/host.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/isci/host.c +3 -0
@@ -1252,6 +1252,9 @@ void isci_host_deinit(struct isci_host *wait_for_stop (ihost); +/* No further IRQ-driven scheduling can happen past wait_for_stop(). */ +tasklet_kill (&ihost->completion_tasklet); +/* phy stop is after controller stop to allow port and device to * go idle before shutting down the phys, but the expectation is * that i/o has been shut off well before we reach this
Greg Kroah-Hartman
maintainerPATCH 119/377 spi: ep93xx: fix error pointer deref after DMA setup failure
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit 5e121a81667a83e9a01d62b429e340f5a4a84abc upstream.
The driver falls back to PIO mode if DMA setup fails during probe.
Make sure to the clear the DMA channel pointers on setup failure to avoid dereferencing an error pointer on later probe errors or driver unbind.
This issue was flagged by Sashiko when reviewing a devres allocation conversion patch.
--- drivers/spi/spi-ep93xx.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/spi/spi-ep93xx.c +2 -0
@@ -582,12 +582,14 @@ static int ep93xx_spi_setup_dma(struct d espi->dma_rx =dma_request_chan (dev,"rx" );if (IS_ERR (espi->dma_rx)) { ret =dev_err_probe (dev,PTR_ERR (espi->dma_rx),"rx DMA setup failed" ); + espi->dma_rx =NULL ; goto fail_free_page; } espi->dma_tx =dma_request_chan (dev,"tx" );if (IS_ERR (espi->dma_tx)) { ret =dev_err_probe (dev,PTR_ERR (espi->dma_tx),"tx DMA setup failed" ); + espi->dma_tx =NULL ; goto fail_release_rx; }
Greg Kroah-Hartman
maintainerPATCH 120/377 spi: sprd: fix error pointer deref after DMA setup failure
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit 3d67fffb74267772d461c02c67f1eff893ad547d upstream.
The driver falls back to PIO mode if DMA setup fails during probe.
Make sure to check the dma.enabled flag before trying to release the DMA channels also on late probe errors to avoid dereferencing an error pointer (or attempting to release a channel a second time).
This issue was flagged by Sashiko when reviewing a devres allocation conversion patch.
--- drivers/spi/spi-sprd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/spi/spi-sprd.c +2 -1
@@ -992,7 +992,8 @@ err_rpm_put: disable_clk:clk_disable_unprepare (ss->clk); release_dma: -sprd_spi_dma_release (ss); +if (ss->dma.enable) +sprd_spi_dma_release (ss); free_controller:spi_controller_put (sctlr);
Greg Kroah-Hartman
maintainerPATCH 121/377 spi: ti-qspi: fix use-after-free after DMA setup failure
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit ea6ec3343e05f7937a53eb6d7617b3abdb4abc19 upstream.
The driver falls back to PIO mode if DMA setup fails during probe.
Make sure to clear the DMA channel pointer also if buffer allocation fails to avoid passing a pointer to the released channel to the DMA engine (or trying to free the channel a second time on late probe errors or driver unbind).
This issue was flagged by Sashiko when reviewing a devres allocation conversion patch.
--- drivers/spi/spi-ti-qspi.c | 1 + 1 file changed, 1 insertion(+)
drivers/spi/spi-ti-qspi.c +1 -0
@@ -868,6 +868,7 @@ static int ti_qspi_probe(struct platformdev_err (qspi->dev,"dma_alloc_coherent failed, using PIO mode\n" );dma_release_channel (qspi->rx_chan); + qspi->rx_chan =NULL ; goto no_dma; } host->dma_rx = qspi->rx_chan;
Greg Kroah-Hartman
maintainerPATCH 122/377 RDMA/siw: Reject MPA FPDU length underflow before signed receive math
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Bommarito <[email protected]>
commit 0ce1bc9e46ecabe84772bb561e373c0d9876d6f2 upstream.
A malicious connected siw peer can send an iWARP FPDU whose MPA length field (c_hdr->mpa_len, 16 bit big-endian, peer-controlled) is smaller than the fixed DDP/RDMAP header for the announced opcode. Soft-iWARP parses the full header in siw_get_hdr() based on iwarp_pktinfo[opcode] .hdr_len, but never compares mpa_len against that header length.
siw_tcp_rx_data() then derives
srx->fpdu_part_rem = be16_to_cpu(mpa_len) - fpdu_part_rcvd
+ MPA_HDR_SIZE;
where fpdu_part_rcvd equals iwarp_pktinfo[opcode].hdr_len at this point. For a tagged WRITE (hdr_len 16, MPA_HDR_SIZE 2) the smallest on-wire mpa_len of 0 yields fpdu_part_rem = -14, and any mpa_len below hdr_len - MPA_HDR_SIZE underflows to a negative int.
The signed value then flows into siw_proc_write()/siw_proc_rresp() as
bytes = min(srx->fpdu_part_rem, srx->skb_new);
is handed to siw_check_mem() as an int len (whose interval check addr + len > mem->va + mem->len is satisfied for a valid base when len is negative), and reaches siw_rx_data() -> siw_rx_kva() / siw_rx_umem() -> skb_copy_bits() as a signed copy length. The header copy branch in skb_copy_bits() promotes that to size_t, producing a multi-gigabyte read.
KASAN under a KUnit harness that drives the real kernel TCP receive path -- a loopback AF_INET socketpair, the malformed FPDU written via kernel_sendmsg, sk_data_ready firing in softirq, tcp_read_sock dispatching to siw_tcp_rx_data -- reports:
BUG: KASAN: use-after-free in skb_copy_bits+0x284/0x480
Read of size 4294967295 at addr ffff888...
Call Trace:
skb_copy_bits
siw_rx_kva
siw_rx_data
siw_check_mem
siw_proc_write
siw_tcp_rx_data
__tcp_read_sock
siw_qp_llp_data_ready
tcp_data_ready
tcp_data_queueAdd the missing invariant at the earliest point where the peer header is fully assembled. iwarp_pktinfo[*].hdr_len - MPA_HDR_SIZE is exactly the value the siw transmitter uses as the minimum mpa_len for each opcode (drivers/infiniband/sw/siw/siw_qp.c:33), so this matches the protocol contract. Out-of-range FPDUs terminate the connection with TERM_ERROR_LAYER_LLP / LLP_ETYPE_MPA / LLP_ECODE_FPDU_START -- which is RFC 5044 Section 8 error code 3 ("Marker and ULPDU Length fields do not agree on the start of an FPDU"), the correct framing-error class for this inconsistency.
--- drivers/infiniband/sw/siw/siw_qp_rx.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/infiniband/sw/siw/siw_qp_rx.c +15 -0
@@ -1082,6 +1082,21 @@ static int siw_get_hdr(struct siw_rx_str }/* +* Peer-controlled mpa_len must not underflow srx->fpdu_part_rem +* in siw_tcp_rx_data(); a negative value flows as a signed copy +* length into siw_check_mem() and skb_copy_bits(). +*/ +if (unlikely (be16_to_cpu (c_hdr->mpa_len) +MPA_HDR_SIZE < + iwarp_pktinfo[opcode].hdr_len)) { +pr_warn_ratelimited ("siw: short mpa_len %u for opcode %u (hdr_len %u)\n" , +be16_to_cpu (c_hdr->mpa_len), opcode, + iwarp_pktinfo[opcode].hdr_len); +siw_init_terminate (rx_qp (srx),TERM_ERROR_LAYER_LLP , +LLP_ETYPE_MPA ,LLP_ECODE_FPDU_START ,0 ); +return -EINVAL ; + } + +/* * DDP/RDMAP header receive completed. Check if the current * DDP segment starts a new RDMAP message or continues a previously * started RDMAP message.
Greg Kroah-Hartman
maintainerPATCH 123/377 fwctl: pds: Validate RPC input size before parsing
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heechan Kang <[email protected]>
commit e7537735028c3ad4b0bfc02ff8fa2a1a28aa04fe upstream.
The fwctl core allocates the device-specific RPC input buffer with fwctl_rpc.in_len and passes that buffer to the driver callback.
pdsfc_fw_rpc() casts the buffer to struct fwctl_rpc_pds and then calls pdsfc_validate_rpc(), which reads fields from that structure before checking that the input buffer is large enough to contain it. A short in_len can make pds_fwctl read beyond the allocation.
Reject pds RPC buffers that are smaller than struct fwctl_rpc_pds before parsing any pds-specific fields.
--- drivers/fwctl/pds/main.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/fwctl/pds/main.c +3 -0
@@ -362,6 +362,9 @@ static void *pdsfc_fw_rpc(struct fwctl_uctx *uctx, enum fwctl_rpc_scope scope,void *out =NULL ;int err; +if (in_len <sizeof (*rpc)) +return ERR_PTR (-EINVAL ); + err =pdsfc_validate_rpc (pdsfc, rpc, scope);if (err)return ERR_PTR (err);
Signature · 1 line
2.54.0
Greg Kroah-Hartman
maintainerPATCH 124/377 LoongArch: kprobes: Use larch_insn_text_copy() to patch instructions
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tiezhu Yang <[email protected]>
commit e3ef9a28f558d1cbf0b42d6dcd16c60da557562b upstream.
On SMP systems, kprobe handlers would occasionally fail to execute on certain CPU cores. The issue is hard to reproduce and typically occurs randomly under high system load.
The root cause is a software-side instruction hazard. According to the LoongArch Reference Manual, while the cache coherency is maintained by hardware, software must explicitly use the "IBAR" instruction to ensure the instruction fetch unit (IFU) observes the effects of recent stores.
The current arch_arm_kprobe() and arch_disarm_kprobe() only execute the "IBAR" barrier (via flush_insn_slot -> local_flush_icache_range) on the local CPU. This leaves a vulnerable window where remote CPU cores may continue executing stale instructions from their pipelines or prefetch buffers, as they have not executed an "IBAR" since the code modification.
Switch to larch_insn_text_copy() to fix this:
1. Synchronization: It uses stop_machine_cpuslocked() to synchronize all online CPUs, ensuring no CPU is executing the target code area during modification.
2. Visibility: By passing cpu_online_mask to stop_machine_cpuslocked(), the callback text_copy_cb() is executed on all online cores. Each CPU core invokes local_flush_icache_range() to execute "IBAR", clearing instruction hazards system-wide and ensuring the "break" instruction is visible to the fetch units of all cores.
3. Robustness: It properly manages memory write permissions (ROX/RW) for the kernel text segment during patching, ensuring compatibility with CONFIG_STRICT_KERNEL_RWX.
--- arch/loongarch/kernel/kprobes.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
arch/loongarch/kernel/kprobes.c +6 -4
@@ -60,16 +60,18 @@ NOKPROBE_SYMBOL(arch_prepare_kprobe);/* Install breakpoint in text */ void arch_arm_kprobe (struct kprobe *p) { - *p->addr =KPROBE_BP_INSN ; -flush_insn_slot (p); +u32 insn =KPROBE_BP_INSN ; + +larch_insn_text_copy (p->addr, &insn,LOONGARCH_INSN_SIZE ); }NOKPROBE_SYMBOL (arch_arm_kprobe);/* Remove breakpoint from text */ void arch_disarm_kprobe (struct kprobe *p) { - *p->addr = p->opcode; -flush_insn_slot (p); +u32 insn = p->opcode; + +larch_insn_text_copy (p->addr, &insn,LOONGARCH_INSN_SIZE ); }NOKPROBE_SYMBOL (arch_disarm_kprobe);
Greg Kroah-Hartman
maintainerPATCH 125/377 LoongArch: Remove unused code to avoid build warning
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Huacai Chen <[email protected]>
commit 0ccc9d47cf020994097ff51827cebd04aa2b0bf4 upstream.
After commit feee6b2989165631b1 ("mm/memory_hotplug: shrink zones when offlining memory"), __remove_pages() doesn't need the "zone" parameter so the "page" variable is also unused. Remove the unused code to avoid such build warning:
arch/loongarch/mm/init.c: In function 'arch_remove_memory':arch/loongarch/mm/init.c:134:22: warning: variable 'page' set but not used [-Wunused-but-set-variable=]
134 | struct page *page = pfn_to_page(start_pfn);
--- arch/loongarch/mm/init.c | 4 ---- 1 file changed, 4 deletions(-)
arch/loongarch/mm/init.c +0 -4
@@ -97,11 +97,7 @@ void arch_remove_memory(u64 start, u64 s {unsigned long start_pfn = start >>PAGE_SHIFT ;unsigned long nr_pages = size >>PAGE_SHIFT ; -struct page *page =pfn_to_page (start_pfn); -/* With altmap the first mapped page is offset from @start */ -if (altmap) - page +=vmem_altmap_offset (altmap);__remove_pages (start_pfn, nr_pages, altmap); }#endif
Greg Kroah-Hartman
maintainerPATCH 126/377 device property: set fwnode->secondary to NULL in fwnode_init()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bartosz Golaszewski <[email protected]>
commit 215c90ee656114f5e8c32408228d97082f8e0eef upstream.
If a firmware node is allocated on the stack (for instance: temporary software node whose life-time we control) or on the heap - but using a non-zeroing allocation function - and initialized using fwnode_init(), its secondary pointer will contain uninitalized memory which likely will be neither NULL nor IS_ERR() and so may end up being dereferenced (for
example: in dev_to_swnode()). Set fwnode->secondary to NULL on initialization.
--- include/linux/fwnode.h | 1 + 1 file changed, 1 insertion(+)
include/linux/fwnode.h +1 -0
@@ -208,6 +208,7 @@ struct fwnode_operations {static inline void fwnode_init (struct fwnode_handle *fwnode,const struct fwnode_operations *ops) { + fwnode->secondary =NULL ; fwnode->ops = ops;INIT_LIST_HEAD (&fwnode->consumers);INIT_LIST_HEAD (&fwnode->suppliers);
Greg Kroah-Hartman
maintainerPATCH 127/377 drm/msm: Fix shrinker deadlock
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel J Blueman <[email protected]>
commit 3392291fc509d8ad6e4ad90f15b0a193f721cbc9 upstream.
With PROVE_LOCKING on an Snapdragon X1 and VM reclaim pressure, we see:
======================================================
WARNING: possible circular locking dependency detected
7.0.0-debug+ #43 Tainted: G W
------------------------------------------------------
kswapd0/82 is trying to acquire lock:
ffff800080ec3870 (reservation_ww_class_acquire){+.+.}-{0:0}, at: msm_gem_shrinker_scan+0x17c/0x400 [msm]
but task is already holding lock:
ffffc31709b263b8 (fs_reclaim){+.+.}-{0:0}, at: balance_pgdat+0x88/0x988
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #2 (fs_reclaim){+.+.}-{0:0}:
__lock_acquire+0x4d0/0xad0
lock_acquire.part.0+0xc4/0x248
lock_acquire+0x8c/0x248
fs_reclaim_acquire+0xd0/0xf0
dma_resv_lockdep+0x224/0x348
do_one_initcall+0x84/0x5d0
do_initcalls+0x194/0x1d8
kernel_init_freeable+0x128/0x180
kernel_init+0x2c/0x160
ret_from_fork+0x10/0x20-> #1 (reservation_ww_class_mutex){+.+.}-{4:4}:
__lock_acquire+0x4d0/0xad0
lock_acquire.part.0+0xc4/0x248
lock_acquire+0x8c/0x248
dma_resv_lockdep+0x1a8/0x348
do_one_initcall+0x84/0x5d0
do_initcalls+0x194/0x1d8
kernel_init_freeable+0x128/0x180
kernel_init+0x2c/0x160
ret_from_fork+0x10/0x20-> #0 (reservation_ww_class_acquire){+.+.}-{0:0}:
check_prev_add+0x114/0x790
validate_chain+0x594/0x6f0
__lock_acquire+0x4d0/0xad0
lock_acquire.part.0+0xc4/0x248
lock_acquire+0x8c/0x248
drm_gem_lru_scan+0x1ac/0x440
msm_gem_shrinker_scan+0x17c/0x400 [msm]
do_shrink_slab+0x150/0x4a0
shrink_slab+0x144/0x460
shrink_one+0x9c/0x1b0
shrink_many+0x27c/0x5c0
shrink_node+0x344/0x550
balance_pgdat+0x2c0/0x988
kswapd+0x11c/0x318
kthread+0x10c/0x128
ret_from_fork+0x10/0x20 other info that might help us debug this:
Chain exists of:
reservation_ww_class_acquire --> reservation_ww_class_mutex --> fs_reclaim
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(fs_reclaim);
lock(reservation_ww_class_mutex);
lock(fs_reclaim);
lock(reservation_ww_class_acquire); *** DEADLOCK ***
1 lock held by kswapd0/82:
#0: ffffc31709b263b8 (fs_reclaim){+.+.}-{0:0}, at: balance_pgdat+0x88/0x988 stack backtrace:
CPU: 4 UID: 0 PID: 82 Comm: kswapd0 Tainted: G W 7.0.0-debug+ #43 PREEMPT(full)
Tainted: [W]=WARN
Hardware name: LENOVO 21BX0016US/21BX0016US, BIOS N3HET94W (1.66 ) 09/15/2025
Call trace:
show_stack+0x20/0x40 (C)
dump_stack_lvl+0x9c/0xd0
dump_stack+0x18/0x30
print_circular_bug+0x114/0x120
check_noncircular+0x178/0x198
check_prev_add+0x114/0x790
validate_chain+0x594/0x6f0
__lock_acquire+0x4d0/0xad0
lock_acquire.part.0+0xc4/0x248
lock_acquire+0x8c/0x248
drm_gem_lru_scan+0x1ac/0x440
msm_gem_shrinker_scan+0x17c/0x400 [msm]
do_shrink_slab+0x150/0x4a0
shrink_slab+0x144/0x460
shrink_one+0x9c/0x1b0
shrink_many+0x27c/0x5c0
shrink_node+0x344/0x550
balance_pgdat+0x2c0/0x988
kswapd+0x11c/0x318
kthread+0x10c/0x128
ret_from_fork+0x10/0x20kswapd0 holding fs_reclaim calls the MSM shrinker, which calls dma_resv_lock. This in turn acquires fs_reclaim.
Fix this deadlock by using dma_resv_trylock() instead, dropping the subsequently unused passed wait-wound lock 'ticket'.
Patchwork: https://patchwork.freedesktop.org/patch/723564/
Message-ID: <[email protected]>
--- drivers/gpu/drm/msm/msm_gem_shrinker.c | 40 +++++++++++--------------- 1 file changed, 16 insertions(+), 24 deletions(-)
drivers/gpu/drm/msm/msm_gem_shrinker.c +16 -24
@@ -43,8 +43,7 @@ msm_gem_shrinker_count(struct shrinker *shrinker, struct shrink_control *sc) }static bool -with_vm_locks (struct ww_acquire_ctx *ticket, -void (*fn)(struct drm_gem_object *obj), +with_vm_locks (void (*fn)(struct drm_gem_object *obj),struct drm_gem_object *obj) {/*
@@ -52,7 +51,7 @@ with_vm_locks(struct ww_acquire_ctx *ticket,* success paths */ struct drm_gpuvm_bo *vm_bo, *last_locked =NULL ; -int ret =0 ; +bool locked = true; drm_gem_for_each_gpuvm_bo (vm_bo, obj) {struct dma_resv *resv =drm_gpuvm_resv (vm_bo->vm);
@@ -60,23 +59,14 @@ with_vm_locks(struct ww_acquire_ctx *ticket,if (resv == obj->resv)continue ; - ret =dma_resv_lock (resv, ticket); -/* -* Since we already skip the case when the VM and obj -* share a resv (ie. _NO_SHARE objs), we don't expect -* to hit a double-locking scenario... which the lock -* unwinding cannot really cope with. +* dma_resv_lock can't be used due to acquiring 'ticket' before the +* fs_reclaim lock, which is held in shrinker context */ -WARN_ON (ret == -EALREADY ); - -/* -* Don't bother with slow-lock / backoff / retry sequence, -* if we can't get the lock just give up and move on to -* the next object. -*/ -if (ret) +if (!dma_resv_trylock (resv)) { + locked = false; goto out_unlock; + }/* * Hold a ref to prevent the vm_bo from being freed
@@ -108,11 +98,11 @@ with_vm_locks(struct ww_acquire_ctx *ticket, } } -return ret ==0 ; +return locked; }static bool -purge (struct drm_gem_object *obj,struct ww_acquire_ctx *ticket) +purge (struct drm_gem_object *obj,struct ww_acquire_ctx *) {if (!is_purgeable (to_msm_bo (obj)))return false;
@@ -120,11 +110,11 @@ purge(struct drm_gem_object *obj, struct ww_acquire_ctx *ticket)if (msm_gem_active (obj))return false; -return with_vm_locks (ticket, msm_gem_purge, obj); +return with_vm_locks (msm_gem_purge, obj); }static bool -evict (struct drm_gem_object *obj,struct ww_acquire_ctx *ticket) +evict (struct drm_gem_object *obj,struct ww_acquire_ctx *) {if (is_unevictable (to_msm_bo (obj)))return false;
@@ -132,7 +122,7 @@ evict(struct drm_gem_object *obj, struct ww_acquire_ctx *ticket)if (msm_gem_active (obj))return false; -return with_vm_locks (ticket, msm_gem_evict, obj); +return with_vm_locks (msm_gem_evict, obj); } static bool
@@ -164,7 +154,6 @@ static unsigned long msm_gem_shrinker_scan(struct shrinker *shrinker, struct shrink_control *sc) { struct msm_drm_private *priv = shrinker->private_data; -struct ww_acquire_ctx ticket; struct { struct drm_gem_lru *lru; bool (*shrink)(struct drm_gem_object *obj, struct ww_acquire_ctx *ticket);
@@ -185,11 +174,14 @@ msm_gem_shrinker_scan(struct shrinker *shrinker, struct shrink_control *sc)for (unsigned i =0 ; (nr >0 ) && (i <ARRAY_SIZE (stages)); i++) {if (!stages[i].cond)continue ; +/* +* 'ticket' not needed on trylock paths +*/ stages[i].freed =drm_gem_lru_scan (stages[i].lru, nr, &stages[i].remaining, stages[i].shrink, - &ticket); +NULL ); nr -= stages[i].freed; freed += stages[i].freed; remaining += stages[i].remaining;
Signature · 1 line
2.54.0