6.18.35-rc1 review
Subsystems (7)
Greg Kroah-Hartman
maintainercover 6.18.35-rc1 review
This is the start of the stable review cycle for the 6.18.35 release. There are 315 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 Tue, 09 Jun 2026 09:56:45 +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.35-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.35-rc1
Michael Bommarito <[email protected]>
thunderbolt: property: Cap recursion depth in __tb_property_parse_dir()
Jouni Högander <[email protected]>
drm/i915/psr: Use DC_OFF wake reference to block DC6 on vblank enable
Jassi Brar <[email protected]>
mailbox: Fix NULL message support in mbox_send_message()
Wei-Cheng Chen <[email protected]>
xhci: tegra: Fix ghost USB device on dual-role port unplug
Robert Marko <[email protected]>
net: phy: micrel: fix LAN8814 QSGMII soft reset
Qing Wang <[email protected]>
mm/slub: hold cpus_read_lock around flush_rcu_sheaves_on_cache()
Abdurrahman Hussain <[email protected]>
hwmon: (pmbus/adm1266) serialize GPIO PMBus accesses with pmbus_lock
Abdurrahman Hussain <[email protected]>
hwmon: (pmbus/adm1266) serialize sequencer_state debugfs read with pmbus_lock
Guenter Roeck <[email protected]>
hwmon: (pmbus) Add support for guarded PMBus lock
Johan Hovold <[email protected]>
USB: serial: mct_u232: fix memory corruption with small endpoint
Johan Hovold <[email protected]>
USB: serial: digi_acceleport: fix memory corruption with small endpoints
Johan Hovold <[email protected]>
USB: serial: cypress_m8: fix memory corruption with small endpoint
Radhey Shyam Pandey <[email protected]>
usb: dwc3: xilinx: fix error handling in zynqmp init error paths
Shaomin Chen <[email protected]>
xfrm: iptfs: reset runtime state when cloning SAs
Rafael J. Wysocki <[email protected]>
cpufreq: intel_pstate: Use correct scaling factor on Raptor Lake-E
Rafael J. Wysocki <[email protected]>
cpufreq: intel_pstate: Add and use hybrid_get_cpu_type()
Paolo Abeni <[email protected]>
mptcp: reset rcv wnd on disconnect
Paolo Abeni <[email protected]>
mptcp: cleanup fallback dummy mapping generation
Dawei Feng <[email protected]>
octeontx2-pf: avoid double free of pool->stack on AQ init failure
Zeng Heng <[email protected]>
arm64: tlb: Flush walk cache when unsharing PMD tables
Shardul Bankar <[email protected]>
mptcp: do not drop partial packets
Paolo Abeni <[email protected]>
mptcp: borrow forward memory from subflow
Paolo Abeni <[email protected]>
mptcp: handle first subflow closing consistently
David Carlier <[email protected]>
net: devmem: reject dma-buf bind with non-page-aligned size or SG length
Matthieu Baerts (NGI0) <[email protected]>
selftests: mptcp: drop nanoseconds width specifier
Shuai Zhang <[email protected]>
Bluetooth: hci_qca: Convert timeout from jiffies to ms
Uwe Kleine-König <[email protected]>
Bluetooth: hci_qca: Migrate to serdev specific shutdown function
Uwe Kleine-König <[email protected]>
serdev: Provide a bustype shutdown function
David Howells <[email protected]>
rxrpc: Fix RESPONSE packet verification to extract skb to a linear buffer
David Howells <[email protected]>
rxrpc: Fix DATA decrypt vs splice() by copying data to buffer in recvmsg
Tom Lendacky <[email protected]>
x86/mm: Disable broadcast TLB flush when PCID is disabled
Lukas Wunner <[email protected]>
platform/x86/intel/vsec: Fix enable_cnt imbalance on PCIe error recovery
David E. Box <[email protected]>
platform/x86/intel/vsec: Make driver_data info const
David E. Box <[email protected]>
platform/x86/intel/vsec: Refactor base_addr handling
Jacques Nilo <[email protected]>
serial: 8250_dw: dispatch SysRq character in dw8250_handle_irq()
Jacques Nilo <[email protected]>
serial: 8250: dispatch SysRq character in serial8250_handle_irq()
Jacques Nilo <[email protected]>
serial: core: introduce guard(uart_port_lock_check_sysrq_irqsave)
Maciej W. Rozycki <[email protected]>
serial: zs: Convert to use a platform device
Maciej W. Rozycki <[email protected]>
serial: zs: Switch to using channel reset
Maciej W. Rozycki <[email protected]>
serial: zs: Fix bootconsole handover lockup
Maciej W. Rozycki <[email protected]>
serial: dz: Convert to use a platform device
Maciej W. Rozycki <[email protected]>
serial: dz: Fix bootconsole handover lockup
Maciej W. Rozycki <[email protected]>
serial: dz: Fix bootconsole message clobbering at chip reset
Ziyi Guo <[email protected]>
drm/amdgpu: check num_entries in GEM_OP GET_MAPPING_INFO
Christian König <[email protected]>
drm/amdgpu: fix calling VM invalidation in amdgpu_hmm_invalidate_gfx
Michael Bommarito <[email protected]>
drm/amdgpu: fix lock leak on ENOMEM in AMDGPU_GEM_OP_GET_MAPPING_INFO
David Francis <[email protected]>
drm/amdkfd: Check for pdd drm file first in CRIU restore path
Eric Huang <[email protected]>
drm/amdkfd: fix a vulnerability of integer overflow in kfd debugger
Eric Huang <[email protected]>
drm/amdkfd: fix NULL pointer bug in svm_range_set_attr
Shitalkumar Gandhi <[email protected]>
serial: fsl_lpuart: fix rx buffer and DMA map leaks in start_rx_dma
Maciej W. Rozycki <[email protected]>
serial: zs: Fix swapped RI/DSR modem line transition counting
Hongling Zeng <[email protected]>
serial: sh-sci: fix memory region release in error path
Viken Dadhaniya <[email protected]>
serial: qcom_geni: fix kfifo underflow when flush precedes DMA completion IRQ
Prasanna S <[email protected]>
serial: qcom-geni: fix UART_RX_PAR_EN bit position
Myeonghun Pak <[email protected]>
serial: altera_jtaguart: handle uart_add_one_port() failures
Timur Kristóf <[email protected]>
drm/amd/pm/si: Disregard vblank time when no displays are connected
Janusz Krzysztofik <[email protected]>
drm/i915: Fix potential UAF in TTM object purge
Jouni Högander <[email protected]>
drm/i915/psr: Block DC states on vblank enable when Panel Replay supported
Zhenghang Xiao <[email protected]>
drm/gem: fix race between change_handle and handle_delete
Berkant Koc <[email protected]>
drm/hyperv: validate VMBus packet size in receive callback
Berkant Koc <[email protected]>
drm/hyperv: validate resolution_count and fix WIN8 fallback
Alexandru Hossu <[email protected]>
scsi: target: iscsi: Validate CHAP_R length before base64 decode
Michael Bommarito <[email protected]>
scsi: target: iscsi: Bound iscsi_encode_text_output() appends to rsp_buf
Michael Bommarito <[email protected]>
scsi: target: iscsi: Fix CRC overread and double-free in iscsit_handle_text_cmd()
Michael Bommarito <[email protected]>
scsi: scsi_transport_fc: Widen FPIN pname walker counter to u32
Michael Bommarito <[email protected]>
scsi: fcoe: Reject FIP descriptors with zero fip_dlen in CVL walker
Michael Bommarito <[email protected]>
thunderbolt: property: Reject dir_len < 4 to prevent size_t underflow
Michael Bommarito <[email protected]>
thunderbolt: property: Reject u32 wrap in tb_property_entry_valid()
Michael Bommarito <[email protected]>
usb: gadget: f_fs: serialize DMABUF cancel against request completion
Michael Bommarito <[email protected]>
usb: gadget: f_fs: copy only received bytes on short ep0 read
Seungjin Bae <[email protected]>
usb: gadget: dummy_hcd: Reject hub port requests for non-existent ports
Jeremy Erazo <[email protected]>
usb: gadget: composite: fix integer underflow in WebUSB GET_URL handling
Guangshuo Li <[email protected]>
usb: gadget: f_hid: fix device reference leak in hidg_alloc()
Guangshuo Li <[email protected]>
usb: gadget: net2280: Fix double free in probe error path
Kai Aizen <[email protected]>
usb: gadget: uvc: hold opts->lock across XU walks in uvc_function_bind
Johan Hovold <[email protected]>
USB: serial: mct_u232: fix missing interrupt-in transfer sanity check
Johan Hovold <[email protected]>
USB: serial: mxuport: fix memory corruption with small endpoint
Johan Hovold <[email protected]>
USB: serial: keyspan: fix missing indat transfer sanity check
Zhang Cen <[email protected]>
USB: serial: cypress_m8: validate interrupt packet headers
Zhang Cen <[email protected]>
USB: serial: belkin_sa: validate interrupt status length
Wanquan Zhong <[email protected]>
USB: serial: option: add missing RSVD(5) flag for Rolling RW135R-GL
Jan Volckaert <[email protected]>
USB: serial: option: add MeiG SRM813Q
Myrrh Periwinkle <[email protected]>
usb: typec: ucsi: Don't update power_supply on power role change if not connected
Myrrh Periwinkle <[email protected]>
usb: typec: ucsi: Check if power role change actually happened before handling
Sebastian Reichel <[email protected]>
usb: typec: tcpm: improve handling of DISCOVER_MODES failures
Dan Carpenter <[email protected]>
usb: typec: tipd: Fix error code in tps6598x_probe()
Heitor Alves de Siqueira <[email protected]>
usb: usbtmc: reject interrupt endpoints with small wMaxPacketSize
Heitor Alves de Siqueira <[email protected]>
usb: usbtmc: check URB actual_length for interrupt-IN notifications
Michael Bommarito <[email protected]>
usbip: vudc: Fix use after free bug in vudc_remove due to race condition
Sam Burkels <[email protected]>
usb: storage: Add quirks for PNY Elite Portable SSD
Stephen J. Fuhry <[email protected]>
USB: quirks: add NO_LPM for Lenovo ThinkPad USB-C Dock Gen2 hub controllers
Wentao Liang <[email protected]>
usb: musb: omap2430: Fix use-after-free in omap2430_probe()
Michal Pecio <[email protected]>
usb: core: Fix up Interrupt IN endpoints with bogus wBytesPerInterval
Xu Yang <[email protected]>
usb: chipidea: core: convert ci_role_switch to local variable
Tudor Ambarus <[email protected]>
tty: serial: samsung: Remove redundant port lock acquisition in rx helpers
Zhaoyang Yu <[email protected]>
tty: serial: pch_uart: add check for dma_alloc_coherent()
Guangshuo Li <[email protected]>
counter: Fix refcount leak in counter_alloc() error path
Ian Abbott <[email protected]>
comedi: comedi_test: Fix limiting of convert_arg in waveform_ai_cmdtest()
Ian Abbott <[email protected]>
comedi: comedi_test: fix check for valid scan_begin_src in waveform_ai_cmdtest()
Hongling Zeng <[email protected]>
gpib: cb7210: Fix region leak when request_irq fails
Nicolás Bazaes <[email protected]>
Input: synaptics - add LEN2058 to SMBus passlist for ThinkPad E490
Dmitry Torokhov <[email protected]>
Input: atmel_mxt_ts - fix boundary check in mxt_prepare_cfg_mem
Xiaolei Wang <[email protected]>
misc: rp1: Send IACK on IRQ activate to fix kdump/kexec
Ali Ganiyev <[email protected]>
ksmbd: OOB read regression in smb_check_perm_dacl() ACE-walk loops
Dmitriy Zharov <[email protected]>
Input: xpad - add support for ASUS ROG RAIKIRI II
Qbeliw Tanaka <[email protected]>
Input: xpad - add "Nova 2 Lite" from GameSir
Zhang Heng <[email protected]>
ALSA: hda/realtek: Fix speaker output on ASUS ROG Strix G615LP
Jingguo Tan <[email protected]>
xfrm: esp: restore combined single-frag length gate
Srinivas Kandagatla <[email protected]>
ASoC: qcom: q6asm-dai: do not set stream state in event and trigger callbacks
Srinivas Kandagatla <[email protected]>
ASoC: qcom: q6asm-dai: close stream only when running
Hamza Mahfooz <[email protected]>
netfilter: conntrack: tcp: do not force CLOSE on invalid-seq RST without direction check
Cássio Gabriel <[email protected]>
ALSA: firewire-motu: Protect register DSP event queue positions
Geoffrey D. Bennett <[email protected]>
ALSA: scarlett2: Fix 2i2 Gen 4 direct monitor gain on firmware 2417
Michael Bommarito <[email protected]>
xfrm: ah: use skb_to_full_sk in async output callbacks
Herbert Xu <[email protected]>
xfrm: ipcomp: Free destination pages on acomp errors
Maoyi Xie <[email protected]>
xfrm: route MIGRATE notifications to caller's netns
Ashutosh Desai <[email protected]>
nfc: hci: fix out-of-bounds read in HCP header parsing
Arnd Bergmann <[email protected]>
iommu, debugobjects: avoid gcc-16.1 section mismatch warnings
Lee Jones <[email protected]>
HID: wacom: Fix OOB write in wacom_hid_set_device_mode()
Santhosh Kumar K <[email protected]>
spi: spi-mem: avoid mutating op template in spi_mem_supports_op()
Minh Nguyen <[email protected]>
net: skbuff: fix missing zerocopy reference in pskb_carve helpers
Kuniyuki Iwashima <[email protected]>
ip6: vti: Use ip6_tnl.net in vti6_changelink().
Michael Bommarito <[email protected]>
l2tp: use refcount_inc_not_zero in l2tp_session_get_by_ifname
Zhengchuan Liang <[email protected]>
xfrm: input: hold netns during deferred transport reinjection
Qi Tang <[email protected]>
ipv6: validate extension header length before copying to cmsg
Maoyi Xie <[email protected]>
ip6: vti: Use ip6_tnl.net in vti6_siocdevprivate().
Zhengchuan Liang <[email protected]>
ipv6: exthdrs: refresh nh after handling HAO option
Srinivas Kandagatla <[email protected]>
ASoC: qcom: q6asm-dai: fix error handling in prepare and set_params
Justin Iurman <[email protected]>
ipv6: exthdrs: refresh nh pointer after ipv6_hop_jumbo()
Junrui Luo <[email protected]>
macsec: fix replay protection at XPN lower-PN wrap
Yuqi Xu <[email protected]>
bpf: sockmap: fix tail fragment offset in bpf_msg_push_data
Jason A. Donenfeld <[email protected]>
wireguard: send: append trailer after expanding head
Alexis Lothoré (eBPF Foundation) <[email protected]>
x86/ftrace: Relocate %rip-relative percpu refs in dynamic trampolines
Chaitanya Sabnis <[email protected]>
i2c: davinci: fix division by zero on missing clock-frequency
Dmitry Torokhov <[email protected]>
Input: elan_i2c - validate firmware size before use
Dan Carpenter <[email protected]>
usb: dwc2: Fix use after free in debug code
Peter Chen <[email protected]>
usb: cdns3: plat: fix unbalanced pm_runtime_forbid() call permanently leaks the runtime PM usage counter across bind/unbind cycles
Peter Chen <[email protected]>
usb: cdns3: plat: fix leaked usb2_phy initialization on usb3_phy acquisition failure
Yongchao Wu <[email protected]>
usb: cdns3: gadget: fix request skipping after clearing halt
Johan Hovold <[email protected]>
USB: serial: omninet: fix memory corruption with small endpoint
Benoît Monin <[email protected]>
iio: buffer: Fix DMA fence leak in iio_buffer_enqueue_dmabuf()
Felix Gu <[email protected]>
iio: buffer: hw-consumer: fix use-after-free in error path
Aldo Conte <[email protected]>
iio: light: cm3323: fix reg_conf not being initialized correctly
Antoniu Miclaus <[email protected]>
iio: chemical: scd30: fix division by zero in write_raw
Pengpeng Hou <[email protected]>
iio: chemical: mhz19b: reject oversized serial replies
Svyatoslav Ryhel <[email protected]>
iio: Fix iio_multiply_value use in iio_read_channel_processed_scale
Felix Gu <[email protected]>
iio: light: veml6070: Fix resource leak in probe error path
Advait Dhamorikar <[email protected]>
iio: magnetometer: st_magn: fix default DRDY pin selection for LIS2MDL
Salah Triki <[email protected]>
iio: temperature: tsys01: fix broken PROM checksum validation
Sanjay Chitroda <[email protected]>
iio: ssp_sensors: cancel delayed work_refresh on remove
Antoniu Miclaus <[email protected]>
iio: gyro: adis16260: fix division by zero in write_raw
David Carlier <[email protected]>
iio: gyro: itg3200: fix i2c read into the wrong stack location
Radu Sabau <[email protected]>
iio: adc: ad4695: Fix call ordering in offload buffer postenable
Salah Triki <[email protected]>
iio: adc: viperboard: Fix error handling in vprbrd_iio_read_raw
Salah Triki <[email protected]>
iio: adc: mt6359: fix unchecked return value in mt6358_read_imp
Rodrigo Alencar <[email protected]>
iio: dac: ad5686: fix powerdown control on dual-channel devices
Rodrigo Alencar <[email protected]>
iio: dac: ad5686: acquire lock when doing powerdown control
Rodrigo Alencar <[email protected]>
iio: dac: ad5686: fix input raw value check
Rodrigo Alencar <[email protected]>
iio: dac: ad5686: fix ref bit initialization for single-channel parts
Salah Triki <[email protected]>
iio: dac: max5821: fix return value check in powerdown sync
Kim Seer Paller <[email protected]>
iio: dac: ad3530r: Fix AD3531/AD3531R powerdown mode strings
David Carlier <[email protected]>
iio: adc: npcm: fix unbalanced clk_disable_unprepare()
Christofer Jonason <[email protected]>
iio: adc: xilinx-xadc: Fix sequencer mode in postdisable for dual mux
Nathan Chancellor <[email protected]>
Disable -Wattribute-alias for clang-23 and newer
Sean Christopherson <[email protected]>
KVM: SEV: Don't explicitly pass PSC buffer to snp_begin_psc()
Sean Christopherson <[email protected]>
KVM: SEV: Use READ_ONCE() when reading entries/indices from PSC buffer
Sean Christopherson <[email protected]>
KVM: SEV: Check PSC request indices against the actual size of the buffer
Sean Christopherson <[email protected]>
KVM: SEV: Compute the correct max length of the in-GHCB scratch area
Sean Christopherson <[email protected]>
KVM: SEV: WARN if KVM attempts to setup scratch area with min_len==0
Sean Christopherson <[email protected]>
KVM: SEV: Use the size of the PSC header as the minimum size for PSC requests
Sean Christopherson <[email protected]>
KVM: SEV: Ignore Port I/O requests of length '0'
Michael Roth <[email protected]>
KVM: SEV: Require in-GHCB scratch area if GHCB v2+ is in use
Sean Christopherson <[email protected]>
KVM: SVM: Flush the current TLB when transitioning from xAVIC => x2AVIC
Qiang Ma <[email protected]>
KVM: arm64: PMU: Preserve AArch32 counter low bits
Mark Brown <[email protected]>
KVM: arm64: Correctly cap ZCR_EL2 provided by a guest hypervisor
Wentao Guan <[email protected]>
USB: cdc-acm: Fix bit overlap and move quirk definitions to header
Alice Ryhl <[email protected]>
rust_binder: avoid calling pending_oneway_finished() on TF_UPDATE_TXN
Matthew Maurer <[email protected]>
rust_binder: Avoid holding lock when dropping delivered_death
Ben Hutchings <[email protected]>
parport: Fix race between port and client registration
Dmitry Torokhov <[email protected]>
Input: xpad - fix out-of-bounds access for Share button
Doruk Tan Ozturk <[email protected]>
Bluetooth: hci_sync: fix UAF in hci_le_create_cis_sync
Shuai Zhang <[email protected]>
Bluetooth: hci_qca: Use 100 ms SSR delay for rampatch and NVM loading
Pavitra Jha <[email protected]>
Bluetooth: hci_conn: Fix memory leak in hci_le_big_terminate()
Muhammad Bilal <[email protected]>
Bluetooth: ISO: serialize iso_sock_clear_timer with socket lock
Muhammad Bilal <[email protected]>
Bluetooth: ISO: fix UAF in iso_recv_frame
Muhammad Bilal <[email protected]>
Bluetooth: HIDP: fix missing length checks in hidp_input_report()
Siwei Zhang <[email protected]>
Bluetooth: L2CAP: fix chan ref leak in l2cap_chan_timeout() on !conn
Siwei Zhang <[email protected]>
Bluetooth: L2CAP: use chan timer to close channels in cleanup_listen()
Steve French <[email protected]>
smb: client: fix uninitialized variable in smb2_writev_callback
Stepan Ionichev <[email protected]>
auxdisplay: line-display: fix OOB read on zero-length message_store()
Dev Jain <[email protected]>
mm/rmap: initialize nr_pages to 1 at loop start in try_to_unmap_one
Pratyush Yadav (Google) <[email protected]>
memfd: deny writeable mappings when implying SEAL_WRITE
Alexandre Ghiti <[email protected]>
mm: memcontrol: propagate NMI slab stats to memcg vmstats
Linpu Yu <[email protected]>
ipc: limit next_id allocation to the valid ID range
SeongJae Park <[email protected]>
mm/damon/sysfs-schemes: delete tried region in regions_rmdirs()
Mikulas Patocka <[email protected]>
hpfs: fix a crash if hpfs_map_dnode_bitmap fails
Shuai Zhang <[email protected]>
Bluetooth: btusb: Allow firmware re-download when version matches
hlleng <[email protected]>
HID: quirks: Add ALWAYS_POLL quirk for SIGMACHIP USB mouse
Thomas Fourier <[email protected]>
Input: ims-pcu - fix usb_free_coherent() size in ims_pcu_buffers_free()
Henri A <[email protected]>
media: rc: igorplugusb: fix control request setup packet
Johan Hovold <[email protected]>
USB: serial: safe_serial: fix memory corruption with small endpoint
Greg Kroah-Hartman <[email protected]>
usb: typec: ucsi: validate connector number in ucsi_connector_change()
Greg Kroah-Hartman <[email protected]>
usb: typec: tcpm/tcpci_maxim: validate header NDO against RX_BYTE_CNT
Greg Kroah-Hartman <[email protected]>
usb: typec: wcove: don't write past struct pd_message in wcove_read_rx_buffer()
Greg Kroah-Hartman <[email protected]>
usb: typec: altmodes/displayport: validate count before reading Status Update VDO
Greg Kroah-Hartman <[email protected]>
usb: typec: ucsi: displayport: NAK DP_CMD_CONFIGURE without a payload VDO
Greg Kroah-Hartman <[email protected]>
usb: typec: tcpm: bound altmode_desc[] per iteration in svdm_consume_modes()
Greg Kroah-Hartman <[email protected]>
usb: typec: tcpm: validate VDO count in Discover Identity ACK handlers
Greg Kroah-Hartman <[email protected]>
usb: typec: ucsi: ccg: reject firmware images without a ':' record header
Greg Kroah-Hartman <[email protected]>
iio: pressure: bmp280: fix stack leak in bmp580 trigger handler
Greg Kroah-Hartman <[email protected]>
iio: imu: adis16550: fix stack leak in trigger handler
Greg Kroah-Hartman <[email protected]>
iio: imu: st_lsm6dsx: fix stack leak in tagged FIFO buffer
Horatiu Vultur <[email protected]>
phy: mscc: Use PHY_ID_MATCH_EXACT for VSC8584, VSC8582, VSC8575, VSC856X
Jouni Högander <[email protected]>
drm/i915/psr: Apply Intel DPCD workaround when SDP on prior line used
Jouni Högander <[email protected]>
drm/i915/psr: Read Intel DPCD workaround register
Jouni Högander <[email protected]>
drm/i915/psr: Add defininitions for INTEL_WA_REGISTER_CAPS DPCD register
Peter Oberparleiter <[email protected]>
s390/cio: Restore GFP_DMA for CHSC allocation
Andrei Vagin <[email protected]>
Revert "x86/fpu: Refine and simplify the magic number check during signal return"
Michael Bommarito <[email protected]>
smb: client: validate the whole DACL before rewriting it in cifsacl
Oliver Neukum <[email protected]>
media: rc: ttusbir: fix inverted error logic
Sean Young <[email protected]>
media: rc: fix race between unregister and urb/irq callbacks
Pavel Begunkov <[email protected]>
net: skbuff: fix pskb_carve leaking zcopy pages
Jiayuan Chen <[email protected]>
ipv6: fix possible infinite loop in fib6_select_path()
Jiayuan Chen <[email protected]>
ipv6: fix possible infinite loop in rt6_fill_node()
Jingguo Tan <[email protected]>
vsock/virtio: bind uarg before filling zerocopy skb
Zhenghang Xiao <[email protected]>
sctp: fix race between sctp_wait_for_connect and peeloff
Dipayaan Roy <[email protected]>
net: mana: Skip redundant detach on already-detached port
Dipayaan Roy <[email protected]>
net: mana: Add NULL guards in teardown path to prevent panic on attach failure
Marco Scardovi <[email protected]>
gpio: rockchip: teardown bugs and resource leaks
Marco Scardovi <[email protected]>
gpio: rockchip: convert bank->clk to devm_clk_get_enabled()
Dan Carpenter <[email protected]>
gpio: virtuser: Fix uninitialized data bug in gpio_virtuser_direction_do_write()
Bartosz Golaszewski <[email protected]>
gpio: adnp: fix flow control regression caused by scoped_guard()
Heitor Alves de Siqueira <[email protected]>
Bluetooth: hci_sync: Reset device counters in hci_dev_close_sync()
Heitor Alves de Siqueira <[email protected]>
Bluetooth: hci_sync: Set HCI_CMD_DRAIN_WORKQUEUE during device close
Luiz Augusto von Dentz <[email protected]>
Bluetooth: L2CAP: Fix possible crash on l2cap_ecred_conn_rsp
Zhenghang Xiao <[email protected]>
Bluetooth: l2cap: clear chan->ident on ECRED reconfiguration success
Chuck Lever <[email protected]>
net/handshake: Pass negative errno through handshake_complete()
Chuck Lever <[email protected]>
nvme-tcp: store negative errno in queue->tls_err
Chuck Lever <[email protected]>
net/handshake: Use spin_lock_bh for hn_lock
Jijie Shao <[email protected]>
net: hibmcge: disable Relaxed Ordering to fix RX packet corruption
Jamal Hadi Salim <[email protected]>
net/sched: Revert "net/sched: Restrict conditions for adding duplicating netems to qdisc tree"
Rahul Chandelkar <[email protected]>
ipv6: rpl: fix hdrlen overflow in ipv6_rpl_srh_decompress()
Jakub Kicinski <[email protected]>
ethtool: eeprom: add more safeties to EEPROM Netlink fallback
Jakub Kicinski <[email protected]>
ethtool: eeprom: add missing ethnl_ops_begin() / _complete() during fallback
Jakub Kicinski <[email protected]>
ethtool: strset: fix header attribute index in ethnl_req_get_phydev()
Jakub Kicinski <[email protected]>
ethtool: tsinfo: don't pass ERR_PTR to genlmsg_cancel on prepare failure
Jakub Kicinski <[email protected]>
ethtool: tsinfo: fix uninitialized stats on the by-PHC path
Jakub Kicinski <[email protected]>
ethtool: tsconfig: fix missing ethnl_ops_complete()
Jakub Kicinski <[email protected]>
ethtool: pse-pd: fix missing ethnl_ops_complete()
Jakub Kicinski <[email protected]>
ethtool: linkstate: fix unbalanced ethnl_ops_complete() on PHY lookup error
Jakub Kicinski <[email protected]>
ethtool: tsconfig: fix reply error handling
Jakub Kicinski <[email protected]>
ethtool: coalesce: cap profile updates at NET_DIM_PARAMS_NUM_PROFILES
Ido Schimmel <[email protected]>
bridge: Fix sleep in atomic context in sysfs path
Ido Schimmel <[email protected]>
bridge: Fix sleep in atomic context in netlink path
Oliver Hartkopp <[email protected]>
bonding: refuse to enslave CAN devices
Zhao Dongdong <[email protected]>
Bluetooth: 6lowpan: check skb_clone() return value in send_mcast_pkt()
Balasubramani Vivekanandan <[email protected]>
drm/xe: Restore IDLEDLY regiter on engine reset
Cássio Gabriel <[email protected]>
ASoC: codecs: simple-mux: Fix enum control bounds check
Sean Shen <[email protected]>
ksmbd: fix FSCTL permission bypass by adding a permission check for FSCTL_SET_SPARSE
Eric Dumazet <[email protected]>
tunnels: do not assume transport header in iptunnel_pmtud_check_icmp()
Eric Dumazet <[email protected]>
vxlan: do not reuse cached ip_hdr() value after skb_tunnel_check_pmtu()
Eric Dumazet <[email protected]>
tunnels: load network headers after skb_cow() in iptunnel_pmtud_build_icmp[v6]()
Li Ming <[email protected]>
cxl/test: Update mock dev array before calling platform_device_add()
Jakub Kicinski <[email protected]>
ethtool: cmis: validate fw->size against start_cmd_payload_size
Jakub Kicinski <[email protected]>
ethtool: cmis: validate start_cmd_payload_size from module
Jakub Kicinski <[email protected]>
ethtool: cmis: fix u16-to-u8 truncation of msleep_pre_rpl
Jakub Kicinski <[email protected]>
ethtool: cmis: require exact CDB reply length
Jakub Kicinski <[email protected]>
ethtool: module: fix cleanup if socket used for flashing multiple devices
Jakub Kicinski <[email protected]>
ethtool: module: check fw_flash_in_progress under rtnl_lock
Jakub Kicinski <[email protected]>
ethtool: module: avoid racy updates to dev->ethtool bitfield
Jakub Kicinski <[email protected]>
ethtool: module: avoid leaking a netdev ref on module flash errors
Jakub Kicinski <[email protected]>
ethtool: module: call ethnl_ops_complete() on module flash errors
Jakub Kicinski <[email protected]>
ethtool: rss: avoid device context leak on reply-build failure
Jakub Kicinski <[email protected]>
ethtool: rss: fix hkey leak when indir_size is 0
Jakub Kicinski <[email protected]>
ethtool: rss: fix indir_table and hkey leak on get_rxfh failure
Jakub Kicinski <[email protected]>
ethtool: rss: fix falsely ignoring indir table updates
Jakub Kicinski <[email protected]>
ethtool: rss: add missing errno on RSS context delete
Jakub Kicinski <[email protected]>
ethtool: rss: avoid modifying the RSS context response
Björn Töpel <[email protected]>
net: Avoid checksumming unreadable skb tail on trim
Weiming Shi <[email protected]>
net: team: fix NULL pointer dereference in team_xmit during mode change
Marc Harvey <[email protected]>
net: team: Rename port_disabled team mode op to port_tx_disabled
Marc Harvey <[email protected]>
net: team: Remove unused team_mode_op, port_enabled
Alexander Stein <[email protected]>
gpio: mxc: fix irq_high handling
Luka Gejak <[email protected]>
net: hsr: fix potential OOB access in supervision frame handling
Prathamesh Deshpande <[email protected]>
net/mlx5: HWS: Reject unsupported remove-header action
Cássio Gabriel <[email protected]>
ASoC: Intel: bytcht_es8316: Fix MCLK leak on init errors
Cássio Gabriel <[email protected]>
ALSA: pcm: oss: Fix setup list UAF on proc write error
Eric Dumazet <[email protected]>
ipv4: free net->ipv4.sysctl_local_reserved_ports after unregister_net_sysctl_table()
David Jeffery <[email protected]>
scsi: core: Run queues for all non-SDEV_DEL devices from scsi_run_host_queues
Breno Leitao <[email protected]>
net/iucv: fix locking in .getsockopt
Alexandra Winter <[email protected]>
net/smc: Do not re-initialize smc hashtables
Ilya Maximets <[email protected]>
net: netlink: don't set nsid on local notifications
Ilya Maximets <[email protected]>
net: netlink: fix sending unassigned nsid after assigned one
Ziyu Zhang <[email protected]>
vsock: keep poll shutdown state consistent
Weiming Shi <[email protected]>
tun: free page on build_skb failure in tun_xdp_one()
Weiming Shi <[email protected]>
tun: free page on short-frame rejection in tun_xdp_one()
Fernando Fernandez Mancera <[email protected]>
netfilter: nf_tables: fix dst corruption in same register operation
Florian Westphal <[email protected]>
netfilter: ebtables: fix OOB read in compat_mtw_from_user
Florian Westphal <[email protected]>
netfilter: xt_cpu: prefer raw_smp_processor_id
Chris Mason <[email protected]>
netfilter: synproxy: refresh tcphdr after skb_ensure_writable
Deepanshu Kartikey <[email protected]>
kernel/fork: validate exit_signal in kernel_clone()
Dhabaleshwar Das <[email protected]>
accel/rocket: fix UAF via dangling GEM handle in create_bo
Florian Schmaus <[email protected]>
kunit: fix use-after-free in debugfs when using kunit.filter
Liu Kai <[email protected]>
HID: remove duplicate hid_warn_ratelimited definition
Hongtao Lee <[email protected]>
tools/bootconfig: Fix buf leaks in apply_xbc
Carl Lee <[email protected]>
nfc: nxp-nci: i2c: use rising-edge IRQ on ACPI systems
David Ahern <[email protected]>
xfrm: Check for underflow in xfrm_state_mtu
Lee Jones <[email protected]>
nfc: llcp: Fix use-after-free race in nfc_llcp_recv_cc()
Lee Jones <[email protected]>
nfc: llcp: Fix use-after-free in llcp_sock_release()
Mingzhe Zou <[email protected]>
bcache: fix uninitialized closure object
Victor Nogueria <[email protected]>
net/sched: sch_sfb: Replace direct dequeue call with peek and qdisc_dequeue_peeked
Usama Arif <[email protected]>
xfrm: move policy_bydst RCU sync from per-netns .exit to .pre_exit
Jeremy Kerr <[email protected]>
net: mctp: ensure our nlmsg responses are initialised
Davide Caratti <[email protected]>
net/sched: cls_fw: fix NULL dereference of "old" filters before change()
Greg Kroah-Hartman <[email protected]>
Input: usbtouchscreen - clamp NEXIO data_len/x_len to URB buffer size
-------------
Diffstat:
Documentation/netlink/specs/handshake.yaml | 8 + Makefile | 4 +- arch/arm64/include/asm/kvm_host.h | 2 +- arch/arm64/include/asm/tlb.h | 2 +- arch/arm64/kvm/hyp/include/hyp/switch.h | 16 +- arch/arm64/kvm/nested.c | 5 + arch/arm64/kvm/pmu-emul.c | 4 +- arch/arm64/kvm/sys_regs.c | 11 +- arch/mips/dec/platform.c | 109 ++++++++++- arch/riscv/include/asm/syscall_wrapper.h | 4 + arch/x86/kernel/cpu/cpuid-deps.c | 1 + arch/x86/kernel/fpu/signal.c | 11 +- arch/x86/kernel/ftrace.c | 7 + arch/x86/kvm/svm/avic.c | 35 +++- arch/x86/kvm/svm/sev.c | 76 ++++--- drivers/accel/rocket/rocket_gem.c | 17 +- drivers/android/binder/allocation.rs | 8 + drivers/android/binder/process.rs | 7 +- drivers/android/binder/transaction.rs | 11 +- drivers/auxdisplay/line-display.c | 2 +- drivers/bluetooth/btusb.c | 8 +- drivers/bluetooth/hci_qca.c | 42 ++-- drivers/comedi/drivers/comedi_test.c | 5 +- drivers/counter/counter-core.c | 3 +- drivers/cpufreq/intel_pstate.c | 13 +- drivers/gpio/gpio-adnp.c | 4 +- drivers/gpio/gpio-mxc.c | 2 +- drivers/gpio/gpio-rockchip.c | 23 ++- drivers/gpio/gpio-virtuser.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 7 +- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 10 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 8 +- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 3 + drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 4 + drivers/gpu/drm/bridge/sil-sii8620.c | 1 + drivers/gpu/drm/drm_gem.c | 2 + drivers/gpu/drm/hyperv/hyperv_drm_proto.c | 113 +++++++++-- drivers/gpu/drm/i915/display/intel_display_core.h | 1 + drivers/gpu/drm/i915/display/intel_display_irq.c | 8 +- drivers/gpu/drm/i915/display/intel_display_types.h | 3 + drivers/gpu/drm/i915/display/intel_dpcd.h | 15 ++ drivers/gpu/drm/i915/display/intel_psr.c | 60 ++++-- drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 28 +-- drivers/gpu/drm/xe/xe_guc_ads.c | 5 + drivers/hid/hid-ids.h | 1 + drivers/hid/hid-picolcd_cir.c | 1 + drivers/hid/hid-quirks.c | 1 + drivers/hid/wacom_sys.c | 13 +- drivers/hid/wacom_wac.h | 1 + drivers/hwmon/pmbus/adm1266.c | 7 + drivers/hwmon/pmbus/pmbus.h | 5 + drivers/hwmon/pmbus/pmbus_core.c | 8 + drivers/i2c/busses/i2c-davinci.c | 2 +- drivers/iio/adc/ad4695.c | 23 +-- drivers/iio/adc/mt6359-auxadc.c | 1 + drivers/iio/adc/npcm_adc.c | 25 +-- drivers/iio/adc/viperboard_adc.c | 4 +- drivers/iio/adc/xilinx-xadc-core.c | 11 +- drivers/iio/buffer/industrialio-hw-consumer.c | 4 +- drivers/iio/chemical/mhz19b.c | 17 ++ drivers/iio/chemical/scd30_core.c | 2 +- drivers/iio/common/ssp_sensors/ssp_dev.c | 1 + drivers/iio/dac/ad3530r.c | 54 +++-- drivers/iio/dac/ad5686.c | 56 ++++-- drivers/iio/dac/ad5686.h | 1 + drivers/iio/dac/max5821.c | 9 +- drivers/iio/gyro/adis16260.c | 3 + drivers/iio/gyro/itg3200_buffer.c | 2 +- drivers/iio/imu/adis16550.c | 2 +- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 2 +- drivers/iio/industrialio-buffer.c | 1 + drivers/iio/inkern.c | 6 +- drivers/iio/light/cm3323.c | 5 +- drivers/iio/light/veml6070.c | 14 +- drivers/iio/magnetometer/st_magn_core.c | 13 +- drivers/iio/pressure/bmp280-core.c | 2 +- drivers/iio/temperature/tsys01.c | 2 +- drivers/input/joystick/xpad.c | 14 +- drivers/input/misc/ims-pcu.c | 2 +- drivers/input/mouse/elan_i2c_core.c | 5 + drivers/input/mouse/synaptics.c | 1 + drivers/input/touchscreen/atmel_mxt_ts.c | 2 +- drivers/input/touchscreen/usbtouchscreen.c | 5 + drivers/iommu/io-pgtable-arm-v7s.c | 18 +- drivers/mailbox/mailbox.c | 15 +- drivers/mailbox/tegra-hsp.c | 2 +- drivers/md/bcache/super.c | 3 +- drivers/media/cec/core/cec-core.c | 2 +- drivers/media/common/siano/smsir.c | 1 + drivers/media/i2c/ir-kbd-i2c.c | 2 + drivers/media/pci/bt8xx/bttv-input.c | 3 +- drivers/media/pci/cx23885/cx23885-input.c | 1 + drivers/media/pci/cx88/cx88-input.c | 3 +- drivers/media/pci/dm1105/dm1105.c | 1 + drivers/media/pci/mantis/mantis_input.c | 1 + drivers/media/pci/saa7134/saa7134-input.c | 1 + drivers/media/pci/smipcie/smipcie-ir.c | 1 + drivers/media/pci/ttpci/budget-ci.c | 1 + drivers/media/rc/ati_remote.c | 6 +- drivers/media/rc/ene_ir.c | 2 +- drivers/media/rc/fintek-cir.c | 3 +- drivers/media/rc/igorplugusb.c | 3 +- drivers/media/rc/iguanair.c | 1 + drivers/media/rc/img-ir/img-ir-hw.c | 3 +- drivers/media/rc/img-ir/img-ir-raw.c | 3 +- drivers/media/rc/imon.c | 3 +- drivers/media/rc/ir-hix5hd2.c | 2 +- drivers/media/rc/ir_toy.c | 1 + drivers/media/rc/ite-cir.c | 2 +- drivers/media/rc/mceusb.c | 1 + drivers/media/rc/rc-ir-raw.c | 5 - drivers/media/rc/rc-loopback.c | 1 + drivers/media/rc/rc-main.c | 6 +- drivers/media/rc/redrat3.c | 4 +- drivers/media/rc/st_rc.c | 2 +- drivers/media/rc/streamzap.c | 7 +- drivers/media/rc/sunxi-cir.c | 1 + drivers/media/rc/ttusbir.c | 4 +- drivers/media/rc/winbond-cir.c | 2 +- drivers/media/rc/xbox_remote.c | 5 +- drivers/media/usb/au0828/au0828-input.c | 1 + drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 1 + drivers/media/usb/dvb-usb/dvb-usb-remote.c | 6 +- drivers/media/usb/em28xx/em28xx-input.c | 1 + drivers/misc/rp1/rp1_pci.c | 1 + drivers/net/bonding/bond_main.c | 6 + drivers/net/ethernet/hisilicon/hibmcge/hbg_main.c | 3 + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 2 + .../mellanox/mlx5/core/steering/hws/fs_hws.c | 4 +- drivers/net/ethernet/microsoft/mana/mana_en.c | 78 +++++--- drivers/net/macsec.c | 3 +- drivers/net/phy/micrel.c | 15 +- drivers/net/phy/mscc/mscc.h | 8 +- drivers/net/phy/mscc/mscc_main.c | 23 +-- drivers/net/team/team_core.c | 51 +++-- drivers/net/team/team_mode_loadbalance.c | 4 +- drivers/net/tun.c | 5 +- drivers/net/vxlan/vxlan_core.c | 4 +- drivers/net/wireguard/send.c | 20 +- drivers/nfc/nxp-nci/i2c.c | 21 +- drivers/nvme/host/tcp.c | 2 +- drivers/parport/share.c | 11 +- drivers/platform/x86/intel/vsec.c | 91 ++++----- drivers/s390/cio/chsc.c | 4 +- drivers/s390/cio/chsc_sch.c | 20 +- drivers/s390/cio/scm.c | 2 +- drivers/scsi/fcoe/fcoe_ctlr.c | 2 +- drivers/scsi/scsi_lib.c | 27 ++- drivers/scsi/scsi_transport_fc.c | 77 ++++---- drivers/spi/spi-mem.c | 15 +- drivers/staging/gpib/cb7210/cb7210.c | 10 +- drivers/staging/media/av7110/av7110_ir.c | 1 + drivers/target/iscsi/iscsi_target.c | 5 +- drivers/target/iscsi/iscsi_target_auth.c | 19 +- drivers/target/iscsi/iscsi_target_nego.c | 7 +- drivers/target/iscsi/iscsi_target_parameters.c | 62 ++++-- drivers/target/iscsi/iscsi_target_parameters.h | 2 +- drivers/thunderbolt/property.c | 32 ++- drivers/tty/serdev/core.c | 21 ++ drivers/tty/serial/8250/8250_dw.c | 2 +- drivers/tty/serial/8250/8250_port.c | 7 +- drivers/tty/serial/altera_jtaguart.c | 7 +- drivers/tty/serial/dz.c | 171 ++++++++-------- drivers/tty/serial/fsl_lpuart.c | 15 +- drivers/tty/serial/pch_uart.c | 19 +- drivers/tty/serial/qcom_geni_serial.c | 16 +- drivers/tty/serial/samsung_tty.c | 8 - drivers/tty/serial/sh-sci.c | 2 +- drivers/tty/serial/zs.c | 218 ++++++++------------- drivers/tty/serial/zs.h | 1 - drivers/usb/cdns3/cdns3-gadget.c | 12 +- drivers/usb/cdns3/cdns3-plat.c | 11 +- drivers/usb/chipidea/core.c | 16 +- drivers/usb/class/cdc-acm.c | 2 - drivers/usb/class/cdc-acm.h | 2 + drivers/usb/class/usbtmc.c | 14 ++ drivers/usb/core/config.c | 9 +- drivers/usb/core/quirks.c | 4 + drivers/usb/dwc2/hcd.c | 4 +- drivers/usb/dwc3/dwc3-xilinx.c | 27 +-- drivers/usb/gadget/composite.c | 5 +- drivers/usb/gadget/function/f_fs.c | 26 ++- drivers/usb/gadget/function/f_hid.c | 3 +- drivers/usb/gadget/function/f_uvc.c | 28 ++- drivers/usb/gadget/udc/dummy_hcd.c | 4 + drivers/usb/gadget/udc/net2280.c | 4 +- drivers/usb/host/xhci-tegra.c | 77 ++++---- drivers/usb/musb/omap2430.c | 3 +- drivers/usb/serial/belkin_sa.c | 3 + drivers/usb/serial/cypress_m8.c | 20 +- drivers/usb/serial/digi_acceleport.c | 23 ++- drivers/usb/serial/keyspan.c | 4 + drivers/usb/serial/mct_u232.c | 26 ++- drivers/usb/serial/mxuport.c | 8 + drivers/usb/serial/omninet.c | 9 +- drivers/usb/serial/option.c | 9 +- drivers/usb/serial/safe_serial.c | 11 ++ drivers/usb/storage/unusual_uas.h | 7 + drivers/usb/typec/altmodes/displayport.c | 2 + drivers/usb/typec/tcpm/tcpci_maxim_core.c | 9 + drivers/usb/typec/tcpm/tcpm.c | 117 ++++++----- drivers/usb/typec/tcpm/wcove.c | 13 +- drivers/usb/typec/tipd/core.c | 1 + drivers/usb/typec/ucsi/displayport.c | 4 + drivers/usb/typec/ucsi/ucsi.c | 24 ++- drivers/usb/typec/ucsi/ucsi_ccg.c | 5 + drivers/usb/usbip/vudc_dev.c | 1 + drivers/usb/usbip/vudc_transfer.c | 3 +- fs/hpfs/alloc.c | 2 +- fs/smb/client/cifsacl.c | 116 ++++++++--- fs/smb/client/smb2pdu.c | 2 +- fs/smb/server/smb2pdu.c | 11 ++ fs/smb/server/smbacl.c | 8 +- include/kunit/test.h | 1 + include/linux/compat.h | 4 + include/linux/compiler-clang.h | 6 + include/linux/compiler_attributes.h | 11 ++ include/linux/compiler_types.h | 4 + include/linux/hid.h | 2 - include/linux/if_team.h | 3 +- include/linux/intel_vsec.h | 4 +- include/linux/mailbox_controller.h | 3 + include/linux/parport.h | 1 + include/linux/serdev.h | 1 + include/linux/serial_core.h | 12 ++ include/linux/syscalls.h | 4 + include/media/rc-core.h | 2 - include/net/netfilter/nf_tables.h | 7 + include/net/xfrm.h | 3 +- ipc/util.c | 2 +- kernel/fork.c | 11 +- lib/debugobjects.c | 2 +- lib/kunit/executor.c | 19 +- lib/kunit/test.c | 1 + mm/damon/sysfs-schemes.c | 8 +- mm/memcontrol.c | 6 + mm/memfd.c | 12 +- mm/rmap.c | 2 + mm/slab_common.c | 2 + mm/slub.c | 1 + net/bluetooth/6lowpan.c | 2 + net/bluetooth/hci_conn.c | 4 +- net/bluetooth/hci_sync.c | 16 +- net/bluetooth/hidp/core.c | 23 ++- net/bluetooth/iso.c | 12 +- net/bluetooth/l2cap_core.c | 41 +++- net/bluetooth/l2cap_sock.c | 16 +- net/bridge/br_netlink.c | 17 +- net/bridge/br_switchdev.c | 1 - net/bridge/br_sysfs_if.c | 30 ++- net/bridge/netfilter/ebtables.c | 30 +++ net/core/devmem.c | 11 ++ net/core/filter.c | 2 +- net/core/skbuff.c | 45 ++++- net/ethtool/cmis.h | 4 +- net/ethtool/cmis_cdb.c | 9 +- net/ethtool/cmis_fw_update.c | 44 +++-- net/ethtool/coalesce.c | 6 + net/ethtool/eeprom.c | 10 +- net/ethtool/linkstate.c | 6 +- net/ethtool/module.c | 41 ++-- net/ethtool/netlink.c | 4 +- net/ethtool/netlink.h | 4 +- net/ethtool/pse-pd.c | 10 +- net/ethtool/rss.c | 37 ++-- net/ethtool/strset.c | 2 +- net/ethtool/tsconfig.c | 15 +- net/ethtool/tsinfo.c | 19 +- net/handshake/genl.c | 3 +- net/handshake/genl.h | 1 + net/handshake/handshake-test.c | 2 +- net/handshake/handshake.h | 4 +- net/handshake/netlink.c | 6 +- net/handshake/request.c | 16 +- net/handshake/tlshd.c | 6 +- net/hsr/hsr_forward.c | 4 +- net/ipv4/ah4.c | 2 +- net/ipv4/esp4.c | 4 +- net/ipv4/ip_tunnel_core.c | 22 ++- net/ipv4/sysctl_net_ipv4.c | 2 +- net/ipv6/ah6.c | 2 +- net/ipv6/datagram.c | 54 ++++- net/ipv6/esp6.c | 4 +- net/ipv6/exthdrs.c | 6 +- net/ipv6/ip6_vti.c | 23 ++- net/ipv6/route.c | 5 + net/iucv/af_iucv.c | 20 +- net/key/af_key.c | 6 +- net/l2tp/l2tp_core.c | 11 +- net/mctp/device.c | 1 + net/mctp/neigh.c | 1 + net/mctp/route.c | 1 + net/mptcp/fastopen.c | 4 +- net/mptcp/mib.c | 1 - net/mptcp/mib.h | 1 - net/mptcp/protocol.c | 65 ++++-- net/mptcp/protocol.h | 31 ++- net/mptcp/subflow.c | 8 +- net/netfilter/nf_conntrack_proto_tcp.c | 3 +- net/netfilter/nf_synproxy_core.c | 2 + net/netfilter/nft_bitwise.c | 18 +- net/netfilter/nft_byteorder.c | 13 +- net/netfilter/xt_cpu.c | 2 +- net/netlink/af_netlink.c | 11 +- net/nfc/hci/core.c | 10 + net/nfc/llcp_core.c | 11 ++ net/nfc/llcp_sock.c | 2 + net/nfc/nci/hci.c | 10 + net/rxrpc/ar-internal.h | 14 +- net/rxrpc/call_event.c | 22 +-- net/rxrpc/call_object.c | 2 + net/rxrpc/conn_event.c | 30 ++- net/rxrpc/insecure.c | 8 +- net/rxrpc/recvmsg.c | 68 +++++-- net/rxrpc/rxgk.c | 147 ++++++-------- net/rxrpc/rxgk_app.c | 46 ++--- net/rxrpc/rxgk_common.h | 66 +++---- net/rxrpc/rxkad.c | 115 ++++------- net/sched/cls_fw.c | 6 +- net/sched/sch_netem.c | 40 ---- net/sched/sch_sfb.c | 2 +- net/sctp/socket.c | 2 + net/smc/af_smc.c | 4 +- net/vmw_vsock/af_vsock.c | 49 +++-- net/vmw_vsock/hyperv_transport.c | 9 +- net/vmw_vsock/virtio_transport_common.c | 26 ++- net/vmw_vsock/vmci_transport.c | 8 +- net/xfrm/xfrm_input.c | 16 +- net/xfrm/xfrm_ipcomp.c | 12 +- net/xfrm/xfrm_iptfs.c | 29 ++- net/xfrm/xfrm_policy.c | 17 +- net/xfrm/xfrm_state.c | 23 ++- net/xfrm/xfrm_user.c | 5 +- sound/core/oss/pcm_oss.c | 18 +- .../motu/motu-register-dsp-message-parser.c | 11 +- sound/hda/codecs/realtek/alc269.c | 1 + sound/soc/codecs/simple-mux.c | 2 +- sound/soc/intel/boards/bytcht_es8316.c | 29 ++- sound/soc/qcom/qdsp6/q6asm-dai.c | 43 ++-- sound/usb/mixer_scarlett2.c | 33 +++- tools/bootconfig/main.c | 4 +- tools/testing/cxl/test/cxl.c | 105 ++++------ tools/testing/selftests/net/mptcp/mptcp_connect.sh | 6 +- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 10 +- 346 files changed, 3284 insertions(+), 1733 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/315 Input: usbtouchscreen - clamp NEXIO data_len/x_len to URB buffer size
6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 2905281cbda52ec9df540113b35b835feb5fafd3 upstream.
nexio_read_data() pulls data_len and x_len from a packed __be16 header in the device's interrupt packet and then walks packet->data[0..x_len) and packet->data[x_len..data_len) comparing each byte against a threshold.
Both fields are 16-bit on the wire (max 65535). The existing adjustments shave at most 0x100 / 0x80 off, so the loop bound can still reach roughly 0xfeff. The URB transfer buffer for NEXIO is rept_size (1024) bytes from usb_alloc_coherent(), with the first 7 occupied by the packed header — so packet->data[] has 1017 valid bytes. read_data() callbacks are not given urb->actual_length, and nothing else bounds the walk.
A device that lies about its length can get a ~64 KiB out-of-bounds read past the coherent DMA allocation. The first index whose byte exceeds NEXIO_THRESHOLD lands in begin_x / begin_y and from there into the reported touch coordinates, so adjacent kernel memory contents leak to userspace as ABS_X / ABS_Y events. Far enough out, the read can also hit an unmapped page and fault.
Fix this all by clamping data_len to the buffer's data[] capacity and x_len to data_len.
--- drivers/input/touchscreen/usbtouchscreen.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/input/touchscreen/usbtouchscreen.c +5 -0
@@ -1070,6 +1070,11 @@ static int nexio_read_data(struct usbtouif (x_len >0xff ) x_len -=0x80 ; +if (data_len > usbtouch->data_size -sizeof (*packet)) + data_len = usbtouch->data_size -sizeof (*packet); +if (x_len > data_len) + x_len = data_len; +/* send ACK */ ret =usb_submit_urb (priv->ack,GFP_ATOMIC );if (ret)
Greg Kroah-Hartman
maintainerPATCH 2/315 net/sched: cls_fw: fix NULL dereference of "old" filters before change()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Davide Caratti <[email protected]>
[ Upstream commit 65782b2db7321d5f97c16718c4c7f6c7205a56be ]
Like pointed out by Sashiko [1], since commit ed76f5edccc9 ("net: sched:
protect filter_chain list with filter_chain_lock mutex") TC filters are added to a shared block and published to datapath before their ->change() function is called. This is a problem for cls_fw: an invalid filter created with the "old" method can still classify some packets before it is destroyed by the validation logic added by Xiang. Therefore, insisting with repeated runs of the following script:
# ip link add dev crash0 type dummy # ip link set dev crash0 up # mausezahn crash0 -c 100000 -P 10 \
Quoted 1 line
-A 4.3.2.1 -B 1.2.3.4 -t udp "dp=1234" -q &
# sleep 1 # tc qdisc add dev crash0 egress_block 1 clsact # tc filter add block 1 protocol ip prio 1 matchall \
Quoted 1 line
action skbedit mark 65536 continue
# tc filter add block 1 protocol ip prio 2 fw # ip link del dev crash0
can still make fw_classify() hit the WARN_ON() in [2]:
WARNING: ./include/net/pkt_cls.h:88 at fw_classify+0x244/0x250 [cls_fw], CPU#18: mausezahn/1399 Modules linked in: cls_fw(E) act_skbedit(E) CPU: 18 UID: 0 PID: 1399 Comm: mausezahn Tainted: G E 7.0.0-rc6-virtme #17 PREEMPT(full) Tainted: [E]=UNSIGNED_MODULE Hardware name: Red Hat KVM, BIOS 1.16.3-2.el9 04/01/2014 RIP: 0010:fw_classify+0x244/0x250 [cls_fw] Code: 5c 49 c7 45 00 00 00 00 00 41 5d 41 5e 41 5f 5d c3 cc cc cc cc 5b b8 ff ff ff ff 41 5c 41 5d 41 5e 41 5f 5d c3 cc cc cc cc 90 <0f> 0b 90 eb a0 0f 1f 80 00 00 00 00 90 90 90 90 90 90 90 90 90 90 RSP: 0018:ffffd1b7026bf8a8 EFLAGS: 00010202 RAX: ffff8c5ac9c60800 RBX: ffff8c5ac99322c0 RCX: 0000000000000004 RDX: 0000000000000001 RSI: ffff8c5b74d7a000 RDI: ffff8c5ac8284f40 RBP: ffffd1b7026bf8d0 R08: 0000000000000000 R09: ffffd1b7026bf9b0 R10: 00000000ffffffff R11: 0000000000000000 R12: 0000000000010000 R13: ffffd1b7026bf930 R14: ffff8c5ac8284f40 R15: 0000000000000000 FS: 00007fca40c37740(0000) GS:ffff8c5b74d7a000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007fca40e822a0 CR3: 0000000005ca0001 CR4: 0000000000172ef0 Call Trace: <TASK> tcf_classify+0x17d/0x5c0 tc_run+0x9d/0x150 __dev_queue_xmit+0x2ab/0x14d0 ip_finish_output2+0x340/0x8f0 ip_output+0xa4/0x250 raw_sendmsg+0x147d/0x14b0 __sys_sendto+0x1cc/0x1f0 __x64_sys_sendto+0x24/0x30 do_syscall_64+0x126/0xf80 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7fca40e822ba Code: d8 64 89 02 48 c7 c0 ff ff ff ff eb b8 0f 1f 00 f3 0f 1e fa 41 89 ca 64 8b 04 25 18 00 00 00 85 c0 75 15 b8 2c 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 7e c3 0f 1f 44 00 00 41 54 48 83 ec 30 44 89 RSP: 002b:00007ffc248a42c8 EFLAGS: 00000246 ORIG_RAX: 000000000000002c RAX: ffffffffffffffda RBX: 000055ef233289d0 RCX: 00007fca40e822ba RDX: 000000000000001e RSI: 000055ef23328c30 RDI: 0000000000000003 RBP: 000055ef233289d0 R08: 00007ffc248a42d0 R09: 0000000000000010 R10: 0000000000000000 R11: 0000000000000246 R12: 000000000000001e R13: 00000000000186a0 R14: 0000000000000000 R15: 00007fca41043000 </TASK> irq event stamp: 1045778 hardirqs last enabled at (1045784): [<ffffffff864ec042>] __up_console_sem+0x52/0x60 hardirqs last disabled at (1045789): [<ffffffff864ec027>] __up_console_sem+0x37/0x60 softirqs last enabled at (1045426): [<ffffffff874d48c7>] __alloc_skb+0x207/0x260 softirqs last disabled at (1045434): [<ffffffff874fe8f8>] __dev_queue_xmit+0x78/0x14d0
Then, because of the value in the packet's mark, dereference on 'q->handle' with NULL 'q' occurs:
BUG: kernel NULL pointer dereference, address: 0000000000000038 [...] RIP: 0010:fw_classify+0x1fe/0x250 [cls_fw] [...]
Skip "old-style" classification on shared blocks, so that the NULL dereference is fixed and WARN_ON() is not hit anymore in the short lifetime of invalid cls_fw "old-style" filters.
[1] https://sashiko.dev/#/patchset/20260331050217.504278-1-xmei5%40asu.edu
[2] https://elixir.bootlin.com/linux/v7.0-rc6/source/include/net/pkt_cls.h#L86
--- net/sched/cls_fw.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/sched/cls_fw.c +5 -1
@@ -74,9 +74,13 @@ TC_INDIRECT_SCOPE int fw_classify(struct sk_buff *skb, } } }else { -struct Qdisc *q =tcf_block_q (tp->chain->block); +struct Qdisc *q;/* Old method: classify the packet using its skb mark. */ +if (tcf_block_shared (tp->chain->block)) +return -1 ; + + q =tcf_block_q (tp->chain->block);if (id && (TC_H_MAJ (id) ==0 || !(TC_H_MAJ (id ^ q->handle)))) { res->classid = id;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 3/315 net: mctp: ensure our nlmsg responses are initialised
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeremy Kerr <[email protected]>
[ Upstream commit a6a9bc544b675d8b5180f2718ec985ad267b5cbf ]
Syed Faraz Abrar (@farazsth98) from Zellic, and Pumpkin (@u1f383) from DEVCORE Research Team working with Trend Micro Zero Day Initiative report that a RTM_GETNEIGH will return uninitalised data in the pad bytes of the ndmsg data.
Ensure we're initialising the netlink data to zero, in the link, addr and neigh response messages.
--- net/mctp/device.c | 1 + net/mctp/neigh.c | 1 + net/mctp/route.c | 1 + 3 files changed, 3 insertions(+)
net/mctp/device.c +1 -0
@@ -70,6 +70,7 @@ static int mctp_fill_addrinfo(struct sk_buff *skb,return -EMSGSIZE ; hdr =nlmsg_data (nlh); +memset (hdr,0 ,sizeof (*hdr)); hdr->ifa_family =AF_MCTP ; hdr->ifa_prefixlen =0 ; hdr->ifa_flags =0 ;
net/mctp/neigh.c +1 -0
@@ -218,6 +218,7 @@ static int mctp_fill_neigh(struct sk_buff *skb, u32 portid, u32 seq, int event,return -EMSGSIZE ; hdr =nlmsg_data (nlh); +memset (hdr,0 ,sizeof (*hdr)); hdr->ndm_family =AF_MCTP ; hdr->ndm_ifindex = dev->ifindex; hdr->ndm_state =0 ;// TODO other state bits?
net/mctp/route.c +1 -0
@@ -1650,6 +1650,7 @@ static int mctp_fill_rtinfo(struct sk_buff *skb, struct mctp_route *rt,return -EMSGSIZE ; hdr =nlmsg_data (nlh); +memset (hdr,0 ,sizeof (*hdr)); hdr->rtm_family =AF_MCTP ;/* we use the _len fields as a number of EIDs, rather than
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 4/315 xfrm: move policy_bydst RCU sync from per-netns .exit to .pre_exit
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Usama Arif <[email protected]>
[ Upstream commit 3e52417318473782012b236d0325bf7d2266a597 ]
The struct pernet_operations docstring in include/net/net_namespace.h explicitly warns against blocking RCU primitives in .exit handlers:
Exit methods using blocking RCU primitives, such as synchronize_rcu(), should be implemented via exit_batch. [...]
Please, avoid synchronize_rcu() at all, where it's possible.
Note that a combination of pre_exit() and exit() can be used, since a synchronize_rcu() is guaranteed between the calls.
xfrm_policy_fini() violates this: it calls synchronize_rcu() before freeing the policy_bydst hash tables (so no RCU reader is mid- traversal at free time), but runs from xfrm_net_ops.exit -- once per namespace -- so a cleanup_net() of N namespaces pays N full RCU grace periods serially.
Use the documented pre_exit/exit split. Move the policy flush (and the workqueue drains it depends on) into a new .pre_exit handler; xfrm_policy_fini() then runs in .exit and frees the hash tables after the synchronize_rcu_expedited() that cleanup_net() guarantees between the two phases. Providing O(1) RCU grace periods per batch instead of O(N).
Observed on Linux 6.18 with a workload doing unshare(CLONE_NEWNET) at ~13/sec sustained: cleanup_net() and the netns_wq rescuer kthread both stuck in xfrm_policy_fini()'s synchronize_rcu(), >300k struct net accumulated in the cleanup queue, Percpu in /proc/meminfo climbed to 130+ GB on 256-CPU hosts, and memcg OOMs followed. setup_net and __put_net counts were balanced, ruling out a refcount leak.
--- net/xfrm/xfrm_policy.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
net/xfrm/xfrm_policy.c +8 -7
@@ -4276,21 +4276,21 @@ static int __net_init xfrm_policy_init(struct net *net)return -ENOMEM ; } -static void xfrm_policy_fini (struct net *net) +static void __net_exit xfrm_net_pre_exit(struct net *net) { -struct xfrm_pol_inexact_bin *b, *t; -unsigned int sz; -int dir; -disable_work_sync (&net->xfrm.policy_hthresh.work); -flush_work (&net->xfrm.policy_hash_work);#ifdef CONFIG_XFRM_SUB_POLICY xfrm_policy_flush (net,XFRM_POLICY_TYPE_SUB , false);#endif xfrm_policy_flush (net,XFRM_POLICY_TYPE_MAIN , false); +} -synchronize_rcu (); +static void xfrm_policy_fini (struct net *net) +{ +struct xfrm_pol_inexact_bin *b, *t; +unsigned int sz; +int dir;WARN_ON (!list_empty (&net->xfrm.policy_all));
@@ -4368,6 +4368,7 @@ static void __net_exit xfrm_net_exit(struct net *net)static struct pernet_operations __net_initdata xfrm_net_ops = { .init = xfrm_net_init, + .pre_exit = xfrm_net_pre_exit, .exit = xfrm_net_exit, };
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 5/315 net/sched: sch_sfb: Replace direct dequeue call with peek and qdisc_dequeue_peeked
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Victor Nogueria <[email protected]>
[ Upstream commit 1b9bc71153b01dbde8045b9edede4240f4f5520e ]
When sfb has children (eg qfq qdisc) whose peek() callback is qdisc_peek_dequeued(), we could get a kernel panic. When the parent of such qdiscs (eg illustrated in patch #3 as tbf) wants to retrieve an skb from its child (sfb in this case), it will do the following:
1a. do a peek() - and when sensing there's an skb the child can offer, then
- the child in this case(sfb) calls its child's (qfq) peek. qfq does the right thing and will return the gso_skb queue packet.
Note: if there wasnt a gso_skb entry then qfq will store it there.
1b. invoke a dequeue() on the child (sfb). And herein lies the problem.
- sfb will call the child's dequeue() which will essentially just try to grab something of qfq's queue.
[ 127.594489][ T453] KASAN: null-ptr-deref in range [0x0000000000000048-0x000000000000004f] [ 127.594741][ T453] CPU: 2 UID: 0 PID: 453 Comm: ping Not tainted 7.1.0-rc1-00035-gac961974495b-dirty #793 PREEMPT(full) [ 127.595059][ T453] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011 [ 127.595254][ T453] RIP: 0010:qfq_dequeue+0x35c/0x1650 [sch_qfq] [ 127.595461][ T453] Code: 00 fc ff df 80 3c 02 00 0f 85 17 0e 00 00 4c 8d 73 48 48 89 9d b8 02 00 00 48 b8 00 00 00 00 00 fc ff df 4c 89 f2 48 c1 ea 03 <80> 3c 02 00 0f 85 76 0c 00 00 48 b8 00 00 00 00 00 fc ff df 4c 8b [ 127.596081][ T453] RSP: 0018:ffff88810e5af440 EFLAGS: 00010216 [ 127.596337][ T453] RAX: dffffc0000000000 RBX: 0000000000000000 RCX: dffffc0000000000 [ 127.596623][ T453] RDX: 0000000000000009 RSI: 0000001880000000 RDI: ffff888104fd82b0 [ 127.596917][ T453] RBP: ffff888104fd8000 R08: ffff888104fd8280 R09: 1ffff110211893a3 [ 127.597165][ T453] R10: 1ffff110211893a6 R11: 1ffff110211893a7 R12: 0000001880000000 [ 127.597404][ T453] R13: ffff888104fd82b8 R14: 0000000000000048 R15: 0000000040000000 [ 127.597644][ T453] FS: 00007fc380cbfc40(0000) GS:ffff88816f2a8000(0000) knlGS:0000000000000000 [ 127.597956][ T453] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 127.598160][ T453] CR2: 00005610aa9890a8 CR3: 000000010369e000 CR4: 0000000000750ef0 [ 127.598390][ T453] PKRU: 55555554 [ 127.598509][ T453] Call Trace: [ 127.598629][ T453] <TASK> [ 127.598718][ T453] ? mark_held_locks+0x40/0x70 [ 127.598890][ T453] ? srso_alias_return_thunk+0x5/0xfbef5 [ 127.599053][ T453] sfb_dequeue+0x88/0x4d0 [ 127.599174][ T453] ? ktime_get+0x137/0x230 [ 127.599328][ T453] ? srso_alias_return_thunk+0x5/0xfbef5 [ 127.599480][ T453] ? qdisc_peek_dequeued+0x7b/0x350 [sch_qfq] [ 127.599670][ T453] ? srso_alias_return_thunk+0x5/0xfbef5 [ 127.599831][ T453] tbf_dequeue+0x6b1/0x1098 [sch_tbf] [ 127.599988][ T453] __qdisc_run+0x169/0x1900
The right thing to do in #1b is to grab the skb off gso_skb queue. This patchset fixes that issue by changing #1b to use qdisc_dequeue_peeked() method instead.
--- net/sched/sch_sfb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sched/sch_sfb.c +1 -1
@@ -441,7 +441,7 @@ static struct sk_buff *sfb_dequeue(struct Qdisc *sch)struct Qdisc *child = q->qdisc;struct sk_buff *skb; - skb = child->dequeue (q->qdisc); + skb =qdisc_dequeue_peeked (child);if (skb) {qdisc_bstats_update (sch, skb);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 6/315 bcache: fix uninitialized closure object
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mingzhe Zou <[email protected]>
[ Upstream commit 20a8e451ec1c7e99060b1bbaaad03ce88c39ddb8 ]
In the previous patch ("bcache: fix cached_dev.sb_bio use-after-free and crash"), we adopted a simple modification suggestion from AI to fix the use-after-free.
But in actual testing, we found an extreme case where the device is stopped before calling bch_write_bdev_super().
At this point, struct closure sb_write has not been initialized yet. For this patch, we ensure that sb_bio has been completed via sb_write_mutex.
--- drivers/md/bcache/super.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/md/bcache/super.c +2 -1
@@ -1378,7 +1378,8 @@ static CLOSURE_CALLBACK(cached_dev_free)* The sb_bio is embedded in struct cached_dev, so we must * ensure no I/O is in progress. */ -closure_sync (&dc->sb_write); +down (&dc->sb_write_mutex); +up (&dc->sb_write_mutex);if (dc->sb_disk)folio_put (virt_to_folio (dc->sb_disk));
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 7/315 nfc: llcp: Fix use-after-free in llcp_sock_release()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lee Jones <[email protected]>
[ Upstream commit f4268b466190dae95a7585f69b4f1f8ad097632c ]
llcp_sock_release() unconditionally unlinks the socket from the local sockets list. However, if the socket is still in connecting state, it is on the connecting list.
Fix this by checking the socket state and unlinking from the correct list.
--- net/nfc/llcp_sock.c | 2 ++ 1 file changed, 2 insertions(+)
net/nfc/llcp_sock.c +2 -0
@@ -633,6 +633,8 @@ static int llcp_sock_release(struct socket *sock)if (sock->type ==SOCK_RAW )nfc_llcp_sock_unlink (&local->raw_sockets, sk); +else if (sk->sk_state ==LLCP_CONNECTING ) +nfc_llcp_sock_unlink (&local->connecting_sockets, sk);else nfc_llcp_sock_unlink (&local->sockets, sk);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 8/315 nfc: llcp: Fix use-after-free race in nfc_llcp_recv_cc()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lee Jones <[email protected]>
[ Upstream commit b493ea2765cc17cb8aa7e7544a4b6dcb05b6ed77 ]
A race condition exists in the NFC LLCP connection state machine where the connection acceptance packet (CC) can be processed concurrently with socket release. This can lead to a use-after-free of the socket object.
When nfc_llcp_recv_cc() moves the socket from the connecting_sockets list to the sockets list, it does so without holding the socket lock. If llcp_sock_release() is executing concurrently, it might have already unlinked the socket and dropped its references, which can result in nfc_llcp_recv_cc() linking a freed socket into the live list.
Fix this by holding lock_sock() during the state transition and list movement in nfc_llcp_recv_cc(). After acquiring the lock, check if the socket is still hashed to ensure it hasn't already been unlinked and marked for destruction by the release path. This aligns the locking pattern with recv_hdlc() and recv_disc().
--- net/nfc/llcp_core.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
net/nfc/llcp_core.c +11 -0
@@ -1218,6 +1218,15 @@ static void nfc_llcp_recv_cc(struct nfc_llcp_local *local, sk = &llcp_sock->sk; +lock_sock (sk); + +/* Check if socket was destroyed whilst waiting for the lock */ +if (!sk_hashed (sk)) { +release_sock (sk); +nfc_llcp_sock_put (llcp_sock); +return ; + } +/* Unlink from connecting and link to the client array */ nfc_llcp_sock_unlink (&local->connecting_sockets, sk);nfc_llcp_sock_link (&local->sockets, sk);
@@ -1229,6 +1238,8 @@ static void nfc_llcp_recv_cc(struct nfc_llcp_local *local, sk->sk_state =LLCP_CONNECTED ; sk->sk_state_change (sk); +release_sock (sk); +nfc_llcp_sock_put (llcp_sock); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 9/315 xfrm: Check for underflow in xfrm_state_mtu
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Ahern <[email protected]>
[ Upstream commit 742b04d0550b0ec89dcbc99537ec88653bd1ad90 ]
Leo Lin reported OOB write issue in esp component:
xfrm_state_mtu() returns u32 but performs its arithmetic in unsigned modulo-2^32 space using an attacker-influenced "header_len + authsize + net_adj" subtracted from a small "mtu" argument. A nobody user can install an IPv4 ESP tunnel SA with a large authentication key (XFRMA_ALG_AUTH_TRUNC, e.g. hmac(sha512), 64-byte key, 64-byte trunc), configure a small interface MTU (68 bytes), and set XFRMA_TFCPAD to a large value. When a single UDP datagram is then sent through the tunnel, xfrm_state_mtu() underflows to a near-2^32 value, and esp_output() consumes it as a signed int via:
padto = min(x->tfcpad, xfrm_state_mtu(x, mtu_cached))
esp.tfclen = padto - skb->len (assigned to int) esp.tfclen ends up negative (e.g. -207). It is sign-extended to size_t when passed to memset() inside esp_output_fill_trailer(), producing a ~16 EB write of zeroes at skb_tail_pointer(skb). KASAN logs it as "Write of size 18446744073709551537 at addr ffff888...".
Check for underflow and return 1. This causes the sendmsg attempt to fail with ENETUNREACH.
--- net/xfrm/xfrm_state.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
net/xfrm/xfrm_state.c +16 -3
@@ -3113,10 +3113,14 @@ u32 xfrm_state_mtu(struct xfrm_state *x, int mtu)const struct xfrm_type *type =READ_ONCE (x->type);struct crypto_aead *aead;u32 blksize, net_adj =0 ; +u32 overhead, payload_mtu;if (x->km.state !=XFRM_STATE_VALID || - !type || type->proto !=IPPROTO_ESP ) + !type || type->proto !=IPPROTO_ESP ) { +if (mtu <= x->props.header_len) +return 1 ;return mtu - x->props.header_len; + } aead = x->data; blksize =ALIGN (crypto_aead_blocksize (aead),4 );
@@ -3139,8 +3143,17 @@ u32 xfrm_state_mtu(struct xfrm_state *x, int mtu)break ; } -return ((mtu - x->props.header_len -crypto_aead_authsize (aead) - - net_adj) & ~(blksize -1 )) + net_adj -2 ; + overhead = x->props.header_len +crypto_aead_authsize (aead) + net_adj; +if (mtu <= overhead) +return 1 ; + + payload_mtu = mtu - overhead; + payload_mtu &= ~(blksize -1 ); +if (payload_mtu <=2 ) +return 1 ; + +return payload_mtu + net_adj -2 ; + }EXPORT_SYMBOL_GPL (xfrm_state_mtu);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 10/315 nfc: nxp-nci: i2c: use rising-edge IRQ on ACPI systems
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Carl Lee <[email protected]>
[ Upstream commit f23bf992d65a42007c517b060ca35cebdea3525a ]
Some ACPI-based platforms report incorrect IRQ trigger types (e.g. IRQF_TRIGGER_HIGH), which can lead to interrupt storms.
Use the historically working rising-edge trigger on ACPI systems to avoid this regression.
Device Tree-based systems continue to use the firmware-provided trigger type.
--- drivers/nfc/nxp-nci/i2c.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-)
drivers/nfc/nxp-nci/i2c.c +20 -1
@@ -16,6 +16,7 @@#include <linux/delay.h> #include <linux/i2c.h> #include <linux/interrupt.h> +#include <linux/irq.h> #include <linux/module.h> #include <linux/nfc.h> #include <linux/gpio/consumer.h>
@@ -267,6 +268,7 @@ static int nxp_nci_i2c_probe(struct i2c_client *client) {struct device *dev = &client->dev;struct nxp_nci_i2c_phy *phy; +unsigned long irqflags;int r;if (!i2c_check_functionality (client->adapter,I2C_FUNC_I2C )) {
@@ -303,9 +305,26 @@ static int nxp_nci_i2c_probe(struct i2c_client *client)if (r <0 )return r; +/* +* ACPI platforms may report incorrect IRQ trigger types +* (e.g. level-high), which can lead to interrupt storms. +* +* Use the historically stable rising-edge trigger for ACPI devices. +* +* On non-ACPI systems (e.g. Device Tree), prefer the firmware- +* provided trigger type, falling back to rising-edge if not set. +*/ +if (ACPI_COMPANION (dev)) { + irqflags =IRQF_TRIGGER_RISING ; + }else { + irqflags =irq_get_trigger_type (client->irq); +if (!irqflags) + irqflags =IRQF_TRIGGER_RISING ; + } + r =request_threaded_irq (client->irq,NULL , nxp_nci_i2c_irq_thread_fn, -IRQF_ONESHOT , + irqflags |IRQF_ONESHOT ,NXP_NCI_I2C_DRIVER_NAME , phy);if (r <0 )nfc_err (&client->dev,"Unable to register IRQ handler\n" );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 11/315 tools/bootconfig: Fix buf leaks in apply_xbc
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hongtao Lee <[email protected]>
[ Upstream commit f42d01aadcedd7bbf4f9a466cabe25c1781dedad ]
If data calloc failed, free the buf before return.
--- tools/bootconfig/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/bootconfig/main.c +3 -1
@@ -390,8 +390,10 @@ static int apply_xbc(const char *path, const char *xbc_path)/* Backup the bootconfig data */ data =calloc (size +BOOTCONFIG_ALIGN +BOOTCONFIG_FOOTER_SIZE ,1 ); -if (!data) +if (!data) { +free (buf);return -ENOMEM ; + }memcpy (data, buf, size);/* Check the data format */
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 12/315 HID: remove duplicate hid_warn_ratelimited definition
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Liu Kai <[email protected]>
[ Upstream commit dd2147375a8fe7c5bc3f1f1b1d3a9567c26faefa ]
The hid_warn_ratelimited macro is defined twice in include/linux/hid.h:
- first one added by commit 4051ead99888 ("HID: rate-limit hid_warn to prevent log flooding")
- second one added by commit 1d64624243af ("HID: core: Add printk_ratelimited variants to hid_warn() etc")).
The second definition is correctly grouped with other ratelimited macros. Remove the duplicate definition.
--- include/linux/hid.h | 2 -- 1 file changed, 2 deletions(-)
include/linux/hid.h +0 -2
@@ -1276,8 +1276,6 @@ void hid_quirks_exit(__u16 bus); dev_notice(&(hid)->dev, fmt, ##__VA_ARGS__)#define hid_warn (hid, fmt, ...) \ dev_warn(&(hid)->dev, fmt, ##__VA_ARGS__) -#define hid_warn_ratelimited (hid, fmt, ...) \ - dev_warn_ratelimited(&(hid)->dev, fmt, ##__VA_ARGS__)#define hid_info (hid, fmt, ...) \ dev_info(&(hid)->dev, fmt, ##__VA_ARGS__)#define hid_dbg (hid, fmt, ...) \
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 13/315 kunit: fix use-after-free in debugfs when using kunit.filter
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Schmaus <[email protected]>
[ Upstream commit fb6988b83b4cafe8db63999c1ddff1b7c66d2ff5 ]
When the kernel is booted with a kunit filter (e.g., kunit.filter="speed!=slow"), the kunit executor dynamically allocates copies of the filtered test suites using kmalloc/kmemdup.
During the initial boot execution, kunit_debugfs_create_suite() creates debugfs files (such as /sys/kernel/debug/kunit/<suite>/run) and permanently stores a pointer to the dynamically allocated suite in the inode's i_private field.
Previously, the executor freed this dynamically allocated suite_set immediately after executing the boot-time tests. Because the debugfs nodes were not destroyed, any subsequent interaction with the debugfs run file from userspace triggered a use-after-free (UAF). On systems with architectural capabilities, like CHERI RISC-V, this resulted in an immediate fatal hardware exception due to the invalidation of the capability tags on the reclaimed memory. On other architectures, it resulted in silent memory corruption.
Fix this UAF by properly coupling the lifetime of the filtered suite memory allocation to the lifetime of the kunit subsystem and its associated VFS nodes. Ownership of the boot-time suite_set is now transferred to a global tracker ('kunit_boot_suites'), and the memory is cleanly released in kunit_exit() during module teardown.
--- include/kunit/test.h | 1 + lib/kunit/executor.c | 19 ++++++++++++++++--- lib/kunit/test.c | 1 + 3 files changed, 18 insertions(+), 3 deletions(-)
include/kunit/test.h +1 -0
@@ -613,6 +613,7 @@ unsigned long kunit_vm_mmap(struct kunit *test, struct file *file, unsigned long offset);void kunit_cleanup (struct kunit *test); +void kunit_free_boot_suites (void ); void __printf(2, 3) kunit_log_append(struct string_stream *log, const char *fmt, ...);
lib/kunit/executor.c +16 -3
@@ -15,6 +15,16 @@ extern struct kunit_suite * const __kunit_suites_end[];extern struct kunit_suite *const __kunit_init_suites_start[];extern struct kunit_suite *const __kunit_init_suites_end[]; +static struct kunit_suite_set kunit_boot_suites; + +void kunit_free_boot_suites (void ) +{ +if (kunit_boot_suites.start) { +kunit_free_suite_set (kunit_boot_suites); + kunit_boot_suites = (struct kunit_suite_set ){NULL ,NULL }; + } +} +static char *action_param;module_param_named (action, action_param, charp,0400 );
@@ -409,9 +419,12 @@ int kunit_run_all_tests(void)pr_err ("kunit executor: unknown action '%s'\n" , action_param); free_out: -if (filter_glob_param || filter_param) -kunit_free_suite_set (suite_set); -else if (init_num_suites >0 ) +if (filter_glob_param || filter_param) { +if (err) +kunit_free_suite_set (suite_set); +else + kunit_boot_suites = suite_set; + }else if (init_num_suites >0 )/* Don't use kunit_free_suite_set because suites aren't individually allocated */ kfree (suite_set.start);
lib/kunit/test.c +1 -0
@@ -1056,6 +1056,7 @@ static void __exit kunit_exit(void)kunit_bus_shutdown ();kunit_debugfs_cleanup (); +kunit_free_boot_suites (); }module_exit (kunit_exit);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 14/315 accel/rocket: fix UAF via dangling GEM handle in create_bo
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dhabaleshwar Das <[email protected]>
[ Upstream commit f706e6a4ce75585af979aec3dcbdce68bc76306b ]
rocket_ioctl_create_bo() inserts a GEM handle into the file's IDR via drm_gem_handle_create() early on, then performs several operations that can fail (sgt allocation, drm_mm insert, iommu_map). If any fail after the handle is live, the error path calls drm_gem_shmem_object_free() which kfree's the object without removing the handle from the IDR.
This leaves a dangling handle pointing to freed slab memory. Any subsequent ioctl using that handle (PREP_BO, FINI_BO, SUBMIT) calls drm_gem_object_lookup() and dereferences freed memory (UAF).
Fix by moving drm_gem_handle_create() to after all fallible operations succeed, matching the pattern used by panfrost, lima, and etnaviv.
Also fix drm_mm_insert_node_generic() whose return value was silently overwritten by iommu_map_sgtable() on the next line. Add the missing error check.
[tomeu: Move handle creation to the very end]
--- drivers/accel/rocket/rocket_gem.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/accel/rocket/rocket_gem.c +12 -5
@@ -78,11 +78,6 @@ int rocket_ioctl_create_bo(struct drm_device *dev, void *data, struct drm_file * rkt_obj->size = args->size; rkt_obj->offset =0 ; - ret =drm_gem_handle_create (file, gem_obj, &args->handle); -drm_gem_object_put (gem_obj); -if (ret) - goto err; - sgt =drm_gem_shmem_get_pages_sgt (shmem_obj);if (IS_ERR (sgt)) { ret =PTR_ERR (sgt);
@@ -94,6 +89,8 @@ int rocket_ioctl_create_bo(struct drm_device *dev, void *data, struct drm_file * rkt_obj->size,PAGE_SIZE , 0, 0);mutex_unlock (&rocket_priv->mm_lock); +if (ret) + goto err; ret = iommu_map_sgtable(rocket_priv->domain->domain, rkt_obj->mm.start,
@@ -111,8 +108,18 @@ int rocket_ioctl_create_bo(struct drm_device *dev, void *data, struct drm_file * args->offset =drm_vma_node_offset_addr (&gem_obj->vma_node); args->dma_address = rkt_obj->mm.start; + ret =drm_gem_handle_create (file, gem_obj, &args->handle); +if (ret) + goto err_unmap; + +drm_gem_object_put (gem_obj); +return 0 ; +err_unmap: +iommu_unmap (rocket_priv->domain->domain, + rkt_obj->mm.start, rkt_obj->size); + err_remove_node:mutex_lock (&rocket_priv->mm_lock);drm_mm_remove_node (&rkt_obj->mm);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 15/315 kernel/fork: validate exit_signal in kernel_clone()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Deepanshu Kartikey <[email protected]>
[ Upstream commit 09e7827e785729f391c8d46dc71becce70d296ab ]
When a child process exits, it sends exit_signal to its parent via do_notify_parent(). The clone() syscall constructs exit_signal as:
(lower_32_bits(clone_flags) & CSIGNAL)
CSIGNAL is 0xff, so values in the range 65-255 are possible. However, valid_signal() only accepts signals up to _NSIG (64 on x86_64). A non-zero non-valid exit_signal acts the same as exit_signal == 0: the parent process is not signaled when the child terminates.
The syzkaller reproducer triggers this by calling clone() with flags=0x80, resulting in exit_signal = (0x80 & CSIGNAL) = 128, which exceeds _NSIG and is not a valid signal.
The v1 of this patch added the check only in the clone() syscall handler, which is incomplete. kernel_clone() has other callers such as sys_ia32_clone() which would remain unprotected. Move the check to kernel_clone() to cover all callers.
Since the valid_signal() check is now in kernel_clone() and covers all callers including clone3(), the same check in copy_clone_args_from_user() becomes redundant and is removed. The higher 32bits check for clone3() is kept as it is clone3() specific.
Note that this is a user-visible change: previously, passing an invalid exit_signal to clone() was silently accepted. The man page for clone() does not document any defined behavior for invalid exit_signal values, so rejecting them with -EINVAL is the correct behavior. It is unlikely that any sane application relies on passing an invalid exit_signal.
--- kernel/fork.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
kernel/fork.c +5 -6
@@ -2562,8 +2562,6 @@ struct task_struct *create_io_thread(int (*fn)(void *), void *arg, int node)* * It copies the process, and if successful kick-starts * it and waits for it to finish using the VM if required. -* -* args->exit_signal is expected to be checked for sanity by the caller. */ pid_t kernel_clone (struct kernel_clone_args *args) {
@@ -2588,6 +2586,9 @@ pid_t kernel_clone(struct kernel_clone_args *args) (args->pidfd == args->parent_tid))return -EINVAL ; +if (!valid_signal (args->exit_signal)) +return -EINVAL ; +/* * Determine whether and which event to report to ptracer. When * called from kernel_thread or CLONE_UNTRACED is explicitly
@@ -2786,11 +2787,9 @@ static noinline int copy_clone_args_from_user(struct kernel_clone_args *kargs,return -EINVAL ;/* -* Verify that higher 32bits of exit_signal are unset and that -* it is a valid signal +* Verify that higher 32bits of exit_signal are unset */ -if (unlikely ((args.exit_signal & ~((u64 )CSIGNAL )) || - !valid_signal (args.exit_signal))) +if (unlikely (args.exit_signal & ~((u64 )CSIGNAL )))return -EINVAL ; if ((args.flags & CLONE_INTO_CGROUP) &&
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 16/315 netfilter: synproxy: refresh tcphdr after skb_ensure_writable
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chris Mason <[email protected]>
[ Upstream commit 92170e6afe927ab2792a3f71902845789c8e31b1 ]
synproxy_tstamp_adjust() rewrites the TCP timestamp option in place and then patches the TCP checksum via inet_proto_csum_replace4() on the caller-supplied tcphdr pointer. Both ipv4_synproxy_hook() and ipv6_synproxy_hook() obtain that pointer with skb_header_pointer() before calling in, so it may either alias skb->head directly or point at the caller's on-stack _tcph buffer.
Between obtaining the pointer and using it, the function calls skb_ensure_writable(skb, optend), which on a cloned or non-linear skb invokes pskb_expand_head() and frees the old skb->head. After that point the cached th is stale:
caller (ipv[46]_synproxy_hook)
th = skb_header_pointer(skb, ..., &_tcph)
synproxy_tstamp_adjust(skb, protoff, th, ...)
skb_ensure_writable(skb, optend)
pskb_expand_head() /* kfree(old skb->head) */
...
inet_proto_csum_replace4(&th->check, ...)
/* writes into freed head, or
into the caller's stack copy
leaving the on-wire checksum
stale */The option bytes are written through skb->data and are fine; only the checksum update goes through th and so lands in the wrong place. The result is either a write into freed slab memory or a packet leaving with a checksum that does not match its payload.
Fix by re-deriving th from skb->data + protoff immediately after skb_ensure_writable() succeeds, so the subsequent checksum update targets the linear, writable header.
--- net/netfilter/nf_synproxy_core.c | 2 ++ 1 file changed, 2 insertions(+)
net/netfilter/nf_synproxy_core.c +2 -0
@@ -199,6 +199,8 @@ synproxy_tstamp_adjust(struct sk_buff *skb, unsigned int protoff,if (skb_ensure_writable (skb, optend))return 0 ; + th = (struct tcphdr *)(skb->data + protoff); +while (optoff < optend) {unsigned char *op = skb->data + optoff;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 17/315 netfilter: xt_cpu: prefer raw_smp_processor_id
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
[ Upstream commit c376f07e16c02239ed44cabb97145d03f65b4d15 ]
With PREEMPT_RCU we get splat:
BUG: using smp_processor_id() in preemptible [..] caller is cpu_mt+0x53/0xd0 net/netfilter/xt_cpu.c:37 CPU: 1 .. Comm: syz.3.1377 #0 PREEMPT(full) Call Trace: <TASK> dump_stack_lvl+0xe8/0x150 lib/dump_stack.c:120 check_preemption_disabled+0xd3/0xe0 lib/smp_processor_id.c:47 cpu_mt+0x53/0xd0 net/netfilter/xt_cpu.c:37 [..]
Just use raw version instead.
This is similar to 14d14a5d2957 ("netfilter: nft_meta: use raw_smp_processor_id()").
--- net/netfilter/xt_cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/xt_cpu.c +1 -1
@@ -34,7 +34,7 @@ static bool cpu_mt(const struct sk_buff *skb, struct xt_action_param *par) {const struct xt_cpu_info *info = par->matchinfo; -return (info->cpu ==smp_processor_id ()) ^ info->invert; +return (info->cpu ==raw_smp_processor_id ()) ^ info->invert; }static struct xt_match cpu_mt_reg__read_mostly = {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 18/315 netfilter: ebtables: fix OOB read in compat_mtw_from_user
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
[ Upstream commit f438d1786d657d57790c5d138d6db3fc9fdac392 ]
Luxiao Xu says:
The function compat_mtw_from_user() converts ebtables extensions from 32-bit user structures to kernel native structures. However, it lacks proper validation of the user-supplied match_size/target_size.
When certain extensions are processed, the kernel-side translation logic may perform memory accesses based on the extension's expected size. If the user provides a size smaller than what the extension requires, it results in an out-of-bounds read as reported by KASAN.
This fix introduces a check to ensure match_size is at least as large as the extension's required compatsize. This covers matches, watchers, and targets, while maintaining compatibility with standard targets.
AFAIU this is relevant for matches that need to go though match->compat_from_user() call. Those that use plain memcpy with the user-provided size are ok because the caller checks that size vs the start of the next rule entry offset (which itself is checked vs. total size copied from userspace).
The ->compat_from_user() callbacks assume they can read compatsize bytes, so they need this extra check.
Based on an earlier patch from Luxiao Xu.
--- net/bridge/netfilter/ebtables.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
net/bridge/netfilter/ebtables.c +30 -0
@@ -1956,6 +1956,25 @@ enum compat_mwt { EBT_COMPAT_TARGET, }; +static bool match_size_ok (const struct xt_match *match,unsigned int match_size) +{ +u16 csize; + +if (match->matchsize ==-1 )/* cannot validate ebt_among */ +return true; + + csize = match->compatsize ? : match->matchsize; + +return match_size >= csize; +} + +static bool tgt_size_ok (const struct xt_target *tgt,unsigned int tgt_size) +{ +u16 csize = tgt->compatsize ? : tgt->targetsize; + +return tgt_size >= csize; +} + static int compat_mtw_from_user(const struct compat_ebt_entry_mwt *mwt, enum compat_mwt compat_mwt, struct ebt_entries_buf_state *state,
@@ -1981,6 +2000,11 @@ static int compat_mtw_from_user(const struct compat_ebt_entry_mwt *mwt,if (IS_ERR (match))return PTR_ERR (match); +if (!match_size_ok (match, match_size)) { +module_put (match->me); +return -EINVAL ; + } + off =ebt_compat_match_offset (match, match_size);if (dst) {if (match->compat_from_user)
@@ -2000,6 +2024,12 @@ static int compat_mtw_from_user(const struct compat_ebt_entry_mwt *mwt, mwt->u.revision);if (IS_ERR (wt))return PTR_ERR (wt); + +if (!tgt_size_ok (wt, match_size)) { +module_put (wt->me); +return -EINVAL ; + } + off =xt_compat_target_offset (wt);if (dst) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 19/315 netfilter: nf_tables: fix dst corruption in same register operation
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fernando Fernandez Mancera <[email protected]>
[ Upstream commit 18014147d3ee7831dce53fe65d7fc8d428b02552 ]
For lshift and rshift, the shift operations are performed in a loop over 32-bit words. The loop calculates the shifted value and write it to dst, and then immediately reads from src to calculate the carry for the next iteration. Because src and dst could point to the same memory location, the carry is incorrectly calculated using the newly modified dst value instead of the original src value.
Adding a temporary local variable to cache the original value before writing to dst and using it for the carry calculation solves the problem. In addition, partial overlap is rejected from control plane for all kind of operations including byteorder. This was tested with the following bytecode:
table test_table ip flags 0 use 1 handle 1
ip test_table test_chain use 3 type filter hook input prio 0 policy accept packets 0 bytes 0 flags 1 ip test_table test_chain 2
[ immediate reg 1 0x44332211 0x88776655 ]
[ bitwise reg 1 = ( reg 1 << 0x08000000 ) ]
[ cmp eq reg 1 0x66443322 0x00887766 ]
[ counter pkts 0 bytes 0 ]
ip test_table test_chain 4 3
[ immediate reg 1 0x44332211 0x88776655 ]
[ bitwise reg 1 = ( reg 1 << 0x08000000 ) ]
[ cmp eq reg 1 0x55443322 0x00887766 ]
[ counter pkts 21794 bytes 1917798 ]
--- include/net/netfilter/nf_tables.h | 7 +++++++ net/netfilter/nft_bitwise.c | 18 ++++++++++++++---- net/netfilter/nft_byteorder.c | 13 ++++++++++--- 3 files changed, 31 insertions(+), 7 deletions(-)
include/net/netfilter/nf_tables.h +7 -0
@@ -188,6 +188,13 @@ static inline u64 nft_reg_load64(const u32 *sreg)return get_unaligned ((u64 *)sreg); } +static inline bool nft_reg_overlap (u8 src,u8 dst,u32 len) +{ +unsigned int n =DIV_ROUND_UP (len,sizeof (u32)); + +return src != dst && src < dst + n && dst < src + n; +} +static inline void nft_data_copy (u32 *dst,const struct nft_data *src,unsigned int len) {
net/netfilter/nft_bitwise.c +14 -4
@@ -43,8 +43,10 @@ static void nft_bitwise_eval_lshift(u32 *dst, const u32 *src,u32 carry =0 ;for (i =DIV_ROUND_UP (priv->len,sizeof (u32)); i >0 ; i--) { - dst[i -1 ] = (src[i -1 ] << shift) | carry; - carry = src[i -1 ] >> (BITS_PER_TYPE (u32) - shift); +u32 tmp_src = src[i -1 ]; + + dst[i -1 ] = (tmp_src << shift) | carry; + carry = tmp_src >> (BITS_PER_TYPE (u32) - shift); } }
@@ -56,8 +58,10 @@ static void nft_bitwise_eval_rshift(u32 *dst, const u32 *src,u32 carry =0 ;for (i =0 ; i <DIV_ROUND_UP (priv->len,sizeof (u32)); i++) { - dst[i] = carry | (src[i] >> shift); - carry = src[i] << (BITS_PER_TYPE (u32) - shift); +u32 tmp_src = src[i]; + + dst[i] = carry | (tmp_src >> shift); + carry = tmp_src << (BITS_PER_TYPE (u32) - shift); } }
@@ -235,6 +239,9 @@ static int nft_bitwise_init_bool(const struct nft_ctx *ctx, &priv->sreg2, priv->len);if (err <0 )return err; + +if (nft_reg_overlap (priv->sreg2, priv->dreg, priv->len)) +return -EINVAL ; }return 0 ;
@@ -265,6 +272,9 @@ static int nft_bitwise_init(const struct nft_ctx *ctx,if (err <0 )return err; +if (nft_reg_overlap (priv->sreg, priv->dreg, priv->len)) +return -EINVAL ; +if (tb[NFTA_BITWISE_OP ]) { priv->op =ntohl (nla_get_be32 (tb[NFTA_BITWISE_OP ]));switch (priv->op) {
net/netfilter/nft_byteorder.c +10 -3
@@ -144,9 +144,16 @@ static int nft_byteorder_init(const struct nft_ctx *ctx,if (err <0 )return err; -return nft_parse_register_store (ctx, tb[NFTA_BYTEORDER_DREG ], - &priv->dreg,NULL ,NFT_DATA_VALUE , - priv->len); + err =nft_parse_register_store (ctx, tb[NFTA_BYTEORDER_DREG ], + &priv->dreg,NULL ,NFT_DATA_VALUE , + priv->len); +if (err <0 ) +return err; + +if (nft_reg_overlap (priv->sreg, priv->dreg, priv->len)) +return -EINVAL ; + +return 0 ; } static int nft_byteorder_dump(struct sk_buff *skb,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 20/315 tun: free page on short-frame rejection in tun_xdp_one()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Weiming Shi <[email protected]>
[ Upstream commit f4feb1e20058e407cb00f45aff47f5b7e19a6bbf ]
tun_xdp_one() returns -EINVAL on a frame shorter than ETH_HLEN without freeing the page that vhost_net_build_xdp() allocated for it. tun_sendmsg() discards that -EINVAL and still returns total_len, so vhost_tx_batch() takes the success path and never frees the page; each short frame in a batch leaks one page-frag chunk.
A local process that can open /dev/net/tun and /dev/vhost-net can hit this path: it attaches a tun/tap device as the vhost-net backend and feeds TX descriptors whose length minus the virtio-net header is below ETH_HLEN. Each kick leaks the page-frag chunks for that batch, and a tight submission loop exhausts host memory and triggers an OOM panic. Free the page before returning -EINVAL, matching the XDP-program error path in the same function.
--- drivers/net/tun.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/tun.c +3 -1
@@ -2392,8 +2392,10 @@ static int tun_xdp_one(struct tun_struct *tun,bool skb_xdp = false;struct page *page; -if (unlikely (datasize <ETH_HLEN )) +if (unlikely (datasize <ETH_HLEN )) { +put_page (virt_to_head_page (xdp->data));return -EINVAL ; + } xdp_prog =rcu_dereference (tun->xdp_prog);if (xdp_prog) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 21/315 tun: free page on build_skb failure in tun_xdp_one()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Weiming Shi <[email protected]>
[ Upstream commit aa8963fdce667a42fb7f0bdd2909fadcab02f9a8 ]
When build_skb() fails in tun_xdp_one(), the function sets ret to -ENOMEM and jumps to the out label, which returns without freeing the page that vhost_net_build_xdp() allocated for the frame. As with the short-frame rejection path, tun_sendmsg() discards the per-buffer error and still returns total_len, so vhost_tx_batch() takes the success path and never frees the page. Each build_skb() failure in a batch leaks one page-frag chunk.
Free the page before taking the error path, matching the put_page() the other error exits of tun_xdp_one() already perform.
--- drivers/net/tun.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/tun.c +1 -0
@@ -2437,6 +2437,7 @@ static int tun_xdp_one(struct tun_struct *tun, build: skb =build_skb (xdp->data_hard_start, buflen);if (!skb) { +put_page (virt_to_head_page (xdp->data)); ret = -ENOMEM ; goto out; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 22/315 vsock: keep poll shutdown state consistent
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ziyu Zhang <[email protected]>
[ Upstream commit aae9d8a5528b8ee9ff8dc5d3558b8a9f852a724a ]
vsock_poll() reads vsk->peer_shutdown before taking the socket lock to set EPOLLHUP and EPOLLRDHUP, then reads it again after taking the lock to report EOF readability. A shutdown packet can update peer_shutdown while poll is waiting for the lock, so one poll invocation can report EOF readability without the corresponding HUP/RDHUP bits.
For connectible sockets, take one peer_shutdown snapshot after lock_sock() and use it for all peer-shutdown-derived poll bits. For datagram sockets, which do not take lock_sock() in poll(), take one lockless READ_ONCE() snapshot and pair it with WRITE_ONCE() on the writer side.
This keeps the peer-shutdown-derived bits internally consistent for each poll pass.
--- net/vmw_vsock/af_vsock.c | 49 ++++++++++++++++--------- net/vmw_vsock/hyperv_transport.c | 9 +++-- net/vmw_vsock/virtio_transport_common.c | 14 ++++--- net/vmw_vsock/vmci_transport.c | 8 ++-- 4 files changed, 52 insertions(+), 28 deletions(-)
net/vmw_vsock/af_vsock.c +32 -17
@@ -523,7 +523,7 @@ int vsock_assign_transport(struct vsock_sock *vsk, struct vsock_sock *psk)*/ sock_reset_flag (sk,SOCK_DONE ); sk->sk_state =TCP_CLOSE ; - vsk->peer_shutdown =0 ; +WRITE_ONCE (vsk->peer_shutdown,0 ); }if (sk->sk_type ==SOCK_SEQPACKET ) {
@@ -814,7 +814,7 @@ static struct sock *__vsock_create(struct net *net, vsk->rejected = false; vsk->sent_request = false; vsk->ignore_connecting_rst = false; - vsk->peer_shutdown =0 ; +WRITE_ONCE (vsk->peer_shutdown,0 );INIT_DELAYED_WORK (&vsk->connect_work, vsock_connect_timeout);INIT_DELAYED_WORK (&vsk->pending_work, vsock_pending_work);
@@ -1122,6 +1122,25 @@ static int vsock_shutdown(struct socket *sock, int mode)return err; } +static __poll_t vsock_poll_shutdown (struct sock *sk,u32 peer_shutdown) +{ +__poll_t mask =0 ; + +/* INET sockets treat local write shutdown and peer write shutdown as a +* case of EPOLLHUP set. +*/ +if (sk->sk_shutdown ==SHUTDOWN_MASK || + ((sk->sk_shutdown &SEND_SHUTDOWN ) && + (peer_shutdown &SEND_SHUTDOWN ))) + mask |=EPOLLHUP ; + +if (sk->sk_shutdown &RCV_SHUTDOWN || + peer_shutdown &SEND_SHUTDOWN ) + mask |=EPOLLRDHUP ; + +return mask; +} +static __poll_t vsock_poll (struct file *file,struct socket *sock,poll_table *wait) {
@@ -1139,24 +1158,17 @@ static __poll_t vsock_poll(struct file *file, struct socket *sock,/* Signify that there has been an error on this socket. */ mask |=EPOLLERR ; -/* INET sockets treat local write shutdown and peer write shutdown as a -* case of EPOLLHUP set. -*/ -if ((sk->sk_shutdown ==SHUTDOWN_MASK ) || - ((sk->sk_shutdown &SEND_SHUTDOWN ) && - (vsk->peer_shutdown &SEND_SHUTDOWN ))) { - mask |=EPOLLHUP ; - } - -if (sk->sk_shutdown &RCV_SHUTDOWN || - vsk->peer_shutdown &SEND_SHUTDOWN ) { - mask |=EPOLLRDHUP ; - } -if (sk_is_readable (sk)) mask |=EPOLLIN |EPOLLRDNORM ;if (sock->type ==SOCK_DGRAM ) { +u32 peer_shutdown =READ_ONCE (vsk->peer_shutdown); + +/* DGRAM sockets do not take lock_sock() in poll(), so use one +* lockless snapshot for all shutdown-derived mask bits. +*/ + mask |=vsock_poll_shutdown (sk, peer_shutdown); +/* For datagram sockets we can read if there is something in * the queue and write as long as the socket isn't shutdown for * sending.
@@ -1171,6 +1183,7 @@ static __poll_t vsock_poll(struct file *file, struct socket *sock, }else if (sock_type_connectible (sk->sk_type)) {const struct vsock_transport *transport; +u32 peer_shutdown;lock_sock (sk);
@@ -1203,8 +1216,10 @@ static __poll_t vsock_poll(struct file *file, struct socket *sock,* terminated should also be considered read, and we check the * shutdown flag for that. */ + peer_shutdown =READ_ONCE (vsk->peer_shutdown); + mask |=vsock_poll_shutdown (sk, peer_shutdown);if (sk->sk_shutdown &RCV_SHUTDOWN || - vsk->peer_shutdown &SEND_SHUTDOWN ) { + peer_shutdown &SEND_SHUTDOWN ) { mask |=EPOLLIN |EPOLLRDNORM ; }
net/vmw_vsock/hyperv_transport.c +6 -3
@@ -264,7 +264,7 @@ static void hvs_do_close_lock_held(struct vsock_sock *vsk,struct sock *sk =sk_vsock (vsk);sock_set_flag (sk,SOCK_DONE ); - vsk->peer_shutdown =SHUTDOWN_MASK ; +WRITE_ONCE (vsk->peer_shutdown,SHUTDOWN_MASK );if (vsock_stream_has_data (vsk) <=0 ) sk->sk_state =TCP_CLOSING ; sk->sk_state_change (sk);
@@ -593,7 +593,9 @@ static int hvs_update_recv_data(struct hvsock *hvs)return -EIO ;if (payload_len ==0 ) - hvs->vsk->peer_shutdown |=SEND_SHUTDOWN ; +WRITE_ONCE (hvs->vsk->peer_shutdown, +READ_ONCE (hvs->vsk->peer_shutdown) | +SEND_SHUTDOWN ); hvs->recv_data_len = payload_len; hvs->recv_data_off =0 ;
@@ -736,7 +738,8 @@ static s64 hvs_stream_has_data(struct vsock_sock *vsk)return ret;return hvs->recv_data_len;case 0 : - vsk->peer_shutdown |=SEND_SHUTDOWN ; +WRITE_ONCE (vsk->peer_shutdown, +READ_ONCE (vsk->peer_shutdown) |SEND_SHUTDOWN ); ret =0 ;break ;default :/* -1 */
net/vmw_vsock/virtio_transport_common.c +9 -5
@@ -1206,7 +1206,7 @@ static void virtio_transport_do_close(struct vsock_sock *vsk,struct sock *sk =sk_vsock (vsk);sock_set_flag (sk,SOCK_DONE ); - vsk->peer_shutdown =SHUTDOWN_MASK ; +WRITE_ONCE (vsk->peer_shutdown,SHUTDOWN_MASK );if (vsock_stream_has_data (vsk) <=0 ) sk->sk_state =TCP_CLOSING ; sk->sk_state_change (sk);
@@ -1409,12 +1409,15 @@ virtio_transport_recv_connected(struct sock *sk,case VIRTIO_VSOCK_OP_CREDIT_UPDATE : sk->sk_write_space (sk);break ; -case VIRTIO_VSOCK_OP_SHUTDOWN : +case VIRTIO_VSOCK_OP_SHUTDOWN : { +u32 peer_shutdown =READ_ONCE (vsk->peer_shutdown); +if (le32_to_cpu (hdr->flags) &VIRTIO_VSOCK_SHUTDOWN_RCV ) - vsk->peer_shutdown |=RCV_SHUTDOWN ; + peer_shutdown |=RCV_SHUTDOWN ;if (le32_to_cpu (hdr->flags) &VIRTIO_VSOCK_SHUTDOWN_SEND ) - vsk->peer_shutdown |=SEND_SHUTDOWN ; -if (vsk->peer_shutdown ==SHUTDOWN_MASK ) { + peer_shutdown |=SEND_SHUTDOWN ; +WRITE_ONCE (vsk->peer_shutdown, peer_shutdown); +if (peer_shutdown ==SHUTDOWN_MASK ) {if (vsock_stream_has_data (vsk) <=0 && !sock_flag (sk,SOCK_DONE )) { (void )virtio_transport_reset (vsk,NULL );virtio_transport_do_close (vsk, true);
@@ -1429,6 +1432,7 @@ virtio_transport_recv_connected(struct sock *sk,if (le32_to_cpu (virtio_vsock_hdr (skb)->flags)) sk->sk_state_change (sk);break ; + }case VIRTIO_VSOCK_OP_RST :virtio_transport_do_close (vsk, true);break ;
net/vmw_vsock/vmci_transport.c +5 -3
@@ -811,7 +811,7 @@ static void vmci_transport_handle_detach(struct sock *sk)/* On a detach the peer will not be sending or receiving * anymore. */ - vsk->peer_shutdown =SHUTDOWN_MASK ; +WRITE_ONCE (vsk->peer_shutdown,SHUTDOWN_MASK );/* We should not be sending anymore since the peer won't be * there to receive, but we can still receive if there is data
@@ -1534,7 +1534,9 @@ static int vmci_transport_recv_connected(struct sock *sk,if (pkt->u.mode) { vsk =vsock_sk (sk); - vsk->peer_shutdown |= pkt->u.mode; +WRITE_ONCE (vsk->peer_shutdown, +READ_ONCE (vsk->peer_shutdown) | + pkt->u.mode); sk->sk_state_change (sk); }break ;
@@ -1551,7 +1553,7 @@ static int vmci_transport_recv_connected(struct sock *sk,* a clean shutdown. */ sock_set_flag (sk,SOCK_DONE ); - vsk->peer_shutdown =SHUTDOWN_MASK ; +WRITE_ONCE (vsk->peer_shutdown,SHUTDOWN_MASK );if (vsock_stream_has_data (vsk) <=0 ) sk->sk_state =TCP_CLOSING ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 23/315 net: netlink: fix sending unassigned nsid after assigned one
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilya Maximets <[email protected]>
[ Upstream commit 70f8592ee90585272018a725054b6eb2ab7e99ca ]
If the current skb is not shared, it is re-used directly for all the sockets subscribed to the notification. If we have remote all-nsid socket receiving a message first, then the 'nsid_is_set' will be set to 'true'. If the nsid is NOT_ASSIGNED for the next socket in the list, the 'nsid_is_set' will remain 'true' and the negative value is be delivered to the user space. All subsequent nsid values will be delivered as well, since there is no code path that sets the flag back to 'false'.
Fix that by always dropping the flag to 'false' first.
--- net/netlink/af_netlink.c | 1 + 1 file changed, 1 insertion(+)
net/netlink/af_netlink.c +1 -0
@@ -1484,6 +1484,7 @@ static void do_one_broadcast(struct sock *sk, p->skb2 =NULL ; goto out; } +NETLINK_CB (p->skb2).nsid_is_set = false;NETLINK_CB (p->skb2).nsid =peernet2id (sock_net (sk), p->net);if (NETLINK_CB (p->skb2).nsid !=NETNSA_NSID_NOT_ASSIGNED )NETLINK_CB (p->skb2).nsid_is_set = true;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 24/315 net: netlink: dont set nsid on local notifications
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilya Maximets <[email protected]>
[ Upstream commit 88b126b39f9757e9debc322d4679239e9af089c7 ]
In most cases, notifications on sockets with NETLINK_LISTEN_ALL_NSID do not contain NSID in their ancillary data in case the event is local to the listener.
However, when a self-referential NSID is allocated for a namespace, every local notification starts sending this ID to the user space.
This is problematic, because the listener cannot tell if those notifications are local or not anymore without making extra requests to figure out if the provided NSID is local or not. The listener can also not figure out the local NSID beforehand as it can be allocated at any point in time by other processes, changing the structure of the future notifications for everyone.
The value is practically not useful, since it's the namespace's own ID that the application has to obtain from other sources in order to figure out if it's the same or not. So, for the application it's just an extra busy work with no benefits. Moreover, applications that do not know about this quirk may be mishandling notifications with NSID set as notifications from remote namespaces. This is the case for ovs-vswitchd and the iproute2's 'ip monitor' that stops printing 'current' and starts printing the nsid number mid-session.
Lack of clear documentation for this behavior is also not helping.
A search though open-source projects doesn't reveal any projects that use NETNSA_NSID_NOT_ASSIGNED and rely on metadata to contain self-referential NSIDs (expected, since the value is not useful). Quite the opposite, as already mentioned, there are few applications that rely on NSID to not be present in local events.
Since the value is not useful and actively harmful in some cases, let's not report it for local events, making the notifications more consistent.
Also adding some blank lines for readability.
--- net/netlink/af_netlink.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
net/netlink/af_netlink.c +7 -3
@@ -1484,10 +1484,14 @@ static void do_one_broadcast(struct sock *sk, p->skb2 =NULL ; goto out; } +NETLINK_CB (p->skb2).nsid_is_set = false; -NETLINK_CB (p->skb2).nsid =peernet2id (sock_net (sk), p->net); -if (NETLINK_CB (p->skb2).nsid !=NETNSA_NSID_NOT_ASSIGNED ) -NETLINK_CB (p->skb2).nsid_is_set = true; +if (!net_eq (sock_net (sk), p->net)) { +NETLINK_CB (p->skb2).nsid =peernet2id (sock_net (sk), p->net); +if (NETLINK_CB (p->skb2).nsid !=NETNSA_NSID_NOT_ASSIGNED ) +NETLINK_CB (p->skb2).nsid_is_set = true; + } + val =netlink_broadcast_deliver (sk, p->skb2);if (val <0 ) {netlink_overrun (sk);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 25/315 net/smc: Do not re-initialize smc hashtables
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexandra Winter <[email protected]>
[ Upstream commit 9e4389b0038781f19f97895186ed941ff8ac1678 ]
INIT_HLIST_HEAD(&smc_v*_hashinfo.ht) are called after smc_nl_init(), proto_register() and sock_register(). This can lead to smc_v*_hashinfo.ht being reset even though hash entries already exist and are being used, possibly resulting in a corrupted list.
Remove unnecessary and dangerous re-initialisation of smc_v*_hashinfo.ht in smc_init(); it is implicitly initialised to zero anyhow. Add HLIST_HEAD_INIT to the definitions for clarity.
--- net/smc/af_smc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/smc/af_smc.c +2 -2
@@ -188,10 +188,12 @@ static bool smc_hs_congested(const struct sock *sk)struct smc_hashinfo smc_v4_hashinfo = { .lock =__RW_LOCK_UNLOCKED (smc_v4_hashinfo.lock), + .ht =HLIST_HEAD_INIT , };struct smc_hashinfo smc_v6_hashinfo = { .lock =__RW_LOCK_UNLOCKED (smc_v6_hashinfo.lock), + .ht =HLIST_HEAD_INIT , };int smc_hash_sk (struct sock *sk)
@@ -3595,8 +3597,6 @@ static int __init smc_init(void)pr_err ("%s: sock_register fails with %d\n" , __func__, rc); goto out_proto6; } -INIT_HLIST_HEAD (&smc_v4_hashinfo.ht); -INIT_HLIST_HEAD (&smc_v6_hashinfo.ht); rc =smc_ib_register_client ();if (rc) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 26/315 net/iucv: fix locking in .getsockopt
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Breno Leitao <[email protected]>
[ Upstream commit 3589d20a666caf30ad100c960a2de7de390fce88 ]
Mirror iucv_sock_setsockopt() and wrap the whole switch in lock_sock()/release_sock(). The pre-existing SO_MSGLIMIT-only lock becomes redundant and is removed.
Any AF_IUCV HIPER user can potentially crash the kernel by racing recvmsg() with getsockopt(SO_MSGSIZE): the SO_MSGSIZE arm dereferences iucv->hs_dev->mtu after iucv_sock_close() (called from the racing recvmsg()) has set hs_dev to NULL, producing a NULL pointer dereference oops.
--- net/iucv/af_iucv.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
net/iucv/af_iucv.c +14 -6
@@ -1538,7 +1538,7 @@ static int iucv_sock_getsockopt(struct socket *sock, int level, int optname,struct sock *sk = sock->sk;struct iucv_sock *iucv =iucv_sk (sk);unsigned int val; -int len; +int len, rc;if (level !=SOL_IUCV )return -ENOPROTOOPT ;
@@ -1551,26 +1551,34 @@ static int iucv_sock_getsockopt(struct socket *sock, int level, int optname, len = min_t(unsigned int, len, sizeof(int)); + rc =0 ; + +lock_sock (sk);switch (optname) {case SO_IPRMDATA_MSG : val = (iucv->flags &IUCV_IPRMDATA ) ?1 :0 ;break ;case SO_MSGLIMIT : -lock_sock (sk); val = (iucv->path !=NULL ) ? iucv->path->msglim/* connected */ : iucv->msglimit;/* default */ -release_sock (sk);break ;case SO_MSGSIZE : -if (sk->sk_state ==IUCV_OPEN ) -return -EBADFD ; +if (sk->sk_state ==IUCV_OPEN ) { + rc = -EBADFD ; +break ; + } val = (iucv->hs_dev) ? iucv->hs_dev->mtu -sizeof (struct af_iucv_trans_hdr ) -ETH_HLEN :0x7fffffff ;break ;default : -return -ENOPROTOOPT ; + rc = -ENOPROTOOPT ; +break ; } +release_sock (sk); + +if (rc) +return rc;if (put_user (len, optlen))return -EFAULT ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 27/315 scsi: core: Run queues for all non-SDEV_DEL devices from scsi_run_host_queues
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Jeffery <[email protected]>
[ Upstream commit 7205b58702273baf21d6ba7992e6ba15852325f7 ]
While a SCSI host is in a recovery state, scsi_mq_requeue_cmd() will not set the requeue list for a requeued command to be kicked in the future. The expectation is a call to scsi_run_host_queues() will kick all SCSI devices once the recovery state is cleared.
However, scsi_run_host_queues() uses shost_for_each_device() which uses scsi_device_get() and so will ignore devices in a partially removed state like SDEV_CANCEL. But these devices may also have requeued requests, leaving their requests stuck from not being kicked and causing the removal process of the device to hang.
scsi_run_host_queues() needs to run against more devices than the macro shost_for_each_device() allows. Instead of using the too limiting scsi_device_get() state checks, only ignore devices in SDEV_DEL state or when unable to acquire a reference. Attempt to run the queues for all other devices when scsi_run_host_queues() is called.
--- drivers/scsi/scsi_lib.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-)
drivers/scsi/scsi_lib.c +25 -2
@@ -572,10 +572,33 @@ void scsi_requeue_run_queue(struct work_struct *work)void scsi_run_host_queues (struct Scsi_Host *shost) { -struct scsi_device *sdev; +struct scsi_device *sdev, *prev =NULL ; +unsigned long flags; -shost_for_each_device (sdev, shost) +spin_lock_irqsave (shost->host_lock, flags); +__shost_for_each_device (sdev, shost) { +/* +* Only skip devices so deep into removal they will never need +* another kick to their queues. Thus scsi_device_get() cannot +* be used as it would skip devices in SDEV_CANCEL state which +* may need a queue kick. +*/ +if (sdev->sdev_state ==SDEV_DEL || + !get_device (&sdev->sdev_gendev)) +continue ; +spin_unlock_irqrestore (shost->host_lock, flags); + +if (prev) +put_device (&prev->sdev_gendev);scsi_run_queue (sdev->request_queue); + + prev = sdev; + +spin_lock_irqsave (shost->host_lock, flags); + } +spin_unlock_irqrestore (shost->host_lock, flags); +if (prev) +put_device (&prev->sdev_gendev); }static void scsi_uninit_cmd (struct scsi_cmnd *cmd)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 28/315 ipv4: free net->ipv4.sysctl_local_reserved_ports after unregister_net_sysctl_table()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 87a1e0fe7776da7ab411be332b4be58ac8840d10 ]
ipv4_sysctl_exit_net() is currently freeing net->ipv4.sysctl_local_reserved_ports too soon.
Only after unregister_net_sysctl_table() we can be sure no threads can possibly use the sysctls, including /proc/sys/net/ipv4/ip_local_reserved_ports.
--- net/ipv4/sysctl_net_ipv4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/sysctl_net_ipv4.c +1 -1
@@ -1669,10 +1669,10 @@ static __net_exit void ipv4_sysctl_exit_net(struct net *net) {const struct ctl_table *table; -kfree (net->ipv4.sysctl_local_reserved_ports); table = net->ipv4.ipv4_hdr->ctl_table_arg;unregister_net_sysctl_table (net->ipv4.ipv4_hdr);kfree (table); +kfree (net->ipv4.sysctl_local_reserved_ports); }static __net_initdata struct pernet_operations ipv4_sysctl_ops = {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 29/315 ALSA: pcm: oss: Fix setup list UAF on proc write error
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]>
[ Upstream commit 4cc54bdd54b337e77115be5b55577d1c58608eae ]
snd_pcm_oss_proc_write() links a newly allocated setup entry into the OSS setup list before duplicating the task name. If the task-name allocation fails, the error path frees the already linked entry and leaves setup_list pointing at freed memory.
A later OSS device open can then walk the stale list entry in snd_pcm_oss_look_for_setup() and dereference freed memory.
Allocate the task name and initialize the setup entry before publishing the entry on setup_list. Also fetch the initial proc read iterator only after taking setup_mutex, so all setup_list traversal follows the same list lifetime rules.
--- sound/core/oss/pcm_oss.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
sound/core/oss/pcm_oss.c +11 -7
@@ -2965,8 +2965,10 @@ static void snd_pcm_oss_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer) {struct snd_pcm_str *pstr = entry->private_data; -struct snd_pcm_oss_setup *setup = pstr->oss.setup_list; +struct snd_pcm_oss_setup *setup; +guard (mutex)(&pstr->oss.setup_mutex); + setup = pstr->oss.setup_list;while (setup) { snd_iprintf(buffer, "%s %u %u%s%s%s%s%s%s\n", setup->task_name,
@@ -3051,6 +3053,13 @@ static void snd_pcm_oss_proc_write(struct snd_info_entry *entry, buffer->error = -ENOMEM ;return ; } + template.task_name =kstrdup (task_name,GFP_KERNEL ); +if (!template.task_name) { +kfree (setup); + buffer->error = -ENOMEM ; +return ; + } + *setup = template;if (pstr->oss.setup_list ==NULL ) pstr->oss.setup_list = setup;else {
@@ -3058,12 +3067,7 @@ static void snd_pcm_oss_proc_write(struct snd_info_entry *entry, setup1->next; setup1 = setup1->next); setup1->next = setup; } - template.task_name =kstrdup (task_name,GFP_KERNEL ); -if (! template.task_name) { -kfree (setup); - buffer->error = -ENOMEM ; -return ; - } +continue ; } *setup = template; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 30/315 ASoC: Intel: bytcht_es8316: Fix MCLK leak on init errors
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]>
[ Upstream commit afb2a3a9d8369d18122a0d7cd294eba9a98259c6 ]
byt_cht_es8316_init() enables MCLK before configuring the codec sysclk and creating the headset jack. If either of those later steps fails, the function returns without disabling MCLK, leaving the clock enabled after card registration fails.
Track whether this driver enabled MCLK and disable it on the init error paths. Add the matching DAI link exit callback so the same clock enable is also balanced when ASoC cleans up a successfully initialized link.
--- sound/soc/intel/boards/bytcht_es8316.c | 29 ++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-)
sound/soc/intel/boards/bytcht_es8316.c +27 -2
@@ -40,6 +40,7 @@ struct byt_cht_es8316_private {struct gpio_desc *speaker_en_gpio;struct device *codec_dev;bool speaker_en; +bool mclk_enabled; };enum {
@@ -170,6 +171,15 @@ static struct snd_soc_jack_pin byt_cht_es8316_jack_pins[] = { }, }; +static void byt_cht_es8316_disable_mclk (struct byt_cht_es8316_private *priv) +{ +if (!priv->mclk_enabled) +return ; + +clk_disable_unprepare (priv->mclk); + priv->mclk_enabled = false; +} +static int byt_cht_es8316_init (struct snd_soc_pcm_runtime *runtime) {struct snd_soc_component *codec =snd_soc_rtd_to_codec (runtime,0 )->component;
@@ -226,12 +236,14 @@ static int byt_cht_es8316_init(struct snd_soc_pcm_runtime *runtime) ret =clk_prepare_enable (priv->mclk);if (ret)dev_err (card->dev,"unable to enable MCLK\n" ); +else + priv->mclk_enabled = true; ret =snd_soc_dai_set_sysclk (snd_soc_rtd_to_codec (runtime,0 ),0 ,19200000 ,SND_SOC_CLOCK_IN );if (ret <0 ) {dev_err (card->dev,"can't set codec clock %d\n" , ret); -return ret; + goto err_disable_mclk; } ret = snd_soc_card_jack_new_pins(card, "Headset",
@@ -240,13 +252,25 @@ static int byt_cht_es8316_init(struct snd_soc_pcm_runtime *runtime) ARRAY_SIZE(byt_cht_es8316_jack_pins));if (ret) {dev_err (card->dev,"jack creation failed %d\n" , ret); -return ret; + goto err_disable_mclk; }snd_jack_set_key (priv->jack.jack,SND_JACK_BTN_0 ,KEY_PLAYPAUSE );snd_soc_component_set_jack (codec, &priv->jack,NULL );return 0 ; + +err_disable_mclk: +byt_cht_es8316_disable_mclk (priv); +return ret; +} + +static void byt_cht_es8316_exit (struct snd_soc_pcm_runtime *runtime) +{ +struct snd_soc_card *card = runtime->card; +struct byt_cht_es8316_private *priv =snd_soc_card_get_drvdata (card); + +byt_cht_es8316_disable_mclk (priv); } static int byt_cht_es8316_codec_fixup(struct snd_soc_pcm_runtime *rtd,
@@ -352,6 +376,7 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = { | SND_SOC_DAIFMT_CBC_CFC, .be_hw_params_fixup = byt_cht_es8316_codec_fixup, .init = byt_cht_es8316_init, + .exit = byt_cht_es8316_exit, SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform), }, };
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 31/315 net/mlx5: HWS: Reject unsupported remove-header action
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Prathamesh Deshpande <[email protected]>
[ Upstream commit 86f1d0f063e423a5c1982db1e5e7a8eac511e603 ]
mlx5_cmd_hws_packet_reformat_alloc() handles MLX5_REFORMAT_TYPE_REMOVE_HDR by looking up a matching HWS remove-header action.
If mlx5_fs_get_action_remove_header_vlan() returns NULL, the code only logs an error and continues. The function then returns success with a NULL HWS action stored in the packet-reformat object.
Return an error when no matching remove-header action is available.
--- drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c +3 -1
@@ -1323,8 +1323,10 @@ mlx5_cmd_hws_packet_reformat_alloc(struct mlx5_flow_root_namespace *ns,break ;case MLX5_REFORMAT_TYPE_REMOVE_HDR : hws_action =mlx5_fs_get_action_remove_header_vlan (fs_ctx, params); -if (!hws_action) +if (!hws_action) {mlx5_core_err (dev,"Only vlan remove header supported\n" ); +return -EOPNOTSUPP ; + }break ;default : mlx5_core_err(ns->dev, "Packet-reformat not supported(%d)\n",
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 32/315 net: hsr: fix potential OOB access in supervision frame handling
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luka Gejak <[email protected]>
[ Upstream commit f229426072fc865654a60978bb7fda790a051ff3 ]
Ensure the entire TLV header is linearized before access by adding sizeof(struct hsr_sup_tlv) to the pskb_may_pull() calls. Without this, a truncated frame could cause an out-of-bounds access.
--- net/hsr/hsr_forward.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/hsr/hsr_forward.c +2 -2
@@ -84,7 +84,7 @@ static bool is_supervision_frame(struct hsr_priv *hsr, struct sk_buff *skb)/* Get next tlv */ total_length += hsr_sup_tag->tlv.HSR_TLV_length; -if (!pskb_may_pull (skb, total_length)) +if (!pskb_may_pull (skb, total_length +sizeof (struct hsr_sup_tlv )))return false;skb_pull (skb, total_length); hsr_sup_tlv = (struct hsr_sup_tlv *)skb->data;
@@ -100,7 +100,7 @@ static bool is_supervision_frame(struct hsr_priv *hsr, struct sk_buff *skb)/* make sure another tlv follows */ total_length +=sizeof (struct hsr_sup_tlv ) + hsr_sup_tlv->HSR_TLV_length; -if (!pskb_may_pull (skb, total_length)) +if (!pskb_may_pull (skb, total_length +sizeof (struct hsr_sup_tlv )))return false;/* get next tlv */
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 33/315 gpio: mxc: fix irq_high handling
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Stein <[email protected]>
[ Upstream commit dac917ed5aead741004db8d0d5151dd577802df8 ]
If port->irq_high is -1 (fsl,imx21-gpio compatible) and gpio_idx is >= 16 enable_irq_wake() is called with -1 which is wrong.
--- drivers/gpio/gpio-mxc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/gpio-mxc.c +1 -1
@@ -469,7 +469,7 @@ static int mxc_gpio_probe(struct platform_device *pdev)* the handler is needed only once, but doing it for every port * is more robust and easier. */ - port->irq_high =-1 ; + port->irq_high =0 ; port->mx_irq_handler = mx2_gpio_irq_handler; }else port->mx_irq_handler = mx3_gpio_irq_handler;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 34/315 net: team: Remove unused team_mode_op, port_enabled
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marc Harvey <[email protected]>
[ Upstream commit 014f249121d73909528df320818fba7693d0ec92 ]
This team_mode_op wasn't used by any of the team modes, so remove it.
Stable-dep-of: 25fe708bbc59 ("net: team: fix NULL pointer dereference in team_xmit during mode change")
--- drivers/net/team/team_core.c | 2 -- include/linux/if_team.h | 1 - 2 files changed, 3 deletions(-)
drivers/net/team/team_core.c +0 -2
@@ -945,8 +945,6 @@ static void team_port_enable(struct team *team, team_port_index_hash(team, port->index));team_adjust_ops (team);team_queue_override_port_add (team, port); -if (team->ops.port_enabled) - team->ops.port_enabled (team, port);team_notify_peers (team);team_mcast_rejoin (team);team_lower_state_changed (port);
include/linux/if_team.h +0 -1
@@ -121,7 +121,6 @@ struct team_mode_ops {int (*port_enter)(struct team *team,struct team_port *port);void (*port_leave)(struct team *team,struct team_port *port);void (*port_change_dev_addr)(struct team *team,struct team_port *port); -void (*port_enabled)(struct team *team,struct team_port *port);void (*port_disabled)(struct team *team,struct team_port *port); };
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 35/315 net: team: Rename port_disabled team mode op to port_tx_disabled
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marc Harvey <[email protected]>
[ Upstream commit cfa477df2cc62ba53cb936669886361152b594a7 ]
This team mode op is only used by the load balance mode, and it only uses it in the tx path.
Stable-dep-of: 25fe708bbc59 ("net: team: fix NULL pointer dereference in team_xmit during mode change")
--- drivers/net/team/team_core.c | 4 ++-- drivers/net/team/team_mode_loadbalance.c | 4 ++-- include/linux/if_team.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
drivers/net/team/team_core.c +2 -2
@@ -969,8 +969,8 @@ static void team_port_disable(struct team *team, {if (!team_port_enabled (port))return ; -if (team->ops.port_disabled) - team->ops.port_disabled (team, port); +if (team->ops.port_tx_disabled) + team->ops.port_tx_disabled (team, port);hlist_del_rcu (&port->hlist);__reconstruct_port_hlist (team, port->index); port->index =-1 ;
drivers/net/team/team_mode_loadbalance.c +2 -2
@@ -655,7 +655,7 @@ static void lb_port_leave(struct team *team, struct team_port *port)free_percpu (lb_port_priv->pcpu_stats); } -static void lb_port_disabled (struct team *team,struct team_port *port) +static void lb_port_tx_disabled (struct team *team,struct team_port *port) {lb_tx_hash_to_port_mapping_null_port (team, port); }
@@ -665,7 +665,7 @@ static const struct team_mode_ops lb_mode_ops = { .exit = lb_exit, .port_enter = lb_port_enter, .port_leave = lb_port_leave, - .port_disabled = lb_port_disabled, + .port_tx_disabled = lb_port_tx_disabled, .receive = lb_receive, .transmit = lb_transmit, };
include/linux/if_team.h +1 -1
@@ -121,7 +121,7 @@ struct team_mode_ops {int (*port_enter)(struct team *team,struct team_port *port);void (*port_leave)(struct team *team,struct team_port *port);void (*port_change_dev_addr)(struct team *team,struct team_port *port); -void (*port_disabled)(struct team *team,struct team_port *port); +void (*port_tx_disabled)(struct team *team,struct team_port *port); };extern int team_modeop_port_enter (struct team *team,struct team_port *port);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 36/315 net: team: fix NULL pointer dereference in team_xmit during mode change
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Weiming Shi <[email protected]>
[ Upstream commit 25fe708bbc59289d3d1ea4b126fbc1b460a072a5 ]
__team_change_mode() clears team->ops with memset() before restoring safe dummy handlers via team_adjust_ops(). A concurrent team_xmit() running under RCU on another CPU can read team->ops.transmit during this window and call a NULL function pointer, crashing the kernel.
The race requires a mode change (CAP_NET_ADMIN) concurrent with transmit on the team device.
BUG: kernel NULL pointer dereference, address: 0000000000000000 Oops: 0010 [#1] SMP KASAN NOPTI RIP: 0010:0x0 Call Trace: team_xmit (drivers/net/team/team_core.c:1853) dev_hard_start_xmit (net/core/dev.c:3904) __dev_queue_xmit (net/core/dev.c:4871) packet_sendmsg (net/packet/af_packet.c:3109) __sys_sendto (net/socket.c:2265)
The original code assumed that no ports means no traffic, so mode changes could freely memset()/memcpy() the ops. AF_PACKET with forced carrier breaks that assumption.
Prevent the race instead of making it safe: replace memset()/memcpy() with per-field updates that never touch transmit or receive. Those two handlers are managed solely by team_adjust_ops(), which already installs dummies when tx_en_port_count == 0 (always true during mode change since no ports are present). WRITE_ONCE/READ_ONCE prevent store/load tearing on the handler pointers.
synchronize_net() before exit_op() drains in-flight readers that may still reference old mode state from before port removal switched the handlers to dummies.
--- drivers/net/team/team_core.c | 45 +++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 13 deletions(-)
drivers/net/team/team_core.c +32 -13
@@ -535,21 +535,23 @@ static void team_adjust_ops(struct team *team)if (!team->en_port_count || !team_is_mode_set (team) || !team->mode->ops->transmit) - team->ops.transmit = team_dummy_transmit; +WRITE_ONCE (team->ops.transmit, team_dummy_transmit);else - team->ops.transmit = team->mode->ops->transmit; +WRITE_ONCE (team->ops.transmit, team->mode->ops->transmit);if (!team->en_port_count || !team_is_mode_set (team) || !team->mode->ops->receive) - team->ops.receive = team_dummy_receive; +WRITE_ONCE (team->ops.receive, team_dummy_receive);else - team->ops.receive = team->mode->ops->receive; +WRITE_ONCE (team->ops.receive, team->mode->ops->receive); }/* -* We can benefit from the fact that it's ensured no port is present -* at the time of mode change. Therefore no packets are in fly so there's no -* need to set mode operations in any special way. +* team_change_mode() ensures no ports are present during mode change, +* but lockless readers can still reach team_xmit(). Avoid touching +* transmit/receive -- they are already set to dummies by +* team_adjust_ops() since no ports are enabled. synchronize_net() +* drains in-flight readers before destroying old mode state. */ static int __team_change_mode (struct team *team,const struct team_mode *new_mode)
@@ -558,9 +560,21 @@ static int __team_change_mode(struct team *team,if (team_is_mode_set (team)) {void (*exit_op)(struct team *team) = team->ops.exit; -/* Clear ops area so no callback is called any longer */ -memset (&team->ops,0 ,sizeof (struct team_mode_ops )); -team_adjust_ops (team); +/* Clear cold-path ops used only under RTNL. transmit and +* receive are already dummies (no ports) so leave them +* alone -- overwriting them is the source of the race. +*/ + team->ops.init =NULL ; + team->ops.exit =NULL ; + team->ops.port_enter =NULL ; + team->ops.port_leave =NULL ; + team->ops.port_change_dev_addr =NULL ; + team->ops.port_tx_disabled =NULL ; + +/* Wait for in-flight readers before tearing down mode +* state they may reference. +*/ +synchronize_net ();if (exit_op)exit_op (team);
@@ -583,7 +597,12 @@ static int __team_change_mode(struct team *team, } team->mode = new_mode; -memcpy (&team->ops, new_mode->ops,sizeof (struct team_mode_ops )); + team->ops.init = new_mode->ops->init; + team->ops.exit = new_mode->ops->exit; + team->ops.port_enter = new_mode->ops->port_enter; + team->ops.port_leave = new_mode->ops->port_leave; + team->ops.port_change_dev_addr = new_mode->ops->port_change_dev_addr; + team->ops.port_tx_disabled = new_mode->ops->port_tx_disabled;team_adjust_ops (team);return 0 ;
@@ -744,7 +763,7 @@ static rx_handler_result_t team_handle_frame(struct sk_buff **pskb)/* allow exact match delivery for disabled ports */ res =RX_HANDLER_EXACT ; }else { - res = team->ops.receive (team, port, skb); + res =READ_ONCE (team->ops.receive)(team, port, skb); }if (res ==RX_HANDLER_ANOTHER ) {struct team_pcpu_stats *pcpu_stats;
@@ -1683,7 +1702,7 @@ static netdev_tx_t team_xmit(struct sk_buff *skb, struct net_device *dev) tx_success =team_queue_override_transmit (team, skb);if (!tx_success) - tx_success = team->ops.transmit (team, skb); + tx_success =READ_ONCE (team->ops.transmit)(team, skb);if (tx_success) {struct team_pcpu_stats *pcpu_stats;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 37/315 net: Avoid checksumming unreadable skb tail on trim
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Björn Töpel <[email protected]>
[ Upstream commit 2e357f002c61fd76fd8f12468744a06a5ec48eaa ]
pskb_trim_rcsum_slow() keeps CHECKSUM_COMPLETE valid by subtracting the checksum of the bytes removed from the skb tail. That assumes the removed bytes can be read.
io_uring zcrx skbs may contain unreadable net_iov frags. With fbnic header/data split, small TCP/IPv4 packets can carry Ethernet padding in such a frag. ip_rcv_core() trims the skb to iph->tot_len before TCP sees it, and the CHECKSUM_COMPLETE adjustment then calls skb_checksum() on the padding.
This is exposed by IPv4 because small TCP/IPv4 frames can be shorter than the Ethernet minimum payload. TCP/IPv6 frames are large enough in the normal zcrx path, so they do not hit the same padding trim.
Keep the existing checksum adjustment for readable skbs. If the remaining packet is fully linear, drop CHECKSUM_COMPLETE and let the stack validate the packet after trimming. If unreadable payload would remain, fail the trim; the checksum cannot be adjusted without reading the trimmed tail.
Also clear skb->unreadable when trimming removes all frags.
--- net/core/skbuff.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-)
net/core/skbuff.c +27 -4
@@ -2739,6 +2739,8 @@ int ___pskb_trim(struct sk_buff *skb, unsigned int len) skb->data_len =0 ;skb_set_tail_pointer (skb, len); } +if (!skb_shinfo (skb)->nr_frags && !skb_has_frag_list (skb)) + skb->unreadable =0 ;if (!skb->sk || skb->destructor == sock_edemux)skb_condense (skb);
@@ -2746,16 +2748,37 @@ int ___pskb_trim(struct sk_buff *skb, unsigned int len) }EXPORT_SYMBOL (___pskb_trim); +static int pskb_trim_rcsum_complete (struct sk_buff *skb,unsigned int len) +{ +int delta = skb->len - len; + +if (skb_frags_readable (skb)) { + skb->csum =csum_block_sub (skb->csum, +skb_checksum (skb, len, delta,0 ), + len); +return 0 ; + } + +if (len >skb_headlen (skb)) +return -EFAULT ; + +/* The trimmed bytes are unreadable, but the remaining packet can be +* checksummed by software after trimming. +*/ + skb->ip_summed =CHECKSUM_NONE ; +return 0 ; +} +/* Note : use pskb_trim_rcsum() instead of calling this directly */ int pskb_trim_rcsum_slow (struct sk_buff *skb,unsigned int len) {if (skb->ip_summed ==CHECKSUM_COMPLETE ) { -int delta = skb->len - len; +int err; - skb->csum =csum_block_sub (skb->csum, -skb_checksum (skb, len, delta,0 ), - len); + err =pskb_trim_rcsum_complete (skb, len); +if (err) +return err; }else if (skb->ip_summed ==CHECKSUM_PARTIAL ) {int hdlen = (len >skb_headlen (skb)) ?skb_headlen (skb) : len;int offset =skb_checksum_start_offset (skb) + skb->csum_offset;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 38/315 ethtool: rss: avoid modifying the RSS context response
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit c75b6f6eaacd0b74b832414cc3b9289c3686e941 ]
Gemini says that we're modifying the RSS_CREATE response skb. I think it's right, the comment says that unicast() should unshare the skb but I'm not entirely sure what I meant there. netlink_trim() does a copy but only if skb is not well sized (it's at least 2x larger than necessary for the payload).
--- net/ethtool/rss.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
net/ethtool/rss.c +10 -8
@@ -974,11 +974,17 @@ ethnl_rss_create_validate(struct net_device *dev, struct genl_info *info) }static void -ethnl_rss_create_send_ntf (struct sk_buff *rsp,struct net_device *dev) +ethnl_rss_create_send_ntf (const struct sk_buff *rsp,struct net_device *dev) { -struct nlmsghdr *nlh = (void *)rsp->data;struct genlmsghdr *genl_hdr; +struct nlmsghdr *nlh; +struct sk_buff *ntf; + + ntf =skb_copy_expand (rsp,0 ,0 ,GFP_KERNEL ); +if (!ntf) +return ; + nlh =nlmsg_hdr (ntf);/* Convert the reply into a notification */ nlh->nlmsg_pid =0 ; nlh->nlmsg_seq =ethnl_bcast_seq_next ();
@@ -986,7 +992,7 @@ ethnl_rss_create_send_ntf(struct sk_buff *rsp, struct net_device *dev) genl_hdr =nlmsg_data (nlh); genl_hdr->cmd =ETHTOOL_MSG_RSS_CREATE_NTF ; -ethnl_multicast (rsp, dev); +ethnl_multicast (ntf, dev); }int ethnl_rss_create_doit (struct sk_buff *skb,struct genl_info *info)
@@ -1094,12 +1100,8 @@ int ethnl_rss_create_doit(struct sk_buff *skb, struct genl_info *info)genlmsg_end (rsp, hdr); -/* Use the same skb for the response and the notification, -* genlmsg_reply() will copy the skb if it has elevated user count. -*/ -skb_get (rsp); - ret =genlmsg_reply (rsp, info);ethnl_rss_create_send_ntf (rsp, dev); + ret =genlmsg_reply (rsp, info); rsp =NULL ; exit_unlock:
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 39/315 ethtool: rss: add missing errno on RSS context delete
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 3e6c6e9782ff8a8d8ded774b07ad4590cd61d04c ]
Remember to set ret before jumping out if someone tries to delete a context on a device which doesn't support contexts.
--- net/ethtool/rss.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/ethtool/rss.c +3 -1
@@ -1160,8 +1160,10 @@ int ethnl_rss_delete_doit(struct sk_buff *skb, struct genl_info *info) dev = req.dev; ops = dev->ethtool_ops; -if (!ops->create_rxfh_context) +if (!ops->create_rxfh_context) { + ret = -EOPNOTSUPP ; goto exit_free_dev; + }rtnl_lock ();netdev_lock_ops (dev);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 40/315 ethtool: rss: fix falsely ignoring indir table updates
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 8d60141a32875248ef71d49c9920fa5e2aa40b29 ]
rss_set_prep_indir() compares the new indirection table against the current one to determine whether any update is needed. The memcmp call passes data->indir_size as the length argument, but indir_size is the number of u32 entries, not the byte count.
--- net/ethtool/rss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ethtool/rss.c +1 -1
@@ -684,7 +684,7 @@ rss_set_prep_indir(struct net_device *dev, struct genl_info *info,ethtool_rxfh_indir_default (i, num_rx_rings); } - *mod |=memcmp (rxfh->indir, data->indir_table, data->indir_size); + *mod |=memcmp (rxfh->indir, data->indir_table, alloc_size);return 0 ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 41/315 ethtool: rss: fix indir_table and hkey leak on get_rxfh failure
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 266297692f97008ca48bc311775c087c59bd7fe3 ]
rss_prepare_get() allocates the indirection table and hash key buffer via rss_get_data_alloc(), then calls ops->get_rxfh() to populate them. If get_rxfh() fails, the function returns an error without freeing the allocation.
--- net/ethtool/rss.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/ethtool/rss.c +3 -1
@@ -168,8 +168,10 @@ rss_prepare_get(const struct rss_req_info *request, struct net_device *dev, rxfh.key = data->hkey; ret = ops->get_rxfh (dev, &rxfh); -if (ret) +if (ret) { +rss_get_data_free (data); goto out_unlock; + } data->hfunc = rxfh.hfunc; data->input_xfrm = rxfh.input_xfrm;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 42/315 ethtool: rss: fix hkey leak when indir_size is 0
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 78ccf1a70c6378e1f5073a8c2209b5129067b925 ]
rss_get_data_alloc() allocates a single buffer that backs both the indirection table and the hash key, but only assigned data->indir_table when indir_size was nonzero. The expectation was that no driver implements RSS without supporting indirection table but apparently enic does just that (it's the only such in-tree driver). enic has get_rxfh_key_size but no get_rxfh_indir_size. data->indir_table stays as NULL, hkey gets set but rss_get_data_free() kfree(data->indir_table) is a nop and the allocation leaks.
Always store the allocation base in data->indir_table so the free path is unambiguous. No caller treats indir_table as a sentinel; everything keys off indir_size.
--- net/ethtool/rss.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/ethtool/rss.c +1 -2
@@ -132,8 +132,7 @@ rss_get_data_alloc(struct net_device *dev, struct rss_reply_data *data)if (!rss_config)return -ENOMEM ; -if (data->indir_size) - data->indir_table = (u32 *)rss_config; + data->indir_table = (u32 *)rss_config;if (data->hkey_size) data->hkey = rss_config + indir_bytes;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 43/315 ethtool: rss: avoid device context leak on reply-build failure
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 32a9ecde62731c9f7412507709192c84dafc38d1 ]
We wait with filling the reply for new RSS context creation until after the driver ->create_rxfh_context call. The driver needs to fill some of the defaults in the context. The failure of rss_fill_reply() is somewhat theoretical, but doesn't take much effort to handle it properly. Call ->remove_rxfh_context().
If the driver's remove callback fails (some implementations like sfc can return real command errors from firmware RPCs) - skip the xa_erase and kfree, leaving the context in the xarray. This matches how ethnl_rss_delete_doit() behaves.
--- net/ethtool/rss.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/ethtool/rss.c +5 -1
@@ -1096,7 +1096,7 @@ int ethnl_rss_create_doit(struct sk_buff *skb, struct genl_info *info) ntf_fail |=rss_fill_reply (rsp, &req.base, &data.base);if (WARN_ON (!hdr || ntf_fail)) { ret = -EMSGSIZE ; - goto exit_unlock; + goto err_remove_ctx; }genlmsg_end (rsp, hdr);
@@ -1124,6 +1124,10 @@ int ethnl_rss_create_doit(struct sk_buff *skb, struct genl_info *info)nlmsg_free (rsp);return ret; +err_remove_ctx: +if (ops->remove_rxfh_context (dev, ctx, req.rss_context,NULL )) +/* leave the context on failure, like ethnl_rss_delete_doit() */ + goto exit_unlock; err_ctx_id_free:xa_erase (&dev->ethtool->rss_ctx, req.rss_context); err_unlock_free_ctx:
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 44/315 ethtool: module: call ethnl_ops_complete() on module flash errors
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 84371fb58423f997939aacdcbc02d128d76a54e5 ]
When validate() fails we are skipping over ethnl_ops_complete() even tho we already called ethnl_ops_begin().
--- net/ethtool/module.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/ethtool/module.c +2 -1
@@ -427,10 +427,11 @@ int ethnl_act_module_fw_flash(struct sk_buff *skb, struct genl_info *info) ret =ethnl_module_fw_flash_validate (dev, info->extack);if (ret <0 ) - goto out_unlock; + goto out_complete; ret =module_flash_fw (dev, tb, skb, info); +out_complete:ethnl_ops_complete (dev); out_unlock:
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 45/315 ethtool: module: avoid leaking a netdev ref on module flash errors
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit fb7f511d62692661846c47f199e0afe25c2982db ]
module_flash_fw_schedule() is missing undo for setting the "in_progress" flag and taking the netdev reference. Delay taking these, the device can't disappear while we are holding rtnl_lock.
--- net/ethtool/module.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/ethtool/module.c +3 -2
@@ -319,8 +319,6 @@ module_flash_fw_schedule(struct net_device *dev, const char *file_name,if (err <0 ) goto err_release_firmware; - dev->ethtool->module_fw_flash_in_progress = true; -netdev_hold (dev, &module_fw->dev_tracker,GFP_KERNEL ); fw_update->dev = dev; fw_update->ntf_params.portid = info->snd_portid; fw_update->ntf_params.seq = info->snd_seq;
@@ -335,6 +333,9 @@ module_flash_fw_schedule(struct net_device *dev, const char *file_name,if (err <0 ) goto err_release_firmware; + dev->ethtool->module_fw_flash_in_progress = true; +netdev_hold (dev, &module_fw->dev_tracker,GFP_KERNEL ); +schedule_work (&module_fw->work);return 0 ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 46/315 ethtool: module: avoid racy updates to dev->ethtool bitfield
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 7a84b965ffc12030af63cd10a8f3a1123ff39b7a ]
When reviewing other changes Gemini points out that we currently update module_fw_flash_in_progress without holding any locks. Since module_fw_flash_in_progress is part of a bitfield this is not great, updates to other fields may be lost.
We could use a bool and sprinkle some READ_ONCE/WRITE_ONCE here but seems like the issue is rather than the work is an unusual writer. The other writers already hold the right locks. So just very briefly take these locks when the work completes.
Note that nothing ever cancels the FW update work, so there's no concern with deadlocks vs cancel.
--- net/ethtool/module.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
net/ethtool/module.c +10 -2
@@ -221,14 +221,22 @@ static void module_flash_fw_work_list_del(struct list_head *list)static void module_flash_fw_work (struct work_struct *work) {struct ethtool_module_fw_flash *module_fw; +struct net_device *dev; module_fw = container_of(work, struct ethtool_module_fw_flash, work); + dev = module_fw->fw_update.dev;ethtool_cmis_fw_update (&module_fw->fw_update);module_flash_fw_work_list_del (&module_fw->list); - module_fw->fw_update.dev->ethtool->module_fw_flash_in_progress = false; -netdev_put (module_fw->fw_update.dev, &module_fw->dev_tracker); + +rtnl_lock (); +netdev_lock_ops (dev); + dev->ethtool->module_fw_flash_in_progress = false; +netdev_unlock_ops (dev); +rtnl_unlock (); + +netdev_put (dev, &module_fw->dev_tracker);release_firmware (module_fw->fw_update.fw);kfree (module_fw); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 47/315 ethtool: module: check fw_flash_in_progress under rtnl_lock
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 504eaefa44c8dec50f7499edcb36d24f3aefab2a ]
ethnl_set_module_validate() inspects module_fw_flash_in_progress but validate is meant for _input_ validation, not state validation. rtnl_lock is not held, yet. Move the check into ethnl_set_module().
--- net/ethtool/module.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
net/ethtool/module.c +6 -6
@@ -120,12 +120,6 @@ ethnl_set_module_validate(struct ethnl_req_info *req_info,if (!tb[ETHTOOL_A_MODULE_POWER_MODE_POLICY ])return 0 ; -if (req_info->dev->ethtool->module_fw_flash_in_progress) { -NL_SET_ERR_MSG (info->extack, -"Module firmware flashing is in progress" ); -return -EBUSY ; - } -if (!ops->get_module_power_mode || !ops->set_module_power_mode) { NL_SET_ERR_MSG_ATTR(info->extack, tb[ETHTOOL_A_MODULE_POWER_MODE_POLICY],
@@ -148,6 +142,12 @@ ethnl_set_module(struct ethnl_req_info *req_info, struct genl_info *info) ops = dev->ethtool_ops; +if (dev->ethtool->module_fw_flash_in_progress) { +NL_SET_ERR_MSG (info->extack, +"Module firmware flashing is in progress" ); +return -EBUSY ; + } + power_new.policy =nla_get_u8 (tb[ETHTOOL_A_MODULE_POWER_MODE_POLICY ]); ret = ops->get_module_power_mode (dev, &power, info->extack);if (ret <0 )
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 48/315 ethtool: module: fix cleanup if socket used for flashing multiple devices
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 760d04ebad5c4304f22c0d2251c9623b87a117c8 ]
When a single Netlink socket issues MODULE_FW_FLASH_ACT against multiple devices, ethnl_sock_priv_set() overwrites sk_priv->dev on each call, retaining only the last one. The socket priv is used on socket close, to walk the global work list and mark the uncompleted flashing work as "orphaned". Otherwise if another socket reuses the PID it will unexpectedly receive the flashing notifications.
Don't record the device, record net pointer instead. The purpose of the dev is to scope the work to a netns, anyway. If we store netns the overrides are safe/a nop since all flashed devices must be in the same netns as the socket.
--- net/ethtool/module.c | 9 ++++----- net/ethtool/netlink.c | 4 ++-- net/ethtool/netlink.h | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-)
net/ethtool/module.c +4 -5
@@ -291,11 +291,9 @@ void ethnl_module_fw_flash_sock_destroy(struct ethnl_sock_priv *sk_priv)spin_lock (&module_fw_flash_work_list_lock);list_for_each_entry (work, &module_fw_flash_work_list, list) { -if (work->fw_update.dev == sk_priv->dev && - work->fw_update.ntf_params.portid == sk_priv->portid) { +if (work->fw_update.ntf_params.portid == sk_priv->portid && +dev_net (work->fw_update.dev) == sk_priv->net) work->fw_update.ntf_params.closed_sock = true; -break ; - } }spin_unlock (&module_fw_flash_work_list_lock); }
@@ -332,7 +330,8 @@ module_flash_fw_schedule(struct net_device *dev, const char *file_name, fw_update->ntf_params.seq = info->snd_seq; fw_update->ntf_params.closed_sock = false; - err =ethnl_sock_priv_set (skb, dev, fw_update->ntf_params.portid, + err =ethnl_sock_priv_set (skb,dev_net (dev), + fw_update->ntf_params.portid,ETHTOOL_SOCK_TYPE_MODULE_FW_FLASH );if (err <0 ) goto err_release_firmware;
net/ethtool/netlink.c +2 -2
@@ -52,7 +52,7 @@ const struct nla_policy ethnl_header_policy_phy_stats[] = { [ETHTOOL_A_HEADER_PHY_INDEX] = NLA_POLICY_MIN(NLA_U32, 1), }; -int ethnl_sock_priv_set (struct sk_buff *skb,struct net_device *dev,u32 portid, +int ethnl_sock_priv_set (struct sk_buff *skb,struct net *net,u32 portid,enum ethnl_sock_type type) {struct ethnl_sock_priv *sk_priv;
@@ -61,7 +61,7 @@ int ethnl_sock_priv_set(struct sk_buff *skb, struct net_device *dev, u32 portid,if (IS_ERR (sk_priv))return PTR_ERR (sk_priv); - sk_priv->dev = dev; + sk_priv->net = net; sk_priv->portid = portid; sk_priv->type = type;
net/ethtool/netlink.h +2 -2
@@ -318,12 +318,12 @@ enum ethnl_sock_type { };struct ethnl_sock_priv { -struct net_device *dev; +struct net *net;u32 portid;enum ethnl_sock_type type; }; -int ethnl_sock_priv_set (struct sk_buff *skb,struct net_device *dev,u32 portid, +int ethnl_sock_priv_set (struct sk_buff *skb,struct net *net,u32 portid,enum ethnl_sock_type type);/**
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 49/315 ethtool: cmis: require exact CDB reply length
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 6c3f999a9d1338c6c89a9ff4549eafe72bc2e7b1 ]
Malicious SFP module could respond with rpl_len longer than what cmis_cdb_process_reply() expected, leading to OOB writes. Malicious HW is a bit theoretical but some modules may just be buggy and/or the reads may occasionally get corrupted, so let's protect the kernel.
The existing check protects from short replies. We need to protect from long ones, too. All callers that pass a non-zero rpl_exp_len cast the reply payload to a fixed-layout struct and read fields at fixed offsets, with no version negotiation or short-reply handling:
- cmis_cdb_validate_password()
- cmis_cdb_module_features_get()
- cmis_fw_update_fw_mng_features_get()
so let's assume that responses longer than expected do not have to be handled gracefully here. Add a warning message to make the debug easier in case my understanding is wrong...
Note that page_data->length (argument of kmalloc) comes from last arg to ethtool_cmis_page_init() which is rpl_exp_len.
Note2 that AIs also like to point out overflows in args->req.payload itself (which is a fixed-size 120 B buffer, on the stack), but callers should be reading structs defined by the standard, so protecting from requests for more data than max seem like defensive programming.
--- net/ethtool/cmis_cdb.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
net/ethtool/cmis_cdb.c +7 -2
@@ -513,8 +513,13 @@ static int cmis_cdb_process_reply(struct net_device *dev, } rpl = (struct ethtool_cmis_cdb_rpl *)page_data->data; -if ((args->rpl_exp_len > rpl->hdr.rpl_len + rpl_hdr_len) || - !rpl->hdr.rpl_chk_code) { +if (rpl->hdr.rpl_len != args->rpl_exp_len) { +netdev_warn (dev,"CDB reply length mismatch, expected %u got %u\n" , + args->rpl_exp_len, rpl->hdr.rpl_len); + err = -EIO ; + goto out; + } +if (!rpl->hdr.rpl_chk_code) { err = -EIO ; goto out; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 50/315 ethtool: cmis: fix u16-to-u8 truncation of msleep_pre_rpl
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 3e8c3d464c36bb342fe377b026577c7ec27fdbb4 ]
ethtool_cmis_cdb_compose_args() accepts msleep_pre_rpl as u16 but stores it into the u8 field ethtool_cmis_cdb_cmd_args::msleep_pre_rpl, silently truncating values >= 256. Seven of the nine call sites pass 1000 ms (it's the third argument from the end).
--- net/ethtool/cmis.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/ethtool/cmis.h +2 -2
@@ -63,9 +63,9 @@ struct ethtool_cmis_cdb_request {* struct ethtool_cmis_cdb_cmd_args - CDB commands execution arguments * @req: CDB command fields as described in the CMIS standard. * @max_duration: Maximum duration time for command completion in msec. +* @msleep_pre_rpl: Waiting time before checking reply in msec. * @read_write_len_ext: Allowable additional number of byte octets to the LPL * in a READ or a WRITE commands. -* @msleep_pre_rpl: Waiting time before checking reply in msec. * @rpl_exp_len: Expected reply length in bytes. * @flags: Validation flags for CDB commands. * @err_msg: Error message to be sent to user space.
@@ -73,8 +73,8 @@ struct ethtool_cmis_cdb_request {struct ethtool_cmis_cdb_cmd_args {struct ethtool_cmis_cdb_request req;u16 max_duration; +u16 msleep_pre_rpl;u8 read_write_len_ext; -u8 msleep_pre_rpl;u8 rpl_exp_len;u8 flags;char *err_msg;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 51/315 ethtool: cmis: validate start_cmd_payload_size from module
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 12c2496a71f82f63617971ca9b730dffa05cf58b ]
The CMIS firmware update code reads start_cmd_payload_size from the module's FW Management Features CDB reply and uses it directly as the byte count for memcpy. The destination buffer is 112 bytes (ETHTOOL_CMIS_CDB_LPL_MAX_PL_LENGTH - 8). So a malicious module (or corrupted response) can cause a OOB write later on in cmis_fw_update_start_download().
Let's error out. If modules that expect longer LPL writes actually exist we should revisit.
struct cmis_cdb_start_fw_download_pl's definition has to move, no change there.
--- net/ethtool/cmis_fw_update.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-)
net/ethtool/cmis_fw_update.c +22 -14
@@ -44,6 +44,20 @@ enum cmis_cdb_fw_write_mechanism { CMIS_CDB_FW_WRITE_MECHANISM_BOTH = 0x11, }; +/* See section 9.7.2 "CMD 0101h: Start Firmware Download" in CMIS standard +* revision 5.2. +* struct cmis_cdb_start_fw_download_pl is a structured layout of the +* flat array, ethtool_cmis_cdb_request::payload. +*/ +struct cmis_cdb_start_fw_download_pl { + __struct_group(cmis_cdb_start_fw_download_pl_h, head, /* no attrs */, + __be32 image_size; +__be32 resv1; + ); +u8 vendor_data[ETHTOOL_CMIS_CDB_LPL_MAX_PL_LENGTH - +sizeof (struct cmis_cdb_start_fw_download_pl_h )]; +}; + static int cmis_fw_update_fw_mng_features_get(struct ethtool_cmis_cdb *cdb, struct net_device *dev,
@@ -86,6 +100,14 @@ cmis_fw_update_fw_mng_features_get(struct ethtool_cmis_cdb *cdb,*/ cdb->read_write_len_ext = rpl->read_write_len_ext; fw_mng->start_cmd_payload_size = rpl->start_cmd_payload_size; +if (fw_mng->start_cmd_payload_size > + sizeof_field(struct cmis_cdb_start_fw_download_pl, vendor_data)) { +ethnl_module_fw_flash_ntf_err (dev, ntf_params, +"Start cmd payload size exceeds max LPL payload" , +NULL ); +return -EINVAL ; + } + fw_mng->write_mechanism = rpl->write_mechanism ==CMIS_CDB_FW_WRITE_MECHANISM_LPL ? CMIS_CDB_FW_WRITE_MECHANISM_LPL :
@@ -97,20 +119,6 @@ cmis_fw_update_fw_mng_features_get(struct ethtool_cmis_cdb *cdb,return 0 ; } -/* See section 9.7.2 "CMD 0101h: Start Firmware Download" in CMIS standard -* revision 5.2. -* struct cmis_cdb_start_fw_download_pl is a structured layout of the -* flat array, ethtool_cmis_cdb_request::payload. -*/ -struct cmis_cdb_start_fw_download_pl { - __struct_group(cmis_cdb_start_fw_download_pl_h, head, /* no attrs */, - __be32 image_size; -__be32 resv1; - ); -u8 vendor_data[ETHTOOL_CMIS_CDB_LPL_MAX_PL_LENGTH - -sizeof (struct cmis_cdb_start_fw_download_pl_h )]; -}; - static int cmis_fw_update_start_download(struct ethtool_cmis_cdb *cdb, struct ethtool_cmis_fw_update_params *fw_update,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 52/315 ethtool: cmis: validate fw->size against start_cmd_payload_size
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit d5551f4c1800dc714cec86647bdd651ae0de923e ]
cmis_fw_update_start_download() copies start_cmd_payload_size bytes from the firmware blob into the CDB LPL vendor_data[] payload without validating that the FW has enough data.
Since the start_cmd_payload_size can only be ~120B an image too short is most likely corrupted, so reject it.
--- net/ethtool/cmis_fw_update.c | 8 ++++++++ 1 file changed, 8 insertions(+)
net/ethtool/cmis_fw_update.c +8 -0
@@ -130,6 +130,14 @@ cmis_fw_update_start_download(struct ethtool_cmis_cdb *cdb,u8 lpl_len;int err; +if (fw_update->fw->size < vendor_data_size) { +ethnl_module_fw_flash_ntf_err (fw_update->dev, + &fw_update->ntf_params, +"Firmware image too small for module's start payload" , +NULL ); +return -EINVAL ; + } + pl.image_size =cpu_to_be32 (fw_update->fw->size);memcpy (pl.vendor_data, fw_update->fw->data, vendor_data_size);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 53/315 cxl/test: Update mock dev array before calling platform_device_add()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li Ming <[email protected]>
[ Upstream commit d90f236f8b9e354848bd226f581db27755ab901d ]
CXL test environment hits the following error sometimes.
cxl_mem mem9: endpoint7 failed probe
All mock memdevs are platform firmware devices added by cxl_test module, and cxl_test module also provides a platform device driver for them to create a memdev device to CXL subsystem. cxl_test module uses cxl_rcd/mem_single/mem arrays to store different types of mock memdevs. CXL drivers calls registered mock functions for a mock memdev by checking if a given memdev is in these arrays.
When cxl_test module adds these mock memdevs, it always calls platform_device_add() before adding them to a suitable mock memdev array. However, there is a small window where CXL drivers calls mock function for a added memdev before it added to a mock memdev array. In above case, cxl endpoint driver considers a added memdev was not a mock memdev, then calling devm_cxl_endpoint_decoders_setup() for it rather than mock_endpoint_decoders_setup().
An appropriate solution is that adding a new mock device to a mock device array before calling platform_device_add() for it. It can guarantee the new mock device is visible to CXL subsystem.
This patch introduces a new helped called cxl_mock_platform_device_add() to handle the issue, and uses the function for all mock devices addition.
--- tools/testing/cxl/test/cxl.c | 105 ++++++++++++++--------------------- 1 file changed, 43 insertions(+), 62 deletions(-)
tools/testing/cxl/test/cxl.c +43 -62
@@ -1132,6 +1132,23 @@ static void mock_companion(struct acpi_device *adev, struct device *dev)#define SZ_64G (SZ_32G * 2)#endif +static int cxl_mock_platform_device_add (struct platform_device *pdev, +struct platform_device **ppdev) +{ +int rc; + +if (ppdev) + *ppdev = pdev; + rc =platform_device_add (pdev); +if (rc) { +platform_device_put (pdev); +if (ppdev) + *ppdev =NULL ; + } + +return rc; +} +static __init int cxl_rch_topo_init (void ) {int rc, i;
@@ -1146,13 +1163,10 @@ static __init int cxl_rch_topo_init(void) goto err_bridge;mock_companion (adev, &pdev->dev); - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_rch[i]); +if (rc) goto err_bridge; - } - cxl_rch[i] = pdev; mock_pci_bus[idx].bridge = &pdev->dev; rc =sysfs_create_link (&pdev->dev.kobj, &pdev->dev.kobj,"firmware_node" );
@@ -1204,13 +1218,10 @@ static __init int cxl_single_topo_init(void) goto err_bridge;mock_companion (adev, &pdev->dev); - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_hb_single[i]); +if (rc) goto err_bridge; - } - cxl_hb_single[i] = pdev; mock_pci_bus[i +NR_CXL_HOST_BRIDGES ].bridge = &pdev->dev; rc =sysfs_create_link (&pdev->dev.kobj, &pdev->dev.kobj,"physical_node" );
@@ -1229,12 +1240,9 @@ static __init int cxl_single_topo_init(void) goto err_port; pdev->dev.parent = &bridge->dev; - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_root_single[i]); +if (rc) goto err_port; - } - cxl_root_single[i] = pdev; }for (i =0 ; i <ARRAY_SIZE (cxl_swu_single); i++) {
@@ -1247,12 +1255,9 @@ static __init int cxl_single_topo_init(void) goto err_uport; pdev->dev.parent = &root_port->dev; - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_swu_single[i]); +if (rc) goto err_uport; - } - cxl_swu_single[i] = pdev; }for (i =0 ; i <ARRAY_SIZE (cxl_swd_single); i++) {
@@ -1266,12 +1271,9 @@ static __init int cxl_single_topo_init(void) goto err_dport; pdev->dev.parent = &uport->dev; - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_swd_single[i]); +if (rc) goto err_dport; - } - cxl_swd_single[i] = pdev; }return 0 ;
@@ -1344,12 +1346,9 @@ static int cxl_mem_init(void) pdev->dev.parent = &dport->dev;set_dev_node (&pdev->dev, i %2 ); - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_mem[i]); +if (rc) goto err_mem; - } - cxl_mem[i] = pdev; }for (i =0 ; i <ARRAY_SIZE (cxl_mem_single); i++) {
@@ -1362,12 +1361,9 @@ static int cxl_mem_init(void) pdev->dev.parent = &dport->dev;set_dev_node (&pdev->dev, i %2 ); - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_mem_single[i]); +if (rc) goto err_single; - } - cxl_mem_single[i] = pdev; }for (i =0 ; i <ARRAY_SIZE (cxl_rcd); i++) {
@@ -1381,12 +1377,9 @@ static int cxl_mem_init(void) pdev->dev.parent = &rch->dev;set_dev_node (&pdev->dev, i %2 ); - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_rcd[i]); +if (rc) goto err_rcd; - } - cxl_rcd[i] = pdev; }return 0 ;
@@ -1451,13 +1444,10 @@ static __init int cxl_test_init(void) goto err_bridge;mock_companion (adev, &pdev->dev); - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_host_bridge[i]); +if (rc) goto err_bridge; - } - cxl_host_bridge[i] = pdev; mock_pci_bus[i].bridge = &pdev->dev; rc =sysfs_create_link (&pdev->dev.kobj, &pdev->dev.kobj,"physical_node" );
@@ -1475,12 +1465,9 @@ static __init int cxl_test_init(void) goto err_port; pdev->dev.parent = &bridge->dev; - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_root_port[i]); +if (rc) goto err_port; - } - cxl_root_port[i] = pdev; }BUILD_BUG_ON (ARRAY_SIZE (cxl_switch_uport) !=ARRAY_SIZE (cxl_root_port));
@@ -1493,12 +1480,9 @@ static __init int cxl_test_init(void) goto err_uport; pdev->dev.parent = &root_port->dev; - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_switch_uport[i]); +if (rc) goto err_uport; - } - cxl_switch_uport[i] = pdev; }for (i =0 ; i <ARRAY_SIZE (cxl_switch_dport); i++) {
@@ -1511,12 +1495,9 @@ static __init int cxl_test_init(void) goto err_dport; pdev->dev.parent = &uport->dev; - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_switch_dport[i]); +if (rc) goto err_dport; - } - cxl_switch_dport[i] = pdev; } rc =cxl_single_topo_init ();
@@ -1534,9 +1515,9 @@ static __init int cxl_test_init(void)mock_companion (&acpi0017_mock, &cxl_acpi->dev); acpi0017_mock.dev.bus = &platform_bus_type; - rc =platform_device_add (cxl_acpi); + rc =cxl_mock_platform_device_add (cxl_acpi,NULL );if (rc) - goto err_root; + goto err_rch; rc =cxl_mem_init ();if (rc)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 54/315 tunnels: load network headers after skb_cow() in iptunnel_pmtud_build_icmp[v6]()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit b4bc94353050b1fa7b702bd4c6600710dd926cff ]
Sashiko found that iptunnel_pmtud_build_icmp() and iptunnel_pmtud_build_icmpv6() were caching ip_hdr() and ipv6_hdr() before an skb_cow() call which can reallocate skb->head.
Fix this possible UAF by initializing the local variables after the skb_cow() call.
Remove skb_reset_network_header() calls which were not needed.
--- net/ipv4/ip_tunnel_core.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
net/ipv4/ip_tunnel_core.c +4 -5
@@ -212,7 +212,7 @@ EXPORT_SYMBOL_GPL(iptunnel_handle_offloads);*/ static int iptunnel_pmtud_build_icmp (struct sk_buff *skb,int mtu) { -const struct iphdr *iph =ip_hdr (skb); +const struct iphdr *iph;struct icmphdr *icmph;struct iphdr *niph;struct ethhdr eh;
@@ -226,7 +226,6 @@ static int iptunnel_pmtud_build_icmp(struct sk_buff *skb, int mtu)skb_copy_bits (skb,skb_mac_offset (skb), &eh,ETH_HLEN );pskb_pull (skb,ETH_HLEN ); -skb_reset_network_header (skb); err =pskb_trim (skb,576 -sizeof (*niph) -sizeof (*icmph));if (err)
@@ -236,7 +235,7 @@ static int iptunnel_pmtud_build_icmp(struct sk_buff *skb, int mtu) err =skb_cow (skb,sizeof (*niph) +sizeof (*icmph) +ETH_HLEN );if (err)return err; - + iph =ip_hdr (skb); icmph =skb_push (skb,sizeof (*icmph)); *icmph = (struct icmphdr ) { .type =ICMP_DEST_UNREACH ,
@@ -308,7 +307,7 @@ static int iptunnel_pmtud_check_icmp(struct sk_buff *skb, int mtu)*/ static int iptunnel_pmtud_build_icmpv6 (struct sk_buff *skb,int mtu) { -const struct ipv6hdr *ip6h =ipv6_hdr (skb); +const struct ipv6hdr *ip6h;struct icmp6hdr *icmp6h;struct ipv6hdr *nip6h;struct ethhdr eh;
@@ -323,7 +322,6 @@ static int iptunnel_pmtud_build_icmpv6(struct sk_buff *skb, int mtu)skb_copy_bits (skb,skb_mac_offset (skb), &eh,ETH_HLEN );pskb_pull (skb,ETH_HLEN ); -skb_reset_network_header (skb); err =pskb_trim (skb,IPV6_MIN_MTU -sizeof (*nip6h) -sizeof (*icmp6h));if (err)
@@ -334,6 +332,7 @@ static int iptunnel_pmtud_build_icmpv6(struct sk_buff *skb, int mtu)if (err)return err; + ip6h =ipv6_hdr (skb); icmp6h =skb_push (skb,sizeof (*icmp6h)); *icmp6h = (struct icmp6hdr ) { .icmp6_type =ICMPV6_PKT_TOOBIG ,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 55/315 vxlan: do not reuse cached ip_hdr() value after skb_tunnel_check_pmtu()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 7d9ef0cb271555d8cf39fefe6c981e1493b25ecf ]
skb_tunnel_check_pmtu() can change skb->head.
Reusing old_iph afer skb_tunnel_check_pmtu() can cause an UAF.
Use instead ip_hdr(skb) as done in drivers/net/bareudp.c and drivers/net/geneve.c.
Found by Sashiko.
--- drivers/net/vxlan/vxlan_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/vxlan/vxlan_core.c +2 -2
@@ -2532,7 +2532,7 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, goto out_unlock; } - tos =ip_tunnel_ecn_encap (tos, old_iph, skb); + tos =ip_tunnel_ecn_encap (tos,ip_hdr (skb), skb); ttl = ttl ? :ip4_dst_hoplimit (&rt->dst); err =vxlan_build_skb (skb, ndst,sizeof (struct iphdr ), vni, md, flags, udp_sum);
@@ -2606,7 +2606,7 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, goto out_unlock; } - tos =ip_tunnel_ecn_encap (tos, old_iph, skb); + tos =ip_tunnel_ecn_encap (tos,ip_hdr (skb), skb); ttl = ttl ? :ip6_dst_hoplimit (ndst);skb_scrub_packet (skb, xnet); err = vxlan_build_skb(skb, ndst, sizeof(struct ipv6hdr),
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 56/315 tunnels: do not assume transport header in iptunnel_pmtud_check_icmp()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 509323077ef79a26ba0c60bb556e45c12c398b2d ]
In some cases, iptunnel_pmtud_check_icmp() can be called while skb transport header is not set.
This triggers an out-of-bound access, because
(typeof(skb->transport_header))~0U is 65535.
Access the icmp header based on IPv4 network header, after making sure icmp->type is present in skb linear part.
Note that iptunnel_pmtud_check_icmpv6()) is fine.
--- net/ipv4/ip_tunnel_core.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
net/ipv4/ip_tunnel_core.c +10 -3
@@ -280,7 +280,6 @@ static int iptunnel_pmtud_build_icmp(struct sk_buff *skb, int mtu)*/ static int iptunnel_pmtud_check_icmp (struct sk_buff *skb,int mtu) { -const struct icmphdr *icmph =icmp_hdr (skb);const struct iphdr *iph =ip_hdr (skb);if (mtu <576 || iph->frag_off !=htons (IP_DF ))
@@ -291,9 +290,17 @@ static int iptunnel_pmtud_check_icmp(struct sk_buff *skb, int mtu) ipv4_is_lbcast(iph->saddr) || ipv4_is_multicast(iph->saddr))return 0 ; -if (iph->protocol ==IPPROTO_ICMP &&icmp_is_err (icmph->type)) -return 0 ; +if (iph->protocol ==IPPROTO_ICMP ) { +const struct icmphdr *icmph; +if (!pskb_network_may_pull (skb, iph->ihl *4 + + offsetofend(struct icmphdr, type))) +return 0 ; + iph =ip_hdr (skb); + icmph = (void *)iph + iph->ihl *4 ; +if (icmp_is_err (icmph->type)) +return 0 ; + }return iptunnel_pmtud_build_icmp (skb, mtu); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 57/315 ksmbd: fix FSCTL permission bypass by adding a permission check for FSCTL_SET_SPARSE
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Shen <[email protected]>
[ Upstream commit cc57232cae23c0df91b4a59d0f519141ce9b5b02 ]
FSCTL_SET_SPARSE in fsctl_set_sparse() modifies the file's sparse attribute and saves it through xattr without any permission checks.
This exposes two issues:
1) A client on a read-only share can change the sparse attribute on files it opened, even though the share is read-only. Other FSCTL write operations already check test_tree_conn_flag(work->tcon, KSMBD_TREE_CONN_FLAG_WRITABLE), but FSCTL_SET_SPARSE does not.
2) Even on writable shares, clients without FILE_WRITE_DATA or FILE_WRITE_ATTRIBUTES access should not modify the sparse attribute. Similar handle-level checks exist in other functions but are missing here.
Add both share-level writable check and per-handle access check. Use goto out on error to avoid leaking file references.
--- fs/smb/server/smb2pdu.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
fs/smb/server/smb2pdu.c +11 -0
@@ -8203,9 +8203,20 @@ static inline int fsctl_set_sparse(struct ksmbd_work *work, u64 id,int ret =0 ;__le32 old_fattr; +if (!test_tree_conn_flag (work->tcon,KSMBD_TREE_CONN_FLAG_WRITABLE )) { +ksmbd_debug (SMB ,"User does not have write permission\n" ); +return -EACCES ; + } + fp =ksmbd_lookup_fd_fast (work, id);if (!fp)return -ENOENT ; + +if (!(fp->daccess & (FILE_WRITE_DATA_LE |FILE_WRITE_ATTRIBUTES_LE ))) { + ret = -EACCES ; + goto out; + } + idmap =file_mnt_idmap (fp->filp); old_fattr = fp->f_ci->m_fattr;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 58/315 ASoC: codecs: simple-mux: Fix enum control bounds check
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]>
[ Upstream commit f63ad68e18d774a5d15cd7e405ead63f6b322679 ]
simple_mux_control_put() rejects values greater than e->items, but enum control values are zero based. For the two-entry mux used by this driver, valid values are 0 and 1, so value 2 must be rejected as well.
Accepting e->items can store an invalid mux state, pass it to the GPIO setter, and pass it on to the DAPM mux update path where it is used as an index into the enum text array.
Use the same >= e->items check used by the ASoC enum helpers.
--- sound/soc/codecs/simple-mux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/simple-mux.c +1 -1
@@ -51,7 +51,7 @@ static int simple_mux_control_put(struct snd_kcontrol *kcontrol,struct snd_soc_component *c =snd_soc_dapm_to_component (dapm);struct simple_mux *priv =snd_soc_component_get_drvdata (c); -if (ucontrol->value.enumerated.item[0 ] > e->items) +if (ucontrol->value.enumerated.item[0 ] >= e->items)return -EINVAL ;if (priv->mux == ucontrol->value.enumerated.item[0 ])
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 59/315 drm/xe: Restore IDLEDLY regiter on engine reset
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Balasubramani Vivekanandan <[email protected]>
[ Upstream commit f657a6a3ba4c20bc01f5be3752d53498ee1bfe35 ]
Wa_16023105232 programs the register IDLEDLY. The register is reset whenever the engine is reset. Therefore it should be added to the GuC save-restore register list for it to be restored after reset.
--- drivers/gpu/drm/xe/xe_guc_ads.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/xe/xe_guc_ads.c +5 -0
@@ -772,6 +772,11 @@ static unsigned int guc_mmio_regset_write(struct xe_guc_ads *ads, } } +if (XE_GT_WA (hwe->gt,16023105232 )) +guc_mmio_regset_write_one (ads, regset_map, +RING_IDLEDLY (hwe->mmio_base), + count++); +return count; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 60/315 Bluetooth: 6lowpan: check skb_clone() return value in send_mcast_pkt()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhao Dongdong <[email protected]>
[ Upstream commit 3c40d381ce04f9575a5d8b542898183c3b4b38dc ]
The skb_clone() function can return NULL if memory allocation fails. send_mcast_pkt() calls skb_clone() without checking the return value, which can lead to a NULL pointer dereference in send_pkt() when it dereferences skb->data.
Add a NULL check after skb_clone() and skip the peer if the clone fails.
--- net/bluetooth/6lowpan.c | 2 ++ 1 file changed, 2 insertions(+)
net/bluetooth/6lowpan.c +2 -0
@@ -486,6 +486,8 @@ static int send_mcast_pkt(struct sk_buff *skb, struct net_device *netdev)int ret; local_skb =skb_clone (skb,GFP_ATOMIC ); +if (!local_skb) +continue ; BT_DBG("xmit %s to %pMR type %u IP %pI6c chan %p", netdev->name,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 61/315 bonding: refuse to enslave CAN devices
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Hartkopp <[email protected]>
[ Upstream commit 8ba68464e4787b6a7ec938826e16124df20fd23d ]
syzbot reported a kernel paging request crash in can_rx_unregister() inside net/can/af_can.c. The crash occurs because a virtual CAN device (vxcan) is being enslaved to a bonding master.
During the enslavement process, the bonding driver mutates and modifies the network device states to fit an Ethernet-like aggregation model. However, CAN devices operate on a completely different Layer 2 architecture, relying on the CAN mid-layer private data structure (can_ml_priv) instead of standard Ethernet structures. Since bonding does not initialize or maintain these CAN structures, subsequent operations on the half-enslaved interface (such as closing associated sockets via isotp_release) lead to a null-pointer dereference when accessing the CAN receiver lists.
Bonding CAN interfaces is architecturally invalid as CAN lacks MAC addresses, ARP capabilities, and standard Ethernet link-layer mechanisms. While generic loopback devices are blocked globally in net/core/dev.c, virtual CAN devices bypass this check because they do not carry the IFF_LOOPBACK flag, despite acting as local software-loopbacks.
Fix this by explicitly blocking network devices of type ARPHRD_CAN from being enslaved at the very beginning of bond_enslave(). This prevents illegal state mutations, eliminates the resulting KASAN crashes, and avoids potential memory leaks from incomplete socket cleanups.
As the CAN support has been added a long time after bonding the Fixes-tag points to the introduction of ARPHRD_CAN that would have needed a specific handling in bonding_main.c.
--- drivers/net/bonding/bond_main.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/bonding/bond_main.c +6 -0
@@ -1860,6 +1860,12 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,struct sockaddr_storage ss;int res =0 , i; +if (slave_dev->type ==ARPHRD_CAN ) { +BOND_NL_ERR (bond_dev, extack, +"CAN devices cannot be enslaved" ); +return -EPERM ; + } +if (slave_dev->flags &IFF_MASTER && !netif_is_bond_master (slave_dev)) { BOND_NL_ERR(bond_dev, extack,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 62/315 bridge: Fix sleep in atomic context in netlink path
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ido Schimmel <[email protected]>
[ Upstream commit 5eec4427b89c2fb2beac54920101e55a2f1c0c21 ]
Since the introduction of the netlink configuration path for bridge ports in commit 25c71c75ac87 ("bridge: bridge port parameters over netlink"), br_setport() was always called with the bridge lock held around it. Back then this decision made sense: The bridge lock protects the STP state of the bridge and its ports and at that time the function only processed three STP related netlink attributes (cost, priority and state).
Nowadays, br_setport() processes a lot more attributes and most of them do not need the bridge lock:
* Bridge flags: Only require RTNL. Read locklessly by the data path. Annotations can be added in net-next.
* FDB port flushing: Only requires the FDB lock.
* Multicast attributes: Only require the multicast lock.
* Group forward mask: Only requires RTNL. Read locklessly by the data path. Annotations can be added in net-next.
* Backup port and NHID: Only require RTNL. Read locklessly by the data path.
This is a problem as the bridge calls dev_set_promiscuity() when certain bridge port flags change and this function can sleep since the commit cited below, resulting in a splat such as [1].
Fix this by reducing the scope of the bridge lock and only take it when processing the three STP related attributes that require it. This is consistent with the multicast attributes where each attribute acquires the multicast lock instead of having one critical section for all relevant attributes.
[1]
BUG: sleeping function called from invalid context at net/core/dev_addr_lists.c:1262
in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 356, name: bridgepreempt_count: 201, expected: 0
RCU nest depth: 0, expected: 0
2 locks held by bridge/356:
#0: ffffffff919473a0 (rtnl_mutex){+.+.}-{4:4}, at: rtnetlink_rcv_msg (net/core/rtnetlink.c:80 net/core/rtnetlink.c:7002) #1: ffff888115072d58 (&br->lock){+...}-{3:3}, at: br_setlink (./include/linux/spinlock.h:348 net/bridge/br_netlink.c:1117) Preemption disabled at:
0x0
Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011 Call Trace: <TASK> dump_stack_lvl (lib/dump_stack.c:94 lib/dump_stack.c:120)
__might_resched.cold (kernel/sched/core.c:9163) netif_rx_mode_run (net/core/dev_addr_lists.c:1262) netif_rx_mode_sync (net/core/dev_addr_lists.c:1428) dev_set_promiscuity (net/core/dev_api.c:289)
br_manage_promisc (net/bridge/br_if.c:135 net/bridge/br_if.c:172) br_port_flags_change (net/bridge/br_if.c:242 net/bridge/br_if.c:747)
br_setport (net/bridge/br_netlink.c:1000)br_setlink (net/bridge/br_netlink.c:1118)rtnl_bridge_setlink (net/core/rtnetlink.c:5572)rtnetlink_rcv_msg (net/core/rtnetlink.c:7005)netlink_rcv_skb (net/netlink/af_netlink.c:2550)netlink_unicast (net/netlink/af_netlink.c:1318 net/netlink/af_netlink.c:1344) netlink_sendmsg (net/netlink/af_netlink.c:1894)__sock_sendmsg (net/socket.c:787 (discriminator 4) net/socket.c:802 (discriminator 4)) ____sys_sendmsg (net/socket.c:2698)___sys_sendmsg (net/socket.c:2752)__sys_sendmsg (net/socket.c:2784)do_syscall_64 (arch/x86/entry/syscall_64.c:63 arch/x86/entry/syscall_64.c:94) entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:121)
--- net/bridge/br_netlink.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
net/bridge/br_netlink.c +7 -10
@@ -1000,19 +1000,25 @@ static int br_setport(struct net_bridge_port *p, struct nlattr *tb[],br_port_flags_change (p, changed_mask);if (tb[IFLA_BRPORT_COST ]) { +spin_lock_bh (&p->br->lock); err =br_stp_set_path_cost (p,nla_get_u32 (tb[IFLA_BRPORT_COST ])); +spin_unlock_bh (&p->br->lock);if (err)return err; }if (tb[IFLA_BRPORT_PRIORITY ]) { +spin_lock_bh (&p->br->lock); err =br_stp_set_port_priority (p,nla_get_u16 (tb[IFLA_BRPORT_PRIORITY ])); +spin_unlock_bh (&p->br->lock);if (err)return err; }if (tb[IFLA_BRPORT_STATE ]) { +spin_lock_bh (&p->br->lock); err =br_set_port_state (p,nla_get_u8 (tb[IFLA_BRPORT_STATE ])); +spin_unlock_bh (&p->br->lock);if (err)return err; }
@@ -1114,9 +1120,7 @@ int br_setlink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags,if (err)return err; -spin_lock_bh (&p->br->lock); err =br_setport (p, tb, extack); -spin_unlock_bh (&p->br->lock); }else {/* Binary compatibility with old RSTP */ if (nla_len (protinfo) <sizeof (u8))
@@ -1203,17 +1207,10 @@ static int br_port_slave_changelink(struct net_device *brdev, struct nlattr *data[], struct netlink_ext_ack *extack) { - struct net_bridge *br = netdev_priv(brdev); -int ret; -if (!data)return 0 ; -spin_lock_bh (&br->lock); - ret =br_setport (br_port_get_rtnl (dev), data, extack); -spin_unlock_bh (&br->lock); - -return ret; +return br_setport (br_port_get_rtnl (dev), data, extack); } static int br_port_fill_slave_info(struct sk_buff *skb,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 63/315 bridge: Fix sleep in atomic context in sysfs path
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ido Schimmel <[email protected]>
[ Upstream commit 6d34594cc619d0d4b07d5afcad8b5984f3526dcf ]
Since the start of the git history, brport_store() always acquired the bridge lock. Back then this decision made sense: The bridge lock protects the STP state of the bridge and its ports and at that time the function was only used by two STP related attributes (cost and priority).
Nowadays, brport_store() processes a lot more attributes and most of them do not need the bridge lock:
* Bridge flags: Only require RTNL. Read locklessly by the data path. Annotations can be added in net-next.
* FDB port flushing: Only requires the FDB lock.
* Multicast attributes: Only require the multicast lock.
* Group forward mask: Only requires RTNL. Read locklessly by the data path. Annotations can be added in net-next.
* Backup port: Only requires RTNL. Read locklessly by the data path.
This is a problem as the bridge calls dev_set_promiscuity() when certain bridge port flags change and this function can sleep since the commit cited below, resulting in a splat such as [1].
Fix this by reducing the scope of the bridge lock and only take it when processing the two STP related attributes that require it. Remove the now stale comment from br_switchdev_set_port_flag(). The SWITCHDEV_F_DEFER flag can be removed in net-next.
[1]
BUG: sleeping function called from invalid context at net/core/dev_addr_lists.c:1262
in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 372, name: bashpreempt_count: 201, expected: 0
RCU nest depth: 0, expected: 0
5 locks held by bash/372:
#0: ffff88810c51c3f0 (sb_writers#7){.+.+}-{0:0}, at: ksys_write (fs/read_write.c:740)
#1: ffff888115ce9480 (&of->mutex){+.+.}-{4:4}, at: kernfs_fop_write_iter (fs/kernfs/file.c:343)
#2: ffff88810b9fd330 (kn->active#37){.+.+}-{0:0}, at: kernfs_fop_write_iter (fs/kernfs/file.c:80 fs/kernfs/file.c:344) #3: ffffffffa59473a0 (rtnl_mutex){+.+.}-{4:4}, at: brport_store (net/bridge/br_sysfs_if.c:326)
#4: ffff8881099d2d58 (&br->lock){+...}-{3:3}, at: brport_store (./include/linux/spinlock.h:348 net/bridge/br_sysfs_if.c:345) Preemption disabled at:
0x0
Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011 Call Trace: <TASK> dump_stack_lvl (lib/dump_stack.c:94 lib/dump_stack.c:120)
__might_resched.cold (kernel/sched/core.c:9163) netif_rx_mode_run (net/core/dev_addr_lists.c:1262) netif_rx_mode_sync (net/core/dev_addr_lists.c:1428) dev_set_promiscuity (net/core/dev_api.c:289)
br_manage_promisc (net/bridge/br_if.c:135 net/bridge/br_if.c:172) br_port_flags_change (net/bridge/br_if.c:242 net/bridge/br_if.c:747) store_learning (net/bridge/br_sysfs_if.c:79 net/bridge/br_sysfs_if.c:235)
brport_store (net/bridge/br_sysfs_if.c:346)kernfs_fop_write_iter (fs/kernfs/file.c:352)new_sync_write (fs/read_write.c:595)vfs_write (fs/read_write.c:688)ksys_write (fs/read_write.c:740)do_syscall_64 (arch/x86/entry/syscall_64.c:63 arch/x86/entry/syscall_64.c:94) entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:121)
--- net/bridge/br_switchdev.c | 1 - net/bridge/br_sysfs_if.c | 30 ++++++++++++++++++++++-------- 2 files changed, 22 insertions(+), 9 deletions(-)
net/bridge/br_switchdev.c +0 -1
@@ -99,7 +99,6 @@ int br_switchdev_set_port_flag(struct net_bridge_port *p, attr.u.brport_flags.val = flags; attr.u.brport_flags.mask = mask; -/* We run from atomic context here */ err =call_switchdev_notifiers (SWITCHDEV_PORT_ATTR_SET , p->dev, &info.info, extack); err =notifier_to_errno (err);
net/bridge/br_sysfs_if.c +22 -8
@@ -86,16 +86,34 @@ static ssize_t show_path_cost(struct net_bridge_port *p, char *buf)return sprintf (buf,"%d\n" , p->path_cost); } -static BRPORT_ATTR(path_cost, 0644, - show_path_cost, br_stp_set_path_cost); +static int store_path_cost (struct net_bridge_port *p,unsigned long v) +{ +int ret; + +spin_lock_bh (&p->br->lock); + ret =br_stp_set_path_cost (p, v); +spin_unlock_bh (&p->br->lock); +return ret; +} + +static BRPORT_ATTR(path_cost, 0644, show_path_cost, store_path_cost);static ssize_t show_priority (struct net_bridge_port *p,char *buf) {return sprintf (buf,"%d\n" , p->priority); } -static BRPORT_ATTR(priority, 0644, - show_priority, br_stp_set_port_priority); +static int store_priority (struct net_bridge_port *p,unsigned long v) +{ +int ret; + +spin_lock_bh (&p->br->lock); + ret =br_stp_set_port_priority (p, v); +spin_unlock_bh (&p->br->lock); +return ret; +} + +static BRPORT_ATTR(priority, 0644, show_priority, store_priority);static ssize_t show_designated_root (struct net_bridge_port *p,char *buf) {
@@ -334,17 +352,13 @@ static ssize_t brport_store(struct kobject *kobj, ret = -ENOMEM ; goto out_unlock; } -spin_lock_bh (&p->br->lock); ret = brport_attr->store_raw (p, buf_copy); -spin_unlock_bh (&p->br->lock);kfree (buf_copy); }else if (brport_attr->store) { val =simple_strtoul (buf, &endp,0 );if (endp == buf) goto out_unlock; -spin_lock_bh (&p->br->lock); ret = brport_attr->store (p, val); -spin_unlock_bh (&p->br->lock); }if (!ret) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 64/315 ethtool: coalesce: cap profile updates at NET_DIM_PARAMS_NUM_PROFILES
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 7281b096b072f6c6e30420e3467d738f2e4c4b57 ]
ethnl_update_profile() walks the ETHTOOL_A_PROFILE_IRQ_MODERATION nest list with an index 'i' and writes new_profile[i++] without bounding i. The destination is kmemdup()'d at NET_DIM_PARAMS_NUM_PROFILES entries (5), but the Netlink nest count is entirely user-controlled. Netlink policies do not have support for constraining the number of nested entries (or number of multi-attr entries).
--- net/ethtool/coalesce.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/ethtool/coalesce.c +6 -0
@@ -463,6 +463,12 @@ static int ethnl_update_profile(struct net_device *dev,nla_for_each_nested_type (nest,ETHTOOL_A_PROFILE_IRQ_MODERATION , nests, rem) { +if (i >=NET_DIM_PARAMS_NUM_PROFILES ) { +NL_SET_BAD_ATTR (extack, nest); + ret = -E2BIG ; + goto err_out; + } + ret =nla_parse_nested (tb, len_irq_moder -1 , nest, coalesce_irq_moderation_policy, extack);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 65/315 ethtool: tsconfig: fix reply error handling
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit a888bbd43940cada72f7686337741ce86d1cf869 ]
A couple of trivial bugs in error handling in tsconfig_send_reply(). If we failed to allocate rskb we need to set the error. If we did allocate it but failed to send it - we need to remember to free it.
--- net/ethtool/tsconfig.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
net/ethtool/tsconfig.c +7 -2
@@ -224,16 +224,21 @@ static int tsconfig_send_reply(struct net_device *dev, struct genl_info *info) reply_len = ret +ethnl_reply_header_size (); rskb =ethnl_reply_init (reply_len, dev,ETHTOOL_MSG_TSCONFIG_SET_REPLY ,ETHTOOL_A_TSCONFIG_HEADER , info, &reply_payload); -if (!rskb) +if (!rskb) { + ret = -ENOMEM ; goto err_cleanup; + } ret =tsconfig_fill_reply (rskb, &req_info->base, &reply_data->base);if (ret <0 ) - goto err_cleanup; + goto err_free_msg;genlmsg_end (rskb, reply_payload); ret =genlmsg_reply (rskb, info); + rskb =NULL ; +err_free_msg: +nlmsg_free (rskb); err_cleanup:kfree (reply_data);kfree (req_info);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 66/315 ethtool: linkstate: fix unbalanced ethnl_ops_complete() on PHY lookup error
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 596c51ed9e125b12c4d85b4530dfd4c7847634b7 ]
linkstate_prepare_data() calls ethnl_req_get_phydev() before ethnl_ops_begin(), but routes its error path through "goto out" which calls ethnl_ops_complete().
--- net/ethtool/linkstate.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
net/ethtool/linkstate.c +2 -4
@@ -105,10 +105,8 @@ static int linkstate_prepare_data(const struct ethnl_req_info *req_base, phydev =ethnl_req_get_phydev (req_base, tb,ETHTOOL_A_LINKSTATE_HEADER , info->extack); -if (IS_ERR (phydev)) { - ret =PTR_ERR (phydev); - goto out; - } +if (IS_ERR (phydev)) +return PTR_ERR (phydev); ret =ethnl_ops_begin (dev);if (ret <0 )
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 67/315 ethtool: pse-pd: fix missing ethnl_ops_complete()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit ab5bf428fb6bd361163c7247b92750d1d24ca2ed ]
pse_prepare_data() is missing ethnl_ops_complete() if ethnl_req_get_phydev() returned an error. Move getting phydev up so that we don't have to worry about this (similar order to linkstate_prepare_data()).
Note that phydev may still be NULL (this is checked in pse_get_pse_attributes()), the goal isn't really to avoid the _begin() / _complete() calls, only to simplify the error handling.
While at it propagate the original error. Why this code overrides the error with -ENODEV but !phydev generates -EOPNOTSUPP is unclear to me...
--- net/ethtool/pse-pd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
net/ethtool/pse-pd.c +5 -5
@@ -61,14 +61,14 @@ static int pse_prepare_data(const struct ethnl_req_info *req_base,struct phy_device *phydev;int ret; - ret =ethnl_ops_begin (dev); -if (ret <0 ) -return ret; - phydev =ethnl_req_get_phydev (req_base, tb,ETHTOOL_A_PSE_HEADER , info->extack);if (IS_ERR (phydev)) -return -ENODEV ; +return PTR_ERR (phydev); + + ret =ethnl_ops_begin (dev); +if (ret <0 ) +return ret; ret =pse_get_pse_attributes (phydev, info->extack, data);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 68/315 ethtool: tsconfig: fix missing ethnl_ops_complete()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 6386bd772de64e6760306eb91c7e86163af6c22f ]
tsconfig_prepare_data() calls ethnl_ops_begin(), we need to call ethnl_ops_complete() before returning the error.
--- net/ethtool/tsconfig.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/ethtool/tsconfig.c +4 -2
@@ -69,8 +69,10 @@ static int tsconfig_prepare_data(const struct ethnl_req_info *req_base,if (ret) goto out; -if (ts_info.phc_index ==-1 ) -return -ENODEV ; +if (ts_info.phc_index ==-1 ) { + ret = -ENODEV ; + goto out; + } data->hwprov_desc.index = ts_info.phc_index; data->hwprov_desc.qualifier = ts_info.phc_qualifier;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 69/315 ethtool: tsinfo: fix uninitialized stats on the by-PHC path
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 1de405699c62c3a9544bcdcfb9eff8a01cfc7582 ]
tsinfo_prepare_data() has two code paths: a "by-PHC" path for user-specified hardware timestamping providers, and the old path. Commit 89e281ebff72 ("ethtool: init tsinfo stats if requested") added ethtool_stats_init() to mark stat slots as ETHTOOL_STAT_NOT_SET before the driver callback populates them, but placed the call inside the old-path block.
When commit b9e3f7dc9ed9 ("net: ethtool: tsinfo: Enhance tsinfo to support several hwtstamp by net topology") added the by-PHC early return, it landed above the stats initialization. On that path the stats array retains the zero-fill from ethnl_init_reply_data()'s zalloc. This leads to the reply including a stats nest with four zero-valued attributes that should have been absent.
Reject GET requests for stats with HWTSTAMP_PROVIDER or dump.
--- net/ethtool/tsinfo.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
net/ethtool/tsinfo.c +13 -0
@@ -81,6 +81,11 @@ tsinfo_parse_request(struct ethnl_req_info *req_base, struct nlattr **tb,if (!tb[ETHTOOL_A_TSINFO_HWTSTAMP_PROVIDER ])return 0 ; +if (req_base->flags ÐTOOL_FLAG_STATS ) { +NL_SET_ERR_MSG (extack,"can't query statistics for a provider" ); +return -EOPNOTSUPP ; + } +return ts_parse_hwtst_provider (tb[ETHTOOL_A_TSINFO_HWTSTAMP_PROVIDER ], &req->hwprov_desc, extack, &mod); }
@@ -521,6 +526,12 @@ int ethnl_tsinfo_start(struct netlink_callback *cb)if (ret <0 ) goto free_reply_data; +if (req_info->base.flags ÐTOOL_FLAG_STATS ) { +NL_SET_ERR_MSG (cb->extack,"stats not supported in dump" ); + ret = -EOPNOTSUPP ; + goto err_dev_put; + } + ctx->req_info = req_info; ctx->reply_data = reply_data; ctx->pos_ifindex =0 ;
@@ -530,6 +541,8 @@ int ethnl_tsinfo_start(struct netlink_callback *cb)return 0 ; +err_dev_put: +ethnl_parse_header_dev_put (&req_info->base); free_reply_data:kfree (reply_data); free_req_info:
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 70/315 ethtool: tsinfo: dont pass ERR_PTR to genlmsg_cancel on prepare failure
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit c3fc9976f686f9a95baf87db9d387f218fd65394 ]
The goto err label leads to:
genlmsg_cancel(skb, ehdr); return ret;
If ethnl_tsinfo_prepare_dump() failed, it has not started a genlmsg. There's nothing to cancel, and passing an error pointer to genlmsg_cancel() would cause a crash.
--- net/ethtool/tsinfo.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
net/ethtool/tsinfo.c +2 -4
@@ -405,10 +405,8 @@ static int ethnl_tsinfo_dump_one_netdev(struct sk_buff *skb,continue ; ehdr =ethnl_tsinfo_prepare_dump (skb, dev, reply_data, cb); -if (IS_ERR (ehdr)) { - ret =PTR_ERR (ehdr); - goto err; - } +if (IS_ERR (ehdr)) +return PTR_ERR (ehdr); reply_data->ts_info.phc_qualifier = ctx->pos_phcqualifier; ret = ops->get_ts_info (dev, &reply_data->ts_info);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 71/315 ethtool: strset: fix header attribute index in ethnl_req_get_phydev()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit a8d8bef6b45bf7cc0b1f6110c5cd8d0160a9bad7 ]
strset_prepare_data() passes ETHTOOL_A_HEADER_FLAGS (3) as the header attribute to ethnl_req_get_phydev(). This is incorrect, in the main attr space 3 is ETHTOOL_A_STRSET_COUNTS_ONLY, not the request header attr. The correct constant is ETHTOOL_A_STRSET_HEADER (1).
ethnl_req_get_phydev() only uses this value for the extack, so this is not a "functionally visible"(?) bug.
--- net/ethtool/strset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ethtool/strset.c +1 -1
@@ -309,7 +309,7 @@ static int strset_prepare_data(const struct ethnl_req_info *req_base,return 0 ; } - phydev =ethnl_req_get_phydev (req_base, tb,ETHTOOL_A_HEADER_FLAGS , + phydev =ethnl_req_get_phydev (req_base, tb,ETHTOOL_A_STRSET_HEADER , info->extack);/* phydev can be NULL, check for errors only */
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 72/315 ethtool: eeprom: add missing ethnl_ops_begin() / _complete() during fallback
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 2376586f85f972fefe701f095bb37dcfe7405d21 ]
All ethtool driver op calls should be sandwiched between ethnl_ops_begin() / ethnl_ops_complete(). In Netlink eeprom code, if the paged access failed we fall back to old API, but we first call _complete() and the fallback never does its own ethnl_ops_begin(). Move the fallback into the _begin() / _complete() section.
--- net/ethtool/eeprom.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
net/ethtool/eeprom.c +2 -3
@@ -140,12 +140,11 @@ static int eeprom_prepare_data(const struct ethnl_req_info *req_base,return 0 ; err_ops: +if (ret == -EOPNOTSUPP ) + ret =eeprom_fallback (request, reply);ethnl_ops_complete (dev); err_free:kfree (page_data.data); - -if (ret == -EOPNOTSUPP ) -return eeprom_fallback (request, reply);return ret; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 73/315 ethtool: eeprom: add more safeties to EEPROM Netlink fallback
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 67cfdd9210b99f260b3e0afeb9525e0acc7be31e ]
The Netlink fallback path for reading module EEPROM (fallback_set_params()) validates that offset < eeprom_len, but does not check that offset + length stays within eeprom_len. The ioctl equivalent (ethtool_get_any_eeprom() in ioctl.c) has always enforced both bounds:
if (eeprom.offset + eeprom.len > total_len)
return -EINVAL;
This could lead to surprises in both drivers and device FW. Add the missing offset + length validation to fallback_set_params(), mirroring the ioctl.
Similarly - ethtool core in general, and ethtool_get_any_eeprom() in particular tries to zero-init all buffers passed to the drivers to avoid any extra work of zeroing things out. eeprom_fallback() uses a plain kmalloc(), change it to zalloc.
--- net/ethtool/eeprom.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
net/ethtool/eeprom.c +4 -1
@@ -43,6 +43,9 @@ static int fallback_set_params(struct eeprom_req_info *request,if (offset >= modinfo->eeprom_len)return -EINVAL ; +if (length > modinfo->eeprom_len - offset) +return -EINVAL ; + eeprom->cmd =ETHTOOL_GMODULEEEPROM ; eeprom->len = length; eeprom->offset = offset;
@@ -68,7 +71,7 @@ static int eeprom_fallback(struct eeprom_req_info *request,if (err <0 )return err; - data =kmalloc (eeprom.len,GFP_KERNEL ); + data =kzalloc (eeprom.len,GFP_KERNEL );if (!data)return -ENOMEM ; err =ethtool_get_module_eeprom_call (dev, &eeprom, data);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 74/315 ipv6: rpl: fix hdrlen overflow in ipv6_rpl_srh_decompress()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rahul Chandelkar <[email protected]>
[ Upstream commit 9d5e7a46a9f6d8f503b41bfefef70659845f1679 ]
ipv6_rpl_srh_decompress() computes:
outhdr->hdrlen = (((n + 1) * sizeof(struct in6_addr)) >> 3);
hdrlen is __u8. For n >= 127 the result exceeds 255 and silently truncates. With n=127 (cmpri=15, cmpre=15, pad=0, hdrlen=16):
(128 * 16) >> 3 = 256, truncated to 0 as __u8
The caller in ipv6_rpl_srh_rcv() then places the compressed header at buf + ((ohdr->hdrlen + 1) << 3). With hdrlen=0 this is buf + 8, but the decompressed region occupies buf[0..2055] (8-byte header plus 128 full addresses). The compressed header overlaps the decompressed data, and ipv6_rpl_srh_compress() writes into this overlap, corrupting the routing header of the forwarded packet.
The existing guard at exthdrs.c:546 checks (n + 1) > 255, which prevents n+1 from overflowing unsigned char (the segments_left field), but does not prevent the computed hdrlen from overflowing __u8. n=127 passes because 128 <= 255, yet hdrlen=256 does not fit.
Tighten the bound to (n + 1) > 127. This caps n at 126, giving hdrlen = (127 * 16) >> 3 = 254, which fits in __u8. The compressed header then lands at buf + ((254 + 1) << 3) = buf + 2040, exactly past the decompressed region (buf[0..2039]). No overlap. 127 segments is well beyond any realistic RPL deployment.
--- net/ipv6/exthdrs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv6/exthdrs.c +1 -1
@@ -544,7 +544,7 @@ static int ipv6_rpl_srh_rcv(struct sk_buff *skb)* unsigned char which is segments_left field. Should not be * higher than that. */ -if (r || (n +1 ) >255 ) { +if (r || (n +1 ) >127 ) {kfree_skb (skb);return -1 ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 75/315 net/sched: Revert "net/sched: Restrict conditions for adding duplicating netems to qdisc tree"
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jamal Hadi Salim <[email protected]>
[ Upstream commit eda0b7f203bb166c98d1418b204135bd566ac83b ]
This reverts commit ec8e0e3d7adef940cdf9475e2352c0680189d14e.
The original patch rejects any tree containing two netems when either has duplication set, even when they sit on unrelated classes of the same classful parent. That broke configurations that have worked since netem was introduced.
The re-entrancy problem the original commit was trying to solve is handled by later patch using tc_depth flag.
Doing this revert will (re)expose the original bug with multiple netem duplication. When this patch is backported make sure and get the full series.
--- net/sched/sch_netem.c | 40 ---------------------------------------- 1 file changed, 40 deletions(-)
net/sched/sch_netem.c +0 -40
@@ -1006,41 +1006,6 @@ static int parse_attr(struct nlattr *tb[], int maxtype, struct nlattr *nla,return 0 ; } -static const struct Qdisc_class_ops netem_class_ops; - -static int check_netem_in_tree (struct Qdisc *sch,bool duplicates, -struct netlink_ext_ack *extack) -{ -struct Qdisc *root, *q; -unsigned int i; - - root =qdisc_root_sleeping (sch); - -if (sch != root && root->ops->cl_ops == &netem_class_ops) { -if (duplicates || - ((struct netem_sched_data *)qdisc_priv (root))->duplicate) - goto err; - } - -if (!qdisc_dev (root)) -return 0 ; - -hash_for_each (qdisc_dev (root)->qdisc_hash, i, q, hash) { -if (sch != q && q->ops->cl_ops == &netem_class_ops) { -if (duplicates || - ((struct netem_sched_data *)qdisc_priv (q))->duplicate) - goto err; - } - } - -return 0 ; - -err: -NL_SET_ERR_MSG (extack, -"netem: cannot mix duplicating netems with other netems in tree" ); -return -EINVAL ; -} -/* Parse netlink message to set options */ static int netem_change (struct Qdisc *sch,struct nlattr *opt,struct netlink_ext_ack *extack)
@@ -1117,11 +1082,6 @@ static int netem_change(struct Qdisc *sch, struct nlattr *opt, q->gap = qopt->gap; q->counter =0 ; q->loss = qopt->loss; - - ret =check_netem_in_tree (sch, qopt->duplicate, extack); -if (ret) - goto unlock; - q->duplicate = qopt->duplicate;/* for compatibility with earlier versions.
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 76/315 net: hibmcge: disable Relaxed Ordering to fix RX packet corruption
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jijie Shao <[email protected]>
[ Upstream commit 463a1271aa26eac992851b9d98cc75bc3cd4a1ed ]
When SMMU is disabled, the hibmcge driver may receive corrupted packets. The hardware writes packet data and descriptors to the same page, but with Relaxed Ordering enabled, PCI write transactions may not be strictly ordered. This can cause the driver to observe a valid descriptor before the corresponding packet data is fully written.
Fix this by clearing PCI_EXP_DEVCTL_RELAX_EN in the PCI bridge control register to ensure strict write ordering between packet data and descriptors.
--- drivers/net/ethernet/hisilicon/hibmcge/hbg_main.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/hisilicon/hibmcge/hbg_main.c +3 -0
@@ -420,6 +420,9 @@ static int hbg_pci_init(struct pci_dev *pdev)return -ENOMEM ;pci_set_master (pdev); +pcie_capability_clear_word (pdev,PCI_EXP_DEVCTL , +PCI_EXP_DEVCTL_RELAX_EN ); +pci_save_state (pdev);return 0 ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 77/315 net/handshake: Use spin_lock_bh for hn_lock
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chuck Lever <[email protected]>
[ Upstream commit cc993e0927ec8bd98ea33377ada03295fcda0f24 ]
nvmet_tcp_state_change(), a socket callback that runs in BH context, can reach handshake_req_cancel() via nvmet_tcp_schedule_release_queue() and tls_handshake_cancel(). handshake_req_cancel() acquires hn->hn_lock with plain spin_lock(). If a process-context thread on the same CPU holds hn->hn_lock when a softirq invokes the cancel path, the lock attempt deadlocks. This is the only caller that invokes tls_handshake_cancel() from BH context; every other consumer calls it from process context.
Deferring the cancel to process context in the NVMe target is not
straightforward: nvmet_tcp_schedule_release_queue() must call tls_handshake_cancel() atomically with its state transition to DISCONNECTING. If the cancel were deferred, the handshake completion callback could fire in the window before the cancel runs, observe the unexpected state, and return without dropping its kref on the queue. Reworking that interlock is considerably more invasive than hardening the handshake lock. Convert all hn->hn_lock acquisitions from spin_lock/spin_unlock to spin_lock_bh/spin_unlock_bh so the lock is never taken with softirqs enabled.
--- net/handshake/netlink.c | 4 ++-- net/handshake/request.c | 14 +++++++------- net/handshake/tlshd.c | 2 ++ 3 files changed, 11 insertions(+), 9 deletions(-)
net/handshake/netlink.c +2 -2
@@ -203,10 +203,10 @@ static void __net_exit handshake_net_exit(struct net *net)* accepted and are in progress will be destroyed when * the socket is closed. */ -spin_lock (&hn->hn_lock); +spin_lock_bh (&hn->hn_lock);set_bit (HANDSHAKE_F_NET_DRAINING , &hn->hn_flags);list_splice_init (&requests, &hn->hn_requests); -spin_unlock (&hn->hn_lock); +spin_unlock_bh (&hn->hn_lock);while (!list_empty (&requests)) { req = list_first_entry(&requests, struct handshake_req, hr_list);
net/handshake/request.c +7 -7
@@ -167,12 +167,12 @@ static bool remove_pending(struct handshake_net *hn, struct handshake_req *req) {bool ret = false; -spin_lock (&hn->hn_lock); +spin_lock_bh (&hn->hn_lock);if (!list_empty (&req->hr_list)) {__remove_pending_locked (hn, req); ret = true; } -spin_unlock (&hn->hn_lock); +spin_unlock_bh (&hn->hn_lock);return ret; }
@@ -182,7 +182,7 @@ struct handshake_req *handshake_req_next(struct handshake_net *hn, int class)struct handshake_req *req, *pos; req =NULL ; -spin_lock (&hn->hn_lock); +spin_lock_bh (&hn->hn_lock);list_for_each_entry (pos, &hn->hn_requests, hr_list) {if (pos->hr_proto->hp_handler_class != class)continue ;
@@ -190,7 +190,7 @@ struct handshake_req *handshake_req_next(struct handshake_net *hn, int class) req = pos;break ; } -spin_unlock (&hn->hn_lock); +spin_unlock_bh (&hn->hn_lock);return req; }
@@ -249,7 +249,7 @@ int handshake_req_submit(struct socket *sock, struct handshake_req *req,if (READ_ONCE (hn->hn_pending) >= hn->hn_pending_max) goto out_err; -spin_lock (&hn->hn_lock); +spin_lock_bh (&hn->hn_lock); ret = -EOPNOTSUPP ;if (test_bit (HANDSHAKE_F_NET_DRAINING , &hn->hn_flags)) goto out_unlock;
@@ -258,7 +258,7 @@ int handshake_req_submit(struct socket *sock, struct handshake_req *req, goto out_unlock;if (!__add_pending_locked (hn, req)) goto out_unlock; -spin_unlock (&hn->hn_lock); +spin_unlock_bh (&hn->hn_lock); ret =handshake_genl_notify (net, req->hr_proto, flags);if (ret) {
@@ -274,7 +274,7 @@ int handshake_req_submit(struct socket *sock, struct handshake_req *req,return 0 ; out_unlock: -spin_unlock (&hn->hn_lock); +spin_unlock_bh (&hn->hn_lock); out_err:/* Restore original destructor so socket teardown still runs on failure */ req->hr_sk->sk_destruct = req->hr_odestruct;
net/handshake/tlshd.c +2 -0
@@ -425,6 +425,8 @@ EXPORT_SYMBOL(tls_server_hello_psk);* Request cancellation races with request completion. To determine * who won, callers examine the return value from this function. * +* Context: May be called from process or softirq context. +* * Return values: * %true - Uncompleted handshake request was canceled * %false - Handshake request already completed or not found
Signature · 1 line
2.53.0
Re: [PATCH 6.12 073/307] net/sched: Revert "net/sched: Restrict conditions for adding duplicating netems to qdisc tree"
안전한 Proton Mail로 전송되었습니다.
에 2026년 6월 7일 일요일 10:20 Greg Kroah-Hartman <[email protected]> 님이 작성함:
Quoted 103 lines
6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jamal Hadi Salim <[email protected]>
[ Upstream commit
eda0b7f203bb166c98d1418b204135bd566ac83b]This reverts commit
ec8e0e3d7adef940cdf9475e2352c0680189d14e.The original patch rejects any tree containing two netems when either has duplication set, even when they sit on unrelated classes of the same classful parent. That broke configurations that have worked since netem was introduced.
The re-entrancy problem the original commit was trying to solve is handled by later patch using
tc_depthflag.Doing this revert will (re)expose the original bug with multiple netem duplication. When this patch is backported make sure and get the full series.
Fixes ec8e0e3d7ade ("net/sched: Restrict conditions for adding duplicating netems to qdisc tree")Reported-by Ji-Soo Chung <[email protected]>Reported-by Gerlinde <[email protected]>Reported-by zyc zyc <[email protected]>Reported-by Manas Ghandat <[email protected]>Reviewed-by Stephen Hemminger <[email protected]>Signed-off-by Jamal Hadi Salim <[email protected]>Signed-off-by Paolo Abeni <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- net/sched/sch_netem.c | 40 ---------------------------------------- 1 file changed, 40 deletions(-)net/sched/sch_netem.c +0
-41@@ -1005,41 +1005,6 @@ static int parse_attr(struct nlattr *tb[], int maxtype, struct nlattr *nla,return 0 ; } -static const struct Qdisc_class_ops netem_class_ops; - -static int check_netem_in_tree (struct Qdisc *sch,bool duplicates, -struct netlink_ext_ack *extack) -{ -struct Qdisc *root, *q; -unsigned int i; - - root =qdisc_root_sleeping (sch); - -if (sch != root && root->ops->cl_ops == &netem_class_ops) { -if (duplicates || - ((struct netem_sched_data *)qdisc_priv (root))->duplicate) - goto err; - } - -if (!qdisc_dev (root)) -return 0 ; - -hash_for_each (qdisc_dev (root)->qdisc_hash, i, q, hash) { -if (sch != q && q->ops->cl_ops == &netem_class_ops) { -if (duplicates || - ((struct netem_sched_data *)qdisc_priv (q))->duplicate) - goto err; - } - } - -return 0 ; - -err: -NL_SET_ERR_MSG (extack, -"netem: cannot mix duplicating netems with other netems in tree" ); -return -EINVAL ; -} -/* Parse netlink message to set options */ static int netem_change (struct Qdisc *sch,struct nlattr *opt,struct netlink_ext_ack *extack)@@ -1116,11 +1081,6 @@ static int netem_change(struct Qdisc *sch, struct nlattr *opt, q->gap = qopt->gap; q->counter =0 ; q->loss = qopt->loss; - - ret =check_netem_in_tree (sch, qopt->duplicate, extack); -if (ret) - goto unlock; - q->duplicate = qopt->duplicate;/* for compatibility with earlier versions. -- 2.53.0
Greg Kroah-Hartman
maintainerPATCH 78/315 nvme-tcp: store negative errno in queue->tls_err
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chuck Lever <[email protected]>
[ Upstream commit 9015985b5eb1a90eb86caf5bce1dfcf1aa38f8ad ]
nvme_tcp_tls_done() assigns queue->tls_err in three branches. The ENOKEY lookup failure and the EOPNOTSUPP initializer both store negative errnos. The third branch, reached when the handshake layer reports a non-zero status, stores -status.
The handshake layer delivers status to the consumer callback as a negative errno; the other in-tree consumers -- xs_tls_handshake_done() and the nvmet target callback -- treat their status argument that way. The extra negation in nvme_tcp_tls_done() flips the sign, leaving tls_err as a positive value (for instance, +EIO), which nvme_tcp_start_tls() then returns to its caller.
Drop the extra negation so queue->tls_err uniformly carries a negative errno on failure.
--- drivers/nvme/host/tcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/host/tcp.c +1 -1
@@ -1687,7 +1687,7 @@ static void nvme_tcp_tls_done(void *data, int status, key_serial_t pskid) qid, pskid, status);if (status) { - queue->tls_err = -status; + queue->tls_err = status; goto out_complete; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 79/315 net/handshake: Pass negative errno through handshake_complete()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chuck Lever <[email protected]>
[ Upstream commit 6b22d433aa13f68e3cd9534ca9a5f4277bfa01c2 ]
handshake_complete() declares status as unsigned int and tls_handshake_done() negates that value (-status) before handing it to the TLS consumer. Consumers match on negative errno constants -- xs_tls_handshake_done() has
switch (status) {
case 0:
case -EACCES:
case -ETIMEDOUT:
lower_transport->xprt_err = status;
break;
default:
lower_transport->xprt_err = -EACCES;
}so the API as designed expects callers to pass positive errno values that the tlshd shim then negates.
Three internal callers in handshake_nl_accept_doit(), the net-exit drain, and a kunit test follow kernel convention and pass negative errnos -- -EIO, -ETIMEDOUT, -ETIMEDOUT. The implicit conversion to unsigned int turns -ETIMEDOUT into 0xFFFFFF92; the subsequent -status in tls_handshake_done() wraps back to 110, the consumer's switch falls through, and the xprt reports -EACCES on what should be -ETIMEDOUT or -EIO.
Fix the API rather than the call sites. The natural kernel convention is negative errno in, negative errno out. Change handshake_complete() and hp_done to take int status, drop the negation in tls_handshake_done(), and negate once in handshake_nl_done_doit() where status arrives from the wire as an unsigned netlink attribute. The three internal callers were already correct under that convention and need no change.
At the same wire boundary, declare MAX_ERRNO as the netlink policy upper bound for HANDSHAKE_A_DONE_STATUS. Attribute validation rejects out-of-range values before handshake_nl_done_doit() runs, and negating a bounded u32 there stays within int range -- closing the UBSAN-visible signed- integer overflow that an unconstrained u32 would invoke.
--- Documentation/netlink/specs/handshake.yaml | 8 ++++++++ net/handshake/genl.c | 3 ++- net/handshake/genl.h | 1 + net/handshake/handshake-test.c | 2 +- net/handshake/handshake.h | 4 ++-- net/handshake/netlink.c | 2 +- net/handshake/request.c | 2 +- net/handshake/tlshd.c | 4 ++-- 8 files changed, 18 insertions(+), 8 deletions(-)
Documentation/netlink/specs/handshake.yaml +8 -0
@@ -12,6 +12,12 @@ protocol: genetlink doc: Netlink protocol to request a transport layer security handshake. definitions: + - + type: const + name: max-errno + value: 4095 + header: linux/err.h + scope: kernel - type: enum name: handler-class
@@ -80,6 +86,8 @@ attribute-sets: - name: status type: u32 + checks: + max: max-errno - name: sockfd type: s32
net/handshake/genl.c +2 -1
@@ -9,6 +9,7 @@#include "genl.h" #include <uapi/linux/handshake.h> +#include <linux/err.h> /* HANDSHAKE_CMD_ACCEPT - do */ static const struct nla_policy handshake_accept_nl_policy[HANDSHAKE_A_ACCEPT_HANDLER_CLASS +1 ] = {
@@ -17,7 +18,7 @@ static const struct nla_policy handshake_accept_nl_policy[HANDSHAKE_A_ACCEPT_HAN/* HANDSHAKE_CMD_DONE - do */ static const struct nla_policy handshake_done_nl_policy[HANDSHAKE_A_DONE_REMOTE_AUTH +1 ] = { - [HANDSHAKE_A_DONE_STATUS ] = { .type =NLA_U32 , }, + [HANDSHAKE_A_DONE_STATUS ] =NLA_POLICY_MAX (NLA_U32 ,MAX_ERRNO ), [HANDSHAKE_A_DONE_SOCKFD ] = { .type =NLA_S32 , }, [HANDSHAKE_A_DONE_REMOTE_AUTH ] = { .type =NLA_U32 , }, };
net/handshake/genl.h +1 -0
@@ -10,6 +10,7 @@#include <net/genetlink.h> #include <uapi/linux/handshake.h> +#include <linux/err.h> int handshake_nl_accept_doit (struct sk_buff *skb,struct genl_info *info);int handshake_nl_done_doit (struct sk_buff *skb,struct genl_info *info);
net/handshake/handshake-test.c +1 -1
@@ -25,7 +25,7 @@ static int test_accept_func(struct handshake_req *req, struct genl_info *info,return 0 ; } -static void test_done_func (struct handshake_req *req,unsigned int status, +static void test_done_func (struct handshake_req *req,int status,struct genl_info *info) { }
net/handshake/handshake.h +2 -2
@@ -57,7 +57,7 @@ struct handshake_proto {int (*hp_accept)(struct handshake_req *req,struct genl_info *info,int fd);void (*hp_done)(struct handshake_req *req, -unsigned int status, +int status,struct genl_info *info);void (*hp_destroy)(struct handshake_req *req); };
@@ -86,7 +86,7 @@ struct handshake_req *handshake_req_hash_lookup(struct sock *sk);struct handshake_req *handshake_req_next (struct handshake_net *hn,int class);int handshake_req_submit (struct socket *sock,struct handshake_req *req,gfp_t flags); -void handshake_complete (struct handshake_req *req,unsigned int status, +void handshake_complete (struct handshake_req *req,int status,struct genl_info *info);bool handshake_req_cancel (struct sock *sk);
net/handshake/netlink.c +1 -1
@@ -161,7 +161,7 @@ int handshake_nl_done_doit(struct sk_buff *skb, struct genl_info *info) status = -EIO ;if (info->attrs[HANDSHAKE_A_DONE_STATUS ]) - status =nla_get_u32 (info->attrs[HANDSHAKE_A_DONE_STATUS ]); + status = -(int )nla_get_u32 (info->attrs[HANDSHAKE_A_DONE_STATUS ]);handshake_complete (req, status, info);sockfd_put (sock);
net/handshake/request.c +1 -1
@@ -284,7 +284,7 @@ int handshake_req_submit(struct socket *sock, struct handshake_req *req, }EXPORT_SYMBOL (handshake_req_submit); -void handshake_complete (struct handshake_req *req,unsigned int status, +void handshake_complete (struct handshake_req *req,int status,struct genl_info *info) {struct sock *sk = req->hr_sk;
net/handshake/tlshd.c +2 -2
@@ -93,7 +93,7 @@ static void tls_handshake_remote_peerids(struct tls_handshake_req *treq,* */ static void tls_handshake_done (struct handshake_req *req, -unsigned int status,struct genl_info *info) +int status,struct genl_info *info) {struct tls_handshake_req *treq =handshake_req_private (req);
@@ -104,7 +104,7 @@ static void tls_handshake_done(struct handshake_req *req,if (!status)set_bit (HANDSHAKE_F_REQ_SESSION , &req->hr_flags); - treq->th_consumer_done (treq->th_consumer_data, -status, + treq->th_consumer_done (treq->th_consumer_data, status, treq->th_peerid[0 ]); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 80/315 Bluetooth: l2cap: clear chan->ident on ECRED reconfiguration success
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhenghang Xiao <[email protected]>
[ Upstream commit 00e1950716c6ed67d74777b2db286b0fa23b4be9 ]
l2cap_ecred_reconf_rsp() returns early on success without clearing chan->ident. Every other L2CAP response handler (l2cap_ecred_conn_rsp, l2cap_le_connect_rsp, l2cap_config_rsp) clears chan->ident after a successful transaction to prevent the channel from matching subsequent responses with the recycled ident value.
A remote attacker that completed a reconfiguration as the peer can replay a failure response with the stale ident, causing the kernel to match and destroy the already-established channel via l2cap_chan_del(chan, ECONNRESET).
Clear chan->ident for all matching channels on success, and harden the failure path by using l2cap_chan_hold_unless_zero() consistent with other L2CAP handlers (l2cap_le_command_rej, __l2cap_get_chan_by_ident).
--- net/bluetooth/l2cap_core.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
net/bluetooth/l2cap_core.c +8 -2
@@ -5466,14 +5466,20 @@ static inline int l2cap_ecred_reconf_rsp(struct l2cap_conn *conn,BT_DBG ("result 0x%4.4x" , result); -if (!result) +if (!result) { +list_for_each_entry (chan, &conn->chan_l, list) { +if (chan->ident == cmd->ident) + chan->ident =0 ; + }return 0 ; + }list_for_each_entry_safe (chan, tmp, &conn->chan_l, list) {if (chan->ident != cmd->ident)continue ; -l2cap_chan_hold (chan); +if (!l2cap_chan_hold_unless_zero (chan)) +continue ;l2cap_chan_lock (chan);l2cap_chan_del (chan,ECONNRESET );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 81/315 Bluetooth: L2CAP: Fix possible crash on l2cap_ecred_conn_rsp
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit 41c2713b204e6cb6a94587bc6bf6935107df5479 ]
If dcid is received for an already-assigned destination CID the spec requires that both channels to be discarded, but calling l2cap_chan_del may invalidate the tmp cursor created by list_for_each_entry_safe and in fact it is the wrong procedure as the chan->dcid may be assigned previously it really needs to be disconnected.
Calling l2cap_chan_clone directly may still lead to l2cap_chan_del so instead schedule l2cap_chan_timeout with delay 0 to close the channel asynchronously.
--- net/bluetooth/l2cap_core.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-)
net/bluetooth/l2cap_core.c +22 -5
@@ -5268,6 +5268,7 @@ static inline int l2cap_ecred_conn_rsp(struct l2cap_conn *conn, cmd_len -=sizeof (*rsp);list_for_each_entry_safe (chan, tmp, &conn->chan_l, list) { +struct l2cap_chan *orig;u16 dcid; if (chan->ident != cmd->ident ||
@@ -5289,8 +5290,10 @@ static inline int l2cap_ecred_conn_rsp(struct l2cap_conn *conn,BT_DBG ("dcid[%d] 0x%4.4x" , i, dcid); + orig =__l2cap_get_chan_by_dcid (conn, dcid); +/* Check if dcid is already in use */ -if (dcid &&__l2cap_get_chan_by_dcid (conn, dcid)) { +if (dcid && orig) {/* If a device receives a * L2CAP_CREDIT_BASED_CONNECTION_RSP packet with an * already-assigned Destination CID, then both the
@@ -5299,10 +5302,24 @@ static inline int l2cap_ecred_conn_rsp(struct l2cap_conn *conn,*/ l2cap_chan_del (chan,ECONNREFUSED );l2cap_chan_unlock (chan); - chan =__l2cap_get_chan_by_dcid (conn, dcid); -l2cap_chan_lock (chan); -l2cap_chan_del (chan,ECONNRESET ); -l2cap_chan_unlock (chan); + +/* Check that the dcid channel mode is +* L2CAP_MODE_EXT_FLOWCTL since this procedure is only +* valid for that mode and shouldn't disconnect a dcid +* in other modes. +*/ +if (orig->mode ==L2CAP_MODE_EXT_FLOWCTL ) { +l2cap_chan_lock (orig); +/* Disconnect the original channel as it may be +* considered connected since dcid has already +* been assigned; don't call l2cap_chan_close +* directly since that could lead to +* l2cap_chan_del and then removing the channel +* from the list while we're iterating over it. +*/ +__set_chan_timer (orig,0 ); +l2cap_chan_unlock (orig); + }continue ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 82/315 Bluetooth: hci_sync: Set HCI_CMD_DRAIN_WORKQUEUE during device close
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heitor Alves de Siqueira <[email protected]>
[ Upstream commit 525daaea459fc215f432de1b8debbd9144bf97b0 ]
Since hci_dev_close_sync() can now be called during the reset path, we should also set HCI_CMD_DRAIN_WORKQUEUE. This avoids queuing timeouts while the hdev workqueue is being drained.
--- net/bluetooth/hci_sync.c | 8 ++++++++ 1 file changed, 8 insertions(+)
net/bluetooth/hci_sync.c +8 -0
@@ -5246,6 +5246,12 @@ int hci_dev_close_sync(struct hci_dev *hdev)bt_dev_dbg (hdev,"" ); +/* Set HCI_DRAIN_WORKQUEUE flag to prevent queuing work during +* reset/close. See hci_cmd_work() and handle_cmd_cnt_and_timer(). +*/ +hci_dev_set_flag (hdev,HCI_CMD_DRAIN_WORKQUEUE ); +synchronize_rcu (); +if (hci_dev_test_flag (hdev,HCI_UNREGISTER )) {disable_delayed_work (&hdev->power_off);disable_delayed_work (&hdev->ncmd_timer);
@@ -5269,6 +5275,7 @@ int hci_dev_close_sync(struct hci_dev *hdev)if (!test_and_clear_bit (HCI_UP , &hdev->flags)) {cancel_delayed_work_sync (&hdev->cmd_timer); +hci_dev_clear_flag (hdev,HCI_CMD_DRAIN_WORKQUEUE );return err; }
@@ -5368,6 +5375,7 @@ int hci_dev_close_sync(struct hci_dev *hdev)/* Clear flags */ hdev->flags &=BIT (HCI_RAW );hci_dev_clear_volatile_flags (hdev); +hci_dev_clear_flag (hdev,HCI_CMD_DRAIN_WORKQUEUE );memset (hdev->eir,0 ,sizeof (hdev->eir));memset (hdev->dev_class,0 ,sizeof (hdev->dev_class));
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 83/315 Bluetooth: hci_sync: Reset device counters in hci_dev_close_sync()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heitor Alves de Siqueira <[email protected]>
[ Upstream commit cdf88b35e06f1b385f7f6228060ae541d44fbb72 ]
Before resetting or closing the device, protocol counters should also be zeroed.
--- net/bluetooth/hci_sync.c | 4 ++++ 1 file changed, 4 insertions(+)
net/bluetooth/hci_sync.c +4 -0
@@ -5338,6 +5338,10 @@ int hci_dev_close_sync(struct hci_dev *hdev)/* Reset device */ skb_queue_purge (&hdev->cmd_q);atomic_set (&hdev->cmd_cnt,1 ); + hdev->acl_cnt =0 ; + hdev->sco_cnt =0 ; + hdev->le_cnt =0 ; + hdev->iso_cnt =0 ;if (hci_test_quirk (hdev,HCI_QUIRK_RESET_ON_CLOSE ) && !auto_off && !hci_dev_test_flag (hdev,HCI_UNCONFIGURED )) {set_bit (HCI_INIT , &hdev->flags);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 84/315 gpio: adnp: fix flow control regression caused by scoped_guard()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bartosz Golaszewski <[email protected]>
[ Upstream commit a5c627d90809b793fc053849b3a00609db305776 ]
scoped_guard() is implemented as a for loop. Using it to protect code using the continue statement changes the flow as we now only break out of the hidden loop inside scoped_guard(), not the original for loop. Use a regular code block instead.
--- drivers/gpio/gpio-adnp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpio/gpio-adnp.c +3 -1
@@ -237,7 +237,9 @@ static irqreturn_t adnp_irq(int irq, void *data)unsigned long pending;int err; - scoped_guard(mutex, &adnp->i2c_lock) { + { +guard (mutex)(&adnp->i2c_lock); + err =adnp_read (adnp,GPIO_PLR (adnp) + i, &level);if (err <0 )continue ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 85/315 gpio: virtuser: Fix uninitialized data bug in gpio_virtuser_direction_do_write()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 8a122b5e72cc0043705f0d524bcd15f0c0b3ec15 ]
If *ppos is non-zero (user-space write split over multiple calls to write()) then simple_write_to_buffer() won't initialize the start of the buffer. Really, non-zero values for *ppos aren't going to work at all. Check for that and return -EINVAL at the start of the function.
--- drivers/gpio/gpio-virtuser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpio/gpio-virtuser.c +2 -2
@@ -399,7 +399,7 @@ static ssize_t gpio_virtuser_direction_do_write(struct file *file,char buf[32 ], *trimmed;int ret, dir, val =0 ; -if (count >=sizeof (buf)) +if (*ppos !=0 || count >=sizeof (buf))return -EINVAL ; ret =simple_write_to_buffer (buf,sizeof (buf) -1 , ppos, user_buf, count);
@@ -626,7 +626,7 @@ static ssize_t gpio_virtuser_consumer_write(struct file *file,char buf[GPIO_VIRTUSER_NAME_BUF_LEN +2 ];int ret; -if (count >=sizeof (buf)) +if (*ppos !=0 || count >=sizeof (buf))return -EINVAL ; ret = simple_write_to_buffer(buf, GPIO_VIRTUSER_NAME_BUF_LEN, ppos,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 86/315 gpio: rockchip: convert bank->clk to devm_clk_get_enabled()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marco Scardovi <[email protected]>
[ Upstream commit 3e46c18d5d87f063a93ae0fe7662fbf6660459d5 ]
The bank->clk was previously obtained via of_clk_get() and manually prepared/enabled. However, it was missing a corresponding clk_put() in both the error paths and the remove function, leading to a reference leak.
Convert the allocation to devm_clk_get_enabled(), which also properly propagates failures from clk_prepare_enable() that were previously ignored.
The GPIO bank device uses the same OF node as the previous of_clk_get() call, so devm_clk_get_enabled(dev, NULL) correctly resolves the same clock provider entry.
Fix the reference leak and simplify the code by removing the manual clk_disable_unprepare() calls in the probe error paths and in the remove function.
--- drivers/gpio/gpio-rockchip.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpio/gpio-rockchip.c +1 -5
@@ -656,11 +656,10 @@ static int rockchip_get_bank_data(struct rockchip_pin_bank *bank)if (!bank->irq)return -EINVAL ; - bank->clk =of_clk_get (bank->of_node,0 ); + bank->clk =devm_clk_get_enabled (bank->dev,NULL );if (IS_ERR (bank->clk))return PTR_ERR (bank->clk); -clk_prepare_enable (bank->clk); id =readl (bank->reg_base + gpio_regs_v2.version_id);switch (id) {
@@ -672,7 +671,6 @@ static int rockchip_get_bank_data(struct rockchip_pin_bank *bank) bank->db_clk =of_clk_get (bank->of_node,1 );if (IS_ERR (bank->db_clk)) {dev_err (bank->dev,"cannot find debounce clk\n" ); -clk_disable_unprepare (bank->clk);return -EINVAL ; }break ;
@@ -751,7 +749,6 @@ static int rockchip_gpio_probe(struct platform_device *pdev) ret =rockchip_gpiolib_register (bank);if (ret) { -clk_disable_unprepare (bank->clk);mutex_unlock (&bank->deferred_lock);return ret; }
@@ -792,7 +789,6 @@ static void rockchip_gpio_remove(struct platform_device *pdev) {struct rockchip_pin_bank *bank =platform_get_drvdata (pdev); -clk_disable_unprepare (bank->clk);gpiochip_remove (&bank->gpio_chip); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 87/315 gpio: rockchip: teardown bugs and resource leaks
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marco Scardovi <[email protected]>
[ Upstream commit 9500077678230e36d22bf16d2b9539c13e59a801 ]
Address several teardown issues and resource leaks in the driver's remove path and error handling:
1. Debounce clock reference leak: The debounce clock (bank->db_clk) is obtained using of_clk_get() which increments the clock's reference count, but clk_put() is never called. Register a devm action to cleanly release it on unbind. Note that of_clk_get(..., 1) remains necessary over devm_clk_get() because the DT binding does not define clock-names, precluding name-based lookup.
2. Unregistered chained IRQ handler: The chained IRQ handler is not disconnected in remove(). If a stray interrupt fires after the driver is removed, the kernel attempts to execute a stale handler, leading to a panic. Fix this by clearing the handler in remove().
3. IRQ domain leak: The linear IRQ domain and its generic chips are allocated manually during probe but never removed. Remove the IRQ domain during driver teardown to free the associated generic chips and mappings.
--- drivers/gpio/gpio-rockchip.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
drivers/gpio/gpio-rockchip.c +16 -1
@@ -638,10 +638,17 @@ static int rockchip_gpiolib_register(struct rockchip_pin_bank *bank)return ret; } +static void rockchip_clk_put (void *data) +{ +struct clk *clk = data; + +clk_put (clk); +} +static int rockchip_get_bank_data (struct rockchip_pin_bank *bank) {struct resource res; -int id =0 ; +int id =0 , ret;if (of_address_to_resource (bank->of_node,0 , &res)) {dev_err (bank->dev,"cannot find IO resource for bank\n" );
@@ -673,6 +680,11 @@ static int rockchip_get_bank_data(struct rockchip_pin_bank *bank)dev_err (bank->dev,"cannot find debounce clk\n" );return -EINVAL ; } + + ret =devm_add_action_or_reset (bank->dev, rockchip_clk_put, + bank->db_clk); +if (ret) +return ret;break ;case GPIO_TYPE_V1 : bank->gpio_regs = &gpio_regs_v1;
@@ -789,6 +801,9 @@ static void rockchip_gpio_remove(struct platform_device *pdev) {struct rockchip_pin_bank *bank =platform_get_drvdata (pdev); +irq_set_chained_handler_and_data (bank->irq,NULL ,NULL ); +if (bank->domain) +irq_domain_remove (bank->domain);gpiochip_remove (&bank->gpio_chip); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 88/315 net: mana: Add NULL guards in teardown path to prevent panic on attach failure
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dipayaan Roy <[email protected]>
[ Upstream commit 17bfe0a8c014ee1d542ad352cd6a0a505361664a ]
When queue allocation fails partway through, the error cleanup frees and NULLs apc->tx_qp and apc->rxqs. Multiple teardown paths such as mana_remove(), mana_change_mtu() recovery, and internal error handling in mana_alloc_queues() can subsequently call into functions that dereference these pointers without NULL checks:
- mana_chn_setxdp() dereferences apc->rxqs[0], causing a NULL pointer dereference panic (CR2: 0000000000000000 at mana_chn_setxdp+0x26).
- mana_destroy_vport() iterates apc->rxqs without a NULL check.
- mana_fence_rqs() iterates apc->rxqs without a NULL check.
- mana_dealloc_queues() iterates apc->tx_qp without a NULL check.
Add NULL guards for apc->rxqs in mana_fence_rqs(), mana_destroy_vport(), and before the mana_chn_setxdp() call. Add a NULL guard for apc->tx_qp in mana_dealloc_queues() to skip TX queue draining when TX queues were never allocated or already freed.
--- drivers/net/ethernet/microsoft/mana/mana_en.c | 70 +++++++++++-------- 1 file changed, 41 insertions(+), 29 deletions(-)
drivers/net/ethernet/microsoft/mana/mana_en.c +41 -29
@@ -1720,6 +1720,9 @@ static void mana_fence_rqs(struct mana_port_context *apc)struct mana_rxq *rxq;int err; +if (!apc->rxqs) +return ; +for (rxq_idx =0 ; rxq_idx < apc->num_queues; rxq_idx++) { rxq = apc->rxqs[rxq_idx]; err =mana_fence_rq (apc, rxq);
@@ -2830,13 +2833,16 @@ static void mana_destroy_vport(struct mana_port_context *apc)struct mana_rxq *rxq;u32 rxq_idx; -for (rxq_idx =0 ; rxq_idx < apc->num_queues; rxq_idx++) { - rxq = apc->rxqs[rxq_idx]; -if (!rxq) -continue ; +if (apc->rxqs) { -mana_destroy_rxq (apc, rxq, true); - apc->rxqs[rxq_idx] =NULL ; +for (rxq_idx =0 ; rxq_idx < apc->num_queues; rxq_idx++) { + rxq = apc->rxqs[rxq_idx]; +if (!rxq) +continue ; + +mana_destroy_rxq (apc, rxq, true); + apc->rxqs[rxq_idx] =NULL ; + } }mana_destroy_txq (apc);
@@ -3241,7 +3247,8 @@ static int mana_dealloc_queues(struct net_device *ndev)if (apc->port_is_up)return -EINVAL ; -mana_chn_setxdp (apc,NULL ); +if (apc->rxqs) +mana_chn_setxdp (apc,NULL );if (gd->gdma_context->is_pf && !apc->ac->bm_hostmode)mana_pf_deregister_filter (apc);
@@ -3259,33 +3266,38 @@ static int mana_dealloc_queues(struct net_device *ndev)* number of queues. */ -for (i =0 ; i < apc->num_queues; i++) { - txq = &apc->tx_qp[i].txq; - tsleep =1000 ; -while (atomic_read (&txq->pending_sends) >0 && -time_before (jiffies, timeout)) { -usleep_range (tsleep, tsleep +1000 ); - tsleep <<=1 ; - } -if (atomic_read (&txq->pending_sends)) { - err =pcie_flr (to_pci_dev (gd->gdma_context->dev)); -if (err) { -netdev_err (ndev,"flr failed %d with %d pkts pending in txq %u\n" , - err,atomic_read (&txq->pending_sends), - txq->gdma_txq_id); +if (apc->tx_qp) { +for (i =0 ; i < apc->num_queues; i++) { + txq = &apc->tx_qp[i].txq; + tsleep =1000 ; +while (atomic_read (&txq->pending_sends) >0 && +time_before (jiffies, timeout)) { +usleep_range (tsleep, tsleep +1000 ); + tsleep <<=1 ; + } +if (atomic_read (&txq->pending_sends)) { + err = +pcie_flr (to_pci_dev (gd->gdma_context->dev)); +if (err) { +netdev_err (ndev,"flr failed %d with %d pkts pending in txq %u\n" , + err, +atomic_read (&txq->pending_sends), + txq->gdma_txq_id); + } +break ; } -break ; } - } -for (i =0 ; i < apc->num_queues; i++) { - txq = &apc->tx_qp[i].txq; -while ((skb =skb_dequeue (&txq->pending_skbs))) { -mana_unmap_skb (skb, apc); -dev_kfree_skb_any (skb); +for (i =0 ; i < apc->num_queues; i++) { + txq = &apc->tx_qp[i].txq; +while ((skb =skb_dequeue (&txq->pending_skbs))) { +mana_unmap_skb (skb, apc); +dev_kfree_skb_any (skb); + } +atomic_set (&txq->pending_sends,0 ); } -atomic_set (&txq->pending_sends,0 ); } +/* We're 100% sure the queues can no longer be woken up, because * we're sure now mana_poll_tx_cq() can't be running. */
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 89/315 net: mana: Skip redundant detach on already-detached port
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dipayaan Roy <[email protected]>
[ Upstream commit 5b05aa36ee24297d7296ca58dfd8c448d0e4cda3 ]
When mana_per_port_queue_reset_work_handler() runs after a previous detach succeeded but attach failed, the port is left in a detached state with apc->tx_qp and apc->rxqs already freed. Calling mana_detach() again unconditionally leads to NULL pointer dereferences during queue teardown.
Add an early exit in mana_detach() when the port is already in detached state (!netif_device_present) for non-close callers, making it safe to call idempotently. This allows the queue reset handler and other recovery paths to simply retry mana_attach() without redundant teardown.
--- drivers/net/ethernet/microsoft/mana/mana_en.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/ethernet/microsoft/mana/mana_en.c +6 -0
@@ -3322,6 +3322,12 @@ int mana_detach(struct net_device *ndev, bool from_close)ASSERT_RTNL (); +/* If already detached (indicates detach succeeded but attach failed +* previously). Now skip mana detach and just retry mana_attach. +*/ +if (!from_close && !netif_device_present (ndev)) +return 0 ; + apc->port_st_save = apc->port_is_up; apc->port_is_up = false;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 90/315 sctp: fix race between sctp_wait_for_connect and peeloff
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhenghang Xiao <[email protected]>
[ Upstream commit f14fe6395a8b3d961a61e138ad7b36ba3626dd4e ]
sctp_wait_for_connect() drops and re-acquires the socket lock while waiting for the association to reach ESTABLISHED state. During this window, another thread can peeloff the association to a new socket via getsockopt(SCTP_SOCKOPT_PEELOFF), changing asoc->base.sk. After re-acquiring the old socket lock, sctp_wait_for_connect() returns success without noticing the migration — the caller then accesses the association under the wrong lock in sctp_datamsg_from_user().
Add the same sk != asoc->base.sk check that sctp_wait_for_sndbuf() already has, returning an error if the association was migrated while we slept.
--- net/sctp/socket.c | 2 ++ 1 file changed, 2 insertions(+)
net/sctp/socket.c +2 -0
@@ -9350,6 +9350,8 @@ static int sctp_wait_for_connect(struct sctp_association *asoc, long *timeo_p)release_sock (sk); current_timeo =schedule_timeout (current_timeo);lock_sock (sk); +if (sk != asoc->base.sk) + goto do_error; *timeo_p = current_timeo; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 91/315 vsock/virtio: bind uarg before filling zerocopy skb
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jingguo Tan <[email protected]>
[ Upstream commit 1e584c304cfb94a759417130b1fc6d30b30c4cce ]
virtio_transport_send_pkt_info() allocates or reuses the zerocopy uarg before entering the send loop, but virtio_transport_alloc_skb() still fills the skb before it inherits that uarg. When fixed-buffer vectored zerocopy hits MAX_SKB_FRAGS, io_sg_from_iter() may partially attach managed frags and return -EMSGSIZE. The rollback path call kfree_skb() to free an skb that carries SKBFL_MANAGED_FRAG_REFS but no uarg, so skb_release_data() falls through to ordinary frag unref.
Pass the uarg into virtio_transport_alloc_skb() and bind it immediately before virtio_transport_fill_skb(). This keeps control or no-payload skbs untouched while ensuring success and rollback share one lifetime rule.
--- net/vmw_vsock/virtio_transport_common.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
net/vmw_vsock/virtio_transport_common.c +9 -3
@@ -207,6 +207,7 @@ static u16 virtio_transport_get_type(struct sock *sk) static struct sk_buff *virtio_transport_alloc_skb(struct virtio_vsock_pkt_info *info, size_t payload_len, bool zcopy, + struct ubuf_info *uarg, u32 src_cid, u32 src_port, u32 dst_cid,
@@ -247,6 +248,12 @@ static struct sk_buff *virtio_transport_alloc_skb(struct virtio_vsock_pkt_info *if (info->msg && payload_len >0 ) {int err; +/* Bind the zerocopy lifetime before filling frags so error +* rollback frees managed fixed-buffer pages through +* the uarg-aware path. +*/ +skb_zcopy_set (skb, uarg,NULL ); + err =virtio_transport_fill_skb (skb, info, payload_len, zcopy);if (err) goto out;
@@ -366,6 +373,7 @@ static int virtio_transport_send_pkt_info(struct vsock_sock *vsk, skb_len =min (max_skb_len, rest_len); skb =virtio_transport_alloc_skb (info, skb_len, can_zcopy, + uarg, src_cid, src_port, dst_cid, dst_port);if (!skb) {
@@ -373,8 +381,6 @@ static int virtio_transport_send_pkt_info(struct vsock_sock *vsk,break ; } -skb_zcopy_set (skb, uarg,NULL ); -virtio_transport_inc_tx_pkt (vvs, skb); ret = t_ops->send_pkt (skb);
@@ -1161,7 +1167,7 @@ static int virtio_transport_reset_no_sock(const struct virtio_transport *t,if (!t)return -ENOTCONN ; - reply = virtio_transport_alloc_skb(&info, 0, false, + reply = virtio_transport_alloc_skb(&info, 0, false, NULL, le64_to_cpu(hdr->dst_cid), le32_to_cpu(hdr->dst_port), le64_to_cpu(hdr->src_cid),
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 92/315 ipv6: fix possible infinite loop in rt6_fill_node()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiayuan Chen <[email protected]>
[ Upstream commit 9f72412bcf60144f252b0d6205106abf14344abc ]
Sashiko reported this issue [1]. Apply the same fix as
commit f8d8ce1b515a ("ipv6: fix possible infinite loop in fib6_info_uses_dev()").
Writers holding tb6_lock can list_del_rcu(&rt->fib6_siblings) without waiting for RCU readers; rt->fib6_siblings.next then still points into the old ring and this softirq-side walker never reaches &rt->fib6_siblings, causing a CPU stall. fib6_del_route() always WRITE_ONCE()s rt->fib6_nsiblings to 0 before list_del_rcu(), so an inside-loop check is a reliable detach signal.
[1] https://sashiko.dev/#/patchset/20260526020227.4857-1-jiayuan.chen%40linux.dev
--- net/ipv6/route.c | 2 ++ 1 file changed, 2 insertions(+)
net/ipv6/route.c +2 -0
@@ -5892,6 +5892,8 @@ static int rt6_fill_node(struct net *net, struct sk_buff *skb, goto nla_put_failure; } +if (!READ_ONCE (rt->fib6_nsiblings)) +break ; }rcu_read_unlock ();
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 93/315 ipv6: fix possible infinite loop in fib6_select_path()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiayuan Chen <[email protected]>
[ Upstream commit 9c7da87c2dc860bb17ca1ece942495d28b1ce3b9 ]
Found while auditing the same pattern Sashiko reported in rt6_fill_node() [1]. Apply the same fix as
commit f8d8ce1b515a ("ipv6: fix possible infinite loop in fib6_info_uses_dev()").
Writers holding tb6_lock can list_del_rcu(&first->fib6_siblings) without waiting for RCU readers; first->fib6_siblings.next then still points into the old ring and this softirq-side walker never reaches &first->fib6_siblings as its terminator. fib6_purge_rt() always WRITE_ONCE()s first->fib6_nsiblings to 0 before list_del_rcu(), so an inside-loop check is a reliable detach signal.
[1] https://sashiko.dev/#/patchset/20260526020227.4857-1-jiayuan.chen%40linux.dev
--- net/ipv6/route.c | 3 +++ 1 file changed, 3 insertions(+)
net/ipv6/route.c +3 -0
@@ -481,6 +481,9 @@ void fib6_select_path(const struct net *net, struct fib6_result *res,const struct fib6_nh *nh = sibling->fib6_nh;int nh_upper_bound; +if (!READ_ONCE (first->fib6_nsiblings)) +break ; + nh_upper_bound =atomic_read (&nh->fib_nh_upper_bound);if (hash > nh_upper_bound)continue ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 94/315 net: skbuff: fix pskb_carve leaking zcopy pages
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pavel Begunkov <[email protected]>
[ Upstream commit ff6e798c2eac3ebd0501ad7e796f583fab928de8 ]
When SKBFL_MANAGED_FRAG_REFS is set, frag pages are not refcounted but their lifetime is controlled by the attached ubuf_info. To make a copy of the skb_shared_info, we either should clear the flag and reference the frags, or keep the flag and have frags unreferenced.
pskb_carve_inside_header() and pskb_carve_inside_nonlinear() don't follow the rule and thus can leak page references. Let's clear SKBFL_MANAGED_FRAG_REFS from the original skb to fix it. It's the simplest way to address it, but there are more performant ways to do that if it ever becomes a problem.
--- net/core/skbuff.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
net/core/skbuff.c +10 -0
@@ -6772,6 +6772,11 @@ static int pskb_carve_inside_header(struct sk_buff *skb, const u32 off,skb_copy_from_linear_data_offset (skb, off, data, new_hlen); skb->len -= off; +/* Remove SKBFL_MANAGED_FRAG_REFS instead of trying to honour it +* while refcounting frags below. +*/ +skb_zcopy_downgrade_managed (skb); + memcpy((struct skb_shared_info *)(data + size), skb_shinfo(skb), offsetof(struct skb_shared_info,
@@ -6883,6 +6888,11 @@ static int pskb_carve_inside_nonlinear(struct sk_buff *skb, const u32 off,return -ENOMEM ; size =SKB_WITH_OVERHEAD (size); +/* Remove SKBFL_MANAGED_FRAG_REFS instead of trying to honour it +* while refcounting frags below. +*/ +skb_zcopy_downgrade_managed (skb); +memcpy ((struct skb_shared_info *)(data + size), skb_shinfo(skb), offsetof(struct skb_shared_info, frags[0]));if (skb_orphan_frags (skb, gfp_mask)) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 95/315 media: rc: fix race between unregister and urb/irq callbacks
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Young <[email protected]>
[ Upstream commit dccc0c3ddf8f16071736f98a7d6dd46a2d43e037 ]
Some rc device drivers have a race condition between rc_unregister_device() and irq or urb callbacks. This is because rc_unregister_device() does two things, it marks the device as unregistered so no new commands can be issued and then it calls rc_free_device(). This means the driver has no chance to cancel any pending urb callbacks or interrupts after the device has been marked as unregistered. Those callbacks may access struct rc_dev or its members (e.g. struct ir_raw_event_ctrl), which have been freed by rc_free_device().
This change removes the implicit call to rc_free_device() from rc_unregister_device(). This means that device drivers can call rc_unregister_device() in their remove or disconnect function, then cancel all the urbs and interrupts before explicitly calling rc_free_device().
Note this is an alternative fix for an issue found by Haotian Zhang, see the Closes: tags.
Stable-dep-of: 646ebdd31058 ("media: rc: ttusbir: fix inverted error logic")
--- drivers/gpu/drm/bridge/sil-sii8620.c | 1 + drivers/hid/hid-picolcd_cir.c | 1 + drivers/media/cec/core/cec-core.c | 2 +- drivers/media/common/siano/smsir.c | 1 + drivers/media/i2c/ir-kbd-i2c.c | 2 ++ drivers/media/pci/bt8xx/bttv-input.c | 3 ++- drivers/media/pci/cx23885/cx23885-input.c | 1 + drivers/media/pci/cx88/cx88-input.c | 3 ++- drivers/media/pci/dm1105/dm1105.c | 1 + drivers/media/pci/mantis/mantis_input.c | 1 + drivers/media/pci/saa7134/saa7134-input.c | 1 + drivers/media/pci/smipcie/smipcie-ir.c | 1 + drivers/media/pci/ttpci/budget-ci.c | 1 + drivers/media/rc/ati_remote.c | 6 +++--- drivers/media/rc/ene_ir.c | 2 +- drivers/media/rc/fintek-cir.c | 3 ++- drivers/media/rc/igorplugusb.c | 1 + drivers/media/rc/iguanair.c | 1 + drivers/media/rc/img-ir/img-ir-hw.c | 3 ++- drivers/media/rc/img-ir/img-ir-raw.c | 3 ++- drivers/media/rc/imon.c | 3 ++- drivers/media/rc/ir-hix5hd2.c | 2 +- drivers/media/rc/ir_toy.c | 1 + drivers/media/rc/ite-cir.c | 2 +- drivers/media/rc/mceusb.c | 1 + drivers/media/rc/rc-ir-raw.c | 5 ----- drivers/media/rc/rc-loopback.c | 1 + drivers/media/rc/rc-main.c | 6 +----- drivers/media/rc/redrat3.c | 4 +++- drivers/media/rc/st_rc.c | 2 +- drivers/media/rc/streamzap.c | 7 ++++--- drivers/media/rc/sunxi-cir.c | 1 + drivers/media/rc/ttusbir.c | 2 +- drivers/media/rc/winbond-cir.c | 2 +- drivers/media/rc/xbox_remote.c | 5 +++-- drivers/media/usb/au0828/au0828-input.c | 1 + drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 1 + drivers/media/usb/dvb-usb/dvb-usb-remote.c | 6 ++++-- drivers/media/usb/em28xx/em28xx-input.c | 1 + drivers/staging/media/av7110/av7110_ir.c | 1 + include/media/rc-core.h | 2 -- 41 files changed, 58 insertions(+), 36 deletions(-)
drivers/gpu/drm/bridge/sil-sii8620.c +1 -0
@@ -2221,6 +2221,7 @@ static void sii8620_detach(struct drm_bridge *bridge)return ;rc_unregister_device (ctx->rc_dev); +rc_free_device (ctx->rc_dev); } static int sii8620_is_packing_required(struct sii8620 *ctx,
drivers/hid/hid-picolcd_cir.c +1 -0
@@ -134,5 +134,6 @@ void picolcd_exit_cir(struct picolcd_data *data) data->rc_dev =NULL ;rc_unregister_device (rdev); +rc_free_device (rdev); }
drivers/media/cec/core/cec-core.c +1 -1
@@ -338,8 +338,8 @@ int cec_register_adapter(struct cec_adapter *adap, res =cec_devnode_register (&adap->devnode, adap->owner);if (res) {#ifdef CONFIG_MEDIA_CEC_RC -/* Note: rc_unregister also calls rc_free */ rc_unregister_device (adap->rc); +rc_free_device (adap->rc); adap->rc =NULL ;#endif return res;
drivers/media/common/siano/smsir.c +1 -0
@@ -92,6 +92,7 @@ int sms_ir_init(struct smscore_device_t *coredev)void sms_ir_exit (struct smscore_device_t *coredev) {rc_unregister_device (coredev->ir.dev); +rc_free_device (coredev->ir.dev);pr_debug ("\n" ); }
drivers/media/i2c/ir-kbd-i2c.c +2 -0
@@ -355,6 +355,7 @@ static void ir_work(struct work_struct *work)mutex_unlock (&ir->lock);if (rc == -ENODEV ) {rc_unregister_device (ir->rc); +rc_free_device (ir->rc); ir->rc =NULL ;return ; }
@@ -972,6 +973,7 @@ static void ir_remove(struct i2c_client *client)i2c_unregister_device (ir->tx_c);rc_unregister_device (ir->rc); +rc_free_device (ir->rc); }static const struct i2c_device_id ir_kbd_id[] = {
drivers/media/pci/bt8xx/bttv-input.c +2 -1
@@ -572,8 +572,9 @@ void bttv_input_fini(struct bttv *btv)if (btv->remote ==NULL )return ; -bttv_ir_stop (btv);rc_unregister_device (btv->remote->dev); +bttv_ir_stop (btv); +rc_free_device (btv->remote->dev);kfree (btv->remote); btv->remote =NULL ; }
drivers/media/pci/cx23885/cx23885-input.c +1 -0
@@ -402,6 +402,7 @@ void cx23885_input_fini(struct cx23885_dev *dev)if (dev->kernel_ir ==NULL )return ;rc_unregister_device (dev->kernel_ir->rc); +rc_free_device (dev->kernel_ir->rc);kfree (dev->kernel_ir->phys);kfree (dev->kernel_ir->name);kfree (dev->kernel_ir);
drivers/media/pci/cx88/cx88-input.c +2 -1
@@ -509,8 +509,9 @@ int cx88_ir_fini(struct cx88_core *core)if (!ir)return 0 ; -cx88_ir_stop (core);rc_unregister_device (ir->dev); +cx88_ir_stop (core); +rc_free_device (ir->dev);kfree (ir);/* done */
drivers/media/pci/dm1105/dm1105.c +1 -0
@@ -763,6 +763,7 @@ static int dm1105_ir_init(struct dm1105_dev *dm1105)static void dm1105_ir_exit (struct dm1105_dev *dm1105) {rc_unregister_device (dm1105->ir.dev); +rc_free_device (dm1105->ir.dev); }static int dm1105_hw_init (struct dm1105_dev *dev)
drivers/media/pci/mantis/mantis_input.c +1 -0
@@ -72,5 +72,6 @@ EXPORT_SYMBOL_GPL(mantis_input_init);void mantis_input_exit (struct mantis_pci *mantis) {rc_unregister_device (mantis->rc); +rc_free_device (mantis->rc); }EXPORT_SYMBOL_GPL (mantis_input_exit);
drivers/media/pci/saa7134/saa7134-input.c +1 -0
@@ -834,6 +834,7 @@ void saa7134_input_fini(struct saa7134_dev *dev)return ;rc_unregister_device (dev->remote->dev); +rc_free_device (dev->remote->dev);kfree (dev->remote); dev->remote =NULL ; }
drivers/media/pci/smipcie/smipcie-ir.c +1 -0
@@ -181,5 +181,6 @@ void smi_ir_exit(struct smi_dev *dev)rc_unregister_device (rc_dev);smi_ir_stop (ir); +rc_free_device (rc_dev); ir->rc_dev =NULL ; }
drivers/media/pci/ttpci/budget-ci.c +1 -0
@@ -249,6 +249,7 @@ static void msp430_ir_deinit(struct budget_ci *budget_ci)cancel_work_sync (&budget_ci->ir.msp430_irq_bh_work);rc_unregister_device (budget_ci->ir.dev); +rc_free_device (budget_ci->ir.dev); }static int ciintf_read_attribute_mem (struct dvb_ca_en50221 *ca,int slot,int address)
drivers/media/rc/ati_remote.c +3 -3
@@ -921,7 +921,6 @@ static int ati_remote_probe(struct usb_interface *interface,input_free_device (input_dev); exit_unregister_device:rc_unregister_device (rc_dev); - rc_dev =NULL ; exit_kill_urbs:usb_kill_urb (ati_remote->irq_urb);usb_kill_urb (ati_remote->out_urb);
@@ -941,18 +940,19 @@ static void ati_remote_disconnect(struct usb_interface *interface)struct ati_remote *ati_remote; ati_remote =usb_get_intfdata (interface); -usb_set_intfdata (interface,NULL );if (!ati_remote) {dev_warn (&interface->dev,"%s - null device?\n" , __func__);return ; } +rc_unregister_device (ati_remote->rdev); +usb_set_intfdata (interface,NULL );usb_kill_urb (ati_remote->irq_urb);usb_kill_urb (ati_remote->out_urb);if (ati_remote->idev)input_unregister_device (ati_remote->idev); -rc_unregister_device (ati_remote->rdev);ati_remote_free_buffers (ati_remote); +rc_free_device (ati_remote->rdev);kfree (ati_remote); }
drivers/media/rc/ene_ir.c +1 -1
@@ -1090,7 +1090,6 @@ static int ene_probe(struct pnp_dev *pnp_dev, const struct pnp_device_id *id)release_region (dev->hw_io,ENE_IO_SIZE ); exit_unregister_device:rc_unregister_device (rdev); - rdev =NULL ; exit_free_dev_rdev:rc_free_device (rdev);kfree (dev);
@@ -1110,6 +1109,7 @@ static void ene_remove(struct pnp_dev *pnp_dev)ene_rx_restore_hw_buffer (dev);spin_unlock_irqrestore (&dev->hw_lock, flags); +rc_free_device (dev->rdev);free_irq (dev->irq, dev);release_region (dev->hw_io,ENE_IO_SIZE );kfree (dev);
drivers/media/rc/fintek-cir.c +2 -1
@@ -568,6 +568,7 @@ static void fintek_remove(struct pnp_dev *pdev)struct fintek_dev *fintek =pnp_get_drvdata (pdev);unsigned long flags; +rc_unregister_device (fintek->rdev);spin_lock_irqsave (&fintek->fintek_lock, flags);/* disable CIR */ fintek_disable_cir (fintek);
@@ -580,7 +581,7 @@ static void fintek_remove(struct pnp_dev *pdev)free_irq (fintek->cir_irq, fintek);release_region (fintek->cir_addr, fintek->cir_port_len); -rc_unregister_device (fintek->rdev); +rc_free_device (fintek->rdev);kfree (fintek); }
drivers/media/rc/igorplugusb.c +1 -0
@@ -247,6 +247,7 @@ static void igorplugusb_disconnect(struct usb_interface *intf)usb_set_intfdata (intf,NULL );usb_unpoison_urb (ir->urb);usb_free_urb (ir->urb); +rc_free_device (ir->rc);kfree (ir->buf_in);kfree (ir->request); }
drivers/media/rc/iguanair.c +1 -0
@@ -500,6 +500,7 @@ static void iguanair_disconnect(struct usb_interface *intf)usb_set_intfdata (intf,NULL );usb_kill_urb (ir->urb_in);usb_kill_urb (ir->urb_out); +rc_free_device (ir->rc);usb_free_urb (ir->urb_in);usb_free_urb (ir->urb_out);usb_free_coherent (ir->udev,MAX_IN_PACKET , ir->buf_in, ir->dma_in);
drivers/media/rc/img-ir/img-ir-hw.c +2 -1
@@ -1118,9 +1118,10 @@ void img_ir_remove_hw(struct img_ir_priv *priv)struct rc_dev *rdev = hw->rdev;if (!rdev)return ; +rc_unregister_device (rdev);img_ir_set_decoder (priv,NULL ,0 ); hw->rdev =NULL ; -rc_unregister_device (rdev); +rc_free_device (rdev);#ifdef CONFIG_COMMON_CLK if (!IS_ERR (priv->clk))clk_notifier_unregister (priv->clk, &hw->clk_nb);
drivers/media/rc/img-ir/img-ir-raw.c +2 -1
@@ -136,6 +136,7 @@ void img_ir_remove_raw(struct img_ir_priv *priv)if (!rdev)return ; +rc_unregister_device (rdev);/* switch off and disable raw (edge) interrupts */ spin_lock_irq (&priv->lock); raw->rdev =NULL ;
@@ -145,7 +146,7 @@ void img_ir_remove_raw(struct img_ir_priv *priv)img_ir_write (priv,IMG_IR_IRQ_CLEAR ,IMG_IR_IRQ_EDGE );spin_unlock_irq (&priv->lock); -rc_unregister_device (rdev); +rc_free_device (rdev);timer_delete_sync (&raw->timer); }
drivers/media/rc/imon.c +2 -1
@@ -2541,9 +2541,10 @@ static void imon_disconnect(struct usb_interface *interface)if (ifnum ==0 ) { ictx->dev_present_intf0 = false; +rc_unregister_device (ictx->rdev);usb_kill_urb (ictx->rx_urb_intf0);input_unregister_device (ictx->idev); -rc_unregister_device (ictx->rdev); +rc_free_device (ictx->rdev);if (ictx->display_supported) {if (ictx->display_type ==IMON_DISPLAY_TYPE_LCD )usb_deregister_dev (interface, &imon_lcd_class);
drivers/media/rc/ir-hix5hd2.c +1 -1
@@ -331,7 +331,6 @@ static int hix5hd2_ir_probe(struct platform_device *pdev) regerr:rc_unregister_device (rdev); - rdev =NULL ; clkerr:clk_disable_unprepare (priv->clock); err:
@@ -346,6 +345,7 @@ static void hix5hd2_ir_remove(struct platform_device *pdev)clk_disable_unprepare (priv->clock);rc_unregister_device (priv->rdev); +rc_free_device (priv->rdev); }#ifdef CONFIG_PM_SLEEP
drivers/media/rc/ir_toy.c +1 -0
@@ -536,6 +536,7 @@ static void irtoy_disconnect(struct usb_interface *intf)usb_free_urb (ir->urb_out);usb_kill_urb (ir->urb_in);usb_free_urb (ir->urb_in); +rc_free_device (ir->rc);kfree (ir->in);kfree (ir->out);kfree (ir);
drivers/media/rc/ite-cir.c +1 -1
@@ -1414,7 +1414,6 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_idrelease_region (itdev->cir_addr, itdev->params->io_region_size); exit_unregister_device:rc_unregister_device (rdev); - rdev =NULL ; exit_free_dev_rdev:rc_free_device (rdev);kfree (itdev);
@@ -1439,6 +1438,7 @@ static void ite_remove(struct pnp_dev *pdev)release_region (dev->cir_addr, dev->params->io_region_size);rc_unregister_device (dev->rdev); +rc_free_device (dev->rdev);kfree (dev); }
drivers/media/rc/mceusb.c +1 -0
@@ -1850,6 +1850,7 @@ static void mceusb_dev_disconnect(struct usb_interface *intf)usb_free_urb (ir->urb_in);usb_free_coherent (dev, ir->len_in, ir->buf_in, ir->dma_in);usb_put_dev (dev); +rc_free_device (ir->rc);kfree (ir); }
drivers/media/rc/rc-ir-raw.c +0 -5
@@ -648,9 +648,6 @@ int ir_raw_event_register(struct rc_dev *dev)void ir_raw_event_free (struct rc_dev *dev) { -if (!dev) -return ; -kfree (dev->raw); dev->raw =NULL ; }
@@ -674,8 +671,6 @@ void ir_raw_event_unregister(struct rc_dev *dev)lirc_bpf_free (dev); -ir_raw_event_free (dev); -/* * A user can be calling bpf(BPF_PROG_{QUERY|ATTACH|DETACH}), so * ensure that the raw member is null on unlock; this is how
drivers/media/rc/rc-loopback.c +1 -0
@@ -263,6 +263,7 @@ static int __init loop_init(void) static void __exit loop_exit(void) {rc_unregister_device (loopdev.dev); +rc_free_device (loopdev.dev); }module_init (loop_init);
drivers/media/rc/rc-main.c +1 -5
@@ -1611,6 +1611,7 @@ static void rc_dev_release(struct device *device) {struct rc_dev *dev =to_rc_dev (device); +ir_raw_event_free (dev);kfree (dev); }
@@ -1773,7 +1774,6 @@ struct rc_dev *devm_rc_allocate_device(struct device *dev, } rc->dev.parent = dev; - rc->managed_alloc = true; *dr = rc;devres_add (dev, dr);
@@ -2042,11 +2042,7 @@ void rc_unregister_device(struct rc_dev *dev)device_del (&dev->dev);ida_free (&rc_ida, dev->minor); - -if (!dev->managed_alloc) -rc_free_device (dev); } -EXPORT_SYMBOL_GPL (rc_unregister_device);/*
drivers/media/rc/redrat3.c +3 -1
@@ -1133,11 +1133,13 @@ static void redrat3_dev_disconnect(struct usb_interface *intf) {struct usb_device *udev =interface_to_usbdev (intf);struct redrat3_dev *rr3 =usb_get_intfdata (intf); +struct rc_dev *rc = rr3->rc;usb_set_intfdata (intf,NULL ); -rc_unregister_device (rr3->rc); +rc_unregister_device (rc);led_classdev_unregister (&rr3->led);redrat3_delete (rr3, udev); +rc_free_device (rc); }static int redrat3_dev_suspend (struct usb_interface *intf,pm_message_t message)
drivers/media/rc/st_rc.c +1 -1
@@ -203,6 +203,7 @@ static void st_rc_remove(struct platform_device *pdev)device_init_wakeup (&pdev->dev, false);clk_disable_unprepare (rc_dev->sys_clock);rc_unregister_device (rc_dev->rdev); +rc_free_device (rc_dev->rdev); }static int st_rc_open (struct rc_dev *rdev)
@@ -334,7 +335,6 @@ static int st_rc_probe(struct platform_device *pdev)return ret; rcerr:rc_unregister_device (rdev); - rdev =NULL ; clkerr:clk_disable_unprepare (rc_dev->sys_clock); err:
drivers/media/rc/streamzap.c +4 -3
@@ -392,15 +392,16 @@ static void streamzap_disconnect(struct usb_interface *interface)struct streamzap_ir *sz =usb_get_intfdata (interface);struct usb_device *usbdev =interface_to_usbdev (interface); -usb_set_intfdata (interface,NULL ); -if (!sz)return ; -usb_kill_urb (sz->urb_in);rc_unregister_device (sz->rdev); +usb_set_intfdata (interface,NULL ); + +usb_kill_urb (sz->urb_in);usb_free_urb (sz->urb_in);usb_free_coherent (usbdev, sz->buf_in_len, sz->buf_in, sz->dma_in); +rc_free_device (sz->rdev);kfree (sz); }
drivers/media/rc/sunxi-cir.c +1 -0
@@ -371,6 +371,7 @@ static void sunxi_ir_remove(struct platform_device *pdev)struct sunxi_ir *ir =platform_get_drvdata (pdev);rc_unregister_device (ir->rc); +rc_free_device (ir->rc);sunxi_ir_hw_exit (&pdev->dev); }
drivers/media/rc/ttusbir.c +1 -1
@@ -336,7 +336,6 @@ static int ttusbir_probe(struct usb_interface *intf,return 0 ; out3:rc_unregister_device (rc); - rc =NULL ; out2:led_classdev_unregister (&tt->led); out:
@@ -378,6 +377,7 @@ static void ttusbir_disconnect(struct usb_interface *intf)usb_kill_urb (tt->bulk_urb);usb_free_urb (tt->bulk_urb);kfree (tt->bulk_buffer); +rc_free_device (tt->rc);usb_set_intfdata (intf,NULL );kfree (tt); }
drivers/media/rc/winbond-cir.c +1 -1
@@ -1132,7 +1132,6 @@ wbcir_probe(struct pnp_dev *device, const struct pnp_device_id *dev_id)release_region (data->wbase,WAKEUP_IOMEM_LEN ); exit_unregister_device:rc_unregister_device (data->dev); - data->dev =NULL ; exit_free_rc:rc_free_device (data->dev); exit_unregister_led:
@@ -1163,6 +1162,7 @@ wbcir_remove(struct pnp_dev *device)wbcir_set_bits (data->wbase +WBCIR_REG_WCEIR_EV_EN ,0x00 ,0x07 );rc_unregister_device (data->dev); +rc_free_device (data->dev);led_classdev_unregister (&data->led);
drivers/media/rc/xbox_remote.c +3 -2
@@ -283,14 +283,15 @@ static void xbox_remote_disconnect(struct usb_interface *interface)struct xbox_remote *xbox_remote; xbox_remote =usb_get_intfdata (interface); -usb_set_intfdata (interface,NULL );if (!xbox_remote) {dev_warn (&interface->dev,"%s - null device?\n" , __func__);return ; } -usb_kill_urb (xbox_remote->irq_urb);rc_unregister_device (xbox_remote->rdev); +usb_set_intfdata (interface,NULL ); +usb_kill_urb (xbox_remote->irq_urb); +rc_free_device (xbox_remote->rdev);usb_free_urb (xbox_remote->irq_urb);kfree (xbox_remote->inbuf);kfree (xbox_remote);
drivers/media/usb/au0828/au0828-input.c +1 -0
@@ -357,6 +357,7 @@ void au0828_rc_unregister(struct au0828_dev *dev)return ;rc_unregister_device (ir->rc); +rc_free_device (ir->rc);/* done */ kfree (ir);
drivers/media/usb/dvb-usb-v2/dvb_usb_core.c +1 -0
@@ -187,6 +187,7 @@ static int dvb_usbv2_remote_exit(struct dvb_usb_device *d)if (d->rc_dev) {cancel_delayed_work_sync (&d->rc_query_work);rc_unregister_device (d->rc_dev); +rc_free_device (d->rc_dev); d->rc_dev =NULL ; }
drivers/media/usb/dvb-usb/dvb-usb-remote.c +4 -2
@@ -347,10 +347,12 @@ int dvb_usb_remote_exit(struct dvb_usb_device *d) {if (d->state &DVB_USB_STATE_REMOTE ) {cancel_delayed_work_sync (&d->rc_query_work); -if (d->props.rc.mode ==DVB_RC_LEGACY ) +if (d->props.rc.mode ==DVB_RC_LEGACY ) {input_unregister_device (d->input_dev); -else + }else {rc_unregister_device (d->rc_dev); +rc_free_device (d->rc_dev); + } } d->state &= ~DVB_USB_STATE_REMOTE ;return 0 ;
drivers/media/usb/em28xx/em28xx-input.c +1 -0
@@ -853,6 +853,7 @@ static int em28xx_ir_fini(struct em28xx *dev) goto ref_put;rc_unregister_device (ir->rc); +rc_free_device (ir->rc);kfree (ir->i2c_client);
drivers/staging/media/av7110/av7110_ir.c +1 -0
@@ -151,6 +151,7 @@ int av7110_ir_init(struct av7110 *av7110)void av7110_ir_exit (struct av7110 *av7110) {rc_unregister_device (av7110->ir.rcdev); +rc_free_device (av7110->ir.rcdev); }//MODULE_AUTHOR("Holger Waechtler <[email protected]>, Oliver Endriss <[email protected]>");
include/media/rc-core.h +0 -2
@@ -81,7 +81,6 @@ struct lirc_fh {/** * struct rc_dev - represents a remote control device * @dev: driver model's view of this device -* @managed_alloc: devm_rc_allocate_device was used to create rc_dev * @registered: set to true by rc_register_device(), false by * rc_unregister_device * @idle: used to keep track of RX state
@@ -156,7 +155,6 @@ struct lirc_fh {*/ struct rc_dev {struct device dev; -bool managed_alloc;bool registered;bool idle;bool encode_wakeup;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 96/315 media: rc: ttusbir: fix inverted error logic
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
[ Upstream commit 646ebdd3105809d84ed04aa9e92e47e89cc44502 ]
We have to report ENOMEM if no buffer is allocated. Typo dropped a "!". Restore it.
--- drivers/media/rc/ttusbir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/rc/ttusbir.c +1 -1
@@ -191,7 +191,7 @@ static int ttusbir_probe(struct usb_interface *intf, tt =kzalloc (sizeof (*tt),GFP_KERNEL ); buffer =kzalloc (5 ,GFP_KERNEL ); rc =rc_allocate_device (RC_DRIVER_IR_RAW ); -if (!tt || !rc || buffer) { +if (!tt || !rc || !buffer) { ret = -ENOMEM ; goto out; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 97/315 smb: client: validate the whole DACL before rewriting it in cifsacl
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Bommarito <[email protected]>
[ Upstream commit 0a8cf165566ba55a39fd0f4de172119dd646d39a ]
build_sec_desc() and id_mode_to_cifs_acl() derive a DACL pointer from a server-supplied dacloffset and then use the incoming ACL to rebuild the chmod/chown security descriptor.
The original fix only checked that the struct smb_acl header fits before reading dacl_ptr->size or dacl_ptr->num_aces. That avoids the immediate header-field OOB read, but the rewrite helpers still walk ACEs based on pdacl->num_aces with no structural validation of the incoming DACL body.
A malicious server can return a truncated DACL that still contains a header, claims one or more ACEs, and then drive replace_sids_and_copy_aces() or set_chmod_dacl() past the validated extent while they compare or copy attacker-controlled ACEs.
Factor the DACL structural checks into validate_dacl(), extend them to validate each ACE against the DACL bounds, and use the shared validator before the chmod/chown rebuild paths. parse_dacl() reuses the same validator so the read-side parser and write-side rewrite paths agree on what constitutes a well-formed incoming DACL.
--- fs/smb/client/cifsacl.c | 116 +++++++++++++++++++++++++++++----------- 1 file changed, 85 insertions(+), 31 deletions(-)
fs/smb/client/cifsacl.c +85 -31
@@ -757,6 +757,77 @@ static void dump_ace(struct smb_ace *pace, char *end_of_acl) }#endif +static int validate_dacl (struct smb_acl *pdacl,char *end_of_acl) +{ +int i, ace_hdr_size, ace_size, min_ace_size; +u16 dacl_size, num_aces; +char *acl_base, *end_of_dacl; +struct smb_ace *pace; + +if (!pdacl) +return 0 ; + +if (end_of_acl < (char *)pdacl +sizeof (struct smb_acl )) { +cifs_dbg (VFS ,"ACL too small to parse DACL\n" ); +return -EINVAL ; + } + + dacl_size =le16_to_cpu (pdacl->size); +if (dacl_size <sizeof (struct smb_acl ) || + end_of_acl < (char *)pdacl + dacl_size) { +cifs_dbg (VFS ,"ACL too small to parse DACL\n" ); +return -EINVAL ; + } + + num_aces =le16_to_cpu (pdacl->num_aces); +if (!num_aces) +return 0 ; + + ace_hdr_size = offsetof(struct smb_ace , sid) + + offsetof(struct smb_sid , sub_auth); + min_ace_size = ace_hdr_size +sizeof (__le32); +if (num_aces > (dacl_size -sizeof (struct smb_acl )) / min_ace_size) { +cifs_dbg (VFS ,"ACL too small to parse DACL\n" ); +return -EINVAL ; + } + + end_of_dacl = (char *)pdacl + dacl_size; + acl_base = (char *)pdacl; + ace_size =sizeof (struct smb_acl ); + +for (i =0 ; i < num_aces; ++i) { +if (end_of_dacl - acl_base < ace_size) { +cifs_dbg (VFS ,"ACL too small to parse ACE\n" ); +return -EINVAL ; + } + + pace = (struct smb_ace *)(acl_base + ace_size); + acl_base = (char *)pace; + +if (end_of_dacl - acl_base < ace_hdr_size || + pace->sid.num_subauth ==0 || + pace->sid.num_subauth >SID_MAX_SUB_AUTHORITIES ) { +cifs_dbg (VFS ,"ACL too small to parse ACE\n" ); +return -EINVAL ; + } + + ace_size = ace_hdr_size +sizeof (__le32) * pace->sid.num_subauth; +if (end_of_dacl - acl_base < ace_size || +le16_to_cpu (pace->size) < ace_size) { +cifs_dbg (VFS ,"ACL too small to parse ACE\n" ); +return -EINVAL ; + } + + ace_size =le16_to_cpu (pace->size); +if (end_of_dacl - acl_base < ace_size) { +cifs_dbg (VFS ,"ACL too small to parse ACE\n" ); +return -EINVAL ; + } + } + +return 0 ; +} +static void parse_dacl (struct smb_acl *pdacl,char *end_of_acl,struct smb_sid *pownersid,struct smb_sid *pgrpsid,struct cifs_fattr *fattr,bool mode_from_special_sid)
@@ -764,7 +835,7 @@ static void parse_dacl(struct smb_acl *pdacl, char *end_of_acl,int i;u16 num_aces =0 ;int acl_size; -char *acl_base; +char *acl_base, *end_of_dacl;struct smb_ace **ppace;/* BB need to add parm so we can store the SID BB */
@@ -776,12 +847,8 @@ static void parse_dacl(struct smb_acl *pdacl, char *end_of_acl,return ; } -/* validate that we do not go past end of acl */ -if (end_of_acl < (char *)pdacl +sizeof (struct smb_acl ) || - end_of_acl < (char *)pdacl +le16_to_cpu (pdacl->size)) { -cifs_dbg (VFS ,"ACL too small to parse DACL\n" ); +if (validate_dacl (pdacl, end_of_acl))return ; - } cifs_dbg(NOISY, "DACL revision %d size %d num aces %d\n", le16_to_cpu(pdacl->revision), le16_to_cpu(pdacl->size),
@@ -792,6 +859,7 @@ static void parse_dacl(struct smb_acl *pdacl, char *end_of_acl,user/group/other have no permissions */ fattr->cf_mode &= ~(0777 ); + end_of_dacl = (char *)pdacl +le16_to_cpu (pdacl->size); acl_base = (char *)pdacl; acl_size =sizeof (struct smb_acl );
@@ -799,36 +867,16 @@ static void parse_dacl(struct smb_acl *pdacl, char *end_of_acl,if (num_aces >0 ) {umode_t denied_mode =0 ; -if (num_aces > (le16_to_cpu (pdacl->size) -sizeof (struct smb_acl )) / - (offsetof(struct smb_ace , sid) + - offsetof(struct smb_sid , sub_auth) +sizeof (__le16))) -return ; - ppace =kmalloc_array (num_aces,sizeof (struct smb_ace *),GFP_KERNEL );if (!ppace)return ;for (i =0 ; i < num_aces; ++i) { -if (end_of_acl - acl_base < acl_size) -break ; - ppace[i] = (struct smb_ace *) (acl_base + acl_size); - acl_base = (char *)ppace[i]; - acl_size = offsetof(struct smb_ace , sid) + - offsetof(struct smb_sid , sub_auth); - -if (end_of_acl - acl_base < acl_size || - ppace[i]->sid.num_subauth ==0 || - ppace[i]->sid.num_subauth >SID_MAX_SUB_AUTHORITIES || - (end_of_acl - acl_base < - acl_size +sizeof (__le32) * ppace[i]->sid.num_subauth) || - (le16_to_cpu (ppace[i]->size) < - acl_size +sizeof (__le32) * ppace[i]->sid.num_subauth)) -break ;#ifdef CONFIG_CIFS_DEBUG2 -dump_ace (ppace[i], end_of_acl); +dump_ace (ppace[i], end_of_dacl);#endif if (mode_from_special_sid && ppace[i]->sid.num_subauth >= 3 &&
@@ -871,6 +919,7 @@ static void parse_dacl(struct smb_acl *pdacl, char *end_of_acl,(void *)ppace[i], sizeof(struct smb_ace)); */ + acl_base = (char *)ppace[i]; acl_size =le16_to_cpu (ppace[i]->size); }
@@ -1316,10 +1365,9 @@ static int build_sec_desc(struct smb_ntsd *pntsd, struct smb_ntsd *pnntsd, } dacl_ptr = (struct smb_acl *)((char *)pntsd + dacloffset); -if (end_of_acl < (char *)dacl_ptr +le16_to_cpu (dacl_ptr->size)) { -cifs_dbg (VFS ,"Server returned illegal ACL size\n" ); -return -EINVAL ; - } + rc =validate_dacl (dacl_ptr, end_of_acl); +if (rc) +return rc; } owner_sid_ptr = (struct smb_sid *)((char *)pntsd +
@@ -1698,6 +1746,12 @@ id_mode_to_cifs_acl(struct inode *inode, const char *path, __u64 *pnmode, } dacl_ptr = (struct smb_acl *)((char *)pntsd + dacloffset); + rc =validate_dacl (dacl_ptr, (char *)pntsd + secdesclen); +if (rc) { +kfree (pntsd); +cifs_put_tlink (tlink); +return rc; + }if (mode_from_sid) nsecdesclen +=le16_to_cpu (dacl_ptr->num_aces) *sizeof (struct smb_ace );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 98/315 Revert "x86/fpu: Refine and simplify the magic number check during signal return"
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrei Vagin <[email protected]>
[ Upstream commit 44eeff9bc467bc7d1fec34fc3f6001f385fe462c ]
This reverts
dc8aa31a7ac2 ("x86/fpu: Refine and simplify the magic number check during signal return").
The aforementioned commit broke applications that construct signal frames in userspace (such as CRIU and gVisor) if the frame's xstate size is smaller than the kernel's fpstate->user_size.
Furthermore, this introduces a critical issue for checkpoint/restore tools like CRIU. If a process is checkpointed while inside a signal handler, its stack contains a signal frame formatted according to the source host's xstate capabilities.
If that process is later restored on a destination host with larger xstate capabilities (e.g., a newer CPU with more features enabled, resulting in a larger fpstate->user_size), the kernel will look for FP_XSTATE_MAGIC2 at the destination host's larger user_size offset instead of the offset encoded in the frame's fx_sw->xstate_size.
This causes the magic2 check to fail, forcing sigreturn to silently fall back to "FX-only" mode. Upon return from the signal handler, the process's extended state is reset to initial values instead of being restored, leading to silent data corruption.
The aforementioned commit cited
d877550eaf2d ("x86/fpu: Stop relying on userspace for info to fault in xsave buffer")
as justification to stop relying on userspace for the magic number check.
However, these two changes are fundamentally different. The last one only changed how much memory the kernel ensures is paged-in before running XRSTOR to prevent an infinite loop. It did not change the signal frame format or how the layout is validated.
Reverting this change restores the use of fx_sw->xstate_size for locating magic2 and restores the necessary sanity checks, ensuring that the signal frame remains self-describing and portable.
[ bp: Massage commit message. ]
--- arch/x86/kernel/fpu/signal.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
arch/x86/kernel/fpu/signal.c +8 -3
@@ -27,14 +27,19 @@static inline bool check_xstate_in_sigframe (struct fxregs_state __user *fxbuf,struct _fpx_sw_bytes *fx_sw) { +int min_xstate_size =sizeof (struct fxregs_state ) + +sizeof (struct xstate_header );void __user *fpstate = fxbuf;unsigned int magic2;if (__copy_from_user (fx_sw, &fxbuf->sw_reserved[0 ],sizeof (*fx_sw)))return false; -/* Check for the first magic field */ -if (fx_sw->magic1 !=FP_XSTATE_MAGIC1 ) +/* Check for the first magic field and other error scenarios. */ +if (fx_sw->magic1 !=FP_XSTATE_MAGIC1 || + fx_sw->xstate_size < min_xstate_size || + fx_sw->xstate_size >x86_task_fpu (current)->fpstate->user_size || + fx_sw->xstate_size > fx_sw->extended_size) goto setfx;/*
@@ -43,7 +48,7 @@ static inline bool check_xstate_in_sigframe(struct fxregs_state __user *fxbuf,* fpstate layout with out copying the extended state information * in the memory layout. */ -if (__get_user (magic2, (__u32 __user *)(fpstate +x86_task_fpu (current)->fpstate->user_size))) +if (__get_user (magic2, (__u32 __user *)(fpstate + fx_sw->xstate_size)))return false;if (likely (magic2 ==FP_XSTATE_MAGIC2 ))
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 99/315 s390/cio: Restore GFP_DMA for CHSC allocation
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Oberparleiter <[email protected]>
[ Upstream commit ea34567db0a6b3a7ce78ba421592344315c8f90e ]
Re-add GFP_DMA when allocating memory for CHSC control blocks. On some supported machines, CHSC cannot access memory outside the DMA zone, causing CHSC command failures.
--- drivers/s390/cio/chsc.c | 4 ++-- drivers/s390/cio/chsc_sch.c | 20 ++++++++++---------- drivers/s390/cio/scm.c | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-)
drivers/s390/cio/chsc.c +2 -2
@@ -1143,8 +1143,8 @@ int __init chsc_init(void) {int ret; - sei_page = (void *)get_zeroed_page (GFP_KERNEL ); - chsc_page = (void *)get_zeroed_page (GFP_KERNEL ); + sei_page = (void *)get_zeroed_page (GFP_KERNEL |GFP_DMA ); + chsc_page = (void *)get_zeroed_page (GFP_KERNEL |GFP_DMA );if (!sei_page || !chsc_page) { ret = -ENOMEM ; goto out_err;
drivers/s390/cio/chsc_sch.c +10 -10
@@ -293,7 +293,7 @@ static int chsc_ioctl_start(void __user *user_area)if (!css_general_characteristics.dynio)/* It makes no sense to try. */ return -EOPNOTSUPP ; - chsc_area = (void *)get_zeroed_page (GFP_KERNEL ); + chsc_area = (void *)get_zeroed_page (GFP_DMA |GFP_KERNEL );if (!chsc_area)return -ENOMEM ; request =kzalloc (sizeof (*request),GFP_KERNEL );
@@ -341,7 +341,7 @@ static int chsc_ioctl_on_close_set(void __user *user_area) ret = -ENOMEM ; goto out_unlock; } - on_close_chsc_area = (void *)get_zeroed_page (GFP_KERNEL ); + on_close_chsc_area = (void *)get_zeroed_page (GFP_DMA |GFP_KERNEL );if (!on_close_chsc_area) { ret = -ENOMEM ; goto out_free_request;
@@ -393,7 +393,7 @@ static int chsc_ioctl_start_sync(void __user *user_area)struct chsc_sync_area *chsc_area;int ret, ccode; - chsc_area = (void *)get_zeroed_page (GFP_KERNEL ); + chsc_area = (void *)get_zeroed_page (GFP_KERNEL |GFP_DMA );if (!chsc_area)return -ENOMEM ;if (copy_from_user (chsc_area, user_area,PAGE_SIZE )) {
@@ -439,7 +439,7 @@ static int chsc_ioctl_info_channel_path(void __user *user_cd)u8 data[PAGE_SIZE -20 ]; } __attribute__ ((packed)) *scpcd_area; - scpcd_area = (void *)get_zeroed_page (GFP_KERNEL ); + scpcd_area = (void *)get_zeroed_page (GFP_KERNEL |GFP_DMA );if (!scpcd_area)return -ENOMEM ; cd =kzalloc (sizeof (*cd),GFP_KERNEL );
@@ -501,7 +501,7 @@ static int chsc_ioctl_info_cu(void __user *user_cd)u8 data[PAGE_SIZE -20 ]; } __attribute__ ((packed)) *scucd_area; - scucd_area = (void *)get_zeroed_page (GFP_KERNEL ); + scucd_area = (void *)get_zeroed_page (GFP_KERNEL |GFP_DMA );if (!scucd_area)return -ENOMEM ; cd =kzalloc (sizeof (*cd),GFP_KERNEL );
@@ -564,7 +564,7 @@ static int chsc_ioctl_info_sch_cu(void __user *user_cud)u8 data[PAGE_SIZE -20 ]; } __attribute__ ((packed)) *sscud_area; - sscud_area = (void *)get_zeroed_page (GFP_KERNEL ); + sscud_area = (void *)get_zeroed_page (GFP_KERNEL |GFP_DMA );if (!sscud_area)return -ENOMEM ; cud =kzalloc (sizeof (*cud),GFP_KERNEL );
@@ -626,7 +626,7 @@ static int chsc_ioctl_conf_info(void __user *user_ci)u8 data[PAGE_SIZE -20 ]; } __attribute__ ((packed)) *sci_area; - sci_area = (void *)get_zeroed_page (GFP_KERNEL ); + sci_area = (void *)get_zeroed_page (GFP_KERNEL |GFP_DMA );if (!sci_area)return -ENOMEM ; ci =kzalloc (sizeof (*ci),GFP_KERNEL );
@@ -697,7 +697,7 @@ static int chsc_ioctl_conf_comp_list(void __user *user_ccl)u32 res; } __attribute__ ((packed)) *cssids_parm; - sccl_area = (void *)get_zeroed_page (GFP_KERNEL ); + sccl_area = (void *)get_zeroed_page (GFP_KERNEL |GFP_DMA );if (!sccl_area)return -ENOMEM ; ccl =kzalloc (sizeof (*ccl),GFP_KERNEL );
@@ -757,7 +757,7 @@ static int chsc_ioctl_chpd(void __user *user_chpd)int ret; chpd =kzalloc (sizeof (*chpd),GFP_KERNEL ); - scpd_area = (void *)get_zeroed_page (GFP_KERNEL ); + scpd_area = (void *)get_zeroed_page (GFP_KERNEL |GFP_DMA );if (!scpd_area || !chpd) { ret = -ENOMEM ; goto out_free;
@@ -797,7 +797,7 @@ static int chsc_ioctl_dcal(void __user *user_dcal)u8 data[PAGE_SIZE -36 ]; } __attribute__ ((packed)) *sdcal_area; - sdcal_area = (void *)get_zeroed_page (GFP_KERNEL ); + sdcal_area = (void *)get_zeroed_page (GFP_KERNEL |GFP_DMA );if (!sdcal_area)return -ENOMEM ; dcal =kzalloc (sizeof (*dcal),GFP_KERNEL );
drivers/s390/cio/scm.c +1 -1
@@ -229,7 +229,7 @@ int scm_update_information(void)size_t num;int ret; - scm_info = (void *)__get_free_page (GFP_KERNEL ); + scm_info = (void *)__get_free_page (GFP_KERNEL |GFP_DMA );if (!scm_info)return -ENOMEM ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 100/315 drm/i915/psr: Add defininitions for INTEL_WA_REGISTER_CAPS DPCD register
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jouni Högander <[email protected]>
commit fbceb39b536e40c2f7cc47ab42037bb7c2b7ced9 upstream.
EDP specification says:
"If either VSC SDP is unable to be transmitted 100 ns before the SU region, the Source device may optionally transmit the VSC SDP during the prior video scan line’s HBlank period There is a Intel specific drm dp register currently containing bits related how TCON can support PSR2 with SDP on prior line."
Unfortunately many panels are having problems in implementing this. So there is a custom Intel specific DPCD register (INTEL_WA_REGISTER_CAPS) to figure out if this is properly implemented on a panel or if panel doesn't require that 100 ns delay before the SU region. Here are the definitions in this custom DPCD address:
0 = Panel doesn't support SDP on prior line
1 = Panel supports SDP on prior line
2 = Panel doesn't have 100ns requirement
3 = Reserved
Add definitions for this new register and it's values into new header intel_dpcd.h.
v2: add INTEL_DPCD_ prefix to definitions
Bspec: 74741
--- drivers/gpu/drm/i915/display/intel_dpcd.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 drivers/gpu/drm/i915/display/intel_dpcd.h
drivers/gpu/drm/i915/display/intel_dpcd.h new file +15 -0
@@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2026 Intel Corporation +*/ + +#ifndef __INTEL_DPCD_H__ +#define __INTEL_DPCD_H__ + +#define INTEL_DPCD_INTEL_WA_REGISTER_CAPS 0x3f0 +# define INTEL_DPCD_INTEL_WA_REGISTER_CAPS_PSR2_EARLYSCANLINE_SDP_SUPPORT_MASK REG_GENMASK(1, 0) +# define INTEL_DPCD_INTEL_WA_REGISTER_CAPS_FALL_BACK_TO_PSR1 0 +# define INTEL_DPCD_INTEL_WA_REGISTER_CAPS_PSR2_WITH_EARLY_SCANLINE 1 +# define INTEL_DPCD_INTEL_WA_REGISTER_CAPS_PSR2_WITHOUT_EARLY_SCANLINE 2 + +#endif /* __INTEL_DPCD_H__ */
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 101/315 drm/i915/psr: Read Intel DPCD workaround register
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jouni Högander <[email protected]>
commit f30bece421a4ae34359254e1dc2a187a42b6af9b upstream.
Read Intel DPCD workaround register and store it into intel_connector->dp.psr_caps. psr_caps was chosen as currently it contains only PSR workaround for PSR2 SDP on prior scanline implementation.
--- drivers/gpu/drm/i915/display/intel_display_types.h | 1 + drivers/gpu/drm/i915/display/intel_psr.c | 7 +++++++ 2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/display/intel_display_types.h +1 -0
@@ -1710,6 +1710,7 @@ struct intel_dp {u8 lttpr_common_caps[DP_LTTPR_COMMON_CAP_SIZE ];u8 lttpr_phy_caps[DP_MAX_LTTPR_COUNT ][DP_LTTPR_PHY_CAP_SIZE ];u8 pcon_dsc_dpcd[DP_PCON_DSC_ENCODER_CAP_SIZE ]; +u8 intel_wa_dpcd;/* source rates */ int num_source_rates;const int *source_rates;
drivers/gpu/drm/i915/display/intel_psr.c +7 -0
@@ -41,6 +41,7 @@#include "intel_display_types.h" #include "intel_dmc.h" #include "intel_dp.h" +#include "intel_dpcd.h" #include "intel_dp_aux.h" #include "intel_dsb.h" #include "intel_frontbuffer.h"
@@ -679,6 +680,12 @@ static void _psr_init_dpcd(struct intel_dp *intel_dp)drm_dbg_kms (display->drm,"PSR2 %ssupported\n" , intel_dp->psr.sink_psr2_support ?"" :"not " ); } + +if (intel_dp->psr.sink_psr2_support) +drm_dp_dpcd_read (&intel_dp->aux, +INTEL_DPCD_INTEL_WA_REGISTER_CAPS , + &intel_dp->intel_wa_dpcd, +sizeof (intel_dp->intel_wa_dpcd)); }void intel_psr_init_dpcd (struct intel_dp *intel_dp)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 102/315 drm/i915/psr: Apply Intel DPCD workaround when SDP on prior line used
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jouni Högander <[email protected]>
commit 4703049f768fc1c1caac754134118bee1a3af189 upstream.
There is Intel specific workaround DPCD address containing workaround for case where SDP is on prior line. Apply this workaround according to values in the offset.
--- drivers/gpu/drm/i915/display/intel_psr.c | 28 +++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_psr.c +27 -1
@@ -29,6 +29,7 @@#include <drm/drm_vblank.h> #include "i915_reg.h" +#include "i915_utils.h" #include "intel_alpm.h" #include "intel_atomic.h" #include "intel_crtc.h"
@@ -1315,6 +1316,30 @@ static bool psr2_granularity_check(struct intel_dp *intel_dp,return true; } +static bool apply_scanline_indication_wa (struct intel_dp *intel_dp, +struct intel_crtc_state *crtc_state) +{ +u8 early_scanline_support = intel_dp->intel_wa_dpcd & +INTEL_DPCD_INTEL_WA_REGISTER_CAPS_PSR2_EARLYSCANLINE_SDP_SUPPORT_MASK ; + +if (intel_dp->edp_dpcd[0 ] >=DP_EDP_15 ) +return true; + +switch (early_scanline_support) { +case INTEL_DPCD_INTEL_WA_REGISTER_CAPS_FALL_BACK_TO_PSR1 : + crtc_state->req_psr2_sdp_prior_scanline = false; +return false; +case INTEL_DPCD_INTEL_WA_REGISTER_CAPS_PSR2_WITH_EARLY_SCANLINE : +return true; +case INTEL_DPCD_INTEL_WA_REGISTER_CAPS_PSR2_WITHOUT_EARLY_SCANLINE : + crtc_state->req_psr2_sdp_prior_scanline = false; +return true; +default : +MISSING_CASE (early_scanline_support); +return false; + } +} +static bool _compute_psr2_sdp_prior_scanline_indication (struct intel_dp *intel_dp,struct intel_crtc_state *crtc_state) {
@@ -1336,7 +1361,8 @@ static bool _compute_psr2_sdp_prior_scanline_indication(struct intel_dp *intel_dreturn false; crtc_state->req_psr2_sdp_prior_scanline = true; -return true; + +return apply_scanline_indication_wa (intel_dp, crtc_state); } static int intel_psr_entry_setup_frames(struct intel_dp *intel_dp,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 103/315 phy: mscc: Use PHY_ID_MATCH_EXACT for VSC8584, VSC8582, VSC8575, VSC856X
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Horatiu Vultur <[email protected]>
[ Upstream commit 1bc80d673087e5704adbb3ee8e4b785c14899cce ]
As the PHYs VSC8584, VSC8582, VSC8575 and VSC856X exists only as rev B, we can use PHY_ID_MATCH_EXACT to match exactly on revision B of the PHY. Because of this change then there is not need the check if it is a different revision than rev B in the function vsc8584_probe() as we already know that this will never happen.
These changes are a preparation for the next patch because in that patch we will make the PHYs VSC8574 and VSC8572 to use vsc8584_probe() and these PHYs have multiple revision.
--- drivers/net/phy/mscc/mscc.h | 8 ++++---- drivers/net/phy/mscc/mscc_main.c | 23 ++++------------------- 2 files changed, 8 insertions(+), 23 deletions(-)
drivers/net/phy/mscc/mscc.h +4 -4
@@ -289,12 +289,12 @@ enum rgmii_clock_delay {#define PHY_ID_VSC8540 0x00070760#define PHY_ID_VSC8541 0x00070770#define PHY_ID_VSC8552 0x000704e0 -#define PHY_ID_VSC856X 0x000707e0 +#define PHY_ID_VSC856X 0x000707e1#define PHY_ID_VSC8572 0x000704d0#define PHY_ID_VSC8574 0x000704a0 -#define PHY_ID_VSC8575 0x000707d0 -#define PHY_ID_VSC8582 0x000707b0 -#define PHY_ID_VSC8584 0x000707c0 +#define PHY_ID_VSC8575 0x000707d1 +#define PHY_ID_VSC8582 0x000707b1 +#define PHY_ID_VSC8584 0x000707c1#define PHY_VENDOR_MSCC 0x00070400#define MSCC_VDDMAC_1500 1500
drivers/net/phy/mscc/mscc_main.c +4 -19
@@ -1724,12 +1724,6 @@ static int vsc8584_config_init(struct phy_device *phydev)* in this pre-init function. */ if (phy_package_init_once (phydev)) { -/* The following switch statement assumes that the lowest -* nibble of the phy_id_mask is always 0. This works because -* the lowest nibble of the PHY_ID's below are also 0. -*/ -WARN_ON (phydev->drv->phy_id_mask &0xf ); -switch (phydev->phy_id & phydev->drv->phy_id_mask) {case PHY_ID_VSC8504 :case PHY_ID_VSC8552 :
@@ -2290,11 +2284,6 @@ static int vsc8584_probe(struct phy_device *phydev) VSC8531_DUPLEX_COLLISION};int ret; -if ((phydev->phy_id &MSCC_DEV_REV_MASK ) !=VSC8584_REVB ) { -dev_err (&phydev->mdio.dev,"Only VSC8584 revB is supported.\n" ); -return -ENOTSUPP ; - } - vsc8531 =devm_kzalloc (&phydev->mdio.dev,sizeof (*vsc8531),GFP_KERNEL );if (!vsc8531)return -ENOMEM ;
@@ -2587,9 +2576,8 @@ static struct phy_driver vsc85xx_driver[] = { .config_inband = vsc85xx_config_inband, }, { - .phy_id = PHY_ID_VSC856X, + PHY_ID_MATCH_EXACT(PHY_ID_VSC856X), .name = "Microsemi GE VSC856X SyncE", - .phy_id_mask = 0xfffffff0,/* PHY_GBIT_FEATURES */ .soft_reset = &genphy_soft_reset, .config_init = &vsc8584_config_init,
@@ -2667,9 +2655,8 @@ static struct phy_driver vsc85xx_driver[] = { .config_inband = vsc85xx_config_inband, }, { - .phy_id = PHY_ID_VSC8575, + PHY_ID_MATCH_EXACT(PHY_ID_VSC8575), .name = "Microsemi GE VSC8575 SyncE", - .phy_id_mask = 0xfffffff0,/* PHY_GBIT_FEATURES */ .soft_reset = &genphy_soft_reset, .config_init = &vsc8584_config_init,
@@ -2693,9 +2680,8 @@ static struct phy_driver vsc85xx_driver[] = { .config_inband = vsc85xx_config_inband, }, { - .phy_id = PHY_ID_VSC8582, + PHY_ID_MATCH_EXACT(PHY_ID_VSC8582), .name = "Microsemi GE VSC8582 SyncE", - .phy_id_mask = 0xfffffff0,/* PHY_GBIT_FEATURES */ .soft_reset = &genphy_soft_reset, .config_init = &vsc8584_config_init,
@@ -2719,9 +2705,8 @@ static struct phy_driver vsc85xx_driver[] = { .config_inband = vsc85xx_config_inband, }, { - .phy_id = PHY_ID_VSC8584, + PHY_ID_MATCH_EXACT(PHY_ID_VSC8584), .name = "Microsemi GE VSC8584 SyncE", - .phy_id_mask = 0xfffffff0,/* PHY_GBIT_FEATURES */ .soft_reset = &genphy_soft_reset, .config_init = &vsc8584_config_init,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 104/315 iio: imu: st_lsm6dsx: fix stack leak in tagged FIFO buffer
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 c9d8e9adaa63150ef7e833480b799d0bab83a276 upstream.
The tagged FIFO path declares iio_buff on the stack with __aligned(8) but no initializer, but there is a hole in the structure, which will then leak to userspace as ST_LSM6DSX_SAMPLE_SIZE bytes (6) will be copied, but the space between that and the timestamp are not initialized.
Commit c14edb4d0bdc ("iio:imu:st_lsm6dsx Fix alignment and data leak issues") moved the untagged FIFO path to a kzalloc'd buffer in hw->scan, but for the tagged path it only added the alignment qualifier and not the initializer :(
Fix this by just zero-initializing the structure on the stack.
--- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c +1 -1
@@ -608,7 +608,7 @@ int st_lsm6dsx_read_tagged_fifo(struct s* must be passed a buffer that is aligned to 8 bytes so * as to allow insertion of a naturally aligned timestamp. */ -u8 iio_buff[ST_LSM6DSX_IIO_BUFF_SIZE ]__aligned(8) ; +u8 iio_buff[ST_LSM6DSX_IIO_BUFF_SIZE ]__aligned(8) = { };u8 tag;bool reset_ts = false;int i, err, read_len;
Greg Kroah-Hartman
maintainerPATCH 105/315 iio: imu: adis16550: fix stack leak in trigger handler
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 474f8928d50b09f7dcf507049f08732640b88b49 upstream.
adis16550_trigger_handler() declares the scan data array on the stack without initializing it. The memcpy() at the bottom fills only the first 28 bytes (TEMP + 6 channels of GYRO/ACCEL data), and iio_push_to_buffers_with_timestamp() writes the s64 timestamp at the 8-byte-aligned offset 32. Bytes 28-31 remain uninitialized stack data which leaks to userspace on ever trigger.
Fix this all by just zero-initializing the structure on the stack.
--- drivers/iio/imu/adis16550.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/imu/adis16550.c +1 -1
@@ -836,7 +836,7 @@ static irqreturn_t adis16550_trigger_hanu16 dummy;bool valid;struct iio_poll_func *pf = p; -__be32 data[ADIS16550_MAX_SCAN_DATA ]__aligned(8) ; +__be32 data[ADIS16550_MAX_SCAN_DATA ]__aligned(8) = { };struct iio_dev *indio_dev = pf->indio_dev;struct adis16550 *st =iio_priv (indio_dev);struct adis *adis =iio_device_get_drvdata (indio_dev);
Greg Kroah-Hartman
maintainerPATCH 106/315 iio: pressure: bmp280: fix stack leak in bmp580 trigger handler
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 387c86b582e0782ab332e7bfcd4e6e3f93922961 upstream.
bmp580_trigger_handler() declares its scan buffer on the stack without an initializer and then memcpy()s 3 bytes of 24-bit sensor data into each 4-byte __le32 field. The high byte of comp_temp and comp_press is left uninitialized, and the channel storagebits is 32, so two bytes of stack are pushed to userspace per scan.
This is a regression from when the buffer lived in the private data, the move to a stack-local struct dropped the implicit zeroing. bme280_trigger_handler() was fixed up to handle this bug, but this driver was not fixed because there was no padding hole, but rather a short-fill issue.
Fix this all by just zero-initializing the structure on the stack.
--- drivers/iio/pressure/bmp280-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/pressure/bmp280-core.c +1 -1
@@ -2616,7 +2616,7 @@ static irqreturn_t bmp580_trigger_handler(int irq, void *p)__le32 comp_temp;__le32 comp_press;aligned_s64 timestamp; - } buffer; + } buffer = { };int ret;guard (mutex)(&data->lock);
Signature · 1 line
2.54.0
Greg Kroah-Hartman
maintainerPATCH 107/315 usb: typec: ucsi: ccg: reject firmware images without a : record header
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 d7486952bf74e546ee3748fb14b2d07881fa6273 upstream.
do_flash() locates the first .cyacd record with
p = strnchr(fw->data, fw->size, ':');
while (p < eof) {
s = strnchr(p + 1, eof - p - 1, ':');
...
}If the firmware image contains no ':' byte, strnchr() returns NULL. NULL compares less than the valid kernel pointer eof, so the loop body runs and strnchr() is called with p + 1 == (void *)1 and a length of roughly (unsigned long)eof, causing a wonderful crash.
The not_signed_fw fallthrough earlier in do_flash() and the chip-state branches in ccg_fw_update_needed() allow an unsigned blob to reach this loop, so a root user who can place a crafted file under /lib/firmware and write the do_flash sysfs attribute can trigger the oops.
Bail out with -EINVAL when the initial strnchr() returns NULL.
--- drivers/usb/typec/ucsi/ucsi_ccg.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/usb/typec/ucsi/ucsi_ccg.c +5 -0
@@ -1242,6 +1242,11 @@ not_signed_fw:*****************************************************************/ p =strnchr (fw->data, fw->size,':' ); +if (!p) { +dev_err (dev,"Bad FW format: no ':' record header found\n" ); + err = -EINVAL ; + goto release_mem; + }while (p < eof) { s =strnchr (p +1 , eof - p -1 ,':' );
Greg Kroah-Hartman
maintainerPATCH 108/315 usb: typec: tcpm: validate VDO count in Discover Identity ACK handlers
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 8fbc349e8383125dd2d8de1c1e926279d398ab17 upstream.
Properly validate the count passed from a device when calling svdm_consume_identity() or svdm_consume_identity_sop_prime() as the device-controlled value could index off of the static arrays, which could leak data.
--- drivers/usb/typec/tcpm/tcpm.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/usb/typec/tcpm/tcpm.c +7 -1
@@ -1695,6 +1695,9 @@ static void svdm_consume_identity(structu32 vdo = p[VDO_INDEX_IDH ];u32 product = p[VDO_INDEX_PRODUCT ]; +if (cnt <=VDO_INDEX_PRODUCT ) +return ; +memset (&port->mode_data,0 ,sizeof (port->mode_data)); port->partner_ident.id_header = vdo;
@@ -1715,6 +1718,9 @@ static void svdm_consume_identity_sop_pru32 product = p[VDO_INDEX_PRODUCT ];int svdm_version; +if (cnt <=VDO_INDEX_CABLE_1 ) +return ; +/* * Attempt to consume identity only if cable currently is not set */
@@ -1738,7 +1744,7 @@ static void svdm_consume_identity_sop_prswitch (port->negotiated_rev_prime) {case PD_REV30 : port->cable_desc.pd_revision =0x0300 ; -if (port->cable_desc.active) +if (port->cable_desc.active && cnt >VDO_INDEX_CABLE_2 ) port->cable_ident.vdo[1 ] = p[VDO_INDEX_CABLE_2 ];break ;case PD_REV20 :
Greg Kroah-Hartman
maintainerPATCH 109/315 usb: typec: tcpm: bound altmode_desc[] per iteration in svdm_consume_modes()
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 3389c149c68c3fea61910ad5d34f7bf3bff44e32 upstream.
svdm_consume_modes() checks pmdata->altmodes against the array size once before the loop over the count, but forgot to check the bound at every point in the loop.
In the well-behaved SVDM discovery flow this is harmless because each of at most SVID_DISCOVERY_MAX SVIDs contributes at most MODE_DISCOVERY_MAX modes, exactly filling altmode_desc[ALTMODE_DISCOVERY_MAX]. But the CMDT_RSP_ACK handler in tcpm_pd_svdm() does not correlate an incoming ACK with any request the port actually sent. Once port->partner is set, an unsolicited Discover Modes ACK is consumed unconditionally. A broken or malicious port partner can therefore drive altmodes to ALTMODE_DISCOVERY_MAX - 1 via the normal flow, and then send one extra Discover Modes ACK with seven VDOs. Because the pre-loop check passes, the loop could then writes up to five entries past altmode_desc[]. For mode_data_prime the next field in struct tcpm_port is the partner_altmode[] pointer array, which then receives partner-chosen SVID/VDO bytes.
Move the bound check inside the loop so the array can never be indexed past ALTMODE_DISCOVERY_MAX regardless of how many VDOs the partner supplies or how the function was reached.
--- drivers/usb/typec/tcpm/tcpm.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/usb/typec/tcpm/tcpm.c +4 -8
@@ -1832,23 +1832,19 @@ static void svdm_consume_modes(struct tcswitch (rx_sop_type) {case TCPC_TX_SOP_PRIME : pmdata = &port->mode_data_prime; -if (pmdata->altmodes >=ARRAY_SIZE (port->plug_prime_altmode)) { -/* Already logged in svdm_consume_svids() */ -return ; - }break ;case TCPC_TX_SOP : pmdata = &port->mode_data; -if (pmdata->altmodes >=ARRAY_SIZE (port->partner_altmode)) { -/* Already logged in svdm_consume_svids() */ -return ; - }break ;default :return ; }for (i =1 ; i < cnt; i++) { +if (pmdata->altmodes >=ALTMODE_DISCOVERY_MAX ) { +/* Already logged in svdm_consume_svids() */ +return ; + } paltmode = &pmdata->altmode_desc[pmdata->altmodes];memset (paltmode,0 ,sizeof (*paltmode));
Greg Kroah-Hartman
maintainerPATCH 110/315 usb: typec: ucsi: displayport: NAK DP_CMD_CONFIGURE without a payload VDO
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 167dd8d12226587ee554f520aed0256b7769cd5d upstream.
ucsi_displayport_vdm() handles a DP_CMD_CONFIGURE by copying the first payload VDO from data[], but unlike the equivalent handler in altmodes/displayport.c it does not check that count covers a VDO beyond the header. A header-only Configure VDM (count == 1) would read one u32 past the caller's array.
In the normal UCSI path the caller controls count, so this is hardening for non-standard delivery paths. NAK and bail when no configuration VDO is present, matching the generic DP altmode driver's existing guard.
--- drivers/usb/typec/ucsi/displayport.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/typec/ucsi/displayport.c +4 -0
@@ -240,6 +240,10 @@ static int ucsi_displayport_vdm(struct t dp->header |=VDO_CMDT (CMDT_RSP_ACK );break ;case DP_CMD_CONFIGURE : +if (count <2 ) { + dp->header |=VDO_CMDT (CMDT_RSP_NAK ); +break ; + } dp->data.conf = *data;if (ucsi_displayport_configure (dp)) { dp->header |=VDO_CMDT (CMDT_RSP_NAK );
Greg Kroah-Hartman
maintainerPATCH 111/315 usb: typec: altmodes/displayport: validate count before reading Status Update VDO
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 8a18f896e667df491331371b55d4ad644dc51d60 upstream.
A broken/malicious device can send the incorrect count for a status update VDO, which will cause the kernel to read uninitialized stack data and send it off elsewhere.
Fix this up by correctly verifying the count for the update object.
--- drivers/usb/typec/altmodes/displayport.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/typec/altmodes/displayport.c +2 -0
@@ -405,6 +405,8 @@ static int dp_altmode_vdm(struct typec_a dp->state =DP_STATE_EXIT_PRIME ;break ;case DP_CMD_STATUS_UPDATE : +if (count <2 ) +break ; dp->data.status = *vdo; ret =dp_altmode_status_update (dp);break ;
Greg Kroah-Hartman
maintainerPATCH 112/315 usb: typec: wcove: dont write past struct pd_message in wcove_read_rx_buffer()
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 4af7ad0e6d7aa4403dbb1dac7b9659b0421efcaa upstream.
wcove_read_rx_buffer() copies the PD RX FIFO into the caller's struct pd_message with
for (i = 0; i < USBC_RXINFO_RXBYTES(info); i++) regmap_read(wcove->regmap, USBC_RX_DATA + i, msg + i);
which has two problems:
USBC_RXINFO_RXBYTES() is a 5-bit field (max 31) while struct pd_message is 30 bytes (__le16 header + __le32 payload[PD_MAX_PAYLOAD], packed). The byte count latched in RXINFO is the number of bytes the port partner put on the wire, so a malicious partner that transmits a 31-byte frame can drive the loop one byte past the destination if the WCOVE BMC receiver does not enforce the PD object-count limit in hardware. The existing FIXME flagged this as unverified.
Independently, regmap_read() takes an unsigned int * and stores a full unsigned int at the destination. Passing the byte pointer msg + i means each iteration writes four bytes; the high three are zero (val_bits is
8) and are normally overwritten by the next iteration, but the final iteration's high bytes are not. With RXBYTES == 30 the i == 29 iteration already writes three zero bytes past msg, which sits on the IRQ thread's stack in wcove_typec_irq().
Clamp the loop to sizeof(struct pd_message) and read each register into a local before storing only its low byte, so the copy can never exceed the destination regardless of what RXINFO reports.
--- drivers/usb/typec/tcpm/wcove.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/usb/typec/tcpm/wcove.c +8 -5
@@ -444,9 +444,11 @@ static int wcove_start_toggling(struct treturn regmap_write (wcove->regmap,USBC_CONTROL1 , usbc_ctrl); } -static int wcove_read_rx_buffer (struct wcove_typec *wcove,void *msg) +static int wcove_read_rx_buffer (struct wcove_typec *wcove, +struct pd_message *msg) { -unsigned int info; +unsigned int info, val, len; +u8 *buf = (u8 *)msg;int ret;int i;
@@ -454,12 +456,13 @@ static int wcove_read_rx_buffer(struct wif (ret)return ret; -/* FIXME: Check that USBC_RXINFO_RXBYTES(info) matches the header */ + len =min (USBC_RXINFO_RXBYTES (info),sizeof (*msg)); -for (i =0 ; i <USBC_RXINFO_RXBYTES (info); i++) { - ret =regmap_read (wcove->regmap,USBC_RX_DATA + i, msg + i); +for (i =0 ; i < len; i++) { + ret =regmap_read (wcove->regmap,USBC_RX_DATA + i, &val);if (ret)return ret; + buf[i] = val; } return regmap_write(wcove->regmap, USBC_RXSTATUS,
Greg Kroah-Hartman
maintainerPATCH 113/315 usb: typec: tcpm/tcpci_maxim: validate header NDO against RX_BYTE_CNT
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 aa2f716327be1818e1cb156da8a2844804aaec2f upstream.
A broken/malicious port can transmit a CRC-valid frame whose header advertises up to seven data objects but whose body carries fewer than that. Check for this, and rightfully reject the message, instead of reading from uninitialized stack memory.
--- drivers/usb/typec/tcpm/tcpci_maxim_core.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/usb/typec/tcpm/tcpci_maxim_core.c +9 -0
@@ -186,6 +186,15 @@ static void process_rx(struct max_tcpci_ rx_buf_ptr = rx_buf +TCPC_RECEIVE_BUFFER_RX_BYTE_BUF_OFFSET ; msg.header =cpu_to_le16 (*(u16 *)rx_buf_ptr); rx_buf_ptr = rx_buf_ptr +sizeof (msg.header); + +if (count <TCPC_RECEIVE_BUFFER_RX_BYTE_BUF_OFFSET +sizeof (msg.header) + +pd_header_cnt_le (msg.header) *sizeof (msg.payload[0 ])) { +max_tcpci_write16 (chip,TCPC_ALERT ,TCPC_ALERT_RX_STATUS ); +dev_err (chip->dev,"Invalid TCPC_RX_BYTE_CNT %d for header cnt %d\n" , + count,pd_header_cnt_le (msg.header)); +return ; + } +for (payload_index =0 ; payload_index <pd_header_cnt_le (msg.header); payload_index++, rx_buf_ptr +=sizeof (msg.payload[0 ])) msg.payload[payload_index] =cpu_to_le32 (*(u32 *)rx_buf_ptr);
Greg Kroah-Hartman
maintainerPATCH 114/315 usb: typec: ucsi: validate connector number in ucsi_connector_change()
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 288a81a8507052bcfbf884d39a463c44c42c5fd9 upstream.
The connector number in a UCSI CCI notification is a 7-bit field supplied by the PPM. ucsi_connector_change() uses it to index the ucsi->connector[] array without checking it against the number of connectors the PPM reported at init time, so a buggy or malicious PPM (EC firmware, or an I2C-attached UCSI controller on the ccg / stm32g0 / glink transports) can drive schedule_work() on memory past the end of the array.
Reject connector numbers that are zero or exceed cap.num_connectors before dereferencing the array.
--- drivers/usb/typec/ucsi/ucsi.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/usb/typec/ucsi/ucsi.c +10 -1
@@ -1325,13 +1325,22 @@ out_unlock:*/ void ucsi_connector_change (struct ucsi *ucsi,u8 num) { -struct ucsi_connector *con = &ucsi->connector[num -1 ]; +struct ucsi_connector *con;if (!(ucsi->ntfy &UCSI_ENABLE_NTFY_CONNECTOR_CHANGE )) {dev_dbg (ucsi->dev,"Early connector change event\n" );return ; } +if (!num || num > ucsi->cap.num_connectors) { +dev_warn_ratelimited (ucsi->dev, +"Bogus connector change on %u (max %u)\n" , + num, ucsi->cap.num_connectors); +return ; + } + + con = &ucsi->connector[num -1 ]; +if (!test_and_set_bit (EVENT_PENDING , &ucsi->flags))schedule_work (&con->work); }
Greg Kroah-Hartman
maintainerPATCH 115/315 USB: serial: safe_serial: fix memory corruption with small endpoint
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 438061ed1ad85e6743e2dce826671772d81089ec upstream.
Make sure that the bulk-out buffer size is at least eight bytes to avoid user-controlled slab corruption in "safe" mode should a malicious device report a smaller size.
--- drivers/usb/serial/safe_serial.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/usb/serial/safe_serial.c +11 -0
@@ -259,6 +259,7 @@ static int safe_prepare_write_buffer(strstatic int safe_startup (struct usb_serial *serial) {struct usb_interface_descriptor *desc; +int bulk_out_size;if (serial->dev->descriptor.bDeviceClass !=CDC_DEVICE_CLASS )return -ENODEV ;
@@ -279,6 +280,16 @@ static int safe_startup(struct usb_seriadefault :return -EINVAL ; } + +/* +* The bulk-out buffer needs to be large enough for the two-byte +* trailer in safe mode, but assume anything smaller than eight bytes +* is broken. +*/ + bulk_out_size = serial->port[0 ]->bulk_out_size; +if (bulk_out_size >0 && bulk_out_size <8 ) +return -EINVAL ; +return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 116/315 media: rc: igorplugusb: fix control request setup packet
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Henri A <[email protected]>
commit 171022c7d594c133a45f92357a2a91475edabe20 upstream.
Commit eac69475b01f ("media: rc: igorplugusb: heed coherency rules") changed the control request storage from an embedded struct to an allocated pointer so it can obey DMA coherency rules.
However, the driver still passes &ir->request to usb_fill_control_urb(). That points the URB setup packet at the pointer field itself rather than at the allocated struct usb_ctrlrequest.
USB core then interprets pointer bytes as the setup packet. This can produce an invalid bRequestType and trigger the control direction warning reported by syzbot:
usb 2-1: BOGUS control dir, pipe 80003580 doesn't match bRequestType 0
Pass ir->request itself as the setup packet.
--- drivers/media/rc/igorplugusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/rc/igorplugusb.c +1 -1
@@ -184,7 +184,7 @@ static int igorplugusb_probe(struct usb_if (!ir->buf_in) goto fail;usb_fill_control_urb (ir->urb, udev, -usb_rcvctrlpipe (udev,0 ), (uint8_t *)&ir->request, +usb_rcvctrlpipe (udev,0 ), (uint8_t *)ir->request, ir->buf_in,MAX_PACKET , igorplugusb_callback, ir);usb_make_path (udev, ir->phys,sizeof (ir->phys));
Greg Kroah-Hartman
maintainerPATCH 117/315 Input: ims-pcu - fix usb_free_coherent() size in ims_pcu_buffers_free()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Fourier <[email protected]>
commit dab48a7e74e6a394f3aa0461a2b1fb0c7b38fcb8 upstream.
The input buffer size is pcu->max_in_size, but pcu->max_out_size is passed to usb_free_coherent().
Change size to match the allocation size.
--- drivers/input/misc/ims-pcu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/misc/ims-pcu.c +1 -1
@@ -1604,7 +1604,7 @@ static void ims_pcu_buffers_free(structusb_kill_urb (pcu->urb_in);usb_free_urb (pcu->urb_in); -usb_free_coherent (pcu->udev, pcu->max_out_size, +usb_free_coherent (pcu->udev, pcu->max_in_size, pcu->urb_in_buf, pcu->read_dma);kfree (pcu->urb_out_buf);
Greg Kroah-Hartman
maintainerPATCH 118/315 HID: quirks: Add ALWAYS_POLL quirk for SIGMACHIP USB mouse
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: hlleng <[email protected]>
commit 07466fc91c55532edcfb5c6a7ccd2ea52728d6bd upstream.
The SIGMACHIP USB mouse with VID/PID 1c4f:0034 can disconnect and re-enumerate repeatedly after it has been enumerated if its interrupt endpoint is not continuously polled.
This was observed with the device reporting itself as "SIGMACHIP Usb Mouse". Keeping the input event device open avoids the disconnects.
Add HID_QUIRK_ALWAYS_POLL for this device so the HID core keeps polling it even when there is no userspace input consumer.
--- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-quirks.c | 1 + 2 files changed, 2 insertions(+)
drivers/hid/hid-ids.h +1 -0
@@ -1244,6 +1244,7 @@#define USB_VENDOR_ID_SIGMA_MICRO 0x1c4f#define USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD 0x0002 +#define USB_DEVICE_ID_SIGMA_MICRO_USB_MOUSE 0x0034#define USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD2 0x0059#define USB_VENDOR_ID_SIGMATEL 0x066F
drivers/hid/hid-quirks.c +1 -0
@@ -186,6 +186,7 @@ static const struct hid_device_id hid_qu { HID_USB_DEVICE(USB_VENDOR_ID_SEMICO, USB_DEVICE_ID_SEMICO_USB_KEYKOARD), HID_QUIRK_NO_INIT_REPORTS }, { HID_USB_DEVICE(USB_VENDOR_ID_SENNHEISER, USB_DEVICE_ID_SENNHEISER_BTD500USB), HID_QUIRK_NOGET }, { HID_USB_DEVICE(USB_VENDOR_ID_SIGMA_MICRO, USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD), HID_QUIRK_NO_INIT_REPORTS }, + { HID_USB_DEVICE(USB_VENDOR_ID_SIGMA_MICRO, USB_DEVICE_ID_SIGMA_MICRO_USB_MOUSE), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_SIGMATEL, USB_DEVICE_ID_SIGMATEL_STMP3780), HID_QUIRK_NOGET }, { HID_USB_DEVICE(USB_VENDOR_ID_SIS_TOUCH, USB_DEVICE_ID_SIS1030_TOUCH), HID_QUIRK_NOGET }, { HID_USB_DEVICE(USB_VENDOR_ID_SIS_TOUCH, USB_DEVICE_ID_SIS817_TOUCH), HID_QUIRK_NOGET },
Greg Kroah-Hartman
maintainerPATCH 119/315 Bluetooth: btusb: Allow firmware re-download when version matches
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shuai Zhang <[email protected]>
commit 82855073c1081732656734b74d7d1d5e4cfd0da7 upstream.
The Bluetooth host decides whether to download firmware by reading the controller firmware download completion flag and firmware version information.
If a USB error occurs during the firmware download process (for example due to a USB disconnect), the download is aborted immediately. An incomplete firmware transfer does not cause the controller to set the download completion flag, but the firmware version information may be updated at an early stage of the download process.
In this case, after USB reconnection, the host attempts to re-download the firmware because the download completion flag is not set. However, since the controller reports the same firmware version as the target firmware, the download is skipped. This ultimately results in the firmware not being properly updated on the controller.
This change removes the restriction that skips firmware download when the versions are equal. It covers scenarios where the USB connection can be disconnected at any time and ensures that firmware download can be retriggered after USB reconnection, allowing the Bluetooth firmware to be correctly and completely updated.
--- drivers/bluetooth/btusb.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/bluetooth/btusb.c +7 -1
@@ -3478,7 +3478,13 @@ static int btusb_setup_qca_load_rampatch"firmware rome 0x%x build 0x%x" , rver_rom, rver_patch, ver_rom, ver_patch); -if (rver_rom != ver_rom || rver_patch <= ver_patch) { +/* Allow rampatch when the patch version equals the firmware version. +* A firmware download may be aborted by a transient USB error (e.g. +* disconnect) after the controller updates version info but before +* completion. +* Allowing equal versions enables re-flashing during recovery. +*/ +if (rver_rom != ver_rom || rver_patch < ver_patch) {bt_dev_err (hdev,"rampatch file version did not match with firmware" ); err = -EINVAL ; goto done;
Greg Kroah-Hartman
maintainerPATCH 120/315 hpfs: fix a crash if hpfs_map_dnode_bitmap fails
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikulas Patocka <[email protected]>
commit 974820a59efde7c1a7e1260bcfe9bb81f833cc9f upstream.
If hpfs_map_dnode_bitmap fails, the code would call hpfs_brelse4 on uninitialized quad buffer head, causing a crash.
--- fs/hpfs/alloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/hpfs/alloc.c +1 -1
@@ -372,8 +372,8 @@ int hpfs_check_free_dnodes(struct super_return 0 ; } } +hpfs_brelse4 (&qbh); } -hpfs_brelse4 (&qbh); i =0 ;if (hpfs_sb (s)->sb_c_bitmap !=-1 ) { bmp =hpfs_map_bitmap (s, b, &qbh,"chkdn1" );
Greg Kroah-Hartman
maintainerPATCH 121/315 mm/damon/sysfs-schemes: delete tried region in regions_rmdirs()
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 441f92f7d386b85bad16de49db95a307cba048a2 upstream.
DAMON sysfs maintains the DAMOS tried region directory objects via a linked list. When the user requests refresh of the directories, DAMON sysfs removes all the region directories first, and then generate updated regions directory on the empty space. The removal function (damon_sysfs_scheme_regions_rm_dirs()) only puts the kobj objects. Deletion of the container region object from the linked list is done inside the kobj release callback function.
If somehow the callback invocation is delayed, the list will contain regions list that gonna be freed. If the updated region directories creation is started in this situation, the list can be corrupted and use-after-free can happen.
Because the kobj objects are managed by only DAMON sysfs, the issue cannot happen in normal situation. But, such delays can be made on kernels that built with CONFIG_DEBUG_KOBJECT_RELEASE. On the kernel, the issue can indeed be reproduced like below.
# damo start --damos_action stat
# cd /sys/kernel/mm/damon/admin/kdamonds/0/
# for i in {1..10}; do echo update_schemes_tried_regions > state; done
# dmesg | grep underflow
[ 89.296152] refcount_t: underflow; use-after-free.Fix the issue by removing the region object from the list when decrementing the reference count.
Also update damos_sysfs_populate_region_dir() to add the region object to the list only after the kobject_init_and_add() is success, so that fail of kobject_init_and_add() is not leaving the deallocated object on the list.
The issue was discovered [1] by Sashiko.
--- mm/damon/sysfs-schemes.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
mm/damon/sysfs-schemes.c +4 -4
@@ -89,7 +89,6 @@ static void damon_sysfs_scheme_region_restruct damon_sysfs_scheme_region *region =container_of (kobj, struct damon_sysfs_scheme_region, kobj); -list_del (®ion->list);kfree (region); }
@@ -166,7 +165,7 @@ static void damon_sysfs_scheme_regions_rstruct damon_sysfs_scheme_region *r, *next;list_for_each_entry_safe (r, next, ®ions->regions_list, list) { -/* release function deletes it from the list */ +list_del (&r->list);kobject_put (&r->kobj); regions->nr_regions--; }
@@ -2767,14 +2766,15 @@ void damos_sysfs_populate_region_dir(strif (!region)return ; region->sz_filter_passed = sz_filter_passed; -list_add_tail (®ion->list, &sysfs_regions->regions_list); - sysfs_regions->nr_regions++;if (kobject_init_and_add (®ion->kobj, &damon_sysfs_scheme_region_ktype, &sysfs_regions->kobj,"%d" , sysfs_regions->nr_regions++)) {kobject_put (®ion->kobj); +return ; } +list_add_tail (®ion->list, &sysfs_regions->regions_list); + sysfs_regions->nr_regions++; } int damon_sysfs_schemes_clear_regions(
Greg Kroah-Hartman
maintainerPATCH 122/315 ipc: limit next_id allocation to the valid ID range
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linpu Yu <[email protected]>
commit fa0b9b2b7ae3539908d69c2b9ac0d144d9bc5139 upstream.
The checkpoint/restore sysctl path can request the next SysV IPC id through ids->next_id. ipc_idr_alloc() currently forwards that request to idr_alloc() with an open-ended upper bound.
If the valid tail of the SysV IPC id space is full, the allocation can spill beyond ipc_mni. The returned SysV IPC id still uses the normal index encoding, so later lookup and removal can target the wrong slot. This leaves the real IDR entry behind and breaks the IDR state for the object.
The bug is in ipc_idr_alloc() in the checkpoint/restore path.
1. ids->next_id is passed to:
idr_alloc(&ids->ipcs_idr, new, ipcid_to_idx(next_id), 0, ...)
2. The zero upper bound makes the allocation effectively open-ended. Once the valid SysV IPC tail is occupied, idr_alloc() can spill past ipc_mni and allocate an entry beyond the valid IPC id range.
3. The new object id is still encoded with the narrower SysV IPC index width:
new->id = (new->seq << ipcmni_seq_shift()) + idx
4. Later removal goes through ipc_rmid(), which uses:
ipcid_to_idx(ipcp->id)
That truncates the real IDR index. An object actually stored at a high index can then be removed as if it lived at a low in-range index.
5. For shared memory, shm_destroy() frees the current object anyway, but the real high IDR slot is left behind as a dangling pointer.
6. A subsequent walk of /proc/sysvipc/shm reaches the stale IDR entry and dereferences freed memory.
Prevent this by bounding the requested allocation to ipc_mni so the checkpoint/restore path fails once the valid range is exhausted.
--- ipc/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
ipc/util.c +1 -1
@@ -253,7 +253,7 @@ static inline int ipc_idr_alloc(struct i }else { new->seq =ipcid_to_seqx (next_id); idx =idr_alloc (&ids->ipcs_idr, new,ipcid_to_idx (next_id), -0 ,GFP_NOWAIT ); + ipc_mni,GFP_NOWAIT ); }if (idx >=0 ) new->id = (new->seq <<ipcmni_seq_shift ()) + idx;
Greg Kroah-Hartman
maintainerPATCH 123/315 mm: memcontrol: propagate NMI slab stats to memcg vmstats
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexandre Ghiti <[email protected]>
commit e16f17a9c5af50221184d1ef4be4056bf3c4209e upstream.
flush_nmi_stats() drains per-node NMI slab atomics into the per-node lruvec_stats, but does not propagate them to the memcg-level vmstats.
For non NMI case, account_slab_nmi_safe() calls mod_memcg_lruvec_state() which updates both per-node lruvec_stats and memcg-level vmstats, so flush_nmi_stats() needs to flush to per-node lruvec_stats as well as memcg-level vmstats.
So fix this by flushing to the memcg-level vmstats for NMI too.
--- mm/memcontrol.c | 6 ++++++ 1 file changed, 6 insertions(+)
mm/memcontrol.c +6 -0
@@ -4044,6 +4044,9 @@ static void flush_nmi_stats(struct mem_c lstats->state[index] += slab;if (plstats) plstats->state_pending[index] += slab; + memcg->vmstats->state[index] += slab; +if (parent) + parent->vmstats->state_pending[index] += slab; }if (atomic_read (&pn->slab_unreclaimable)) {int slab =atomic_xchg (&pn->slab_unreclaimable,0 );
@@ -4052,6 +4055,9 @@ static void flush_nmi_stats(struct mem_c lstats->state[index] += slab;if (plstats) plstats->state_pending[index] += slab; + memcg->vmstats->state[index] += slab; +if (parent) + parent->vmstats->state_pending[index] += slab; } } }
Greg Kroah-Hartman
maintainerPATCH 124/315 memfd: deny writeable mappings when implying SEAL_WRITE
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pratyush Yadav (Google) <[email protected]>
commit 3b041514cb6eae45869b020f743c14d983363222 upstream.
When SEAL_EXEC is added, SEAL_WRITE is implied to make W^X. But the implied seal is set after the check that makes sure the memfd can not have any writable mappings. This means one can use SEAL_EXEC to apply SEAL_WRITE while having writeable mappings.
This breaks the contract that SEAL_WRITE provides and can be used by an attacker to pass a memfd that appears to be write sealed but can still be modified arbitrarily.
Fix this by adding the implied seals before the call for mapping_deny_writable() is done.
--- mm/memfd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
mm/memfd.c +6 -6
@@ -284,6 +284,12 @@ static int memfd_add_seals(struct file * goto unlock; } +/* +* SEAL_EXEC implies SEAL_WRITE, making W^X from the start. +*/ +if (seals &F_SEAL_EXEC && inode->i_mode &0111 ) + seals |=F_SEAL_SHRINK |F_SEAL_GROW |F_SEAL_WRITE |F_SEAL_FUTURE_WRITE ; +if ((seals &F_SEAL_WRITE ) && !(*file_seals &F_SEAL_WRITE )) { error =mapping_deny_writable (file->f_mapping);if (error)
@@ -296,12 +302,6 @@ static int memfd_add_seals(struct file * } } -/* -* SEAL_EXEC implies SEAL_WRITE, making W^X from the start. -*/ -if (seals &F_SEAL_EXEC && inode->i_mode &0111 ) - seals |=F_SEAL_SHRINK |F_SEAL_GROW |F_SEAL_WRITE |F_SEAL_FUTURE_WRITE ; - *file_seals |= seals; error =0 ;
Greg Kroah-Hartman
maintainerPATCH 125/315 mm/rmap: initialize nr_pages to 1 at loop start in try_to_unmap_one
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dev Jain <[email protected]>
commit 3f8968e9cbf95d5d87d32218906cab0b9b9eddbe upstream.
Initialize nr_pages to 1 at the start of each loop iteration, like folio_referenced_one() does.
Without this, nr_pages computed by a previous folio_unmap_pte_batch() call can be reused on a later iteration that does not run folio_unmap_pte_batch() again.
mmap a 64K large folio with MAP_ANONYMOUS | MAP_DROPPABLE, then call madvise(MADV_FREE), then make the last page device-exclusive via HMM_DMIRROR_EXCLUSIVE.
Trigger node reclaim through sysfs. Now, in try_to_unmap_one(), we will first clear the first 15 out of 16 entries mapping the lazyfree folio. This will set nr_pages to 15. In the next pvmw walk, this nr_pages gets reused on a device-exclusive pte, thus potentially corrupting folio refcount/mapcount.
At the moment, I have a userspace program which can make the kernel spit out a trace, but the blow up is in folio_referenced_one(), because there are existing bugs in the interaction between device-private and rmap (which too I am investigating). I did a one liner kernel change to avoid going into folio_referenced_one(), and the kernel blows up at folio_remove_rmap_ptes in try_to_unmap_one which is what I wanted.
Note that the bug is there not since file folio batching but lazyfree folio batching, since device-exclusive only works for anonymous folios.
Userspace visible effect is simply kernel crashing somewhere due to refcount/mapcount corruption.
--- mm/rmap.c | 2 ++ 1 file changed, 2 insertions(+)
mm/rmap.c +2 -0
@@ -1918,6 +1918,8 @@ static bool try_to_unmap_one(struct folimmu_notifier_invalidate_range_start (&range);while (page_vma_mapped_walk (&pvmw)) { + nr_pages =1 ; +/* * If the folio is in an mlock()d vma, we must not swap it out. */
Greg Kroah-Hartman
maintainerPATCH 126/315 auxdisplay: line-display: fix OOB read on zero-length message_store()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stepan Ionichev <[email protected]>
commit a7511dcd9dd4bc55d123f9b800c8a4ed2662e5c6 upstream.
linedisp_display() unconditionally reads msg[count - 1] before checking whether count is zero, so a write of zero bytes to the message sysfs attribute hits msg[-1]:
write(fd, "", 0); -> message_store(..., buf, count=0) -> linedisp_display(linedisp, buf, count=0) -> msg[count - 1] == '\n' ; OOB read
The kernfs write buffer for that store is a 1-byte allocation (kernfs_fop_write_iter() does kmalloc(len + 1) with len == 0), so msg[-1] is a 1-byte read before the slab object. On a KASAN-enabled kernel this trips an out-of-bounds report and panics; on stock kernels it silently reads adjacent slab data and, if that byte happens to be '\n', the following count-- wraps ssize_t 0 to -1 and is then passed to kmemdup_nul().
linedisp_display() is reached from the message_store() sysfs callback (drivers/auxdisplay/line-display.c message attribute, mode 0644) and from the in-tree initial-message setup with count == -1, so the OOB path is only userspace-triggerable via zero-byte writes; vfs_write() does not short-circuit on count == 0 and kernfs_fop_write_iter() dispatches the store callback regardless.
Guard the trailing-newline trim with a count check. The existing if (!count) block then takes the clear-display path unchanged.
Affects every auxdisplay driver that registers via linedisp_register() / linedisp_attach(): ht16k33, max6959, img-ascii-lcd, seg-led-gpio.
--- drivers/auxdisplay/line-display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/auxdisplay/line-display.c +1 -1
@@ -90,7 +90,7 @@ static int linedisp_display(struct lined count =strlen (msg);/* if the string ends with a newline, trim it */ -if (msg[count -1 ] =='\n' ) +if (count && msg[count -1 ] =='\n' ) count--;if (!count) {
Greg Kroah-Hartman
maintainerPATCH 127/315 smb: client: fix uninitialized variable in smb2_writev_callback
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steve French <[email protected]>
commit 9d2491197a00acf8c423512078458c2855102b66 upstream.
compiling with W=2 pointed out that "written may be used uninitialized"
--- fs/smb/client/smb2pdu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/smb/client/smb2pdu.c +1 -1
@@ -4837,7 +4837,7 @@ smb2_writev_callback(struct mid_q_entryunsigned int rreq_debug_id = wdata->rreq->debug_id;unsigned int subreq_debug_index = wdata->subreq.debug_index;ssize_t result =0 ; -size_t written; +size_t written =0 ; WARN_ONCE(wdata->server != mid->server, "wdata server %p != mid server %p",
Greg Kroah-Hartman
maintainerPATCH 128/315 Bluetooth: L2CAP: use chan timer to close channels in cleanup_listen()
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Siwei Zhang <[email protected]>
commit 8c8e620467a7b51562dbcefbd1f09f288d7d710d upstream.
l2cap_chan_close() removes the channel from conn->chan_l, which must be done under conn->lock. cleanup_listen() runs under the parent sk_lock, so acquiring conn->lock would invert the established conn->lock -> chan->lock -> sk_lock order.
Instead of calling l2cap_chan_close() directly, schedule l2cap_chan_timeout with delay 0 to close the channel asynchronously. The timeout handler already acquires conn->lock and chan->lock in the correct order.
The timer is only armed when chan->conn is still set: if it is already NULL, l2cap_conn_del() has already processed this channel (l2cap_chan_del + l2cap_sock_teardown_cb + l2cap_sock_close_cb), so there is nothing left to do. If l2cap_conn_del() races in after the timer is armed, __clear_chan_timer() inside l2cap_chan_del() cancels it; if the timer has already fired, the handler returns harmlessly because chan->conn was cleared.
--- net/bluetooth/l2cap_sock.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
net/bluetooth/l2cap_sock.c +9 -7
@@ -1481,6 +1481,10 @@ static void l2cap_sock_cleanup_listen(st* pin it (hold_unless_zero() additionally skips a chan already past * its last reference). We then drop the sk lock before taking * chan->lock, so sk and chan locks are never held together. +* +* Since we cannot call l2cap_chan_close() without conn->lock, +* schedule l2cap_chan_timeout to close the channel; it already +* acquires conn->lock -> chan->lock in the correct order. */ while ((sk =bt_accept_dequeue (parent,NULL ))) {struct l2cap_chan *chan;
@@ -1498,14 +1502,12 @@ static void l2cap_sock_cleanup_listen(st state_to_string(chan->state));l2cap_chan_lock (chan); -__clear_chan_timer (chan); -l2cap_chan_close (chan,ECONNRESET ); -/* l2cap_conn_del() may already have killed this socket -* (it sets SOCK_DEAD); skip the duplicate to avoid a -* double sock_put()/l2cap_chan_put(). +/* Since we cannot call l2cap_chan_close() without +* conn->lock, schedule its timer to trigger the close +* and cleanup of this channel. */ -if (!sock_flag (sk,SOCK_DEAD )) -l2cap_sock_kill (sk); +if (chan->conn) +__set_chan_timer (chan,0 );l2cap_chan_unlock (chan);l2cap_chan_put (chan);
Greg Kroah-Hartman
maintainerPATCH 129/315 Bluetooth: L2CAP: fix chan ref leak in l2cap_chan_timeout() on !conn
In reply to Greg Kroah-Hartman6.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Siwei Zhang <[email protected]>
commit 9dbd84990394c51f5cee1e8871bb5ff8af5ed939 upstream.
__set_chan_timer() takes a l2cap_chan reference via l2cap_chan_hold() before scheduling the delayed work. The normal path in l2cap_chan_timeout() drops this reference with l2cap_chan_put() at the end, but the early return when chan->conn is NULL skips the put, leaking the reference.
Add the missing l2cap_chan_put() before the early return.
--- net/bluetooth/l2cap_core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/bluetooth/l2cap_core.c +3 -1
@@ -411,8 +411,10 @@ static void l2cap_chan_timeout(struct woBT_DBG ("chan %p state %s" , chan,state_to_string (chan->state)); -if (!conn) +if (!conn) { +l2cap_chan_put (chan);return ; + }mutex_lock (&conn->lock);/* __set_chan_timer() calls l2cap_chan_hold(chan) while scheduling