6.6.134-rc1 review
Subsystems (2)
Greg Kroah-Hartman
maintainercover 6.6.134-rc1 review
This is the start of the stable review cycle for the 6.6.134 release. There are 160 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Fri, 10 Apr 2026 17:58:42 +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.6.134-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.6.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 6.6.134-rc1
Marek Behún <[email protected]>
net: sfp: Fix Ubiquiti U-Fiber Instant SFP module on mvneta
Li Xiasong <[email protected]>
MPTCP: fix lock class name family in pm_nl_create_listen_socket
Theodore Ts'o <[email protected]>
ext4: handle wraparound when searching for blocks for indirect mapped blocks
Li Chen <[email protected]>
ext4: publish jinode after initialization
Joy Zou <[email protected]>
dmaengine: fsl-edma: fix channel parameter config for fixed channel requests
Joy Zou <[email protected]>
dmaengine: fsl-edma: change to guard(mutex) within fsl_edma3_xlate()
Nikunj A Dadhania <[email protected]>
x86/cpu: Enable FSGSBASE early in cpu_init_exception_handling()
Jinjiang Tu <[email protected]>
mm/huge_memory: fix folio isn't locked in softleaf_to_folio()
Josef Bacik <[email protected]>
scsi: target: tcm_loop: Drain commands in target_reset handler
Guangshuo Li <[email protected]>
net: mana: fix use-after-free in add_adev() error path
Willem de Bruijn <[email protected]>
net: correctly handle tunneled traffic on IPV6_CSUM GSO fallback
Kevin Hao <[email protected]>
net: macb: Move devm_{free,request}_irq() out of spin lock area
Jean-Baptiste Maneyrol <[email protected]>
iio: imu: inv_icm42600: fix odr switch when turning buffer off
Alexander Popov <[email protected]>
wifi: virt_wifi: remove SET_NETDEV_DEV to avoid use-after-free
Taegu Ha <[email protected]>
usb: gadget: f_uac1_legacy: validate control request size
Kuen-Han Tsai <[email protected]>
usb: gadget: f_rndis: Protect RNDIS options with mutex
Kuen-Han Tsai <[email protected]>
usb: gadget: f_subset: Fix unbalanced refcnt in geth_free
Jimmy Hu <[email protected]>
usb: gadget: uvc: fix NULL pointer dereference during unbind race
Kuen-Han Tsai <[email protected]>
usb: gadget: u_ether: Fix race between gether_disconnect and eth_stop
Xi Ruoyao <[email protected]>
LoongArch: vDSO: Emit GNU_EH_FRAME correctly
Andrew Price <[email protected]>
gfs2: Validate i_depth for exhash directories
Andrew Price <[email protected]>
gfs2: Improve gfs2_consist_inode() usage
Filipe Manana <[email protected]>
btrfs: do not free data reservation in fallback from inline due to -ENOSPC
Qu Wenruo <[email protected]>
btrfs: fix the qgroup data free range for inline data extents
Sebastian Urban <[email protected]>
usb: gadget: dummy_hcd: fix premature URB completion when ZLP follows partial transfer
Alan Stern <[email protected]>
USB: dummy-hcd: Fix interrupt synchronization error
Alan Stern <[email protected]>
USB: dummy-hcd: Fix locking/synchronization error
Konrad Dybcio <[email protected]>
thunderbolt: Fix property read in nhi_wake_supported()
Xingjing Deng <[email protected]>
misc: fastrpc: possible double-free of cctx->remote_heap
Rafael J. Wysocki <[email protected]>
thermal: core: Fix thermal zone device registration error path
Shenwei Wang <[email protected]>
gpio: mxc: map Both Edge pad wakeup to Rising Edge
Guangshuo Li <[email protected]>
cpufreq: governor: fix double free in cpufreq_dbs_governor_init() error path
Yufan Chen <[email protected]>
net: ftgmac100: fix ring allocation unwind on open failure
Yang Yang <[email protected]>
vxlan: validate ND option lengths in vxlan_na_create
Cosmin Tanislav <[email protected]>
counter: rz-mtu3-cnt: do not use struct rz_mtu3_channel's dev member
Cosmin Tanislav <[email protected]>
counter: rz-mtu3-cnt: prevent counter from being toggled multiple times
Yifan Wu <[email protected]>
netfilter: ipset: drop logically empty buckets in mtype_del
Christian Eggers <[email protected]>
nvmem: imx: assign nvmem_cell_info::raw_len
Xu Yang <[email protected]>
dt-bindings: connector: add pd-disable dependency
Ian Abbott <[email protected]>
comedi: me4000: Fix potential overrun of firmware buffer
Ian Abbott <[email protected]>
comedi: me_daq: Fix potential overrun of firmware buffer
Ian Abbott <[email protected]>
comedi: ni_atmio16d: Fix invalid clean-up after failed attach
Ian Abbott <[email protected]>
comedi: Reinit dev->spinlock between attachments to low-level drivers
Deepanshu Kartikey <[email protected]>
comedi: dt2815: add hardware detection to prevent crash
Oliver Neukum <[email protected]>
cdc-acm: new quirk for EPSON HMD
Yang Yang <[email protected]>
bridge: br_nd_send: validate ND option lengths
Miaohe Lin <[email protected]>
fork: defer linking file vma until vma is fully initialized
Alex Williamson <[email protected]>
vfio/pci: Insert full vma on mmap'd MMIO fault
Alex Williamson <[email protected]>
vfio/pci: Use unmap_mapping_range()
Alex Williamson <[email protected]>
vfio: Create vfio_fs_type with inode per device
Yongchao Wu <[email protected]>
usb: cdns3: gadget: fix state inconsistency on gadget init failure
Yongchao Wu <[email protected]>
usb: cdns3: gadget: fix NULL pointer dereference in ep_queue
Juno Choi <[email protected]>
usb: dwc2: gadget: Fix spin_lock/unlock mismatch in dwc2_hsotg_udc_stop()
Justin Chen <[email protected]>
usb: ehci-brcm: fix sleep during atomic
Heitor Alves de Siqueira <[email protected]>
usb: usbtmc: Flush anchored URBs in usbtmc_release
Guangshuo Li <[email protected]>
usb: ulpi: fix double free in ulpi_register_interface() error path
Miao Li <[email protected]>
usb: quirks: add DELAY_INIT quirk for another Silicon Motion flash drive
Ethan Tidmore <[email protected]>
iio: gyro: mpu3050: Fix out-of-sequence free_irq()
Ethan Tidmore <[email protected]>
iio: gyro: mpu3050: Move iio_device_register() to correct location
Ethan Tidmore <[email protected]>
iio: gyro: mpu3050: Fix irq resource leak
Ethan Tidmore <[email protected]>
iio: gyro: mpu3050: Fix incorrect free_irq() variable
Francesco Lavra <[email protected]>
iio: imu: st_lsm6dsx: Set FIFO ODR for accelerometer and gyroscope only
Josh Poimboeuf <[email protected]>
iio: imu: bmi160: Remove potential undefined behavior in bmi160_config_pin()
David Lechner <[email protected]>
iio: light: vcnl4035: fix scan buffer on big-endian
Antoniu Miclaus <[email protected]>
iio: dac: ad5770r: fix error return in ad5770r_read_raw()
Valek Andrej <[email protected]>
iio: accel: fix ADXL355 temperature signature value
Zoltan Illes <[email protected]>
Input: xpad - add support for Razer Wolverine V3 Pro
Shengyu Qu <[email protected]>
Input: xpad - add support for BETOP BTP-KP50B/C controller's wireless mode
Christoffer Sandberg <[email protected]>
Input: i8042 - add TUXEDO InfinityBook Max 16 Gen10 AMD to i8042 quirk table
Bart Van Assche <[email protected]>
Input: synaptics-rmi4 - fix a locking bug in an error path
David Lechner <[email protected]>
iio: adc: ti-adc161s626: use DMA-safe memory for spi_read()
JP Hein <[email protected]>
USB: core: add NO_LPM quirk for Razer Kiyo Pro webcam
Wanquan Zhong <[email protected]>
USB: serial: option: add support for Rolling Wireless RW135R-GL
Frej Drejhammar <[email protected]>
USB: serial: io_edgeport: add support for Blackbox IC135A
Ville Syrjälä <[email protected]>
drm/i915/dp: Use crtc_state->enhanced_framing properly on ivb/hsw CPU eDP
Thomas Zimmermann <[email protected]>
drm/ast: dp501: Fix initialization of SCU2C
David Lechner <[email protected]>
iio: adc: ti-adc161s626: fix buffer read on big-endian
Stefan Wiehler <[email protected]>
mips: mm: Allocate tlb_vpn array atomically
Sanman Pradhan <[email protected]>
hwmon: (occ) Fix division by zero in occ_show_power_1()
Maciej W. Rozycki <[email protected]>
MIPS: Fix the GCC version check for `__multi3' workaround
Oleh Konko <[email protected]>
Bluetooth: SMP: force responder MITM requirements before building the pairing response
Oleh Konko <[email protected]>
Bluetooth: SMP: derive legacy responder STK authentication from MITM state
Takashi Iwai <[email protected]>
ALSA: ctxfi: Fix missing SPDIFI1 index handling
Berk Cem Goksel <[email protected]>
ALSA: caiaq: fix stack out-of-bounds read in init_card
Ernestas Kulik <[email protected]>
USB: serial: option: add MeiG Smart SRM825WN
Alexey Velichayshiy <[email protected]>
wifi: iwlwifi: mvm: fix potential out-of-bounds read in iwl_mvm_nd_match_info_handler()
Yasuaki Torimaru <[email protected]>
wifi: wilc1000: fix u8 overflow in SSID scan buffer size calculation
Greg Kroah-Hartman <[email protected]>
drm/ioc32: stop speculation on the drm_compat_ioctl path
Paul Walmsley <[email protected]>
riscv: kgdb: fix several debug register assignment bugs
Shiji Yang <[email protected]>
mips: ralink: update CPU clock index
Sanman Pradhan <[email protected]>
hwmon: (occ) Fix missing newline in occ_show_extended()
Sanman Pradhan <[email protected]>
hwmon: (tps53679) Fix device ID comparison and printing in tps53676_identify()
Jamie Gibbons <[email protected]>
dt-bindings: gpio: fix microchip #interrupt-cells
Sanman Pradhan <[email protected]>
hwmon: (pxe1610) Check return value of page-select write in probe
Youssef Samir <[email protected]>
accel/qaic: Handle DBC deactivation if the owner went away
David Lechner <[email protected]>
iio: imu: bno055: fix BNO055_SCAN_CH_COUNT off by one
Qi Tang <[email protected]>
bpf: reject direct access to nullable PTR_TO_BUF pointers
Eric Dumazet <[email protected]>
ipv6: avoid overflows in ip6_datagram_send_ctl()
Luka Gejak <[email protected]>
net: hsr: fix VLAN add unwind on slave errors
Xiang Mei <[email protected]>
net/sched: cls_flow: fix NULL pointer dereference on shared blocks
Xiang Mei <[email protected]>
net/sched: cls_fw: fix NULL pointer dereference on shared blocks
Martin Schiller <[email protected]>
net/x25: Fix overflow when accumulating packets
Martin Schiller <[email protected]>
net/x25: Fix potential double free of skb
Saeed Mahameed <[email protected]>
net/mlx5: Avoid "No data available" when FW version queries fail
Shay Drory <[email protected]>
net/mlx5: lag: Check for LAG device before creating debugfs
Fedor Pchelkin <[email protected]>
net: macb: properly unregister fixed rate clocks
Fedor Pchelkin <[email protected]>
net: macb: fix clk handling on PCI glue driver removal
Yucheng Lu <[email protected]>
net/sched: sch_netem: fix out-of-bounds access in packet corruption
Kuniyuki Iwashima <[email protected]>
bpf: sockmap: Fix use-after-free of sk->sk_socket in sk_psock_verdict_data_ready().
Weiming Shi <[email protected]>
rds: ib: reject FRMR registration before IB connection is established
Keenan Dong <[email protected]>
Bluetooth: MGMT: validate mesh send advertising payload length
Pauli Virtanen <[email protected]>
Bluetooth: hci_event: fix potential UAF in hci_le_remote_conn_param_req_evt
Keenan Dong <[email protected]>
Bluetooth: MGMT: validate LTK enc_size on load
Cen Zhang <[email protected]>
Bluetooth: SCO: fix race conditions in sco_sock_connect()
Pauli Virtanen <[email protected]>
Bluetooth: hci_sync: call destroy in hci_cmd_sync_run if immediate
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: reject immediate NF_QUEUE verdict
Pablo Neira Ayuso <[email protected]>
netfilter: x_tables: restrict xt_check_match/xt_check_target extensions for NFPROTO_ARP
Pablo Neira Ayuso <[email protected]>
netfilter: ctnetlink: ignore explicit helper on new expectations
Pablo Neira Ayuso <[email protected]>
netfilter: nf_conntrack_expect: store netns and zone in expectation
Pablo Neira Ayuso <[email protected]>
netfilter: nf_conntrack_expect: use expect->helper
Pablo Neira Ayuso <[email protected]>
netfilter: nf_conntrack_expect: honor expectation helper field
Qi Tang <[email protected]>
netfilter: ctnetlink: zero expect NAT fields when CTA_EXPECT_NAT absent
Qi Tang <[email protected]>
netfilter: nf_conntrack_helper: pass helper to expect cleanup
Florian Westphal <[email protected]>
netfilter: ipset: use nla_strcmp for IPSET_ATTR_NAME attr
Florian Westphal <[email protected]>
netfilter: x_tables: ensure names are nul-terminated
Florian Westphal <[email protected]>
netfilter: nfnetlink_log: account for netlink header size
Pablo Neira Ayuso <[email protected]>
netfilter: flowtable: strictly check for maximum number of actions
Zhengchuan Liang <[email protected]>
net: ipv6: flowlabel: defer exclusive option free until RCU teardown
Alexei Starovoitov <[email protected]>
bpf: Fix regsafe() for pointers to packet
Suraj Gupta <[email protected]>
net: xilinx: axienet: Correct BD length masks to match AXIDMA IP spec
Pengpeng Hou <[email protected]>
NFC: pn533: bound the UART receive buffer
Yochai Eisenrich <[email protected]>
net: sched: cls_api: fix tc_chain_fill_node to initialize tcm_info to zero to prevent an info-leak
Paolo Abeni <[email protected]>
ipv6: prevent possible UaF in addrconf_permanent_addr()
Jihed Chaibi <[email protected]>
ASoC: ep93xx: Fix unchecked clk_prepare_enable() and add rollback on failure
Xiang Mei <[email protected]>
net/sched: sch_hfsc: fix divide-by-zero in rtsc_min()
Yang Yang <[email protected]>
bridge: br_nd_send: linearize skb before parsing ND options
Eric Dumazet <[email protected]>
ip6_tunnel: clear skb2->cb[] in ip4ip6_err()
Eric Dumazet <[email protected]>
ipv6: icmp: clear skb2->cb[] in ip6_err_gen_icmpv6_unreach()
Thomas Bogendoerfer <[email protected]>
tg3: Fix race for querying speed/duplex
Pengpeng Hou <[email protected]>
net/ipv6: ioam6: prevent schema length wraparound in trace fill
Yochai Eisenrich <[email protected]>
net: ipv6: ndisc: fix ndisc_ra_useropt to initialize nduseropt_padX fields to zero to prevent an info-leak
Jiayuan Chen <[email protected]>
net: qrtr: replace qrtr_tx_flow radix_tree with xarray to fix memory leak
Buday Csaba <[email protected]>
net: fec: fix the PTP periodic output sysfs interface
Norbert Szetei <[email protected]>
crypto: af-alg - fix NULL pointer dereference in scatterwalk
Horia Geantă <[email protected]>
crypto: caam - fix overflow on long hmac keys
Horia Geantă <[email protected]>
crypto: caam - fix DMA corruption on long hmac keys
Reshma Immaculate Rajkumar <[email protected]>
wifi: ath11k: Pass the correct value of each TID during a stop AMPDU session
P Praneesh <[email protected]>
wifi: ath11k: Use dma_alloc_noncoherent for rx_tid buffer allocation
Venkateswara Naralasetty <[email protected]>
wifi: ath11k: skip status ring entry processing
Frank Li <[email protected]>
dt-bindings: auxdisplay: ht16k33: Use unevaluatedProperties to fix common property warning
Praveen Talari <[email protected]>
spi: geni-qcom: Check DMA interrupts early in ISR
ZhengYuan Huang <[email protected]>
btrfs: reject root items with drop_progress and zero drop_level
Mikko Perttunen <[email protected]>
i2c: tegra: Don't mark devices with pins as IRQ safe
Lee Jones <[email protected]>
HID: multitouch: Check to ensure report responses match the request
Josh Poimboeuf <[email protected]>
objtool: Fix Clang jump table detection
Paul SAGE <[email protected]>
tg3: replace placeholder MAC address with device property
Johannes Thumshirn <[email protected]>
btrfs: don't take device_list_mutex when querying zone info
Deepanshu Kartikey <[email protected]>
atm: lec: fix use-after-free in sock_def_readable()
Benoît Sevens <[email protected]>
HID: wacom: fix out-of-bounds read in wacom_intuos_bt_irq
Pepper Gray <[email protected]>
arm64/scs: Fix handling of advance_loc4
-------------
Diffstat:
.../bindings/auxdisplay/holtek,ht16k33.yaml | 2 +- .../bindings/connector/usb-connector.yaml | 1 + .../bindings/gpio/microchip,mpfs-gpio.yaml | 4 +- Makefile | 4 +- arch/arm64/kernel/patch-scs.c | 8 + arch/loongarch/include/asm/linkage.h | 36 +++ arch/loongarch/include/asm/sigframe.h | 9 + arch/loongarch/kernel/asm-offsets.c | 2 + arch/loongarch/kernel/signal.c | 6 +- arch/loongarch/vdso/Makefile | 4 +- arch/loongarch/vdso/sigreturn.S | 6 +- arch/mips/lib/multi3.c | 6 +- arch/mips/mm/tlb-r4k.c | 2 +- arch/mips/ralink/clk.c | 8 +- arch/riscv/kernel/kgdb.c | 7 +- arch/x86/kernel/cpu/common.c | 18 +- crypto/af_alg.c | 4 +- drivers/accel/qaic/qaic_control.c | 47 +++- drivers/comedi/drivers.c | 8 + drivers/comedi/drivers/dt2815.c | 12 + drivers/comedi/drivers/me4000.c | 16 +- drivers/comedi/drivers/me_daq.c | 35 +-- drivers/comedi/drivers/ni_atmio16d.c | 3 +- drivers/counter/rz-mtu3-cnt.c | 67 ++--- drivers/cpufreq/cpufreq_governor.c | 6 +- drivers/crypto/caam/caamalg_qi2.c | 3 +- drivers/crypto/caam/caamhash.c | 3 +- drivers/dma/fsl-edma-main.c | 31 +-- drivers/gpio/gpio-mxc.c | 10 +- drivers/gpu/drm/ast/ast_dp501.c | 2 +- drivers/gpu/drm/drm_ioc32.c | 2 + drivers/gpu/drm/i915/display/g4x_dp.c | 2 +- drivers/hid/hid-multitouch.c | 7 + drivers/hid/wacom_wac.c | 10 + drivers/hwmon/occ/common.c | 19 +- drivers/hwmon/pmbus/pxe1610.c | 5 +- drivers/hwmon/pmbus/tps53679.c | 4 +- drivers/i2c/busses/Kconfig | 2 + drivers/i2c/busses/i2c-tegra.c | 5 +- drivers/iio/accel/adxl355_core.c | 2 +- drivers/iio/adc/ti-adc161s626.c | 41 ++- drivers/iio/dac/ad5770r.c | 2 +- drivers/iio/gyro/mpu3050-core.c | 32 ++- drivers/iio/imu/bmi160/bmi160_core.c | 15 +- drivers/iio/imu/bno055/bno055.c | 2 +- drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c | 3 + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 4 + drivers/iio/light/vcnl4035.c | 18 +- drivers/input/joystick/xpad.c | 5 + drivers/input/rmi4/rmi_f54.c | 4 +- drivers/input/serio/i8042-acpipnpio.h | 7 + drivers/misc/fastrpc.c | 1 + drivers/net/ethernet/broadcom/tg3.c | 13 +- drivers/net/ethernet/cadence/macb_main.c | 13 +- drivers/net/ethernet/cadence/macb_pci.c | 10 +- drivers/net/ethernet/faraday/ftgmac100.c | 28 ++- drivers/net/ethernet/freescale/fec_ptp.c | 3 - drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/fw.c | 49 ++-- .../net/ethernet/mellanox/mlx5/core/lag/debugfs.c | 3 + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 4 +- drivers/net/ethernet/microsoft/mana/mana_en.c | 6 +- drivers/net/ethernet/xilinx/xilinx_axienet.h | 4 +- drivers/net/phy/sfp.c | 7 +- drivers/net/vxlan/vxlan_core.c | 6 +- drivers/net/wireless/ath/ath11k/dp.h | 6 +- drivers/net/wireless/ath/ath11k/dp_rx.c | 210 ++++++++++------ drivers/net/wireless/ath/ath11k/hal.c | 16 +- drivers/net/wireless/ath/ath11k/hal.h | 2 + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 2 +- drivers/net/wireless/microchip/wilc1000/hif.c | 2 +- drivers/net/wireless/virtual/virt_wifi.c | 1 - drivers/nfc/pn533/uart.c | 3 + drivers/nvmem/imx-ocotp-ele.c | 1 + drivers/nvmem/imx-ocotp.c | 1 + drivers/spi/spi-geni-qcom.c | 9 +- drivers/target/loopback/tcm_loop.c | 52 +++- drivers/thermal/thermal_core.c | 1 + drivers/thunderbolt/nhi.c | 2 +- drivers/usb/cdns3/cdns3-gadget.c | 4 + drivers/usb/class/cdc-acm.c | 9 + drivers/usb/class/cdc-acm.h | 1 + drivers/usb/class/usbtmc.c | 3 + drivers/usb/common/ulpi.c | 5 +- drivers/usb/core/quirks.c | 3 + drivers/usb/dwc2/gadget.c | 2 + drivers/usb/gadget/function/f_rndis.c | 9 +- drivers/usb/gadget/function/f_subset.c | 6 + drivers/usb/gadget/function/f_uac1_legacy.c | 47 +++- drivers/usb/gadget/function/f_uvc.c | 39 ++- drivers/usb/gadget/function/u_ether.c | 10 +- drivers/usb/gadget/function/uvc.h | 3 + drivers/usb/gadget/function/uvc_v4l2.c | 5 +- drivers/usb/gadget/udc/dummy_hcd.c | 42 ++-- drivers/usb/host/ehci-brcm.c | 4 +- drivers/usb/serial/io_edgeport.c | 3 + drivers/usb/serial/io_usbvend.h | 1 + drivers/usb/serial/option.c | 4 + drivers/vfio/device_cdev.c | 7 + drivers/vfio/group.c | 7 + drivers/vfio/pci/vfio_pci_core.c | 277 +++++---------------- drivers/vfio/vfio_main.c | 44 ++++ fs/btrfs/inode.c | 6 +- fs/btrfs/tree-checker.c | 17 ++ fs/btrfs/zoned.c | 6 +- fs/ext4/fast_commit.c | 4 +- fs/ext4/inode.c | 15 +- fs/ext4/mballoc.c | 2 + fs/gfs2/dir.c | 37 +-- fs/gfs2/glops.c | 40 +-- fs/gfs2/xattr.c | 28 ++- include/linux/netfilter/ipset/ip_set.h | 2 +- include/linux/swapops.h | 20 +- include/linux/vfio.h | 1 + include/linux/vfio_pci_core.h | 2 - include/net/netfilter/nf_conntrack_expect.h | 20 +- kernel/bpf/verifier.c | 10 +- kernel/fork.c | 29 +-- net/atm/lec.c | 72 ++++-- net/atm/lec.h | 2 +- net/bluetooth/hci_event.c | 33 ++- net/bluetooth/hci_sync.c | 11 +- net/bluetooth/mgmt.c | 17 +- net/bluetooth/sco.c | 30 ++- net/bluetooth/smp.c | 11 +- net/bridge/br_arp_nd_proxy.c | 18 +- net/core/dev.c | 22 +- net/core/skmsg.c | 13 +- net/hsr/hsr_device.c | 32 +-- net/ipv6/addrconf.c | 6 +- net/ipv6/datagram.c | 10 + net/ipv6/icmp.c | 3 + net/ipv6/ioam6.c | 4 +- net/ipv6/ip6_flowlabel.c | 5 - net/ipv6/ip6_tunnel.c | 5 + net/ipv6/ndisc.c | 3 + net/mptcp/pm_netlink.c | 2 +- net/netfilter/ipset/ip_set_core.c | 4 +- net/netfilter/ipset/ip_set_hash_gen.h | 2 +- net/netfilter/ipset/ip_set_list_set.c | 4 +- net/netfilter/nf_conntrack_broadcast.c | 8 +- net/netfilter/nf_conntrack_expect.c | 25 +- net/netfilter/nf_conntrack_h323_main.c | 12 +- net/netfilter/nf_conntrack_helper.c | 13 +- net/netfilter/nf_conntrack_netlink.c | 87 +++---- net/netfilter/nf_conntrack_sip.c | 4 +- net/netfilter/nf_flow_table_offload.c | 196 ++++++++++----- net/netfilter/nf_tables_api.c | 7 +- net/netfilter/nfnetlink_log.c | 2 +- net/netfilter/x_tables.c | 23 ++ net/netfilter/xt_cgroup.c | 6 + net/netfilter/xt_rateest.c | 5 + net/qrtr/af_qrtr.c | 31 +-- net/rds/ib_rdma.c | 7 +- net/sched/cls_api.c | 1 + net/sched/cls_flow.c | 10 +- net/sched/cls_fw.c | 14 +- net/sched/sch_hfsc.c | 4 +- net/sched/sch_netem.c | 5 +- net/x25/x25_in.c | 9 +- net/x25/x25_subr.c | 1 + sound/pci/ctxfi/ctdaio.c | 1 + sound/soc/cirrus/ep93xx-i2s.c | 34 ++- sound/usb/caiaq/device.c | 2 +- tools/objtool/check.c | 5 +- 165 files changed, 1668 insertions(+), 947 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/160 arm64/scs: Fix handling of advance_loc4
6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pepper Gray <[email protected]>
[ Upstream commit d499e9627d70b1269020d59b95ed3e18bee6b8cd ]
DW_CFA_advance_loc4 is defined but no handler is implemented. Its CFA opcode defaults to EDYNSCS_INVALID_CFA_OPCODE triggering an error which wrongfully prevents modules from loading.
--- arch/arm64/kernel/patch-scs.c | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm64/kernel/patch-scs.c +8 -0
@@ -171,6 +171,14 @@ static int noinstr scs_handle_fde_frame(const struct eh_frame *frame, size -=2 ;break ; +case DW_CFA_advance_loc4: + loc += *opcode++ * code_alignment_factor; + loc += (*opcode++ <<8 ) * code_alignment_factor; + loc += (*opcode++ <<16 ) * code_alignment_factor; + loc += (*opcode++ <<24 ) * code_alignment_factor; + size -=4 ; +break ; +case DW_CFA_def_cfa:case DW_CFA_offset_extended: size =skip_xleb128 (&opcode, size);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 2/160 HID: wacom: fix out-of-bounds read in wacom_intuos_bt_irq
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benoît Sevens <[email protected]>
[ Upstream commit 2f1763f62909ccb6386ac50350fa0abbf5bb16a9 ]
The wacom_intuos_bt_irq() function processes Bluetooth HID reports without sufficient bounds checking. A maliciously crafted short report can trigger an out-of-bounds read when copying data into the wacom structure.
Specifically, report 0x03 requires at least 22 bytes to safely read the processed data and battery status, while report 0x04 (which falls through to 0x03) requires 32 bytes.
Add explicit length checks for these report IDs and log a warning if a short report is received.
--- drivers/hid/wacom_wac.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/hid/wacom_wac.c +10 -0
@@ -1256,10 +1256,20 @@ static int wacom_intuos_bt_irq(struct wacom_wac *wacom, size_t len)switch (data[0 ]) {case 0x04 : +if (len <32 ) { +dev_warn (wacom->pen_input->dev.parent, +"Report 0x04 too short: %zu bytes\n" , len); +break ; + }wacom_intuos_bt_process_data (wacom, data + i); i +=10 ; fallthrough;case 0x03 : +if (i ==1 && len <22 ) { +dev_warn (wacom->pen_input->dev.parent, +"Report 0x03 too short: %zu bytes\n" , len); +break ; + }wacom_intuos_bt_process_data (wacom, data + i); i +=10 ;wacom_intuos_bt_process_data (wacom, data + i);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 3/160 atm: lec: fix use-after-free in sock_def_readable()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Deepanshu Kartikey <[email protected]>
[ Upstream commit 922814879542c2e397b0e9641fd36b8202a8e555 ]
A race condition exists between lec_atm_close() setting priv->lecd to NULL and concurrent access to priv->lecd in send_to_lecd(), lec_handle_bridge(), and lec_atm_send(). When the socket is freed via RCU while another thread is still using it, a use-after-free occurs in sock_def_readable() when accessing the socket's wait queue.
The root cause is that lec_atm_close() clears priv->lecd without any synchronization, while callers dereference priv->lecd without any protection against concurrent teardown.
Fix this by converting priv->lecd to an RCU-protected pointer:
- Mark priv->lecd as __rcu in lec.h
- Use rcu_assign_pointer() in lec_atm_close() and lecd_attach() for safe pointer assignment
- Use rcu_access_pointer() for NULL checks that do not dereference the pointer in lec_start_xmit(), lec_push(), send_to_lecd() and lecd_attach()
- Use rcu_read_lock/rcu_dereference/rcu_read_unlock in send_to_lecd(), lec_handle_bridge() and lec_atm_send() to safely access lecd
- Use rcu_assign_pointer() followed by synchronize_rcu() in lec_atm_close() to ensure all readers have completed before proceeding. This is safe since lec_atm_close() is called from vcc_release() which holds lock_sock(), a sleeping lock.
- Remove the manual sk_receive_queue drain from lec_atm_close() since vcc_destroy_socket() already drains it after lec_atm_close() returns.
v2: Switch from spinlock + sock_hold/put approach to RCU to properly
fix the race. The v1 spinlock approach had two issues pointed out by Eric Dumazet:
1. priv->lecd was still accessed directly after releasing the lock instead of using a local copy.
2. The spinlock did not prevent packets being queued after lec_atm_close() drains sk_receive_queue since timer and workqueue paths bypass netif_stop_queue().
Note: Syzbot patch testing was attempted but the test VM terminated
unexpectedly with "Connection to localhost closed by remote host", likely due to a QEMU AHCI emulation issue unrelated to this fix. Compile testing with "make W=1 net/atm/lec.o" passes cleanly.
--- net/atm/lec.c | 72 +++++++++++++++++++++++++++++++++------------------ net/atm/lec.h | 2 +- 2 files changed, 48 insertions(+), 26 deletions(-)
net/atm/lec.c +47 -25
@@ -154,10 +154,19 @@ static void lec_handle_bridge(struct sk_buff *skb, struct net_device *dev)/* 0x01 is topology change */ priv =netdev_priv (dev); -atm_force_charge (priv->lecd, skb2->truesize); - sk =sk_atm (priv->lecd); -skb_queue_tail (&sk->sk_receive_queue, skb2); - sk->sk_data_ready(sk); +struct atm_vcc *vcc; + +rcu_read_lock (); + vcc =rcu_dereference (priv->lecd); +if (vcc) { +atm_force_charge (vcc, skb2->truesize); + sk =sk_atm (vcc); +skb_queue_tail (&sk->sk_receive_queue, skb2); + sk->sk_data_ready (sk); + }else { +dev_kfree_skb (skb2); + } + rcu_read_unlock(); } }#endif /* IS_ENABLED(CONFIG_BRIDGE) */
@@ -216,7 +225,7 @@ static netdev_tx_t lec_start_xmit(struct sk_buff *skb,int is_rdesc;pr_debug ("called\n" ); -if (!priv->lecd) { +if (!rcu_access_pointer (priv->lecd)) {pr_info ("%s:No lecd attached\n" , dev->name); dev->stats.tx_errors++;netif_stop_queue (dev);
@@ -449,10 +458,19 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)break ; skb2->len =sizeof (struct atmlec_msg );skb_copy_to_linear_data (skb2, mesg,sizeof (*mesg)); -atm_force_charge (priv->lecd, skb2->truesize); - sk =sk_atm (priv->lecd); -skb_queue_tail (&sk->sk_receive_queue, skb2); - sk->sk_data_ready(sk); +struct atm_vcc *vcc; + +rcu_read_lock (); + vcc =rcu_dereference (priv->lecd); +if (vcc) { +atm_force_charge (vcc, skb2->truesize); + sk =sk_atm (vcc); +skb_queue_tail (&sk->sk_receive_queue, skb2); + sk->sk_data_ready (sk); + }else { +dev_kfree_skb (skb2); + } + rcu_read_unlock(); } }#endif /* IS_ENABLED(CONFIG_BRIDGE) */
@@ -468,23 +486,16 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb)static void lec_atm_close (struct atm_vcc *vcc) { -struct sk_buff *skb;struct net_device *dev = (struct net_device *)vcc->proto_data;struct lec_priv *priv =netdev_priv (dev); - priv->lecd =NULL ; +rcu_assign_pointer (priv->lecd,NULL ); +synchronize_rcu ();/* Do something needful? */ netif_stop_queue (dev);lec_arp_destroy (priv); -if (skb_peek (&sk_atm (vcc)->sk_receive_queue)) -pr_info ("%s closing with messages pending\n" , dev->name); -while ((skb =skb_dequeue (&sk_atm (vcc)->sk_receive_queue))) { -atm_return (vcc, skb->truesize); -dev_kfree_skb (skb); - } -pr_info ("%s: Shut down!\n" , dev->name);module_put (THIS_MODULE ); }
@@ -510,12 +521,14 @@ send_to_lecd(struct lec_priv *priv, atmlec_msg_type type, const unsigned char *mac_addr, const unsigned char *atm_addr, struct sk_buff *data) { + struct atm_vcc *vcc;struct sock *sk;struct sk_buff *skb;struct atmlec_msg *mesg; -if (!priv || !priv->lecd) +if (!priv || !rcu_access_pointer (priv->lecd))return -1 ; + skb =alloc_skb (sizeof (struct atmlec_msg ),GFP_ATOMIC );if (!skb)return -1 ;
@@ -532,18 +545,27 @@ send_to_lecd(struct lec_priv *priv, atmlec_msg_type type,if (atm_addr)memcpy (&mesg->content.normal.atm_addr, atm_addr,ATM_ESA_LEN ); -atm_force_charge (priv->lecd, skb->truesize); - sk =sk_atm (priv->lecd); +rcu_read_lock (); + vcc =rcu_dereference (priv->lecd); +if (!vcc) { +rcu_read_unlock (); +kfree_skb (skb); +return -1 ; + } + +atm_force_charge (vcc, skb->truesize); + sk =sk_atm (vcc);skb_queue_tail (&sk->sk_receive_queue, skb); sk->sk_data_ready (sk);if (data !=NULL ) {pr_debug ("about to send %d bytes of data\n" , data->len); -atm_force_charge (priv->lecd, data->truesize); +atm_force_charge (vcc, data->truesize);skb_queue_tail (&sk->sk_receive_queue, data); sk->sk_data_ready (sk); } +rcu_read_unlock ();return 0 ; }
@@ -618,7 +640,7 @@ static void lec_push(struct atm_vcc *vcc, struct sk_buff *skb)atm_return (vcc, skb->truesize);if (*(__be16 *) skb->data ==htons (priv->lecid) || - !priv->lecd || !(dev->flags &IFF_UP )) { + !rcu_access_pointer (priv->lecd) || !(dev->flags &IFF_UP )) {/* * Probably looping back, or if lecd is missing, * lecd has gone down
@@ -753,12 +775,12 @@ static int lecd_attach(struct atm_vcc *vcc, int arg) priv =netdev_priv (dev_lec[i]); }else { priv =netdev_priv (dev_lec[i]); -if (priv->lecd) +if (rcu_access_pointer (priv->lecd))return -EADDRINUSE ; }lec_arp_init (priv); priv->itfnum = i;/* LANE2 addition */ - priv->lecd = vcc; +rcu_assign_pointer (priv->lecd, vcc); vcc->dev = &lecatm_dev;vcc_insert_socket (sk_atm (vcc));
net/atm/lec.h +1 -1
@@ -91,7 +91,7 @@ struct lec_priv {*/ spinlock_t lec_arp_lock;struct atm_vcc *mcast_vcc;/* Default Multicast Send VCC */ -struct atm_vcc *lecd; +struct atm_vcc __rcu *lecd;struct delayed_work lec_arp_work;/* C10 */ unsigned int maximum_unknown_frame_count;/*
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 4/160 btrfs: dont take device_list_mutex when querying zone info
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Thumshirn <[email protected]>
[ Upstream commit 77603ab10429fe713a03345553ca8dbbfb1d91c6 ]
Shin'ichiro reported sporadic hangs when running generic/013 in our CI system. When enabling lockdep, there is a lockdep splat when calling btrfs_get_dev_zone_info_all_devices() in the mount path that can be triggered by i.e. generic/013:
======================================================
WARNING: possible circular locking dependency detected
7.0.0-rc1+ #355 Not tainted
------------------------------------------------------
mount/1043 is trying to acquire lock:
ffff8881020b5470 (&vblk->vdev_mutex){+.+.}-{4:4}, at: virtblk_report_zones+0xda/0x430
but task is already holding lock:
ffff888102a738e0 (&fs_devs->device_list_mutex){+.+.}-{4:4}, at: btrfs_get_dev_zone_info_all_devices+0x45/0x90
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #4 (&fs_devs->device_list_mutex){+.+.}-{4:4}:
__mutex_lock+0xa3/0x1360 btrfs_create_pending_block_groups+0x1f4/0x9d0 __btrfs_end_transaction+0x3e/0x2e0 btrfs_zoned_reserve_data_reloc_bg+0x2f8/0x390 open_ctree+0x1934/0x23db btrfs_get_tree.cold+0x105/0x26c vfs_get_tree+0x28/0xb0 __do_sys_fsconfig+0x324/0x680 do_syscall_64+0x92/0x4f0 entry_SYSCALL_64_after_hwframe+0x76/0x7e
-> #3 (btrfs_trans_num_extwriters){++++}-{0:0}:
join_transaction+0xc2/0x5c0 start_transaction+0x17c/0xbc0 btrfs_zoned_reserve_data_reloc_bg+0x2b4/0x390 open_ctree+0x1934/0x23db btrfs_get_tree.cold+0x105/0x26c vfs_get_tree+0x28/0xb0 __do_sys_fsconfig+0x324/0x680 do_syscall_64+0x92/0x4f0 entry_SYSCALL_64_after_hwframe+0x76/0x7e
-> #2 (btrfs_trans_num_writers){++++}-{0:0}:
lock_release+0x163/0x4b0 __btrfs_end_transaction+0x1c7/0x2e0 btrfs_dirty_inode+0x6f/0xd0 touch_atime+0xe5/0x2c0 btrfs_file_mmap_prepare+0x65/0x90 __mmap_region+0x4b9/0xf00 mmap_region+0xf7/0x120 do_mmap+0x43d/0x610 vm_mmap_pgoff+0xd6/0x190 ksys_mmap_pgoff+0x7e/0xc0 do_syscall_64+0x92/0x4f0 entry_SYSCALL_64_after_hwframe+0x76/0x7e
-> #1 (&mm->mmap_lock){++++}-{4:4}:
__might_fault+0x68/0xa0 _copy_to_user+0x22/0x70 blkdev_copy_zone_to_user+0x22/0x40 virtblk_report_zones+0x282/0x430 blkdev_report_zones_ioctl+0xfd/0x130 blkdev_ioctl+0x20f/0x2c0 __x64_sys_ioctl+0x86/0xd0 do_syscall_64+0x92/0x4f0 entry_SYSCALL_64_after_hwframe+0x76/0x7e
-> #0 (&vblk->vdev_mutex){+.+.}-{4:4}:
__lock_acquire+0x1522/0x2680 lock_acquire+0xd5/0x2f0 __mutex_lock+0xa3/0x1360 virtblk_report_zones+0xda/0x430 blkdev_report_zones_cached+0x162/0x190 btrfs_get_dev_zones+0xdc/0x2e0 btrfs_get_dev_zone_info+0x219/0xe80 btrfs_get_dev_zone_info_all_devices+0x62/0x90 open_ctree+0x1200/0x23db btrfs_get_tree.cold+0x105/0x26c vfs_get_tree+0x28/0xb0 __do_sys_fsconfig+0x324/0x680 do_syscall_64+0x92/0x4f0 entry_SYSCALL_64_after_hwframe+0x76/0x7e
other info that might help us debug this:
Chain exists of:
&vblk->vdev_mutex --> btrfs_trans_num_extwriters --> &fs_devs->device_list_mutex
Possible unsafe locking scenario: CPU0 CPU1
---- ----
lock(&fs_devs->device_list_mutex);
lock(btrfs_trans_num_extwriters);
lock(&fs_devs->device_list_mutex);
lock(&vblk->vdev_mutex);*** DEADLOCK ***
3 locks held by mount/1043:
#0: ffff88811063e878 (&fc->uapi_mutex){+.+.}-{4:4}, at: __do_sys_fsconfig+0x2ae/0x680
#1: ffff88810cb9f0e8 (&type->s_umount_key#31/1){+.+.}-{4:4}, at: alloc_super+0xc0/0x3e0
#2: ffff888102a738e0 (&fs_devs->device_list_mutex){+.+.}-{4:4}, at: btrfs_get_dev_zone_info_all_devices+0x45/0x90
stack backtrace: CPU: 2 UID: 0 PID: 1043 Comm: mount Not tainted 7.0.0-rc1+ #355 PREEMPT(full) Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.17.0-9.fc43 06/10/2025 Call Trace: <TASK> dump_stack_lvl+0x5b/0x80 print_circular_bug.cold+0x18d/0x1d8 check_noncircular+0x10d/0x130 __lock_acquire+0x1522/0x2680 ? vmap_small_pages_range_noflush+0x3ef/0x820 lock_acquire+0xd5/0x2f0 ? virtblk_report_zones+0xda/0x430 ? lock_is_held_type+0xcd/0x130 __mutex_lock+0xa3/0x1360 ? virtblk_report_zones+0xda/0x430 ? virtblk_report_zones+0xda/0x430 ? __pfx_copy_zone_info_cb+0x10/0x10 ? virtblk_report_zones+0xda/0x430 virtblk_report_zones+0xda/0x430 ? __pfx_copy_zone_info_cb+0x10/0x10 blkdev_report_zones_cached+0x162/0x190 ? __pfx_copy_zone_info_cb+0x10/0x10 btrfs_get_dev_zones+0xdc/0x2e0 btrfs_get_dev_zone_info+0x219/0xe80 btrfs_get_dev_zone_info_all_devices+0x62/0x90 open_ctree+0x1200/0x23db btrfs_get_tree.cold+0x105/0x26c ? rcu_is_watching+0x18/0x50 vfs_get_tree+0x28/0xb0 __do_sys_fsconfig+0x324/0x680 do_syscall_64+0x92/0x4f0 entry_SYSCALL_64_after_hwframe+0x76/0x7e RIP: 0033:0x7f615e27a40e RSP: 002b:00007fff11b18fb8 EFLAGS: 00000246 ORIG_RAX: 00000000000001af RAX: ffffffffffffffda RBX: 000055572e92ab10 RCX: 00007f615e27a40e RDX: 0000000000000000 RSI: 0000000000000006 RDI: 0000000000000003 RBP: 00007fff11b19100 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 000055572e92bc40 R14: 00007f615e3faa60 R15: 000055572e92bd08 </TASK>
Don't hold the device_list_mutex while calling into btrfs_get_dev_zone_info() in btrfs_get_dev_zone_info_all_devices() to mitigate the issue. This is safe, as no other thread can touch the device list at the moment of execution.
--- fs/btrfs/zoned.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/btrfs/zoned.c +4 -2
@@ -342,7 +342,10 @@ int btrfs_get_dev_zone_info_all_devices(struct btrfs_fs_info *fs_info)if (!btrfs_fs_incompat (fs_info,ZONED ))return 0 ; -mutex_lock (&fs_devices->device_list_mutex); +/* +* No need to take the device_list mutex here, we're still in the mount +* path and devices cannot be added to or removed from the list yet. +*/ list_for_each_entry (device, &fs_devices->devices, dev_list) {/* We can skip reading of zone info for missing devices */ if (!device->bdev)
@@ -352,7 +355,6 @@ int btrfs_get_dev_zone_info_all_devices(struct btrfs_fs_info *fs_info)if (ret)break ; } -mutex_unlock (&fs_devices->device_list_mutex);return ret; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 5/160 tg3: replace placeholder MAC address with device property
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul SAGE <[email protected]>
[ Upstream commit e4c00ba7274b613e3ab19e27eb009f0ec2e28379 ]
On some systems (e.g. iMac 20,1 with BCM57766), the tg3 driver reads a default placeholder mac address (00:10:18:00:00:00) from the mailbox. The correct value on those systems are stored in the 'local-mac-address' property.
This patch, detect the default value and tries to retrieve the correct address from the device_get_mac_address function instead.
The patch has been tested on two different systems:
- iMac 20,1 (BCM57766) model which use the local-mac-address property
- iMac 13,2 (BCM57766) model which can use the mailbox, NVRAM or MAC control registers
--- drivers/net/ethernet/broadcom/tg3.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/net/ethernet/broadcom/tg3.c +11 -0
@@ -16945,6 +16945,13 @@ static int tg3_get_invariants(struct tg3 *tp, const struct pci_device_id *ent)return err; } +static int tg3_is_default_mac_address (u8 *addr) +{ +static const u8 default_mac_address[ETH_ALEN ] = {0x00 ,0x10 ,0x18 ,0x00 ,0x00 ,0x00 }; + +return ether_addr_equal (default_mac_address, addr); +} +static int tg3_get_device_address (struct tg3 *tp,u8 *addr) {u32 hi, lo, mac_offset;
@@ -17016,6 +17023,10 @@ static int tg3_get_device_address(struct tg3 *tp, u8 *addr)if (!is_valid_ether_addr (addr))return -EINVAL ; + +if (tg3_is_default_mac_address (addr)) +return device_get_mac_address (&tp->pdev->dev, addr); +return 0 ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 6/160 objtool: Fix Clang jump table detection
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Poimboeuf <[email protected]>
[ Upstream commit 4e5019216402ad0b4a84cff457b662d26803f103 ]
With Clang, there can be a conditional forward jump between the load of the jump table address and the indirect branch.
Fixes the following warning:
vmlinux.o: warning: objtool: ___bpf_prog_run+0x1c5: sibling call from callable instruction with modified stack frame
--- tools/objtool/check.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
tools/objtool/check.c +2 -3
@@ -2136,12 +2136,11 @@ static void mark_func_jump_tables(struct objtool_file *file, last = insn;/* -* Store back-pointers for unconditional forward jumps such +* Store back-pointers for forward jumps such * that find_jump_table() can back-track using those and * avoid some potentially confusing code. */ -if (insn->type ==INSN_JUMP_UNCONDITIONAL && insn->jump_dest && - insn->offset > last->offset && +if (insn->jump_dest && insn->jump_dest->offset > insn->offset && !insn->jump_dest->first_jump_src) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 7/160 HID: multitouch: Check to ensure report responses match the request
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lee Jones <[email protected]>
[ Upstream commit e716edafedad4952fe3a4a273d2e039a84e8681a ]
It is possible for a malicious (or clumsy) device to respond to a specific report's feature request using a completely different report ID. This can cause confusion in the HID core resulting in nasty side-effects such as OOB writes.
Add a check to ensure that the report ID in the response, matches the one that was requested. If it doesn't, omit reporting the raw event and return early.
--- drivers/hid/hid-multitouch.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/hid/hid-multitouch.c +7 -0
@@ -472,12 +472,19 @@ static void mt_get_feature(struct hid_device *hdev, struct hid_report *report)dev_warn (&hdev->dev,"failed to fetch feature %d\n" , report->id); }else { +/* The report ID in the request and the response should match */ +if (report->id != buf[0 ]) { +hid_err (hdev,"Returned feature report did not match the request\n" ); + goto free; + } + ret =hid_report_raw_event (hdev,HID_FEATURE_REPORT , buf, size,0 );if (ret)dev_warn (&hdev->dev,"failed to report feature\n" ); } +free:kfree (buf); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 8/160 i2c: tegra: Dont mark devices with pins as IRQ safe
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikko Perttunen <[email protected]>
[ Upstream commit ec69c9e88315c4be70c283f18c2ff130da6320b5 ]
I2C devices with associated pinctrl states (DPAUX I2C controllers) will change pinctrl state during runtime PM. This requires taking a mutex, so these devices cannot be marked as IRQ safe.
Add PINCTRL as dependency to avoid build errors.
--- drivers/i2c/busses/Kconfig | 2 ++ drivers/i2c/busses/i2c-tegra.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-)
drivers/i2c/busses/Kconfig +2 -0
@@ -1139,6 +1139,8 @@ config I2C_TEGRA tristate "NVIDIA Tegra internal I2C controller" depends on ARCH_TEGRA || (COMPILE_TEST && (ARC || ARM || ARM64 || M68K || RISCV || SUPERH || SPARC)) # COMPILE_TEST needs architectures with readsX()/writesX() primitives + depends on PINCTRL + # ARCH_TEGRA implies PINCTRL, but the COMPILE_TEST side doesn't. help If you say yes to this option, support will be included for the I2C controller embedded in NVIDIA Tegra SOCs
drivers/i2c/busses/i2c-tegra.c +4 -1
@@ -1788,8 +1788,11 @@ static int tegra_i2c_probe(struct platform_device *pdev)* * VI I2C device shouldn't be marked as IRQ-safe because VI I2C won't * be used for atomic transfers. ACPI device is not IRQ safe also. +* +* Devices with pinctrl states cannot be marked IRQ-safe as the pinctrl +* state transitions during runtime PM require mutexes. */ -if (!IS_VI (i2c_dev) && !has_acpi_companion (i2c_dev->dev)) +if (!IS_VI (i2c_dev) && !has_acpi_companion (i2c_dev->dev) && !i2c_dev->dev->pins)pm_runtime_irq_safe (i2c_dev->dev);pm_runtime_enable (i2c_dev->dev);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 9/160 btrfs: reject root items with drop_progress and zero drop_level
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: ZhengYuan Huang <[email protected]>
[ Upstream commit b17b79ff896305fd74980a5f72afec370ee88ca4 ]
[BUG]
When recovering relocation at mount time, merge_reloc_root() and btrfs_drop_snapshot() both use BUG_ON(level == 0) to guard against an impossible state: a non-zero drop_progress combined with a zero drop_level in a root_item, which can be triggered:
------------[ cut here ]------------ kernel BUG at fs/btrfs/relocation.c:1545! Oops: invalid opcode: 0000 [#1] SMP KASAN NOPTI CPU: 1 UID: 0 PID: 283 ... Tainted: 6.18.0+ #16 PREEMPT(voluntary) Tainted: [O]=OOT_MODULE, [E]=UNSIGNED_MODULE Hardware name: QEMU Ubuntu 24.04 PC v2, BIOS 1.16.3-debian-1.16.3-2 RIP: 0010:merge_reloc_root+0x1266/0x1650 fs/btrfs/relocation.c:1545 Code: ffff0000 00004589 d7e9acfa ffffe8a1 79bafebe 02000000 Call Trace: merge_reloc_roots+0x295/0x890 fs/btrfs/relocation.c:1861 btrfs_recover_relocation+0xd6e/0x11d0 fs/btrfs/relocation.c:4195 btrfs_start_pre_rw_mount+0xa4d/0x1810 fs/btrfs/disk-io.c:3130 open_ctree+0x5824/0x5fe0 fs/btrfs/disk-io.c:3640 btrfs_fill_super fs/btrfs/super.c:987 [inline] btrfs_get_tree_super fs/btrfs/super.c:1951 [inline] btrfs_get_tree_subvol fs/btrfs/super.c:2094 [inline] btrfs_get_tree+0x111c/0x2190 fs/btrfs/super.c:2128 vfs_get_tree+0x9a/0x370 fs/super.c:1758 fc_mount fs/namespace.c:1199 [inline] do_new_mount_fc fs/namespace.c:3642 [inline] do_new_mount fs/namespace.c:3718 [inline] path_mount+0x5b8/0x1ea0 fs/namespace.c:4028 do_mount fs/namespace.c:4041 [inline] __do_sys_mount fs/namespace.c:4229 [inline] __se_sys_mount fs/namespace.c:4206 [inline] __x64_sys_mount+0x282/0x320 fs/namespace.c:4206 ... RIP: 0033:0x7f969c9a8fde Code: 0f1f4000 48c7c2b0 fffffff7 d8648902 b8ffffff ffc3660f ---[ end trace 0000000000000000 ]---
The bug is reproducible on 7.0.0-rc2-next-20260310 with our dynamic metadata fuzzing tool that corrupts btrfs metadata at runtime.
[CAUSE]
A non-zero drop_progress.objectid means an interrupted btrfs_drop_snapshot() left a resume point on disk, and in that case drop_level must be greater than 0 because the checkpoint is only saved at internal node levels.
Although this invariant is enforced when the kernel writes the root item, it is not validated when the root item is read back from disk. That allows on-disk corruption to provide an invalid state with drop_progress.objectid != 0 and drop_level == 0.
When relocation recovery later processes such a root item, merge_reloc_root() reads drop_level and hits BUG_ON(level == 0). The same invalid metadata can also trigger the corresponding BUG_ON() in btrfs_drop_snapshot().
[FIX]
Fix this by validating the root_item invariant in tree-checker when reading root items from disk: if drop_progress.objectid is non-zero, drop_level must also be non-zero. Reject such malformed metadata with -EUCLEAN before it reaches merge_reloc_root() or btrfs_drop_snapshot() and triggers the BUG_ON.
After the fix, the same corruption is correctly rejected by tree-checker and the BUG_ON is no longer triggered.
--- fs/btrfs/tree-checker.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
fs/btrfs/tree-checker.c +17 -0
@@ -1224,6 +1224,23 @@ static int check_root_item(struct extent_buffer *leaf, struct btrfs_key *key, btrfs_root_drop_level(&ri), BTRFS_MAX_LEVEL - 1);return -EUCLEAN ; } +/* +* If drop_progress.objectid is non-zero, a btrfs_drop_snapshot() was +* interrupted and the resume point was recorded in drop_progress and +* drop_level. In that case drop_level must be >= 1: level 0 is the +* leaf level and drop_snapshot never saves a checkpoint there (it +* only records checkpoints at internal node levels in DROP_REFERENCE +* stage). A zero drop_level combined with a non-zero drop_progress +* objectid indicates on-disk corruption and would cause a BUG_ON in +* merge_reloc_root() and btrfs_drop_snapshot() at mount time. +*/ +if (unlikely (btrfs_disk_key_objectid (&ri.drop_progress) !=0 && +btrfs_root_drop_level (&ri) ==0 )) { +generic_err (leaf, slot, +"invalid root drop_level 0 with non-zero drop_progress objectid %llu" , +btrfs_disk_key_objectid (&ri.drop_progress)); +return -EUCLEAN ; + }/* Flags check */ if (unlikely (btrfs_root_flags (&ri) & ~valid_root_flags)) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 10/160 spi: geni-qcom: Check DMA interrupts early in ISR
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Praveen Talari <[email protected]>
[ Upstream commit 8c89a077ca796a2fe248c584e9d7e66cff0388c8 ]
The current interrupt handler only checks the GENI main IRQ status (m_irq) before deciding to return IRQ_NONE. This can lead to spurious IRQ_NONE returns when DMA interrupts are pending but m_irq is zero.
Move the DMA TX/RX status register reads to the beginning of the ISR, right after reading m_irq. Update the early return condition to check all three status registers (m_irq, dma_tx_status, dma_rx_status) before returning IRQ_NONE.
--- drivers/spi/spi-geni-qcom.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/spi/spi-geni-qcom.c +5 -4
@@ -948,10 +948,13 @@ static irqreturn_t geni_spi_isr(int irq, void *data)struct spi_master *spi = data;struct spi_geni_master *mas =spi_master_get_devdata (spi);struct geni_se *se = &mas->se; -u32 m_irq; +u32 m_irq, dma_tx_status, dma_rx_status; m_irq =readl (se->base +SE_GENI_M_IRQ_STATUS ); -if (!m_irq) + dma_tx_status =readl_relaxed (se->base +SE_DMA_TX_IRQ_STAT ); + dma_rx_status =readl_relaxed (se->base +SE_DMA_RX_IRQ_STAT ); + +if (!m_irq && !dma_tx_status && !dma_rx_status)return IRQ_NONE ; if (m_irq & (M_CMD_OVERRUN_EN | M_ILLEGAL_CMD_EN | M_CMD_FAILURE_EN |
@@ -999,8 +1002,6 @@ static irqreturn_t geni_spi_isr(int irq, void *data) } }else if (mas->cur_xfer_mode ==GENI_SE_DMA ) {const struct spi_transfer *xfer = mas->cur_xfer; -u32 dma_tx_status =readl_relaxed (se->base +SE_DMA_TX_IRQ_STAT ); -u32 dma_rx_status =readl_relaxed (se->base +SE_DMA_RX_IRQ_STAT );if (dma_tx_status)writel (dma_tx_status, se->base +SE_DMA_TX_IRQ_CLR );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 11/160 dt-bindings: auxdisplay: ht16k33: Use unevaluatedProperties to fix common property warning
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frank Li <[email protected]>
[ Upstream commit 398c0c8bbc8f5a9d2f43863275a427a9d3720b6f ]
Change additionalProperties to unevaluatedProperties because it refs to /schemas/input/matrix-keymap.yaml.
Fix below CHECK_DTBS warnings:arch/arm/boot/dts/nxp/imx/imx6dl-victgo.dtb: keypad@70 (holtek,ht16k33): 'keypad,num-columns', 'keypad,num-rows' do not match any of the regexes: '^pinctrl-[0-9]+$'
from schema $id: http://devicetree.org/schemas/auxdisplay/holtek,ht16k33.yaml#
--- .../devicetree/bindings/auxdisplay/holtek,ht16k33.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/auxdisplay/holtek,ht16k33.yaml +1 -1
@@ -66,7 +66,7 @@ then: required: - refresh-rate-hz -additionalProperties: false +unevaluatedProperties: false examples: - |
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 12/160 wifi: ath11k: skip status ring entry processing
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Venkateswara Naralasetty <[email protected]>
[ Upstream commit 4c2b796be3a12a11ab611917fafdabc9d3862a1d ]
If STATUS_BUFFER_DONE is not set for a monitor status ring entry, we don't process the status ring until STATUS_BUFFER_DONE set for that status ring entry.
During LMAC reset it may happen that hardware will not write STATUS_BUFFER_DONE tlv in status buffer, in that case we end up waiting for STATUS_BUFFER_DONE leading to backpressure on monitor status ring.
To fix the issue, when HP (Head Pointer) + 1 entry is peeked and if DMA is not done and if HP + 2 entry's DMA done is set, replenish HP + 1 entry and start processing in next interrupt. If HP + 2 entry's DMA done is not set, poll onto HP + 1 entry DMA done to be set.
Also, during monitor attach HP points to the end of the ring and TP (Tail Pointer) points to the start of the ring. Using ath11k_hal_srng_src_peek() may result in processing invalid buffer for the very first interrupt. Since, HW starts writing buffer from TP.
To avoid this issue call ath11k_hal_srng_src_next_peek() instead of calling ath11k_hal_srng_src_peek().
Tested-on: IPQ5018 hw1.0 AHB WLAN.HK.2.6.0.1-00861-QCAHKSWPL_SILICONZ-1
Stable-dep-of: e225b36f83d7 ("wifi: ath11k: Pass the correct value of each TID during a stop AMPDU session")
--- drivers/net/wireless/ath/ath11k/dp_rx.c | 82 ++++++++++++++++++++++--- drivers/net/wireless/ath/ath11k/hal.c | 16 ++++- drivers/net/wireless/ath/ath11k/hal.h | 2 + 3 files changed, 90 insertions(+), 10 deletions(-)
drivers/net/wireless/ath/ath11k/dp_rx.c +73 -9
@@ -1,7 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. -* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ #include <linux/ieee80211.h>
@@ -2996,11 +2996,52 @@ ath11k_dp_rx_mon_update_status_buf_state(struct ath11k_mon_data *pmon, } } +static enum dp_mon_status_buf_state +ath11k_dp_rx_mon_buf_done (struct ath11k_base *ab,struct hal_srng *srng, +struct dp_rxdma_ring *rx_ring) +{ +struct ath11k_skb_rxcb *rxcb; +struct hal_tlv_hdr *tlv; +struct sk_buff *skb; +void *status_desc; +dma_addr_t paddr; +u32 cookie; +int buf_id; +u8 rbm; + + status_desc =ath11k_hal_srng_src_next_peek (ab, srng); +if (!status_desc) +return DP_MON_STATUS_NO_DMA ; + +ath11k_hal_rx_buf_addr_info_get (status_desc, &paddr, &cookie, &rbm); + + buf_id =FIELD_GET (DP_RXDMA_BUF_COOKIE_BUF_ID , cookie); + +spin_lock_bh (&rx_ring->idr_lock); + skb =idr_find (&rx_ring->bufs_idr, buf_id); +spin_unlock_bh (&rx_ring->idr_lock); + +if (!skb) +return DP_MON_STATUS_NO_DMA ; + + rxcb =ATH11K_SKB_RXCB (skb); +dma_sync_single_for_cpu (ab->dev, rxcb->paddr, + skb->len +skb_tailroom (skb), +DMA_FROM_DEVICE ); + + tlv = (struct hal_tlv_hdr *)skb->data; +if (FIELD_GET (HAL_TLV_HDR_TAG , tlv->tl) !=HAL_RX_STATUS_BUFFER_DONE ) +return DP_MON_STATUS_NO_DMA ; + +return DP_MON_STATUS_REPLINISH ; +} +static int ath11k_dp_rx_reap_mon_status_ring (struct ath11k_base *ab,int mac_id,int *budget,struct sk_buff_head *skb_list) {struct ath11k *ar;const struct ath11k_hw_hal_params *hal_params; +enum dp_mon_status_buf_state reap_status;struct ath11k_pdev_dp *dp;struct dp_rxdma_ring *rx_ring;struct ath11k_mon_data *pmon;
@@ -3063,15 +3104,38 @@ static int ath11k_dp_rx_reap_mon_status_ring(struct ath11k_base *ab, int mac_id,ath11k_warn (ab,"mon status DONE not set %lx, buf_id %d\n" ,FIELD_GET (HAL_TLV_HDR_TAG , tlv->tl), buf_id); -/* If done status is missing, hold onto status -* ring until status is done for this status -* ring buffer. -* Keep HP in mon_status_ring unchanged, -* and break from here. -* Check status for same buffer for next time +/* RxDMA status done bit might not be set even +* though tp is moved by HW. */ - pmon->buf_state =DP_MON_STATUS_NO_DMA ; -break ; + +/* If done status is missing: +* 1. As per MAC team's suggestion, +* when HP + 1 entry is peeked and if DMA +* is not done and if HP + 2 entry's DMA done +* is set. skip HP + 1 entry and +* start processing in next interrupt. +* 2. If HP + 2 entry's DMA done is not set, +* poll onto HP + 1 entry DMA done to be set. +* Check status for same buffer for next time +* dp_rx_mon_status_srng_process +*/ + + reap_status =ath11k_dp_rx_mon_buf_done (ab, srng, + rx_ring); +if (reap_status ==DP_MON_STATUS_NO_DMA ) +continue ; + +spin_lock_bh (&rx_ring->idr_lock); +idr_remove (&rx_ring->bufs_idr, buf_id); +spin_unlock_bh (&rx_ring->idr_lock); + +dma_unmap_single (ab->dev, rxcb->paddr, + skb->len +skb_tailroom (skb), +DMA_FROM_DEVICE ); + +dev_kfree_skb_any (skb); + pmon->buf_state =DP_MON_STATUS_REPLINISH ; + goto move_next; }spin_lock_bh (&rx_ring->idr_lock);
drivers/net/wireless/ath/ath11k/hal.c +15 -1
@@ -1,7 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. -* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ #include <linux/dma-mapping.h> #include "hal_tx.h"
@@ -783,6 +783,20 @@ u32 *ath11k_hal_srng_src_get_next_reaped(struct ath11k_base *ab,return desc; } +u32 *ath11k_hal_srng_src_next_peek (struct ath11k_base *ab,struct hal_srng *srng) +{ +u32 next_hp; + +lockdep_assert_held (&srng->lock); + + next_hp = (srng->u.src_ring.hp + srng->entry_size) % srng->ring_size; + +if (next_hp != srng->u.src_ring.cached_tp) +return srng->ring_base_vaddr + next_hp; + +return NULL ; +} +u32 *ath11k_hal_srng_src_peek (struct ath11k_base *ab,struct hal_srng *srng) {lockdep_assert_held (&srng->lock);
drivers/net/wireless/ath/ath11k/hal.h +2 -0
@@ -946,6 +946,8 @@ u32 *ath11k_hal_srng_dst_peek(struct ath11k_base *ab, struct hal_srng *srng);int ath11k_hal_srng_dst_num_free (struct ath11k_base *ab,struct hal_srng *srng,bool sync_hw_ptr);u32 *ath11k_hal_srng_src_peek (struct ath11k_base *ab,struct hal_srng *srng); +u32 *ath11k_hal_srng_src_next_peek (struct ath11k_base *ab, +struct hal_srng *srng);u32 *ath11k_hal_srng_src_get_next_reaped (struct ath11k_base *ab,struct hal_srng *srng); u32 *ath11k_hal_srng_src_reap_next(struct ath11k_base *ab,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 13/160 wifi: ath11k: Use dma_alloc_noncoherent for rx_tid buffer allocation
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: P Praneesh <[email protected]>
[ Upstream commit eeadc6baf8b3dcd32787cc84f0473dc2a2850370 ]
Currently, the driver allocates cacheable DMA buffers for the rx_tid structure using kzalloc() and dma_map_single(). These buffers are long-lived and can persist for the lifetime of the peer, which is not advisable. Instead of using kzalloc() and dma_map_single() for allocating cacheable DMA buffers, utilize the dma_alloc_noncoherent() helper for the allocation of long-lived cacheable DMA buffers, such as the peer's rx_tid. Since dma_alloc_noncoherent() returns unaligned physical and virtual addresses, align them internally before use within the driver. This ensures proper allocation of non-coherent memory through the kernel helper.
Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.7.0.1-01744-QCAHKSWPL_SILICONZ-1
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3
Stable-dep-of: e225b36f83d7 ("wifi: ath11k: Pass the correct value of each TID during a stop AMPDU session")
--- drivers/net/wireless/ath/ath11k/dp.h | 6 +- drivers/net/wireless/ath/ath11k/dp_rx.c | 117 +++++++++++------------- 2 files changed, 58 insertions(+), 65 deletions(-)
drivers/net/wireless/ath/ath11k/dp.h +4 -2
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. -* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2021-2023, 2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_DP_H
@@ -20,7 +20,6 @@ struct ath11k_ext_irq_grp;struct dp_rx_tid {u8 tid; -u32 *vaddr;dma_addr_t paddr;u32 size;u32 ba_win_sz;
@@ -37,6 +36,9 @@ struct dp_rx_tid {/* Timer info related to fragments */ struct timer_list frag_timer;struct ath11k_base *ab; +u32 *vaddr_unaligned; +dma_addr_t paddr_unaligned; +u32 unaligned_size; };#define DP_REO_DESC_FREE_THRESHOLD 64
drivers/net/wireless/ath/ath11k/dp_rx.c +54 -63
196 lines not on this page · raw message
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 14/160 wifi: ath11k: Pass the correct value of each TID during a stop AMPDU session
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Reshma Immaculate Rajkumar <[email protected]>
[ Upstream commit e225b36f83d7926c1f2035923bb0359d851fdb73 ]
During ongoing traffic, a request to stop an AMPDU session for one TID could incorrectly affect other active sessions. This can happen because an incorrect TID reference would be passed when updating the BA session state, causing the wrong session to be stopped. As a result, the affected session would be reduced to a minimal BA size, leading to a noticeable throughput degradation.
Fix this issue by passing the correct argument from ath11k_dp_rx_ampdu_stop() to ath11k_peer_rx_tid_reo_update() during a stop AMPDU session. Instead of passing peer->tx_tid, which is the base address of the array, corresponding to TID 0; pass the value of &peer->rx_tid[params->tid], where the different TID numbers are accounted for.
Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.9.0.1-02146-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath11k/dp_rx.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/net/wireless/ath/ath11k/dp_rx.c +7 -8
@@ -1,7 +1,7 @@// SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. -* Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. */ #include <linux/ieee80211.h>
@@ -1110,9 +1110,8 @@ int ath11k_dp_rx_ampdu_stop(struct ath11k *ar,struct ath11k_base *ab = ar->ab;struct ath11k_peer *peer;struct ath11k_sta *arsta =ath11k_sta_to_arsta (params->sta); +struct dp_rx_tid *rx_tid;int vdev_id = arsta->arvif->vdev_id; -dma_addr_t paddr; -bool active;int ret;spin_lock_bh (&ab->base_lock);
@@ -1124,15 +1123,14 @@ int ath11k_dp_rx_ampdu_stop(struct ath11k *ar,return -ENOENT ; } - paddr = peer->rx_tid[params->tid].paddr; - active = peer->rx_tid[params->tid].active; + rx_tid = &peer->rx_tid[params->tid]; -if (!active) { +if (!rx_tid->active) {spin_unlock_bh (&ab->base_lock);return 0 ; } - ret =ath11k_peer_rx_tid_reo_update (ar, peer, peer->rx_tid,1 ,0 , false); + ret =ath11k_peer_rx_tid_reo_update (ar, peer, rx_tid,1 ,0 , false);spin_unlock_bh (&ab->base_lock);if (ret) { ath11k_warn(ab, "failed to update reo for rx tid %d: %d\n",
@@ -1141,7 +1139,8 @@ int ath11k_dp_rx_ampdu_stop(struct ath11k *ar, } ret =ath11k_wmi_peer_rx_reorder_queue_setup (ar, vdev_id, - params->sta->addr, paddr, + params->sta->addr, + rx_tid->paddr, params->tid,1 ,1 );if (ret) ath11k_warn(ab, "failed to send wmi to delete rx tid %d\n",
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 15/160 crypto: caam - fix DMA corruption on long hmac keys
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Horia Geantă <[email protected]>
[ Upstream commit 5ddfdcbe10dc5f97afc4e46ca22be2be717e8caf ]
When a key longer than block size is supplied, it is copied and then hashed into the real key. The memory allocated for the copy needs to be rounded to DMA cache alignment, as otherwise the hashed key may corrupt neighbouring memory.
The rounding was performed, but never actually used for the allocation. Fix this by replacing kmemdup with kmalloc for a larger buffer, followed by memcpy.
--- drivers/crypto/caam/caamhash.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/crypto/caam/caamhash.c +2 -1
@@ -441,9 +441,10 @@ static int ahash_setkey(struct crypto_ahash *ahash,if (aligned_len < keylen)return -EOVERFLOW ; - hashed_key =kmemdup (key, keylen,GFP_KERNEL ); + hashed_key =kmalloc (aligned_len,GFP_KERNEL );if (!hashed_key)return -ENOMEM ; +memcpy (hashed_key, key, keylen); ret =hash_digest_key (ctx, &keylen, hashed_key, digestsize);if (ret) goto bad_free_key;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 16/160 crypto: caam - fix overflow on long hmac keys
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Horia Geantă <[email protected]>
[ Upstream commit 80688afb9c35b3934ce2d6be9973758915e2e0ef ]
When a key longer than block size is supplied, it is copied and then hashed into the real key. The memory allocated for the copy needs to be rounded to DMA cache alignment, as otherwise the hashed key may corrupt neighbouring memory.
The copying is performed using kmemdup, however this leads to an overflow:
reading more bytes (aligned_len - keylen) from the keylen source buffer. Fix this by replacing kmemdup with kmalloc, followed by memcpy.
--- drivers/crypto/caam/caamalg_qi2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/crypto/caam/caamalg_qi2.c +2 -1
@@ -3325,9 +3325,10 @@ static int ahash_setkey(struct crypto_ahash *ahash, const u8 *key,if (aligned_len < keylen)return -EOVERFLOW ; - hashed_key =kmemdup (key, aligned_len,GFP_KERNEL ); + hashed_key =kmalloc (aligned_len,GFP_KERNEL );if (!hashed_key)return -ENOMEM ; +memcpy (hashed_key, key, keylen); ret =hash_digest_key (ctx, &keylen, hashed_key, digestsize);if (ret) goto bad_free_key;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 17/160 crypto: af-alg - fix NULL pointer dereference in scatterwalk
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Norbert Szetei <[email protected]>
[ Upstream commit 62397b493e14107ae82d8b80938f293d95425bcb ]
The AF_ALG interface fails to unmark the end of a Scatter/Gather List (SGL) when chaining a new af_alg_tsgl structure. If a sendmsg() fills an SGL exactly to MAX_SGL_ENTS, the last entry is marked as the end. A subsequent sendmsg() allocates a new SGL and chains it, but fails to clear the end marker on the previous SGL's last data entry.
This causes the crypto scatterwalk to hit a premature end, returning NULL on sg_next() and leading to a kernel panic during dereference.
Fix this by explicitly unmarking the end of the previous SGL when performing sg_chain() in af_alg_alloc_tsgl().
--- crypto/af_alg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
crypto/af_alg.c +3 -1
@@ -622,8 +622,10 @@ static int af_alg_alloc_tsgl(struct sock *sk)sg_init_table (sgl->sg,MAX_SGL_ENTS +1 ); sgl->cur =0 ; -if (sg) +if (sg) { +sg_unmark_end (sg +MAX_SGL_ENTS -1 );sg_chain (sg,MAX_SGL_ENTS +1 , sgl->sg); + }list_add_tail (&sgl->list, &ctx->tsgl_list); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 18/160 net: fec: fix the PTP periodic output sysfs interface
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Buday Csaba <[email protected]>
[ Upstream commit e8e44c98f789dee45cfd24ffb9d4936e0606d7c6 ]
When the PPS channel configuration was implemented, the channel index for the periodic outputs was configured as the hardware channel number.
The sysfs interface uses a logical channel index, and rejects numbers greater than n_per_out (see period_store() in ptp_sysfs.c). That property was left at 1, since the driver implements channel selection, not simultaneous operation of multiple PTP hardware timer channels.
A second check in fec_ptp_enable() returns -EOPNOTSUPP when the two channel numbers disagree, making channels 1..3 unusable from sysfs.
Fix by removing this redundant check in the FEC PTP driver.
--- drivers/net/ethernet/freescale/fec_ptp.c | 3 --- 1 file changed, 3 deletions(-)
drivers/net/ethernet/freescale/fec_ptp.c +0 -3
@@ -546,9 +546,6 @@ static int fec_ptp_enable(struct ptp_clock_info *ptp,if (rq->perout.flags)return -EOPNOTSUPP ; -if (rq->perout.index != fep->pps_channel) -return -EOPNOTSUPP ; - period.tv_sec = rq->perout.period.sec; period.tv_nsec = rq->perout.period.nsec; period_ns =timespec64_to_ns (&period);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 19/160 net: qrtr: replace qrtr_tx_flow radix_tree with xarray to fix memory leak
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiayuan Chen <[email protected]>
[ Upstream commit 2428083101f6883f979cceffa76cd8440751ffe6 ]
__radix_tree_create() allocates and links intermediate nodes into the tree one by one. If a subsequent allocation fails, the already-linked nodes remain in the tree with no corresponding leaf entry. These orphaned internal nodes are never reclaimed because radix_tree_for_each_slot() only visits slots containing leaf values.
The radix_tree API is deprecated in favor of xarray. As suggested by Matthew Wilcox, migrate qrtr_tx_flow from radix_tree to xarray instead of fixing the radix_tree itself [1]. xarray properly handles cleanup of internal nodes — xa_destroy() frees all internal xarray nodes when the qrtr_node is released, preventing the leak.
[1] https://lore.kernel.org/all/[email protected]/T/
--- net/qrtr/af_qrtr.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-)
net/qrtr/af_qrtr.c +13 -18
@@ -118,7 +118,7 @@ static DEFINE_XARRAY_ALLOC(qrtr_ports);* @ep: endpoint * @ref: reference count for node * @nid: node id -* @qrtr_tx_flow: tree of qrtr_tx_flow, keyed by node << 32 | port +* @qrtr_tx_flow: xarray of qrtr_tx_flow, keyed by node << 32 | port * @qrtr_tx_lock: lock for qrtr_tx_flow inserts * @rx_queue: receive queue * @item: list item for broadcast list
@@ -129,7 +129,7 @@ struct qrtr_node {struct kref ref;unsigned int nid; -struct radix_tree_root qrtr_tx_flow; +struct xarray qrtr_tx_flow;struct mutex qrtr_tx_lock;/* for qrtr_tx_flow */ struct sk_buff_head rx_queue;
@@ -172,6 +172,7 @@ static void __qrtr_node_release(struct kref *kref)struct qrtr_tx_flow *flow;unsigned long flags;void __rcu **slot; +unsigned long index;spin_lock_irqsave (&qrtr_nodes_lock, flags);/* If the node is a bridge for other nodes, there are possibly
@@ -189,11 +190,9 @@ static void __qrtr_node_release(struct kref *kref)skb_queue_purge (&node->rx_queue);/* Free tx flow counters */ -radix_tree_for_each_slot (slot, &node->qrtr_tx_flow, &iter,0 ) { - flow = *slot; -radix_tree_iter_delete (&node->qrtr_tx_flow, &iter, slot); +xa_for_each (&node->qrtr_tx_flow, index, flow)kfree (flow); - } +xa_destroy (&node->qrtr_tx_flow);kfree (node); }
@@ -228,9 +227,7 @@ static void qrtr_tx_resume(struct qrtr_node *node, struct sk_buff *skb) key = remote_node <<32 | remote_port; -rcu_read_lock (); - flow =radix_tree_lookup (&node->qrtr_tx_flow, key); -rcu_read_unlock (); + flow =xa_load (&node->qrtr_tx_flow, key);if (flow) {spin_lock (&flow->resume_tx.lock); flow->pending =0 ;
@@ -269,12 +266,13 @@ static int qrtr_tx_wait(struct qrtr_node *node, int dest_node, int dest_port,return 0 ;mutex_lock (&node->qrtr_tx_lock); - flow =radix_tree_lookup (&node->qrtr_tx_flow, key); + flow =xa_load (&node->qrtr_tx_flow, key);if (!flow) { flow =kzalloc (sizeof (*flow),GFP_KERNEL );if (flow) {init_waitqueue_head (&flow->resume_tx); -if (radix_tree_insert (&node->qrtr_tx_flow, key, flow)) { +if (xa_err (xa_store (&node->qrtr_tx_flow, key, flow, +GFP_KERNEL ))) {kfree (flow); flow =NULL ; }
@@ -326,9 +324,7 @@ static void qrtr_tx_flow_failed(struct qrtr_node *node, int dest_node,unsigned long key = (u64 )dest_node <<32 | dest_port;struct qrtr_tx_flow *flow; -rcu_read_lock (); - flow =radix_tree_lookup (&node->qrtr_tx_flow, key); -rcu_read_unlock (); + flow =xa_load (&node->qrtr_tx_flow, key);if (flow) {spin_lock_irq (&flow->resume_tx.lock); flow->tx_failed =1 ;
@@ -599,7 +595,7 @@ int qrtr_endpoint_register(struct qrtr_endpoint *ep, unsigned int nid) node->nid =QRTR_EP_NID_AUTO ; node->ep = ep; -INIT_RADIX_TREE (&node->qrtr_tx_flow,GFP_KERNEL ); +xa_init (&node->qrtr_tx_flow);mutex_init (&node->qrtr_tx_lock);qrtr_node_assign (node, nid);
@@ -627,6 +623,7 @@ void qrtr_endpoint_unregister(struct qrtr_endpoint *ep)struct qrtr_tx_flow *flow;struct sk_buff *skb;unsigned long flags; +unsigned long index;void __rcu **slot;mutex_lock (&node->ep_lock);
@@ -649,10 +646,8 @@ void qrtr_endpoint_unregister(struct qrtr_endpoint *ep)/* Wake up any transmitters waiting for resume-tx from the node */ mutex_lock (&node->qrtr_tx_lock); -radix_tree_for_each_slot (slot, &node->qrtr_tx_flow, &iter,0 ) { - flow = *slot; +xa_for_each (&node->qrtr_tx_flow, index, flow)wake_up_interruptible_all (&flow->resume_tx); - }mutex_unlock (&node->qrtr_tx_lock);qrtr_node_release (node);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 20/160 net: ipv6: ndisc: fix ndisc_ra_useropt to initialize nduseropt_padX fields to zero to prevent an info-leak
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yochai Eisenrich <[email protected]>
[ Upstream commit ae05340ccaa9d347fe85415609e075545bec589f ]
When processing Router Advertisements with user options the kernel builds an RTM_NEWNDUSEROPT netlink message. The nduseroptmsg struct has three padding fields that are never zeroed and can leak kernel data
The fix is simple, just zeroes the padding fields.
--- net/ipv6/ndisc.c | 3 +++ 1 file changed, 3 insertions(+)
net/ipv6/ndisc.c +3 -0
@@ -1216,6 +1216,9 @@ static void ndisc_ra_useropt(struct sk_buff *ra, struct nd_opt_hdr *opt) ndmsg->nduseropt_icmp_type = icmp6h->icmp6_type; ndmsg->nduseropt_icmp_code = icmp6h->icmp6_code; ndmsg->nduseropt_opts_len = opt->nd_opt_len <<3 ; + ndmsg->nduseropt_pad1 =0 ; + ndmsg->nduseropt_pad2 =0 ; + ndmsg->nduseropt_pad3 =0 ;memcpy (ndmsg +1 , opt, opt->nd_opt_len <<3 );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 21/160 net/ipv6: ioam6: prevent schema length wraparound in trace fill
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pengpeng Hou <[email protected]>
[ Upstream commit 5e67ba9bb531e1ec6599a82a065dea9040b9ce50 ]
ioam6_fill_trace_data() stores the schema contribution to the trace length in a u8. With bit 22 enabled and the largest schema payload, sclen becomes 1 + 1020 / 4, wraps from 256 to 0, and bypasses the remaining-space check. __ioam6_fill_trace_data() then positions the write cursor without reserving the schema area but still copies the 4-byte schema header and the full schema payload, overrunning the trace buffer.
Keep sclen in an unsigned int so the remaining-space check and the write cursor calculation both see the full schema length.
--- net/ipv6/ioam6.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/ipv6/ioam6.c +2 -2
@@ -648,7 +648,7 @@ static void __ioam6_fill_trace_data(struct sk_buff *skb,struct ioam6_namespace *ns, struct ioam6_trace_hdr *trace, struct ioam6_schema *sc, - u8 sclen, bool is_input) + unsigned int sclen, bool is_input) { struct timespec64 ts;ktime_t tstamp;
@@ -878,7 +878,7 @@ void ioam6_fill_trace_data(struct sk_buff *skb, bool is_input) {struct ioam6_schema *sc; -u8 sclen =0 ; +unsigned int sclen =0 ;/* Skip if Overflow flag is set */
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 22/160 tg3: Fix race for querying speed/duplex
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Bogendoerfer <[email protected]>
[ Upstream commit bb417456c7814d1493d98b7dd9c040bf3ce3b4ed ]
When driver signals carrier up via netif_carrier_on() its internal link_up state isn't updated immediately. This leads to inconsistent speed/duplex in /proc/net/bonding/bondX where the speed and duplex is shown as unknown while ethtool shows correct values. Fix this by using netif_carrier_ok() for link checking in get_ksettings function.
--- drivers/net/ethernet/broadcom/tg3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/broadcom/tg3.c +1 -1
@@ -12212,7 +12212,7 @@ static int tg3_get_link_ksettings(struct net_device *dev,ethtool_convert_legacy_u32_to_link_mode (cmd->link_modes.advertising, advertising); -if (netif_running (dev) && tp->link_up) { +if (netif_running (dev) &&netif_carrier_ok (dev)) { cmd->base.speed = tp->link_config.active_speed; cmd->base.duplex = tp->link_config.active_duplex; ethtool_convert_legacy_u32_to_link_mode(
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 23/160 ipv6: icmp: clear skb2->cb[] in ip6_err_gen_icmpv6_unreach()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 86ab3e55673a7a49a841838776f1ab18d23a67b5 ]
Sashiko AI-review observed:
In ip6_err_gen_icmpv6_unreach(), the skb is an outer IPv4 ICMP error packet where its cb contains an IPv4 inet_skb_parm. When skb is cloned into skb2 and passed to icmp6_send(), it uses IP6CB(skb2).
IP6CB interprets the IPv4 inet_skb_parm as an inet6_skb_parm. The cipso offset in inet_skb_parm.opt directly overlaps with dsthao in inet6_skb_parm at offset 18.
If an attacker sends a forged ICMPv4 error with a CIPSO IP option, dsthao would be a non-zero offset. Inside icmp6_send(), mip6_addr_swap() is called and uses ipv6_find_tlv(skb, opt->dsthao, IPV6_TLV_HAO).
This would scan the inner, attacker-controlled IPv6 packet starting at that offset, potentially returning a fake TLV without checking if the remaining packet length can hold the full 18-byte struct ipv6_destopt_hao.
Could mip6_addr_swap() then perform a 16-byte swap that extends past the end of the packet data into skb_shared_info?
Should the cb array also be cleared in ip6_err_gen_icmpv6_unreach() and ip6ip6_err() to prevent this?
This patch implements the first suggestion.
I am not sure if ip6ip6_err() needs to be changed. A separate patch would be better anyway.
--- net/ipv6/icmp.c | 3 +++ 1 file changed, 3 insertions(+)
net/ipv6/icmp.c +3 -0
@@ -679,6 +679,9 @@ int ip6_err_gen_icmpv6_unreach(struct sk_buff *skb, int nhs, int type,if (!skb2)return 1 ; +/* Remove debris left by IPv4 stack. */ +memset (IP6CB (skb2),0 ,sizeof (*IP6CB (skb2))); +skb_dst_drop (skb2);skb_pull (skb2, nhs);skb_reset_network_header (skb2);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 24/160 ip6_tunnel: clear skb2->cb[] in ip4ip6_err()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 2edfa31769a4add828a7e604b21cb82aaaa05925 ]
Oskar Kjos reported the following problem.
ip4ip6_err() calls icmp_send() on a cloned skb whose cb[] was written by the IPv6 receive path as struct inet6_skb_parm. icmp_send() passes IPCB(skb2) to __ip_options_echo(), which interprets that cb[] region as struct inet_skb_parm (IPv4). The layouts differ: inet6_skb_parm.nhoff at offset 14 overlaps inet_skb_parm.opt.rr, producing a non-zero rr value. __ip_options_echo() then reads optlen from attacker-controlled packet data at sptr[rr+1] and copies that many bytes into dopt->__data, a fixed 40-byte stack buffer (IP_OPTIONS_DATA_FIXED_SIZE).
To fix this we clear skb2->cb[], as suggested by Oskar Kjos.
Also add minimal IPv4 header validation (version == 4, ihl >= 5).
--- net/ipv6/ip6_tunnel.c | 5 +++++ 1 file changed, 5 insertions(+)
net/ipv6/ip6_tunnel.c +5 -0
@@ -601,11 +601,16 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,if (!skb2)return 0 ; +/* Remove debris left by IPv6 stack. */ +memset (IPCB (skb2),0 ,sizeof (*IPCB (skb2))); +skb_dst_drop (skb2);skb_pull (skb2, offset);skb_reset_network_header (skb2); eiph =ip_hdr (skb2); +if (eiph->version !=4 || eiph->ihl <5 ) + goto out;/* Try to guess incoming interface */ rt = ip_route_output_ports(dev_net(skb->dev), &fl4, NULL, eiph->saddr,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 25/160 bridge: br_nd_send: linearize skb before parsing ND options
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yang Yang <[email protected]>
[ Upstream commit a01aee7cafc575bb82f5529e8734e7052f9b16ea ]
br_nd_send() parses neighbour discovery options from ns->opt[] and assumes that these options are in the linear part of request.
Its callers only guarantee that the ICMPv6 header and target address are available, so the option area can still be non-linear. Parsing ns->opt[] in that case can access data past the linear buffer.
Linearize request before option parsing and derive ns from the linear network header.
--- net/bridge/br_arp_nd_proxy.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
net/bridge/br_arp_nd_proxy.c +7 -5
@@ -248,12 +248,12 @@ struct nd_msg *br_is_nd_neigh_msg(struct sk_buff *skb, struct nd_msg *msg)static void br_nd_send (struct net_bridge *br,struct net_bridge_port *p,struct sk_buff *request,struct neighbour *n, -__be16 vlan_proto,u16 vlan_tci,struct nd_msg *ns) +__be16 vlan_proto,u16 vlan_tci) {struct net_device *dev = request->dev;struct net_bridge_vlan_group *vg; +struct nd_msg *na, *ns;struct sk_buff *reply; -struct nd_msg *na;struct ipv6hdr *pip6;int na_olen =8 ;/* opt hdr + ETH_ALEN for target */ int ns_olen;
@@ -261,7 +261,7 @@ static void br_nd_send(struct net_bridge *br, struct net_bridge_port *p,u8 *daddr;u16 pvid; -if (!dev) +if (!dev ||skb_linearize (request))return ; len = LL_RESERVED_SPACE(dev) + sizeof(struct ipv6hdr) +
@@ -278,6 +278,8 @@ static void br_nd_send(struct net_bridge *br, struct net_bridge_port *p,skb_set_mac_header (reply,0 ); daddr =eth_hdr (request)->h_source; + ns = (struct nd_msg *)(skb_network_header (request) + +sizeof (struct ipv6hdr ));/* Do we need option processing ? */ ns_olen = request->len - (skb_network_offset(request) +
@@ -465,9 +467,9 @@ void br_do_suppress_nd(struct sk_buff *skb, struct net_bridge *br,if (vid !=0 )br_nd_send (br, p, skb, n, skb->vlan_proto, -skb_vlan_tag_get (skb), msg); +skb_vlan_tag_get (skb));else -br_nd_send (br, p, skb, n,0 ,0 , msg); +br_nd_send (br, p, skb, n,0 ,0 ); replied = true; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 26/160 net/sched: sch_hfsc: fix divide-by-zero in rtsc_min()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiang Mei <[email protected]>
[ Upstream commit 4576100b8cd03118267513cafacde164b498b322 ]
m2sm() converts a u32 slope to a u64 scaled value. For large inputs (e.g. m1=4000000000), the result can reach 2^32. rtsc_min() stores the difference of two such u64 values in a u32 variable dsm and uses it as a divisor. When the difference is exactly 2^32 the truncation yields zero, causing a divide-by-zero oops in the concave-curve intersection path:
Oops: divide error: 0000 RIP: 0010:rtsc_min (net/sched/sch_hfsc.c:601) Call Trace: init_ed (net/sched/sch_hfsc.c:629) hfsc_enqueue (net/sched/sch_hfsc.c:1569) [...]
Widen dsm to u64 and replace do_div() with div64_u64() so the full difference is preserved.
--- net/sched/sch_hfsc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/sched/sch_hfsc.c +2 -2
@@ -555,7 +555,7 @@ static void rtsc_min(struct runtime_sc *rtsc, struct internal_sc *isc, u64 x, u64 y) { u64 y1, y2, dx, dy; -u32 dsm; +u64 dsm;if (isc->sm1 <= isc->sm2) {/* service curve is convex */
@@ -598,7 +598,7 @@ rtsc_min(struct runtime_sc *rtsc, struct internal_sc *isc, u64 x, u64 y)*/ dx = (y1 - y) <<SM_SHIFT ; dsm = isc->sm1 - isc->sm2; -do_div (dx, dsm); + dx =div64_u64 (dx, dsm);/* * check if (x, y1) belongs to the 1st segment of rtsc. * if so, add the offset.
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 27/160 ASoC: ep93xx: Fix unchecked clk_prepare_enable() and add rollback on failure
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jihed Chaibi <[email protected]>
[ Upstream commit 622363757b2286dd2c2984b0d80255cbb35a0495 ]
ep93xx_i2s_enable() calls clk_prepare_enable() on three clocks in sequence (mclk, sclk, lrclk) without checking the return value of any of them. If an intermediate enable fails, the clocks that were already enabled are never rolled back, leaking them until the next disable cycle — which may never come if the stream never started cleanly.
Change ep93xx_i2s_enable() from void to int. Add error checking after each clk_prepare_enable() call and unwind already-enabled clocks on failure. Propagate the error through ep93xx_i2s_startup() and ep93xx_i2s_resume(), both of which already return int.
--- sound/soc/cirrus/ep93xx-i2s.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-)
sound/soc/cirrus/ep93xx-i2s.c +24 -10
@@ -105,16 +105,28 @@ static inline unsigned ep93xx_i2s_read_reg(struct ep93xx_i2s_info *info,return __raw_readl (info->regs + reg); } -static void ep93xx_i2s_enable (struct ep93xx_i2s_info *info,int stream) +static int ep93xx_i2s_enable (struct ep93xx_i2s_info *info,int stream) {unsigned base_reg; +int err;if ((ep93xx_i2s_read_reg (info,EP93XX_I2S_TX0EN ) &0x1 ) ==0 && (ep93xx_i2s_read_reg (info,EP93XX_I2S_RX0EN ) &0x1 ) ==0 ) {/* Enable clocks */ -clk_prepare_enable (info->mclk); -clk_prepare_enable (info->sclk); -clk_prepare_enable (info->lrclk); + err =clk_prepare_enable (info->mclk); +if (err) +return err; + err =clk_prepare_enable (info->sclk); +if (err) { +clk_disable_unprepare (info->mclk); +return err; + } + err =clk_prepare_enable (info->lrclk); +if (err) { +clk_disable_unprepare (info->sclk); +clk_disable_unprepare (info->mclk); +return err; + }/* Enable i2s */ ep93xx_i2s_write_reg (info,EP93XX_I2S_GLCTRL ,1 );
@@ -133,6 +145,8 @@ static void ep93xx_i2s_enable(struct ep93xx_i2s_info *info, int stream)ep93xx_i2s_write_reg (info,EP93XX_I2S_TXCTRL ,EP93XX_I2S_TXCTRL_TXEMPTY_LVL |EP93XX_I2S_TXCTRL_TXUFIE ); + +return 0 ; }static void ep93xx_i2s_disable (struct ep93xx_i2s_info *info,int stream)
@@ -214,9 +228,7 @@ static int ep93xx_i2s_startup(struct snd_pcm_substream *substream, {struct ep93xx_i2s_info *info =snd_soc_dai_get_drvdata (dai); -ep93xx_i2s_enable (info, substream->stream); - -return 0 ; +return ep93xx_i2s_enable (info, substream->stream); } static void ep93xx_i2s_shutdown(struct snd_pcm_substream *substream,
@@ -392,14 +404,16 @@ static int ep93xx_i2s_suspend(struct snd_soc_component *component)static int ep93xx_i2s_resume (struct snd_soc_component *component) {struct ep93xx_i2s_info *info =snd_soc_component_get_drvdata (component); +int err;if (!snd_soc_component_active (component))return 0 ; -ep93xx_i2s_enable (info,SNDRV_PCM_STREAM_PLAYBACK ); -ep93xx_i2s_enable (info,SNDRV_PCM_STREAM_CAPTURE ); + err =ep93xx_i2s_enable (info,SNDRV_PCM_STREAM_PLAYBACK ); +if (err) +return err; -return 0 ; +return ep93xx_i2s_enable (info,SNDRV_PCM_STREAM_CAPTURE ); }#else #define ep93xx_i2s_suspend NULL
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 28/160 ipv6: prevent possible UaF in addrconf_permanent_addr()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Abeni <[email protected]>
[ Upstream commit fd63f185979b047fb22a0dfc6bd94d0cab6a6a70 ]
The mentioned helper try to warn the user about an exceptional condition, but the message is delivered too late, accessing the ipv6 after its possible deletion.
Reorder the statement to avoid the possible UaF; while at it, place the warning outside the idev->lock as it needs no protection.
--- net/ipv6/addrconf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/ipv6/addrconf.c +3 -3
@@ -3611,12 +3611,12 @@ static void addrconf_permanent_addr(struct net *net, struct net_device *dev)if ((ifp->flags &IFA_F_PERMANENT ) &&fixup_permanent_addr (net, idev, ifp) <0 ) {write_unlock_bh (&idev->lock); -in6_ifa_hold (ifp); -ipv6_del_addr (ifp); -write_lock_bh (&idev->lock);net_info_ratelimited ("%s: Failed to add prefix route for address %pI6c; dropping\n" , idev->dev->name, &ifp->addr); +in6_ifa_hold (ifp); +ipv6_del_addr (ifp); +write_lock_bh (&idev->lock); } }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 29/160 net: sched: cls_api: fix tc_chain_fill_node to initialize tcm_info to zero to prevent an info-leak
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yochai Eisenrich <[email protected]>
[ Upstream commit e6e3eb5ee89ac4c163d46429391c889a1bb5e404 ]
When building netlink messages, tc_chain_fill_node() never initializes the tcm_info field of struct tcmsg. Since the allocation is not zeroed, kernel heap memory is leaked to userspace through this 4-byte field.
The fix simply zeroes tcm_info alongside the other fields that are already initialized.
--- net/sched/cls_api.c | 1 + 1 file changed, 1 insertion(+)
net/sched/cls_api.c +1 -0
@@ -2886,6 +2886,7 @@ static int tc_chain_fill_node(const struct tcf_proto_ops *tmplt_ops, tcm->tcm__pad1 =0 ; tcm->tcm__pad2 =0 ; tcm->tcm_handle =0 ; + tcm->tcm_info =0 ;if (block->q) { tcm->tcm_ifindex =qdisc_dev (block->q)->ifindex; tcm->tcm_parent = block->q->handle;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 30/160 NFC: pn533: bound the UART receive buffer
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pengpeng Hou <[email protected]>
[ Upstream commit 30fe3f5f6494f827d812ff179f295a8e532709d6 ]
pn532_receive_buf() appends every incoming byte to dev->recv_skb and only resets the buffer after pn532_uart_rx_is_frame() recognizes a complete frame. A continuous stream of bytes without a valid PN532 frame header therefore keeps growing the skb until skb_put_u8() hits the tail limit.
Drop the accumulated partial frame once the fixed receive buffer is full so malformed UART traffic cannot grow the skb past PN532_UART_SKB_BUFF_LEN.
--- drivers/nfc/pn533/uart.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/nfc/pn533/uart.c +3 -0
@@ -211,6 +211,9 @@ static int pn532_receive_buf(struct serdev_device *serdev,del_timer (&dev->cmd_timeout);for (i =0 ; i < count; i++) { +if (unlikely (!skb_tailroom (dev->recv_skb))) +skb_trim (dev->recv_skb,0 ); +skb_put_u8 (dev->recv_skb, *data++);if (!pn532_uart_rx_is_frame (dev->recv_skb))continue ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 31/160 net: xilinx: axienet: Correct BD length masks to match AXIDMA IP spec
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Suraj Gupta <[email protected]>
[ Upstream commit 393e0b4f178ec7fce1141dacc3304e3607a92ee9 ]
The XAXIDMA_BD_CTRL_LENGTH_MASK and XAXIDMA_BD_STS_ACTUAL_LEN_MASK macros were defined as 0x007FFFFF (23 bits), but the AXI DMA IP product guide (PG021) specifies the buffer length field as bits 25:0 (26 bits). Update both masks to match the IP documentation.
In practice this had no functional impact, since Ethernet frames are far smaller than 2^23 bytes and the extra bits were always zero, but the masks should still reflect the hardware specification.
--- drivers/net/ethernet/xilinx/xilinx_axienet.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/xilinx/xilinx_axienet.h +2 -2
@@ -103,7 +103,7 @@#define XAXIDMA_BD_HAS_DRE_MASK 0xF00/* Whether has DRE mask */ #define XAXIDMA_BD_WORDLEN_MASK 0xFF/* Whether has DRE mask */ -#define XAXIDMA_BD_CTRL_LENGTH_MASK 0x007FFFFF/* Requested len */ +#define XAXIDMA_BD_CTRL_LENGTH_MASK GENMASK(25, 0)/* Requested len */ #define XAXIDMA_BD_CTRL_TXSOF_MASK 0x08000000/* First tx packet */ #define XAXIDMA_BD_CTRL_TXEOF_MASK 0x04000000/* Last tx packet */ #define XAXIDMA_BD_CTRL_ALL_MASK 0x0C000000/* All control bits */
@@ -129,7 +129,7 @@#define XAXIDMA_BD_CTRL_TXEOF_MASK 0x04000000/* Last tx packet */ #define XAXIDMA_BD_CTRL_ALL_MASK 0x0C000000/* All control bits */ -#define XAXIDMA_BD_STS_ACTUAL_LEN_MASK 0x007FFFFF/* Actual len */ +#define XAXIDMA_BD_STS_ACTUAL_LEN_MASK GENMASK(25, 0)/* Actual len */ #define XAXIDMA_BD_STS_COMPLETE_MASK 0x80000000/* Completed */ #define XAXIDMA_BD_STS_DEC_ERR_MASK 0x40000000/* Decode error */ #define XAXIDMA_BD_STS_SLV_ERR_MASK 0x20000000/* Slave error */
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 32/160 bpf: Fix regsafe() for pointers to packet
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexei Starovoitov <[email protected]>
[ Upstream commit a8502a79e832b861e99218cbd2d8f4312d62e225 ]
In case rold->reg->range == BEYOND_PKT_END && rcur->reg->range == N regsafe() may return true which may lead to current state with valid packet range not being explored. Fix the bug.
--- kernel/bpf/verifier.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
kernel/bpf/verifier.c +6 -1
@@ -16148,8 +16148,13 @@ static bool regsafe(struct bpf_verifier_env *env, struct bpf_reg_state *rold,* since someone could have accessed through (ptr - k), or * even done ptr -= k in a register, to get a safe access. */ -if (rold->range > rcur->range) +if (rold->range <0 || rcur->range <0 ) { +/* special case for [BEYOND|AT]_PKT_END */ +if (rold->range != rcur->range) +return false; + }else if (rold->range > rcur->range) {return false; + }/* If the offsets don't match, we can't trust our alignment; * nor can we be sure that we won't fall out of range. */
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 33/160 net: ipv6: flowlabel: defer exclusive option free until RCU teardown
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhengchuan Liang <[email protected]>
[ Upstream commit 9ca562bb8e66978b53028fa32b1a190708e6a091 ]
ip6fl_seq_show() walks the global flowlabel hash under the seq-file RCU read-side lock and prints fl->opt->opt_nflen when an option block is present.
Exclusive flowlabels currently free fl->opt as soon as fl->users drops to zero in fl_release(). However, the surrounding struct ip6_flowlabel remains visible in the global hash table until later garbage collection removes it and fl_free_rcu() finally tears it down.
A concurrent /proc/net/ip6_flowlabel reader can therefore race that early kfree() and dereference freed option state, triggering a crash in ip6fl_seq_show().
Fix this by keeping fl->opt alive until fl_free_rcu(). That matches the lifetime already required for the enclosing flowlabel while readers can still reach it under RCU.
--- net/ipv6/ip6_flowlabel.c | 5 ----- 1 file changed, 5 deletions(-)
net/ipv6/ip6_flowlabel.c +0 -5
@@ -133,11 +133,6 @@ static void fl_release(struct ip6_flowlabel *fl)if (time_after (ttd, fl->expires)) fl->expires = ttd; ttd = fl->expires; -if (fl->opt && fl->share ==IPV6_FL_S_EXCL ) { -struct ipv6_txoptions *opt = fl->opt; - fl->opt =NULL ; -kfree (opt); - }if (!timer_pending (&ip6_fl_gc_timer) ||time_after (ip6_fl_gc_timer.expires, ttd))mod_timer (&ip6_fl_gc_timer, ttd);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 34/160 netfilter: flowtable: strictly check for maximum number of actions
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 76522fcdbc3a02b568f5d957f7e66fc194abb893 ]
The maximum number of flowtable hardware offload actions in IPv6 is:
* ethernet mangling (4 payload actions, 2 for each ethernet address)
* SNAT (4 payload actions)
* DNAT (4 payload actions)
* Double VLAN (4 vlan actions, 2 for popping vlan, and 2 for pushing) for QinQ.
* Redirect (1 action)
Which makes 17, while the maximum is 16. But act_ct supports for tunnels actions too. Note that payload action operates at 32-bit word level, so mangling an IPv6 address takes 4 payload actions.
Update flow_action_entry_next() calls to check for the maximum number of supported actions.
While at it, rise the maximum number of actions per flow from 16 to 24 so this works fine with IPv6 setups.
--- net/netfilter/nf_flow_table_offload.c | 196 +++++++++++++++++--------- 1 file changed, 130 insertions(+), 66 deletions(-)
net/netfilter/nf_flow_table_offload.c +130 -66
@@ -13,6 +13,8 @@#include <net/netfilter/nf_conntrack_core.h> #include <net/netfilter/nf_conntrack_tuple.h> +#define NF_FLOW_RULE_ACTION_MAX 24 +static struct workqueue_struct *nf_flow_offload_add_wq;static struct workqueue_struct *nf_flow_offload_del_wq;static struct workqueue_struct *nf_flow_offload_stats_wq;
@@ -215,7 +217,12 @@ static void flow_offload_mangle(struct flow_action_entry *entry,static inline struct flow_action_entry *flow_action_entry_next (struct nf_flow_rule *flow_rule) { -int i = flow_rule->rule->action.num_entries++; +int i; + +if (unlikely (flow_rule->rule->action.num_entries >=NF_FLOW_RULE_ACTION_MAX )) +return NULL ; + + i = flow_rule->rule->action.num_entries++;return &flow_rule->rule->action.entries[i]; }
@@ -233,6 +240,9 @@ static int flow_offload_eth_src(struct net *net,u32 mask, val;u16 val16; +if (!entry0 || !entry1) +return -E2BIG ; + this_tuple = &flow->tuplehash[dir].tuple;switch (this_tuple->xmit_type) {
@@ -283,6 +293,9 @@ static int flow_offload_eth_dst(struct net *net,u8 nud_state;u16 val16; +if (!entry0 || !entry1) +return -E2BIG ; + this_tuple = &flow->tuplehash[dir].tuple;switch (this_tuple->xmit_type) {
@@ -324,16 +337,19 @@ static int flow_offload_eth_dst(struct net *net,return 0 ; } -static void flow_offload_ipv4_snat (struct net *net, -const struct flow_offload *flow, -enum flow_offload_tuple_dir dir, -struct nf_flow_rule *flow_rule) +static int flow_offload_ipv4_snat (struct net *net, +const struct flow_offload *flow, +enum flow_offload_tuple_dir dir, +struct nf_flow_rule *flow_rule) {struct flow_action_entry *entry =flow_action_entry_next (flow_rule);u32 mask = ~htonl (0xffffffff );__be32 addr;u32 offset; +if (!entry) +return -E2BIG ; +switch (dir) {case FLOW_OFFLOAD_DIR_ORIGINAL : addr = flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY ].tuple.dst_v4.s_addr;
@@ -344,23 +360,27 @@ static void flow_offload_ipv4_snat(struct net *net, offset = offsetof(struct iphdr , daddr);break ;default : -return ; +return -EOPNOTSUPP ; }flow_offload_mangle (entry,FLOW_ACT_MANGLE_HDR_TYPE_IP4 , offset, &addr, &mask); +return 0 ; } -static void flow_offload_ipv4_dnat (struct net *net, -const struct flow_offload *flow, -enum flow_offload_tuple_dir dir, -struct nf_flow_rule *flow_rule) +static int flow_offload_ipv4_dnat (struct net *net, +const struct flow_offload *flow, +enum flow_offload_tuple_dir dir, +struct nf_flow_rule *flow_rule) {struct flow_action_entry *entry =flow_action_entry_next (flow_rule);u32 mask = ~htonl (0xffffffff );__be32 addr;u32 offset; +if (!entry) +return -E2BIG ; +switch (dir) {case FLOW_OFFLOAD_DIR_ORIGINAL : addr = flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY ].tuple.src_v4.s_addr;
@@ -371,14 +391,15 @@ static void flow_offload_ipv4_dnat(struct net *net, offset = offsetof(struct iphdr , saddr);break ;default : -return ; +return -EOPNOTSUPP ; }flow_offload_mangle (entry,FLOW_ACT_MANGLE_HDR_TYPE_IP4 , offset, &addr, &mask); +return 0 ; } -static void flow_offload_ipv6_mangle (struct nf_flow_rule *flow_rule, +static int flow_offload_ipv6_mangle (struct nf_flow_rule *flow_rule,unsigned int offset,const __be32 *addr,const __be32 *mask) {
@@ -387,15 +408,20 @@ static void flow_offload_ipv6_mangle(struct nf_flow_rule *flow_rule,for (i =0 ; i <sizeof (struct in6_addr ) /sizeof (u32); i++) { entry =flow_action_entry_next (flow_rule); +if (!entry) +return -E2BIG ; +flow_offload_mangle (entry,FLOW_ACT_MANGLE_HDR_TYPE_IP6 , offset + i *sizeof (u32), &addr[i], mask); } + +return 0 ; } -static void flow_offload_ipv6_snat (struct net *net, -const struct flow_offload *flow, -enum flow_offload_tuple_dir dir, -struct nf_flow_rule *flow_rule) +static int flow_offload_ipv6_snat (struct net *net, +const struct flow_offload *flow, +enum flow_offload_tuple_dir dir, +struct nf_flow_rule *flow_rule) {u32 mask = ~htonl (0xffffffff );const __be32 *addr;
@@ -411,16 +437,16 @@ static void flow_offload_ipv6_snat(struct net *net, offset = offsetof(struct ipv6hdr , daddr);break ;default : -return ; +return -EOPNOTSUPP ; } -flow_offload_ipv6_mangle (flow_rule, offset, addr, &mask); +return flow_offload_ipv6_mangle (flow_rule, offset, addr, &mask); } -static void flow_offload_ipv6_dnat (struct net *net, -const struct flow_offload *flow, -enum flow_offload_tuple_dir dir, -struct nf_flow_rule *flow_rule) +static int flow_offload_ipv6_dnat (struct net *net, +const struct flow_offload *flow, +enum flow_offload_tuple_dir dir, +struct nf_flow_rule *flow_rule) {u32 mask = ~htonl (0xffffffff );const __be32 *addr;
@@ -436,10 +462,10 @@ static void flow_offload_ipv6_dnat(struct net *net, offset = offsetof(struct ipv6hdr , saddr);break ;default : -return ; +return -EOPNOTSUPP ; } -flow_offload_ipv6_mangle (flow_rule, offset, addr, &mask); +return flow_offload_ipv6_mangle (flow_rule, offset, addr, &mask); }static int flow_offload_l4proto (const struct flow_offload *flow)
@@ -461,15 +487,18 @@ static int flow_offload_l4proto(const struct flow_offload *flow)return type; } -static void flow_offload_port_snat (struct net *net, -const struct flow_offload *flow, -enum flow_offload_tuple_dir dir, -struct nf_flow_rule *flow_rule) +static int flow_offload_port_snat (struct net *net, +const struct flow_offload *flow, +enum flow_offload_tuple_dir dir, +struct nf_flow_rule *flow_rule) {struct flow_action_entry *entry =flow_action_entry_next (flow_rule);u32 mask, port;u32 offset; +if (!entry) +return -E2BIG ; +switch (dir) {case FLOW_OFFLOAD_DIR_ORIGINAL : port =ntohs (flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY ].tuple.dst_port);
@@ -484,22 +513,26 @@ static void flow_offload_port_snat(struct net *net, mask = ~htonl (0xffff );break ;default : -return ; +return -EOPNOTSUPP ; }flow_offload_mangle (entry,flow_offload_l4proto (flow), offset, &port, &mask); +return 0 ; } -static void flow_offload_port_dnat (struct net *net, -const struct flow_offload *flow, -enum flow_offload_tuple_dir dir, -struct nf_flow_rule *flow_rule) +static int flow_offload_port_dnat (struct net *net, +const struct flow_offload *flow, +enum flow_offload_tuple_dir dir, +struct nf_flow_rule *flow_rule) {struct flow_action_entry *entry =flow_action_entry_next (flow_rule);u32 mask, port;u32 offset; +if (!entry) +return -E2BIG ; +switch (dir) {case FLOW_OFFLOAD_DIR_ORIGINAL : port =ntohs (flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY ].tuple.src_port);
@@ -514,20 +547,24 @@ static void flow_offload_port_dnat(struct net *net, mask = ~htonl (0xffff0000 );break ;default : -return ; +return -EOPNOTSUPP ; }flow_offload_mangle (entry,flow_offload_l4proto (flow), offset, &port, &mask); +return 0 ; } -static void flow_offload_ipv4_checksum (struct net *net, -const struct flow_offload *flow, -struct nf_flow_rule *flow_rule) +static int flow_offload_ipv4_checksum (struct net *net, +const struct flow_offload *flow, +struct nf_flow_rule *flow_rule) {u8 protonum = flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL ].tuple.l4proto;struct flow_action_entry *entry =flow_action_entry_next (flow_rule); +if (!entry) +return -E2BIG ; + entry->id =FLOW_ACTION_CSUM ; entry->csum_flags =TCA_CSUM_UPDATE_FLAG_IPV4HDR ;
@@ -539,12 +576,14 @@ static void flow_offload_ipv4_checksum(struct net *net, entry->csum_flags |=TCA_CSUM_UPDATE_FLAG_UDP ;break ; } + +return 0 ; } -static void flow_offload_redirect (struct net *net, -const struct flow_offload *flow, -enum flow_offload_tuple_dir dir, -struct nf_flow_rule *flow_rule) +static int flow_offload_redirect (struct net *net, +const struct flow_offload *flow, +enum flow_offload_tuple_dir dir, +struct nf_flow_rule *flow_rule) {const struct flow_offload_tuple *this_tuple, *other_tuple;struct flow_action_entry *entry;
@@ -562,21 +601,28 @@ static void flow_offload_redirect(struct net *net, ifindex = other_tuple->iifidx;break ;default : -return ; +return -EOPNOTSUPP ; } dev =dev_get_by_index (net, ifindex);if (!dev) -return ; +return -ENODEV ; entry =flow_action_entry_next (flow_rule); +if (!entry) { +dev_put (dev); +return -E2BIG ; + } + entry->id =FLOW_ACTION_REDIRECT ; entry->dev = dev; + +return 0 ; } -static void flow_offload_encap_tunnel (const struct flow_offload *flow, -enum flow_offload_tuple_dir dir, -struct nf_flow_rule *flow_rule) +static int flow_offload_encap_tunnel (const struct flow_offload *flow, +enum flow_offload_tuple_dir dir, +struct nf_flow_rule *flow_rule) {const struct flow_offload_tuple *this_tuple;struct flow_action_entry *entry;
@@ -584,7 +630,7 @@ static void flow_offload_encap_tunnel(const struct flow_offload *flow, this_tuple = &flow->tuplehash[dir].tuple;if (this_tuple->xmit_type ==FLOW_OFFLOAD_XMIT_DIRECT ) -return ; +return 0 ; dst = this_tuple->dst_cache;if (dst && dst->lwtstate) {
@@ -593,15 +639,19 @@ static void flow_offload_encap_tunnel(const struct flow_offload *flow, tun_info =lwt_tun_info (dst->lwtstate);if (tun_info && (tun_info->mode &IP_TUNNEL_INFO_TX )) { entry =flow_action_entry_next (flow_rule); +if (!entry) +return -E2BIG ; entry->id =FLOW_ACTION_TUNNEL_ENCAP ; entry->tunnel = tun_info; } } + +return 0 ; } -static void flow_offload_decap_tunnel (const struct flow_offload *flow, -enum flow_offload_tuple_dir dir, -struct nf_flow_rule *flow_rule) +static int flow_offload_decap_tunnel (const struct flow_offload *flow, +enum flow_offload_tuple_dir dir, +struct nf_flow_rule *flow_rule) {const struct flow_offload_tuple *other_tuple;struct flow_action_entry *entry;
@@ -609,7 +659,7 @@ static void flow_offload_decap_tunnel(const struct flow_offload *flow, other_tuple = &flow->tuplehash[!dir].tuple;if (other_tuple->xmit_type ==FLOW_OFFLOAD_XMIT_DIRECT ) -return ; +return 0 ; dst = other_tuple->dst_cache;if (dst && dst->lwtstate) {
@@ -618,9 +668,13 @@ static void flow_offload_decap_tunnel(const struct flow_offload *flow, tun_info =lwt_tun_info (dst->lwtstate);if (tun_info && (tun_info->mode &IP_TUNNEL_INFO_TX )) { entry =flow_action_entry_next (flow_rule); +if (!entry) +return -E2BIG ; entry->id =FLOW_ACTION_TUNNEL_DECAP ; } } + +return 0 ; } static int
@@ -632,8 +686,9 @@ nf_flow_rule_route_common(struct net *net, const struct flow_offload *flow,const struct flow_offload_tuple *tuple;int i; -flow_offload_decap_tunnel (flow, dir, flow_rule); -flow_offload_encap_tunnel (flow, dir, flow_rule); +if (flow_offload_decap_tunnel (flow, dir, flow_rule) <0 || +flow_offload_encap_tunnel (flow, dir, flow_rule) <0 ) +return -1 ;if (flow_offload_eth_src (net, flow, dir, flow_rule) <0 ||flow_offload_eth_dst (net, flow, dir, flow_rule) <0 )
@@ -649,6 +704,8 @@ nf_flow_rule_route_common(struct net *net, const struct flow_offload *flow,if (tuple->encap[i].proto ==htons (ETH_P_8021Q )) { entry =flow_action_entry_next (flow_rule); +if (!entry) +return -1 ; entry->id =FLOW_ACTION_VLAN_POP ; } }
@@ -662,6 +719,8 @@ nf_flow_rule_route_common(struct net *net, const struct flow_offload *flow,continue ; entry =flow_action_entry_next (flow_rule); +if (!entry) +return -1 ;switch (other_tuple->encap[i].proto) {case htons (ETH_P_PPP_SES ):
@@ -687,18 +746,22 @@ int nf_flow_rule_route_ipv4(struct net *net, struct flow_offload *flow,return -1 ;if (test_bit (NF_FLOW_SNAT , &flow->flags)) { -flow_offload_ipv4_snat (net, flow, dir, flow_rule); -flow_offload_port_snat (net, flow, dir, flow_rule); +if (flow_offload_ipv4_snat (net, flow, dir, flow_rule) <0 || +flow_offload_port_snat (net, flow, dir, flow_rule) <0 ) +return -1 ; }if (test_bit (NF_FLOW_DNAT , &flow->flags)) { -flow_offload_ipv4_dnat (net, flow, dir, flow_rule); -flow_offload_port_dnat (net, flow, dir, flow_rule); +if (flow_offload_ipv4_dnat (net, flow, dir, flow_rule) <0 || +flow_offload_port_dnat (net, flow, dir, flow_rule) <0 ) +return -1 ; }if (test_bit (NF_FLOW_SNAT , &flow->flags) ||test_bit (NF_FLOW_DNAT , &flow->flags)) -flow_offload_ipv4_checksum (net, flow, flow_rule); +if (flow_offload_ipv4_checksum (net, flow, flow_rule) <0 ) +return -1 ; -flow_offload_redirect (net, flow, dir, flow_rule); +if (flow_offload_redirect (net, flow, dir, flow_rule) <0 ) +return -1 ;return 0 ; }
@@ -712,22 +775,23 @@ int nf_flow_rule_route_ipv6(struct net *net, struct flow_offload *flow,return -1 ;if (test_bit (NF_FLOW_SNAT , &flow->flags)) { -flow_offload_ipv6_snat (net, flow, dir, flow_rule); -flow_offload_port_snat (net, flow, dir, flow_rule); +if (flow_offload_ipv6_snat (net, flow, dir, flow_rule) <0 || +flow_offload_port_snat (net, flow, dir, flow_rule) <0 ) +return -1 ; }if (test_bit (NF_FLOW_DNAT , &flow->flags)) { -flow_offload_ipv6_dnat (net, flow, dir, flow_rule); -flow_offload_port_dnat (net, flow, dir, flow_rule); +if (flow_offload_ipv6_dnat (net, flow, dir, flow_rule) <0 || +flow_offload_port_dnat (net, flow, dir, flow_rule) <0 ) +return -1 ; } -flow_offload_redirect (net, flow, dir, flow_rule); +if (flow_offload_redirect (net, flow, dir, flow_rule) <0 ) +return -1 ;return 0 ; }EXPORT_SYMBOL_GPL (nf_flow_rule_route_ipv6); -#define NF_FLOW_RULE_ACTION_MAX 16 -static struct nf_flow_rule * nf_flow_offload_rule_alloc(struct net *net, const struct flow_offload_work *offload,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 35/160 netfilter: nfnetlink_log: account for netlink header size
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
[ Upstream commit 6d52a4a0520a6696bdde51caa11f2d6821cd0c01 ]
This is a followup to an old bug fix: NLMSG_DONE needs to account for the netlink header size, not just the attribute size.
This can result in a WARN splat + drop of the netlink message, but other than this there are no ill effects.
--- net/netfilter/nfnetlink_log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nfnetlink_log.c +1 -1
@@ -726,7 +726,7 @@ nfulnl_log_packet(struct net *net, +nla_total_size (plen)/* prefix */ +nla_total_size (sizeof (struct nfulnl_msg_packet_hw )) +nla_total_size (sizeof (struct nfulnl_msg_packet_timestamp )) - +nla_total_size (sizeof (struct nfgenmsg ));/* NLMSG_DONE */ + +nlmsg_total_size (sizeof (struct nfgenmsg ));/* NLMSG_DONE */ if (in &&skb_mac_header_was_set (skb)) { size +=nla_total_size (skb->dev->hard_header_len)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 36/160 netfilter: x_tables: ensure names are nul-terminated
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
[ Upstream commit a958a4f90ddd7de0800b33ca9d7b886b7d40f74e ]
Reject names that lack a \0 character before feeding them to functions that expect c-strings.
Fixes tag is the most recent commit that needs this change.
--- net/netfilter/xt_cgroup.c | 6 ++++++ net/netfilter/xt_rateest.c | 5 +++++ 2 files changed, 11 insertions(+)
net/netfilter/xt_cgroup.c +6 -0
@@ -53,6 +53,9 @@ static int cgroup_mt_check_v1(const struct xt_mtchk_param *par) info->priv =NULL ;if (info->has_path) { +if (strnlen (info->path,sizeof (info->path)) >=sizeof (info->path)) +return -ENAMETOOLONG ; + cgrp =cgroup_get_from_path (info->path);if (IS_ERR (cgrp)) { pr_info_ratelimited("invalid path, errno=%ld\n",
@@ -85,6 +88,9 @@ static int cgroup_mt_check_v2(const struct xt_mtchk_param *par) info->priv =NULL ;if (info->has_path) { +if (strnlen (info->path,sizeof (info->path)) >=sizeof (info->path)) +return -ENAMETOOLONG ; + cgrp =cgroup_get_from_path (info->path);if (IS_ERR (cgrp)) { pr_info_ratelimited("invalid path, errno=%ld\n",
net/netfilter/xt_rateest.c +5 -0
@@ -91,6 +91,11 @@ static int xt_rateest_mt_checkentry(const struct xt_mtchk_param *par) goto err1; } +if (strnlen (info->name1,sizeof (info->name1)) >=sizeof (info->name1)) +return -ENAMETOOLONG ; +if (strnlen (info->name2,sizeof (info->name2)) >=sizeof (info->name2)) +return -ENAMETOOLONG ; + ret = -ENOENT ; est1 =xt_rateest_lookup (par->net, info->name1);if (!est1)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 37/160 netfilter: ipset: use nla_strcmp for IPSET_ATTR_NAME attr
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
[ Upstream commit b7e8590987aa94c9dc51518fad0e58cb887b1db5 ]
IPSET_ATTR_NAME and IPSET_ATTR_NAMEREF are of NLA_STRING type, they cannot be treated like a c-string.
They either have to be switched to NLA_NUL_STRING, or the compare operations need to use the nla functions.
--- include/linux/netfilter/ipset/ip_set.h | 2 +- net/netfilter/ipset/ip_set_core.c | 4 ++-- net/netfilter/ipset/ip_set_list_set.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
include/linux/netfilter/ipset/ip_set.h +1 -1
@@ -309,7 +309,7 @@ enum {/* register and unregister set references */ extern ip_set_id_t ip_set_get_byname (struct net *net, -const char *name,struct ip_set **set); +const struct nlattr *name,struct ip_set **set);extern void ip_set_put_byindex (struct net *net,ip_set_id_t index);extern void ip_set_name_byindex (struct net *net,ip_set_id_t index,char *name);extern ip_set_id_t ip_set_nfnl_get_byindex (struct net *net,ip_set_id_t index);
net/netfilter/ipset/ip_set_core.c +2 -2
@@ -821,7 +821,7 @@ EXPORT_SYMBOL_GPL(ip_set_del);* */ ip_set_id_t -ip_set_get_byname (struct net *net,const char *name,struct ip_set **set) +ip_set_get_byname (struct net *net,const struct nlattr *name,struct ip_set **set) {ip_set_id_t i, index =IPSET_INVALID_ID ;struct ip_set *s;
@@ -830,7 +830,7 @@ ip_set_get_byname(struct net *net, const char *name, struct ip_set **set)rcu_read_lock ();for (i =0 ; i < inst->ip_set_max; i++) { s =rcu_dereference (inst->ip_set_list)[i]; -if (s &&STRNCMP (s->name, name)) { +if (s &&nla_strcmp (name, s->name) ==0 ) {__ip_set_get (s); index = i; *set = s;
net/netfilter/ipset/ip_set_list_set.c +2 -2
@@ -367,7 +367,7 @@ list_set_uadt(struct ip_set *set, struct nlattr *tb[], ret =ip_set_get_extensions (set, tb, &ext);if (ret)return ret; - e.id =ip_set_get_byname (map->net,nla_data (tb[IPSET_ATTR_NAME ]), &s); + e.id =ip_set_get_byname (map->net, tb[IPSET_ATTR_NAME ], &s);if (e.id ==IPSET_INVALID_ID )return -IPSET_ERR_NAME ;/* "Loop detection" */
@@ -389,7 +389,7 @@ list_set_uadt(struct ip_set *set, struct nlattr *tb[],if (tb[IPSET_ATTR_NAMEREF ]) { e.refid =ip_set_get_byname (map->net, -nla_data (tb[IPSET_ATTR_NAMEREF ]), + tb[IPSET_ATTR_NAMEREF ], &s);if (e.refid ==IPSET_INVALID_ID ) { ret = -IPSET_ERR_NAMEREF ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 38/160 netfilter: nf_conntrack_helper: pass helper to expect cleanup
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qi Tang <[email protected]>
[ Upstream commit a242a9ae58aa46ff7dae51ce64150a93957abe65 ]
nf_conntrack_helper_unregister() calls nf_ct_expect_iterate_destroy() to remove expectations belonging to the helper being unregistered. However, it passes NULL instead of the helper pointer as the data argument, so expect_iter_me() never matches any expectation and all of them survive the cleanup.
After unregister returns, nfnl_cthelper_del() frees the helper object immediately. Subsequent expectation dumps or packet-driven init_conntrack() calls then dereference the freed exp->helper, causing a use-after-free.
Pass the actual helper pointer so expectations referencing it are properly destroyed before the helper object is freed.
BUG: KASAN: slab-use-after-free in string+0x38f/0x430 Read of size 1 at addr ffff888003b14d20 by task poc/103 Call Trace: string+0x38f/0x430 vsnprintf+0x3cc/0x1170 seq_printf+0x17a/0x240 exp_seq_show+0x2e5/0x560 seq_read_iter+0x419/0x1280 proc_reg_read+0x1ac/0x270 vfs_read+0x179/0x930 ksys_read+0xef/0x1c0 Freed by task 103: The buggy address is located 32 bytes inside of freed 192-byte region [ffff888003b14d00, ffff888003b14dc0)
--- net/netfilter/nf_conntrack_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nf_conntrack_helper.c +1 -1
@@ -424,7 +424,7 @@ void nf_conntrack_helper_unregister(struct nf_conntrack_helper *me)*/ synchronize_rcu (); -nf_ct_expect_iterate_destroy (expect_iter_me,NULL ); +nf_ct_expect_iterate_destroy (expect_iter_me, me);nf_ct_iterate_destroy (unhelp, me); }EXPORT_SYMBOL_GPL (nf_conntrack_helper_unregister);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 39/160 netfilter: ctnetlink: zero expect NAT fields when CTA_EXPECT_NAT absent
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qi Tang <[email protected]>
[ Upstream commit 35177c6877134a21315f37d57a5577846225623e ]
ctnetlink_alloc_expect() allocates expectations from a non-zeroing slab cache via nf_ct_expect_alloc(). When CTA_EXPECT_NAT is not present in the netlink message, saved_addr and saved_proto are never initialized. Stale data from a previous slab occupant can then be dumped to userspace by ctnetlink_exp_dump_expect(), which checks these fields to decide whether to emit CTA_EXPECT_NAT.
The safe sibling nf_ct_expect_init(), used by the packet path, explicitly zeroes these fields.
Zero saved_addr, saved_proto and dir in the else branch, guarded by IS_ENABLED(CONFIG_NF_NAT) since these fields only exist when NAT is enabled.
Confirmed by priming the expect slab with NAT-bearing expectations, freeing them, creating a new expectation without CTA_EXPECT_NAT, and observing that the ctnetlink dump emits a spurious CTA_EXPECT_NAT containing stale data from the prior allocation.
--- net/netfilter/nf_conntrack_netlink.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/netfilter/nf_conntrack_netlink.c +6 -0
@@ -3565,6 +3565,12 @@ ctnetlink_alloc_expect(const struct nlattr * const cda[], struct nf_conn *ct, exp, nf_ct_l3num(ct));if (err <0 ) goto err_out; +#if IS_ENABLED (CONFIG_NF_NAT ) + } else { +memset (&exp->saved_addr,0 ,sizeof (exp->saved_addr)); +memset (&exp->saved_proto,0 ,sizeof (exp->saved_proto)); + exp->dir =0 ; +#endif }return exp; err_out:
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 40/160 netfilter: nf_conntrack_expect: honor expectation helper field
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 9c42bc9db90a154bc61ae337a070465f3393485a ]
The expectation helper field is mostly unused. As a result, the netfilter codebase relies on accessing the helper through exp->master.
Always set on the expectation helper field so it can be used to reach the helper.
nf_ct_expect_init() is called from packet path where the skb owns the ct object, therefore accessing exp->master for the newly created expectation is safe. This saves a lot of updates in all callsites to pass the ct object as parameter to nf_ct_expect_init().
This is a preparation patches for follow up fixes.
Stable-dep-of: 917b61fa2042 ("netfilter: ctnetlink: ignore explicit helper on new expectations")
--- include/net/netfilter/nf_conntrack_expect.h | 2 +- net/netfilter/nf_conntrack_broadcast.c | 2 +- net/netfilter/nf_conntrack_expect.c | 14 +++++++++++++- net/netfilter/nf_conntrack_h323_main.c | 12 ++++++------ net/netfilter/nf_conntrack_helper.c | 7 ++++++- net/netfilter/nf_conntrack_netlink.c | 2 +- net/netfilter/nf_conntrack_sip.c | 2 +- 7 files changed, 29 insertions(+), 12 deletions(-)
include/net/netfilter/nf_conntrack_expect.h +1 -1
@@ -40,7 +40,7 @@ struct nf_conntrack_expect { struct nf_conntrack_expect *this);/* Helper to assign to new connection */ -struct nf_conntrack_helper *helper; +struct nf_conntrack_helper __rcu *helper;/* The conntrack of the master connection */ struct nf_conn *master;
net/netfilter/nf_conntrack_broadcast.c +1 -1
@@ -70,7 +70,7 @@ int nf_conntrack_broadcast_help(struct sk_buff *skb, exp->expectfn =NULL ; exp->flags =NF_CT_EXPECT_PERMANENT ; exp->class =NF_CT_EXPECT_CLASS_DEFAULT ; - exp->helper =NULL ; +rcu_assign_pointer (exp->helper, helper);nf_ct_expect_related (exp,0 );nf_ct_expect_put (exp);
net/netfilter/nf_conntrack_expect.c +13 -1
@@ -309,12 +309,19 @@ struct nf_conntrack_expect *nf_ct_expect_alloc(struct nf_conn *me) }EXPORT_SYMBOL_GPL (nf_ct_expect_alloc); +/* This function can only be used from packet path, where accessing +* master's helper is safe, because the packet holds a reference on +* the conntrack object. Never use it from control plane. +*/ void nf_ct_expect_init (struct nf_conntrack_expect *exp,unsigned int class,u_int8_t family,const union nf_inet_addr *saddr,const union nf_inet_addr *daddr,u_int8_t proto,const __be16 *src,const __be16 *dst) { +struct nf_conntrack_helper *helper =NULL ; +struct nf_conn *ct = exp->master; +struct nf_conn_help *help;int len;if (family ==AF_INET )
@@ -325,7 +332,12 @@ void nf_ct_expect_init(struct nf_conntrack_expect *exp, unsigned int class, exp->flags =0 ; exp->class = class; exp->expectfn =NULL ; - exp->helper =NULL ; + + help =nfct_help (ct); +if (help) + helper =rcu_dereference (help->helper); + +rcu_assign_pointer (exp->helper, helper); exp->tuple.src.l3num = family; exp->tuple.dst.protonum = proto;
net/netfilter/nf_conntrack_h323_main.c +6 -6
@@ -642,7 +642,7 @@ static int expect_h245(struct sk_buff *skb, struct nf_conn *ct, &ct->tuplehash[!dir].tuple.src.u3, &ct->tuplehash[!dir].tuple.dst.u3, IPPROTO_TCP, NULL, &port); - exp->helper = &nf_conntrack_helper_h245; +rcu_assign_pointer (exp->helper, &nf_conntrack_helper_h245); nathook =rcu_dereference (nfct_h323_nat_hook); if (memcmp(&ct->tuplehash[dir].tuple.src.u3,
@@ -766,7 +766,7 @@ static int expect_callforwarding(struct sk_buff *skb,nf_ct_expect_init (exp,NF_CT_EXPECT_CLASS_DEFAULT ,nf_ct_l3num (ct), &ct->tuplehash[!dir].tuple.src.u3, &addr,IPPROTO_TCP ,NULL , &port); - exp->helper = nf_conntrack_helper_q931; +rcu_assign_pointer (exp->helper, nf_conntrack_helper_q931); nathook =rcu_dereference (nfct_h323_nat_hook); if (memcmp(&ct->tuplehash[dir].tuple.src.u3,
@@ -1233,7 +1233,7 @@ static int expect_q931(struct sk_buff *skb, struct nf_conn *ct, &ct->tuplehash[!dir].tuple.src.u3 : NULL, &ct->tuplehash[!dir].tuple.dst.u3, IPPROTO_TCP, NULL, &port); - exp->helper = nf_conntrack_helper_q931; +rcu_assign_pointer (exp->helper, nf_conntrack_helper_q931); exp->flags =NF_CT_EXPECT_PERMANENT ;/* Accept multiple calls */ nathook =rcu_dereference (nfct_h323_nat_hook);
@@ -1305,7 +1305,7 @@ static int process_gcf(struct sk_buff *skb, struct nf_conn *ct,nf_ct_expect_init (exp,NF_CT_EXPECT_CLASS_DEFAULT ,nf_ct_l3num (ct), &ct->tuplehash[!dir].tuple.src.u3, &addr,IPPROTO_UDP ,NULL , &port); - exp->helper = nf_conntrack_helper_ras; +rcu_assign_pointer (exp->helper, nf_conntrack_helper_ras);if (nf_ct_expect_related (exp,0 ) ==0 ) {pr_debug ("nf_ct_ras: expect RAS " );
@@ -1522,7 +1522,7 @@ static int process_acf(struct sk_buff *skb, struct nf_conn *ct, &ct->tuplehash[!dir].tuple.src.u3, &addr, IPPROTO_TCP, NULL, &port); exp->flags =NF_CT_EXPECT_PERMANENT ; - exp->helper = nf_conntrack_helper_q931; +rcu_assign_pointer (exp->helper, nf_conntrack_helper_q931);if (nf_ct_expect_related (exp,0 ) ==0 ) {pr_debug ("nf_ct_ras: expect Q.931 " );
@@ -1576,7 +1576,7 @@ static int process_lcf(struct sk_buff *skb, struct nf_conn *ct, &ct->tuplehash[!dir].tuple.src.u3, &addr, IPPROTO_TCP, NULL, &port); exp->flags =NF_CT_EXPECT_PERMANENT ; - exp->helper = nf_conntrack_helper_q931; +rcu_assign_pointer (exp->helper, nf_conntrack_helper_q931);if (nf_ct_expect_related (exp,0 ) ==0 ) {pr_debug ("nf_ct_ras: expect Q.931 " );
net/netfilter/nf_conntrack_helper.c +6 -1
@@ -404,7 +404,7 @@ static bool expect_iter_me(struct nf_conntrack_expect *exp, void *data)const struct nf_conntrack_helper *me = data;const struct nf_conntrack_helper *this; -if (exp->helper == me) +if (rcu_access_pointer (exp->helper) == me)return true; this = rcu_dereference_protected(help->helper,
@@ -426,6 +426,11 @@ void nf_conntrack_helper_unregister(struct nf_conntrack_helper *me)nf_ct_expect_iterate_destroy (expect_iter_me, me);nf_ct_iterate_destroy (unhelp, me); + +/* nf_ct_iterate_destroy() does an unconditional synchronize_rcu() as +* last step, this ensures rcu readers of exp->helper are done. +* No need for another synchronize_rcu() here. +*/ }EXPORT_SYMBOL_GPL (nf_conntrack_helper_unregister);
net/netfilter/nf_conntrack_netlink.c +1 -1
@@ -3555,7 +3555,7 @@ ctnetlink_alloc_expect(const struct nlattr * const cda[], struct nf_conn *ct, exp->class = class; exp->master = ct; - exp->helper = helper; +rcu_assign_pointer (exp->helper, helper); exp->tuple = *tuple; exp->mask.src.u3 = mask->src.u3; exp->mask.src.u.all = mask->src.u.all;
net/netfilter/nf_conntrack_sip.c +1 -1
@@ -1303,7 +1303,7 @@ static int process_register_request(struct sk_buff *skb, unsigned int protoff,nf_ct_expect_init (exp,SIP_EXPECT_SIGNALLING ,nf_ct_l3num (ct), saddr, &daddr, proto,NULL , &port); exp->timeout.expires = sip_timeout *HZ ; - exp->helper = helper; +rcu_assign_pointer (exp->helper, helper); exp->flags =NF_CT_EXPECT_PERMANENT |NF_CT_EXPECT_INACTIVE ; hooks =rcu_dereference (nf_nat_sip_hooks);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 41/160 netfilter: nf_conntrack_expect: use expect->helper
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
[ Upstream commit f01794106042ee27e54af6fdf5b319a2fe3df94d ]
Use expect->helper in ctnetlink and /proc to dump the helper name. Using nfct_help() without holding a reference to the master conntrack is unsafe.
Use exp->master->helper in ctnetlink path if userspace does not provide an explicit helper when creating an expectation to retain the existing behaviour. The ctnetlink expectation path holds the reference on the master conntrack and nf_conntrack_expect lock and the nfnetlink glue path refers to the master ct that is attached to the skb.
Stable-dep-of: 917b61fa2042 ("netfilter: ctnetlink: ignore explicit helper on new expectations")
--- net/netfilter/nf_conntrack_expect.c | 2 +- net/netfilter/nf_conntrack_helper.c | 6 +----- net/netfilter/nf_conntrack_netlink.c | 24 ++++++++++-------------- net/netfilter/nf_conntrack_sip.c | 2 +- 4 files changed, 13 insertions(+), 21 deletions(-)
net/netfilter/nf_conntrack_expect.c +1 -1
@@ -670,7 +670,7 @@ static int exp_seq_show(struct seq_file *s, void *v)if (expect->flags &NF_CT_EXPECT_USERSPACE )seq_printf (s,"%sUSERSPACE" , delim); - helper =rcu_dereference (nfct_help (expect->master)->helper); + helper =rcu_dereference (expect->helper);if (helper) {seq_printf (s,"%s%s" , expect->flags ?" " :"" , helper->name);if (helper->expect_policy[expect->class].name[0 ])
net/netfilter/nf_conntrack_helper.c +1 -5
@@ -400,14 +400,10 @@ EXPORT_SYMBOL_GPL(nf_conntrack_helper_register);static bool expect_iter_me (struct nf_conntrack_expect *exp,void *data) { -struct nf_conn_help *help =nfct_help (exp->master);const struct nf_conntrack_helper *me = data;const struct nf_conntrack_helper *this; -if (rcu_access_pointer (exp->helper) == me) -return true; - - this =rcu_dereference_protected (help->helper, + this =rcu_dereference_protected (exp->helper,lockdep_is_held (&nf_conntrack_expect_lock));return this == me; }
net/netfilter/nf_conntrack_netlink.c +10 -14
@@ -2994,7 +2994,7 @@ ctnetlink_exp_dump_expect(struct sk_buff *skb, {struct nf_conn *master = exp->master;long timeout = ((long )exp->timeout.expires - (long )jiffies) /HZ ; -struct nf_conn_help *help; +struct nf_conntrack_helper *helper;#if IS_ENABLED (CONFIG_NF_NAT )struct nlattr *nest_parms;struct nf_conntrack_tuple nat_tuple = {};
@@ -3039,15 +3039,12 @@ ctnetlink_exp_dump_expect(struct sk_buff *skb, nla_put_be32(skb, CTA_EXPECT_FLAGS, htonl(exp->flags)) || nla_put_be32(skb, CTA_EXPECT_CLASS, htonl(exp->class))) goto nla_put_failure; - help =nfct_help (master); -if (help) { -struct nf_conntrack_helper *helper; - helper =rcu_dereference (help->helper); -if (helper && -nla_put_string (skb,CTA_EXPECT_HELP_NAME , helper->name)) - goto nla_put_failure; - } + helper =rcu_dereference (exp->helper); +if (helper && +nla_put_string (skb,CTA_EXPECT_HELP_NAME , helper->name)) + goto nla_put_failure; + expfn =nf_ct_helper_expectfn_find_by_symbol (exp->expectfn);if (expfn !=NULL &&nla_put_string (skb,CTA_EXPECT_FN , expfn->name))
@@ -3376,12 +3373,9 @@ static int ctnetlink_get_expect(struct sk_buff *skb,static bool expect_iter_name (struct nf_conntrack_expect *exp,void *data) {struct nf_conntrack_helper *helper; -const struct nf_conn_help *m_help;const char *name = data; - m_help =nfct_help (exp->master); - - helper =rcu_dereference (m_help->helper); + helper =rcu_dereference (exp->helper);if (!helper)return false;
@@ -3516,9 +3510,9 @@ ctnetlink_alloc_expect(const struct nlattr * const cda[], struct nf_conn *ct,struct nf_conntrack_tuple *tuple, struct nf_conntrack_tuple *mask) { - u_int32_t class = 0; struct nf_conntrack_expect *exp;struct nf_conn_help *help; +u32 class =0 ;int err; help =nfct_help (ct);
@@ -3555,6 +3549,8 @@ ctnetlink_alloc_expect(const struct nlattr * const cda[], struct nf_conn *ct, exp->class = class; exp->master = ct; +if (!helper) + helper =rcu_dereference (help->helper);rcu_assign_pointer (exp->helper, helper); exp->tuple = *tuple; exp->mask.src.u3 = mask->src.u3;
net/netfilter/nf_conntrack_sip.c +1 -1
@@ -924,7 +924,7 @@ static int set_expected_rtp_rtcp(struct sk_buff *skb, unsigned int protoff, exp =__nf_ct_expect_find (net,nf_ct_zone (ct), &tuple);if (!exp || exp->master == ct || -nfct_help (exp->master)->helper !=nfct_help (ct)->helper || + exp->helper !=nfct_help (ct)->helper || exp->class != class)break ;#if IS_ENABLED (CONFIG_NF_NAT )
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 42/160 netfilter: nf_conntrack_expect: store netns and zone in expectation
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 02a3231b6d82efe750da6554ebf280e4a6f78756 ]
__nf_ct_expect_find() and nf_ct_expect_find_get() are called under rcu_read_lock() but they dereference the master conntrack via exp->master.
Since the expectation does not hold a reference on the master conntrack, this could be dying conntrack or different recycled conntrack than the real master due to SLAB_TYPESAFE_RCU.
Store the netns, the master_tuple and the zone in struct nf_conntrack_expect as a safety measure.
This patch is required by the follow up fix not to dump expectations that do not belong to this netns.
Stable-dep-of: 917b61fa2042 ("netfilter: ctnetlink: ignore explicit helper on new expectations")
--- include/net/netfilter/nf_conntrack_expect.h | 18 +++++++++++++++++- net/netfilter/nf_conntrack_broadcast.c | 6 +++++- net/netfilter/nf_conntrack_expect.c | 9 +++++++-- net/netfilter/nf_conntrack_netlink.c | 5 +++++ 4 files changed, 34 insertions(+), 4 deletions(-)
include/net/netfilter/nf_conntrack_expect.h +17 -1
@@ -22,10 +22,16 @@ struct nf_conntrack_expect {/* Hash member */ struct hlist_node hnode; +/* Network namespace */ +possible_net_t net; +/* We expect this tuple, with the following mask */ struct nf_conntrack_tuple tuple;struct nf_conntrack_tuple_mask mask; +#ifdef CONFIG_NF_CONNTRACK_ZONES +struct nf_conntrack_zone zone; +#endif /* Usage count. */ refcount_t use;
@@ -62,7 +68,17 @@ struct nf_conntrack_expect {static inline struct net *nf_ct_exp_net (struct nf_conntrack_expect *exp) { -return nf_ct_net (exp->master); +return read_pnet (&exp->net); +} + +static inline bool nf_ct_exp_zone_equal_any (const struct nf_conntrack_expect *a, +const struct nf_conntrack_zone *b) +{ +#ifdef CONFIG_NF_CONNTRACK_ZONES +return a->zone.id == b->id; +#else +return true; +#endif }#define NF_CT_EXP_POLICY_NAME_LEN 16
net/netfilter/nf_conntrack_broadcast.c +5 -1
@@ -21,6 +21,7 @@ int nf_conntrack_broadcast_help(struct sk_buff *skb, unsigned int timeout) {const struct nf_conntrack_helper *helper; +struct net *net =read_pnet (&ct->ct_net);struct nf_conntrack_expect *exp;struct iphdr *iph =ip_hdr (skb);struct rtable *rt =skb_rtable (skb);
@@ -71,7 +72,10 @@ int nf_conntrack_broadcast_help(struct sk_buff *skb, exp->flags =NF_CT_EXPECT_PERMANENT ; exp->class =NF_CT_EXPECT_CLASS_DEFAULT ;rcu_assign_pointer (exp->helper, helper); - +write_pnet (&exp->net, net); +#ifdef CONFIG_NF_CONNTRACK_ZONES + exp->zone = ct->zone; +#endif nf_ct_expect_related (exp,0 );nf_ct_expect_put (exp);
net/netfilter/nf_conntrack_expect.c +7 -2
@@ -112,8 +112,8 @@ nf_ct_exp_equal(const struct nf_conntrack_tuple *tuple, const struct net *net) {return nf_ct_tuple_mask_cmp (tuple, &i->tuple, &i->mask) && -net_eq (net,nf_ct_net (i->master)) && -nf_ct_zone_equal_any (i->master, zone); +net_eq (net,read_pnet (&i->net)) && +nf_ct_exp_zone_equal_any (i, zone); }bool nf_ct_remove_expect (struct nf_conntrack_expect *exp)
@@ -321,6 +321,7 @@ void nf_ct_expect_init(struct nf_conntrack_expect *exp, unsigned int class, {struct nf_conntrack_helper *helper =NULL ;struct nf_conn *ct = exp->master; +struct net *net =read_pnet (&ct->ct_net);struct nf_conn_help *help;int len;
@@ -338,6 +339,10 @@ void nf_ct_expect_init(struct nf_conntrack_expect *exp, unsigned int class, helper =rcu_dereference (help->helper);rcu_assign_pointer (exp->helper, helper); +write_pnet (&exp->net, net); +#ifdef CONFIG_NF_CONNTRACK_ZONES + exp->zone = ct->zone; +#endif exp->tuple.src.l3num = family; exp->tuple.dst.protonum = proto;
net/netfilter/nf_conntrack_netlink.c +5 -0
@@ -3510,6 +3510,7 @@ ctnetlink_alloc_expect(const struct nlattr * const cda[], struct nf_conn *ct,struct nf_conntrack_tuple *tuple, struct nf_conntrack_tuple *mask) { + struct net *net = read_pnet(&ct->ct_net);struct nf_conntrack_expect *exp;struct nf_conn_help *help;u32 class =0 ;
@@ -3549,6 +3550,10 @@ ctnetlink_alloc_expect(const struct nlattr * const cda[], struct nf_conn *ct, exp->class = class; exp->master = ct; +write_pnet (&exp->net, net); +#ifdef CONFIG_NF_CONNTRACK_ZONES + exp->zone = ct->zone; +#endif if (!helper) helper =rcu_dereference (help->helper);rcu_assign_pointer (exp->helper, helper);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 43/160 netfilter: ctnetlink: ignore explicit helper on new expectations
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 917b61fa2042f11e2af4c428e43f08199586633a ]
Use the existing master conntrack helper, anything else is not really supported and it just makes validation more complicated, so just ignore what helper userspace suggests for this expectation.
This was uncovered when validating CTA_EXPECT_CLASS via different helper provided by userspace than the existing master conntrack helper:
BUG: KASAN: slab-out-of-bounds in nf_ct_expect_related_report+0x2479/0x27c0 Read of size 4 at addr ffff8880043fe408 by task poc/102 Call Trace: nf_ct_expect_related_report+0x2479/0x27c0 ctnetlink_create_expect+0x22b/0x3b0 ctnetlink_new_expect+0x4bd/0x5c0 nfnetlink_rcv_msg+0x67a/0x950 netlink_rcv_skb+0x120/0x350
Allowing to read kernel memory bytes off the expectation boundary.
CTA_EXPECT_HELP_NAME is still used to offer the helper name to userspace via netlink dump.
--- net/netfilter/nf_conntrack_netlink.c | 54 +++++----------------------- 1 file changed, 9 insertions(+), 45 deletions(-)
net/netfilter/nf_conntrack_netlink.c +9 -45
@@ -2624,7 +2624,6 @@ static const struct nla_policy exp_nla_policy[CTA_EXPECT_MAX+1] = {static struct nf_conntrack_expect *ctnetlink_alloc_expect (const struct nlattr *const cda[],struct nf_conn *ct, -struct nf_conntrack_helper *helper,struct nf_conntrack_tuple *tuple,struct nf_conntrack_tuple *mask);
@@ -2853,7 +2852,6 @@ ctnetlink_glue_attach_expect(const struct nlattr *attr, struct nf_conn *ct, {struct nlattr *cda[CTA_EXPECT_MAX +1 ];struct nf_conntrack_tuple tuple, mask; -struct nf_conntrack_helper *helper =NULL ;struct nf_conntrack_expect *exp;int err;
@@ -2867,17 +2865,8 @@ ctnetlink_glue_attach_expect(const struct nlattr *attr, struct nf_conn *ct,if (err <0 )return err; -if (cda[CTA_EXPECT_HELP_NAME ]) { -const char *helpname =nla_data (cda[CTA_EXPECT_HELP_NAME ]); - - helper =__nf_conntrack_helper_find (helpname,nf_ct_l3num (ct), -nf_ct_protonum (ct)); -if (helper ==NULL ) -return -EOPNOTSUPP ; - } - exp =ctnetlink_alloc_expect ((const struct nlattr *const *)cda, ct, - helper, &tuple, &mask); + &tuple, &mask);if (IS_ERR (exp))return PTR_ERR (exp);
@@ -3506,11 +3495,11 @@ ctnetlink_parse_expect_nat(const struct nlattr *attr,static struct nf_conntrack_expect *ctnetlink_alloc_expect (const struct nlattr *const cda[],struct nf_conn *ct, -struct nf_conntrack_helper *helper,struct nf_conntrack_tuple *tuple,struct nf_conntrack_tuple *mask) {struct net *net =read_pnet (&ct->ct_net); +struct nf_conntrack_helper *helper;struct nf_conntrack_expect *exp;struct nf_conn_help *help;u32 class =0 ;
@@ -3520,7 +3509,11 @@ ctnetlink_alloc_expect(const struct nlattr * const cda[], struct nf_conn *ct,if (!help)return ERR_PTR (-EOPNOTSUPP ); -if (cda[CTA_EXPECT_CLASS ] && helper) { + helper =rcu_dereference (help->helper); +if (!helper) +return ERR_PTR (-EOPNOTSUPP ); + +if (cda[CTA_EXPECT_CLASS ]) { class =ntohl (nla_get_be32 (cda[CTA_EXPECT_CLASS ]));if (class > helper->expect_class_max)return ERR_PTR (-EINVAL );
@@ -3554,8 +3547,6 @@ ctnetlink_alloc_expect(const struct nlattr * const cda[], struct nf_conn *ct,#ifdef CONFIG_NF_CONNTRACK_ZONES exp->zone = ct->zone;#endif -if (!helper) - helper =rcu_dereference (help->helper);rcu_assign_pointer (exp->helper, helper); exp->tuple = *tuple; exp->mask.src.u3 = mask->src.u3;
@@ -3587,7 +3578,6 @@ ctnetlink_create_expect(struct net *net, {struct nf_conntrack_tuple tuple, mask, master_tuple;struct nf_conntrack_tuple_hash *h =NULL ; -struct nf_conntrack_helper *helper =NULL ;struct nf_conntrack_expect *exp;struct nf_conn *ct;int err;
@@ -3613,33 +3603,7 @@ ctnetlink_create_expect(struct net *net, ct =nf_ct_tuplehash_to_ctrack (h);rcu_read_lock (); -if (cda[CTA_EXPECT_HELP_NAME ]) { -const char *helpname =nla_data (cda[CTA_EXPECT_HELP_NAME ]); - - helper =__nf_conntrack_helper_find (helpname, u3, -nf_ct_protonum (ct)); -if (helper ==NULL ) { -rcu_read_unlock (); -#ifdef CONFIG_MODULES -if (request_module ("nfct-helper-%s" , helpname) <0 ) { - err = -EOPNOTSUPP ; - goto err_ct; - } -rcu_read_lock (); - helper =__nf_conntrack_helper_find (helpname, u3, -nf_ct_protonum (ct)); -if (helper) { - err = -EAGAIN ; - goto err_rcu; - } -rcu_read_unlock (); -#endif - err = -EOPNOTSUPP ; - goto err_ct; - } - } - - exp =ctnetlink_alloc_expect (cda, ct, helper, &tuple, &mask); + exp =ctnetlink_alloc_expect (cda, ct, &tuple, &mask);if (IS_ERR (exp)) { err =PTR_ERR (exp); goto err_rcu;
@@ -3649,8 +3613,8 @@ ctnetlink_create_expect(struct net *net,nf_ct_expect_put (exp); err_rcu:rcu_read_unlock (); -err_ct:nf_ct_put (ct); +return err; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 44/160 netfilter: x_tables: restrict xt_check_match/xt_check_target extensions for NFPROTO_ARP
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 3d5d488f11776738deab9da336038add95d342d1 ]
Weiming Shi says:
xt_match and xt_target structs registered with NFPROTO_UNSPEC can be loaded by any protocol family through nft_compat. When such a match/target sets .hooks to restrict which hooks it may run on, the bitmask uses NF_INET_* constants. This is only correct for families whose hook layout matches NF_INET_*: IPv4, IPv6, INET, and bridge all share the same five hooks (PRE_ROUTING ... POST_ROUTING).
ARP only has three hooks (IN=0, OUT=1, FORWARD=2) with different semantics. Because NF_ARP_OUT == 1 == NF_INET_LOCAL_IN, the .hooks validation silently passes for the wrong reasons, allowing matches to run on ARP chains where the hook assumptions (e.g. state->in being set on input hooks) do not hold. This leads to NULL pointer dereferences; xt_devgroup is one concrete example:
Oops: general protection fault, probably for non-canonical address 0xdffffc0000000044: 0000 [#1] SMP KASAN NOPTI KASAN: null-ptr-deref in range [0x0000000000000220-0x0000000000000227] RIP: 0010:devgroup_mt+0xff/0x350 Call Trace: <TASK> nft_match_eval (net/netfilter/nft_compat.c:407) nft_do_chain (net/netfilter/nf_tables_core.c:285) nft_do_chain_arp (net/netfilter/nft_chain_filter.c:61) nf_hook_slow (net/netfilter/core.c:623) arp_xmit (net/ipv4/arp.c:666) </TASK> Kernel panic - not syncing: Fatal exception in interrupt
Fix it by restricting arptables to NFPROTO_ARP extensions only. Note that arptables-legacy only supports:
- arpt_CLASSIFY
- arpt_mangle
- arpt_MARK
that provide explicit NFPROTO_ARP match/target declarations.
--- net/netfilter/x_tables.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
net/netfilter/x_tables.c +23 -0
@@ -501,6 +501,17 @@ int xt_check_match(struct xt_mtchk_param *par, par->match->table, par->table);return -EINVAL ; } + +/* NFPROTO_UNSPEC implies NF_INET_* hooks which do not overlap with +* NF_ARP_IN,OUT,FORWARD, allow explicit extensions with NFPROTO_ARP +* support. +*/ +if (par->family ==NFPROTO_ARP && + par->match->family !=NFPROTO_ARP ) { +pr_info_ratelimited ("%s_tables: %s match: not valid for this family\n" , + xt_prefix[par->family], par->match->name); +return -EINVAL ; + }if (par->match->hooks && (par->hook_mask & ~par->match->hooks) !=0 ) {char used[64 ], allow[64 ];
@@ -1016,6 +1027,18 @@ int xt_check_target(struct xt_tgchk_param *par, par->target->table, par->table);return -EINVAL ; } + +/* NFPROTO_UNSPEC implies NF_INET_* hooks which do not overlap with +* NF_ARP_IN,OUT,FORWARD, allow explicit extensions with NFPROTO_ARP +* support. +*/ +if (par->family ==NFPROTO_ARP && + par->target->family !=NFPROTO_ARP ) { +pr_info_ratelimited ("%s_tables: %s target: not valid for this family\n" , + xt_prefix[par->family], par->target->name); +return -EINVAL ; + } +if (par->target->hooks && (par->hook_mask & ~par->target->hooks) !=0 ) {char used[64 ], allow[64 ];
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 45/160 netfilter: nf_tables: reject immediate NF_QUEUE verdict
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
[ Upstream commit da107398cbd4bbdb6bffecb2ce86d5c9384f4cec ]
nft_queue is always used from userspace nftables to deliver the NF_QUEUE verdict. Immediately emitting an NF_QUEUE verdict is never used by the userspace nft tools, so reject immediate NF_QUEUE verdicts.
The arp family does not provide queue support, but such an immediate verdict is still reachable. Globally reject NF_QUEUE immediate verdicts to address this issue.
--- net/netfilter/nf_tables_api.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
net/netfilter/nf_tables_api.c +5 -2
@@ -11105,8 +11105,6 @@ static int nft_verdict_init(const struct nft_ctx *ctx, struct nft_data *data,switch (data->verdict.code) {case NF_ACCEPT :case NF_DROP : -case NF_QUEUE : -break ;case NFT_CONTINUE :case NFT_BREAK :case NFT_RETURN :
@@ -11141,6 +11139,11 @@ static int nft_verdict_init(const struct nft_ctx *ctx, struct nft_data *data, data->verdict.chain = chain;break ; +case NF_QUEUE : +/* The nft_queue expression is used for this purpose, an +* immediate NF_QUEUE verdict should not ever be seen here. +*/ + fallthrough;default :return -EINVAL ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 46/160 Bluetooth: hci_sync: call destroy in hci_cmd_sync_run if immediate
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pauli Virtanen <[email protected]>
[ Upstream commit a834a0b66ec6fb743377201a0f4229bb2503f4ce ]
hci_cmd_sync_run() may run the work immediately if called from existing sync work (otherwise it queues a new sync work). In this case it fails to call the destroy() function.
On immediate run, make it behave same way as if item was queued
successfully: call destroy, and return 0.
The only callsite is hci_abort_conn() via hci_cmd_sync_run_once(), and this changes its return value. However, its return value is not used except as the return value for hci_disconnect(), and nothing uses the return value of hci_disconnect(). Hence there should be no behavior change anywhere.
--- net/bluetooth/hci_sync.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
net/bluetooth/hci_sync.c +9 -2
@@ -825,8 +825,15 @@ int hci_cmd_sync_run(struct hci_dev *hdev, hci_cmd_sync_work_func_t func,return -ENETDOWN ;/* If on cmd_sync_work then run immediately otherwise queue */ -if (current_work () == &hdev->cmd_sync_work) -return func (hdev, data); +if (current_work () == &hdev->cmd_sync_work) { +int err; + + err =func (hdev, data); +if (destroy) +destroy (hdev, data, err); + +return 0 ; + }return hci_cmd_sync_submit (hdev, func, data, destroy); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 47/160 Bluetooth: SCO: fix race conditions in sco_sock_connect()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cen Zhang <[email protected]>
[ Upstream commit 8a5b0135d4a5d9683203a3d9a12a711ccec5936b ]
sco_sock_connect() checks sk_state and sk_type without holding the socket lock. Two concurrent connect() syscalls on the same socket can both pass the check and enter sco_connect(), leading to use-after-free.
The buggy scenario involves three participants and was confirmed with additional logging instrumentation:
Thread A (connect): HCI disconnect: Thread B (connect):
sco_sock_connect(sk) sco_sock_connect(sk)
sk_state==BT_OPEN sk_state==BT_OPEN
(pass, no lock) (pass, no lock)
sco_connect(sk): sco_connect(sk):
hci_dev_lock hci_dev_lock
hci_connect_sco <- blocked
-> hcon1
sco_conn_add->conn1
lock_sock(sk)
sco_chan_add:
conn1->sk = sk
sk->conn = conn1
sk_state=BT_CONNECT
release_sock
hci_dev_unlock
hci_dev_lock
sco_conn_del:
lock_sock(sk)
sco_chan_del:
sk->conn=NULL
conn1->sk=NULL
sk_state=
BT_CLOSED
SOCK_ZAPPED
release_sock
hci_dev_unlock
(unblocked)
hci_connect_sco
-> hcon2
sco_conn_add
-> conn2
lock_sock(sk)
sco_chan_add:
sk->conn=conn2
sk_state=
BT_CONNECT
// zombie sk!
release_sock
hci_dev_unlockThread B revives a BT_CLOSED + SOCK_ZAPPED socket back to BT_CONNECT. Subsequent cleanup triggers double sock_put() and use-after-free. Meanwhile conn1 is leaked as it was orphaned when sco_conn_del() cleared the association.
Fix this by:
- Moving lock_sock() before the sk_state/sk_type checks in sco_sock_connect() to serialize concurrent connect attempts
- Fixing the sk_type != SOCK_SEQPACKET check to actually return the error instead of just assigning it
- Adding a state re-check in sco_connect() after lock_sock() to catch state changes during the window between the locks
- Adding sco_pi(sk)->conn check in sco_chan_add() to prevent double-attach of a socket to multiple connections
- Adding hci_conn_drop() on sco_chan_add failure to prevent HCI connection leaks
--- net/bluetooth/sco.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-)
net/bluetooth/sco.c +21 -5
@@ -238,7 +238,7 @@ static int sco_chan_add(struct sco_conn *conn, struct sock *sk,int err =0 ;sco_conn_lock (conn); -if (conn->sk) +if (conn->sk ||sco_pi (sk)->conn) err = -EBUSY ;else __sco_chan_add (conn, sk, parent);
@@ -292,9 +292,20 @@ static int sco_connect(struct sock *sk)lock_sock (sk); +/* Recheck state after reacquiring the socket lock, as another +* thread may have changed it (e.g., closed the socket). +*/ +if (sk->sk_state !=BT_OPEN && sk->sk_state !=BT_BOUND ) { +release_sock (sk); +hci_conn_drop (hcon); + err = -EBADFD ; + goto unlock; + } + err =sco_chan_add (conn, sk,NULL );if (err) {release_sock (sk); +hci_conn_drop (hcon); goto unlock; }
@@ -601,13 +612,18 @@ static int sco_sock_connect(struct socket *sock, struct sockaddr *addr, int alen addr->sa_family != AF_BLUETOOTH)return -EINVAL ; -if (sk->sk_state !=BT_OPEN && sk->sk_state !=BT_BOUND ) +lock_sock (sk); + +if (sk->sk_state !=BT_OPEN && sk->sk_state !=BT_BOUND ) { +release_sock (sk);return -EBADFD ; + } -if (sk->sk_type !=SOCK_SEQPACKET ) - err = -EINVAL ; +if (sk->sk_type !=SOCK_SEQPACKET ) { +release_sock (sk); +return -EINVAL ; + } -lock_sock (sk);/* Set destination address and psm */ bacpy (&sco_pi (sk)->dst, &sa->sco_bdaddr);release_sock (sk);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 48/160 Bluetooth: MGMT: validate LTK enc_size on load
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Keenan Dong <[email protected]>
[ Upstream commit b8dbe9648d69059cfe3a28917bfbf7e61efd7f15 ]
Load Long Term Keys stores the user-provided enc_size and later uses it to size fixed-size stack operations when replying to LE LTK requests. An enc_size larger than the 16-byte key buffer can therefore overflow the reply stack buffer.
Reject oversized enc_size values while validating the management LTK record so invalid keys never reach the stored key state.
--- net/bluetooth/mgmt.c | 3 +++ 1 file changed, 3 insertions(+)
net/bluetooth/mgmt.c +3 -0
@@ -7145,6 +7145,9 @@ static bool ltk_is_valid(struct mgmt_ltk_info *key)if (key->initiator !=0x00 && key->initiator !=0x01 )return false; +if (key->enc_size >sizeof (key->val)) +return false; +switch (key->addr.type) {case BDADDR_LE_PUBLIC :return true;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 49/160 Bluetooth: hci_event: fix potential UAF in hci_le_remote_conn_param_req_evt
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pauli Virtanen <[email protected]>
[ Upstream commit b255531b27da336571411248c2a72a350662bd09 ]
hci_conn lookup and field access must be covered by hdev lock in hci_le_remote_conn_param_req_evt, otherwise it's possible it is freed concurrently.
Extend the hci_dev_lock critical section to cover all conn usage.
--- net/bluetooth/hci_event.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-)
net/bluetooth/hci_event.c +20 -13
@@ -6555,25 +6555,31 @@ static void hci_le_remote_conn_param_req_evt(struct hci_dev *hdev, void *data, latency =le16_to_cpu (ev->latency); timeout =le16_to_cpu (ev->timeout); +hci_dev_lock (hdev); + hcon =hci_conn_hash_lookup_handle (hdev, handle); -if (!hcon || hcon->state !=BT_CONNECTED ) -return send_conn_param_neg_reply (hdev, handle, -HCI_ERROR_UNKNOWN_CONN_ID ); +if (!hcon || hcon->state !=BT_CONNECTED ) { +send_conn_param_neg_reply (hdev, handle, +HCI_ERROR_UNKNOWN_CONN_ID ); + goto unlock; + } -if (max > hcon->le_conn_max_interval) -return send_conn_param_neg_reply (hdev, handle, -HCI_ERROR_INVALID_LL_PARAMS ); +if (max > hcon->le_conn_max_interval) { +send_conn_param_neg_reply (hdev, handle, +HCI_ERROR_INVALID_LL_PARAMS ); + goto unlock; + } -if (hci_check_conn_params (min, max, latency, timeout)) -return send_conn_param_neg_reply (hdev, handle, -HCI_ERROR_INVALID_LL_PARAMS ); +if (hci_check_conn_params (min, max, latency, timeout)) { +send_conn_param_neg_reply (hdev, handle, +HCI_ERROR_INVALID_LL_PARAMS ); + goto unlock; + }if (hcon->role ==HCI_ROLE_MASTER ) {struct hci_conn_params *params;u8 store_hint; -hci_dev_lock (hdev); - params =hci_conn_params_lookup (hdev, &hcon->dst, hcon->dst_type);if (params) {
@@ -6586,8 +6592,6 @@ static void hci_le_remote_conn_param_req_evt(struct hci_dev *hdev, void *data, store_hint =0x00 ; } -hci_dev_unlock (hdev); -mgmt_new_conn_param (hdev, &hcon->dst, hcon->dst_type, store_hint, min, max, latency, timeout); }
@@ -6601,6 +6605,9 @@ static void hci_le_remote_conn_param_req_evt(struct hci_dev *hdev, void *data, cp.max_ce_len =0 ;hci_send_cmd (hdev,HCI_OP_LE_CONN_PARAM_REQ_REPLY ,sizeof (cp), &cp); + +unlock: +hci_dev_unlock (hdev); } static void hci_le_direct_adv_report_evt(struct hci_dev *hdev, void *data,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 50/160 Bluetooth: MGMT: validate mesh send advertising payload length
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Keenan Dong <[email protected]>
[ Upstream commit bda93eec78cdbfe5cda00785cefebd443e56b88b ]
mesh_send() currently bounds MGMT_OP_MESH_SEND by total command length, but it never verifies that the bytes supplied for the flexible adv_data[] array actually match the embedded adv_data_len field. MGMT_MESH_SEND_SIZE only covers the fixed header, so a truncated command can still pass the existing 20..50 byte range check and later drive the async mesh send path past the end of the queued command buffer.
Keep rejecting zero-length and oversized advertising payloads, but validate adv_data_len explicitly and require the command length to exactly match the flexible array size before queueing the request.
--- net/bluetooth/mgmt.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
net/bluetooth/mgmt.c +11 -3
@@ -2388,6 +2388,7 @@ static int mesh_send(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)struct mgmt_mesh_tx *mesh_tx;struct mgmt_cp_mesh_send *send = data;struct mgmt_rp_mesh_read_features rp; +u16 expected_len;bool sending;int err =0 ;
@@ -2395,12 +2396,19 @@ static int mesh_send(struct sock *sk, struct hci_dev *hdev, void *data, u16 len) !hci_dev_test_flag(hdev, HCI_MESH_EXPERIMENTAL))return mgmt_cmd_status (sk, hdev->id,MGMT_OP_MESH_SEND ,MGMT_STATUS_NOT_SUPPORTED ); -if (!hci_dev_test_flag (hdev,HCI_LE_ENABLED ) || - len <=MGMT_MESH_SEND_SIZE || - len > (MGMT_MESH_SEND_SIZE +31 )) +if (!hci_dev_test_flag (hdev,HCI_LE_ENABLED )) +return mgmt_cmd_status (sk, hdev->id,MGMT_OP_MESH_SEND , +MGMT_STATUS_REJECTED ); + +if (!send->adv_data_len || send->adv_data_len >31 )return mgmt_cmd_status (sk, hdev->id,MGMT_OP_MESH_SEND ,MGMT_STATUS_REJECTED ); + expected_len =struct_size (send, adv_data, send->adv_data_len); +if (expected_len != len) +return mgmt_cmd_status (sk, hdev->id,MGMT_OP_MESH_SEND , +MGMT_STATUS_INVALID_PARAMS ); +hci_dev_lock (hdev);memset (&rp,0 ,sizeof (rp));
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 51/160 rds: ib: reject FRMR registration before IB connection is established
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Weiming Shi <[email protected]>
[ Upstream commit a54ecccfae62c5c85259ae5ea5d9c20009519049 ]
rds_ib_get_mr() extracts the rds_ib_connection from conn->c_transport_data and passes it to rds_ib_reg_frmr() for FRWR memory registration. On a fresh outgoing connection, ic is allocated in rds_ib_conn_alloc() with i_cm_id = NULL because the connection worker has not yet called rds_ib_conn_path_connect() to create the rdma_cm_id. When sendmsg() with RDS_CMSG_RDMA_MAP is called on such a connection, the sendmsg path parses the control message before any connection establishment, allowing rds_ib_post_reg_frmr() to dereference ic->i_cm_id->qp and crash the kernel.
The existing guard in rds_ib_reg_frmr() only checks for !ic (added in commit 9e630bcb7701), which does not catch this case since ic is allocated early and is always non-NULL once the connection object exists.
KASAN: null-ptr-deref in range [0x0000000000000010-0x0000000000000017] RIP: 0010:rds_ib_post_reg_frmr+0x50e/0x920 Call Trace: rds_ib_post_reg_frmr (net/rds/ib_frmr.c:167) rds_ib_map_frmr (net/rds/ib_frmr.c:252) rds_ib_reg_frmr (net/rds/ib_frmr.c:430) rds_ib_get_mr (net/rds/ib_rdma.c:615) __rds_rdma_map (net/rds/rdma.c:295) rds_cmsg_rdma_map (net/rds/rdma.c:860) rds_sendmsg (net/rds/send.c:1363) ____sys_sendmsg do_syscall_64
Add a check in rds_ib_get_mr() that verifies ic, i_cm_id, and qp are all non-NULL before proceeding with FRMR registration, mirroring the guard already present in rds_ib_post_inv(). Return -ENODEV when the connection is not ready, which the existing error handling in rds_cmsg_send() converts to -EAGAIN for userspace retry and triggers rds_conn_connect_if_down() to start the connection worker.
--- net/rds/ib_rdma.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
net/rds/ib_rdma.c +6 -1
@@ -608,8 +608,13 @@ void *rds_ib_get_mr(struct scatterlist *sg, unsigned long nents,return ibmr; } -if (conn) +if (conn) { ic = conn->c_transport_data; +if (!ic || !ic->i_cm_id || !ic->i_cm_id->qp) { + ret = -ENODEV ; + goto out; + } + }if (!rds_ibdev->mr_8k_pool || !rds_ibdev->mr_1m_pool) { ret = -ENODEV ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 52/160 bpf: sockmap: Fix use-after-free of sk->sk_socket in sk_psock_verdict_data_ready().
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit ad8391d37f334ee73ba91926f8b4e4cf6d31ea04 ]
syzbot reported use-after-free of AF_UNIX socket's sk->sk_socket in sk_psock_verdict_data_ready(). [0]
In unix_stream_sendmsg(), the peer socket's ->sk_data_ready() is called after dropping its unix_state_lock().
Although the sender socket holds the peer's refcount, it does not prevent the peer's sock_orphan(), and the peer's sk_socket might be freed after one RCU grace period.
Let's fetch the peer's sk->sk_socket and sk->sk_socket->ops under RCU in sk_psock_verdict_data_ready().
[0]:
BUG: KASAN: slab-use-after-free in sk_psock_verdict_data_ready+0xec/0x590 net/core/skmsg.c:1278 Read of size 8 at addr ffff8880594da860 by task syz.4.1842/11013 CPU: 1 UID: 0 PID: 11013 Comm: syz.4.1842 Not tainted syzkaller #0 PREEMPT(full) Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 02/12/2026 Call Trace: <TASK> dump_stack_lvl+0xe8/0x150 lib/dump_stack.c:120 print_address_description mm/kasan/report.c:378 [inline] print_report+0xba/0x230 mm/kasan/report.c:482 kasan_report+0x117/0x150 mm/kasan/report.c:595 sk_psock_verdict_data_ready+0xec/0x590 net/core/skmsg.c:1278 unix_stream_sendmsg+0x8a3/0xe80 net/unix/af_unix.c:2482 sock_sendmsg_nosec net/socket.c:721 [inline] __sock_sendmsg net/socket.c:736 [inline] ____sys_sendmsg+0x972/0x9f0 net/socket.c:2585 ___sys_sendmsg+0x2a5/0x360 net/socket.c:2639 __sys_sendmsg net/socket.c:2671 [inline] __do_sys_sendmsg net/socket.c:2676 [inline] __se_sys_sendmsg net/socket.c:2674 [inline] __x64_sys_sendmsg+0x1bd/0x2a0 net/socket.c:2674 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0x14d/0xf80 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7facf899c819 Code: ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 e8 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007facf9827028 EFLAGS: 00000246 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 00007facf8c15fa0 RCX: 00007facf899c819 RDX: 0000000000000000 RSI: 0000200000000500 RDI: 0000000000000004 RBP: 00007facf8a32c91 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 00007facf8c16038 R14: 00007facf8c15fa0 R15: 00007ffd41b01c78 </TASK> Allocated by task 11013: kasan_save_stack mm/kasan/common.c:57 [inline] kasan_save_track+0x3e/0x80 mm/kasan/common.c:78 unpoison_slab_object mm/kasan/common.c:340 [inline] __kasan_slab_alloc+0x6c/0x80 mm/kasan/common.c:366 kasan_slab_alloc include/linux/kasan.h:253 [inline] slab_post_alloc_hook mm/slub.c:4538 [inline] slab_alloc_node mm/slub.c:4866 [inline] kmem_cache_alloc_lru_noprof+0x2b8/0x640 mm/slub.c:4885 sock_alloc_inode+0x28/0xc0 net/socket.c:316 alloc_inode+0x6a/0x1b0 fs/inode.c:347 new_inode_pseudo include/linux/fs.h:3003 [inline] sock_alloc net/socket.c:631 [inline] __sock_create+0x12d/0x9d0 net/socket.c:1562 sock_create net/socket.c:1656 [inline] __sys_socketpair+0x1c4/0x560 net/socket.c:1803 __do_sys_socketpair net/socket.c:1856 [inline] __se_sys_socketpair net/socket.c:1853 [inline] __x64_sys_socketpair+0x9b/0xb0 net/socket.c:1853 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0x14d/0xf80 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x77/0x7f Freed by task 15: kasan_save_stack mm/kasan/common.c:57 [inline] kasan_save_track+0x3e/0x80 mm/kasan/common.c:78 kasan_save_free_info+0x46/0x50 mm/kasan/generic.c:584 poison_slab_object mm/kasan/common.c:253 [inline] __kasan_slab_free+0x5c/0x80 mm/kasan/common.c:285 kasan_slab_free include/linux/kasan.h:235 [inline] slab_free_hook mm/slub.c:2685 [inline] slab_free mm/slub.c:6165 [inline] kmem_cache_free+0x187/0x630 mm/slub.c:6295 rcu_do_batch kernel/rcu/tree.c:2617 [inline] rcu_core+0x7cd/0x1070 kernel/rcu/tree.c:2869 handle_softirqs+0x22a/0x870 kernel/softirq.c:622 run_ksoftirqd+0x36/0x60 kernel/softirq.c:1063 smpboot_thread_fn+0x541/0xa50 kernel/smpboot.c:160 kthread+0x388/0x470 kernel/kthread.c:436 ret_from_fork+0x51e/0xb90 arch/x86/kernel/process.c:158 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:245
--- net/core/skmsg.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
net/core/skmsg.c +8 -5
@@ -1266,17 +1266,20 @@ static int sk_psock_verdict_recv(struct sock *sk, struct sk_buff *skb)static void sk_psock_verdict_data_ready (struct sock *sk) { -struct socket *sock = sk->sk_socket; -const struct proto_ops *ops; +const struct proto_ops *ops =NULL ; +struct socket *sock;int copied;trace_sk_data_ready (sk); -if (unlikely (!sock)) -return ; - ops =READ_ONCE (sock->ops); +rcu_read_lock (); + sock =READ_ONCE (sk->sk_socket); +if (likely (sock)) + ops =READ_ONCE (sock->ops); +rcu_read_unlock ();if (!ops || !ops->read_skb)return ; + copied = ops->read_skb (sk, sk_psock_verdict_recv);if (copied >=0 ) {struct sk_psock *psock;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 53/160 net/sched: sch_netem: fix out-of-bounds access in packet corruption
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yucheng Lu <[email protected]>
[ Upstream commit d64cb81dcbd54927515a7f65e5e24affdc73c14b ]
In netem_enqueue(), the packet corruption logic uses get_random_u32_below(skb_headlen(skb)) to select an index for modifying skb->data. When an AF_PACKET TX_RING sends fully non-linear packets over an IPIP tunnel, skb_headlen(skb) evaluates to 0.
Passing 0 to get_random_u32_below() takes the variable-ceil slow path which returns an unconstrained 32-bit random integer. Using this unconstrained value as an offset into skb->data results in an out-of-bounds memory access.
Fix this by verifying skb_headlen(skb) is non-zero before attempting to corrupt the linear data area. Fully non-linear packets will silently bypass the corruption logic.
--- net/sched/sch_netem.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/sched/sch_netem.c +3 -2
@@ -517,8 +517,9 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch, goto finish_segs; } - skb->data[get_random_u32_below (skb_headlen (skb))] ^= -1 <<get_random_u32_below (8 ); +if (skb_headlen (skb)) + skb->data[get_random_u32_below (skb_headlen (skb))] ^= +1 <<get_random_u32_below (8 ); }if (unlikely (q->t_len >= sch->limit)) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 54/160 net: macb: fix clk handling on PCI glue driver removal
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fedor Pchelkin <[email protected]>
[ Upstream commit ce8fe5287b87e24e225c342f3b0ec04f0b3680fe ]
platform_device_unregister() may still want to use the registered clks during runtime resume callback.
Note that there is a commit d82d5303c4c5 ("net: macb: fix use after free on rmmod") that addressed the similar problem of clk vs platform device unregistration but just moved the bug to another place.
Save the pointers to clks into local variables for reuse after platform device is unregistered.
BUG: KASAN: use-after-free in clk_prepare+0x5a/0x60 Read of size 8 at addr ffff888104f85e00 by task modprobe/597 CPU: 2 PID: 597 Comm: modprobe Not tainted 6.1.164+ #114 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.16.1-0-g3208b098f51a-prebuilt.qemu.org 04/01/2014 Call Trace: <TASK> dump_stack_lvl+0x8d/0xba print_report+0x17f/0x496 kasan_report+0xd9/0x180 clk_prepare+0x5a/0x60 macb_runtime_resume+0x13d/0x410 [macb] pm_generic_runtime_resume+0x97/0xd0 __rpm_callback+0xc8/0x4d0 rpm_callback+0xf6/0x230 rpm_resume+0xeeb/0x1a70 __pm_runtime_resume+0xb4/0x170 bus_remove_device+0x2e3/0x4b0 device_del+0x5b3/0xdc0 platform_device_del+0x4e/0x280 platform_device_unregister+0x11/0x50 pci_device_remove+0xae/0x210 device_remove+0xcb/0x180 device_release_driver_internal+0x529/0x770 driver_detach+0xd4/0x1a0 bus_remove_driver+0x135/0x260 driver_unregister+0x72/0xb0 pci_unregister_driver+0x26/0x220 __do_sys_delete_module+0x32e/0x550 do_syscall_64+0x35/0x80 entry_SYSCALL_64_after_hwframe+0x6e/0xd8 </TASK> Allocated by task 519: kasan_save_stack+0x2c/0x50 kasan_set_track+0x21/0x30 __kasan_kmalloc+0x8e/0x90 __clk_register+0x458/0x2890 clk_hw_register+0x1a/0x60 __clk_hw_register_fixed_rate+0x255/0x410 clk_register_fixed_rate+0x3c/0xa0 macb_probe+0x1d8/0x42e [macb_pci] local_pci_probe+0xd7/0x190 pci_device_probe+0x252/0x600 really_probe+0x255/0x7f0 __driver_probe_device+0x1ee/0x330 driver_probe_device+0x4c/0x1f0 __driver_attach+0x1df/0x4e0 bus_for_each_dev+0x15d/0x1f0 bus_add_driver+0x486/0x5e0 driver_register+0x23a/0x3d0 do_one_initcall+0xfd/0x4d0 do_init_module+0x18b/0x5a0 load_module+0x5663/0x7950 __do_sys_finit_module+0x101/0x180 do_syscall_64+0x35/0x80 entry_SYSCALL_64_after_hwframe+0x6e/0xd8 Freed by task 597: kasan_save_stack+0x2c/0x50 kasan_set_track+0x21/0x30 kasan_save_free_info+0x2a/0x50 __kasan_slab_free+0x106/0x180 __kmem_cache_free+0xbc/0x320 clk_unregister+0x6de/0x8d0 macb_remove+0x73/0xc0 [macb_pci] pci_device_remove+0xae/0x210 device_remove+0xcb/0x180 device_release_driver_internal+0x529/0x770 driver_detach+0xd4/0x1a0 bus_remove_driver+0x135/0x260 driver_unregister+0x72/0xb0 pci_unregister_driver+0x26/0x220 __do_sys_delete_module+0x32e/0x550 do_syscall_64+0x35/0x80 entry_SYSCALL_64_after_hwframe+0x6e/0xd8
--- drivers/net/ethernet/cadence/macb_pci.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/cadence/macb_pci.c +4 -2
@@ -110,10 +110,12 @@ static void macb_remove(struct pci_dev *pdev) {struct platform_device *plat_dev =pci_get_drvdata (pdev);struct macb_platform_data *plat_data =dev_get_platdata (&plat_dev->dev); +struct clk *pclk = plat_data->pclk; +struct clk *hclk = plat_data->hclk; -clk_unregister (plat_data->pclk); -clk_unregister (plat_data->hclk);platform_device_unregister (plat_dev); +clk_unregister (pclk); +clk_unregister (hclk); }static const struct pci_device_id dev_id_table[] = {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 55/160 net: macb: properly unregister fixed rate clocks
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fedor Pchelkin <[email protected]>
[ Upstream commit f0f367a4f459cc8118aadc43c6bba53c60d93f8d ]
The additional resources allocated with clk_register_fixed_rate() need to be released with clk_unregister_fixed_rate(), otherwise they are lost.
--- drivers/net/ethernet/cadence/macb_pci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/cadence/macb_pci.c +4 -4
@@ -97,10 +97,10 @@ static int macb_probe(struct pci_dev *pdev, const struct pci_device_id *id)return 0 ; err_plat_dev_register: -clk_unregister (plat_data.hclk); +clk_unregister_fixed_rate (plat_data.hclk); err_hclk_register: -clk_unregister (plat_data.pclk); +clk_unregister_fixed_rate (plat_data.pclk); err_pclk_register:return err;
@@ -114,8 +114,8 @@ static void macb_remove(struct pci_dev *pdev)struct clk *hclk = plat_data->hclk;platform_device_unregister (plat_dev); -clk_unregister (pclk); -clk_unregister (hclk); +clk_unregister_fixed_rate (pclk); +clk_unregister_fixed_rate (hclk); }static const struct pci_device_id dev_id_table[] = {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 56/160 net/mlx5: lag: Check for LAG device before creating debugfs
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shay Drory <[email protected]>
[ Upstream commit bf16bca6653679d8a514d6c1c5a2c67065033f14 ]
__mlx5_lag_dev_add_mdev() may return 0 (success) even when an error occurs that is handled gracefully. Consequently, the initialization flow proceeds to call mlx5_ldev_add_debugfs() even when there is no valid LAG context.
mlx5_ldev_add_debugfs() blindly created the debugfs directory and attributes. This exposed interfaces (like the members file) that rely on a valid ldev pointer, leading to potential NULL pointer dereferences if accessed when ldev is NULL.
Add a check to verify that mlx5_lag_dev(dev) returns a valid pointer before attempting to create the debugfs entries.
--- drivers/net/ethernet/mellanox/mlx5/core/lag/debugfs.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/lag/debugfs.c +3 -0
@@ -163,8 +163,11 @@ DEFINE_SHOW_ATTRIBUTE(members);void mlx5_ldev_add_debugfs (struct mlx5_core_dev *dev) { +struct mlx5_lag *ldev =mlx5_lag_dev (dev);struct dentry *dbg; +if (!ldev) +return ; dbg =debugfs_create_dir ("lag" ,mlx5_debugfs_get_dev_root (dev)); dev->priv.dbg.lag_debugfs = dbg;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 57/160 net/mlx5: Avoid "No data available" when FW version queries fail
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Saeed Mahameed <[email protected]>
[ Upstream commit 10dc35f6a443d488f219d1a1e3fb8f8dac422070 ]
Avoid printing the misleading "kernel answers: No data available" devlink output when querying firmware or pending firmware version fails (e.g. MLX5 fw state errors / flash failures).
FW can fail on loading the pending flash image and get its version due to various reasons, examples:
mlxfw: Firmware flash failed: key not applicable, err (7)mlx5_fw_image_pending: can't read pending fw version while fw state is 1
and the resulting:
$ devlink dev info kernel answers: No data available
Instead, just report 0 or 0xfff.. versions in case of failure to indicate a problem, and let other information be shown.
after the fix:
$ devlink dev info
pci/0000:00:06.0:
driver mlx5_core
serial_number xxx...
board.serial_number MT2225300179
versions:
fixed:
fw.psid MT_0000000436
running:
fw.version 22.41.0188
fw 22.41.0188
stored:
fw.version 255.255.65535
fw 255.255.65535--- .../net/ethernet/mellanox/mlx5/core/devlink.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/fw.c | 53 ++++++++++++------- .../ethernet/mellanox/mlx5/core/mlx5_core.h | 4 +- 3 files changed, 37 insertions(+), 24 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/devlink.c +1 -3
@@ -53,9 +53,7 @@ mlx5_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req,if (err)return err; - err =mlx5_fw_version_query (dev, &running_fw, &stored_fw); -if (err) -return err; +mlx5_fw_version_query (dev, &running_fw, &stored_fw); snprintf(version_str, sizeof(version_str), "%d.%d.%04d", mlx5_fw_ver_major(running_fw), mlx5_fw_ver_minor(running_fw),
drivers/net/ethernet/mellanox/mlx5/core/fw.c +34 -19
82 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h +2 -2
@@ -269,8 +269,8 @@ void mlx5_dm_cleanup(struct mlx5_core_dev *dev);int mlx5_firmware_flash (struct mlx5_core_dev *dev,const struct firmware *fw,struct netlink_ext_ack *extack); -int mlx5_fw_version_query (struct mlx5_core_dev *dev, -u32 *running_ver,u32 *stored_ver); +void mlx5_fw_version_query (struct mlx5_core_dev *dev,u32 *running_ver, +u32 *stored_ver);#ifdef CONFIG_MLX5_CORE_EN int mlx5e_init (void );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 58/160 net/x25: Fix potential double free of skb
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martin Schiller <[email protected]>
[ Upstream commit d10a26aa4d072320530e6968ef945c8c575edf61 ]
When alloc_skb fails in x25_queue_rx_frame it calls kfree_skb(skb) at line 48 and returns 1 (error).
This error propagates back through the call chain:
x25_queue_rx_frame returns 1
|
v
x25_state3_machine receives the return value 1 and takes the else
branch at line 278, setting queued=0 and returning 0
|
v
x25_process_rx_frame returns queued=0
|
vx25_backlog_rcv at line 452 sees queued=0 and calls kfree_skb(skb) again
This would free the same skb twice. Looking at x25_backlog_rcv:
net/x25/x25_in.c:x25_backlog_rcv() {
...
queued = x25_process_rx_frame(sk, skb);
...
if (!queued)
kfree_skb(skb);
}--- net/x25/x25_in.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
net/x25/x25_in.c +2 -3
@@ -44,10 +44,9 @@ static int x25_queue_rx_frame(struct sock *sk, struct sk_buff *skb, int more)if (x25->fraglen >0 ) {/* End of fragment */ int len = x25->fraglen + skb->len; -if ((skbn =alloc_skb (len,GFP_ATOMIC )) ==NULL ){ -kfree_skb (skb); + skbn =alloc_skb (len,GFP_ATOMIC ); +if (!skbn)return 1 ; - }skb_queue_tail (&x25->fragment_queue, skb);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 59/160 net/x25: Fix overflow when accumulating packets
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martin Schiller <[email protected]>
[ Upstream commit a1822cb524e89b4cd2cf0b82e484a2335496a6d9 ]
Add a check to ensure that x25_sock.fraglen does not overflow.
The fraglen also needs to be resetted when purging fragment_queue in x25_clear_queues().
--- net/x25/x25_in.c | 4 ++++ net/x25/x25_subr.c | 1 + 2 files changed, 5 insertions(+)
net/x25/x25_in.c +4 -0
@@ -34,6 +34,10 @@ static int x25_queue_rx_frame(struct sock *sk, struct sk_buff *skb, int more)struct sk_buff *skbo, *skbn = skb;struct x25_sock *x25 =x25_sk (sk); +/* make sure we don't overflow */ +if (x25->fraglen + skb->len >USHRT_MAX ) +return 1 ; +if (more) { x25->fraglen += skb->len;skb_queue_tail (&x25->fragment_queue, skb);
net/x25/x25_subr.c +1 -0
@@ -40,6 +40,7 @@ void x25_clear_queues(struct sock *sk)skb_queue_purge (&x25->interrupt_in_queue);skb_queue_purge (&x25->interrupt_out_queue);skb_queue_purge (&x25->fragment_queue); + x25->fraglen =0 ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 60/160 net/sched: cls_fw: fix NULL pointer dereference on shared blocks
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiang Mei <[email protected]>
[ Upstream commit faeea8bbf6e958bf3c00cb08263109661975987c ]
The old-method path in fw_classify() calls tcf_block_q() and dereferences q->handle. Shared blocks leave block->q NULL, causing a NULL deref when an empty cls_fw filter is attached to a shared block and a packet with a nonzero major skb mark is classified.
Reject the configuration in fw_change() when the old method (no TCA_OPTIONS) is used on a shared block, since fw_classify()'s old-method path needs block->q which is NULL for shared blocks.
The fixed null-ptr-deref calling stack:
KASAN: null-ptr-deref in range [0x0000000000000038-0x000000000000003f] RIP: 0010:fw_classify (net/sched/cls_fw.c:81) Call Trace: tcf_classify (./include/net/tc_wrapper.h:197 net/sched/cls_api.c:1764 net/sched/cls_api.c:1860) tc_run (net/core/dev.c:4401) __dev_queue_xmit (net/core/dev.c:4535 net/core/dev.c:4790)
--- net/sched/cls_fw.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
net/sched/cls_fw.c +12 -2
@@ -247,8 +247,18 @@ static int fw_change(struct net *net, struct sk_buff *in_skb,struct nlattr *tb[TCA_FW_MAX +1 ];int err; -if (!opt) -return handle ? -EINVAL :0 ;/* Succeed if it is old method. */ +if (!opt) { +if (handle) +return -EINVAL ; + +if (tcf_block_shared (tp->chain->block)) { +NL_SET_ERR_MSG (extack, +"Must specify mark when attaching fw filter to block" ); +return -EINVAL ; + } + +return 0 ;/* Succeed if it is old method. */ + } err =nla_parse_nested_deprecated (tb,TCA_FW_MAX , opt, fw_policy,NULL );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 61/160 net/sched: cls_flow: fix NULL pointer dereference on shared blocks
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiang Mei <[email protected]>
[ Upstream commit 1a280dd4bd1d616a01d6ffe0de284c907b555504 ]
flow_change() calls tcf_block_q() and dereferences q->handle to derive a default baseclass. Shared blocks leave block->q NULL, causing a NULL deref when a flow filter without a fully qualified baseclass is created on a shared block.
Check tcf_block_shared() before accessing block->q and return -EINVAL for shared blocks. This avoids the null-deref shown below:
=======================================================================
KASAN: null-ptr-deref in range [0x0000000000000038-0x000000000000003f] RIP: 0010:flow_change (net/sched/cls_flow.c:508) Call Trace: tc_new_tfilter (net/sched/cls_api.c:2432) rtnetlink_rcv_msg (net/core/rtnetlink.c:6980) [...] =======================================================================
--- net/sched/cls_flow.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
net/sched/cls_flow.c +9 -1
@@ -503,8 +503,16 @@ static int flow_change(struct net *net, struct sk_buff *in_skb, }if (TC_H_MAJ (baseclass) ==0 ) { -struct Qdisc *q =tcf_block_q (tp->chain->block); +struct tcf_block *block = tp->chain->block; +struct Qdisc *q; +if (tcf_block_shared (block)) { +NL_SET_ERR_MSG (extack, +"Must specify baseclass when attaching flow filter to block" ); + goto err2; + } + + q =tcf_block_q (block); baseclass =TC_H_MAKE (q->handle, baseclass); }if (TC_H_MIN (baseclass) ==0 )
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 62/160 net: hsr: fix VLAN add unwind on slave errors
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luka Gejak <[email protected]>
[ Upstream commit 2e3514e63bfb0e972b1f19668547a455d0129e88 ]
When vlan_vid_add() fails for a secondary slave, the error path calls vlan_vid_del() on the failing port instead of the peer slave that had already succeeded. This results in asymmetric VLAN state across the HSR pair.
Fix this by switching to a centralized unwind path that removes the VID from any slave device that was already programmed.
--- net/hsr/hsr_device.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-)
net/hsr/hsr_device.c +17 -15
@@ -473,8 +473,8 @@ static void hsr_change_rx_flags(struct net_device *dev, int change)static int hsr_ndo_vlan_rx_add_vid (struct net_device *dev,__be16 proto,u16 vid) { -bool is_slave_a_added = false; -bool is_slave_b_added = false; +struct net_device *slave_a_dev =NULL ; +struct net_device *slave_b_dev =NULL ;struct hsr_port *port;struct hsr_priv *hsr;int ret =0 ;
@@ -490,33 +490,35 @@ static int hsr_ndo_vlan_rx_add_vid(struct net_device *dev,switch (port->type) {case HSR_PT_SLAVE_A :if (ret) { -/* clean up Slave-B */ netdev_err (dev,"add vid failed for Slave-A\n" ); -if (is_slave_b_added) -vlan_vid_del (port->dev, proto, vid); -return ret; + goto unwind; } - - is_slave_a_added = true; + slave_a_dev = port->dev;break ; -case HSR_PT_SLAVE_B :if (ret) { -/* clean up Slave-A */ netdev_err (dev,"add vid failed for Slave-B\n" ); -if (is_slave_a_added) -vlan_vid_del (port->dev, proto, vid); -return ret; + goto unwind; } - - is_slave_b_added = true; + slave_b_dev = port->dev;break ;default : +if (ret) + goto unwind;break ; } }return 0 ; + +unwind: +if (slave_a_dev) +vlan_vid_del (slave_a_dev, proto, vid); + +if (slave_b_dev) +vlan_vid_del (slave_b_dev, proto, vid); + +return ret; } static int hsr_ndo_vlan_rx_kill_vid(struct net_device *dev,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 63/160 ipv6: avoid overflows in ip6_datagram_send_ctl()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 4e453375561fc60820e6b9d8ebeb6b3ee177d42e ]
Yiming Qian reported :
<quote>
I believe I found a locally triggerable kernel bug in the IPv6 sendmsg ancillary-data path that can panic the kernel via skb_under_panic() (local DoS).
The core issue is a mismatch between:
- a 16-bit length accumulator (struct ipv6_txoptions::opt_flen, type __u16) and
- a pointer to the *last* provided destination-options header (opt->dst1opt)
when multiple IPV6_DSTOPTS control messages (cmsgs) are provided.
- include/net/ipv6.h:
- struct ipv6_txoptions::opt_flen is __u16 (wrap possible).
(lines 291-307, especially 298)
- net/ipv6/datagram.c:ip6_datagram_send_ctl():
- Accepts repeated IPV6_DSTOPTS and accumulates into opt_flen
without rejecting duplicates. (lines 909-933)
- net/ipv6/ip6_output.c:__ip6_append_data():
- Uses opt->opt_flen + opt->opt_nflen to compute header
sizes/headroom decisions. (lines 1448-1466, especially 1463-1465)
- net/ipv6/ip6_output.c:__ip6_make_skb():
- Calls ipv6_push_frag_opts() if opt->opt_flen is non-zero.
(lines 1930-1934)
- net/ipv6/exthdrs.c:ipv6_push_frag_opts() / ipv6_push_exthdr():
- Push size comes from ipv6_optlen(opt->dst1opt) (based on the
pointed-to header). (lines 1179-1185 and 1206-1211)
1. opt_flen is a 16-bit accumulator:
- include/net/ipv6.h:298 defines __u16 opt_flen; /* after fragment hdr */.
2. ip6_datagram_send_ctl() accepts *repeated* IPV6_DSTOPTS cmsgs and increments opt_flen each time:
- In net/ipv6/datagram.c:909-933, for IPV6_DSTOPTS:
- It computes len = ((hdr->hdrlen + 1) << 3);
- It checks CAP_NET_RAW using `ns_capable(net->user_ns,
CAP_NET_RAW)`. (line 922)
- Then it does:
- opt->opt_flen += len; (line 927)
- opt->dst1opt = hdr; (line 928)
There is no duplicate rejection here (unlike the legacy IPV6_2292DSTOPTS path which rejects duplicates at net/ipv6/datagram.c:901-904).
If enough large IPV6_DSTOPTS cmsgs are provided, opt_flen wraps while dst1opt still points to a large (2048-byte) destination-options header.
In the attached PoC (poc.c):
- 32 cmsgs with hdrlen=255 => len = (255+1)*8 = 2048
- 1 cmsg with hdrlen=0 => len = 8
- Total increment: 32*2048 + 8 = 65544, so (__u16)opt_flen == 8
- The last cmsg is 2048 bytes, so dst1opt points to a 2048-byte header.
3. The transmit path sizes headers using the wrapped opt_flen:
- In net/ipv6/ip6_output.c:1463-1465:
- `headersize = sizeof(struct ipv6hdr) + (opt ? opt->opt_flen +
opt->opt_nflen : 0) + ...;`
With wrapped opt_flen, headersize/headroom decisions underestimate what will be pushed later.
4. When building the final skb, the actual push length comes from dst1opt and is not limited by wrapped opt_flen:
- In net/ipv6/ip6_output.c:1930-1934:
- if (opt->opt_flen) proto = ipv6_push_frag_opts(skb, opt, proto);
- In net/ipv6/exthdrs.c:1206-1211, ipv6_push_frag_opts() pushes dst1opt via ipv6_push_exthdr().
- In net/ipv6/exthdrs.c:1179-1184, ipv6_push_exthdr() does:
- skb_push(skb, ipv6_optlen(opt));
- memcpy(h, opt, ipv6_optlen(opt));
With insufficient headroom, skb_push() underflows and triggers skb_under_panic() -> BUG():
- net/core/skbuff.c:2669-2675 (skb_push() calls skb_under_panic())
- net/core/skbuff.c:207-214 (skb_panic() ends in BUG())
- The IPV6_DSTOPTS cmsg path requires CAP_NET_RAW in the target netns user namespace (ns_capable(net->user_ns, CAP_NET_RAW)).
- Root (or any task with CAP_NET_RAW) can trigger this without user namespaces.
- An unprivileged uid=1000 user can trigger this if unprivileged user namespaces are enabled and it can create a userns+netns to obtain namespaced CAP_NET_RAW (the attached PoC does this).
- Local denial of service: kernel BUG/panic (system crash).
- Reproducible with a small userspace PoC.
</quote>
This patch does not reject duplicated options, as this might break some user applications.
Instead, it makes sure to adjust opt_flen and opt_nflen to correctly reflect the size of the current option headers, preventing the overflows and the potential for panics.
This applies to IPV6_DSTOPTS, IPV6_HOPOPTS, and IPV6_RTHDR.
Specifically:
When a new IPV6_DSTOPTS is processed, the length of the old opt->dst1opt is subtracted from opt->opt_flen before adding the new length.
When a new IPV6_HOPOPTS is processed, the length of the old opt->dst0opt is subtracted from opt->opt_nflen.
When a new Routing Header (IPV6_RTHDR or IPV6_2292RTHDR) is processed, the length of the old opt->srcrt is subtracted from opt->opt_nflen.
In the special case within IPV6_2292RTHDR handling where dst1opt is moved to dst0opt, the length of the old opt->dst0opt is subtracted from opt->opt_nflen before the new one is added.
--- net/ipv6/datagram.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
net/ipv6/datagram.c +10 -0
@@ -763,6 +763,7 @@ int ip6_datagram_send_ctl(struct net *net, struct sock *sk, {struct in6_pktinfo *src_info;struct cmsghdr *cmsg; +struct ipv6_rt_hdr *orthdr;struct ipv6_rt_hdr *rthdr;struct ipv6_opt_hdr *hdr;struct ipv6_txoptions *opt = ipc6->opt;
@@ -924,9 +925,13 @@ int ip6_datagram_send_ctl(struct net *net, struct sock *sk, goto exit_f; }if (cmsg->cmsg_type ==IPV6_DSTOPTS ) { +if (opt->dst1opt) + opt->opt_flen -=ipv6_optlen (opt->dst1opt); opt->opt_flen += len; opt->dst1opt = hdr; }else { +if (opt->dst0opt) + opt->opt_nflen -=ipv6_optlen (opt->dst0opt); opt->opt_nflen += len; opt->dst0opt = hdr; }
@@ -969,12 +974,17 @@ int ip6_datagram_send_ctl(struct net *net, struct sock *sk, goto exit_f; } + orthdr = opt->srcrt; +if (orthdr) + opt->opt_nflen -= ((orthdr->hdrlen +1 ) <<3 ); opt->opt_nflen += len; opt->srcrt = rthdr;if (cmsg->cmsg_type ==IPV6_2292RTHDR && opt->dst1opt) {int dsthdrlen = ((opt->dst1opt->hdrlen+1 )<<3 ); +if (opt->dst0opt) + opt->opt_nflen -=ipv6_optlen (opt->dst0opt); opt->opt_nflen += dsthdrlen; opt->dst0opt = opt->dst1opt; opt->dst1opt =NULL ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 64/160 bpf: reject direct access to nullable PTR_TO_BUF pointers
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qi Tang <[email protected]>
[ Upstream commit b0db1accbc7395657c2b79db59fa9fae0d6656f3 ]
check_mem_access() matches PTR_TO_BUF via base_type() which strips PTR_MAYBE_NULL, allowing direct dereference without a null check.
Map iterator ctx->key and ctx->value are PTR_TO_BUF | PTR_MAYBE_NULL. On stop callbacks these are NULL, causing a kernel NULL dereference.
Add a type_may_be_null() guard to the PTR_TO_BUF branch, matching the existing PTR_TO_BTF_ID pattern.
--- kernel/bpf/verifier.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/bpf/verifier.c +2 -1
@@ -6912,7 +6912,8 @@ static int check_mem_access(struct bpf_verifier_env *env, int insn_idx, u32 regn }else if (reg->type ==CONST_PTR_TO_MAP ) { err =check_ptr_to_map_access (env, regs, regno, off, size, t, value_regno); - }else if (base_type (reg->type) ==PTR_TO_BUF ) { + }else if (base_type (reg->type) ==PTR_TO_BUF && + !type_may_be_null (reg->type)) {bool rdonly_mem =type_is_rdonly_mem (reg->type);u32 *max_access;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 65/160 iio: imu: bno055: fix BNO055_SCAN_CH_COUNT off by one
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Lechner <[email protected]>
[ Upstream commit 773ef9f95385bae52dcb7fd129fefba3a71a04db ]
Fix an off-by-one error in the BNO055_SCAN_CH_COUNT macro. The count is derived by taking the difference of the last and first register addresses, dividing by the size of each channel (2 bytes). It needs to also add 1 to account for the fact that the count is inclusive of both the first and last channels.
Thanks to the aligned_s64 timestamp field, there was already extra padding in the buffer, so there were no runtime issues caused by this bug.
--- drivers/iio/imu/bno055/bno055.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/imu/bno055/bno055.c +1 -1
@@ -64,7 +64,7 @@#define BNO055_GRAVITY_DATA_X_LSB_REG 0x2E#define BNO055_GRAVITY_DATA_Y_LSB_REG 0x30#define BNO055_GRAVITY_DATA_Z_LSB_REG 0x32 -#define BNO055_SCAN_CH_COUNT ((BNO055_GRAVITY_DATA_Z_LSB_REG - BNO055_ACC_DATA_X_LSB_REG) / 2) +#define BNO055_SCAN_CH_COUNT ((BNO055_GRAVITY_DATA_Z_LSB_REG - BNO055_ACC_DATA_X_LSB_REG) / 2 + 1)#define BNO055_TEMP_REG 0x34#define BNO055_CALIB_STAT_REG 0x35#define BNO055_CALIB_STAT_MAGN_SHIFT 0
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 66/160 accel/qaic: Handle DBC deactivation if the owner went away
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Youssef Samir <[email protected]>
[ Upstream commit 2feec5ae5df785658924ab6bd91280dc3926507c ]
When a DBC is released, the device sends a QAIC_TRANS_DEACTIVATE_FROM_DEV transaction to the host over the QAIC_CONTROL MHI channel. QAIC handles this by calling decode_deactivate() to release the resources allocated for that DBC. Since that handling is done in the qaic_manage_ioctl() context, if the user goes away before receiving and handling the deactivation, the host will be out-of-sync with the DBCs available for use, and the DBC resources will not be freed unless the device is removed. If another user loads and requests to activate a network, then the device assigns the same DBC to that network, QAIC will "indefinitely" wait for dbc->in_use = false, leading the user process to hang.
As a solution to this, handle QAIC_TRANS_DEACTIVATE_FROM_DEV transactions that are received after the user has gone away.
--- drivers/accel/qaic/qaic_control.c | 47 +++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-)
drivers/accel/qaic/qaic_control.c +45 -2
@@ -910,7 +910,7 @@ static int decode_deactivate(struct qaic_device *qdev, void *trans, u32 *msg_len*/ return -ENODEV ; -if (status) { +if (usr && status) {/* * Releasing resources failed on the device side, which puts * us in a bind since they may still be in use, so enable the
@@ -1104,6 +1104,9 @@ static void *msg_xfer(struct qaic_device *qdev, struct wrapper_list *wrappers, umutex_lock (&qdev->cntl_mutex);if (!list_empty (&elem.list))list_del (&elem.list); +/* resp_worker() processed the response but the wait was interrupted */ +else if (ret == -ERESTARTSYS ) + ret =0 ;if (!ret && !elem.buf) ret = -ETIMEDOUT ;else if (ret >0 && !elem.buf)
@@ -1414,9 +1417,49 @@ static void resp_worker(struct work_struct *work) }mutex_unlock (&qdev->cntl_mutex); -if (!found) +if (!found) { +/* +* The user might have gone away at this point without waiting +* for QAIC_TRANS_DEACTIVATE_FROM_DEV transaction coming from +* the device. If this is not handled correctly, the host will +* not know that the DBC[n] has been freed on the device. +* Due to this failure in synchronization between the device and +* the host, if another user requests to activate a network, and +* the device assigns DBC[n] again, save_dbc_buf() will hang, +* waiting for dbc[n]->in_use to be set to false, which will not +* happen unless the qaic_dev_reset_clean_local_state() gets +* called by resetting the device (or re-inserting the module). +* +* As a solution, we look for QAIC_TRANS_DEACTIVATE_FROM_DEV +* transactions in the message before disposing of it, then +* handle releasing the DBC resources. +* +* Since the user has gone away, if the device could not +* deactivate the network (status != 0), there is no way to +* enable and reassign the DBC to the user. We can put trust in +* the device that it will release all the active DBCs in +* response to the QAIC_TRANS_TERMINATE_TO_DEV transaction, +* otherwise, the user can issue an soc_reset to the device. +*/ +u32 msg_count =le32_to_cpu (msg->hdr.count); +u32 msg_len =le32_to_cpu (msg->hdr.len); +u32 len =0 ; +int j; + +for (j =0 ; j < msg_count && len < msg_len; ++j) { +struct wire_trans_hdr *trans_hdr; + + trans_hdr = (struct wire_trans_hdr *)(msg->data + len); +if (le32_to_cpu (trans_hdr->type) ==QAIC_TRANS_DEACTIVATE_FROM_DEV ) { +if (decode_deactivate (qdev, trans_hdr, &len,NULL )) + len +=le32_to_cpu (trans_hdr->len); + }else { + len +=le32_to_cpu (trans_hdr->len); + } + }/* request must have timed out, drop packet */ kfree (msg); + }kfree (resp); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 67/160 hwmon: (pxe1610) Check return value of page-select write in probe
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sanman Pradhan <[email protected]>
[ Upstream commit ccf70c41e562b29d1c05d1bbf53391785e09c6fb ]
pxe1610_probe() writes PMBUS_PAGE to select page 0 but does not check the return value. If the write fails, subsequent register reads operate on an indeterminate page, leading to silent misconfiguration.
Check the return value and propagate the error using dev_err_probe(), which also handles -EPROBE_DEFER correctly without log spam.
--- drivers/hwmon/pmbus/pxe1610.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/hwmon/pmbus/pxe1610.c +4 -1
@@ -104,7 +104,10 @@ static int pxe1610_probe(struct i2c_client *client)* By default this device doesn't boot to page 0, so set page 0 * to access all pmbus registers. */ -i2c_smbus_write_byte_data (client,PMBUS_PAGE ,0 ); + ret =i2c_smbus_write_byte_data (client,PMBUS_PAGE ,0 ); +if (ret <0 ) +return dev_err_probe (&client->dev, ret, +"Failed to set page 0\n" );/* Read Manufacturer id */ ret =i2c_smbus_read_block_data (client,PMBUS_MFR_ID , buf);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 68/160 dt-bindings: gpio: fix microchip #interrupt-cells
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jamie Gibbons <[email protected]>
[ Upstream commit 6b5ef8c88854b343b733b574ea8754c9dab61f41 ]
The GPIO controller on PolarFire SoC supports more than one type of interrupt and needs two interrupt cells.
--- .../devicetree/bindings/gpio/microchip,mpfs-gpio.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/gpio/microchip,mpfs-gpio.yaml +2 -2
@@ -33,7 +33,7 @@ properties: const: 2 "#interrupt-cells": - const: 1 + const: 2 ngpios: description:
@@ -84,7 +84,7 @@ examples: gpio-controller; #gpio-cells = <2>; interrupt-controller; - #interrupt-cells = <1>; + #interrupt-cells = <2>; interrupts = <53>, <53>, <53>, <53>, <53>, <53>, <53>, <53>, <53>, <53>, <53>, <53>,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 69/160 hwmon: (tps53679) Fix device ID comparison and printing in tps53676_identify()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sanman Pradhan <[email protected]>
[ Upstream commit ca34ee6d0307a0b4e52c870dfc1bb8a3c3eb956e ]
tps53676_identify() uses strncmp() to compare the device ID buffer against a byte sequence containing embedded non-printable bytes (\x53\x67\x60). strncmp() is semantically wrong for binary data comparison; use memcmp() instead.
Additionally, the buffer from i2c_smbus_read_block_data() is not NUL-terminated, so printing it with "%s" in the error path is undefined behavior and may read past the buffer. Use "%*ph" to hex-dump the actual bytes returned.
Per the datasheet, the expected device ID is the 6-byte sequence 54 49 53 67 60 00 ("TI\x53\x67\x60\x00"), so compare all 6 bytes including the trailing NUL.
--- drivers/hwmon/pmbus/tps53679.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/hwmon/pmbus/tps53679.c +2 -2
@@ -156,8 +156,8 @@ static int tps53676_identify(struct i2c_client *client, ret =i2c_smbus_read_block_data (client,PMBUS_IC_DEVICE_ID , buf);if (ret <0 )return ret; -if (strncmp ("TI\x53\x67\x60" , buf,5 )) { -dev_err (&client->dev,"Unexpected device ID: %s\n" , buf); +if (ret !=6 ||memcmp (buf,"TI\x53\x67\x60\x00" ,6 )) { +dev_err (&client->dev,"Unexpected device ID: %*ph\n" , ret, buf);return -ENODEV ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 70/160 hwmon: (occ) Fix missing newline in occ_show_extended()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sanman Pradhan <[email protected]>
[ Upstream commit 09773978879ecf71a7990fe9a28ce4eb92bce645 ]
In occ_show_extended() case 0, when the EXTN_FLAG_SENSOR_ID flag is set, the sysfs_emit format string "%u" is missing the trailing newline that the sysfs ABI expects. The else branch correctly uses "%4phN\n", and all other show functions in this file include the trailing newline.
Add the missing "\n" for consistency and correct sysfs output.
--- drivers/hwmon/occ/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/occ/common.c +1 -1
@@ -725,7 +725,7 @@ static ssize_t occ_show_extended(struct device *dev,switch (sattr->nr) {case 0 :if (extn->flags &EXTN_FLAG_SENSOR_ID ) { - rc =sysfs_emit (buf,"%u" , + rc =sysfs_emit (buf,"%u\n" ,get_unaligned_be32 (&extn->sensor_id)); }else { rc =sysfs_emit (buf,"%4phN\n" , extn->name);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 71/160 mips: ralink: update CPU clock index
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shiji Yang <[email protected]>
[ Upstream commit 43985a62bab9d35e5e9af41118ce2f44c01b97d2 ]
Update CPU clock index to match the clock driver changes.
--- arch/mips/ralink/clk.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/mips/ralink/clk.c +4 -4
@@ -21,16 +21,16 @@ static const char *clk_cpu(int *idx) {switch (ralink_soc) {case RT2880_SOC : - *idx =0 ; + *idx =1 ;return "ralink,rt2880-sysc" ;case RT3883_SOC : - *idx =0 ; + *idx =1 ;return "ralink,rt3883-sysc" ;case RT305X_SOC_RT3050 : - *idx =0 ; + *idx =1 ;return "ralink,rt3050-sysc" ;case RT305X_SOC_RT3052 : - *idx =0 ; + *idx =1 ;return "ralink,rt3052-sysc" ;case RT305X_SOC_RT3350 : *idx =1 ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 72/160 riscv: kgdb: fix several debug register assignment bugs
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Walmsley <[email protected]>
[ Upstream commit 834911eb8eef2501485d819b4eabebadc25c3497 ]
Fix several bugs in the RISC-V kgdb implementation:
- The element of dbg_reg_def[] that is supposed to pertain to the S1 register embeds instead the struct pt_regs offset of the A1 register. Fix this to use the S1 register offset in struct pt_regs.
- The sleeping_thread_to_gdb_regs() function copies the value of the S10 register into the gdb_regs[] array element meant for the S9 register, and copies the value of the S11 register into the array element meant for the S10 register. It also neglects to copy the value of the S11 register. Fix all of these issues.
--- arch/riscv/kernel/kgdb.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
arch/riscv/kernel/kgdb.c +4 -3
@@ -175,7 +175,7 @@ struct dbg_reg_def_t dbg_reg_def[DBG_MAX_REG_NUM] = { {DBG_REG_T1, GDB_SIZEOF_REG, offsetof(struct pt_regs, t1)}, {DBG_REG_T2, GDB_SIZEOF_REG, offsetof(struct pt_regs, t2)}, {DBG_REG_FP, GDB_SIZEOF_REG, offsetof(struct pt_regs, s0)}, - {DBG_REG_S1, GDB_SIZEOF_REG, offsetof(struct pt_regs, a1)}, + {DBG_REG_S1, GDB_SIZEOF_REG, offsetof(struct pt_regs, s1)}, {DBG_REG_A0, GDB_SIZEOF_REG, offsetof(struct pt_regs, a0)}, {DBG_REG_A1, GDB_SIZEOF_REG, offsetof(struct pt_regs, a1)}, {DBG_REG_A2, GDB_SIZEOF_REG, offsetof(struct pt_regs, a2)},
@@ -244,8 +244,9 @@ sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *task) gdb_regs[DBG_REG_S6_OFF ] = task->thread.s[6 ]; gdb_regs[DBG_REG_S7_OFF ] = task->thread.s[7 ]; gdb_regs[DBG_REG_S8_OFF ] = task->thread.s[8 ]; - gdb_regs[DBG_REG_S9_OFF ] = task->thread.s[10 ]; - gdb_regs[DBG_REG_S10_OFF ] = task->thread.s[11 ]; + gdb_regs[DBG_REG_S9_OFF ] = task->thread.s[9 ]; + gdb_regs[DBG_REG_S10_OFF ] = task->thread.s[10 ]; + gdb_regs[DBG_REG_S11_OFF ] = task->thread.s[11 ]; gdb_regs[DBG_REG_EPC_OFF ] = task->thread.ra; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 73/160 drm/ioc32: stop speculation on the drm_compat_ioctl path
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit f8995c2df519f382525ca4bc90553ad2ec611067 upstream.
The drm compat ioctl path takes a user controlled pointer, and then dereferences it into a table of function pointers, the signature method of spectre problems. Fix this up by calling array_index_nospec() on the index to the function pointer list.
--- drivers/gpu/drm/drm_ioc32.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/drm_ioc32.c +2 -0
@@ -28,6 +28,7 @@* IN THE SOFTWARE. */ #include <linux/compat.h> +#include <linux/nospec.h> #include <linux/ratelimit.h> #include <linux/export.h>
@@ -983,6 +984,7 @@ long drm_compat_ioctl(struct file *filp,if (nr >=ARRAY_SIZE (drm_compat_ioctls))return drm_ioctl (filp, cmd, arg); + nr =array_index_nospec (nr,ARRAY_SIZE (drm_compat_ioctls)); fn = drm_compat_ioctls[nr].fn;if (!fn)return drm_ioctl (filp, cmd, arg);
Greg Kroah-Hartman
maintainerPATCH 74/160 wifi: wilc1000: fix u8 overflow in SSID scan buffer size calculation
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yasuaki Torimaru <[email protected]>
commit d049e56b1739101d1c4d81deedb269c52a8dbba0 upstream.
The variable valuesize is declared as u8 but accumulates the total length of all SSIDs to scan. Each SSID contributes up to 33 bytes (IEEE80211_MAX_SSID_LEN + 1), and with WILC_MAX_NUM_PROBED_SSID (10) SSIDs the total can reach 330, which wraps around to 74 when stored in a u8.
This causes kmalloc to allocate only 75 bytes while the subsequent memcpy writes up to 331 bytes into the buffer, resulting in a 256-byte heap buffer overflow.
Widen valuesize from u8 to u32 to accommodate the full range.
--- drivers/net/wireless/microchip/wilc1000/hif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/microchip/wilc1000/hif.c +1 -1
@@ -162,7 +162,7 @@ int wilc_scan(struct wilc_vif *vif, u8 su32 index =0 ;u32 i, scan_timeout;u8 *buffer; -u8 valuesize =0 ; +u32 valuesize =0 ;u8 *search_ssid_vals =NULL ;struct host_if_drv *hif_drv = vif->hif_drv;
Greg Kroah-Hartman
maintainerPATCH 75/160 wifi: iwlwifi: mvm: fix potential out-of-bounds read in iwl_mvm_nd_match_info_handler()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexey Velichayshiy <[email protected]>
commit 744fabc338e87b95c4d1ff7c95bc8c0f834c6d99 upstream.
The memcpy function assumes the dynamic array notif->matches is at least as large as the number of bytes to copy. Otherwise, results->matches may contain unwanted data. To guarantee safety, extend the validation in one of the checks to ensure sufficient packet length.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/d3.c +1 -1
@@ -2863,7 +2863,7 @@ static void iwl_mvm_nd_match_info_handleif (IS_ERR_OR_NULL (vif))return ; -if (len <sizeof (struct iwl_scan_offload_match_info )) { +if (len <sizeof (struct iwl_scan_offload_match_info ) + matches_len) {IWL_ERR (mvm,"Invalid scan match info notification\n" );return ; }
Greg Kroah-Hartman
maintainerPATCH 76/160 USB: serial: option: add MeiG Smart SRM825WN
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ernestas Kulik <[email protected]>
commit e8d0ed37bd51da52da6225d278e330c2f18a6198 upstream.
Add support for the SDX62-based MeiG Smart SRM825WN module.
If#= 0: RNDIS
If#= 1: RNDIS
If#= 2: Diag
If#= 3: AT
If#= 4: AT
If#= 5: NMEA
T: Bus=01 Lev=02 Prnt=02 Port=00 Cnt=01 Dev#= 19 Spd=480 MxCh= 0 D: Ver= 2.10 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=2dee ProdID=4d38 Rev= 5.04 S: Manufacturer=MEIG S: Product=LTE-A Module S: SerialNumber=da47a175
C:* #Ifs= 6 Cfg#= 1 Atr=80 MxPwr=500mA
A: FirstIf#= 0 IfCount= 2 Cls=e0(wlcon) Sub=01 Prot=03
I:* If#= 0 Alt= 0 #EPs= 1 Cls=e0(wlcon) Sub=01 Prot=03 Driver=rndis_host
E: Ad=81(I) Atr=03(Int.) MxPS= 8 Ivl=32ms
I:* If#= 1 Alt= 0 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=rndis_host
E: Ad=8e(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=0f(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option E: Ad=84(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option E: Ad=86(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 5 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=60 Driver=option E: Ad=88(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
--- drivers/usb/serial/option.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/serial/option.c +3 -0
@@ -2441,6 +2441,9 @@ static const struct usb_device_id option { USB_DEVICE_AND_INTERFACE_INFO(0x2dee, 0x4d22, 0xff, 0xff, 0x30) }, /* MeiG Smart SRM815 and SRM825L */ { USB_DEVICE_AND_INTERFACE_INFO(0x2dee, 0x4d22, 0xff, 0xff, 0x40) }, /* MeiG Smart SRM825L */ { USB_DEVICE_AND_INTERFACE_INFO(0x2dee, 0x4d22, 0xff, 0xff, 0x60) }, /* MeiG Smart SRM825L */ + { USB_DEVICE_AND_INTERFACE_INFO(0x2dee, 0x4d38, 0xff, 0xff, 0x30) }, /* MeiG Smart SRM825WN (Diag) */ + { USB_DEVICE_AND_INTERFACE_INFO(0x2dee, 0x4d38, 0xff, 0xff, 0x40) }, /* MeiG Smart SRM825WN (AT) */ + { USB_DEVICE_AND_INTERFACE_INFO(0x2dee, 0x4d38, 0xff, 0xff, 0x60) }, /* MeiG Smart SRM825WN (NMEA) */ { USB_DEVICE_INTERFACE_CLASS(0x2df3, 0x9d03, 0xff) }, /* LongSung M5710 */ { USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1404, 0xff) }, /* GosunCn GM500 RNDIS */ { USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1405, 0xff) }, /* GosunCn GM500 MBIM */
Greg Kroah-Hartman
maintainerPATCH 77/160 ALSA: caiaq: fix stack out-of-bounds read in init_card
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Berk Cem Goksel <[email protected]>
commit 45424e871abf2a152e247a9cff78359f18dd95c0 upstream.
The loop creates a whitespace-stripped copy of the card shortname where len < sizeof(card->id) is used for the bounds check. Since sizeof(card->id) is 16 and the local id buffer is also 16 bytes, writing 16 non-space characters fills the entire buffer, overwriting the terminating nullbyte.
When this non-null-terminated string is later passed to snd_card_set_id() -> copy_valid_id_string(), the function scans forward with while (*nid && ...) and reads past the end of the stack buffer, reading the contents of the stack.
A USB device with a product name containing many non-ASCII, non-space characters (e.g. multibyte UTF-8) will reliably trigger this as follows:
BUG: KASAN: stack-out-of-bounds in copy_valid_id_string
sound/core/init.c:696 [inline]
BUG: KASAN: stack-out-of-bounds in snd_card_set_id_no_lock+0x698/0x74c
sound/core/init.c:718The off-by-one has been present since commit bafeee5b1f8d ("ALSA:snd_usb_caiaq: give better shortname") from June 2009 (v2.6.31-rc1), which first introduced this whitespace-stripping loop. The original code never accounted for the null terminator when bounding the copy.
Fix this by changing the loop bound to sizeof(card->id) - 1, ensuring at least one byte remains as the null terminator.
--- sound/usb/caiaq/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/caiaq/device.c +1 -1
@@ -488,7 +488,7 @@ static int init_card(struct snd_usb_caiamemset (id,0 ,sizeof (id));for (c = card->shortname, len =0 ; - *c && len <sizeof (card->id); c++) + *c && len <sizeof (card->id) -1 ; c++)if (*c !=' ' ) id[len++] = *c;
Greg Kroah-Hartman
maintainerPATCH 78/160 ALSA: ctxfi: Fix missing SPDIFI1 index handling
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit b045ab3dff97edae6d538eeff900a34c098761f8 upstream.
SPDIF1 DAIO type isn't properly handled in daio_device_index() for hw20k2, and it returned -EINVAL, which ended up with the out-of-bounds array access. Follow the hw20k1 pattern and return the proper index for this type, too.
--- sound/pci/ctxfi/ctdaio.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/ctxfi/ctdaio.c +1 -0
@@ -119,6 +119,7 @@ static unsigned int daio_device_index(enswitch (type) {case SPDIFOO :return 0 ;case SPDIFIO :return 0 ; +case SPDIFI1 :return 1 ;case LINEO1 :return 4 ;case LINEO2 :return 7 ;case LINEO3 :return 5 ;
Greg Kroah-Hartman
maintainerPATCH 79/160 Bluetooth: SMP: derive legacy responder STK authentication from MITM state
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleh Konko <[email protected]>
commit 20756fec2f0108cb88e815941f1ffff88dc286fe upstream.
The legacy responder path in smp_random() currently labels the stored STK as authenticated whenever pending_sec_level is BT_SECURITY_HIGH. That reflects what the local service requested, not what the pairing flow actually achieved.
For Just Works/Confirm legacy pairing, SMP_FLAG_MITM_AUTH stays clear and the resulting STK should remain unauthenticated even if the local side requested HIGH security. Use the established MITM state when storing the responder STK so the key metadata matches the pairing result.
This also keeps the legacy path aligned with the Secure Connections code, which already treats JUST_WORKS/JUST_CFM as unauthenticated.
--- net/bluetooth/smp.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
net/bluetooth/smp.c +1 -4
@@ -1019,10 +1019,7 @@ static u8 smp_random(struct smp_chan *smsmp_s1 (smp->tk, smp->prnd, smp->rrnd, stk); -if (hcon->pending_sec_level ==BT_SECURITY_HIGH ) - auth =1 ; -else - auth =0 ; + auth =test_bit (SMP_FLAG_MITM_AUTH , &smp->flags) ?1 :0 ;/* Even though there's no _RESPONDER suffix this is the * responder STK we're adding for later lookup (the initiator
Greg Kroah-Hartman
maintainerPATCH 80/160 Bluetooth: SMP: force responder MITM requirements before building the pairing response
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleh Konko <[email protected]>
commit d05111bfe37bfd8bd4d2dfe6675d6bdeef43f7c7 upstream.
smp_cmd_pairing_req() currently builds the pairing response from the initiator auth_req before enforcing the local BT_SECURITY_HIGH requirement. If the initiator omits SMP_AUTH_MITM, the response can also omit it even though the local side still requires MITM.
tk_request() then sees an auth value without SMP_AUTH_MITM and may select JUST_CFM, making method selection inconsistent with the pairing policy the responder already enforces.
When the local side requires HIGH security, first verify that MITM can be achieved from the IO capabilities and then force SMP_AUTH_MITM in the response in both rsp.auth_req and auth. This keeps the responder auth bits and later method selection aligned.
--- net/bluetooth/smp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/bluetooth/smp.c +5 -1
@@ -1824,7 +1824,7 @@ static u8 smp_cmd_pairing_req(struct l2cif (sec_level > conn->hcon->pending_sec_level) conn->hcon->pending_sec_level = sec_level; -/* If we need MITM check that it can be achieved */ +/* If we need MITM check that it can be achieved. */ if (conn->hcon->pending_sec_level >=BT_SECURITY_HIGH ) {u8 method;
@@ -1832,6 +1832,10 @@ static u8 smp_cmd_pairing_req(struct l2c req->io_capability);if (method ==JUST_WORKS || method ==JUST_CFM )return SMP_AUTH_REQUIREMENTS ; + +/* Force MITM bit if it isn't set by the initiator. */ + auth |=SMP_AUTH_MITM ; + rsp.auth_req |=SMP_AUTH_MITM ; } key_size =min (req->max_key_size, rsp.max_key_size);
Greg Kroah-Hartman
maintainerPATCH 81/160 MIPS: Fix the GCC version check for `__multi3 workaround
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maciej W. Rozycki <[email protected]>
commit ec8bf18814915460d9c617b556bf024efef26613 upstream.
It was only GCC 10 that fixed a MIPS64r6 code generation issue with a `__multi3' libcall inefficiently produced to perform 64-bit widening multiplication while suitable machine instructions exist to do such a calculation. The fix went in with GCC commit 48b2123f6336 ("re PR target/82981 (unnecessary __multi3 call for mips64r6 linux kernel)").
Adjust our code accordingly, removing build failures such as:
mips64-linux-ld: lib/math/div64.o: in function `mul_u64_add_u64_div_u64':
div64.c:(.text+0x84): undefined reference to `__multi3'
with the GCC versions affected.
--- arch/mips/lib/multi3.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/mips/lib/multi3.c +3 -3
@@ -4,12 +4,12 @@#include "libgcc.h" /* -* GCC 7 & older can suboptimally generate __multi3 calls for mips64r6, so for +* GCC 9 & older can suboptimally generate __multi3 calls for mips64r6, so for * that specific case only we implement that intrinsic here. * * See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82981 */ -#if defined(CONFIG_64BIT ) && defined(CONFIG_CPU_MIPSR6 ) && (__GNUC__ <8 ) +#if defined(CONFIG_64BIT ) && defined(CONFIG_CPU_MIPSR6 ) && (__GNUC__ <10 )/* multiply 64-bit values, low 64-bits returned */ static inline long long notrace dmulu (long long a,long long b)
@@ -51,4 +51,4 @@ ti_type notrace __multi3(ti_type a, ti_t }EXPORT_SYMBOL (__multi3); -#endif /* 64BIT && CPU_MIPSR6 && GCC7 */ +#endif /* 64BIT && CPU_MIPSR6 && GCC9 */
Greg Kroah-Hartman
maintainerPATCH 82/160 hwmon: (occ) Fix division by zero in occ_show_power_1()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sanman Pradhan <[email protected]>
commit 39e2a5bf970402a8530a319cf06122e216ba57b8 upstream.
In occ_show_power_1() case 1, the accumulator is divided by update_tag without checking for zero. If no samples have been collected yet (e.g. during early boot when the sensor block is included but hasn't been updated), update_tag is zero, causing a kernel divide-by-zero crash.
The 2019 fix in commit 211186cae14d ("hwmon: (occ) Fix division by zero issue") only addressed occ_get_powr_avg() used by occ_show_power_2() and occ_show_power_a0(). This separate code path in occ_show_power_1() was missed.
Fix this by reusing the existing occ_get_powr_avg() helper, which already handles the zero-sample case and uses mul_u64_u32_div() to multiply before dividing for better precision. Move the helper above occ_show_power_1() so it is visible at the call site.
--- drivers/hwmon/occ/common.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
drivers/hwmon/occ/common.c +8 -9
@@ -420,6 +420,12 @@ static ssize_t occ_show_freq_2(struct dereturn sysfs_emit (buf,"%u\n" , val); } +static u64 occ_get_powr_avg (u64 accum,u32 samples) +{ +return (samples ==0 ) ?0 : +mul_u64_u32_div (accum,1000000UL , samples); +} +static ssize_t occ_show_power_1 (struct device *dev,struct device_attribute *attr,char *buf) {
@@ -441,9 +447,8 @@ static ssize_t occ_show_power_1(struct d val =get_unaligned_be16 (&power->sensor_id);break ;case 1 : - val =get_unaligned_be32 (&power->accumulator) / -get_unaligned_be32 (&power->update_tag); - val *=1000000ULL ; + val =occ_get_powr_avg (get_unaligned_be32 (&power->accumulator), +get_unaligned_be32 (&power->update_tag));break ;case 2 : val = (u64)get_unaligned_be32(&power->update_tag) *
@@ -459,12 +464,6 @@ static ssize_t occ_show_power_1(struct dreturn sysfs_emit (buf,"%llu\n" , val); } -static u64 occ_get_powr_avg (u64 accum,u32 samples) -{ -return (samples ==0 ) ?0 : -mul_u64_u32_div (accum,1000000UL , samples); -} -static ssize_t occ_show_power_2 (struct device *dev,struct device_attribute *attr,char *buf) {
Greg Kroah-Hartman
maintainerPATCH 83/160 mips: mm: Allocate tlb_vpn array atomically
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Wiehler <[email protected]>
commit 01cc50ea5167bb14117257ec084637abe9e5f691 upstream.
Found by DEBUG_ATOMIC_SLEEP:
BUG: sleeping function called from invalid context at /include/linux/sched/mm.h:306
in_atomic(): 1, irqs_disabled(): 1, non_block: 0, pid: 0, name: swapper/1
preempt_count: 1, expected: 0
RCU nest depth: 0, expected: 0
no locks held by swapper/1/0.
irq event stamp: 0
hardirqs last enabled at (0): [<0000000000000000>] 0x0
hardirqs last disabled at (0): [<ffffffff801477fc>] copy_process+0x75c/0x1b68
softirqs last enabled at (0): [<ffffffff801477fc>] copy_process+0x75c/0x1b68
softirqs last disabled at (0): [<0000000000000000>] 0x0
CPU: 1 PID: 0 Comm: swapper/1 Not tainted 6.6.119-d79e757675ec-fct #1
Stack : 800000000290bad8 0000000000000000 0000000000000008 800000000290bae8
800000000290bae8 800000000290bc78 0000000000000000 0000000000000000
ffffffff80c80000 0000000000000001 ffffffff80d8dee8 ffffffff810d09c0
784bb2a7ec10647d 0000000000000010 ffffffff80a6fd60 8000000001d8a9c0
0000000000000000 0000000000000000 ffffffff80d90000 0000000000000000
ffffffff80c9e0e8 0000000007ffffff 0000000000000cc0 0000000000000400
ffffffffffffffff 0000000000000001 0000000000000002 ffffffffc0149ed8
fffffffffffffffe 8000000002908000 800000000290bae0 ffffffff80a81b74
ffffffff80129fb0 0000000000000000 0000000000000000 0000000000000000
0000000000000000 0000000000000000 ffffffff80129fd0 0000000000000000
...
Call Trace:
[<ffffffff80129fd0>] show_stack+0x60/0x158
[<ffffffff80a7f894>] dump_stack_lvl+0x88/0xbc
[<ffffffff8018d3c8>] __might_resched+0x268/0x288
[<ffffffff803648b0>] __kmem_cache_alloc_node+0x2e0/0x330
[<ffffffff80302788>] __kmalloc+0x58/0xd0
[<ffffffff80a81b74>] r4k_tlb_uniquify+0x7c/0x428
[<ffffffff80143e8c>] tlb_init+0x7c/0x110
[<ffffffff8012bdb4>] per_cpu_trap_init+0x16c/0x1d0
[<ffffffff80133258>] start_secondary+0x28/0x128--- arch/mips/mm/tlb-r4k.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/mm/tlb-r4k.c +1 -1
@@ -536,7 +536,7 @@ static void __ref r4k_tlb_uniquify(void) tlb_vpn_size = tlbsize *sizeof (*tlb_vpns); tlb_vpns = (use_slab ? -kmalloc (tlb_vpn_size,GFP_KERNEL ) : +kmalloc (tlb_vpn_size,GFP_ATOMIC ) :memblock_alloc_raw (tlb_vpn_size,sizeof (*tlb_vpns)));if (WARN_ON (!tlb_vpns))return ;/* Pray local_flush_tlb_all() is good enough. */
Greg Kroah-Hartman
maintainerPATCH 84/160 iio: adc: ti-adc161s626: fix buffer read on big-endian
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Lechner <[email protected]>
commit 24869650dff34a6fc8fd1cc91b2058a72f9abc95 upstream.
Rework ti_adc_trigger_handler() to properly handle data on big-endian architectures. The scan data format is 16-bit CPU-endian, so we can't cast it to a int * on big-endian and expect it to work. Instead, we introduce a local int variable to read the data into, and then copy it to the buffer.
Since the buffer isn't passed to any SPI functions, we don't need it to be DMA-safe. So we can drop it from the driver data struct and just use stack memory for the scan data.
Since there is only one data value (plus timestamp), we don't need an array and can just declare a struct with the correct data type instead.
Also fix alignment of iio_get_time_ns() to ( while we are touching this.
--- drivers/iio/adc/ti-adc161s626.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
drivers/iio/adc/ti-adc161s626.c +12 -9
@@ -70,8 +70,6 @@ struct ti_adc_data {u8 read_size;u8 shift; - -u8 buffer[16 ]__aligned(IIO_DMA_MINALIGN) ; }; static int ti_adc_read_measurement(struct ti_adc_data *data,
@@ -114,15 +112,20 @@ static irqreturn_t ti_adc_trigger_handlestruct iio_poll_func *pf = private;struct iio_dev *indio_dev = pf->indio_dev;struct ti_adc_data *data =iio_priv (indio_dev); -int ret; +struct { +s16 data; +aligned_s64 timestamp; + } scan = { }; +int ret, val; + + ret =ti_adc_read_measurement (data, &indio_dev->channels[0 ], &val); +if (ret) + goto exit_notify_done; - ret =ti_adc_read_measurement (data, &indio_dev->channels[0 ], - (int *) &data->buffer); -if (!ret) -iio_push_to_buffers_with_timestamp (indio_dev, - data->buffer, -iio_get_time_ns (indio_dev)); + scan.data = val; +iio_push_to_buffers_with_timestamp (indio_dev, &scan,iio_get_time_ns (indio_dev)); + exit_notify_done:iio_trigger_notify_done (indio_dev->trig);return IRQ_HANDLED ;
Greg Kroah-Hartman
maintainerPATCH 85/160 drm/ast: dp501: Fix initialization of SCU2C
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Zimmermann <[email protected]>
commit 2f42c1a6161646cbd29b443459fd635d29eda634 upstream.
Ast's DP501 initialization reads the register SCU2C at offset 0x1202c and tries to set it to source data from VGA. But writes the update to offset 0x0, with unknown results. Write the result to SCU instead.
The bug only happens in ast_init_analog(). There's similar code in ast_init_dvo(), which works correctly.
--- drivers/gpu/drm/ast/ast_dp501.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/ast/ast_dp501.c +1 -1
@@ -439,7 +439,7 @@ static void ast_init_analog(struct drm_d/* Finally, clear bits [17:16] of SCU2c */ data =ast_read32 (ast,0x1202c ); data &=0xfffcffff ; -ast_write32 (ast,0 , data); +ast_write32 (ast,0x1202c , data);/* Disable DVO */ ast_set_index_reg_mask (ast,AST_IO_CRTC_PORT ,0xa3 ,0xcf ,0x00 );
Greg Kroah-Hartman
maintainerPATCH 86/160 drm/i915/dp: Use crtc_state->enhanced_framing properly on ivb/hsw CPU eDP
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ville Syrjälä <[email protected]>
commit 9c9a57e4e337f94e23ddf69263fd0685c91155fb upstream.
Looks like I missed the drm_dp_enhanced_frame_cap() in the ivb/hsw CPU eDP code when I introduced crtc_state->enhanced_framing. Fix it up so that the state we program to the hardware is guaranteed to match what we computed earlier.
--- drivers/gpu/drm/i915/display/g4x_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/display/g4x_dp.c +1 -1
@@ -132,7 +132,7 @@ static void intel_dp_prepare(struct inte intel_dp->DP |=DP_SYNC_VS_HIGH ; intel_dp->DP |=DP_LINK_TRAIN_OFF_CPT ; -if (drm_dp_enhanced_frame_cap (intel_dp->dpcd)) +if (pipe_config->enhanced_framing) intel_dp->DP |=DP_ENHANCED_FRAMING ; intel_dp->DP |=DP_PIPE_SEL_IVB (crtc->pipe);
Greg Kroah-Hartman
maintainerPATCH 87/160 USB: serial: io_edgeport: add support for Blackbox IC135A
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frej Drejhammar <[email protected]>
commit 0e01c3416eb863ee7f156a9d7e7421ec0a9f68a0 upstream.
The Blackbox 724-746-5500 USB Director USB-RS-232 HUB, part number IC135A, is a rebadged Edgeport/4 with its own USB device id.
--- drivers/usb/serial/io_edgeport.c | 3 +++ drivers/usb/serial/io_usbvend.h | 1 + 2 files changed, 4 insertions(+)
drivers/usb/serial/io_edgeport.c +3 -0
@@ -73,6 +73,7 @@ static const struct usb_device_id edgepo { USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_22I) }, { USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_412_4) }, { USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_COMPATIBLE) }, + { USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_BLACKBOX_IC135A) }, { } };
@@ -121,6 +122,7 @@ static const struct usb_device_id id_tab { USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_8R) }, { USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_8RR) }, { USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_412_8) }, + { USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_BLACKBOX_IC135A) }, { USB_DEVICE(USB_VENDOR_ID_NCR, NCR_DEVICE_ID_EPIC_0202) }, { USB_DEVICE(USB_VENDOR_ID_NCR, NCR_DEVICE_ID_EPIC_0203) }, { USB_DEVICE(USB_VENDOR_ID_NCR, NCR_DEVICE_ID_EPIC_0310) },
@@ -470,6 +472,7 @@ static void get_product_info(struct edgecase ION_DEVICE_ID_EDGEPORT_2_DIN :case ION_DEVICE_ID_EDGEPORT_4_DIN :case ION_DEVICE_ID_EDGEPORT_16_DUAL_CPU : +case ION_DEVICE_ID_BLACKBOX_IC135A : product_info->IsRS232 =1 ;break ;
drivers/usb/serial/io_usbvend.h +1 -0
@@ -211,6 +211,7 @@// // Definitions for other product IDs +#define ION_DEVICE_ID_BLACKBOX_IC135A 0x0801 // OEM device (rebranded Edgeport/4)#define ION_DEVICE_ID_MT4X56USB 0x1403 // OEM device#define ION_DEVICE_ID_E5805A 0x1A01 // OEM device (rebranded Edgeport/4)
Greg Kroah-Hartman
maintainerPATCH 88/160 USB: serial: option: add support for Rolling Wireless RW135R-GL
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wanquan Zhong <[email protected]>
commit 01e8d0f742222f1e68f48180d5480097adf7ae9f upstream.
Add VID/PID 33f8:1003 for the Rolling Wireless RW135R-GL M.2 module, which is used in laptop debug cards with MBIM interface for Linux/Chrome OS. The device supports mbim, pipe functionalities.
Here are the outputs of usb-devices:
T: Bus=04 Lev=01 Prnt=01 Port=02 Cnt=01 Dev#= 2 Spd=5000 MxCh= 0 D: Ver= 3.20 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 9 #Cfgs= 1 P: Vendor=33f8 ProdID=1003 Rev=05.15 S: Manufacturer=Rolling Wireless S.a.r.l. S: Product=Rolling RW135R-GL Module S: SerialNumber=12345678 C: #Ifs= 3 Cfg#= 1 Atr=a0 MxPwr=896mA I: If#= 0 Alt= 0 #EPs= 1 Cls=02(commc) Sub=0e Prot=00 Driver=cdc_mbim E: Ad=81(I) Atr=03(Int.) MxPS= 64 Ivl=32ms I: If#= 1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim E: Ad=0f(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=8e(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms I: If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=40 Driver=option E: Ad=01(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=82(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=83(I) Atr=03(Int.) MxPS= 10 Ivl=32ms
--- drivers/usb/serial/option.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/serial/option.c +1 -0
@@ -2464,6 +2464,7 @@ static const struct usb_device_id option { USB_DEVICE_INTERFACE_CLASS(0x33f8, 0x0302, 0xff) }, /* Rolling RW101R-GL (laptop MBIM) */ { USB_DEVICE_INTERFACE_CLASS(0x33f8, 0x0802, 0xff), /* Rolling RW350-GL (laptop MBIM) */ .driver_info = RSVD(5) }, + { USB_DEVICE_INTERFACE_CLASS(0x33f8, 0x1003, 0xff) }, /* Rolling RW135R-GL (laptop MBIM) */ { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0100, 0xff, 0xff, 0x30) }, /* NetPrisma LCUK54-WWD for Global */ { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0100, 0xff, 0x00, 0x40) }, { USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0100, 0xff, 0xff, 0x40) },
Greg Kroah-Hartman
maintainerPATCH 89/160 USB: core: add NO_LPM quirk for Razer Kiyo Pro webcam
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: JP Hein <[email protected]>
commit 8b7a42ecdcdeb55580d9345412f7f8fc5aca3f6c upstream.
The Razer Kiyo Pro (1532:0e05) is a USB 3.0 UVC webcam whose firmware does not handle USB Link Power Management transitions reliably. When LPM is active, the device can enter a state where it fails to respond to control transfers, producing EPIPE (-32) errors on UVC probe control SET_CUR requests. In the worst case, the stalled endpoint triggers an xHCI stop-endpoint command that times out, causing the host controller to be declared dead and every USB device on the bus to be disconnected.
This has been reported as Ubuntu Launchpad Bug #2061177. The failure mode is:
1. UVC probe control SET_CUR returns -32 (EPIPE)
2. xHCI host not responding to stop endpoint command
3. xHCI host controller not responding, assume dead
4. All USB devices on the affected xHCI controller disconnect
Disabling LPM prevents the firmware from entering the problematic low- power states that precede the stall. This is the same approach used for other webcams with similar firmware issues (e.g., Logitech HD Webcam C270).
--- drivers/usb/core/quirks.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/core/quirks.c +2 -0
@@ -490,6 +490,8 @@ static const struct usb_device_id usb_qu/* Razer - Razer Blade Keyboard */ { USB_DEVICE(0x1532, 0x0116), .driver_info = USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL }, + /* Razer - Razer Kiyo Pro Webcam */ + { USB_DEVICE(0x1532, 0x0e05), .driver_info = USB_QUIRK_NO_LPM }, /* Lenovo ThinkPad OneLink+ Dock twin hub controllers (VIA Labs VL812) */ { USB_DEVICE(0x17ef, 0x1018), .driver_info = USB_QUIRK_RESET_RESUME },
Greg Kroah-Hartman
maintainerPATCH 90/160 iio: adc: ti-adc161s626: use DMA-safe memory for spi_read()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Lechner <[email protected]>
commit 768461517a28d80fe81ea4d5d03a90cd184ea6ad upstream.
Add a DMA-safe buffer and use it for spi_read() instead of a stack memory. All SPI buffers must be DMA-safe.
Since we only need up to 3 bytes, we just use a u8[] instead of __be16 and __be32 and change the conversion functions appropriately.
--- drivers/iio/adc/ti-adc161s626.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
drivers/iio/adc/ti-adc161s626.c +8 -12
@@ -15,6 +15,7 @@#include <linux/init.h> #include <linux/err.h> #include <linux/spi/spi.h> +#include <asm/unaligned.h> #include <linux/iio/iio.h> #include <linux/iio/trigger.h> #include <linux/iio/buffer.h>
@@ -70,6 +71,7 @@ struct ti_adc_data {u8 read_size;u8 shift; +u8 buf[3 ]__aligned(IIO_DMA_MINALIGN) ; }; static int ti_adc_read_measurement(struct ti_adc_data *data,
@@ -78,26 +80,20 @@ static int ti_adc_read_measurement(strucint ret;switch (data->read_size) { -case 2 : { -__be16 buf; - - ret =spi_read (data->spi, (void *) &buf,2 ); +case 2 : + ret =spi_read (data->spi, data->buf,2 );if (ret)return ret; - *val =be16_to_cpu (buf); + *val =get_unaligned_be16 (data->buf);break ; - } -case 3 : { -__be32 buf; - - ret =spi_read (data->spi, (void *) &buf,3 ); +case 3 : + ret =spi_read (data->spi, data->buf,3 );if (ret)return ret; - *val =be32_to_cpu (buf) >>8 ; + *val =get_unaligned_be24 (data->buf);break ; - }default :return -EINVAL ; }
Greg Kroah-Hartman
maintainerPATCH 91/160 Input: synaptics-rmi4 - fix a locking bug in an error path
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bart Van Assche <[email protected]>
commit 7adaaee5edd35a423ae199c41b86bd1ed60ed483 upstream.
Lock f54->data_mutex when entering the function statement since jumping to the 'error' label when checking report_size fails causes that mutex to be unlocked.
This bug has been detected by the Clang thread-safety checker.
--- drivers/input/rmi4/rmi_f54.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/input/rmi4/rmi_f54.c +2 -2
@@ -540,6 +540,8 @@ static void rmi_f54_work(struct work_strint error;int i; +mutex_lock (&f54->data_mutex); + report_size =rmi_f54_get_report_size (f54);if (report_size ==0 ) { dev_err(&fn->dev, "Bad report size, report type=%d\n",
@@ -548,8 +550,6 @@ static void rmi_f54_work(struct work_str goto error;/* retry won't help */ } -mutex_lock (&f54->data_mutex); -/* * Need to check if command has completed. * If not try again later.
Greg Kroah-Hartman
maintainerPATCH 92/160 Input: i8042 - add TUXEDO InfinityBook Max 16 Gen10 AMD to i8042 quirk table
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoffer Sandberg <[email protected]>
commit 5839419cffc7788a356428d321e3ec18055c0286 upstream.
The device occasionally wakes up from suspend with missing input on the internal keyboard and the following suspend attempt results in an instant wake-up. The quirks fix both issues for this device.
--- drivers/input/serio/i8042-acpipnpio.h | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/input/serio/i8042-acpipnpio.h +7 -0
@@ -1189,6 +1189,13 @@ static const struct dmi_system_id i8042_ }, { .matches = { + DMI_MATCH(DMI_BOARD_NAME, "X6KK45xU_X6SP45xU"), + }, + .driver_data = (void *)(SERIO_QUIRK_NOMUX |SERIO_QUIRK_RESET_ALWAYS | +SERIO_QUIRK_NOLOOP |SERIO_QUIRK_NOPNP ) + }, + { + .matches = { DMI_MATCH(DMI_BOARD_NAME, "WUJIE Series-X5SP4NAG"), }, .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS |
Greg Kroah-Hartman
maintainerPATCH 93/160 Input: xpad - add support for BETOP BTP-KP50B/C controllers wireless mode
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shengyu Qu <[email protected]>
commit 0d9363a764d9d601a05591f9695cea8b429e9be3 upstream.
BETOP's BTP-KP50B and BTP-KP50C controller's wireless dongles are both working as standard Xbox 360 controllers. Add USB device IDs for them to xpad driver.
--- drivers/input/joystick/xpad.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/input/joystick/xpad.c +3 -0
@@ -354,6 +354,8 @@ static const struct xpad_device { { 0x1bad, 0xfd00, "Razer Onza TE", 0, XTYPE_XBOX360 }, { 0x1bad, 0xfd01, "Razer Onza", 0, XTYPE_XBOX360 }, { 0x1ee9, 0x1590, "ZOTAC Gaming Zone", 0, XTYPE_XBOX360 }, + { 0x20bc, 0x5134, "BETOP BTP-KP50B Xinput Dongle", 0, XTYPE_XBOX360 }, + { 0x20bc, 0x514a, "BETOP BTP-KP50C Xinput Dongle", 0, XTYPE_XBOX360 }, { 0x20d6, 0x2001, "BDA Xbox Series X Wired Controller", 0, XTYPE_XBOXONE }, { 0x20d6, 0x2009, "PowerA Enhanced Wired Controller for Xbox Series X|S", 0, XTYPE_XBOXONE }, { 0x20d6, 0x2064, "PowerA Wired Controller for Xbox", MAP_SHARE_BUTTON, XTYPE_XBOXONE },
@@ -547,6 +549,7 @@ static const struct usb_device_id xpad_tXPAD_XBOX360_VENDOR (0x1a86 ),/* Nanjing Qinheng Microelectronics (WCH) */ XPAD_XBOX360_VENDOR (0x1bad ),/* Harmonix Rock Band guitar and drums */ XPAD_XBOX360_VENDOR (0x1ee9 ),/* ZOTAC Technology Limited */ +XPAD_XBOX360_VENDOR (0x20bc ),/* BETOP wireless dongles */ XPAD_XBOX360_VENDOR (0x20d6 ),/* PowerA controllers */ XPAD_XBOXONE_VENDOR (0x20d6 ),/* PowerA controllers */ XPAD_XBOX360_VENDOR(0x24c6), /* PowerA controllers */
Greg Kroah-Hartman
maintainerPATCH 94/160 Input: xpad - add support for Razer Wolverine V3 Pro
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zoltan Illes <[email protected]>
commit e2b0ae529db4766584e77647cefe3ec15c3d842e upstream.
Add device IDs for the Razer Wolverine V3 Pro controller in both wired (0x0a57) and wireless 2.4 GHz dongle (0x0a59) modes.
The controller uses the Xbox 360 protocol (vendor-specific class, subclass 93, protocol 1) on interface 0 with an identical 20-byte input report layout, so no additional processing is needed.
--- drivers/input/joystick/xpad.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/input/joystick/xpad.c +2 -0
@@ -307,6 +307,8 @@ static const struct xpad_device { { 0x1532, 0x0a00, "Razer Atrox Arcade Stick", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOXONE }, { 0x1532, 0x0a03, "Razer Wildcat", 0, XTYPE_XBOXONE }, { 0x1532, 0x0a29, "Razer Wolverine V2", 0, XTYPE_XBOXONE }, + { 0x1532, 0x0a57, "Razer Wolverine V3 Pro (Wired)", 0, XTYPE_XBOX360 }, + { 0x1532, 0x0a59, "Razer Wolverine V3 Pro (2.4 GHz Dongle)", 0, XTYPE_XBOX360 }, { 0x15e4, 0x3f00, "Power A Mini Pro Elite", 0, XTYPE_XBOX360 }, { 0x15e4, 0x3f0a, "Xbox Airflo wired controller", 0, XTYPE_XBOX360 }, { 0x15e4, 0x3f10, "Batarang Xbox 360 controller", 0, XTYPE_XBOX360 },
Greg Kroah-Hartman
maintainerPATCH 95/160 iio: accel: fix ADXL355 temperature signature value
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Valek Andrej <[email protected]>
commit 4f51e6c0baae80e52bd013092e82a55678be31fc upstream.
Temperature was wrongly represented as 12-bit signed, confirmed by checking the datasheet. Even if the temperature is negative, the value in the register stays unsigned.
--- drivers/iio/accel/adxl355_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/accel/adxl355_core.c +1 -1
@@ -745,7 +745,7 @@ static const struct iio_chan_spec adxl35BIT (IIO_CHAN_INFO_OFFSET ), .scan_index = 3, .scan_type = { - .sign ='s' , + .sign ='u' , .realbits =12 , .storagebits =16 , .endianness =IIO_BE ,
Greg Kroah-Hartman
maintainerPATCH 96/160 iio: dac: ad5770r: fix error return in ad5770r_read_raw()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Antoniu Miclaus <[email protected]>
commit c354521708175d776d896f8bdae44b18711eccb6 upstream.
Return the error code from regmap_bulk_read() instead of 0 so that I/O failures are properly propagated.
--- drivers/iio/dac/ad5770r.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/dac/ad5770r.c +1 -1
@@ -323,7 +323,7 @@ static int ad5770r_read_raw(struct iio_d chan->address, st->transf_buf, 2);if (ret) -return 0 ; +return ret; buf16 = st->transf_buf[0 ] + (st->transf_buf[1 ] <<8 ); *val = buf16 >>2 ;
Greg Kroah-Hartman
maintainerPATCH 97/160 iio: light: vcnl4035: fix scan buffer on big-endian
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Lechner <[email protected]>
commit fdc7aa54a5d44c05880a4aad7cfb41aacfd16d7b upstream.
Rework vcnl4035_trigger_consumer_handler() so that we are not passing what should be a u16 value as an int * to regmap_read(). This won't work on bit endian systems.
Instead, add a new unsigned int variable to pass to regmap_read(). Then copy that value into the buffer struct.
The buffer array is replaced with a struct since there is only one value being read. This allows us to use the correct u16 data type and has a side-effect of simplifying the alignment specification.
Also fix the endianness of the scan format from little-endian to CPU endianness. Since we are using regmap to read the value, it will be CPU-endian.
--- drivers/iio/light/vcnl4035.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/iio/light/vcnl4035.c +12 -6
@@ -105,17 +105,23 @@ static irqreturn_t vcnl4035_trigger_consstruct iio_dev *indio_dev = pf->indio_dev;struct vcnl4035_data *data =iio_priv (indio_dev);/* Ensure naturally aligned timestamp */ -u8 buffer[ALIGN (sizeof (u16),sizeof (s64)) +sizeof (s64)]__aligned(8) = { }; +struct { +u16 als_data; +aligned_s64 timestamp; + } buffer = { }; +unsigned int val;int ret; - ret =regmap_read (data->regmap,VCNL4035_ALS_DATA , (int *)buffer); + ret =regmap_read (data->regmap,VCNL4035_ALS_DATA , &val);if (ret <0 ) {dev_err (&data->client->dev,"Trigger consumer can't read from sensor.\n" ); goto fail_read; } -iio_push_to_buffers_with_timestamp (indio_dev, buffer, -iio_get_time_ns (indio_dev)); + + buffer.als_data = val; +iio_push_to_buffers_with_timestamp (indio_dev, &buffer, +iio_get_time_ns (indio_dev)); fail_read:iio_trigger_notify_done (indio_dev->trig);
@@ -378,7 +384,7 @@ static const struct iio_chan_spec vcnl40 .sign = 'u', .realbits = 16, .storagebits = 16, - .endianness = IIO_LE, + .endianness = IIO_CPU, }, }, {
@@ -392,7 +398,7 @@ static const struct iio_chan_spec vcnl40 .sign = 'u', .realbits = 16, .storagebits = 16, - .endianness = IIO_LE, + .endianness = IIO_CPU, }, }, };
Greg Kroah-Hartman
maintainerPATCH 98/160 iio: imu: bmi160: Remove potential undefined behavior in bmi160_config_pin()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Poimboeuf <[email protected]>
commit c05a87d9ec3bf8727a5d746ce855003c6f2f8bb4 upstream.
If 'pin' is not one of its expected values, the value of 'int_out_ctrl_shift' is undefined. With UBSAN enabled, this causes Clang to generate undefined behavior, resulting in the following warning:
drivers/iio/imu/bmi160/bmi160_core.o: warning: objtool: bmi160_setup_irq() falls through to next function __cfi_bmi160_core_runtime_resume()
Prevent the UB and improve error handling by returning an error if 'pin' has an unexpected value.
While at it, simplify the code a bit by moving the 'pin_name' assignment to the first switch statement.
--- drivers/iio/imu/bmi160/bmi160_core.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
drivers/iio/imu/bmi160/bmi160_core.c +5 -10
@@ -568,12 +568,16 @@ static int bmi160_config_pin(struct regm int_out_ctrl_shift =BMI160_INT1_OUT_CTRL_SHIFT ; int_latch_mask =BMI160_INT1_LATCH_MASK ; int_map_mask =BMI160_INT1_MAP_DRDY_EN ; + pin_name ="INT1" ;break ;case BMI160_PIN_INT2 : int_out_ctrl_shift =BMI160_INT2_OUT_CTRL_SHIFT ; int_latch_mask =BMI160_INT2_LATCH_MASK ; int_map_mask =BMI160_INT2_MAP_DRDY_EN ; + pin_name ="INT2" ;break ; +default : +return -EINVAL ; } int_out_ctrl_mask =BMI160_INT_OUT_CTRL_MASK << int_out_ctrl_shift;
@@ -607,17 +611,8 @@ static int bmi160_config_pin(struct regm ret =bmi160_write_conf_reg (regmap,BMI160_REG_INT_MAP , int_map_mask, int_map_mask, write_usleep); -if (ret) { -switch (pin) { -case BMI160_PIN_INT1 : - pin_name ="INT1" ; -break ; -case BMI160_PIN_INT2 : - pin_name ="INT2" ; -break ; - } +if (ret)dev_err (dev,"Failed to configure %s IRQ pin" , pin_name); - }return ret; }
Greg Kroah-Hartman
maintainerPATCH 99/160 iio: imu: st_lsm6dsx: Set FIFO ODR for accelerometer and gyroscope only
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Francesco Lavra <[email protected]>
commit 630748afa7030b272b7bee5df857e7bcf132ed51 upstream.
The st_lsm6dsx_set_fifo_odr() function, which is called when enabling and disabling the hardware FIFO, checks the contents of the hw->settings->batch array at index sensor->id, and then sets the current ODR value in sensor registers that depend on whether the register address is set in the above array element. This logic is valid for internal sensors only, i.e. the accelerometer and gyroscope; however, since commit c91c1c844ebd ("iio: imu:st_lsm6dsx: add i2c embedded controller support"), this function is called also when configuring the hardware FIFO for external sensors (i.e. sensors accessed through the sensor hub functionality), which can result in unrelated device registers being written.
Add a check to the beginning of st_lsm6dsx_set_fifo_odr() so that it does not touch any registers unless it is called for internal sensors.
--- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c +4 -0
@@ -202,6 +202,10 @@ static int st_lsm6dsx_set_fifo_odr(strucconst struct st_lsm6dsx_reg *batch_reg;u8 data; +/* Only internal sensors have a FIFO ODR configuration register. */ +if (sensor->id >=ARRAY_SIZE (hw->settings->batch)) +return 0 ; + batch_reg = &hw->settings->batch[sensor->id];if (batch_reg->addr) {int val;
Greg Kroah-Hartman
maintainerPATCH 100/160 iio: gyro: mpu3050: Fix incorrect free_irq() variable
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ethan Tidmore <[email protected]>
commit edb11a1aef4011a4b7b22cc3c3396c6fe371f4a6 upstream.
The handler for the IRQ part of this driver is mpu3050->trig but, in the teardown free_irq() is called with handler mpu3050.
Use correct IRQ handler when calling free_irq().
--- drivers/iio/gyro/mpu3050-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/gyro/mpu3050-core.c +1 -1
@@ -1279,7 +1279,7 @@ void mpu3050_common_remove(struct devicepm_runtime_disable (dev);iio_triggered_buffer_cleanup (indio_dev);if (mpu3050->irq) -free_irq (mpu3050->irq, mpu3050); +free_irq (mpu3050->irq, mpu3050->trig);iio_device_unregister (indio_dev);mpu3050_power_down (mpu3050); }
Greg Kroah-Hartman
maintainerPATCH 101/160 iio: gyro: mpu3050: Fix irq resource leak
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ethan Tidmore <[email protected]>
commit 4216db1043a3be72ef9c2b7b9f393d7fa72496e6 upstream.
The interrupt handler is setup but only a few lines down if iio_trigger_register() fails the function returns without properly releasing the handler.
Add cleanup goto to resolve resource leak.
Detected by Smatch:drivers/iio/gyro/mpu3050-core.c:1128 mpu3050_trigger_probe() warn:
'irq' from request_threaded_irq() not released on lines: 1124.
--- drivers/iio/gyro/mpu3050-core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/iio/gyro/mpu3050-core.c +6 -1
@@ -1139,11 +1139,16 @@ static int mpu3050_trigger_probe(struct ret =iio_trigger_register (mpu3050->trig);if (ret) -return ret; + goto err_iio_trigger; indio_dev->trig =iio_trigger_get (mpu3050->trig);return 0 ; + +err_iio_trigger: +free_irq (mpu3050->irq, mpu3050->trig); + +return ret; } int mpu3050_common_probe(struct device *dev,
Greg Kroah-Hartman
maintainerPATCH 102/160 iio: gyro: mpu3050: Move iio_device_register() to correct location
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ethan Tidmore <[email protected]>
commit 4c05799449108fb0e0a6bd30e65fffc71e60db4d upstream.
iio_device_register() should be at the end of the probe function to prevent race conditions.
Place iio_device_register() at the end of the probe function and place iio_device_unregister() accordingly.
--- drivers/iio/gyro/mpu3050-core.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
drivers/iio/gyro/mpu3050-core.c +13 -8
@@ -1236,12 +1236,6 @@ int mpu3050_common_probe(struct device * goto err_power_down; } - ret =iio_device_register (indio_dev); -if (ret) { -dev_err (dev,"device register failed\n" ); - goto err_cleanup_buffer; - } -dev_set_drvdata (dev, indio_dev);/* Check if we have an assigned IRQ to use as trigger */
@@ -1264,9 +1258,20 @@ int mpu3050_common_probe(struct device *pm_runtime_use_autosuspend (dev);pm_runtime_put (dev); + ret =iio_device_register (indio_dev); +if (ret) { +dev_err (dev,"device register failed\n" ); + goto err_iio_device_register; + } +return 0 ; -err_cleanup_buffer: +err_iio_device_register: +pm_runtime_get_sync (dev); +pm_runtime_put_noidle (dev); +pm_runtime_disable (dev); +if (irq) +free_irq (mpu3050->irq, mpu3050->trig);iio_triggered_buffer_cleanup (indio_dev); err_power_down:mpu3050_power_down (mpu3050);
@@ -1279,13 +1284,13 @@ void mpu3050_common_remove(struct devicestruct iio_dev *indio_dev =dev_get_drvdata (dev);struct mpu3050 *mpu3050 =iio_priv (indio_dev); +iio_device_unregister (indio_dev);pm_runtime_get_sync (dev);pm_runtime_put_noidle (dev);pm_runtime_disable (dev);iio_triggered_buffer_cleanup (indio_dev);if (mpu3050->irq)free_irq (mpu3050->irq, mpu3050->trig); -iio_device_unregister (indio_dev);mpu3050_power_down (mpu3050); }
Greg Kroah-Hartman
maintainerPATCH 103/160 iio: gyro: mpu3050: Fix out-of-sequence free_irq()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ethan Tidmore <[email protected]>
commit d14116f6529fa085b1a1b1f224dc9604e4d2a29c upstream.
The triggered buffer is initialized before the IRQ is requested. The removal path currently calls iio_triggered_buffer_cleanup() before free_irq(). This violates the expected LIFO.
Place free_irq() in the correct location relative to iio_triggered_buffer_cleanup().
--- drivers/iio/gyro/mpu3050-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/gyro/mpu3050-core.c +1 -1
@@ -1288,9 +1288,9 @@ void mpu3050_common_remove(struct devicepm_runtime_get_sync (dev);pm_runtime_put_noidle (dev);pm_runtime_disable (dev); -iio_triggered_buffer_cleanup (indio_dev);if (mpu3050->irq)free_irq (mpu3050->irq, mpu3050->trig); +iio_triggered_buffer_cleanup (indio_dev);mpu3050_power_down (mpu3050); }
Greg Kroah-Hartman
maintainerPATCH 104/160 usb: quirks: add DELAY_INIT quirk for another Silicon Motion flash drive
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miao Li <[email protected]>
commit dd36014ec6042f424ef51b923e607772f7502ee7 upstream.
Another Silicon Motion flash drive also randomly work incorrectly (lsusb does not list the device) on Huawei hisi platforms during 500 reboot cycles, and the DELAY_INIT quirk fixes this issue.
--- drivers/usb/core/quirks.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/core/quirks.c +1 -0
@@ -402,6 +402,7 @@ static const struct usb_device_id usb_qu/* Silicon Motion Flash Drive */ { USB_DEVICE(0x090c, 0x1000), .driver_info = USB_QUIRK_DELAY_INIT }, + { USB_DEVICE(0x090c, 0x2000), .driver_info = USB_QUIRK_DELAY_INIT }, /* Sound Devices USBPre2 */ { USB_DEVICE(0x0926, 0x0202), .driver_info =
Greg Kroah-Hartman
maintainerPATCH 105/160 usb: ulpi: fix double free in ulpi_register_interface() error path
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guangshuo Li <[email protected]>
commit 01af542392b5d41fd659d487015a71f627accce3 upstream.
When device_register() fails, ulpi_register() calls put_device() on ulpi->dev.
The device release callback ulpi_dev_release() drops the OF node reference and frees ulpi, but the current error path in ulpi_register_interface() then calls kfree(ulpi) again, causing a double free.
Let put_device() handle the cleanup through ulpi_dev_release() and avoid freeing ulpi again in ulpi_register_interface().
--- drivers/usb/common/ulpi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/usb/common/ulpi.c +2 -3
@@ -331,10 +331,9 @@ struct ulpi *ulpi_register_interface(str ulpi->ops = ops; ret =ulpi_register (dev, ulpi); -if (ret) { -kfree (ulpi); +if (ret)return ERR_PTR (ret); - } +return ulpi; }
Greg Kroah-Hartman
maintainerPATCH 106/160 usb: usbtmc: Flush anchored URBs in usbtmc_release
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heitor Alves de Siqueira <[email protected]>
commit 8a768552f7a8276fb9e01d49773d2094ace7c8f1 upstream.
When calling usbtmc_release, pending anchored URBs must be flushed or killed to prevent use-after-free errors (e.g. in the HCD giveback path). Call usbtmc_draw_down() to allow anchored URBs to be completed.
--- drivers/usb/class/usbtmc.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/class/usbtmc.c +3 -0
@@ -254,6 +254,9 @@ static int usbtmc_release(struct inode *list_del (&file_data->file_elem);spin_unlock_irq (&file_data->data->dev_lock); + +/* flush anchored URBs */ +usbtmc_draw_down (file_data);mutex_unlock (&file_data->data->io_mutex);kref_put (&file_data->data->kref, usbtmc_delete);
Greg Kroah-Hartman
maintainerPATCH 107/160 usb: ehci-brcm: fix sleep during atomic
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Justin Chen <[email protected]>
commit 679b771ea05ad0f8eeae83e14a91b8f4f39510c4 upstream.
echi_brcm_wait_for_sof() gets called after disabling interrupts in ehci_brcm_hub_control(). Use the atomic version of poll_timeout to fix the warning.
--- drivers/usb/host/ehci-brcm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/host/ehci-brcm.c +2 -2
@@ -31,8 +31,8 @@ static inline void ehci_brcm_wait_for_soint res;/* Wait for next microframe (every 125 usecs) */ - res =readl_relaxed_poll_timeout (&ehci->regs->frame_index, val, - val != frame_idx,1 ,130 ); + res =readl_relaxed_poll_timeout_atomic (&ehci->regs->frame_index, + val, val != frame_idx,1 ,130 );if (res)ehci_err (ehci,"Error waiting for SOF\n" );udelay (delay);
Greg Kroah-Hartman
maintainerPATCH 108/160 usb: dwc2: gadget: Fix spin_lock/unlock mismatch in dwc2_hsotg_udc_stop()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Juno Choi <[email protected]>
commit 9bb4b5ed7f8c4f95cc556bdf042b0ba2fa13557a upstream.
dwc2_gadget_exit_clock_gating() internally calls call_gadget() macro, which expects hsotg->lock to be held since it does spin_unlock/spin_lock around the gadget driver callback invocation.
However, dwc2_hsotg_udc_stop() calls dwc2_gadget_exit_clock_gating() without holding the lock. This leads to:
- spin_unlock on a lock that is not held (undefined behavior)
- The lock remaining held after dwc2_gadget_exit_clock_gating() returns, causing a deadlock when spin_lock_irqsave() is called later in the same function.
Fix this by acquiring hsotg->lock before calling dwc2_gadget_exit_clock_gating() and releasing it afterwards, which satisfies the locking requirement of the call_gadget() macro.
--- drivers/usb/dwc2/gadget.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/dwc2/gadget.c +2 -0
@@ -4604,7 +4604,9 @@ static int dwc2_hsotg_udc_stop(struct us/* Exit clock gating when driver is stopped. */ if (hsotg->params.power_down ==DWC2_POWER_DOWN_PARAM_NONE && hsotg->bus_suspended && !hsotg->params.no_clock_gating) { +spin_lock_irqsave (&hsotg->lock, flags);dwc2_gadget_exit_clock_gating (hsotg,0 ); +spin_unlock_irqrestore (&hsotg->lock, flags); }/* all endpoints should be shutdown */
Greg Kroah-Hartman
maintainerPATCH 109/160 usb: cdns3: gadget: fix NULL pointer dereference in ep_queue
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yongchao Wu <[email protected]>
commit 7f6f127b9bc34bed35f56faf7ecb1561d6b39000 upstream.
When the gadget endpoint is disabled or not yet configured, the ep->desc pointer can be NULL. This leads to a NULL pointer dereference when __cdns3_gadget_ep_queue() is called, causing a kernel crash.
Add a check to return -ESHUTDOWN if ep->desc is NULL, which is the standard return code for unconfigured endpoints.
This prevents potential crashes when ep_queue is called on endpoints that are not ready.
--- drivers/usb/cdns3/cdns3-gadget.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/cdns3/cdns3-gadget.c +3 -0
@@ -2588,6 +2588,9 @@ static int __cdns3_gadget_ep_queue(strucstruct cdns3_request *priv_req;int ret =0 ; +if (!ep->desc) +return -ESHUTDOWN ; + request->actual =0 ; request->status = -EINPROGRESS ; priv_req =to_cdns3_request (request);
Greg Kroah-Hartman
maintainerPATCH 110/160 usb: cdns3: gadget: fix state inconsistency on gadget init failure
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yongchao Wu <[email protected]>
commit c32f8748d70c8fc77676ad92ed76cede17bf2c48 upstream.
When cdns3_gadget_start() fails, the DRD hardware is left in gadget mode while software state remains INACTIVE, creating hardware/software state inconsistency.
When switching to host mode via sysfs:
echo host > /sys/class/usb_role/13180000.usb-role-switch/role
The role state is not set to CDNS_ROLE_STATE_ACTIVE due to the error, so cdns_role_stop() skips cleanup because state is still INACTIVE. This violates the DRD controller design specification (Figure22), which requires returning to idle state before switching roles.
This leads to a synchronous external abort in xhci_gen_setup() when setting up the host controller:
[ 516.440698] configfs-gadget 13180000.usb: failed to start g1: -19
[ 516.442035] cdns-usb3 13180000.usb: Failed to add gadget
[ 516.443278] cdns-usb3 13180000.usb: set role 2 has failed
...
[ 1301.375722] xhci-hcd xhci-hcd.1.auto: xHCI Host Controller
[ 1301.377716] Internal error: synchronous external abort: 96000010 [#1] PREEMPT SMP
[ 1301.382485] pc : xhci_gen_setup+0xa4/0x408
[ 1301.393391] backtrace:
...
xhci_gen_setup+0xa4/0x408 <-- CRASH
xhci_plat_setup+0x44/0x58
usb_add_hcd+0x284/0x678
...
cdns_role_set+0x9c/0xbc <-- Role switchFix by calling cdns_drd_gadget_off() in the error path to properly clean up the DRD gadget state.
--- drivers/usb/cdns3/cdns3-gadget.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/cdns3/cdns3-gadget.c +1 -0
@@ -3431,6 +3431,7 @@ static int __cdns3_gadget_init(struct cd ret =cdns3_gadget_start (cdns);if (ret) {pm_runtime_put_sync (cdns->dev); +cdns_drd_gadget_off (cdns);return ret; }
Greg Kroah-Hartman
maintainerPATCH 111/160 vfio: Create vfio_fs_type with inode per device
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Williamson <[email protected]>
commit b7c5e64fecfa88764791679cca4786ac65de739e upstream.
By linking all the device fds we provide to userspace to an address space through a new pseudo fs, we can use tools like unmap_mapping_range() to zap all vmas associated with a device.
--- drivers/vfio/device_cdev.c | 7 ++++++ drivers/vfio/group.c | 7 ++++++ drivers/vfio/vfio_main.c | 44 ++++++++++++++++++++++++++++++++++++++ include/linux/vfio.h | 1 + 4 files changed, 59 insertions(+)
drivers/vfio/device_cdev.c +7 -0
@@ -39,6 +39,13 @@ int vfio_device_fops_cdev_open(struct inode *inode, struct file *filep) filep->private_data = df; +/* +* Use the pseudo fs inode on the device to link all mmaps +* to the same address space, allowing us to unmap all vmas +* associated to this device using unmap_mapping_range(). +*/ + filep->f_mapping = device->inode->i_mapping; +return 0 ; err_put_registration:
drivers/vfio/group.c +7 -0
@@ -285,6 +285,13 @@ static struct file *vfio_device_open_file(struct vfio_device *device)*/ filep->f_mode |= (FMODE_PREAD |FMODE_PWRITE ); +/* +* Use the pseudo fs inode on the device to link all mmaps +* to the same address space, allowing us to unmap all vmas +* associated to this device using unmap_mapping_range(). +*/ + filep->f_mapping = device->inode->i_mapping; +if (device->group->type ==VFIO_NO_IOMMU )dev_warn (device->dev,"vfio-noiommu device opened by user " "(%s:%d)\n" , current->comm,task_pid_nr (current));
drivers/vfio/vfio_main.c +44 -0
85 lines not on this page · raw message
include/linux/vfio.h +1 -0
@@ -64,6 +64,7 @@ struct vfio_device {struct completion comp;struct iommufd_access *iommufd_access;void (*put_kvm)(struct kvm *kvm); +struct inode *inode;#if IS_ENABLED (CONFIG_IOMMUFD )struct iommufd_device *iommufd_device; u8 iommufd_attached:1;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerRe: [PATCH 6.6 111/160] vfio: Create vfio_fs_type with inode per device
Quoted 23 lines · Greg Kroah-Hartman
6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Williamson <[email protected]>
commit
b7c5e64fecfa88764791679cca4786ac65de739eupstream.By linking all the device fds we provide to userspace to an address space through a new pseudo fs, we can use tools like
unmap_mapping_range()to zap all vmas associated with a device.Suggested-by Jason Gunthorpe <[email protected]>Reviewed-by Jason Gunthorpe <[email protected]>Reviewed-by Kevin Tian <[email protected]>Signed-off-by Alex Williamson <[email protected]>Signed-off-by Axel Rasmussen <[email protected]>Signed-off-by Tugrul Kukul <[email protected]>Tested-by Florian Fainelli <[email protected]>Tested-by Pavel Machek (CIP) <[email protected]>Tested-by Ron Economos <[email protected]>Tested-by Justin M. Forbes <[email protected]>
Quoted 8 lines
Tested-by Mark Brown <[email protected]>Tested-by Conor Dooley <[email protected]>Tested-by Jon Hunter <[email protected]>Tested-by Shuah Khan <[email protected]>Tested-by Peter Schneider <[email protected]>Reviewed-by Alex Williamson <[email protected]>Acked-by Alex Williamson <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Sasha, something went odd with your scripts to pull all of these names in as "tested-by", right? The original commit did not say that :(
thanks,
greg k-h
Sasha Levin
maintainerRe: [PATCH 6.6 111/160] vfio: Create vfio_fs_type with inode per device
Quoted 33 lines · Greg Kroah-Hartman
Quoted 23 lines · Greg Kroah-Hartman
6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Williamson <[email protected]>
commit
b7c5e64fecfa88764791679cca4786ac65de739eupstream.By linking all the device fds we provide to userspace to an address space through a new pseudo fs, we can use tools like
unmap_mapping_range()to zap all vmas associated with a device.Suggested-by Jason Gunthorpe <[email protected]>Reviewed-by Jason Gunthorpe <[email protected]>Reviewed-by Kevin Tian <[email protected]>Signed-off-by Alex Williamson <[email protected]>Signed-off-by Axel Rasmussen <[email protected]>Signed-off-by Tugrul Kukul <[email protected]>Tested-by Florian Fainelli <[email protected]>Tested-by Pavel Machek (CIP) <[email protected]>Tested-by Ron Economos <[email protected]>Tested-by Justin M. Forbes <[email protected]>Quoted 8 lines
Tested-by Mark Brown <[email protected]>Tested-by Conor Dooley <[email protected]>Tested-by Jon Hunter <[email protected]>Tested-by Shuah Khan <[email protected]>Tested-by Peter Schneider <[email protected]>Reviewed-by Alex Williamson <[email protected]>Acked-by Alex Williamson <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Quoted 2 lines
Sasha, something went odd with your scripts to pull all of these names in as "tested-by", right? The original commit did not say that :(
Argh... I switched to using b4 to pick up backports that folks send on the mailing list. Looks like it picks up trailers from unrelated messages...
$ b4 am [email protected] Looking up https://lore.kernel.org/all/[email protected]/ Grabbing thread from lore.kernel.org/all/[email protected]/t.mbox.gz Breaking thread to remove parents of [email protected] Analyzing 7 messages in the thread Looking for additional code-review trailers on lore.kernel.org Analyzing 423 code-review messages Checking attestation on all messages, may take a moment... --- ✓ [PATCH 1/4] vfio: Create vfio_fs_type with inode per device + Tested-by: Jon Hunter <[email protected]> (✓ DKIM/nvidia.com) + Tested-by: Pavel Machek (CIP) <[email protected]> + Tested-by: Shuah Khan <[email protected]> (✗ DKIM/linuxfoundation.org) + Tested-by: Peter Schneider <[email protected]> (✗ DKIM/googlemail.com) + Tested-by: Ron Economos <[email protected]> (✗ DKIM/w6rz.net) + Tested-by: Conor Dooley <[email protected]> (✓ DKIM/kernel.org) + Tested-by: Florian Fainelli <[email protected]> (✗ DKIM/gmail.com) + Tested-by: Justin M. Forbes <[email protected]> (✗ DKIM/linuxtx.org) + Tested-by: Mark Brown <[email protected]> (✓ DKIM/kernel.org) + Reviewed-by: Alex Williamson <[email protected]> (✓ DKIM/redhat.com) + Acked-by: Alex Williamson <[email protected]> (✓ DKIM/shazbot.org) ✓ [PATCH 2/4] vfio/pci: Use unmap_mapping_range() + Acked-by: Alex Williamson <[email protected]> (✓ DKIM/shazbot.org) ✓ [PATCH 3/4] vfio/pci: Insert full vma on mmap'd MMIO fault + Tested-by: Jon Hunter <[email protected]> (✓ DKIM/nvidia.com) + Tested-by: Pavel Machek (CIP) <[email protected]> + Tested-by: Shuah Khan <[email protected]> (✗ DKIM/linuxfoundation.org) + Tested-by: Peter Schneider <[email protected]> (✗ DKIM/googlemail.com) + Tested-by: Ron Economos <[email protected]> (✗ DKIM/w6rz.net) + Tested-by: Conor Dooley <[email protected]> (✓ DKIM/kernel.org) + Tested-by: Florian Fainelli <[email protected]> (✗ DKIM/gmail.com) + Tested-by: Justin M. Forbes <[email protected]> (✗ DKIM/linuxtx.org) + Tested-by: Mark Brown <[email protected]> (✓ DKIM/kernel.org) + Reviewed-by: Alex Williamson <[email protected]> (✓ DKIM/redhat.com) + Acked-by: Alex Williamson <[email protected]> (✓ DKIM/shazbot.org) ✓ [PATCH 4/4] fork: defer linking file vma until vma is fully initialized + Acked-by: Alex Williamson <[email protected]> (✓ DKIM/shazbot.org) --- ✓ Signed: DKIM/est.tech --- Total patches: 4
Let me investigate if this is a bug or whether I should be passing something to b4 to make it not do that.
Signature · 2 lines
Thanks, Sasha
Re: [PATCH 6.6 111/160] vfio: Create vfio_fs_type with inode per device
Quoted 2 lines · Sasha Levin
Argh... I switched to using b4 to pick up backports that folks send on the mailing list. Looks like it picks up trailers from unrelated messages...
It will pick up all trailers sent to that patch, matching it by patch-id. You can see where every trailer came from if you run "b4 -d". E.g.:
✓ [PATCH 4/4] fork: defer linking file vma until vma is fully initialized
+ Tested-by: Mark Brown <[email protected]> (✓ DKIM/kernel.org)
origin: [email protected]
+ Tested-by: Ron Economos <[email protected]> (✗ DKIM/w6rz.net)
origin: [email protected]
+ Tested-by: Florian Fainelli <[email protected]> (✗ DKIM/gmail.com)
origin: [email protected]
+ Tested-by: Peter Schneider <[email protected]> (✓ DKIM/googlemail.com)
origin: [email protected]
+ Tested-by: Miguel Ojeda <[email protected]> (✓ DKIM/kernel.org)
origin: [email protected]
+ Tested-by: Francesco Dolcini <[email protected]> (✓ DKIM/dolcini.it)
origin: 20260409073909.GA32276@francesco-nb
+ Tested-by: Jon Hunter <[email protected]> (✓ DKIM/nvidia.com)
origin: [email protected]
+ Tested-by: Shung-Hsi Yu <[email protected]> (✓ DKIM/suse.com)
origin: dozxr24wmpnj4k72ojbvtnhdgi4ekkgkfjdf6xaj7eoupboyg4@vnefmfsdk35m
+ Tested-by: Shuah Khan <[email protected]> (✓ DKIM/linuxfoundation.org)
origin: [email protected]
+ Acked-by: Alex Williamson <[email protected]> (✗ DKIM/shazbot.org)
origin: [email protected]
Looks like a lot of these came in response to stable review requests, sent to the cover letter.
This is generally the desired behaviour for b4 -- if someone sent a trailer to a patch, we want to reflect it even if it was received for a previous revision or when the patch was posted as part of a different series.
I'm happy to make more nuanced exceptions for special-case situations like stable reviews.
Signature · 1 line
KR
Greg Kroah-Hartman
maintainerPATCH 112/160 vfio/pci: Use unmap_mapping_range()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Williamson <[email protected]>
commit aac6db75a9fc2c7a6f73e152df8f15101dda38e6 upstream.
With the vfio device fd tied to the address space of the pseudo fs inode, we can use the mm to track all vmas that might be mmap'ing device BARs, which removes our vma_list and all the complicated lock ordering necessary to manually zap each related vma.
Note that we can no longer store the pfn in vm_pgoff if we want to use unmap_mapping_range() to zap a selective portion of the device fd corresponding to BAR mappings.
This also converts our mmap fault handler to use vmf_insert_pfn() because we no longer have a vma_list to avoid the concurrency problem with io_remap_pfn_range(). The goal is to eventually use the vm_ops huge_fault handler to avoid the additional faulting overhead, but vmf_insert_pfn_{pmd,pud}() need to learn about pfnmaps first.
Also, Jason notes that a race exists between unmap_mapping_range() and the fops mmap callback if we were to call io_remap_pfn_range() to populate the vma on mmap. Specifically, mmap_region() does call_mmap() before it does vma_link_file() which gives a window where the vma is populated but invisible to unmap_mapping_range().
--- drivers/vfio/pci/vfio_pci_core.c | 264 +++++++------------------------ include/linux/vfio_pci_core.h | 2 - 2 files changed, 55 insertions(+), 211 deletions(-)
drivers/vfio/pci/vfio_pci_core.c +55 -209
@@ -1599,100 +1599,20 @@ ssize_t vfio_pci_core_write(struct vfio_device *core_vdev, const char __user *bu }EXPORT_SYMBOL_GPL (vfio_pci_core_write); -/* Return 1 on zap and vma_lock acquired, 0 on contention (only with @try) */ -static int vfio_pci_zap_and_vma_lock (struct vfio_pci_core_device *vdev,bool try) +static void vfio_pci_zap_bars (struct vfio_pci_core_device *vdev) { -struct vfio_pci_mmap_vma *mmap_vma, *tmp; +struct vfio_device *core_vdev = &vdev->vdev; +loff_t start =VFIO_PCI_INDEX_TO_OFFSET (VFIO_PCI_BAR0_REGION_INDEX ); +loff_t end =VFIO_PCI_INDEX_TO_OFFSET (VFIO_PCI_ROM_REGION_INDEX ); +loff_t len = end - start; -/* -* Lock ordering: -* vma_lock is nested under mmap_lock for vm_ops callback paths. -* The memory_lock semaphore is used by both code paths calling -* into this function to zap vmas and the vm_ops.fault callback -* to protect the memory enable state of the device. -* -* When zapping vmas we need to maintain the mmap_lock => vma_lock -* ordering, which requires using vma_lock to walk vma_list to -* acquire an mm, then dropping vma_lock to get the mmap_lock and -* reacquiring vma_lock. This logic is derived from similar -* requirements in uverbs_user_mmap_disassociate(). -* -* mmap_lock must always be the top-level lock when it is taken. -* Therefore we can only hold the memory_lock write lock when -* vma_list is empty, as we'd need to take mmap_lock to clear -* entries. vma_list can only be guaranteed empty when holding -* vma_lock, thus memory_lock is nested under vma_lock. -* -* This enables the vm_ops.fault callback to acquire vma_lock, -* followed by memory_lock read lock, while already holding -* mmap_lock without risk of deadlock. -*/ -while (1 ) { -struct mm_struct *mm =NULL ; - -if (try) { -if (!mutex_trylock (&vdev->vma_lock)) -return 0 ; - }else { -mutex_lock (&vdev->vma_lock); - } -while (!list_empty (&vdev->vma_list)) { - mmap_vma =list_first_entry (&vdev->vma_list, - struct vfio_pci_mmap_vma, - vma_next); - mm = mmap_vma->vma->vm_mm; -if (mmget_not_zero (mm)) -break ; - -list_del (&mmap_vma->vma_next); -kfree (mmap_vma); - mm =NULL ; - } -if (!mm) -return 1 ; -mutex_unlock (&vdev->vma_lock); - -if (try) { -if (!mmap_read_trylock (mm)) { -mmput (mm); -return 0 ; - } - }else { -mmap_read_lock (mm); - } -if (try) { -if (!mutex_trylock (&vdev->vma_lock)) { -mmap_read_unlock (mm); -mmput (mm); -return 0 ; - } - }else { -mutex_lock (&vdev->vma_lock); - } -list_for_each_entry_safe (mmap_vma, tmp, - &vdev->vma_list, vma_next) { -struct vm_area_struct *vma = mmap_vma->vma; - -if (vma->vm_mm != mm) -continue ; - -list_del (&mmap_vma->vma_next); -kfree (mmap_vma); - -zap_vma_ptes (vma, vma->vm_start, - vma->vm_end - vma->vm_start); - } -mutex_unlock (&vdev->vma_lock); -mmap_read_unlock (mm); -mmput (mm); - } +unmap_mapping_range (core_vdev->inode->i_mapping, start, len, true); }void vfio_pci_zap_and_down_write_memory_lock (struct vfio_pci_core_device *vdev) { -vfio_pci_zap_and_vma_lock (vdev, false);down_write (&vdev->memory_lock); -mutex_unlock (&vdev->vma_lock); +vfio_pci_zap_bars (vdev); }u16 vfio_pci_memory_lock_and_enable (struct vfio_pci_core_device *vdev)
@@ -1714,99 +1634,41 @@ void vfio_pci_memory_unlock_and_restore(struct vfio_pci_core_device *vdev, u16 cup_write (&vdev->memory_lock); } -/* Caller holds vma_lock */ -static int __vfio_pci_add_vma (struct vfio_pci_core_device *vdev, -struct vm_area_struct *vma) -{ -struct vfio_pci_mmap_vma *mmap_vma; - - mmap_vma =kmalloc (sizeof (*mmap_vma),GFP_KERNEL_ACCOUNT ); -if (!mmap_vma) -return -ENOMEM ; - - mmap_vma->vma = vma; -list_add (&mmap_vma->vma_next, &vdev->vma_list); - -return 0 ; -} - -/* -* Zap mmaps on open so that we can fault them in on access and therefore -* our vma_list only tracks mappings accessed since last zap. -*/ -static void vfio_pci_mmap_open (struct vm_area_struct *vma) -{ -zap_vma_ptes (vma, vma->vm_start, vma->vm_end - vma->vm_start); -} - -static void vfio_pci_mmap_close (struct vm_area_struct *vma) +static unsigned long vma_to_pfn (struct vm_area_struct *vma) {struct vfio_pci_core_device *vdev = vma->vm_private_data; -struct vfio_pci_mmap_vma *mmap_vma; +int index = vma->vm_pgoff >> (VFIO_PCI_OFFSET_SHIFT -PAGE_SHIFT ); +u64 pgoff; -mutex_lock (&vdev->vma_lock); -list_for_each_entry (mmap_vma, &vdev->vma_list, vma_next) { -if (mmap_vma->vma == vma) { -list_del (&mmap_vma->vma_next); -kfree (mmap_vma); -break ; - } - } -mutex_unlock (&vdev->vma_lock); + pgoff = vma->vm_pgoff & + ((1U << (VFIO_PCI_OFFSET_SHIFT -PAGE_SHIFT )) -1 ); + +return (pci_resource_start (vdev->pdev, index) >>PAGE_SHIFT ) + pgoff; }static vm_fault_t vfio_pci_mmap_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct vfio_pci_core_device *vdev = vma->vm_private_data; -struct vfio_pci_mmap_vma *mmap_vma; -vm_fault_t ret =VM_FAULT_NOPAGE ; +unsigned long pfn, pgoff = vmf->pgoff - vma->vm_pgoff; +vm_fault_t ret =VM_FAULT_SIGBUS ; -mutex_lock (&vdev->vma_lock); -down_read (&vdev->memory_lock); + pfn =vma_to_pfn (vma); -/* -* Memory region cannot be accessed if the low power feature is engaged -* or memory access is disabled. -*/ -if (vdev->pm_runtime_engaged || !__vfio_pci_memory_enabled (vdev)) { - ret =VM_FAULT_SIGBUS ; - goto up_out; - } +down_read (&vdev->memory_lock); -/* -* We populate the whole vma on fault, so we need to test whether -* the vma has already been mapped, such as for concurrent faults -* to the same vma. io_remap_pfn_range() will trigger a BUG_ON if -* we ask it to fill the same range again. -*/ -list_for_each_entry (mmap_vma, &vdev->vma_list, vma_next) { -if (mmap_vma->vma == vma) - goto up_out; - } +if (vdev->pm_runtime_engaged || !__vfio_pci_memory_enabled (vdev)) + goto out_disabled; -if (io_remap_pfn_range (vma, vma->vm_start, vma->vm_pgoff, - vma->vm_end - vma->vm_start, - vma->vm_page_prot)) { - ret =VM_FAULT_SIGBUS ; -zap_vma_ptes (vma, vma->vm_start, vma->vm_end - vma->vm_start); - goto up_out; - } + ret =vmf_insert_pfn (vma, vmf->address, pfn + pgoff); -if (__vfio_pci_add_vma (vdev, vma)) { - ret =VM_FAULT_OOM ; -zap_vma_ptes (vma, vma->vm_start, vma->vm_end - vma->vm_start); - } - -up_out: +out_disabled:up_read (&vdev->memory_lock); -mutex_unlock (&vdev->vma_lock); +return ret; }static const struct vm_operations_struct vfio_pci_mmap_ops = { - .open = vfio_pci_mmap_open, - .close = vfio_pci_mmap_close, .fault = vfio_pci_mmap_fault, };
@@ -1869,11 +1731,12 @@ int vfio_pci_core_mmap(struct vfio_device *core_vdev, struct vm_area_struct *vma vma->vm_private_data = vdev; vma->vm_page_prot =pgprot_noncached (vma->vm_page_prot); - vma->vm_pgoff = (pci_resource_start (pdev, index) >>PAGE_SHIFT ) + pgoff; + vma->vm_page_prot =pgprot_decrypted (vma->vm_page_prot);/* -* See remap_pfn_range(), called from vfio_pci_fault() but we can't -* change vm_flags within the fault handler. Set them now. +* Set vm_flags now, they should not be changed in the fault handler. +* We want the same flags and page protection (decrypted above) as +* io_remap_pfn_range() would set. */ vm_flags_set (vma,VM_IO |VM_PFNMAP |VM_DONTEXPAND |VM_DONTDUMP ); vma->vm_ops = &vfio_pci_mmap_ops;
@@ -2173,8 +2036,6 @@ int vfio_pci_core_init_dev(struct vfio_device *core_vdev)mutex_init (&vdev->ioeventfds_lock);INIT_LIST_HEAD (&vdev->dummy_resources_list);INIT_LIST_HEAD (&vdev->ioeventfds_list); -mutex_init (&vdev->vma_lock); -INIT_LIST_HEAD (&vdev->vma_list);INIT_LIST_HEAD (&vdev->sriov_pfs_item);init_rwsem (&vdev->memory_lock);xa_init (&vdev->ctx);
@@ -2190,7 +2051,6 @@ void vfio_pci_core_release_dev(struct vfio_device *core_vdev)mutex_destroy (&vdev->igate);mutex_destroy (&vdev->ioeventfds_lock); -mutex_destroy (&vdev->vma_lock);kfree (vdev->region);kfree (vdev->pm_save); }
@@ -2468,26 +2328,15 @@ static int vfio_pci_dev_set_pm_runtime_get(struct vfio_device_set *dev_set)return ret; } -/* -* We need to get memory_lock for each device, but devices can share mmap_lock, -* therefore we need to zap and hold the vma_lock for each device, and only then -* get each memory_lock. -*/ static int vfio_pci_dev_set_hot_reset (struct vfio_device_set *dev_set,struct vfio_pci_group_info *groups,struct iommufd_ctx *iommufd_ctx) { -struct vfio_pci_core_device *cur_mem; -struct vfio_pci_core_device *cur_vma; -struct vfio_pci_core_device *cur; +struct vfio_pci_core_device *vdev;struct pci_dev *pdev; -bool is_mem = true;int ret;mutex_lock (&dev_set->lock); - cur_mem =list_first_entry (&dev_set->device_list, - struct vfio_pci_core_device, - vdev.dev_set_list); pdev =vfio_pci_dev_set_resettable (dev_set);if (!pdev) {
@@ -2504,7 +2353,7 @@ static int vfio_pci_dev_set_hot_reset(struct vfio_device_set *dev_set,if (ret) goto err_unlock; -list_for_each_entry (cur_vma, &dev_set->device_list, vdev.dev_set_list) { +list_for_each_entry (vdev, &dev_set->device_list, vdev.dev_set_list) {bool owned;/*
@@ -2528,38 +2377,38 @@ static int vfio_pci_dev_set_hot_reset(struct vfio_device_set *dev_set,* Otherwise, reset is not allowed. */ if (iommufd_ctx) { -int devid =vfio_iommufd_get_dev_id (&cur_vma->vdev, +int devid =vfio_iommufd_get_dev_id (&vdev->vdev, iommufd_ctx); owned = (devid >0 || devid == -ENOENT ); }else { - owned =vfio_dev_in_groups (&cur_vma->vdev, groups); + owned =vfio_dev_in_groups (&vdev->vdev, groups); }if (!owned) { ret = -EINVAL ; - goto err_undo; +break ; }/* -* Locking multiple devices is prone to deadlock, runaway and -* unwind if we hit contention. +* Take the memory write lock for each device and zap BAR +* mappings to prevent the user accessing the device while in +* reset. Locking multiple devices is prone to deadlock, +* runaway and unwind if we hit contention. */ -if (!vfio_pci_zap_and_vma_lock (cur_vma, true)) { +if (!down_write_trylock (&vdev->memory_lock)) { ret = -EBUSY ; - goto err_undo; +break ; } + +vfio_pci_zap_bars (vdev); } - cur_vma =NULL ; -list_for_each_entry (cur_mem, &dev_set->device_list, vdev.dev_set_list) { -if (!down_write_trylock (&cur_mem->memory_lock)) { - ret = -EBUSY ; - goto err_undo; - } -mutex_unlock (&cur_mem->vma_lock); +if (!list_entry_is_head (vdev, + &dev_set->device_list, vdev.dev_set_list)) { + vdev =list_prev_entry (vdev, vdev.dev_set_list); + goto err_undo; } - cur_mem =NULL ;/* * The pci_reset_bus() will reset all the devices in the bus.
@@ -2570,25 +2419,22 @@ static int vfio_pci_dev_set_hot_reset(struct vfio_device_set *dev_set,* cause the PCI config space reset without restoring the original * state (saved locally in 'vdev->pm_save'). */ -list_for_each_entry (cur, &dev_set->device_list, vdev.dev_set_list) -vfio_pci_set_power_state (cur,PCI_D0 ); +list_for_each_entry (vdev, &dev_set->device_list, vdev.dev_set_list) +vfio_pci_set_power_state (vdev,PCI_D0 ); ret =pci_reset_bus (pdev); + vdev =list_last_entry (&dev_set->device_list, + struct vfio_pci_core_device, vdev.dev_set_list); + err_undo: -list_for_each_entry (cur, &dev_set->device_list, vdev.dev_set_list) { -if (cur == cur_mem) - is_mem = false; -if (cur == cur_vma) -break ; -if (is_mem) -up_write (&cur->memory_lock); -else -mutex_unlock (&cur->vma_lock); - } +list_for_each_entry_from_reverse (vdev, &dev_set->device_list, + vdev.dev_set_list) +up_write (&vdev->memory_lock); + +list_for_each_entry (vdev, &dev_set->device_list, vdev.dev_set_list) +pm_runtime_put (&vdev->pdev->dev); -list_for_each_entry (cur, &dev_set->device_list, vdev.dev_set_list) -pm_runtime_put (&cur->pdev->dev); err_unlock:mutex_unlock (&dev_set->lock);return ret;
include/linux/vfio_pci_core.h +0 -2
@@ -93,8 +93,6 @@ struct vfio_pci_core_device {struct list_head sriov_pfs_item;struct vfio_pci_core_device *sriov_pf_core_dev;struct notifier_block nb; -struct mutex vma_lock; -struct list_head vma_list;struct rw_semaphore memory_lock; };
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 113/160 vfio/pci: Insert full vma on mmapd MMIO fault
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Williamson <[email protected]>
commit d71a989cf5d961989c273093cdff2550acdde314 upstream.
In order to improve performance of typical scenarios we can try to insert the entire vma on fault. This accelerates typical cases, such as when the MMIO region is DMA mapped by QEMU. The vfio_iommu_type1 driver will fault in the entire DMA mapped range through fixup_user_fault().
In synthetic testing, this improves the time required to walk a PCI BAR mapping from userspace by roughly 1/3rd.
This is likely an interim solution until vmf_insert_pfn_{pmd,pud}() gain support for pfnmaps.
--- drivers/vfio/pci/vfio_pci_core.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
drivers/vfio/pci/vfio_pci_core.c +17 -2
@@ -1651,6 +1651,7 @@ static vm_fault_t vfio_pci_mmap_fault(struct vm_fault *vmf)struct vm_area_struct *vma = vmf->vma;struct vfio_pci_core_device *vdev = vma->vm_private_data;unsigned long pfn, pgoff = vmf->pgoff - vma->vm_pgoff; +unsigned long addr = vma->vm_start;vm_fault_t ret =VM_FAULT_SIGBUS ; pfn =vma_to_pfn (vma);
@@ -1658,11 +1659,25 @@ static vm_fault_t vfio_pci_mmap_fault(struct vm_fault *vmf)down_read (&vdev->memory_lock);if (vdev->pm_runtime_engaged || !__vfio_pci_memory_enabled (vdev)) - goto out_disabled; + goto out_unlock; ret =vmf_insert_pfn (vma, vmf->address, pfn + pgoff); +if (ret &VM_FAULT_ERROR ) + goto out_unlock; -out_disabled: +/* +* Pre-fault the remainder of the vma, abort further insertions and +* supress error if fault is encountered during pre-fault. +*/ +for (; addr < vma->vm_end; addr +=PAGE_SIZE , pfn++) { +if (addr == vmf->address) +continue ; + +if (vmf_insert_pfn (vma, addr, pfn) &VM_FAULT_ERROR ) +break ; + } + +out_unlock:up_read (&vdev->memory_lock);return ret;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 114/160 fork: defer linking file vma until vma is fully initialized
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miaohe Lin <[email protected]>
[ Upstream commit 35e351780fa9d8240dd6f7e4f245f9ea37e96c19 ]
Thorvald reported a WARNING [1]. And the root cause is below race:
CPU 1 CPU 2
fork hugetlbfs_fallocate
dup_mmap hugetlbfs_punch_hole
i_mmap_lock_write(mapping);
vma_interval_tree_insert_after -- Child vma is visible through i_mmap tree. i_mmap_unlock_write(mapping);
hugetlb_dup_vma_private -- Clear vma_lock outside i_mmap_rwsem!
i_mmap_lock_write(mapping); hugetlb_vmdelete_list vma_interval_tree_foreach hugetlb_vma_trylock_write -- Vma_lock is cleared. tmp->vm_ops->open -- Alloc new vma_lock outside i_mmap_rwsem! hugetlb_vma_unlock_write -- Vma_lock is assigned!!! i_mmap_unlock_write(mapping);
hugetlb_dup_vma_private() and hugetlb_vm_op_open() are called outside i_mmap_rwsem lock while vma lock can be used in the same time. Fix this by deferring linking file vma until vma is fully initialized. Those vmas should be initialized first before they can be used.
[tk: Adapted to 6.6 stable where vma_iter_bulk_store() can fail (unlike mainline which uses __mt_dup() for pre-allocation). Preserved error handling via goto fail_nomem_vmi_store. Previous backport (cec11fa2eb512) was reverted (dd782da470761) due to xfstests failures.]
--- kernel/fork.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-)
kernel/fork.c +15 -14
@@ -733,6 +733,21 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, }else if (anon_vma_fork (tmp, mpnt)) goto fail_nomem_anon_vma_fork;vm_flags_clear (tmp,VM_LOCKED_MASK ); +/* +* Copy/update hugetlb private vma information. +*/ +if (is_vm_hugetlb_page (tmp)) +hugetlb_dup_vma_private (tmp); + +/* Link the vma into the MT */ +if (vma_iter_bulk_store (&vmi, tmp)) + goto fail_nomem_vmi_store; + + mm->map_count++; + +if (tmp->vm_ops && tmp->vm_ops->open) + tmp->vm_ops->open (tmp); + file = tmp->vm_file;if (file) {struct address_space *mapping = file->f_mapping;
@@ -749,23 +764,9 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,i_mmap_unlock_write (mapping); } -/* -* Copy/update hugetlb private vma information. -*/ -if (is_vm_hugetlb_page (tmp)) -hugetlb_dup_vma_private (tmp); - -/* Link the vma into the MT */ -if (vma_iter_bulk_store (&vmi, tmp)) - goto fail_nomem_vmi_store; - - mm->map_count++;if (!(tmp->vm_flags &VM_WIPEONFORK )) retval =copy_page_range (tmp, mpnt); -if (tmp->vm_ops && tmp->vm_ops->open) - tmp->vm_ops->open (tmp); -if (retval) goto loop_out; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 115/160 bridge: br_nd_send: validate ND option lengths
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yang Yang <[email protected]>
commit 850837965af15707fd3142c1cf3c5bfaf022299b upstream.
br_nd_send() walks ND options according to option-provided lengths. A malformed option can make the parser advance beyond the computed option span or use a too-short source LLADDR option payload.
Validate option lengths against the remaining NS option area before advancing, and only read source LLADDR when the option is large enough for an Ethernet address.
--- net/bridge/br_arp_nd_proxy.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/bridge/br_arp_nd_proxy.c +4 -2
@@ -285,12 +285,14 @@ static void br_nd_send(struct net_bridge ns_olen = request->len - (skb_network_offset (request) +sizeof (struct ipv6hdr )) -sizeof (*ns);for (i =0 ; i < ns_olen -1 ; i += (ns->opt[i +1 ] <<3 )) { -if (!ns->opt[i +1 ]) { +if (!ns->opt[i +1 ] || i + (ns->opt[i +1 ] <<3 ) > ns_olen) {kfree_skb (reply);return ; }if (ns->opt[i] ==ND_OPT_SOURCE_LL_ADDR ) { - daddr = ns->opt + i +sizeof (struct nd_opt_hdr ); +if ((ns->opt[i +1 ] <<3 ) >= +sizeof (struct nd_opt_hdr ) +ETH_ALEN ) + daddr = ns->opt + i +sizeof (struct nd_opt_hdr );break ; } }
Greg Kroah-Hartman
maintainerPATCH 116/160 cdc-acm: new quirk for EPSON HMD
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
commit f97e96c303d689708f7f713d8f3afcc31f1237e9 upstream.
This device has a union descriptor that is just garbage and needs a custom descriptor.
In principle this could be done with a (conditionally activated) heuristic. That would match more devices without a need for defining a new quirk. However, this always carries the risk that the heuristics does the wrong thing and leads to more breakage. Defining the quirk and telling it exactly what to do is the safe and conservative approach.
--- drivers/usb/class/cdc-acm.c | 9 +++++++++ drivers/usb/class/cdc-acm.h | 1 + 2 files changed, 10 insertions(+)
drivers/usb/class/cdc-acm.c +9 -0
@@ -1225,6 +1225,12 @@ static int acm_probe(struct usb_interfacif (!data_interface || !control_interface)return -ENODEV ; goto skip_normal_probe; + }else if (quirks ==NO_UNION_12 ) { + data_interface =usb_ifnum_to_if (usb_dev,2 ); + control_interface =usb_ifnum_to_if (usb_dev,1 ); +if (!data_interface || !control_interface) +return -ENODEV ; + goto skip_normal_probe; }/* normal probing*/
@@ -1748,6 +1754,9 @@ static const struct usb_device_id acm_id { USB_DEVICE(0x045b, 0x024D), /* Renesas R-Car E3 USB Download mode */ .driver_info =DISABLE_ECHO ,/* Don't echo banner */ }, + { USB_DEVICE(0x04b8, 0x0d12), /* EPSON HMD Com&Sens */ + .driver_info = NO_UNION_12, /* union descriptor is garbage */ + }, { USB_DEVICE(0x0e8d, 0x0003), /* FIREFLY, MediaTek Inc; [email protected] */ .driver_info = NO_UNION_NORMAL, /* has no union descriptor */ },
drivers/usb/class/cdc-acm.h +1 -0
@@ -114,3 +114,4 @@ struct acm {#define SEND_ZERO_PACKET BIT(6)#define DISABLE_ECHO BIT(7)#define MISSING_CAP_BRK BIT(8) +#define NO_UNION_12 BIT(9)
Greg Kroah-Hartman
maintainerPATCH 117/160 comedi: dt2815: add hardware detection to prevent crash
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Deepanshu Kartikey <[email protected]>
commit 93853512f565e625df2397f0d8050d6aafd7c3ad upstream.
The dt2815 driver crashes when attached to I/O ports without actual hardware present. This occurs because syzkaller or users can attach the driver to arbitrary I/O addresses via COMEDI_DEVCONFIG ioctl.
When no hardware exists at the specified port, inb() operations return 0xff (floating bus), but outb() operations can trigger page faults due to undefined behavior, especially under race conditions:
BUG: unable to handle page fault for address: 000000007fffff90 #PF: supervisor write access in kernel mode #PF: error_code(0x0002) - not-present page RIP: 0010:dt2815_attach+0x6e0/0x1110
Add hardware detection by reading the status register before attempting any write operations. If the read returns 0xff, assume no hardware is present and fail the attach with -ENODEV. This prevents crashes from outb() operations on non-existent hardware.
--- drivers/comedi/drivers/dt2815.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/comedi/drivers/dt2815.c +12 -0
@@ -175,6 +175,18 @@ static int dt2815_attach(struct comedi_d ? current_range_type : voltage_range_type; } +/* +* Check if hardware is present before attempting any I/O operations. +* Reading 0xff from status register typically indicates no hardware +* on the bus (floating bus reads as all 1s). +*/ +if (inb (dev->iobase +DT2815_STATUS ) ==0xff ) { +dev_err (dev->class_dev, +"No hardware detected at I/O base 0x%lx\n" , + dev->iobase); +return -ENODEV ; + } +/* Init the 2815 */ outb (0x00 , dev->iobase +DT2815_STATUS );for (i =0 ; i <100 ; i++) {
Greg Kroah-Hartman
maintainerPATCH 118/160 comedi: Reinit dev->spinlock between attachments to low-level drivers
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
commit 4b9a9a6d71e3e252032f959fb3895a33acb5865c upstream.
struct comedi_device is the main controlling structure for a COMEDI device created by the COMEDI subsystem. It contains a member spinlock containing a spin-lock that is initialized by the COMEDI subsystem, but is reserved for use by a low-level driver attached to the COMEDI device (at least since commit 25436dc9d84f ("Staging: comedi: remove RT code")).
Some COMEDI devices (those created on initialization of the COMEDI subsystem when the "comedi.comedi_num_legacy_minors" parameter is non-zero) can be attached to different low-level drivers over their lifetime using the COMEDI_DEVCONFIG ioctl command. This can result in inconsistent lock states being reported when there is a mismatch in the spin-lock locking levels used by each low-level driver to which the COMEDI device has been attached. Fix it by reinitializing dev->spinlock before calling the low-level driver's attach function pointer if CONFIG_LOCKDEP is enabled.
--- drivers/comedi/drivers.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/comedi/drivers.c +8 -0
@@ -1000,6 +1000,14 @@ int comedi_device_attach(struct comedi_d ret = -EIO ; goto out; } +if (IS_ENABLED (CONFIG_LOCKDEP )) { +/* +* dev->spinlock is for private use by the attached low-level +* driver. Reinitialize it to stop lock-dependency tracking +* between attachments to different low-level drivers. +*/ +spin_lock_init (&dev->spinlock); + } dev->driver = driv; dev->board_name = dev->board_ptr ? *(const char **)dev->board_ptr : dev->driver->driver_name;
Greg Kroah-Hartman
maintainerPATCH 119/160 comedi: ni_atmio16d: Fix invalid clean-up after failed attach
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
commit 101ab946b79ad83b36d5cfd47de587492a80acf0 upstream.
If the driver's COMEDI "attach" handler function (atmio16d_attach()) returns an error, the COMEDI core will call the driver's "detach" handler function (atmio16d_detach()) to clean up. This calls reset_atmio16d() unconditionally, but depending on where the error occurred in the attach handler, the device may not have been sufficiently initialized to call reset_atmio16d(). It uses dev->iobase as the I/O port base address and dev->private as the pointer to the COMEDI device's private data structure. dev->iobase may still be set to its initial value of 0, which would result in undesired writes to low I/O port addresses. dev->private may still be NULL, which would result in null pointer dereferences.
Fix atmio16d_detach() by checking that dev->private is valid (non-null) before calling reset_atmio16d(). This implies that dev->iobase was set correctly since that is set up before dev->private.
--- drivers/comedi/drivers/ni_atmio16d.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/comedi/drivers/ni_atmio16d.c +2 -1
@@ -698,7 +698,8 @@ static int atmio16d_attach(struct comedistatic void atmio16d_detach (struct comedi_device *dev) { -reset_atmio16d (dev); +if (dev->private) +reset_atmio16d (dev);comedi_legacy_detach (dev); }
Greg Kroah-Hartman
maintainerPATCH 120/160 comedi: me_daq: Fix potential overrun of firmware buffer
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
commit cc797d4821c754c701d9714b58bea947e31dbbe0 upstream.
me2600_xilinx_download() loads the firmware that was requested by request_firmware(). It is possible for it to overrun the source buffer because it blindly trusts the file format. It reads a data stream length from the first 4 bytes into variable file_length and reads the data stream contents of length file_length from offset 16 onwards. Although it checks that the supplied firmware is at least 16 bytes long, it does not check that it is long enough to contain the data stream.
Add a test to ensure that the supplied firmware is long enough to contain the header and the data stream. On failure, log an error and return -EINVAL.
--- drivers/comedi/drivers/me_daq.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-)
drivers/comedi/drivers/me_daq.c +19 -16
@@ -344,6 +344,25 @@ static int me2600_xilinx_download(structunsigned int file_length;unsigned int i; +/* +* Format of the firmware +* Build longs from the byte-wise coded header +* Byte 1-3: length of the array +* Byte 4-7: version +* Byte 8-11: date +* Byte 12-15: reserved +*/ +if (size >=4 ) { + file_length = (((unsigned int )data[0 ] &0xff ) <<24 ) + + (((unsigned int )data[1 ] &0xff ) <<16 ) + + (((unsigned int )data[2 ] &0xff ) <<8 ) + + ((unsigned int )data[3 ] &0xff ); + } +if (size <16 || file_length > size -16 ) { +dev_err (dev->class_dev,"Firmware length inconsistency\n" ); +return -EINVAL ; + } +/* disable irq's on PLX */ writel (0x00 , devpriv->plx_regbase +PLX9052_INTCSR );
@@ -358,22 +377,6 @@ static int me2600_xilinx_download(structsleep (1 );/* -* Format of the firmware -* Build longs from the byte-wise coded header -* Byte 1-3: length of the array -* Byte 4-7: version -* Byte 8-11: date -* Byte 12-15: reserved -*/ -if (size <16 ) -return -EINVAL ; - - file_length = (((unsigned int )data[0 ] &0xff ) <<24 ) + - (((unsigned int )data[1 ] &0xff ) <<16 ) + - (((unsigned int )data[2 ] &0xff ) <<8 ) + - ((unsigned int )data[3 ] &0xff ); - -/* * Loop for writing firmware byte by byte to xilinx * Firmware data start at offset 16 */
Greg Kroah-Hartman
maintainerPATCH 121/160 comedi: me4000: Fix potential overrun of firmware buffer
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
commit 3fb43a7a5b44713f892c58ead2e5f3a1bc9f4ee7 upstream.
me4000_xilinx_download() loads the firmware that was requested by request_firmware(). It is possible for it to overrun the source buffer because it blindly trusts the file format. It reads a data stream length from the first 4 bytes into variable file_length and reads the data stream contents of length file_length from offset 16 onwards.
Add a test to ensure that the supplied firmware is long enough to contain the header and the data stream. On failure, log an error and return -EINVAL.
Note: The firmware loading was totally broken before commit ac584af59945 ("staging: comedi: me4000: fix firmware downloading"), but that is the most sensible target for this fix.
--- drivers/comedi/drivers/me4000.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/comedi/drivers/me4000.c +12 -4
@@ -315,6 +315,18 @@ static int me4000_xilinx_download(structunsigned int val;unsigned int i; +/* Get data stream length from header. */ +if (size >=4 ) { + file_length = (((unsigned int )data[0 ] &0xff ) <<24 ) + + (((unsigned int )data[1 ] &0xff ) <<16 ) + + (((unsigned int )data[2 ] &0xff ) <<8 ) + + ((unsigned int )data[3 ] &0xff ); + } +if (size <16 || file_length > size -16 ) { +dev_err (dev->class_dev,"Firmware length inconsistency\n" ); +return -EINVAL ; + } +if (!xilinx_iobase)return -ENODEV ;
@@ -346,10 +358,6 @@ static int me4000_xilinx_download(structoutl (val, devpriv->plx_regbase +PLX9052_CNTRL );/* Download Xilinx firmware */ - file_length = (((unsigned int )data[0 ] &0xff ) <<24 ) + - (((unsigned int )data[1 ] &0xff ) <<16 ) + - (((unsigned int )data[2 ] &0xff ) <<8 ) + - ((unsigned int )data[3 ] &0xff );usleep_range (10 ,1000 );for (i =0 ; i < file_length; i++) {
Greg Kroah-Hartman
maintainerPATCH 122/160 dt-bindings: connector: add pd-disable dependency
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xu Yang <[email protected]>
commit 269c26464dcf8b54b0dd9c333721c30ee44ae297 upstream.
When Power Delivery is not supported, the source is unable to obtain the current capability from the Source PDO. As a result, typec-power-opmode needs to be added to advertise such capability.
--- Documentation/devicetree/bindings/connector/usb-connector.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/connector/usb-connector.yaml +1 -0
@@ -232,6 +232,7 @@ properties: type: boolean dependencies: + pd-disable: [typec-power-opmode] sink-vdos-v1: [ sink-vdos ] sink-vdos: [ sink-vdos-v1 ]
Greg Kroah-Hartman
maintainerPATCH 123/160 nvmem: imx: assign nvmem_cell_info::raw_len
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Eggers <[email protected]>
commit 48b5163c957548f5854f14c90bfdedc33afbea3c upstream.
Avoid getting error messages at startup like the following on i.MX6ULL:
nvmem imx-ocotp0: cell mac-addr raw len 6 unaligned to nvmem word size 4 nvmem imx-ocotp0: cell mac-addr raw len 6 unaligned to nvmem word size 4
This shouldn't cause any functional change as this alignment would otherwise be done in nvmem_cell_info_to_nvmem_cell_entry_nodup().
--- drivers/nvmem/imx-ocotp-ele.c | 1 + drivers/nvmem/imx-ocotp.c | 1 + 2 files changed, 2 insertions(+)
drivers/nvmem/imx-ocotp-ele.c +1 -0
@@ -127,6 +127,7 @@ static int imx_ocotp_cell_pp(void *contestatic void imx_ocotp_fixup_dt_cell_info (struct nvmem_device *nvmem,struct nvmem_cell_info *cell) { + cell->raw_len =round_up (cell->bytes,4 ); cell->read_post_process = imx_ocotp_cell_pp; }
drivers/nvmem/imx-ocotp.c +1 -0
@@ -589,6 +589,7 @@ MODULE_DEVICE_TABLE(of, imx_ocotp_dt_idsstatic void imx_ocotp_fixup_dt_cell_info (struct nvmem_device *nvmem,struct nvmem_cell_info *cell) { + cell->raw_len =round_up (cell->bytes,4 ); cell->read_post_process = imx_ocotp_cell_pp; }
Greg Kroah-Hartman
maintainerPATCH 124/160 netfilter: ipset: drop logically empty buckets in mtype_del
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yifan Wu <[email protected]>
commit 9862ef9ab0a116c6dca98842aab7de13a252ae02 upstream.
mtype_del() counts empty slots below n->pos in k, but it only drops the bucket when both n->pos and k are zero. This misses buckets whose live entries have all been removed while n->pos still points past deleted slots.
Treat a bucket as empty when all positions below n->pos are unused and release it directly instead of shrinking it further.
--- net/netfilter/ipset/ip_set_hash_gen.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/ipset/ip_set_hash_gen.h +1 -1
@@ -1098,7 +1098,7 @@ mtype_del(struct ip_set *set, void *valuif (!test_bit (i, n->used)) k++; } -if (n->pos ==0 && k ==0 ) { +if (k == n->pos) { t->hregion[r].ext_size -=ext_size (n->size, dsize);rcu_assign_pointer (hbucket (t, key),NULL );kfree_rcu (n, rcu);
Greg Kroah-Hartman
maintainerPATCH 125/160 counter: rz-mtu3-cnt: prevent counter from being toggled multiple times
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cosmin Tanislav <[email protected]>
commit 67c3f99bed6f422ba343d2b70a2eeeccdfd91bef upstream.
Runtime PM counter is incremented / decremented each time the sysfs enable file is written to.
If user writes 0 to the sysfs enable file multiple times, runtime PM usage count underflows, generating the following message.
rz-mtu3-counter rz-mtu3-counter.0: Runtime PM usage count underflow!
At the same time, hardware registers end up being accessed with clocks off in rz_mtu3_terminate_counter() to disable an already disabled channel.
If user writes 1 to the sysfs enable file multiple times, runtime PM usage count will be incremented each time, requiring the same number of 0 writes to get it back to 0.
If user writes 0 to the sysfs enable file while PWM is in progress, PWM is stopped without counter being the owner of the underlying MTU3 channel.
Check against the cached count_is_enabled value and exit if the user is trying to set the same enable value.
--- drivers/counter/rz-mtu3-cnt.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/counter/rz-mtu3-cnt.c +8 -4
@@ -499,21 +499,25 @@ static int rz_mtu3_count_enable_write(ststruct rz_mtu3_cnt *const priv =counter_priv (counter);int ret =0 ; +mutex_lock (&priv->lock); + +if (priv->count_is_enabled[count->id] == enable) + goto exit; +if (enable) { -mutex_lock (&priv->lock);pm_runtime_get_sync (ch->dev); ret =rz_mtu3_initialize_counter (counter, count->id);if (ret ==0 ) priv->count_is_enabled[count->id] = true; -mutex_unlock (&priv->lock); }else { -mutex_lock (&priv->lock);rz_mtu3_terminate_counter (counter, count->id); priv->count_is_enabled[count->id] = false;pm_runtime_put (ch->dev); -mutex_unlock (&priv->lock); } +exit: +mutex_unlock (&priv->lock); +return ret; }
Greg Kroah-Hartman
maintainerPATCH 126/160 counter: rz-mtu3-cnt: do not use struct rz_mtu3_channels dev member
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cosmin Tanislav <[email protected]>
commit 2932095c114b98cbb40ccf34fc00d613cb17cead upstream.
The counter driver can use HW channels 1 and 2, while the PWM driver can use HW channels 0, 1, 2, 3, 4, 6, 7.
The dev member is assigned both by the counter driver and the PWM driver for channels 1 and 2, to their own struct device instance, overwriting the previous value.
The sub-drivers race to assign their own struct device pointer to the same struct rz_mtu3_channel's dev member.
The dev member of struct rz_mtu3_channel is used by the counter sub-driver for runtime PM.
Depending on the probe order of the counter and PWM sub-drivers, the dev member may point to the wrong struct device instance, causing the counter sub-driver to do runtime PM actions on the wrong device.
To fix this, use the parent pointer of the counter, which is assigned during probe to the correct struct device, not the struct device pointer inside the shared struct rz_mtu3_channel.
--- drivers/counter/rz-mtu3-cnt.c | 55 ++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 28 deletions(-)
drivers/counter/rz-mtu3-cnt.c +27 -28
@@ -107,9 +107,9 @@ static bool rz_mtu3_is_counter_invalid(sstruct rz_mtu3_cnt *const priv =counter_priv (counter);unsigned long tmdr; -pm_runtime_get_sync (priv->ch->dev); +pm_runtime_get_sync (counter->parent); tmdr =rz_mtu3_shared_reg_read (priv->ch,RZ_MTU3_TMDR3 ); -pm_runtime_put (priv->ch->dev); +pm_runtime_put (counter->parent);if (id ==RZ_MTU3_32_BIT_CH &&test_bit (RZ_MTU3_TMDR3_LWA , &tmdr))return false;
@@ -165,12 +165,12 @@ static int rz_mtu3_count_read(struct couif (ret)return ret; -pm_runtime_get_sync (ch->dev); +pm_runtime_get_sync (counter->parent);if (count->id ==RZ_MTU3_32_BIT_CH ) *val =rz_mtu3_32bit_ch_read (ch,RZ_MTU3_TCNTLW );else *val =rz_mtu3_16bit_ch_read (ch,RZ_MTU3_TCNT ); -pm_runtime_put (ch->dev); +pm_runtime_put (counter->parent);mutex_unlock (&priv->lock);return 0 ;
@@ -187,26 +187,26 @@ static int rz_mtu3_count_write(struct coif (ret)return ret; -pm_runtime_get_sync (ch->dev); +pm_runtime_get_sync (counter->parent);if (count->id ==RZ_MTU3_32_BIT_CH )rz_mtu3_32bit_ch_write (ch,RZ_MTU3_TCNTLW , val);else rz_mtu3_16bit_ch_write (ch,RZ_MTU3_TCNT , val); -pm_runtime_put (ch->dev); +pm_runtime_put (counter->parent);mutex_unlock (&priv->lock);return 0 ; }static int rz_mtu3_count_function_read_helper (struct rz_mtu3_channel *const ch, -struct rz_mtu3_cnt *const priv, +struct counter_device *const counter,enum counter_function *function) {u8 timer_mode; -pm_runtime_get_sync (ch->dev); +pm_runtime_get_sync (counter->parent); timer_mode =rz_mtu3_8bit_ch_read (ch,RZ_MTU3_TMDR1 ); -pm_runtime_put (ch->dev); +pm_runtime_put (counter->parent);switch (timer_mode &RZ_MTU3_TMDR1_PH_CNT_MODE_MASK ) {case RZ_MTU3_TMDR1_PH_CNT_MODE_1 :
@@ -240,7 +240,7 @@ static int rz_mtu3_count_function_read(sif (ret)return ret; - ret =rz_mtu3_count_function_read_helper (ch, priv, function); + ret =rz_mtu3_count_function_read_helper (ch, counter, function);mutex_unlock (&priv->lock);return ret;
@@ -279,9 +279,9 @@ static int rz_mtu3_count_function_write(return -EINVAL ; } -pm_runtime_get_sync (ch->dev); +pm_runtime_get_sync (counter->parent);rz_mtu3_8bit_ch_write (ch,RZ_MTU3_TMDR1 , timer_mode); -pm_runtime_put (ch->dev); +pm_runtime_put (counter->parent);mutex_unlock (&priv->lock);return 0 ;
@@ -300,9 +300,9 @@ static int rz_mtu3_count_direction_read(if (ret)return ret; -pm_runtime_get_sync (ch->dev); +pm_runtime_get_sync (counter->parent); tsr =rz_mtu3_8bit_ch_read (ch,RZ_MTU3_TSR ); -pm_runtime_put (ch->dev); +pm_runtime_put (counter->parent); *direction = (tsr &RZ_MTU3_TSR_TCFD ) ?COUNTER_COUNT_DIRECTION_FORWARD :COUNTER_COUNT_DIRECTION_BACKWARD ;
@@ -377,14 +377,14 @@ static int rz_mtu3_count_ceiling_write(sreturn -EINVAL ; } -pm_runtime_get_sync (ch->dev); +pm_runtime_get_sync (counter->parent);if (count->id ==RZ_MTU3_32_BIT_CH )rz_mtu3_32bit_ch_write (ch,RZ_MTU3_TGRALW , ceiling);else rz_mtu3_16bit_ch_write (ch,RZ_MTU3_TGRA , ceiling);rz_mtu3_8bit_ch_write (ch,RZ_MTU3_TCR ,RZ_MTU3_TCR_CCLR_TGRA ); -pm_runtime_put (ch->dev); +pm_runtime_put (counter->parent);mutex_unlock (&priv->lock);return 0 ;
@@ -495,7 +495,6 @@ static int rz_mtu3_count_enable_read(strstatic int rz_mtu3_count_enable_write (struct counter_device *counter,struct counter_count *count,u8 enable) { -struct rz_mtu3_channel *const ch =rz_mtu3_get_ch (counter, count->id);struct rz_mtu3_cnt *const priv =counter_priv (counter);int ret =0 ;
@@ -505,14 +504,14 @@ static int rz_mtu3_count_enable_write(st goto exit;if (enable) { -pm_runtime_get_sync (ch->dev); +pm_runtime_get_sync (counter->parent); ret =rz_mtu3_initialize_counter (counter, count->id);if (ret ==0 ) priv->count_is_enabled[count->id] = true; }else {rz_mtu3_terminate_counter (counter, count->id); priv->count_is_enabled[count->id] = false; -pm_runtime_put (ch->dev); +pm_runtime_put (counter->parent); } exit:
@@ -544,9 +543,9 @@ static int rz_mtu3_cascade_counts_enableif (ret)return ret; -pm_runtime_get_sync (priv->ch->dev); +pm_runtime_get_sync (counter->parent); tmdr =rz_mtu3_shared_reg_read (priv->ch,RZ_MTU3_TMDR3 ); -pm_runtime_put (priv->ch->dev); +pm_runtime_put (counter->parent); *cascade_enable =test_bit (RZ_MTU3_TMDR3_LWA , &tmdr);mutex_unlock (&priv->lock);
@@ -563,10 +562,10 @@ static int rz_mtu3_cascade_counts_enableif (ret)return ret; -pm_runtime_get_sync (priv->ch->dev); +pm_runtime_get_sync (counter->parent);rz_mtu3_shared_reg_update_bit (priv->ch,RZ_MTU3_TMDR3 ,RZ_MTU3_TMDR3_LWA , cascade_enable); -pm_runtime_put (priv->ch->dev); +pm_runtime_put (counter->parent);mutex_unlock (&priv->lock);return 0 ;
@@ -583,9 +582,9 @@ static int rz_mtu3_ext_input_phase_clockif (ret)return ret; -pm_runtime_get_sync (priv->ch->dev); +pm_runtime_get_sync (counter->parent); tmdr =rz_mtu3_shared_reg_read (priv->ch,RZ_MTU3_TMDR3 ); -pm_runtime_put (priv->ch->dev); +pm_runtime_put (counter->parent); *ext_input_phase_clock_select =test_bit (RZ_MTU3_TMDR3_PHCKSEL , &tmdr);mutex_unlock (&priv->lock);
@@ -602,11 +601,11 @@ static int rz_mtu3_ext_input_phase_clockif (ret)return ret; -pm_runtime_get_sync (priv->ch->dev); +pm_runtime_get_sync (counter->parent);rz_mtu3_shared_reg_update_bit (priv->ch,RZ_MTU3_TMDR3 ,RZ_MTU3_TMDR3_PHCKSEL , ext_input_phase_clock_select); -pm_runtime_put (priv->ch->dev); +pm_runtime_put (counter->parent);mutex_unlock (&priv->lock);return 0 ;
@@ -644,7 +643,7 @@ static int rz_mtu3_action_read(struct coif (ret)return ret; - ret =rz_mtu3_count_function_read_helper (ch, priv, &function); + ret =rz_mtu3_count_function_read_helper (ch, counter, &function);if (ret) {mutex_unlock (&priv->lock);return ret;
Greg Kroah-Hartman
maintainerPATCH 127/160 vxlan: validate ND option lengths in vxlan_na_create
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yang Yang <[email protected]>
commit afa9a05e6c4971bd5586f1b304e14d61fb3d9385 upstream.
vxlan_na_create() walks ND options according to option-provided lengths. A malformed option can make the parser advance beyond the computed option span or use a too-short source LLADDR option payload.
Validate option lengths against the remaining NS option area before advancing, and only read source LLADDR when the option is large enough for an Ethernet address.
--- drivers/net/vxlan/vxlan_core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/vxlan/vxlan_core.c +4 -2
@@ -1964,12 +1964,14 @@ static struct sk_buff *vxlan_na_create(s ns_olen = request->len -skb_network_offset (request) -sizeof (struct ipv6hdr ) -sizeof (*ns);for (i =0 ; i < ns_olen-1 ; i += (ns->opt[i+1 ]<<3 )) { -if (!ns->opt[i +1 ]) { +if (!ns->opt[i +1 ] || i + (ns->opt[i +1 ] <<3 ) > ns_olen) {kfree_skb (reply);return NULL ; }if (ns->opt[i] ==ND_OPT_SOURCE_LL_ADDR ) { - daddr = ns->opt + i +sizeof (struct nd_opt_hdr ); +if ((ns->opt[i +1 ] <<3 ) >= +sizeof (struct nd_opt_hdr ) +ETH_ALEN ) + daddr = ns->opt + i +sizeof (struct nd_opt_hdr );break ; } }
Greg Kroah-Hartman
maintainerPATCH 128/160 net: ftgmac100: fix ring allocation unwind on open failure
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yufan Chen <[email protected]>
commit c0fd0fe745f5e8c568d898cd1513d0083e46204a upstream.
ftgmac100_alloc_rings() allocates rx_skbs, tx_skbs, rxdes, txdes, and rx_scratch in stages. On intermediate failures it returned -ENOMEM directly, leaking resources allocated earlier in the function.
Rework the failure path to use staged local unwind labels and free allocated resources in reverse order before returning -ENOMEM. This matches common netdev allocation cleanup style.
--- drivers/net/ethernet/faraday/ftgmac100.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-)
drivers/net/ethernet/faraday/ftgmac100.c +24 -4
@@ -934,19 +934,19 @@ static int ftgmac100_alloc_rings(struct priv->tx_skbs =kcalloc (MAX_TX_QUEUE_ENTRIES ,sizeof (void *),GFP_KERNEL );if (!priv->tx_skbs) -return -ENOMEM ; + goto err_free_rx_skbs;/* Allocate descriptors */ priv->rxdes =dma_alloc_coherent (priv->dev,MAX_RX_QUEUE_ENTRIES *sizeof (struct ftgmac100_rxdes ), &priv->rxdes_dma,GFP_KERNEL );if (!priv->rxdes) -return -ENOMEM ; + goto err_free_tx_skbs; priv->txdes =dma_alloc_coherent (priv->dev,MAX_TX_QUEUE_ENTRIES *sizeof (struct ftgmac100_txdes ), &priv->txdes_dma,GFP_KERNEL );if (!priv->txdes) -return -ENOMEM ; + goto err_free_rxdes;/* Allocate scratch packet buffer */ priv->rx_scratch = dma_alloc_coherent(priv->dev,
@@ -954,9 +954,29 @@ static int ftgmac100_alloc_rings(struct &priv->rx_scratch_dma, GFP_KERNEL);if (!priv->rx_scratch) -return -ENOMEM ; + goto err_free_txdes;return 0 ; + +err_free_txdes: +dma_free_coherent (priv->dev, +MAX_TX_QUEUE_ENTRIES * +sizeof (struct ftgmac100_txdes ), + priv->txdes, priv->txdes_dma); + priv->txdes =NULL ; +err_free_rxdes: +dma_free_coherent (priv->dev, +MAX_RX_QUEUE_ENTRIES * +sizeof (struct ftgmac100_rxdes ), + priv->rxdes, priv->rxdes_dma); + priv->rxdes =NULL ; +err_free_tx_skbs: +kfree (priv->tx_skbs); + priv->tx_skbs =NULL ; +err_free_rx_skbs: +kfree (priv->rx_skbs); + priv->rx_skbs =NULL ; +return -ENOMEM ; }static void ftgmac100_init_rings (struct ftgmac100 *priv)
Greg Kroah-Hartman
maintainerPATCH 129/160 cpufreq: governor: fix double free in cpufreq_dbs_governor_init() error path
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guangshuo Li <[email protected]>
commit 6dcf9d0064ce2f3e3dfe5755f98b93abe6a98e1e upstream.
When kobject_init_and_add() fails, cpufreq_dbs_governor_init() calls kobject_put(&dbs_data->attr_set.kobj).
The kobject release callback cpufreq_dbs_data_release() calls gov->exit(dbs_data) and kfree(dbs_data), but the current error path then calls gov->exit(dbs_data) and kfree(dbs_data) again, causing a double free.
Keep the direct kfree(dbs_data) for the gov->init() failure path, but after kobject_init_and_add() has been called, let kobject_put() handle the cleanup through cpufreq_dbs_data_release().
--- drivers/cpufreq/cpufreq_governor.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/cpufreq/cpufreq_governor.c +3 -3
@@ -468,13 +468,13 @@ int cpufreq_dbs_governor_init(struct cpu/* Failure, so roll back. */ pr_err ("initialization failed (dbs_data kobject init error %d)\n" , ret); -kobject_put (&dbs_data->attr_set.kobj); - policy->governor_data =NULL ;if (!have_governor_per_policy ()) gov->gdbs_data =NULL ; - gov->exit (dbs_data); + +kobject_put (&dbs_data->attr_set.kobj); + goto free_policy_dbs_info; free_dbs_data:kfree (dbs_data);
Greg Kroah-Hartman
maintainerPATCH 130/160 gpio: mxc: map Both Edge pad wakeup to Rising Edge
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shenwei Wang <[email protected]>
commit c720fb57d56274213d027b3c5ab99080cf62a306 upstream.
Suspend may fail on i.MX8QM when Falling Edge is used as a pad wakeup trigger due to a hardware bug in the detection logic. Since the hardware does not support Both Edge wakeup, remap requests for Both Edge to Rising Edge by default to avoid hitting this issue.
A warning is emitted when Falling Edge is selected on i.MX8QM.
--- drivers/gpio/gpio-mxc.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/gpio/gpio-mxc.c +9 -1
@@ -576,12 +576,13 @@ static bool mxc_gpio_set_pad_wakeup(struunsigned long config;bool ret = false;int i, type; +bool is_imx8qm =of_device_is_compatible (port->dev->of_node,"fsl,imx8qm-gpio" );static const u32 pad_type_map[] = {IMX_SCU_WAKEUP_OFF ,/* 0 */ IMX_SCU_WAKEUP_RISE_EDGE ,/* IRQ_TYPE_EDGE_RISING */ IMX_SCU_WAKEUP_FALL_EDGE ,/* IRQ_TYPE_EDGE_FALLING */ -IMX_SCU_WAKEUP_FALL_EDGE ,/* IRQ_TYPE_EDGE_BOTH */ +IMX_SCU_WAKEUP_RISE_EDGE ,/* IRQ_TYPE_EDGE_BOTH */ IMX_SCU_WAKEUP_HIGH_LVL ,/* IRQ_TYPE_LEVEL_HIGH */ IMX_SCU_WAKEUP_OFF ,/* 5 */ IMX_SCU_WAKEUP_OFF ,/* 6 */
@@ -596,6 +597,13 @@ static bool mxc_gpio_set_pad_wakeup(stru config = pad_type_map[type]; else config =IMX_SCU_WAKEUP_OFF ; + +if (is_imx8qm && config ==IMX_SCU_WAKEUP_FALL_EDGE ) { +dev_warn_once (port->dev, +"No falling-edge support for wakeup on i.MX8QM\n" ); + config =IMX_SCU_WAKEUP_OFF ; + } + ret |=mxc_gpio_generic_config (port, i, config); } }
Greg Kroah-Hartman
maintainerPATCH 131/160 thermal: core: Fix thermal zone device registration error path
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafael J. Wysocki <[email protected]>
commit 9e07e3b81807edd356e1f794cffa00a428eff443 upstream.
If thermal_zone_device_register_with_trips() fails after registering a thermal zone device, it needs to wait for the tz->removal completion like thermal_zone_device_unregister(), in case user space has managed to take a reference to the thermal zone device's kobject, in which case thermal_release() may not be called by the error path itself and tz may be freed prematurely.
Add the missing wait_for_completion() call to the thermal zone device registration error path.
--- drivers/thermal/thermal_core.c | 1 + 1 file changed, 1 insertion(+)
drivers/thermal/thermal_core.c +1 -0
@@ -1394,6 +1394,7 @@ unregister:device_del (&tz->device); release_device:put_device (&tz->device); +wait_for_completion (&tz->removal); remove_id:ida_free (&thermal_tz_ida, id); free_tzp:
Greg Kroah-Hartman
maintainerPATCH 132/160 misc: fastrpc: possible double-free of cctx->remote_heap
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xingjing Deng <[email protected]>
commit ba2c83167b215da30fa2aae56b140198cf8d8408 upstream.
fastrpc_init_create_static_process() may free cctx->remote_heap on the err_map path but does not clear the pointer. Later, fastrpc_rpmsg_remove() frees cctx->remote_heap again if it is non-NULL, which can lead to a double-free if the INIT_CREATE_STATIC ioctl hits the error path and the rpmsg device is subsequently removed/unbound.
Clear cctx->remote_heap after freeing it in the error path to prevent the later cleanup from freeing it again.
This issue was found by an in-house analysis workflow that extracts AST-based information and runs static checks, with LLM assistance for triage, and was confirmed by manual code review.
No hardware testing was performed.
--- drivers/misc/fastrpc.c | 1 + 1 file changed, 1 insertion(+)
drivers/misc/fastrpc.c +1 -0
@@ -1374,6 +1374,7 @@ err_invoke: } err_map:fastrpc_buf_free (fl->cctx->remote_heap); + fl->cctx->remote_heap =NULL ; err_name:kfree (name); err:
Greg Kroah-Hartman
maintainerPATCH 133/160 thunderbolt: Fix property read in nhi_wake_supported()
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konrad Dybcio <[email protected]>
commit 73a505dc48144ec72e25874e2b2a72487b02d3bc upstream.
device_property_read_foo() returns 0 on success and only then modifies 'val'. Currently, val is left uninitialized if the aforementioned function returns non-zero, making nhi_wake_supported() return true almost always (random != 0) if the property is not present in device firmware.
Invert the check to make it make sense.
--- drivers/thunderbolt/nhi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thunderbolt/nhi.c +1 -1
@@ -1010,7 +1010,7 @@ static bool nhi_wake_supported(struct pc* If power rails are sustainable for wakeup from S4 this * property is set by the BIOS. */ -if (device_property_read_u8 (&pdev->dev,"WAKE_SUPPORTED" , &val)) +if (!device_property_read_u8 (&pdev->dev,"WAKE_SUPPORTED" , &val))return !!val;return true;
Greg Kroah-Hartman
maintainerPATCH 134/160 USB: dummy-hcd: Fix locking/synchronization error
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Stern <[email protected]>
commit 616a63ff495df12863692ab3f9f7b84e3fa7a66d upstream.
Syzbot testing was able to provoke an addressing exception and crash in the usb_gadget_udc_reset() routine in drivers/usb/gadgets/udc/core.c, resulting from the fact that the routine was called with a second ("driver") argument of NULL. The bad caller was set_link_state() in dummy_hcd.c, and the problem arose because of a race between a USB reset and driver unbind.
These sorts of races were not supposed to be possible; commit 7dbd8f4cabd9 ("USB: dummy-hcd: Fix erroneous synchronization change"), along with a few followup commits, was written specifically to prevent them. As it turns out, there are (at least) two errors remaining in the code. Another patch will address the second error; this one is concerned with the first.
The error responsible for the syzbot crash occurred because the stop_activity() routine will sometimes drop and then re-acquire the dum->lock spinlock. A call to stop_activity() occurs in set_link_state() when handling an emulated USB reset, after the test of dum->ints_enabled and before the increment of dum->callback_usage. This allowed another thread (doing a driver unbind) to sneak in and grab the spinlock, and then clear dum->ints_enabled and dum->driver. Normally this other thread would have to wait for dum->callback_usage to go down to 0 before it would clear dum->driver, but in this case it didn't have to wait since dum->callback_usage had not yet been incremented.
The fix is to increment dum->callback_usage _before_ calling stop_activity() instead of after. Then the thread doing the unbind will not clear dum->driver until after the call to usb_gadget_udc_reset() safely returns and dum->callback_usage has been decremented again.
--- drivers/usb/gadget/udc/dummy_hcd.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/usb/gadget/udc/dummy_hcd.c +6 -1
@@ -461,8 +461,13 @@ static void set_link_state(struct dummy_/* Report reset and disconnect events to the driver */ if (dum->ints_enabled && (disconnect || reset)) { -stop_activity (dum); ++dum->callback_usage; +/* +* stop_activity() can drop dum->lock, so it must +* not come between the dum->ints_enabled test +* and the ++dum->callback_usage. +*/ +stop_activity (dum);spin_unlock (&dum->lock);if (reset)usb_gadget_udc_reset (&dum->gadget, dum->driver);
Greg Kroah-Hartman
maintainerPATCH 135/160 USB: dummy-hcd: Fix interrupt synchronization error
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Stern <[email protected]>
commit 2ca9e46f8f1f5a297eb0ac83f79d35d5b3a02541 upstream.
This fixes an error in synchronization in the dummy-hcd driver. The error has a somewhat involved history. The synchronization mechanism was introduced by commit 7dbd8f4cabd9 ("USB: dummy-hcd: Fix erroneous synchronization change"), which added an emulated "interrupts enabled" flag together with code emulating synchronize_irq() (it waits until all current handler callbacks have returned).
But the emulated interrupt-disable occurred too late, after the driver containing the handler callback routines had been told that it was unbound and no more callbacks would occur. Commit 4a5d797a9f9c ("usb:
gadget: dummy_hcd: fix gpf in gadget_setup") tried to fix this by moving the synchronize_irq() emulation code from dummy_stop() to dummy_pullup(), which runs before the unbind callback.
There still were races, though, because the emulated interrupt-disable still occurred too late. It couldn't be moved to dummy_pullup(), because that routine can be called for reasons other than an impending unbind. Therefore commits 7dc0c55e9f30 ("USB: UDC core: Add udc_async_callbacks gadget op") and 04145a03db9d ("USB: UDC: Implement udc_async_callbacks in dummy-hcd") added an API allowing the UDC core to tell dummy-hcd exactly when emulated interrupts and their callbacks should be disabled.
That brings us to the current state of things, which is still wrong because the emulated synchronize_irq() occurs before the emulated interrupt-disable! That's no good, beause it means that more emulated interrupts can occur after the synchronize_irq() emulation has run, leading to the possibility that a callback handler may be running when the gadget driver is unbound.
To fix this, we have to move the synchronize_irq() emulation code yet again, to the dummy_udc_async_callbacks() routine, which takes care of enabling and disabling emulated interrupt requests. The synchronization will now run immediately after emulated interrupts are disabled, which is where it belongs.
--- drivers/usb/gadget/udc/dummy_hcd.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-)
drivers/usb/gadget/udc/dummy_hcd.c +14 -15
@@ -912,21 +912,6 @@ static int dummy_pullup(struct usb_gadgespin_lock_irqsave (&dum->lock, flags); dum->pullup = (value !=0 );set_link_state (dum_hcd); -if (value ==0 ) { -/* -* Emulate synchronize_irq(): wait for callbacks to finish. -* This seems to be the best place to emulate the call to -* synchronize_irq() that's in usb_gadget_remove_driver(). -* Doing it in dummy_udc_stop() would be too late since it -* is called after the unbind callback and unbind shouldn't -* be invoked until all the other callbacks are finished. -*/ -while (dum->callback_usage >0 ) { -spin_unlock_irqrestore (&dum->lock, flags); -usleep_range (1000 ,2000 ); -spin_lock_irqsave (&dum->lock, flags); - } - }spin_unlock_irqrestore (&dum->lock, flags);usb_hcd_poll_rh_status (dummy_hcd_to_hcd (dum_hcd));
@@ -949,6 +934,20 @@ static void dummy_udc_async_callbacks(stspin_lock_irq (&dum->lock); dum->ints_enabled = enable; +if (!enable) { +/* +* Emulate synchronize_irq(): wait for callbacks to finish. +* This has to happen after emulated interrupts are disabled +* (dum->ints_enabled is clear) and before the unbind callback, +* just like the call to synchronize_irq() in +* gadget/udc/core:gadget_unbind_driver(). +*/ +while (dum->callback_usage >0 ) { +spin_unlock_irq (&dum->lock); +usleep_range (1000 ,2000 ); +spin_lock_irq (&dum->lock); + } + }spin_unlock_irq (&dum->lock); }
Greg Kroah-Hartman
maintainerPATCH 136/160 usb: gadget: dummy_hcd: fix premature URB completion when ZLP follows partial transfer
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sebastian Urban <[email protected]>
commit f50200dd44125e445a6164e88c217472fa79cdbc upstream.
When a gadget request is only partially transferred in transfer() because the per-frame bandwidth budget is exhausted, the loop advances to the next queued request. If that next request is a zero-length packet (ZLP), len evaluates to zero and the code takes the unlikely(len == 0) path, which sets is_short = 1. This bypasses the bandwidth guard ("limit < ep->ep.maxpacket && limit < len") that lives in the else branch and would otherwise break out of the loop for non-zero requests. The is_short path then completes the URB before all data from the first request has been transferred.
Reproducer (bulk IN, high speed):
Device side (FunctionFS with Linux AIO):
1. Queue a 65024-byte write via io_submit (127 * 512, i.e. a multiple of the HS bulk max packet size).
2. Immediately queue a zero-length write (ZLP) via io_submit.
Host side:
3. Submit a 65536-byte bulk IN URB.
Expected: URB completes with actual_length = 65024.
Actual: URB completes with actual_length = 53248, losing 11776
bytes that leak into subsequent URBs.
At high speed the per-frame budget is 53248 bytes (512 * 13 * 8). The 65024-byte request exhausts this budget after 53248 bytes, leaving the request incomplete (req->req.actual < req->req.length). Neither the request nor the URB is finished, and rescan is 0, so the loop advances to the ZLP. For the ZLP, dev_len = 0, so len = min(12288, 0) = 0, taking the unlikely(len == 0) path and setting is_short = 1. The is_short handler then sets *status = 0, completing the URB with only 53248 of the expected 65024 bytes.
Fix this by breaking out of the loop when the current request has remaining data (req->req.actual < req->req.length). The request resumes on the next timer tick, preserving correct data ordering.
--- drivers/usb/gadget/udc/dummy_hcd.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/usb/gadget/udc/dummy_hcd.c +6 -0
@@ -1537,6 +1537,12 @@ top:/* rescan to continue with any other queued i/o */ if (rescan) goto top; + +/* request not fully transferred; stop iterating to +* preserve data ordering across queued requests. +*/ +if (req->req.actual < req->req.length) +break ; }return sent; }
Greg Kroah-Hartman
maintainerPATCH 137/160 btrfs: fix the qgroup data free range for inline data extents
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qu Wenruo <[email protected]>
[ Upstream commit 0bb067ca64e35536f1f5d9ef6aaafc40f4833623 ]
Inside function __cow_file_range_inline() since the inlined data no longer take any data space, we need to free up the reserved space.
However the code is still using the old page size == sector size assumption, and will not handle subpage case well.
Thankfully it is not going to cause any problems because we have two extra safe nets:
- Inline data extents creation is disabled for sector size < page size cases for now
But it won't stay that for long.
- btrfs_qgroup_free_data() will only clear ranges which have been already reserved
So even if we pass a range larger than what we need, it should still be fine, especially there is only reserved space for a single block at file offset 0 of an inline data extent.
But just for the sake of consistency, fix the call site to use sectorsize instead of page size.
Stable-dep-of: f8da41de0bff ("btrfs: do not free data reservation in fallback from inline due to -ENOSPC")
--- fs/btrfs/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/inode.c +1 -1
@@ -692,7 +692,7 @@ static noinline int cow_file_range_inline(struct btrfs_inode *inode, u64 size,* And at reserve time, it's always aligned to page size, so * just free one page here. */ -btrfs_qgroup_free_data (inode,NULL ,0 ,PAGE_SIZE ,NULL ); +btrfs_qgroup_free_data (inode,NULL ,0 , fs_info->sectorsize,NULL );btrfs_free_path (path);if (trans)btrfs_end_transaction (trans);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 138/160 btrfs: do not free data reservation in fallback from inline due to -ENOSPC
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
[ Upstream commit f8da41de0bff9eb1d774a7253da0c9f637c4470a ]
If we fail to create an inline extent due to -ENOSPC, we will attempt to go through the normal COW path, reserve an extent, create an ordered extent, etc. However we were always freeing the reserved qgroup data, which is wrong since we will use data. Fix this by freeing the reserved qgroup data in __cow_file_range_inline() only if we are not doing the fallback (ret is <= 0).
--- fs/btrfs/inode.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/btrfs/inode.c +5 -1
@@ -691,8 +691,12 @@ static noinline int cow_file_range_inline(struct btrfs_inode *inode, u64 size,* it won't count as data extent, free them directly here. * And at reserve time, it's always aligned to page size, so * just free one page here. +* +* If we fallback to non-inline (ret == 1) due to -ENOSPC, then we need +* to keep the data reservation. */ -btrfs_qgroup_free_data (inode,NULL ,0 , fs_info->sectorsize,NULL ); +if (ret <=0 ) +btrfs_qgroup_free_data (inode,NULL ,0 , fs_info->sectorsize,NULL );btrfs_free_path (path);if (trans)btrfs_end_transaction (trans);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 139/160 gfs2: Improve gfs2_consist_inode() usage
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Price <[email protected]>
[ Upstream commit 10398ef57aa189153406c110f5957145030f08fe ]
gfs2_consist_inode() logs an error message with the source file and line number. When we jump before calling it, the line number becomes less useful as it no longer relates to the source of the error. To aid troubleshooting, replace the gotos with the gfs2_consist_inode() calls so that the error messages are more informative.
--- fs/gfs2/dir.c | 31 +++++++++++++++++-------------- fs/gfs2/glops.c | 34 ++++++++++++++++++++-------------- fs/gfs2/xattr.c | 28 ++++++++++++++++------------ 3 files changed, 53 insertions(+), 40 deletions(-)
fs/gfs2/dir.c +17 -14
@@ -562,15 +562,18 @@ static struct gfs2_dirent *gfs2_dirent_scan(struct inode *inode, void *buf,int ret =0 ; ret =gfs2_dirent_offset (GFS2_SB (inode), buf); -if (ret <0 ) - goto consist_inode; - +if (ret <0 ) { +gfs2_consist_inode (GFS2_I (inode)); +return ERR_PTR (-EIO ); + } offset = ret; prev =NULL ; dent = buf + offset; size =be16_to_cpu (dent->de_rec_len); -if (gfs2_check_dirent (GFS2_SB (inode), dent, offset, size, len,1 )) - goto consist_inode; +if (gfs2_check_dirent (GFS2_SB (inode), dent, offset, size, len,1 )) { +gfs2_consist_inode (GFS2_I (inode)); +return ERR_PTR (-EIO ); + } do { ret = scan(dent, name, opaque); if (ret)
@@ -582,8 +585,10 @@ static struct gfs2_dirent *gfs2_dirent_scan(struct inode *inode, void *buf, dent = buf + offset; size =be16_to_cpu (dent->de_rec_len);if (gfs2_check_dirent (GFS2_SB (inode), dent, offset, size, - len,0 )) - goto consist_inode; + len,0 )) { +gfs2_consist_inode (GFS2_I (inode)); +return ERR_PTR (-EIO ); + } }while (1 );switch (ret) {
@@ -597,10 +602,6 @@ static struct gfs2_dirent *gfs2_dirent_scan(struct inode *inode, void *buf,BUG_ON (ret >0 );return ERR_PTR (ret); } - -consist_inode: -gfs2_consist_inode (GFS2_I (inode)); -return ERR_PTR (-EIO ); } static int dirent_check_reclen(struct gfs2_inode *dip,
@@ -609,14 +610,16 @@ static int dirent_check_reclen(struct gfs2_inode *dip,const void *ptr = d;u16 rec_len =be16_to_cpu (d->de_rec_len); -if (unlikely (rec_len <sizeof (struct gfs2_dirent ))) - goto broken; +if (unlikely (rec_len <sizeof (struct gfs2_dirent ))) { +gfs2_consist_inode (dip); +return -EIO ; + } ptr += rec_len;if (ptr < end_p)return rec_len;if (ptr == end_p)return -ENOENT ; -broken: +gfs2_consist_inode (dip);return -EIO ; }
fs/gfs2/glops.c +20 -14
@@ -412,10 +412,14 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf)struct inode *inode = &ip->i_inode;bool is_new = inode->i_state &I_NEW ; -if (unlikely (ip->i_no_addr !=be64_to_cpu (str->di_num.no_addr))) - goto corrupt; -if (unlikely (!is_new &&inode_wrong_type (inode, mode))) - goto corrupt; +if (unlikely (ip->i_no_addr !=be64_to_cpu (str->di_num.no_addr))) { +gfs2_consist_inode (ip); +return -EIO ; + } +if (unlikely (!is_new &&inode_wrong_type (inode, mode))) { +gfs2_consist_inode (ip); +return -EIO ; + } ip->i_no_formal_ino =be64_to_cpu (str->di_num.no_formal_ino); inode->i_mode = mode;if (is_new) {
@@ -451,26 +455,28 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf)/* i_diskflags and i_eattr must be set before gfs2_set_inode_flags() */ gfs2_set_inode_flags (inode); height =be16_to_cpu (str->di_height); -if (unlikely (height > sdp->sd_max_height)) - goto corrupt; +if (unlikely (height > sdp->sd_max_height)) { +gfs2_consist_inode (ip); +return -EIO ; + } ip->i_height = (u8 )height; depth =be16_to_cpu (str->di_depth); -if (unlikely (depth >GFS2_DIR_MAX_DEPTH )) - goto corrupt; +if (unlikely (depth >GFS2_DIR_MAX_DEPTH )) { +gfs2_consist_inode (ip); +return -EIO ; + } ip->i_depth = (u8 )depth; ip->i_entries =be32_to_cpu (str->di_entries); -if (gfs2_is_stuffed (ip) && inode->i_size >gfs2_max_stuffed_size (ip)) - goto corrupt; - +if (gfs2_is_stuffed (ip) && inode->i_size >gfs2_max_stuffed_size (ip)) { +gfs2_consist_inode (ip); +return -EIO ; + }if (S_ISREG (inode->i_mode))gfs2_set_aops (inode);return 0 ; -corrupt: -gfs2_consist_inode (ip); -return -EIO ; }/**
fs/gfs2/xattr.c +16 -12
@@ -96,30 +96,34 @@ static int ea_foreach_i(struct gfs2_inode *ip, struct buffer_head *bh,return -EIO ;for (ea =GFS2_EA_BH2FIRST (bh);; prev = ea, ea =GFS2_EA2NEXT (ea)) { -if (!GFS2_EA_REC_LEN (ea)) - goto fail; +if (!GFS2_EA_REC_LEN (ea)) { +gfs2_consist_inode (ip); +return -EIO ; + }if (!(bh->b_data <= (char *)ea && (char *)GFS2_EA2NEXT (ea) <= - bh->b_data + bh->b_size)) - goto fail; -if (!gfs2_eatype_valid (sdp, ea->ea_type)) - goto fail; + bh->b_data + bh->b_size)) { +gfs2_consist_inode (ip); +return -EIO ; + } +if (!gfs2_eatype_valid (sdp, ea->ea_type)) { +gfs2_consist_inode (ip); +return -EIO ; + } error =ea_call (ip, bh, ea, prev, data);if (error)return error;if (GFS2_EA_IS_LAST (ea)) {if ((char *)GFS2_EA2NEXT (ea) != - bh->b_data + bh->b_size) - goto fail; + bh->b_data + bh->b_size) { +gfs2_consist_inode (ip); +return -EIO ; + }break ; } }return error; - -fail: -gfs2_consist_inode (ip); -return -EIO ; }static int ea_foreach (struct gfs2_inode *ip,ea_call_t ea_call,void *data)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 140/160 gfs2: Validate i_depth for exhash directories
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Price <[email protected]>
[ Upstream commit 557c024ca7250bb65ae60f16c02074106c2f197b ]
A fuzzer test introduced corruption that ends up with a depth of 0 in dir_e_read(), causing an undefined shift by 32 at:
index = hash >> (32 - dip->i_depth);
As calculated in an open-coded way in dir_make_exhash(), the minimum depth for an exhash directory is ilog2(sdp->sd_hash_ptrs) and 0 is invalid as sdp->sd_hash_ptrs is fixed as sdp->bsize / 16 at mount time.
So we can avoid the undefined behaviour by checking for depth values lower than the minimum in gfs2_dinode_in(). Values greater than the maximum are already being checked for there.
Also switch the calculation in dir_make_exhash() to use ilog2() to clarify how the depth is calculated.
Tested with the syzkaller repro.c and xfstests '-g quick'.
--- fs/gfs2/dir.c | 6 ++---- fs/gfs2/glops.c | 6 ++++++ 2 files changed, 8 insertions(+), 4 deletions(-)
fs/gfs2/dir.c +2 -4
@@ -60,6 +60,7 @@#include <linux/crc32.h> #include <linux/vmalloc.h> #include <linux/bio.h> +#include <linux/log2.h> #include "gfs2.h" #include "incore.h"
@@ -912,7 +913,6 @@ static int dir_make_exhash(struct inode *inode)struct qstr args;struct buffer_head *bh, *dibh;struct gfs2_leaf *leaf; -int y;u32 x;__be64 *lp;u64 bn;
@@ -979,9 +979,7 @@ static int dir_make_exhash(struct inode *inode)i_size_write (inode, sdp->sd_sb.sb_bsize /2 );gfs2_add_inode_blocks (&dip->i_inode,1 ); dip->i_diskflags |=GFS2_DIF_EXHASH ; - -for (x = sdp->sd_hash_ptrs, y =-1 ; x; x >>=1 , y++) ; - dip->i_depth = y; + dip->i_depth =ilog2 (sdp->sd_hash_ptrs);gfs2_dinode_out (dip, dibh->b_data);
fs/gfs2/glops.c +6 -0
@@ -11,6 +11,7 @@#include <linux/bio.h> #include <linux/posix_acl.h> #include <linux/security.h> +#include <linux/log2.h> #include "gfs2.h" #include "incore.h"
@@ -466,6 +467,11 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf)gfs2_consist_inode (ip);return -EIO ; } +if ((ip->i_diskflags &GFS2_DIF_EXHASH ) && + depth <ilog2 (sdp->sd_hash_ptrs)) { +gfs2_consist_inode (ip); +return -EIO ; + } ip->i_depth = (u8 )depth; ip->i_entries =be32_to_cpu (str->di_entries);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 141/160 LoongArch: vDSO: Emit GNU_EH_FRAME correctly
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xi Ruoyao <[email protected]>
With -fno-asynchronous-unwind-tables and --no-eh-frame-hdr (the default of the linker), the GNU_EH_FRAME segment (specified by vdso.lds.S) is empty. This is not valid, as the current DWARF specification mandates the first byte of the EH frame to be the version number 1. It causes some unwinders to complain, for example the ClickHouse query profiler spams the log with messages:
clickhouse-server[365854]: libunwind: unsupported .eh_frame_hdr
version: 127 at 7ffffffb0000
Here "127" is just the byte located at the p_vaddr (0, i.e. the beginning of the vDSO) of the empty GNU_EH_FRAME segment. Cross- checking with /proc/365854/maps has also proven 7ffffffb0000 is the start of vDSO in the process VM image.
In LoongArch the -fno-asynchronous-unwind-tables option seems just a MIPS legacy, and MIPS only uses this option to satisfy the MIPS-specific "genvdso" program, per the commit cfd75c2db17e ("MIPS: VDSO: Explicitly use -fno-asynchronous-unwind-tables"). IIRC it indicates some inherent limitation of the MIPS ELF ABI and has nothing to do with LoongArch. So we can simply flip it over to -fasynchronous-unwind-tables and pass --eh-frame-hdr for linking the vDSO, allowing the profilers to unwind the stack for statistics even if the sample point is taken when the PC is in the vDSO.
However simply adjusting the options above would exploit an issue: when the libgcc unwinder saw the invalid GNU_EH_FRAME segment, it silently falled back to a machine-specific routine to match the code pattern of rt_sigreturn() and extract the registers saved in the sigframe if the code pattern is matched. As unwinding from signal handlers is vital for libgcc to support pthread cancellation etc., the fall-back routine had been silently keeping the LoongArch Linux systems functioning since Linux 5.19. But when we start to emit GNU_EH_FRAME with the correct format, fall-back routine will no longer be used and libgcc will fail to unwind the sigframe, and unwinding from signal handlers will no longer work, causing dozens of glibc test failures. To make it possible to unwind from signal handlers again, it's necessary to code the unwind info in __vdso_rt_sigreturn via .cfi_* directives.
The offsets in the .cfi_* directives depend on the layout of struct sigframe, notably the offset of sigcontext in the sigframe. To use the offset in the assembly file, factor out struct sigframe into a header to allow asm-offsets.c to output the offset for assembly.
To work around a long-term issue in the libgcc unwinder (the pc is unconditionally substracted by 1: doing so is technically incorrect for a signal frame), a nop instruction is included with the two real instructions in __vdso_rt_sigreturn in the same FDE PC range. The same hack has been used on x86 for a long time.
(cherry picked from commit e4878c37f6679fdea91b27a0f4e60a871f0b7bad)
--- arch/loongarch/include/asm/linkage.h | 36 +++++++++++++++++++++++++++ arch/loongarch/include/asm/sigframe.h | 9 +++++++ arch/loongarch/kernel/asm-offsets.c | 2 ++ arch/loongarch/kernel/signal.c | 6 +---- arch/loongarch/vdso/Makefile | 4 +-- arch/loongarch/vdso/sigreturn.S | 6 ++--- 6 files changed, 53 insertions(+), 10 deletions(-) create mode 100644 arch/loongarch/include/asm/sigframe.h
arch/loongarch/include/asm/linkage.h +36 -0
@@ -41,4 +41,40 @@ .cfi_endproc; \SYM_END (name,SYM_T_NONE ) +/* +* This is for the signal handler trampoline, which is used as the return +* address of the signal handlers in userspace instead of called normally. +* The long standing libgcc bug https://gcc.gnu.org/PR124050 requires a +* nop between .cfi_startproc and the actual address of the trampoline, so +* we cannot simply use SYM_FUNC_START. +* +* This wrapper also contains all the .cfi_* directives for recovering +* the content of the GPRs and the "return address" (where the rt_sigreturn +* syscall will jump to), assuming there is a struct rt_sigframe (where +* a struct sigcontext containing those information we need to recover) at +* $sp. The "DWARF for the LoongArch(TM) Architecture" manual states +* column 0 is for $zero, but it does not make too much sense to +* save/restore the hardware zero register. Repurpose this column here +* for the return address (here it's not the content of $ra we cannot use +* the default column 3). + */ +#define SYM_SIGFUNC_START (name) \ + .cfi_startproc; \ + .cfi_signal_frame; \ + .cfi_def_cfa 3, RT_SIGFRAME_SC; \ + .cfi_return_column 0; \ + .cfi_offset 0, SC_PC; \ + \ + .irp num, 1, 2, 3, 4, 5, 6, 7, 8, \ + 9, 10, 11, 12, 13, 14, 15, 16, \ + 17, 18, 19, 20, 21, 22, 23, 24, \ + 25, 26, 27, 28, 29, 30, 31; \ + .cfi_offset \num, SC_REGS + \num * SZREG; \ + .endr; \ + \ + nop; \ + SYM_START(name, SYM_L_GLOBAL, SYM_A_ALIGN) + +#define SYM_SIGFUNC_END (name) SYM_FUNC_END(name) +#endif
arch/loongarch/include/asm/sigframe.h new file +9 -0
@@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ + +#include <asm/siginfo.h> +#include <asm/ucontext.h> + +struct rt_sigframe { +struct siginfo rs_info; +struct ucontext rs_uctx; +};
arch/loongarch/kernel/asm-offsets.c +2 -0
@@ -15,6 +15,7 @@#include <asm/ptrace.h> #include <asm/processor.h> #include <asm/ftrace.h> +#include <asm/sigframe.h> void output_ptreg_defines (void ) {
@@ -218,6 +219,7 @@ void output_sc_defines(void)COMMENT ("Linux sigcontext offsets." );OFFSET (SC_REGS , sigcontext, sc_regs);OFFSET (SC_PC , sigcontext, sc_pc); +OFFSET (RT_SIGFRAME_SC , rt_sigframe, rs_uctx.uc_mcontext);BLANK (); }
arch/loongarch/kernel/signal.c +1 -5
@@ -34,6 +34,7 @@#include <asm/cpu-features.h> #include <asm/fpu.h> #include <asm/lbt.h> +#include <asm/sigframe.h> #include <asm/ucontext.h> #include <asm/vdso.h>
@@ -71,11 +72,6 @@ extern asmlinkage int _save_ftop_context(void __user *ftop); extern asmlinkage int _restore_ftop_context(void __user *ftop);#endif -struct rt_sigframe { -struct siginfo rs_info; -struct ucontext rs_uctx; -}; -struct _ctx_layout {struct sctx_info *addr;unsigned int size;
arch/loongarch/vdso/Makefile +2 -2
@@ -24,7 +24,7 @@ cflags-vdso := $(ccflags-vdso) \ $(filter -W%,$(filter-out -Wa$(comma)%,$(KBUILD_CFLAGS))) \ -std=gnu11 -O2 -g -fno-strict-aliasing -fno-common -fno-builtin \ -fno-stack-protector -fno-jump-tables -DDISABLE_BRANCH_PROFILING \ - $(call cc-option, -fno-asynchronous-unwind-tables) \ + $(call cc-option, -fasynchronous-unwind-tables) \ $(call cc-option, -fno-stack-protector) aflags-vdso := $(ccflags-vdso) \ -D__ASSEMBLY__ -Wa,-gdwarf-2
@@ -36,7 +36,7 @@ endif # VDSO linker flags. ldflags-y := -Bsymbolic --no-undefined -soname=linux-vdso.so.1 \ $(filter -E%,$(KBUILD_CFLAGS)) -nostdlib -shared \ - --hash-style=sysv --build-id -T + --hash-style=sysv --build-id --eh-frame-hdr -T GCOV_PROFILE := n
arch/loongarch/vdso/sigreturn.S +3 -3
@@ -12,13 +12,13 @@ #include <asm/regdef.h> #include <asm/asm.h> +#include <asm/asm-offsets.h> .section .text - .cfi_sections .debug_frame -SYM_FUNC_START(__vdso_rt_sigreturn) +SYM_SIGFUNC_START(__vdso_rt_sigreturn) li.w a7, __NR_rt_sigreturn syscall 0 -SYM_FUNC_END(__vdso_rt_sigreturn) +SYM_SIGFUNC_END(__vdso_rt_sigreturn)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 142/160 usb: gadget: u_ether: Fix race between gether_disconnect and eth_stop
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuen-Han Tsai <[email protected]>
commit e1eabb072c75681f78312c484ccfffb7430f206e upstream.
A race condition between gether_disconnect() and eth_stop() leads to a NULL pointer dereference. Specifically, if eth_stop() is triggered concurrently while gether_disconnect() is tearing down the endpoints, eth_stop() attempts to access the cleared endpoint descriptor, causing the following NPE:
Unable to handle kernel NULL pointer dereference Call trace: __dwc3_gadget_ep_enable+0x60/0x788 dwc3_gadget_ep_enable+0x70/0xe4 usb_ep_enable+0x60/0x15c eth_stop+0xb8/0x108
Because eth_stop() crashes while holding the dev->lock, the thread running gether_disconnect() fails to acquire the same lock and spins forever, resulting in a hardlockup:
Core - Debugging Information for Hardlockup core(7)
Call trace: queued_spin_lock_slowpath+0x94/0x488 _raw_spin_lock+0x64/0x6c gether_disconnect+0x19c/0x1e8 ncm_set_alt+0x68/0x1a0 composite_setup+0x6a0/0xc50
The root cause is that the clearing of dev->port_usb in gether_disconnect() is delayed until the end of the function.
Move the clearing of dev->port_usb to the very beginning of gether_disconnect() while holding dev->lock. This cuts off the link immediately, ensuring eth_stop() will see dev->port_usb as NULL and safely bail out.
--- drivers/usb/gadget/function/u_ether.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/usb/gadget/function/u_ether.c +5 -5
@@ -1200,6 +1200,11 @@ void gether_disconnect(struct gether *liDBG (dev,"%s\n" , __func__); +spin_lock (&dev->lock); + dev->port_usb =NULL ; + link->is_suspend = false; +spin_unlock (&dev->lock); +netif_stop_queue (dev->net);netif_carrier_off (dev->net);
@@ -1237,11 +1242,6 @@ void gether_disconnect(struct gether *li dev->header_len =0 ; dev->unwrap =NULL ; dev->wrap =NULL ; - -spin_lock (&dev->lock); - dev->port_usb =NULL ; - link->is_suspend = false; -spin_unlock (&dev->lock); }EXPORT_SYMBOL_GPL (gether_disconnect);
Greg Kroah-Hartman
maintainerPATCH 143/160 usb: gadget: uvc: fix NULL pointer dereference during unbind race
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jimmy Hu <[email protected]>
commit eba2936bbe6b752a31725a9eb5c674ecbf21ee7d upstream.
Commit b81ac4395bbe ("usb: gadget: uvc: allow for application to cleanly shutdown") introduced two stages of synchronization waits totaling 1500ms in uvc_function_unbind() to prevent several types of kernel panics. However, this timing-based approach is insufficient during power management (PM) transitions.
When the PM subsystem starts freezing user space processes, the wait_event_interruptible_timeout() is aborted early, which allows the unbind thread to proceed and nullify the gadget pointer (cdev->gadget = NULL):
[ 814.123447][ T947] configfs-gadget.g1 gadget.0: uvc: uvc_function_unbind() [ 814.178583][ T3173] PM: suspend entry (deep) [ 814.192487][ T3173] Freezing user space processes [ 814.197668][ T947] configfs-gadget.g1 gadget.0: uvc: uvc_function_unbind no clean disconnect, wait for release
When the PM subsystem resumes or aborts the suspend and tasks are restarted, the V4L2 release path is executed and attempts to access the already nullified gadget pointer, triggering a kernel panic:
[ 814.292597][ C0] PM: pm_system_irq_wakeup: 479 triggered dhdpcie_host_wake [ 814.386727][ T3173] Restarting tasks ... [ 814.403522][ T4558] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000030 [ 814.404021][ T4558] pc : usb_gadget_deactivate+0x14/0xf4 [ 814.404031][ T4558] lr : usb_function_deactivate+0x54/0x94 [ 814.404078][ T4558] Call trace: [ 814.404080][ T4558] usb_gadget_deactivate+0x14/0xf4 [ 814.404083][ T4558] usb_function_deactivate+0x54/0x94 [ 814.404087][ T4558] uvc_function_disconnect+0x1c/0x5c [ 814.404092][ T4558] uvc_v4l2_release+0x44/0xac [ 814.404095][ T4558] v4l2_release+0xcc/0x130
Address the race condition and NULL pointer dereference by:
1. State Synchronization (flag + mutex)
Introduce a 'func_unbound' flag in struct uvc_device. This allows uvc_function_disconnect() to safely skip accessing the nullified cdev->gadget pointer. As suggested by Alan Stern, this flag is protected by a new mutex (uvc->lock) to ensure proper memory ordering and prevent instruction reordering or speculative loads. This mutex is also used to protect 'func_connected' for consistent state management.
2. Explicit Synchronization (completion)
Use a completion to synchronize uvc_function_unbind() with the uvc_vdev_release() callback. This prevents Use-After-Free (UAF) by ensuring struct uvc_device is freed after all video device resources are released.
--- drivers/usb/gadget/function/f_uvc.c | 39 ++++++++++++++++++++++++++++++--- drivers/usb/gadget/function/uvc.h | 3 ++ drivers/usb/gadget/function/uvc_v4l2.c | 5 +++- 3 files changed, 43 insertions(+), 4 deletions(-)
drivers/usb/gadget/function/f_uvc.c +36 -3
@@ -410,6 +410,12 @@ uvc_function_disconnect(struct uvc_devic {int ret; +guard (mutex)(&uvc->lock); +if (uvc->func_unbound) { +dev_dbg (&uvc->vdev.dev,"skipping function deactivate (unbound)\n" ); +return ; + } +if ((ret =usb_function_deactivate (&uvc->func)) <0 )uvcg_info (&uvc->func,"UVC disconnect failed with %d\n" , ret); }
@@ -428,6 +434,15 @@ static ssize_t function_name_show(structstatic DEVICE_ATTR_RO (function_name); +static void uvc_vdev_release (struct video_device *vdev) +{ +struct uvc_device *uvc =video_get_drvdata (vdev); + +/* Signal uvc_function_unbind() that the video device has been released */ +if (uvc->vdev_release_done) +complete (uvc->vdev_release_done); +} +static int uvc_register_video (struct uvc_device *uvc) {
@@ -440,7 +455,7 @@ uvc_register_video(struct uvc_device *uv uvc->vdev.v4l2_dev->dev = &cdev->gadget->dev; uvc->vdev.fops = &uvc_v4l2_fops; uvc->vdev.ioctl_ops = &uvc_v4l2_ioctl_ops; - uvc->vdev.release = video_device_release_empty; + uvc->vdev.release = uvc_vdev_release; uvc->vdev.vfl_dir =VFL_DIR_TX ; uvc->vdev.lock = &uvc->video.mutex; uvc->vdev.device_caps =V4L2_CAP_VIDEO_OUTPUT |V4L2_CAP_STREAMING ;
@@ -653,6 +668,8 @@ uvc_function_bind(struct usb_configuratiint ret = -EINVAL ;uvcg_info (f,"%s()\n" , __func__); +scoped_guard (mutex, &uvc->lock) + uvc->func_unbound = false; opts =fi_to_f_uvc_opts (f->fi);/* Sanity check the streaming endpoint module parameters. */
@@ -975,12 +992,19 @@ static void uvc_free(struct usb_functionstatic void uvc_function_unbind (struct usb_configuration *c,struct usb_function *f) { +DECLARE_COMPLETION_ONSTACK (vdev_release_done);struct usb_composite_dev *cdev = c->cdev;struct uvc_device *uvc =to_uvc (f);struct uvc_video *video = &uvc->video;long wait_ret =1 ; +bool connected;uvcg_info (f,"%s()\n" , __func__); + scoped_guard(mutex, &uvc->lock) { + uvc->func_unbound = true; + uvc->vdev_release_done = &vdev_release_done; + connected = uvc->func_connected; + }if (video->async_wq)destroy_workqueue (video->async_wq);
@@ -991,7 +1015,7 @@ static void uvc_function_unbind(struct u* though the video device removal uevent. Allow some time for the * application to close out before things get deleted. */ -if (uvc->func_connected) { +if (connected) {uvcg_dbg (f,"waiting for clean disconnect\n" ); wait_ret =wait_event_interruptible_timeout (uvc->func_connected_queue, uvc->func_connected == false,msecs_to_jiffies (500 ));
@@ -1002,7 +1026,10 @@ static void uvc_function_unbind(struct uvideo_unregister_device (&uvc->vdev);v4l2_device_unregister (&uvc->v4l2_dev); -if (uvc->func_connected) { +scoped_guard (mutex, &uvc->lock) + connected = uvc->func_connected; + +if (connected) {/* * Wait for the release to occur to ensure there are no longer any * pending operations that may cause panics when resources are cleaned
@@ -1014,6 +1041,10 @@ static void uvc_function_unbind(struct uuvcg_dbg (f,"done waiting for release with ret: %ld\n" , wait_ret); } +/* Wait for the video device to be released */ +wait_for_completion (&vdev_release_done); + uvc->vdev_release_done =NULL ; +usb_ep_free_request (cdev->gadget->ep0, uvc->control_req);kfree (uvc->control_buf);
@@ -1032,6 +1063,8 @@ static struct usb_function *uvc_alloc(streturn ERR_PTR (-ENOMEM );mutex_init (&uvc->video.mutex); +mutex_init (&uvc->lock); + uvc->func_unbound = true; uvc->state =UVC_STATE_DISCONNECTED ;init_waitqueue_head (&uvc->func_connected_queue); opts =fi_to_f_uvc_opts (fi);
drivers/usb/gadget/function/uvc.h +3 -0
@@ -131,6 +131,9 @@ struct uvc_device {enum uvc_state state;struct usb_function func;struct uvc_video video; +struct completion *vdev_release_done; +struct mutex lock;/* protects func_unbound and func_connected */ +bool func_unbound;bool func_connected;wait_queue_head_t func_connected_queue;
drivers/usb/gadget/function/uvc_v4l2.c +4 -1
@@ -491,6 +491,8 @@ uvc_v4l2_subscribe_event(struct v4l2_fhif (sub->type <UVC_EVENT_FIRST || sub->type >UVC_EVENT_LAST )return -EINVAL ; +guard (mutex)(&uvc->lock); +if (sub->type ==UVC_EVENT_SETUP && uvc->func_connected)return -EBUSY ;
@@ -512,7 +514,8 @@ static void uvc_v4l2_disable(struct uvc_uvc_function_disconnect (uvc);uvcg_video_enable (&uvc->video,0 );uvcg_free_buffers (&uvc->video.queue); - uvc->func_connected = false; +scoped_guard (mutex, &uvc->lock) + uvc->func_connected = false;wake_up_interruptible (&uvc->func_connected_queue); }
Greg Kroah-Hartman
maintainerPATCH 144/160 usb: gadget: f_subset: Fix unbalanced refcnt in geth_free
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuen-Han Tsai <[email protected]>
commit caa27923aacd8a5869207842f2ab1657c6c0c7bc upstream.
geth_alloc() increments the reference count, but geth_free() fails to decrement it. This prevents the configuration of attributes via configfs after unlinking the function.
Decrement the reference count in geth_free() to ensure proper cleanup.
--- drivers/usb/gadget/function/f_subset.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/usb/gadget/function/f_subset.c +6 -0
@@ -6,6 +6,7 @@* Copyright (C) 2008 Nokia Corporation */ +#include <linux/cleanup.h> #include <linux/slab.h> #include <linux/kernel.h> #include <linux/module.h>
@@ -449,8 +450,13 @@ static struct usb_function_instance *getstatic void geth_free (struct usb_function *f) {struct f_gether *eth; +struct f_gether_opts *opts; + + opts = container_of(f->fi, struct f_gether_opts, func_inst); eth =func_to_geth (f); +scoped_guard (mutex, &opts->lock) + opts->refcnt--;kfree (eth); }
Greg Kroah-Hartman
maintainerPATCH 145/160 usb: gadget: f_rndis: Protect RNDIS options with mutex
In reply to Greg Kroah-Hartman6.6-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuen-Han Tsai <[email protected]>
commit 8d8c68b1fc06ece60cf43e1306ff0f4ac121547e upstream.
The class/subclass/protocol options are suspectible to race conditions as they can be accessed concurrently through configfs.
Use existing mutex to protect these options. This issue was identified during code inspection.
--- drivers/usb/gadget/function/f_rndis.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/usb/gadget/function/f_rndis.c +6 -3
@@ -11,6 +11,7 @@/* #define VERBOSE_DEBUG */ +#include <linux/cleanup.h> #include <linux/slab.h> #include <linux/kernel.h> #include <linux/module.h>
@@ -678,9 +679,11 @@ rndis_bind(struct usb_configuration *c,return -ENOMEM ; } - rndis_iad_descriptor.bFunctionClass = rndis_opts->class; - rndis_iad_descriptor.bFunctionSubClass = rndis_opts->subclass; - rndis_iad_descriptor.bFunctionProtocol = rndis_opts->protocol; + scoped_guard(mutex, &rndis_opts->lock) { + rndis_iad_descriptor.bFunctionClass = rndis_opts->class; + rndis_iad_descriptor.bFunctionSubClass = rndis_opts->subclass; + rndis_iad_descriptor.bFunctionProtocol = rndis_opts->protocol; + }/* * in drivers/usb/gadget/configfs.c:configfs_composite_bind()