5.15.190-rc1 review
Subsystems (5)
Greg Kroah-Hartman
maintainercover 5.15.190-rc1 review
This is the start of the stable review cycle for the 5.15.190 release. There are 644 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 28 Aug 2025 11:08:21 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.190-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.15.190-rc1
Mikhail Lobanov <[email protected]>
wifi: mac80211: check basic rates validity in sta_link_apply_parameters
Florian Westphal <[email protected]>
netfilter: nf_reject: don't leak dst refcount for loopback packets
Peter Oberparleiter <[email protected]>
s390/hypfs: Enable limited access during lockdown
Peter Oberparleiter <[email protected]>
s390/hypfs: Avoid unnecessary ioctl registration in debugfs
Takashi Iwai <[email protected]>
ALSA: usb-audio: Use correct sub-type for UAC3 feature unit validation
Hangbin Liu <[email protected]>
bonding: update LACP activity flag after setting lacp_active
William Liu <[email protected]>
net/sched: Remove unnecessary WARNING condition for empty child qdisc in htb_activate
William Liu <[email protected]>
net/sched: Make cake_enqueue return NET_XMIT_CN when past buffer_limit
ValdikSS <[email protected]>
igc: fix disabling L1.2 PCI-E link substate on I226 on init
Jason Xing <[email protected]>
ixgbe: xsk: resolve the negative overflow of budget in ixgbe_xmit_zc
Yuichiro Tsuji <[email protected]>
net: usb: asix_devices: Fix PHY address mask in MDIO bus initialization
Horatiu Vultur <[email protected]>
phy: mscc: Fix timestamping for vsc8584
Sebastian Andrzej Siewior <[email protected]>
net: phy: Use netif_rx().
Qingfang Deng <[email protected]>
ppp: fix race conditions in ppp_fill_forward_path
Minhong He <[email protected]>
ipv6: sr: validate HMAC algorithm ID in seg6_hmac_info_add
Chenyuan Yang <[email protected]>
drm/amd/display: Add null pointer check in mod_hdcp_hdcp1_create_session()
Dan Carpenter <[email protected]>
ALSA: usb-audio: Fix size validation in convert_chmap_v3()
Baihan Li <[email protected]>
drm/hisilicon/hibmc: fix the hibmc loaded failed bug
Ido Schimmel <[email protected]>
mlxsw: spectrum: Forward packets with an IPv4 link-local source IP
Kees Cook <[email protected]>
iommu/amd: Avoid stack buffer overflow from kernel cmdline
Dan Carpenter <[email protected]>
scsi: qla4xxx: Prevent a potential error pointer dereference
Wang Liang <[email protected]>
net: bridge: fix soft lockup in br_multicast_query_expired()
Anantha Prabhu <[email protected]>
RDMA/bnxt_re: Fix to initialize the PBL array
Waiman Long <[email protected]>
cgroup/cpuset: Use static_branch_enable_cpuslocked() on cpusets_insane_config_key
Feng Tang <[email protected]>
mm/page_alloc: detect allocation forbidden by cpuset and bail out early
Tianxiang Peng <[email protected]>
x86/cpu/hygon: Add missing resctrl_cpu_detect() in bsp_init helper
Jinjiang Tu <[email protected]>
mm/memory-failure: fix infinite UCE for VM_PFNMAP pfn
Jonathan Cameron <[email protected]>
iio: light: as73211: Ensure buffer holes are zeroed
Pu Lehui <[email protected]>
tracing: Limit access to parser->buffer when trace_get_user failed
Steven Rostedt <[email protected]>
tracing: Remove unneeded goto out logic
Jean-Baptiste Maneyrol <[email protected]>
iio: imu: inv_icm42600: change invalid data error to -EBUSY
Weitao Wang <[email protected]>
usb: xhci: Fix slot_id resource race conflict
Jan Beulich <[email protected]>
compiler: remove __ADDRESSABLE_ASM{_STR,}() again
Matthieu Baerts (NGI0) <[email protected]>
selftests: mptcp: pm: check flush doesn't reset limits
Uwe Kleine-König <[email protected]>
pwm: mediatek: Fix duty and period setting
Uwe Kleine-König <[email protected]>
pwm: mediatek: Handle hardware enable and clock enable separately
Uwe Kleine-König <[email protected]>
pwm: mediatek: Implement .apply() callback
Ranjan Kumar <[email protected]>
scsi: mpi3mr: Serialize admin queue BAR writes on 32-bit systems
Ranjan Kumar <[email protected]>
scsi: mpi3mr: Drop unnecessary volatile from __iomem pointers
André Draszik <[email protected]>
scsi: ufs: exynos: Fix programming of HCI_UTRL_NEXUS_TYPE
David Lechner <[email protected]>
iio: adc: ad_sigma_delta: change to buffer predisable
Bjorn Andersson <[email protected]>
soc: qcom: mdt_loader: Ensure we don't read past the ELF header
Johan Hovold <[email protected]>
wifi: ath11k: fix dest ring-buffer corruption when ring is full
Kefeng Wang <[email protected]>
asm-generic: Add memory barrier dma_mb()
Marco Elver <[email protected]>
locking/barriers, kcsan: Support generic instrumentation
Jorge Ramirez-Ortiz <[email protected]>
media: venus: protect against spurious interrupts during probe
Dikshita Agarwal <[email protected]>
media: venus: Add support for SSR trigger using fault injection
Sasha Levin <[email protected]>
media: qcom: camss: cleanup media device allocated resource on error path
Uwe Kleine-König <[email protected]>
media: camss: Convert to platform remove callback returning void
Chao Yu <[email protected]>
f2fs: fix to avoid out-of-boundary access in dnode page
Imre Deak <[email protected]>
drm/dp: Change AUX DPCD probe address from DPCD_REV to LANE0_1_STATUS
Geliang Tang <[email protected]>
mptcp: disable add_addr retransmission when timeout is 0
Timur Kristóf <[email protected]>
drm/amd/display: Don't overclock DCE 6 by 15%
Selvarasu Ganesan <[email protected]>
usb: dwc3: Remove WARN_ON for device endpoint command timeouts
Kuen-Han Tsai <[email protected]>
usb: dwc3: Ignore late xferNotReady event to prevent halt timeout
Zenm Chen <[email protected]>
USB: storage: Ignore driver CD mode for Realtek multi-mode Wi-Fi dongles
Thorsten Blum <[email protected]>
usb: storage: realtek_cr: Use correct byte order for bcs->Residue
Mael GUERIN <[email protected]>
USB: storage: Add unusual-devs entry for Novatek NTK96550-based camera
Marek Vasut <[email protected]>
usb: renesas-xhci: Fix External ROM access timeouts
Xu Yang <[email protected]>
usb: core: hcd: fix accessing unmapped memory in SINGLE_STEP_SET_FEATURE test
Ian Abbott <[email protected]>
comedi: Fix use of uninitialized memory in do_insn_ioctl() and do_insnlist_ioctl()
Edward Adam Davis <[email protected]>
comedi: pcl726: Prevent invalid irq number
Ian Abbott <[email protected]>
comedi: Make insn_rw_emulate_bits() do insn->n samples
Miao Li <[email protected]>
usb: quirks: Add DELAY_INIT quick for another SanDisk 3.2Gen1 Flash Drive
Miaoqian Lin <[email protected]>
most: core: Drop device reference after usage in get_channel()
David Lechner <[email protected]>
iio: proximity: isl29501: fix buffered read on big-endian systems
Salah Triki <[email protected]>
iio: pressure: bmp280: Use IS_ERR() in bmp280_common_probe()
Steven Rostedt <[email protected]>
ftrace: Also allocate and copy hash for reading of filter files
Xu Yilun <[email protected]>
fpga: zynq_fpga: Fix the wrong usage of dma_map_sgtable()
Al Viro <[email protected]>
use uniform permission checks for all mount propagation changes
Ye Bin <[email protected]>
fs/buffer: fix use-after-free when call bh_read() helper
Timur Kristóf <[email protected]>
drm/amd/display: Fill display clock and vblank time in dce110_fill_display_configs
Timur Kristóf <[email protected]>
drm/amd/display: Find first CRTC and its line time in dce110_fill_display_configs
Timur Kristóf <[email protected]>
drm/amd/display: Fix DP audio DTO1 clock source on DCE 6.
Timur Kristóf <[email protected]>
drm/amd/display: Fix fractional fb divider in set_pixel_clock_v3
Mario Limonciello <[email protected]>
drm/amd/display: Avoid a NULL pointer dereference
Evgeniy Harchenko <[email protected]>
ALSA: hda/realtek: Add support for HP EliteBook x360 830 G6 and EliteBook 830 G6
Herton R. Krzesinski <[email protected]>
mm/debug_vm_pgtable: clear page table entries at destroy_args()
Phillip Lougher <[email protected]>
squashfs: fix memory leak in squashfs_fill_super
Victor Shih <[email protected]>
mmc: sdhci-pci-gli: GL9763e: Rename the gli_set_gl9763e() for consistency
Jiayi Li <[email protected]>
memstick: Fix deadlock by moving removing flag earlier
Will Deacon <[email protected]>
KVM: arm64: Fix kernel BUG() due to bad backport of FPSIMD/SVE/SME fix
Adrian Hunter <[email protected]>
scsi: ufs: ufs-pci: Fix default runtime and system PM levels
Archana Patni <[email protected]>
scsi: ufs: ufs-pci: Fix hibernate state transition for Intel MTL-like host controllers
Paolo Abeni <[email protected]>
mptcp: do not queue data on closed subflows
Geliang Tang <[email protected]>
mptcp: drop unused sk in mptcp_push_release
Mat Martineau <[email protected]>
selftests: mptcp: Initialize variables to quiet gcc 12 warnings
Paolo Abeni <[email protected]>
mptcp: introduce MAPPING_BAD_CSUM
Paolo Abeni <[email protected]>
mptcp: fix error mibs accounting
Matthieu Baerts <[email protected]>
selftests: mptcp: add missing join check
Matthieu Baerts (NGI0) <[email protected]>
selftests: mptcp: connect: also cover checksum
Matthieu Baerts (NGI0) <[email protected]>
selftests: mptcp: connect: also cover alt modes
Florian Westphal <[email protected]>
selftests: mptcp: make sendfile selftest work
Thomas Weißschuh <[email protected]>
kbuild: userprogs: use correct linker when mixing clang and GNU ld
Li Zhong <[email protected]>
ACPI: processor: idle: Check acpi_fetch_acpi_dev() return value
Nirmal Patel <[email protected]>
PCI: vmd: Assign VMD IRQ domain before enumeration
Cong Wang <[email protected]>
sch_htb: make htb_deactivate() idempotent
Cong Wang <[email protected]>
codel: remove sch->q.qlen check before qdisc_tree_reduce_backlog()
Cong Wang <[email protected]>
sch_drr: make drr_qlen_notify() idempotent
Qu Wenruo <[email protected]>
btrfs: populate otime when logging an inode item
Chao Gao <[email protected]>
KVM: VMX: Flush shadow VMCS on emergency reboot
Davide Caratti <[email protected]>
net/sched: ets: use old 'nbands' while purging unused classes
Eric Dumazet <[email protected]>
net_sched: sch_ets: implement lockless ets_dump()
Davide Caratti <[email protected]>
net/sched: sch_ets: properly init all active DRR list handles
Tzung-Bi Shih <[email protected]>
platform/chrome: cros_ec: Unregister notifier in cros_ec_unregister()
Tzung-Bi Shih <[email protected]>
platform/chrome: cros_ec: remove unneeded label and if-condition
Chen-Yu Tsai <[email protected]>
platform/chrome: cros_ec: Use per-device lockdep key
Uwe Kleine-König <[email protected]>
platform/chrome: cros_ec: Make cros_ec_unregister() return void
Johan Hovold <[email protected]>
usb: dwc3: imx8mp: fix device leak at unbind
Youssef Samir <[email protected]>
bus: mhi: host: Detect events pointing to unexpected TREs
Damien Le Moal <[email protected]>
ata: Fix SATA_MOBILE_LPM_POLICY description in Kconfig
Johan Hovold <[email protected]>
usb: musb: omap2430: fix device leak at unbind
Uwe Kleine-König <[email protected]>
usb: musb: omap2430: Convert to platform remove callback returning void
Anshuman Khandual <[email protected]>
mm/ptdump: take the memory hotplug lock inside ptdump_walk_pgd()
Trond Myklebust <[email protected]>
NFS: Fix the setting of capabilities when automounting a new filesystem
Anna Schumaker <[email protected]>
NFS: Create an nfs4_server_set_init_caps() function
Johan Hovold <[email protected]>
net: enetc: fix device and OF node leak at probe
Damien Le Moal <[email protected]>
block: Make REQ_OP_ZONE_FINISH a write operation
Lukas Wunner <[email protected]>
PCI/ACPI: Fix runtime PM ref imbalance on Hot-Plug Capable ports
Sebastian Reichel <[email protected]>
usb: typec: fusb302: cache PD RX state
Haiyang Zhang <[email protected]>
hv_netvsc: Fix panic during namespace deletion with VF
Thorsten Blum <[email protected]>
smb: server: Fix extension string in ksmbd_extract_shortname()
Geoffrey D. Bennett <[email protected]>
ALSA: scarlett2: Add retry on -EPROTO from scarlett2_usb_tx()
Dave Hansen <[email protected]>
x86/fpu: Delay instruction pointer fixup until after warning
Wang Zhaolong <[email protected]>
smb: client: fix use-after-free in crypt_message when using async crypto
Mathias Nyman <[email protected]>
usb: hub: Don't try to recover devices lost during warm reset.
Mathias Nyman <[email protected]>
usb: hub: avoid warm port reset during USB3 disconnect
Yazen Ghannam <[email protected]>
x86/mce/amd: Add default names for MCA banks and blocks
Zhang Lixu <[email protected]>
iio: hid-sensor-prox: Fix incorrect OFFSET calculation
Zhang Lixu <[email protected]>
iio: hid-sensor-prox: Restore lost scale assignments
Chao Yu <[email protected]>
f2fs: fix to do sanity check on ino and xnid
Nathan Chancellor <[email protected]>
ARM: 9448/1: Use an absolute path to unified.h in KBUILD_AFLAGS
Ada Couprie Diaz <[email protected]>
arm64/entry: Mask DAIF in cpu_switch_to(), call_on_irq_stack()
Lin.Cao <[email protected]>
drm/sched: Remove optimization that causes hang when killing dependent jobs
Haoxiang Li <[email protected]>
ice: Fix a null pointer dereference in ice_copy_and_init_pkg()
Lorenzo Stoakes <[email protected]>
selftests/memfd: add test for mapping write-sealed memfd read-only
Lorenzo Stoakes <[email protected]>
mm: reinstate ability to map write-sealed memfd mappings read-only
Lorenzo Stoakes <[email protected]>
mm: update memfd seal write check to include F_SEAL_WRITE
Lorenzo Stoakes <[email protected]>
mm: drop the assumption that VM_SHARED always implies writable
Cong Wang <[email protected]>
sch_qfq: make qfq_qlen_notify() idempotent
Cong Wang <[email protected]>
sch_hfsc: make hfsc_qlen_notify() idempotent
Cong Wang <[email protected]>
sch_htb: make htb_qlen_notify() idempotent
Matthieu Baerts (NGI0) <[email protected]>
mptcp: pm: kernel: flush: do not reset ADD_ADDR limit
Christoph Paasch <[email protected]>
mptcp: drop skb if MPTCP skb extension allocation fails
Eric Biggers <[email protected]>
ipv6: sr: Fix MAC comparison to be constant-time
Jakub Acs <[email protected]>
net, hsr: reject HSR frame if skb can't hold tag
Timur Kristóf <[email protected]>
drm/amd/display: Don't overwrite dce60_clk_mgr
Mario Limonciello <[email protected]>
drm/amd: Restore cached power limit during resume
Ricardo Ribalda <[email protected]>
media: venus: venc: Clamp param smaller than 1fps and bigger than 240
Ricardo Ribalda <[email protected]>
media: venus: vdec: Clamp param smaller than 1fps and bigger than 240.
Jorge Ramirez-Ortiz <[email protected]>
media: venus: hfi: explicitly release IRQ during teardown
Vedang Nagar <[email protected]>
media: venus: Add a check for packet size after reading from shared memory
Zhang Shurong <[email protected]>
media: ov2659: Fix memory leaks in ov2659_probe()
Gui-Dong Han <[email protected]>
media: rainshadow-cec: fix TOCTOU race condition in rain_interrupt()
Ludwig Disterhof <[email protected]>
media: usbtv: Lock resolution while streaming
Sakari Ailus <[email protected]>
media: v4l2-ctrls: Don't reset handler's error in v4l2_ctrl_handler_free()
Haoxiang Li <[email protected]>
media: imx: fix a potential memory leak in imx_media_csc_scaler_device_init()
Bingbu Cao <[email protected]>
media: hi556: correct the test pattern configuration
Dan Carpenter <[email protected]>
media: gspca: Add bounds checking to firmware parser
Jon Hunter <[email protected]>
soc/tegra: pmc: Ensure power-domains are in a known state
Baokun Li <[email protected]>
jbd2: prevent softlockup in jbd2_log_do_checkpoint()
Damien Le Moal <[email protected]>
PCI: endpoint: Fix configfs group removal on driver teardown
Damien Le Moal <[email protected]>
PCI: endpoint: Fix configfs group list head handling
Thomas Fourier <[email protected]>
mtd: rawnand: fsmc: Add missing check after DMA map
Gabor Juhos <[email protected]>
mtd: spinand: propagate spinand_wait() errors from spinand_write_page()
Tim Harvey <[email protected]>
hwmon: (gsc-hwmon) fix fan pwm setpoint show functions
Laurentiu Mihalcea <[email protected]>
pwm: imx-tpm: Reset counter if CMOD is 0
Johan Hovold <[email protected]>
wifi: ath11k: fix source ring-buffer corruption
Nathan Chancellor <[email protected]>
wifi: brcmsmac: Remove const from tbl_ptr parameter in wlc_lcnphy_common_read_table()
Marek Szyprowski <[email protected]>
zynq_fpga: use sgtable-based scatterlist wrappers
Damien Le Moal <[email protected]>
ata: libata-scsi: Fix ata_to_sense_error() status handling
Ranjan Kumar <[email protected]>
scsi: mpi3mr: Fix race between config read submit and interrupt completion
Zhang Yi <[email protected]>
ext4: fix hole length calculation overflow in non-extent inodes
Liao Yuanhong <[email protected]>
ext4: use kmalloc_array() for array space allocation
Theodore Ts'o <[email protected]>
ext4: don't try to clear the orphan_present feature block device is r/o
Ojaswin Mujoo <[email protected]>
ext4: fix reserved gdt blocks handling in fsmap
Ojaswin Mujoo <[email protected]>
ext4: fix fsmap end of range reporting with bigalloc
Andreas Dilger <[email protected]>
ext4: check fast symlink for ea_inode correctly
Helge Deller <[email protected]>
Revert "vgacon: Add check for vc_origin address range in vgacon_scroll()"
Eric Biggers <[email protected]>
lib/crypto: mips/chacha: Fix clang build and remove unneeded byteswap
Myrrh Periwinkle <[email protected]>
vt: defkeymap: Map keycodes above 127 to K_HOLE
Myrrh Periwinkle <[email protected]>
vt: keyboard: Don't process Unicode characters in K_OFF mode
Alexander Wilhelm <[email protected]>
bus: mhi: host: Fix endianness of BHI vector table
Johan Hovold <[email protected]>
usb: dwc3: meson-g12a: fix device leaks at unbind
Johan Hovold <[email protected]>
usb: gadget: udc: renesas_usb3: fix device leak at unbind
Nathan Chancellor <[email protected]>
usb: atm: cxacru: Merge cxacru_upload_firmware() into cxacru_heavy_init()
Finn Thain <[email protected]>
m68k: Fix lost column on framebuffer debug console
Dan Carpenter <[email protected]>
cpufreq: armada-8k: Fix off by one in armada_8k_cpufreq_free_table()
Yunhui Cui <[email protected]>
serial: 8250: fix panic due to PSLVERR
Aditya Garg <[email protected]>
HID: magicmouse: avoid setting up battery timer when not needed
Ricardo Ribalda <[email protected]>
media: uvcvideo: Do not mark valid metadata as invalid
Youngjun Lee <[email protected]>
media: uvcvideo: Fix 1-byte out-of-bounds read in uvc_parse_format()
Breno Leitao <[email protected]>
mm/kmemleak: avoid deadlock by moving pr_warn() outside kmemleak_lock
Waiman Long <[email protected]>
mm/kmemleak: avoid soft lockup in __kmemleak_do_cleanup()
Randy Dunlap <[email protected]>
parisc: Makefile: fix a typo in palo.conf
Sravan Kumar Gundu <[email protected]>
fbdev: Fix vmalloc out-of-bounds write in fast_imageblit
Qu Wenruo <[email protected]>
btrfs: do not allow relocation of partially dropped subvolumes
Filipe Manana <[email protected]>
btrfs: fix log tree replay failure due to file with 0 links and extents
Oliver Neukum <[email protected]>
cdc-acm: fix race between initial clearing halt and open
Eric Biggers <[email protected]>
thunderbolt: Fix copy+paste error in match_service_id()
Ian Abbott <[email protected]>
comedi: fix race between polling and detaching
Myrrh Periwinkle <[email protected]>
usb: typec: ucsi: Update power_supply on power role change
Ricky Wu <[email protected]>
misc: rtsx: usb: Ensure mmc child device is active when card is present
Xinyu Liu <[email protected]>
usb: core: config: Prevent OOB read in SS endpoint companion parsing
Baokun Li <[email protected]>
ext4: fix largest free orders lists corruption on mb_optimize_scan switch
Jack Xiao <[email protected]>
drm/amdgpu: fix incorrect vm flags to map bo
Shengjiu Wang <[email protected]>
ASoC: fsl_sai: replace regmap_write with regmap_update_bits
Kuninori Morimoto <[email protected]>
ASoC: soc-dai.h: merge DAI call back functions into ops
Kuninori Morimoto <[email protected]>
ASoC: soc-dai.c: add missing flag check at snd_soc_pcm_dai_probe()
Jiasheng Jiang <[email protected]>
scsi: lpfc: Remove redundant assignment to avoid memory leak
Meagan Lloyd <[email protected]>
rtc: ds1307: remove clear of oscillator stop flag (OSF) in probe
Sergey Bashirov <[email protected]>
pNFS: Fix uninited ptr deref in block/scsi layout
Sergey Bashirov <[email protected]>
pNFS: Handle RPC size limit for layoutcommits
Sergey Bashirov <[email protected]>
pNFS: Fix disk addr range check in block/scsi layout
Sergey Bashirov <[email protected]>
pNFS: Fix stripe mapping in block/scsi layout
John Garry <[email protected]>
block: avoid possible overflow for chunk_sectors check in blk_stack_limits()
Buday Csaba <[email protected]>
net: phy: smsc: add proper reset flags for LAN8710A
Corey Minyard <[email protected]>
ipmi: Fix strcpy source and destination the same
Yann E. MORIN <[email protected]>
kconfig: lxdialog: fix 'space' to (de)select options
Masahiro Yamada <[email protected]>
kconfig: gconf: fix potential memory leak in renderer_edited()
Masahiro Yamada <[email protected]>
kconfig: gconf: avoid hardcoding model2 in on_treeview2_cursor_changed()
Breno Leitao <[email protected]>
ipmi: Use dev_warn_ratelimited() for incorrect message warnings
John Garry <[email protected]>
scsi: aacraid: Stop using PCI_IRQ_AFFINITY
Maurizio Lombardi <[email protected]>
scsi: target: core: Generate correct identifiers for PR OUT transport IDs
Ranjan Kumar <[email protected]>
scsi: Fix sas_user_scan() to handle wildcard and multi-channel scans
Shankari Anand <[email protected]>
kconfig: nconf: Ensure null termination where strncpy is used
Suchit Karunakaran <[email protected]>
kconfig: lxdialog: replace strcpy() with strncpy() in inputbox.c
fangzhong.zhou <[email protected]>
i2c: Force DLL0945 touchpad i2c freq to 100khz
Mikulas Patocka <[email protected]>
dm-mpath: don't print the "loaded" message if registering fails
Wolfram Sang <[email protected]>
i3c: don't fail if GETHDRCAP is unsupported
Meagan Lloyd <[email protected]>
rtc: ds1307: handle oscillator stop flag (OSF) for ds1341
Wolfram Sang <[email protected]>
i3c: add missing include to internal header
Purva Yeshi <[email protected]>
md: dm-zoned-target: Initialize return variable r to avoid uninitialized use
Bharat Bhushan <[email protected]>
crypto: octeontx2 - add timeout for load_fvc completion poll
chenchangcheng <[email protected]>
media: uvcvideo: Fix bandwidth issue for Alcor camera
Alex Guo <[email protected]>
media: dvb-frontends: w7090p: fix null-ptr-deref in w7090p_tuner_write_serpar and w7090p_tuner_read_serpar
Alex Guo <[email protected]>
media: dvb-frontends: dib7090p: fix null-ptr-deref in dib7090p_rw_on_apb()
Wolfram Sang <[email protected]>
media: usb: hdpvr: disable zero-length read messages
Dave Stevenson <[email protected]>
media: tc358743: Increase FIFO trigger level to 374
Dave Stevenson <[email protected]>
media: tc358743: Return an appropriate colorspace from tc358743_set_fmt
Dave Stevenson <[email protected]>
media: tc358743: Check I2C succeeded during probe
Cheick Traore <[email protected]>
pinctrl: stm32: Manage irq affinity settings
Damien Le Moal <[email protected]>
scsi: mpt3sas: Correctly handle ATA device errors
Justin Tee <[email protected]>
scsi: lpfc: Check for hdwq null ptr when cleaning up lpfc_vport structure
Arnd Bergmann <[email protected]>
RDMA/core: reduce stack using in nldev_stat_get_doit()
Yury Norov [NVIDIA] <[email protected]>
RDMA: hfi1: fix possible divide-by-zero in find_hw_thread_mask()
Johan Adolfsson <[email protected]>
leds: leds-lp50xx: Handle reg to get correct multi_index
Niklas Söderlund <[email protected]>
media: v4l2-common: Reduce warnings about missing V4L2_CID_LINK_FREQ control
Thomas Weißschuh <[email protected]>
MIPS: Don't crash in stack_top() for tasks without ABI or vDSO
Arnaud Lecomte <[email protected]>
jfs: upper bound check of tree index in dbAllocAG
Edward Adam Davis <[email protected]>
jfs: Regular file corruption check
Lizhi Xu <[email protected]>
jfs: truncate good inode pages when hard link is 0
jackysliu <[email protected]>
scsi: bfa: Double-free fix
Ziyan Fu <[email protected]>
watchdog: iTCO_wdt: Report error if timeout configuration fails
Shiji Yang <[email protected]>
MIPS: vpe-mt: add missing prototypes for vpe_{alloc,start,stop,free}Sebastian Reichel <[email protected]>
watchdog: dw_wdt: Fix default timeout
Amir Mohammad Jahangirzad <[email protected]>
fs/orangefs: use snprintf() instead of sprintf()
Showrya M N <[email protected]>
scsi: libiscsi: Initialize iscsi_conn->dd_data only if memory is allocated
Theodore Ts'o <[email protected]>
ext4: do not BUG when INLINE_DATA_FL lacks system.data xattr
Zhiqi Song <[email protected]>
crypto: hisilicon/hpre - fix dma unmap sequence
Pali Rohár <[email protected]>
cifs: Fix calling CIFSFindFirst() for root path without msearch
Aaron Plattner <[email protected]>
watchdog: sbsa: Adjust keepalive timeout to avoid MediaTek WS0 race condition
Jason Wang <[email protected]>
vhost: fail early when __vhost_add_used() fails
Álvaro Fernández Rojas <[email protected]>
net: dsa: b53: fix IP_MULTICAST_CTRL on BCM5325
Tvrtko Ursulin <[email protected]>
drm/ttm: Respect the shrinker core free target
Jakub Kicinski <[email protected]>
uapi: in6: restore visibility of most IPv6 socket options
Emily Deng <[email protected]>
drm/ttm: Should to return the evict error
Hari Kalavakunta <[email protected]>
net: ncsi: Fix buffer overflow in fetching version id
Thomas Fourier <[email protected]>
wifi: rtlwifi: fix possible skb memory leak in _rtl_pci_init_one_rxdesc()
Álvaro Fernández Rojas <[email protected]>
net: dsa: b53: prevent SWITCH_CTRL access on BCM5325
Álvaro Fernández Rojas <[email protected]>
net: dsa: b53: prevent DIS_LEARNING access on BCM5325
Álvaro Fernández Rojas <[email protected]>
net: dsa: b53: prevent GMII_PORT_OVERRIDE_CTRL access on BCM5325
Álvaro Fernández Rojas <[email protected]>
net: dsa: b53: fix b53_imp_vlan_setup for BCM5325
Alok Tiwari <[email protected]>
gve: Return error for unknown admin queue command
Gal Pressman <[email protected]>
net: vlan: Replace BUG() with WARN_ON_ONCE() in vlan_dev_* stubs
Mario Limonciello <[email protected]>
drm/amd: Allow printing VanGogh OD SCLK levels without setting dpm to manual
Heiner Kallweit <[email protected]>
dpaa_eth: don't use fixed_phy_change_carrier
Stanislaw Gruszka <[email protected]>
wifi: iwlegacy: Check rate_idx range after addition
Mina Almasry <[email protected]>
netmem: fix skb_frag_address_safe with unreadable skbs
Thomas Fourier <[email protected]>
wifi: rtlwifi: fix possible skb memory leak in _rtl_pci_rx_interrupt().
Wen Chen <[email protected]>
drm/amd/display: Fix 'failed to blank crtc!'
Pagadala Yesu Anjaneyulu <[email protected]>
wifi: iwlwifi: fw: Fix possible memory leak in iwl_fw_dbg_collect
Rand Deeb <[email protected]>
wifi: iwlwifi: dvm: fix potential overflow in rs_fill_link_cmd()
Ilya Bakoulin <[email protected]>
drm/amd/display: Separate set_gsl from set_gsl_source_select
Jonas Rebmann <[email protected]>
net: fec: allow disable coalescing
Eric Work <[email protected]>
net: atlantic: add set_power to fw_ops for atl2 to fix wol
zhangjianrong <[email protected]>
net: thunderbolt: Fix the parameter passing of tb_xdomain_enable_paths()/tb_xdomain_disable_paths()
Rob Clark <[email protected]>
drm/msm: use trylock for debugfs
Kuniyuki Iwashima <[email protected]>
ipv6: mcast: Check inet6_dev->dead under idev->mc_lock in __ipv6_dev_mc_inc().
Thomas Fourier <[email protected]>
(powerpc/512) Fix possible dma_unmap_single() on uninitialized pointer
Johannes Berg <[email protected]>
wifi: mac80211: don't complete management TX on SAE commit
Sven Schnelle <[email protected]>
s390/stp: Remove udelay from stp_sync_clock()
Avraham Stern <[email protected]>
wifi: iwlwifi: mvm: fix scan request validation
Juri Lelli <[email protected]>
sched/deadline: Fix accounting after global limits change
Alok Tiwari <[email protected]>
net: thunderx: Fix format-truncation warning in bgx_acpi_match_id()
Oscar Maes <[email protected]>
net: ipv4: fix incorrect MTU in broadcast routes
Ilan Peer <[email protected]>
wifi: cfg80211: Fix interface type validation
Matt Johnston <[email protected]>
net: mctp: Prevent duplicate binds
Paul E. McKenney <[email protected]>
rcu: Protect ->defer_qs_iw_pending from data race
Breno Leitao <[email protected]>
arm64: Mark kernel as tainted on SAE and SError panic
Leon Romanovsky <[email protected]>
net/mlx5e: Properly access RCU protected qdisc_sleeping variable
Thomas Fourier <[email protected]>
net: ag71xx: Add missing check after DMA map
Thomas Fourier <[email protected]>
et131x: Add missing check after DMA map
Alok Tiwari <[email protected]>
be2net: Use correct byte order and format string for TCP seq and ack_seq
Sven Schnelle <[email protected]>
s390/time: Use monotonic clock in get_cycles()
Johannes Berg <[email protected]>
wifi: cfg80211: reject HTC bit for management frames
Steven Rostedt <[email protected]>
ktest.pl: Prevent recursion of default variable options
Anthoine Bourgeois <[email protected]>
xen/netfront: Fix TX response spurious interrupts
Xinxin Wan <[email protected]>
ASoC: codecs: rt5640: Retry DEVICE_ID verification
Jonathan Santos <[email protected]>
iio: adc: ad7768-1: Ensure SYNC_IN pulse minimum timing requirement
Cristian Ciocaltea <[email protected]>
ALSA: usb-audio: Avoid precedence issues in mixer_quirks macros
Christophe Leroy <[email protected]>
ALSA: pcm: Rewrite recalculate_boundary() to avoid costly loop
Lucy Thrun <[email protected]>
ALSA: hda/ca0132: Fix buffer overflow in add_tuning_control
Tomasz Michalec <[email protected]>
platform/chrome: cros_ec_typec: Defer probe on missing EC parent
Kees Cook <[email protected]>
platform/x86: thinkpad_acpi: Handle KCOV __init vs inline mismatches
Gautham R. Shenoy <[email protected]>
pm: cpupower: Fix the snapshot-order of tsc,mperf, clock in mperf_stop()
Oliver Neukum <[email protected]>
usb: core: usb_submit_urb: downgrade type check
Tomasz Michalec <[email protected]>
usb: typec: intel_pmc_mux: Defer probe if SCU IPC isn't present
Peter Ujfalusi <[email protected]>
ASoC: core: Check for rtd == NULL in snd_soc_remove_pcm_runtime()
Alok Tiwari <[email protected]>
ALSA: intel8x0: Fix incorrect codec index usage in mixer for ICH4
Mark Brown <[email protected]>
ASoC: hdac_hdmi: Rate limit logging on connection and disconnection
Pawan Gupta <[email protected]>
x86/bugs: Avoid warning when overriding return thunk
Ulf Hansson <[email protected]>
mmc: rtsx_usb_sdmmc: Fix error-path in sd_set_power_mode()
Peter Robinson <[email protected]>
reset: brcmstb: Enable reset drivers for ARCH_BCM2835
Eliav Farber <[email protected]>
pps: clients: gpio: fix interrupt handling order in remove path
Breno Leitao <[email protected]>
ACPI: APEI: GHES: add TAINT_MACHINE_CHECK on GHES panic path
Sarthak Garg <[email protected]>
mmc: sdhci-msm: Ensure SD card power isn't ON when card removed
Sebastian Ott <[email protected]>
ACPI: processor: fix acpi_object initialization
tuhaowen <[email protected]>
PM: sleep: console: Fix the black screen issue
Hsin-Te Yuan <[email protected]>
thermal: sysfs: Return ENODATA instead of EAGAIN for reads
Rafael J. Wysocki <[email protected]>
PM: runtime: Clear power.needs_force_resume in pm_runtime_reinit()
Zhu Qiyu <[email protected]>
ACPI: PRM: Reduce unnecessary printing to avoid user confusion
Masami Hiramatsu (Google) <[email protected]>
selftests: tracing: Use mutex_unlock for testing glob filter
Aaron Kling <[email protected]>
ARM: tegra: Use I/O memcpy to write to IRAM
Bartosz Golaszewski <[email protected]>
gpio: tps65912: check the return value of regmap_update_bits()
Thomas Weißschuh <[email protected]>
tools/nolibc: define time_t in terms of __kernel_old_time_t
David Collins <[email protected]>
thermal/drivers/qcom-spmi-temp-alarm: Enable stage 2 shutdown when required
Kuninori Morimoto <[email protected]>
ASoC: soc-dapm: set bias_level if snd_soc_dapm_set_bias_level() was successed
Shubhrajyoti Datta <[email protected]>
EDAC/synopsys: Clear the ECC counters on init
Lifeng Zheng <[email protected]>
PM / devfreq: governor: Replace sscanf() with kstrtoul() in set_freq_store()
Alexander Kochetkov <[email protected]>
ARM: rockchip: fix kernel hang during smp initialization
Lifeng Zheng <[email protected]>
cpufreq: Exit governor when failed to start old governor
Bartosz Golaszewski <[email protected]>
gpio: wcd934x: check the return value of regmap_update_bits()
Mario Limonciello <[email protected]>
usb: xhci: Avoid showing errors during surprise removal
Jay Chen <[email protected]>
usb: xhci: Set avg_trb_len = 8 for EP0 during Address Device Command
Mario Limonciello <[email protected]>
usb: xhci: Avoid showing warnings for dying controller
Benson Leung <[email protected]>
usb: typec: ucsi: psy: Set current max to 100mA for BC 1.2 and Default
Cynthia Huang <[email protected]>
selftests/futex: Define SYS_futex on 32-bit architectures with 64-bit time_t
Prashant Malani <[email protected]>
cpufreq: CPPC: Mark driver with NEED_UPDATE_LIMITS flag
Su Hui <[email protected]>
usb: xhci: print xhci->xhc_state when queue_command failed
Al Viro <[email protected]>
securityfs: don't pin dentries twice, once is enough...
Wei Gao <[email protected]>
ext2: Handle fiemap on empty files to prevent EINVAL
Rong Zhang <[email protected]>
fs/ntfs3: correctly create symlink for relative path
Lizhi Xu <[email protected]>
fs/ntfs3: Add sanity check for file name
Damien Le Moal <[email protected]>
ata: libata-sata: Disallow changing LPM state if not supported
Al Viro <[email protected]>
better lockdep annotations for simple_recursive_removal()
Viacheslav Dubeyko <[email protected]>
hfs: fix not erasing deleted b-tree node issue
Sarah Newman <[email protected]>
drbd: add missing kref_get in handle_write_conflicts
Jan Kara <[email protected]>
udf: Verify partition map count
NeilBrown <[email protected]>
smb/server: avoid deadlock when linking with ReplaceIfExists
Kees Cook <[email protected]>
arm64: Handle KCOV __init vs inline mismatches
Tetsuo Handa <[email protected]>
hfsplus: don't use BUG_ON() in hfsplus_create_attributes_file()
Viacheslav Dubeyko <[email protected]>
hfsplus: fix slab-out-of-bounds read in hfsplus_uni2asc()
Viacheslav Dubeyko <[email protected]>
hfsplus: fix slab-out-of-bounds in hfsplus_bnode_read()
Viacheslav Dubeyko <[email protected]>
hfs: fix slab-out-of-bounds in hfs_bnode_read()
Jeongjun Park <[email protected]>
ptp: prevent possible ABBA deadlock in ptp_clock_freerun()
Rafael J. Wysocki <[email protected]>
cpuidle: governors: menu: Avoid using invalid recent intervals data
Len Brown <[email protected]>
intel_idle: Allow loading ACPI tables for any family
Xin Long <[email protected]>
sctp: linearize cloned gso packets in sctp_rcv
Florian Westphal <[email protected]>
netfilter: ctnetlink: fix refcount leak on table dump
Sabrina Dubroca <[email protected]>
udp: also consider secpath when evaluating ipsec use for checksumming
Rafael J. Wysocki <[email protected]>
ACPI: processor: perflib: Move problematic pr->performance check
Jiayi Li <[email protected]>
ACPI: processor: perflib: Fix initial _PPC limit application
Andy Shevchenko <[email protected]>
Documentation: ACPI: Fix parent device references
Jann Horn <[email protected]>
eventpoll: Fix semi-unbounded recursion
Sasha Levin <[email protected]>
fs: Prevent file descriptor table allocations exceeding INT_MAX
Ma Ke <[email protected]>
sunvdc: Balance device refcount in vdc_port_mpgroup_check
Dai Ngo <[email protected]>
NFSD: detect mismatch of file handle and delegation stateid in OPEN op
Jeff Layton <[email protected]>
nfsd: handle get_client_locked() failure in nfsd4_setclientid_confirm()
Xu Yang <[email protected]>
net: usb: asix_devices: add phy_mask for ax88772 mdio bus
Johan Hovold <[email protected]>
net: dpaa: fix device leak when querying time stamp info
Johan Hovold <[email protected]>
net: gianfar: fix device leak when querying time stamp info
Fedor Pchelkin <[email protected]>
netlink: avoid infinite retry looping in netlink_unicast()
Harald Mommer <[email protected]>
gpio: virtio: Fix config space reading.
Takashi Iwai <[email protected]>
ALSA: usb-audio: Validate UAC3 cluster segment descriptors
Takashi Iwai <[email protected]>
ALSA: usb-audio: Validate UAC3 power domain descriptors, too
Pavel Begunkov <[email protected]>
io_uring: don't use int for ABI
Tao Xue <[email protected]>
usb: gadget : fix use-after-free in composite_dev_cleanup()
Andy Shevchenko <[email protected]>
mm/hmm: move pmd_to_hmm_pfn_flags() to the respective #ifdeffery
Jiaxun Yang <[email protected]>
MIPS: mm: tlb-r4k: Uniquify TLB entries on init
Thorsten Blum <[email protected]>
ALSA: intel_hdmi: Fix off-by-one error in __hdmi_lpe_audio_probe()
Ammar Faizi <[email protected]>
net: usbnet: Fix the wrong netif_carrier_on() call
John Ernberg <[email protected]>
net: usbnet: Avoid potential RCU stall on LINK_CHANGE event
Slark Xiao <[email protected]>
USB: serial: option: add Foxconn T99W709
Budimir Markovic <[email protected]>
vsock: Do not allow binding to VMADDR_PORT_ANY
Quang Le <[email protected]>
net/packet: fix a race in packet_set_ring() and packet_notifier()
Lorenzo Stoakes <[email protected]>
selftests/perf_events: Add a mmap() correctness test
Thomas Gleixner <[email protected]>
perf/core: Prevent VMA split of buffer mappings
Thomas Gleixner <[email protected]>
perf/core: Exit early on perf_mmap() fail
Thomas Gleixner <[email protected]>
perf/core: Don't leak AUX buffer refcount on allocation failure
Eric Dumazet <[email protected]>
pptp: fix pptp_xmit() error path
Stefan Metzmacher <[email protected]>
smb: client: let recv_done() cleanup before notifying the callers.
Stefan Metzmacher <[email protected]>
smb: server: let recv_done() avoid touching data_transfer after cleanup/move
Stefan Metzmacher <[email protected]>
smb: server: let recv_done() consistently call put_recvmsg/smb_direct_disconnect_rdma_connection
Stefan Metzmacher <[email protected]>
smb: server: make sure we call ib_dma_unmap_single() only if we called ib_dma_map_single already
Stefan Metzmacher <[email protected]>
smb: server: remove separate empty_recvmsg_queue
Takashi Iwai <[email protected]>
ALSA: hda/ca0132: Fix missing error handling in ca0132_alt_select_out()
Michal Schmidt <[email protected]>
benet: fix BUG when creating VFs
Wang Liang <[email protected]>
net: drop UFO packets in udp_rcv_segment()
Eric Dumazet <[email protected]>
ipv6: reject malicious packets in ipv6_gso_segment()
Christoph Paasch <[email protected]>
net/mlx5: Correctly set gso_segs when LRO is used
Eric Dumazet <[email protected]>
pptp: ensure minimal skb length in pptp_xmit()
Horatiu Vultur <[email protected]>
phy: mscc: Fix parsing of unicast frames
Jakub Kicinski <[email protected]>
netpoll: prevent hanging NAPI when netcons gets enabled
Benjamin Coddington <[email protected]>
NFS: Fixup allocation flags for nfsiod's __GFP_NORETRY
Matthew Wilcox (Oracle) <[email protected]>
XArray: Add calls to might_alloc()
Olga Kornievskaia <[email protected]>
NFSv4.2: another fix for listxattr
Trond Myklebust <[email protected]>
NFS: Fix filehandle bounds checking in nfs_fh_to_dentry()
Tigran Mkrtchyan <[email protected]>
pNFS/flexfiles: don't attempt pnfs on fatal DS errors
Timothy Pearson <[email protected]>
PCI: pnv_php: Fix surprise plug detection and recovery
Timothy Pearson <[email protected]>
powerpc/eeh: Make EEH driver device hotplug safe
Maciej W. Rozycki <[email protected]>
powerpc/eeh: Rely on dev->link_active_reporting
Timothy Pearson <[email protected]>
powerpc/eeh: Export eeh_unfreeze_pe()
Timothy Pearson <[email protected]>
PCI: pnv_php: Work around switches with broken presence detection
Timothy Pearson <[email protected]>
PCI: pnv_php: Clean up allocated IRQs on unplug
Masahiro Yamada <[email protected]>
kconfig: qconf: fix ConfigList::updateListAllforAll()
Seunghui Lee <[email protected]>
scsi: ufs: core: Use link recovery when h8 exit fails during runtime resume
Tomas Henzl <[email protected]>
scsi: mpt3sas: Fix a fw_event memory leak
Chao Yu <[email protected]>
f2fs: fix to avoid out-of-boundary access in devs.path
Chao Yu <[email protected]>
f2fs: fix to avoid panic in f2fs_evict_inode
Chao Yu <[email protected]>
f2fs: fix to avoid UAF in f2fs_sync_inode_meta()
Chao Yu <[email protected]>
f2fs: doc: fix wrong quota mount option description
Abinash Singh <[email protected]>
f2fs: fix KMSAN uninit-value in extent_info usage
Brian Masney <[email protected]>
rtc: rv3028: fix incorrect maximum clock rate handling
Brian Masney <[email protected]>
rtc: pcf8563: fix incorrect maximum clock rate handling
Brian Masney <[email protected]>
rtc: pcf85063: fix incorrect maximum clock rate handling
Brian Masney <[email protected]>
rtc: hym8563: fix incorrect maximum clock rate handling
Brian Masney <[email protected]>
rtc: ds1307: fix incorrect maximum clock rate handling
Uros Bizjak <[email protected]>
ucount: fix atomic_long_inc_below() argument type
Petr Pavlu <[email protected]>
module: Restore the moduleparam prefix length check
Ryan Lee <[email protected]>
apparmor: ensure WB_HISTORY_SIZE value is a power of 2
Paul Chaignon <[email protected]>
bpf: Check flow_dissector ctx accesses are aligned
Mike Christie <[email protected]>
vhost-scsi: Fix log flooding with target does not exist errors
Balamanikandan Gunasundar <[email protected]>
mtd: rawnand: atmel: set pmecc data setup time
Thomas Fourier <[email protected]>
mtd: rawnand: rockchip: Add missing check after DMA map
Thomas Fourier <[email protected]>
mtd: rawnand: atmel: Fix dma_mapping_error() address
Zheng Yu <[email protected]>
jfs: fix metapage reference count leak in dbAllocCtl
Chenyuan Yang <[email protected]>
fbdev: imxfb: Check fb_add_videomode to prevent null-ptr-deref
Giovanni Cabiddu <[email protected]>
crypto: qat - fix seq_file position update in adf_ring_next()
Ben Hutchings <[email protected]>
sh: Do not use hyphen in exported variable name
Thomas Fourier <[email protected]>
dmaengine: nbpfaxi: Add missing check after DMA map
Thomas Fourier <[email protected]>
dmaengine: mv_xor: Fix missing check after DMA map and missing unmap
Dan Carpenter <[email protected]>
fs/orangefs: Allow 2 more characters in do_c_string()
Manivannan Sadhasivam <[email protected]>
PCI: endpoint: pci-epf-vntb: Fix the incorrect usage of __iomem attribute
Bard Liao <[email protected]>
soundwire: stream: restore params when prepare ports fail
Thomas Fourier <[email protected]>
crypto: img-hash - Fix dma_unmap_sg() nents value
Thomas Fourier <[email protected]>
crypto: keembay - Fix dma_unmap_sg() nents value
Ovidiu Panait <[email protected]>
hwrng: mtk - handle devm_pm_runtime_enable errors
Dan Carpenter <[email protected]>
watchdog: ziirave_wdt: check record length in ziirave_firm_verify()
Thomas Fourier <[email protected]>
scsi: isci: Fix dma_unmap_sg() nents value
Thomas Fourier <[email protected]>
scsi: mvsas: Fix dma_unmap_sg() nents value
Thomas Fourier <[email protected]>
scsi: ibmvscsi_tgt: Fix dma_unmap_sg() nents value
Paul Kocialkowski <[email protected]>
clk: sunxi-ng: v3s: Fix de clock definition
Leo Yan <[email protected]>
perf tests bp_account: Fix leaked file descriptor
Arnd Bergmann <[email protected]>
kernel: trace: preemptirq_delay_test: use offstack cpu mask
Junxian Huang <[email protected]>
RDMA/hns: Fix -Wframe-larger-than issue
Mengbiao Xiong <[email protected]>
crypto: ccp - Fix crash when rebind ccp device for ccp.ko
Thomas Fourier <[email protected]>
crypto: inside-secure - Fix dma_unmap_sg() nents value
Namhyung Kim <[email protected]>
perf sched: Fix memory leaks for evsel->priv in timehist
Nuno Sá <[email protected]>
clk: clk-axi-clkgen: fix fpfd_max frequency for zynq
Yuan Chen <[email protected]>
pinctrl: sunxi: Fix memory leak on krealloc failure
Jerome Brunet <[email protected]>
PCI: endpoint: pci-epf-vntb: Return -ENOENT if pci_epc_get_next_free_bar() fails
Charles Han <[email protected]>
power: supply: max14577: Handle NULL pdata when CONFIG_OF is not set
Charles Han <[email protected]>
power: supply: cpcap-charger: Fix null check for power_supply_get_by_name
Rohit Visavalia <[email protected]>
clk: xilinx: vcu: unregister pll_post only if registered correctly
James Cowgill <[email protected]>
media: v4l2-ctrls: Fix H264 SEPARATE_COLOUR_PLANE check
Henry Martin <[email protected]>
clk: davinci: Add NULL check in davinci_lpsc_clk_register()
Ivan Stepchenko <[email protected]>
mtd: fix possible integer overflow in erase_xfer()
Herbert Xu <[email protected]>
crypto: marvell/cesa - Fix engine load inaccuracy
Hans Zhang <[email protected]>
PCI: rockchip-host: Fix "Unexpected Completion" log message
Stanislav Fomichev <[email protected]>
vrf: Drop existing dst reference in vrf_ip6_input_dst
Xiumei Mu <[email protected]>
selftests: rtnetlink.sh: remove esp4_offload after test
Florian Westphal <[email protected]>
netfilter: xt_nfacct: don't assume acct name is null-terminated
Jimmy Assarsson <[email protected]>
can: kvaser_usb: Assign netdev.dev_port based on device channel index
Jimmy Assarsson <[email protected]>
can: kvaser_pciefd: Store device channel index
Gokul Sivakumar <[email protected]>
wifi: brcmfmac: fix P2P discovery failure in P2P peer due to missing P2P IE
Remi Pommarel <[email protected]>
Reapply "wifi: mac80211: Update skb's control block key in ieee80211_tx_dequeue()"
Remi Pommarel <[email protected]>
wifi: mac80211: Check 802.11 encaps offloading in ieee80211_tx_h_select_key()
Alexander Wetzel <[email protected]>
wifi: mac80211: Don't call fq_flow_idx() for management frames
Thomas Fourier <[email protected]>
mwl8k: Add missing check after DMA map
Martin Kaistra <[email protected]>
wifi: rtl8xxxu: Fix RX skb size for aggregation disabled
Juergen Gross <[email protected]>
xen/gntdev: remove struct gntdev_copy_batch from stack
Eric Dumazet <[email protected]>
net_sched: act_ctinfo: use atomic64_t for three counters
William Liu <[email protected]>
net/sched: Restrict conditions for adding duplicating netems to qdisc tree
Tiwei Bie <[email protected]>
um: rtc: Avoid shadowing err in uml_rtc_start()
Johan Korsnes <[email protected]>
arch: powerpc: defconfig: Drop obsolete CONFIG_NET_CLS_TCINDEX
Fedor Pchelkin <[email protected]>
netfilter: nf_tables: adjust lockdep assertions handling
Fedor Pchelkin <[email protected]>
drm/amd/pm/powerplay/hwmgr/smu_helper: fix order of mask and value
Finn Thain <[email protected]>
m68k: Don't unregister boot console needlessly
Stav Aviram <[email protected]>
net/mlx5: Check device memory pointer before usage
xin.guo <[email protected]>
tcp: fix tcp_ofo_queue() to avoid including too much DUP SACK range
Sergey Senozhatsky <[email protected]>
wifi: ath11k: clear initialized flag for deinit-ed srng lists
Jiasheng Jiang <[email protected]>
iwlwifi: Add missing check for alloc_ordered_workqueue
Xiu Jianfeng <[email protected]>
wifi: iwlwifi: Fix memory leak in iwl_mvm_init()
Daniil Dulov <[email protected]>
wifi: rtl818x: Kill URBs before clearing tx status queue
Arnd Bergmann <[email protected]>
caif: reduce stack size, again
Yuan Chen <[email protected]>
bpftool: Fix memory leak in dump_xx_nlmsg on realloc failure
Jiayuan Chen <[email protected]>
bpf, ktls: Fix data corruption when using bpf_msg_pop_data() in ktls
Jiayuan Chen <[email protected]>
bpf, sockmap: Fix psock incorrectly pointing to sk
Andy Yan <[email protected]>
drm/rockchip: cleanup fb when drm_gem_fb_afbc_init failed
Steven Rostedt <[email protected]>
selftests/tracing: Fix false failure of subsystem event test
Alok Tiwari <[email protected]>
staging: nvec: Fix incorrect null termination of battery manufacturer
Brahmajit Das <[email protected]>
samples: mei: Fix building on musl libc
Lifeng Zheng <[email protected]>
cpufreq: Init policy->rwsem before it may be possibly used
Lifeng Zheng <[email protected]>
cpufreq: Initialize cpufreq-based frequency-invariance later
Rafael J. Wysocki <[email protected]>
cpufreq: intel_pstate: Always use HWP_DESIRED_PERF in passive mode
Lifeng Zheng <[email protected]>
PM / devfreq: Check governor before using governor->name
Adam Ford <[email protected]>
arm64: dts: imx8mn-beacon: Fix HS400 USDHC clock speed
Adam Ford <[email protected]>
arm64: dts: imx8mm-beacon: Fix HS400 USDHC clock speed
Annette Kobou <[email protected]>
ARM: dts: imx6ul-kontron-bl-common: Fix RTS polarity for RS485 interface
Albin Törnqvist <[email protected]>
arm: dts: ti: omap: Fixup pinheader typo
Lucas De Marchi <[email protected]>
usb: early: xhci-dbc: Fix early_ioremap leak
Greg Kroah-Hartman <[email protected]>
Revert "vmci: Prevent the dispatching of uninitialized payloads"
Denis OSTERLAND-HEIM <[email protected]>
pps: fix poll support
Lizhi Xu <[email protected]>
vmci: Prevent the dispatching of uninitialized payloads
Abdun Nihaal <[email protected]>
staging: fbtft: fix potential memory leak in fbtft_framebuffer_alloc()
Charalampos Mitrodimas <[email protected]>
usb: misc: apple-mfi-fastcharge: Make power supply names unique
Krzysztof Kozlowski <[email protected]>
ARM: dts: vfxxx: Correctly use two tuples for timer address
Dmitry Vyukov <[email protected]>
selftests: Fix errno checking in syscall_user_dispatch test
Arnd Bergmann <[email protected]>
ASoC: ops: dynamically allocate struct snd_ctl_elem_value
Kuninori Morimoto <[email protected]>
ASoC: soc-dai: tidyup return value of snd_soc_xlate_tdm_slot_mask()
Konstantin Komarov <[email protected]>
Revert "fs/ntfs3: Replace inode_trylock with inode_lock"
Yangtao Li <[email protected]>
hfsplus: remove mutex_lock check in hfsplus_free_extents
RubenKelevra <[email protected]>
fs_context: fix parameter name in infofc() macro
Arnd Bergmann <[email protected]>
ASoC: Intel: fix SND_SOC_SOF dependencies
Arnd Bergmann <[email protected]>
ethernet: intel: fix building with large NR_CPUS
Xu Yang <[email protected]>
usb: phy: mxs: disconnect line when USB charger is attached
Xu Yang <[email protected]>
usb: chipidea: add USB PHY event
Daniel Dadap <[email protected]>
ALSA: hda: Add missing NVIDIA HDA codec IDs
Ian Abbott <[email protected]>
comedi: comedi_test: Fix possible deletion of uninitialized timers
Dmitry Antipov <[email protected]>
jfs: reject on-disk inodes of an unsupported type
Michael Zhivich <[email protected]>
x86/bugs: Fix use of possibly uninit value in amd_check_tsa_microcode()
RD Babiera <[email protected]>
usb: typec: tcpm: apply vbus before data bringup in tcpm_src_attach
Michael Grzeschik <[email protected]>
usb: typec: tcpm: allow switching to mode accessory to mux properly
Michael Grzeschik <[email protected]>
usb: typec: tcpm: allow to use sink in accessory mode
Harry Yoo <[email protected]>
mm/zsmalloc: do not pass __GFP_MOVABLE if CONFIG_COMPACTION=n
Ryusuke Konishi <[email protected]>
nilfs2: reject invalid file types when reading inodes
Praveen Kaligineedi <[email protected]>
gve: Fix stuck TX queue for DQ queue format
Jacek Kowalski <[email protected]>
e1000e: ignore uninitialized checksum word on tgp
Jacek Kowalski <[email protected]>
e1000e: disregard NVM checksum on tgp when valid checksum bit is not set
Ma Ke <[email protected]>
dpaa2-switch: Fix device reference count leak in MAC endpoint handling
Ma Ke <[email protected]>
dpaa2-eth: Fix device reference count leak in MAC endpoint handling
Dawid Rezler <[email protected]>
ALSA: hda/realtek - Add mute LED support for HP Pavilion 15-eg0xxx
Ma Ke <[email protected]>
bus: fsl-mc: Fix potential double device reference in fsl_mc_get_endpoint()
Viresh Kumar <[email protected]>
i2c: virtio: Avoid hang by using interruptible completion wait
Yang Xiwen <[email protected]>
i2c: qup: jump out of the loop in case of timeout
Rong Zhang <[email protected]>
platform/x86: ideapad-laptop: Fix kbd backlight not remembered among boots
Jian Shen <[email protected]>
net: hns3: fixed vf get max channels bug
Yonglong Liu <[email protected]>
net: hns3: disable interrupt when ptp init failed
Jian Shen <[email protected]>
net: hns3: fix concurrent setting vlan filter issue
Xiang Mei <[email protected]>
net/sched: sch_qfq: Avoid triggering might_sleep in atomic context in qfq_delete_class
Kito Xu (veritas501) <[email protected]>
net: appletalk: Fix use-after-free in AARP proxy probe
Dennis Chen <[email protected]>
i40e: report VF tx_dropped with tx_errors instead of tx_discards
Yajun Deng <[email protected]>
i40e: Add rx_missed_errors for buffer exhaustion
Abdun Nihaal <[email protected]>
regmap: fix potential memory leak of regmap_bus
Xilin Wu <[email protected]>
interconnect: qcom: sc7280: Add missing num_links to xm_pcie3_1 node
Maor Gottlieb <[email protected]>
RDMA/core: Rate limit GID cache warning messages
Alessandro Carminati <[email protected]>
regulator: core: fix NULL dereference on unbind due to stale coupling data
Fabrice Gasnier <[email protected]>
Input: gpio-keys - fix a sleep while atomic with PREEMPT_RT
Peter Zijlstra <[email protected]>
x86: Pin task-stack in __get_wchan()
Peter Zijlstra <[email protected]>
x86: Fix __get_wchan() for !STACKTRACE
Kees Cook <[email protected]>
sched: Add wrapper for get_wchan() to keep task blocked
Qi Zheng <[email protected]>
x86: Fix get_wchan() to support the ORC unwinder
Jiayuan Chen <[email protected]>
bpf, sockmap: Fix panic when calling skb_linearize
Kurt Borja <[email protected]>
platform/x86: think-lmi: Fix kobject cleanup
Zhang Rui <[email protected]>
powercap: intel_rapl: Do not change CLAMPING bit if ENABLE bit cannot be changed
Alexander Gordeev <[email protected]>
mm/vmalloc: leave lazy MMU mode on PTE mapping error
Arun Raghavan <[email protected]>
ASoC: fsl_sai: Force a software reset when starting in consumer mode
Krishna Kurapati <[email protected]>
usb: dwc3: qcom: Don't leave BCR asserted
Drew Hamilton <[email protected]>
usb: musb: fix gadget state on disconnect
Paul Cercueil <[email protected]>
usb: musb: Add and use inline functions musb_{get,set}_state
Mathias Nyman <[email protected]>
usb: hub: Fix flushing of delayed work used for post resume purposes
Mathias Nyman <[email protected]>
usb: hub: Fix flushing and scheduling of delayed work that tunes runtime pm
Mathias Nyman <[email protected]>
usb: hub: fix detection of high tier USB3 devices behind suspended hubs
Al Viro <[email protected]>
clone_private_mnt(): make sure that caller has CAP_SYS_ADMIN in the right userns
Aruna Ramakrishna <[email protected]>
sched: Change nr_uninterruptible type to unsigned long
William Liu <[email protected]>
net/sched: Return NULL when htb_lookup_leaf encounters an empty rbtree
Joseph Huang <[email protected]>
net: bridge: Do not offload IGMP/MLD messages
Dong Chenchen <[email protected]>
net: vlan: fix VLAN 0 refcount imbalance of toggling filtering during runtime
Luiz Augusto von Dentz <[email protected]>
Bluetooth: L2CAP: Fix attempting to adjust outgoing MTU
Yue Haibing <[email protected]>
ipv6: mcast: Delay put pmc->idev in mld_del_delrec()
Christoph Paasch <[email protected]>
net/mlx5: Correctly set gso_size when LRO is used
Ben Ben-Ishay <[email protected]>
net/mlx5e: Add support to klm_umr_wqe
Tariq Toukan <[email protected]>
lib: bitmap: Introduce node-aware alloc API
Luiz Augusto von Dentz <[email protected]>
Bluetooth: SMP: Fix using HCI_ERROR_REMOTE_USER_TERM on timeout
Luiz Augusto von Dentz <[email protected]>
Bluetooth: SMP: If an unallowed command is received consider it a failure
Kuniyuki Iwashima <[email protected]>
Bluetooth: Fix null-ptr-deref in l2cap_sock_resume_cb()
Oliver Neukum <[email protected]>
usb: net: sierra: check for no status endpoint
Marius Zachmann <[email protected]>
hwmon: (corsair-cpro) Validate the size of the received input buffer
Paolo Abeni <[email protected]>
selftests: net: increase inter-packet timeout in udpgro.sh
Hangbin Liu <[email protected]>
selftests: udpgro: report error when receive failed
Yu Kuai <[email protected]>
nvme: fix misaccounting of nvme-mpath inflight I/O
Wang Zhaolong <[email protected]>
smb: client: fix use-after-free in cifs_oplock_break
Sam Shih <[email protected]>
pinctrl: mediatek: moore: check if pin_desc is valid before use
Kuniyuki Iwashima <[email protected]>
rpl: Fix use-after-free in rpl_do_srh_inline().
Xiang Mei <[email protected]>
net/sched: sch_qfq: Fix race condition on qfq_aggregate
Alok Tiwari <[email protected]>
net: emaclite: Fix missing pointer increment in aligned_read()
Paul Chaignon <[email protected]>
bpf: Reject %p% format string in bprintf-like helpers
Ian Abbott <[email protected]>
comedi: Fix initialization of data for instructions that write to subdevice
Ian Abbott <[email protected]>
comedi: Fix use of uninitialized data in insn_rw_emulate_bits()
Ian Abbott <[email protected]>
comedi: Fix some signed shift left operations
Ian Abbott <[email protected]>
comedi: Fail COMEDI_INSNLIST ioctl if n_insns is too large
Ian Abbott <[email protected]>
comedi: das6402: Fix bit shift out of bounds
Ian Abbott <[email protected]>
comedi: das16m1: Fix bit shift out of bounds
Ian Abbott <[email protected]>
comedi: aio_iiro_16: Fix bit shift out of bounds
Ian Abbott <[email protected]>
comedi: pcl812: Fix bit shift out of bounds
Chen Ni <[email protected]>
iio: adc: stm32-adc: Fix race in installing chained IRQ handler
Fabio Estevam <[email protected]>
iio: adc: max1363: Reorder mode_list[] entries
Fabio Estevam <[email protected]>
iio: adc: max1363: Fix MAX1363_4X_CHANS/MAX1363_8X_CHANS[]
Andrew Jeffery <[email protected]>
soc: aspeed: lpc-snoop: Don't disable channels that aren't enabled
Andrew Jeffery <[email protected]>
soc: aspeed: lpc-snoop: Cleanup resources in stack-order
Maulik Shah <[email protected]>
pmdomain: governor: Consider CPU latency tolerance from pm_domain_cpu_gov
Judith Mendez <[email protected]>
mmc: sdhci_am654: Workaround for Errata i2312
Edson Juliano Drosdeck <[email protected]>
mmc: sdhci-pci: Quirk for broken command queuing on Intel GLK-based Positivo models
Thomas Fourier <[email protected]>
mmc: bcm2835: Fix dma_unmap_sg() nents value
Nathan Chancellor <[email protected]>
memstick: core: Zero initialize id_reg in h_memstick_read_dev_id()
Jan Kara <[email protected]>
isofs: Verify inode mode when loading from disk
Dan Carpenter <[email protected]>
dmaengine: nbpfaxi: Fix memory corruption in probe()
Yun Lu <[email protected]>
af_packet: fix soft lockup issue caused by tpacket_snd()
Yun Lu <[email protected]>
af_packet: fix the SO_SNDTIMEO constraint not effective on tpacked_snd()
Nathan Chancellor <[email protected]>
phonet/pep: Move call to pn_skb_get_dst_sockaddr() earlier in pep_sock_accept()
Steven Rostedt <[email protected]>
tracing: Add down_write(trace_event_sem) when adding trace event
Benjamin Tissoires <[email protected]>
HID: core: do not bypass hid_hw_raw_request
Benjamin Tissoires <[email protected]>
HID: core: ensure __hid_request reserves the report ID as the first byte
Benjamin Tissoires <[email protected]>
HID: core: ensure the allocated report buffer can contain the reserved report ID
Thomas Fourier <[email protected]>
pch_uart: Fix dma_sync_sg_for_device() nents value
Nilton Perim Neto <[email protected]>
Input: xpad - set correct controller type for Acer NGR200
Alok Tiwari <[email protected]>
thunderbolt: Fix bit masking in tb_dp_port_set_hops()
Clément Le Goffic <[email protected]>
i2c: stm32: fix the device used for the DMA map
Xinyu Liu <[email protected]>
usb: gadget: configfs: Fix OOB read on empty string write
Ryan Mann (NDI) <[email protected]>
USB: serial: ftdi_sio: add support for NDI EMGUIDE GEMINI
Slark Xiao <[email protected]>
USB: serial: option: add Foxconn T99W640
Fabio Porcedda <[email protected]>
USB: serial: option: add Telit Cinterion FE910C04 (ECM) composition
Wayne Chang <[email protected]>
phy: tegra: xusb: Fix unbalanced regulator disable in UTMI PHY mode
-------------
Diffstat:
Documentation/filesystems/f2fs.rst | 6 +- Documentation/firmware-guide/acpi/i2c-muxes.rst | 8 +- Documentation/memory-barriers.txt | 11 +- Documentation/networking/mptcp-sysctl.rst | 2 + Makefile | 6 +- arch/alpha/include/asm/processor.h | 2 +- arch/alpha/kernel/process.c | 5 +- arch/arc/include/asm/processor.h | 2 +- arch/arc/kernel/stacktrace.c | 4 +- arch/arm/Makefile | 2 +- arch/arm/boot/dts/am335x-boneblack.dts | 2 +- arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi | 1 - arch/arm/boot/dts/vfxxx.dtsi | 2 +- arch/arm/include/asm/processor.h | 2 +- arch/arm/kernel/process.c | 4 +- arch/arm/mach-rockchip/platsmp.c | 15 +- arch/arm/mach-tegra/reset.c | 2 +- .../boot/dts/freescale/imx8mm-beacon-som.dtsi | 2 + .../boot/dts/freescale/imx8mn-beacon-som.dtsi | 2 + arch/arm64/include/asm/acpi.h | 2 +- arch/arm64/include/asm/processor.h | 2 +- arch/arm64/kernel/entry.S | 6 + arch/arm64/kernel/fpsimd.c | 4 +- arch/arm64/kernel/process.c | 4 +- arch/arm64/kernel/traps.c | 1 + arch/arm64/mm/fault.c | 1 + arch/arm64/mm/ptdump_debugfs.c | 3 - arch/csky/include/asm/processor.h | 2 +- arch/csky/kernel/stacktrace.c | 5 +- arch/h8300/include/asm/processor.h | 2 +- arch/h8300/kernel/process.c | 5 +- arch/hexagon/include/asm/processor.h | 2 +- arch/hexagon/kernel/process.c | 4 +- arch/ia64/include/asm/processor.h | 2 +- arch/ia64/kernel/process.c | 5 +- arch/m68k/Kconfig.debug | 2 +- arch/m68k/include/asm/processor.h | 2 +- arch/m68k/kernel/early_printk.c | 42 +-- arch/m68k/kernel/head.S | 39 ++- arch/m68k/kernel/process.c | 4 +- arch/microblaze/include/asm/processor.h | 2 +- arch/microblaze/kernel/process.c | 2 +- arch/mips/crypto/chacha-core.S | 20 +- arch/mips/include/asm/processor.h | 2 +- arch/mips/include/asm/vpe.h | 8 + arch/mips/kernel/process.c | 24 +- arch/mips/mm/tlb-r4k.c | 56 +++- arch/nds32/include/asm/processor.h | 2 +- arch/nds32/kernel/process.c | 7 +- arch/nios2/include/asm/processor.h | 2 +- arch/nios2/kernel/process.c | 5 +- arch/openrisc/include/asm/processor.h | 2 +- arch/openrisc/kernel/process.c | 2 +- arch/parisc/Makefile | 2 +- arch/parisc/include/asm/processor.h | 2 +- arch/parisc/kernel/process.c | 5 +- arch/powerpc/configs/ppc6xx_defconfig | 1 - arch/powerpc/include/asm/processor.h | 2 +- arch/powerpc/kernel/eeh.c | 1 + arch/powerpc/kernel/eeh_driver.c | 48 ++-- arch/powerpc/kernel/eeh_pe.c | 11 +- arch/powerpc/kernel/pci-hotplug.c | 3 + arch/powerpc/kernel/process.c | 9 +- arch/powerpc/platforms/512x/mpc512x_lpbfifo.c | 6 +- arch/riscv/include/asm/processor.h | 2 +- arch/riscv/kernel/stacktrace.c | 12 +- arch/s390/hypfs/hypfs_dbfs.c | 19 +- arch/s390/include/asm/processor.h | 2 +- arch/s390/include/asm/timex.h | 13 +- arch/s390/kernel/process.c | 4 +- arch/s390/kernel/time.c | 2 +- arch/s390/mm/dump_pagetables.c | 2 - arch/sh/Makefile | 10 +- arch/sh/boot/compressed/Makefile | 4 +- arch/sh/boot/romimage/Makefile | 4 +- arch/sh/include/asm/processor_32.h | 2 +- arch/sh/kernel/process_32.c | 5 +- arch/sparc/include/asm/processor_32.h | 2 +- arch/sparc/include/asm/processor_64.h | 2 +- arch/sparc/kernel/process_32.c | 5 +- arch/sparc/kernel/process_64.c | 5 +- arch/um/drivers/rtc_user.c | 2 +- arch/um/include/asm/processor-generic.h | 2 +- arch/um/kernel/process.c | 5 +- arch/x86/include/asm/processor.h | 2 +- arch/x86/include/asm/xen/hypercall.h | 6 +- arch/x86/kernel/cpu/amd.c | 2 + arch/x86/kernel/cpu/bugs.c | 5 +- arch/x86/kernel/cpu/hygon.c | 3 + arch/x86/kernel/cpu/mce/amd.c | 13 +- arch/x86/kernel/process.c | 62 ++--- arch/x86/kvm/vmx/vmx.c | 5 +- arch/x86/mm/extable.c | 5 +- arch/xtensa/include/asm/processor.h | 2 +- arch/xtensa/kernel/process.c | 5 +- block/blk-settings.c | 2 +- drivers/acpi/acpi_processor.c | 2 +- drivers/acpi/apei/ghes.c | 2 + drivers/acpi/prmt.c | 26 +- drivers/acpi/processor_idle.c | 4 +- drivers/acpi/processor_perflib.c | 11 + drivers/ata/Kconfig | 35 ++- drivers/ata/libata-sata.c | 5 + drivers/ata/libata-scsi.c | 20 +- drivers/base/power/domain_governor.c | 18 +- drivers/base/power/runtime.c | 5 + drivers/base/regmap/regmap.c | 2 + drivers/block/drbd/drbd_receiver.c | 6 +- drivers/block/sunvdc.c | 4 +- drivers/bus/fsl-mc/fsl-mc-bus.c | 19 +- drivers/bus/mhi/host/boot.c | 8 +- drivers/bus/mhi/host/internal.h | 4 +- drivers/bus/mhi/host/main.c | 15 +- drivers/char/hw_random/mtk-rng.c | 4 +- drivers/char/ipmi/ipmi_msghandler.c | 8 +- drivers/char/ipmi/ipmi_watchdog.c | 59 +++-- drivers/clk/clk-axi-clkgen.c | 2 +- drivers/clk/davinci/psc.c | 5 + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 3 +- drivers/clk/xilinx/xlnx_vcu.c | 4 +- drivers/comedi/comedi_fops.c | 68 ++++- drivers/comedi/comedi_internal.h | 1 + drivers/comedi/drivers.c | 47 ++-- drivers/comedi/drivers/aio_iiro_16.c | 3 +- drivers/comedi/drivers/comedi_test.c | 2 +- drivers/comedi/drivers/das16m1.c | 3 +- drivers/comedi/drivers/das6402.c | 3 +- drivers/comedi/drivers/pcl726.c | 3 +- drivers/comedi/drivers/pcl812.c | 3 +- drivers/cpufreq/armada-8k-cpufreq.c | 2 +- drivers/cpufreq/cppc_cpufreq.c | 2 +- drivers/cpufreq/cpufreq.c | 29 +- drivers/cpufreq/intel_pstate.c | 4 +- drivers/cpuidle/governors/menu.c | 21 +- drivers/crypto/ccp/ccp-debugfs.c | 3 + drivers/crypto/hisilicon/hpre/hpre_crypto.c | 8 +- drivers/crypto/img-hash.c | 2 +- drivers/crypto/inside-secure/safexcel_hash.c | 8 +- drivers/crypto/keembay/keembay-ocs-hcu-core.c | 8 +- drivers/crypto/marvell/cesa/cipher.c | 4 +- drivers/crypto/marvell/cesa/hash.c | 5 +- .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 16 +- .../crypto/qat/qat_common/adf_transport_debug.c | 4 +- drivers/devfreq/devfreq.c | 10 +- drivers/devfreq/governor_userspace.c | 6 +- drivers/dma/mv_xor.c | 21 +- drivers/dma/nbpfaxi.c | 24 +- drivers/edac/synopsys_edac.c | 93 +++---- drivers/fpga/zynq-fpga.c | 10 +- drivers/gpio/gpio-tps65912.c | 7 +- drivers/gpio/gpio-virtio.c | 9 +- drivers/gpio/gpio-wcd934x.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 4 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 + .../gpu/drm/amd/display/dc/bios/command_table.c | 2 +- drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 1 - .../amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 2 - .../amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c | 40 +-- .../amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c | 31 +-- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 11 +- .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 3 + .../gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c | 2 +- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 6 + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 37 ++- drivers/gpu/drm/drm_dp_helper.c | 2 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 4 +- drivers/gpu/drm/msm/msm_gem.c | 3 +- drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 9 +- drivers/gpu/drm/scheduler/sched_entity.c | 27 +- drivers/gpu/drm/ttm/ttm_pool.c | 8 +- drivers/gpu/drm/ttm/ttm_resource.c | 3 + drivers/hid/hid-core.c | 21 +- drivers/hid/hid-magicmouse.c | 51 ++-- drivers/hwmon/corsair-cpro.c | 5 + drivers/hwmon/gsc-hwmon.c | 4 +- drivers/i2c/busses/i2c-qup.c | 4 +- drivers/i2c/busses/i2c-stm32.c | 8 +- drivers/i2c/busses/i2c-stm32f7.c | 4 +- drivers/i2c/busses/i2c-virtio.c | 15 +- drivers/i2c/i2c-core-acpi.c | 1 + drivers/i3c/internals.h | 1 + drivers/i3c/master.c | 2 +- drivers/idle/intel_idle.c | 2 +- drivers/iio/adc/ad7768-1.c | 23 +- drivers/iio/adc/ad_sigma_delta.c | 4 +- drivers/iio/adc/max1363.c | 43 ++- drivers/iio/adc/stm32-adc-core.c | 7 +- drivers/iio/imu/inv_icm42600/inv_icm42600_temp.c | 6 +- drivers/iio/light/as73211.c | 2 +- drivers/iio/light/hid-sensor-prox.c | 8 +- drivers/iio/pressure/bmp280-core.c | 9 +- drivers/iio/proximity/isl29501.c | 14 +- drivers/infiniband/core/cache.c | 4 +- drivers/infiniband/core/nldev.c | 22 +- drivers/infiniband/hw/bnxt_re/qplib_res.c | 2 + drivers/infiniband/hw/hfi1/affinity.c | 44 +-- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 15 +- drivers/infiniband/hw/mlx5/dm.c | 2 +- drivers/input/joystick/xpad.c | 2 +- drivers/input/keyboard/gpio_keys.c | 4 +- drivers/interconnect/qcom/sc7280.c | 1 + drivers/iommu/amd/init.c | 4 +- drivers/leds/leds-lp50xx.c | 11 +- drivers/md/dm-ps-historical-service-time.c | 4 +- drivers/md/dm-ps-queue-length.c | 4 +- drivers/md/dm-ps-round-robin.c | 4 +- drivers/md/dm-ps-service-time.c | 4 +- drivers/md/dm-zoned-target.c | 2 +- drivers/media/cec/usb/rainshadow/rainshadow-cec.c | 3 +- drivers/media/dvb-frontends/dib7000p.c | 10 + drivers/media/i2c/hi556.c | 26 +- drivers/media/i2c/ov2659.c | 3 +- drivers/media/i2c/tc358743.c | 86 +++--- drivers/media/platform/qcom/camss/camss.c | 10 +- drivers/media/platform/qcom/venus/core.c | 21 +- drivers/media/platform/qcom/venus/core.h | 2 + drivers/media/platform/qcom/venus/dbgfs.c | 9 + drivers/media/platform/qcom/venus/dbgfs.h | 13 + drivers/media/platform/qcom/venus/hfi_venus.c | 5 + drivers/media/platform/qcom/venus/vdec.c | 5 +- drivers/media/platform/qcom/venus/venc.c | 5 +- drivers/media/usb/gspca/vicam.c | 10 +- drivers/media/usb/hdpvr/hdpvr-i2c.c | 6 + drivers/media/usb/usbtv/usbtv-video.c | 4 + drivers/media/usb/uvc/uvc_driver.c | 3 + drivers/media/usb/uvc/uvc_video.c | 21 +- drivers/media/v4l2-core/v4l2-common.c | 8 +- drivers/media/v4l2-core/v4l2-ctrls-core.c | 9 +- drivers/memstick/core/memstick.c | 3 +- drivers/memstick/host/rtsx_usb_ms.c | 1 + drivers/misc/cardreader/rtsx_usb.c | 16 +- drivers/mmc/host/bcm2835.c | 3 +- drivers/mmc/host/rtsx_usb_sdmmc.c | 4 +- drivers/mmc/host/sdhci-msm.c | 14 + drivers/mmc/host/sdhci-pci-core.c | 3 +- drivers/mmc/host/sdhci-pci-gli.c | 4 +- drivers/mmc/host/sdhci_am654.c | 9 +- drivers/most/core.c | 2 +- drivers/mtd/ftl.c | 2 +- drivers/mtd/nand/raw/atmel/nand-controller.c | 2 +- drivers/mtd/nand/raw/atmel/pmecc.c | 6 + drivers/mtd/nand/raw/fsmc_nand.c | 2 + drivers/mtd/nand/raw/rockchip-nand-controller.c | 15 ++ drivers/mtd/nand/spi/core.c | 5 +- drivers/net/bonding/bond_3ad.c | 25 ++ drivers/net/bonding/bond_options.c | 1 + drivers/net/can/kvaser_pciefd.c | 1 + drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 1 + drivers/net/dsa/b53/b53_common.c | 63 +++-- drivers/net/dsa/b53/b53_regs.h | 2 + drivers/net/ethernet/agere/et131x.c | 36 +++ drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 2 + .../aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c | 39 +++ drivers/net/ethernet/atheros/ag71xx.c | 9 + drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 4 +- drivers/net/ethernet/emulex/benet/be_cmds.c | 2 +- drivers/net/ethernet/emulex/benet/be_main.c | 8 +- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 - drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 4 +- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 15 +- .../net/ethernet/freescale/dpaa2/dpaa2-switch.c | 15 +- drivers/net/ethernet/freescale/enetc/enetc_pf.c | 14 +- drivers/net/ethernet/freescale/fec_main.c | 34 ++- drivers/net/ethernet/freescale/gianfar_ethtool.c | 4 +- drivers/net/ethernet/google/gve/gve_adminq.c | 1 + drivers/net/ethernet/google/gve/gve_main.c | 67 ++--- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 36 +-- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c | 9 +- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 6 +- drivers/net/ethernet/intel/e1000e/defines.h | 3 + drivers/net/ethernet/intel/e1000e/ich8lan.c | 2 + drivers/net/ethernet/intel/e1000e/nvm.c | 6 + drivers/net/ethernet/intel/fm10k/fm10k.h | 3 +- drivers/net/ethernet/intel/i40e/i40e.h | 2 +- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 3 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 18 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 4 +- drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 2 + drivers/net/ethernet/intel/igc/igc_main.c | 14 +- drivers/net/ethernet/intel/ixgbe/ixgbe.h | 3 +- drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/en.h | 24 +- drivers/net/ethernet/mellanox/mlx5/core/en/qos.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 13 +- drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 3 - drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 2 + drivers/net/ethernet/mellanox/mlxsw/trap.h | 1 + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- drivers/net/hyperv/hyperv_net.h | 3 + drivers/net/hyperv/netvsc_drv.c | 29 +- drivers/net/phy/dp83640.c | 6 +- drivers/net/phy/mscc/mscc.h | 12 + drivers/net/phy/mscc/mscc_main.c | 12 + drivers/net/phy/mscc/mscc_ptp.c | 50 +++- drivers/net/phy/mscc/mscc_ptp.h | 1 + drivers/net/phy/nxp-c45-tja11xx.c | 2 +- drivers/net/phy/smsc.c | 1 + drivers/net/ppp/ppp_generic.c | 17 +- drivers/net/ppp/pptp.c | 18 +- drivers/net/thunderbolt.c | 8 +- drivers/net/usb/asix_devices.c | 1 + drivers/net/usb/sierra_net.c | 4 + drivers/net/usb/usbnet.c | 11 +- drivers/net/vrf.c | 2 + drivers/net/wireless/ath/ath11k/hal.c | 25 +- .../broadcom/brcm80211/brcmfmac/cfg80211.c | 8 +- .../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 2 +- drivers/net/wireless/intel/iwlegacy/4965-mac.c | 5 +- drivers/net/wireless/intel/iwlwifi/dvm/main.c | 11 +- drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 2 +- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 7 +- drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 4 +- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +- drivers/net/wireless/marvell/mwl8k.c | 4 + drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c | 3 +- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 2 +- drivers/net/wireless/realtek/rtlwifi/pci.c | 23 +- drivers/net/xen-netfront.c | 5 - drivers/nvme/host/core.c | 4 + drivers/pci/controller/pcie-rockchip-host.c | 2 +- drivers/pci/controller/vmd.c | 3 + drivers/pci/endpoint/functions/pci-epf-vntb.c | 4 +- drivers/pci/endpoint/pci-ep-cfs.c | 1 + drivers/pci/endpoint/pci-epf-core.c | 2 +- drivers/pci/hotplug/pnv_php.c | 235 ++++++++++++++-- drivers/pci/pci-acpi.c | 4 +- drivers/pci/pci.c | 8 +- drivers/pci/probe.c | 2 +- drivers/phy/tegra/xusb-tegra186.c | 61 +++-- drivers/pinctrl/mediatek/pinctrl-moore.c | 18 ++ drivers/pinctrl/stm32/pinctrl-stm32.c | 1 + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 11 +- drivers/platform/chrome/cros_ec.c | 23 +- drivers/platform/chrome/cros_ec.h | 2 +- drivers/platform/chrome/cros_ec_i2c.c | 4 +- drivers/platform/chrome/cros_ec_lpc.c | 4 +- drivers/platform/chrome/cros_ec_spi.c | 4 +- drivers/platform/chrome/cros_ec_typec.c | 4 +- drivers/platform/x86/ideapad-laptop.c | 2 +- drivers/platform/x86/think-lmi.c | 27 +- drivers/platform/x86/thinkpad_acpi.c | 4 +- drivers/power/supply/cpcap-charger.c | 5 +- drivers/power/supply/max14577_charger.c | 4 +- drivers/powercap/intel_rapl_common.c | 23 +- drivers/pps/clients/pps-gpio.c | 5 +- drivers/pps/pps.c | 11 +- drivers/ptp/ptp_private.h | 5 + drivers/ptp/ptp_vclock.c | 7 + drivers/pwm/pwm-imx-tpm.c | 9 + drivers/pwm/pwm-mediatek.c | 78 ++++-- drivers/regulator/core.c | 1 + drivers/reset/Kconfig | 10 +- drivers/rtc/rtc-ds1307.c | 17 +- drivers/rtc/rtc-hym8563.c | 2 +- drivers/rtc/rtc-pcf85063.c | 2 +- drivers/rtc/rtc-pcf8563.c | 2 +- drivers/rtc/rtc-rv3028.c | 2 +- drivers/scsi/aacraid/comminit.c | 3 +- drivers/scsi/bfa/bfad_im.c | 1 + drivers/scsi/ibmvscsi_tgt/libsrp.c | 6 +- drivers/scsi/isci/request.c | 2 +- drivers/scsi/libiscsi.c | 3 +- drivers/scsi/lpfc/lpfc_debugfs.c | 1 - drivers/scsi/lpfc/lpfc_scsi.c | 4 + drivers/scsi/mpi3mr/mpi3mr.h | 6 +- drivers/scsi/mpi3mr/mpi3mr_fw.c | 17 +- drivers/scsi/mpi3mr/mpi3mr_os.c | 2 + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 22 +- drivers/scsi/mvsas/mv_sas.c | 4 +- drivers/scsi/qla4xxx/ql4_os.c | 2 + drivers/scsi/scsi_scan.c | 2 +- drivers/scsi/scsi_transport_sas.c | 62 ++++- drivers/scsi/ufs/ufs-exynos.c | 4 +- drivers/scsi/ufs/ufshcd-pci.c | 42 ++- drivers/scsi/ufs/ufshcd.c | 10 +- drivers/soc/aspeed/aspeed-lpc-snoop.c | 13 +- drivers/soc/qcom/mdt_loader.c | 41 +++ drivers/soc/tegra/pmc.c | 51 ++-- drivers/soundwire/stream.c | 2 +- drivers/staging/fbtft/fbtft-core.c | 1 + drivers/staging/media/imx/imx-media-csc-scaler.c | 2 +- drivers/staging/nvec/nvec_power.c | 2 +- drivers/target/target_core_fabric_lib.c | 65 +++-- drivers/target/target_core_internal.h | 4 +- drivers/target/target_core_pr.c | 18 +- drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 43 ++- drivers/thermal/thermal_sysfs.c | 9 +- drivers/thunderbolt/domain.c | 2 +- drivers/thunderbolt/switch.c | 2 +- drivers/tty/serial/8250/8250_port.c | 3 +- drivers/tty/serial/pch_uart.c | 2 +- drivers/tty/vt/defkeymap.c_shipped | 112 ++++++++ drivers/tty/vt/keyboard.c | 2 +- drivers/usb/atm/cxacru.c | 172 ++++++------ drivers/usb/chipidea/ci.h | 18 +- drivers/usb/chipidea/udc.c | 10 + drivers/usb/class/cdc-acm.c | 11 +- drivers/usb/core/config.c | 10 +- drivers/usb/core/hcd.c | 8 +- drivers/usb/core/hub.c | 60 ++++- drivers/usb/core/hub.h | 1 + drivers/usb/core/quirks.c | 1 + drivers/usb/core/urb.c | 2 +- drivers/usb/dwc3/dwc3-imx8mp.c | 6 +- drivers/usb/dwc3/dwc3-meson-g12a.c | 3 + drivers/usb/dwc3/dwc3-qcom.c | 7 +- drivers/usb/dwc3/ep0.c | 20 +- drivers/usb/dwc3/gadget.c | 19 +- drivers/usb/early/xhci-dbc.c | 4 + drivers/usb/gadget/composite.c | 5 + drivers/usb/gadget/configfs.c | 2 + drivers/usb/gadget/udc/renesas_usb3.c | 1 + drivers/usb/host/xhci-hub.c | 3 +- drivers/usb/host/xhci-mem.c | 24 +- drivers/usb/host/xhci-pci-renesas.c | 7 +- drivers/usb/host/xhci-ring.c | 19 +- drivers/usb/host/xhci.c | 24 +- drivers/usb/host/xhci.h | 3 +- drivers/usb/misc/apple-mfi-fastcharge.c | 24 +- drivers/usb/musb/musb_core.c | 62 ++--- drivers/usb/musb/musb_core.h | 11 + drivers/usb/musb/musb_debugfs.c | 6 +- drivers/usb/musb/musb_gadget.c | 30 ++- drivers/usb/musb/musb_host.c | 6 +- drivers/usb/musb/musb_virthub.c | 18 +- drivers/usb/musb/omap2430.c | 16 +- drivers/usb/phy/phy-mxs-usb.c | 4 +- drivers/usb/serial/ftdi_sio.c | 2 + drivers/usb/serial/ftdi_sio_ids.h | 3 + drivers/usb/serial/option.c | 7 + drivers/usb/storage/realtek_cr.c | 2 +- drivers/usb/storage/unusual_devs.h | 29 ++ drivers/usb/typec/mux/intel_pmc_mux.c | 2 +- drivers/usb/typec/tcpm/fusb302.c | 8 + drivers/usb/typec/tcpm/tcpm.c | 64 +++-- drivers/usb/typec/ucsi/psy.c | 2 +- drivers/usb/typec/ucsi/ucsi.c | 1 + drivers/usb/typec/ucsi/ucsi.h | 7 +- drivers/vhost/scsi.c | 4 +- drivers/vhost/vhost.c | 3 + drivers/video/console/vgacon.c | 2 +- drivers/video/fbdev/core/fbcon.c | 9 +- drivers/video/fbdev/imxfb.c | 9 +- drivers/watchdog/dw_wdt.c | 2 + drivers/watchdog/iTCO_wdt.c | 6 +- drivers/watchdog/sbsa_gwdt.c | 50 +++- drivers/watchdog/ziirave_wdt.c | 3 + drivers/xen/gntdev-common.h | 4 + drivers/xen/gntdev.c | 71 +++-- fs/btrfs/relocation.c | 19 ++ fs/btrfs/tree-log.c | 53 ++-- fs/buffer.c | 2 +- fs/cifs/cifssmb.c | 10 + fs/cifs/file.c | 10 +- fs/cifs/smb2ops.c | 7 +- fs/cifs/smbdirect.c | 14 +- fs/eventpoll.c | 60 ++++- fs/ext2/inode.c | 12 +- fs/ext4/fsmap.c | 23 +- fs/ext4/indirect.c | 4 +- fs/ext4/inline.c | 19 +- fs/ext4/inode.c | 2 +- fs/ext4/mballoc.c | 35 ++- fs/ext4/orphan.c | 5 +- fs/ext4/super.c | 2 + fs/f2fs/extent_cache.c | 2 +- fs/f2fs/f2fs.h | 2 +- fs/f2fs/inode.c | 28 +- fs/f2fs/node.c | 10 + fs/file.c | 15 ++ fs/hfs/bnode.c | 93 +++++++ fs/hfsplus/bnode.c | 92 +++++++ fs/hfsplus/extents.c | 3 - fs/hfsplus/unicode.c | 7 + fs/hfsplus/xattr.c | 6 +- fs/hugetlbfs/inode.c | 2 +- fs/isofs/inode.c | 9 +- fs/jbd2/checkpoint.c | 1 + fs/jfs/file.c | 3 + fs/jfs/inode.c | 2 +- fs/jfs/jfs_dmap.c | 10 +- fs/jfs/jfs_imap.c | 13 +- fs/ksmbd/smb2pdu.c | 16 +- fs/ksmbd/smb_common.c | 2 +- fs/ksmbd/transport_rdma.c | 97 +++---- fs/libfs.c | 4 +- fs/namespace.c | 39 ++- fs/nfs/blocklayout/blocklayout.c | 4 +- fs/nfs/blocklayout/dev.c | 5 +- fs/nfs/blocklayout/extent_tree.c | 20 +- fs/nfs/client.c | 44 ++- fs/nfs/export.c | 11 +- fs/nfs/flexfilelayout/flexfilelayout.c | 26 +- fs/nfs/flexfilelayout/flexfilelayoutdev.c | 6 +- fs/nfs/internal.h | 10 +- fs/nfs/nfs4client.c | 15 +- fs/nfs/nfs4proc.c | 12 +- fs/nfs/pnfs.c | 11 +- fs/nfsd/nfs4state.c | 34 ++- fs/nilfs2/inode.c | 9 +- fs/ntfs3/dir.c | 3 + fs/ntfs3/file.c | 5 +- fs/ntfs3/inode.c | 31 ++- fs/orangefs/orangefs-debugfs.c | 8 +- fs/squashfs/super.c | 14 +- fs/udf/super.c | 13 +- include/asm-generic/barrier.h | 33 +++ include/linux/bitmap.h | 2 + include/linux/blk_types.h | 8 +- include/linux/compiler.h | 8 - include/linux/cpuset.h | 17 ++ include/linux/fs.h | 4 +- include/linux/fs_context.h | 2 +- include/linux/if_vlan.h | 6 +- include/linux/memfd.h | 14 + include/linux/mlx5/device.h | 1 + include/linux/mm.h | 76 ++++-- include/linux/mmzone.h | 22 ++ include/linux/moduleparam.h | 5 +- include/linux/pci.h | 10 +- include/linux/platform_data/cros_ec_proto.h | 4 + include/linux/pps_kernel.h | 1 + include/linux/sched.h | 1 + include/linux/skbuff.h | 31 ++- include/linux/usb/usbnet.h | 1 + include/linux/xarray.h | 15 ++ include/net/bond_3ad.h | 1 + include/net/cfg80211.h | 2 +- include/net/mac80211.h | 2 + include/net/tc_act/tc_ctinfo.h | 6 +- include/net/udp.h | 24 +- include/sound/soc-dai.h | 13 + include/uapi/linux/in6.h | 4 +- include/uapi/linux/io_uring.h | 2 +- kernel/bpf/helpers.c | 11 +- kernel/cgroup/cpuset.c | 23 ++ kernel/events/core.c | 20 +- kernel/fork.c | 2 +- kernel/power/console.c | 7 +- kernel/rcu/tree_plugin.h | 3 + kernel/sched/core.c | 19 ++ kernel/sched/deadline.c | 4 +- kernel/sched/loadavg.c | 2 +- kernel/sched/rt.c | 6 + kernel/sched/sched.h | 2 +- kernel/trace/ftrace.c | 19 +- kernel/trace/preemptirq_delay_test.c | 13 +- kernel/trace/trace.c | 33 ++- kernel/trace/trace.h | 8 +- kernel/trace/trace_events.c | 5 + kernel/ucount.c | 2 +- lib/bitmap.c | 13 + mm/debug_vm_pgtable.c | 9 +- mm/filemap.c | 2 +- mm/hmm.c | 2 +- mm/kmemleak.c | 10 +- mm/madvise.c | 2 +- mm/memfd.c | 2 +- mm/memory-failure.c | 8 + mm/mmap.c | 10 +- mm/page_alloc.c | 13 + mm/ptdump.c | 2 + mm/shmem.c | 2 +- mm/vmalloc.c | 17 +- mm/zsmalloc.c | 3 + net/8021q/vlan.c | 42 ++- net/8021q/vlan.h | 1 + net/appletalk/aarp.c | 24 +- net/bluetooth/l2cap_core.c | 26 +- net/bluetooth/l2cap_sock.c | 3 + net/bluetooth/smp.c | 21 +- net/bluetooth/smp.h | 1 + net/bridge/br_multicast.c | 16 ++ net/bridge/br_private.h | 2 + net/bridge/br_switchdev.c | 3 + net/caif/cfctrl.c | 294 ++++++++++----------- net/core/filter.c | 3 + net/core/netpoll.c | 7 + net/core/skmsg.c | 57 ++-- net/hsr/hsr_slave.c | 8 +- net/ipv4/netfilter/nf_reject_ipv4.c | 6 +- net/ipv4/route.c | 1 - net/ipv4/tcp_input.c | 3 +- net/ipv4/udp_offload.c | 2 +- net/ipv6/addrconf.c | 7 +- net/ipv6/ip6_offload.c | 4 +- net/ipv6/mcast.c | 13 +- net/ipv6/netfilter/nf_reject_ipv6.c | 5 +- net/ipv6/rpl_iptunnel.c | 8 +- net/ipv6/seg6_hmac.c | 6 +- net/mac80211/cfg.c | 13 +- net/mac80211/mlme.c | 9 +- net/mac80211/tx.c | 10 +- net/mctp/af_mctp.c | 28 +- net/mptcp/options.c | 7 +- net/mptcp/pm_netlink.c | 14 +- net/mptcp/protocol.c | 17 +- net/mptcp/protocol.h | 11 +- net/mptcp/subflow.c | 20 +- net/ncsi/internal.h | 2 +- net/ncsi/ncsi-rsp.c | 1 + net/netfilter/nf_conntrack_netlink.c | 24 +- net/netfilter/nf_tables_api.c | 4 +- net/netfilter/xt_nfacct.c | 4 +- net/netlink/af_netlink.c | 2 +- net/packet/af_packet.c | 39 ++- net/phonet/pep.c | 2 +- net/sched/act_ctinfo.c | 19 +- net/sched/sch_cake.c | 14 +- net/sched/sch_codel.c | 5 +- net/sched/sch_drr.c | 7 +- net/sched/sch_ets.c | 46 ++-- net/sched/sch_fq_codel.c | 6 +- net/sched/sch_hfsc.c | 8 +- net/sched/sch_htb.c | 19 +- net/sched/sch_netem.c | 40 +++ net/sched/sch_qfq.c | 40 ++- net/sctp/input.c | 2 +- net/tls/tls_sw.c | 13 + net/vmw_vsock/af_vsock.c | 3 +- net/wireless/mlme.c | 3 +- samples/mei/mei-amt-version.c | 2 +- scripts/kconfig/gconf.c | 8 +- scripts/kconfig/lxdialog/inputbox.c | 6 +- scripts/kconfig/lxdialog/menubox.c | 2 +- scripts/kconfig/nconf.c | 2 + scripts/kconfig/nconf.gui.c | 1 + scripts/kconfig/qconf.cc | 2 +- security/apparmor/include/match.h | 3 +- security/apparmor/match.c | 1 + security/inode.c | 2 - sound/core/pcm_native.c | 19 +- sound/pci/hda/patch_ca0132.c | 7 +- sound/pci/hda/patch_hdmi.c | 19 ++ sound/pci/hda/patch_realtek.c | 3 + sound/pci/intel8x0.c | 2 +- sound/soc/codecs/hdac_hdmi.c | 10 +- sound/soc/codecs/rt5640.c | 5 + sound/soc/fsl/fsl_sai.c | 30 ++- sound/soc/generic/audio-graph-card.c | 2 +- sound/soc/intel/boards/Kconfig | 2 +- sound/soc/soc-core.c | 28 ++ sound/soc/soc-dai.c | 59 +++-- sound/soc/soc-dapm.c | 4 + sound/soc/soc-ops.c | 28 +- sound/usb/mixer_quirks.c | 14 +- sound/usb/mixer_scarlett_gen2.c | 8 + sound/usb/stream.c | 25 +- sound/usb/validate.c | 14 +- sound/x86/intel_hdmi_audio.c | 2 +- tools/bpf/bpftool/net.c | 15 +- tools/include/linux/sched/mm.h | 2 + tools/include/nolibc/std.h | 4 +- tools/perf/builtin-sched.c | 12 + tools/perf/tests/bp_account.c | 1 + tools/perf/util/evsel.c | 11 + tools/perf/util/evsel.h | 2 + .../cpupower/utils/idle_monitor/mperf_monitor.c | 4 +- tools/testing/ktest/ktest.pl | 5 +- .../ftrace/test.d/event/subsystem-enable.tc | 28 +- .../ftrace/test.d/ftrace/func-filter-glob.tc | 2 +- tools/testing/selftests/futex/include/futextest.h | 11 + tools/testing/selftests/memfd/memfd_test.c | 43 +++ tools/testing/selftests/net/mptcp/Makefile | 3 +- tools/testing/selftests/net/mptcp/mptcp_connect.c | 28 +- .../selftests/net/mptcp/mptcp_connect_checksum.sh | 5 + .../selftests/net/mptcp/mptcp_connect_mmap.sh | 5 + .../selftests/net/mptcp/mptcp_connect_sendfile.sh | 5 + tools/testing/selftests/net/mptcp/mptcp_join.sh | 1 + tools/testing/selftests/net/mptcp/pm_netlink.sh | 1 + tools/testing/selftests/net/rtnetlink.sh | 6 + tools/testing/selftests/net/udpgro.sh | 46 ++-- tools/testing/selftests/perf_events/.gitignore | 1 + tools/testing/selftests/perf_events/Makefile | 2 +- tools/testing/selftests/perf_events/mmap.c | 236 +++++++++++++++++ .../selftests/syscall_user_dispatch/sud_test.c | 50 ++-- 677 files changed, 6081 insertions(+), 2515 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/644 phy: tegra: xusb: Fix unbalanced regulator disable in UTMI PHY mode
5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wayne Chang <[email protected]>
commit cefc1caee9dd06c69e2d807edc5949b329f52b22 upstream.
When transitioning from USB_ROLE_DEVICE to USB_ROLE_NONE, the code assumed that the regulator should be disabled. However, if the regulator is marked as always-on, regulator_is_enabled() continues to return true, leading to an incorrect attempt to disable a regulator which is not enabled.
This can result in warnings such as:
[ 250.155624] WARNING: CPU: 1 PID: 7326 at drivers/regulator/core.c:3004 _regulator_disable+0xe4/0x1a0 [ 250.155652] unbalanced disables for VIN_SYS_5V0
To fix this, we move the regulator control logic into tegra186_xusb_padctl_id_override() function since it's directly related to the ID override state. The regulator is now only disabled when the role transitions from USB_ROLE_HOST to USB_ROLE_NONE, by checking the VBUS_ID register. This ensures that regulator enable/disable operations are properly balanced and only occur when actually transitioning to/from host mode.
--- drivers/phy/tegra/xusb-tegra186.c | 59 +++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 22 deletions(-)
drivers/phy/tegra/xusb-tegra186.c +37 -22
@@ -715,13 +715,15 @@ static int tegra186_xusb_padctl_vbus_ove }static int tegra186_xusb_padctl_id_override (struct tegra_xusb_padctl *padctl, -bool status) +struct tegra_xusb_usb2_port *port,bool status) { -u32 value; +u32 value, id_override; +int err =0 ;dev_dbg (padctl->dev,"%s id override\n" , status ?"set" :"clear" ); value =padctl_readl (padctl,USB2_VBUS_ID ); + id_override = value &ID_OVERRIDE (~0 );if (status) {if (value &VBUS_OVERRIDE ) {
@@ -732,14 +734,34 @@ static int tegra186_xusb_padctl_id_overr value =padctl_readl (padctl,USB2_VBUS_ID ); } - value &= ~ID_OVERRIDE (~0 ); - value |=ID_OVERRIDE_GROUNDED ; +if (id_override !=ID_OVERRIDE_GROUNDED ) { + value &= ~ID_OVERRIDE (~0 ); + value |=ID_OVERRIDE_GROUNDED ; +padctl_writel (padctl, value,USB2_VBUS_ID ); + + err =regulator_enable (port->supply); +if (err) { +dev_err (padctl->dev,"Failed to enable regulator: %d\n" , err); +return err; + } + } }else { - value &= ~ID_OVERRIDE (~0 ); - value |=ID_OVERRIDE_FLOATING ; - } +if (id_override ==ID_OVERRIDE_GROUNDED ) { +/* +* The regulator is disabled only when the role transitions +* from USB_ROLE_HOST to USB_ROLE_NONE. +*/ + err =regulator_disable (port->supply); +if (err) { +dev_err (padctl->dev,"Failed to disable regulator: %d\n" , err); +return err; + } -padctl_writel (padctl, value,USB2_VBUS_ID ); + value &= ~ID_OVERRIDE (~0 ); + value |=ID_OVERRIDE_FLOATING ; +padctl_writel (padctl, value,USB2_VBUS_ID ); + } + }return 0 ; }
@@ -759,27 +781,20 @@ static int tegra186_utmi_phy_set_mode(stif (mode ==PHY_MODE_USB_OTG ) {if (submode ==USB_ROLE_HOST ) { -tegra186_xusb_padctl_id_override (padctl, true); - - err =regulator_enable (port->supply); + err =tegra186_xusb_padctl_id_override (padctl, port, true); +if (err) + goto out; }else if (submode ==USB_ROLE_DEVICE ) {tegra186_xusb_padctl_vbus_override (padctl, true); }else if (submode ==USB_ROLE_NONE ) { -/* -* When port is peripheral only or role transitions to -* USB_ROLE_NONE from USB_ROLE_DEVICE, regulator is not -* enabled. -*/ -if (regulator_is_enabled (port->supply)) -regulator_disable (port->supply); - -tegra186_xusb_padctl_id_override (padctl, false); + err =tegra186_xusb_padctl_id_override (padctl, port, false); +if (err) + goto out;tegra186_xusb_padctl_vbus_override (padctl, false); } } - +out:mutex_unlock (&padctl->lock); -return err; }
Greg Kroah-Hartman
maintainerPATCH 2/644 USB: serial: option: add Telit Cinterion FE910C04 (ECM) composition
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fabio Porcedda <[email protected]>
commit 252f4ac08cd2f16ecd20e4c5e41ac2a17dd86942 upstream.
Add Telit Cinterion FE910C04 (ECM) composition:0x10c7: ECM + tty (AT) + tty (AT) + tty (diag)
usb-devices output:
T: Bus=01 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 7 Spd=480 MxCh= 0 D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=1bc7 ProdID=10c7 Rev=05.15 S: Manufacturer=Telit Cinterion S: Product=FE910 S: SerialNumber=f71b8b32 C: #Ifs= 5 Cfg#= 1 Atr=e0 MxPwr=500mA I: If#= 0 Alt= 0 #EPs= 1 Cls=02(commc) Sub=06 Prot=00 Driver=cdc_ether E: Ad=82(I) Atr=03(Int.) MxPS= 16 Ivl=32ms I: If#= 1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=cdc_ether E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I: If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=84(I) Atr=03(Int.) MxPS= 10 Ivl=32ms I: If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=86(I) Atr=03(Int.) MxPS= 10 Ivl=32ms I: If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=87(I) 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
@@ -1415,6 +1415,9 @@ static const struct usb_device_id option .driver_info = NCTRL(5) }, { USB_DEVICE_AND_INTERFACE_INFO(TELIT_VENDOR_ID, 0x10d0, 0xff, 0xff, 0x40) }, { USB_DEVICE_AND_INTERFACE_INFO(TELIT_VENDOR_ID, 0x10d0, 0xff, 0xff, 0x60) }, + { USB_DEVICE_AND_INTERFACE_INFO(TELIT_VENDOR_ID, 0x10c7, 0xff, 0xff, 0x30), /* Telit FE910C04 (ECM) */ + .driver_info = NCTRL(4) }, + { USB_DEVICE_AND_INTERFACE_INFO(TELIT_VENDOR_ID, 0x10c7, 0xff, 0xff, 0x40) }, { USB_DEVICE_AND_INTERFACE_INFO(TELIT_VENDOR_ID, 0x10d1, 0xff, 0xff, 0x30), /* Telit FN990B (MBIM) */ .driver_info = NCTRL(6) }, { USB_DEVICE_AND_INTERFACE_INFO(TELIT_VENDOR_ID, 0x10d1, 0xff, 0xff, 0x40) },
Greg Kroah-Hartman
maintainerPATCH 3/644 USB: serial: option: add Foxconn T99W640
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Slark Xiao <[email protected]>
commit 08f49cdb71f3759368fded4dbc9dde35a404ec2b upstream.
T99W640 is designed based on Qualconn SDX72 chip. There are 3 serial ports to be enumerated: Diag, NMEA and AT.
Test evidence as below:
T: Bus=04 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 2 Spd=5000 MxCh= 0 D: Ver= 3.20 Cls=ef(misc ) Sub=02 Prot=01 MxPS= 9 #Cfgs= 1 P: Vendor=0489 ProdID=e167 Rev=05.15 S: Manufacturer=QCOM S: Product=SDXPINNL USB WWAN Adapter S: SerialNumber=cc1f1d92 C: #Ifs= 6 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=82(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=01(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=81(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms I: If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option E: Ad=02(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=83(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=84(I) Atr=03(Int.) MxPS= 10 Ivl=32ms I: If#= 3 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) E: Ad=85(I) Atr=03(Int.) MxPS= 64 Ivl=32ms I: If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option E: Ad=03(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=86(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=87(I) Atr=03(Int.) MxPS= 10 Ivl=32ms I: If#= 5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option E: Ad=04(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms E: Ad=88(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms
0&1: MBIM, 2:Modem, 3:GNSS(non-serial port), 4: NMEA, 5:Diag
--- drivers/usb/serial/option.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/serial/option.c +2 -0
@@ -2346,6 +2346,8 @@ static const struct usb_device_id option .driver_info = RSVD(3) }, { USB_DEVICE_INTERFACE_CLASS(0x0489, 0xe145, 0xff), /* Foxconn T99W651 RNDIS */ .driver_info = RSVD(5) | RSVD(6) }, + { USB_DEVICE_INTERFACE_CLASS(0x0489, 0xe167, 0xff), /* Foxconn T99W640 MBIM */ + .driver_info = RSVD(3) }, { USB_DEVICE(0x1508, 0x1001), /* Fibocom NL668 (IOT version) */ .driver_info = RSVD(4) | RSVD(5) | RSVD(6) }, { USB_DEVICE(0x1782, 0x4d10) }, /* Fibocom L610 (AT mode) */
Greg Kroah-Hartman
maintainerPATCH 4/644 USB: serial: ftdi_sio: add support for NDI EMGUIDE GEMINI
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryan Mann (NDI) <[email protected]>
commit c980666b6958d9a841597331b38115a29a32250e upstream.
NDI (Northern Digital Inc.) is introducing a new product called the EMGUIDE GEMINI that will use an FTDI chip for USB serial communications. Add the NDI EMGUIDE GEMINI product ID that uses the NDI Vendor ID rather than the FTDI Vendor ID, unlike older products.
--- drivers/usb/serial/ftdi_sio.c | 2 ++ drivers/usb/serial/ftdi_sio_ids.h | 3 +++ 2 files changed, 5 insertions(+)
drivers/usb/serial/ftdi_sio.c +2 -0
@@ -781,6 +781,8 @@ static const struct usb_device_id id_tab .driver_info = (kernel_ulong_t)&ftdi_NDI_device_quirk }, { USB_DEVICE(FTDI_VID, FTDI_NDI_AURORA_SCU_PID), .driver_info = (kernel_ulong_t)&ftdi_NDI_device_quirk }, + { USB_DEVICE(FTDI_NDI_VID, FTDI_NDI_EMGUIDE_GEMINI_PID), + .driver_info = (kernel_ulong_t)&ftdi_NDI_device_quirk }, { USB_DEVICE(TELLDUS_VID, TELLDUS_TELLSTICK_PID) }, { USB_DEVICE(NOVITUS_VID, NOVITUS_BONO_E_PID) }, { USB_DEVICE(FTDI_VID, RTSYSTEMS_USB_VX8_PID) },
drivers/usb/serial/ftdi_sio_ids.h +3 -0
@@ -197,6 +197,9 @@#define FTDI_NDI_FUTURE_3_PID 0xDA73/* NDI future device #3 */ #define FTDI_NDI_AURORA_SCU_PID 0xDA74/* NDI Aurora SCU */ +#define FTDI_NDI_VID 0x23F2 +#define FTDI_NDI_EMGUIDE_GEMINI_PID 0x0003/* NDI Emguide Gemini */ +/* * ChamSys Limited (www.chamsys.co.uk) USB wing/interface product IDs */
Greg Kroah-Hartman
maintainerPATCH 5/644 usb: gadget: configfs: Fix OOB read on empty string write
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xinyu Liu <[email protected]>
commit 3014168731b7930300aab656085af784edc861f6 upstream.
When writing an empty string to either 'qw_sign' or 'landingPage' sysfs attributes, the store functions attempt to access page[l - 1] before validating that the length 'l' is greater than zero.
This patch fixes the vulnerability by adding a check at the beginning of os_desc_qw_sign_store() and webusb_landingPage_store() to handle the zero-length input case gracefully by returning immediately.
--- drivers/usb/gadget/configfs.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/gadget/configfs.c +2 -0
@@ -861,6 +861,8 @@ static ssize_t os_desc_qw_sign_store(strstruct gadget_info *gi =os_desc_item_to_gadget_info (item);int res, l; +if (!len) +return len; l =min ((int )len,OS_STRING_QW_SIGN_LEN >>1 );if (page[l -1 ] =='\n' ) --l;
Greg Kroah-Hartman
maintainerPATCH 6/644 i2c: stm32: fix the device used for the DMA map
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Clément Le Goffic <[email protected]>
commit c870cbbd71fccda71d575f0acd4a8d2b7cd88861 upstream.
If the DMA mapping failed, it produced an error log with the wrong device name:
"stm32-dma3 40400000.dma-controller: rejecting DMA map of vmalloc memory" Fix this issue by replacing the dev with the I2C dev.
--- drivers/i2c/busses/i2c-stm32.c | 8 +++----- drivers/i2c/busses/i2c-stm32f7.c | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-)
drivers/i2c/busses/i2c-stm32.c +3 -5
@@ -102,7 +102,6 @@ int stm32_i2c_prep_dma_xfer(struct devic void *dma_async_param) {struct dma_async_tx_descriptor *txdesc; -struct device *chan_dev;int ret;if (rd_wr) {
@@ -116,11 +115,10 @@ int stm32_i2c_prep_dma_xfer(struct devic } dma->dma_len = len; - chan_dev = dma->chan_using->device->dev; - dma->dma_buf =dma_map_single (chan_dev, buf, dma->dma_len, + dma->dma_buf =dma_map_single (dev, buf, dma->dma_len, dma->dma_data_dir); -if (dma_mapping_error (chan_dev, dma->dma_buf)) { +if (dma_mapping_error (dev, dma->dma_buf)) {dev_err (dev,"DMA mapping failed\n" );return -EINVAL ; }
@@ -150,7 +148,7 @@ int stm32_i2c_prep_dma_xfer(struct devicreturn 0 ; err: -dma_unmap_single (chan_dev, dma->dma_buf, dma->dma_len, +dma_unmap_single (dev, dma->dma_buf, dma->dma_len, dma->dma_data_dir);return ret; }
drivers/i2c/busses/i2c-stm32f7.c +2 -2
@@ -721,10 +721,10 @@ static void stm32f7_i2c_dma_callback(voi {struct stm32f7_i2c_dev *i2c_dev = (struct stm32f7_i2c_dev *)arg;struct stm32_i2c_dma *dma = i2c_dev->dma; -struct device *dev = dma->chan_using->device->dev;stm32f7_i2c_disable_dma_req (i2c_dev); -dma_unmap_single (dev, dma->dma_buf, dma->dma_len, dma->dma_data_dir); +dma_unmap_single (i2c_dev->dev, dma->dma_buf, dma->dma_len, + dma->dma_data_dir);complete (&dma->dma_complete); }
Greg Kroah-Hartman
maintainerPATCH 7/644 thunderbolt: Fix bit masking in tb_dp_port_set_hops()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alok Tiwari <[email protected]>
commit 2cdde91c14ec358087f43287513946d493aef940 upstream.
The tb_dp_port_set_hops() function was incorrectly clearing ADP_DP_CS_1_AUX_RX_HOPID_MASK twice. According to the function's purpose, it should clear both TX and RX AUX HopID fields. Replace the first instance with ADP_DP_CS_1_AUX_TX_HOPID_MASK to ensure proper configuration of both AUX directions.
--- drivers/thunderbolt/switch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thunderbolt/switch.c +1 -1
@@ -1333,7 +1333,7 @@ int tb_dp_port_set_hops(struct tb_port *return ret; data[0 ] &= ~ADP_DP_CS_0_VIDEO_HOPID_MASK ; - data[1 ] &= ~ADP_DP_CS_1_AUX_RX_HOPID_MASK ; + data[1 ] &= ~ADP_DP_CS_1_AUX_TX_HOPID_MASK ; data[1 ] &= ~ADP_DP_CS_1_AUX_RX_HOPID_MASK ; data[0] |= (video << ADP_DP_CS_0_VIDEO_HOPID_SHIFT) &
Greg Kroah-Hartman
maintainerPATCH 8/644 Input: xpad - set correct controller type for Acer NGR200
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nilton Perim Neto <[email protected]>
commit bcce05041b21888f10b80ea903dcfe51a25c586e upstream.
The controller should have been set as XTYPE_XBOX360 and not XTYPE_XBOX. Also the entry is in the wrong place. Fix it.
--- drivers/input/joystick/xpad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/joystick/xpad.c +1 -1
@@ -144,12 +144,12 @@ static const struct xpad_device { { 0x046d, 0xca88, "Logitech Compact Controller for Xbox", 0, XTYPE_XBOX }, { 0x046d, 0xca8a, "Logitech Precision Vibration Feedback Wheel", 0, XTYPE_XBOX }, { 0x046d, 0xcaa3, "Logitech DriveFx Racing Wheel", 0, XTYPE_XBOX360 }, + { 0x0502, 0x1305, "Acer NGR200", 0, XTYPE_XBOX360 }, { 0x056e, 0x2004, "Elecom JC-U3613M", 0, XTYPE_XBOX360 }, { 0x05fd, 0x1007, "Mad Catz Controller (unverified)", 0, XTYPE_XBOX }, { 0x05fd, 0x107a, "InterAct 'PowerPad Pro' X-Box pad (Germany)", 0, XTYPE_XBOX }, { 0x05fe, 0x3030, "Chic Controller", 0, XTYPE_XBOX }, { 0x05fe, 0x3031, "Chic Controller", 0, XTYPE_XBOX }, - { 0x0502, 0x1305, "Acer NGR200", 0, XTYPE_XBOX }, { 0x062a, 0x0020, "Logic3 Xbox GamePad", 0, XTYPE_XBOX }, { 0x062a, 0x0033, "Competition Pro Steering Wheel", 0, XTYPE_XBOX }, { 0x06a3, 0x0200, "Saitek Racing Wheel", 0, XTYPE_XBOX },
Greg Kroah-Hartman
maintainerPATCH 9/644 pch_uart: Fix dma_sync_sg_for_device() nents value
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Fourier <[email protected]>
commit 6c0e9f05c9d7875995b0e92ace71be947f280bbd upstream.
The dma_sync_sg_for_device() functions should be called with the same nents as the dma_map_sg(), not the value the map function returned according to the documentation in Documentation/core-api/dma-api.rst:450:
With the sync_sg API, all the parameters must be the same as those passed into the sg mapping API.
--- drivers/tty/serial/pch_uart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/pch_uart.c +1 -1
@@ -1014,7 +1014,7 @@ static unsigned int dma_handle_tx(struct __func__);return 0 ; } -dma_sync_sg_for_device (port->dev, priv->sg_tx_p, nent,DMA_TO_DEVICE ); +dma_sync_sg_for_device (port->dev, priv->sg_tx_p, num,DMA_TO_DEVICE ); priv->desc_tx = desc; desc->callback = pch_dma_tx_complete; desc->callback_param = priv;
Greg Kroah-Hartman
maintainerPATCH 10/644 HID: core: ensure the allocated report buffer can contain the reserved report ID
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Tissoires <[email protected]>
commit 4f15ee98304b96e164ff2340e1dfd6181c3f42aa upstream.
When the report ID is not used, the low level transport drivers expect the first byte to be 0. However, currently the allocated buffer not account for that extra byte, meaning that instead of having 8 guaranteed bytes for implement to be working, we only have 7.
--- drivers/hid/hid-core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/hid/hid-core.c +4 -1
@@ -1662,9 +1662,12 @@ u8 *hid_alloc_report_buf(struct hid_repo/* * 7 extra bytes are necessary to achieve proper functionality * of implement() working on 8 byte chunks +* 1 extra byte for the report ID if it is null (not used) so +* we can reserve that extra byte in the first position of the buffer +* when sending it to .raw_request() */ -u32 len =hid_report_len (report) +7 ; +u32 len =hid_report_len (report) +7 + (report->id ==0 );return kzalloc (len, flags); }
Greg Kroah-Hartman
maintainerPATCH 11/644 HID: core: ensure __hid_request reserves the report ID as the first byte
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Tissoires <[email protected]>
commit 0d0777ccaa2d46609d05b66ba0096802a2746193 upstream.
The low level transport driver expects the first byte to be the report ID, even when the report ID is not use (in which case they just shift the buffer).
However, __hid_request() whas not offsetting the buffer it used by one in this case, meaning that the raw_request() callback emitted by the transport driver would be stripped of the first byte.
Note: this changes the API for uhid devices when a request is made through hid_hw_request. However, several considerations makes me think this is fine:
- every request to a HID device made through hid_hw_request() would see that change, but every request made through hid_hw_raw_request() already has the new behaviour. So that means that the users are already facing situations where they might have or not the first byte being the null report ID when it is 0. We are making things more straightforward in the end.
- uhid is mainly used for BLE devices
- uhid is also used for testing, but I don't see that change a big issue
- for BLE devices, we can check which kernel module is calling hid_hw_request()
- and in those modules, we can check which are using a Bluetooth device
- and then we can check if the command is used with a report ID or not.
- surprise: none of the kernel module are using a report ID 0
- and finally, bluez, in its function set_report()[0], does the same shift if the report ID is 0 and the given buffer has a size > 0.
[0] https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/profiles/input/hog-lib.c#n879
--- drivers/hid/hid-core.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/hid/hid-core.c +9 -2
@@ -1730,7 +1730,7 @@ static struct hid_report *hid_get_reportint __hid_request (struct hid_device *hid,struct hid_report *report,int reqtype) { -char *buf; +char *buf, *data_buf;int ret;u32 len;
@@ -1738,10 +1738,17 @@ int __hid_request(struct hid_device *hidif (!buf)return -ENOMEM ; + data_buf = buf; len =hid_report_len (report); +if (report->id ==0 ) { +/* reserve the first byte for the report ID */ + data_buf++; + len++; + } +if (reqtype ==HID_REQ_SET_REPORT ) -hid_output_report (report, buf); +hid_output_report (report, data_buf); ret = hid->ll_driver->raw_request (hid, report->id, buf, len, report->type, reqtype);
Greg Kroah-Hartman
maintainerPATCH 12/644 HID: core: do not bypass hid_hw_raw_request
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Tissoires <[email protected]>
commit c2ca42f190b6714d6c481dfd3d9b62ea091c946b upstream.
hid_hw_raw_request() is actually useful to ensure the provided buffer and length are valid. Directly calling in the low level transport driver function bypassed those checks and allowed invalid paramto be used.
--- drivers/hid/hid-core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/hid/hid-core.c +1 -2
@@ -1750,8 +1750,7 @@ int __hid_request(struct hid_device *hidif (reqtype ==HID_REQ_SET_REPORT )hid_output_report (report, data_buf); - ret = hid->ll_driver->raw_request (hid, report->id, buf, len, - report->type, reqtype); + ret =hid_hw_raw_request (hid, report->id, buf, len, report->type, reqtype);if (ret <0 ) {dbg_hid ("unable to complete request: %d\n" , ret); goto out;
Greg Kroah-Hartman
maintainerPATCH 13/644 tracing: Add down_write(trace_event_sem) when adding trace event
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt <[email protected]>
commit b5e8acc14dcb314a9b61ff19dcd9fdd0d88f70df upstream.
When a module is loaded, it adds trace events defined by the module. It may also need to modify the modules trace printk formats to replace enum names with their values.
If two modules are loaded at the same time, the adding of the event to the ftrace_events list can corrupt the walking of the list in the code that is modifying the printk format strings and crash the kernel.
The addition of the event should take the trace_event_sem for write while it adds the new event.
Also add a lockdep_assert_held() on that semaphore in __trace_add_event_dirs() as it iterates the list.
--- kernel/trace/trace_events.c | 5 +++++ 1 file changed, 5 insertions(+)
kernel/trace/trace_events.c +5 -0
@@ -2685,7 +2685,10 @@ __register_event(struct trace_event_callif (ret <0 )return ret; +down_write (&trace_event_sem);list_add (&call->list, &ftrace_events); +up_write (&trace_event_sem); +if (call->flags &TRACE_EVENT_FL_DYNAMIC )atomic_set (&call->refcnt,0 );else
@@ -3156,6 +3159,8 @@ __trace_add_event_dirs(struct trace_arrastruct trace_event_call *call;int ret; +lockdep_assert_held (&trace_event_sem); +list_for_each_entry (call, &ftrace_events, list) { ret =__trace_add_new_event (call, tr);if (ret <0 )
Greg Kroah-Hartman
maintainerPATCH 14/644 phonet/pep: Move call to pn_skb_get_dst_sockaddr() earlier in pep_sock_accept()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Chancellor <[email protected]>
commit 17ba793f381eb813596d6de1cc6820bcbda5ed8b upstream.
A new warning in clang [1] points out a place in pep_sock_accept() where dst is uninitialized then passed as a const pointer to pep_find_pipe():
net/phonet/pep.c:829:37: error: variable 'dst' is uninitialized when passed as a const pointer argument here [-Werror,-Wuninitialized-const-pointer]
829 | newsk = pep_find_pipe(&pn->hlist, &dst, pipe_handle);
| ^~~:Move the call to pn_skb_get_dst_sockaddr(), which initializes dst, to before the call to pep_find_pipe(), so that dst is consistently used initialized throughout the function.
--- net/phonet/pep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/phonet/pep.c +1 -1
@@ -825,6 +825,7 @@ static struct sock *pep_sock_accept(stru }/* Check for duplicate pipe handle */ +pn_skb_get_dst_sockaddr (skb, &dst); newsk =pep_find_pipe (&pn->hlist, &dst, pipe_handle);if (unlikely (newsk)) {__sock_put (newsk);
@@ -849,7 +850,6 @@ static struct sock *pep_sock_accept(stru newsk->sk_destruct = pipe_destruct; newpn =pep_sk (newsk); -pn_skb_get_dst_sockaddr (skb, &dst);pn_skb_get_src_sockaddr (skb, &src); newpn->pn_sk.sobject =pn_sockaddr_get_object (&dst); newpn->pn_sk.dobject =pn_sockaddr_get_object (&src);
Greg Kroah-Hartman
maintainerPATCH 15/644 af_packet: fix the SO_SNDTIMEO constraint not effective on tpacked_snd()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yun Lu <[email protected]>
commit c1ba3c0cbdb5e53a8ec5d708e99cd4c497028a13 upstream.
Due to the changes in commit 581073f626e3 ("af_packet: do not call packet_read_pending() from tpacket_destruct_skb()"), every time tpacket_destruct_skb() is executed, the skb_completion is marked as completed. When wait_for_completion_interruptible_timeout() returns completed, the pending_refcnt has not yet been reduced to zero. Therefore, when ph is NULL, the wait function may need to be called multiple times until packet_read_pending() finally returns zero.
We should call sock_sndtimeo() only once, otherwise the SO_SNDTIMEO constraint could be way off.
--- net/packet/af_packet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/packet/af_packet.c +2 -2
@@ -2742,7 +2742,7 @@ static int tpacket_snd(struct packet_socint len_sum =0 ;int status =TP_STATUS_AVAILABLE ;int hlen, tlen, copylen =0 ; -long timeo =0 ; +long timeo;mutex_lock (&po->pg_vec_lock);
@@ -2796,6 +2796,7 @@ static int tpacket_snd(struct packet_socif ((size_max > dev->mtu + reserve +VLAN_HLEN ) && !po->has_vnet_hdr) size_max = dev->mtu + reserve +VLAN_HLEN ; + timeo =sock_sndtimeo (&po->sk, msg->msg_flags &MSG_DONTWAIT );reinit_completion (&po->skb_completion); do {
@@ -2803,7 +2804,6 @@ static int tpacket_snd(struct packet_soc TP_STATUS_SEND_REQUEST);if (unlikely (ph ==NULL )) {if (need_wait && skb) { - timeo =sock_sndtimeo (&po->sk, msg->msg_flags &MSG_DONTWAIT ); timeo =wait_for_completion_interruptible_timeout (&po->skb_completion, timeo);if (timeo <=0 ) { err = !timeo ? -ETIMEDOUT : -ERESTARTSYS ;
Greg Kroah-Hartman
maintainerPATCH 16/644 af_packet: fix soft lockup issue caused by tpacket_snd()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yun Lu <[email protected]>
commit 55f0bfc0370539213202f4ce1a07615327ac4713 upstream.
When MSG_DONTWAIT is not set, the tpacket_snd operation will wait for pending_refcnt to decrement to zero before returning. The pending_refcnt is decremented by 1 when the skb->destructor function is called, indicating that the skb has been successfully sent and needs to be destroyed.
If an error occurs during this process, the tpacket_snd() function will exit and return error, but pending_refcnt may not yet have decremented to zero. Assuming the next send operation is executed immediately, but there are no available frames to be sent in tx_ring (i.e., packet_current_frame returns NULL), and skb is also NULL, the function will not execute wait_for_completion_interruptible_timeout() to yield the CPU. Instead, it will enter a do-while loop, waiting for pending_refcnt to be zero. Even if the previous skb has completed transmission, the skb->destructor function can only be invoked in the ksoftirqd thread (assuming NAPI threading is enabled). When both the ksoftirqd thread and the tpacket_snd operation happen to run on the same CPU, and the CPU trapped in the do-while loop without yielding, the ksoftirqd thread will not get scheduled to run. As a result, pending_refcnt will never be reduced to zero, and the do-while loop cannot exit, eventually leading to a CPU soft lockup issue.
In fact, skb is true for all but the first iterations of that loop, and as long as pending_refcnt is not zero, even if incremented by a previous call, wait_for_completion_interruptible_timeout() should be executed to yield the CPU, allowing the ksoftirqd thread to be scheduled. Therefore, the execution condition of this function should be modified to check if pending_refcnt is not zero, instead of check skb.
- if (need_wait && skb) {
+ if (need_wait && packet_read_pending(&po->tx_ring)) {
As a result, the judgment conditions are duplicated with the end code of the while loop, and packet_read_pending() is a very expensive function. Actually, this loop can only exit when ph is NULL, so the loop condition can be changed to while (1), and in the "ph = NULL" branch, if the subsequent condition of if is not met, the loop can break directly. Now, the loop logic remains the same as origin but is clearer and more obvious.
--- net/packet/af_packet.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
net/packet/af_packet.c +11 -12
@@ -2803,15 +2803,21 @@ static int tpacket_snd(struct packet_soc ph =packet_current_frame (po, &po->tx_ring,TP_STATUS_SEND_REQUEST );if (unlikely (ph ==NULL )) { -if (need_wait && skb) { +/* Note: packet_read_pending() might be slow if we +* have to call it as it's per_cpu variable, but in +* fast-path we don't have to call it, only when ph +* is NULL, we need to check the pending_refcnt. +*/ +if (need_wait &&packet_read_pending (&po->tx_ring)) { timeo =wait_for_completion_interruptible_timeout (&po->skb_completion, timeo);if (timeo <=0 ) { err = !timeo ? -ETIMEDOUT : -ERESTARTSYS ; goto out_put; } - } -/* check for additional frames */ -continue ; +/* check for additional frames */ +continue ; + }else +break ; } skb =NULL ;
@@ -2901,14 +2907,7 @@ tpacket_error: }packet_increment_head (&po->tx_ring); len_sum += tp_len; - }while (likely ((ph !=NULL ) || -/* Note: packet_read_pending() might be slow if we have -* to call it as it's per_cpu variable, but in fast-path -* we already short-circuit the loop with the first -* condition, and luckily don't have to go that path -* anyway. -*/ - (need_wait &&packet_read_pending (&po->tx_ring)))); + }while (1 ); err = len_sum; goto out_put;
Greg Kroah-Hartman
maintainerPATCH 17/644 dmaengine: nbpfaxi: Fix memory corruption in probe()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit 188c6ba1dd925849c5d94885c8bbdeb0b3dcf510 upstream.
The nbpf->chan[] array is allocated earlier in the nbpf_probe() function and it has "num_channels" elements. These three loops iterate one element farther than they should and corrupt memory.
The changes to the second loop are more involved. In this case, we're copying data from the irqbuf[] array into the nbpf->chan[] array. If the data in irqbuf[i] is the error IRQ then we skip it, so the iterators are not in sync. I added a check to ensure that we don't go beyond the end of the irqbuf[] array. I'm pretty sure this can't happen, but it seemed harmless to add a check.
On the other hand, after the loop has ended there is a check to ensure that the "chan" iterator is where we expect it to be. In the original code we went one element beyond the end of the array so the iterator wasn't in the correct place and it would always return -EINVAL. However, now it will always be in the correct place. I deleted the check since we know the result.
--- drivers/dma/nbpfaxi.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/dma/nbpfaxi.c +5 -6
@@ -1356,7 +1356,7 @@ static int nbpf_probe(struct platform_deif (irqs ==1 ) { eirq = irqbuf[0 ]; -for (i =0 ; i <= num_channels; i++) +for (i =0 ; i < num_channels; i++) nbpf->chan[i].irq = irqbuf[0 ]; }else { eirq =platform_get_irq_byname (pdev,"error" );
@@ -1366,16 +1366,15 @@ static int nbpf_probe(struct platform_deif (irqs == num_channels +1 ) {struct nbpf_channel *chan; -for (i =0 , chan = nbpf->chan; i <= num_channels; +for (i =0 , chan = nbpf->chan; i < num_channels; i++, chan++) {/* Skip the error IRQ */ if (irqbuf[i] == eirq) i++; +if (i >=ARRAY_SIZE (irqbuf)) +return -EINVAL ; chan->irq = irqbuf[i]; } - -if (chan != nbpf->chan + num_channels) -return -EINVAL ; }else {/* 2 IRQs and more than one channel */ if (irqbuf[0 ] == eirq)
@@ -1383,7 +1382,7 @@ static int nbpf_probe(struct platform_deelse irq = irqbuf[0 ]; -for (i =0 ; i <= num_channels; i++) +for (i =0 ; i < num_channels; i++) nbpf->chan[i].irq = irq; } }
Greg Kroah-Hartman
maintainerPATCH 18/644 isofs: Verify inode mode when loading from disk
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit 0a9e7405131380b57e155f10242b2e25d2e51852 upstream.
Verify that the inode mode is sane when loading it from the disk to avoid complaints from VFS about setting up invalid inodes.
--- fs/isofs/inode.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
fs/isofs/inode.c +8 -1
@@ -1493,9 +1493,16 @@ static int isofs_read_inode(struct inode inode->i_op = &page_symlink_inode_operations;inode_nohighmem (inode); inode->i_data.a_ops = &isofs_symlink_aops; - }else + }else if (S_ISCHR (inode->i_mode) ||S_ISBLK (inode->i_mode) || +S_ISFIFO (inode->i_mode) ||S_ISSOCK (inode->i_mode)) {/* XXX - parse_rock_ridge_inode() had already set i_rdev. */ init_special_inode (inode, inode->i_mode, inode->i_rdev); + }else { +printk (KERN_DEBUG "ISOFS: Invalid file type 0%04o for inode %lu.\n" , + inode->i_mode, inode->i_ino); + ret = -EIO ; + goto fail; + } ret =0 ; out:
Greg Kroah-Hartman
maintainerPATCH 19/644 memstick: core: Zero initialize id_reg in h_memstick_read_dev_id()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Chancellor <[email protected]>
commit 21b34a3a204ed616373a12ec17dc127ebe51eab3 upstream.
A new warning in clang [1] points out that id_reg is uninitialized then passed to memstick_init_req() as a const pointer:
drivers/memstick/core/memstick.c:330:59: error: variable 'id_reg' is uninitialized when passed as a const pointer argument here [-Werror,-Wuninitialized-const-pointer]
330 | memstick_init_req(&card->current_mrq, MS_TPC_READ_REG, &id_reg,
| ^~~~~~Commit de182cc8e882 ("drivers/memstick/core/memstick.c: avoid -Wnonnull warning") intentionally passed this variable uninitialized to avoid an -Wnonnull warning from a NULL value that was previously there because id_reg is never read from the call to memstick_init_req() in h_memstick_read_dev_id(). Just zero initialize id_reg to avoid the warning, which is likely happening in the majority of builds using modern compilers that support '-ftrivial-auto-var-init=zero'.
--- drivers/memstick/core/memstick.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/memstick/core/memstick.c +1 -1
@@ -323,7 +323,7 @@ EXPORT_SYMBOL(memstick_init_req);static int h_memstick_read_dev_id (struct memstick_dev *card,struct memstick_request **mrq) { -struct ms_id_register id_reg; +struct ms_id_register id_reg = {};if (!(*mrq)) { memstick_init_req(&card->current_mrq, MS_TPC_READ_REG, &id_reg,
Greg Kroah-Hartman
maintainerPATCH 20/644 mmc: bcm2835: Fix dma_unmap_sg() nents value
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Fourier <[email protected]>
commit ff09b71bf9daeca4f21d6e5e449641c9fad75b53 upstream.
The dma_unmap_sg() functions should be called with the same nents as the dma_map_sg(), not the value the map function returned.
--- drivers/mmc/host/bcm2835.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/host/bcm2835.c +2 -1
@@ -507,7 +507,8 @@ void bcm2835_prepare_dma(struct bcm2835_ DMA_PREP_INTERRUPT | DMA_CTRL_ACK);if (!desc) { -dma_unmap_sg (dma_chan->device->dev, data->sg, sg_len, dir_data); +dma_unmap_sg (dma_chan->device->dev, data->sg, data->sg_len, + dir_data);return ; }
Greg Kroah-Hartman
maintainerPATCH 21/644 mmc: sdhci-pci: Quirk for broken command queuing on Intel GLK-based Positivo models
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Edson Juliano Drosdeck <[email protected]>
commit 50c78f398e92fafa1cbba3469c95fe04b2e4206d upstream.
Disable command queuing on Intel GLK-based Positivo models.
Without this quirk, CQE (Command Queuing Engine) causes instability or I/O errors during operation. Disabling it ensures stable operation on affected devices.
--- drivers/mmc/host/sdhci-pci-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-pci-core.c +2 -1
@@ -980,7 +980,8 @@ static bool glk_broken_cqhci(struct sdhc {return slot->chip->pdev->device ==PCI_DEVICE_ID_INTEL_GLK_EMMC && (dmi_match (DMI_BIOS_VENDOR ,"LENOVO" ) || -dmi_match (DMI_SYS_VENDOR ,"IRBIS" )); +dmi_match (DMI_SYS_VENDOR ,"IRBIS" ) || +dmi_match (DMI_SYS_VENDOR ,"Positivo Tecnologia SA" )); }static bool jsl_broken_hs400es (struct sdhci_pci_slot *slot)
Greg Kroah-Hartman
maintainerPATCH 22/644 mmc: sdhci_am654: Workaround for Errata i2312
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Judith Mendez <[email protected]>
commit 6d0b1c01847fedd7c85a5cdf59b8cfc7d14512e6 upstream.
Errata i2312 [0] for K3 silicon mentions the maximum obtainable timeout through MMC host controller is 700ms. And for commands taking longer than 700ms, hardware timeout should be disabled and software timeout should be used.
The workaround for Errata i2312 can be achieved by adding SDHCI_QUIRK2_DISABLE_HW_TIMEOUT quirk in sdhci_am654.
[0] https://www.ti.com/lit/pdf/sprz487
--- drivers/mmc/host/sdhci_am654.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/mmc/host/sdhci_am654.c +6 -3
@@ -558,7 +558,8 @@ static struct sdhci_ops sdhci_am654_opsstatic const struct sdhci_pltfm_data sdhci_am654_pdata = { .ops = &sdhci_am654_ops, .quirks =SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12 , - .quirks2 =SDHCI_QUIRK2_PRESET_VALUE_BROKEN , + .quirks2 =SDHCI_QUIRK2_PRESET_VALUE_BROKEN | +SDHCI_QUIRK2_DISABLE_HW_TIMEOUT , };static const struct sdhci_am654_driver_data sdhci_am654_sr1_drvdata = {
@@ -588,7 +589,8 @@ static struct sdhci_ops sdhci_j721e_8bitstatic const struct sdhci_pltfm_data sdhci_j721e_8bit_pdata = { .ops = &sdhci_j721e_8bit_ops, .quirks =SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12 , - .quirks2 =SDHCI_QUIRK2_PRESET_VALUE_BROKEN , + .quirks2 =SDHCI_QUIRK2_PRESET_VALUE_BROKEN | +SDHCI_QUIRK2_DISABLE_HW_TIMEOUT , };static const struct sdhci_am654_driver_data sdhci_j721e_8bit_drvdata = {
@@ -612,7 +614,8 @@ static struct sdhci_ops sdhci_j721e_4bitstatic const struct sdhci_pltfm_data sdhci_j721e_4bit_pdata = { .ops = &sdhci_j721e_4bit_ops, .quirks =SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12 , - .quirks2 =SDHCI_QUIRK2_PRESET_VALUE_BROKEN , + .quirks2 =SDHCI_QUIRK2_PRESET_VALUE_BROKEN | +SDHCI_QUIRK2_DISABLE_HW_TIMEOUT , };static const struct sdhci_am654_driver_data sdhci_j721e_4bit_drvdata = {
Greg Kroah-Hartman
maintainerPATCH 23/644 pmdomain: governor: Consider CPU latency tolerance from pm_domain_cpu_gov
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maulik Shah <[email protected]>
commit 500ba33284416255b9a5b50ace24470b6fe77ea5 upstream.
pm_domain_cpu_gov is selecting a cluster idle state but does not consider latency tolerance of child CPUs. This results in deeper cluster idle state whose latency does not meet latency tolerance requirement.
Select deeper idle state only if global and device latency tolerance of all child CPUs meet.
Test results on SM8750 with 300 usec PM-QoS on CPU0 which is less than domain idle state entry (2150) + exit (1983) usec latency mentioned in devicetree, demonstrate the issue.
# echo 300 > /sys/devices/system/cpu/cpu0/power/pm_qos_resume_latency_us
Before: (Usage is incrementing)
======
# cat /sys/kernel/debug/pm_genpd/power-domain-cluster0/idle_states State Time Spent(ms) Usage Rejected Above Below S0 29817 537 8 270 0
# cat /sys/kernel/debug/pm_genpd/power-domain-cluster0/idle_states State Time Spent(ms) Usage Rejected Above Below S0 30348 542 8 271 0
After: (Usage is not incrementing due to latency tolerance)
======
# cat /sys/kernel/debug/pm_genpd/power-domain-cluster0/idle_states State Time Spent(ms) Usage Rejected Above Below S0 39319 626 14 307 0
# cat /sys/kernel/debug/pm_genpd/power-domain-cluster0/idle_states State Time Spent(ms) Usage Rejected Above Below S0 39319 626 14 307 0
--- drivers/base/power/domain_governor.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
drivers/base/power/domain_governor.c +16 -2
@@ -8,6 +8,7 @@#include <linux/pm_domain.h> #include <linux/pm_qos.h> #include <linux/hrtimer.h> +#include <linux/cpu.h> #include <linux/cpuidle.h> #include <linux/cpumask.h> #include <linux/ktime.h>
@@ -339,6 +340,8 @@ static bool cpu_power_down_ok(struct devstruct cpuidle_device *dev;ktime_t domain_wakeup, next_hrtimer;ktime_t now =ktime_get (); +struct device *cpu_dev; +s64 cpu_constraint, global_constraint;s64 idle_duration_ns;int cpu, i;
@@ -349,6 +352,7 @@ static bool cpu_power_down_ok(struct devif (!(genpd->flags &GENPD_FLAG_CPU_DOMAIN ))return true; + global_constraint =cpu_latency_qos_limit ();/* * Find the next wakeup for any of the online CPUs within the PM domain * and its subdomains. Note, we only need the genpd->cpus, as it already
@@ -362,8 +366,16 @@ static bool cpu_power_down_ok(struct devif (ktime_before (next_hrtimer, domain_wakeup)) domain_wakeup = next_hrtimer; } + + cpu_dev =get_cpu_device (cpu); +if (cpu_dev) { + cpu_constraint =dev_pm_qos_raw_resume_latency (cpu_dev); +if (cpu_constraint < global_constraint) + global_constraint = cpu_constraint; + } } + global_constraint *=NSEC_PER_USEC ;/* The minimum idle duration is from now - until the next wakeup. */ idle_duration_ns =ktime_to_ns (ktime_sub (domain_wakeup, now));if (idle_duration_ns <=0 )
@@ -376,8 +388,10 @@ static bool cpu_power_down_ok(struct dev*/ i = genpd->state_idx; do { - if (idle_duration_ns >= (genpd->states[i].residency_ns + - genpd->states[i].power_off_latency_ns)) { + if ((idle_duration_ns >= (genpd->states[i].residency_ns + + genpd->states[i].power_off_latency_ns)) && + (global_constraint >= (genpd->states[i].power_on_latency_ns + + genpd->states[i].power_off_latency_ns))) { genpd->state_idx = i; return true; }
Greg Kroah-Hartman
maintainerPATCH 24/644 soc: aspeed: lpc-snoop: Cleanup resources in stack-order
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Jeffery <[email protected]>
commit 8481d59be606d2338dbfe14b04cdbd1a3402c150 upstream.
Free the kfifo after unregistering the miscdev in aspeed_lpc_disable_snoop() as the kfifo is initialised before the miscdev in aspeed_lpc_enable_snoop().
--- drivers/soc/aspeed/aspeed-lpc-snoop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/aspeed/aspeed-lpc-snoop.c +1 -1
@@ -264,8 +264,8 @@ static void aspeed_lpc_disable_snoop(strreturn ; } -kfifo_free (&lpc_snoop->chan[channel].fifo);misc_deregister (&lpc_snoop->chan[channel].miscdev); +kfifo_free (&lpc_snoop->chan[channel].fifo); }static int aspeed_lpc_snoop_probe (struct platform_device *pdev)
Greg Kroah-Hartman
maintainerPATCH 25/644 soc: aspeed: lpc-snoop: Dont disable channels that arent enabled
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Jeffery <[email protected]>
commit 56448e78a6bb4e1a8528a0e2efe94eff0400c247 upstream.
Mitigate e.g. the following:
# echo 1e789080.lpc-snoop > /sys/bus/platform/drivers/aspeed-lpc-snoop/unbind
...
[ 120.363594] Unable to handle kernel NULL pointer dereference at virtual address 00000004 when write
[ 120.373866] [00000004] *pgd=00000000
[ 120.377910] Internal error: Oops: 805 [#1] SMP ARM
[ 120.383306] CPU: 1 UID: 0 PID: 315 Comm: sh Not tainted 6.15.0-rc1-00009-g926217bc7d7d-dirty #20 NONE
...
[ 120.679543] Call trace:
[ 120.679559] misc_deregister from aspeed_lpc_snoop_remove+0x84/0xac
[ 120.692462] aspeed_lpc_snoop_remove from platform_remove+0x28/0x38
[ 120.700996] platform_remove from device_release_driver_internal+0x188/0x200
...--- drivers/soc/aspeed/aspeed-lpc-snoop.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/soc/aspeed/aspeed-lpc-snoop.c +11 -0
@@ -59,6 +59,7 @@ struct aspeed_lpc_snoop_model_data { };struct aspeed_lpc_snoop_channel { +bool enabled;struct kfifo fifo;wait_queue_head_t wq;struct miscdevice miscdev;
@@ -191,6 +192,9 @@ static int aspeed_lpc_enable_snoop(strucconst struct aspeed_lpc_snoop_model_data *model_data =of_device_get_match_data (dev); +if (WARN_ON (lpc_snoop->chan[channel].enabled)) +return -EBUSY ; +init_waitqueue_head (&lpc_snoop->chan[channel].wq);/* Create FIFO datastructure */ rc = kfifo_alloc(&lpc_snoop->chan[channel].fifo,
@@ -237,6 +241,8 @@ static int aspeed_lpc_enable_snoop(strucregmap_update_bits (lpc_snoop->regmap,HICRB , hicrb_en, hicrb_en); + lpc_snoop->chan[channel].enabled = true; +return 0 ; err_misc_deregister:
@@ -249,6 +255,9 @@ err_free_fifo:static void aspeed_lpc_disable_snoop (struct aspeed_lpc_snoop *lpc_snoop,int channel) { +if (!lpc_snoop->chan[channel].enabled) +return ; +switch (channel) {case 0 : regmap_update_bits(lpc_snoop->regmap, HICR5,
@@ -264,6 +273,8 @@ static void aspeed_lpc_disable_snoop(strreturn ; } + lpc_snoop->chan[channel].enabled = false; +/* Consider improving safety wrt concurrent reader(s) */ misc_deregister (&lpc_snoop->chan[channel].miscdev);kfifo_free (&lpc_snoop->chan[channel].fifo); }
Greg Kroah-Hartman
maintainerPATCH 26/644 iio: adc: max1363: Fix MAX1363_4X_CHANS/MAX1363_8X_CHANS[]
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fabio Estevam <[email protected]>
commit 6d21f2c2dd843bceefd9455f2919f6bb526797f0 upstream.
Since commit 2718f15403fb ("iio: sanity check available_scan_masks array"), booting a board populated with a MAX11601 results in a flood of warnings:
max1363 1-0064: available_scan_mask 8 subset of 0. Never used max1363 1-0064: available_scan_mask 9 subset of 0. Never used max1363 1-0064: available_scan_mask 10 subset of 0. Never used max1363 1-0064: available_scan_mask 11 subset of 0. Never used max1363 1-0064: available_scan_mask 12 subset of 0. Never used max1363 1-0064: available_scan_mask 13 subset of 0. Never used
...
These warnings are caused by incorrect offsets used for differential channels in the MAX1363_4X_CHANS() and MAX1363_8X_CHANS() macros.
The max1363_mode_table[] defines the differential channel mappings as follows:
MAX1363_MODE_DIFF_SINGLE(0, 1, 1 << 12),MAX1363_MODE_DIFF_SINGLE(2, 3, 1 << 13),MAX1363_MODE_DIFF_SINGLE(4, 5, 1 << 14),MAX1363_MODE_DIFF_SINGLE(6, 7, 1 << 15),MAX1363_MODE_DIFF_SINGLE(8, 9, 1 << 16),MAX1363_MODE_DIFF_SINGLE(10, 11, 1 << 17),MAX1363_MODE_DIFF_SINGLE(1, 0, 1 << 18),MAX1363_MODE_DIFF_SINGLE(3, 2, 1 << 19),MAX1363_MODE_DIFF_SINGLE(5, 4, 1 << 20),MAX1363_MODE_DIFF_SINGLE(7, 6, 1 << 21),MAX1363_MODE_DIFF_SINGLE(9, 8, 1 << 22),MAX1363_MODE_DIFF_SINGLE(11, 10, 1 << 23),
Update the macros to follow this same pattern, ensuring that the scan masks are valid and preventing the warnings.
--- drivers/iio/adc/max1363.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/iio/adc/max1363.c +12 -12
@@ -513,10 +513,10 @@ static const struct iio_event_spec max13MAX1363_CHAN_U (1 , _s1,1 , bits, ev_spec, num_ev_spec), \MAX1363_CHAN_U (2 , _s2,2 , bits, ev_spec, num_ev_spec), \MAX1363_CHAN_U (3 , _s3,3 , bits, ev_spec, num_ev_spec), \ -MAX1363_CHAN_B (0 ,1 , d0m1,4 , bits, ev_spec, num_ev_spec), \ -MAX1363_CHAN_B (2 ,3 , d2m3,5 , bits, ev_spec, num_ev_spec), \ -MAX1363_CHAN_B (1 ,0 , d1m0,6 , bits, ev_spec, num_ev_spec), \ -MAX1363_CHAN_B (3 ,2 , d3m2,7 , bits, ev_spec, num_ev_spec), \ +MAX1363_CHAN_B (0 ,1 , d0m1,12 , bits, ev_spec, num_ev_spec), \ +MAX1363_CHAN_B (2 ,3 , d2m3,13 , bits, ev_spec, num_ev_spec), \ +MAX1363_CHAN_B (1 ,0 , d1m0,18 , bits, ev_spec, num_ev_spec), \ +MAX1363_CHAN_B (3 ,2 , d3m2,19 , bits, ev_spec, num_ev_spec), \ IIO_CHAN_SOFT_TIMESTAMP(8) \ }
@@ -611,14 +611,14 @@ static const enum max1363_modes max11608MAX1363_CHAN_U (5 , _s5,5 , bits,NULL ,0 ), \MAX1363_CHAN_U (6 , _s6,6 , bits,NULL ,0 ), \MAX1363_CHAN_U (7 , _s7,7 , bits,NULL ,0 ), \ -MAX1363_CHAN_B (0 ,1 , d0m1,8 , bits,NULL ,0 ), \ -MAX1363_CHAN_B (2 ,3 , d2m3,9 , bits,NULL ,0 ), \ -MAX1363_CHAN_B (4 ,5 , d4m5,10 , bits,NULL ,0 ), \ -MAX1363_CHAN_B (6 ,7 , d6m7,11 , bits,NULL ,0 ), \ -MAX1363_CHAN_B (1 ,0 , d1m0,12 , bits,NULL ,0 ), \ -MAX1363_CHAN_B (3 ,2 , d3m2,13 , bits,NULL ,0 ), \ -MAX1363_CHAN_B (5 ,4 , d5m4,14 , bits,NULL ,0 ), \ -MAX1363_CHAN_B (7 ,6 , d7m6,15 , bits,NULL ,0 ), \ +MAX1363_CHAN_B (0 ,1 , d0m1,12 , bits,NULL ,0 ), \ +MAX1363_CHAN_B (2 ,3 , d2m3,13 , bits,NULL ,0 ), \ +MAX1363_CHAN_B (4 ,5 , d4m5,14 , bits,NULL ,0 ), \ +MAX1363_CHAN_B (6 ,7 , d6m7,15 , bits,NULL ,0 ), \ +MAX1363_CHAN_B (1 ,0 , d1m0,18 , bits,NULL ,0 ), \ +MAX1363_CHAN_B (3 ,2 , d3m2,19 , bits,NULL ,0 ), \ +MAX1363_CHAN_B (5 ,4 , d5m4,20 , bits,NULL ,0 ), \ +MAX1363_CHAN_B (7 ,6 , d7m6,21 , bits,NULL ,0 ), \ IIO_CHAN_SOFT_TIMESTAMP(16) \ } static const struct iio_chan_spec max11602_channels[] = MAX1363_8X_CHANS(8);
Greg Kroah-Hartman
maintainerPATCH 27/644 iio: adc: max1363: Reorder mode_list[] entries
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fabio Estevam <[email protected]>
commit 8d8d7c1dbc46aa07a76acab7336a42ddd900be10 upstream.
The IIO core issues warnings when a scan mask is a subset of a previous entry in the available_scan_masks array.
On a board using a MAX11601, the following warning is observed:
max1363 1-0064: available_scan_mask 7 subset of 6. Never used
This occurs because the entries in the max11607_mode_list[] array are not ordered correctly. To fix this, reorder the entries so that no scan mask is a subset of an earlier one.
While at it, reorder the mode_list[] arrays for other supported chips as well, to prevent similar warnings on different variants.
Note fixes tag dropped as these were introduced over many commits a long time back and the side effect until recently was a reduction in sampling rate due to reading too many channels when only a few were desired. Now we have a sanity check that reports this error but that is not where the issue was introduced.
--- drivers/iio/adc/max1363.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
drivers/iio/adc/max1363.c +9 -10
@@ -534,23 +534,23 @@ static const struct iio_chan_spec max136/* Applies to max1236, max1237 */ static const enum max1363_modes max1236_mode_list[] = { _s0, _s1, _s2, _s3, - s0to1, s0to2, s0to3, + s0to1, s0to2, s2to3, s0to3, d0m1, d2m3, d1m0, d3m2, d0m1to2m3, d1m0to3m2, - s2to3, };/* Applies to max1238, max1239 */ static const enum max1363_modes max1238_mode_list[] = { _s0, _s1, _s2, _s3, _s4, _s5, _s6, _s7, _s8, _s9, _s10, _s11, s0to1, s0to2, s0to3, s0to4, s0to5, s0to6, + s6to7, s6to8, s6to9, s6to10, s6to11, s0to7, s0to8, s0to9, s0to10, s0to11, d0m1, d2m3, d4m5, d6m7, d8m9, d10m11, d1m0, d3m2, d5m4, d7m6, d9m8, d11m10, - d0m1to2m3, d0m1to4m5, d0m1to6m7, d0m1to8m9, d0m1to10m11, - d1m0to3m2, d1m0to5m4, d1m0to7m6, d1m0to9m8, d1m0to11m10, - s6to7, s6to8, s6to9, s6to10, s6to11, - d6m7to8m9, d6m7to10m11, d7m6to9m8, d7m6to11m10, + d0m1to2m3, d0m1to4m5, d0m1to6m7, d6m7to8m9, + d0m1to8m9, d6m7to10m11, d0m1to10m11, d1m0to3m2, + d1m0to5m4, d1m0to7m6, d7m6to9m8, d1m0to9m8, + d7m6to11m10, d1m0to11m10, };#define MAX1363_12X_CHANS (bits) { \
@@ -586,16 +586,15 @@ static const struct iio_chan_spec max123static const enum max1363_modes max11607_mode_list[] = { _s0, _s1, _s2, _s3, - s0to1, s0to2, s0to3, - s2to3, + s0to1, s0to2, s2to3, + s0to3, d0m1, d2m3, d1m0, d3m2, d0m1to2m3, d1m0to3m2, };static const enum max1363_modes max11608_mode_list[] = { _s0, _s1, _s2, _s3, _s4, _s5, _s6, _s7, - s0to1, s0to2, s0to3, s0to4, s0to5, s0to6, s0to7, - s6to7, + s0to1, s0to2, s0to3, s0to4, s0to5, s0to6, s6to7, s0to7, d0m1, d2m3, d4m5, d6m7, d1m0, d3m2, d5m4, d7m6, d0m1to2m3, d0m1to4m5, d0m1to6m7,
Greg Kroah-Hartman
maintainerPATCH 28/644 iio: adc: stm32-adc: Fix race in installing chained IRQ handler
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen Ni <[email protected]>
commit e8ad595064f6ebd5d2d1a5d5d7ebe0efce623091 upstream.
Fix a race where a pending interrupt could be received and the handler called before the handler's data has been setup, by converting to irq_set_chained_handler_and_data().
--- drivers/iio/adc/stm32-adc-core.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/iio/adc/stm32-adc-core.c +3 -4
@@ -410,10 +410,9 @@ static int stm32_adc_irq_probe(struct plreturn -ENOMEM ; } -for (i =0 ; i < priv->cfg->num_irqs; i++) { -irq_set_chained_handler (priv->irq[i], stm32_adc_irq_handler); -irq_set_handler_data (priv->irq[i], priv); - } +for (i =0 ; i < priv->cfg->num_irqs; i++) +irq_set_chained_handler_and_data (priv->irq[i], + stm32_adc_irq_handler, priv);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 29/644 comedi: pcl812: Fix bit shift out of bounds
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
commit b14b076ce593f72585412fc7fd3747e03a5e3632 upstream.
When checking for a supported IRQ number, the following test is used:
if ((1 << it->options[1]) & board->irq_bits) {However, it->options[i] is an unchecked int value from userspace, so the shift amount could be negative or out of bounds. Fix the test by requiring it->options[1] to be within bounds before proceeding with the original test. Valid it->options[1] values that select the IRQ will be in the range [1,15]. The value 0 explicitly disables the use of interrupts.
--- drivers/comedi/drivers/pcl812.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/comedi/drivers/pcl812.c +2 -1
@@ -1151,7 +1151,8 @@ static int pcl812_attach(struct comedi_dif (!dev->pacer)return -ENOMEM ; -if ((1 << it->options[1 ]) & board->irq_bits) { +if (it->options[1 ] >0 && it->options[1 ] <16 && + (1 << it->options[1 ]) & board->irq_bits) { ret =request_irq (it->options[1 ], pcl812_interrupt,0 , dev->board_name, dev);if (ret ==0 )
Greg Kroah-Hartman
maintainerPATCH 30/644 comedi: aio_iiro_16: Fix bit shift out of bounds
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
commit 66acb1586737a22dd7b78abc63213b1bcaa100e4 upstream.
When checking for a supported IRQ number, the following test is used:
if ((1 << it->options[1]) & 0xdcfc) {However, it->options[i] is an unchecked int value from userspace, so the shift amount could be negative or out of bounds. Fix the test by requiring it->options[1] to be within bounds before proceeding with the original test. Valid it->options[1] values that select the IRQ will be in the range [1,15]. The value 0 explicitly disables the use of interrupts.
--- drivers/comedi/drivers/aio_iiro_16.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/comedi/drivers/aio_iiro_16.c +2 -1
@@ -178,7 +178,8 @@ static int aio_iiro_16_attach(struct com* Digital input change of state interrupts are optionally supported * using IRQ 2-7, 10-12, 14, or 15. */ -if ((1 << it->options[1 ]) &0xdcfc ) { +if (it->options[1 ] >0 && it->options[1 ] <16 && + (1 << it->options[1 ]) &0xdcfc ) { ret =request_irq (it->options[1 ], aio_iiro_16_cos,0 , dev->board_name, dev);if (ret ==0 )
Greg Kroah-Hartman
maintainerPATCH 31/644 comedi: das16m1: Fix bit shift out of bounds
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
commit ed93c6f68a3be06e4e0c331c6e751f462dee3932 upstream.
When checking for a supported IRQ number, the following test is used:
/* only irqs 2, 3, 4, 5, 6, 7, 10, 11, 12, 14, and 15 are valid */
if ((1 << it->options[1]) & 0xdcfc) {However, it->options[i] is an unchecked int value from userspace, so the shift amount could be negative or out of bounds. Fix the test by requiring it->options[1] to be within bounds before proceeding with the original test.
--- drivers/comedi/drivers/das16m1.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/comedi/drivers/das16m1.c +2 -1
@@ -523,7 +523,8 @@ static int das16m1_attach(struct comedi_ devpriv->extra_iobase = dev->iobase +DAS16M1_8255_IOBASE ;/* only irqs 2, 3, 4, 5, 6, 7, 10, 11, 12, 14, and 15 are valid */ -if ((1 << it->options[1 ]) &0xdcfc ) { +if (it->options[1 ] >=2 && it->options[1 ] <=15 && + (1 << it->options[1 ]) &0xdcfc ) { ret =request_irq (it->options[1 ], das16m1_interrupt,0 , dev->board_name, dev);if (ret ==0 )
Greg Kroah-Hartman
maintainerPATCH 32/644 comedi: das6402: Fix bit shift out of bounds
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
commit 70f2b28b5243df557f51c054c20058ae207baaac upstream.
When checking for a supported IRQ number, the following test is used:
/* IRQs 2,3,5,6,7, 10,11,15 are valid for "enhanced" mode */
if ((1 << it->options[1]) & 0x8cec) {However, it->options[i] is an unchecked int value from userspace, so the shift amount could be negative or out of bounds. Fix the test by requiring it->options[1] to be within bounds before proceeding with the original test. Valid it->options[1] values that select the IRQ will be in the range [1,15]. The value 0 explicitly disables the use of interrupts.
--- drivers/comedi/drivers/das6402.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/comedi/drivers/das6402.c +2 -1
@@ -569,7 +569,8 @@ static int das6402_attach(struct comedi_das6402_reset (dev);/* IRQs 2,3,5,6,7, 10,11,15 are valid for "enhanced" mode */ -if ((1 << it->options[1 ]) &0x8cec ) { +if (it->options[1 ] >0 && it->options[1 ] <16 && + (1 << it->options[1 ]) &0x8cec ) { ret =request_irq (it->options[1 ], das6402_interrupt,0 , dev->board_name, dev);if (ret ==0 ) {
Greg Kroah-Hartman
maintainerPATCH 33/644 comedi: Fail COMEDI_INSNLIST ioctl if n_insns is too large
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
commit 08ae4b20f5e82101d77326ecab9089e110f224cc upstream.
The handling of the COMEDI_INSNLIST ioctl allocates a kernel buffer to hold the array of struct comedi_insn, getting the length from the n_insns member of the struct comedi_insnlist supplied by the user. The allocation will fail with a WARNING and a stack dump if it is too large.
Avoid that by failing with an -EINVAL error if the supplied n_insns value is unreasonable.
Define the limit on the n_insns value in the MAX_INSNS macro. Set this to the same value as MAX_SAMPLES (65536), which is the maximum allowed sum of the values of the member n in the array of struct comedi_insn, and sensible comedi instructions will have an n of at least 1.
--- drivers/comedi/comedi_fops.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/comedi/comedi_fops.c +16 -0
@@ -1584,6 +1584,16 @@ error:return i; } +#define MAX_INSNS MAX_SAMPLES +static int check_insnlist_len (struct comedi_device *dev,unsigned int n_insns) +{ +if (n_insns >MAX_INSNS ) { +dev_dbg (dev->class_dev,"insnlist length too large\n" ); +return -EINVAL ; + } +return 0 ; +} +/* * COMEDI_INSN ioctl * synchronous instruction
@@ -2234,6 +2244,9 @@ static long comedi_unlocked_ioctl(struct rc = -EFAULT ;break ; } + rc =check_insnlist_len (dev, insnlist.n_insns); +if (rc) +break ; insns =kcalloc (insnlist.n_insns,sizeof (*insns),GFP_KERNEL );if (!insns) { rc = -ENOMEM ;
@@ -3085,6 +3098,9 @@ static int compat_insnlist(struct file *if (copy_from_user (&insnlist32,compat_ptr (arg),sizeof (insnlist32)))return -EFAULT ; + rc =check_insnlist_len (dev, insnlist32.n_insns); +if (rc) +return rc; insns =kcalloc (insnlist32.n_insns,sizeof (*insns),GFP_KERNEL );if (!insns)return -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 34/644 comedi: Fix some signed shift left operations
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
commit ab705c8c35e18652abc6239c07cf3441f03e2cda upstream.
Correct some left shifts of the signed integer constant 1 by some unsigned number less than 32. Change the constant to 1U to avoid shifting a 1 into the sign bit.
The corrected functions are comedi_dio_insn_config(), comedi_dio_update_state(), and __comedi_device_postconfig().
--- drivers/comedi/drivers.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/comedi/drivers.c +7 -7
@@ -339,10 +339,10 @@ int comedi_dio_insn_config(struct comedi unsigned int *data, unsigned int mask) { -unsigned int chan_mask =1 <<CR_CHAN (insn->chanspec); +unsigned int chan =CR_CHAN (insn->chanspec); -if (!mask) - mask = chan_mask; +if (!mask && chan <32 ) + mask =1U << chan;switch (data[0 ]) {case INSN_CONFIG_DIO_INPUT :
@@ -382,7 +382,7 @@ EXPORT_SYMBOL_GPL(comedi_dio_insn_configunsigned int comedi_dio_update_state (struct comedi_subdevice *s,unsigned int *data) { -unsigned int chanmask = (s->n_chan <32 ) ? ((1 << s->n_chan) -1 ) +unsigned int chanmask = (s->n_chan <32 ) ? ((1U << s->n_chan) -1 ) :0xffffffff ;unsigned int mask = data[0 ] & chanmask;unsigned int bits = data[1 ];
@@ -625,8 +625,8 @@ static int insn_rw_emulate_bits(struct cif (insn->insn ==INSN_WRITE ) {if (!(s->subdev_flags &SDF_WRITABLE ))return -EINVAL ; - _data[0 ] =1 << (chan - base_chan);/* mask */ - _data[1 ] = data[0 ] ? (1 << (chan - base_chan)) :0 ;/* bits */ + _data[0 ] =1U << (chan - base_chan);/* mask */ + _data[1 ] = data[0 ] ? (1U << (chan - base_chan)) :0 ;/* bits */ } ret = s->insn_bits (dev, s, &_insn, _data);
@@ -709,7 +709,7 @@ static int __comedi_device_postconfig(stif (s->type ==COMEDI_SUBD_DO ) {if (s->n_chan <32 ) - s->io_bits = (1 << s->n_chan) -1 ; + s->io_bits = (1U << s->n_chan) -1 ;else s->io_bits =0xffffffff ; }
Greg Kroah-Hartman
maintainerPATCH 35/644 comedi: Fix use of uninitialized data in insn_rw_emulate_bits()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
commit e9cb26291d009243a4478a7ffb37b3a9175bfce9 upstream.
For Comedi INSN_READ and INSN_WRITE instructions on "digital" subdevices (subdevice types COMEDI_SUBD_DI, COMEDI_SUBD_DO, and COMEDI_SUBD_DIO), it is common for the subdevice driver not to have insn_read and insn_write handler functions, but to have an insn_bits handler function for handling Comedi INSN_BITS instructions. In that case, the subdevice's insn_read and/or insn_write function handler pointers are set to point to the insn_rw_emulate_bits() function by __comedi_device_postconfig().
For INSN_WRITE, insn_rw_emulate_bits() currently assumes that the supplied data[0] value is a valid copy from user memory. It will at least exist because do_insnlist_ioctl() and do_insn_ioctl() in "comedi_fops.c" ensure at lease MIN_SAMPLES (16) elements are allocated. However, if insn->n is 0 (which is allowable for INSN_READ and INSN_WRITE instructions, then data[0] may contain uninitialized data, and certainly contains invalid data, possibly from a different instruction in the array of instructions handled by do_insnlist_ioctl(). This will result in an incorrect value being written to the digital output channel (or to the digital input/output channel if configured as an output), and may be reflected in the internal saved state of the channel.
Fix it by returning 0 early if insn->n is 0, before reaching the code that accesses data[0]. Previously, the function always returned 1 on success, but it is supposed to be the number of data samples actually read or written up to insn->n, which is 0 in this case.
--- drivers/comedi/drivers.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/comedi/drivers.c +3 -0
@@ -615,6 +615,9 @@ static int insn_rw_emulate_bits(struct cunsigned int _data[2 ];int ret; +if (insn->n ==0 ) +return 0 ; +memset (_data,0 ,sizeof (_data));memset (&_insn,0 ,sizeof (_insn)); _insn.insn =INSN_BITS ;
Greg Kroah-Hartman
maintainerPATCH 36/644 comedi: Fix initialization of data for instructions that write to subdevice
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
commit 46d8c744136ce2454aa4c35c138cc06817f92b8e upstream.
Some Comedi subdevice instruction handlers are known to access instruction data elements beyond the first insn->n elements in some cases. The do_insn_ioctl() and do_insnlist_ioctl() functions allocate at least MIN_SAMPLES (16) data elements to deal with this, but they do not initialize all of that. For Comedi instruction codes that write to the subdevice, the first insn->n data elements are copied from user-space, but the remaining elements are left uninitialized. That could be a problem if the subdevice instruction handler reads the uninitialized data. Ensure that the first MIN_SAMPLES elements are initialized before calling these instruction handlers, filling the uncopied elements with 0. For do_insnlist_ioctl(), the same data buffer elements are used for handling a list of instructions, so ensure the first MIN_SAMPLES elements are initialized for each instruction that writes to the subdevice.
--- drivers/comedi/comedi_fops.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/comedi/comedi_fops.c +12 -2
@@ -1551,21 +1551,27 @@ static int do_insnlist_ioctl(struct come }for (i =0 ; i < n_insns; ++i) { +unsigned int n = insns[i].n; +if (insns[i].insn &INSN_MASK_WRITE ) {if (copy_from_user (data, insns[i].data, - insns[i].n *sizeof (unsigned int ))) { + n *sizeof (unsigned int ))) {dev_dbg (dev->class_dev,"copy_from_user failed\n" ); ret = -EFAULT ; goto error; } +if (n <MIN_SAMPLES ) { +memset (&data[n],0 , (MIN_SAMPLES - n) * +sizeof (unsigned int )); + } } ret =parse_insn (dev, insns + i, data, file);if (ret <0 ) goto error;if (insns[i].insn &INSN_MASK_READ ) {if (copy_to_user (insns[i].data, data, - insns[i].n *sizeof (unsigned int ))) { + n *sizeof (unsigned int ))) {dev_dbg (dev->class_dev,"copy_to_user failed\n" ); ret = -EFAULT ;
@@ -1638,6 +1644,10 @@ static int do_insn_ioctl(struct comedi_d ret = -EFAULT ; goto error; } +if (insn->n <MIN_SAMPLES ) { +memset (&data[insn->n],0 , + (MIN_SAMPLES - insn->n) *sizeof (unsigned int )); + } } ret =parse_insn (dev, insn, data, file);if (ret <0 )
Greg Kroah-Hartman
maintainerPATCH 37/644 bpf: Reject %p% format string in bprintf-like helpers
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Chaignon <[email protected]>
[ Upstream commit f8242745871f81a3ac37f9f51853d12854fd0b58 ]
static const char fmt[] = "%p%";
bpf_trace_printk(fmt, sizeof(fmt));The above BPF program isn't rejected and causes a kernel warning at runtime:
Please remove unsupported %\x00 in format string
WARNING: CPU: 1 PID: 7244 at lib/vsprintf.c:2680 format_decode+0x49c/0x5d0
This happens because bpf_bprintf_prepare skips over the second %, detected as punctuation, while processing %p. This patch fixes it by not skipping over punctuation. %\x00 is then processed in the next iteration and rejected.
--- kernel/bpf/helpers.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
kernel/bpf/helpers.c +8 -3
@@ -832,6 +832,13 @@ int bpf_bprintf_prepare(char *fmt, u32 fmt_size, const u64 *raw_args,if (fmt[i] =='p' ) { sizeof_cur_arg =sizeof (long ); +if (fmt[i +1 ] ==0 ||isspace (fmt[i +1 ]) || +ispunct (fmt[i +1 ])) { +if (tmp_buf) + cur_arg = raw_args[num_spec]; + goto nocopy_fmt; + } +if ((fmt[i +1 ] =='k' || fmt[i +1 ] =='u' ) && fmt[i +2 ] =='s' ) { fmt_ptype = fmt[i +1 ];
@@ -839,11 +846,9 @@ int bpf_bprintf_prepare(char *fmt, u32 fmt_size, const u64 *raw_args, goto fmt_str; } -if (fmt[i +1 ] ==0 ||isspace (fmt[i +1 ]) || -ispunct (fmt[i +1 ]) || fmt[i +1 ] =='K' || +if (fmt[i +1 ] =='K' || fmt[i +1 ] =='x' || fmt[i +1 ] =='s' || fmt[i +1 ] =='S' ) { -/* just kernel pointers */ if (tmp_buf) cur_arg = raw_args[num_spec]; i++;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 38/644 net: emaclite: Fix missing pointer increment in aligned_read()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alok Tiwari <[email protected]>
[ Upstream commit 7727ec1523d7973defa1dff8f9c0aad288d04008 ]
Add missing post-increment operators for byte pointers in the loop that copies remaining bytes in xemaclite_aligned_read(). Without the increment, the same byte was written repeatedly to the destination.
This update aligns with xemaclite_aligned_write()
--- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/xilinx/xilinx_emaclite.c +1 -1
@@ -294,7 +294,7 @@ static void xemaclite_aligned_read(u32 *src_ptr, u8 *dest_ptr,/* Read the remaining data */ for (; length >0 ; length--) - *to_u8_ptr = *from_u8_ptr; + *to_u8_ptr++ = *from_u8_ptr++; } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 39/644 net/sched: sch_qfq: Fix race condition on qfq_aggregate
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiang Mei <[email protected]>
[ Upstream commit 5e28d5a3f774f118896aec17a3a20a9c5c9dfc64 ]
A race condition can occur when 'agg' is modified in qfq_change_agg (called during qfq_enqueue) while other threads access it concurrently. For example, qfq_dump_class may trigger a NULL dereference, and qfq_delete_class may cause a use-after-free.
This patch addresses the issue by:
1. Moved qfq_destroy_class into the critical section.
2. Added sch_tree_lock protection to qfq_dump_class and qfq_dump_class_stats.
--- net/sched/sch_qfq.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-)
net/sched/sch_qfq.c +21 -9
@@ -414,7 +414,7 @@ static int qfq_change_class(struct Qdisc *sch, u32 classid, u32 parentid,bool existing = false;struct nlattr *tb[TCA_QFQ_MAX +1 ];struct qfq_aggregate *new_agg =NULL ; -u32 weight, lmax, inv_w; +u32 weight, lmax, inv_w, old_weight, old_lmax;int err;int delta_w;
@@ -448,12 +448,16 @@ static int qfq_change_class(struct Qdisc *sch, u32 classid, u32 parentid, inv_w =ONE_FP / weight; weight =ONE_FP / inv_w; -if (cl !=NULL && - lmax == cl->agg->lmax && - weight == cl->agg->class_weight) -return 0 ;/* nothing to change */ +if (cl !=NULL ) { +sch_tree_lock (sch); + old_weight = cl->agg->class_weight; + old_lmax = cl->agg->lmax; +sch_tree_unlock (sch); +if (lmax == old_lmax && weight == old_weight) +return 0 ;/* nothing to change */ + } - delta_w = weight - (cl ? cl->agg->class_weight :0 ); + delta_w = weight - (cl ? old_weight :0 );if (q->wsum + delta_w >QFQ_MAX_WSUM ) { pr_notice("qfq: total weight out of range (%d + %u)\n",
@@ -555,10 +559,10 @@ static int qfq_delete_class(struct Qdisc *sch, unsigned long arg,qdisc_purge_queue (cl->qdisc);qdisc_class_hash_remove (&q->clhash, &cl->common); +qfq_destroy_class (sch, cl);sch_tree_unlock (sch); -qfq_destroy_class (sch, cl);return 0 ; }
@@ -625,6 +629,7 @@ static int qfq_dump_class(struct Qdisc *sch, unsigned long arg, {struct qfq_class *cl = (struct qfq_class *)arg;struct nlattr *nest; +u32 class_weight, lmax; tcm->tcm_parent =TC_H_ROOT ; tcm->tcm_handle = cl->common.classid;
@@ -633,8 +638,13 @@ static int qfq_dump_class(struct Qdisc *sch, unsigned long arg, nest =nla_nest_start_noflag (skb,TCA_OPTIONS );if (nest ==NULL ) goto nla_put_failure; -if (nla_put_u32 (skb,TCA_QFQ_WEIGHT , cl->agg->class_weight) || -nla_put_u32 (skb,TCA_QFQ_LMAX , cl->agg->lmax)) + +sch_tree_lock (sch); + class_weight = cl->agg->class_weight; + lmax = cl->agg->lmax; +sch_tree_unlock (sch); +if (nla_put_u32 (skb,TCA_QFQ_WEIGHT , class_weight) || +nla_put_u32 (skb,TCA_QFQ_LMAX , lmax)) goto nla_put_failure;return nla_nest_end (skb, nest);
@@ -651,8 +661,10 @@ static int qfq_dump_class_stats(struct Qdisc *sch, unsigned long arg,memset (&xstats,0 ,sizeof (xstats)); +sch_tree_lock (sch); xstats.weight = cl->agg->class_weight; xstats.lmax = cl->agg->lmax; +sch_tree_unlock (sch); if (gnet_stats_copy_basic(qdisc_root_sleeping_running(sch), d, NULL, &cl->bstats) < 0 ||
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 40/644 rpl: Fix use-after-free in rpl_do_srh_inline().
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit b640daa2822a39ff76e70200cb2b7b892b896dce ]
Running lwt_dst_cache_ref_loop.sh in selftest with KASAN triggers the splat below [0].
rpl_do_srh_inline() fetches ipv6_hdr(skb) and accesses it after skb_cow_head(), which is illegal as the header could be freed then.
Let's fix it by making oldhdr to a local struct instead of a pointer.
[0]:
[root@fedora net]# ./lwt_dst_cache_ref_loop.sh
...
TEST: rpl (input)
[ 57.631529] ================================================================== BUG: KASAN: slab-use-after-free in rpl_do_srh_inline.isra.0 (net/ipv6/rpl_iptunnel.c:174) Read of size 40 at addr ffff888122bf96d8 by task ping6/1543 CPU: 50 UID: 0 PID: 1543 Comm: ping6 Not tainted 6.16.0-rc5-01302-gfadd1e6231b1 #23 PREEMPT(voluntary) Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.3-debian-1.16.3-2 04/01/2014 Call Trace: <IRQ> dump_stack_lvl (lib/dump_stack.c:122) print_report (mm/kasan/report.c:409 mm/kasan/report.c:521) kasan_report (mm/kasan/report.c:221 mm/kasan/report.c:636) kasan_check_range (mm/kasan/generic.c:175 (discriminator 1) mm/kasan/generic.c:189 (discriminator 1)) __asan_memmove (mm/kasan/shadow.c:94 (discriminator 2)) rpl_do_srh_inline.isra.0 (net/ipv6/rpl_iptunnel.c:174) rpl_input (net/ipv6/rpl_iptunnel.c:201 net/ipv6/rpl_iptunnel.c:282) lwtunnel_input (net/core/lwtunnel.c:459) ipv6_rcv (./include/net/dst.h:471 (discriminator 1) ./include/net/dst.h:469 (discriminator 1) net/ipv6/ip6_input.c:79 (discriminator 1) ./include/linux/netfilter.h:317 (discriminator 1) ./include/linux/netfilter.h:311 (discriminator 1) net/ipv6/ip6_input.c:311 (discriminator 1)) __netif_receive_skb_one_core (net/core/dev.c:5967) process_backlog (./include/linux/rcupdate.h:869 net/core/dev.c:6440) __napi_poll.constprop.0 (net/core/dev.c:7452) net_rx_action (net/core/dev.c:7518 net/core/dev.c:7643) handle_softirqs (kernel/softirq.c:579) do_softirq (kernel/softirq.c:480 (discriminator 20)) </IRQ> <TASK> __local_bh_enable_ip (kernel/softirq.c:407) __dev_queue_xmit (net/core/dev.c:4740) ip6_finish_output2 (./include/linux/netdevice.h:3358 ./include/net/neighbour.h:526 ./include/net/neighbour.h:540 net/ipv6/ip6_output.c:141) ip6_finish_output (net/ipv6/ip6_output.c:215 net/ipv6/ip6_output.c:226) ip6_output (./include/linux/netfilter.h:306 net/ipv6/ip6_output.c:248) ip6_send_skb (net/ipv6/ip6_output.c:1983) rawv6_sendmsg (net/ipv6/raw.c:588 net/ipv6/raw.c:918) __sys_sendto (net/socket.c:714 (discriminator 1) net/socket.c:729 (discriminator 1) net/socket.c:2228 (discriminator 1)) __x64_sys_sendto (net/socket.c:2231) do_syscall_64 (arch/x86/entry/syscall_64.c:63 (discriminator 1) arch/x86/entry/syscall_64.c:94 (discriminator 1)) entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:130) RIP: 0033:0x7f68cffb2a06 Code: 5d e8 41 8b 93 08 03 00 00 59 5e 48 83 f8 fc 75 19 83 e2 39 83 fa 08 75 11 e8 26 ff ff ff 66 0f 1f 44 00 00 48 8b 45 10 0f 05 <48> 8b 5d f8 c9 c3 0f 1f 40 00 f3 0f 1e fa 55 48 89 e5 48 83 ec 08 RSP: 002b:00007ffefb7c53d0 EFLAGS: 00000202 ORIG_RAX: 000000000000002c RAX: ffffffffffffffda RBX: 0000564cd69f10a0 RCX: 00007f68cffb2a06 RDX: 0000000000000040 RSI: 0000564cd69f10a4 RDI: 0000000000000003 RBP: 00007ffefb7c53f0 R08: 0000564cd6a032ac R09: 000000000000001c R10: 0000000000000000 R11: 0000000000000202 R12: 0000564cd69f10a4 R13: 0000000000000040 R14: 00007ffefb7c66e0 R15: 0000564cd69f10a0 </TASK> Allocated by task 1543: kasan_save_stack (mm/kasan/common.c:48) kasan_save_track (mm/kasan/common.c:60 (discriminator 1) mm/kasan/common.c:69 (discriminator 1)) __kasan_slab_alloc (mm/kasan/common.c:319 mm/kasan/common.c:345) kmem_cache_alloc_node_noprof (./include/linux/kasan.h:250 mm/slub.c:4148 mm/slub.c:4197 mm/slub.c:4249) kmalloc_reserve (net/core/skbuff.c:581 (discriminator 88)) __alloc_skb (net/core/skbuff.c:669) __ip6_append_data (net/ipv6/ip6_output.c:1672 (discriminator 1)) ip6_append_data (net/ipv6/ip6_output.c:1859) rawv6_sendmsg (net/ipv6/raw.c:911) __sys_sendto (net/socket.c:714 (discriminator 1) net/socket.c:729 (discriminator 1) net/socket.c:2228 (discriminator 1)) __x64_sys_sendto (net/socket.c:2231) do_syscall_64 (arch/x86/entry/syscall_64.c:63 (discriminator 1) arch/x86/entry/syscall_64.c:94 (discriminator 1)) entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:130) Freed by task 1543: kasan_save_stack (mm/kasan/common.c:48) kasan_save_track (mm/kasan/common.c:60 (discriminator 1) mm/kasan/common.c:69 (discriminator 1)) kasan_save_free_info (mm/kasan/generic.c:579 (discriminator 1)) __kasan_slab_free (mm/kasan/common.c:271) kmem_cache_free (mm/slub.c:4643 (discriminator 3) mm/slub.c:4745 (discriminator 3)) pskb_expand_head (net/core/skbuff.c:2274) rpl_do_srh_inline.isra.0 (net/ipv6/rpl_iptunnel.c:158 (discriminator 1)) rpl_input (net/ipv6/rpl_iptunnel.c:201 net/ipv6/rpl_iptunnel.c:282) lwtunnel_input (net/core/lwtunnel.c:459) ipv6_rcv (./include/net/dst.h:471 (discriminator 1) ./include/net/dst.h:469 (discriminator 1) net/ipv6/ip6_input.c:79 (discriminator 1) ./include/linux/netfilter.h:317 (discriminator 1) ./include/linux/netfilter.h:311 (discriminator 1) net/ipv6/ip6_input.c:311 (discriminator 1)) __netif_receive_skb_one_core (net/core/dev.c:5967) process_backlog (./include/linux/rcupdate.h:869 net/core/dev.c:6440) __napi_poll.constprop.0 (net/core/dev.c:7452) net_rx_action (net/core/dev.c:7518 net/core/dev.c:7643) handle_softirqs (kernel/softirq.c:579) do_softirq (kernel/softirq.c:480 (discriminator 20)) __local_bh_enable_ip (kernel/softirq.c:407) __dev_queue_xmit (net/core/dev.c:4740) ip6_finish_output2 (./include/linux/netdevice.h:3358 ./include/net/neighbour.h:526 ./include/net/neighbour.h:540 net/ipv6/ip6_output.c:141) ip6_finish_output (net/ipv6/ip6_output.c:215 net/ipv6/ip6_output.c:226) ip6_output (./include/linux/netfilter.h:306 net/ipv6/ip6_output.c:248) ip6_send_skb (net/ipv6/ip6_output.c:1983) rawv6_sendmsg (net/ipv6/raw.c:588 net/ipv6/raw.c:918) __sys_sendto (net/socket.c:714 (discriminator 1) net/socket.c:729 (discriminator 1) net/socket.c:2228 (discriminator 1)) __x64_sys_sendto (net/socket.c:2231) do_syscall_64 (arch/x86/entry/syscall_64.c:63 (discriminator 1) arch/x86/entry/syscall_64.c:94 (discriminator 1)) entry_SYSCALL_64_after_hwframe (arch/x86/entry/entry_64.S:130) The buggy address belongs to the object at ffff888122bf96c0 which belongs to the cache skbuff_small_head of size 704
The buggy address is located 24 bytes inside of
freed 704-byte region [ffff888122bf96c0, ffff888122bf9980)
The buggy address belongs to the physical page: page: refcount:0 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x122bf8 head: order:3 mapcount:0 entire_mapcount:0 nr_pages_mapped:0 pincount:0 flags: 0x200000000000040(head|node=0|zone=2) page_type: f5(slab) raw: 0200000000000040 ffff888101fc0a00 ffffea000464dc00 0000000000000002 raw: 0000000000000000 0000000080270027 00000000f5000000 0000000000000000
head: 0200000000000040 ffff888101fc0a00 ffffea000464dc00 0000000000000002
head: 0000000000000000 0000000080270027 00000000f5000000 0000000000000000
head: 0200000000000003 ffffea00048afe01 00000000ffffffff 00000000ffffffff
head: 0000000000000000 0000000000000000 00000000ffffffff 0000000000000000
page dumped because: kasan: bad access detected
Memory state around the buggy address:
ffff888122bf9580: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff888122bf9600: fb fb fb fb fb fb fb fb fc fc fc fc fc fc fc fc
>ffff888122bf9680: fc fc fc fc fc fc fc fc fa fb fb fb fb fb fb fb
^
ffff888122bf9700: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff888122bf9780: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb--- net/ipv6/rpl_iptunnel.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/ipv6/rpl_iptunnel.c +4 -4
@@ -129,13 +129,13 @@ static int rpl_do_srh_inline(struct sk_buff *skb, const struct rpl_lwt *rlwt, struct dst_entry *cache_dst) {struct ipv6_rpl_sr_hdr *isrh, *csrh; -const struct ipv6hdr *oldhdr; +struct ipv6hdr oldhdr;struct ipv6hdr *hdr;unsigned char *buf;size_t hdrlen;int err; - oldhdr =ipv6_hdr (skb); +memcpy (&oldhdr,ipv6_hdr (skb),sizeof (oldhdr)); buf =kcalloc (struct_size (srh, segments.addr, srh->segments_left),2 ,GFP_ATOMIC );if (!buf)
@@ -147,7 +147,7 @@ static int rpl_do_srh_inline(struct sk_buff *skb, const struct rpl_lwt *rlwt,memcpy (isrh, srh,sizeof (*isrh));memcpy (isrh->rpl_segaddr, &srh->rpl_segaddr[1 ], (srh->segments_left -1 ) *16 ); - isrh->rpl_segaddr[srh->segments_left -1 ] = oldhdr->daddr; + isrh->rpl_segaddr[srh->segments_left -1 ] = oldhdr.daddr;ipv6_rpl_srh_compress (csrh, isrh, &srh->rpl_segaddr[0 ], isrh->segments_left -1 );
@@ -169,7 +169,7 @@ static int rpl_do_srh_inline(struct sk_buff *skb, const struct rpl_lwt *rlwt,skb_mac_header_rebuild (skb); hdr =ipv6_hdr (skb); -memmove (hdr, oldhdr,sizeof (*hdr)); +memmove (hdr, &oldhdr,sizeof (*hdr)); isrh = (void *)hdr +sizeof (*hdr);memcpy (isrh, csrh, hdrlen);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 41/644 pinctrl: mediatek: moore: check if pin_desc is valid before use
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sam Shih <[email protected]>
[ Upstream commit d8b94c9ff96c2024a527086d850eb0b314337ff9 ]
Certain SoC are missing the middle part gpios in consecutive pins, it's better to check if mtk_pin_desc is a valid pin for the extensibility
Stable-dep-of: 705c79101ccf ("smb: client: fix use-after-free in cifs_oplock_break")
--- drivers/pinctrl/mediatek/pinctrl-moore.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/pinctrl/mediatek/pinctrl-moore.c +18 -0
@@ -60,6 +60,8 @@ static int mtk_pinmux_set_mux(struct pinctrl_dev *pctldev,int pin = grp->pins[i]; desc = (const struct mtk_pin_desc *)&hw->soc->pins[pin]; +if (!desc->name) +return -ENOTSUPP ;mtk_hw_set_value (hw, desc,PINCTRL_PIN_REG_MODE , pin_modes[i]);
@@ -76,6 +78,8 @@ static int mtk_pinmux_gpio_request_enable(struct pinctrl_dev *pctldev,const struct mtk_pin_desc *desc; desc = (const struct mtk_pin_desc *)&hw->soc->pins[pin]; +if (!desc->name) +return -ENOTSUPP ;return mtk_hw_set_value (hw, desc,PINCTRL_PIN_REG_MODE , hw->soc->gpio_m);
@@ -89,6 +93,8 @@ static int mtk_pinmux_gpio_set_direction(struct pinctrl_dev *pctldev,const struct mtk_pin_desc *desc; desc = (const struct mtk_pin_desc *)&hw->soc->pins[pin]; +if (!desc->name) +return -ENOTSUPP ;/* hardware would take 0 as input direction */ return mtk_hw_set_value (hw, desc,PINCTRL_PIN_REG_DIR , !input);
@@ -103,6 +109,8 @@ static int mtk_pinconf_get(struct pinctrl_dev *pctldev,const struct mtk_pin_desc *desc; desc = (const struct mtk_pin_desc *)&hw->soc->pins[pin]; +if (!desc->name) +return -ENOTSUPP ;switch (param) {case PIN_CONFIG_BIAS_DISABLE :
@@ -218,6 +226,8 @@ static int mtk_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin,int cfg, err =0 ; desc = (const struct mtk_pin_desc *)&hw->soc->pins[pin]; +if (!desc->name) +return -ENOTSUPP ;for (cfg =0 ; cfg < num_configs; cfg++) { param =pinconf_to_config_param (configs[cfg]);
@@ -435,6 +445,8 @@ static int mtk_gpio_get(struct gpio_chip *chip, unsigned int gpio)int value, err; desc = (const struct mtk_pin_desc *)&hw->soc->pins[gpio]; +if (!desc->name) +return -ENOTSUPP ; err =mtk_hw_get_value (hw, desc,PINCTRL_PIN_REG_DI , &value);if (err)
@@ -449,6 +461,10 @@ static void mtk_gpio_set(struct gpio_chip *chip, unsigned int gpio, int value)const struct mtk_pin_desc *desc; desc = (const struct mtk_pin_desc *)&hw->soc->pins[gpio]; +if (!desc->name) { +dev_err (hw->dev,"Failed to set gpio %d\n" , gpio); +return ; + }mtk_hw_set_value (hw, desc,PINCTRL_PIN_REG_DO , !!value); }
@@ -490,6 +506,8 @@ static int mtk_gpio_set_config(struct gpio_chip *chip, unsigned int offset,u32 debounce; desc = (const struct mtk_pin_desc *)&hw->soc->pins[offset]; +if (!desc->name) +return -ENOTSUPP ; if (!hw->eint || pinconf_to_config_param(config) != PIN_CONFIG_INPUT_DEBOUNCE ||
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 42/644 smb: client: fix use-after-free in cifs_oplock_break
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wang Zhaolong <[email protected]>
[ Upstream commit 705c79101ccf9edea5a00d761491a03ced314210 ]
A race condition can occur in cifs_oplock_break() leading to a use-after-free of the cinode structure when unmounting:
cifs_oplock_break()
_cifsFileInfo_put(cfile)
cifsFileInfo_put_final()
cifs_sb_deactive()
[last ref, start releasing sb]
kill_sb()
kill_anon_super()
generic_shutdown_super()
evict_inodes()
dispose_list()
evict()
destroy_inode()
call_rcu(&inode->i_rcu, i_callback)
spin_lock(&cinode->open_file_lock) <- OK
[later] i_callback()
cifs_free_inode()
kmem_cache_free(cinode)
spin_unlock(&cinode->open_file_lock) <- UAF
cifs_done_oplock_break(cinode) <- UAFThe issue occurs when umount has already released its reference to the superblock. When _cifsFileInfo_put() calls cifs_sb_deactive(), this releases the last reference, triggering the immediate cleanup of all inodes under RCU. However, cifs_oplock_break() continues to access the cinode after this point, resulting in use-after-free.
Fix this by holding an extra reference to the superblock during the entire oplock break operation. This ensures that the superblock and its inodes remain valid until the oplock break completes.
--- fs/cifs/file.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
fs/cifs/file.c +9 -1
@@ -4865,7 +4865,8 @@ void cifs_oplock_break(struct work_struct *work) struct cifsFileInfo *cfile = container_of(work, struct cifsFileInfo, oplock_break);struct inode *inode =d_inode (cfile->dentry); -struct cifs_sb_info *cifs_sb =CIFS_SB (inode->i_sb); +struct super_block *sb = inode->i_sb; +struct cifs_sb_info *cifs_sb =CIFS_SB (sb);struct cifsInodeInfo *cinode =CIFS_I (inode);struct cifs_tcon *tcon;struct TCP_Server_Info *server;
@@ -4875,6 +4876,12 @@ void cifs_oplock_break(struct work_struct *work)__u64 persistent_fid, volatile_fid;__u16 net_fid; +/* +* Hold a reference to the superblock to prevent it and its inodes from +* being freed while we are accessing cinode. Otherwise, _cifsFileInfo_put() +* may release the last reference to the sb and trigger inode eviction. +*/ +cifs_sb_active (sb);wait_on_bit (&cinode->flags,CIFS_INODE_PENDING_WRITERS ,TASK_UNINTERRUPTIBLE );
@@ -4947,6 +4954,7 @@ void cifs_oplock_break(struct work_struct *work)cifs_put_tlink (tlink); out:cifs_done_oplock_break (cinode); +cifs_sb_deactive (sb); }/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 43/644 nvme: fix misaccounting of nvme-mpath inflight I/O
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yu Kuai <[email protected]>
[ Upstream commit 71257925e83eae1cb6913d65ca71927d2220e6d1 ]
Procedures for nvme-mpath IO accounting:
1) initialize nvme_request and clear flags;
2) set NVME_MPATH_IO_STATS and increase inflight counter when IO
started;
3) check NVME_MPATH_IO_STATS and decrease inflight counter when IO is
done;However, for the case nvme_fail_nonready_command(), both step 1) and 2) are skipped, and if old nvme_request set NVME_MPATH_IO_STATS and then request is reused, step 3) will still be executed, causing inflight I/O counter to be negative.
Fix the problem by clearing nvme_request in nvme_fail_nonready_command().
--- drivers/nvme/host/core.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/nvme/host/core.c +4 -0
@@ -675,6 +675,10 @@ blk_status_t nvme_fail_nonready_command(struct nvme_ctrl *ctrl, !test_bit(NVME_CTRL_FAILFAST_EXPIRED, &ctrl->flags) && !blk_noretry_request(rq) && !(rq->cmd_flags & REQ_NVME_MPATH))return BLK_STS_RESOURCE ; + +if (!(rq->rq_flags &RQF_DONTPREP )) +nvme_clear_nvme_request (rq); +return nvme_host_path_error (rq); }EXPORT_SYMBOL_GPL (nvme_fail_nonready_command);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 44/644 selftests: udpgro: report error when receive failed
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hangbin Liu <[email protected]>
[ Upstream commit 7167395a4be7930ecac6a33b4e54d7e3dd9ee209 ]
Currently, we only check the latest senders's exit code. If the receiver report failed, it is not recoreded. Fix it by checking the exit code of all the involved processes.
Before:
bad GRO lookup ok
multiple GRO socks ./udpgso_bench_rx: recv: bad packet len, got 1452, expected 14520
./udpgso_bench_rx: recv: bad packet len, got 1452, expected 14520
failed
$ echo $? 0
After:
bad GRO lookup ok
multiple GRO socks ./udpgso_bench_rx: recv: bad packet len, got 1452, expected 14520
./udpgso_bench_rx: recv: bad packet len, got 1452, expected 14520
failed
$ echo $? 1
Stable-dep-of: 0e9418961f89 ("selftests: net: increase inter-packet timeout in udpgro.sh")
--- tools/testing/selftests/net/udpgro.sh | 44 ++++++++++++++++----------- 1 file changed, 27 insertions(+), 17 deletions(-)
tools/testing/selftests/net/udpgro.sh +27 -17
@@ -44,17 +44,19 @@ run_one() { local -r all="$@" local -r tx_args=${all%rx*} local -r rx_args=${all#*rx} + local ret=0 cfg_veth - ip netns exec "${PEER_NS}" ./udpgso_bench_rx -C 1000 -R 10 ${rx_args} && \ - echo "ok" || \ - echo "failed" & + ip netns exec "${PEER_NS}" ./udpgso_bench_rx -C 1000 -R 10 ${rx_args} & + local PID1=$! wait_local_port_listen ${PEER_NS} 8000 udp ./udpgso_bench_tx ${tx_args} - ret=$? - wait $(jobs -p) + check_err $? + wait ${PID1} + check_err $? + [ "$ret" -eq 0 ] && echo "ok" || echo "failed" return $ret }
@@ -71,6 +73,7 @@ run_one_nat() { local -r all="$@" local -r tx_args=${all%rx*} local -r rx_args=${all#*rx} + local ret=0 if [[ ${tx_args} = *-4* ]]; then ipt_cmd=iptables
@@ -91,16 +94,17 @@ run_one_nat() { # ... so that GRO will match the UDP_GRO enabled socket, but packets # will land on the 'plain' one ip netns exec "${PEER_NS}" ./udpgso_bench_rx -G ${family} -b ${addr1} -n 0 & - pid=$! - ip netns exec "${PEER_NS}" ./udpgso_bench_rx -C 1000 -R 10 ${family} -b ${addr2%/*} ${rx_args} && \ - echo "ok" || \ - echo "failed"& + local PID1=$! + ip netns exec "${PEER_NS}" ./udpgso_bench_rx -C 1000 -R 10 ${family} -b ${addr2%/*} ${rx_args} & + local PID2=$! wait_local_port_listen "${PEER_NS}" 8000 udp ./udpgso_bench_tx ${tx_args} - ret=$? - kill -INT $pid - wait $(jobs -p) + check_err $? + kill -INT ${PID1} + wait ${PID2} + check_err $? + [ "$ret" -eq 0 ] && echo "ok" || echo "failed" return $ret }
@@ -109,20 +113,26 @@ run_one_2sock() { local -r all="$@" local -r tx_args=${all%rx*} local -r rx_args=${all#*rx} + local ret=0 cfg_veth ip netns exec "${PEER_NS}" ./udpgso_bench_rx -C 1000 -R 10 ${rx_args} -p 12345 & - ip netns exec "${PEER_NS}" ./udpgso_bench_rx -C 2000 -R 10 ${rx_args} && \ - echo "ok" || \ - echo "failed" & + local PID1=$! + ip netns exec "${PEER_NS}" ./udpgso_bench_rx -C 2000 -R 10 ${rx_args} & + local PID2=$! wait_local_port_listen "${PEER_NS}" 12345 udp ./udpgso_bench_tx ${tx_args} -p 12345 + check_err $? wait_local_port_listen "${PEER_NS}" 8000 udp ./udpgso_bench_tx ${tx_args} - ret=$? - wait $(jobs -p) + check_err $? + wait ${PID1} + check_err $? + wait ${PID2} + check_err $? + [ "$ret" -eq 0 ] && echo "ok" || echo "failed" return $ret }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 45/644 selftests: net: increase inter-packet timeout in udpgro.sh
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Abeni <[email protected]>
[ Upstream commit 0e9418961f897be59b1fab6e31ae1b09a0bae902 ]
The mentioned test is not very stable when running on top of debug kernel build. Increase the inter-packet timeout to allow more slack in such environments.
--- tools/testing/selftests/net/udpgro.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/testing/selftests/net/udpgro.sh +4 -4
@@ -48,7 +48,7 @@ run_one() { cfg_veth - ip netns exec "${PEER_NS}" ./udpgso_bench_rx -C 1000 -R 10 ${rx_args} & + ip netns exec "${PEER_NS}" ./udpgso_bench_rx -C 1000 -R 100 ${rx_args} & local PID1=$! wait_local_port_listen ${PEER_NS} 8000 udp
@@ -95,7 +95,7 @@ run_one_nat() { # will land on the 'plain' one ip netns exec "${PEER_NS}" ./udpgso_bench_rx -G ${family} -b ${addr1} -n 0 & local PID1=$! - ip netns exec "${PEER_NS}" ./udpgso_bench_rx -C 1000 -R 10 ${family} -b ${addr2%/*} ${rx_args} & + ip netns exec "${PEER_NS}" ./udpgso_bench_rx -C 1000 -R 100 ${family} -b ${addr2%/*} ${rx_args} & local PID2=$! wait_local_port_listen "${PEER_NS}" 8000 udp
@@ -117,9 +117,9 @@ run_one_2sock() { cfg_veth - ip netns exec "${PEER_NS}" ./udpgso_bench_rx -C 1000 -R 10 ${rx_args} -p 12345 & + ip netns exec "${PEER_NS}" ./udpgso_bench_rx -C 1000 -R 100 ${rx_args} -p 12345 & local PID1=$! - ip netns exec "${PEER_NS}" ./udpgso_bench_rx -C 2000 -R 10 ${rx_args} & + ip netns exec "${PEER_NS}" ./udpgso_bench_rx -C 2000 -R 100 ${rx_args} & local PID2=$! wait_local_port_listen "${PEER_NS}" 12345 udp
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 46/644 hwmon: (corsair-cpro) Validate the size of the received input buffer
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marius Zachmann <[email protected]>
[ Upstream commit 495a4f0dce9c8c4478c242209748f1ee9e4d5820 ]
Add buffer_recv_size to store the size of the received bytes. Validate buffer_recv_size in send_usb_cmd().
--- drivers/hwmon/corsair-cpro.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hwmon/corsair-cpro.c +5 -0
@@ -84,6 +84,7 @@ struct ccp_device {struct mutex mutex;/* whenever buffer is used, lock before send_usb_cmd */ u8 *cmd_buffer;u8 *buffer; +int buffer_recv_size;/* number of received bytes in buffer */ int target[6 ];DECLARE_BITMAP (temp_cnct,NUM_TEMP_SENSORS );DECLARE_BITMAP (fan_cnct,NUM_FANS );
@@ -139,6 +140,9 @@ static int send_usb_cmd(struct ccp_device *ccp, u8 command, u8 byte1, u8 byte2,if (!t)return -ETIMEDOUT ; +if (ccp->buffer_recv_size !=IN_BUFFER_SIZE ) +return -EPROTO ; +return ccp_get_errno (ccp); }
@@ -150,6 +154,7 @@ static int ccp_raw_event(struct hid_device *hdev, struct hid_report *report, u8spin_lock (&ccp->wait_input_report_lock);if (!completion_done (&ccp->wait_input_report)) {memcpy (ccp->buffer, data,min (IN_BUFFER_SIZE , size)); + ccp->buffer_recv_size = size;complete_all (&ccp->wait_input_report); }spin_unlock (&ccp->wait_input_report_lock);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 47/644 usb: net: sierra: check for no status endpoint
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
[ Upstream commit 4c4ca3c46167518f8534ed70f6e3b4bf86c4d158 ]
The driver checks for having three endpoints and having bulk in and out endpoints, but not that the third endpoint is interrupt input.
Rectify the omission.
--- drivers/net/usb/sierra_net.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/usb/sierra_net.c +4 -0
@@ -689,6 +689,10 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf) status);return -ENODEV ; } +if (!dev->status) { +dev_err (&dev->udev->dev,"No status endpoint found" ); +return -ENODEV ; + }/* Initialize sierra private data */ priv =kzalloc (sizeof *priv,GFP_KERNEL );if (!priv)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 48/644 Bluetooth: Fix null-ptr-deref in l2cap_sock_resume_cb()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit a0075accbf0d76c2dad1ad3993d2e944505d99a0 ]
syzbot reported null-ptr-deref in l2cap_sock_resume_cb(). [0]
l2cap_sock_resume_cb() has a similar problem that was fixed by commit 1bff51ea59a9 ("Bluetooth: fix use-after-free error in lock_sock_nested()").
Since both l2cap_sock_kill() and l2cap_sock_resume_cb() are executed under l2cap_sock_resume_cb(), we can avoid the issue simply by checking if chan->data is NULL.
Let's not access to the killed socket in l2cap_sock_resume_cb().
[0]:
BUG: KASAN: null-ptr-deref in instrument_atomic_write include/linux/instrumented.h:82 [inline] BUG: KASAN: null-ptr-deref in clear_bit include/asm-generic/bitops/instrumented-atomic.h:41 [inline] BUG: KASAN: null-ptr-deref in l2cap_sock_resume_cb+0xb4/0x17c net/bluetooth/l2cap_sock.c:1711 Write of size 8 at addr 0000000000000570 by task kworker/u9:0/52 CPU: 1 UID: 0 PID: 52 Comm: kworker/u9:0 Not tainted 6.16.0-rc4-syzkaller-g7482bb149b9f #0 PREEMPT Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 05/07/2025 Workqueue: hci0 hci_rx_work Call trace: show_stack+0x2c/0x3c arch/arm64/kernel/stacktrace.c:501 (C) __dump_stack+0x30/0x40 lib/dump_stack.c:94 dump_stack_lvl+0xd8/0x12c lib/dump_stack.c:120 print_report+0x58/0x84 mm/kasan/report.c:524 kasan_report+0xb0/0x110 mm/kasan/report.c:634 check_region_inline mm/kasan/generic.c:-1 [inline] kasan_check_range+0x264/0x2a4 mm/kasan/generic.c:189 __kasan_check_write+0x20/0x30 mm/kasan/shadow.c:37 instrument_atomic_write include/linux/instrumented.h:82 [inline] clear_bit include/asm-generic/bitops/instrumented-atomic.h:41 [inline] l2cap_sock_resume_cb+0xb4/0x17c net/bluetooth/l2cap_sock.c:1711 l2cap_security_cfm+0x524/0xea0 net/bluetooth/l2cap_core.c:7357 hci_auth_cfm include/net/bluetooth/hci_core.h:2092 [inline] hci_auth_complete_evt+0x2e8/0xa4c net/bluetooth/hci_event.c:3514 hci_event_func net/bluetooth/hci_event.c:7511 [inline] hci_event_packet+0x650/0xe9c net/bluetooth/hci_event.c:7565 hci_rx_work+0x320/0xb18 net/bluetooth/hci_core.c:4070 process_one_work+0x7e8/0x155c kernel/workqueue.c:3238 process_scheduled_works kernel/workqueue.c:3321 [inline] worker_thread+0x958/0xed8 kernel/workqueue.c:3402 kthread+0x5fc/0x75c kernel/kthread.c:464 ret_from_fork+0x10/0x20 arch/arm64/kernel/entry.S:847
--- net/bluetooth/l2cap_sock.c | 3 +++ 1 file changed, 3 insertions(+)
net/bluetooth/l2cap_sock.c +3 -0
@@ -1678,6 +1678,9 @@ static void l2cap_sock_resume_cb(struct l2cap_chan *chan) {struct sock *sk = chan->data; +if (!sk) +return ; +if (test_and_clear_bit (FLAG_PENDING_SECURITY , &chan->flags)) { sk->sk_state =BT_CONNECTED ; chan->state =BT_CONNECTED ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 49/644 Bluetooth: SMP: If an unallowed command is received consider it a failure
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit fe4840df0bdf341f376885271b7680764fe6b34e ]
If a command is received while a bonding is ongoing consider it a pairing failure so the session is cleanup properly and the device is disconnected immediately instead of continuing with other commands that may result in the session to get stuck without ever completing such as the case bellow:
Quoted 1 line
ACL Data RX: Handle 2048 flags
0x02dlen 21
SMP: Identity Information (0x08) len 16
Identity resolving key[16]: d7e08edef97d3e62cd2331f82d8073b0Quoted 1 line
ACL Data RX: Handle 2048 flags
0x02dlen 21
SMP: Signing Information (0x0a) len 16
Signature key[16]: 1716c536f94e843a9aea8b13ffde477dBluetooth: hci0: unexpected SMP command 0x0a from XX:XX:XX:XX:XX:XX
Quoted 1 line
ACL Data RX: Handle 2048 flags
0x02dlen 12
SMP: Identity Address Information (0x09) len 7
Address: XX:XX:XX:XX:XX:XX (Intel Corporate)
While accourding to core spec 6.1 the expected order is always BD_ADDR first first then CSRK:
When using LE legacy pairing, the keys shall be distributed in the following order:
LTK by the Peripheral
EDIV and Rand by the Peripheral
IRK by the Peripheral
BD_ADDR by the Peripheral
CSRK by the Peripheral
LTK by the Central
EDIV and Rand by the Central
IRK by the Central
BD_ADDR by the Central
CSRK by the Central
When using LE Secure Connections, the keys shall be distributed in the following order:
IRK by the Peripheral
BD_ADDR by the Peripheral
CSRK by the Peripheral
IRK by the Central
BD_ADDR by the Central
CSRK by the Central
According to the Core 6.1 for commands used for key distribution "Key Rejected" can be used:
'3.6.1. Key distribution and generation
A device may reject a distributed key by sending the Pairing Failed command with the reason set to "Key Rejected".
--- net/bluetooth/smp.c | 19 ++++++++++++++++++- net/bluetooth/smp.h | 1 + 2 files changed, 19 insertions(+), 1 deletion(-)
net/bluetooth/smp.c +18 -1
@@ -2971,8 +2971,25 @@ static int smp_sig_channel(struct l2cap_chan *chan, struct sk_buff *skb)if (code >SMP_CMD_MAX ) goto drop; -if (smp && !test_and_clear_bit (code, &smp->allow_cmd)) +if (smp && !test_and_clear_bit (code, &smp->allow_cmd)) { +/* If there is a context and the command is not allowed consider +* it a failure so the session is cleanup properly. +*/ +switch (code) { +case SMP_CMD_IDENT_INFO : +case SMP_CMD_IDENT_ADDR_INFO : +case SMP_CMD_SIGN_INFO : +/* 3.6.1. Key distribution and generation +* +* A device may reject a distributed key by sending the +* Pairing Failed command with the reason set to +* "Key Rejected". +*/ +smp_failure (conn,SMP_KEY_REJECTED ); +break ; + } goto drop; + }/* If we don't have a context the only allowed commands are * pairing request and security request.
net/bluetooth/smp.h +1 -0
@@ -138,6 +138,7 @@ struct smp_cmd_keypress_notify {#define SMP_NUMERIC_COMP_FAILED 0x0c#define SMP_BREDR_PAIRING_IN_PROGRESS 0x0d#define SMP_CROSS_TRANSP_NOT_ALLOWED 0x0e +#define SMP_KEY_REJECTED 0x0f#define SMP_MIN_ENC_KEY_SIZE 7#define SMP_MAX_ENC_KEY_SIZE 16
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 50/644 Bluetooth: SMP: Fix using HCI_ERROR_REMOTE_USER_TERM on timeout
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit 6ef99c917688a8510259e565bd1b168b7146295a ]
This replaces the usage of HCI_ERROR_REMOTE_USER_TERM, which as the name suggest is to indicate a regular disconnection initiated by an user, with HCI_ERROR_AUTH_FAILURE to indicate the session has timeout thus any pairing shall be considered as failed.
--- net/bluetooth/smp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/bluetooth/smp.c +1 -1
@@ -1373,7 +1373,7 @@ static void smp_timeout(struct work_struct *work)bt_dev_dbg (conn->hcon->hdev,"conn %p" , conn); -hci_disconnect (conn->hcon,HCI_ERROR_REMOTE_USER_TERM ); +hci_disconnect (conn->hcon,HCI_ERROR_AUTH_FAILURE ); }static struct smp_chan *smp_chan_create (struct l2cap_conn *conn)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 51/644 lib: bitmap: Introduce node-aware alloc API
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tariq Toukan <[email protected]>
[ Upstream commit 7529cc7fbd9c02eda6851f3260416cbe198a321d ]
Expose new node-aware API for bitmap allocation:bitmap_alloc_node() / bitmap_zalloc_node().
Stable-dep-of: 531d0d32de3e ("net/mlx5: Correctly set gso_size when LRO is used")
--- include/linux/bitmap.h | 2 ++ lib/bitmap.c | 13 +++++++++++++ 2 files changed, 15 insertions(+)
include/linux/bitmap.h +2 -0
@@ -123,6 +123,8 @@ struct device;*/ unsigned long *bitmap_alloc (unsigned int nbits,gfp_t flags);unsigned long *bitmap_zalloc (unsigned int nbits,gfp_t flags); +unsigned long *bitmap_alloc_node (unsigned int nbits,gfp_t flags,int node); +unsigned long *bitmap_zalloc_node (unsigned int nbits,gfp_t flags,int node);void bitmap_free (const unsigned long *bitmap);/* Managed variants of the above. */
lib/bitmap.c +13 -0
@@ -1398,6 +1398,19 @@ unsigned long *bitmap_zalloc(unsigned int nbits, gfp_t flags) }EXPORT_SYMBOL (bitmap_zalloc); +unsigned long *bitmap_alloc_node (unsigned int nbits,gfp_t flags,int node) +{ +return kmalloc_array_node (BITS_TO_LONGS (nbits),sizeof (unsigned long ), + flags, node); +} +EXPORT_SYMBOL (bitmap_alloc_node); + +unsigned long *bitmap_zalloc_node (unsigned int nbits,gfp_t flags,int node) +{ +return bitmap_alloc_node (nbits, flags | __GFP_ZERO, node); +} +EXPORT_SYMBOL (bitmap_zalloc_node); +void bitmap_free (const unsigned long *bitmap) {kfree (bitmap);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 52/644 net/mlx5e: Add support to klm_umr_wqe
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Ben-Ishay <[email protected]>
[ Upstream commit d7b896acbdcb3ef5dab1fd2f33ba5a8da6ba1dda ]
This commit adds the needed definitions for using the klm_umr_wqe. UMR stands for user-mode memory registration, is a mechanism to alter address translation properties of MKEY by posting WorkQueueElement aka WQE on send queue.
MKEY stands for memory key, MKEY are used to describe a region in memory that can be later used by HW.
KLM stands for {Key, Length, MemVa}, KLM_MKEY is indirect MKEY that enables to map multiple memory spaces with different sizes in unified MKEY. klm_umr_wqe is a UMR that use to update a KLM_MKEY.
SHAMPO feature uses KLM_MKEY for memory registration of his header buffer.
Stable-dep-of: 531d0d32de3e ("net/mlx5: Correctly set gso_size when LRO is used")
--- drivers/net/ethernet/mellanox/mlx5/core/en.h | 24 +++++++++++++++++++- include/linux/mlx5/device.h | 1 + 2 files changed, 24 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/en.h +23 -1
@@ -152,6 +152,25 @@ struct page_pool;#define MLX5E_UMR_WQEBBS \ (DIV_ROUND_UP(MLX5E_UMR_WQE_INLINE_SZ, MLX5_SEND_WQE_BB)) +#define MLX5E_KLM_UMR_WQE_SZ (sgl_len)\ + (sizeof(struct mlx5e_umr_wqe) +\ + (sizeof(struct mlx5_klm) * (sgl_len))) + +#define MLX5E_KLM_UMR_WQEBBS (klm_entries) \ + (DIV_ROUND_UP(MLX5E_KLM_UMR_WQE_SZ(klm_entries), MLX5_SEND_WQE_BB)) + +#define MLX5E_KLM_UMR_DS_CNT (klm_entries)\ + (DIV_ROUND_UP(MLX5E_KLM_UMR_WQE_SZ(klm_entries), MLX5_SEND_WQE_DS)) + +#define MLX5E_KLM_MAX_ENTRIES_PER_WQE (wqe_size)\ + (((wqe_size) - sizeof(struct mlx5e_umr_wqe)) / sizeof(struct mlx5_klm)) + +#define MLX5E_KLM_ENTRIES_PER_WQE (wqe_size)\ + ALIGN_DOWN(MLX5E_KLM_MAX_ENTRIES_PER_WQE(wqe_size), MLX5_UMR_KLM_ALIGNMENT) + +#define MLX5E_MAX_KLM_PER_WQE (mdev) \ + MLX5E_KLM_ENTRIES_PER_WQE(MLX5E_TX_MPW_MAX_NUM_DS << MLX5_MKEY_BSF_OCTO_SIZE) +#define MLX5E_MSG_LEVEL NETIF_MSG_LINK#define mlx5e_dbg (mlevel, priv, format, ...) \
@@ -217,7 +236,10 @@ struct mlx5e_umr_wqe {struct mlx5_wqe_ctrl_seg ctrl;struct mlx5_wqe_umr_ctrl_seg uctrl;struct mlx5_mkey_seg mkc; -struct mlx5_mtt inline_mtts[0 ]; +union { +struct mlx5_mtt inline_mtts[0 ]; +struct mlx5_klm inline_klms[0 ]; + }; };extern const char mlx5e_self_tests[][ETH_GSTRING_LEN ];
include/linux/mlx5/device.h +1 -0
@@ -290,6 +290,7 @@ enum { MLX5_UMR_INLINE = (1 << 7), }; +#define MLX5_UMR_KLM_ALIGNMENT 4#define MLX5_UMR_MTT_ALIGNMENT 0x40#define MLX5_UMR_MTT_MASK (MLX5_UMR_MTT_ALIGNMENT - 1)#define MLX5_UMR_MTT_MIN_CHUNK_SIZE MLX5_UMR_MTT_ALIGNMENT
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 53/644 net/mlx5: Correctly set gso_size when LRO is used
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Paasch <[email protected]>
[ Upstream commit 531d0d32de3e1b6b77a87bd37de0c2c6e17b496a ]
gso_size is expected by the networking stack to be the size of the payload (thus, not including ethernet/IP/TCP-headers). However, cqe_bcnt is the full sized frame (including the headers). Dividing cqe_bcnt by lro_num_seg will then give incorrect results.
For example, running a bpftrace higher up in the TCP-stack (tcp_event_data_recv), we commonly have gso_size set to 1450 or 1451 even though in reality the payload was only 1448 bytes.
This can have unintended consequences:
- In tcp_measure_rcv_mss() len will be for example 1450, but. rcv_mss will be 1448 (because tp->advmss is 1448). Thus, we will always recompute scaling_ratio each time an LRO-packet is received.
- In tcp_gro_receive(), it will interfere with the decision whether or not to flush and thus potentially result in less gro'ed packets.
So, we need to discount the protocol headers from cqe_bcnt so we can actually divide the payload by lro_num_seg to get the real gso_size.
v2:
- Use "(unsigned char *)tcp + tcp->doff * 4 - skb->data)" to compute header-len (Tariq Toukan <[email protected]>)
- Improve commit-message (Gal Pressman <[email protected]>)
--- drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +8 -4
@@ -788,8 +788,9 @@ static void mlx5e_lro_update_tcp_hdr(struct mlx5_cqe64 *cqe, struct tcphdr *tcp) } } -static void mlx5e_lro_update_hdr (struct sk_buff *skb,struct mlx5_cqe64 *cqe, -u32 cqe_bcnt) +static unsigned int mlx5e_lro_update_hdr (struct sk_buff *skb, +struct mlx5_cqe64 *cqe, +u32 cqe_bcnt) {struct ethhdr *eth = (struct ethhdr *)(skb->data);struct tcphdr *tcp;
@@ -840,6 +841,8 @@ static void mlx5e_lro_update_hdr(struct sk_buff *skb, struct mlx5_cqe64 *cqe, tcp->check =csum_ipv6_magic (&ipv6->saddr, &ipv6->daddr, payload_len,IPPROTO_TCP , check); } + +return (unsigned int )((unsigned char *)tcp + tcp->doff *4 - skb->data); } static inline void mlx5e_skb_set_hash(struct mlx5_cqe64 *cqe,
@@ -1055,8 +1058,9 @@ static inline void mlx5e_build_rx_skb(struct mlx5_cqe64 *cqe,mlx5e_ipsec_offload_handle_rx_skb (netdev, skb, cqe);if (lro_num_seg >1 ) { -mlx5e_lro_update_hdr (skb, cqe, cqe_bcnt); -skb_shinfo (skb)->gso_size =DIV_ROUND_UP (cqe_bcnt, lro_num_seg); +unsigned int hdrlen =mlx5e_lro_update_hdr (skb, cqe, cqe_bcnt); + +skb_shinfo (skb)->gso_size =DIV_ROUND_UP (cqe_bcnt - hdrlen, lro_num_seg);/* Subtract one since we already counted this as one * "regular" packet in mlx5e_complete_rx_cqe() */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 54/644 ipv6: mcast: Delay put pmc->idev in mld_del_delrec()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yue Haibing <[email protected]>
[ Upstream commit ae3264a25a4635531264728859dbe9c659fad554 ]
pmc->idev is still used in ip6_mc_clear_src(), so as mld_clear_delrec() does, the reference should be put after ip6_mc_clear_src() return.
--- net/ipv6/mcast.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv6/mcast.c +1 -1
@@ -803,8 +803,8 @@ static void mld_del_delrec(struct inet6_dev *idev, struct ifmcaddr6 *im) }else { im->mca_crcount = idev->mc_qrv; } -in6_dev_put (pmc->idev);ip6_mc_clear_src (pmc); +in6_dev_put (pmc->idev);kfree_rcu (pmc, rcu); } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 55/644 Bluetooth: L2CAP: Fix attempting to adjust outgoing MTU
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit d24e4a7fedae121d33fb32ad785b87046527eedb ]
Configuration request only configure the incoming direction of the peer initiating the request, so using the MTU is the other direction shall not be used, that said the spec allows the peer responding to adjust:
Bluetooth Core 6.1, Vol 3, Part A, Section 4.5
'Each configuration parameter value (if any is present) in an L2CAP_CONFIGURATION_RSP packet reflects an ‘adjustment’ to a configuration parameter value that has been sent (or, in case of default values, implied) in the corresponding L2CAP_CONFIGURATION_REQ packet.'
That said adjusting the MTU in the response shall be limited to ERTM channels only as for older modes the remote stack may not be able to detect the adjustment causing it to silently drop packets.
--- net/bluetooth/l2cap_core.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-)
net/bluetooth/l2cap_core.c +21 -5
@@ -3687,12 +3687,28 @@ static int l2cap_parse_conf_req(struct l2cap_chan *chan, void *data, size_t data/* Configure output options and let the other side know * which ones we don't like. */ -/* If MTU is not provided in configure request, use the most recently -* explicitly or implicitly accepted value for the other direction, -* or the default value. +/* If MTU is not provided in configure request, try adjusting it +* to the current output MTU if it has been set +* +* Bluetooth Core 6.1, Vol 3, Part A, Section 4.5 +* +* Each configuration parameter value (if any is present) in an +* L2CAP_CONFIGURATION_RSP packet reflects an ‘adjustment’ to a +* configuration parameter value that has been sent (or, in case +* of default values, implied) in the corresponding +* L2CAP_CONFIGURATION_REQ packet. */ -if (mtu ==0 ) - mtu = chan->imtu ? chan->imtu :L2CAP_DEFAULT_MTU ; +if (!mtu) { +/* Only adjust for ERTM channels as for older modes the +* remote stack may not be able to detect that the +* adjustment causing it to silently drop packets. +*/ +if (chan->mode ==L2CAP_MODE_ERTM && + chan->omtu && chan->omtu !=L2CAP_DEFAULT_MTU ) + mtu = chan->omtu; +else + mtu =L2CAP_DEFAULT_MTU ; + }if (mtu <L2CAP_DEFAULT_MIN_MTU ) result =L2CAP_CONF_UNACCEPT ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 56/644 net: vlan: fix VLAN 0 refcount imbalance of toggling filtering during runtime
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dong Chenchen <[email protected]>
[ Upstream commit 579d4f9ca9a9a605184a9b162355f6ba131f678d ]
Assuming the "rx-vlan-filter" feature is enabled on a net device, the 8021q module will automatically add or remove VLAN 0 when the net device is put administratively up or down, respectively. There are a couple of problems with the above scheme.
The first problem is a memory leak that can happen if the "rx-vlan-filter" feature is disabled while the device is running:
# ip link add bond1 up type bond mode 0 # ethtool -K bond1 rx-vlan-filter off # ip link del dev bond1
When the device is put administratively down the "rx-vlan-filter" feature is disabled, so the 8021q module will not remove VLAN 0 and the memory will be leaked [1].
Another problem that can happen is that the kernel can automatically delete VLAN 0 when the device is put administratively down despite not adding it when the device was put administratively up since during that time the "rx-vlan-filter" feature was disabled. null-ptr-unref or bug_on[2] will be triggered by unregister_vlan_dev() for refcount imbalance if toggling filtering during runtime:
$ ip link add bond0 type bond mode 0 $ ip link add link bond0 name vlan0 type vlan id 0 protocol 802.1q $ ethtool -K bond0 rx-vlan-filter off $ ifconfig bond0 up $ ethtool -K bond0 rx-vlan-filter on $ ifconfig bond0 down $ ip link del vlan0
Root cause is as below:
step1: add vlan0 for real_dev, such as bond, team. register_vlan_dev
vlan_vid_add(real_dev,htons(ETH_P_8021Q),0) //refcnt=1
step2: disable vlan filter feature and enable real_dev
step3: change filter from 0 to 1vlan_device_event
vlan_filter_push_vids
ndo_vlan_rx_add_vid //No refcnt added to real_dev vlan0
step4: real_dev downvlan_device_event
vlan_vid_del(dev, htons(ETH_P_8021Q), 0); //refcnt=0
vlan_info_rcu_free //free vlan0
step5: delete vlan0unregister_vlan_dev
BUG_ON(!vlan_info); //vlan_info is null
Fix both problems by noting in the VLAN info whether VLAN 0 was automatically added upon NETDEV_UP and based on that decide whether it should be deleted upon NETDEV_DOWN, regardless of the state of the "rx-vlan-filter" feature.
[1]
unreferenced object 0xffff8880068e3100 (size 256):
comm "ip", pid 384, jiffies 4296130254 hex dump (first 32 bytes):
00 20 30 0d 80 88 ff ff 00 00 00 00 00 00 00 00 . 0.............
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace (crc 81ce31fa):
__kmalloc_cache_noprof+0x2b5/0x340
vlan_vid_add+0x434/0x940
vlan_device_event.cold+0x75/0xa8
notifier_call_chain+0xca/0x150
__dev_notify_flags+0xe3/0x250
rtnl_configure_link+0x193/0x260
rtnl_newlink_create+0x383/0x8e0
__rtnl_newlink+0x22c/0xa40
rtnl_newlink+0x627/0xb00
rtnetlink_rcv_msg+0x6fb/0xb70
netlink_rcv_skb+0x11f/0x350
netlink_unicast+0x426/0x710
netlink_sendmsg+0x75a/0xc20
__sock_sendmsg+0xc1/0x150
____sys_sendmsg+0x5aa/0x7b0
___sys_sendmsg+0xfc/0x180[2]
kernel BUG at net/8021q/vlan.c:99!
Oops: invalid opcode: 0000 [#1] SMP KASAN PTI CPU: 0 UID: 0 PID: 382 Comm: ip Not tainted 6.16.0-rc3 #61 PREEMPT(voluntary) Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.13.0-0-gf21b5a4aeb02-prebuilt.qemu.org 04/01/2014 RIP: 0010:unregister_vlan_dev (net/8021q/vlan.c:99 (discriminator 1)) RSP: 0018:ffff88810badf310 EFLAGS: 00010246 RAX: 0000000000000000 RBX: ffff88810da84000 RCX: ffffffffb47ceb9a RDX: dffffc0000000000 RSI: 0000000000000008 RDI: ffff88810e8b43c8 RBP: 0000000000000000 R08: 0000000000000000 R09: fffffbfff6cefe80 R10: ffffffffb677f407 R11: ffff88810badf3c0 R12: ffff88810e8b4000 R13: 0000000000000000 R14: ffff88810642a5c0 R15: 000000000000017e FS: 00007f1ff68c20c0(0000) GS:ffff888163a24000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f1ff5dad240 CR3: 0000000107e56000 CR4: 00000000000006f0 Call Trace: <TASK> rtnl_dellink (net/core/rtnetlink.c:3511 net/core/rtnetlink.c:3553)
rtnetlink_rcv_msg (net/core/rtnetlink.c:6945)netlink_rcv_skb (net/netlink/af_netlink.c:2535)netlink_unicast (net/netlink/af_netlink.c:1314 net/netlink/af_netlink.c:1339) netlink_sendmsg (net/netlink/af_netlink.c:1883)____sys_sendmsg (net/socket.c:712 net/socket.c:727 net/socket.c:2566) ___sys_sendmsg (net/socket.c:2622)__sys_sendmsg (net/socket.c:2652)do_syscall_64 (arch/x86/entry/syscall_64.c:63 arch/x86/entry/syscall_64.c:94)
--- net/8021q/vlan.c | 42 +++++++++++++++++++++++++++++++++--------- net/8021q/vlan.h | 1 + 2 files changed, 34 insertions(+), 9 deletions(-)
net/8021q/vlan.c +33 -9
@@ -359,6 +359,35 @@ static int __vlan_device_event(struct net_device *dev, unsigned long event)return err; } +static void vlan_vid0_add (struct net_device *dev) +{ +struct vlan_info *vlan_info; +int err; + +if (!(dev->features &NETIF_F_HW_VLAN_CTAG_FILTER )) +return ; + +pr_info ("adding VLAN 0 to HW filter on device %s\n" , dev->name); + + err =vlan_vid_add (dev,htons (ETH_P_8021Q ),0 ); +if (err) +return ; + + vlan_info =rtnl_dereference (dev->vlan_info); + vlan_info->auto_vid0 = true; +} + +static void vlan_vid0_del (struct net_device *dev) +{ +struct vlan_info *vlan_info =rtnl_dereference (dev->vlan_info); + +if (!vlan_info || !vlan_info->auto_vid0) +return ; + + vlan_info->auto_vid0 = false; +vlan_vid_del (dev,htons (ETH_P_8021Q ),0 ); +} +static int vlan_device_event (struct notifier_block *unused,unsigned long event,void *ptr) {
@@ -380,15 +409,10 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,return notifier_from_errno (err); } -if ((event ==NETDEV_UP ) && - (dev->features &NETIF_F_HW_VLAN_CTAG_FILTER )) { -pr_info ("adding VLAN 0 to HW filter on device %s\n" , - dev->name); -vlan_vid_add (dev,htons (ETH_P_8021Q ),0 ); - } -if (event ==NETDEV_DOWN && - (dev->features &NETIF_F_HW_VLAN_CTAG_FILTER )) -vlan_vid_del (dev,htons (ETH_P_8021Q ),0 ); +if (event ==NETDEV_UP ) +vlan_vid0_add (dev); +else if (event ==NETDEV_DOWN ) +vlan_vid0_del (dev); vlan_info =rtnl_dereference (dev->vlan_info);if (!vlan_info)
net/8021q/vlan.h +1 -0
@@ -33,6 +33,7 @@ struct vlan_info {struct vlan_group grp;struct list_head vid_list;unsigned int nr_vids; +bool auto_vid0;struct rcu_head rcu; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 57/644 net: bridge: Do not offload IGMP/MLD messages
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joseph Huang <[email protected]>
[ Upstream commit 683dc24da8bf199bb7446e445ad7f801c79a550e ]
Do not offload IGMP/MLD messages as it could lead to IGMP/MLD Reports being unintentionally flooded to Hosts. Instead, let the bridge decide where to send these IGMP/MLD messages.
Consider the case where the local host is sending out reports in response to a remote querier like the following:
mcast-listener-process (IP_ADD_MEMBERSHIP)
\
br0
/ \
swp1 swp2
| |QUERIER SOME-OTHER-HOST
In the above setup, br0 will want to br_forward() reports for mcast-listener-process's group(s) via swp1 to QUERIER; but since the source hwdom is 0, the report is eligible for tx offloading, and is flooded by hardware to both swp1 and swp2, reaching SOME-OTHER-HOST as well. (Example and illustration provided by Tobias.)
--- net/bridge/br_switchdev.c | 3 +++ 1 file changed, 3 insertions(+)
net/bridge/br_switchdev.c +3 -0
@@ -16,6 +16,9 @@ static bool nbp_switchdev_can_offload_tx_fwd(const struct net_bridge_port *p,if (!static_branch_unlikely (&br_switchdev_tx_fwd_offload))return false; +if (br_multicast_igmp_type (skb)) +return false; +return (p->flags &BR_TX_FWD_OFFLOAD ) && (p->hwdom !=BR_INPUT_SKB_CB (skb)->src_hwdom); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 58/644 net/sched: Return NULL when htb_lookup_leaf encounters an empty rbtree
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: William Liu <[email protected]>
[ Upstream commit 0e1d5d9b5c5966e2e42e298670808590db5ed628 ]
htb_lookup_leaf has a BUG_ON that can trigger with the following:
tc qdisc del dev lo root
tc qdisc add dev lo root handle 1: htb default 1 tc class add dev lo parent 1: classid 1:1 htb rate 64bit tc qdisc add dev lo parent 1:1 handle 2: netem tc qdisc add dev lo parent 2:1 handle 3: blackhole ping -I lo -c1 -W0.001 127.0.0.1
The root cause is the following:
1. htb_dequeue calls htb_dequeue_tree which calls the dequeue handler on the selected leaf qdisc
2. netem_dequeue calls enqueue on the child qdisc
3. blackhole_enqueue drops the packet and returns a value that is not just NET_XMIT_SUCCESS
4. Because of this, netem_dequeue calls qdisc_tree_reduce_backlog, and since qlen is now 0, it calls htb_qlen_notify -> htb_deactivate -> htb_deactiviate_prios -> htb_remove_class_from_row -> htb_safe_rb_erase
5. As this is the only class in the selected hprio rbtree, __rb_change_child in __rb_erase_augmented sets the rb_root pointer to NULL
6. Because blackhole_dequeue returns NULL, netem_dequeue returns NULL, which causes htb_dequeue_tree to call htb_lookup_leaf with the same hprio rbtree, and fail the BUG_ON
The function graph for this scenario is shown here:
0) | htb_enqueue() {
0) + 13.635 us | netem_enqueue();
0) 4.719 us | htb_activate_prios();
0) # 2249.199 us | }
0) | htb_dequeue() {
0) 2.355 us | htb_lookup_leaf();
0) | netem_dequeue() {
0) + 11.061 us | blackhole_enqueue();
0) | qdisc_tree_reduce_backlog() {
0) | qdisc_lookup_rcu() {
0) 1.873 us | qdisc_match_from_root();
0) 6.292 us | }
0) 1.894 us | htb_search();
0) | htb_qlen_notify() {
0) 2.655 us | htb_deactivate_prios();
0) 6.933 us | }
0) + 25.227 us | }
0) 1.983 us | blackhole_dequeue();
0) + 86.553 us | }
0) # 2932.761 us | qdisc_warn_nonwc();
0) | htb_lookup_leaf() {
0) | BUG_ON();------------------------------------------
The full original bug report can be seen here [1].
We can fix this just by returning NULL instead of the BUG_ON, as htb_dequeue_tree returns NULL when htb_lookup_leaf returns NULL.
--- net/sched/sch_htb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/sched/sch_htb.c +3 -1
@@ -817,7 +817,9 @@ static struct htb_class *htb_lookup_leaf(struct htb_prio *hprio, const int prio)u32 *pid; } stk[TC_HTB_MAXDEPTH ], *sp = stk; -BUG_ON (!hprio->row.rb_node); +if (unlikely (!hprio->row.rb_node)) +return NULL ; + sp->root = hprio->row.rb_node; sp->pptr = &hprio->ptr; sp->pid = &hprio->last_ptr_id;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 59/644 sched: Change nr_uninterruptible type to unsigned long
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aruna Ramakrishna <[email protected]>
commit 36569780b0d64de283f9d6c2195fd1a43e221ee8 upstream.
The commit e6fe3f422be1 ("sched: Make multiple runqueue task counters 32-bit") changed nr_uninterruptible to an unsigned int. But the nr_uninterruptible values for each of the CPU runqueues can grow to large numbers, sometimes exceeding INT_MAX. This is valid, if, over time, a large number of tasks are migrated off of one CPU after going into an uninterruptible state. Only the sum of all nr_interruptible values across all CPUs yields the correct result, as explained in a comment in kernel/sched/loadavg.c.
Change the type of nr_uninterruptible back to unsigned long to prevent overflows, and thus the miscalculation of load average.
--- kernel/sched/loadavg.c | 2 +- kernel/sched/sched.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
kernel/sched/loadavg.c +1 -1
@@ -81,7 +81,7 @@ long calc_load_fold_active(struct rq *thlong nr_active, delta =0 ; nr_active = this_rq->nr_running - adjust; - nr_active += (int )this_rq->nr_uninterruptible; + nr_active += (long )this_rq->nr_uninterruptible;if (nr_active != this_rq->calc_load_active) { delta = nr_active - this_rq->calc_load_active;
kernel/sched/sched.h +1 -1
@@ -971,7 +971,7 @@ struct rq {* one CPU and if it got migrated afterwards it may decrease * it on another CPU. Always updated under the runqueue lock: */ -unsigned int nr_uninterruptible; +unsigned long nr_uninterruptible;struct task_struct __rcu *curr;struct task_struct *idle;
Greg Kroah-Hartman
maintainerPATCH 60/644 clone_private_mnt(): make sure that caller has CAP_SYS_ADMIN in the right userns
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
commit c28f922c9dcee0e4876a2c095939d77fe7e15116 upstream.
What we want is to verify there is that clone won't expose something hidden by a mount we wouldn't be able to undo. "Wouldn't be able to undo" may be a result of MNT_LOCKED on a child, but it may also come from lacking admin rights in the userns of the namespace mount belongs to.
clone_private_mnt() checks the former, but not the latter.
There's a number of rather confusing CAP_SYS_ADMIN checks in various userns during the mount, especially with the new mount API; they serve different purposes and in case of clone_private_mnt() they usually, but not always end up covering the missing check mentioned above.
[ merge conflict resolution: clone_private_mount() was reworked in
db04662e2f4f ("fs: allow detached mounts in clone_private_mount()"). Tweak the relevant ns_capable check so that it works on older kernels ]
--- fs/namespace.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/namespace.c +5 -0
@@ -1975,6 +1975,11 @@ struct vfsmount *clone_private_mount(conif (!check_mnt (old_mnt)) goto invalid; +if (!ns_capable (old_mnt->mnt_ns->user_ns,CAP_SYS_ADMIN )) { +up_read (&namespace_sem); +return ERR_PTR (-EPERM ); + } +if (has_locked_children (old_mnt, path->dentry)) goto invalid;
Greg Kroah-Hartman
maintainerPATCH 61/644 usb: hub: fix detection of high tier USB3 devices behind suspended hubs
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mathias Nyman <[email protected]>
commit 8f5b7e2bec1c36578fdaa74a6951833541103e27 upstream.
USB3 devices connected behind several external suspended hubs may not be detected when plugged in due to aggressive hub runtime pm suspend.
The hub driver immediately runtime-suspends hubs if there are no active children or port activity.
There is a delay between the wake signal causing hub resume, and driver visible port activity on the hub downstream facing ports. Most of the LFPS handshake, resume signaling and link training done on the downstream ports is not visible to the hub driver until completed, when device then will appear fully enabled and running on the port.
This delay between wake signal and detectable port change is even more significant with chained suspended hubs where the wake signal will propagate upstream first. Suspended hubs will only start resuming downstream ports after upstream facing port resumes.
The hub driver may resume a USB3 hub, read status of all ports, not yet see any activity, and runtime suspend back the hub before any port activity is visible.
This exact case was seen when conncting USB3 devices to a suspended Thunderbolt dock.
USB3 specification defines a 100ms tU3WakeupRetryDelay, indicating USB3 devices expect to be resumed within 100ms after signaling wake. if not then device will resend the wake signal.
Give the USB3 hubs twice this time (200ms) to detect any port changes after resume, before allowing hub to runtime suspend again.
--- drivers/usb/core/hub.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-)
drivers/usb/core/hub.c +32 -1
@@ -53,6 +53,12 @@#define USB_TP_TRANSMISSION_DELAY_MAX 65535/* ns */ #define USB_PING_RESPONSE_TIME 400/* ns */ +/* +* Give SS hubs 200ms time after wake to train downstream links before +* assuming no port activity and allowing hub to runtime suspend back. +*/ +#define USB_SS_PORT_U0_WAKE_TIME 200/* ms */ +/* Protect struct usb_device->state and ->children members * Note: Both are also protected by ->dev.sem, except that ->state can * change to USB_STATE_NOTATTACHED even when the semaphore isn't held. */
@@ -1025,11 +1031,12 @@ int usb_remove_device(struct usb_deviceenum hub_activation_type {HUB_INIT ,HUB_INIT2 ,HUB_INIT3 ,/* INITs must come first */ -HUB_POST_RESET ,HUB_RESUME ,HUB_RESET_RESUME , +HUB_POST_RESET ,HUB_RESUME ,HUB_RESET_RESUME ,HUB_POST_RESUME , };static void hub_init_func2 (struct work_struct *ws);static void hub_init_func3 (struct work_struct *ws); +static void hub_post_resume (struct work_struct *ws);static void hub_activate (struct usb_hub *hub,enum hub_activation_type type) {
@@ -1052,6 +1059,13 @@ static void hub_activate(struct usb_hub goto init2; goto init3; } + +if (type ==HUB_POST_RESUME ) { +usb_autopm_put_interface_async (to_usb_interface (hub->intfdev)); +hub_put (hub); +return ; + } +hub_get (hub);/* The superspeed hub except for root hub has to use Hub Depth
@@ -1300,6 +1314,16 @@ static void hub_activate(struct usb_hubdevice_unlock (&hdev->dev); } +if (type ==HUB_RESUME &&hub_is_superspeed (hub->hdev)) { +/* give usb3 downstream links training time after hub resume */ +INIT_DELAYED_WORK (&hub->init_work, hub_post_resume); +queue_delayed_work (system_power_efficient_wq, &hub->init_work, +msecs_to_jiffies (USB_SS_PORT_U0_WAKE_TIME )); +usb_autopm_get_interface_no_resume ( +to_usb_interface (hub->intfdev)); +return ; + } +hub_put (hub); }
@@ -1318,6 +1342,13 @@ static void hub_init_func3(struct work_shub_activate (hub,HUB_INIT3 ); } +static void hub_post_resume (struct work_struct *ws) +{ + struct usb_hub *hub = container_of(ws, struct usb_hub, init_work.work); + +hub_activate (hub,HUB_POST_RESUME ); +} +enum hub_quiescing_type {HUB_DISCONNECT ,HUB_PRE_RESET ,HUB_SUSPEND };
Greg Kroah-Hartman
maintainerPATCH 62/644 usb: hub: Fix flushing and scheduling of delayed work that tunes runtime pm
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mathias Nyman <[email protected]>
commit a49e1e2e785fb3621f2d748581881b23a364998a upstream.
Delayed work to prevent USB3 hubs from runtime-suspending immediately after resume was added in commit 8f5b7e2bec1c ("usb: hub: fix detection of high tier USB3 devices behind suspended hubs").
This delayed work needs be flushed if system suspends, or hub needs to be quiesced for other reasons right after resume. Not flushing it triggered issues on QC SC8280XP CRD board during suspend/resume testing.
Fix it by flushing the delayed resume work in hub_quiesce()
The delayed work item that allow hub runtime suspend is also scheduled just before calling autopm get. Alan pointed out there is a small risk that work is run before autopm get, which would call autopm put before get, and mess up the runtime pm usage order.
Swap the order of work sheduling and calling autopm get to solve this.
--- drivers/usb/core/hub.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/usb/core/hub.c +4 -2
@@ -1316,11 +1316,12 @@ static void hub_activate(struct usb_hubif (type ==HUB_RESUME &&hub_is_superspeed (hub->hdev)) {/* give usb3 downstream links training time after hub resume */ +usb_autopm_get_interface_no_resume ( +to_usb_interface (hub->intfdev)); +INIT_DELAYED_WORK (&hub->init_work, hub_post_resume);queue_delayed_work (system_power_efficient_wq, &hub->init_work,msecs_to_jiffies (USB_SS_PORT_U0_WAKE_TIME )); -usb_autopm_get_interface_no_resume ( -to_usb_interface (hub->intfdev));return ; }
@@ -1374,6 +1375,7 @@ static void hub_quiesce(struct usb_hub */* Stop hub_wq and related activity */ del_timer_sync (&hub->irq_urb_retry); +flush_delayed_work (&hub->init_work);usb_kill_urb (hub->urb);if (hub->has_indicators)cancel_delayed_work_sync (&hub->leds);
Greg Kroah-Hartman
maintainerPATCH 63/644 usb: hub: Fix flushing of delayed work used for post resume purposes
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mathias Nyman <[email protected]>
commit 9bd9c8026341f75f25c53104eb7e656e357ca1a2 upstream.
Delayed work that prevents USB3 hubs from runtime-suspending too early needed to be flushed in hub_quiesce() to resolve issues detected on QC SC8280XP CRD board during suspend resume testing.
This flushing did however trigger new issues on Raspberry Pi 3B+, which doesn't have USB3 ports, and doesn't queue any post resume delayed work.
The flushed 'hub->init_work' item is used for several purposes, and is originally initialized with a 'NULL' work function. The work function is also changed on the fly, which may contribute to the issue.
Solve this by creating a dedicated delayed work item for post resume work, and flush that delayed work in hub_quiesce()
--- drivers/usb/core/hub.c | 21 ++++++++------------- drivers/usb/core/hub.h | 1 + 2 files changed, 9 insertions(+), 13 deletions(-)
drivers/usb/core/hub.c +8 -13
@@ -1031,12 +1031,11 @@ int usb_remove_device(struct usb_deviceenum hub_activation_type {HUB_INIT ,HUB_INIT2 ,HUB_INIT3 ,/* INITs must come first */ -HUB_POST_RESET ,HUB_RESUME ,HUB_RESET_RESUME ,HUB_POST_RESUME , +HUB_POST_RESET ,HUB_RESUME ,HUB_RESET_RESUME , };static void hub_init_func2 (struct work_struct *ws);static void hub_init_func3 (struct work_struct *ws); -static void hub_post_resume (struct work_struct *ws);static void hub_activate (struct usb_hub *hub,enum hub_activation_type type) {
@@ -1060,12 +1059,6 @@ static void hub_activate(struct usb_hub goto init3; } -if (type ==HUB_POST_RESUME ) { -usb_autopm_put_interface_async (to_usb_interface (hub->intfdev)); -hub_put (hub); -return ; - } -hub_get (hub);/* The superspeed hub except for root hub has to use Hub Depth
@@ -1319,8 +1312,8 @@ static void hub_activate(struct usb_hubusb_autopm_get_interface_no_resume (to_usb_interface (hub->intfdev)); -INIT_DELAYED_WORK (&hub->init_work, hub_post_resume); -queue_delayed_work (system_power_efficient_wq, &hub->init_work, +queue_delayed_work (system_power_efficient_wq, + &hub->post_resume_work,msecs_to_jiffies (USB_SS_PORT_U0_WAKE_TIME ));return ; }
@@ -1345,9 +1338,10 @@ static void hub_init_func3(struct work_sstatic void hub_post_resume (struct work_struct *ws) { - struct usb_hub *hub = container_of(ws, struct usb_hub, init_work.work); + struct usb_hub *hub = container_of(ws, struct usb_hub, post_resume_work.work); -hub_activate (hub,HUB_POST_RESUME ); +usb_autopm_put_interface_async (to_usb_interface (hub->intfdev)); +hub_put (hub); }enum hub_quiescing_type {
@@ -1375,7 +1369,7 @@ static void hub_quiesce(struct usb_hub */* Stop hub_wq and related activity */ del_timer_sync (&hub->irq_urb_retry); -flush_delayed_work (&hub->init_work); +flush_delayed_work (&hub->post_resume_work);usb_kill_urb (hub->urb);if (hub->has_indicators)cancel_delayed_work_sync (&hub->leds);
@@ -1932,6 +1926,7 @@ static int hub_probe(struct usb_interfac hub->hdev = hdev;INIT_DELAYED_WORK (&hub->leds, led_work);INIT_DELAYED_WORK (&hub->init_work,NULL ); +INIT_DELAYED_WORK (&hub->post_resume_work, hub_post_resume);INIT_WORK (&hub->events, hub_event);spin_lock_init (&hub->irq_urb_lock);timer_setup (&hub->irq_urb_retry, hub_retry_irq_urb,0 );
drivers/usb/core/hub.h +1 -0
@@ -69,6 +69,7 @@ struct usb_hub {u8 indicator[USB_MAXCHILDREN ];struct delayed_work leds;struct delayed_work init_work; +struct delayed_work post_resume_work;struct work_struct events;spinlock_t irq_urb_lock;struct timer_list irq_urb_retry;
Greg Kroah-Hartman
maintainerPATCH 64/644 usb: musb: Add and use inline functions musb_{get,set}_state
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Cercueil <[email protected]>
commit 21acc656a06e912341d9db66c67b58cc7ed071e7 upstream.
Instead of manipulating musb->xceiv->otg->state directly, use the newly introduced musb_get_state() and musb_set_state() inline functions.
Later, these inline functions will be modified to get rid of the musb->xceiv dependency, which prevents the musb code from using the generic PHY subsystem.
Stable-dep-of: 67a59f82196c ("usb: musb: fix gadget state on disconnect")
--- drivers/usb/musb/musb_core.c | 62 ++++++++++++++++++++-------------------- drivers/usb/musb/musb_core.h | 11 +++++++ drivers/usb/musb/musb_debugfs.c | 6 +-- drivers/usb/musb/musb_gadget.c | 28 +++++++++--------- drivers/usb/musb/musb_host.c | 6 +-- drivers/usb/musb/musb_virthub.c | 18 +++++------ 6 files changed, 71 insertions(+), 60 deletions(-)
drivers/usb/musb/musb_core.c +31 -31
@@ -502,7 +502,7 @@ int musb_set_host(struct musb *musb) init_data: musb->is_active =1 ; - musb->xceiv->otg->state =OTG_STATE_A_IDLE ; +musb_set_state (musb,OTG_STATE_A_IDLE );MUSB_HST_MODE (musb);return error;
@@ -549,7 +549,7 @@ int musb_set_peripheral(struct musb *mus init_data: musb->is_active =0 ; - musb->xceiv->otg->state =OTG_STATE_B_IDLE ; +musb_set_state (musb,OTG_STATE_B_IDLE );MUSB_DEV_MODE (musb);return error;
@@ -599,12 +599,12 @@ static void musb_otg_timer_func(struct tunsigned long flags;spin_lock_irqsave (&musb->lock, flags); -switch (musb->xceiv->otg->state) { +switch (musb_get_state (musb)) {case OTG_STATE_B_WAIT_ACON :musb_dbg (musb,"HNP: b_wait_acon timeout; back to b_peripheral" );musb_g_disconnect (musb); - musb->xceiv->otg->state =OTG_STATE_B_PERIPHERAL ; +musb_set_state (musb,OTG_STATE_B_PERIPHERAL ); musb->is_active =0 ;break ;case OTG_STATE_A_SUSPEND :
@@ -612,7 +612,7 @@ static void musb_otg_timer_func(struct tmusb_dbg (musb,"HNP: %s timeout" ,usb_otg_state_string (musb->xceiv->otg->state));musb_platform_set_vbus (musb,0 ); - musb->xceiv->otg->state =OTG_STATE_A_WAIT_VFALL ; +musb_set_state (musb,OTG_STATE_A_WAIT_VFALL );break ;default : musb_dbg(musb, "HNP: Unhandled mode %s",
@@ -633,7 +633,7 @@ void musb_hnp_stop(struct musb *musb)musb_dbg (musb,"HNP: stop from %s" ,usb_otg_state_string (musb->xceiv->otg->state)); -switch (musb->xceiv->otg->state) { +switch (musb_get_state (musb)) {case OTG_STATE_A_PERIPHERAL :musb_g_disconnect (musb); musb_dbg(musb, "HNP: back to %s",
@@ -643,7 +643,7 @@ void musb_hnp_stop(struct musb *musb)musb_dbg (musb,"HNP: Disabling HR" );if (hcd) hcd->self.is_b_host =0 ; - musb->xceiv->otg->state =OTG_STATE_B_PERIPHERAL ; +musb_set_state (musb,OTG_STATE_B_PERIPHERAL );MUSB_DEV_MODE (musb); reg =musb_readb (mbase,MUSB_POWER ); reg |=MUSB_POWER_SUSPENDM ;
@@ -671,7 +671,7 @@ static void musb_handle_intr_resume(stru usb_otg_state_string(musb->xceiv->otg->state));if (devctl &MUSB_DEVCTL_HM ) { -switch (musb->xceiv->otg->state) { +switch (musb_get_state (musb)) {case OTG_STATE_A_SUSPEND :/* remote wakeup? */ musb->port1_status |=
@@ -679,14 +679,14 @@ static void musb_handle_intr_resume(stru | MUSB_PORT_STAT_RESUME; musb->rh_timer = jiffies +msecs_to_jiffies (USB_RESUME_TIMEOUT ); - musb->xceiv->otg->state =OTG_STATE_A_HOST ; +musb_set_state (musb,OTG_STATE_A_HOST ); musb->is_active =1 ;musb_host_resume_root_hub (musb);schedule_delayed_work (&musb->finish_resume_work,msecs_to_jiffies (USB_RESUME_TIMEOUT ));break ;case OTG_STATE_B_WAIT_ACON : - musb->xceiv->otg->state =OTG_STATE_B_PERIPHERAL ; +musb_set_state (musb,OTG_STATE_B_PERIPHERAL ); musb->is_active =1 ;MUSB_DEV_MODE (musb);break ;
@@ -696,10 +696,10 @@ static void musb_handle_intr_resume(stru usb_otg_state_string(musb->xceiv->otg->state)); } }else { -switch (musb->xceiv->otg->state) { +switch (musb_get_state (musb)) {case OTG_STATE_A_SUSPEND :/* possibly DISCONNECT is upcoming */ - musb->xceiv->otg->state =OTG_STATE_A_HOST ; +musb_set_state (musb,OTG_STATE_A_HOST );musb_host_resume_root_hub (musb);break ;case OTG_STATE_B_WAIT_ACON :
@@ -750,7 +750,7 @@ static irqreturn_t musb_handle_intr_sess*/ musb_writeb (mbase,MUSB_DEVCTL ,MUSB_DEVCTL_SESSION ); musb->ep0_stage =MUSB_EP0_START ; - musb->xceiv->otg->state =OTG_STATE_A_IDLE ; +musb_set_state (musb,OTG_STATE_A_IDLE );MUSB_HST_MODE (musb);musb_platform_set_vbus (musb,1 );
@@ -777,7 +777,7 @@ static void musb_handle_intr_vbuserr(str* REVISIT: do delays from lots of DEBUG_KERNEL checks * make trouble here, keeping VBUS < 4.4V ? */ -switch (musb->xceiv->otg->state) { +switch (musb_get_state (musb)) {case OTG_STATE_A_HOST :/* recovery is dicey once we've gotten past the * initial stages of enumeration, but if VBUS
@@ -833,7 +833,7 @@ static void musb_handle_intr_suspend(strmusb_dbg (musb,"SUSPEND (%s) devctl %02x" ,usb_otg_state_string (musb->xceiv->otg->state), devctl); -switch (musb->xceiv->otg->state) { +switch (musb_get_state (musb)) {case OTG_STATE_A_PERIPHERAL :/* We also come here if the cable is removed, since * this silicon doesn't report ID-no-longer-grounded.
@@ -858,7 +858,7 @@ static void musb_handle_intr_suspend(strmusb_g_suspend (musb); musb->is_active = musb->g.b_hnp_enable; if (musb->is_active) { - musb->xceiv->otg->state = OTG_STATE_B_WAIT_ACON; + musb_set_state(musb, OTG_STATE_B_WAIT_ACON); musb_dbg(musb, "HNP: Setting timer for b_ase0_brst"); mod_timer(&musb->otg_timer, jiffies + msecs_to_jiffies(
@@ -871,7 +871,7 @@ static void musb_handle_intr_suspend(str + msecs_to_jiffies(musb->a_wait_bcon));break ;case OTG_STATE_A_HOST : - musb->xceiv->otg->state =OTG_STATE_A_SUSPEND ; +musb_set_state (musb,OTG_STATE_A_SUSPEND ); musb->is_active = musb->hcd->self.b_hnp_enable;break ;case OTG_STATE_B_HOST :
@@ -909,7 +909,7 @@ static void musb_handle_intr_connect(str musb->port1_status |=USB_PORT_STAT_LOW_SPEED ;/* indicate new connection to OTG machine */ -switch (musb->xceiv->otg->state) { +switch (musb_get_state (musb)) {case OTG_STATE_B_PERIPHERAL :if (int_usb &MUSB_INTR_SUSPEND ) {musb_dbg (musb,"HNP: SUSPEND+CONNECT, now b_host" );
@@ -921,7 +921,7 @@ static void musb_handle_intr_connect(strcase OTG_STATE_B_WAIT_ACON :musb_dbg (musb,"HNP: CONNECT, now b_host" ); b_host: - musb->xceiv->otg->state =OTG_STATE_B_HOST ; +musb_set_state (musb,OTG_STATE_B_HOST );if (musb->hcd) musb->hcd->self.is_b_host =1 ;del_timer (&musb->otg_timer);
@@ -929,7 +929,7 @@ b_host:default :if ((devctl &MUSB_DEVCTL_VBUS ) == (3 <<MUSB_DEVCTL_VBUS_SHIFT )) { - musb->xceiv->otg->state =OTG_STATE_A_HOST ; +musb_set_state (musb,OTG_STATE_A_HOST );if (hcd) hcd->self.is_b_host =0 ; }
@@ -948,7 +948,7 @@ static void musb_handle_intr_disconnect(usb_otg_state_string (musb->xceiv->otg->state), MUSB_MODE(musb), devctl); -switch (musb->xceiv->otg->state) { +switch (musb_get_state (musb)) {case OTG_STATE_A_HOST :case OTG_STATE_A_SUSPEND :musb_host_resume_root_hub (musb);
@@ -966,7 +966,7 @@ static void musb_handle_intr_disconnect(musb_root_disconnect (musb);if (musb->hcd) musb->hcd->self.is_b_host =0 ; - musb->xceiv->otg->state =OTG_STATE_B_PERIPHERAL ; +musb_set_state (musb,OTG_STATE_B_PERIPHERAL );MUSB_DEV_MODE (musb);musb_g_disconnect (musb);break ;
@@ -1006,7 +1006,7 @@ static void musb_handle_intr_reset(struc }else {musb_dbg (musb,"BUS RESET as %s" ,usb_otg_state_string (musb->xceiv->otg->state)); -switch (musb->xceiv->otg->state) { +switch (musb_get_state (musb)) {case OTG_STATE_A_SUSPEND :musb_g_reset (musb); fallthrough;
@@ -1025,11 +1025,11 @@ static void musb_handle_intr_reset(struccase OTG_STATE_B_WAIT_ACON :musb_dbg (musb,"HNP: RESET (%s), to b_peripheral" ,usb_otg_state_string (musb->xceiv->otg->state)); - musb->xceiv->otg->state =OTG_STATE_B_PERIPHERAL ; +musb_set_state (musb,OTG_STATE_B_PERIPHERAL );musb_g_reset (musb);break ;case OTG_STATE_B_IDLE : - musb->xceiv->otg->state =OTG_STATE_B_PERIPHERAL ; +musb_set_state (musb,OTG_STATE_B_PERIPHERAL ); fallthrough;case OTG_STATE_B_PERIPHERAL :musb_g_reset (musb);
@@ -1216,8 +1216,8 @@ void musb_start(struct musb *musb)* (c) peripheral initiates, using SRP */ if (musb->port_mode !=MUSB_HOST && - musb->xceiv->otg->state !=OTG_STATE_A_WAIT_BCON && - (devctl &MUSB_DEVCTL_VBUS ) ==MUSB_DEVCTL_VBUS ) { +musb_get_state (musb) !=OTG_STATE_A_WAIT_BCON && + (devctl &MUSB_DEVCTL_VBUS ) ==MUSB_DEVCTL_VBUS ) { musb->is_active =1 ; }else { devctl |=MUSB_DEVCTL_SESSION ;
@@ -1908,7 +1908,7 @@ vbus_store(struct device *dev, struct despin_lock_irqsave (&musb->lock, flags);/* force T(a_wait_bcon) to be zero/unlimited *OR* valid */ musb->a_wait_bcon = val ?max_t (int, val,OTG_TIME_A_WAIT_BCON ) :0 ; -if (musb->xceiv->otg->state ==OTG_STATE_A_WAIT_BCON ) +if (musb_get_state (musb) ==OTG_STATE_A_WAIT_BCON ) musb->is_active =0 ;musb_platform_try_idle (musb, jiffies +msecs_to_jiffies (val));spin_unlock_irqrestore (&musb->lock, flags);
@@ -2089,8 +2089,8 @@ static void musb_irq_work(struct work_stmusb_pm_runtime_check_session (musb); -if (musb->xceiv->otg->state != musb->xceiv_old_state) { - musb->xceiv_old_state = musb->xceiv->otg->state; +if (musb_get_state (musb) != musb->xceiv_old_state) { + musb->xceiv_old_state =musb_get_state (musb);sysfs_notify (&musb->controller->kobj,NULL ,"mode" ); }
@@ -2532,7 +2532,7 @@ musb_init_controller(struct device *dev, }MUSB_DEV_MODE (musb); - musb->xceiv->otg->state =OTG_STATE_B_IDLE ; +musb_set_state (musb,OTG_STATE_B_IDLE );switch (musb->port_mode) {case MUSB_HOST :
drivers/usb/musb/musb_core.h +11 -0
@@ -592,6 +592,17 @@ static inline void musb_platform_clear_e musb->ops->clear_ep_rxintr (musb, epnum); } +static inline void musb_set_state (struct musb *musb, +enum usb_otg_state otg_state) +{ + musb->xceiv->otg->state = otg_state; +} + +static inline enum usb_otg_state musb_get_state (struct musb *musb) +{ +return musb->xceiv->otg->state; +} +/* * gets the "dr_mode" property from DT and converts it into musb_mode * if the property is not found or not recognized returns MUSB_OTG
drivers/usb/musb/musb_debugfs.c +3 -3
@@ -235,7 +235,7 @@ static int musb_softconnect_show(structu8 reg;int connect; -switch (musb->xceiv->otg->state) { +switch (musb_get_state (musb)) {case OTG_STATE_A_HOST :case OTG_STATE_A_WAIT_BCON :pm_runtime_get_sync (musb->controller);
@@ -275,7 +275,7 @@ static ssize_t musb_softconnect_write(stpm_runtime_get_sync (musb->controller);if (!strncmp (buf,"0" ,1 )) { -switch (musb->xceiv->otg->state) { +switch (musb_get_state (musb)) {case OTG_STATE_A_HOST :musb_root_disconnect (musb); reg =musb_readb (musb->mregs,MUSB_DEVCTL );
@@ -286,7 +286,7 @@ static ssize_t musb_softconnect_write(stbreak ; } }else if (!strncmp (buf,"1" ,1 )) { -switch (musb->xceiv->otg->state) { +switch (musb_get_state (musb)) {case OTG_STATE_A_WAIT_BCON :/* * musb_save_context() called in musb_runtime_suspend()
drivers/usb/musb/musb_gadget.c +14 -14
@@ -1523,7 +1523,7 @@ static int musb_gadget_wakeup(struct usbspin_lock_irqsave (&musb->lock, flags); -switch (musb->xceiv->otg->state) { +switch (musb_get_state (musb)) {case OTG_STATE_B_PERIPHERAL :/* NOTE: OTG state machine doesn't include B_SUSPENDED; * that's part of the standard usb 1.1 state machine, and
@@ -1785,7 +1785,7 @@ int musb_gadget_setup(struct musb *musb) musb->g.speed =USB_SPEED_UNKNOWN ;MUSB_DEV_MODE (musb); - musb->xceiv->otg->state =OTG_STATE_B_IDLE ; +musb_set_state (musb,OTG_STATE_B_IDLE );/* this "gadget" abstracts/virtualizes the controller */ musb->g.name = musb_driver_name;
@@ -1850,7 +1850,7 @@ static int musb_gadget_start(struct usb_ musb->is_active =1 ;otg_set_peripheral (otg, &musb->g); - musb->xceiv->otg->state =OTG_STATE_B_IDLE ; +musb_set_state (musb,OTG_STATE_B_IDLE );spin_unlock_irqrestore (&musb->lock, flags);musb_start (musb);
@@ -1895,7 +1895,7 @@ static int musb_gadget_stop(struct usb_g (void )musb_gadget_vbus_draw (&musb->g,0 ); - musb->xceiv->otg->state =OTG_STATE_UNDEFINED ; +musb_set_state (musb,OTG_STATE_UNDEFINED );musb_stop (musb);otg_set_peripheral (musb->xceiv->otg,NULL );
@@ -1926,7 +1926,7 @@ static int musb_gadget_stop(struct usb_gvoid musb_g_resume (struct musb *musb) { musb->is_suspended =0 ; -switch (musb->xceiv->otg->state) { +switch (musb_get_state (musb)) {case OTG_STATE_B_IDLE :break ;case OTG_STATE_B_WAIT_ACON :
@@ -1952,10 +1952,10 @@ void musb_g_suspend(struct musb *musb) devctl =musb_readb (musb->mregs,MUSB_DEVCTL );musb_dbg (musb,"musb_g_suspend: devctl %02x" , devctl); -switch (musb->xceiv->otg->state) { +switch (musb_get_state (musb)) {case OTG_STATE_B_IDLE :if ((devctl &MUSB_DEVCTL_VBUS ) ==MUSB_DEVCTL_VBUS ) - musb->xceiv->otg->state =OTG_STATE_B_PERIPHERAL ; +musb_set_state (musb,OTG_STATE_B_PERIPHERAL );break ;case OTG_STATE_B_PERIPHERAL : musb->is_suspended =1 ;
@@ -2001,22 +2001,22 @@ void musb_g_disconnect(struct musb *musbspin_lock (&musb->lock); } -switch (musb->xceiv->otg->state) { +switch (musb_get_state (musb)) {default :musb_dbg (musb,"Unhandled disconnect %s, setting a_idle" ,usb_otg_state_string (musb->xceiv->otg->state)); - musb->xceiv->otg->state =OTG_STATE_A_IDLE ; +musb_set_state (musb,OTG_STATE_A_IDLE );MUSB_HST_MODE (musb);break ;case OTG_STATE_A_PERIPHERAL : - musb->xceiv->otg->state =OTG_STATE_A_WAIT_BCON ; +musb_set_state (musb,OTG_STATE_A_WAIT_BCON );MUSB_HST_MODE (musb);break ;case OTG_STATE_B_WAIT_ACON :case OTG_STATE_B_HOST :case OTG_STATE_B_PERIPHERAL :case OTG_STATE_B_IDLE : - musb->xceiv->otg->state =OTG_STATE_B_IDLE ; +musb_set_state (musb,OTG_STATE_B_IDLE );break ;case OTG_STATE_B_SRP_INIT :break ;
@@ -2080,13 +2080,13 @@ __acquires(musb->lock)* In that case, do not rely on devctl for setting * peripheral mode. */ - musb->xceiv->otg->state =OTG_STATE_B_PERIPHERAL ; +musb_set_state (musb,OTG_STATE_B_PERIPHERAL ); musb->g.is_a_peripheral =0 ; }else if (devctl &MUSB_DEVCTL_BDEVICE ) { - musb->xceiv->otg->state =OTG_STATE_B_PERIPHERAL ; +musb_set_state (musb,OTG_STATE_B_PERIPHERAL ); musb->g.is_a_peripheral =0 ; }else { - musb->xceiv->otg->state =OTG_STATE_A_PERIPHERAL ; +musb_set_state (musb,OTG_STATE_A_PERIPHERAL ); musb->g.is_a_peripheral =1 ; }
drivers/usb/musb/musb_host.c +3 -3
@@ -2508,7 +2508,7 @@ static int musb_bus_suspend(struct usb_hif (!is_host_active (musb))return 0 ; -switch (musb->xceiv->otg->state) { +switch (musb_get_state (musb)) {case OTG_STATE_A_SUSPEND :return 0 ;case OTG_STATE_A_WAIT_VRISE :
@@ -2518,7 +2518,7 @@ static int musb_bus_suspend(struct usb_h*/ devctl =musb_readb (musb->mregs,MUSB_DEVCTL );if ((devctl &MUSB_DEVCTL_VBUS ) ==MUSB_DEVCTL_VBUS ) - musb->xceiv->otg->state =OTG_STATE_A_WAIT_BCON ; +musb_set_state (musb,OTG_STATE_A_WAIT_BCON );break ;default :break ;
@@ -2727,7 +2727,7 @@ int musb_host_setup(struct musb *musb, iif (musb->port_mode ==MUSB_HOST ) {MUSB_HST_MODE (musb); - musb->xceiv->otg->state =OTG_STATE_A_IDLE ; +musb_set_state (musb,OTG_STATE_A_IDLE ); }otg_set_host (musb->xceiv->otg, &hcd->self);/* don't support otg protocols */
drivers/usb/musb/musb_virthub.c +9 -9
@@ -43,7 +43,7 @@ void musb_host_finish_resume(struct work musb->port1_status |=USB_PORT_STAT_C_SUSPEND <<16 ;usb_hcd_poll_rh_status (musb->hcd);/* NOTE: it might really be A_WAIT_BCON ... */ - musb->xceiv->otg->state =OTG_STATE_A_HOST ; +musb_set_state (musb,OTG_STATE_A_HOST );spin_unlock_irqrestore (&musb->lock, flags); }
@@ -85,9 +85,9 @@ int musb_port_suspend(struct musb *musb,musb_dbg (musb,"Root port suspended, power %02x" , power); musb->port1_status |=USB_PORT_STAT_SUSPEND ; -switch (musb->xceiv->otg->state) { +switch (musb_get_state (musb)) {case OTG_STATE_A_HOST : - musb->xceiv->otg->state =OTG_STATE_A_SUSPEND ; +musb_set_state (musb,OTG_STATE_A_SUSPEND ); musb->is_active = otg->host->b_hnp_enable;if (musb->is_active) mod_timer(&musb->otg_timer, jiffies
@@ -96,7 +96,7 @@ int musb_port_suspend(struct musb *musb,musb_platform_try_idle (musb,0 );break ;case OTG_STATE_B_HOST : - musb->xceiv->otg->state =OTG_STATE_B_WAIT_ACON ; +musb_set_state (musb,OTG_STATE_B_WAIT_ACON ); musb->is_active = otg->host->b_hnp_enable;musb_platform_try_idle (musb,0 );break ;
@@ -123,7 +123,7 @@ void musb_port_reset(struct musb *musb,u8 power;void __iomem *mbase = musb->mregs; -if (musb->xceiv->otg->state ==OTG_STATE_B_IDLE ) { +if (musb_get_state (musb) ==OTG_STATE_B_IDLE ) {musb_dbg (musb,"HNP: Returning from HNP; no hub reset from b_idle" ); musb->port1_status &= ~USB_PORT_STAT_RESET ;return ;
@@ -204,20 +204,20 @@ void musb_root_disconnect(struct musb *musb_hcd_poll_rh_status (musb->hcd); musb->is_active =0 ; -switch (musb->xceiv->otg->state) { +switch (musb_get_state (musb)) {case OTG_STATE_A_SUSPEND :if (otg->host->b_hnp_enable) { - musb->xceiv->otg->state =OTG_STATE_A_PERIPHERAL ; +musb_set_state (musb,OTG_STATE_A_PERIPHERAL ); musb->g.is_a_peripheral =1 ;break ; } fallthrough;case OTG_STATE_A_HOST : - musb->xceiv->otg->state =OTG_STATE_A_WAIT_BCON ; +musb_set_state (musb,OTG_STATE_A_WAIT_BCON ); musb->is_active =0 ;break ;case OTG_STATE_A_WAIT_VFALL : - musb->xceiv->otg->state =OTG_STATE_B_IDLE ; +musb_set_state (musb,OTG_STATE_B_IDLE );break ;default : musb_dbg(musb, "host disconnect (%s)",
Greg Kroah-Hartman
maintainerPATCH 65/644 usb: musb: fix gadget state on disconnect
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Drew Hamilton <[email protected]>
commit 67a59f82196c8c4f50c83329f0577acfb1349b50 upstream.
When unplugging the USB cable or disconnecting a gadget in usb peripheral mode with echo "" > /sys/kernel/config/usb_gadget/<your_gadget>/UDC, /sys/class/udc/musb-hdrc.0/state does not change from USB_STATE_CONFIGURED.
Testing on dwc2/3 shows they both update the state to USB_STATE_NOTATTACHED.
Add calls to usb_gadget_set_state in musb_g_disconnect and musb_gadget_stop to fix both cases.
--- drivers/usb/musb/musb_gadget.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/musb/musb_gadget.c +2 -0
@@ -1909,6 +1909,7 @@ static int musb_gadget_stop(struct usb_g* gadget driver here and have everything work; * that currently misbehaves. */ +usb_gadget_set_state (g,USB_STATE_NOTATTACHED );/* Force check of devctl register for PM runtime */ schedule_delayed_work (&musb->irq_work,0 );
@@ -2017,6 +2018,7 @@ void musb_g_disconnect(struct musb *musbcase OTG_STATE_B_PERIPHERAL :case OTG_STATE_B_IDLE :musb_set_state (musb,OTG_STATE_B_IDLE ); +usb_gadget_set_state (&musb->g,USB_STATE_NOTATTACHED );break ;case OTG_STATE_B_SRP_INIT :break ;
Greg Kroah-Hartman
maintainerPATCH 66/644 usb: dwc3: qcom: Dont leave BCR asserted
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krishna Kurapati <[email protected]>
commit ef8abc0ba49ce717e6bc4124e88e59982671f3b5 upstream.
Leaving the USB BCR asserted prevents the associated GDSC to turn on. This blocks any subsequent attempts of probing the device, e.g. after a probe deferral, with the following showing in the log:
[ 1.332226] usb30_prim_gdsc status stuck at 'off'
Leave the BCR deasserted when exiting the driver to avoid this issue.
--- drivers/usb/dwc3/dwc3-qcom.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/usb/dwc3/dwc3-qcom.c +2 -5
@@ -791,13 +791,13 @@ static int dwc3_qcom_probe(struct platfo ret =reset_control_deassert (qcom->resets);if (ret) {dev_err (&pdev->dev,"failed to deassert resets, err=%d\n" , ret); - goto reset_assert; +return ret; } ret =dwc3_qcom_clk_init (qcom,of_clk_get_parent_count (np));if (ret) {dev_err (dev,"failed to get clocks\n" ); - goto reset_assert; +return ret; } res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
@@ -898,8 +898,6 @@ clk_disable:clk_disable_unprepare (qcom->clks[i]);clk_put (qcom->clks[i]); } -reset_assert: -reset_control_assert (qcom->resets);return ret; }
@@ -929,7 +927,6 @@ static int dwc3_qcom_remove(struct platf qcom->num_clocks =0 ;dwc3_qcom_interconnect_exit (qcom); -reset_control_assert (qcom->resets);pm_runtime_allow (dev);pm_runtime_disable (dev);
Greg Kroah-Hartman
maintainerPATCH 67/644 ASoC: fsl_sai: Force a software reset when starting in consumer mode
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arun Raghavan <[email protected]>
commit dc78f7e59169d3f0e6c3c95d23dc8e55e95741e2 upstream.
On an imx8mm platform with an external clock provider, when running the receiver (arecord) and triggering an xrun with xrun_injection, we see a channel swap/offset. This happens sometimes when running only the receiver, but occurs reliably if a transmitter (aplay) is also concurrently running.
It seems that the SAI loses track of frame sync during the trigger stop -> trigger start cycle that occurs during an xrun. Doing just a FIFO reset in this case does not suffice, and only a software reset seems to get it back on track.
This looks like the same h/w bug that is already handled for the producer case, so we now do the reset unconditionally on config disable.
--- sound/soc/fsl/fsl_sai.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
sound/soc/fsl/fsl_sai.c +8 -6
@@ -580,13 +580,15 @@ static void fsl_sai_config_disable(struc* anymore. Add software reset to fix this issue. * This is a hardware bug, and will be fix in the * next sai version. +* +* In consumer mode, this can happen even after a +* single open/close, especially if both tx and rx +* are running concurrently. */ -if (!sai->is_consumer_mode) { -/* Software Reset */ -regmap_write (sai->regmap,FSL_SAI_xCSR (tx, ofs),FSL_SAI_CSR_SR ); -/* Clear SR bit to finish the reset */ -regmap_write (sai->regmap,FSL_SAI_xCSR (tx, ofs),0 ); - } +/* Software Reset */ +regmap_write (sai->regmap,FSL_SAI_xCSR (tx, ofs),FSL_SAI_CSR_SR ); +/* Clear SR bit to finish the reset */ +regmap_write (sai->regmap,FSL_SAI_xCSR (tx, ofs),0 ); } static int fsl_sai_trigger(struct snd_pcm_substream *substream, int cmd,
Greg Kroah-Hartman
maintainerPATCH 68/644 mm/vmalloc: leave lazy MMU mode on PTE mapping error
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Gordeev <[email protected]>
commit fea18c686320a53fce7ad62a87a3e1d10ad02f31 upstream.
vmap_pages_pte_range() enters the lazy MMU mode, but fails to leave it in case an error is encountered.
--- mm/vmalloc.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
mm/vmalloc.c +12 -5
@@ -460,6 +460,7 @@ static int vmap_pages_pte_range(pmd_t *p unsigned long end, pgprot_t prot, struct page **pages, int *nr, pgtbl_mod_mask *mask) { + int err = 0;pte_t *pte;/*
@@ -473,15 +474,21 @@ static int vmap_pages_pte_range(pmd_t *pdo {struct page *page = pages[*nr]; -if (WARN_ON (!pte_none (*pte))) -return -EBUSY ; -if (WARN_ON (!page)) -return -ENOMEM ; +if (WARN_ON (!pte_none (*pte))) { + err = -EBUSY ; +break ; + } +if (WARN_ON (!page)) { + err = -ENOMEM ; +break ; + } +set_pte_at (&init_mm, addr, pte,mk_pte (page, prot)); (*nr)++; }while (pte++, addr +=PAGE_SIZE , addr != end); *mask |=PGTBL_PTE_MODIFIED ; -return 0 ; + +return err; } static int vmap_pages_pmd_range(pud_t *pud, unsigned long addr,
Greg Kroah-Hartman
maintainerPATCH 69/644 powercap: intel_rapl: Do not change CLAMPING bit if ENABLE bit cannot be changed
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Rui <[email protected]>
commit 964209202ebe1569c858337441e87ef0f9d71416 upstream.
PL1 cannot be disabled on some platforms. The ENABLE bit is still set after software clears it. This behavior leads to a scenario where, upon user request to disable the Power Limit through the powercap sysfs, the ENABLE bit remains set while the CLAMPING bit is inadvertently cleared.
According to the Intel Software Developer's Manual, the CLAMPING bit, "When set, allows the processor to go below the OS requested P states in order to maintain the power below specified Platform Power Limit value."
Thus this means the system may operate at higher power levels than intended on such platforms.
Enhance the code to check ENABLE bit after writing to it, and stop further processing if ENABLE bit cannot be changed.
--- drivers/powercap/intel_rapl_common.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)
drivers/powercap/intel_rapl_common.c +22 -1
@@ -212,12 +212,33 @@ static int find_nr_power_limit(struct rastatic int set_domain_enable (struct powercap_zone *power_zone,bool mode) {struct rapl_domain *rd =power_zone_to_rapl_domain (power_zone); +u64 val; +int ret;if (rd->state &DOMAIN_STATE_BIOS_LOCKED )return -EACCES ;cpus_read_lock (); -rapl_write_data_raw (rd,PL1_ENABLE , mode); + ret =rapl_write_data_raw (rd,PL1_ENABLE , mode); +if (ret) { +cpus_read_unlock (); +return ret; + } + +/* Check if the ENABLE bit was actually changed */ + ret =rapl_read_data_raw (rd,PL1_ENABLE , true, &val); +if (ret) { +cpus_read_unlock (); +return ret; + } + +if (mode != val) { +pr_debug ("%s cannot be %s\n" , power_zone->name, + mode ?"enabled" :"disabled" ); +cpus_read_unlock (); +return 0 ; + } +if (rapl_defaults->set_floor_freq) rapl_defaults->set_floor_freq (rd, mode);cpus_read_unlock ();
Greg Kroah-Hartman
maintainerPATCH 70/644 platform/x86: think-lmi: Fix kobject cleanup
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kurt Borja <[email protected]>
commit 9110056fe10b0519529bdbbac37311a5037ea0c2 upstream.
In tlmi_analyze(), allocated structs with an embedded kobject are freed in error paths after the they were already initialized.
Fix this by first by avoiding the initialization of kobjects in tlmi_analyze() and then by correctly cleaning them up in tlmi_release_attr() using their kset's kobject list.
--- drivers/platform/x86/think-lmi.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-)
drivers/platform/x86/think-lmi.c +15 -12
@@ -765,25 +765,31 @@ static struct kobj_attribute debug_cmd =/* ---- Initialisation --------------------------------------------------------- */ static void tlmi_release_attr (void ) { +struct kobject *pos, *n;int i;/* Attribute structures */ for (i =0 ; i <TLMI_SETTINGS_COUNT ; i++) {if (tlmi_priv.setting[i]) {sysfs_remove_group (&tlmi_priv.setting[i]->kobj, &tlmi_attr_group); -kobject_put (&tlmi_priv.setting[i]->kobj); } }sysfs_remove_file (&tlmi_priv.attribute_kset->kobj, &pending_reboot.attr);if (tlmi_priv.can_debug_cmd && debug_support)sysfs_remove_file (&tlmi_priv.attribute_kset->kobj, &debug_cmd.attr); + +list_for_each_entry_safe (pos, n, &tlmi_priv.attribute_kset->list, entry) +kobject_put (pos); +kset_unregister (tlmi_priv.attribute_kset);/* Authentication structures */ sysfs_remove_group (&tlmi_priv.pwd_admin->kobj, &auth_attr_group); -kobject_put (&tlmi_priv.pwd_admin->kobj);sysfs_remove_group (&tlmi_priv.pwd_power->kobj, &auth_attr_group); -kobject_put (&tlmi_priv.pwd_power->kobj); + +list_for_each_entry_safe (pos, n, &tlmi_priv.authentication_kset->list, entry) +kobject_put (pos); +kset_unregister (tlmi_priv.authentication_kset); }
@@ -851,8 +857,8 @@ static int tlmi_sysfs_init(void)/* Build attribute */ tlmi_priv.setting[i]->kobj.kset = tlmi_priv.attribute_kset; - ret =kobject_add (&tlmi_priv.setting[i]->kobj,NULL , -"%s" , tlmi_priv.setting[i]->display_name); + ret =kobject_init_and_add (&tlmi_priv.setting[i]->kobj, &tlmi_attr_setting_ktype, +NULL ,"%s" , tlmi_priv.setting[i]->display_name);if (ret) goto fail_create_attr;
@@ -872,7 +878,8 @@ static int tlmi_sysfs_init(void) }/* Create authentication entries */ tlmi_priv.pwd_admin->kobj.kset = tlmi_priv.authentication_kset; - ret =kobject_add (&tlmi_priv.pwd_admin->kobj,NULL ,"%s" ,"Admin" ); + ret =kobject_init_and_add (&tlmi_priv.pwd_admin->kobj, &tlmi_pwd_setting_ktype, +NULL ,"%s" ,"Admin" );if (ret) goto fail_create_attr;
@@ -881,7 +888,8 @@ static int tlmi_sysfs_init(void) goto fail_create_attr; tlmi_priv.pwd_power->kobj.kset = tlmi_priv.authentication_kset; - ret =kobject_add (&tlmi_priv.pwd_power->kobj,NULL ,"%s" ,"System" ); + ret =kobject_init_and_add (&tlmi_priv.pwd_power->kobj, &tlmi_pwd_setting_ktype, +NULL ,"%s" ,"Power-on" );if (ret) goto fail_create_attr;
@@ -995,7 +1003,6 @@ static int tlmi_analyze(void)if (setting->possible_values)strreplace (setting->possible_values,',' ,';' ); -kobject_init (&setting->kobj, &tlmi_attr_setting_ktype); tlmi_priv.setting[i] = setting;kfree (item); }
@@ -1021,8 +1028,6 @@ static int tlmi_analyze(void)if (pwdcfg.password_state &TLMI_PAP_PWD ) tlmi_priv.pwd_admin->valid = true; -kobject_init (&tlmi_priv.pwd_admin->kobj, &tlmi_pwd_setting_ktype); - tlmi_priv.pwd_power =kzalloc (sizeof (struct tlmi_pwd_setting ),GFP_KERNEL );if (!tlmi_priv.pwd_power) { ret = -ENOMEM ;
@@ -1038,8 +1043,6 @@ static int tlmi_analyze(void)if (pwdcfg.password_state &TLMI_POP_PWD ) tlmi_priv.pwd_power->valid = true; -kobject_init (&tlmi_priv.pwd_power->kobj, &tlmi_pwd_setting_ktype); -return 0 ; fail_free_pwd_admin:
Greg Kroah-Hartman
maintainerPATCH 71/644 bpf, sockmap: Fix panic when calling skb_linearize
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiayuan Chen <[email protected]>
commit 5ca2e29f6834c64c0e5a9ccf1278c21fb49b827e upstream.
The panic can be reproduced by executing the command:
./bench sockmap -c 2 -p 1 -a --rx-verdict-ingress --rx-strp 100000
Then a kernel panic was captured:
'''
[ 657.460555] kernel BUG at net/core/skbuff.c:2178! [ 657.462680] Tainted: [W]=WARN [ 657.463287] Workqueue: events sk_psock_backlog ... [ 657.469610] <TASK> [ 657.469738] ? die+0x36/0x90 [ 657.469916] ? do_trap+0x1d0/0x270 [ 657.470118] ? pskb_expand_head+0x612/0xf40 [ 657.470376] ? pskb_expand_head+0x612/0xf40 [ 657.470620] ? do_error_trap+0xa3/0x170 [ 657.470846] ? pskb_expand_head+0x612/0xf40 [ 657.471092] ? handle_invalid_op+0x2c/0x40 [ 657.471335] ? pskb_expand_head+0x612/0xf40 [ 657.471579] ? exc_invalid_op+0x2d/0x40 [ 657.471805] ? asm_exc_invalid_op+0x1a/0x20 [ 657.472052] ? pskb_expand_head+0xd1/0xf40 [ 657.472292] ? pskb_expand_head+0x612/0xf40 [ 657.472540] ? lock_acquire+0x18f/0x4e0 [ 657.472766] ? find_held_lock+0x2d/0x110 [ 657.472999] ? __pfx_pskb_expand_head+0x10/0x10 [ 657.473263] ? __kmalloc_cache_noprof+0x5b/0x470 [ 657.473537] ? __pfx___lock_release.isra.0+0x10/0x10 [ 657.473826] __pskb_pull_tail+0xfd/0x1d20 [ 657.474062] ? __kasan_slab_alloc+0x4e/0x90 [ 657.474707] sk_psock_skb_ingress_enqueue+0x3bf/0x510 [ 657.475392] ? __kasan_kmalloc+0xaa/0xb0 [ 657.476010] sk_psock_backlog+0x5cf/0xd70 [ 657.476637] process_one_work+0x858/0x1a20
'''
The panic originates from the assertion BUG_ON(skb_shared(skb)) in skb_linearize(). A previous commit(see Fixes tag) introduced skb_get() to avoid race conditions between skb operations in the backlog and skb release in the recvmsg path. However, this caused the panic to always occur when skb_linearize is executed.
The "--rx-strp 100000" parameter forces the RX path to use the strparser module which aggregates data until it reaches 100KB before calling sockmap logic. The 100KB payload exceeds MAX_MSG_FRAGS, triggering skb_linearize.
To fix this issue, just move skb_get into sk_psock_skb_ingress_enqueue.
'''sk_psock_backlog:
sk_psock_handle_skb
skb_get(skb) <== we move it into 'sk_psock_skb_ingress_enqueue'
sk_psock_skb_ingress____________
↓
|
| → sk_psock_skb_ingress_self
| sk_psock_skb_ingress_enqueuesk_psock_verdict_apply_________________↑ skb_linearize
'''
Note that for verdict_apply path, the skb_get operation is unnecessary so we add 'take_ref' param to control it's behavior.
--- net/core/skmsg.c | 50 +++++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 23 deletions(-)
net/core/skmsg.c +27 -23
@@ -525,26 +525,35 @@ static int sk_psock_skb_ingress_enqueue( u32 off, u32 len, struct sk_psock *psock, struct sock *sk, - struct sk_msg *msg) + struct sk_msg *msg, + bool take_ref) { int num_sge, copied; -/* skb linearize may fail with ENOMEM, but lets simply try again -* later if this happens. Under memory pressure we don't want to -* drop the skb. We need to linearize the skb so that the mapping -* in skb_to_sgvec can not error. +/* skb_to_sgvec will fail when the total number of fragments in +* frag_list and frags exceeds MAX_MSG_FRAGS. For example, the +* caller may aggregate multiple skbs. */ -if (skb_linearize (skb)) -return -EAGAIN ; num_sge =skb_to_sgvec (skb, msg->sg.data, off, len); -if (unlikely (num_sge <0 )) -return num_sge; +if (num_sge <0 ) { +/* skb linearize may fail with ENOMEM, but lets simply try again +* later if this happens. Under memory pressure we don't want to +* drop the skb. We need to linearize the skb so that the mapping +* in skb_to_sgvec can not error. +* Note that skb_linearize requires the skb not to be shared. +*/ +if (skb_linearize (skb)) +return -EAGAIN ; + num_sge =skb_to_sgvec (skb, msg->sg.data, off, len); +if (unlikely (num_sge <0 )) +return num_sge; + } copied = len; msg->sg.start =0 ; msg->sg.size = copied; msg->sg.end = num_sge; - msg->skb = skb; + msg->skb = take_ref ?skb_get (skb) : skb;sk_psock_queue_msg (psock, msg);sk_psock_data_ready (sk, psock);
@@ -552,7 +561,7 @@ static int sk_psock_skb_ingress_enqueue( }static int sk_psock_skb_ingress_self (struct sk_psock *psock,struct sk_buff *skb, -u32 off,u32 len); +u32 off,u32 len,bool take_ref);static int sk_psock_skb_ingress (struct sk_psock *psock,struct sk_buff *skb,u32 off,u32 len)
@@ -566,7 +575,7 @@ static int sk_psock_skb_ingress(struct s* correctly. */ if (unlikely (skb->sk == sk)) -return sk_psock_skb_ingress_self (psock, skb, off, len); +return sk_psock_skb_ingress_self (psock, skb, off, len, true); msg =sk_psock_create_ingress_msg (sk, skb);if (!msg)return -EAGAIN ;
@@ -578,7 +587,7 @@ static int sk_psock_skb_ingress(struct s* into user buffers. */ skb_set_owner_r (skb, sk); - err =sk_psock_skb_ingress_enqueue (skb, off, len, psock, sk, msg); + err =sk_psock_skb_ingress_enqueue (skb, off, len, psock, sk, msg, true);if (err <0 )kfree (msg);return err;
@@ -589,7 +598,7 @@ static int sk_psock_skb_ingress(struct s* because the skb is already accounted for here. */ static int sk_psock_skb_ingress_self (struct sk_psock *psock,struct sk_buff *skb, -u32 off,u32 len) +u32 off,u32 len,bool take_ref) {struct sk_msg *msg =kzalloc (sizeof (*msg), __GFP_NOWARN |GFP_ATOMIC );struct sock *sk = psock->sk;
@@ -599,7 +608,7 @@ static int sk_psock_skb_ingress_self(strreturn -EAGAIN ;sk_msg_init (msg);skb_set_owner_r (skb, sk); - err =sk_psock_skb_ingress_enqueue (skb, off, len, psock, sk, msg); + err =sk_psock_skb_ingress_enqueue (skb, off, len, psock, sk, msg, take_ref);if (err <0 )kfree (msg);return err;
@@ -608,18 +617,13 @@ static int sk_psock_skb_ingress_self(strstatic int sk_psock_handle_skb (struct sk_psock *psock,struct sk_buff *skb,u32 off,u32 len,bool ingress) { -int err =0 ; -if (!ingress) {if (!sock_writeable (psock->sk))return -EAGAIN ;return skb_send_sock (psock->sk, skb, off, len); } -skb_get (skb); - err =sk_psock_skb_ingress (psock, skb, off, len); -if (err <0 ) -kfree_skb (skb); -return err; + +return sk_psock_skb_ingress (psock, skb, off, len); } static void sk_psock_skb_state(struct sk_psock *psock,
@@ -1016,7 +1020,7 @@ static int sk_psock_verdict_apply(struct off = stm->offset; len = stm->full_len; } - err =sk_psock_skb_ingress_self (psock, skb, off, len); + err =sk_psock_skb_ingress_self (psock, skb, off, len, false); }if (err <0 ) {spin_lock_bh (&psock->ingress_lock);
Greg Kroah-Hartman
maintainerPATCH 72/644 x86: Fix get_wchan() to support the ORC unwinder
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qi Zheng <[email protected]>
commit bc9bbb81730ea667c31c5b284f95ee312bab466f upstream.
Currently, the kernel CONFIG_UNWINDER_ORC option is enabled by default on x86, but the implementation of get_wchan() is still based on the frame pointer unwinder, so the /proc/<pid>/wchan usually returned 0 regardless of whether the task <pid> is running.
Reimplement get_wchan() by calling stack_trace_save_tsk(), which is adapted to the ORC and frame pointer unwinders.
--- arch/x86/kernel/process.c | 51 ++-------------------------------------------- 1 file changed, 3 insertions(+), 48 deletions(-)
arch/x86/kernel/process.c +3 -48
@@ -971,58 +971,13 @@ unsigned long arch_randomize_brk(struct*/ unsigned long get_wchan (struct task_struct *p) { -unsigned long start, bottom, top, sp, fp, ip, ret =0 ; -int count =0 ; +unsigned long entry =0 ;if (p == current ||task_is_running (p))return 0 ; -if (!try_get_task_stack (p)) -return 0 ; - - start = (unsigned long )task_stack_page (p); -if (!start) - goto out; - -/* -* Layout of the stack page: -* -* ----------- topmax = start + THREAD_SIZE - sizeof(unsigned long) -* PADDING -* ----------- top = topmax - TOP_OF_KERNEL_STACK_PADDING -* stack -* ----------- bottom = start -* -* The tasks stack pointer points at the location where the -* framepointer is stored. The data on the stack is: -* ... IP FP ... IP FP -* -* We need to read FP and IP, so we need to adjust the upper -* bound by another unsigned long. -*/ - top = start +THREAD_SIZE -TOP_OF_KERNEL_STACK_PADDING ; - top -=2 *sizeof (unsigned long ); - bottom = start; - - sp =READ_ONCE (p->thread.sp); -if (sp < bottom || sp > top) - goto out; - - fp =READ_ONCE_NOCHECK (((struct inactive_task_frame *)sp)->bp); -do { -if (fp < bottom || fp > top) - goto out; - ip =READ_ONCE_NOCHECK (*(unsigned long *)(fp +sizeof (unsigned long ))); -if (!in_sched_functions (ip)) { - ret = ip; - goto out; - } - fp =READ_ONCE_NOCHECK (*(unsigned long *)fp); - }while (count++ <16 && !task_is_running (p)); - -out: -put_task_stack (p); -return ret; +stack_trace_save_tsk (p, &entry,1 ,0 ); +return entry; } long do_arch_prctl_common(struct task_struct *task, int option,
Greg Kroah-Hartman
maintainerPATCH 73/644 sched: Add wrapper for get_wchan() to keep task blocked
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
commit 42a20f86dc19f9282d974df0ba4d226c865ab9dd upstream.
Having a stable wchan means the process must be blocked and for it to stay that way while performing stack unwinding.
--- arch/alpha/include/asm/processor.h | 2 +- arch/alpha/kernel/process.c | 5 ++--- arch/arc/include/asm/processor.h | 2 +- arch/arc/kernel/stacktrace.c | 4 ++-- arch/arm/include/asm/processor.h | 2 +- arch/arm/kernel/process.c | 4 +--- arch/arm64/include/asm/processor.h | 2 +- arch/arm64/kernel/process.c | 4 +--- arch/csky/include/asm/processor.h | 2 +- arch/csky/kernel/stacktrace.c | 5 ++--- arch/h8300/include/asm/processor.h | 2 +- arch/h8300/kernel/process.c | 5 +---- arch/hexagon/include/asm/processor.h | 2 +- arch/hexagon/kernel/process.c | 4 +--- arch/ia64/include/asm/processor.h | 2 +- arch/ia64/kernel/process.c | 5 +---- arch/m68k/include/asm/processor.h | 2 +- arch/m68k/kernel/process.c | 4 +--- arch/microblaze/include/asm/processor.h | 2 +- arch/microblaze/kernel/process.c | 2 +- arch/mips/include/asm/processor.h | 2 +- arch/mips/kernel/process.c | 8 +++----- arch/nds32/include/asm/processor.h | 2 +- arch/nds32/kernel/process.c | 7 +------ arch/nios2/include/asm/processor.h | 2 +- arch/nios2/kernel/process.c | 5 +---- arch/openrisc/include/asm/processor.h | 2 +- arch/openrisc/kernel/process.c | 2 +- arch/parisc/include/asm/processor.h | 2 +- arch/parisc/kernel/process.c | 5 +---- arch/powerpc/include/asm/processor.h | 2 +- arch/powerpc/kernel/process.c | 9 +++------ arch/riscv/include/asm/processor.h | 2 +- arch/riscv/kernel/stacktrace.c | 12 +++++------- arch/s390/include/asm/processor.h | 2 +- arch/s390/kernel/process.c | 4 ++-- arch/sh/include/asm/processor_32.h | 2 +- arch/sh/kernel/process_32.c | 5 +---- arch/sparc/include/asm/processor_32.h | 2 +- arch/sparc/include/asm/processor_64.h | 2 +- arch/sparc/kernel/process_32.c | 5 +---- arch/sparc/kernel/process_64.c | 5 +---- arch/um/include/asm/processor-generic.h | 2 +- arch/um/kernel/process.c | 5 +---- arch/x86/include/asm/processor.h | 2 +- arch/x86/kernel/process.c | 5 +---- arch/xtensa/include/asm/processor.h | 2 +- arch/xtensa/kernel/process.c | 5 +---- include/linux/sched.h | 1 + kernel/sched/core.c | 19 +++++++++++++++++++ 50 files changed, 80 insertions(+), 112 deletions(-)
arch/alpha/include/asm/processor.h +1 -1
@@ -38,7 +38,7 @@ extern void start_thread(struct pt_regsstruct task_struct ;extern void release_thread (struct task_struct *); -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) (task_pt_regs(tsk)->pc)
arch/alpha/kernel/process.c +2 -3
@@ -376,12 +376,11 @@ thread_saved_pc(struct task_struct *t) }unsigned long -get_wchan (struct task_struct *p) +__get_wchan (struct task_struct *p) {unsigned long schedule_frame;unsigned long pc; -if (!p || p == current ||task_is_running (p)) -return 0 ; +/* * This one depends on the frame size of schedule(). Do a * "disass schedule" in gdb to find the frame size. Also, the
arch/arc/include/asm/processor.h +1 -1
@@ -70,7 +70,7 @@ struct task_struct;extern void start_thread (struct pt_regs * regs,unsigned long pc,unsigned long usp); -extern unsigned int get_wchan (struct task_struct *p); +extern unsigned int __get_wchan (struct task_struct *p);#endif /* !__ASSEMBLY__ */
arch/arc/kernel/stacktrace.c +2 -2
@@ -15,7 +15,7 @@* = specifics of data structs where trace is saved(CONFIG_STACKTRACE etc) * * vineetg: March 2009 -* -Implemented correct versions of thread_saved_pc() and get_wchan() +* -Implemented correct versions of thread_saved_pc() and __get_wchan() * * rajeshwarr: 2008 * -Initial implementation
@@ -248,7 +248,7 @@ void show_stack(struct task_struct *tsk,* Of course just returning schedule( ) would be pointless so unwind until * the function is not in schedular code */ -unsigned int get_wchan (struct task_struct *tsk) +unsigned int __get_wchan (struct task_struct *tsk) {return arc_unwind_core (tsk,NULL , __get_first_nonsched,NULL ); }
arch/arm/include/asm/processor.h +1 -1
@@ -84,7 +84,7 @@ struct task_struct;/* Free all resources held by a thread. */ extern void release_thread (struct task_struct *); -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define task_pt_regs (p) \ ((struct pt_regs *)(THREAD_START_SP + task_stack_page(p)) - 1)
arch/arm/kernel/process.c +1 -3
@@ -276,13 +276,11 @@ int copy_thread(unsigned long clone_flagreturn 0 ; } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {struct stackframe frame;unsigned long stack_page;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; frame.fp =thread_saved_fp (p); frame.sp =thread_saved_sp (p);
arch/arm64/include/asm/processor.h +1 -1
@@ -265,7 +265,7 @@ struct task_struct;/* Free all resources held by a thread. */ extern void release_thread (struct task_struct *); -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);void update_sctlr_el1 (u64 sctlr);
arch/arm64/kernel/process.c +1 -3
@@ -523,13 +523,11 @@ __notrace_funcgraph struct task_struct *return last; } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {struct stackframe frame;unsigned long stack_page, ret =0 ;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; stack_page = (unsigned long )try_get_task_stack (p);if (!stack_page)
arch/csky/include/asm/processor.h +1 -1
@@ -81,7 +81,7 @@ static inline void release_thread(structextern int kernel_thread (int (*fn)(void *),void *arg,unsigned long flags); -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) (task_pt_regs(tsk)->pc)#define KSTK_ESP (tsk) (task_pt_regs(tsk)->usp)
arch/csky/kernel/stacktrace.c +2 -3
@@ -111,12 +111,11 @@ static bool save_wchan(unsigned long pc,return false; } -unsigned long get_wchan (struct task_struct *task) +unsigned long __get_wchan (struct task_struct *task) {unsigned long pc =0 ; -if (likely (task && task != current && !task_is_running (task))) -walk_stackframe (task,NULL , save_wchan, &pc); +walk_stackframe (task,NULL , save_wchan, &pc);return pc; }
arch/h8300/include/asm/processor.h +1 -1
@@ -105,7 +105,7 @@ static inline void release_thread(struct { } -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) \ ({ \
arch/h8300/kernel/process.c +1 -4
@@ -128,15 +128,12 @@ int copy_thread(unsigned long clone_flagreturn 0 ; } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long fp, pc;unsigned long stack_page;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; - stack_page = (unsigned long )p; fp = ((struct pt_regs *)p->thread.ksp)->er6; do {
arch/hexagon/include/asm/processor.h +1 -1
@@ -64,7 +64,7 @@ struct thread_struct {extern void release_thread (struct task_struct *dead_task);/* Get wait channel for task P. */ -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);/* The following stuff is pretty HEXAGON specific. */
arch/hexagon/kernel/process.c +1 -3
@@ -130,13 +130,11 @@ void flush_thread(void)* is an identification of the point at which the scheduler * was invoked by a blocked thread. */ -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long fp, pc;unsigned long stack_page;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; stack_page = (unsigned long )task_stack_page (p); fp = ((struct hexagon_switch_stack *)p->thread.switch_sp)->fp;
arch/ia64/include/asm/processor.h +1 -1
@@ -330,7 +330,7 @@ struct task_struct;#define release_thread (dead_task)/* Get wait channel for task P. */ -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);/* Return instruction pointer of blocked task TSK. */ #define KSTK_EIP (tsk) \
arch/ia64/kernel/process.c +1 -4
@@ -523,15 +523,12 @@ exit_thread (struct task_struct *tsk) }unsigned long -get_wchan (struct task_struct *p) +__get_wchan (struct task_struct *p) {struct unw_frame_info info;unsigned long ip;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; -/* * Note: p may not be a blocked task (it could be current or * another process running on some other CPU. Rather than
arch/m68k/include/asm/processor.h +1 -1
@@ -150,7 +150,7 @@ static inline void release_thread(struct { } -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) \ ({ \
arch/m68k/kernel/process.c +1 -3
@@ -263,13 +263,11 @@ int dump_fpu (struct pt_regs *regs, stru }EXPORT_SYMBOL (dump_fpu); -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long fp, pc;unsigned long stack_page;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; stack_page = (unsigned long )task_stack_page (p); fp = ((struct switch_stack *)p->thread.ksp)->a6;
arch/microblaze/include/asm/processor.h +1 -1
@@ -68,7 +68,7 @@ static inline void release_thread(struct { } -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);/* The size allocated for kernel stacks. This _must_ be a power of two! */ # define KERNEL_STACK_SIZE 0x2000
arch/microblaze/kernel/process.c +1 -1
@@ -112,7 +112,7 @@ int copy_thread(unsigned long clone_flagreturn 0 ; } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {/* TBD (used by procfs) */ return 0 ;
arch/mips/include/asm/processor.h +1 -1
@@ -369,7 +369,7 @@ static inline void flush_thread(void) { } -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define __KSTK_TOS (tsk) ((unsigned long)task_stack_page(tsk) + \ THREAD_SIZE - 32 - sizeof(struct pt_regs))
arch/mips/kernel/process.c +3 -5
@@ -511,7 +511,7 @@ static int __init frame_info_init(void)/* * Without schedule() frame info, result given by -* thread_saved_pc() and get_wchan() are not reliable. +* thread_saved_pc() and __get_wchan() are not reliable. */ if (schedule_mfi.pc_offset <0 )printk ("Can't analyze schedule() prologue at %p\n" , schedule);
@@ -652,9 +652,9 @@ unsigned long unwind_stack(struct task_s#endif /* -* get_wchan - a maintenance nightmare^W^Wpain in the ass ... +* __get_wchan - a maintenance nightmare^W^Wpain in the ass ... */ -unsigned long get_wchan (struct task_struct *task) +unsigned long __get_wchan (struct task_struct *task) {unsigned long pc =0 ;#ifdef CONFIG_KALLSYMS
@@ -662,8 +662,6 @@ unsigned long get_wchan(struct task_struunsigned long ra =0 ;#endif -if (!task || task == current ||task_is_running (task)) - goto out;if (!task_stack_page (task)) goto out;
arch/nds32/include/asm/processor.h +1 -1
@@ -83,7 +83,7 @@ extern struct task_struct *last_task_use/* Prepare to copy thread state - unlazy all lazy status */ #define prepare_to_copy (tsk) do { } while (0) -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define cpu_relax () barrier()
arch/nds32/kernel/process.c +1 -6
@@ -233,15 +233,12 @@ int dump_fpu(struct pt_regs *regs, elf_fEXPORT_SYMBOL (dump_fpu); -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long fp, lr;unsigned long stack_start, stack_end;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; -if (IS_ENABLED (CONFIG_FRAME_POINTER )) { stack_start = (unsigned long )end_of_stack (p); stack_end = (unsigned long )task_stack_page (p) +THREAD_SIZE ;
@@ -258,5 +255,3 @@ unsigned long get_wchan(struct task_stru }return 0 ; } - -EXPORT_SYMBOL (get_wchan);
arch/nios2/include/asm/processor.h +1 -1
@@ -69,7 +69,7 @@ static inline void release_thread(struct { } -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);#define task_pt_regs (p) \ ((struct pt_regs *)(THREAD_SIZE + task_stack_page(p)) - 1)
arch/nios2/kernel/process.c +1 -4
@@ -217,15 +217,12 @@ void dump(struct pt_regs *fp)pr_emerg ("\n\n" ); } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long fp, pc;unsigned long stack_page;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; - stack_page = (unsigned long )p; fp = ((struct switch_stack *)p->thread.ksp)->fp;/* ;dgt2 */ do {
arch/openrisc/include/asm/processor.h +1 -1
@@ -73,7 +73,7 @@ struct thread_struct {void start_thread (struct pt_regs *regs,unsigned long nip,unsigned long sp);void release_thread (struct task_struct *); -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define cpu_relax () barrier()
arch/openrisc/kernel/process.c +1 -1
@@ -263,7 +263,7 @@ void dump_elf_thread(elf_greg_t *dest, s dest[35 ] =0 ; } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {/* TODO */
arch/parisc/include/asm/processor.h +1 -1
@@ -273,7 +273,7 @@ struct mm_struct;/* Free all resources held by a thread. */ extern void release_thread (struct task_struct *); -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) ((tsk)->thread.regs.iaoq[0])#define KSTK_ESP (tsk) ((tsk)->thread.regs.gr[30])
arch/parisc/kernel/process.c +1 -4
@@ -245,15 +245,12 @@ copy_thread(unsigned long clone_flags, u }unsigned long -get_wchan (struct task_struct *p) +__get_wchan (struct task_struct *p) {struct unwind_frame_info info;unsigned long ip;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; -/* * These bracket the sleeping functions.. */
arch/powerpc/include/asm/processor.h +1 -1
@@ -300,7 +300,7 @@ struct thread_struct {#define task_pt_regs (tsk) ((tsk)->thread.regs) -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) ((tsk)->thread.regs? (tsk)->thread.regs->nip: 0)#define KSTK_ESP (tsk) ((tsk)->thread.regs? (tsk)->thread.regs->gpr[1]: 0)
arch/powerpc/kernel/process.c +3 -6
@@ -2111,14 +2111,11 @@ int validate_sp(unsigned long sp, structEXPORT_SYMBOL (validate_sp); -static unsigned long __get_wchan (struct task_struct *p) +static unsigned long ___get_wchan (struct task_struct *p) {unsigned long ip, sp;int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; - sp = p->thread.ksp;if (!validate_sp (sp, p,STACK_FRAME_OVERHEAD ))return 0 ;
@@ -2137,14 +2134,14 @@ static unsigned long __get_wchan(structreturn 0 ; } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long ret;if (!try_get_task_stack (p))return 0 ; - ret =__get_wchan (p); + ret =___get_wchan (p);put_task_stack (p);
arch/riscv/include/asm/processor.h +1 -1
@@ -66,7 +66,7 @@ static inline void release_thread(struct { } -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);static inline void wait_for_interrupt (void )
arch/riscv/kernel/stacktrace.c +5 -7
@@ -148,16 +148,14 @@ static bool save_wchan(void *arg, unsignreturn true; } -unsigned long get_wchan (struct task_struct *task) +unsigned long __get_wchan (struct task_struct *task) {unsigned long pc =0 ; -if (likely (task && task != current && !task_is_running (task))) { -if (!try_get_task_stack (task)) -return 0 ; -walk_stackframe (task,NULL , save_wchan, &pc); -put_task_stack (task); - } +if (!try_get_task_stack (task)) +return 0 ; +walk_stackframe (task,NULL , save_wchan, &pc); +put_task_stack (task);return pc; }
arch/s390/include/asm/processor.h +1 -1
@@ -192,7 +192,7 @@ static inline void release_thread(structvoid guarded_storage_release (struct task_struct *tsk);void gs_load_bc_cb (struct pt_regs *regs); -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);#define task_pt_regs (tsk) ((struct pt_regs *) \ (task_stack_page(tsk) + THREAD_SIZE) - 1)#define KSTK_EIP (tsk) (task_pt_regs(tsk)->psw.addr)
arch/s390/kernel/process.c +2 -2
@@ -191,12 +191,12 @@ void execve_tail(void) asmvolatile ("sfpc %0" : :"d" (0 )); } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {struct unwind_state state;unsigned long ip =0 ; -if (!p || p == current ||task_is_running (p) || !task_stack_page (p)) +if (!task_stack_page (p))return 0 ;if (!try_get_task_stack (p))
arch/sh/include/asm/processor_32.h +1 -1
@@ -181,7 +181,7 @@ static inline void show_code(struct pt_r }#endif -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) (task_pt_regs(tsk)->pc)#define KSTK_ESP (tsk) (task_pt_regs(tsk)->regs[15])
arch/sh/kernel/process_32.c +1 -4
@@ -182,13 +182,10 @@ __switch_to(struct task_struct *prev, streturn prev; } -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long pc; -if (!p || p == current ||task_is_running (p)) -return 0 ; -/* * The same comment as on the Alpha applies here, too ... */
arch/sparc/include/asm/processor_32.h +1 -1
@@ -89,7 +89,7 @@ static inline void start_thread(struct p/* Free all resources held by a thread. */ #define release_thread (tsk) do { } while(0) -unsigned long get_wchan (struct task_struct *); +unsigned long __get_wchan (struct task_struct *);#define task_pt_regs (tsk) ((tsk)->thread.kregs)#define KSTK_EIP (tsk) ((tsk)->thread.kregs->pc)
arch/sparc/include/asm/processor_64.h +1 -1
@@ -183,7 +183,7 @@ do { \/* Free all resources held by a thread. */ #define release_thread (tsk) do { } while (0) -unsigned long get_wchan (struct task_struct *task); +unsigned long __get_wchan (struct task_struct *task);#define task_pt_regs (tsk) (task_thread_info(tsk)->kregs)#define KSTK_EIP (tsk) (task_pt_regs(tsk)->tpc)
arch/sparc/kernel/process_32.c +1 -4
@@ -365,7 +365,7 @@ int copy_thread(unsigned long clone_flagreturn 0 ; } -unsigned long get_wchan (struct task_struct *task) +unsigned long __get_wchan (struct task_struct *task) {unsigned long pc, fp, bias =0 ;unsigned long task_base = (unsigned long ) task;
@@ -373,9 +373,6 @@ unsigned long get_wchan(struct task_strustruct reg_window32 *rw;int count =0 ; -if (!task || task == current ||task_is_running (task)) - goto out; - fp =task_thread_info (task)->ksp + bias; do { /* Bogus frame pointer? */
arch/sparc/kernel/process_64.c +1 -4
@@ -663,7 +663,7 @@ int arch_dup_task_struct(struct task_strreturn 0 ; } -unsigned long get_wchan (struct task_struct *task) +unsigned long __get_wchan (struct task_struct *task) {unsigned long pc, fp, bias =0 ;struct thread_info *tp;
@@ -671,9 +671,6 @@ unsigned long get_wchan(struct task_struunsigned long ret =0 ;int count =0 ; -if (!task || task == current ||task_is_running (task)) - goto out; - tp =task_thread_info (task); bias =STACK_BIAS ; fp =task_thread_info (task)->ksp + bias;
arch/um/include/asm/processor-generic.h +1 -1
@@ -106,6 +106,6 @@ extern struct cpuinfo_um boot_cpu_data;#define cache_line_size () (boot_cpu_data.cache_alignment)#define KSTK_REG (tsk, reg) get_thread_reg(reg, &tsk->thread.switch_buf) -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);#endif
arch/um/kernel/process.c +1 -4
@@ -364,14 +364,11 @@ unsigned long arch_align_stack(unsigned }#endif -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long stack_page, sp, ip;bool seen_sched =0 ; -if ((p ==NULL ) || (p == current) ||task_is_running (p)) -return 0 ; - stack_page = (unsigned long )task_stack_page (p);/* Bail if the process has no kernel stack for some reason */ if (stack_page ==0 )
arch/x86/include/asm/processor.h +1 -1
@@ -591,7 +591,7 @@ static inline void load_sp0(unsigned lon/* Free all resources held by a thread. */ extern void release_thread (struct task_struct *); -unsigned long get_wchan (struct task_struct *p); +unsigned long __get_wchan (struct task_struct *p);/* * Generic CPUID function
arch/x86/kernel/process.c +1 -4
@@ -969,13 +969,10 @@ unsigned long arch_randomize_brk(struct* because the task might wake up and we might look at a stack * changing under us. */ -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long entry =0 ; -if (p == current ||task_is_running (p)) -return 0 ; -stack_trace_save_tsk (p, &entry,1 ,0 );return entry; }
arch/xtensa/include/asm/processor.h +1 -1
@@ -215,7 +215,7 @@ struct mm_struct;/* Free all resources held by a thread. */ #define release_thread (thread) do { } while(0) -extern unsigned long get_wchan (struct task_struct *p); +extern unsigned long __get_wchan (struct task_struct *p);#define KSTK_EIP (tsk) (task_pt_regs(tsk)->pc)#define KSTK_ESP (tsk) (task_pt_regs(tsk)->areg[1])
arch/xtensa/kernel/process.c +1 -4
@@ -298,15 +298,12 @@ int copy_thread(unsigned long clone_flag* These bracket the sleeping functions.. */ -unsigned long get_wchan (struct task_struct *p) +unsigned long __get_wchan (struct task_struct *p) {unsigned long sp, pc;unsigned long stack_page = (unsigned long )task_stack_page (p);int count =0 ; -if (!p || p == current ||task_is_running (p)) -return 0 ; - sp = p->thread.sp; pc =MAKE_PC_FROM_RA (p->thread.ra, p->thread.sp);
include/linux/sched.h +1 -0
@@ -2141,6 +2141,7 @@ static inline void set_task_cpu(struct t#endif /* CONFIG_SMP */ extern bool sched_task_on_rq (struct task_struct *p); +extern unsigned long get_wchan (struct task_struct *p);/* * In order to reduce various lock holder preemption latencies provide an
kernel/sched/core.c +19 -0
@@ -1963,6 +1963,25 @@ bool sched_task_on_rq(struct task_structreturn task_on_rq_queued (p); } +unsigned long get_wchan (struct task_struct *p) +{ +unsigned long ip =0 ; +unsigned int state; + +if (!p || p == current) +return 0 ; + +/* Only get wchan if task is blocked and we can keep it that way. */ +raw_spin_lock_irq (&p->pi_lock); + state =READ_ONCE (p->__state); +smp_rmb ();/* see try_to_wake_up() */ +if (state !=TASK_RUNNING && state !=TASK_WAKING && !p->on_rq) + ip =__get_wchan (p); +raw_spin_unlock_irq (&p->pi_lock); + +return ip; +} +static inline void enqueue_task (struct rq *rq,struct task_struct *p,int flags) {if (!(flags &ENQUEUE_NOCLOCK ))
Greg Kroah-Hartman
maintainerPATCH 74/644 x86: Fix __get_wchan() for !STACKTRACE
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra <[email protected]>
commit 5d1ceb3969b6b2e47e2df6d17790a7c5a20fcbb4 upstream.
Use asm/unwind.h to implement wchan, since we cannot always rely on STACKTRACE=y.
--- arch/x86/kernel/process.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
arch/x86/kernel/process.c +14 -3
@@ -43,6 +43,7 @@#include <asm/io_bitmap.h> #include <asm/proto.h> #include <asm/frame.h> +#include <asm/unwind.h> #include "process.h"
@@ -971,10 +972,20 @@ unsigned long arch_randomize_brk(struct*/ unsigned long __get_wchan (struct task_struct *p) { -unsigned long entry =0 ; +struct unwind_state state; +unsigned long addr =0 ; -stack_trace_save_tsk (p, &entry,1 ,0 ); -return entry; +for (unwind_start (&state, p,NULL ,NULL ); !unwind_done (&state); +unwind_next_frame (&state)) { + addr =unwind_get_return_address (&state); +if (!addr) +break ; +if (in_sched_functions (addr)) +continue ; +break ; + } + +return addr; } long do_arch_prctl_common(struct task_struct *task, int option,
Greg Kroah-Hartman
maintainerPATCH 75/644 x86: Pin task-stack in __get_wchan()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra <[email protected]>
commit 0dc636b3b757a6b747a156de613275f9d74a4a66 upstream.
When commit 5d1ceb3969b6 ("x86: Fix __get_wchan() for !STACKTRACE") moved from stacktrace to native unwind_*() usage, the try_get_task_stack() got lost, leading to use-after-free issues for dying tasks.
--- arch/x86/kernel/process.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/x86/kernel/process.c +5 -0
@@ -975,6 +975,9 @@ unsigned long __get_wchan(struct task_ststruct unwind_state state;unsigned long addr =0 ; +if (!try_get_task_stack (p)) +return 0 ; +for (unwind_start (&state, p,NULL ,NULL ); !unwind_done (&state);unwind_next_frame (&state)) { addr =unwind_get_return_address (&state);
@@ -985,6 +988,8 @@ unsigned long __get_wchan(struct task_stbreak ; } +put_task_stack (p); +return addr; }
Greg Kroah-Hartman
maintainerPATCH 76/644 Input: gpio-keys - fix a sleep while atomic with PREEMPT_RT
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fabrice Gasnier <[email protected]>
commit f4a8f561d08e39f7833d4a278ebfb12a41eef15f upstream.
When enabling PREEMPT_RT, the gpio_keys_irq_timer() callback runs in hard irq context, but the input_event() takes a spin_lock, which isn't allowed there as it is converted to a rt_spin_lock().
[ 4054.289999] BUG: sleeping function called from invalid context at kernel/locking/spinlock_rt.c:48 [ 4054.290028] in_atomic(): 1, irqs_disabled(): 1, non_block: 0, pid: 0, name: swapper/0 ... [ 4054.290195] __might_resched+0x13c/0x1f4 [ 4054.290209] rt_spin_lock+0x54/0x11c [ 4054.290219] input_event+0x48/0x80 [ 4054.290230] gpio_keys_irq_timer+0x4c/0x78 [ 4054.290243] __hrtimer_run_queues+0x1a4/0x438 [ 4054.290257] hrtimer_interrupt+0xe4/0x240 [ 4054.290269] arch_timer_handler_phys+0x2c/0x44 [ 4054.290283] handle_percpu_devid_irq+0x8c/0x14c [ 4054.290297] handle_irq_desc+0x40/0x58 [ 4054.290307] generic_handle_domain_irq+0x1c/0x28 [ 4054.290316] gic_handle_irq+0x44/0xcc
Considering the gpio_keys_irq_isr() can run in any context, e.g. it can be threaded, it seems there's no point in requesting the timer isr to run in hard irq context.
Relax the hrtimer not to use the hard context.
--- drivers/input/keyboard/gpio_keys.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/input/keyboard/gpio_keys.c +2 -2
@@ -493,7 +493,7 @@ static irqreturn_t gpio_keys_irq_isr(intif (bdata->release_delay)hrtimer_start (&bdata->release_timer,ms_to_ktime (bdata->release_delay), -HRTIMER_MODE_REL_HARD ); +HRTIMER_MODE_REL ); out:spin_unlock_irqrestore (&bdata->lock, flags);return IRQ_HANDLED ;
@@ -633,7 +633,7 @@ static int gpio_keys_setup_key(struct pl bdata->release_delay = button->debounce_interval;hrtimer_init (&bdata->release_timer, -CLOCK_REALTIME ,HRTIMER_MODE_REL_HARD ); +CLOCK_REALTIME ,HRTIMER_MODE_REL ); bdata->release_timer.function = gpio_keys_irq_timer; isr = gpio_keys_irq_isr;
Greg Kroah-Hartman
maintainerPATCH 77/644 regulator: core: fix NULL dereference on unbind due to stale coupling data
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alessandro Carminati <[email protected]>
[ Upstream commit ca46946a482238b0cdea459fb82fc837fb36260e ]
Failing to reset coupling_desc.n_coupled after freeing coupled_rdevs can lead to NULL pointer dereference when regulators are accessed post-unbind.
This can happen during runtime PM or other regulator operations that rely on coupling metadata.
For example, on ridesx4, unbinding the 'reg-dummy' platform device triggers a panic in regulator_lock_recursive() due to stale coupling state.
Ensure n_coupled is set to 0 to prevent access to invalid pointers.
--- drivers/regulator/core.c | 1 + 1 file changed, 1 insertion(+)
drivers/regulator/core.c +1 -0
@@ -5359,6 +5359,7 @@ static void regulator_remove_coupling(struct regulator_dev *rdev) ERR_PTR(err)); } + rdev->coupling_desc.n_coupled =0 ;kfree (rdev->coupling_desc.coupled_rdevs); rdev->coupling_desc.coupled_rdevs =NULL ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 78/644 RDMA/core: Rate limit GID cache warning messages
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maor Gottlieb <[email protected]>
[ Upstream commit 333e4d79316c9ed5877d7aac8b8ed22efc74e96d ]
The GID cache warning messages can flood the kernel log when there are multiple failed attempts to add GIDs. This can happen when creating many virtual interfaces without having enough space for their GIDs in the GID table.
Change pr_warn to pr_warn_ratelimited to prevent log flooding while still maintaining visibility of the issue.
--- drivers/infiniband/core/cache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/core/cache.c +2 -2
@@ -582,8 +582,8 @@ static int __ib_cache_gid_add(struct ib_device *ib_dev, u32 port, out_unlock:mutex_unlock (&table->lock);if (ret) -pr_warn ("%s: unable to add gid %pI6 error=%d\n" , - __func__, gid->raw, ret); +pr_warn_ratelimited ("%s: unable to add gid %pI6 error=%d\n" , + __func__, gid->raw, ret);return ret; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 79/644 interconnect: qcom: sc7280: Add missing num_links to xm_pcie3_1 node
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xilin Wu <[email protected]>
[ Upstream commit 886a94f008dd1a1702ee66dd035c266f70fd9e90 ]
This allows adding interconnect paths for PCIe 1 in device tree later.
--- drivers/interconnect/qcom/sc7280.c | 1 + 1 file changed, 1 insertion(+)
drivers/interconnect/qcom/sc7280.c +1 -0
@@ -164,6 +164,7 @@ static struct qcom_icc_node xm_pcie3_1 = { .id = SC7280_MASTER_PCIE_1, .channels = 1, .buswidth = 8, + .num_links = 1, .links = { SC7280_SLAVE_ANOC_PCIE_GEM_NOC }, };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 80/644 regmap: fix potential memory leak of regmap_bus
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Abdun Nihaal <[email protected]>
[ Upstream commit c871c199accb39d0f4cb941ad0dccabfc21e9214 ]
When __regmap_init() is called from __regmap_init_i2c() and __regmap_init_spi() (and their devm versions), the bus argument obtained from regmap_get_i2c_bus() and regmap_get_spi_bus(), may be allocated using kmemdup() to support quirks. In those cases, the bus->free_on_exit field is set to true.
However, inside __regmap_init(), buf is not freed on any error path. This could lead to a memory leak of regmap_bus when __regmap_init() fails. Fix that by freeing bus on error path when free_on_exit is set.
--- drivers/base/regmap/regmap.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/base/regmap/regmap.c +2 -0
@@ -1264,6 +1264,8 @@ struct regmap *__regmap_init(struct device *dev, err_map:kfree (map); err: +if (bus && bus->free_on_exit) +kfree (bus);return ERR_PTR (ret); }EXPORT_SYMBOL_GPL (__regmap_init);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 81/644 i40e: Add rx_missed_errors for buffer exhaustion
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yajun Deng <[email protected]>
[ Upstream commit 5337d294973331660e84e41836a54014de22e5b0 ]
As the comment in struct rtnl_link_stats64, rx_dropped should not include packets dropped by the device due to buffer exhaustion. They are counted in rx_missed_errors, procfs folds those two counters together.
Add rx_missed_errors for buffer exhaustion, rx_missed_errors corresponds to rx_discards, rx_dropped corresponds to rx_discards_other.
Stable-dep-of: 50b2af451597 ("i40e: report VF tx_dropped with tx_errors instead of tx_discards")
--- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 3 ++- drivers/net/ethernet/intel/i40e/i40e_main.c | 18 +++++++----------- .../net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 2 +- 3 files changed, 10 insertions(+), 13 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +2 -1
@@ -247,6 +247,7 @@ static const struct i40e_stats i40e_gstrings_net_stats[] = {I40E_NETDEV_STAT (rx_errors),I40E_NETDEV_STAT (tx_errors),I40E_NETDEV_STAT (rx_dropped), +I40E_NETDEV_STAT (rx_missed_errors),I40E_NETDEV_STAT (tx_dropped),I40E_NETDEV_STAT (collisions), I40E_NETDEV_STAT(rx_length_errors),
@@ -317,7 +318,7 @@ static const struct i40e_stats i40e_gstrings_stats[] = {I40E_PF_STAT ("port.rx_broadcast" , stats.eth.rx_broadcast),I40E_PF_STAT ("port.tx_broadcast" , stats.eth.tx_broadcast),I40E_PF_STAT ("port.tx_errors" , stats.eth.tx_errors), -I40E_PF_STAT ("port.rx_dropped" , stats.eth.rx_discards), +I40E_PF_STAT ("port.rx_discards" , stats.eth.rx_discards),I40E_PF_STAT ("port.tx_dropped_link_down" , stats.tx_dropped_link_down),I40E_PF_STAT ("port.rx_crc_errors" , stats.crc_errors), I40E_PF_STAT("port.illegal_bytes", stats.illegal_bytes),
drivers/net/ethernet/intel/i40e/i40e_main.c +7 -11
@@ -493,6 +493,7 @@ static void i40e_get_netdev_stats_struct(struct net_device *netdev, stats->tx_dropped = vsi_stats->tx_dropped; stats->rx_errors = vsi_stats->rx_errors; stats->rx_dropped = vsi_stats->rx_dropped; + stats->rx_missed_errors = vsi_stats->rx_missed_errors; stats->rx_crc_errors = vsi_stats->rx_crc_errors; stats->rx_length_errors = vsi_stats->rx_length_errors; }
@@ -684,17 +685,13 @@ i40e_stats_update_rx_discards(struct i40e_vsi *vsi, struct i40e_hw *hw,struct i40e_eth_stats *stat_offset, struct i40e_eth_stats *stat) { - u64 rx_rdpc, rx_rxerr; -i40e_stat_update32 (hw ,I40E_GLV_RDPC (stat_idx ),offset_loaded , - &stat_offset->rx_discards, &rx_rdpc); + &stat_offset->rx_discards, &stat->rx_discards);i40e_stat_update64 (hw,I40E_GL_RXERR1H (i40e_compute_pci_to_hw_id (vsi, hw)),I40E_GL_RXERR1L (i40e_compute_pci_to_hw_id (vsi, hw)), offset_loaded, &stat_offset->rx_discards_other, - &rx_rxerr); - - stat->rx_discards = rx_rdpc + rx_rxerr; + &stat->rx_discards_other); }/**
@@ -716,9 +713,6 @@ void i40e_update_eth_stats(struct i40e_vsi *vsi)i40e_stat_update32 (hw,I40E_GLV_TEPC (stat_idx), vsi->stat_offsets_loaded, &oes->tx_errors, &es->tx_errors); -i40e_stat_update32 (hw,I40E_GLV_RDPC (stat_idx), - vsi->stat_offsets_loaded, - &oes->rx_discards, &es->rx_discards);i40e_stat_update32 (hw,I40E_GLV_RUPP (stat_idx), vsi->stat_offsets_loaded, &oes->rx_unknown_protocol, &es->rx_unknown_protocol);
@@ -959,8 +953,10 @@ static void i40e_update_vsi_stats(struct i40e_vsi *vsi) ns->tx_errors = es->tx_errors; ons->multicast = oes->rx_multicast; ns->multicast = es->rx_multicast; - ons->rx_dropped = oes->rx_discards; - ns->rx_dropped = es->rx_discards; + ons->rx_dropped = oes->rx_discards_other; + ns->rx_dropped = es->rx_discards_other; + ons->rx_missed_errors = oes->rx_discards; + ns->rx_missed_errors = es->rx_discards; ons->tx_dropped = oes->tx_discards; ns->tx_dropped = es->tx_discards;
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +1 -1
@@ -4879,7 +4879,7 @@ int i40e_get_vf_stats(struct net_device *netdev, int vf_id, vf_stats->tx_bytes = stats->tx_bytes; vf_stats->broadcast = stats->rx_broadcast; vf_stats->multicast = stats->rx_multicast; - vf_stats->rx_dropped = stats->rx_discards; + vf_stats->rx_dropped = stats->rx_discards + stats->rx_discards_other; vf_stats->tx_dropped = stats->tx_discards;return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 82/644 i40e: report VF tx_dropped with tx_errors instead of tx_discards
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dennis Chen <[email protected]>
[ Upstream commit 50b2af451597ca6eefe9d4543f8bbf8de8aa00e7 ]
Currently the tx_dropped field in VF stats is not updated correctly when reading stats from the PF. This is because it reads from i40e_eth_stats.tx_discards which seems to be unused for per VSI stats, as it is not updated by i40e_update_eth_stats() and the corresponding register, GLV_TDPC, is not implemented[1].
Use i40e_eth_stats.tx_errors instead, which is actually updated by i40e_update_eth_stats() by reading from GLV_TEPC.
To test, create a VF and try to send bad packets through it:
$ echo 1 > /sys/class/net/enp2s0f0/device/sriov_numvfs $ cat test.py from scapy.all import *
vlan_pkt = Ether(dst="ff:ff:ff:ff:ff:ff") / Dot1Q(vlan=999) / IP(dst="192.168.0.1") / ICMP() ttl_pkt = IP(dst="8.8.8.8", ttl=0) / ICMP()
print("Send packet with bad VLAN tag")sendp(vlan_pkt, iface="enp2s0f0v0")print("Send packet with TTL=0")sendp(ttl_pkt, iface="enp2s0f0v0")
$ ip -s link show dev enp2s0f0
16: enp2s0f0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP mode DEFAULT group default qlen 1000
link/ether 3c:ec:ef:b7:e0:ac brd ff:ff:ff:ff:ff:ff
RX: bytes packets errors dropped missed mcast
0 0 0 0 0 0
TX: bytes packets errors dropped carrier collsns
0 0 0 0 0 0
vf 0 link/ether e2:c6:fd:c1:1e:92 brd ff:ff:ff:ff:ff:ff, spoof checking on, link-state auto, trust off
RX: bytes packets mcast bcast dropped
0 0 0 0 0
TX: bytes packets dropped
0 0 0
$ python test.py
Send packet with bad VLAN tag
.
Sent 1 packets.
Send packet with TTL=0
.
Sent 1 packets.
$ ip -s link show dev enp2s0f0
16: enp2s0f0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP mode DEFAULT group default qlen 1000
link/ether 3c:ec:ef:b7:e0:ac brd ff:ff:ff:ff:ff:ff
RX: bytes packets errors dropped missed mcast
0 0 0 0 0 0
TX: bytes packets errors dropped carrier collsns
0 0 0 0 0 0
vf 0 link/ether e2:c6:fd:c1:1e:92 brd ff:ff:ff:ff:ff:ff, spoof checking on, link-state auto, trust off
RX: bytes packets mcast bcast dropped
0 0 0 0 0
TX: bytes packets dropped
0 0 0A packet with non-existent VLAN tag and a packet with TTL = 0 are sent, but tx_dropped is not incremented.
After patch:
$ ip -s link show dev enp2s0f0
19: enp2s0f0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP mode DEFAULT group default qlen 1000
link/ether 3c:ec:ef:b7:e0:ac brd ff:ff:ff:ff:ff:ff
RX: bytes packets errors dropped missed mcast
0 0 0 0 0 0
TX: bytes packets errors dropped carrier collsns
0 0 0 0 0 0
vf 0 link/ether 4a:b7:3d:37:f7:56 brd ff:ff:ff:ff:ff:ff, spoof checking on, link-state auto, trust off
RX: bytes packets mcast bcast dropped
0 0 0 0 0
TX: bytes packets dropped
0 0 2--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +1 -1
@@ -4880,7 +4880,7 @@ int i40e_get_vf_stats(struct net_device *netdev, int vf_id, vf_stats->broadcast = stats->rx_broadcast; vf_stats->multicast = stats->rx_multicast; vf_stats->rx_dropped = stats->rx_discards + stats->rx_discards_other; - vf_stats->tx_dropped = stats->tx_discards; + vf_stats->tx_dropped = stats->tx_errors;return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 83/644 net: appletalk: Fix use-after-free in AARP proxy probe
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kito Xu (veritas501) <[email protected]>
[ Upstream commit 6c4a92d07b0850342d3becf2e608f805e972467c ]
The AARP proxy‐probe routine (aarp_proxy_probe_network) sends a probe, releases the aarp_lock, sleeps, then re-acquires the lock. During that window an expire timer thread (__aarp_expire_timer) can remove and kfree() the same entry, leading to a use-after-free.
race condition:
cpu 0 | cpu 1
atalk_sendmsg() | atif_proxy_probe_device()
aarp_send_ddp() | aarp_proxy_probe_network()
mod_timer() | lock(aarp_lock) // LOCK!!
timeout around 200ms | alloc(aarp_entry)
and then call | proxies[hash] = aarp_entry
aarp_expire_timeout() | aarp_send_probe()
| unlock(aarp_lock) // UNLOCK!!
lock(aarp_lock) // LOCK!! | msleep(100);
__aarp_expire_timer(&proxies[ct]) |
free(aarp_entry) |
unlock(aarp_lock) // UNLOCK!! |
| lock(aarp_lock) // LOCK!!
| UAF aarp_entry !!==================================================================
BUG: KASAN: slab-use-after-free in aarp_proxy_probe_network+0x560/0x630 net/appletalk/aarp.c:493 Read of size 4 at addr ffff8880123aa360 by task repro/13278 CPU: 3 UID: 0 PID: 13278 Comm: repro Not tainted 6.15.2 #3 PREEMPT(full) Call Trace: <TASK> __dump_stack lib/dump_stack.c:94 [inline] dump_stack_lvl+0x116/0x1b0 lib/dump_stack.c:120 print_address_description mm/kasan/report.c:408 [inline] print_report+0xc1/0x630 mm/kasan/report.c:521 kasan_report+0xca/0x100 mm/kasan/report.c:634 aarp_proxy_probe_network+0x560/0x630 net/appletalk/aarp.c:493 atif_proxy_probe_device net/appletalk/ddp.c:332 [inline] atif_ioctl+0xb58/0x16c0 net/appletalk/ddp.c:857 atalk_ioctl+0x198/0x2f0 net/appletalk/ddp.c:1818 sock_do_ioctl+0xdc/0x260 net/socket.c:1190 sock_ioctl+0x239/0x6a0 net/socket.c:1311 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:906 [inline] __se_sys_ioctl fs/ioctl.c:892 [inline] __x64_sys_ioctl+0x194/0x200 fs/ioctl.c:892 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0xcb/0x250 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x77/0x7f </TASK>
Allocated:
aarp_alloc net/appletalk/aarp.c:382 [inline] aarp_proxy_probe_network+0xd8/0x630 net/appletalk/aarp.c:468 atif_proxy_probe_device net/appletalk/ddp.c:332 [inline] atif_ioctl+0xb58/0x16c0 net/appletalk/ddp.c:857 atalk_ioctl+0x198/0x2f0 net/appletalk/ddp.c:1818
Freed:
kfree+0x148/0x4d0 mm/slub.c:4841 __aarp_expire net/appletalk/aarp.c:90 [inline] __aarp_expire_timer net/appletalk/aarp.c:261 [inline] aarp_expire_timeout+0x480/0x6e0 net/appletalk/aarp.c:317 The buggy address belongs to the object at ffff8880123aa300 which belongs to the cache kmalloc-192 of size 192
The buggy address is located 96 bytes inside of
freed 192-byte region [ffff8880123aa300, ffff8880123aa3c0)
Memory state around the buggy address:
ffff8880123aa200: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
ffff8880123aa280: 00 00 00 00 fc fc fc fc fc fc fc fc fc fc fc fc
>ffff8880123aa300: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
^
ffff8880123aa380: fb fb fb fb fb fb fb fb fc fc fc fc fc fc fc fc
ffff8880123aa400: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
==================================================================--- net/appletalk/aarp.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)
net/appletalk/aarp.c +21 -3
@@ -35,6 +35,7 @@#include <linux/seq_file.h> #include <linux/export.h> #include <linux/etherdevice.h> +#include <linux/refcount.h> int sysctl_aarp_expiry_time =AARP_EXPIRY_TIME ;int sysctl_aarp_tick_time =AARP_TICK_TIME ;
@@ -44,6 +45,7 @@ int sysctl_aarp_resolve_time = AARP_RESOLVE_TIME;/* Lists of aarp entries */ /** * struct aarp_entry - AARP entry +* @refcnt: Reference count * @last_sent: Last time we xmitted the aarp request * @packet_queue: Queue of frames wait for resolution * @status: Used for proxy AARP
@@ -55,6 +57,7 @@ int sysctl_aarp_resolve_time = AARP_RESOLVE_TIME;* @next: Next entry in chain */ struct aarp_entry { +refcount_t refcnt;/* These first two are only used for unresolved entries */ unsigned long last_sent;struct sk_buff_head packet_queue;
@@ -79,6 +82,17 @@ static DEFINE_RWLOCK(aarp_lock);/* Used to walk the list and purge/kick entries. */ static struct timer_list aarp_timer; +static inline void aarp_entry_get (struct aarp_entry *a) +{ +refcount_inc (&a->refcnt); +} + +static inline void aarp_entry_put (struct aarp_entry *a) +{ +if (refcount_dec_and_test (&a->refcnt)) +kfree (a); +} +/* * Delete an aarp queue *
@@ -87,7 +101,7 @@ static struct timer_list aarp_timer;static void __aarp_expire (struct aarp_entry *a) {skb_queue_purge (&a->packet_queue); -kfree (a); +aarp_entry_put (a); }/*
@@ -380,9 +394,11 @@ static void aarp_purge(void)static struct aarp_entry *aarp_alloc (void ) {struct aarp_entry *a =kmalloc (sizeof (*a),GFP_ATOMIC ); +if (!a) +return NULL ; -if (a) -skb_queue_head_init (&a->packet_queue); +refcount_set (&a->refcnt,1 ); +skb_queue_head_init (&a->packet_queue);return a; }
@@ -508,6 +524,7 @@ int aarp_proxy_probe_network(struct atalk_iface *atif, struct atalk_addr *sa) entry->dev = atif->dev;write_lock_bh (&aarp_lock); +aarp_entry_get (entry); hash = sa->s_node % (AARP_HASH_SIZE -1 ); entry->next = proxies[hash];
@@ -533,6 +550,7 @@ int aarp_proxy_probe_network(struct atalk_iface *atif, struct atalk_addr *sa) retval =1 ; } +aarp_entry_put (entry);write_unlock_bh (&aarp_lock); out:return retval;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 84/644 net/sched: sch_qfq: Avoid triggering might_sleep in atomic context in qfq_delete_class
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiang Mei <[email protected]>
[ Upstream commit cf074eca0065bc5142e6004ae236bb35a2687fdf ]
might_sleep could be trigger in the atomic context in qfq_delete_class.
qfq_destroy_class was moved into atomic context locked
by sch_tree_lock to avoid a race condition bug on qfq_aggregate. However, might_sleep could be triggered by qfq_destroy_class, which introduced sleeping in atomic context (path:qfq_destroy_class->qdisc_put->__qdisc_destroy->lockdep_unregister_key ->might_sleep).
Considering the race is on the qfq_aggregate objects, keeping qfq_rm_from_agg in the lock but moving the left part out can solve this issue.
--- net/sched/sch_qfq.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
net/sched/sch_qfq.c +3 -4
@@ -538,9 +538,6 @@ static int qfq_change_class(struct Qdisc *sch, u32 classid, u32 parentid,static void qfq_destroy_class (struct Qdisc *sch,struct qfq_class *cl) { -struct qfq_sched *q =qdisc_priv (sch); - -qfq_rm_from_agg (q, cl);gen_kill_estimator (&cl->rate_est);qdisc_put (cl->qdisc);kfree (cl);
@@ -559,10 +556,11 @@ static int qfq_delete_class(struct Qdisc *sch, unsigned long arg,qdisc_purge_queue (cl->qdisc);qdisc_class_hash_remove (&q->clhash, &cl->common); -qfq_destroy_class (sch, cl); +qfq_rm_from_agg (q, cl);sch_tree_unlock (sch); +qfq_destroy_class (sch, cl);return 0 ; }
@@ -1510,6 +1508,7 @@ static void qfq_destroy_qdisc(struct Qdisc *sch)for (i =0 ; i < q->clhash.hashsize; i++) {hlist_for_each_entry_safe (cl, next, &q->clhash.hash[i], common.hnode) { +qfq_rm_from_agg (q, cl);qfq_destroy_class (sch, cl); } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 85/644 net: hns3: fix concurrent setting vlan filter issue
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jian Shen <[email protected]>
[ Upstream commit 4555f8f8b6aa46940f55feb6a07704c2935b6d6e ]
The vport->req_vlan_fltr_en may be changed concurrently by function hclge_sync_vlan_fltr_state() called in periodic work task and function hclge_enable_vport_vlan_filter() called by user configuration. It may cause the user configuration inoperative. Fixes it by protect the vport->req_vlan_fltr by vport_lock.
--- .../hisilicon/hns3/hns3pf/hclge_main.c | 36 +++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +21 -15
@@ -9709,33 +9709,36 @@ static bool hclge_need_enable_vport_vlan_filter(struct hclge_vport *vport)return false; } -int hclge_enable_vport_vlan_filter (struct hclge_vport *vport,bool request_en) +static int __hclge_enable_vport_vlan_filter (struct hclge_vport *vport, +bool request_en) { -struct hclge_dev *hdev = vport->back;bool need_en;int ret; -mutex_lock (&hdev->vport_lock); - - vport->req_vlan_fltr_en = request_en; - need_en =hclge_need_enable_vport_vlan_filter (vport); -if (need_en == vport->cur_vlan_fltr_en) { -mutex_unlock (&hdev->vport_lock); +if (need_en == vport->cur_vlan_fltr_en)return 0 ; - } ret =hclge_set_vport_vlan_filter (vport, need_en); -if (ret) { -mutex_unlock (&hdev->vport_lock); +if (ret)return ret; - } vport->cur_vlan_fltr_en = need_en; +return 0 ; +} + +int hclge_enable_vport_vlan_filter (struct hclge_vport *vport,bool request_en) +{ +struct hclge_dev *hdev = vport->back; +int ret; + +mutex_lock (&hdev->vport_lock); + vport->req_vlan_fltr_en = request_en; + ret =__hclge_enable_vport_vlan_filter (vport, request_en);mutex_unlock (&hdev->vport_lock); -return 0 ; +return ret; }static int hclge_enable_vlan_filter (struct hnae3_handle *handle,bool enable)
@@ -10743,16 +10746,19 @@ static void hclge_sync_vlan_fltr_state(struct hclge_dev *hdev) &vport->state))continue ; - ret =hclge_enable_vport_vlan_filter (vport, - vport->req_vlan_fltr_en); +mutex_lock (&hdev->vport_lock); + ret =__hclge_enable_vport_vlan_filter (vport, + vport->req_vlan_fltr_en);if (ret) {dev_err (&hdev->pdev->dev,"failed to sync vlan filter state for vport%u, ret = %d\n" , vport->vport_id, ret);set_bit (HCLGE_VPORT_STATE_VLAN_FLTR_CHANGE , &vport->state); +mutex_unlock (&hdev->vport_lock);return ; } +mutex_unlock (&hdev->vport_lock); } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 86/644 net: hns3: disable interrupt when ptp init failed
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yonglong Liu <[email protected]>
[ Upstream commit cde304655f25d94a996c45b0f9956e7dcc2bc4c0 ]
When ptp init failed, we'd better disable the interrupt and clear the flag, to avoid early report interrupt at next probe.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c +6 -3
@@ -509,14 +509,14 @@ int hclge_ptp_init(struct hclge_dev *hdev)if (ret) {dev_err (&hdev->pdev->dev,"failed to init freq, ret = %d\n" , ret); - goto out; + goto out_clear_int; } ret =hclge_ptp_set_ts_mode (hdev, &hdev->ptp->ts_cfg);if (ret) {dev_err (&hdev->pdev->dev,"failed to init ts mode, ret = %d\n" , ret); - goto out; + goto out_clear_int; }ktime_get_real_ts64 (&ts);
@@ -524,7 +524,7 @@ int hclge_ptp_init(struct hclge_dev *hdev)if (ret) {dev_err (&hdev->pdev->dev,"failed to init ts time, ret = %d\n" , ret); - goto out; + goto out_clear_int; }set_bit (HCLGE_STATE_PTP_EN , &hdev->state);
@@ -532,6 +532,9 @@ int hclge_ptp_init(struct hclge_dev *hdev)return 0 ; +out_clear_int: +clear_bit (HCLGE_PTP_FLAG_EN , &hdev->ptp->flags); +hclge_ptp_int_en (hdev, false); out:hclge_ptp_destroy_clock (hdev);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 87/644 net: hns3: fixed vf get max channels bug
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jian Shen <[email protected]>
[ Upstream commit b3e75c0bcc53f647311960bc1b0970b9b480ca5a ]
Currently, the queried maximum of vf channels is the maximum of channels supported by each TC. However, the actual maximum of channels is the maximum of channels supported by the device.
--- drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +1 -5
@@ -3571,11 +3571,7 @@ static void hclgevf_uninit_ae_dev(struct hnae3_ae_dev *ae_dev)static u32 hclgevf_get_max_channels (struct hclgevf_dev *hdev) { -struct hnae3_handle *nic = &hdev->nic; -struct hnae3_knic_private_info *kinfo = &nic->kinfo; - -return min_t (u32, hdev->rss_size_max, - hdev->num_tqps / kinfo->tc_info.num_tc); +return min (hdev->rss_size_max, hdev->num_tqps); }/**
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 88/644 platform/x86: ideapad-laptop: Fix kbd backlight not remembered among boots
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rong Zhang <[email protected]>
commit e10981075adce203eac0be866389309eeb8ef11e upstream.
On some models supported by ideapad-laptop, the HW/FW can remember the state of keyboard backlight among boots. However, it is always turned off while shutting down, as a side effect of the LED class device unregistering sequence.
This is inconvenient for users who always prefer turning on the keyboard backlight. Thus, set LED_RETAIN_AT_SHUTDOWN on the LED class device so that the state of keyboard backlight gets remembered, which also aligns with the behavior of manufacturer utilities on Windows.
--- drivers/platform/x86/ideapad-laptop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/ideapad-laptop.c +1 -1
@@ -1357,7 +1357,7 @@ static int ideapad_kbd_bl_init(struct id priv->kbd_bl.led.max_brightness =1 ; priv->kbd_bl.led.brightness_get = ideapad_kbd_bl_led_cdev_brightness_get; priv->kbd_bl.led.brightness_set_blocking = ideapad_kbd_bl_led_cdev_brightness_set; - priv->kbd_bl.led.flags =LED_BRIGHT_HW_CHANGED ; + priv->kbd_bl.led.flags =LED_BRIGHT_HW_CHANGED |LED_RETAIN_AT_SHUTDOWN ; err =led_classdev_register (&priv->platform_device->dev, &priv->kbd_bl.led);if (err)
Greg Kroah-Hartman
maintainerPATCH 89/644 i2c: qup: jump out of the loop in case of timeout
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yang Xiwen <[email protected]>
commit a7982a14b3012527a9583d12525cd0dc9f8d8934 upstream.
Original logic only sets the return value but doesn't jump out of the loop if the bus is kept active by a client. This is not expected. A malicious or buggy i2c client can hang the kernel in this case and should be avoided. This is observed during a long time test with a PCA953x GPIO extender.
Fix it by changing the logic to not only sets the return value, but also jumps out of the loop and return to the caller with -ETIMEDOUT.
--- drivers/i2c/busses/i2c-qup.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/i2c/busses/i2c-qup.c +3 -1
@@ -452,8 +452,10 @@ static int qup_i2c_bus_active(struct qupif (!(status &I2C_STATUS_BUS_ACTIVE ))break ; -if (time_after (jiffies, timeout)) +if (time_after (jiffies, timeout)) { ret = -ETIMEDOUT ; +break ; + }usleep_range (len, len *2 ); }
Greg Kroah-Hartman
maintainerPATCH 90/644 i2c: virtio: Avoid hang by using interruptible completion wait
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Viresh Kumar <[email protected]>
commit a663b3c47ab10f66130818cf94eb59c971541c3f upstream.
The current implementation uses wait_for_completion(), which can cause the caller to hang indefinitely if the transfer never completes.
Switch to wait_for_completion_interruptible() so that the operation can be interrupted by signals.
--- drivers/i2c/busses/i2c-virtio.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/i2c/busses/i2c-virtio.c +8 -7
@@ -118,15 +118,16 @@ static int virtio_i2c_complete_reqs(strufor (i =0 ; i < num; i++) {struct virtio_i2c_req *req = &reqs[i]; -wait_for_completion (&req->completion); - -if (!failed && req->in_hdr.status !=VIRTIO_I2C_MSG_OK ) - failed = true; +if (!failed) { +if (wait_for_completion_interruptible (&req->completion)) + failed = true; +else if (req->in_hdr.status !=VIRTIO_I2C_MSG_OK ) + failed = true; +else + j++; + }i2c_put_dma_safe_msg_buf (reqs[i].buf, &msgs[i], !failed); - -if (!failed) - j++; }return j;
Greg Kroah-Hartman
maintainerPATCH 91/644 bus: fsl-mc: Fix potential double device reference in fsl_mc_get_endpoint()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ma Ke <[email protected]>
commit bddbe13d36a02d5097b99cf02354d5752ad1ac60 upstream.
The fsl_mc_get_endpoint() function may call fsl_mc_device_lookup() twice, which would increment the device's reference count twice if both lookups find a device. This could lead to a reference count leak.
Found by code review.
--- drivers/bus/fsl-mc/fsl-mc-bus.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
drivers/bus/fsl-mc/fsl-mc-bus.c +9 -10
@@ -944,6 +944,7 @@ struct fsl_mc_device *fsl_mc_get_endpoinstruct fsl_mc_obj_desc endpoint_desc = {{0 }};struct dprc_endpoint endpoint1 = {{0 }};struct dprc_endpoint endpoint2 = {{0 }}; +struct fsl_mc_bus *mc_bus;int state, err; mc_bus_dev =to_fsl_mc_device (mc_dev->dev.parent);
@@ -967,6 +968,8 @@ struct fsl_mc_device *fsl_mc_get_endpoinstrcpy (endpoint_desc.type, endpoint2.type); endpoint_desc.id = endpoint2.id; endpoint =fsl_mc_device_lookup (&endpoint_desc, mc_bus_dev); +if (endpoint) +return endpoint;/* * We know that the device has an endpoint because we verified by
@@ -974,17 +977,13 @@ struct fsl_mc_device *fsl_mc_get_endpoin* yet discovered by the fsl-mc bus, thus the lookup returned NULL. * Force a rescan of the devices in this container and retry the lookup. */ -if (!endpoint) { -struct fsl_mc_bus *mc_bus =to_fsl_mc_bus (mc_bus_dev); - -if (mutex_trylock (&mc_bus->scan_mutex)) { - err =dprc_scan_objects (mc_bus_dev, true); -mutex_unlock (&mc_bus->scan_mutex); - } - -if (err <0 ) -return ERR_PTR (err); + mc_bus =to_fsl_mc_bus (mc_bus_dev); +if (mutex_trylock (&mc_bus->scan_mutex)) { + err =dprc_scan_objects (mc_bus_dev, true); +mutex_unlock (&mc_bus->scan_mutex); } +if (err <0 ) +return ERR_PTR (err); endpoint =fsl_mc_device_lookup (&endpoint_desc, mc_bus_dev);/*
Greg Kroah-Hartman
maintainerPATCH 92/644 ALSA: hda/realtek - Add mute LED support for HP Pavilion 15-eg0xxx
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dawid Rezler <[email protected]>
commit 9744ede7099e8a69c04aa23fbea44c15bc390c04 upstream.
The mute LED on the HP Pavilion Laptop 15-eg0xxx,
which uses the ALC287 codec, didn't work.
This patch fixes the issue by enabling the ALC287_FIXUP_HP_GPIO_LED quirk.
Tested on a physical device, the LED now works as intended.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -9350,6 +9350,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x103c ,0x8788 ,"HP OMEN 15" ,ALC285_FIXUP_HP_MUTE_LED ),SND_PCI_QUIRK (0x103c ,0x87b7 ,"HP Laptop 14-fq0xxx" ,ALC236_FIXUP_HP_MUTE_LED_COEFBIT2 ),SND_PCI_QUIRK (0x103c ,0x87c8 ,"HP" ,ALC287_FIXUP_HP_GPIO_LED ), +SND_PCI_QUIRK (0x103c ,0x87cc ,"HP Pavilion 15-eg0xxx" ,ALC287_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x87d3 ,"HP Laptop 15-gw0xxx" ,ALC236_FIXUP_HP_MUTE_LED_COEFBIT2 ),SND_PCI_QUIRK (0x103c ,0x87df ,"HP ProBook 430 G8 Notebook PC" ,ALC236_FIXUP_HP_GPIO_LED ), SND_PCI_QUIRK(0x103c, 0x87e5, "HP ProBook 440 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
Greg Kroah-Hartman
maintainerPATCH 93/644 dpaa2-eth: Fix device reference count leak in MAC endpoint handling
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ma Ke <[email protected]>
commit ee9f3a81ab08dfe0538dbd1746f81fd4d5147fdc upstream.
The fsl_mc_get_endpoint() function uses device_find_child() for localization, which implicitly calls get_device() to increment the device's reference count before returning the pointer. However, the caller dpaa2_eth_connect_mac() fails to properly release this reference in multiple scenarios. We should call put_device() to decrement reference count properly.
As comment of device_find_child() says, 'NOTE: you will need to drop the reference with put_device() after use'.
Found by code review.
--- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +12 -3
@@ -4228,12 +4228,19 @@ static int dpaa2_eth_connect_mac(structif (PTR_ERR (dpmac_dev) == -EPROBE_DEFER )return PTR_ERR (dpmac_dev); -if (IS_ERR (dpmac_dev) || dpmac_dev->dev.type != &fsl_mc_bus_dpmac_type) +if (IS_ERR (dpmac_dev))return 0 ; +if (dpmac_dev->dev.type != &fsl_mc_bus_dpmac_type) { + err =0 ; + goto out_put_device; + } + mac =kzalloc (sizeof (struct dpaa2_mac ),GFP_KERNEL ); -if (!mac) -return -ENOMEM ; +if (!mac) { + err = -ENOMEM ; + goto out_put_device; + } mac->mc_dev = dpmac_dev; mac->mc_io = priv->mc_io;
@@ -4260,6 +4267,8 @@ err_close_mac: priv->mac =NULL ; err_free_mac:kfree (mac); +out_put_device: +put_device (&dpmac_dev->dev);return err; }
Greg Kroah-Hartman
maintainerPATCH 94/644 dpaa2-switch: Fix device reference count leak in MAC endpoint handling
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ma Ke <[email protected]>
commit 96e056ffba912ef18a72177f71956a5b347b5177 upstream.
The fsl_mc_get_endpoint() function uses device_find_child() for localization, which implicitly calls get_device() to increment the device's reference count before returning the pointer. However, the caller dpaa2_switch_port_connect_mac() fails to properly release this reference in multiple scenarios. We should call put_device() to decrement reference count properly.
As comment of device_find_child() says, 'NOTE: you will need to drop the reference with put_device() after use'.
Found by code review.
--- drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c +12 -3
@@ -1435,12 +1435,19 @@ static int dpaa2_switch_port_connect_macif (PTR_ERR (dpmac_dev) == -EPROBE_DEFER )return PTR_ERR (dpmac_dev); -if (IS_ERR (dpmac_dev) || dpmac_dev->dev.type != &fsl_mc_bus_dpmac_type) +if (IS_ERR (dpmac_dev))return 0 ; +if (dpmac_dev->dev.type != &fsl_mc_bus_dpmac_type) { + err =0 ; + goto out_put_device; + } + mac =kzalloc (sizeof (*mac),GFP_KERNEL ); -if (!mac) -return -ENOMEM ; +if (!mac) { + err = -ENOMEM ; + goto out_put_device; + } mac->mc_dev = dpmac_dev; mac->mc_io = port_priv->ethsw_data->mc_io;
@@ -1468,6 +1475,8 @@ err_close_mac: port_priv->mac =NULL ; err_free_mac:kfree (mac); +out_put_device: +put_device (&dpmac_dev->dev);return err; }
Greg Kroah-Hartman
maintainerPATCH 95/644 e1000e: disregard NVM checksum on tgp when valid checksum bit is not set
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jacek Kowalski <[email protected]>
commit 536fd741c7ac907d63166cdae1081b1febfab613 upstream.
As described by Vitaly Lifshits:
Quoted 7 lines
Starting from Tiger Lake, LAN NVM is locked for writes by SW, so the driver cannot perform checksum validation and correction. This means that all NVM images must leave the factory with correct checksum and checksum valid bit set. Since Tiger Lake devices were the first to have this lock, some systems in the field did not meet this requirement. Therefore, for these transitional devices we skip checksum update and verification, if the valid bit is not set.
--- drivers/net/ethernet/intel/e1000e/ich8lan.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/intel/e1000e/ich8lan.c +2 -0
@@ -4146,6 +4146,8 @@ static s32 e1000_validate_nvm_checksum_i ret_val =e1000e_update_nvm_checksum (hw);if (ret_val)return ret_val; + }else if (hw->mac.type == e1000_pch_tgp) { +return 0 ; } }
Greg Kroah-Hartman
maintainerPATCH 96/644 e1000e: ignore uninitialized checksum word on tgp
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jacek Kowalski <[email protected]>
commit 61114910a5f6a71d0b6ea3b95082dfe031b19dfe upstream.
As described by Vitaly Lifshits:
Quoted 4 lines
Starting from Tiger Lake, LAN NVM is locked for writes by SW, so the driver cannot perform checksum validation and correction. This means that all NVM images must leave the factory with correct checksum and checksum valid bit set.
Unfortunately some systems have left the factory with an uninitialized value of 0xFFFF at register address 0x3F (checksum word location). So on Tiger Lake platform we ignore the computed checksum when such condition is encountered.
--- drivers/net/ethernet/intel/e1000e/defines.h | 3 +++ drivers/net/ethernet/intel/e1000e/nvm.c | 6 ++++++ 2 files changed, 9 insertions(+)
drivers/net/ethernet/intel/e1000e/defines.h +3 -0
@@ -638,6 +638,9 @@/* For checksumming, the sum of all words in the NVM should equal 0xBABA. */ #define NVM_SUM 0xBABA +/* Uninitialized ("empty") checksum word value */ +#define NVM_CHECKSUM_UNINITIALIZED 0xFFFF +/* PBA (printed board assembly) number words */ #define NVM_PBA_OFFSET_0 8#define NVM_PBA_OFFSET_1 9
drivers/net/ethernet/intel/e1000e/nvm.c +6 -0
@@ -558,6 +558,12 @@ s32 e1000e_validate_nvm_checksum_generic checksum += nvm_data; } +if (hw->mac.type == e1000_pch_tgp && + nvm_data ==NVM_CHECKSUM_UNINITIALIZED ) { +e_dbg ("Uninitialized NVM Checksum on TGP platform - ignoring\n" ); +return 0 ; + } +if (checksum != (u16 )NVM_SUM ) {e_dbg ("NVM Checksum Invalid\n" );return -E1000_ERR_NVM ;
Greg Kroah-Hartman
maintainerPATCH 97/644 gve: Fix stuck TX queue for DQ queue format
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Praveen Kaligineedi <[email protected]>
commit b03f15c0192b184078206760c839054ae6eb4eaa upstream.
gve_tx_timeout was calculating missed completions in a way that is only relevant in the GQ queue format. Additionally, it was attempting to disable device interrupts, which is not needed in either GQ or DQ queue formats.
As a result, TX timeouts with the DQ queue format likely would have triggered early resets without kicking the queue at all.
This patch drops the check for pending work altogether and always kicks the queue after validating the queue has not seen a TX timeout too recently.
--- drivers/net/ethernet/google/gve/gve_main.c | 71 +++++++++++++++-------------- 1 file changed, 39 insertions(+), 32 deletions(-)
drivers/net/ethernet/google/gve/gve_main.c +39 -32
@@ -1111,49 +1111,56 @@ static void gve_turnup(struct gve_priv *gve_set_napi_enabled (priv); } -static void gve_tx_timeout (struct net_device *dev,unsigned int txqueue) +static struct gve_notify_block *gve_get_tx_notify_block (struct gve_priv *priv, +unsigned int txqueue) { -struct gve_notify_block *block; -struct gve_tx_ring *tx =NULL ; -struct gve_priv *priv; -u32 last_nic_done; -u32 current_time;u32 ntfy_idx; -netdev_info (dev,"Timeout on tx queue, %d" , txqueue); - priv =netdev_priv (dev);if (txqueue > priv->tx_cfg.num_queues) - goto reset; +return NULL ; ntfy_idx =gve_tx_idx_to_ntfy (priv, txqueue);if (ntfy_idx >= priv->num_ntfy_blks) - goto reset; +return NULL ; + +return &priv->ntfy_blocks[ntfy_idx]; +} + +static bool gve_tx_timeout_try_q_kick (struct gve_priv *priv, +unsigned int txqueue) +{ +struct gve_notify_block *block; +u32 current_time; - block = &priv->ntfy_blocks[ntfy_idx]; - tx = block->tx; + block =gve_get_tx_notify_block (priv, txqueue); + +if (!block) +return false; current_time =jiffies_to_msecs (jiffies); -if (tx->last_kick_msec +MIN_TX_TIMEOUT_GAP > current_time) - goto reset; +if (block->tx->last_kick_msec +MIN_TX_TIMEOUT_GAP > current_time) +return false; + +netdev_info (priv->dev,"Kicking queue %d" , txqueue); +napi_schedule (&block->napi); + block->tx->last_kick_msec = current_time; +return true; +} + +static void gve_tx_timeout (struct net_device *dev,unsigned int txqueue) +{ +struct gve_notify_block *block; +struct gve_priv *priv; + +netdev_info (dev,"Timeout on tx queue, %d" , txqueue); + priv =netdev_priv (dev); + +if (!gve_tx_timeout_try_q_kick (priv, txqueue)) +gve_schedule_reset (priv); -/* Check to see if there are missed completions, which will allow us to -* kick the queue. -*/ - last_nic_done =gve_tx_load_event_counter (priv, tx); -if (last_nic_done - tx->done) { -netdev_info (dev,"Kicking queue %d" , txqueue); -iowrite32be (GVE_IRQ_MASK ,gve_irq_doorbell (priv, block)); -napi_schedule (&block->napi); - tx->last_kick_msec = current_time; - goto out; - }// Else reset. - -reset: -gve_schedule_reset (priv); - -out: -if (tx) - tx->queue_timeout++; + block =gve_get_tx_notify_block (priv, txqueue); +if (block) + block->tx->queue_timeout++; priv->tx_timeo_cnt++; }
Greg Kroah-Hartman
maintainerPATCH 98/644 nilfs2: reject invalid file types when reading inodes
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
commit 4aead50caf67e01020c8be1945c3201e8a972a27 upstream.
To prevent inodes with invalid file types from tripping through the vfs and causing malfunctions or assertion failures, add a missing sanity check when reading an inode from a block device. If the file type is not valid, treat it as a filesystem error.
--- fs/nilfs2/inode.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
fs/nilfs2/inode.c +8 -1
@@ -517,11 +517,18 @@ static int __nilfs_read_inode(struct sup inode->i_op = &nilfs_symlink_inode_operations;inode_nohighmem (inode); inode->i_mapping->a_ops = &nilfs_aops; - }else { + }else if (S_ISCHR (inode->i_mode) ||S_ISBLK (inode->i_mode) || +S_ISFIFO (inode->i_mode) ||S_ISSOCK (inode->i_mode)) { inode->i_op = &nilfs_special_inode_operations;init_special_inode ( inode, inode->i_mode,huge_decode_dev (le64_to_cpu (raw_inode->i_device_code))); + }else { +nilfs_error (sb, +"invalid file type bits in mode 0%o for inode %lu" , + inode->i_mode, ino); + err = -EIO ; + goto failed_unmap; }nilfs_ifile_unmap_inode (root->ifile, ino, bh);brelse (bh);
Greg Kroah-Hartman
maintainerPATCH 99/644 mm/zsmalloc: do not pass __GFP_MOVABLE if CONFIG_COMPACTION=n
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Harry Yoo <[email protected]>
commit 694d6b99923eb05a8fd188be44e26077d19f0e21 upstream.
Commit 48b4800a1c6a ("zsmalloc: page migration support") added support for migrating zsmalloc pages using the movable_operations migration framework. However, the commit did not take into account that zsmalloc supports migration only when CONFIG_COMPACTION is enabled. Tracing shows that zsmalloc was still passing the __GFP_MOVABLE flag even when compaction is not supported.
This can result in unmovable pages being allocated from movable page blocks (even without stealing page blocks), ZONE_MOVABLE and CMA area.
Possible user visible effects:
- Some ZONE_MOVABLE memory can be not actually movable
- CMA allocation can fail because of this
- Increased memory fragmentation due to ignoring the page mobility grouping feature
I'm not really sure who uses kernels without compaction support, though :(
To fix this, clear the __GFP_MOVABLE flag when
!IS_ENABLED(CONFIG_COMPACTION).
--- mm/zsmalloc.c | 3 +++ 1 file changed, 3 insertions(+)
mm/zsmalloc.c +3 -0
@@ -1064,6 +1064,9 @@ static struct zspage *alloc_zspage(strucif (!zspage)return NULL ; +if (!IS_ENABLED (CONFIG_COMPACTION )) + gfp &= ~__GFP_MOVABLE; + zspage->magic =ZSPAGE_MAGIC ;migrate_lock_init (zspage);
Greg Kroah-Hartman
maintainerPATCH 100/644 usb: typec: tcpm: allow to use sink in accessory mode
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Grzeschik <[email protected]>
commit 64843d0ba96d3eae297025562111d57585273366 upstream.
Since the function tcpm_acc_attach is not setting the data and role for for the sink case we extend it to check for it first.
Stable-dep-of: bec15191d523 ("usb: typec: tcpm: apply vbus before data bringup in tcpm_src_attach")
--- drivers/usb/typec/tcpm/tcpm.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/usb/typec/tcpm/tcpm.c +7 -2
@@ -3794,12 +3794,17 @@ static void tcpm_snk_detach(struct tcpm_static int tcpm_acc_attach (struct tcpm_port *port) {int ret; +enum typec_role role; +enum typec_data_role data;if (port->attached)return 0 ; - ret =tcpm_set_roles (port, true,TYPEC_SOURCE , -tcpm_data_role_for_source (port)); + role =tcpm_port_is_sink (port) ?TYPEC_SINK :TYPEC_SOURCE ; + data =tcpm_port_is_sink (port) ?tcpm_data_role_for_sink (port) + :tcpm_data_role_for_source (port); + + ret =tcpm_set_roles (port, true, role, data);if (ret <0 )return ret;
Greg Kroah-Hartman
maintainerPATCH 101/644 usb: typec: tcpm: allow switching to mode accessory to mux properly
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Grzeschik <[email protected]>
commit 8a50da849151e7e12b43c1d8fe7ad302223aef6b upstream.
The funciton tcpm_acc_attach is not setting the proper state when calling tcpm_set_role. The function tcpm_set_role is currently only handling TYPEC_STATE_USB. For the tcpm_acc_attach to switch into other modal states tcpm_set_role needs to be extended by an extra state parameter. This patch is handling the proper state change when calling tcpm_acc_attach.
Stable-dep-of: bec15191d523 ("usb: typec: tcpm: apply vbus before data bringup in tcpm_src_attach")
--- drivers/usb/typec/tcpm/tcpm.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-)
drivers/usb/typec/tcpm/tcpm.c +18 -9
@@ -1024,7 +1024,7 @@ static int tcpm_set_attached_state(struc port->data_role); } -static int tcpm_set_roles (struct tcpm_port *port,bool attached, +static int tcpm_set_roles (struct tcpm_port *port,bool attached,int state,enum typec_role role,enum typec_data_role data) {enum typec_orientation orientation;
@@ -1061,7 +1061,7 @@ static int tcpm_set_roles(struct tcpm_po } } - ret =tcpm_mux_set (port,TYPEC_STATE_USB , usb_role, orientation); + ret =tcpm_mux_set (port, state, usb_role, orientation);if (ret <0 )return ret;
@@ -3622,7 +3622,8 @@ static int tcpm_src_attach(struct tcpm_ptcpm_enable_auto_vbus_discharge (port, true); - ret =tcpm_set_roles (port, true,TYPEC_SOURCE ,tcpm_data_role_for_source (port)); + ret =tcpm_set_roles (port, true,TYPEC_STATE_USB , +TYPEC_SOURCE ,tcpm_data_role_for_source (port));if (ret <0 )return ret;
@@ -3772,7 +3773,8 @@ static int tcpm_snk_attach(struct tcpm_ptcpm_enable_auto_vbus_discharge (port, true); - ret =tcpm_set_roles (port, true,TYPEC_SINK ,tcpm_data_role_for_sink (port)); + ret =tcpm_set_roles (port, true,TYPEC_STATE_USB , +TYPEC_SINK ,tcpm_data_role_for_sink (port));if (ret <0 )return ret;
@@ -3796,6 +3798,7 @@ static int tcpm_acc_attach(struct tcpm_pint ret;enum typec_role role;enum typec_data_role data; +int state =TYPEC_STATE_USB ;if (port->attached)return 0 ;
@@ -3804,7 +3807,13 @@ static int tcpm_acc_attach(struct tcpm_p data =tcpm_port_is_sink (port) ?tcpm_data_role_for_sink (port) :tcpm_data_role_for_source (port); - ret =tcpm_set_roles (port, true, role, data); +if (tcpm_port_is_audio (port)) + state =TYPEC_MODE_AUDIO ; + +if (tcpm_port_is_debug (port)) + state =TYPEC_MODE_DEBUG ; + + ret =tcpm_set_roles (port, true, state, role, data);if (ret <0 )return ret;
@@ -4484,7 +4493,7 @@ static void run_state_machine(struct tcp*/ tcpm_set_vconn (port, false);tcpm_set_vbus (port, false); -tcpm_set_roles (port, port->self_powered,TYPEC_SOURCE , +tcpm_set_roles (port, port->self_powered,TYPEC_STATE_USB ,TYPEC_SOURCE ,tcpm_data_role_for_source (port));/* * If tcpc fails to notify vbus off, TCPM will wait for PD_T_SAFE_0V +
@@ -4516,7 +4525,7 @@ static void run_state_machine(struct tcptcpm_set_vconn (port, false);if (port->pd_capable)tcpm_set_charge (port, false); -tcpm_set_roles (port, port->self_powered,TYPEC_SINK , +tcpm_set_roles (port, port->self_powered,TYPEC_STATE_USB ,TYPEC_SINK ,tcpm_data_role_for_sink (port));/* * VBUS may or may not toggle, depending on the adapter.
@@ -4615,10 +4624,10 @@ static void run_state_machine(struct tcpcase DR_SWAP_CHANGE_DR :tcpm_unregister_altmodes (port);if (port->data_role ==TYPEC_HOST ) -tcpm_set_roles (port, true, port->pwr_role, +tcpm_set_roles (port, true,TYPEC_STATE_USB , port->pwr_role,TYPEC_DEVICE );else -tcpm_set_roles (port, true, port->pwr_role, +tcpm_set_roles (port, true,TYPEC_STATE_USB , port->pwr_role,TYPEC_HOST );tcpm_ams_finish (port);tcpm_set_state (port,ready_state (port),0 );
Greg Kroah-Hartman
maintainerPATCH 102/644 usb: typec: tcpm: apply vbus before data bringup in tcpm_src_attach
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: RD Babiera <[email protected]>
commit bec15191d52300defa282e3fd83820f69e447116 upstream.
This patch fixes Type-C compliance test TD 4.7.6 - Try.SNK DRP Connect SNKAS.
tVbusON has a limit of 275ms when entering SRC_ATTACHED. Compliance testers can interpret the TryWait.Src to Attached.Src transition after Try.Snk as being in Attached.Src the entire time, so ~170ms is lost to the debounce timer.
Setting the data role can be a costly operation in host mode, and when completed after 100ms can cause Type-C compliance test check TD 4.7.5.V.4 to fail.
Turn VBUS on before tcpm_set_roles to meet timing requirement.
--- drivers/usb/typec/tcpm/tcpm.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)
drivers/usb/typec/tcpm/tcpm.c +17 -17
@@ -3622,17 +3622,6 @@ static int tcpm_src_attach(struct tcpm_ptcpm_enable_auto_vbus_discharge (port, true); - ret =tcpm_set_roles (port, true,TYPEC_STATE_USB , -TYPEC_SOURCE ,tcpm_data_role_for_source (port)); -if (ret <0 ) -return ret; - -if (port->pd_supported) { - ret = port->tcpc->set_pd_rx (port->tcpc, true); -if (ret <0 ) - goto out_disable_mux; - } -/* * USB Type-C specification, version 1.2, * chapter 4.5.2.2.8.1 (Attached.SRC Requirements)
@@ -3642,13 +3631,24 @@ static int tcpm_src_attach(struct tcpm_p (polarity == TYPEC_POLARITY_CC2 && port->cc1 == TYPEC_CC_RA)) { ret =tcpm_set_vconn (port, true);if (ret <0 ) - goto out_disable_pd; +return ret; } ret =tcpm_set_vbus (port, true);if (ret <0 ) goto out_disable_vconn; + ret =tcpm_set_roles (port, true,TYPEC_STATE_USB ,TYPEC_SOURCE , +tcpm_data_role_for_source (port)); +if (ret <0 ) + goto out_disable_vbus; + +if (port->pd_supported) { + ret = port->tcpc->set_pd_rx (port->tcpc, true); +if (ret <0 ) + goto out_disable_mux; + } + port->pd_capable = false; port->partner =NULL ;
@@ -3658,14 +3658,14 @@ static int tcpm_src_attach(struct tcpm_preturn 0 ; -out_disable_vconn: -tcpm_set_vconn (port, false); -out_disable_pd: -if (port->pd_supported) - port->tcpc->set_pd_rx (port->tcpc, false); out_disable_mux:tcpm_mux_set (port,TYPEC_STATE_SAFE ,USB_ROLE_NONE ,TYPEC_ORIENTATION_NONE ); +out_disable_vbus: +tcpm_set_vbus (port, false); +out_disable_vconn: +tcpm_set_vconn (port, false); +return ret; }
Greg Kroah-Hartman
maintainerPATCH 103/644 x86/bugs: Fix use of possibly uninit value in amd_check_tsa_microcode()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Zhivich <[email protected]>
For kernels compiled with CONFIG_INIT_STACK_NONE=y, the value of __reserved field in zen_patch_rev union on the stack may be garbage. If so, it will prevent correct microcode check when consulting p.ucode_rev, resulting in incorrect mitigation selection.
This is a stable-only fix.
--- arch/x86/kernel/cpu/amd.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/kernel/cpu/amd.c +2 -0
@@ -592,6 +592,8 @@ static bool amd_check_tsa_microcode(void p.model = c->x86_model; p.ext_model = c->x86_model >>4 ; p.stepping = c->x86_stepping; +/* reserved bits are expected to be 0 in test below */ + p.__reserved =0 ;if (c->x86 ==0x19 ) {switch (p.ucode_rev >>8 ) {
Greg Kroah-Hartman
maintainerPATCH 104/644 jfs: reject on-disk inodes of an unsupported type
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Antipov <[email protected]>
commit 8c3f9a70d2d4dd6c640afe294b05c6a0a45434d9 upstream.
Syzbot has reported the following BUG:
kernel BUG at fs/inode.c:668!
Oops: invalid opcode: 0000 [#1] PREEMPT SMP KASAN PTI CPU: 3 UID: 0 PID: 139 Comm: jfsCommit Not tainted 6.12.0-rc4-syzkaller-00085-g4e46774408d9 #0 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.3-3.fc41 04/01/2014 RIP: 0010:clear_inode+0x168/0x190 Code: 4c 89 f7 e8 ba fe e5 ff e9 61 ff ff ff 44 89 f1 80 e1 07 80 c1 03 38 c1 7c c1 4c 89 f7 e8 90 ff e5 ff eb b7 0b e8 01 5d 7f ff 90 0f 0b e8 f9 5c 7f ff 90 0f 0b e8 f1 5c 7f RSP: 0018:ffffc900027dfae8 EFLAGS: 00010093 RAX: ffffffff82157a87 RBX: 0000000000000001 RCX: ffff888104d4b980 RDX: 0000000000000000 RSI: 0000000000000001 RDI: 0000000000000000 RBP: ffffc900027dfc90 R08: ffffffff82157977 R09: fffff520004fbf38 R10: dffffc0000000000 R11: fffff520004fbf38 R12: dffffc0000000000 R13: ffff88811315bc00 R14: ffff88811315bda8 R15: ffff88811315bb80 FS: 0000000000000000(0000) GS:ffff888135f00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00005565222e0578 CR3: 0000000026ef0000 CR4: 00000000000006f0 Call Trace: <TASK> ? __die_body+0x5f/0xb0 ? die+0x9e/0xc0 ? do_trap+0x15a/0x3a0 ? clear_inode+0x168/0x190 ? do_error_trap+0x1dc/0x2c0 ? clear_inode+0x168/0x190 ? __pfx_do_error_trap+0x10/0x10 ? report_bug+0x3cd/0x500 ? handle_invalid_op+0x34/0x40 ? clear_inode+0x168/0x190 ? exc_invalid_op+0x38/0x50 ? asm_exc_invalid_op+0x1a/0x20 ? clear_inode+0x57/0x190 ? clear_inode+0x167/0x190 ? clear_inode+0x168/0x190 ? clear_inode+0x167/0x190 jfs_evict_inode+0xb5/0x440 ? __pfx_jfs_evict_inode+0x10/0x10 evict+0x4ea/0x9b0 ? __pfx_evict+0x10/0x10 ? iput+0x713/0xa50 txUpdateMap+0x931/0xb10 ? __pfx_txUpdateMap+0x10/0x10 jfs_lazycommit+0x49a/0xb80 ? _raw_spin_unlock_irqrestore+0x8f/0x140 ? lockdep_hardirqs_on+0x99/0x150 ? __pfx_jfs_lazycommit+0x10/0x10 ? __pfx_default_wake_function+0x10/0x10 ? __kthread_parkme+0x169/0x1d0 ? __pfx_jfs_lazycommit+0x10/0x10 kthread+0x2f2/0x390 ? __pfx_jfs_lazycommit+0x10/0x10 ? __pfx_kthread+0x10/0x10 ret_from_fork+0x4d/0x80 ? __pfx_kthread+0x10/0x10 ret_from_fork_asm+0x1a/0x30 </TASK>
This happens when 'clear_inode()' makes an attempt to finalize an underlying JFS inode of unknown type. According to JFS layout description from
https://jfs.sourceforge.net/project/pub/jfslayout.pdf, inode types from 5 to 15 are reserved for future extensions and should not be encountered on a valid filesystem. So add an extra check for valid inode type in 'copy_from_dinode()'.
--- fs/jfs/jfs_imap.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
fs/jfs/jfs_imap.c +11 -2
@@ -3029,14 +3029,23 @@ static void duplicateIXtree(struct super* * RETURN VALUES: * 0 - success -* -ENOMEM - insufficient memory +* -EINVAL - unexpected inode type */ static int copy_from_dinode (struct dinode * dip,struct inode *ip) {struct jfs_inode_info *jfs_ip =JFS_IP (ip);struct jfs_sb_info *sbi =JFS_SBI (ip->i_sb); +int fileset =le32_to_cpu (dip->di_fileset); - jfs_ip->fileset =le32_to_cpu (dip->di_fileset); +switch (fileset) { +case AGGR_RESERVED_I :case AGGREGATE_I :case BMAP_I : +case LOG_I :case BADBLOCK_I :case FILESYSTEM_I : +break ; +default : +return -EINVAL ; + } + + jfs_ip->fileset = fileset; jfs_ip->mode2 =le32_to_cpu (dip->di_mode);jfs_set_inode_flags (ip);
Greg Kroah-Hartman
maintainerPATCH 105/644 comedi: comedi_test: Fix possible deletion of uninitialized timers
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
commit 1b98304c09a0192598d0767f1eb8c83d7e793091 upstream.
In waveform_common_attach(), the two timers &devpriv->ai_timer and &devpriv->ao_timer are initialized after the allocation of the device private data by comedi_alloc_devpriv() and the subdevices by comedi_alloc_subdevices(). The function may return with an error between those function calls. In that case, waveform_detach() will be called by the Comedi core to clean up. The check that waveform_detach() uses to decide whether to delete the timers is incorrect. It only checks that the device private data was allocated, but that does not guarantee that the timers were initialized. It also needs to check that the subdevices were allocated. Fix it.
--- drivers/comedi/drivers/comedi_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/comedi/drivers/comedi_test.c +1 -1
@@ -790,7 +790,7 @@ static void waveform_detach(struct comed {struct waveform_private *devpriv = dev->private; -if (devpriv) { +if (devpriv && dev->n_subdevices) {del_timer_sync (&devpriv->ai_timer);del_timer_sync (&devpriv->ao_timer); }
Greg Kroah-Hartman
maintainerPATCH 106/644 ALSA: hda: Add missing NVIDIA HDA codec IDs
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Dadap <[email protected]>
commit e0a911ac86857a73182edde9e50d9b4b949b7f01 upstream.
Add codec IDs for several NVIDIA products with HDA controllers to the snd_hda_id_hdmi[] patch table.
--- sound/pci/hda/patch_hdmi.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
sound/pci/hda/patch_hdmi.c +19 -0
@@ -4364,6 +4364,8 @@ HDA_CODEC_ENTRY(0x10de002d, "Tegra186 HDHDA_CODEC_ENTRY (0x10de002e ,"Tegra186 HDMI/DP1" , patch_tegra_hdmi),HDA_CODEC_ENTRY (0x10de002f ,"Tegra194 HDMI/DP2" , patch_tegra_hdmi),HDA_CODEC_ENTRY (0x10de0030 ,"Tegra194 HDMI/DP3" , patch_tegra_hdmi), +HDA_CODEC_ENTRY (0x10de0033 ,"SoC 33 HDMI/DP" , patch_tegra_hdmi), +HDA_CODEC_ENTRY (0x10de0035 ,"SoC 35 HDMI/DP" , patch_tegra_hdmi),HDA_CODEC_ENTRY (0x10de0040 ,"GPU 40 HDMI/DP" , patch_nvhdmi),HDA_CODEC_ENTRY (0x10de0041 ,"GPU 41 HDMI/DP" , patch_nvhdmi), HDA_CODEC_ENTRY(0x10de0042, "GPU 42 HDMI/DP", patch_nvhdmi),
@@ -4402,15 +4404,32 @@ HDA_CODEC_ENTRY(0x10de0097, "GPU 97 HDMIHDA_CODEC_ENTRY (0x10de0098 ,"GPU 98 HDMI/DP" , patch_nvhdmi),HDA_CODEC_ENTRY (0x10de0099 ,"GPU 99 HDMI/DP" , patch_nvhdmi),HDA_CODEC_ENTRY (0x10de009a ,"GPU 9a HDMI/DP" , patch_nvhdmi), +HDA_CODEC_ENTRY (0x10de009b ,"GPU 9b HDMI/DP" , patch_nvhdmi), +HDA_CODEC_ENTRY (0x10de009c ,"GPU 9c HDMI/DP" , patch_nvhdmi),HDA_CODEC_ENTRY (0x10de009d ,"GPU 9d HDMI/DP" , patch_nvhdmi),HDA_CODEC_ENTRY (0x10de009e ,"GPU 9e HDMI/DP" , patch_nvhdmi),HDA_CODEC_ENTRY (0x10de009f ,"GPU 9f HDMI/DP" , patch_nvhdmi),HDA_CODEC_ENTRY (0x10de00a0 ,"GPU a0 HDMI/DP" , patch_nvhdmi), +HDA_CODEC_ENTRY (0x10de00a1 ,"GPU a1 HDMI/DP" , patch_nvhdmi),HDA_CODEC_ENTRY (0x10de00a3 ,"GPU a3 HDMI/DP" , patch_nvhdmi),HDA_CODEC_ENTRY (0x10de00a4 ,"GPU a4 HDMI/DP" , patch_nvhdmi),HDA_CODEC_ENTRY (0x10de00a5 ,"GPU a5 HDMI/DP" , patch_nvhdmi),HDA_CODEC_ENTRY (0x10de00a6 ,"GPU a6 HDMI/DP" , patch_nvhdmi),HDA_CODEC_ENTRY (0x10de00a7 ,"GPU a7 HDMI/DP" , patch_nvhdmi), +HDA_CODEC_ENTRY (0x10de00a8 ,"GPU a8 HDMI/DP" , patch_nvhdmi), +HDA_CODEC_ENTRY (0x10de00a9 ,"GPU a9 HDMI/DP" , patch_nvhdmi), +HDA_CODEC_ENTRY (0x10de00aa ,"GPU aa HDMI/DP" , patch_nvhdmi), +HDA_CODEC_ENTRY (0x10de00ab ,"GPU ab HDMI/DP" , patch_nvhdmi), +HDA_CODEC_ENTRY (0x10de00ad ,"GPU ad HDMI/DP" , patch_nvhdmi), +HDA_CODEC_ENTRY (0x10de00ae ,"GPU ae HDMI/DP" , patch_nvhdmi), +HDA_CODEC_ENTRY (0x10de00af ,"GPU af HDMI/DP" , patch_nvhdmi), +HDA_CODEC_ENTRY (0x10de00b0 ,"GPU b0 HDMI/DP" , patch_nvhdmi), +HDA_CODEC_ENTRY (0x10de00b1 ,"GPU b1 HDMI/DP" , patch_nvhdmi), +HDA_CODEC_ENTRY (0x10de00c0 ,"GPU c0 HDMI/DP" , patch_nvhdmi), +HDA_CODEC_ENTRY (0x10de00c1 ,"GPU c1 HDMI/DP" , patch_nvhdmi), +HDA_CODEC_ENTRY (0x10de00c3 ,"GPU c3 HDMI/DP" , patch_nvhdmi), +HDA_CODEC_ENTRY (0x10de00c4 ,"GPU c4 HDMI/DP" , patch_nvhdmi), +HDA_CODEC_ENTRY (0x10de00c5 ,"GPU c5 HDMI/DP" , patch_nvhdmi),HDA_CODEC_ENTRY (0x10de8001 ,"MCP73 HDMI" , patch_nvhdmi_2ch),HDA_CODEC_ENTRY (0x10de8067 ,"MCP67/68 HDMI" , patch_nvhdmi_2ch), HDA_CODEC_ENTRY(0x67663d82, "Arise 82 HDMI/DP", patch_gf_hdmi),
Greg Kroah-Hartman
maintainerPATCH 107/644 usb: chipidea: add USB PHY event
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xu Yang <[email protected]>
[ Upstream commit b7a62611fab72e585c729a7fcf666aa9c4144214 ]
Add USB PHY event for below situation:
- usb role changed
- vbus connect
- vbus disconnect
- gadget driver is enumerated
USB PHY driver can get the last event after above situation occurs and deal with different situations.
--- drivers/usb/chipidea/ci.h | 18 ++++++++++++++++-- drivers/usb/chipidea/udc.c | 10 ++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-)
drivers/usb/chipidea/ci.h +16 -2
@@ -276,8 +276,19 @@ static inline int ci_role_start(struct ci_hdrc *ci, enum ci_role role)return -ENXIO ; ret = ci->roles[role]->start (ci); -if (!ret) - ci->role = role; +if (ret) +return ret; + + ci->role = role; + +if (ci->usb_phy) { +if (role ==CI_ROLE_HOST ) +usb_phy_set_event (ci->usb_phy,USB_EVENT_ID ); +else +/* in device mode but vbus is invalid*/ +usb_phy_set_event (ci->usb_phy,USB_EVENT_NONE ); + } +return ret; }
@@ -291,6 +302,9 @@ static inline void ci_role_stop(struct ci_hdrc *ci) ci->role =CI_ROLE_END ; ci->roles[role]->stop (ci); + +if (ci->usb_phy) +usb_phy_set_event (ci->usb_phy,USB_EVENT_NONE ); }static inline enum usb_role ci_role_to_usb_role (struct ci_hdrc *ci)
drivers/usb/chipidea/udc.c +10 -0
@@ -1703,6 +1703,13 @@ static int ci_udc_vbus_session(struct usb_gadget *_gadget, int is_active) ret = ci->platdata->notify_event (ci,CI_HDRC_CONTROLLER_VBUS_EVENT ); +if (ci->usb_phy) { +if (is_active) +usb_phy_set_event (ci->usb_phy,USB_EVENT_VBUS ); +else +usb_phy_set_event (ci->usb_phy,USB_EVENT_NONE ); + } +if (ci->driver)ci_hdrc_gadget_connect (_gadget, is_active);
@@ -2018,6 +2025,9 @@ static irqreturn_t udc_irq(struct ci_hdrc *ci)if (USBi_PCI & intr) { ci->gadget.speed =hw_port_is_high_speed (ci) ?USB_SPEED_HIGH :USB_SPEED_FULL ; +if (ci->usb_phy) +usb_phy_set_event (ci->usb_phy, +USB_EVENT_ENUMERATED );if (ci->suspended) {if (ci->driver->resume) {spin_unlock (&ci->lock);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 108/644 usb: phy: mxs: disconnect line when USB charger is attached
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xu Yang <[email protected]>
[ Upstream commit 87ed257acb0934e08644568df6495988631afd4c ]
For mxs PHY, if there is a vbus but the bus is not enumerated, we need to force the dp/dm as SE0 from the controller side. If not, there is possible USB wakeup due to unstable dp/dm, since there is possible no pull on dp/dm, such as there is a USB charger on the port.
--- drivers/usb/phy/phy-mxs-usb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/phy/phy-mxs-usb.c +3 -1
@@ -394,6 +394,7 @@ static bool mxs_phy_is_otg_host(struct mxs_phy *mxs_phy)static void mxs_phy_disconnect_line (struct mxs_phy *mxs_phy,bool on) {bool vbus_is_on = false; +enum usb_phy_events last_event = mxs_phy->phy.last_event;/* If the SoCs don't need to disconnect line without vbus, quit */ if (!(mxs_phy->data->flags &MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS ))
@@ -405,7 +406,8 @@ static void mxs_phy_disconnect_line(struct mxs_phy *mxs_phy, bool on) vbus_is_on =mxs_phy_get_vbus_status (mxs_phy); -if (on && !vbus_is_on && !mxs_phy_is_otg_host (mxs_phy)) +if (on && ((!vbus_is_on && !mxs_phy_is_otg_host (mxs_phy)) + || (last_event ==USB_EVENT_VBUS )))__mxs_phy_disconnect_line (mxs_phy, true);else __mxs_phy_disconnect_line (mxs_phy, false);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 109/644 ethernet: intel: fix building with large NR_CPUS
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit 24171a5a4a952c26568ff0d2a0bc8c4708a95e1d ]
With large values of CONFIG_NR_CPUS, three Intel ethernet drivers fail to compile like:
In function ‘i40e_free_q_vector’,
inlined from ‘i40e_vsi_alloc_q_vectors’ at drivers/net/ethernet/intel/i40e/i40e_main.c:12112:3:
571 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)include/linux/rcupdate.h:1084:17: note: in expansion of macro ‘BUILD_BUG_ON’
1084 | BUILD_BUG_ON(offsetof(typeof(*(ptr)), rhf) >= 4096); \drivers/net/ethernet/intel/i40e/i40e_main.c:5113:9: note: in expansion of macro ‘kfree_rcu’
5113 | kfree_rcu(q_vector, rcu);
| ^~~~~~~~~The problem is that the 'rcu' member in 'q_vector' is too far from the start of the structure. Move this member before the CPU mask instead, in all three drivers.
--- drivers/net/ethernet/intel/fm10k/fm10k.h | 3 ++- drivers/net/ethernet/intel/i40e/i40e.h | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe.h | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/fm10k/fm10k.h +2 -1
@@ -189,13 +189,14 @@ struct fm10k_q_vector {struct fm10k_ring_container rx, tx;struct napi_struct napi; +struct rcu_head rcu;/* to avoid race with update stats on free */ +cpumask_t affinity_mask;char name[IFNAMSIZ +9 ];#ifdef CONFIG_DEBUG_FS struct dentry *dbg_q_vector;#endif /* CONFIG_DEBUG_FS */ -struct rcu_head rcu;/* to avoid race with update stats on free */ /* for dynamic allocation of rings associated with this q_vector */ struct fm10k_ring ring[]____cacheline_internodealigned_in_smp ;
drivers/net/ethernet/intel/i40e/i40e.h +1 -1
@@ -961,6 +961,7 @@ struct i40e_q_vector {u16 reg_idx;/* register index of the interrupt */ struct napi_struct napi; +struct rcu_head rcu;/* to avoid race with update stats on free */ struct i40e_ring_container rx;struct i40e_ring_container tx;
@@ -971,7 +972,6 @@ struct i40e_q_vector {cpumask_t affinity_mask;struct irq_affinity_notify affinity_notify; -struct rcu_head rcu;/* to avoid race with update stats on free */ char name[I40E_INT_NAME_STR_LEN ];bool arm_wb_state;bool in_busy_poll;
drivers/net/ethernet/intel/ixgbe/ixgbe.h +2 -1
@@ -458,9 +458,10 @@ struct ixgbe_q_vector {struct ixgbe_ring_container rx, tx;struct napi_struct napi; +struct rcu_head rcu;/* to avoid race with update stats on free */ +cpumask_t affinity_mask;int numa_node; -struct rcu_head rcu;/* to avoid race with update stats on free */ char name[IFNAMSIZ +9 ];/* for dynamic allocation of rings associated with this q_vector */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 110/644 ASoC: Intel: fix SND_SOC_SOF dependencies
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit e837b59f8b411b5baf5e3de7a5aea10b1c545a63 ]
It is currently possible to configure a kernel with all Intel SoC configs as loadable modules, but the board config as built-in. This causes a link failure in the reference to the snd_soc_sof.ko module:
x86_64-linux-ld: sound/soc/intel/boards/sof_rt5682.o: in function `sof_rt5682_hw_params':
sof_rt5682.c:(.text+0x1f9): undefined reference to `sof_dai_get_mclk'
x86_64-linux-ld: sof_rt5682.c:(.text+0x234): undefined reference to `sof_dai_get_bclk'
x86_64-linux-ld: sound/soc/intel/boards/sof_rt5682.o: in function `sof_rt5682_codec_init':
sof_rt5682.c:(.text+0x3e0): undefined reference to `sof_dai_get_mclk'
x86_64-linux-ld: sound/soc/intel/boards/sof_cs42l42.o: in function `sof_cs42l42_hw_params':
sof_cs42l42.c:(.text+0x2a): undefined reference to `sof_dai_get_bclk'
x86_64-linux-ld: sound/soc/intel/boards/sof_nau8825.o: in function `sof_nau8825_hw_params':
sof_nau8825.c:(.text+0x7f): undefined reference to `sof_dai_get_bclk'
x86_64-linux-ld: sound/soc/intel/boards/sof_da7219.o: in function `da7219_codec_init':
sof_da7219.c:(.text+0xbf): undefined reference to `sof_dai_get_mclk'
x86_64-linux-ld: sound/soc/intel/boards/sof_maxim_common.o: in function `max_98373_hw_params':
sof_maxim_common.c:(.text+0x6f9): undefined reference to `sof_dai_get_tdm_slots'
x86_64-linux-ld: sound/soc/intel/boards/sof_realtek_common.o: in function `rt1015_hw_params':
sof_realtek_common.c:(.text+0x54c): undefined reference to `sof_dai_get_bclk'
x86_64-linux-ld: sound/soc/intel/boards/sof_realtek_common.o: in function `rt1308_hw_params':
sof_realtek_common.c:(.text+0x702): undefined reference to `sof_dai_get_mclk'
x86_64-linux-ld: sound/soc/intel/boards/sof_cirrus_common.o: in function `cs35l41_hw_params':
sof_cirrus_common.c:(.text+0x2f): undefined reference to `sof_dai_get_bclk'
Add an optional dependency on SND_SOC_SOF_INTEL_COMMON, to ensure that whenever the SOF support is in a loadable module, none of the board code can be built-in.
This may be be a little heavy-handed, but I also don't see a reason why one would want the boards to be built-in but not the SoC, so it shouldn't actually cause any usability problems.
--- sound/soc/intel/boards/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/boards/Kconfig +1 -1
@@ -11,7 +11,7 @@ menuconfig SND_SOC_INTEL_MACH kernel: saying N will just cause the configurator to skip all the questions about Intel ASoC machine drivers. -if SND_SOC_INTEL_MACH +if SND_SOC_INTEL_MACH && (SND_SOC_SOF_INTEL_COMMON || !SND_SOC_SOF_INTEL_COMMON) config SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES bool "Use more user friendly long card names"
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 111/644 fs_context: fix parameter name in infofc() macro
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: RubenKelevra <[email protected]>
[ Upstream commit ffaf1bf3737f706e4e9be876de4bc3c8fc578091 ]
The macro takes a parameter called "p" but references "fc" internally. This happens to compile as long as callers pass a variable named fc, but breaks otherwise. Rename the first parameter to “fc” to match the usage and to be consistent with warnfc() / errorfc().
--- include/linux/fs_context.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/fs_context.h +1 -1
@@ -209,7 +209,7 @@ void logfc(struct fc_log *log, const char *prefix, char level, const char *fmt,*/ #define infof (fc, fmt, ...) __logfc(fc, 'i', fmt, ## __VA_ARGS__)#define info_plog (p, fmt, ...) __plog(p, 'i', fmt, ## __VA_ARGS__) -#define infofc (p, fmt, ...) __plog((&(fc)->log), 'i', fmt, ## __VA_ARGS__) +#define infofc (fc, fmt, ...) __plog((&(fc)->log), 'i', fmt, ## __VA_ARGS__)/** * warnf - Store supplementary warning message
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 112/644 hfsplus: remove mutex_lock check in hfsplus_free_extents
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yangtao Li <[email protected]>
[ Upstream commit fcb96956c921f1aae7e7b477f2435c56f77a31b4 ]
Syzbot reported an issue in hfsplus filesystem:
------------[ cut here ]------------ WARNING: CPU: 0 PID: 4400 at fs/hfsplus/extents.c:346 hfsplus_free_extents+0x700/0xad0 Call Trace: <TASK> hfsplus_file_truncate+0x768/0xbb0 fs/hfsplus/extents.c:606 hfsplus_write_begin+0xc2/0xd0 fs/hfsplus/inode.c:56 cont_expand_zero fs/buffer.c:2383 [inline] cont_write_begin+0x2cf/0x860 fs/buffer.c:2446 hfsplus_write_begin+0x86/0xd0 fs/hfsplus/inode.c:52 generic_cont_expand_simple+0x151/0x250 fs/buffer.c:2347 hfsplus_setattr+0x168/0x280 fs/hfsplus/inode.c:263 notify_change+0xe38/0x10f0 fs/attr.c:420 do_truncate+0x1fb/0x2e0 fs/open.c:65 do_sys_ftruncate+0x2eb/0x380 fs/open.c:193 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3d/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd
To avoid deadlock, Commit 31651c607151 ("hfsplus: avoid deadlock on file truncation") unlock extree before hfsplus_free_extents(), and add check wheather extree is locked in hfsplus_free_extents().
However, when operations such as hfsplus_file_release, hfsplus_setattr, hfsplus_unlink, and hfsplus_get_block are executed concurrently in different files, it is very likely to trigger the WARN_ON, which will lead syzbot and xfstest to consider it as an abnormality.
The comment above this warning also describes one of the easy triggering situations, which can easily trigger and cause xfstest&syzbot to report errors.
[task A] [task B]
->hfsplus_file_release
->hfsplus_file_truncate
->hfs_find_init
->mutex_lock
->mutex_unlock
->hfsplus_write_begin
->hfsplus_get_block
->hfsplus_file_extend
->hfsplus_ext_read_extent
->hfs_find_init
->mutex_lock
->hfsplus_free_extents
WARN_ON(mutex_is_locked) !!!Several threads could try to lock the shared extents tree. And warning can be triggered in one thread when another thread has locked the tree. This is the wrong behavior of the code and we need to remove the warning.
--- fs/hfsplus/extents.c | 3 --- 1 file changed, 3 deletions(-)
fs/hfsplus/extents.c +0 -3
@@ -342,9 +342,6 @@ static int hfsplus_free_extents(struct super_block *sb,int i;int err =0 ; -/* Mapping the allocation file may lock the extent tree */ -WARN_ON (mutex_is_locked (&HFSPLUS_SB (sb)->ext_tree->tree_lock)); -hfsplus_dump_extent (extent);for (i =0 ; i <8 ; extent++, i++) { count =be32_to_cpu (extent->block_count);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 113/644 Revert "fs/ntfs3: Replace inode_trylock with inode_lock"
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Komarov <[email protected]>
[ Upstream commit a49f0abd8959048af18c6c690b065eb0d65b2d21 ]
This reverts commit 69505fe98f198ee813898cbcaf6770949636430b.
Initially, conditional lock acquisition was removed to fix an xfstest bug that was observed during internal testing. The deadlock reported by syzbot is resolved by reintroducing conditional acquisition. The xfstest bug no longer occurs on kernel version 6.16-rc1 during internal testing. I assume that changes in other modules may have contributed to this.
--- fs/ntfs3/file.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/ntfs3/file.c +4 -1
@@ -398,7 +398,10 @@ static int ntfs_file_mmap(struct file *file, struct vm_area_struct *vma) }if (ni->i_valid < to) { -inode_lock (inode); +if (!inode_trylock (inode)) { + err = -EAGAIN ; + goto out; + } err =ntfs_extend_initialized_size (file, ni, ni->i_valid, to);inode_unlock (inode);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 114/644 ASoC: soc-dai: tidyup return value of snd_soc_xlate_tdm_slot_mask()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuninori Morimoto <[email protected]>
[ Upstream commit f4c77d5af0a9cd0ee22617baa8b49d0e151fbda7 ]
commit 7f1186a8d738661 ("ASoC: soc-dai: check return value at snd_soc_dai_set_tdm_slot()") checks return value of xlate_tdm_slot_mask() (A1)(A2).
/*
* ...
(Y) * TDM mode can be disabled by passing 0 for @slots. In this case @tx_mask,
* @rx_mask and @slot_width will be ignored.
* ...
*/
int snd_soc_dai_set_tdm_slot(...)
{
...
if (...)
(A1) ret = dai->driver->ops->xlate_tdm_slot_mask(...);
else
(A2) ret = snd_soc_xlate_tdm_slot_mask(...);
if (ret)
goto err;
...
}snd_soc_xlate_tdm_slot_mask() (A2) will return -EINVAL if slots was 0 (X), but snd_soc_dai_set_tdm_slot() allow to use it (Y).
(A) static int snd_soc_xlate_tdm_slot_mask(...)
{
...
if (!slots)
(X) return -EINVAL;
...
}Call xlate_tdm_slot_mask() only if slots was non zero.
--- sound/soc/soc-dai.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
sound/soc/soc-dai.c +9 -7
@@ -269,13 +269,15 @@ int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai, {int ret = -ENOTSUPP ; -if (dai->driver->ops && - dai->driver->ops->xlate_tdm_slot_mask) - ret = dai->driver->ops->xlate_tdm_slot_mask (slots, &tx_mask, &rx_mask); -else - ret =snd_soc_xlate_tdm_slot_mask (slots, &tx_mask, &rx_mask); -if (ret) - goto err; +if (slots) { +if (dai->driver->ops && + dai->driver->ops->xlate_tdm_slot_mask) + ret = dai->driver->ops->xlate_tdm_slot_mask (slots, &tx_mask, &rx_mask); +else + ret =snd_soc_xlate_tdm_slot_mask (slots, &tx_mask, &rx_mask); +if (ret) + goto err; + } dai->tx_mask = tx_mask; dai->rx_mask = rx_mask;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 115/644 ASoC: ops: dynamically allocate struct snd_ctl_elem_value
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit 7e10d7242ea8a5947878880b912ffa5806520705 ]
This structure is really too larget to be allocated on the stack:
sound/soc/soc-ops.c:435:5: error: stack frame size (1296) exceeds limit (1280) in 'snd_soc_limit_volume' [-Werror,-Wframe-larger-than]
Change the function to dynamically allocate it instead.
There is probably a better way to do it since only two integer fields inside of that structure are actually used, but this is the simplest rework for the moment.
--- sound/soc/soc-ops.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-)
sound/soc/soc-ops.c +15 -11
@@ -624,28 +624,32 @@ EXPORT_SYMBOL_GPL(snd_soc_get_volsw_range);static int snd_soc_clip_to_platform_max (struct snd_kcontrol *kctl) {struct soc_mixer_control *mc = (struct soc_mixer_control *)kctl->private_value; -struct snd_ctl_elem_value uctl; +struct snd_ctl_elem_value *uctl;int ret;if (!mc->platform_max)return 0 ; - ret = kctl->get (kctl, &uctl); + uctl =kzalloc (sizeof (*uctl),GFP_KERNEL ); +if (!uctl) +return -ENOMEM ; + + ret = kctl->get (kctl, uctl);if (ret <0 ) -return ret; + goto out; -if (uctl.value.integer.value[0 ] > mc->platform_max) - uctl.value.integer.value[0 ] = mc->platform_max; +if (uctl->value.integer.value[0 ] > mc->platform_max) + uctl->value.integer.value[0 ] = mc->platform_max;if (snd_soc_volsw_is_stereo (mc) && - uctl.value.integer.value[1 ] > mc->platform_max) - uctl.value.integer.value[1 ] = mc->platform_max; + uctl->value.integer.value[1 ] > mc->platform_max) + uctl->value.integer.value[1 ] = mc->platform_max; - ret = kctl->put (kctl, &uctl); -if (ret <0 ) -return ret; + ret = kctl->put (kctl, uctl); -return 0 ; +out: +kfree (uctl); +return ret; }/**
Signature · 1 line
2.39.5