5.15.181-rc1 review
Subsystems (4)
Greg Kroah-Hartman
maintainercover 5.15.181-rc1 review
This is the start of the stable review cycle for the 5.15.181 release. There are 373 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, 01 May 2025 16:10:15 +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.181-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.181-rc1
Ross Lagerwall <[email protected]>
PCI: Release resource invalidated by coalescing
Geert Uytterhoeven <[email protected]>
PCI: Fix dropping valid root bus resources with .end = zero
Rob Herring <[email protected]>
PCI: Fix use-after-free in pci_bus_release_domain_nr()
Hannes Reinecke <[email protected]>
nvme: fixup scan failure for non-ANA multipath controllers
Thomas Bogendoerfer <[email protected]>
MIPS: cm: Fix warning if MIPS_CM is disabled
Sebastian Andrzej Siewior <[email protected]>
xdp: Reset bpf_redirect_info before running a xdp's BPF prog.
Tim Huang <[email protected]>
drm/amd/display: fix double free issue during amdgpu module unload
Marek Behún <[email protected]>
net: dsa: mv88e6xxx: enable .port_set_policy() for 6320 family
Marek Behún <[email protected]>
net: dsa: mv88e6xxx: enable PVT for 6321 switch
Marek Behún <[email protected]>
net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family
Marek Behún <[email protected]>
crypto: atmel-sha204a - Set hwrng quality to lowest possible
Ian Abbott <[email protected]>
comedi: jr3_pci: Fix synchronous deletion of timer
Dave Kleikamp <[email protected]>
jfs: define xtree root and page independently
David Hildenbrand <[email protected]>
s390/virtio_ccw: Don't allocate/assign airqs for non-existing queues
Meir Elisha <[email protected]>
md/raid1: Add check for missing source disk in process_checks()
Mostafa Saleh <[email protected]>
ubsan: Fix panic from test_ubsan_out_of_bounds
Yunlong Xing <[email protected]>
loop: aio inherit the ioprio of original request
Igor Pylypiv <[email protected]>
scsi: pm80xx: Set phy_attached to zero when device is gone
Xingui Yang <[email protected]>
scsi: hisi_sas: Fix I/O errors caused by hardware port ID changes
Ojaswin Mujoo <[email protected]>
ext4: make block validity check resistent to sb bh corruption
Daniel Wagner <[email protected]>
nvmet-fc: put ref when assoc->del_work is already scheduled
Daniel Wagner <[email protected]>
nvmet-fc: take tgtport reference only once
Josh Poimboeuf <[email protected]>
x86/bugs: Don't fill RSB on context switch with eIBRS
Josh Poimboeuf <[email protected]>
x86/bugs: Don't fill RSB on VMEXIT with eIBRS+retpoline
Josh Poimboeuf <[email protected]>
x86/bugs: Use SBPB in write_ibpb() if applicable
Qiuxu Zhuo <[email protected]>
selftests/mincore: Allow read-ahead pages to reach the end of the file
Josh Poimboeuf <[email protected]>
objtool: Stop UNRET validation on UD2
Hannes Reinecke <[email protected]>
nvme: re-read ANA log page after ns scan completes
Jean-Marc Eurin <[email protected]>
ACPI PPTT: Fix coding mistakes in a couple of sizeof() calls
Hannes Reinecke <[email protected]>
nvme: requeue namespace scan on missed AENs
Jason Andryuk <[email protected]>
xen: Change xen-acpi-processor dom0 dependency
Ming Lei <[email protected]>
selftests: ublk: fix test_stripe_04
Xiaogang Chen <[email protected]>
udmabuf: fix a buf size overflow issue during udmabuf creation
Thomas Weißschuh <[email protected]>
KVM: s390: Don't use %pK through tracepoints
Oleg Nesterov <[email protected]>
sched/isolation: Make CONFIG_CPU_ISOLATION depend on CONFIG_SMP
Arnd Bergmann <[email protected]>
ntb: reduce stack usage in idt_scan_mws
Al Viro <[email protected]>
qibfs: fix _another_ leak
Josh Poimboeuf <[email protected]>
objtool, ASoC: codecs: wcd934x: Remove potential undefined behavior in wcd934x_slim_irq_handler()
Chenyuan Yang <[email protected]>
usb: gadget: aspeed: Add NULL pointer check in ast_vhub_init_dev()
Michal Pecio <[email protected]>
usb: xhci: Avoid Stop Endpoint retry loop if the endpoint seems Running
Vinicius Costa Gomes <[email protected]>
dmaengine: dmatest: Fix dmatest waiting less when interrupted
John Stultz <[email protected]>
sound/virtio: Fix cancel_sync warnings on uninitialized work_structs
Andy Shevchenko <[email protected]>
usb: dwc3: gadget: Avoid using reserved endpoints on Intel Merrifield
Edward Adam Davis <[email protected]>
fs/ntfs3: Fix WARNING in ntfs_extend_initialized_size
Alexander Stein <[email protected]>
usb: host: max3421-hcd: Add missing spi_device_id table
Haoxiang Li <[email protected]>
s390/tty: Fix a potential memory leak bug
Haoxiang Li <[email protected]>
s390/sclp: Add check for get_zeroed_page()
Yu-Chun Lin <[email protected]>
parisc: PDT: Fix missing prototype warning
Heiko Stuebner <[email protected]>
clk: check for disabled clock-provider in of_clk_get_hw_from_clkspec()
Herbert Xu <[email protected]>
crypto: null - Use spin lock instead of mutex
Gregory CLEMENT <[email protected]>
MIPS: cm: Detect CM quirks from device tree
Oliver Neukum <[email protected]>
USB: wdm: add annotation
Oliver Neukum <[email protected]>
USB: wdm: wdm_wwan_port_tx_complete mutex in atomic context
Oliver Neukum <[email protected]>
USB: wdm: close race between wdm_open and wdm_wwan_port_stop
Oliver Neukum <[email protected]>
USB: wdm: handle IO errors in wdm_wwan_port_start
Oliver Neukum <[email protected]>
USB: VLI disk crashes if LPM is used
Miao Li <[email protected]>
usb: quirks: Add delay init quirk for SanDisk 3.2Gen1 Flash Drive
Miao Li <[email protected]>
usb: quirks: add DELAY_INIT quirk for Silicon Motion Flash Drive
Frode Isaksen <[email protected]>
usb: dwc3: gadget: check that event count does not exceed event buffer length
Huacai Chen <[email protected]>
USB: OHCI: Add quirk for LS7A OHCI controller (rev 0x02)
Fedor Pchelkin <[email protected]>
usb: chipidea: ci_hdrc_imx: implement usb_phy_init() error handling
Fedor Pchelkin <[email protected]>
usb: chipidea: ci_hdrc_imx: fix call balance of regulator routines
Fedor Pchelkin <[email protected]>
usb: chipidea: ci_hdrc_imx: fix usbmisc handling
Ralph Siemsen <[email protected]>
usb: cdns3: Fix deadlock when using NCM gadget
Craig Hesling <[email protected]>
USB: serial: simple: add OWON HDS200 series oscilloscope support
Adam Xue <[email protected]>
USB: serial: option: add Sierra Wireless EM9291
Michael Ehrenreich <[email protected]>
USB: serial: ftdi_sio: add support for Abacus Electrics Optical Probe
Ryo Takakura <[email protected]>
serial: sifive: lock port in startup()/shutdown() callbacks
Sean Christopherson <[email protected]>
KVM: x86: Reset IRTE to host control if *new* route isn't postable
Alexander Usyskin <[email protected]>
mei: me: add panther lake H DID
Oliver Neukum <[email protected]>
USB: storage: quirk for ADATA Portable HDD CH94
Haoxiang Li <[email protected]>
mcb: fix a double free bug in chameleon_parse_gdd()
Sean Christopherson <[email protected]>
KVM: SVM: Allocate IR data using atomic allocation
Roman Li <[email protected]>
drm/amd/display: Fix gpu reset in multidisplay config
Fiona Klute <[email protected]>
net: phy: microchip: force IRQ polling mode for lan88xx
Oleksij Rempel <[email protected]>
net: selftests: initialize TCP header and skb payload with zero
Halil Pasic <[email protected]>
virtio_console: fix missing byte order handling for cols and rows
Björn Töpel <[email protected]>
riscv: uprobes: Add missing fence.i after building the XOL buffer
Sean Christopherson <[email protected]>
iommu/amd: Return an error if vCPU affinity is set for non-vCPU IRTE
Daniel Golle <[email protected]>
net: dsa: mt7530: sync driver-specific behavior of MT7531 variants
Cong Wang <[email protected]>
net_sched: hfsc: Fix a potential UAF in hfsc_dequeue() too
Cong Wang <[email protected]>
net_sched: hfsc: Fix a UAF vulnerability in class handling
Tung Nguyen <[email protected]>
tipc: fix NULL pointer dereference in tipc_mon_reinit_self()
Qingfang Deng <[email protected]>
net: phy: leds: fix memory leak
Marc Zyngier <[email protected]>
cpufreq: cppc: Fix invalid return value in .get() callback
Henry Martin <[email protected]>
cpufreq: scpi: Fix null-ptr-deref in scpi_cpufreq_get_rate()
Henry Martin <[email protected]>
cpufreq: scmi: Fix null-ptr-deref in scmi_cpufreq_get_rate()
Arnd Bergmann <[email protected]>
dma/contiguous: avoid warning about unused size_bytes
Akhil P Oommen <[email protected]>
drm/msm/a6xx: Fix stale rpmh votes from GPU
Akhil P Oommen <[email protected]>
drm/msm/a6xx: Avoid gx gbit halt during rpm suspend
Akhil P Oommen <[email protected]>
drm/msm/a6xx: Handle GMU prepare-slumber hfi failure
Akhil P Oommen <[email protected]>
drm/msm/a6xx: Improve gpu recovery sequence
Peter Collingbourne <[email protected]>
string: Add load_unaligned_zeropad() code path to sized_strscpy()
Alexander Potapenko <[email protected]>
kmsan: disable strscpy() optimization under KMSAN
Mark Brown <[email protected]>
selftests/mm: generate a temporary mountpoint for cgroup filesystem
Denis Arefev <[email protected]>
ksmbd: Prevent integer overflow in calculation of deadtime
Ma Ke <[email protected]>
PCI: Fix reference leak in pci_register_host_bridge()
Pali Rohár <[email protected]>
PCI: Assign PCI domain IDs by ida_alloc()
Kai-Heng Feng <[email protected]>
PCI: Coalesce host bridge contiguous apertures
Guixin Liu <[email protected]>
gpio: tegra186: fix resource handling in ACPI probe path
Thierry Reding <[email protected]>
gpio: tegra186: Force one interrupt per bank
Roman Smirnov <[email protected]>
cifs: fix integer overflow in match_server()
Alexandra Diupina <[email protected]>
cifs: avoid NULL pointer dereference in dbg call
Enzo Matsumiya <[email protected]>
cifs: print TIDs as hex
Herve Codina <[email protected]>
backlight: led_bl: Hold led_access lock when calling led_sysfs_disable()
Uwe Kleine-König <[email protected]>
backlight: led_bl: Convert to platform remove callback returning void
Sergiu Cuciurean <[email protected]>
iio: adc: ad7768-1: Fix conversion result sign
Jonathan Cameron <[email protected]>
iio: adc: ad7768-1: Move setting of val a bit later to avoid unnecessary return value check
Chenyuan Yang <[email protected]>
soc: samsung: exynos-chipid: Add NULL pointer check in exynos_chipid_probe()
Sam Protsenko <[email protected]>
soc: samsung: exynos-chipid: Pass revision reg offsets
Krzysztof Kozlowski <[email protected]>
soc: samsung: exynos-chipid: avoid soc_device_to_device()
Marek Behún <[email protected]>
net: dsa: mv88e6xxx: fix VTU methods for 6320 family
Haoxiang Li <[email protected]>
auxdisplay: hd44780: Fix an API misuse in hd44780.c
Uwe Kleine-König <[email protected]>
auxdisplay: hd44780: Convert to platform remove callback returning void
Murad Masimov <[email protected]>
media: streamzap: fix race between device disconnection and urb callback
Sean Young <[email protected]>
media: streamzap: remove unused struct members
Sean Young <[email protected]>
media: streamzap: less chatter
Sean Young <[email protected]>
media: streamzap: no need for usb pid/vid in device name
Sean Young <[email protected]>
media: streamzap: remove unnecessary ir_raw_event_reset and handle
Thorsten Leemhuis <[email protected]>
module: sign with sha512 instead of sha1 by default
Luiz Augusto von Dentz <[email protected]>
Bluetooth: SCO: Fix UAF on sco_sock_timeout
Nathan Chancellor <[email protected]>
f2fs: Add inline to f2fs_build_fault_attr() stub
James Smart <[email protected]>
scsi: lpfc: Fix null pointer dereference after failing to issue FLOGI and PLOGI
Kunwu Chan <[email protected]>
pmdomain: ti: Add a null pointer check to the omap_prm_domain_init
Chao Yu <[email protected]>
f2fs: check validation of fault attrs in f2fs_build_fault_attr()
Kirill A. Shutemov <[email protected]>
mm: fix apply_to_existing_page_range()
Oleg Nesterov <[email protected]>
fs/proc: do_task_stat: use sig->stats_lock to gather the threads/children stats
Chris Wilson <[email protected]>
drm/i915/gt: Cleanup partial engine discovery failures
Ming-Hung Tsai <[email protected]>
dm cache: fix flushing uninitialized delayed_work on cache_ctr error
Pei Li <[email protected]>
jfs: Fix shift-out-of-bounds in dbDiscardAG
WangYuli <[email protected]>
MIPS: ds1287: Match ds1287_set_base_clock() function types
WangYuli <[email protected]>
MIPS: cevt-ds1287: Add missing ds1287.h include
WangYuli <[email protected]>
MIPS: dec: Declare which_prom() as static
Eric Dumazet <[email protected]>
net: defer final 'struct net' free in netns dismantle
Guixin Liu <[email protected]>
scsi: ufs: bsg: Set bsg_queue to NULL after removal
Tuo Li <[email protected]>
scsi: lpfc: Fix a possible data race in lpfc_unregister_fcf_rescan()
Ilya Maximets <[email protected]>
openvswitch: fix lockup on tx to unregistering netdev with carrier
Felix Huettner <[email protected]>
net: openvswitch: fix race on port output
Chen Hanxiao <[email protected]>
ipvs: properly dereference pe in ip_vs_add_service
Xiaxi Shen <[email protected]>
ext4: fix timer use-after-free on failed mount
Li Nan <[email protected]>
blk-iocost: do not WARN if iocg was already offlined
Yu Kuai <[email protected]>
blk-cgroup: support to track if policy is online
Hou Tao <[email protected]>
bpf: Check rcu_read_lock_trace_held() before calling bpf map helpers
Andrii Nakryiko <[email protected]>
bpf: avoid holding freeze_mutex during mmap operation
Qun-Wei Lin <[email protected]>
sched/task_stack: fix object_is_on_stack() for KASAN tagged pointers
Paulo Alcantara <[email protected]>
smb: client: fix potential UAF in cifs_stats_proc_show()
Paulo Alcantara <[email protected]>
smb: client: fix potential deadlock when releasing mids
ChenXiaoSong <[email protected]>
smb/server: fix potential null-ptr-deref of lease_ctx_info in smb2_open()
Paulo Alcantara <[email protected]>
smb: client: fix NULL ptr deref in crypto_aead_setkey()
Enzo Matsumiya <[email protected]>
smb: client: fix UAF in async decryption
Zhang Xiaoxu <[email protected]>
cifs: Fix UAF in cifs_demultiplex_thread()
Paulo Alcantara <[email protected]>
smb: client: fix use-after-free bug in cifs_debug_data_proc_show()
Eric Dumazet <[email protected]>
net: make sock_inuse_add() available
Namjae Jeon <[email protected]>
ksmbd: fix potencial out-of-bounds when buffer offset is invalid
Paulo Alcantara <[email protected]>
smb: client: fix potential UAF in cifs_dump_full_key()
WangYuli <[email protected]>
nvmet-fc: Remove unused functions
Mickaël Salaün <[email protected]>
landlock: Add the errata interface
Vitaly Prosyak <[email protected]>
drm/amdgpu: fix usage slab after free
Srinivasan Shanmugam <[email protected]>
drm/amd/display: Add null checks for 'stream' and 'plane' before dereferencing
Srinivasan Shanmugam <[email protected]>
drm/amd/display: Fix out-of-bounds access in 'dcn21_link_encoder_create'
Hersen Wu <[email protected]>
drm/amd/display: Stop amdgpu_dm initialize when link nums greater than max_links
Kang Yang <[email protected]>
wifi: ath10k: avoid NULL pointer error during sdio remove
Miaoqian Lin <[email protected]>
phy: tegra: xusb: Fix return value of tegra_xusb_find_port_node function
Nathan Lynch <[email protected]>
powerpc/rtas: Prevent Spectre v1 gadget construction in sys_rtas()
Ard Biesheuvel <[email protected]>
x86/pvh: Call C code via the kernel virtual mapping
Souradeep Chakrabarti <[email protected]>
net: mana: Fix error handling in mana_create_txq/rxq's NAPI cleanup
Michal Schmidt <[email protected]>
bnxt_re: avoid shift undefined behavior in bnxt_qplib_alloc_init_hwq
Rémi Denis-Courmont <[email protected]>
phonet/pep: fix racy skb_queue_empty() use
Trond Myklebust <[email protected]>
filemap: Fix bounds checking in filemap_read()
Wang Liang <[email protected]>
net: fix crash when config small gso_max_size/gso_ipv4_max_size
Paolo Abeni <[email protected]>
ipv6: release nexthop on device removal
Kunihiko Hayashi <[email protected]>
misc: pci_endpoint_test: Fix 'irq_type' to convey the correct type
Kunihiko Hayashi <[email protected]>
misc: pci_endpoint_test: Fix displaying 'irq_type' after 'request_irq' error
Kunihiko Hayashi <[email protected]>
misc: pci_endpoint_test: Avoid issue of interrupts remaining after request_irq error
Matthieu Baerts (NGI0) <[email protected]>
mptcp: sockopt: fix getting IPV6_V6ONLY
Nathan Chancellor <[email protected]>
kbuild: Add '-fno-builtin-wcslen'
Rafael J. Wysocki <[email protected]>
cpufreq: Reference count policy in cpufreq_update_limits()
Mark Rutland <[email protected]>
KVM: arm64: Eagerly switch ZCR_EL{1,2}Fuad Tabba <[email protected]>
KVM: arm64: Calculate cptr_el2 traps on activating traps
Mark Rutland <[email protected]>
KVM: arm64: Remove VHE host restore of CPACR_EL1.ZEN
Mark Rutland <[email protected]>
KVM: arm64: Remove host FPSIMD saving for non-protected KVM
Mark Rutland <[email protected]>
KVM: arm64: Unconditionally save+flush host FPSIMD/SVE/SME state
Mark Brown <[email protected]>
arm64/fpsimd: Stop using TIF_SVE to manage register saving in KVM
Mark Brown <[email protected]>
arm64/fpsimd: Have KVM explicitly say which FP registers to save
Mark Brown <[email protected]>
arm64/fpsimd: Track the saved FPSIMD state type separately to TIF_SVE
Mark Brown <[email protected]>
KVM: arm64: Discard any SVE state when entering KVM guests
Marc Zyngier <[email protected]>
KVM: arm64: Always start with clearing SVE flag on load
Mark Brown <[email protected]>
KVM: arm64: Get rid of host SVE tracking/saving
Rolf Eike Beer <[email protected]>
drm/sti: remove duplicate object names
Chris Bainbridge <[email protected]>
drm/nouveau: prime: fix ttm_bo_delayed_delete oops
Matthew Auld <[email protected]>
drm/amdgpu/dma_buf: fix page_link check
Denis Arefev <[email protected]>
drm/amd/pm/powerplay/hwmgr/vega20_thermal: Prevent division by zero
Denis Arefev <[email protected]>
drm/amd/pm/swsmu/smu13/smu_v13_0: Prevent division by zero
Denis Arefev <[email protected]>
drm/amd/pm/powerplay/hwmgr/smu7_thermal: Prevent division by zero
Denis Arefev <[email protected]>
drm/amd/pm/powerplay: Prevent division by zero
Denis Arefev <[email protected]>
drm/amd/pm: Prevent division by zero
Nikita Zhandarovich <[email protected]>
drm/repaper: fix integer overflows in repeat functions
Kan Liang <[email protected]>
perf/x86/intel/uncore: Fix the scale of IIO free running counters on SPR
Kan Liang <[email protected]>
perf/x86/intel/uncore: Fix the scale of IIO free running counters on ICX
Kan Liang <[email protected]>
perf/x86/intel/uncore: Fix the scale of IIO free running counters on SNR
Dapeng Mi <[email protected]>
perf/x86/intel: Allow to update user space GPRs from PEBS records
Xiangsheng Hou <[email protected]>
virtiofs: add filesystem context source name check
Steven Rostedt <[email protected]>
tracing: Fix filter string testing
Nathan Chancellor <[email protected]>
riscv: Avoid fortify warning in syscall_get_arguments()
Baoquan He <[email protected]>
mm/gup: fix wrongly calculated returned value in fault_in_safe_writeable()
Thomas Weißschuh <[email protected]>
loop: LOOP_SET_FD: send uevents for partitions
Thomas Weißschuh <[email protected]>
loop: properly send KOBJ_CHANGED uevent for disk device
Edward Adam Davis <[email protected]>
isofs: Prevent the use of too small fid
Thadeu Lima de Souza Cascardo <[email protected]>
i2c: cros-ec-tunnel: defer probe if parent EC is not present
Vasiliy Kovalev <[email protected]>
hfs/hfsplus: fix slab-out-of-bounds in hfs_bnode_read_key
Herbert Xu <[email protected]>
crypto: caam/qi - Fix drv_ctx refcount bug
Johannes Kimmel <[email protected]>
btrfs: correctly escape subvol in btrfs_show_options()
Li Lingfeng <[email protected]>
nfsd: decrease sc_count directly if fail to queue dl_recall
Eric Biggers <[email protected]>
nfs: add missing selections of CONFIG_CRC32
Jeff Layton <[email protected]>
nfs: move nfs_fhandle_hash to common include file
Denis Arefev <[email protected]>
asus-laptop: Fix an uninitialized variable
Srinivas Kandagatla <[email protected]>
ASoC: codecs:lpass-wsa-macro: Fix logic of enabling vi channels
Srinivas Kandagatla <[email protected]>
ASoC: codecs:lpass-wsa-macro: Fix vi feedback rate
Alex Williamson <[email protected]>
Revert "PCI: Avoid reset when disabled via sysfs"
Andreas Gruenbacher <[email protected]>
writeback: fix false warning in inode_to_wb()
Rafael J. Wysocki <[email protected]>
cpufreq/sched: Fix the usage of CPUFREQ_NEED_UPDATE_LIMITS
WangYuli <[email protected]>
riscv: KGDB: Remove ".option norvc/.option rvc" for kgdb_compiled_break
WangYuli <[email protected]>
riscv: KGDB: Do not inline arch_kgdb_breakpoint()
Björn Töpel <[email protected]>
riscv: Properly export reserved regions in /proc/iomem
Vladimir Oltean <[email protected]>
net: dsa: avoid refcount warnings when ds->ops->tag_8021q_vlan_del() fails
Vladimir Oltean <[email protected]>
net: dsa: mv88e6xxx: avoid unregistering devlink regions which were never registered
Jonas Gorski <[email protected]>
net: b53: enable BPDU reception for management port
Abdun Nihaal <[email protected]>
cxgb4: fix memory leak in cxgb4_init_ethtool_filters() error path
Ilya Maximets <[email protected]>
net: openvswitch: fix nested key length validation in the set() action
Matt Johnston <[email protected]>
net: mctp: Set SOCK_RCU_FREE
Christopher S M Hall <[email protected]>
igc: cleanup PTP module if probe fails
Christopher S M Hall <[email protected]>
igc: handle the IGC_PTP_ENABLED flag correctly
Christopher S M Hall <[email protected]>
igc: move ktime snapshot into PTM retry loop
Christopher S M Hall <[email protected]>
igc: fix PTM cycle trigger logic
Johannes Berg <[email protected]>
Revert "wifi: mac80211: Update skb's control block key in ieee80211_tx_dequeue()"
Frédéric Danis <[email protected]>
Bluetooth: l2cap: Check encryption key size on incoming connection
Dan Carpenter <[email protected]>
Bluetooth: btrtl: Prevent potential NULL dereference
Luiz Augusto von Dentz <[email protected]>
Bluetooth: hci_event: Fix sending MGMT_EV_DEVICE_FOUND for invalid address
Shay Drory <[email protected]>
RDMA/core: Silence oversized kvmalloc() warning
Chengchang Tang <[email protected]>
RDMA/hns: Fix wrong maximum DMA segment size
Yue Haibing <[email protected]>
RDMA/usnic: Fix passing zero to PTR_ERR in usnic_ib_pci_probe()
Yu Kuai <[email protected]>
md/raid10: fix missing discard IO accounting
Miaoqian Lin <[email protected]>
scsi: iscsi: Fix missing scsi_host_put() in error path
Abdun Nihaal <[email protected]>
wifi: wl1251: fix memory leak in wl1251_tx_work
Remi Pommarel <[email protected]>
wifi: mac80211: Purge vif txq in ieee80211_do_stop()
Remi Pommarel <[email protected]>
wifi: mac80211: Update skb's control block key in ieee80211_tx_dequeue()
Abdun Nihaal <[email protected]>
wifi: at76c50x: fix use after free access in at76_disconnect
Xingui Yang <[email protected]>
scsi: hisi_sas: Enable force phy when SATA disk directly connected
John Garry <[email protected]>
scsi: libsas: Add struct sas_tmf_task
John Garry <[email protected]>
scsi: libsas: Delete lldd_clear_aca callback
John Garry <[email protected]>
scsi: hisi_sas: Fix setting of hisi_sas_slot.is_internal
John Garry <[email protected]>
scsi: hisi_sas: Factor out task prep and delivery code
John Garry <[email protected]>
scsi: hisi_sas: Pass abort structure for internal abort
John Garry <[email protected]>
scsi: hisi_sas: Start delivery hisi_sas_task_exec() directly
Arseniy Krasnov <[email protected]>
Bluetooth: hci_uart: Fix another race during initialization
Myrrh Periwinkle <[email protected]>
x86/e820: Fix handling of subpage regions when calculating nosave ranges in e820__register_nosave_regions()
Nathan Chancellor <[email protected]>
ACPI: platform-profile: Fix CFI violation when accessing sysfs files
Douglas Anderson <[email protected]>
arm64: errata: Add newer ARM cores to the spectre_bhb_loop_affected() lists
Kaixin Wang <[email protected]>
HSI: ssi_protocol: Fix use after free vulnerability in ssi_protocol Driver Due to Race Condition
Stephan Gerhold <[email protected]>
pinctrl: qcom: Clear latched interrupt status when changing IRQ type
Ma Ke <[email protected]>
PCI: Fix reference leak in pci_alloc_child_bus()
Stanimir Varbanov <[email protected]>
PCI: brcmstb: Fix missing of_node_put() in brcm_pcie_probe()
Zijun Hu <[email protected]>
of/irq: Fix device node refcount leakages in of_irq_init()
Zijun Hu <[email protected]>
of/irq: Fix device node refcount leakage in API irq_of_parse_and_map()
Zijun Hu <[email protected]>
of/irq: Fix device node refcount leakages in of_irq_count()
Fedor Pchelkin <[email protected]>
ntb: use 64-bit arithmetic for the MSI doorbell mask
Krzysztof Kozlowski <[email protected]>
gpio: zynq: Fix wakeup source leaks on device unbind
zhoumin <[email protected]>
ftrace: Add cond_resched() to ftrace_graph_set_hash()
Mikulas Patocka <[email protected]>
dm-integrity: set ti->error on memory allocation failure
Tom Lendacky <[email protected]>
crypto: ccp - Fix check for the primary ASP device
Trevor Woerner <[email protected]>
thermal/drivers/rockchip: Add missing rk3328 mapping entry
Ricardo Cañuelo Navarro <[email protected]>
sctp: detect and prevent references to a freed transport in sendmsg
Shuai Xue <[email protected]>
mm/hwpoison: do not send SIGBUS to processes with recovered clean pages
Mathieu Desnoyers <[email protected]>
mm: add missing release barrier on PGDAT_RECLAIM_LOCKED unlock
Ryan Roberts <[email protected]>
sparc/mm: disable preemption in lazy mmu mode
Chen-Yu Tsai <[email protected]>
arm64: dts: mediatek: mt8173: Fix disp-pwm compatible string
Wentao Liang <[email protected]>
mtd: rawnand: Add status chack in r852_ready()
Wentao Liang <[email protected]>
mtd: inftlcore: Add error check for inftl_read_oob()
Matthieu Baerts (NGI0) <[email protected]>
mptcp: only inc MPJoinAckHMacFailure for HMAC failures
Gang Yan <[email protected]>
mptcp: fix NULL pointer in can_accept_new_subflow
T Pratham <[email protected]>
lib: scatterlist: fix sg_split_phys to preserve original scatterlist offsets
Boqun Feng <[email protected]>
locking/lockdep: Decrease nr_unused_locks if lock unused in zap_class()
Chenyuan Yang <[email protected]>
mfd: ene-kb3930: Fix a potential NULL pointer dereference
Jan Kara <[email protected]>
jbd2: remove wrong sb->s_sequence check
Manjunatha Venkatesh <[email protected]>
i3c: Add NULL pointer check in i3c_master_queue_ibi()
Stanley Chu <[email protected]>
i3c: master: svc: Use readsb helper for reading MDB
Si-Wei Liu <[email protected]>
vdpa/mlx5: Fix oversized null mkey longer than 32bit
Artem Sadovnikov <[email protected]>
ext4: fix off-by-one error in do_split
Jeff Hugo <[email protected]>
bus: mhi: host: Fix race between unprepare and queue_buf
Alexey Klimov <[email protected]>
ASoC: qdsp6: q6asm-dai: fix q6asm_dai_compr_set_params error path
Gavrilov Ilia <[email protected]>
wifi: mac80211: fix integer overflow in hwmp_route_info_get()
Haoxiang Li <[email protected]>
wifi: mt76: Add check for devm_kstrdup()
Alexandre Torgue <[email protected]>
clocksource/drivers/stm32-lptimer: Use wakeup capable instead of init wakeup
Jiasheng Jiang <[email protected]>
mtd: Replace kcalloc() with devm_kcalloc()
Marek Behún <[email protected]>
net: dsa: mv88e6xxx: workaround RGMII transmit delay erratum for 6320 family
Jiasheng Jiang <[email protected]>
mtd: Add check for devm_kcalloc()
Vikash Garodia <[email protected]>
media: venus: hfi_parser: refactor hfi packet parsing logic
Vikash Garodia <[email protected]>
media: venus: hfi_parser: add check to avoid out of bound access
Sakari Ailus <[email protected]>
media: i2c: ov7251: Introduce 1 ms delay between regulators and en GPIO
Sakari Ailus <[email protected]>
media: i2c: ov7251: Set enable GPIO low in probe
Sakari Ailus <[email protected]>
media: i2c: ccs: Set the device's runtime PM status correctly in probe
Sakari Ailus <[email protected]>
media: i2c: ccs: Set the device's runtime PM status correctly in remove
Karina Yankevich <[email protected]>
media: v4l2-dv-timings: prevent possible overflow in v4l2_detect_gtf()
Murad Masimov <[email protected]>
media: streamzap: prevent processing IR data on URB failure
Kamal Dasu <[email protected]>
mtd: rawnand: brcmnand: fix PM resume warning
Miquel Raynal <[email protected]>
spi: cadence-qspi: Fix probe on AM62A LP SK
Douglas Anderson <[email protected]>
arm64: errata: Add KRYO 2XX/3XX/4XX silver cores to Spectre BHB safe list
Douglas Anderson <[email protected]>
arm64: errata: Assume that unknown CPUs _are_ vulnerable to Spectre BHB
Douglas Anderson <[email protected]>
arm64: errata: Add QCOM_KRYO_4XX_GOLD to the spectre_bhb_k24_list
Douglas Anderson <[email protected]>
arm64: cputype: Add MIDR_CORTEX_A76AE
Jan Beulich <[email protected]>
xenfs/xensyms: respect hypervisor's "next" indication
Yuan Can <[email protected]>
media: siano: Fix error handling in smsdvb_module_init()
Matthew Majewski <[email protected]>
media: vim2m: print device name after registering device
Vikash Garodia <[email protected]>
media: venus: hfi: add check to handle incorrect queue size
Vikash Garodia <[email protected]>
media: venus: hfi: add a check to handle OOB in sfr region
Niklas Söderlund <[email protected]>
media: i2c: adv748x: Fix test pattern selection mask
Jann Horn <[email protected]>
ext4: don't treat fhandle lookup of ea_inode as FS corruption
Willem de Bruijn <[email protected]>
bpf: support SKF_NET_OFF and SKF_LL_OFF on skb frags
Ben Dooks <[email protected]>
bpf: Add endian modifiers to fix endian warnings
Uwe Kleine-König <[email protected]>
pwm: fsl-ftm: Handle clk_get_rate() returning 0
Uwe Kleine-König <[email protected]>
pwm: rcar: Improve register calculation
Geert Uytterhoeven <[email protected]>
pwm: rcar: Simplify multiplication/shift logic
Josh Poimboeuf <[email protected]>
pwm: mediatek: Prevent divide-by-zero in pwm_mediatek_config()
Ayush Jain <[email protected]>
ktest: Fix Test Failures Due to Missing LOG_FILE Directories
Leonid Arapov <[email protected]>
fbdev: omapfb: Add 'plane' value check
Ryo Takakura <[email protected]>
PCI: vmd: Make vmd_dev::cfg_lock a raw_spinlock_t type
AngeloGioacchino Del Regno <[email protected]>
drm/mediatek: mtk_dpi: Explicitly manage TVD clock in power on/off
Philip Yang <[email protected]>
drm/amdkfd: Fix pqm_destroy_queue race with GPU reset
David Yat Sin <[email protected]>
drm/amdkfd: clamp queue size to minimum
Lucas De Marchi <[email protected]>
drivers: base: devres: Allow to release group on device release
Luca Ceresoli <[email protected]>
drm/bridge: panel: forbid initializing a panel with unknown connector type
Andrew Wyatt <[email protected]>
drm: panel-orientation-quirks: Add new quirk for GPD Win 2
Andrew Wyatt <[email protected]>
drm: panel-orientation-quirks: Add support for AYANEO 2S
Zhikai Zhai <[email protected]>
drm/amd/display: Update Cursor request mode to the beginning prefetch always
Abhinav Kumar <[email protected]>
drm: allow encoder mode_set even when connectors change for crtc
Arseniy Krasnov <[email protected]>
Bluetooth: hci_uart: fix race during initialization
Gabriele Paoloni <[email protected]>
tracing: fix return value in __ftrace_event_enable_disable for TRACE_REG_UNREGISTER
Stanislav Fomichev <[email protected]>
net: vlan: don't propagate flags on open
Icenowy Zheng <[email protected]>
wifi: mt76: mt76x2u: add TP-Link TL-WDN6200 ID to device table
Kai Mäkisara <[email protected]>
scsi: st: Fix array overflow in st_setup()
Bhupesh <[email protected]>
ext4: ignore xattrs past end
Ojaswin Mujoo <[email protected]>
ext4: protect ext4_release_dquot against freezing
Daniel Kral <[email protected]>
ahci: add PCI ID for Marvell 88SE9215 SATA Controller
Chao Yu <[email protected]>
f2fs: fix to avoid out-of-bounds access in f2fs_truncate_inode_blocks()
Niklas Cassel <[email protected]>
ata: libata-eh: Do not use ATAPI DMA for a device limited to PIO mode
Edward Adam Davis <[email protected]>
jfs: add sanity check for agwidth in dbMount
Edward Adam Davis <[email protected]>
jfs: Prevent copying of nlink with value 0 from disk inode
Rand Deeb <[email protected]>
fs/jfs: Prevent integer overflow in AG size calculation
Rand Deeb <[email protected]>
fs/jfs: cast inactags to s64 to prevent potential overflow
Zhongqiu Han <[email protected]>
jfs: Fix uninit-value access of imap allocated in the diMount() function
Jason Xing <[email protected]>
page_pool: avoid infinite loop to schedule delayed worker
Ricard Wanderlof <[email protected]>
ALSA: usb-audio: Fix CME quirk for UF series keyboards
Shengjiu Wang <[email protected]>
ASoC: fsl_audmix: register card device depends on 'dais' property
Maxim Mikityanskiy <[email protected]>
ALSA: hda: intel: Fix Optimus when GPU has no sound
Tomasz Pakuła <[email protected]>
HID: pidff: Fix null pointer dereference in pidff_find_fields
Tomasz Pakuła <[email protected]>
HID: pidff: Do not send effect envelope if it's empty
Tomasz Pakuła <[email protected]>
HID: pidff: Convert infinite length from Linux API to PID standard
Kees Cook <[email protected]>
xen/mcelog: Add __nonstring annotations for unterminated strings
Douglas Anderson <[email protected]>
arm64: cputype: Add QCOM_CPU_PART_KRYO_3XX_GOLD
Mark Rutland <[email protected]>
perf: arm_pmu: Don't disable counter in armpmu_add()
Max Grobecker <[email protected]>
x86/cpu: Don't clear X86_FEATURE_LAHF_LM flag in init_amd_k8() on AMD when running in a virtual machine
Zhongqiu Han <[email protected]>
pm: cpupower: bench: Prevent NULL dereference on malloc failure
Trond Myklebust <[email protected]>
umount: Allow superblock owners to force umount
Florian Westphal <[email protected]>
nft_set_pipapo: fix incorrect avx2 match of 5th field octet
Arnaud Lecomte <[email protected]>
net: ppp: Add bound checking for skb data on ppp_sync_txmung
Daniel Wagner <[email protected]>
nvmet-fcloop: swap list_add_tail arguments
Wentao Liang <[email protected]>
ata: sata_sx4: Add error handling in pdc20621_i2c_read()
Hannes Reinecke <[email protected]>
ata: sata_sx4: Drop pointless VPRINTK() calls and convert the remaining ones
Maxime Chevallier <[email protected]>
net: ethtool: Don't call .cleanup_data when prepare_data fails
Jakub Kicinski <[email protected]>
net: tls: explicitly disallow disconnect
Cong Wang <[email protected]>
codel: remove sch->q.qlen check before qdisc_tree_reduce_backlog()
Tung Nguyen <[email protected]>
tipc: fix memory leak in tipc_link_xmit
Henry Martin <[email protected]>
ata: pata_pxa: Fix potential NULL pointer dereference in pxa_ata_probe()
-------------
Diffstat:
Documentation/scsi/libsas.rst | 2 - Makefile | 7 +- arch/arm64/boot/dts/mediatek/mt8173.dtsi | 6 +- arch/arm64/include/asm/cputype.h | 4 + arch/arm64/include/asm/fpsimd.h | 4 +- arch/arm64/include/asm/kvm_host.h | 17 +- arch/arm64/include/asm/kvm_hyp.h | 7 + arch/arm64/include/asm/processor.h | 7 + arch/arm64/include/asm/spectre.h | 1 - arch/arm64/kernel/fpsimd.c | 115 +++++-- arch/arm64/kernel/process.c | 3 + arch/arm64/kernel/proton-pack.c | 208 ++++++------ arch/arm64/kernel/ptrace.c | 3 + arch/arm64/kernel/signal.c | 3 + arch/arm64/kvm/arm.c | 1 - arch/arm64/kvm/fpsimd.c | 72 ++-- arch/arm64/kvm/hyp/entry.S | 5 + arch/arm64/kvm/hyp/include/hyp/switch.h | 86 +++-- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 9 +- arch/arm64/kvm/hyp/nvhe/switch.c | 52 ++- arch/arm64/kvm/hyp/vhe/switch.c | 4 + arch/arm64/kvm/reset.c | 3 + arch/mips/dec/prom/init.c | 2 +- arch/mips/include/asm/ds1287.h | 2 +- arch/mips/include/asm/mips-cm.h | 22 ++ arch/mips/kernel/cevt-ds1287.c | 1 + arch/mips/kernel/mips-cm.c | 14 + arch/parisc/kernel/pdt.c | 2 + arch/powerpc/kernel/rtas.c | 4 + arch/riscv/include/asm/kgdb.h | 9 +- arch/riscv/include/asm/syscall.h | 7 +- arch/riscv/kernel/kgdb.c | 6 + arch/riscv/kernel/probes/uprobes.c | 10 +- arch/riscv/kernel/setup.c | 36 +- arch/s390/kvm/trace-s390.h | 4 +- arch/sparc/mm/tlb.c | 5 +- arch/x86/entry/entry.S | 2 +- arch/x86/events/intel/ds.c | 8 +- arch/x86/events/intel/uncore_snbep.c | 107 +----- arch/x86/kernel/cpu/amd.c | 2 +- arch/x86/kernel/cpu/bugs.c | 36 +- arch/x86/kernel/e820.c | 17 +- arch/x86/kvm/svm/avic.c | 60 ++-- arch/x86/kvm/vmx/posted_intr.c | 28 +- arch/x86/mm/tlb.c | 6 +- arch/x86/platform/pvh/head.S | 7 +- block/blk-cgroup.c | 24 +- block/blk-iocost.c | 7 +- crypto/crypto_null.c | 37 +- drivers/acpi/platform_profile.c | 20 +- drivers/acpi/pptt.c | 4 +- drivers/ata/ahci.c | 2 + drivers/ata/libata-eh.c | 11 +- drivers/ata/pata_pxa.c | 6 + drivers/ata/sata_sx4.c | 118 +++---- drivers/auxdisplay/hd44780.c | 9 +- drivers/base/devres.c | 7 + drivers/block/loop.c | 9 +- drivers/bluetooth/btrtl.c | 2 + drivers/bluetooth/hci_ldisc.c | 19 +- drivers/bluetooth/hci_uart.h | 1 + drivers/bus/mhi/host/main.c | 16 +- drivers/char/virtio_console.c | 7 +- drivers/clk/clk.c | 4 + drivers/clocksource/timer-stm32-lp.c | 4 +- drivers/comedi/drivers/jr3_pci.c | 17 +- drivers/cpufreq/cppc_cpufreq.c | 2 +- drivers/cpufreq/cpufreq.c | 8 + drivers/cpufreq/scmi-cpufreq.c | 10 +- drivers/cpufreq/scpi-cpufreq.c | 13 +- drivers/crypto/atmel-sha204a.c | 7 +- drivers/crypto/caam/qi.c | 6 +- drivers/crypto/ccp/sp-pci.c | 15 +- drivers/dma-buf/udmabuf.c | 2 +- drivers/dma/dmatest.c | 6 +- drivers/gpio/gpio-tegra186.c | 93 +++++- drivers/gpio/gpio-zynq.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 6 +- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 10 + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 2 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 20 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 2 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 22 +- .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 2 +- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 3 + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c | 2 +- .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_thermal.c | 4 +- .../drm/amd/pm/powerplay/hwmgr/vega10_thermal.c | 4 +- .../drm/amd/pm/powerplay/hwmgr/vega20_thermal.c | 2 +- drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 3 + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 2 +- drivers/gpu/drm/drm_atomic_helper.c | 2 +- drivers/gpu/drm/drm_panel.c | 5 +- drivers/gpu/drm/drm_panel_orientation_quirks.c | 10 +- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 7 +- drivers/gpu/drm/mediatek/mtk_dpi.c | 9 + drivers/gpu/drm/msm/adreno/a6xx.xml.h | 4 + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 158 +++++---- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 14 + drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 1 + drivers/gpu/drm/nouveau/nouveau_bo.c | 3 + drivers/gpu/drm/nouveau/nouveau_gem.c | 3 - drivers/gpu/drm/sti/Makefile | 2 - drivers/gpu/drm/tiny/repaper.c | 4 +- drivers/hid/usbhid/hid-pidff.c | 60 ++-- drivers/hsi/clients/ssi_protocol.c | 1 + drivers/i2c/busses/i2c-cros-ec-tunnel.c | 3 + drivers/i3c/master.c | 3 + drivers/i3c/master/svc-i3c-master.c | 2 +- drivers/iio/adc/ad7768-1.c | 5 +- drivers/infiniband/core/umem_odp.c | 6 +- drivers/infiniband/hw/bnxt_re/qplib_fp.c | 3 +- drivers/infiniband/hw/hns/hns_roce_main.c | 2 +- drivers/infiniband/hw/qib/qib_fs.c | 1 + drivers/infiniband/hw/usnic/usnic_ib_main.c | 14 +- drivers/iommu/amd/iommu.c | 2 +- drivers/mcb/mcb-parse.c | 2 +- drivers/md/dm-cache-target.c | 24 +- drivers/md/dm-integrity.c | 3 + drivers/md/raid1.c | 26 +- drivers/md/raid10.c | 1 + drivers/media/common/siano/smsdvb-main.c | 2 + drivers/media/i2c/adv748x/adv748x.h | 2 +- drivers/media/i2c/ccs/ccs-core.c | 6 +- drivers/media/i2c/ov7251.c | 4 +- drivers/media/platform/qcom/venus/hfi_parser.c | 100 ++++-- drivers/media/platform/qcom/venus/hfi_venus.c | 18 +- drivers/media/rc/streamzap.c | 135 +++----- drivers/media/test-drivers/vim2m.c | 6 +- drivers/media/v4l2-core/v4l2-dv-timings.c | 4 +- drivers/mfd/ene-kb3930.c | 2 +- drivers/misc/mei/hw-me-regs.h | 1 + drivers/misc/mei/pci-me.c | 1 + drivers/misc/pci_endpoint_test.c | 6 +- drivers/mtd/inftlcore.c | 9 +- drivers/mtd/mtdpstore.c | 12 +- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 2 +- drivers/mtd/nand/raw/r852.c | 3 + drivers/net/dsa/b53/b53_common.c | 10 + drivers/net/dsa/mt7530.c | 6 +- drivers/net/dsa/mv88e6xxx/chip.c | 32 +- drivers/net/dsa/mv88e6xxx/devlink.c | 3 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 1 + drivers/net/ethernet/intel/igc/igc_defines.h | 1 + drivers/net/ethernet/intel/igc/igc_main.c | 1 + drivers/net/ethernet/intel/igc/igc_ptp.c | 93 ++++-- drivers/net/ethernet/microsoft/mana/mana.h | 2 + drivers/net/ethernet/microsoft/mana/mana_en.c | 21 +- drivers/net/phy/microchip.c | 46 +-- drivers/net/phy/phy_led_triggers.c | 23 +- drivers/net/ppp/ppp_synctty.c | 5 + drivers/net/wireless/ath/ath10k/sdio.c | 5 +- drivers/net/wireless/atmel/at76c50x-usb.c | 2 +- drivers/net/wireless/mediatek/mt76/eeprom.c | 4 + drivers/net/wireless/mediatek/mt76/mt76x2/usb.c | 1 + drivers/net/wireless/ti/wl1251/tx.c | 4 +- drivers/ntb/hw/idt/ntb_hw_idt.c | 18 +- drivers/ntb/ntb_transport.c | 2 +- drivers/nvme/host/core.c | 9 + drivers/nvme/target/fc.c | 39 +-- drivers/nvme/target/fcloop.c | 2 +- drivers/of/irq.c | 13 +- drivers/pci/controller/pcie-brcmstb.c | 13 +- drivers/pci/controller/vmd.c | 12 +- drivers/pci/pci.c | 111 +++--- drivers/pci/probe.c | 56 +++- drivers/pci/remove.c | 7 + drivers/perf/arm_pmu.c | 8 +- drivers/phy/tegra/xusb.c | 2 +- drivers/pinctrl/qcom/pinctrl-msm.c | 12 +- drivers/platform/x86/asus-laptop.c | 9 +- drivers/pwm/pwm-fsl-ftm.c | 6 + drivers/pwm/pwm-mediatek.c | 8 +- drivers/pwm/pwm-rcar.c | 24 +- drivers/s390/char/sclp_con.c | 17 + drivers/s390/char/sclp_tty.c | 12 + drivers/s390/virtio/virtio_ccw.c | 16 +- drivers/scsi/aic94xx/aic94xx.h | 1 - drivers/scsi/aic94xx/aic94xx_init.c | 1 - drivers/scsi/aic94xx/aic94xx_tmf.c | 9 - drivers/scsi/hisi_sas/hisi_sas.h | 14 +- drivers/scsi/hisi_sas/hisi_sas_main.c | 371 ++++++++++----------- drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 2 +- drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 13 +- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 16 +- drivers/scsi/isci/init.c | 1 - drivers/scsi/isci/task.c | 18 - drivers/scsi/isci/task.h | 4 - drivers/scsi/lpfc/lpfc_els.c | 51 ++- drivers/scsi/lpfc/lpfc_hbadisc.c | 2 + drivers/scsi/mvsas/mv_defs.h | 5 - drivers/scsi/mvsas/mv_init.c | 1 - drivers/scsi/mvsas/mv_sas.c | 31 +- drivers/scsi/mvsas/mv_sas.h | 1 - drivers/scsi/pm8001/pm8001_hwi.c | 4 +- drivers/scsi/pm8001/pm8001_init.c | 1 - drivers/scsi/pm8001/pm8001_sas.c | 27 +- drivers/scsi/pm8001/pm8001_sas.h | 11 +- drivers/scsi/scsi_transport_iscsi.c | 7 +- drivers/scsi/st.c | 2 +- drivers/scsi/ufs/ufs_bsg.c | 1 + drivers/soc/samsung/exynos-chipid.c | 74 +++- drivers/soc/ti/omap_prm.c | 2 + drivers/spi/spi-cadence-quadspi.c | 6 + drivers/thermal/rockchip_thermal.c | 1 + drivers/tty/serial/sifive.c | 6 + drivers/usb/cdns3/cdns3-gadget.c | 2 + drivers/usb/chipidea/ci_hdrc_imx.c | 44 ++- drivers/usb/class/cdc-wdm.c | 21 +- drivers/usb/core/quirks.c | 9 + drivers/usb/dwc3/dwc3-pci.c | 10 + drivers/usb/dwc3/gadget.c | 6 + drivers/usb/gadget/udc/aspeed-vhub/dev.c | 3 + drivers/usb/host/max3421-hcd.c | 7 + drivers/usb/host/ohci-pci.c | 23 ++ drivers/usb/host/xhci-ring.c | 11 +- drivers/usb/serial/ftdi_sio.c | 2 + drivers/usb/serial/ftdi_sio_ids.h | 5 + drivers/usb/serial/option.c | 3 + drivers/usb/serial/usb-serial-simple.c | 7 + drivers/usb/storage/unusual_uas.h | 7 + drivers/vdpa/mlx5/core/mr.c | 7 +- drivers/video/backlight/led_bl.c | 11 +- drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 6 +- drivers/xen/Kconfig | 2 +- drivers/xen/xenfs/xensyms.c | 4 +- fs/Kconfig | 1 + fs/btrfs/super.c | 3 +- fs/cifs/cifs_debug.c | 4 + fs/cifs/cifsglob.h | 1 + fs/cifs/cifsproto.h | 7 +- fs/cifs/connect.c | 2 +- fs/cifs/fs_context.c | 5 + fs/cifs/ioctl.c | 3 +- fs/cifs/smb2misc.c | 11 +- fs/cifs/smb2ops.c | 48 +-- fs/cifs/smb2pdu.c | 10 +- fs/cifs/transport.c | 43 +-- fs/ext4/block_validity.c | 5 +- fs/ext4/inode.c | 75 +++-- fs/ext4/namei.c | 2 +- fs/ext4/super.c | 19 +- fs/ext4/xattr.c | 11 +- fs/f2fs/f2fs.h | 12 +- fs/f2fs/node.c | 9 +- fs/f2fs/super.c | 27 +- fs/f2fs/sysfs.c | 14 +- fs/fuse/virtio_fs.c | 3 + fs/hfs/bnode.c | 6 + fs/hfsplus/bnode.c | 6 + fs/isofs/export.c | 2 +- fs/jbd2/journal.c | 1 - fs/jfs/jfs_dinode.h | 2 +- fs/jfs/jfs_dmap.c | 12 +- fs/jfs/jfs_imap.c | 10 +- fs/jfs/jfs_incore.h | 2 +- fs/jfs/jfs_txnmgr.c | 4 +- fs/jfs/jfs_xtree.c | 4 +- fs/jfs/jfs_xtree.h | 37 +- fs/ksmbd/oplock.c | 2 +- fs/ksmbd/smb2misc.c | 22 +- fs/ksmbd/smb2pdu.c | 49 +-- fs/ksmbd/transport_ipc.c | 7 +- fs/namespace.c | 3 +- fs/nfs/Kconfig | 2 +- fs/nfs/internal.h | 22 -- fs/nfs/nfs4session.h | 4 - fs/nfsd/Kconfig | 1 + fs/nfsd/nfs4state.c | 2 +- fs/nfsd/nfsfh.h | 7 - fs/ntfs3/file.c | 1 + fs/proc/array.c | 59 ++-- include/linux/backing-dev.h | 1 + include/linux/blk-cgroup.h | 1 + include/linux/filter.h | 9 +- include/linux/nfs.h | 13 + include/linux/pci.h | 1 + include/linux/sched/task_stack.h | 2 + include/linux/soc/samsung/exynos-chipid.h | 6 +- include/net/bluetooth/bluetooth.h | 1 + include/net/net_namespace.h | 1 + include/net/sctp/structs.h | 3 +- include/net/sock.h | 10 + include/scsi/libsas.h | 10 +- include/uapi/linux/kfd_ioctl.h | 2 + include/uapi/linux/landlock.h | 2 + include/xen/interface/xen-mca.h | 2 +- init/Kconfig | 3 +- kernel/bpf/helpers.c | 14 +- kernel/bpf/syscall.c | 17 +- kernel/dma/contiguous.c | 3 +- kernel/locking/lockdep.c | 3 + kernel/sched/cpufreq_schedutil.c | 18 +- kernel/trace/ftrace.c | 1 + kernel/trace/trace_events.c | 4 +- kernel/trace/trace_events_filter.c | 4 +- lib/sg_split.c | 2 - lib/string.c | 15 + lib/test_ubsan.c | 18 +- mm/filemap.c | 2 +- mm/gup.c | 4 +- mm/memory-failure.c | 11 +- mm/memory.c | 4 +- mm/vmscan.c | 2 +- net/8021q/vlan_dev.c | 31 +- net/bluetooth/af_bluetooth.c | 22 ++ net/bluetooth/hci_event.c | 5 +- net/bluetooth/l2cap_core.c | 3 +- net/bluetooth/sco.c | 18 +- net/core/dev.c | 1 + net/core/filter.c | 80 +++-- net/core/net_namespace.c | 21 +- net/core/page_pool.c | 8 +- net/core/rtnetlink.c | 2 +- net/core/selftests.c | 18 +- net/core/sock.c | 10 - net/dsa/tag_8021q.c | 2 +- net/ethtool/netlink.c | 8 +- net/ipv6/route.c | 6 +- net/mac80211/iface.c | 3 + net/mac80211/mesh_hwmp.c | 14 +- net/mctp/af_mctp.c | 3 + net/mptcp/sockopt.c | 16 + net/mptcp/subflow.c | 23 +- net/netfilter/ipvs/ip_vs_ctl.c | 10 +- net/netfilter/nft_set_pipapo_avx2.c | 3 +- net/openvswitch/actions.c | 4 +- net/openvswitch/flow_netlink.c | 3 +- net/phonet/pep.c | 41 ++- net/sched/sch_codel.c | 5 +- net/sched/sch_fq_codel.c | 6 +- net/sched/sch_hfsc.c | 23 +- net/sctp/socket.c | 22 +- net/sctp/transport.c | 2 + net/tipc/link.c | 1 + net/tipc/monitor.c | 3 +- net/tls/tls_main.c | 6 + security/landlock/errata.h | 87 +++++ security/landlock/setup.c | 30 ++ security/landlock/setup.h | 3 + security/landlock/syscalls.c | 22 +- sound/pci/hda/hda_intel.c | 15 +- sound/soc/codecs/lpass-wsa-macro.c | 139 +++++--- sound/soc/codecs/wcd934x.c | 2 +- sound/soc/fsl/fsl_audmix.c | 16 +- sound/soc/qcom/qdsp6/q6asm-dai.c | 19 +- sound/usb/midi.c | 80 ++++- sound/virtio/virtio_pcm.c | 21 +- tools/objtool/check.c | 3 + tools/power/cpupower/bench/parse.c | 4 + tools/testing/ktest/ktest.pl | 8 + tools/testing/selftests/landlock/base_test.c | 46 ++- tools/testing/selftests/mincore/mincore_selftest.c | 3 - tools/testing/selftests/ublk/test_stripe_04.sh | 24 ++ .../selftests/vm/charge_reserved_hugetlb.sh | 4 +- .../selftests/vm/hugetlb_reparenting_test.sh | 2 +- 358 files changed, 3501 insertions(+), 2034 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/373 ata: pata_pxa: Fix potential NULL pointer dereference in pxa_ata_probe()
5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Henry Martin <[email protected]>
[ Upstream commit ad320e408a8c95a282ab9c05cdf0c9b95e317985 ]
devm_ioremap() returns NULL on error. Currently, pxa_ata_probe() does not check for this case, which can result in a NULL pointer dereference.
Add NULL check after devm_ioremap() to prevent this issue.
--- drivers/ata/pata_pxa.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/ata/pata_pxa.c +6 -0
@@ -223,10 +223,16 @@ static int pxa_ata_probe(struct platform_device *pdev) ap->ioaddr.cmd_addr =devm_ioremap (&pdev->dev, cmd_res->start,resource_size (cmd_res)); +if (!ap->ioaddr.cmd_addr) +return -ENOMEM ; ap->ioaddr.ctl_addr =devm_ioremap (&pdev->dev, ctl_res->start,resource_size (ctl_res)); +if (!ap->ioaddr.ctl_addr) +return -ENOMEM ; ap->ioaddr.bmdma_addr =devm_ioremap (&pdev->dev, dma_res->start,resource_size (dma_res)); +if (!ap->ioaddr.bmdma_addr) +return -ENOMEM ;/* * Adjust register offsets
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 2/373 tipc: fix memory leak in tipc_link_xmit
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tung Nguyen <[email protected]>
[ Upstream commit 69ae94725f4fc9e75219d2d69022029c5b24bc9a ]
In case the backlog transmit queue for system-importance messages is overloaded, tipc_link_xmit() returns -ENOBUFS but the skb list is not purged. This leads to memory leak and failure when a skb is allocated.
This commit fixes this issue by purging the skb list before tipc_link_xmit() returns.
--- net/tipc/link.c | 1 + 1 file changed, 1 insertion(+)
net/tipc/link.c +1 -0
@@ -1068,6 +1068,7 @@ int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list,if (unlikely (l->backlog[imp].len >= l->backlog[imp].limit)) {if (imp ==TIPC_SYSTEM_IMPORTANCE ) {pr_warn ("%s<%s>, link overflow" , link_rst_msg, l->name); +__skb_queue_purge (list);return -ENOBUFS ; } rc =link_schedule_user (l, hdr);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 3/373 codel: remove sch->q.qlen check before qdisc_tree_reduce_backlog()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cong Wang <[email protected]>
[ Upstream commit 342debc12183b51773b3345ba267e9263bdfaaef ]
After making all ->qlen_notify() callbacks idempotent, now it is safe to remove the check of qlen!=0 from both fq_codel_dequeue() and codel_qdisc_dequeue().
--- net/sched/sch_codel.c | 5 +---- net/sched/sch_fq_codel.c | 6 ++---- 2 files changed, 3 insertions(+), 8 deletions(-)
net/sched/sch_codel.c +1 -4
@@ -95,10 +95,7 @@ static struct sk_buff *codel_qdisc_dequeue(struct Qdisc *sch) &q->stats, qdisc_pkt_len, codel_get_enqueue_time, drop_func, dequeue_func); -/* We cant call qdisc_tree_reduce_backlog() if our qlen is 0, -* or HTB crashes. Defer it for next round. -*/ -if (q->stats.drop_count && sch->q.qlen) { +if (q->stats.drop_count) {qdisc_tree_reduce_backlog (sch, q->stats.drop_count, q->stats.drop_len); q->stats.drop_count =0 ; q->stats.drop_len =0 ;
net/sched/sch_fq_codel.c +2 -4
@@ -314,10 +314,8 @@ static struct sk_buff *fq_codel_dequeue(struct Qdisc *sch) }qdisc_bstats_update (sch, skb); flow->deficit -=qdisc_pkt_len (skb); -/* We cant call qdisc_tree_reduce_backlog() if our qlen is 0, -* or HTB crashes. Defer it for next round. -*/ -if (q->cstats.drop_count && sch->q.qlen) { + +if (q->cstats.drop_count) {qdisc_tree_reduce_backlog (sch, q->cstats.drop_count, q->cstats.drop_len); q->cstats.drop_count =0 ;
Signature · 1 line
2.39.5
Re: [PATCH 5.15 003/373] codel: remove sch->q.qlen check before qdisc_tree_reduce_backlog()
Hi,
I have a question regarding the patchset this patch belongs to.
I saw the recent netdev thread
https://lore.kernel.org/stable/[email protected]/
and noticed that for the patchset
https://lore.kernel.org/all/174410343500.1831514.15019771038334698036.git-patchwork-notify@kernel.org/
only patch 06/11 "codel: remove sch->q.qlen check before qdisc_tree_reduce_backlog()" was pulled into 6.6, 6.1, 6.12, 6.13, 6.14 stable. This was to fix a UAF vulnerability.
In this case for the 5.15 release (and 5.10 and 5.4), the rest of the set is once again excluded. I'm not familiar with the process of pulling kernel patches so I may be missing something - is excluding the rest of the patchset intentional?
From my understanding, this patch depends on the previous patches to work. Without patches 01-05 which make various classful qdiscs' qlen_notify() idempotent, if an fq_codel's dequeue() routine empties the fq_codel qdisc, it will be doubly deactivated - first in the parent qlen_notify and then again in the parent dequeue. For instance, in the case of parent drr, the double deactivation will either cause a fault on an invalid address, or trigger a splat if list checks are compiled into the kernel. This is also why the original unpatched code included the qlen check in the first place.
I think that the rest of the patchset should be pulled as well, for all releases.
Cheers,
Gerrard
Greg Kroah-Hartman
maintainerRe: [PATCH 5.15 003/373] codel: remove sch->q.qlen check before qdisc_tree_reduce_backlog()
Quoted 27 lines · Gerrard
Hi,
I have a question regarding the patchset this patch belongs to.
I saw the recent netdev thread
https://lore.kernel.org/stable/[email protected]/
and noticed that for the patchset
https://lore.kernel.org/all/174410343500.1831514.15019771038334698036.git-patchwork-notify@kernel.org/
only patch 06/11 "codel: removesch->q.qlencheck beforeqdisc_tree_reduce_backlog()" was pulled into 6.6, 6.1, 6.12, 6.13, 6.14 stable. This was to fix a UAF vulnerability.In this case for the 5.15 release (and 5.10 and 5.4), the rest of the set is once again excluded. I'm not familiar with the process of pulling kernel patches so I may be missing something - is excluding the rest of the patchset intentional?
Quoted 1 line
From my understanding, this patch depends on the previous patches to work.
Without patches 01-05 which make various classful qdiscs'
qlen_notify()idempotent, if an fq_codel'sdequeue()routine empties thefq_codelqdisc, it will be doubly deactivated - first in the parentqlen_notifyand then again in the parent dequeue. For instance, in the case of parent drr, the double deactivation will either cause a fault on an invalid address, or trigger a splat if list checks are compiled into the kernel. This is also why the original unpatched code included the qlen check in the first place.
Quoted 2 lines
I think that the rest of the patchset should be pulled as well, for all releases.
Can you submit that whole series then? I've dropped this single patch from all of the other queues for now.
thanks,
greg k-h
Greg Kroah-Hartman
maintainerPATCH 4/373 net: tls: explicitly disallow disconnect
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 5071a1e606b30c0c11278d3c6620cd6a24724cf6 ]
syzbot discovered that it can disconnect a TLS socket and then run into all sort of unexpected corner cases. I have a vague recollection of Eric pointing this out to us a long time ago. Supporting disconnect is really hard, for one thing if offload is enabled we'd need to wait for all packets to be _acked_. Disconnect is not commonly used, disallow it.
The immediate problem syzbot run into is the warning in the strp, but that's just the easiest bug to trigger:
WARNING: CPU: 0 PID: 5834 at net/tls/tls_strp.c:486 tls_strp_msg_load+0x72e/0xa80 net/tls/tls_strp.c:486 RIP: 0010:tls_strp_msg_load+0x72e/0xa80 net/tls/tls_strp.c:486 Call Trace: <TASK> tls_rx_rec_wait+0x280/0xa60 net/tls/tls_sw.c:1363 tls_sw_recvmsg+0x85c/0x1c30 net/tls/tls_sw.c:2043 inet6_recvmsg+0x2c9/0x730 net/ipv6/af_inet6.c:678 sock_recvmsg_nosec net/socket.c:1023 [inline] sock_recvmsg+0x109/0x280 net/socket.c:1045 __sys_recvfrom+0x202/0x380 net/socket.c:2237
--- net/tls/tls_main.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/tls/tls_main.c +6 -0
@@ -626,6 +626,11 @@ static int tls_setsockopt(struct sock *sk, int level, int optname,return do_tls_setsockopt (sk, optname, optval, optlen); } +static int tls_disconnect (struct sock *sk,int flags) +{ +return -EOPNOTSUPP ; +} +struct tls_context *tls_ctx_create (struct sock *sk) {struct inet_connection_sock *icsk =inet_csk (sk);
@@ -720,6 +725,7 @@ static void build_protos(struct proto prot[TLS_NUM_CONFIG][TLS_NUM_CONFIG], prot[TLS_BASE ][TLS_BASE ] = *base; prot[TLS_BASE ][TLS_BASE ].setsockopt = tls_setsockopt; prot[TLS_BASE ][TLS_BASE ].getsockopt = tls_getsockopt; + prot[TLS_BASE ][TLS_BASE ].disconnect = tls_disconnect; prot[TLS_BASE ][TLS_BASE ].close = tls_sk_proto_close; prot[TLS_SW ][TLS_BASE ] = prot[TLS_BASE ][TLS_BASE ];
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 5/373 net: ethtool: Dont call .cleanup_data when prepare_data fails
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maxime Chevallier <[email protected]>
[ Upstream commit 4f038a6a02d20859a3479293cbf172b0f14cbdd6 ]
There's a consistent pattern where the .cleanup_data() callback is called when .prepare_data() fails, when it should really be called to clean after a successful .prepare_data() as per the documentation.
Rewrite the error-handling paths to make sure we don't cleanup un-prepared data.
--- net/ethtool/netlink.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
net/ethtool/netlink.c +5 -3
@@ -377,7 +377,7 @@ static int ethnl_default_doit(struct sk_buff *skb, struct genl_info *info) ret = ops->prepare_data (req_info, reply_data, info);rtnl_unlock ();if (ret <0 ) - goto err_cleanup; + goto err_dev; ret = ops->reply_size (req_info, reply_data);if (ret <0 ) goto err_cleanup;
@@ -435,7 +435,7 @@ static int ethnl_default_dump_one(struct sk_buff *skb, struct net_device *dev, ret = ctx->ops->prepare_data (ctx->req_info, ctx->reply_data,NULL );rtnl_unlock ();if (ret <0 ) - goto out; + goto out_cancel; ret =ethnl_fill_reply_header (skb, dev, ctx->ops->hdr_attr);if (ret <0 ) goto out;
@@ -444,6 +444,7 @@ static int ethnl_default_dump_one(struct sk_buff *skb, struct net_device *dev, out:if (ctx->ops->cleanup_data) ctx->ops->cleanup_data (ctx->reply_data); +out_cancel: ctx->reply_data->dev =NULL ;if (ret <0 )genlmsg_cancel (skb, ehdr);
@@ -628,7 +629,7 @@ static void ethnl_default_notify(struct net_device *dev, unsigned int cmd,ethnl_init_reply_data (reply_data, ops, dev); ret = ops->prepare_data (req_info, reply_data,NULL );if (ret <0 ) - goto err_cleanup; + goto err_rep; ret = ops->reply_size (req_info, reply_data);if (ret <0 ) goto err_cleanup;
@@ -664,6 +665,7 @@ static void ethnl_default_notify(struct net_device *dev, unsigned int cmd, err_cleanup:if (ops->cleanup_data) ops->cleanup_data (reply_data); +err_rep:kfree (reply_data);kfree (req_info);return ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 6/373 ata: sata_sx4: Drop pointless VPRINTK() calls and convert the remaining ones
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hannes Reinecke <[email protected]>
[ Upstream commit bc21c1056d08525d9c5a5d74db4b8f14e6691991 ]
Drop pointless VPRINTK() calls for setting up SG tables and convert the remaining calls to structured logging.
Stable-dep-of: 8d46a2708503 ("ata: sata_sx4: Add error handling in pdc20621_i2c_read()")
--- drivers/ata/sata_sx4.c | 105 +++++++++++++---------------------------- 1 file changed, 34 insertions(+), 71 deletions(-)
drivers/ata/sata_sx4.c +34 -71
@@ -308,15 +308,9 @@ static inline void pdc20621_ata_sg(u8 *buf, unsigned int portno,/* output ATA packet S/G table */ addr =PDC_20621_DIMM_BASE +PDC_20621_DIMM_DATA + (PDC_DIMM_DATA_STEP * portno); -VPRINTK ("ATA sg addr 0x%x, %d\n" , addr, addr); + buf32[dw] =cpu_to_le32 (addr); buf32[dw +1 ] =cpu_to_le32 (total_len |ATA_PRD_EOT ); - -VPRINTK ("ATA PSG @ %x == (0x%x, 0x%x)\n" , -PDC_20621_DIMM_BASE + - (PDC_DIMM_WINDOW_STEP * portno) + -PDC_DIMM_APKT_PRD , - buf32[dw], buf32[dw +1 ]); } static inline void pdc20621_host_sg(u8 *buf, unsigned int portno,
@@ -332,12 +326,6 @@ static inline void pdc20621_host_sg(u8 *buf, unsigned int portno, buf32[dw] =cpu_to_le32 (addr); buf32[dw +1 ] =cpu_to_le32 (total_len |ATA_PRD_EOT ); - -VPRINTK ("HOST PSG @ %x == (0x%x, 0x%x)\n" , -PDC_20621_DIMM_BASE + - (PDC_DIMM_WINDOW_STEP * portno) + -PDC_DIMM_HPKT_PRD , - buf32[dw], buf32[dw +1 ]); } static inline unsigned int pdc20621_ata_pkt(struct ata_taskfile *tf,
@@ -351,7 +339,6 @@ static inline unsigned int pdc20621_ata_pkt(struct ata_taskfile *tf,unsigned int dimm_sg =PDC_20621_DIMM_BASE + (PDC_DIMM_WINDOW_STEP * portno) +PDC_DIMM_APKT_PRD ; -VPRINTK ("ENTER, dimm_sg == 0x%x, %d\n" , dimm_sg, dimm_sg); i =PDC_DIMM_ATA_PKT ;
@@ -406,8 +393,6 @@ static inline void pdc20621_host_pkt(struct ata_taskfile *tf, u8 *buf,unsigned int dimm_sg =PDC_20621_DIMM_BASE + (PDC_DIMM_WINDOW_STEP * portno) +PDC_DIMM_HPKT_PRD ; -VPRINTK ("ENTER, dimm_sg == 0x%x, %d\n" , dimm_sg, dimm_sg); -VPRINTK ("host_sg == 0x%x, %d\n" , host_sg, host_sg); dw =PDC_DIMM_HOST_PKT >>2 ;
@@ -424,14 +409,6 @@ static inline void pdc20621_host_pkt(struct ata_taskfile *tf, u8 *buf, buf32[dw +1 ] =cpu_to_le32 (host_sg); buf32[dw +2 ] =cpu_to_le32 (dimm_sg); buf32[dw +3 ] =0 ; - -VPRINTK ("HOST PKT @ %x == (0x%x 0x%x 0x%x 0x%x)\n" , -PDC_20621_DIMM_BASE + (PDC_DIMM_WINDOW_STEP * portno) + -PDC_DIMM_HOST_PKT , - buf32[dw +0 ], - buf32[dw +1 ], - buf32[dw +2 ], - buf32[dw +3 ]); }static void pdc20621_dma_prep (struct ata_queued_cmd *qc)
@@ -447,8 +424,6 @@ static void pdc20621_dma_prep(struct ata_queued_cmd *qc)WARN_ON (!(qc->flags &ATA_QCFLAG_DMAMAP )); -VPRINTK ("ata%u: ENTER\n" , ap->print_id); -/* hard-code chip #0 */ mmio +=PDC_CHIP0_OFS ;
@@ -492,7 +467,8 @@ static void pdc20621_dma_prep(struct ata_queued_cmd *qc)readl (dimm_mmio);/* MMIO PCI posting flush */ -VPRINTK ("ata pkt buf ofs %u, prd size %u, mmio copied\n" , i, sgt_len); +ata_port_dbg (ap,"ata pkt buf ofs %u, prd size %u, mmio copied\n" , + i, sgt_len); }static void pdc20621_nodata_prep (struct ata_queued_cmd *qc)
@@ -504,8 +480,6 @@ static void pdc20621_nodata_prep(struct ata_queued_cmd *qc)unsigned int portno = ap->port_no;unsigned int i; -VPRINTK ("ata%u: ENTER\n" , ap->print_id); -/* hard-code chip #0 */ mmio +=PDC_CHIP0_OFS ;
@@ -527,7 +501,7 @@ static void pdc20621_nodata_prep(struct ata_queued_cmd *qc)readl (dimm_mmio);/* MMIO PCI posting flush */ -VPRINTK ("ata pkt buf ofs %u, mmio copied\n" , i); +ata_port_dbg (ap,"ata pkt buf ofs %u, mmio copied\n" , i); }static enum ata_completion_errors pdc20621_qc_prep (struct ata_queued_cmd *qc)
@@ -633,8 +607,6 @@ static void pdc20621_packet_start(struct ata_queued_cmd *qc)/* hard-code chip #0 */ mmio +=PDC_CHIP0_OFS ; -VPRINTK ("ata%u: ENTER\n" , ap->print_id); -wmb ();/* flush PRD, pkt writes */ port_ofs =PDC_20621_DIMM_BASE + (PDC_DIMM_WINDOW_STEP * port_no);
@@ -645,7 +617,7 @@ static void pdc20621_packet_start(struct ata_queued_cmd *qc)pdc20621_dump_hdma (qc);pdc20621_push_hdma (qc, seq, port_ofs +PDC_DIMM_HOST_PKT ); -VPRINTK ("queued ofs 0x%x (%u), seq %u\n" , +ata_port_dbg (ap,"queued ofs 0x%x (%u), seq %u\n" , port_ofs +PDC_DIMM_HOST_PKT , port_ofs +PDC_DIMM_HOST_PKT , seq);
@@ -656,7 +628,7 @@ static void pdc20621_packet_start(struct ata_queued_cmd *qc)writel (port_ofs +PDC_DIMM_ATA_PKT , ap->ioaddr.cmd_addr +PDC_PKT_SUBMIT );readl (ap->ioaddr.cmd_addr +PDC_PKT_SUBMIT ); -VPRINTK ("submitted ofs 0x%x (%u), seq %u\n" , +ata_port_dbg (ap,"submitted ofs 0x%x (%u), seq %u\n" , port_ofs +PDC_DIMM_ATA_PKT , port_ofs +PDC_DIMM_ATA_PKT , seq);
@@ -696,14 +668,12 @@ static inline unsigned int pdc20621_host_intr(struct ata_port *ap,u8 status;unsigned int handled =0 ; -VPRINTK ("ENTER\n" ); -if ((qc->tf.protocol ==ATA_PROT_DMA ) &&/* read */ (!(qc->tf.flags &ATA_TFLAG_WRITE ))) {/* step two - DMA from DIMM to host */ if (doing_hdma) { -VPRINTK ("ata%u: read hdma, 0x%x 0x%x\n" , ap->print_id, +ata_port_dbg (ap,"read hdma, 0x%x 0x%x\n" ,readl (mmio +0x104 ),readl (mmio +PDC_HDMA_CTLSTAT ));/* get drive status; clear intr; complete txn */ qc->err_mask |=ac_err_mask (ata_wait_idle (ap));
@@ -714,7 +684,7 @@ static inline unsigned int pdc20621_host_intr(struct ata_port *ap,/* step one - exec ATA command */ else {u8 seq = (u8) (port_no +1 +4 ); -VPRINTK ("ata%u: read ata, 0x%x 0x%x\n" , ap->print_id, +ata_port_dbg (ap,"read ata, 0x%x 0x%x\n" ,readl (mmio +0x104 ),readl (mmio +PDC_HDMA_CTLSTAT ));/* submit hdma pkt */
@@ -729,7 +699,7 @@ static inline unsigned int pdc20621_host_intr(struct ata_port *ap,/* step one - DMA from host to DIMM */ if (doing_hdma) {u8 seq = (u8) (port_no +1 ); -VPRINTK ("ata%u: write hdma, 0x%x 0x%x\n" , ap->print_id, +ata_port_dbg (ap,"write hdma, 0x%x 0x%x\n" ,readl (mmio +0x104 ),readl (mmio +PDC_HDMA_CTLSTAT ));/* submit ata pkt */
@@ -742,7 +712,7 @@ static inline unsigned int pdc20621_host_intr(struct ata_port *ap,/* step two - execute ATA command */ else { -VPRINTK ("ata%u: write ata, 0x%x 0x%x\n" , ap->print_id, +ata_port_dbg (ap,"write ata, 0x%x 0x%x\n" ,readl (mmio +0x104 ),readl (mmio +PDC_HDMA_CTLSTAT ));/* get drive status; clear intr; complete txn */ qc->err_mask |=ac_err_mask (ata_wait_idle (ap));
@@ -755,7 +725,7 @@ static inline unsigned int pdc20621_host_intr(struct ata_port *ap, }else if (qc->tf.protocol ==ATA_PROT_NODATA ) { status =ata_sff_busy_wait (ap,ATA_BUSY |ATA_DRQ ,1000 ); -DPRINTK ("BUS_NODATA (drv_stat 0x%X)\n" , status); +ata_port_dbg (ap,"BUS_NODATA (drv_stat 0x%X)\n" , status); qc->err_mask |=ac_err_mask (status);ata_qc_complete (qc); handled =1 ;
@@ -781,29 +751,21 @@ static irqreturn_t pdc20621_interrupt(int irq, void *dev_instance)unsigned int handled =0 ;void __iomem *mmio_base; -VPRINTK ("ENTER\n" ); - -if (!host || !host->iomap[PDC_MMIO_BAR ]) { -VPRINTK ("QUICK EXIT\n" ); +if (!host || !host->iomap[PDC_MMIO_BAR ])return IRQ_NONE ; - } mmio_base = host->iomap[PDC_MMIO_BAR ];/* reading should also clear interrupts */ mmio_base +=PDC_CHIP0_OFS ; mask =readl (mmio_base +PDC_20621_SEQMASK ); -VPRINTK ("mask == 0x%x\n" , mask); -if (mask ==0xffffffff ) { -VPRINTK ("QUICK EXIT 2\n" ); +if (mask ==0xffffffff )return IRQ_NONE ; - } + mask &=0xffff ;/* only 16 tags possible */ -if (!mask) { -VPRINTK ("QUICK EXIT 3\n" ); +if (!mask)return IRQ_NONE ; - }spin_lock (&host->lock);
@@ -816,7 +778,8 @@ static irqreturn_t pdc20621_interrupt(int irq, void *dev_instance)else ap = host->ports[port_no]; tmp = mask & (1 << i); -VPRINTK ("seq %u, port_no %u, ap %p, tmp %x\n" , i, port_no, ap, tmp); +if (ap) +ata_port_dbg (ap,"seq %u, tmp %x\n" , i, tmp);if (tmp && ap) {struct ata_queued_cmd *qc;
@@ -829,10 +792,6 @@ static irqreturn_t pdc20621_interrupt(int irq, void *dev_instance)spin_unlock (&host->lock); -VPRINTK ("mask == 0x%x\n" , mask); - -VPRINTK ("EXIT\n" ); -return IRQ_RETVAL (handled); }
@@ -1272,7 +1231,7 @@ static unsigned int pdc20621_dimm_init(struct ata_host *host)/* Initialize Time Period Register */ writel (0xffffffff , mmio +PDC_TIME_PERIOD ); time_period =readl (mmio +PDC_TIME_PERIOD ); -VPRINTK ("Time Period Register (0x40): 0x%x\n" , time_period); +dev_dbg (host->dev,"Time Period Register (0x40): 0x%x\n" , time_period);/* Enable timer */ writel (PDC_TIMER_DEFAULT , mmio +PDC_TIME_CONTROL );
@@ -1287,7 +1246,7 @@ static unsigned int pdc20621_dimm_init(struct ata_host *host)*/ tcount =readl (mmio +PDC_TIME_COUNTER ); -VPRINTK ("Time Counter Register (0x44): 0x%x\n" , tcount); +dev_dbg (host->dev,"Time Counter Register (0x44): 0x%x\n" , tcount);/* If SX4 is on PCI-X bus, after 3 seconds, the timer counter
@@ -1295,17 +1254,19 @@ static unsigned int pdc20621_dimm_init(struct ata_host *host)*/ if (tcount >=PCI_X_TCOUNT ) { ticks = (time_period - tcount); -VPRINTK ("Num counters 0x%x (%d)\n" , ticks, ticks); +dev_dbg (host->dev,"Num counters 0x%x (%d)\n" , ticks, ticks); clock = (ticks /300000 ); -VPRINTK ("10 * Internal clk = 0x%x (%d)\n" , clock, clock); +dev_dbg (host->dev,"10 * Internal clk = 0x%x (%d)\n" , + clock, clock); clock = (clock *33 ); -VPRINTK ("10 * Internal clk * 33 = 0x%x (%d)\n" , clock, clock); +dev_dbg (host->dev,"10 * Internal clk * 33 = 0x%x (%d)\n" , + clock, clock);/* PLL F Param (bit 22:16) */ fparam = (1400000 / clock) -2 ; -VPRINTK ("PLL F Param: 0x%x (%d)\n" , fparam, fparam); +dev_dbg (host->dev,"PLL F Param: 0x%x (%d)\n" , fparam, fparam);/* OD param = 0x2 (bit 31:30), R param = 0x5 (bit 29:25) */ pci_status = (0x8a001824 | (fparam <<16 ));
@@ -1313,7 +1274,7 @@ static unsigned int pdc20621_dimm_init(struct ata_host *host) pci_status =PCI_PLL_INIT ;/* Initialize PLL. */ -VPRINTK ("pci_status: 0x%x\n" , pci_status); +dev_dbg (host->dev,"pci_status: 0x%x\n" , pci_status);writel (pci_status, mmio +PDC_CTL_STATUS );readl (mmio +PDC_CTL_STATUS );
@@ -1325,15 +1286,16 @@ static unsigned int pdc20621_dimm_init(struct ata_host *host)printk (KERN_ERR "Detect Local DIMM Fail\n" );return 1 ;/* DIMM error */ } -VPRINTK ("Local DIMM Speed = %d\n" , speed); +dev_dbg (host->dev,"Local DIMM Speed = %d\n" , speed);/* Programming DIMM0 Module Control Register (index_CID0:80h) */ size =pdc20621_prog_dimm0 (host); -VPRINTK ("Local DIMM Size = %dMB\n" , size); +dev_dbg (host->dev,"Local DIMM Size = %dMB\n" , size);/* Programming DIMM Module Global Control Register (index_CID0:88h) */ if (pdc20621_prog_dimm_global (host)) { -printk (KERN_ERR "Programming DIMM Module Global Control Register Fail\n" ); +dev_err (host->dev, +"Programming DIMM Module Global Control Register Fail\n" );return 1 ; }
@@ -1370,13 +1332,14 @@ static unsigned int pdc20621_dimm_init(struct ata_host *host)if (!pdc20621_i2c_read (host,PDC_DIMM0_SPD_DEV_ADDRESS ,PDC_DIMM_SPD_TYPE , &spd0)) { -pr_err ("Failed in i2c read: device=%#x, subaddr=%#x\n" , +dev_err (host->dev, +"Failed in i2c read: device=%#x, subaddr=%#x\n" ,PDC_DIMM0_SPD_DEV_ADDRESS ,PDC_DIMM_SPD_TYPE );return 1 ; }if (spd0 ==0x02 ) {void *buf; -VPRINTK ("Start ECC initialization\n" ); +dev_dbg (host->dev,"Start ECC initialization\n" ); addr =0 ; length = size *1024 *1024 ; buf =kzalloc (ECC_ERASE_BUF_SZ ,GFP_KERNEL );
@@ -1388,7 +1351,7 @@ static unsigned int pdc20621_dimm_init(struct ata_host *host) addr +=ECC_ERASE_BUF_SZ ; }kfree (buf); -VPRINTK ("Finish ECC initialization\n" ); +dev_dbg (host->dev,"Finish ECC initialization\n" ); }return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 7/373 ata: sata_sx4: Add error handling in pdc20621_i2c_read()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wentao Liang <[email protected]>
[ Upstream commit 8d46a27085039158eb5e253ab8a35a0e33b5e864 ]
The function pdc20621_prog_dimm0() calls the function pdc20621_i2c_read() but does not handle the error if the read fails. This could lead to process with invalid data. A proper implementation can be found in /source/drivers/ata/sata_sx4.c, pdc20621_prog_dimm_global(). As mentioned in its commit: bb44e154e25125bef31fa956785e90fccd24610b, the variable spd0 might be used uninitialized when pdc20621_i2c_read() fails.
Add error handling to pdc20621_i2c_read(). If a read operation fails, an error message is logged via dev_err(), and return a negative error code.
Add error handling to pdc20621_prog_dimm0() in pdc20621_dimm_init(), and return a negative error code if pdc20621_prog_dimm0() fails.
--- drivers/ata/sata_sx4.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/ata/sata_sx4.c +10 -3
@@ -1124,9 +1124,14 @@ static int pdc20621_prog_dimm0(struct ata_host *host) mmio +=PDC_CHIP0_OFS ;for (i =0 ; i <ARRAY_SIZE (pdc_i2c_read_data); i++) -pdc20621_i2c_read (host,PDC_DIMM0_SPD_DEV_ADDRESS , - pdc_i2c_read_data[i].reg, - &spd0[pdc_i2c_read_data[i].ofs]); +if (!pdc20621_i2c_read (host,PDC_DIMM0_SPD_DEV_ADDRESS , + pdc_i2c_read_data[i].reg, + &spd0[pdc_i2c_read_data[i].ofs])) { +dev_err (host->dev, +"Failed in i2c read at index %d: device=%#x, reg=%#x\n" , + i,PDC_DIMM0_SPD_DEV_ADDRESS , pdc_i2c_read_data[i].reg); +return -EIO ; + } data |= (spd0[4 ] -8 ) | ((spd0[21 ] !=0 ) <<3 ) | ((spd0[3 ]-11 ) <<4 ); data |= ((spd0[17] / 4) << 6) | ((spd0[5] / 2) << 7) |
@@ -1290,6 +1295,8 @@ static unsigned int pdc20621_dimm_init(struct ata_host *host)/* Programming DIMM0 Module Control Register (index_CID0:80h) */ size =pdc20621_prog_dimm0 (host); +if (size <0 ) +return size;dev_dbg (host->dev,"Local DIMM Size = %dMB\n" , size);/* Programming DIMM Module Global Control Register (index_CID0:88h) */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 8/373 nvmet-fcloop: swap list_add_tail arguments
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Wagner <[email protected]>
[ Upstream commit 2b5f0c5bc819af2b0759a8fcddc1b39102735c0f ]
The newly element to be added to the list is the first argument of list_add_tail. This fix is missing dcfad4ab4d67 ("nvmet-fcloop: swap the list_add_tail arguments").
--- drivers/nvme/target/fcloop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/target/fcloop.c +1 -1
@@ -478,7 +478,7 @@ fcloop_t2h_xmt_ls_rsp(struct nvme_fc_local_port *localport,if (targetport) { tport = targetport->private;spin_lock (&tport->lock); -list_add_tail (&tport->ls_list, &tls_req->ls_list); +list_add_tail (&tls_req->ls_list, &tport->ls_list);spin_unlock (&tport->lock);queue_work (nvmet_wq, &tport->ls_work); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 9/373 net: ppp: Add bound checking for skb data on ppp_sync_txmung
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnaud Lecomte <[email protected]>
[ Upstream commit aabc6596ffb377c4c9c8f335124b92ea282c9821 ]
Ensure we have enough data in linear buffer from skb before accessing initial bytes. This prevents potential out-of-bounds accesses when processing short packets.
When ppp_sync_txmung receives an incoming package with an empty payload:
(remote) gef➤ p *(struct pppoe_hdr *) (skb->head + skb->network_header)
$18 = {
type = 0x1,
ver = 0x1,
code = 0x0,
sid = 0x2,
length = 0x0,
tag = 0xffff8880371cdb96
}from the skb struct (trimmed)
tail = 0x16,
end = 0x140,
head = 0xffff88803346f400 "4",
data = 0xffff88803346f416 ":\377",
truesize = 0x380,
len = 0x0,
data_len = 0x0,
mac_len = 0xe,
hdr_len = 0x0,it is not safe to access data[2].
--- drivers/net/ppp/ppp_synctty.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/ppp/ppp_synctty.c +5 -0
@@ -517,6 +517,11 @@ ppp_sync_txmunge(struct syncppp *ap, struct sk_buff *skb)unsigned char *data;int islcp; +/* Ensure we can safely access protocol field and LCP code */ +if (!pskb_may_pull (skb,3 )) { +kfree_skb (skb); +return NULL ; + } data = skb->data; proto =get_unaligned_be16 (data);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 10/373 nft_set_pipapo: fix incorrect avx2 match of 5th field octet
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
[ Upstream commit e042ed950d4e176379ba4c0722146cd96fb38aa2 ]
Given a set element like:
icmpv6 . dead:beef:00ff::1
The value of 'ff' is irrelevant, any address will be matched as long as the other octets are the same.
This is because of too-early register clobbering:
ymm7 is reloaded with new packet data (pkt[9]) but it still holds data of an earlier load that wasn't processed yet.
The existing tests in nft_concat_range.sh selftests do exercise this code path, but do not trigger incorrect matching due to the network prefix limitation.
--- net/netfilter/nft_set_pipapo_avx2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/netfilter/nft_set_pipapo_avx2.c +2 -1
@@ -994,8 +994,9 @@ static int nft_pipapo_avx2_lookup_8b_16(unsigned long *map, unsigned long *fill,NFT_PIPAPO_AVX2_BUCKET_LOAD8 (5 , lt,8 , pkt[8 ], bsize);NFT_PIPAPO_AVX2_AND (6 ,2 ,3 ); +NFT_PIPAPO_AVX2_AND (3 ,4 ,7 );NFT_PIPAPO_AVX2_BUCKET_LOAD8 (7 , lt,9 , pkt[9 ], bsize); -NFT_PIPAPO_AVX2_AND (0 ,4 ,5 ); +NFT_PIPAPO_AVX2_AND (0 ,3 ,5 );NFT_PIPAPO_AVX2_BUCKET_LOAD8 (1 , lt,10 , pkt[10 ], bsize);NFT_PIPAPO_AVX2_AND (2 ,6 ,7 );NFT_PIPAPO_AVX2_BUCKET_LOAD8 (3 , lt,11 , pkt[11 ], bsize);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 11/373 umount: Allow superblock owners to force umount
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Trond Myklebust <[email protected]>
[ Upstream commit e1ff7aa34dec7e650159fd7ca8ec6af7cc428d9f ]
Loosen the permission check on forced umount to allow users holding CAP_SYS_ADMIN privileges in namespaces that are privileged with respect to the userns that originally mounted the filesystem.
--- fs/namespace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/namespace.c +2 -1
@@ -1734,6 +1734,7 @@ static void warn_mandlock(void)static int can_umount (const struct path *path,int flags) {struct mount *mnt =real_mount (path->mnt); +struct super_block *sb = path->dentry->d_sb;if (!may_mount ())return -EPERM ;
@@ -1743,7 +1744,7 @@ static int can_umount(const struct path *path, int flags)return -EINVAL ;if (mnt->mnt.mnt_flags &MNT_LOCKED )/* Check optimistically */ return -EINVAL ; -if (flags &MNT_FORCE && !capable (CAP_SYS_ADMIN )) +if (flags &MNT_FORCE && !ns_capable (sb->s_user_ns,CAP_SYS_ADMIN ))return -EPERM ;return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 12/373 pm: cpupower: bench: Prevent NULL dereference on malloc failure
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhongqiu Han <[email protected]>
[ Upstream commit 208baa3ec9043a664d9acfb8174b332e6b17fb69 ]
If malloc returns NULL due to low memory, 'config' pointer can be NULL. Add a check to prevent NULL dereference.
--- tools/power/cpupower/bench/parse.c | 4 ++++ 1 file changed, 4 insertions(+)
tools/power/cpupower/bench/parse.c +4 -0
@@ -120,6 +120,10 @@ FILE *prepare_output(const char *dirname)struct config *prepare_default_config () {struct config *config =malloc (sizeof (struct config )); +if (!config) { +perror ("malloc" ); +return NULL ; + }dprintf ("loading defaults\n" );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 13/373 x86/cpu: Dont clear X86_FEATURE_LAHF_LM flag in init_amd_k8() on AMD when running in a virtual machine
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Max Grobecker <[email protected]>
[ Upstream commit a4248ee16f411ac1ea7dfab228a6659b111e3d65 ]
When running in a virtual machine, we might see the original hardware CPU vendor string (i.e. "AuthenticAMD"), but a model and family ID set by the hypervisor. In case we run on AMD hardware and the hypervisor sets a model ID < 0x14, the LAHF cpu feature is eliminated from the the list of CPU capabilities present to circumvent a bug with some BIOSes in conjunction with AMD K8 processors.
Parsing the flags list from /proc/cpuinfo seems to be happening mostly in bash scripts and prebuilt Docker containers, as it does not need to have additionals tools present – even though more reliable ways like using "kcpuid", which calls the CPUID instruction instead of parsing a list, should be preferred. Scripts, that use /proc/cpuinfo to determine if the current CPU is "compliant" with defined microarchitecture levels like x86-64-v2 will falsely claim the CPU is incapable of modern CPU instructions when "lahf_lm" is missing in that flags list.
This can prevent some docker containers from starting or build scripts to create unoptimized binaries.
Admittably, this is more a small inconvenience than a severe bug in the kernel and the shoddy scripts that rely on parsing /proc/cpuinfo
should be fixed instead.
This patch adds an additional check to see if we're running inside a virtual machine (X86_FEATURE_HYPERVISOR is present), which, to my understanding, can't be present on a real K8 processor as it was introduced only with the later/other Athlon64 models.
Example output with the "lahf_lm" flag missing in the flags list (should be shown between "hypervisor" and "abm"):
$ cat /proc/cpuinfo
processor : 0
vendor_id : AuthenticAMD
cpu family : 15
model : 6
model name : Common KVM processor
stepping : 1
microcode : 0x1000065
cpu MHz : 2599.998
cache size : 512 KB
physical id : 0
siblings : 1
core id : 0
cpu cores : 1
apicid : 0
initial apicid : 0
fpu : yes
fpu_exception : yes
cpuid level : 13
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca
cmov pat pse36 clflush mmx fxsr sse sse2 syscall nx rdtscp
lm rep_good nopl cpuid extd_apicid tsc_known_freq pni
pclmulqdq ssse3 fma cx16 sse4_1 sse4_2 x2apic movbe popcnt
tsc_deadline_timer aes xsave avx f16c hypervisor abm
3dnowprefetch vmmcall bmi1 avx2 bmi2 xsaveopt... while kcpuid shows the feature to be present in the CPU:
# kcpuid -d | grep lahf
lahf_lm - LAHF/SAHF available in 64-bit mode[ mingo: Updated the comment a bit, incorporated Boris's review feedback. ]
--- arch/x86/kernel/cpu/amd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/amd.c +1 -1
@@ -811,7 +811,7 @@ static void init_amd_k8(struct cpuinfo_x86 *c)* (model = 0x14) and later actually support it. * (AMD Erratum #110, docId: 25759). */ -if (c->x86_model <0x14 &&cpu_has (c,X86_FEATURE_LAHF_LM )) { +if (c->x86_model <0x14 &&cpu_has (c,X86_FEATURE_LAHF_LM ) && !cpu_has (c,X86_FEATURE_HYPERVISOR )) {clear_cpu_cap (c,X86_FEATURE_LAHF_LM );if (!rdmsrl_amd_safe (0xc001100d , &value)) { value &= ~BIT_64 (32 );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 14/373 perf: arm_pmu: Dont disable counter in armpmu_add()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Rutland <[email protected]>
[ Upstream commit dcca27bc1eccb9abc2552aab950b18a9742fb8e7 ]
Currently armpmu_add() tries to handle a newly-allocated counter having a stale associated event, but this should not be possible, and if this were to happen the current mitigation is insufficient and potentially expensive. It would be better to warn if we encounter the impossible case.
Calls to pmu::add() and pmu::del() are serialized by the core perf code, and armpmu_del() clears the relevant slot in pmu_hw_events::events[] before clearing the bit in pmu_hw_events::used_mask such that the counter can be reallocated. Thus when armpmu_add() allocates a counter index from pmu_hw_events::used_mask, it should not be possible to observe a stale even in pmu_hw_events::events[] unless either pmu_hw_events::used_mask or pmu_hw_events::events[] have been corrupted.
If this were to happen, we'd end up with two events with the same event->hw.idx, which would clash with each other during reprogramming, deletion, etc, and produce bogus results. Add a WARN_ON_ONCE() for this case so that we can detect if this ever occurs in practice.
That possiblity aside, there's no need to call arm_pmu::disable(event) for the new event. The PMU reset code initialises the counter in a disabled state, and armpmu_del() will disable the counter before it can be reused. Remove the redundant disable.
--- drivers/perf/arm_pmu.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/perf/arm_pmu.c +3 -5
@@ -338,12 +338,10 @@ armpmu_add(struct perf_event *event, int flags)if (idx <0 )return idx; -/* -* If there is an event in the counter we are going to use then make -* sure it is disabled. -*/ +/* The newly-allocated counter should be empty */ +WARN_ON_ONCE (hw_events->events[idx]); + event->hw.idx = idx; - armpmu->disable (event); hw_events->events[idx] = event; hwc->state =PERF_HES_STOPPED |PERF_HES_UPTODATE ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 15/373 arm64: cputype: Add QCOM_CPU_PART_KRYO_3XX_GOLD
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
[ Upstream commit 401c3333bb2396aa52e4121887a6f6a6e2f040bc ]
Add a definition for the Qualcomm Kryo 300-series Gold cores.
--- arch/arm64/include/asm/cputype.h | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/include/asm/cputype.h +2 -0
@@ -111,6 +111,7 @@#define QCOM_CPU_PART_KRYO 0x200#define QCOM_CPU_PART_KRYO_2XX_GOLD 0x800#define QCOM_CPU_PART_KRYO_2XX_SILVER 0x801 +#define QCOM_CPU_PART_KRYO_3XX_GOLD 0x802#define QCOM_CPU_PART_KRYO_3XX_SILVER 0x803#define QCOM_CPU_PART_KRYO_4XX_GOLD 0x804#define QCOM_CPU_PART_KRYO_4XX_SILVER 0x805
@@ -170,6 +171,7 @@#define MIDR_QCOM_KRYO MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_KRYO)#define MIDR_QCOM_KRYO_2XX_GOLD MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_KRYO_2XX_GOLD)#define MIDR_QCOM_KRYO_2XX_SILVER MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_KRYO_2XX_SILVER) +#define MIDR_QCOM_KRYO_3XX_GOLD MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_KRYO_3XX_GOLD)#define MIDR_QCOM_KRYO_3XX_SILVER MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_KRYO_3XX_SILVER)#define MIDR_QCOM_KRYO_4XX_GOLD MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_KRYO_4XX_GOLD)#define MIDR_QCOM_KRYO_4XX_SILVER MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_KRYO_4XX_SILVER)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 16/373 xen/mcelog: Add __nonstring annotations for unterminated strings
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
[ Upstream commit 1c3dfc7c6b0f551fdca3f7c1f1e4c73be8adb17d ]
When a character array without a terminating NUL character has a static initializer, GCC 15's -Wunterminated-string-initialization will only warn if the array lacks the "nonstring" attribute[1]. Mark the arrays with __nonstring to and correctly identify the char array as "not a C string" and thereby eliminate the warning.
Message-ID: <[email protected]>
--- include/xen/interface/xen-mca.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/xen/interface/xen-mca.h +1 -1
@@ -371,7 +371,7 @@ struct xen_mce {#define XEN_MCE_LOG_LEN 32struct xen_mce_log { -char signature[12 ];/* "MACHINECHECK" */ + char signature[12] __nonstring; /* "MACHINECHECK" */unsigned len;/* = XEN_MCE_LOG_LEN */ unsigned next; unsigned flags;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 17/373 HID: pidff: Convert infinite length from Linux API to PID standard
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomasz Pakuła <[email protected]>
[ Upstream commit 37e0591fe44dce39d1ebc7a82d5b6e4dba1582eb ]
Software uses 0 as de-facto infinite lenght on Linux FF apis (SDL), Linux doesn't actually define anythi as of now, while USB PID defines NULL (0xffff). Most PID devices do not expect a 0-length effect and can't interpret it as infinite. This change fixes Force Feedback for most PID compliant devices.
As most games depend on updating the values of already playing infinite effects, this is crucial to ensure they will actually work.
Previously, users had to rely on third-party software to do this conversion and make their PID devices usable.
--- drivers/hid/usbhid/hid-pidff.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/hid/usbhid/hid-pidff.c +7 -1
@@ -21,6 +21,7 @@#include "usbhid.h" #define PID_EFFECTS_MAX 64 +#define PID_INFINITE 0xffff/* Report usage table used to put reports into an array */
@@ -301,7 +302,12 @@ static void pidff_set_effect_report(struct pidff_device *pidff, pidff->block_load[PID_EFFECT_BLOCK_INDEX ].value[0 ]; pidff->set_effect_type->value[0 ] = pidff->create_new_effect_type->value[0 ]; - pidff->set_effect[PID_DURATION ].value[0 ] = effect->replay.length; + +/* Convert infinite length from Linux API (0) +to PID standard (NULL) if needed */ + pidff->set_effect[PID_DURATION ].value[0 ] = + effect->replay.length ==0 ?PID_INFINITE : effect->replay.length; + pidff->set_effect[PID_TRIGGER_BUTTON ].value[0 ] = effect->trigger.button; pidff->set_effect[PID_TRIGGER_REPEAT_INT ].value[0 ] = effect->trigger.interval;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 18/373 HID: pidff: Do not send effect envelope if its empty
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomasz Pakuła <[email protected]>
[ Upstream commit 8876fc1884f5b39550c8387ff3176396c988541d ]
Envelope struct is always initialized, but the envelope itself is optional as described in USB PID Device class definition 1.0.
5.1.1.1 Type Specific Block Offsets
...
4) Effects that do not use Condition Blocks use 1 Parameter Block and an *optional* Envelope Block.
Sending out "empty" envelope breaks force feedback on some devices with games that use SINE effect + offset to emulate constant force effect, as well as generally breaking Constant/Periodic effects. One of the affected brands is Moza Racing.
This change prevents the envelope from being sent if it contains all 0 values while keeping the old behavior of only sending it, if it differs from the old one.
Changes in v6:
- Simplify the checks to make them clearer
- Fix possible null pointer dereference while calling pidff_needs_set_envelope
--- drivers/hid/usbhid/hid-pidff.c | 42 +++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 18 deletions(-)
drivers/hid/usbhid/hid-pidff.c +24 -18
@@ -262,10 +262,22 @@ static void pidff_set_envelope_report(struct pidff_device *pidff,static int pidff_needs_set_envelope (struct ff_envelope *envelope,struct ff_envelope *old) { -return envelope->attack_level != old->attack_level || - envelope->fade_level != old->fade_level || +bool needs_new_envelope; + needs_new_envelope = envelope->attack_level !=0 || + envelope->fade_level !=0 || + envelope->attack_length !=0 || + envelope->fade_length !=0 ; + +if (!needs_new_envelope) +return false; + +if (!old) +return needs_new_envelope; + +return envelope->attack_level != old->attack_level || + envelope->fade_level != old->fade_level || envelope->attack_length != old->attack_length || - envelope->fade_length != old->fade_length; + envelope->fade_length != old->fade_length; }/*
@@ -580,11 +592,9 @@ static int pidff_upload_effect(struct input_dev *dev, struct ff_effect *effect,pidff_set_effect_report (pidff, effect);if (!old ||pidff_needs_set_constant (effect, old))pidff_set_constant_force_report (pidff, effect); -if (!old || -pidff_needs_set_envelope (&effect->u.constant.envelope, - &old->u.constant.envelope)) -pidff_set_envelope_report (pidff, - &effect->u.constant.envelope); +if (pidff_needs_set_envelope (&effect->u.constant.envelope, + old ? &old->u.constant.envelope :NULL )) +pidff_set_envelope_report (pidff, &effect->u.constant.envelope);break ;case FF_PERIODIC :
@@ -619,11 +629,9 @@ static int pidff_upload_effect(struct input_dev *dev, struct ff_effect *effect,pidff_set_effect_report (pidff, effect);if (!old ||pidff_needs_set_periodic (effect, old))pidff_set_periodic_report (pidff, effect); -if (!old || -pidff_needs_set_envelope (&effect->u.periodic.envelope, - &old->u.periodic.envelope)) -pidff_set_envelope_report (pidff, - &effect->u.periodic.envelope); +if (pidff_needs_set_envelope (&effect->u.periodic.envelope, + old ? &old->u.periodic.envelope :NULL )) +pidff_set_envelope_report (pidff, &effect->u.periodic.envelope);break ;case FF_RAMP :
@@ -637,11 +645,9 @@ static int pidff_upload_effect(struct input_dev *dev, struct ff_effect *effect,pidff_set_effect_report (pidff, effect);if (!old ||pidff_needs_set_ramp (effect, old))pidff_set_ramp_force_report (pidff, effect); -if (!old || -pidff_needs_set_envelope (&effect->u.ramp.envelope, - &old->u.ramp.envelope)) -pidff_set_envelope_report (pidff, - &effect->u.ramp.envelope); +if (pidff_needs_set_envelope (&effect->u.ramp.envelope, + old ? &old->u.ramp.envelope :NULL )) +pidff_set_envelope_report (pidff, &effect->u.ramp.envelope);break ;case FF_SPRING :
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 19/373 HID: pidff: Fix null pointer dereference in pidff_find_fields
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomasz Pakuła <[email protected]>
[ Upstream commit 22a05462c3d0eee15154faf8d13c49e6295270a5 ]
This function triggered a null pointer dereference if used to search for a report that isn't implemented on the device. This happened both for optional and required reports alike.
The same logic was applied to pidff_find_special_field and although pidff_init_fields should return an error earlier if one of the required reports is missing, future modifications could change this logic and resurface this possible null pointer dereference again.
LKML bug report:
https://lore.kernel.org/all/CAL-gK7f5=R0nrrQdPtaZZr1fd-cdAMbDMuZ_NLA8vM0SX+nGSw@mail.gmail.com
--- drivers/hid/usbhid/hid-pidff.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/hid/usbhid/hid-pidff.c +10 -0
@@ -772,6 +772,11 @@ static int pidff_find_fields(struct pidf {int i, j, k, found; +if (!report) { +pr_debug ("pidff_find_fields, null report\n" ); +return -1 ; + } +for (k =0 ; k < count; k++) { found =0 ;for (i =0 ; i < report->maxfield; i++) {
@@ -885,6 +890,11 @@ static struct hid_field *pidff_find_spec {int i; +if (!report) { +pr_debug ("pidff_find_special_field, null report\n" ); +return NULL ; + } +for (i =0 ; i < report->maxfield; i++) {if (report->field[i]->logical == (HID_UP_PID | usage) && report->field[i]->report_count >0 ) {
Greg Kroah-Hartman
maintainerPATCH 20/373 ALSA: hda: intel: Fix Optimus when GPU has no sound
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maxim Mikityanskiy <[email protected]>
[ Upstream commit 2b360ba9a4936486380bc30d1eabceb40a714d98 ]
quirk_nvidia_hda() forcefully enables HDA controller on all NVIDIA GPUs, because some buggy BIOSes leave it disabled. However, some dual-GPU laptops do not have a functional HDA controller in DGPU, and BIOS disables it on purpose. After quirk_nvidia_hda() reenables this dummy HDA controller, attempting to probe it fails at azx_first_init(), which is too late to cancel the probe, as it happens in azx_probe_continue().
The sna_hda_intel driver calls azx_free() and stops the chip, however, it stays probed, and from the runtime PM point of view, the device remains active (it was set as active by the PCI subsystem on probe). It prevents vga_switcheroo from turning off the DGPU, because pci_create_device_link() syncs power management for video and audio devices.
Affected devices should be added to driver_denylist to prevent them from probing early. This patch helps identify such devices by printing a warning, and also forces the device to the suspended state to allow vga_switcheroo turn off DGPU.
--- sound/pci/hda/hda_intel.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
sound/pci/hda/hda_intel.c +14 -1
@@ -1365,8 +1365,21 @@ static void azx_free(struct azx *chip)if (use_vga_switcheroo (hda)) {if (chip->disabled && hda->probe_continued)snd_hda_unlock_devices (&chip->bus); -if (hda->vga_switcheroo_registered) +if (hda->vga_switcheroo_registered) {vga_switcheroo_unregister_client (chip->pci); + +/* Some GPUs don't have sound, and azx_first_init fails, +* leaving the device probed but non-functional. As long +* as it's probed, the PCI subsystem keeps its runtime +* PM status as active. Force it to suspended (as we +* actually stop the chip) to allow GPU to suspend via +* vga_switcheroo, and print a warning. +*/ +dev_warn (&pci->dev,"GPU sound probed, but not operational: please add a quirk to driver_denylist\n" ); +pm_runtime_disable (&pci->dev); +pm_runtime_set_suspended (&pci->dev); +pm_runtime_enable (&pci->dev); + } }if (bus->chip_init) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 21/373 ASoC: fsl_audmix: register card device depends on dais property
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shengjiu Wang <[email protected]>
[ Upstream commit 294a60e5e9830045c161181286d44ce669f88833 ]
In order to make the audmix device linked by audio graph card, make 'dais' property to be optional.
If 'dais' property exists, then register the imx-audmix card driver. otherwise, it should be linked by audio graph card.
--- sound/soc/fsl/fsl_audmix.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
sound/soc/fsl/fsl_audmix.c +11 -5
@@ -500,11 +500,17 @@ static int fsl_audmix_probe(struct platform_device *pdev) goto err_disable_pm; } - priv->pdev =platform_device_register_data (dev,"imx-audmix" ,0 ,NULL ,0 ); -if (IS_ERR (priv->pdev)) { - ret =PTR_ERR (priv->pdev); -dev_err (dev,"failed to register platform: %d\n" , ret); - goto err_disable_pm; +/* +* If dais property exist, then register the imx-audmix card driver. +* otherwise, it should be linked by audio graph card. +*/ +if (of_find_property (pdev->dev.of_node,"dais" ,NULL )) { + priv->pdev =platform_device_register_data (dev,"imx-audmix" ,0 ,NULL ,0 ); +if (IS_ERR (priv->pdev)) { + ret =PTR_ERR (priv->pdev); +dev_err (dev,"failed to register platform: %d\n" , ret); + goto err_disable_pm; + } }return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 22/373 ALSA: usb-audio: Fix CME quirk for UF series keyboards
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricard Wanderlof <[email protected]>
[ Upstream commit c2820405ba55a38932aa2177f026b70064296663 ]
Fix quirk for CME master keyboards so it not only handles sysex but also song position pointer, MIDI timing clock, start and stop messages, and active sensing. All of these can be output by the CME UF series master keyboards.
Tested with a CME UF6 in a desktop Linux environment as well as on the Zynthian Raspberry Pi based platform.
--- sound/usb/midi.c | 80 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 74 insertions(+), 6 deletions(-)
sound/usb/midi.c +74 -6
@@ -489,16 +489,84 @@ static void ch345_broken_sysex_input(struct snd_usb_midi_in_endpoint *ep,/* * CME protocol: like the standard protocol, but SysEx commands are sent as a -* single USB packet preceded by a 0x0F byte. +* single USB packet preceded by a 0x0F byte, as are system realtime +* messages and MIDI Active Sensing. +* Also, multiple messages can be sent in the same packet. */ static void snd_usbmidi_cme_input (struct snd_usb_midi_in_endpoint *ep,uint8_t *buffer,int buffer_length) { -if (buffer_length <2 || (buffer[0 ] &0x0f ) !=0x0f ) -snd_usbmidi_standard_input (ep, buffer, buffer_length); -else -snd_usbmidi_input_data (ep, buffer[0 ] >>4 , - &buffer[1 ], buffer_length -1 ); +int remaining = buffer_length; + +/* +* CME send sysex, song position pointer, system realtime +* and active sensing using CIN 0x0f, which in the standard +* is only intended for single byte unparsed data. +* So we need to interpret these here before sending them on. +* By default, we assume single byte data, which is true +* for system realtime (midi clock, start, stop and continue) +* and active sensing, and handle the other (known) cases +* separately. +* In contrast to the standard, CME does not split sysex +* into multiple 4-byte packets, but lumps everything together +* into one. In addition, CME can string multiple messages +* together in the same packet; pressing the Record button +* on an UF6 sends a sysex message directly followed +* by a song position pointer in the same packet. +* For it to have any reasonable meaning, a sysex message +* needs to be at least 3 bytes in length (0xf0, id, 0xf7), +* corresponding to a packet size of 4 bytes, and the ones sent +* by CME devices are 6 or 7 bytes, making the packet fragments +* 7 or 8 bytes long (six or seven bytes plus preceding CN+CIN byte). +* For the other types, the packet size is always 4 bytes, +* as per the standard, with the data size being 3 for SPP +* and 1 for the others. +* Thus all packet fragments are at least 4 bytes long, so we can +* skip anything that is shorter; this also conveniantly skips +* packets with size 0, which CME devices continuously send when +* they have nothing better to do. +* Another quirk is that sometimes multiple messages are sent +* in the same packet. This has been observed for midi clock +* and active sensing i.e. 0x0f 0xf8 0x00 0x00 0x0f 0xfe 0x00 0x00, +* but also multiple note ons/offs, and control change together +* with MIDI clock. Similarly, some sysex messages are followed by +* the song position pointer in the same packet, and occasionally +* additionally by a midi clock or active sensing. +* We handle this by looping over all data and parsing it along the way. +*/ +while (remaining >=4 ) { +int source_length =4 ;/* default */ + +if ((buffer[0 ] &0x0f ) ==0x0f ) { +int data_length =1 ;/* default */ + +if (buffer[1 ] ==0xf0 ) { +/* Sysex: Find EOX and send on whole message. */ +/* To kick off the search, skip the first +* two bytes (CN+CIN and SYSEX (0xf0). +*/ +uint8_t *tmp_buf = buffer +2 ; +int tmp_length = remaining -2 ; + +while (tmp_length >1 && *tmp_buf !=0xf7 ) { + tmp_buf++; + tmp_length--; + } + data_length = tmp_buf - buffer; + source_length = data_length +1 ; + }else if (buffer[1 ] ==0xf2 ) { +/* Three byte song position pointer */ + data_length =3 ; + } +snd_usbmidi_input_data (ep, buffer[0 ] >>4 , + &buffer[1 ], data_length); + }else { +/* normal channel events */ +snd_usbmidi_standard_input (ep, buffer, source_length); + } + buffer += source_length; + remaining -= source_length; + } }/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 23/373 page_pool: avoid infinite loop to schedule delayed worker
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Xing <[email protected]>
[ Upstream commit 43130d02baa137033c25297aaae95fd0edc41654 ]
We noticed the kworker in page_pool_release_retry() was waken up repeatedly and infinitely in production because of the buggy driver causing the inflight less than 0 and warning us in page_pool_inflight()[1].
Since the inflight value goes negative, it means we should not expect the whole page_pool to get back to work normally.
This patch mitigates the adverse effect by not rescheduling the kworker when detecting the inflight negative in page_pool_release_retry().
[1]
[Mon Feb 10 20:36:11 2025] ------------[ cut here ]------------ [Mon Feb 10 20:36:11 2025] Negative(-51446) inflight packet-pages ... [Mon Feb 10 20:36:11 2025] Call Trace: [Mon Feb 10 20:36:11 2025] page_pool_release_retry+0x23/0x70 [Mon Feb 10 20:36:11 2025] process_one_work+0x1b1/0x370 [Mon Feb 10 20:36:11 2025] worker_thread+0x37/0x3a0 [Mon Feb 10 20:36:11 2025] kthread+0x11a/0x140 [Mon Feb 10 20:36:11 2025] ? process_one_work+0x370/0x370 [Mon Feb 10 20:36:11 2025] ? __kthread_cancel_work+0x40/0x40 [Mon Feb 10 20:36:11 2025] ret_from_fork+0x35/0x40 [Mon Feb 10 20:36:11 2025] ---[ end trace ebffe800f33e7e34 ]---
Note: before this patch, the above calltrace would flood the dmesg due to repeated reschedule of release_dw kworker.
--- net/core/page_pool.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
net/core/page_pool.c +7 -1
@@ -699,7 +699,13 @@ static void page_pool_release_retry(struct work_struct *wq)int inflight; inflight =page_pool_release (pool); -if (!inflight) +/* In rare cases, a driver bug may cause inflight to go negative. +* Don't reschedule release if inflight is 0 or negative. +* - If 0, the page_pool has been destroyed +* - if negative, we will never recover +* in both cases no reschedule is necessary. +*/ +if (inflight <=0 )return ;/* Periodic warning */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 24/373 jfs: Fix uninit-value access of imap allocated in the diMount() function
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhongqiu Han <[email protected]>
[ Upstream commit 9629d7d66c621671d9a47afe27ca9336bfc8a9ea ]
syzbot reports that hex_dump_to_buffer is using uninit-value:
=====================================================
BUG: KMSAN: uninit-value in hex_dump_to_buffer+0x888/0x1100 lib/hexdump.c:171 hex_dump_to_buffer+0x888/0x1100 lib/hexdump.c:171 print_hex_dump+0x13d/0x3e0 lib/hexdump.c:276 diFree+0x5ba/0x4350 fs/jfs/jfs_imap.c:876 jfs_evict_inode+0x510/0x550 fs/jfs/inode.c:156 evict+0x723/0xd10 fs/inode.c:796 iput_final fs/inode.c:1946 [inline] iput+0x97b/0xdb0 fs/inode.c:1972 txUpdateMap+0xf3e/0x1150 fs/jfs/jfs_txnmgr.c:2367 txLazyCommit fs/jfs/jfs_txnmgr.c:2664 [inline] jfs_lazycommit+0x627/0x11d0 fs/jfs/jfs_txnmgr.c:2733 kthread+0x6b9/0xef0 kernel/kthread.c:464 ret_from_fork+0x6d/0x90 arch/x86/kernel/process.c:148 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244
Uninit was created at:
slab_post_alloc_hook mm/slub.c:4121 [inline] slab_alloc_node mm/slub.c:4164 [inline] __kmalloc_cache_noprof+0x8e3/0xdf0 mm/slub.c:4320 kmalloc_noprof include/linux/slab.h:901 [inline] diMount+0x61/0x7f0 fs/jfs/jfs_imap.c:105 jfs_mount+0xa8e/0x11d0 fs/jfs/jfs_mount.c:176 jfs_fill_super+0xa47/0x17c0 fs/jfs/super.c:523 get_tree_bdev_flags+0x6ec/0x910 fs/super.c:1636 get_tree_bdev+0x37/0x50 fs/super.c:1659 jfs_get_tree+0x34/0x40 fs/jfs/super.c:635 vfs_get_tree+0xb1/0x5a0 fs/super.c:1814 do_new_mount+0x71f/0x15e0 fs/namespace.c:3560 path_mount+0x742/0x1f10 fs/namespace.c:3887 do_mount fs/namespace.c:3900 [inline] __do_sys_mount fs/namespace.c:4111 [inline] __se_sys_mount+0x71f/0x800 fs/namespace.c:4088 __x64_sys_mount+0xe4/0x150 fs/namespace.c:4088 x64_sys_call+0x39bf/0x3c30 arch/x86/include/generated/asm/syscalls_64.h:166 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xcd/0x1e0 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f =====================================================
The reason is that imap is not properly initialized after memory allocation. It will cause the snprintf() function to write uninitialized data into linebuf within hex_dump_to_buffer().
Fix this by using kzalloc instead of kmalloc to clear its content at the beginning in diMount().
--- fs/jfs/jfs_imap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/jfs/jfs_imap.c +1 -1
@@ -102,7 +102,7 @@ int diMount(struct inode *ipimap)* allocate/initialize the in-memory inode map control structure */ /* allocate the in-memory inode map control structure. */ - imap =kmalloc (sizeof (struct inomap ),GFP_KERNEL ); + imap =kzalloc (sizeof (struct inomap ),GFP_KERNEL );if (imap ==NULL )return -ENOMEM ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 25/373 fs/jfs: cast inactags to s64 to prevent potential overflow
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rand Deeb <[email protected]>
[ Upstream commit 70ca3246ad201b53a9f09380b3f29d8bac320383 ]
The expression "inactags << bmp->db_agl2size" in the function dbFinalizeBmap() is computed using int operands. Although the values (inactags and db_agl2size) are derived from filesystem parameters and are usually small, there is a theoretical risk that the shift could overflow a 32-bit int if extreme values occur.
According to the C standard, shifting a signed 32-bit int can lead to undefined behavior if the result exceeds its range. In our case, an overflow could miscalculate free blocks, potentially leading to erroneous filesystem accounting.
To ensure the arithmetic is performed in 64-bit space, we cast "inactags" to s64 before shifting. This defensive fix prevents any risk of overflow and complies with kernel coding best practices.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- fs/jfs/jfs_dmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/jfs/jfs_dmap.c +2 -2
@@ -3732,8 +3732,8 @@ void dbFinalizeBmap(struct inode *ipbmap)* system size is not a multiple of the group size). */ inactfree = (inactags && ag_rem) ? - ((inactags -1 ) << bmp->db_agl2size) + ag_rem - : inactags << bmp->db_agl2size; + (((s64 )inactags -1 ) << bmp->db_agl2size) + ag_rem + : ((s64 )inactags << bmp->db_agl2size);/* determine how many free blocks are in the active * allocation groups plus the average number of free blocks
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 26/373 fs/jfs: Prevent integer overflow in AG size calculation
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rand Deeb <[email protected]>
[ Upstream commit 7fcbf789629cdb9fbf4e2172ce31136cfed11e5e ]
The JFS filesystem calculates allocation group (AG) size using 1 << l2agsize in dbExtendFS(). When l2agsize exceeds 31 (possible with >2TB aggregates on 32-bit systems), this 32-bit shift operation causes undefined behavior and improper AG sizing.
On 32-bit architectures:
- Left-shifting 1 by 32+ bits results in 0 due to integer overflow
- This creates invalid AG sizes (0 or garbage values) in sbi->bmap->db_agsize
- Subsequent block allocations would reference invalid AG structures
- Could lead to:
- Filesystem corruption during extend operations
- Kernel crashes due to invalid memory accesses
- Security vulnerabilities via malformed on-disk structures
Fix by casting to s64 before shifting:bmp->db_agsize = (s64)1 << l2agsize;
This ensures 64-bit arithmetic even on 32-bit architectures. The cast matches the data type of db_agsize (s64) and follows similar patterns in JFS block calculation code.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- fs/jfs/jfs_dmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/jfs/jfs_dmap.c +1 -1
@@ -3469,7 +3469,7 @@ int dbExtendFS(struct inode *ipbmap, s64 blkno, s64 nblocks) oldl2agsize = bmp->db_agl2size; bmp->db_agl2size = l2agsize; - bmp->db_agsize =1 << l2agsize; + bmp->db_agsize = (s64 )1 << l2agsize;/* compute new number of AG */ agno = bmp->db_numag;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 27/373 jfs: Prevent copying of nlink with value 0 from disk inode
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Edward Adam Davis <[email protected]>
[ Upstream commit b61e69bb1c049cf507e3c654fa3dc1568231bd07 ]
syzbot report a deadlock in diFree. [1]
When calling "ioctl$LOOP_SET_STATUS64", the offset value passed in is 4, which does not match the mounted loop device, causing the mapping of the mounted loop device to be invalidated.
When creating the directory and creating the inode of iag in diReadSpecial(), read the page of fixed disk inode (AIT) in raw mode in read_metapage(), the metapage data it returns is corrupted, which causes the nlink value of 0 to be assigned to the iag inode when executing copy_from_dinode(), which ultimately causes a deadlock when entering diFree().
To avoid this, first check the nlink value of dinode before setting iag inode.
[1]
WARNING: possible recursive locking detected
6.12.0-rc7-syzkaller-00212-g4a5df3796467 #0 Not tainted
--------------------------------------------
syz-executor301/5309 is trying to acquire lock:ffff888044548920 (&(imap->im_aglock[index])){+.+.}-{3:3}, at: diFree+0x37c/0x2fb0 fs/jfs/jfs_imap.c:889
but task is already holding lock:ffff888044548920 (&(imap->im_aglock[index])){+.+.}-{3:3}, at: diAlloc+0x1b6/0x1630
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0
---- lock(&(imap->im_aglock[index]));
lock(&(imap->im_aglock[index]));
*** DEADLOCK ***
May be due to missing lock nesting notation
5 locks held by syz-executor301/5309:
#0: ffff8880422a4420 (sb_writers#9){.+.+}-{0:0}, at: mnt_want_write+0x3f/0x90 fs/namespace.c:515 #1: ffff88804755b390 (&type->i_mutex_dir_key#6/1){+.+.}-{3:3}, at: inode_lock_nested include/linux/fs.h:850 [inline] #1: ffff88804755b390 (&type->i_mutex_dir_key#6/1){+.+.}-{3:3}, at: filename_create+0x260/0x540 fs/namei.c:4026 #2: ffff888044548920 (&(imap->im_aglock[index])){+.+.}-{3:3}, at: diAlloc+0x1b6/0x1630
#3: ffff888044548890 (&imap->im_freelock){+.+.}-{3:3}, at: diNewIAG fs/jfs/jfs_imap.c:2460 [inline] #3: ffff888044548890 (&imap->im_freelock){+.+.}-{3:3}, at: diAllocExt fs/jfs/jfs_imap.c:1905 [inline] #3: ffff888044548890 (&imap->im_freelock){+.+.}-{3:3}, at: diAllocAG+0x4b7/0x1e50 fs/jfs/jfs_imap.c:1669 #4: ffff88804755a618 (&jfs_ip->rdwrlock/1){++++}-{3:3}, at: diNewIAG fs/jfs/jfs_imap.c:2477 [inline] #4: ffff88804755a618 (&jfs_ip->rdwrlock/1){++++}-{3:3}, at: diAllocExt fs/jfs/jfs_imap.c:1905 [inline] #4: ffff88804755a618 (&jfs_ip->rdwrlock/1){++++}-{3:3}, at: diAllocAG+0x869/0x1e50 fs/jfs/jfs_imap.c:1669
stack backtrace: CPU: 0 UID: 0 PID: 5309 Comm: syz-executor301 Not tainted 6.12.0-rc7-syzkaller-00212-g4a5df3796467 #0 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.3-debian-1.16.3-2~bpo12+1 04/01/2014 Call Trace: <TASK> __dump_stack lib/dump_stack.c:94 [inline] dump_stack_lvl+0x241/0x360 lib/dump_stack.c:120 print_deadlock_bug+0x483/0x620 kernel/locking/lockdep.c:3037 check_deadlock kernel/locking/lockdep.c:3089 [inline] validate_chain+0x15e2/0x5920 kernel/locking/lockdep.c:3891 __lock_acquire+0x1384/0x2050 kernel/locking/lockdep.c:5202 lock_acquire+0x1ed/0x550 kernel/locking/lockdep.c:5825 __mutex_lock_common kernel/locking/mutex.c:608 [inline] __mutex_lock+0x136/0xd70 kernel/locking/mutex.c:752 diFree+0x37c/0x2fb0 fs/jfs/jfs_imap.c:889 jfs_evict_inode+0x32d/0x440 fs/jfs/inode.c:156 evict+0x4e8/0x9b0 fs/inode.c:725 diFreeSpecial fs/jfs/jfs_imap.c:552 [inline] duplicateIXtree+0x3c6/0x550 fs/jfs/jfs_imap.c:3022 diNewIAG fs/jfs/jfs_imap.c:2597 [inline] diAllocExt fs/jfs/jfs_imap.c:1905 [inline] diAllocAG+0x17dc/0x1e50 fs/jfs/jfs_imap.c:1669 diAlloc+0x1d2/0x1630 fs/jfs/jfs_imap.c:1590 ialloc+0x8f/0x900 fs/jfs/jfs_inode.c:56 jfs_mkdir+0x1c5/0xba0 fs/jfs/namei.c:225 vfs_mkdir+0x2f9/0x4f0 fs/namei.c:4257 do_mkdirat+0x264/0x3a0 fs/namei.c:4280 __do_sys_mkdirat fs/namei.c:4295 [inline] __se_sys_mkdirat fs/namei.c:4293 [inline] __x64_sys_mkdirat+0x87/0xa0 fs/namei.c:4293 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xf3/0x230 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f
--- fs/jfs/jfs_imap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/jfs/jfs_imap.c +1 -1
@@ -456,7 +456,7 @@ struct inode *diReadSpecial(struct super_block *sb, ino_t inum, int secondary) dp += inum %8 ;/* 8 inodes per 4K page */ /* copy on-disk inode to in-memory inode */ -if ((copy_from_dinode (dp, ip)) !=0 ) { +if ((copy_from_dinode (dp, ip) !=0 ) || (ip->i_nlink ==0 )) {/* handle bad return by returning NULL for ip */ set_nlink (ip,1 );/* Don't want iput() deleting it */ iput (ip);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 28/373 jfs: add sanity check for agwidth in dbMount
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Edward Adam Davis <[email protected]>
[ Upstream commit ddf2846f22e8575d6b4b6a66f2100f168b8cd73d ]
The width in dmapctl of the AG is zero, it trigger a divide error when calculating the control page level in dbAllocAG.
To avoid this issue, add a check for agwidth in dbAllocAG.
--- fs/jfs/jfs_dmap.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/jfs/jfs_dmap.c +4 -0
@@ -204,6 +204,10 @@ int dbMount(struct inode *ipbmap) bmp->db_aglevel =le32_to_cpu (dbmp_le->dn_aglevel); bmp->db_agheight =le32_to_cpu (dbmp_le->dn_agheight); bmp->db_agwidth =le32_to_cpu (dbmp_le->dn_agwidth); +if (!bmp->db_agwidth) { + err = -EINVAL ; + goto err_release_metapage; + } bmp->db_agstart =le32_to_cpu (dbmp_le->dn_agstart); bmp->db_agl2size =le32_to_cpu (dbmp_le->dn_agl2size); if (bmp->db_agl2size > L2MAXL2SIZE - L2MAXAG ||
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 29/373 ata: libata-eh: Do not use ATAPI DMA for a device limited to PIO mode
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Cassel <[email protected]>
[ Upstream commit 91ec84f8eaddbc93d7c62e363d68aeb7b89879c7 ]
atapi_eh_request_sense() currently uses ATAPI DMA if the SATA controller has ATA_FLAG_PIO_DMA (PIO cmds via DMA) set.
However, ATA_FLAG_PIO_DMA is a flag that can be set by a low-level driver on a port at initialization time, before any devices are scanned.
If a controller detects a connected device that only supports PIO, we set the flag ATA_DFLAG_PIO.
Modify atapi_eh_request_sense() to not use ATAPI DMA if the connected device only supports PIO.
--- drivers/ata/libata-eh.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/ata/libata-eh.c +9 -2
@@ -1479,8 +1479,15 @@ unsigned int atapi_eh_request_sense(struct ata_device *dev, tf.flags |=ATA_TFLAG_ISADDR |ATA_TFLAG_DEVICE ; tf.command =ATA_CMD_PACKET ; -/* is it pointless to prefer PIO for "safety reasons"? */ -if (ap->flags &ATA_FLAG_PIO_DMA ) { +/* +* Do not use DMA if the connected device only supports PIO, even if the +* port prefers PIO commands via DMA. +* +* Ideally, we should call atapi_check_dma() to check if it is safe for +* the LLD to use DMA for REQUEST_SENSE, but we don't have a qc. +* Since we can't check the command, perhaps we should only use pio? +*/ +if ((ap->flags &ATA_FLAG_PIO_DMA ) && !(dev->flags &ATA_DFLAG_PIO )) { tf.protocol =ATAPI_PROT_DMA ; tf.feature |=ATAPI_PKT_DMA ; }else {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 30/373 f2fs: fix to avoid out-of-bounds access in f2fs_truncate_inode_blocks()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit e6494977bd4a83862118a05f57a8df40256951c0 ]
syzbot reports an UBSAN issue as below:
------------[ cut here ]------------ UBSAN: array-index-out-of-bounds in fs/f2fs/node.h:381:10 index 18446744073709550692 is out of range for type '__le32[5]' (aka 'unsigned int[5]') CPU: 0 UID: 0 PID: 5318 Comm: syz.0.0 Not tainted 6.14.0-rc3-syzkaller-00060-g6537cfb395f3 #0 Call Trace: <TASK> __dump_stack lib/dump_stack.c:94 [inline] dump_stack_lvl+0x241/0x360 lib/dump_stack.c:120 ubsan_epilogue lib/ubsan.c:231 [inline] __ubsan_handle_out_of_bounds+0x121/0x150 lib/ubsan.c:429 get_nid fs/f2fs/node.h:381 [inline] f2fs_truncate_inode_blocks+0xa5e/0xf60 fs/f2fs/node.c:1181 f2fs_do_truncate_blocks+0x782/0x1030 fs/f2fs/file.c:808 f2fs_truncate_blocks+0x10d/0x300 fs/f2fs/file.c:836 f2fs_truncate+0x417/0x720 fs/f2fs/file.c:886 f2fs_file_write_iter+0x1bdb/0x2550 fs/f2fs/file.c:5093 aio_write+0x56b/0x7c0 fs/aio.c:1633 io_submit_one+0x8a7/0x18a0 fs/aio.c:2052 __do_sys_io_submit fs/aio.c:2111 [inline] __se_sys_io_submit+0x171/0x2e0 fs/aio.c:2081 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xf3/0x230 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7f238798cde9
index 18446744073709550692 (decimal, unsigned long long) = 0xfffffffffffffc64 (hexadecimal, unsigned long long) = -924 (decimal, long long)
In f2fs_truncate_inode_blocks(), UBSAN detects that get_nid() tries to access .i_nid[-924], it means both offset[0] and level should zero.
The possible case should be in f2fs_do_truncate_blocks(), we try to truncate inode size to zero, however, dn.ofs_in_node is zero and dn.node_page is not an inode page, so it fails to truncate inode page, and then pass zeroed free_from to f2fs_truncate_inode_blocks(), result in this issue.
if (dn.ofs_in_node || IS_INODE(dn.node_page)) {
f2fs_truncate_data_blocks_range(&dn, count);
free_from += count;
}I guess the reason why dn.node_page is not an inode page could be: there are multiple nat entries share the same node block address, once the node block address was reused, f2fs_get_node_page() may load a non-inode block.
Let's add a sanity check for such condition to avoid out-of-bounds access issue.
--- fs/f2fs/node.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
fs/f2fs/node.c +8 -1
@@ -1105,7 +1105,14 @@ int f2fs_truncate_inode_blocks(struct inode *inode, pgoff_t from)trace_f2fs_truncate_inode_blocks_enter (inode, from); level =get_node_path (inode, from, offset, noffset); -if (level <0 ) { +if (level <=0 ) { +if (!level) { + level = -EFSCORRUPTED ; +f2fs_err (sbi,"%s: inode ino=%lx has corrupted node block, from:%lu addrs:%u" , + __func__, inode->i_ino, + from,ADDRS_PER_INODE (inode)); +set_sbi_flag (sbi,SBI_NEED_FSCK ); + }trace_f2fs_truncate_inode_blocks_exit (inode, level);return level; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 31/373 ahci: add PCI ID for Marvell 88SE9215 SATA Controller
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Kral <[email protected]>
[ Upstream commit 885251dc35767b1c992f6909532ca366c830814a ]
Add support for Marvell Technology Group Ltd. 88SE9215 SATA 6 Gb/s controller, which is e.g. used in the DAWICONTROL DC-614e RAID bus controller and was not automatically recognized before.
Tested with a DAWICONTROL DC-614e RAID bus controller.
--- drivers/ata/ahci.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/ata/ahci.c +2 -0
@@ -595,6 +595,8 @@ static const struct pci_device_id ahci_pci_tbl[] = { .driver_data = board_ahci_yes_fbs }, { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x91a3), .driver_data = board_ahci_yes_fbs }, + { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9215), + .driver_data = board_ahci_yes_fbs }, { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9230), .driver_data = board_ahci_yes_fbs }, { PCI_DEVICE(PCI_VENDOR_ID_TTI, 0x0642), /* highpoint rocketraid 642L */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 32/373 ext4: protect ext4_release_dquot against freezing
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ojaswin Mujoo <[email protected]>
[ Upstream commit 530fea29ef82e169cd7fe048c2b7baaeb85a0028 ]
Protect ext4_release_dquot against freezing so that we don't try to start a transaction when FS is frozen, leading to warnings.
Further, avoid taking the freeze protection if a transaction is already running so that we don't need end up in a deadlock as described in
46e294efc355 ext4: fix deadlock with fs freezing and EA inodes
--- fs/ext4/super.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
fs/ext4/super.c +17 -0
@@ -6212,12 +6212,25 @@ static int ext4_release_dquot(struct dquot *dquot) {int ret, err;handle_t *handle; +bool freeze_protected = false; + +/* +* Trying to sb_start_intwrite() in a running transaction +* can result in a deadlock. Further, running transactions +* are already protected from freezing. +*/ +if (!ext4_journal_current_handle ()) { +sb_start_intwrite (dquot->dq_sb); + freeze_protected = true; + } handle =ext4_journal_start (dquot_to_inode (dquot),EXT4_HT_QUOTA ,EXT4_QUOTA_DEL_BLOCKS (dquot->dq_sb));if (IS_ERR (handle)) {/* Release dquot anyway to avoid endless cycle in dqput() */ dquot_release (dquot); +if (freeze_protected) +sb_end_intwrite (dquot->dq_sb);return PTR_ERR (handle); } ret =dquot_release (dquot);
@@ -6228,6 +6241,10 @@ static int ext4_release_dquot(struct dquot *dquot) err =ext4_journal_stop (handle);if (!ret) ret = err; + +if (freeze_protected) +sb_end_intwrite (dquot->dq_sb); +return ret; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 33/373 ext4: ignore xattrs past end
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bhupesh <[email protected]>
[ Upstream commit c8e008b60492cf6fd31ef127aea6d02fd3d314cd ]
Once inside 'ext4_xattr_inode_dec_ref_all' we should ignore xattrs entries past the 'end' entry.
This fixes the following KASAN reported issue:
==================================================================
BUG: KASAN: slab-use-after-free in ext4_xattr_inode_dec_ref_all+0xb8c/0xe90 Read of size 4 at addr ffff888012c120c4 by task repro/2065 CPU: 1 UID: 0 PID: 2065 Comm: repro Not tainted 6.13.0-rc2+ #11 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.16.3-0-ga6ed6b701f0a-prebuilt.qemu.org 04/01/2014 Call Trace: <TASK> dump_stack_lvl+0x1fd/0x300 ? tcp_gro_dev_warn+0x260/0x260 ? _printk+0xc0/0x100 ? read_lock_is_recursive+0x10/0x10 ? irq_work_queue+0x72/0xf0 ? __virt_addr_valid+0x17b/0x4b0 print_address_description+0x78/0x390 print_report+0x107/0x1f0 ? __virt_addr_valid+0x17b/0x4b0 ? __virt_addr_valid+0x3ff/0x4b0 ? __phys_addr+0xb5/0x160 ? ext4_xattr_inode_dec_ref_all+0xb8c/0xe90 kasan_report+0xcc/0x100 ? ext4_xattr_inode_dec_ref_all+0xb8c/0xe90 ext4_xattr_inode_dec_ref_all+0xb8c/0xe90 ? ext4_xattr_delete_inode+0xd30/0xd30 ? __ext4_journal_ensure_credits+0x5f0/0x5f0 ? __ext4_journal_ensure_credits+0x2b/0x5f0 ? inode_update_timestamps+0x410/0x410 ext4_xattr_delete_inode+0xb64/0xd30 ? ext4_truncate+0xb70/0xdc0 ? ext4_expand_extra_isize_ea+0x1d20/0x1d20 ? __ext4_mark_inode_dirty+0x670/0x670 ? ext4_journal_check_start+0x16f/0x240 ? ext4_inode_is_fast_symlink+0x2f2/0x3a0 ext4_evict_inode+0xc8c/0xff0 ? ext4_inode_is_fast_symlink+0x3a0/0x3a0 ? do_raw_spin_unlock+0x53/0x8a0 ? ext4_inode_is_fast_symlink+0x3a0/0x3a0 evict+0x4ac/0x950 ? proc_nr_inodes+0x310/0x310 ? trace_ext4_drop_inode+0xa2/0x220 ? _raw_spin_unlock+0x1a/0x30 ? iput+0x4cb/0x7e0 do_unlinkat+0x495/0x7c0 ? try_break_deleg+0x120/0x120 ? 0xffffffff81000000 ? __check_object_size+0x15a/0x210 ? strncpy_from_user+0x13e/0x250 ? getname_flags+0x1dc/0x530 __x64_sys_unlinkat+0xc8/0xf0 do_syscall_64+0x65/0x110 entry_SYSCALL_64_after_hwframe+0x67/0x6f RIP: 0033:0x434ffd Code: 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 00 f3 0f 1e fa 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 8 RSP: 002b:00007ffc50fa7b28 EFLAGS: 00000246 ORIG_RAX: 0000000000000107 RAX: ffffffffffffffda RBX: 00007ffc50fa7e18 RCX: 0000000000434ffd RDX: 0000000000000000 RSI: 0000000020000240 RDI: 0000000000000005 RBP: 00007ffc50fa7be0 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000001 R13: 00007ffc50fa7e08 R14: 00000000004bbf30 R15: 0000000000000001 </TASK> The buggy address belongs to the object at ffff888012c12000 which belongs to the cache filp of size 360
The buggy address is located 196 bytes inside of
freed 360-byte region [ffff888012c12000, ffff888012c12168)
The buggy address belongs to the physical page: page: refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x12c12 head: order:1 mapcount:0 entire_mapcount:0 nr_pages_mapped:0 pincount:0 flags: 0x40(head|node=0|zone=0) page_type: f5(slab) raw: 0000000000000040 ffff888000ad7640 ffffea0000497a00 dead000000000004 raw: 0000000000000000 0000000000100010 00000001f5000000 0000000000000000
head: 0000000000000040 ffff888000ad7640 ffffea0000497a00 dead000000000004
head: 0000000000000000 0000000000100010 00000001f5000000 0000000000000000
head: 0000000000000001 ffffea00004b0481 ffffffffffffffff 0000000000000000
head: 0000000000000002 0000000000000000 00000000ffffffff 0000000000000000
page dumped because: kasan: bad access detected Memory state around the buggy address: ffff888012c11f80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ffff888012c12000: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
Quoted 1 line
ffff888012c12080: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
^
ffff888012c12100: fb fb fb fb fb fb fb fb fb fb fb fb fb fc fc fc
ffff888012c12180: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
==================================================================
--- fs/ext4/xattr.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
fs/ext4/xattr.c +10 -1
@@ -1127,15 +1127,24 @@ ext4_xattr_inode_dec_ref_all(handle_t *handle, struct inode *parent, {struct inode *ea_inode;struct ext4_xattr_entry *entry; +struct ext4_iloc iloc;bool dirty = false;unsigned int ea_ino;int err;int credits; +void *end; + +if (block_csum) + end = (void *)bh->b_data + bh->b_size; +else { +ext4_get_inode_loc (parent, &iloc); + end = (void *)ext4_raw_inode (&iloc) +EXT4_SB (parent->i_sb)->s_inode_size; + }/* One credit for dec ref on ea_inode, one for orphan list addition, */ credits =2 + extra_credits; -for (entry = first; !IS_LAST_ENTRY (entry); +for (entry = first; (void *)entry < end && !IS_LAST_ENTRY (entry); entry =EXT4_XATTR_NEXT (entry)) {if (!entry->e_value_inum)continue ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 34/373 scsi: st: Fix array overflow in st_setup()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kai Mäkisara <[email protected]>
[ Upstream commit a018d1cf990d0c339fe0e29b762ea5dc10567d67 ]
Change the array size to follow parms size instead of a fixed value.
--- drivers/scsi/st.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/st.c +1 -1
@@ -4109,7 +4109,7 @@ static void validate_options(void)*/ static int __init st_setup (char *str) { -int i, len, ints[5 ]; +int i, len, ints[ARRAY_SIZE (parms) +1 ];char *stp; stp =get_options (str,ARRAY_SIZE (ints), ints);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 35/373 wifi: mt76: mt76x2u: add TP-Link TL-WDN6200 ID to device table
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Icenowy Zheng <[email protected]>
[ Upstream commit 06cccc2ebbe6c8a20f714f3a0ff3ff489d3004bb ]
The TP-Link TL-WDN6200 "Driverless" version cards use a MT7612U chipset.
Add the USB ID to mt76x2u driver.
--- drivers/net/wireless/mediatek/mt76/mt76x2/usb.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/mediatek/mt76/mt76x2/usb.c +1 -0
@@ -21,6 +21,7 @@ static const struct usb_device_id mt76x2u_device_table[] = { { USB_DEVICE(0x0846, 0x9053) }, /* Netgear A6210 */ { USB_DEVICE(0x045e, 0x02e6) }, /* XBox One Wireless Adapter */ { USB_DEVICE(0x045e, 0x02fe) }, /* XBox One Wireless Adapter */ + { USB_DEVICE(0x2357, 0x0137) }, /* TP-Link TL-WDN6200 */ { }, };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 36/373 net: vlan: dont propagate flags on open
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stanislav Fomichev <[email protected]>
[ Upstream commit 27b918007d96402aba10ed52a6af8015230f1793 ]
With the device instance lock, there is now a possibility of a deadlock:
[ 1.211455] ============================================
[ 1.211571] WARNING: possible recursive locking detected
[ 1.211687] 6.14.0-rc5-01215-g032756b4ca7a-dirty #5 Not tainted
[ 1.211823] --------------------------------------------
[ 1.211936] ip/184 is trying to acquire lock:
[ 1.212032] ffff8881024a4c30 (&dev->lock){+.+.}-{4:4}, at: dev_set_allmulti+0x4e/0xb0
[ 1.212207]
[ 1.212207] but task is already holding lock:
[ 1.212332] ffff8881024a4c30 (&dev->lock){+.+.}-{4:4}, at: dev_open+0x50/0xb0
[ 1.212487]
[ 1.212487] other info that might help us debug this:
[ 1.212626] Possible unsafe locking scenario:
[ 1.212626]
[ 1.212751] CPU0
[ 1.212815] ----
[ 1.212871] lock(&dev->lock);
[ 1.212944] lock(&dev->lock);
[ 1.213016]
[ 1.213016] *** DEADLOCK ***
[ 1.213016]
[ 1.213143] May be due to missing lock nesting notation
[ 1.213143]
[ 1.213294] 3 locks held by ip/184:
[ 1.213371] #0: ffffffff838b53e0 (rtnl_mutex){+.+.}-{4:4}, at: rtnl_nets_lock+0x1b/0xa0
[ 1.213543] #1: ffffffff84e5fc70 (&net->rtnl_mutex){+.+.}-{4:4}, at: rtnl_nets_lock+0x37/0xa0
[ 1.213727] #2: ffff8881024a4c30 (&dev->lock){+.+.}-{4:4}, at: dev_open+0x50/0xb0
[ 1.213895]
[ 1.213895] stack backtrace:
[ 1.213991] CPU: 0 UID: 0 PID: 184 Comm: ip Not tainted 6.14.0-rc5-01215-g032756b4ca7a-dirty #5
[ 1.213993] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Arch Linux 1.16.3-1-1 04/01/2014
[ 1.213994] Call Trace:
[ 1.213995] <TASK>
[ 1.213996] dump_stack_lvl+0x8e/0xd0
[ 1.214000] print_deadlock_bug+0x28b/0x2a0
[ 1.214020] lock_acquire+0xea/0x2a0
[ 1.214027] __mutex_lock+0xbf/0xd40
[ 1.214038] dev_set_allmulti+0x4e/0xb0 # real_dev->flags & IFF_ALLMULTI
[ 1.214040] vlan_dev_open+0xa5/0x170 # ndo_open on vlandev
[ 1.214042] __dev_open+0x145/0x270
[ 1.214046] __dev_change_flags+0xb0/0x1e0
[ 1.214051] netif_change_flags+0x22/0x60 # IFF_UP vlandev
[ 1.214053] dev_change_flags+0x61/0xb0 # for each device in group from dev->vlan_info
[ 1.214055] vlan_device_event+0x766/0x7c0 # on netdevsim0
[ 1.214058] notifier_call_chain+0x78/0x120
[ 1.214062] netif_open+0x6d/0x90
[ 1.214064] dev_open+0x5b/0xb0 # locks netdevsim0
[ 1.214066] bond_enslave+0x64c/0x1230
[ 1.214075] do_set_master+0x175/0x1e0 # on netdevsim0
[ 1.214077] do_setlink+0x516/0x13b0
[ 1.214094] rtnl_newlink+0xaba/0xb80
[ 1.214132] rtnetlink_rcv_msg+0x440/0x490
[ 1.214144] netlink_rcv_skb+0xeb/0x120
[ 1.214150] netlink_unicast+0x1f9/0x320
[ 1.214153] netlink_sendmsg+0x346/0x3f0
[ 1.214157] __sock_sendmsg+0x86/0xb0
[ 1.214160] ____sys_sendmsg+0x1c8/0x220
[ 1.214164] ___sys_sendmsg+0x28f/0x2d0
[ 1.214179] __x64_sys_sendmsg+0xef/0x140
[ 1.214184] do_syscall_64+0xec/0x1d0
[ 1.214190] entry_SYSCALL_64_after_hwframe+0x77/0x7f
[ 1.214191] RIP: 0033:0x7f2d1b4a7e56Device setup:
netdevsim0 (down)
^ ^
bond netdevsim1.100@netdevsim1 allmulticast=on (down)
When we enslave the lower device (netdevsim0) which has a vlan, we propagate vlan's allmuti/promisc flags during ndo_open. This causes (re)locking on of the real_dev.
Propagate allmulti/promisc on flags change, not on the open. There is a slight semantics change that vlans that are down now propagate the flags, but this seems unlikely to result in the real issues.
Reproducer:
echo 0 1 > /sys/bus/netdevsim/new_device
dev_path=$(ls -d /sys/bus/netdevsim/devices/netdevsim0/net/*) dev=$(echo $dev_path | rev | cut -d/ -f1 | rev)
ip link set dev $dev name netdevsim0
ip link set dev netdevsim0 up
ip link add link netdevsim0 name netdevsim0.100 type vlan id 100 ip link set dev netdevsim0.100 allmulticast on down ip link add name bond1 type bond mode 802.3ad
ip link set dev netdevsim0 down
ip link set dev netdevsim0 master bond1
ip link set dev bond1 up
ip link show
--- net/8021q/vlan_dev.c | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-)
net/8021q/vlan_dev.c +4 -27
@@ -272,17 +272,6 @@ static int vlan_dev_open(struct net_device *dev) goto out; } -if (dev->flags &IFF_ALLMULTI ) { - err =dev_set_allmulti (real_dev,1 ); -if (err <0 ) - goto del_unicast; - } -if (dev->flags &IFF_PROMISC ) { - err =dev_set_promiscuity (real_dev,1 ); -if (err <0 ) - goto clear_allmulti; - } -ether_addr_copy (vlan->real_dev_addr, real_dev->dev_addr);if (vlan->flags &VLAN_FLAG_GVRP )
@@ -296,12 +285,6 @@ static int vlan_dev_open(struct net_device *dev)netif_carrier_on (dev);return 0 ; -clear_allmulti: -if (dev->flags &IFF_ALLMULTI ) -dev_set_allmulti (real_dev,-1 ); -del_unicast: -if (!ether_addr_equal (dev->dev_addr, real_dev->dev_addr)) -dev_uc_del (real_dev, dev->dev_addr); out:netif_carrier_off (dev);return err;
@@ -314,10 +297,6 @@ static int vlan_dev_stop(struct net_device *dev)dev_mc_unsync (real_dev, dev);dev_uc_unsync (real_dev, dev); -if (dev->flags &IFF_ALLMULTI ) -dev_set_allmulti (real_dev,-1 ); -if (dev->flags &IFF_PROMISC ) -dev_set_promiscuity (real_dev,-1 );if (!ether_addr_equal (dev->dev_addr, real_dev->dev_addr))dev_uc_del (real_dev, dev->dev_addr);
@@ -474,12 +453,10 @@ static void vlan_dev_change_rx_flags(struct net_device *dev, int change) {struct net_device *real_dev =vlan_dev_priv (dev)->real_dev; -if (dev->flags &IFF_UP ) { -if (change &IFF_ALLMULTI ) -dev_set_allmulti (real_dev, dev->flags &IFF_ALLMULTI ?1 :-1 ); -if (change &IFF_PROMISC ) -dev_set_promiscuity (real_dev, dev->flags &IFF_PROMISC ?1 :-1 ); - } +if (change &IFF_ALLMULTI ) +dev_set_allmulti (real_dev, dev->flags &IFF_ALLMULTI ?1 :-1 ); +if (change &IFF_PROMISC ) +dev_set_promiscuity (real_dev, dev->flags &IFF_PROMISC ?1 :-1 ); }static void vlan_dev_set_rx_mode (struct net_device *vlan_dev)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 37/373 tracing: fix return value in __ftrace_event_enable_disable for TRACE_REG_UNREGISTER
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gabriele Paoloni <[email protected]>
[ Upstream commit 0c588ac0ca6c22b774d9ad4a6594681fdfa57d9d ]
When __ftrace_event_enable_disable invokes the class callback to unregister the event, the return value is not reported up to the caller, hence leading to event unregister failures being silently ignored.
This patch assigns the ret variable to the invocation of the event unregister callback, so that its return value is stored and reported to the caller, and it raises a warning in case of error.
--- kernel/trace/trace_events.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/trace/trace_events.c +3 -1
@@ -763,7 +763,9 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file,clear_bit (EVENT_FILE_FL_RECORDED_TGID_BIT , &file->flags); } - call->class->reg (call,TRACE_REG_UNREGISTER , file); + ret = call->class->reg (call,TRACE_REG_UNREGISTER , file); + +WARN_ON_ONCE (ret); }/* If in SOFT_MODE, just set the SOFT_DISABLE_BIT, else clear it */ if (file->flags &EVENT_FILE_FL_SOFT_MODE )
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 38/373 Bluetooth: hci_uart: fix race during initialization
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arseniy Krasnov <[email protected]>
[ Upstream commit 366ceff495f902182d42b6f41525c2474caf3f9a ]
'hci_register_dev()' calls power up function, which is executed by kworker - 'hci_power_on()'. This function does access to bluetooth chip using callbacks from 'hci_ldisc.c', for example 'hci_uart_send_frame()'. Now 'hci_uart_send_frame()' checks 'HCI_UART_PROTO_READY' bit set, and if not - it fails. Problem is that 'HCI_UART_PROTO_READY' is set after 'hci_register_dev()', and there is tiny chance that 'hci_power_on()' will be executed before setting this bit. In that case HCI init logic fails.
Patch moves setting of 'HCI_UART_PROTO_READY' before calling function 'hci_uart_register_dev()'.
--- drivers/bluetooth/hci_ldisc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/bluetooth/hci_ldisc.c +2 -1
@@ -706,12 +706,13 @@ static int hci_uart_set_proto(struct hci_uart *hu, int id) hu->proto = p; +set_bit (HCI_UART_PROTO_READY , &hu->flags); + err =hci_uart_register_dev (hu);if (err) {return err; } -set_bit (HCI_UART_PROTO_READY , &hu->flags);return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 39/373 drm: allow encoder mode_set even when connectors change for crtc
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Abhinav Kumar <[email protected]>
[ Upstream commit 7e182cb4f5567f53417b762ec0d679f0b6f0039d ]
In certain use-cases, a CRTC could switch between two encoders and because the mode being programmed on the CRTC remains the same during this switch, the CRTC's mode_changed remains false. In such cases, the encoder's mode_set also gets skipped.
Skipping mode_set on the encoder for such cases could cause an issue because even though the same CRTC mode was being used, the encoder type could have changed like the CRTC could have switched from a real time encoder to a writeback encoder OR vice-versa.
Allow encoder's mode_set to happen even when connectors changed on a CRTC and not just when the mode changed.
--- drivers/gpu/drm/drm_atomic_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_atomic_helper.c +1 -1
@@ -1279,7 +1279,7 @@ crtc_set_mode(struct drm_device *dev, struct drm_atomic_state *old_state) mode = &new_crtc_state->mode; adjusted_mode = &new_crtc_state->adjusted_mode; -if (!new_crtc_state->mode_changed) +if (!new_crtc_state->mode_changed && !new_crtc_state->connectors_changed)continue ; DRM_DEBUG_ATOMIC("modeset on [ENCODER:%d:%s]\n",
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 40/373 drm/amd/display: Update Cursor request mode to the beginning prefetch always
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhikai Zhai <[email protected]>
[ Upstream commit 4a4077b4b63a8404efd6d37fc2926f03fb25bace ]
[Why]
The double buffer cursor registers is updated by the cursor vupdate event. There is a gap between vupdate and cursor data fetch if cursor fetch data reletive to cursor position. Cursor corruption will happen if we update the cursor surface in this gap.
[How]
Modify the cursor request mode to the beginning prefetch always and avoid wraparound calculation issues.
--- .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 22 ++++++++----------- .../gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c | 2 +- 2 files changed, 10 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +9 -13
@@ -1838,20 +1838,11 @@ static void delay_cursor_until_vupdate(struct dc *dc, struct pipe_ctx *pipe_ctx) dc->hwss.get_position (&pipe_ctx,1 , &position); vpos = position.vertical_count; -/* Avoid wraparound calculation issues */ - vupdate_start += stream->timing.v_total; - vupdate_end += stream->timing.v_total; - vpos += stream->timing.v_total; -if (vpos <= vupdate_start) {/* VPOS is in VACTIVE or back porch. */ lines_to_vupdate = vupdate_start - vpos; - }else if (vpos > vupdate_end) { -/* VPOS is in the front porch. */ -return ; }else { -/* VPOS is in VUPDATE. */ - lines_to_vupdate =0 ; + lines_to_vupdate = stream->timing.v_total - vpos + vupdate_start; }/* Calculate time until VUPDATE in microseconds. */
@@ -1859,13 +1850,18 @@ static void delay_cursor_until_vupdate(struct dc *dc, struct pipe_ctx *pipe_ctx) stream->timing.h_total *10000u / stream->timing.pix_clk_100hz; us_to_vupdate = lines_to_vupdate * us_per_line; +/* Stall out until the cursor update completes. */ +if (vupdate_end < vupdate_start) + vupdate_end += stream->timing.v_total; + +/* Position is in the range of vupdate start and end*/ +if (lines_to_vupdate > stream->timing.v_total - vupdate_end + vupdate_start) + us_to_vupdate =0 ; +/* 70 us is a conservative estimate of cursor update time*/ if (us_to_vupdate >70 )return ; -/* Stall out until the cursor update completes. */ -if (vupdate_end < vupdate_start) - vupdate_end += stream->timing.v_total; us_vupdate = (vupdate_end - vupdate_start +1 ) * us_per_line;udelay (us_to_vupdate + us_vupdate); }
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c +1 -1
@@ -44,7 +44,7 @@ void hubp31_set_unbounded_requesting(struct hubp *hubp, bool enable)struct dcn20_hubp *hubp2 =TO_DCN20_HUBP (hubp);REG_UPDATE (DCHUBP_CNTL ,HUBP_UNBOUNDED_REQ_MODE , enable); -REG_UPDATE (CURSOR_CONTROL ,CURSOR_REQ_MODE , enable); +REG_UPDATE (CURSOR_CONTROL ,CURSOR_REQ_MODE ,1 ); }void hubp31_soft_reset (struct hubp *hubp,bool reset)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 41/373 drm: panel-orientation-quirks: Add support for AYANEO 2S
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Wyatt <[email protected]>
[ Upstream commit eb8f1e3e8ee10cff591d4a47437dfd34d850d454 ]
AYANEO 2S uses the same panel and orientation as the AYANEO 2.
Update the AYANEO 2 DMI match to also match AYANEO 2S.
--- drivers/gpu/drm/drm_panel_orientation_quirks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_panel_orientation_quirks.c +2 -2
@@ -166,10 +166,10 @@ static const struct dmi_system_id orientation_data[] = { DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T103HAF"), }, .driver_data = (void *)&lcd800x1280_rightside_up, - }, { /* AYA NEO AYANEO 2 */ + }, { /* AYA NEO AYANEO 2/2S */ .matches = {DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"AYANEO" ), - DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "AYANEO 2"), + DMI_MATCH(DMI_PRODUCT_NAME, "AYANEO 2"), }, .driver_data = (void *)&lcd1200x1920_rightside_up, }, { /* AYA NEO 2021 */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 42/373 drm: panel-orientation-quirks: Add new quirk for GPD Win 2
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Wyatt <[email protected]>
[ Upstream commit a860eb9c6ba6cdbf32e3e01a606556e5a90a2931 ]
Some GPD Win 2 units shipped with the correct DMI strings.
Add a DMI match to correctly rotate the panel on these units.
--- drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/drm_panel_orientation_quirks.c +6 -0
@@ -235,6 +235,12 @@ static const struct dmi_system_id orientation_data[] = { DMI_EXACT_MATCH(DMI_BOARD_NAME, "Default string"), }, .driver_data = (void *)&gpd_win2, + }, { /* GPD Win 2 (correct DMI strings) */ + .matches = { +DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"GPD" ), +DMI_EXACT_MATCH (DMI_PRODUCT_NAME ,"WIN2" ) + }, + .driver_data = (void *)&lcd720x1280_rightside_up, }, { /* GPD Win 3 */ .matches = { DMI_EXACT_MATCH(DMI_SYS_VENDOR, "GPD"),
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 43/373 drm/bridge: panel: forbid initializing a panel with unknown connector type
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luca Ceresoli <[email protected]>
[ Upstream commit b296955b3a740ecc8b3b08e34fd64f1ceabb8fb4 ]
Having an DRM_MODE_CONNECTOR_Unknown connector type is considered bad, and drm_panel_bridge_add_typed() and derivatives are deprecated for this.
drm_panel_init() won't prevent initializing a panel with a DRM_MODE_CONNECTOR_Unknown connector type. Luckily there are no in-tree users doing it, so take this as an opportinuty to document a valid connector type must be passed.
Returning an error if this rule is violated is not possible because drm_panel_init() is a void function. Add at least a warning to make any violations noticeable, especially to non-upstream drivers.
--- drivers/gpu/drm/drm_panel.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_panel.c +4 -1
@@ -49,7 +49,7 @@ static LIST_HEAD(panel_list);* @dev: parent device of the panel * @funcs: panel operations * @connector_type: the connector type (DRM_MODE_CONNECTOR_*) corresponding to -* the panel interface +* the panel interface (must NOT be DRM_MODE_CONNECTOR_Unknown) * * Initialize the panel structure for subsequent registration with * drm_panel_add().
@@ -57,6 +57,9 @@ static LIST_HEAD(panel_list);void drm_panel_init (struct drm_panel *panel,struct device *dev,const struct drm_panel_funcs *funcs,int connector_type) { +if (connector_type == DRM_MODE_CONNECTOR_Unknown) +DRM_WARN ("%s: %s: a valid connector type is required!\n" , __func__,dev_name (dev)); +INIT_LIST_HEAD (&panel->list); panel->dev = dev; panel->funcs = funcs;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 44/373 drivers: base: devres: Allow to release group on device release
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lucas De Marchi <[email protected]>
[ Upstream commit 8e1ddfada4530939a8cb64ee9251aef780474274 ]
When releasing a device, if the release action causes a group to be released, a warning is emitted because it can't find the group. This happens because devres_release_all() moves the entire list to a todo list and also move the group markers. Considering r* normal resource nodes and g1 a group resource node:
g1 -----------. v v r1 -> r2 -> g1[0] -> r3-> g[1] -> r4
After devres_release_all(), dev->devres_head becomes empty and the todo list it iterates on becomes:
g1 v r1 -> r2 -> r3-> r4 -> g1[0]
When a call to component_del() is made and takes down the aggregate device, a warning like this happen:
RIP: 0010:devres_release_group+0x362/0x530 ... Call Trace: <TASK> component_unbind+0x156/0x380 component_unbind_all+0x1d0/0x270 mei_component_master_unbind+0x28/0x80 [mei_hdcp] take_down_aggregate_device+0xc1/0x160 component_del+0x1c6/0x3e0 intel_hdcp_component_fini+0xf1/0x170 [xe] xe_display_fini+0x1e/0x40 [xe]
Because the devres group corresponding to the hdcp component cannot be found. Just ignore this corner case: if the dev->devres_head is empty and the caller is trying to remove a group, it's likely in the process of device cleanup so just ignore it instead of warning.
--- drivers/base/devres.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/base/devres.c +7 -0
@@ -682,6 +682,13 @@ int devres_release_group(struct device *dev, void *id)spin_unlock_irqrestore (&dev->devres_lock, flags);release_nodes (dev, &todo); + }else if (list_empty (&dev->devres_head)) { +/* +* dev is probably dying via devres_release_all(): groups +* have already been removed and are on the process of +* being released - don't touch and don't warn. +*/ +spin_unlock_irqrestore (&dev->devres_lock, flags); }else {WARN_ON (1 );spin_unlock_irqrestore (&dev->devres_lock, flags);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 45/373 drm/amdkfd: clamp queue size to minimum
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Yat Sin <[email protected]>
[ Upstream commit e90711946b53590371ecce32e8fcc381a99d6333 ]
If queue size is less than minimum, clamp it to minimum to prevent underflow when writing queue mqd.
--- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 10 ++++++++++ include/uapi/linux/kfd_ioctl.h | 2 ++ 2 files changed, 12 insertions(+)
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +10 -0
@@ -191,6 +191,11 @@ static int set_queue_properties_from_user(struct queue_properties *q_properties,return -EINVAL ; } +if (args->ring_size <KFD_MIN_QUEUE_RING_SIZE ) { + args->ring_size =KFD_MIN_QUEUE_RING_SIZE ; +pr_debug ("Size lower. clamped to KFD_MIN_QUEUE_RING_SIZE" ); + } +if (!access_ok ((const void __user *) args->read_pointer_address,sizeof (uint32_t ))) {pr_err ("Can't access read pointer\n" );
@@ -395,6 +400,11 @@ static int kfd_ioctl_update_queue(struct file *filp, struct kfd_process *p,return -EINVAL ; } +if (args->ring_size <KFD_MIN_QUEUE_RING_SIZE ) { + args->ring_size =KFD_MIN_QUEUE_RING_SIZE ; +pr_debug ("Size lower. clamped to KFD_MIN_QUEUE_RING_SIZE" ); + } + properties.queue_address = args->ring_base_address; properties.queue_size = args->ring_size; properties.queue_percent = args->queue_percentage;
include/uapi/linux/kfd_ioctl.h +2 -0
@@ -50,6 +50,8 @@ struct kfd_ioctl_get_version_args {#define KFD_MAX_QUEUE_PERCENTAGE 100#define KFD_MAX_QUEUE_PRIORITY 15 +#define KFD_MIN_QUEUE_RING_SIZE 1024 +struct kfd_ioctl_create_queue_args {__u64 ring_base_address;/* to KFD */ __u64 write_pointer_address;/* from KFD */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 46/373 drm/amdkfd: Fix pqm_destroy_queue race with GPU reset
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Philip Yang <[email protected]>
[ Upstream commit 7919b4cad5545ed93778f11881ceee72e4dbed66 ]
If GPU in reset, destroy_queue return -EIO, pqm_destroy_queue should delete the queue from process_queue_list and free the resource.
--- drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +1 -1
@@ -384,7 +384,7 @@ int pqm_destroy_queue(struct process_queue_manager *pqm, unsigned int qid)pr_err ("Pasid 0x%x destroy queue %d failed, ret %d\n" , pqm->process->pasid, pqn->q->properties.queue_id, retval); -if (retval != -ETIME ) +if (retval != -ETIME && retval != -EIO ) goto err_destroy_queue; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 47/373 drm/mediatek: mtk_dpi: Explicitly manage TVD clock in power on/off
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: AngeloGioacchino Del Regno <[email protected]>
[ Upstream commit 473c33f5ce651365468503c76f33158aaa1c7dd2 ]
In preparation for adding support for MT8195's HDMI reserved DPI, add calls to clk_prepare_enable() / clk_disable_unprepare() for the TVD clock: in this particular case, the aforementioned clock is not (and cannot be) parented to neither pixel or engine clocks hence it won't get enabled automatically by the clock framework.
Please note that on all of the currently supported MediaTek platforms, the TVD clock is always a parent of either pixel or engine clocks, and this means that the common clock framework is already enabling this clock before the children. On such platforms, this commit will only increase the refcount of the TVD clock without any functional change.
--- drivers/gpu/drm/mediatek/mtk_dpi.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/gpu/drm/mediatek/mtk_dpi.c +9 -0
@@ -389,6 +389,7 @@ static void mtk_dpi_power_off(struct mtk_dpi *dpi)mtk_dpi_disable (dpi);clk_disable_unprepare (dpi->pixel_clk); +clk_disable_unprepare (dpi->tvd_clk);clk_disable_unprepare (dpi->engine_clk); }
@@ -405,6 +406,12 @@ static int mtk_dpi_power_on(struct mtk_dpi *dpi) goto err_refcount; } + ret =clk_prepare_enable (dpi->tvd_clk); +if (ret) { +dev_err (dpi->dev,"Failed to enable tvd pll: %d\n" , ret); + goto err_engine; + } + ret =clk_prepare_enable (dpi->pixel_clk);if (ret) {dev_err (dpi->dev,"Failed to enable pixel clock: %d\n" , ret);
@@ -414,6 +421,8 @@ static int mtk_dpi_power_on(struct mtk_dpi *dpi)return 0 ; err_pixel: +clk_disable_unprepare (dpi->tvd_clk); +err_engine:clk_disable_unprepare (dpi->engine_clk); err_refcount: dpi->refcount--;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 48/373 PCI: vmd: Make vmd_dev::cfg_lock a raw_spinlock_t type
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryo Takakura <[email protected]>
[ Upstream commit 18056a48669a040bef491e63b25896561ee14d90 ]
The access to the PCI config space via pci_ops::read and pci_ops::write is a low-level hardware access. The functions can be accessed with disabled interrupts even on PREEMPT_RT. The pci_lock is a raw_spinlock_t for this purpose.
A spinlock_t becomes a sleeping lock on PREEMPT_RT, so it cannot be acquired with disabled interrupts. The vmd_dev::cfg_lock is accessed in the same context as the pci_lock.
Make vmd_dev::cfg_lock a raw_spinlock_t type so it can be used with interrupts disabled.
This was reported as:
BUG: sleeping function called from invalid context at kernel/locking/spinlock_rt.c:48 Call Trace: rt_spin_lock+0x4e/0x130 vmd_pci_read+0x8d/0x100 [vmd] pci_user_read_config_byte+0x6f/0xe0 pci_read_config+0xfe/0x290 sysfs_kf_bin_read+0x68/0x90
[bhelgaas: add back report info from
https://lore.kernel.org/lkml/[email protected]/]
--- drivers/pci/controller/vmd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/pci/controller/vmd.c +6 -6
@@ -108,7 +108,7 @@ struct vmd_irq_list {struct vmd_dev {struct pci_dev *dev; -spinlock_t cfg_lock; +raw_spinlock_t cfg_lock;void __iomem *cfgbar;int msix_count;
@@ -386,7 +386,7 @@ static int vmd_pci_read(struct pci_bus *bus, unsigned int devfn, int reg,if (!addr)return -EFAULT ; -spin_lock_irqsave (&vmd->cfg_lock, flags); +raw_spin_lock_irqsave (&vmd->cfg_lock, flags);switch (len) {case 1 : *value =readb (addr);
@@ -401,7 +401,7 @@ static int vmd_pci_read(struct pci_bus *bus, unsigned int devfn, int reg, ret = -EINVAL ;break ; } -spin_unlock_irqrestore (&vmd->cfg_lock, flags); +raw_spin_unlock_irqrestore (&vmd->cfg_lock, flags);return ret; }
@@ -421,7 +421,7 @@ static int vmd_pci_write(struct pci_bus *bus, unsigned int devfn, int reg,if (!addr)return -EFAULT ; -spin_lock_irqsave (&vmd->cfg_lock, flags); +raw_spin_lock_irqsave (&vmd->cfg_lock, flags);switch (len) {case 1 :writeb (value, addr);
@@ -439,7 +439,7 @@ static int vmd_pci_write(struct pci_bus *bus, unsigned int devfn, int reg, ret = -EINVAL ;break ; } -spin_unlock_irqrestore (&vmd->cfg_lock, flags); +raw_spin_unlock_irqrestore (&vmd->cfg_lock, flags);return ret; }
@@ -850,7 +850,7 @@ static int vmd_probe(struct pci_dev *dev, const struct pci_device_id *id)if (features &VMD_FEAT_OFFSET_FIRST_VECTOR ) vmd->first_vec =1 ; -spin_lock_init (&vmd->cfg_lock); +raw_spin_lock_init (&vmd->cfg_lock);pci_set_drvdata (dev, vmd); err =vmd_enable_domain (vmd, features);if (err)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 49/373 fbdev: omapfb: Add plane value check
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leonid Arapov <[email protected]>
[ Upstream commit 3e411827f31db7f938a30a3c7a7599839401ec30 ]
Function dispc_ovl_setup is not intended to work with the value OMAP_DSS_WB of the enum parameter plane.
The value of this parameter is initialized in dss_init_overlays and in the current state of the code it cannot take this value so it's not a real problem.
For the purposes of defensive coding it wouldn't be superfluous to check the parameter value, because some functions down the call stack process this value correctly and some not.
For example, in dispc_ovl_setup_global_alpha it may lead to buffer overflow.
Add check for this value.
Found by Linux Verification Center (linuxtesting.org) with SVACE static analysis tool.
--- drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/video/fbdev/omap2/omapfb/dss/dispc.c +5 -1
@@ -2751,9 +2751,13 @@ int dispc_ovl_setup(enum omap_plane plane, const struct omap_overlay_info *oi, bool mem_to_mem) {int r; -enum omap_overlay_caps caps =dss_feat_get_overlay_caps (plane); +enum omap_overlay_caps caps;enum omap_channel channel; +if (plane ==OMAP_DSS_WB ) +return -EINVAL ; + + caps =dss_feat_get_overlay_caps (plane); channel =dispc_ovl_get_channel_out (plane); DSSDBG("dispc_ovl_setup %d, pa %pad, pa_uv %pad, sw %d, %d,%d, %dx%d ->"
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 50/373 ktest: Fix Test Failures Due to Missing LOG_FILE Directories
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ayush Jain <[email protected]>
[ Upstream commit 5a1bed232781d356f842576daacc260f0d0c8d2e ]
Handle missing parent directories for LOG_FILE path to prevent test failures. If the parent directories don't exist, create them to ensure the tests proceed successfully.
--- tools/testing/ktest/ktest.pl | 8 ++++++++ 1 file changed, 8 insertions(+)
tools/testing/ktest/ktest.pl +8 -0
@@ -4282,6 +4282,14 @@ if (defined($opt{"LOG_FILE"})) { if ($opt{"CLEAR_LOG"}) { unlink $opt{"LOG_FILE"}; } + + if (! -e $opt{"LOG_FILE"} && $opt{"LOG_FILE"} =~ m,^(.*/),) { + my $dir = $1; + if (! -d $dir) { + mkpath($dir) or die "Failed to create directories '$dir': $!"; + print "\nThe log directory $dir did not exist, so it was created.\n"; + } + } open(LOG, ">> $opt{LOG_FILE}") or die "Can't write to $opt{LOG_FILE}"; LOG->autoflush(1); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 51/373 pwm: mediatek: Prevent divide-by-zero in pwm_mediatek_config()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Poimboeuf <[email protected]>
[ Upstream commit 7ca59947b5fcf94e7ea4029d1bd0f7c41500a161 ]
With CONFIG_COMPILE_TEST && !CONFIG_HAVE_CLK, pwm_mediatek_config() has a divide-by-zero in the following line:
do_div(resolution, clk_get_rate(pc->clk_pwms[pwm->hwpwm]));
due to the fact that the !CONFIG_HAVE_CLK version of clk_get_rate() returns zero.
This is presumably just a theoretical problem: COMPILE_TEST overrides the dependency on RALINK which would select COMMON_CLK. Regardless it's a good idea to check for the error explicitly to avoid divide-by-zero.
Fixes the following warning:
drivers/pwm/pwm-mediatek.o: warning: objtool: .text: unexpected end of section
--- drivers/pwm/pwm-mediatek.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/pwm/pwm-mediatek.c +6 -2
@@ -120,21 +120,25 @@ static int pwm_mediatek_config(struct pwm_chip *chip, struct pwm_device *pwm,struct pwm_mediatek_chip *pc =to_pwm_mediatek_chip (chip);u32 clkdiv =0 , cnt_period, cnt_duty, reg_width =PWMDWIDTH , reg_thres =PWMTHRES ; +unsigned long clk_rate;u64 resolution;int ret; ret =pwm_mediatek_clk_enable (chip, pwm); -if (ret <0 )return ret; + clk_rate =clk_get_rate (pc->clk_pwms[pwm->hwpwm]); +if (!clk_rate) +return -EINVAL ; +/* Make sure we use the bus clock and not the 26MHz clock */ if (pc->soc->has_ck_26m_sel)writel (0 , pc->regs +PWM_CK_26M_SEL );/* Using resolution in picosecond gets accuracy higher */ resolution = (u64 )NSEC_PER_SEC *1000 ; -do_div (resolution,clk_get_rate (pc->clk_pwms[pwm->hwpwm])); +do_div (resolution, clk_rate); cnt_period =DIV_ROUND_CLOSEST_ULL ((u64 )period_ns *1000 , resolution);while (cnt_period >8191 ) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 52/373 pwm: rcar: Simplify multiplication/shift logic
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geert Uytterhoeven <[email protected]>
[ Upstream commit ed14d36498c8d15be098df4af9ca324f96e9de74 ]
- Remove the superfluous cast; the multiplication will yield a 64-bit result due to the "100ULL" anyway,
- "a * (1 << b)" == "a << b".
Stable-dep-of: e7327c193014 ("pwm: rcar: Improve register calculation")
--- drivers/pwm/pwm-rcar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pwm/pwm-rcar.c +1 -1
@@ -110,7 +110,7 @@ static int rcar_pwm_set_counter(struct rcar_pwm_chip *rp, int div, int duty_ns,unsigned long clk_rate =clk_get_rate (rp->clk);u32 cyc, ph; - one_cycle = (unsigned long long )NSEC_PER_SEC *100ULL * (1 << div); + one_cycle =NSEC_PER_SEC *100ULL << div;do_div (one_cycle, clk_rate); tmp = period_ns *100ULL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 53/373 pwm: rcar: Improve register calculation
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit e7327c193014a4d8666e9c1cda09cf2c060518e8 ]
There were several issues in the function rcar_pwm_set_counter():
- The u64 values period_ns and duty_ns were cast to int on function call which might loose bits on 32 bit architectures.
Fix: Make parameters to rcar_pwm_set_counter() u64
- The algorithm divided by the result of a division which looses precision.
Fix: Make use of mul_u64_u64_div_u64()
- The calculated values were just masked to fit the respective register fields which again might loose bits.
Fix: Explicitly check for overlow
Implement the respective fixes.
A side effect of fixing the 2nd issue is that there is no division by 0 if clk_get_rate() returns 0.
[ukleinek: Added an explicit #include <linux/bitfield.h> to please the 0day build bot]
--- drivers/pwm/pwm-rcar.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)
drivers/pwm/pwm-rcar.c +13 -11
@@ -8,6 +8,7 @@* - The hardware cannot generate a 0% duty cycle. */ +#include <linux/bitfield.h> #include <linux/clk.h> #include <linux/err.h> #include <linux/io.h>
@@ -103,23 +104,24 @@ static void rcar_pwm_set_clock_control(struct rcar_pwm_chip *rp,rcar_pwm_write (rp, value,RCAR_PWMCR ); } -static int rcar_pwm_set_counter (struct rcar_pwm_chip *rp,int div,int duty_ns, -int period_ns) +static int rcar_pwm_set_counter (struct rcar_pwm_chip *rp,int div,u64 duty_ns, +u64 period_ns) { -unsigned long long one_cycle, tmp;/* 0.01 nanoseconds */ +unsigned long long tmp;unsigned long clk_rate =clk_get_rate (rp->clk);u32 cyc, ph; - one_cycle =NSEC_PER_SEC *100ULL << div; -do_div (one_cycle, clk_rate); +/* div <= 24 == RCAR_PWM_MAX_DIVISION, so the shift doesn't overflow. */ + tmp =mul_u64_u64_div_u64 (period_ns, clk_rate, (u64 )NSEC_PER_SEC << div); +if (tmp >FIELD_MAX (RCAR_PWMCNT_CYC0_MASK )) + tmp =FIELD_MAX (RCAR_PWMCNT_CYC0_MASK ); - tmp = period_ns *100ULL ; -do_div (tmp, one_cycle); - cyc = (tmp <<RCAR_PWMCNT_CYC0_SHIFT ) &RCAR_PWMCNT_CYC0_MASK ; + cyc =FIELD_PREP (RCAR_PWMCNT_CYC0_MASK , tmp); - tmp = duty_ns *100ULL ; -do_div (tmp, one_cycle); - ph = tmp &RCAR_PWMCNT_PH0_MASK ; + tmp =mul_u64_u64_div_u64 (duty_ns, clk_rate, (u64 )NSEC_PER_SEC << div); +if (tmp >FIELD_MAX (RCAR_PWMCNT_PH0_MASK )) + tmp =FIELD_MAX (RCAR_PWMCNT_PH0_MASK ); + ph =FIELD_PREP (RCAR_PWMCNT_PH0_MASK , tmp);/* Avoid prohibited setting */ if (cyc ==0 || ph ==0 )
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 54/373 pwm: fsl-ftm: Handle clk_get_rate() returning 0
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit 928446a5302eee30ebb32075c0db5dda5a138fb7 ]
Considering that the driver doesn't enable the used clocks (and also that clk_get_rate() returns 0 if CONFIG_HAVE_CLK is unset) better check the return value of clk_get_rate() for being non-zero before dividing by it.
--- drivers/pwm/pwm-fsl-ftm.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/pwm/pwm-fsl-ftm.c +6 -0
@@ -123,6 +123,9 @@ static unsigned int fsl_pwm_ticks_to_ns(struct fsl_pwm_chip *fpc,unsigned long long exval; rate =clk_get_rate (fpc->clk[fpc->period.clk_select]); +if (rate >> fpc->period.clk_ps ==0 ) +return 0 ; + exval = ticks; exval *=1000000000UL ;do_div (exval, rate >> fpc->period.clk_ps);
@@ -195,6 +198,9 @@ static unsigned int fsl_pwm_calculate_duty(struct fsl_pwm_chip *fpc,unsigned int period = fpc->period.mod_period +1 ;unsigned int period_ns =fsl_pwm_ticks_to_ns (fpc, period); +if (!period_ns) +return 0 ; + duty = (unsigned long long )duty_ns * period;do_div (duty, period_ns);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 55/373 bpf: Add endian modifiers to fix endian warnings
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Dooks <[email protected]>
[ Upstream commit 96a233e600df351bcb06e3c20efe048855552926 ]
A couple of the syscalls which load values (bpf_skb_load_helper_16() and bpf_skb_load_helper_32()) are using u16/u32 types which are triggering warnings as they are then converted from big-endian to CPU-endian. Fix these by making the types __be instead.
Fixes the following sparse warnings:
net/core/filter.c:246:32: warning: cast to restricted __be16 net/core/filter.c:246:32: warning: cast to restricted __be16 net/core/filter.c:246:32: warning: cast to restricted __be16 net/core/filter.c:246:32: warning: cast to restricted __be16 net/core/filter.c:273:32: warning: cast to restricted __be32 net/core/filter.c:273:32: warning: cast to restricted __be32 net/core/filter.c:273:32: warning: cast to restricted __be32 net/core/filter.c:273:32: warning: cast to restricted __be32 net/core/filter.c:273:32: warning: cast to restricted __be32 net/core/filter.c:273:32: warning: cast to restricted __be32
Stable-dep-of: d4bac0288a2b ("bpf: support SKF_NET_OFF and SKF_LL_OFF on skb frags")
--- net/core/filter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/core/filter.c +2 -2
@@ -239,7 +239,7 @@ BPF_CALL_2(bpf_skb_load_helper_8_no_cache, const struct sk_buff *, skb, BPF_CALL_4(bpf_skb_load_helper_16, const struct sk_buff *, skb, const void *, data, int, headlen, int, offset) { -u16 tmp, *ptr; +__be16 tmp, *ptr;const int len =sizeof (tmp);if (offset >=0 ) {
@@ -266,7 +266,7 @@ BPF_CALL_2(bpf_skb_load_helper_16_no_cache, const struct sk_buff *, skb, BPF_CALL_4(bpf_skb_load_helper_32, const struct sk_buff *, skb, const void *, data, int, headlen, int, offset) { -u32 tmp, *ptr; +__be32 tmp, *ptr;const int len =sizeof (tmp);if (likely (offset >=0 )) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 56/373 bpf: support SKF_NET_OFF and SKF_LL_OFF on skb frags
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Willem de Bruijn <[email protected]>
[ Upstream commit d4bac0288a2b444e468e6df9cb4ed69479ddf14a ]
Classic BPF socket filters with SKB_NET_OFF and SKB_LL_OFF fail to read when these offsets extend into frags.
This has been observed with iwlwifi and reproduced with tun with IFF_NAPI_FRAGS. The below straightforward socket filter on UDP port, applied to a RAW socket, will silently miss matching packets.
const int offset_proto = offsetof(struct ip6_hdr, ip6_nxt);
const int offset_dport = sizeof(struct ip6_hdr) + offsetof(struct udphdr, dest);
struct sock_filter filter_code[] = {
BPF_STMT(BPF_LD + BPF_B + BPF_ABS, SKF_AD_OFF + SKF_AD_PKTTYPE),
BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, PACKET_HOST, 0, 4),
BPF_STMT(BPF_LD + BPF_B + BPF_ABS, SKF_NET_OFF + offset_proto),
BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, IPPROTO_UDP, 0, 2),
BPF_STMT(BPF_LD + BPF_H + BPF_ABS, SKF_NET_OFF + offset_dport),This is unexpected behavior. Socket filter programs should be consistent regardless of environment. Silent misses are particularly concerning as hard to detect.
Use skb_copy_bits for offsets outside linear, same as done for non-SKF_(LL|NET) offsets.
Offset is always positive after subtracting the reference threshold SKB_(LL|NET)_OFF, so is always >= skb_(mac|network)_offset. The sum of the two is an offset against skb->data, and may be negative, but it cannot point before skb->head, as skb_(mac|network)_offset would too.
This appears to go back to when frag support was introduced to sk_run_filter in linux-2.4.4, before the introduction of git.
The amount of code change and 8/16/32 bit duplication are unfortunate. But any attempt I made to be smarter saved very few LoC while complicating the code.
--- net/core/filter.c | 80 ++++++++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 36 deletions(-)
net/core/filter.c +44 -36
@@ -209,24 +209,36 @@ BPF_CALL_3(bpf_skb_get_nlattr_nest, struct sk_buff *, skb, u32, a, u32, x)return 0 ; } +static int bpf_skb_load_helper_convert_offset (const struct sk_buff *skb,int offset) +{ +if (likely (offset >=0 )) +return offset; + +if (offset >=SKF_NET_OFF ) +return offset -SKF_NET_OFF +skb_network_offset (skb); + +if (offset >=SKF_LL_OFF &&skb_mac_header_was_set (skb)) +return offset -SKF_LL_OFF +skb_mac_offset (skb); + +return INT_MIN ; +} + BPF_CALL_4(bpf_skb_load_helper_8, const struct sk_buff *, skb, const void *, data, int, headlen, int, offset) { -u8 tmp, *ptr; +u8 tmp;const int len =sizeof (tmp); -if (offset >=0 ) { -if (headlen - offset >= len) -return *(u8 *)(data + offset); -if (!skb_copy_bits (skb, offset, &tmp,sizeof (tmp))) -return tmp; - }else { - ptr =bpf_internal_load_pointer_neg_helper (skb, offset, len); -if (likely (ptr)) -return *(u8 *)ptr; - } + offset =bpf_skb_load_helper_convert_offset (skb, offset); +if (offset ==INT_MIN ) +return -EFAULT ; -return -EFAULT ; +if (headlen - offset >= len) +return *(u8 *)(data + offset); +if (!skb_copy_bits (skb, offset, &tmp,sizeof (tmp))) +return tmp; +else +return -EFAULT ; } BPF_CALL_2(bpf_skb_load_helper_8_no_cache, const struct sk_buff *, skb,
@@ -239,21 +251,19 @@ BPF_CALL_2(bpf_skb_load_helper_8_no_cache, const struct sk_buff *, skb, BPF_CALL_4(bpf_skb_load_helper_16, const struct sk_buff *, skb, const void *, data, int, headlen, int, offset) { -__be16 tmp, *ptr; +__be16 tmp;const int len =sizeof (tmp); -if (offset >=0 ) { -if (headlen - offset >= len) -return get_unaligned_be16 (data + offset); -if (!skb_copy_bits (skb, offset, &tmp,sizeof (tmp))) -return be16_to_cpu (tmp); - }else { - ptr =bpf_internal_load_pointer_neg_helper (skb, offset, len); -if (likely (ptr)) -return get_unaligned_be16 (ptr); - } + offset =bpf_skb_load_helper_convert_offset (skb, offset); +if (offset ==INT_MIN ) +return -EFAULT ; -return -EFAULT ; +if (headlen - offset >= len) +return get_unaligned_be16 (data + offset); +if (!skb_copy_bits (skb, offset, &tmp,sizeof (tmp))) +return be16_to_cpu (tmp); +else +return -EFAULT ; } BPF_CALL_2(bpf_skb_load_helper_16_no_cache, const struct sk_buff *, skb,
@@ -266,21 +276,19 @@ BPF_CALL_2(bpf_skb_load_helper_16_no_cache, const struct sk_buff *, skb, BPF_CALL_4(bpf_skb_load_helper_32, const struct sk_buff *, skb, const void *, data, int, headlen, int, offset) { -__be32 tmp, *ptr; +__be32 tmp;const int len =sizeof (tmp); -if (likely (offset >=0 )) { -if (headlen - offset >= len) -return get_unaligned_be32 (data + offset); -if (!skb_copy_bits (skb, offset, &tmp,sizeof (tmp))) -return be32_to_cpu (tmp); - }else { - ptr =bpf_internal_load_pointer_neg_helper (skb, offset, len); -if (likely (ptr)) -return get_unaligned_be32 (ptr); - } + offset =bpf_skb_load_helper_convert_offset (skb, offset); +if (offset ==INT_MIN ) +return -EFAULT ; -return -EFAULT ; +if (headlen - offset >= len) +return get_unaligned_be32 (data + offset); +if (!skb_copy_bits (skb, offset, &tmp,sizeof (tmp))) +return be32_to_cpu (tmp); +else +return -EFAULT ; } BPF_CALL_2(bpf_skb_load_helper_32_no_cache, const struct sk_buff *, skb,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 57/373 ext4: dont treat fhandle lookup of ea_inode as FS corruption
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jann Horn <[email protected]>
[ Upstream commit 642335f3ea2b3fd6dba03e57e01fa9587843a497 ]
A file handle that userspace provides to open_by_handle_at() can legitimately contain an outdated inode number that has since been reused for another purpose - that's why the file handle also contains a generation number.
But if the inode number has been reused for an ea_inode, check_igot_inode() will notice, __ext4_iget() will go through ext4_error_inode(), and if the inode was newly created, it will also be marked as bad by iget_failed(). This all happens before the point where the inode generation is checked.
ext4_error_inode() is supposed to only be used on filesystem corruption; it should not be used when userspace just got unlucky with a stale file handle. So when this happens, let __ext4_iget() just return an error.
--- fs/ext4/inode.c | 68 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 20 deletions(-)
fs/ext4/inode.c +48 -20
@@ -4593,22 +4593,43 @@ static inline u64 ext4_inode_peek_iversion(const struct inode *inode)return inode_peek_iversion (inode); } -static const char *check_igot_inode (struct inode *inode,ext4_iget_flags flags) - +static int check_igot_inode (struct inode *inode,ext4_iget_flags flags, +const char *function,unsigned int line) { +const char *err_str; +if (flags &EXT4_IGET_EA_INODE ) { -if (!(EXT4_I (inode)->i_flags &EXT4_EA_INODE_FL )) -return "missing EA_INODE flag" ; +if (!(EXT4_I (inode)->i_flags &EXT4_EA_INODE_FL )) { + err_str ="missing EA_INODE flag" ; + goto error; + }if (ext4_test_inode_state (inode,EXT4_STATE_XATTR ) || -EXT4_I (inode)->i_file_acl) -return "ea_inode with extended attributes" ; +EXT4_I (inode)->i_file_acl) { + err_str ="ea_inode with extended attributes" ; + goto error; + } }else { -if ((EXT4_I (inode)->i_flags &EXT4_EA_INODE_FL )) -return "unexpected EA_INODE flag" ; +if ((EXT4_I (inode)->i_flags &EXT4_EA_INODE_FL )) { +/* +* open_by_handle_at() could provide an old inode number +* that has since been reused for an ea_inode; this does +* not indicate filesystem corruption +*/ +if (flags &EXT4_IGET_HANDLE ) +return -ESTALE ; + err_str ="unexpected EA_INODE flag" ; + goto error; + } + } +if (is_bad_inode (inode) && !(flags &EXT4_IGET_BAD )) { + err_str ="unexpected bad inode w/o EXT4_IGET_BAD" ; + goto error; } -if (is_bad_inode (inode) && !(flags &EXT4_IGET_BAD )) -return "unexpected bad inode w/o EXT4_IGET_BAD" ; -return NULL ; +return 0 ; + +error: +ext4_error_inode (inode, function, line,0 , err_str); +return -EFSCORRUPTED ; } struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,
@@ -4620,7 +4641,6 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,struct ext4_inode_info *ei;struct ext4_super_block *es =EXT4_SB (sb)->s_es;struct inode *inode; -const char *err_str;journal_t *journal =EXT4_SB (sb)->s_journal;long ret;loff_t size;
@@ -4649,10 +4669,10 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,if (!inode)return ERR_PTR (-ENOMEM );if (!(inode->i_state &I_NEW )) { -if ((err_str =check_igot_inode (inode, flags)) !=NULL ) { -ext4_error_inode (inode, function, line,0 , err_str); + ret =check_igot_inode (inode, flags, function, line); +if (ret) {iput (inode); -return ERR_PTR (-EFSCORRUPTED ); +return ERR_PTR (ret); }return inode; }
@@ -4927,13 +4947,21 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino, ret = -EFSCORRUPTED ; goto bad_inode; } -if ((err_str =check_igot_inode (inode, flags)) !=NULL ) { -ext4_error_inode (inode, function, line,0 , err_str); - ret = -EFSCORRUPTED ; - goto bad_inode; + ret =check_igot_inode (inode, flags, function, line); +/* +* -ESTALE here means there is nothing inherently wrong with the inode, +* it's just not an inode we can return for an fhandle lookup. +*/ +if (ret == -ESTALE ) { +brelse (iloc.bh); +unlock_new_inode (inode); +iput (inode); +return ERR_PTR (-ESTALE ); } - +if (ret) + goto bad_inode;brelse (iloc.bh); +unlock_new_inode (inode);return inode;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 58/373 media: i2c: adv748x: Fix test pattern selection mask
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Söderlund <[email protected]>
commit 9e38acacb9d809b97a0bdc5c76e725355a47158a upstream.
The mask to select the test-pattern in register ADV748X_SDP_FRP is incorrect, it's the lower 3 bits which controls the pattern. The GENMASK() macro is used incorrectly and the generated mask is 0x0e instead of 0x07.
The result is that not all test patterns are selectable, and that in some cases the wrong test pattern is activated. Fix this by correcting the GENMASK().
--- drivers/media/i2c/adv748x/adv748x.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/adv748x/adv748x.h +1 -1
@@ -322,7 +322,7 @@ struct adv748x_state {/* Free run pattern select */ #define ADV748X_SDP_FRP 0x14 -#define ADV748X_SDP_FRP_MASK GENMASK(3, 1) +#define ADV748X_SDP_FRP_MASK GENMASK(2, 0)/* Saturation */ #define ADV748X_SDP_SD_SAT_U 0xe3/* user_map_rw_reg_e3 */
Greg Kroah-Hartman
maintainerPATCH 59/373 media: venus: hfi: add a check to handle OOB in sfr region
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vikash Garodia <[email protected]>
commit f4b211714bcc70effa60c34d9fa613d182e3ef1e upstream.
sfr->buf_size is in shared memory and can be modified by malicious user. OOB write is possible when the size is made higher than actual sfr data buffer. Cap the size to allocated size for such cases.
--- drivers/media/platform/qcom/venus/hfi_venus.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/media/platform/qcom/venus/hfi_venus.c +10 -2
@@ -1023,18 +1023,26 @@ static void venus_sfr_print(struct venus {struct device *dev = hdev->core->dev;struct hfi_sfr *sfr = hdev->sfr.kva; +u32 size;void *p;if (!sfr)return ; - p =memchr (sfr->data,'\0' , sfr->buf_size); + size = sfr->buf_size; +if (!size) +return ; + +if (size >ALIGNED_SFR_SIZE ) + size =ALIGNED_SFR_SIZE ; + + p =memchr (sfr->data,'\0' , size);/* * SFR isn't guaranteed to be NULL terminated since SYS_ERROR indicates * that Venus is in the process of crashing. */ if (!p) - sfr->data[sfr->buf_size -1 ] ='\0' ; + sfr->data[size -1 ] ='\0' ;dev_err_ratelimited (dev,"SFR message from FW: %s\n" , sfr->data); }
Greg Kroah-Hartman
maintainerPATCH 60/373 media: venus: hfi: add check to handle incorrect queue size
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vikash Garodia <[email protected]>
commit 69baf245b23e20efda0079238b27fc63ecf13de1 upstream.
qsize represents size of shared queued between driver and video firmware. Firmware can modify this value to an invalid large value. In such situation, empty_space will be bigger than the space actually available. Since new_wr_idx is not checked, so the following code will result in an OOB write.
...
qsize = qhdr->q_size
if (wr_idx >= rd_idx)
empty_space = qsize - (wr_idx - rd_idx)
....
if (new_wr_idx < qsize) {
memcpy(wr_ptr, packet, dwords << 2) --> OOB write
Add check to ensure qsize is within the allocated size while reading and writing packets into the queue.
--- drivers/media/platform/qcom/venus/hfi_venus.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/media/platform/qcom/venus/hfi_venus.c +6 -0
@@ -187,6 +187,9 @@ static int venus_write_queue(struct venu/* ensure rd/wr indices's are read from memory */ rmb (); +if (qsize >IFACEQ_QUEUE_SIZE /4 ) +return -EINVAL ; +if (wr_idx >= rd_idx) empty_space = qsize - (wr_idx - rd_idx);else
@@ -255,6 +258,9 @@ static int venus_read_queue(struct venus wr_idx = qhdr->write_idx; qsize = qhdr->q_size; +if (qsize >IFACEQ_QUEUE_SIZE /4 ) +return -EINVAL ; +/* make sure data is valid before using it */ rmb ();
Greg Kroah-Hartman
maintainerPATCH 61/373 media: vim2m: print device name after registering device
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthew Majewski <[email protected]>
commit 143d75583f2427f3a97dba62413c4f0604867ebf upstream.
Move the v4l2_info() call displaying the video device name after the device is actually registered.
This fixes a bug where the driver was always displaying "/dev/video0" since it was reading from the vfd before it was registered.
--- drivers/media/test-drivers/vim2m.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/media/test-drivers/vim2m.c +3 -3
@@ -1321,9 +1321,6 @@ static int vim2m_probe(struct platform_d vfd->v4l2_dev = &dev->v4l2_dev;video_set_drvdata (vfd, dev); -v4l2_info (&dev->v4l2_dev, -"Device registered as /dev/video%d\n" , vfd->num); -platform_set_drvdata (pdev, dev); dev->m2m_dev =v4l2_m2m_init (&m2m_ops);
@@ -1350,6 +1347,9 @@ static int vim2m_probe(struct platform_d goto error_m2m; } +v4l2_info (&dev->v4l2_dev, +"Device registered as /dev/video%d\n" , vfd->num); +#ifdef CONFIG_MEDIA_CONTROLLER ret =v4l2_m2m_register_media_controller (dev->m2m_dev, vfd,MEDIA_ENT_F_PROC_VIDEO_SCALER );
Greg Kroah-Hartman
maintainerPATCH 62/373 media: siano: Fix error handling in smsdvb_module_init()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuan Can <[email protected]>
commit 734ac57e47b3bdd140a1119e2c4e8e6f8ef8b33d upstream.
The smsdvb_module_init() returns without checking the retval from smscore_register_hotplug().
If the smscore_register_hotplug() failed, the module failed to install, leaving the smsdvb_debugfs not unregistered.
--- drivers/media/common/siano/smsdvb-main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/common/siano/smsdvb-main.c +2 -0
@@ -1243,6 +1243,8 @@ static int __init smsdvb_module_init(voismsdvb_debugfs_register (); rc =smscore_register_hotplug (smsdvb_hotplug); +if (rc) +smsdvb_debugfs_unregister ();pr_debug ("\n" );
Greg Kroah-Hartman
maintainerPATCH 63/373 xenfs/xensyms: respect hypervisors "next" indication
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Beulich <[email protected]>
commit 5c4e79e29a9fe4ea132118ac40c2bc97cfe23077 upstream.
The interface specifies the symnum field as an input and output; the hypervisor sets it to the next sequential symbol's index. xensyms_next() incrementing the position explicitly (and xensyms_next_sym() decrementing it to "rewind") is only correct as long as the sequence of symbol indexes is non-sparse. Use the hypervisor-supplied value instead to update the position in xensyms_next(), and use the saved incoming index in xensyms_next_sym().
Message-ID: <[email protected]>
--- drivers/xen/xenfs/xensyms.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/xen/xenfs/xensyms.c +2 -2
@@ -48,7 +48,7 @@ static int xensyms_next_sym(struct xensyreturn -ENOMEM ;set_xen_guest_handle (symdata->name, xs->name); - symdata->symnum--;/* Rewind */ + symdata->symnum = symnum;/* Rewind */ ret =HYPERVISOR_platform_op (&xs->op);if (ret <0 )
@@ -78,7 +78,7 @@ static void *xensyms_next(struct seq_fil {struct xensyms *xs = (struct xensyms *)m->private; - xs->op.u.symdata.symnum = ++(*pos); + *pos = xs->op.u.symdata.symnum;if (xensyms_next_sym (xs))return NULL ;
Greg Kroah-Hartman
maintainerPATCH 64/373 arm64: cputype: Add MIDR_CORTEX_A76AE
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
commit a9b5bd81b294d30a747edd125e9f6aef2def7c79 upstream.
Quoted 1 line
From the TRM,
MIDR_CORTEX_A76AEhas a partnum of 0xDOE and an
implementor of 0x41 (ARM). Add the values.
--- arch/arm64/include/asm/cputype.h | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/include/asm/cputype.h +2 -0
@@ -75,6 +75,7 @@#define ARM_CPU_PART_CORTEX_A76 0xD0B#define ARM_CPU_PART_NEOVERSE_N1 0xD0C#define ARM_CPU_PART_CORTEX_A77 0xD0D +#define ARM_CPU_PART_CORTEX_A76AE 0xD0E#define ARM_CPU_PART_NEOVERSE_V1 0xD40#define ARM_CPU_PART_CORTEX_A78 0xD41#define ARM_CPU_PART_CORTEX_A78AE 0xD42
@@ -140,6 +141,7 @@#define MIDR_CORTEX_A76 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A76)#define MIDR_NEOVERSE_N1 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_N1)#define MIDR_CORTEX_A77 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A77) +#define MIDR_CORTEX_A76AE MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A76AE)#define MIDR_NEOVERSE_V1 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_V1)#define MIDR_CORTEX_A78 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A78)#define MIDR_CORTEX_A78AE MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A78AE)
Greg Kroah-Hartman
maintainerPATCH 65/373 arm64: errata: Add QCOM_KRYO_4XX_GOLD to the spectre_bhb_k24_list
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
commit ed1ce841245d8febe3badf51c57e81c3619d0a1d upstream.
Qualcomm Kryo 400-series Gold cores have a derivative of an ARM Cortex A76 in them. Since A76 needs Spectre mitigation via looping then the Kyro 400-series Gold cores also need Spectre mitigation via looping.
Qualcomm has confirmed that the proper "k" value for Kryo 400-series Gold cores is 24.
--- arch/arm64/kernel/proton-pack.c | 1 + 1 file changed, 1 insertion(+)
arch/arm64/kernel/proton-pack.c +1 -0
@@ -866,6 +866,7 @@ u8 spectre_bhb_loop_affected(int scope)MIDR_ALL_VERSIONS (MIDR_CORTEX_A76 ),MIDR_ALL_VERSIONS (MIDR_CORTEX_A77 ),MIDR_ALL_VERSIONS (MIDR_NEOVERSE_N1 ), + MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_4XX_GOLD), {}, };static const struct midr_range spectre_bhb_k11_list[] = {
Greg Kroah-Hartman
maintainerPATCH 66/373 arm64: errata: Assume that unknown CPUs _are_ vulnerable to Spectre BHB
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
commit e403e8538359d8580cbee1976ff71813e947101e upstream.
The code for detecting CPUs that are vulnerable to Spectre BHB was based on a hardcoded list of CPU IDs that were known to be affected. Unfortunately, the list mostly only contained the IDs of standard ARM cores. The IDs for many cores that are minor variants of the standard ARM cores (like many Qualcomm Kyro CPUs) weren't listed. This led the code to assume that those variants were not affected.
Flip the code on its head and instead assume that a core is vulnerable if it doesn't have CSV2_3 but is unrecognized as being safe. This involves creating a "Spectre BHB safe" list.
As of right now, the only CPU IDs added to the "Spectre BHB safe" list are ARM Cortex A35, A53, A55, A510, and A520. This list was created by looking for cores that weren't listed in ARM's list [1] as per review feedback on v2 of this patch [2]. Additionally Brahma A53 is added as per mailing list feedback [3].
NOTE: this patch will not actually _mitigate_ anyone, it will simply cause them to report themselves as vulnerable. If any cores in the system are reported as vulnerable but not mitigated then the whole system will be reported as vulnerable though the system will attempt to mitigate with the information it has about the known cores.
[1] https://developer.arm.com/Arm%20Security%20Center/Spectre-BHB
[2] https://lore.kernel.org/r/20241219175128.GA25477@willie-the-truck
[3] https://lore.kernel.org/r/[email protected]
--- arch/arm64/include/asm/spectre.h | 1 arch/arm64/kernel/proton-pack.c | 201 +++++++++++++++++++-------------------- 2 files changed, 101 insertions(+), 101 deletions(-)
arch/arm64/include/asm/spectre.h +0 -1
@@ -97,7 +97,6 @@ enum mitigation_state arm64_get_meltdownenum mitigation_state arm64_get_spectre_bhb_state (void );bool is_spectre_bhb_affected (const struct arm64_cpu_capabilities *entry,int scope); -u8 spectre_bhb_loop_affected (int scope);void spectre_bhb_enable_mitigation (const struct arm64_cpu_capabilities *__unused);bool try_emulate_el1_ssbs (struct pt_regs *regs,u32 instr);#endif /* __ASSEMBLY__ */
arch/arm64/kernel/proton-pack.c +101 -100
265 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 67/373 arm64: errata: Add KRYO 2XX/3XX/4XX silver cores to Spectre BHB safe list
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
commit 0c9fc6e652cd5aed48c5f700c32b7642bea7f453 upstream.
Qualcomm has confirmed that, much like Cortex A53 and A55, KRYO 2XX/3XX/4XX silver cores are unaffected by Spectre BHB. Add them to the safe list.
--- arch/arm64/kernel/proton-pack.c | 3 +++ 1 file changed, 3 insertions(+)
arch/arm64/kernel/proton-pack.c +3 -0
@@ -854,6 +854,9 @@ static bool is_spectre_bhb_safe(int scopMIDR_ALL_VERSIONS (MIDR_CORTEX_A510 ),MIDR_ALL_VERSIONS (MIDR_CORTEX_A520 ),MIDR_ALL_VERSIONS (MIDR_BRAHMA_B53 ), +MIDR_ALL_VERSIONS (MIDR_QCOM_KRYO_2XX_SILVER ), +MIDR_ALL_VERSIONS (MIDR_QCOM_KRYO_3XX_SILVER ), + MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_4XX_SILVER), {}, };static bool all_safe = true;
Greg Kroah-Hartman
maintainerPATCH 68/373 spi: cadence-qspi: Fix probe on AM62A LP SK
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miquel Raynal <[email protected]>
commit b8665a1b49f5498edb7b21d730030c06b7348a3c upstream.
In 2020, there's been an unnoticed change which rightfully attempted to report probe deferrals upon DMA absence by checking the return value of dma_request_chan_by_mask(). By doing so, it also reported errors which were simply ignored otherwise, likely on purpose.
This change actually turned a void return into an error code. Hence, not only the -EPROBE_DEFER error codes but all error codes got reported to the callers, now failing to probe in the absence of Rx DMA channel, despite the fact that DMA seems to not be supported natively by many implementations.
Looking at the history, this change probably led to:ad2775dc3fc5 ("spi: cadence-quadspi: Disable the DAC for Intel LGM SoC") f724c296f2f2 ("spi: cadence-quadspi: fix Direct Access Mode disable for SoCFPGA")
In my case, the AM62A LP SK core octo-SPI node from TI does not advertise any DMA channel, hinting that there is likely no support for it, but yet when the support for the am654 compatible was added, DMA seemed to be used, so just discarding its use with the CQSPI_DISABLE_DAC_MODE quirk for this compatible does not seem the correct approach.
Let's get change the return condition back to:
- return a probe deferral error if we get one
- ignore the return value otherwise
The "error" log level was however likely too high for something that is expected to fail, so let's lower it arbitrarily to the info level.
--- drivers/spi/spi-cadence-quadspi.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/spi/spi-cadence-quadspi.c +6 -0
@@ -1370,6 +1370,12 @@ static int cqspi_request_mmap_dma(structif (IS_ERR (cqspi->rx_chan)) {int ret =PTR_ERR (cqspi->rx_chan); cqspi->rx_chan =NULL ; +if (ret == -ENODEV ) { +/* DMA support is not mandatory */ +dev_info (&cqspi->pdev->dev,"No Rx DMA available\n" ); +return 0 ; + } +return dev_err_probe (&cqspi->pdev->dev, ret,"No Rx DMA available\n" ); }init_completion (&cqspi->rx_dma_complete);
Greg Kroah-Hartman
maintainerPATCH 69/373 mtd: rawnand: brcmnand: fix PM resume warning
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kamal Dasu <[email protected]>
commit ddc210cf8b8a8be68051ad958bf3e2cef6b681c2 upstream.
Fixed warning on PM resume as shown below caused due to uninitialized struct nand_operation that checks chip select field :
WARN_ON(op->cs >= nanddev_ntargets(&chip->base)
[ 14.588522] ------------[ cut here ]------------ [ 14.588529] WARNING: CPU: 0 PID: 1392 at drivers/mtd/nand/raw/internals.h:139 nand_reset_op+0x1e0/0x1f8 [ 14.588553] Modules linked in: bdc udc_core [ 14.588579] CPU: 0 UID: 0 PID: 1392 Comm: rtcwake Tainted: G W 6.14.0-rc4-g5394eea10651 #16 [ 14.588590] Tainted: [W]=WARN [ 14.588593] Hardware name: Broadcom STB (Flattened Device Tree) [ 14.588598] Call trace: [ 14.588604] dump_backtrace from show_stack+0x18/0x1c [ 14.588622] r7:00000009 r6:0000008b r5:60000153 r4:c0fa558c [ 14.588625] show_stack from dump_stack_lvl+0x70/0x7c [ 14.588639] dump_stack_lvl from dump_stack+0x18/0x1c [ 14.588653] r5:c08d40b0 r4:c1003cb0 [ 14.588656] dump_stack from __warn+0x84/0xe4 [ 14.588668] __warn from warn_slowpath_fmt+0x18c/0x194 [ 14.588678] r7:c08d40b0 r6:c1003cb0 r5:00000000 r4:00000000 [ 14.588681] warn_slowpath_fmt from nand_reset_op+0x1e0/0x1f8 [ 14.588695] r8:70c40dff r7:89705f41 r6:36b4a597 r5:c26c9444 r4:c26b0048 [ 14.588697] nand_reset_op from brcmnand_resume+0x13c/0x150 [ 14.588714] r9:00000000 r8:00000000 r7:c24f8010 r6:c228a3f8 r5:c26c94bc r4:c26b0040 [ 14.588717] brcmnand_resume from platform_pm_resume+0x34/0x54 [ 14.588735] r5:00000010 r4:c0840a50 [ 14.588738] platform_pm_resume from dpm_run_callback+0x5c/0x14c [ 14.588757] dpm_run_callback from device_resume+0xc0/0x324 [ 14.588776] r9:c24f8054 r8:c24f80a0 r7:00000000 r6:00000000 r5:00000010 r4:c24f8010 [ 14.588779] device_resume from dpm_resume+0x130/0x160 [ 14.588799] r9:c22539e4 r8:00000010 r7:c22bebb0 r6:c24f8010 r5:c22539dc r4:c22539b0 [ 14.588802] dpm_resume from dpm_resume_end+0x14/0x20 [ 14.588822] r10:c2204e40 r9:00000000 r8:c228a3fc r7:00000000 r6:00000003 r5:c228a414 [ 14.588826] r4:00000010 [ 14.588828] dpm_resume_end from suspend_devices_and_enter+0x274/0x6f8 [ 14.588848] r5:c228a414 r4:00000000 [ 14.588851] suspend_devices_and_enter from pm_suspend+0x228/0x2bc [ 14.588868] r10:c3502910 r9:c3501f40 r8:00000004 r7:c228a438 r6:c0f95e18 r5:00000000 [ 14.588871] r4:00000003 [ 14.588874] pm_suspend from state_store+0x74/0xd0 [ 14.588889] r7:c228a438 r6:c0f934c8 r5:00000003 r4:00000003 [ 14.588892] state_store from kobj_attr_store+0x1c/0x28 [ 14.588913] r9:00000000 r8:00000000 r7:f09f9f08 r6:00000004 r5:c3502900 r4:c0283250 [ 14.588916] kobj_attr_store from sysfs_kf_write+0x40/0x4c [ 14.588936] r5:c3502900 r4:c0d92a48 [ 14.588939] sysfs_kf_write from kernfs_fop_write_iter+0x104/0x1f0 [ 14.588956] r5:c3502900 r4:c3501f40 [ 14.588960] kernfs_fop_write_iter from vfs_write+0x250/0x420 [ 14.588980] r10:c0e14b48 r9:00000000 r8:c25f5780 r7:00443398 r6:f09f9f68 r5:c34f7f00 [ 14.588983] r4:c042a88c [ 14.588987] vfs_write from ksys_write+0x74/0xe4 [ 14.589005] r10:00000004 r9:c25f5780 r8:c02002fA0 r7:00000000 r6:00000000 r5:c34f7f00 [ 14.589008] r4:c34f7f00 [ 14.589011] ksys_write from sys_write+0x10/0x14 [ 14.589029] r7:00000004 r6:004421c0 r5:00443398 r4:00000004 [ 14.589032] sys_write from ret_fast_syscall+0x0/0x5c [ 14.589044] Exception stack(0xf09f9fa8 to 0xf09f9ff0) [ 14.589050] 9fa0: 00000004 00443398 00000004 00443398 00000004 00000001 [ 14.589056] 9fc0: 00000004 00443398 004421c0 00000004 b6ecbd58 00000008 bebfbc38 0043eb78 [ 14.589062] 9fe0: 00440eb0 bebfbaf8 b6de18a0 b6e579e8 [ 14.589065] ---[ end trace 0000000000000000 ]---
The fix uses the higher level nand_reset(chip, chipnr); where chipnr = 0, when doing PM resume operation in compliance with the controller support for single die nand chip. Switching from nand_reset_op() to nand_reset() implies more than just setting the cs field op->cs, it also reconfigures the data interface (ie. the timings). Tested and confirmed the NAND chip is in sync timing wise with host after the fix.
--- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/nand/raw/brcmnand/brcmnand.c +1 -1
@@ -2963,7 +2963,7 @@ static int brcmnand_resume(struct devicebrcmnand_save_restore_cs_config (host,1 );/* Reset the chip, required by some chips after power-up */ -nand_reset_op (chip); +nand_reset (chip,0 ); }return 0 ;
Greg Kroah-Hartman
maintainerPATCH 70/373 media: streamzap: prevent processing IR data on URB failure
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Murad Masimov <[email protected]>
commit 549f6d348167fb2f7800ed7c8d4bce9630c74498 upstream.
If streamzap_callback() receives an urb with any non-critical error status, i.e. any error code other than -ECONNRESET, -ENOENT or -ESHUTDOWN, it will try to process IR data, ignoring a possible transfer failure.
Make streamzap_callback() process IR data only when urb->status is 0. Move processing logic to a separate function to make code cleaner and more similar to the URB completion handlers in other RC drivers.
Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
--- drivers/media/rc/streamzap.c | 68 ++++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 30 deletions(-)
drivers/media/rc/streamzap.c +38 -30
@@ -179,39 +179,10 @@ static void sz_push_half_space(struct stsz_push_full_space (sz, value &SZ_SPACE_MASK ); } -/* -* streamzap_callback - usb IRQ handler callback -* -* This procedure is invoked on reception of data from -* the usb remote. -*/ -static void streamzap_callback (struct urb *urb) +static void sz_process_ir_data (struct streamzap_ir *sz,int len) { -struct streamzap_ir *sz;unsigned int i; -int len; - -if (!urb) -return ; - - sz = urb->context; - len = urb->actual_length; - -switch (urb->status) { -case -ECONNRESET : -case -ENOENT : -case -ESHUTDOWN : -/* -* this urb is terminated, clean up. -* sz might already be invalid at this point -*/ -dev_err (sz->dev,"urb terminated, status: %d\n" , urb->status); -return ; -default : -break ; - } -dev_dbg (sz->dev,"%s: received urb, len %d\n" , __func__, len);for (i =0 ; i < len; i++) {dev_dbg (sz->dev,"sz->buf_in[%d]: %x\n" , i, (unsigned char )sz->buf_in[i]);
@@ -264,6 +235,43 @@ static void streamzap_callback(struct ur }ir_raw_event_handle (sz->rdev); +} + +/* +* streamzap_callback - usb IRQ handler callback +* +* This procedure is invoked on reception of data from +* the usb remote. +*/ +static void streamzap_callback (struct urb *urb) +{ +struct streamzap_ir *sz; +int len; + +if (!urb) +return ; + + sz = urb->context; + len = urb->actual_length; + +switch (urb->status) { +case 0 : +dev_dbg (sz->dev,"%s: received urb, len %d\n" , __func__, len); +sz_process_ir_data (sz, len); +break ; +case -ECONNRESET : +case -ENOENT : +case -ESHUTDOWN : +/* +* this urb is terminated, clean up. +* sz might already be invalid at this point +*/ +dev_err (sz->dev,"urb terminated, status: %d\n" , urb->status); +return ; +default : +break ; + } +usb_submit_urb (urb,GFP_ATOMIC ); }
Greg Kroah-Hartman
maintainerPATCH 71/373 media: v4l2-dv-timings: prevent possible overflow in v4l2_detect_gtf()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Karina Yankevich <[email protected]>
commit 3edd1fc48d2c045e8259561797c89fe78f01717e upstream.
In v4l2_detect_gtf(), it seems safer to cast the 32-bit image_width variable to the 64-bit type u64 before multiplying to avoid a possible overflow. The resulting object code even seems to look better, at least on x86_64.
Found by Linux Verification Center (linuxtesting.org) with Svace.
[Sergey: rewrote the patch subject/descripition]
--- drivers/media/v4l2-core/v4l2-dv-timings.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/v4l2-core/v4l2-dv-timings.c +2 -2
@@ -764,7 +764,7 @@ bool v4l2_detect_gtf(unsigned int frame_u64 num;u32 den; - num = ((image_width *GTF_D_C_PRIME * (u64 )hfreq) - + num = (((u64 )image_width *GTF_D_C_PRIME * hfreq) - ((u64 )image_width *GTF_D_M_PRIME *1000 )); den = (hfreq * (100 -GTF_D_C_PRIME ) +GTF_D_M_PRIME *1000 ) * (2 *GTF_CELL_GRAN );
@@ -774,7 +774,7 @@ bool v4l2_detect_gtf(unsigned int frame_u64 num;u32 den; - num = ((image_width *GTF_S_C_PRIME * (u64 )hfreq) - + num = (((u64 )image_width *GTF_S_C_PRIME * hfreq) - ((u64 )image_width *GTF_S_M_PRIME *1000 )); den = (hfreq * (100 -GTF_S_C_PRIME ) +GTF_S_M_PRIME *1000 ) * (2 *GTF_CELL_GRAN );
Greg Kroah-Hartman
maintainerPATCH 72/373 media: i2c: ccs: Set the devices runtime PM status correctly in remove
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sakari Ailus <[email protected]>
commit e04604583095faf455b3490b004254a225fd60d4 upstream.
Set the device's runtime PM status to suspended in device removal only if it wasn't suspended already.
--- drivers/media/i2c/ccs/ccs-core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/media/i2c/ccs/ccs-core.c +3 -2
@@ -3677,9 +3677,10 @@ static int ccs_remove(struct i2c_clientv4l2_async_unregister_subdev (subdev);pm_runtime_disable (&client->dev); -if (!pm_runtime_status_suspended (&client->dev)) +if (!pm_runtime_status_suspended (&client->dev)) {ccs_power_off (&client->dev); -pm_runtime_set_suspended (&client->dev); +pm_runtime_set_suspended (&client->dev); + }for (i =0 ; i < sensor->ssds_used; i++) {v4l2_device_unregister_subdev (&sensor->ssds[i].sd);
Greg Kroah-Hartman
maintainerPATCH 73/373 media: i2c: ccs: Set the devices runtime PM status correctly in probe
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sakari Ailus <[email protected]>
commit 80704d14f1bd3628f578510e0a88b66824990ef6 upstream.
Set the device's runtime PM status to suspended in probe error paths where it was previously set to active.
--- drivers/media/i2c/ccs/ccs-core.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/i2c/ccs/ccs-core.c +1 -0
@@ -3645,6 +3645,7 @@ static int ccs_probe(struct i2c_client * out_disable_runtime_pm:pm_runtime_put_noidle (&client->dev);pm_runtime_disable (&client->dev); +pm_runtime_set_suspended (&client->dev); out_media_entity_cleanup:media_entity_cleanup (&sensor->src->sd.entity);
Greg Kroah-Hartman
maintainerPATCH 74/373 media: i2c: ov7251: Set enable GPIO low in probe
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sakari Ailus <[email protected]>
commit a1963698d59cec83df640ded343af08b76c8e9c5 upstream.
Set the enable GPIO low when acquiring it.
--- drivers/media/i2c/ov7251.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/ov7251.c +1 -1
@@ -1333,7 +1333,7 @@ static int ov7251_probe(struct i2c_clienreturn PTR_ERR (ov7251->analog_regulator); } - ov7251->enable_gpio =devm_gpiod_get (dev,"enable" ,GPIOD_OUT_HIGH ); + ov7251->enable_gpio =devm_gpiod_get (dev,"enable" ,GPIOD_OUT_LOW );if (IS_ERR (ov7251->enable_gpio)) {dev_err (dev,"cannot get enable gpio\n" );return PTR_ERR (ov7251->enable_gpio);
Greg Kroah-Hartman
maintainerPATCH 75/373 media: i2c: ov7251: Introduce 1 ms delay between regulators and en GPIO
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sakari Ailus <[email protected]>
commit 3d391292cdd53984ec1b9a1f6182a62a62751e03 upstream.
Lift the xshutdown (enable) GPIO 1 ms after enabling the regulators, as required by the sensor's power-up sequence.
--- drivers/media/i2c/ov7251.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/i2c/ov7251.c +2 -0
@@ -748,6 +748,8 @@ static int ov7251_set_power_on(struct ovreturn ret; } +usleep_range (1000 ,1100 ); +gpiod_set_value_cansleep (ov7251->enable_gpio,1 );/* wait at least 65536 external clock cycles */
Greg Kroah-Hartman
maintainerPATCH 76/373 media: venus: hfi_parser: add check to avoid out of bound access
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vikash Garodia <[email protected]>
commit 172bf5a9ef70a399bb227809db78442dc01d9e48 upstream.
There is a possibility that init_codecs is invoked multiple times during manipulated payload from video firmware. In such case, if codecs_count can get incremented to value more than MAX_CODEC_NUM, there can be OOB access. Reset the count so that it always starts from beginning.
--- drivers/media/platform/qcom/venus/hfi_parser.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/platform/qcom/venus/hfi_parser.c +2 -0
@@ -19,6 +19,8 @@ static void init_codecs(struct venus_corstruct hfi_plat_caps *caps = core->caps, *cap;unsigned long bit; + core->codecs_count =0 ; +if (hweight_long (core->dec_codecs) +hweight_long (core->enc_codecs) >MAX_CODEC_NUM )return ;
Greg Kroah-Hartman
maintainerPATCH 77/373 media: venus: hfi_parser: refactor hfi packet parsing logic
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vikash Garodia <[email protected]>
commit 9edaaa8e3e15aab1ca413ab50556de1975bcb329 upstream.
words_count denotes the number of words in total payload, while data points to payload of various property within it. When words_count reaches last word, data can access memory beyond the total payload. This can lead to OOB access. With this patch, the utility api for handling individual properties now returns the size of data consumed. Accordingly remaining bytes are calculated before parsing the payload, thereby eliminates the OOB access possibilities.
--- drivers/media/platform/qcom/venus/hfi_parser.c | 98 ++++++++++++++++++------- 1 file changed, 72 insertions(+), 26 deletions(-)
drivers/media/platform/qcom/venus/hfi_parser.c +72 -26
@@ -64,7 +64,7 @@ fill_buf_mode(struct hfi_plat_caps *cap, cap->cap_bufs_mode_dynamic = true; } -static void +static int parse_alloc_mode (struct venus_core *core,u32 codecs,u32 domain,void *data) {struct hfi_buffer_alloc_mode_supported *mode = data;
@@ -72,7 +72,7 @@ parse_alloc_mode(struct venus_core *coreu32 *type;if (num_entries >MAX_ALLOC_MODE_ENTRIES ) -return ; +return -EINVAL ; type = mode->data;
@@ -84,6 +84,8 @@ parse_alloc_mode(struct venus_core *core type++; } + +return sizeof (*mode); } static void fill_profile_level(struct hfi_plat_caps *cap, const void *data,
@@ -98,7 +100,7 @@ static void fill_profile_level(struct hf cap->num_pl += num; } -static void +static int parse_profile_level (struct venus_core *core,u32 codecs,u32 domain,void *data) {struct hfi_profile_level_supported *pl = data;
@@ -106,12 +108,14 @@ parse_profile_level(struct venus_core *cstruct hfi_profile_level pl_arr[HFI_MAX_PROFILE_COUNT ] = {};if (pl->profile_count >HFI_MAX_PROFILE_COUNT ) -return ; +return -EINVAL ;memcpy (pl_arr, proflevel, pl->profile_count *sizeof (*proflevel));for_each_codec (core->caps,ARRAY_SIZE (core->caps), codecs, domain, fill_profile_level, pl_arr, pl->profile_count); + +return pl->profile_count *sizeof (*proflevel) +sizeof (u32); } static void
@@ -126,7 +130,7 @@ fill_caps(struct hfi_plat_caps *cap, con cap->num_caps += num; } -static void +static int parse_caps (struct venus_core *core,u32 codecs,u32 domain,void *data) {struct hfi_capabilities *caps = data;
@@ -135,12 +139,14 @@ parse_caps(struct venus_core *core, u32struct hfi_capability caps_arr[MAX_CAP_ENTRIES ] = {};if (num_caps >MAX_CAP_ENTRIES ) -return ; +return -EINVAL ;memcpy (caps_arr, cap, num_caps *sizeof (*cap));for_each_codec (core->caps,ARRAY_SIZE (core->caps), codecs, domain, fill_caps, caps_arr, num_caps); + +return sizeof (*caps); } static void fill_raw_fmts(struct hfi_plat_caps *cap, const void *fmts,
@@ -155,7 +161,7 @@ static void fill_raw_fmts(struct hfi_pla cap->num_fmts += num_fmts; } -static void +static int parse_raw_formats (struct venus_core *core,u32 codecs,u32 domain,void *data) {struct hfi_uncompressed_format_supported *fmt = data;
@@ -164,7 +170,8 @@ parse_raw_formats(struct venus_core *corstruct raw_formats rawfmts[MAX_FMT_ENTRIES ] = {};u32 entries = fmt->format_entries;unsigned int i =0 ; -u32 num_planes; +u32 num_planes =0 ; +u32 size;while (entries) { num_planes = pinfo->num_planes;
@@ -174,7 +181,7 @@ parse_raw_formats(struct venus_core *cor i++;if (i >=MAX_FMT_ENTRIES ) -return ; +return -EINVAL ;if (pinfo->num_planes >MAX_PLANES )break ;
@@ -186,9 +193,13 @@ parse_raw_formats(struct venus_core *corfor_each_codec (core->caps,ARRAY_SIZE (core->caps), codecs, domain, fill_raw_fmts, rawfmts, i); + size = fmt->format_entries * (sizeof (*constr) * num_planes +2 *sizeof (u32)) + +2 *sizeof (u32); + +return size; } -static void parse_codecs (struct venus_core *core,void *data) +static int parse_codecs (struct venus_core *core,void *data) {struct hfi_codec_supported *codecs = data;
@@ -200,21 +211,27 @@ static void parse_codecs(struct venus_co core->dec_codecs &= ~HFI_VIDEO_CODEC_SPARK ; core->enc_codecs &= ~HFI_VIDEO_CODEC_HEVC ; } + +return sizeof (*codecs); } -static void parse_max_sessions (struct venus_core *core,const void *data) +static int parse_max_sessions (struct venus_core *core,const void *data) {const struct hfi_max_sessions_supported *sessions = data; core->max_sessions_supported = sessions->max_sessions; + +return sizeof (*sessions); } -static void parse_codecs_mask (u32 *codecs,u32 *domain,void *data) +static int parse_codecs_mask (u32 *codecs,u32 *domain,void *data) {struct hfi_codec_mask_supported *mask = data; *codecs = mask->codecs; *domain = mask->video_domains; + +return sizeof (*mask); }static void parser_init (struct venus_inst *inst,u32 *codecs,u32 *domain)
@@ -281,8 +298,9 @@ static int hfi_platform_parser(struct veu32 hfi_parser (struct venus_core *core,struct venus_inst *inst,void *buf,u32 size) { -unsigned int words_count = size >>2 ; -u32 *word = buf, *data, codecs =0 , domain =0 ; +u32 *words = buf, *payload, codecs =0 , domain =0 ; +u32 *frame_size = buf + size; +u32 rem_bytes = size;int ret; ret =hfi_platform_parser (core, inst);
@@ -299,38 +317,66 @@ u32 hfi_parser(struct venus_core *core,memset (core->caps,0 ,sizeof (core->caps)); } -while (words_count) { - data = word +1 ; +while (words < frame_size) { + payload = words +1 ; -switch (*word) { +switch (*words) {case HFI_PROPERTY_PARAM_CODEC_SUPPORTED : -parse_codecs (core, data); +if (rem_bytes <=sizeof (struct hfi_codec_supported )) +return HFI_ERR_SYS_INSUFFICIENT_RESOURCES ; + + ret =parse_codecs (core, payload); +if (ret <0 ) +return HFI_ERR_SYS_INSUFFICIENT_RESOURCES ; +init_codecs (core);break ;case HFI_PROPERTY_PARAM_MAX_SESSIONS_SUPPORTED : -parse_max_sessions (core, data); +if (rem_bytes <=sizeof (struct hfi_max_sessions_supported )) +return HFI_ERR_SYS_INSUFFICIENT_RESOURCES ; + + ret =parse_max_sessions (core, payload);break ;case HFI_PROPERTY_PARAM_CODEC_MASK_SUPPORTED : -parse_codecs_mask (&codecs, &domain, data); +if (rem_bytes <=sizeof (struct hfi_codec_mask_supported )) +return HFI_ERR_SYS_INSUFFICIENT_RESOURCES ; + + ret =parse_codecs_mask (&codecs, &domain, payload);break ;case HFI_PROPERTY_PARAM_UNCOMPRESSED_FORMAT_SUPPORTED : -parse_raw_formats (core, codecs, domain, data); +if (rem_bytes <=sizeof (struct hfi_uncompressed_format_supported )) +return HFI_ERR_SYS_INSUFFICIENT_RESOURCES ; + + ret =parse_raw_formats (core, codecs, domain, payload);break ;case HFI_PROPERTY_PARAM_CAPABILITY_SUPPORTED : -parse_caps (core, codecs, domain, data); +if (rem_bytes <=sizeof (struct hfi_capabilities )) +return HFI_ERR_SYS_INSUFFICIENT_RESOURCES ; + + ret =parse_caps (core, codecs, domain, payload);break ;case HFI_PROPERTY_PARAM_PROFILE_LEVEL_SUPPORTED : -parse_profile_level (core, codecs, domain, data); +if (rem_bytes <=sizeof (struct hfi_profile_level_supported )) +return HFI_ERR_SYS_INSUFFICIENT_RESOURCES ; + + ret =parse_profile_level (core, codecs, domain, payload);break ;case HFI_PROPERTY_PARAM_BUFFER_ALLOC_MODE_SUPPORTED : -parse_alloc_mode (core, codecs, domain, data); +if (rem_bytes <=sizeof (struct hfi_buffer_alloc_mode_supported )) +return HFI_ERR_SYS_INSUFFICIENT_RESOURCES ; + + ret =parse_alloc_mode (core, codecs, domain, payload);break ;default : + ret =sizeof (u32);break ; } - word++; - words_count--; +if (ret <0 ) +return HFI_ERR_SYS_INSUFFICIENT_RESOURCES ; + + words += ret /sizeof (u32); + rem_bytes -= ret; }if (!core->max_sessions_supported)
Greg Kroah-Hartman
maintainerPATCH 78/373 mtd: Add check for devm_kcalloc()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiasheng Jiang <[email protected]>
commit 2aee30bb10d7bad0a60255059c9ce1b84cf0130e upstream.
Add a check for devm_kcalloc() to ensure successful allocation.
--- drivers/mtd/mtdpstore.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/mtd/mtdpstore.c +3 -0
@@ -423,6 +423,9 @@ static void mtdpstore_notify_add(struct longcnt =BITS_TO_LONGS (div_u64 (mtd->size, mtd->erasesize)); cxt->badmap =kcalloc (longcnt,sizeof (long ),GFP_KERNEL ); +if (!cxt->rmmap || !cxt->usedmap || !cxt->badmap) +return ; +/* just support dmesg right now */ cxt->dev.flags =PSTORE_FLAGS_DMESG ; cxt->dev.zone.read = mtdpstore_read;
Greg Kroah-Hartman
maintainerPATCH 79/373 net: dsa: mv88e6xxx: workaround RGMII transmit delay erratum for 6320 family
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Behún <[email protected]>
commit 1ebc8e1ef906db9c08e9abe9776d85ddec837725 upstream.
Implement the workaround for erratum
3.3 RGMII timing may be out of spec when transmit delay is enabled
for the 6320 family, which says:
When transmit delay is enabled via Port register 1 bit 14 = 1, duty cycle may be out of spec. Under very rare conditions this may cause the attached device receive CRC errors.
--- drivers/net/dsa/mv88e6xxx/chip.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/net/dsa/mv88e6xxx/chip.c +17 -0
@@ -3192,6 +3192,21 @@ static int mv88e6xxx_stats_setup(structreturn mv88e6xxx_g1_stats_clear (chip); } +static int mv88e6320_setup_errata (struct mv88e6xxx_chip *chip) +{ +u16 dummy; +int err; + +/* Workaround for erratum +* 3.3 RGMII timing may be out of spec when transmit delay is enabled +*/ + err =mv88e6xxx_port_hidden_write (chip,0 ,0xf ,0x7 ,0xe000 ); +if (err) +return err; + +return mv88e6xxx_port_hidden_read (chip,0 ,0xf ,0x7 , &dummy); +} +/* Check if the errata has already been applied. */ static bool mv88e6390_setup_errata_applied (struct mv88e6xxx_chip *chip) {
@@ -4569,6 +4584,7 @@ static const struct mv88e6xxx_ops mv88e6static const struct mv88e6xxx_ops mv88e6320_ops = {/* MV88E6XXX_FAMILY_6320 */ + .setup_errata = mv88e6320_setup_errata, .ieee_pri_map = mv88e6085_g1_ieee_pri_map, .ip_pri_map = mv88e6085_g1_ip_pri_map, .irl_init_all = mv88e6352_g2_irl_init_all,
@@ -4615,6 +4631,7 @@ static const struct mv88e6xxx_ops mv88e6static const struct mv88e6xxx_ops mv88e6321_ops = {/* MV88E6XXX_FAMILY_6320 */ + .setup_errata = mv88e6320_setup_errata, .ieee_pri_map = mv88e6085_g1_ieee_pri_map, .ip_pri_map = mv88e6085_g1_ip_pri_map, .irl_init_all = mv88e6352_g2_irl_init_all,
Greg Kroah-Hartman
maintainerPATCH 80/373 mtd: Replace kcalloc() with devm_kcalloc()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiasheng Jiang <[email protected]>
commit 1b61a59876f0eafc19b23007c522ee407f55dbec upstream.
Replace kcalloc() with devm_kcalloc() to prevent memory leaks in case of errors.
--- drivers/mtd/mtdpstore.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/mtd/mtdpstore.c +3 -6
@@ -417,11 +417,11 @@ static void mtdpstore_notify_add(struct } longcnt =BITS_TO_LONGS (div_u64 (mtd->size, info->kmsg_size)); - cxt->rmmap =kcalloc (longcnt,sizeof (long ),GFP_KERNEL ); - cxt->usedmap =kcalloc (longcnt,sizeof (long ),GFP_KERNEL ); + cxt->rmmap =devm_kcalloc (&mtd->dev, longcnt,sizeof (long ),GFP_KERNEL ); + cxt->usedmap =devm_kcalloc (&mtd->dev, longcnt,sizeof (long ),GFP_KERNEL ); longcnt =BITS_TO_LONGS (div_u64 (mtd->size, mtd->erasesize)); - cxt->badmap =kcalloc (longcnt,sizeof (long ),GFP_KERNEL ); + cxt->badmap =devm_kcalloc (&mtd->dev, longcnt,sizeof (long ),GFP_KERNEL );if (!cxt->rmmap || !cxt->usedmap || !cxt->badmap)return ;
@@ -530,9 +530,6 @@ static void mtdpstore_notify_remove(strumtdpstore_flush_removed (cxt);unregister_pstore_device (&cxt->dev); -kfree (cxt->badmap); -kfree (cxt->usedmap); -kfree (cxt->rmmap); cxt->mtd =NULL ; cxt->index =-1 ; }
Greg Kroah-Hartman
maintainerPATCH 81/373 clocksource/drivers/stm32-lptimer: Use wakeup capable instead of init wakeup
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexandre Torgue <[email protected]>
commit 96bf4b89a6ab22426ad83ef76e66c72a5a8daca0 upstream.
"wakeup-source" property describes a device which has wakeup capability but should not force this device as a wakeup source.
Rule: add
--- drivers/clocksource/timer-stm32-lp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/clocksource/timer-stm32-lp.c +1 -3
@@ -168,9 +168,7 @@ static int stm32_clkevent_lp_probe(struc }if (of_property_read_bool (pdev->dev.parent->of_node,"wakeup-source" )) { - ret =device_init_wakeup (&pdev->dev, true); -if (ret) - goto out_clk_disable; +device_set_wakeup_capable (&pdev->dev, true); ret =dev_pm_set_wake_irq (&pdev->dev, irq);if (ret)
Greg Kroah-Hartman
maintainerPATCH 82/373 wifi: mt76: Add check for devm_kstrdup()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haoxiang Li <[email protected]>
commit 4bc1da524b502999da28d287de4286c986a1af57 upstream.
Add check for the return value of devm_kstrdup() in mt76_get_of_data_from_mtd() to catch potential exception.
--- drivers/net/wireless/mediatek/mt76/eeprom.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/mediatek/mt76/eeprom.c +4 -0
@@ -74,6 +74,10 @@ int mt76_get_of_eeprom(struct mt76_dev *#ifdef CONFIG_NL80211_TESTMODE dev->test_mtd.name =devm_kstrdup (dev->dev, part,GFP_KERNEL ); +if (!dev->test_mtd.name) { + ret = -ENOMEM ; + goto out_put_node; + } dev->test_mtd.offset = offset;#endif
Greg Kroah-Hartman
maintainerPATCH 83/373 wifi: mac80211: fix integer overflow in hwmp_route_info_get()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gavrilov Ilia <[email protected]>
commit d00c0c4105e5ab8a6a13ed23d701cceb285761fa upstream.
Since the new_metric and last_hop_metric variables can reach the MAX_METRIC(0xffffffff) value, an integer overflow may occur when multiplying them by 10/9. It can lead to incorrect behavior.
Found by InfoTeCS on behalf of Linux Verification Center (linuxtesting.org) with SVACE.
--- net/mac80211/mesh_hwmp.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
net/mac80211/mesh_hwmp.c +10 -4
@@ -360,6 +360,12 @@ u32 airtime_link_metric_get(struct ieee8return (u32 )result; } +/* Check that the first metric is at least 10% better than the second one */ +static bool is_metric_better (u32 x,u32 y) +{ +return (x < y) && (x < (y - x /10 )); +} +/** * hwmp_route_info_get - Update routing info to originator and transmitter *
@@ -450,8 +456,8 @@ static u32 hwmp_route_info_get(struct ie (mpath->sn == orig_sn && (rcu_access_pointer (mpath->next_hop) != sta ? -mult_frac (new_metric,10 ,9 ) : - new_metric) >= mpath->metric)) { + !is_metric_better (new_metric, mpath->metric) : + new_metric >= mpath->metric))) { process = false; fresh_info = false; }
@@ -521,8 +527,8 @@ static u32 hwmp_route_info_get(struct ieif ((mpath->flags &MESH_PATH_FIXED ) || ((mpath->flags &MESH_PATH_ACTIVE ) && ((rcu_access_pointer (mpath->next_hop) != sta ? -mult_frac (last_hop_metric,10 ,9 ) : - last_hop_metric) > mpath->metric))) + !is_metric_better (last_hop_metric, mpath->metric) : + last_hop_metric > mpath->metric)))) fresh_info = false; }else { mpath =mesh_path_add (sdata, ta);
Greg Kroah-Hartman
maintainerPATCH 84/373 ASoC: qdsp6: q6asm-dai: fix q6asm_dai_compr_set_params error path
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexey Klimov <[email protected]>
commit 7eccc86e90f04a0d758d16c08627a620ac59604d upstream.
In case of attempts to compress playback something, for instance, when audio routing is not set up correctly, the audio DSP is left in inconsistent state because we are not doing the correct things in the error path of q6asm_dai_compr_set_params().
So, when routing is not set up and compress playback is attempted the following errors are present (simplified log):
q6routing routing: Routing not setup for MultiMedia-1 Session q6asm-dai dais: Stream reg failed ret:-22
q6asm-dai dais: ASoC error (-22): at snd_soc_component_compr_set_params() on 17300000.remoteproc:glink-edge:apr:service@7:dais
After setting the correct routing the compress playback will always fail:
q6asm-dai dais: cmd = 0x10db3 returned error = 0x9
q6asm-dai dais: DSP returned error[9]
q6asm-dai dais: q6asm_open_write failed
q6asm-dai dais: ASoC error (-22): at snd_soc_component_compr_set_params() on 17300000.remoteproc:glink-edge:apr:service@7:dais
0x9 here means "Operation is already processed". The CMD_OPEN here was sent the second time hence DSP responds that it was already done.
Turns out the CMD_CLOSE should be sent after the q6asm_open_write() succeeded but something failed after that, for instance, routing setup.
Fix this by slightly reworking the error path inq6asm_dai_compr_set_params().
Tested on QRB5165 RB5 and SDM845 RB3 boards.
--- sound/soc/qcom/qdsp6/q6asm-dai.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
sound/soc/qcom/qdsp6/q6asm-dai.c +13 -6
@@ -902,9 +902,7 @@ static int q6asm_dai_compr_set_params(stif (ret <0 ) {dev_err (dev,"q6asm_open_write failed\n" ); -q6asm_audio_client_free (prtd->audio_client); - prtd->audio_client =NULL ; -return ret; + goto open_err; } }
@@ -913,7 +911,7 @@ static int q6asm_dai_compr_set_params(st prtd->session_id, dir);if (ret) {dev_err (dev,"Stream reg failed ret:%d\n" , ret); -return ret; + goto q6_err; } ret = __q6asm_dai_compr_set_codec_params(component, stream,
@@ -921,7 +919,7 @@ static int q6asm_dai_compr_set_params(st prtd->stream_id);if (ret) {dev_err (dev,"codec param setup failed ret:%d\n" , ret); -return ret; + goto q6_err; } ret = q6asm_map_memory_regions(dir, prtd->audio_client, prtd->phys,
@@ -930,12 +928,21 @@ static int q6asm_dai_compr_set_params(stif (ret <0 ) {dev_err (dev,"Buffer Mapping failed ret:%d\n" , ret); -return -ENOMEM ; + ret = -ENOMEM ; + goto q6_err; } prtd->state =Q6ASM_STREAM_RUNNING ;return 0 ; + +q6_err: +q6asm_cmd (prtd->audio_client, prtd->stream_id,CMD_CLOSE ); + +open_err: +q6asm_audio_client_free (prtd->audio_client); + prtd->audio_client =NULL ; +return ret; } static int q6asm_dai_compr_set_metadata(struct snd_soc_component *component,
Greg Kroah-Hartman
maintainerPATCH 85/373 bus: mhi: host: Fix race between unprepare and queue_buf
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeff Hugo <[email protected]>
commit 0686a818d77a431fc3ba2fab4b46bbb04e8c9380 upstream.
A client driver may use mhi_unprepare_from_transfer() to quiesce incoming data during the client driver's tear down. The client driver might also be processing data at the same time, resulting in a call to mhi_queue_buf() which will invoke mhi_gen_tre(). If mhi_gen_tre() runs after mhi_unprepare_from_transfer() has torn down the channel, a panic will occur due to an invalid dereference leading to a page fault.
This occurs because mhi_gen_tre() does not verify the channel state after locking it. Fix this by having mhi_gen_tre() confirm the channel state is valid, or return error to avoid accessing deinitialized data.
--- drivers/bus/mhi/host/main.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/bus/mhi/host/main.c +10 -6
@@ -1192,11 +1192,16 @@ int mhi_gen_tre(struct mhi_controller *mstruct mhi_ring_element *mhi_tre;struct mhi_buf_info *buf_info;int eot, eob, chain, bei; -int ret; +int ret =0 ;/* Protect accesses for reading and incrementing WP */ write_lock_bh (&mhi_chan->lock); +if (mhi_chan->ch_state !=MHI_CH_STATE_ENABLED ) { + ret = -ENODEV ; + goto out; + } + buf_ring = &mhi_chan->buf_ring; tre_ring = &mhi_chan->tre_ring;
@@ -1214,10 +1219,8 @@ int mhi_gen_tre(struct mhi_controller *mif (!info->pre_mapped) { ret = mhi_cntrl->map_single (mhi_cntrl, buf_info); -if (ret) { -write_unlock_bh (&mhi_chan->lock); -return ret; - } +if (ret) + goto out; } eob = !!(flags &MHI_EOB );
@@ -1234,9 +1237,10 @@ int mhi_gen_tre(struct mhi_controller *mmhi_add_ring_element (mhi_cntrl, tre_ring);mhi_add_ring_element (mhi_cntrl, buf_ring); +out:write_unlock_bh (&mhi_chan->lock); -return 0 ; +return ret; } int mhi_queue_buf(struct mhi_device *mhi_dev, enum dma_data_direction dir,
Greg Kroah-Hartman
maintainerPATCH 86/373 ext4: fix off-by-one error in do_split
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Artem Sadovnikov <[email protected]>
commit 94824ac9a8aaf2fb3c54b4bdde842db80ffa555d upstream.
Syzkaller detected a use-after-free issue in ext4_insert_dentry that was caused by out-of-bounds access due to incorrect splitting in do_split.
BUG: KASAN: use-after-free in ext4_insert_dentry+0x36a/0x6d0 fs/ext4/namei.c:2109 Write of size 251 at addr ffff888074572f14 by task syz-executor335/5847 CPU: 0 UID: 0 PID: 5847 Comm: syz-executor335 Not tainted 6.12.0-rc6-syzkaller-00318-ga9cda7c0ffed #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/30/2024 Call Trace: <TASK> __dump_stack lib/dump_stack.c:94 [inline] dump_stack_lvl+0x241/0x360 lib/dump_stack.c:120 print_address_description mm/kasan/report.c:377 [inline] print_report+0x169/0x550 mm/kasan/report.c:488 kasan_report+0x143/0x180 mm/kasan/report.c:601 kasan_check_range+0x282/0x290 mm/kasan/generic.c:189 __asan_memcpy+0x40/0x70 mm/kasan/shadow.c:106 ext4_insert_dentry+0x36a/0x6d0 fs/ext4/namei.c:2109 add_dirent_to_buf+0x3d9/0x750 fs/ext4/namei.c:2154 make_indexed_dir+0xf98/0x1600 fs/ext4/namei.c:2351 ext4_add_entry+0x222a/0x25d0 fs/ext4/namei.c:2455 ext4_add_nondir+0x8d/0x290 fs/ext4/namei.c:2796 ext4_symlink+0x920/0xb50 fs/ext4/namei.c:3431 vfs_symlink+0x137/0x2e0 fs/namei.c:4615 do_symlinkat+0x222/0x3a0 fs/namei.c:4641 __do_sys_symlink fs/namei.c:4662 [inline] __se_sys_symlink fs/namei.c:4660 [inline] __x64_sys_symlink+0x7a/0x90 fs/namei.c:4660 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xf3/0x230 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f </TASK>
The following loop is located right above 'if' statement.
for (i = count-1; i >= 0; i--) {
/* is more than half of this entry in 2nd half of the block? */
if (size + map[i].size/2 > blocksize/2)
break;
size += map[i].size;
move++;
}'i' in this case could go down to -1, in which case sum of active entries wouldn't exceed half the block size, but previous behaviour would also do split in half if sum would exceed at the very last block, which in case of having too many long name files in a single block could lead to out-of-bounds access and following use-after-free.
Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
--- fs/ext4/namei.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ext4/namei.c +1 -1
@@ -2041,7 +2041,7 @@ static struct ext4_dir_entry_2 *do_split* split it in half by count; each resulting block will have at least * half the space free. */ -if (i >0 ) +if (i >=0 ) split = count - move;else split = count/2 ;
Greg Kroah-Hartman
maintainerPATCH 87/373 vdpa/mlx5: Fix oversized null mkey longer than 32bit
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Si-Wei Liu <[email protected]>
commit a6097e0a54a5c24f8d577ffecbc35289ae281c2e upstream.
create_user_mr() has correct code to count the number of null keys used to fill in a hole for the memory map. However, fill_indir() does not follow the same to cap the range up to the 1GB limit correspondingly. Fill in more null keys for the gaps in between, so that null keys are correctly populated.
Message-Id: <[email protected]>
--- drivers/vdpa/mlx5/core/mr.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/vdpa/mlx5/core/mr.c +5 -2
@@ -166,9 +166,12 @@ again: klm->bcount =cpu_to_be32 (klm_bcount (dmr->end - dmr->start)); preve = dmr->end; }else { +u64 bcount =min_t (u64, dmr->start - preve,MAX_KLM_SIZE ); + klm->key =cpu_to_be32 (mvdev->res.null_mkey); - klm->bcount =cpu_to_be32 (klm_bcount (dmr->start - preve)); - preve = dmr->start; + klm->bcount =cpu_to_be32 (klm_bcount (bcount)); + preve += bcount; + goto again; } }
Greg Kroah-Hartman
maintainerPATCH 88/373 i3c: master: svc: Use readsb helper for reading MDB
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stanley Chu <[email protected]>
commit c06acf7143bddaa3c0f7bedd8b99e48f6acb85c3 upstream.
The target can send the MDB byte followed by additional data bytes. The readl on MRDATAB reads one actual byte, but the readsl advances the destination pointer by 4 bytes. This causes the subsequent payload to be copied to wrong position in the destination buffer.
--- drivers/i3c/master/svc-i3c-master.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i3c/master/svc-i3c-master.c +1 -1
@@ -315,7 +315,7 @@ static int svc_i3c_master_handle_ibi(str slot->len < SVC_I3C_FIFO_SIZE) { mdatactrl =readl (master->regs +SVC_I3C_MDATACTRL ); count =SVC_I3C_MDATACTRL_RXCOUNT (mdatactrl); -readsl (master->regs +SVC_I3C_MRDATAB , buf, count); +readsb (master->regs +SVC_I3C_MRDATAB , buf, count); slot->len += count; buf += count; }
Greg Kroah-Hartman
maintainerPATCH 89/373 i3c: Add NULL pointer check in i3c_master_queue_ibi()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manjunatha Venkatesh <[email protected]>
commit bd496a44f041da9ef3afe14d1d6193d460424e91 upstream.
The I3C master driver may receive an IBI from a target device that has not been probed yet. In such cases, the master calls i3c_master_queue_ibi() to queue an IBI work task, leading to "Unable to handle kernel read from unreadable memory" and resulting in a kernel panic.
Typical IBI handling flow:
1. The I3C master scans target devices and probes their respective drivers.
2. The target device driver calls i3c_device_request_ibi() to enable IBI and assigns dev->ibi = ibi.
3. The I3C master receives an IBI from the target device and calls i3c_master_queue_ibi() to queue the target device driver’s IBI handler task.
However, since target device events are asynchronous to the I3C probe sequence, step 3 may occur before step 2, causing dev->ibi to be NULL, leading to a kernel panic.
Add a NULL pointer check in i3c_master_queue_ibi() to prevent accessing an uninitialized dev->ibi, ensuring stability.
--- drivers/i3c/master.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/i3c/master.c +3 -0
@@ -2240,6 +2240,9 @@ static void i3c_master_unregister_i3c_de*/ void i3c_master_queue_ibi (struct i3c_dev_desc *dev,struct i3c_ibi_slot *slot) { +if (!dev->ibi || !slot) +return ; +atomic_inc (&dev->ibi->pending_ibis);queue_work (dev->common.master->wq, &slot->work); }
Greg Kroah-Hartman
maintainerPATCH 90/373 jbd2: remove wrong sb->s_sequence check
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 e6eff39dd0fe4190c6146069cc16d160e71d1148 upstream.
Journal emptiness is not determined by sb->s_sequence == 0 but rather by sb->s_start == 0 (which is set a few lines above). Furthermore 0 is a valid transaction ID so the check can spuriously trigger. Remove the invalid WARN_ON.
--- fs/jbd2/journal.c | 1 - 1 file changed, 1 deletion(-)
fs/jbd2/journal.c +0 -1
@@ -1701,7 +1701,6 @@ int jbd2_journal_update_sb_log_tail(jour/* Log is no longer empty */ write_lock (&journal->j_state_lock); -WARN_ON (!sb->s_sequence); journal->j_flags &= ~JBD2_FLUSHED ;write_unlock (&journal->j_state_lock);
Greg Kroah-Hartman
maintainerPATCH 91/373 mfd: ene-kb3930: Fix a potential NULL pointer dereference
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chenyuan Yang <[email protected]>
commit 4cdf1d2a816a93fa02f7b6b5492dc7f55af2a199 upstream.
The off_gpios could be NULL. Add missing check in the kb3930_probe(). This is similar to the issue fixed in commit b1ba8bcb2d1f ("backlight: hx8357: Fix potential NULL pointer dereference").
This was detected by our static analysis tool.
--- drivers/mfd/ene-kb3930.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/ene-kb3930.c +1 -1
@@ -162,7 +162,7 @@ static int kb3930_probe(struct i2c_cliendevm_gpiod_get_array_optional (dev,"off" ,GPIOD_IN );if (IS_ERR (ddata->off_gpios))return PTR_ERR (ddata->off_gpios); -if (ddata->off_gpios->ndescs <2 ) { +if (ddata->off_gpios && ddata->off_gpios->ndescs <2 ) {dev_err (dev,"invalid off-gpios property\n" );return -EINVAL ; }
Greg Kroah-Hartman
maintainerPATCH 92/373 locking/lockdep: Decrease nr_unused_locks if lock unused in zap_class()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Boqun Feng <[email protected]>
commit 495f53d5cca0f939eaed9dca90b67e7e6fb0e30c upstream.
Currently, when a lock class is allocated, nr_unused_locks will be increased by 1, until it gets used: nr_unused_locks will be decreased by 1 in mark_lock(). However, one scenario is missed: a lock class may be zapped without even being used once. This could result into a situation that nr_unused_locks != 0 but no unused lock class is active in the system, and when cat /proc/lockdep_stats, a WARN_ON() will be triggered in a CONFIG_DEBUG_LOCKDEP=y kernel:
[...] DEBUG_LOCKS_WARN_ON(debug_atomic_read(nr_unused_locks) != nr_unused)
[...] WARNING: CPU: 41 PID: 1121 at kernel/locking/lockdep_proc.c:283 lockdep_stats_show+0xba9/0xbd0
And as a result, lockdep will be disabled after this.
Therefore, nr_unused_locks needs to be accounted correctly at zap_class() time.
--- kernel/locking/lockdep.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/locking/lockdep.c +3 -0
@@ -5982,6 +5982,9 @@ static void zap_class(struct pending_frehlist_del_rcu (&class->hash_entry);WRITE_ONCE (class->key,NULL );WRITE_ONCE (class->name,NULL ); +/* Class allocated but not used, -1 in nr_unused_locks */ +if (class->usage_mask ==0 ) +debug_atomic_dec (nr_unused_locks); nr_lock_classes--;__clear_bit (class - lock_classes, lock_classes_in_use);if (class - lock_classes == max_lock_class_idx)
Greg Kroah-Hartman
maintainerPATCH 93/373 lib: scatterlist: fix sg_split_phys to preserve original scatterlist offsets
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: T Pratham <[email protected]>
commit 8b46fdaea819a679da176b879e7b0674a1161a5e upstream.
The split_sg_phys function was incorrectly setting the offsets of all scatterlist entries (except the first) to 0. Only the first scatterlist entry's offset and length needs to be modified to account for the skip. Setting the rest entries' offsets to 0 could lead to incorrect data access.
I am using this function in a crypto driver that I'm currently developing (not yet sent to mailing list). During testing, it was observed that the output scatterlists (except the first one) contained incorrect garbage data.
I narrowed this issue down to the call of sg_split(). Upon debugging inside this function, I found that this resetting of offset is the cause of the problem, causing the subsequent scatterlists to point to incorrect memory locations in a page. By removing this code, I am obtaining expected data in all the split output scatterlists. Thus, this was indeed causing observable runtime effects!
This patch removes the offending code, ensuring that the page offsets in the input scatterlist are preserved in the output scatterlist.
--- lib/sg_split.c | 2 -- 1 file changed, 2 deletions(-)
lib/sg_split.c +0 -2
@@ -88,8 +88,6 @@ static void sg_split_phys(struct sg_spliif (!j) { out_sg->offset += split->skip_sg0; out_sg->length -= split->skip_sg0; - }else { - out_sg->offset =0 ; }sg_dma_address (out_sg) =0 ;sg_dma_len (out_sg) =0 ;
Greg Kroah-Hartman
maintainerPATCH 94/373 mptcp: fix NULL pointer in can_accept_new_subflow
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gang Yan <[email protected]>
commit 443041deb5ef6a1289a99ed95015ec7442f141dc upstream.
When testing valkey benchmark tool with MPTCP, the kernel panics in 'mptcp_can_accept_new_subflow' because subflow_req->msk is NULL.
Call trace: mptcp_can_accept_new_subflow (./net/mptcp/subflow.c:63 (discriminator 4)) (P) subflow_syn_recv_sock (./net/mptcp/subflow.c:854) tcp_check_req (./net/ipv4/tcp_minisocks.c:863) tcp_v4_rcv (./net/ipv4/tcp_ipv4.c:2268) ip_protocol_deliver_rcu (./net/ipv4/ip_input.c:207) ip_local_deliver_finish (./net/ipv4/ip_input.c:234) ip_local_deliver (./net/ipv4/ip_input.c:254) ip_rcv_finish (./net/ipv4/ip_input.c:449) ...
According to the debug log, the same req received two SYN-ACK in a very short time, very likely because the client retransmits the syn ack due to multiple reasons.
Even if the packets are transmitted with a relevant time interval, they can be processed by the server on different CPUs concurrently). The 'subflow_req->msk' ownership is transferred to the subflow the first, and there will be a risk of a null pointer dereference here.
This patch fixes this issue by moving the 'subflow_req->msk' under the own_req == true conditional.
Note that the !msk check in subflow_hmac_valid() can be dropped, because the same check already exists under the own_req mpj branch where the code has been moved to.
--- net/mptcp/subflow.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
net/mptcp/subflow.c +8 -7
@@ -589,8 +589,6 @@ static bool subflow_hmac_valid(const str subflow_req =mptcp_subflow_rsk (req); msk = subflow_req->msk; -if (!msk) -return false; subflow_generate_hmac(msk->remote_key, msk->local_key, subflow_req->remote_nonce,
@@ -716,12 +714,8 @@ static struct sock *subflow_syn_recv_soc fallback = true; }else if (subflow_req->mp_join) {mptcp_get_options (skb, &mp_opt); -if (!(mp_opt.suboptions &OPTION_MPTCP_MPJ_ACK ) || - !subflow_hmac_valid (req, &mp_opt) || - !mptcp_can_accept_new_subflow (subflow_req->msk)) { -SUBFLOW_REQ_INC_STATS (req,MPTCP_MIB_JOINACKMAC ); +if (!(mp_opt.suboptions &OPTION_MPTCP_MPJ_ACK )) fallback = true; - } } create_child:
@@ -787,6 +781,13 @@ create_child:subflow_add_reset_reason (skb,MPTCP_RST_EPROHIBIT ); goto dispose_child; } + +if (!subflow_hmac_valid (req, &mp_opt) || + !mptcp_can_accept_new_subflow (subflow_req->msk)) { +SUBFLOW_REQ_INC_STATS (req,MPTCP_MIB_JOINACKMAC ); +subflow_add_reset_reason (skb,MPTCP_RST_EPROHIBIT ); + goto dispose_child; + }/* move the msk reference ownership to the subflow */ subflow_req->msk =NULL ;
Greg Kroah-Hartman
maintainerPATCH 95/373 mptcp: only inc MPJoinAckHMacFailure for HMAC failures
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthieu Baerts (NGI0) <[email protected]>
commit 21c02e8272bc95ba0dd44943665c669029b42760 upstream.
Recently, during a debugging session using local MPTCP connections, I noticed MPJoinAckHMacFailure was not zero on the server side. The counter was in fact incremented when the PM rejected new subflows, because the 'subflow' limit was reached.
The fix is easy, simply dissociating the two cases: only the HMAC validation check should increase MPTCP_MIB_JOINACKMAC counter.
--- net/mptcp/subflow.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
net/mptcp/subflow.c +6 -2
@@ -782,12 +782,16 @@ create_child: goto dispose_child; } -if (!subflow_hmac_valid (req, &mp_opt) || - !mptcp_can_accept_new_subflow (subflow_req->msk)) { +if (!subflow_hmac_valid (req, &mp_opt)) {SUBFLOW_REQ_INC_STATS (req,MPTCP_MIB_JOINACKMAC );subflow_add_reset_reason (skb,MPTCP_RST_EPROHIBIT ); goto dispose_child; } + +if (!mptcp_can_accept_new_subflow (owner)) { +subflow_add_reset_reason (skb,MPTCP_RST_EPROHIBIT ); + goto dispose_child; + }/* move the msk reference ownership to the subflow */ subflow_req->msk =NULL ;
Greg Kroah-Hartman
maintainerPATCH 96/373 mtd: inftlcore: Add error check for inftl_read_oob()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wentao Liang <[email protected]>
commit d027951dc85cb2e15924c980dc22a6754d100c7c upstream.
In INFTL_findwriteunit(), the return value of inftl_read_oob() need to be checked. A proper implementation can be found in INFTL_deleteblock(). The status will be set as SECTOR_IGNORE to break from the while-loop correctly if the inftl_read_oob() fails.
--- drivers/mtd/inftlcore.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/mtd/inftlcore.c +5 -4
@@ -482,10 +482,11 @@ static inline u16 INFTL_findwriteunit(st silly =MAX_LOOPS ;while (thisEUN <= inftl->lastEUN) { -inftl_read_oob (mtd, (thisEUN * inftl->EraseSize) + - blockofs,8 , &retlen, (char *)&bci); - - status = bci.Status | bci.Status1; +if (inftl_read_oob (mtd, (thisEUN * inftl->EraseSize) + + blockofs,8 , &retlen, (char *)&bci) <0 ) + status =SECTOR_IGNORE ; +else + status = bci.Status | bci.Status1;pr_debug ("INFTL: status of block %d in EUN %d is %x\n" , block , writeEUN, status);
Greg Kroah-Hartman
maintainerPATCH 97/373 mtd: rawnand: Add status chack in r852_ready()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wentao Liang <[email protected]>
commit b79fe1829975556854665258cf4d2476784a89db upstream.
In r852_ready(), the dev get from r852_get_dev() need to be checked. An unstable device should not be ready. A proper implementation can be found in r852_read_byte(). Add a status check and return 0 when it is unstable.
--- drivers/mtd/nand/raw/r852.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/mtd/nand/raw/r852.c +3 -0
@@ -387,6 +387,9 @@ static int r852_wait(struct nand_chip *cstatic int r852_ready (struct nand_chip *chip) {struct r852_device *dev =r852_get_dev (nand_to_mtd (chip)); +if (dev->card_unstable) +return 0 ; +return !(r852_read_reg (dev,R852_CARD_STA ) &R852_CARD_STA_BUSY ); }
Greg Kroah-Hartman
maintainerPATCH 98/373 arm64: dts: mediatek: mt8173: Fix disp-pwm compatible string
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen-Yu Tsai <[email protected]>
commit 46ad36002088eff8fc5cae200aa42ae9f9310ddd upstream.
The MT8173 disp-pwm device should have only one compatible string, based on the following DT validation error:
arch/arm64/boot/dts/mediatek/mt8173-elm.dtb: pwm@1401e000: compatible: 'oneOf' conditional failed, one must be fixed:
['mediatek,mt8173-disp-pwm', 'mediatek,mt6595-disp-pwm'] is too long
'mediatek,mt8173-disp-pwm' is not one of ['mediatek,mt6795-disp-pwm', 'mediatek,mt8167-disp-pwm']
'mediatek,mt8173-disp-pwm' is not one of ['mediatek,mt8186-disp-pwm', 'mediatek,mt8188-disp-pwm', 'mediatek,mt8192-disp-pwm', 'mediatek,mt8195-disp-pwm', 'mediatek,mt8365-disp-pwm'] 'mediatek,mt8173-disp-pwm' was expected
'mediatek,mt8183-disp-pwm' was expected
from schema $id: http://devicetree.org/schemas/pwm/mediatek,pwm-disp.yaml#
arch/arm64/boot/dts/mediatek/mt8173-elm.dtb: pwm@1401f000: compatible: 'oneOf' conditional failed, one must be fixed:
['mediatek,mt8173-disp-pwm', 'mediatek,mt6595-disp-pwm'] is too long
'mediatek,mt8173-disp-pwm' is not one of ['mediatek,mt6795-disp-pwm', 'mediatek,mt8167-disp-pwm']
'mediatek,mt8173-disp-pwm' is not one of ['mediatek,mt8186-disp-pwm', 'mediatek,mt8188-disp-pwm', 'mediatek,mt8192-disp-pwm', 'mediatek,mt8195-disp-pwm', 'mediatek,mt8365-disp-pwm'] 'mediatek,mt8173-disp-pwm' was expected
'mediatek,mt8183-disp-pwm' was expected
from schema $id: http://devicetree.org/schemas/pwm/mediatek,pwm-disp.yaml#
Drop the extra "mediatek,mt6595-disp-pwm" compatible string.
--- arch/arm64/boot/dts/mediatek/mt8173.dtsi | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/mediatek/mt8173.dtsi +2 -4
@@ -1260,8 +1260,7 @@ }; pwm0: pwm@1401e000 { - compatible = "mediatek,mt8173-disp-pwm", - "mediatek,mt6595-disp-pwm"; + compatible = "mediatek,mt8173-disp-pwm"; reg = <0 0x1401e000 0 0x1000>; #pwm-cells = <2>; clocks = <&mmsys CLK_MM_DISP_PWM026M>,
@@ -1271,8 +1270,7 @@ }; pwm1: pwm@1401f000 { - compatible = "mediatek,mt8173-disp-pwm", - "mediatek,mt6595-disp-pwm"; + compatible = "mediatek,mt8173-disp-pwm"; reg = <0 0x1401f000 0 0x1000>; #pwm-cells = <2>; clocks = <&mmsys CLK_MM_DISP_PWM126M>,
Greg Kroah-Hartman
maintainerPATCH 99/373 sparc/mm: disable preemption in lazy mmu mode
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryan Roberts <[email protected]>
commit a1d416bf9faf4f4871cb5a943614a07f80a7d70f upstream.
Since commit 38e0edb15bd0 ("mm/apply_to_range: call pte function with lazy updates") it's been possible for arch_[enter|leave]_lazy_mmu_mode() to be called without holding a page table lock (for the kernel mappings case), and therefore it is possible that preemption may occur while in the lazy mmu mode. The Sparc lazy mmu implementation is not robust to preemption since it stores the lazy mode state in a per-cpu structure and does not attempt to manage that state on task switch.
Powerpc had the same issue and fixed it by explicitly disabling preemption in arch_enter_lazy_mmu_mode() and re-enabling in arch_leave_lazy_mmu_mode(). See commit b9ef323ea168 ("powerpc/64s:
Disable preemption in hash lazy mmu mode").
Given Sparc's lazy mmu mode is based on powerpc's, let's fix it in the same way here.
--- arch/sparc/mm/tlb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/sparc/mm/tlb.c +4 -1
@@ -52,8 +52,10 @@ out:void arch_enter_lazy_mmu_mode (void ) { -struct tlb_batch *tb =this_cpu_ptr (&tlb_batch); +struct tlb_batch *tb; +preempt_disable (); + tb =this_cpu_ptr (&tlb_batch); tb->active =1 ; }
@@ -64,6 +66,7 @@ void arch_leave_lazy_mmu_mode(void)if (tb->tlb_nr)flush_tlb_pending (); tb->active =0 ; +preempt_enable (); } static void tlb_batch_add_one(struct mm_struct *mm, unsigned long vaddr,
Greg Kroah-Hartman
maintainerPATCH 100/373 mm: add missing release barrier on PGDAT_RECLAIM_LOCKED unlock
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mathieu Desnoyers <[email protected]>
commit c0ebbb3841e07c4493e6fe351698806b09a87a37 upstream.
The PGDAT_RECLAIM_LOCKED bit is used to provide mutual exclusion of node reclaim for struct pglist_data using a single bit.
It is "locked" with a test_and_set_bit (similarly to a try lock) which provides full ordering with respect to loads and stores done within __node_reclaim().
It is "unlocked" with clear_bit(), which does not provide any ordering with respect to loads and stores done before clearing the bit.
The lack of clear_bit() memory ordering with respect to stores within __node_reclaim() can cause a subsequent CPU to fail to observe stores from a prior node reclaim. This is not an issue in practice on TSO (e.g. x86), but it is an issue on weakly-ordered architectures (e.g. arm64).
Fix this by using clear_bit_unlock rather than clear_bit to clear PGDAT_RECLAIM_LOCKED with a release memory ordering semantic.
This provides stronger memory ordering (release rather than relaxed).
--- mm/vmscan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/vmscan.c +1 -1
@@ -4581,7 +4581,7 @@ int node_reclaim(struct pglist_data *pgdreturn NODE_RECLAIM_NOSCAN ; ret =__node_reclaim (pgdat, gfp_mask, order); -clear_bit (PGDAT_RECLAIM_LOCKED , &pgdat->flags); +clear_bit_unlock (PGDAT_RECLAIM_LOCKED , &pgdat->flags);if (!ret)count_vm_event (PGSCAN_ZONE_RECLAIM_FAILED );
Greg Kroah-Hartman
maintainerPATCH 101/373 mm/hwpoison: do not send SIGBUS to processes with recovered clean pages
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shuai Xue <[email protected]>
commit aaf99ac2ceb7c974f758a635723eeaf48596388e upstream.
When an uncorrected memory error is consumed there is a race between the CMCI from the memory controller reporting an uncorrected error with a UCNA signature, and the core reporting and SRAR signature machine check when the data is about to be consumed.
- Background: why *UN*corrected errors tied to *C*MCI in Intel platform [1]
Prior to Icelake memory controllers reported patrol scrub events that detected a previously unseen uncorrected error in memory by signaling a broadcast machine check with an SRAO (Software Recoverable Action Optional) signature in the machine check bank. This was overkill because it's not an urgent problem that no core is on the verge of consuming that bad data. It's also found that multi SRAO UCE may cause nested MCE interrupts and finally become an IERR.
Hence, Intel downgrades the machine check bank signature of patrol scrub from SRAO to UCNA (Uncorrected, No Action required), and signal changed to #CMCI. Just to add to the confusion, Linux does take an action (in uc_decode_notifier()) to try to offline the page despite the UC*NA* signature name.
- Background: why #CMCI and #MCE race when poison is consuming in Intel platform [1]
Having decided that CMCI/UCNA is the best action for patrol scrub errors, the memory controller uses it for reads too. But the memory controller is executing asynchronously from the core, and can't tell the difference between a "real" read and a speculative read. So it will do CMCI/UCNA if an error is found in any read.
Thus:
1) Core is clever and thinks address A is needed soon, issues a speculative read.
2) Core finds it is going to use address A soon after sending the read request
3) The CMCI from the memory controller is in a race with MCE from the core that will soon try to retire the load from address A.
Quite often (because speculation has got better) the CMCI from the memory controller is delivered before the core is committed to the instruction reading address A, so the interrupt is taken, and Linux offlines the page (marking it as poison).
- Why user process is killed for instr case
Commit 046545a661af ("mm/hwpoison: fix error page recovered but reported "not recovered"") tries to fix noise message "Memory error not recovered" and skips duplicate SIGBUSs due to the race. But it also introduced a bug that kill_accessing_process() return -EHWPOISON for instr case, as result, kill_me_maybe() send a SIGBUS to user process.
If the CMCI wins that race, the page is marked poisoned when uc_decode_notifier() calls memory_failure(). For dirty pages, memory_failure() invokes try_to_unmap() with the TTU_HWPOISON flag, converting the PTE to a hwpoison entry. As a result, kill_accessing_process():
- call walk_page_range() and return 1 regardless of whether try_to_unmap() succeeds or fails,
- call kill_proc() to make sure a SIGBUS is sent
- return -EHWPOISON to indicate that SIGBUS is already sent to the process and kill_me_maybe() doesn't have to send it again.
However, for clean pages, the TTU_HWPOISON flag is cleared, leaving the PTE unchanged and not converted to a hwpoison entry. Conversely, for clean pages where PTE entries are not marked as hwpoison, kill_accessing_process() returns -EFAULT, causing kill_me_maybe() to send a SIGBUS.
Console log looks like this:
Memory failure: 0x827ca68: corrupted page was clean: dropped without side effects
Memory failure: 0x827ca68: recovery action for clean LRU page: Recovered
Memory failure: 0x827ca68: already hardware poisoned
mce: Memory error not recoveredTo fix it, return 0 for "corrupted page was clean", preventing an unnecessary SIGBUS to user process.
[1] https://lore.kernel.org/lkml/[email protected]/T/#mba94f1305b3009dd340ce4114d3221fe810d1871
--- mm/memory-failure.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
mm/memory-failure.c +8 -3
@@ -707,12 +707,17 @@ static int kill_accessing_process(structmmap_read_lock (p->mm); ret =walk_page_range (p->mm,0 ,TASK_SIZE , &hwp_walk_ops, (void *)&priv); +/* +* ret = 1 when CMCI wins, regardless of whether try_to_unmap() +* succeeds or fails, then kill the process with SIGBUS. +* ret = 0 when poison page is a clean page and it's dropped, no +* SIGBUS is needed. +*/ if (ret ==1 && priv.tk.addr)kill_proc (&priv.tk, pfn, flags); -else - ret =0 ;mmap_read_unlock (p->mm); -return ret >0 ? -EHWPOISON : -EFAULT ; + +return ret >0 ? -EHWPOISON :0 ; }static const char *action_name[] = {
Greg Kroah-Hartman
maintainerPATCH 102/373 sctp: detect and prevent references to a freed transport in sendmsg
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo Cañuelo Navarro <[email protected]>
commit f1a69a940de58b16e8249dff26f74c8cc59b32be upstream.
sctp_sendmsg() re-uses associations and transports when possible by doing a lookup based on the socket endpoint and the message destination address, and then sctp_sendmsg_to_asoc() sets the selected transport in all the message chunks to be sent.
There's a possible race condition if another thread triggers the removal of that selected transport, for instance, by explicitly unbinding an address with setsockopt(SCTP_SOCKOPT_BINDX_REM), after the chunks have been set up and before the message is sent. This can happen if the send buffer is full, during the period when the sender thread temporarily releases the socket lock in sctp_wait_for_sndbuf().
This causes the access to the transport data in sctp_outq_select_transport(), when the association outqueue is flushed, to result in a use-after-free read.
This change avoids this scenario by having sctp_transport_free() signal the freeing of the transport, tagging it as "dead". In order to do this, the patch restores the "dead" bit in struct sctp_transport, which was removed in
commit 47faa1e4c50e ("sctp: remove the dead field of sctp_transport").
Then, in the scenario where the sender thread has released the socket lock in sctp_wait_for_sndbuf(), the bit is checked again after re-acquiring the socket lock to detect the deletion. This is done while holding a reference to the transport to prevent it from being freed in the process.
If the transport was deleted while the socket lock was relinquished, sctp_sendmsg_to_asoc() will return -EAGAIN to let userspace retry the send.
The bug was found by a private syzbot instance (see the error report [1] and the C reproducer that triggers it [2]).
--- include/net/sctp/structs.h | 3 ++- net/sctp/socket.c | 22 ++++++++++++++-------- net/sctp/transport.c | 2 ++ 3 files changed, 18 insertions(+), 9 deletions(-)
include/net/sctp/structs.h +2 -1
@@ -777,6 +777,7 @@ struct sctp_transport {/* Reference counting. */ refcount_t refcnt; + __u32 dead:1,/* RTO-Pending : A flag used to track if one of the DATA * chunks sent to this address is currently being * used to compute a RTT. If this flag is 0,
@@ -786,7 +787,7 @@ struct sctp_transport {* calculation completes (i.e. the DATA chunk * is SACK'd) clear this flag. */ - __u32 rto_pending:1, + rto_pending:1,/* * hb_sent : a flag that signals that we have a pending
net/sctp/socket.c +14 -8
@@ -70,8 +70,9 @@/* Forward declarations for internal helper functions. */ static bool sctp_writeable (const struct sock *sk);static void sctp_wfree (struct sk_buff *skb); -static int sctp_wait_for_sndbuf (struct sctp_association *asoc,long *timeo_p, -size_t msg_len); +static int sctp_wait_for_sndbuf (struct sctp_association *asoc, +struct sctp_transport *transport, +long *timeo_p,size_t msg_len);static int sctp_wait_for_packet (struct sock *sk,int *err,long *timeo_p);static int sctp_wait_for_connect (struct sctp_association *,long *timeo_p);static int sctp_wait_for_accept (struct sock *sk,long timeo);
@@ -1828,7 +1829,7 @@ static int sctp_sendmsg_to_asoc(struct sif (sctp_wspace (asoc) <=0 || !sk_wmem_schedule (sk, msg_len)) { timeo =sock_sndtimeo (sk, msg->msg_flags &MSG_DONTWAIT ); - err =sctp_wait_for_sndbuf (asoc, &timeo, msg_len); + err =sctp_wait_for_sndbuf (asoc, transport, &timeo, msg_len);if (err) goto err;if (unlikely (sinfo->sinfo_stream >= asoc->stream.outcnt)) {
@@ -9206,8 +9207,9 @@ void sctp_sock_rfree(struct sk_buff *skb/* Helper function to wait for space in the sndbuf. */ -static int sctp_wait_for_sndbuf (struct sctp_association *asoc,long *timeo_p, -size_t msg_len) +static int sctp_wait_for_sndbuf (struct sctp_association *asoc, +struct sctp_transport *transport, +long *timeo_p,size_t msg_len) {struct sock *sk = asoc->base.sk;long current_timeo = *timeo_p;
@@ -9217,7 +9219,9 @@ static int sctp_wait_for_sndbuf(struct spr_debug ("%s: asoc:%p, timeo:%ld, msg_len:%zu\n" , __func__, asoc, *timeo_p, msg_len); -/* Increment the association's refcnt. */ +/* Increment the transport and association's refcnt. */ +if (transport) +sctp_transport_hold (transport);sctp_association_hold (asoc);/* Wait on the association specific sndbuf space. */
@@ -9226,7 +9230,7 @@ static int sctp_wait_for_sndbuf(struct s TASK_INTERRUPTIBLE);if (asoc->base.dead) goto do_dead; -if (!*timeo_p) +if ((!*timeo_p) || (transport && transport->dead)) goto do_nonblock;if (sk->sk_err || asoc->state >=SCTP_STATE_SHUTDOWN_PENDING ) goto do_error;
@@ -9253,7 +9257,9 @@ static int sctp_wait_for_sndbuf(struct s out:finish_wait (&asoc->wait, &wait); -/* Release the association's refcnt. */ +/* Release the transport and association's refcnt. */ +if (transport) +sctp_transport_put (transport);sctp_association_put (asoc);return err;
net/sctp/transport.c +2 -0
@@ -117,6 +117,8 @@ fail:*/ void sctp_transport_free (struct sctp_transport *transport) { + transport->dead =1 ; +/* Try to delete the heartbeat timer. */ if (del_timer (&transport->hb_timer))sctp_transport_put (transport);
Greg Kroah-Hartman
maintainerPATCH 103/373 thermal/drivers/rockchip: Add missing rk3328 mapping entry
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Trevor Woerner <[email protected]>
commit ee022e5cae052e0c67ca7c5fec0f2e7bc897c70e upstream.
The mapping table for the rk3328 is missing the entry for -25C which is found in the TRM section 9.5.2 "Temperature-to-code mapping".
NOTE: the kernel uses the tsadc_q_sel=1'b1 mode which is defined as:
4096-<code in table>. Whereas the table in the TRM gives the code "3774" for -25C, the kernel uses 4096-3774=322.
[Dragan Simic] : "After going through the RK3308 and RK3328 TRMs, as
well as through the downstream kernel code, it seems we may have some troubles at our hands. Let me explain, please.
To sum it up, part 1 of the RK3308 TRM v1.1 says on page 538 that the equation for the output when tsadc_q_sel equals 1 is (4096 - tsadc_q), while part 1 of the RK3328 TRM v1.2 says that the output equation is (1024 - tsadc_q) in that case.
The downstream kernel code, however, treats the RK3308 and RK3328 tables and their values as being the same. It even mentions 1024 as the "offset" value in a comment block for the rk_tsadcv3_control() function, just like the upstream code does, which is obviously wrong "offset" value when correlated with the table on page 544 of part 1 of the RK3308 TRM v1.1.
With all this in mind, it's obvious that more work is needed to make it clear where's the actual mistake (it could be that the TRM is wrong), which I'll volunteer for as part of the SoC binning project. In the meantime, this patch looks fine as-is to me, by offering what's a clear improvement to the current state of the upstream code"
--- drivers/thermal/rockchip_thermal.c | 1 + 1 file changed, 1 insertion(+)
drivers/thermal/rockchip_thermal.c +1 -0
@@ -373,6 +373,7 @@ static const struct tsadc_table rk3328_c {296, -40000}, {304, -35000}, {313, -30000}, + {322, -25000}, {331, -20000}, {340, -15000}, {349, -10000},
Greg Kroah-Hartman
maintainerPATCH 104/373 crypto: ccp - Fix check for the primary ASP device
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tom Lendacky <[email protected]>
commit 07bb097b92b987db518e72525b515d77904e966e upstream.
Currently, the ASP primary device check does not have support for PCI domains, and, as a result, when the system is configured with PCI domains (PCI segments) the wrong device can be selected as primary. This results in commands submitted to the device timing out and failing. The device check also relies on specific device and function assignments that may not hold in the future.
Fix the primary ASP device check to include support for PCI domains and to perform proper checking of the Bus/Device/Function positions.
--- drivers/crypto/ccp/sp-pci.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/crypto/ccp/sp-pci.c +9 -6
@@ -118,14 +118,17 @@ static bool sp_pci_is_master(struct sp_d pdev_new =to_pci_dev (dev_new); pdev_cur =to_pci_dev (dev_cur); -if (pdev_new->bus->number < pdev_cur->bus->number) -return true; +if (pci_domain_nr (pdev_new->bus) !=pci_domain_nr (pdev_cur->bus)) +return pci_domain_nr (pdev_new->bus) <pci_domain_nr (pdev_cur->bus); -if (PCI_SLOT (pdev_new->devfn) <PCI_SLOT (pdev_cur->devfn)) -return true; +if (pdev_new->bus->number != pdev_cur->bus->number) +return pdev_new->bus->number < pdev_cur->bus->number; -if (PCI_FUNC (pdev_new->devfn) <PCI_FUNC (pdev_cur->devfn)) -return true; +if (PCI_SLOT (pdev_new->devfn) !=PCI_SLOT (pdev_cur->devfn)) +return PCI_SLOT (pdev_new->devfn) <PCI_SLOT (pdev_cur->devfn); + +if (PCI_FUNC (pdev_new->devfn) !=PCI_FUNC (pdev_cur->devfn)) +return PCI_FUNC (pdev_new->devfn) <PCI_FUNC (pdev_cur->devfn);return false; }
Greg Kroah-Hartman
maintainerPATCH 105/373 dm-integrity: set ti->error on memory allocation failure
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikulas Patocka <[email protected]>
commit 00204ae3d6712ee053353920e3ce2b00c35ef75b upstream.
The dm-integrity target didn't set the error string when memory allocation failed. This patch fixes it.
--- drivers/md/dm-integrity.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/md/dm-integrity.c +3 -0
@@ -4454,16 +4454,19 @@ try_smaller_buffer: ic->recalc_bitmap =dm_integrity_alloc_page_list (n_bitmap_pages);if (!ic->recalc_bitmap) { + ti->error ="Could not allocate memory for bitmap" ; r = -ENOMEM ; goto bad; } ic->may_write_bitmap =dm_integrity_alloc_page_list (n_bitmap_pages);if (!ic->may_write_bitmap) { + ti->error ="Could not allocate memory for bitmap" ; r = -ENOMEM ; goto bad; } ic->bbs =kvmalloc_array (ic->n_bitmap_blocks,sizeof (struct bitmap_block_status ),GFP_KERNEL );if (!ic->bbs) { + ti->error ="Could not allocate memory for bitmap" ; r = -ENOMEM ; goto bad; }
Greg Kroah-Hartman
maintainerPATCH 106/373 ftrace: Add cond_resched() to ftrace_graph_set_hash()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: zhoumin <[email protected]>
commit 42ea22e754ba4f2b86f8760ca27f6f71da2d982c upstream.
When the kernel contains a large number of functions that can be traced, the loop in ftrace_graph_set_hash() may take a lot of time to execute. This may trigger the softlockup watchdog.
Add cond_resched() within the loop to allow the kernel to remain responsive even when processing a large number of functions.
This matches the cond_resched() that is used in other locations of the code that iterates over all functions that can be traced.
--- kernel/trace/ftrace.c | 1 + 1 file changed, 1 insertion(+)
kernel/trace/ftrace.c +1 -0
@@ -6090,6 +6090,7 @@ ftrace_graph_set_hash(struct ftrace_hash } } } +cond_resched (); }while_for_each_ftrace_rec (); out:mutex_unlock (&ftrace_lock);
Greg Kroah-Hartman
maintainerPATCH 107/373 gpio: zynq: Fix wakeup source leaks on device unbind
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
commit c5672e310ad971d408752fce7596ed27adc6008f upstream.
Device can be unbound, so driver must also release memory for the wakeup source.
--- drivers/gpio/gpio-zynq.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpio/gpio-zynq.c +1 -0
@@ -1012,6 +1012,7 @@ static int zynq_gpio_remove(struct platf ret =pm_runtime_get_sync (&pdev->dev);if (ret <0 )dev_warn (&pdev->dev,"pm_runtime_get_sync() Failed\n" ); +device_init_wakeup (&pdev->dev,0 );gpiochip_remove (&gpio->chip);clk_disable_unprepare (gpio->clk);device_set_wakeup_capable (&pdev->dev,0 );
Greg Kroah-Hartman
maintainerPATCH 108/373 ntb: use 64-bit arithmetic for the MSI doorbell mask
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fedor Pchelkin <[email protected]>
commit fd5625fc86922f36bedee5846fefd647b7e72751 upstream.
msi_db_mask is of type 'u64', still the standard 'int' arithmetic is performed to compute its value.
While most of the ntb_hw drivers actually don't utilize the higher 32 bits of the doorbell mask now, this may be the case for Switchtec - see switchtec_ntb_init_db().
Found by Linux Verification Center (linuxtesting.org) with SVACE static analysis tool.
--- drivers/ntb/ntb_transport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ntb/ntb_transport.c +1 -1
@@ -1338,7 +1338,7 @@ static int ntb_transport_probe(struct nt qp_count =ilog2 (qp_bitmap);if (nt->use_msi) { qp_count -=1 ; - nt->msi_db_mask =1 << qp_count; + nt->msi_db_mask =BIT_ULL (qp_count);ntb_db_clear_mask (ndev, nt->msi_db_mask); }
Greg Kroah-Hartman
maintainerPATCH 109/373 of/irq: Fix device node refcount leakages in of_irq_count()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zijun Hu <[email protected]>
commit bbf71f44aaf241d853759a71de7e7ebcdb89be3d upstream.
of_irq_count() invokes of_irq_parse_one() to count IRQs, and successful invocation of the later will get device node @irq.np refcount, but the former does not put the refcount before next iteration invocation, hence causes device node refcount leakages.
Fix by putting @irq.np refcount before the next iteration invocation.
--- drivers/of/irq.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/of/irq.c +3 -1
@@ -443,8 +443,10 @@ int of_irq_count(struct device_node *devstruct of_phandle_args irq;int nr =0 ; -while (of_irq_parse_one (dev, nr, &irq) ==0 ) +while (of_irq_parse_one (dev, nr, &irq) ==0 ) { +of_node_put (irq.np); nr++; + }return nr; }
Greg Kroah-Hartman
maintainerPATCH 110/373 of/irq: Fix device node refcount leakage in API irq_of_parse_and_map()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zijun Hu <[email protected]>
commit 962a2805e47b933876ba0e4c488d9e89ced2dd29 upstream.
In irq_of_parse_and_map(), refcount of device node @oirq.np was got by successful of_irq_parse_one() invocation, but it does not put the refcount before return, so causes @oirq.np refcount leakage.
Fix by putting @oirq.np refcount before return.
--- drivers/of/irq.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/of/irq.c +5 -1
@@ -36,11 +36,15 @@unsigned int irq_of_parse_and_map (struct device_node *dev,int index) {struct of_phandle_args oirq; +unsigned int ret;if (of_irq_parse_one (dev, index, &oirq))return 0 ; -return irq_create_of_mapping (&oirq); + ret =irq_create_of_mapping (&oirq); +of_node_put (oirq.np); + +return ret; }EXPORT_SYMBOL_GPL (irq_of_parse_and_map);
Greg Kroah-Hartman
maintainerPATCH 111/373 of/irq: Fix device node refcount leakages in of_irq_init()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zijun Hu <[email protected]>
commit 708124d9e6e7ac5ebf927830760679136b23fdf0 upstream.
of_irq_init() will leak interrupt controller device node refcounts in two places as explained below:
1) Leak refcounts of both @desc->dev and @desc->interrupt_parent when suffers @desc->irq_init_cb() failure.
2) Leak refcount of @desc->interrupt_parent when cleans up list @intc_desc_list in the end.
Refcounts of both @desc->dev and @desc->interrupt_parent were got in the first loop, but of_irq_init() does not put them before kfree(@desc) in places mentioned above, so causes refcount leakages.
Fix by putting refcounts involved before kfree(@desc).
--- drivers/of/irq.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/of/irq.c +3 -0
@@ -555,6 +555,8 @@ void __init of_irq_init(const struct of_ desc->interrupt_parent);if (ret) {of_node_clear_flag (desc->dev,OF_POPULATED ); +of_node_put (desc->interrupt_parent); +of_node_put (desc->dev);kfree (desc);continue ; }
@@ -585,6 +587,7 @@ void __init of_irq_init(const struct of_ err:list_for_each_entry_safe (desc, temp_desc, &intc_desc_list, list) {list_del (&desc->list); +of_node_put (desc->interrupt_parent);of_node_put (desc->dev);kfree (desc); }
Greg Kroah-Hartman
maintainerPATCH 112/373 PCI: brcmstb: Fix missing of_node_put() in brcm_pcie_probe()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stanimir Varbanov <[email protected]>
commit 2df181e1aea4628a8fd257f866026625d0519627 upstream.
A call to of_parse_phandle() is incrementing the refcount, and as such, the of_node_put() must be called when the reference is no longer needed.
Thus, refactor the existing code and add a missing of_node_put() call following the check to ensure that "msi_np" matches "pcie->np" and after MSI initialization, but only if the MSI support is enabled system-wide.
--- drivers/pci/controller/pcie-brcmstb.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/pci/controller/pcie-brcmstb.c +9 -4
@@ -1231,7 +1231,7 @@ static const struct of_device_id brcm_pcstatic int brcm_pcie_probe (struct platform_device *pdev) { -struct device_node *np = pdev->dev.of_node, *msi_np; +struct device_node *np = pdev->dev.of_node;struct pci_host_bridge *bridge;const struct pcie_cfg_data *data;struct brcm_pcie *pcie;
@@ -1306,9 +1306,14 @@ static int brcm_pcie_probe(struct platfo goto fail; } - msi_np =of_parse_phandle (pcie->np,"msi-parent" ,0 ); -if (pci_msi_enabled () && msi_np == pcie->np) { - ret =brcm_pcie_enable_msi (pcie); +if (pci_msi_enabled ()) { +struct device_node *msi_np =of_parse_phandle (pcie->np,"msi-parent" ,0 ); + +if (msi_np == pcie->np) + ret =brcm_pcie_enable_msi (pcie); + +of_node_put (msi_np); +if (ret) {dev_err (pcie->dev,"probe of internal MSI failed" ); goto fail;
Greg Kroah-Hartman
maintainerPATCH 113/373 PCI: Fix reference leak in pci_alloc_child_bus()
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 1f2768b6a3ee77a295106e3a5d68458064923ede upstream.
If device_register(&child->dev) fails, call put_device() to explicitly release child->dev, per the comment at device_register().
Found by code review.
--- drivers/pci/probe.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/pci/probe.c +4 -1
@@ -1115,7 +1115,10 @@ static struct pci_bus *pci_alloc_child_b add_dev:pci_set_bus_msi_domain (child); ret =device_register (&child->dev); -WARN_ON (ret <0 ); +if (WARN_ON (ret <0 )) { +put_device (&child->dev); +return NULL ; + }pcibios_add_bus (child);
Greg Kroah-Hartman
maintainerPATCH 114/373 pinctrl: qcom: Clear latched interrupt status when changing IRQ type
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stephan Gerhold <[email protected]>
commit e225128c3f8be879e7d4eb71a25949e188b420ae upstream.
When submitting the TLMM test driver, Bjorn reported that some of the test cases are failing for GPIOs that not are backed by PDC (i.e. "non-wakeup" GPIOs that are handled directly in pinctrl-msm). Basically, lingering latched interrupt state is still being delivered at IRQ request time, e.g.:
ok 1 tlmm_test_silent_rising
tlmm_test_silent_falling: ASSERTION FAILED at drivers/pinctrl/qcom/tlmm-test.c:178 Expected atomic_read(&priv->intr_count) == 0, but
atomic_read(&priv->intr_count) == 1 (0x1)
not ok 2 tlmm_test_silent_falling
tlmm_test_silent_low: ASSERTION FAILED at drivers/pinctrl/qcom/tlmm-test.c:178
Expected atomic_read(&priv->intr_count) == 0, but
atomic_read(&priv->intr_count) == 1 (0x1) not ok 3 tlmm_test_silent_low
ok 4 tlmm_test_silent_high
Whether to report interrupts that came in while the IRQ was unclaimed doesn't seem to be well-defined in the Linux IRQ API. However, looking closer at these specific cases, we're actually reporting events that do not match the interrupt type requested by the driver:
1. After "ok 1 tlmm_test_silent_rising", the GPIO is in low state and configured for IRQF_TRIGGER_RISING.
2. (a) In preparation for "tlmm_test_silent_falling", the GPIO is switched to high state. The rising interrupt gets latched.
(b) The GPIO is re-configured for IRQF_TRIGGER_FALLING, but the latched interrupt isn't cleared.
(c) The IRQ handler is called for the latched interrupt, but there wasn't any falling edge.
3. (a) For "tlmm_test_silent_low", the GPIO remains in high state.
(b) The GPIO is re-configured for IRQF_TRIGGER_LOW. This seems to result in a phantom interrupt that gets latched.
(c) The IRQ handler is called for the latched interrupt, but the GPIO isn't in low state.
4. (a) For "tlmm_test_silent_high", the GPIO is switched to low state.
(b) This doesn't result in a latched interrupt, because RAW_STATUS_EN was cleared when masking the level-triggered interrupt.
Fix this by clearing the interrupt state whenever making any changes to the interrupt configuration. This includes previously disabled interrupts, but also any changes to interrupt polarity or detection type.
With this change, all 16 test cases are now passing for the non-wakeup GPIOs in the TLMM.
--- drivers/pinctrl/qcom/pinctrl-msm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/pinctrl/qcom/pinctrl-msm.c +6 -6
@@ -955,8 +955,7 @@ static int msm_gpio_irq_set_type(structstruct msm_pinctrl *pctrl =gpiochip_get_data (gc);const struct msm_pingroup *g;unsigned long flags; -bool was_enabled; -u32 val; +u32 val, oldval;if (msm_gpio_needs_dual_edge_parent_workaround (d, type)) {set_bit (d->hwirq, pctrl->dual_edge_irqs);
@@ -1016,8 +1015,7 @@ static int msm_gpio_irq_set_type(struct* internal circuitry of TLMM, toggling the RAW_STATUS * could cause the INTR_STATUS to be set for EDGE interrupts. */ - val =msm_readl_intr_cfg (pctrl, g); - was_enabled = val &BIT (g->intr_raw_status_bit); + val = oldval =msm_readl_intr_cfg (pctrl, g); val |=BIT (g->intr_raw_status_bit);if (g->intr_detection_width ==2 ) { val &= ~(3 << g->intr_detection_bit);
@@ -1070,9 +1068,11 @@ static int msm_gpio_irq_set_type(struct/* * The first time we set RAW_STATUS_EN it could trigger an interrupt. * Clear the interrupt. This is safe because we have -* IRQCHIP_SET_TYPE_MASKED. +* IRQCHIP_SET_TYPE_MASKED. When changing the interrupt type, we could +* also still have a non-matching interrupt latched, so clear whenever +* making changes to the interrupt configuration. */ -if (!was_enabled) +if (val != oldval)msm_ack_intr_status (pctrl, g);if (test_bit (d->hwirq, pctrl->dual_edge_irqs))
Greg Kroah-Hartman
maintainerPATCH 115/373 HSI: ssi_protocol: Fix use after free vulnerability in ssi_protocol Driver Due to Race Condition
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kaixin Wang <[email protected]>
commit e3f88665a78045fe35c7669d2926b8d97b892c11 upstream.
In the ssi_protocol_probe() function, &ssi->work is bound with ssip_xmit_work(), In ssip_pn_setup(), the ssip_pn_xmit() function within the ssip_pn_ops structure is capable of starting the work.
If we remove the module which will call ssi_protocol_remove() to make a cleanup, it will free ssi through kfree(ssi), while the work mentioned above will be used. The sequence of operations that may lead to a UAF bug is as follows:
CPU0 CPU1
| ssip_xmit_work
ssi_protocol_remove |
kfree(ssi); |
| struct hsi_client *cl = ssi->cl;
| // use ssiFix it by ensuring that the work is canceled before proceeding with the cleanup in ssi_protocol_remove().
--- drivers/hsi/clients/ssi_protocol.c | 1 + 1 file changed, 1 insertion(+)
drivers/hsi/clients/ssi_protocol.c +1 -0
@@ -403,6 +403,7 @@ static void ssip_reset(struct hsi_clientdel_timer (&ssi->rx_wd);del_timer (&ssi->tx_wd);del_timer (&ssi->keep_alive); +cancel_work_sync (&ssi->work); ssi->main_state =0 ; ssi->send_state =0 ; ssi->recv_state =0 ;
Greg Kroah-Hartman
maintainerPATCH 116/373 arm64: errata: Add newer ARM cores to the spectre_bhb_loop_affected() lists
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
commit a5951389e58d2e816eed3dbec5877de9327fd881 upstream.
When comparing to the ARM list [1], it appears that several ARM cores were missing from the lists in spectre_bhb_loop_affected(). Add them.
NOTE: for some of these cores it may not matter since other ways of clearing the BHB may be used (like the CLRBHB instruction or ECBHB), but it still seems good to have all the info from ARM's whitepaper included.
[1] https://developer.arm.com/Arm%20Security%20Center/Spectre-BHB
--- arch/arm64/kernel/proton-pack.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
arch/arm64/kernel/proton-pack.c +14 -1
@@ -876,6 +876,14 @@ static u8 spectre_bhb_loop_affected(void {u8 k =0 ; +static const struct midr_range spectre_bhb_k132_list[] = { +MIDR_ALL_VERSIONS (MIDR_CORTEX_X3 ), +MIDR_ALL_VERSIONS (MIDR_NEOVERSE_V2 ), + }; +static const struct midr_range spectre_bhb_k38_list[] = { +MIDR_ALL_VERSIONS (MIDR_CORTEX_A715 ), +MIDR_ALL_VERSIONS (MIDR_CORTEX_A720 ), + };static const struct midr_range spectre_bhb_k32_list[] = {MIDR_ALL_VERSIONS (MIDR_CORTEX_A78 ),MIDR_ALL_VERSIONS (MIDR_CORTEX_A78AE ),
@@ -889,6 +897,7 @@ static u8 spectre_bhb_loop_affected(void };static const struct midr_range spectre_bhb_k24_list[] = {MIDR_ALL_VERSIONS (MIDR_CORTEX_A76 ), +MIDR_ALL_VERSIONS (MIDR_CORTEX_A76AE ),MIDR_ALL_VERSIONS (MIDR_CORTEX_A77 ),MIDR_ALL_VERSIONS (MIDR_NEOVERSE_N1 ),MIDR_ALL_VERSIONS (MIDR_QCOM_KRYO_4XX_GOLD ),
@@ -904,7 +913,11 @@ static u8 spectre_bhb_loop_affected(void {}, }; -if (is_midr_in_range_list (read_cpuid_id (), spectre_bhb_k32_list)) +if (is_midr_in_range_list (read_cpuid_id (), spectre_bhb_k132_list)) + k =132 ; +else if (is_midr_in_range_list (read_cpuid_id (), spectre_bhb_k38_list)) + k =38 ; +else if (is_midr_in_range_list (read_cpuid_id (), spectre_bhb_k32_list)) k =32 ;else if (is_midr_in_range_list (read_cpuid_id (), spectre_bhb_k24_list)) k =24 ;
Greg Kroah-Hartman
maintainerPATCH 117/373 ACPI: platform-profile: Fix CFI violation when accessing sysfs files
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 dd4f730b557ce701a2cd4f604bf1e57667bd8b6e upstream.
When an attribute group is created with sysfs_create_group(), the ->sysfs_ops() callback is set to kobj_sysfs_ops, which sets the ->show() and ->store() callbacks to kobj_attr_show() and kobj_attr_store() respectively. These functions use container_of() to get the respective callback from the passed attribute, meaning that these callbacks need to be of the same type as the callbacks in 'struct kobj_attribute'.
However, ->show() and ->store() in the platform_profile driver are defined for struct device_attribute with the help of DEVICE_ATTR_RO() and DEVICE_ATTR_RW(), which results in a CFI violation when accessing platform_profile or platform_profile_choices under /sys/firmware/acpi because the types do not match:
CFI failure at kobj_attr_show+0x19/0x30 (target: platform_profile_choices_show+0x0/0x140; expected type: 0x7a69590c)
There is no functional issue from the type mismatch because the layout of 'struct kobj_attribute' and 'struct device_attribute' are the same, so the container_of() cast does not break anything aside from CFI.
Change the type of platform_profile_choices_show() and platform_profile_{show,store}() to match the callbacks in 'struct kobj_attribute' and update the attribute variables to match, which resolves the CFI violation.
--- drivers/acpi/platform_profile.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/acpi/platform_profile.c +10 -10
@@ -22,8 +22,8 @@ static const char * const profile_names[ };static_assert (ARRAY_SIZE (profile_names) ==PLATFORM_PROFILE_LAST ); -static ssize_t platform_profile_choices_show (struct device *dev, -struct device_attribute *attr, +static ssize_t platform_profile_choices_show (struct kobject *kobj, +struct kobj_attribute *attr,char *buf) {int len =0 ;
@@ -49,8 +49,8 @@ static ssize_t platform_profile_choices_return len; } -static ssize_t platform_profile_show (struct device *dev, -struct device_attribute *attr, +static ssize_t platform_profile_show (struct kobject *kobj, +struct kobj_attribute *attr,char *buf) {enum platform_profile_option profile =PLATFORM_PROFILE_BALANCED ;
@@ -77,8 +77,8 @@ static ssize_t platform_profile_show(strreturn sysfs_emit (buf,"%s\n" , profile_names[profile]); } -static ssize_t platform_profile_store (struct device *dev, -struct device_attribute *attr, +static ssize_t platform_profile_store (struct kobject *kobj, +struct kobj_attribute *attr,const char *buf,size_t count) {int err, i;
@@ -115,12 +115,12 @@ static ssize_t platform_profile_store(streturn count; } -static DEVICE_ATTR_RO (platform_profile_choices); -static DEVICE_ATTR_RW (platform_profile); +static struct kobj_attribute attr_platform_profile_choices =__ATTR_RO (platform_profile_choices); +static struct kobj_attribute attr_platform_profile =__ATTR_RW (platform_profile);static struct attribute *platform_profile_attrs[] = { - &dev_attr_platform_profile_choices.attr, - &dev_attr_platform_profile.attr, + &attr_platform_profile_choices.attr, + &attr_platform_profile.attr,NULL };
Greg Kroah-Hartman
maintainerPATCH 118/373 x86/e820: Fix handling of subpage regions when calculating nosave ranges in e820__register_nosave_regions()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Myrrh Periwinkle <[email protected]>
commit f2f29da9f0d4367f6ff35e0d9d021257bb53e273 upstream.
While debugging kexec/hibernation hangs and crashes, it turned out that the current implementation of e820__register_nosave_regions() suffers from multiple serious issues:
- The end of last region is tracked by PFN, causing it to find holes that aren't there if two consecutive subpage regions are present
- The nosave PFN ranges derived from holes are rounded out (instead of rounded in) which makes it inconsistent with how explicitly reserved regions are handled
Fix this by:
- Treating reserved regions as if they were holes, to ensure consistent handling (rounding out nosave PFN ranges is more correct as the kernel does not use partial pages)
- Tracking the end of the last RAM region by address instead of pages to detect holes more precisely
These bugs appear to have been introduced about ~18 years ago with the very first version of e820_mark_nosave_regions(), and its flawed assumptions were carried forward uninterrupted through various waves of rewrites and renames.
[ mingo: Added Git archeology details, for kicks and giggles. ]
--- arch/x86/kernel/e820.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
arch/x86/kernel/e820.c +8 -9
@@ -753,22 +753,21 @@ void __init e820__memory_setup_extended(void __init e820__register_nosave_regions (unsigned long limit_pfn) {int i; -unsigned long pfn =0 ; +u64 last_addr =0 ;for (i =0 ; i < e820_table->nr_entries; i++) {struct e820_entry *entry = &e820_table->entries[i]; -if (pfn <PFN_UP (entry->addr)) -register_nosave_region (pfn,PFN_UP (entry->addr)); - - pfn =PFN_DOWN (entry->addr + entry->size); -if (entry->type !=E820_TYPE_RAM && entry->type !=E820_TYPE_RESERVED_KERN ) -register_nosave_region (PFN_UP (entry->addr), pfn); +continue ; -if (pfn >= limit_pfn) -break ; +if (last_addr < entry->addr) +register_nosave_region (PFN_DOWN (last_addr),PFN_UP (entry->addr)); + + last_addr = entry->addr + entry->size; } + +register_nosave_region (PFN_DOWN (last_addr), limit_pfn); }#ifdef CONFIG_ACPI
Greg Kroah-Hartman
maintainerPATCH 119/373 Bluetooth: hci_uart: Fix another race during initialization
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arseniy Krasnov <[email protected]>
commit 5df5dafc171b90d0b8d51547a82657cd5a1986c7 upstream.
Do not set 'HCI_UART_PROTO_READY' before call 'hci_uart_register_dev()'. Possible race is when someone calls 'hci_tty_uart_close()' after this bit is set, but 'hci_uart_register_dev()' wasn't done. This leads to access to uninitialized fields. To fix it let's set this bit after device was registered (as before patch c411c62cc133) and to fix previous problem let's add one more bit in addition to 'HCI_UART_PROTO_READY' which allows to perform power up without original bit set (pls see commit c411c62cc133).
Crash backtrace from syzbot report:
RIP: 0010:skb_queue_empty_lockless include/linux/skbuff.h:1887 [inline] RIP: 0010:skb_queue_purge_reason+0x6d/0x140 net/core/skbuff.c:3936 Call Trace: <TASK> skb_queue_purge include/linux/skbuff.h:3364 [inline] mrvl_close+0x2f/0x90 drivers/bluetooth/hci_mrvl.c:100 hci_uart_tty_close+0xb6/0x120 drivers/bluetooth/hci_ldisc.c:557 tty_ldisc_close drivers/tty/tty_ldisc.c:455 [inline] tty_ldisc_kill+0x66/0xc0 drivers/tty/tty_ldisc.c:613 tty_ldisc_release+0xc9/0x120 drivers/tty/tty_ldisc.c:781 tty_release_struct+0x10/0x80 drivers/tty/tty_io.c:1690 tty_release+0x4ef/0x640 drivers/tty/tty_io.c:1861 __fput+0x86/0x2a0 fs/file_table.c:450 task_work_run+0x82/0xb0 kernel/task_work.c:239 resume_user_mode_work include/linux/resume_user_mode.h:50 [inline] exit_to_user_mode_loop kernel/entry/common.c:114 [inline] exit_to_user_mode_prepare include/linux/entry-common.h:329 [inline] __syscall_exit_to_user_mode_work kernel/entry/common.c:207 [inline] syscall_exit_to_user_mode+0xa3/0x1b0 kernel/entry/common.c:218 do_syscall_64+0x9a/0x190 arch/x86/entry/common.c:89 entry_SYSCALL_64_after_hwframe+0x77/0x7f
--- drivers/bluetooth/hci_ldisc.c | 20 ++++++++++++++------ drivers/bluetooth/hci_uart.h | 1 + 2 files changed, 15 insertions(+), 6 deletions(-)
drivers/bluetooth/hci_ldisc.c +14 -6
@@ -102,7 +102,8 @@ static inline struct sk_buff *hci_uart_dif (!skb) {percpu_down_read (&hu->proto_lock); -if (test_bit (HCI_UART_PROTO_READY , &hu->flags)) +if (test_bit (HCI_UART_PROTO_READY , &hu->flags) || +test_bit (HCI_UART_PROTO_INIT , &hu->flags)) skb = hu->proto->dequeue (hu);percpu_up_read (&hu->proto_lock);
@@ -124,7 +125,8 @@ int hci_uart_tx_wakeup(struct hci_uart *if (!percpu_down_read_trylock (&hu->proto_lock))return 0 ; -if (!test_bit (HCI_UART_PROTO_READY , &hu->flags)) +if (!test_bit (HCI_UART_PROTO_READY , &hu->flags) && + !test_bit (HCI_UART_PROTO_INIT , &hu->flags)) goto no_schedule;set_bit (HCI_UART_TX_WAKEUP , &hu->tx_state);
@@ -278,7 +280,8 @@ static int hci_uart_send_frame(struct hcpercpu_down_read (&hu->proto_lock); -if (!test_bit (HCI_UART_PROTO_READY , &hu->flags)) { +if (!test_bit (HCI_UART_PROTO_READY , &hu->flags) && + !test_bit (HCI_UART_PROTO_INIT , &hu->flags)) {percpu_up_read (&hu->proto_lock);return -EUNATCH ; }
@@ -579,7 +582,8 @@ static void hci_uart_tty_wakeup(struct tif (tty != hu->tty)return ; -if (test_bit (HCI_UART_PROTO_READY , &hu->flags)) +if (test_bit (HCI_UART_PROTO_READY , &hu->flags) || +test_bit (HCI_UART_PROTO_INIT , &hu->flags))hci_uart_tx_wakeup (hu); }
@@ -605,7 +609,8 @@ static void hci_uart_tty_receive(structpercpu_down_read (&hu->proto_lock); -if (!test_bit (HCI_UART_PROTO_READY , &hu->flags)) { +if (!test_bit (HCI_UART_PROTO_READY , &hu->flags) && + !test_bit (HCI_UART_PROTO_INIT , &hu->flags)) {percpu_up_read (&hu->proto_lock);return ; }
@@ -706,13 +711,16 @@ static int hci_uart_set_proto(struct hci hu->proto = p; -set_bit (HCI_UART_PROTO_READY , &hu->flags); +set_bit (HCI_UART_PROTO_INIT , &hu->flags); err =hci_uart_register_dev (hu);if (err) {return err; } +set_bit (HCI_UART_PROTO_READY , &hu->flags); +clear_bit (HCI_UART_PROTO_INIT , &hu->flags); +return 0 ; }
drivers/bluetooth/hci_uart.h +1 -0
@@ -90,6 +90,7 @@ struct hci_uart {#define HCI_UART_REGISTERED 1#define HCI_UART_PROTO_READY 2#define HCI_UART_NO_SUSPEND_NOTIFIER 3 +#define HCI_UART_PROTO_INIT 4/* TX states */ #define HCI_UART_SENDING 1
Greg Kroah-Hartman
maintainerPATCH 120/373 scsi: hisi_sas: Start delivery hisi_sas_task_exec() directly
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: John Garry <[email protected]>
[ Upstream commit 0e4620856b89335426a17904933a92346ee4599d ]
Currently we start delivery of commands to the DQ after returning from hisi_sas_task_exec() with success.
Let's just start delivery directly in that function without having to check if some local variable is set.
Stable-dep-of: 8aa580cd9284 ("scsi: hisi_sas: Enable force phy when SATA disk directly connected")
--- drivers/scsi/hisi_sas/hisi_sas_main.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)
drivers/scsi/hisi_sas/hisi_sas_main.c +6 -11
@@ -405,8 +405,7 @@ static int hisi_sas_dif_dma_map(struct hisi_hba *hisi_hba,static int hisi_sas_task_prep (struct sas_task *task,struct hisi_sas_dq **dq_pointer, -bool is_tmf,struct hisi_sas_tmf_task *tmf, -int *pass) +bool is_tmf,struct hisi_sas_tmf_task *tmf) {struct domain_device *device = task->dev;struct hisi_hba *hisi_hba =dev_to_hisi_hba (device);
@@ -544,9 +543,12 @@ static int hisi_sas_task_prep(struct sas_task *task, task->task_state_flags |=SAS_TASK_AT_INITIATOR ;spin_unlock_irqrestore (&task->task_state_lock, flags); - ++(*pass);WRITE_ONCE (slot->ready,1 ); +spin_lock (&dq->lock); + hisi_hba->hw->start_delivery (dq); +spin_unlock (&dq->lock); +return 0 ; err_out_dif_dma_unmap:
@@ -564,7 +566,6 @@ static int hisi_sas_task_exec(struct sas_task *task, gfp_t gfp_flags, bool is_tmf, struct hisi_sas_tmf_task *tmf) { u32 rc; -u32 pass =0 ;struct hisi_hba *hisi_hba;struct device *dev;struct domain_device *device = task->dev;
@@ -597,16 +598,10 @@ static int hisi_sas_task_exec(struct sas_task *task, gfp_t gfp_flags, }/* protect task_prep and start_delivery sequence */ - rc =hisi_sas_task_prep (task, &dq, is_tmf, tmf, &pass); + rc =hisi_sas_task_prep (task, &dq, is_tmf, tmf);if (rc)dev_err (dev,"task exec: failed[%d]!\n" , rc); -if (likely (pass)) { -spin_lock (&dq->lock); - hisi_hba->hw->start_delivery (dq); -spin_unlock (&dq->lock); - } -return rc; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 121/373 scsi: hisi_sas: Pass abort structure for internal abort
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: John Garry <[email protected]>
[ Upstream commit 08c61b5d902b70180b517e9f2616ad70b7a98dcf ]
To help factor out code in future, it's useful to know if we're executing an internal abort, so pass a pointer to the structure. The idea is that a NULL pointer means not an internal abort.
Stable-dep-of: 8aa580cd9284 ("scsi: hisi_sas: Enable force phy when SATA disk directly connected")
--- drivers/scsi/hisi_sas/hisi_sas.h | 5 +++++ drivers/scsi/hisi_sas/hisi_sas_main.c | 21 ++++++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-)
drivers/scsi/hisi_sas/hisi_sas.h +5 -0
@@ -134,6 +134,11 @@ struct hisi_sas_rst {bool done; }; +struct hisi_sas_internal_abort { +unsigned int flag; +unsigned int tag; +}; +#define HISI_SAS_RST_WORK_INIT (r, c) \ { .hisi_hba = hisi_hba, \ .completion = &c, \
drivers/scsi/hisi_sas/hisi_sas_main.c +12 -9
@@ -273,11 +273,11 @@ static void hisi_sas_task_prep_ata(struct hisi_hba *hisi_hba, }static void hisi_sas_task_prep_abort (struct hisi_hba *hisi_hba, -struct hisi_sas_slot *slot, -int device_id,int abort_flag,int tag_to_abort) +struct hisi_sas_internal_abort *abort, +struct hisi_sas_slot *slot,int device_id) { hisi_hba->hw->prep_abort (hisi_hba, slot, - device_id, abort_flag, tag_to_abort); + device_id, abort->flag, abort->tag); } static void hisi_sas_dma_unmap(struct hisi_hba *hisi_hba,
@@ -1968,8 +1968,9 @@ static int hisi_sas_query_task(struct sas_task *task)static int hisi_sas_internal_abort_task_exec (struct hisi_hba *hisi_hba,int device_id, -struct sas_task *task,int abort_flag, -int task_tag,struct hisi_sas_dq *dq) +struct hisi_sas_internal_abort *abort, +struct sas_task *task, +struct hisi_sas_dq *dq) {struct domain_device *device = task->dev;struct hisi_sas_device *sas_dev = device->lldd_dev;
@@ -2026,8 +2027,7 @@ hisi_sas_internal_abort_task_exec(struct hisi_hba *hisi_hba, int device_id,memset (hisi_sas_status_buf_addr_mem (slot),0 ,sizeof (struct hisi_sas_err_record )); -hisi_sas_task_prep_abort (hisi_hba, slot, device_id, - abort_flag, task_tag); +hisi_sas_task_prep_abort (hisi_hba, abort, slot, device_id);spin_lock_irqsave (&task->task_state_lock, flags); task->task_state_flags |=SAS_TASK_AT_INITIATOR ;
@@ -2065,9 +2065,12 @@ _hisi_sas_internal_task_abort(struct hisi_hba *hisi_hba, {struct sas_task *task;struct hisi_sas_device *sas_dev = device->lldd_dev; +struct hisi_sas_internal_abort abort = { + .flag = abort_flag, + .tag = tag, + };struct device *dev = hisi_hba->dev;int res; -/* * The interface is not realized means this HW don't support internal * abort, or don't need to do internal abort. Then here, we return
@@ -2092,7 +2095,7 @@ _hisi_sas_internal_task_abort(struct hisi_hba *hisi_hba,add_timer (&task->slow_task->timer); res =hisi_sas_internal_abort_task_exec (hisi_hba, sas_dev->device_id, - task, abort_flag, tag, dq); + &abort, task, dq);if (res) {del_timer (&task->slow_task->timer); dev_err(dev, "internal task abort: executing internal task failed: %d\n",
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 122/373 scsi: hisi_sas: Factor out task prep and delivery code
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: John Garry <[email protected]>
[ Upstream commit dc313f6b125b095d3d2683d94d5f69c8dc9bdc36 ]
The task prep code is the same between the normal path (in hisi_sas_task_prep()) and the internal abort path, so factor is out into a common function.
Stable-dep-of: 8aa580cd9284 ("scsi: hisi_sas: Enable force phy when SATA disk directly connected")
--- drivers/scsi/hisi_sas/hisi_sas_main.c | 281 ++++++++++++-------------- 1 file changed, 124 insertions(+), 157 deletions(-)
drivers/scsi/hisi_sas/hisi_sas_main.c +124 -157
@@ -403,94 +403,20 @@ static int hisi_sas_dif_dma_map(struct hisi_hba *hisi_hba,return rc; } -static int hisi_sas_task_prep (struct sas_task *task, -struct hisi_sas_dq **dq_pointer, -bool is_tmf,struct hisi_sas_tmf_task *tmf) +static +void hisi_sas_task_deliver (struct hisi_hba *hisi_hba, +struct hisi_sas_slot *slot, +struct hisi_sas_dq *dq, +struct hisi_sas_device *sas_dev, +struct hisi_sas_internal_abort *abort, +struct hisi_sas_tmf_task *tmf) { -struct domain_device *device = task->dev; -struct hisi_hba *hisi_hba =dev_to_hisi_hba (device); -struct hisi_sas_device *sas_dev = device->lldd_dev; -struct hisi_sas_port *port; -struct hisi_sas_slot *slot; -struct hisi_sas_cmd_hdr *cmd_hdr_base; -struct asd_sas_port *sas_port = device->port; -struct device *dev = hisi_hba->dev; -int dlvry_queue_slot, dlvry_queue, rc, slot_idx; -int n_elem =0 , n_elem_dif =0 , n_elem_req =0 ; -struct scsi_cmnd *scmd =NULL ; -struct hisi_sas_dq *dq; +struct hisi_sas_cmd_hdr *cmd_hdr_base; +int dlvry_queue_slot, dlvry_queue; +struct sas_task *task = slot->task;unsigned long flags;int wr_q_index; -if (DEV_IS_GONE (sas_dev)) { -if (sas_dev) -dev_info (dev,"task prep: device %d not ready\n" , - sas_dev->device_id); -else -dev_info (dev,"task prep: device %016llx not ready\n" , -SAS_ADDR (device->sas_addr)); - -return -ECOMM ; - } - -if (task->uldd_task) { -struct ata_queued_cmd *qc; - -if (dev_is_sata (device)) { - qc = task->uldd_task; - scmd = qc->scsicmd; - }else { - scmd = task->uldd_task; - } - } - -if (scmd) { -unsigned int dq_index; -u32 blk_tag; - - blk_tag =blk_mq_unique_tag (scsi_cmd_to_rq (scmd)); - dq_index =blk_mq_unique_tag_to_hwq (blk_tag); - *dq_pointer = dq = &hisi_hba->dq[dq_index]; - }else { -struct Scsi_Host *shost = hisi_hba->shost; -struct blk_mq_queue_map *qmap = &shost->tag_set.map[HCTX_TYPE_DEFAULT ]; -int queue = qmap->mq_map[raw_smp_processor_id ()]; - - *dq_pointer = dq = &hisi_hba->dq[queue]; - } - - port =to_hisi_sas_port (sas_port); -if (port && !port->port_attached) { -dev_info (dev,"task prep: %s port%d not attach device\n" , - (dev_is_sata (device)) ? -"SATA/STP" :"SAS" , - device->port->id); - -return -ECOMM ; - } - - rc =hisi_sas_dma_map (hisi_hba, task, &n_elem, - &n_elem_req); -if (rc <0 ) - goto prep_out; - -if (!sas_protocol_ata (task->task_proto)) { - rc =hisi_sas_dif_dma_map (hisi_hba, &n_elem_dif, task); -if (rc <0 ) - goto err_out_dma_unmap; - } - -if (hisi_hba->hw->slot_index_alloc) - rc = hisi_hba->hw->slot_index_alloc (hisi_hba, device); -else - rc =hisi_sas_slot_index_alloc (hisi_hba, scmd); - -if (rc <0 ) - goto err_out_dif_dma_unmap; - - slot_idx = rc; - slot = &hisi_hba->slot_info[slot_idx]; -spin_lock (&dq->lock); wr_q_index = dq->wr_point; dq->wr_point = (dq->wr_point +1 ) %HISI_SAS_QUEUE_SLOTS ;
@@ -504,16 +430,13 @@ static int hisi_sas_task_prep(struct sas_task *task, dlvry_queue_slot = wr_q_index; slot->device_id = sas_dev->device_id; - slot->n_elem = n_elem; - slot->n_elem_dif = n_elem_dif; slot->dlvry_queue = dlvry_queue; slot->dlvry_queue_slot = dlvry_queue_slot; cmd_hdr_base = hisi_hba->cmd_hdr[dlvry_queue]; slot->cmd_hdr = &cmd_hdr_base[dlvry_queue_slot]; - slot->task = task; - slot->port = port; + slot->tmf = tmf; - slot->is_internal = is_tmf; + slot->is_internal = tmf; task->lldd_task = slot;memset (slot->cmd_hdr,0 ,sizeof (struct hisi_sas_cmd_hdr ));
@@ -533,8 +456,14 @@ static int hisi_sas_task_prep(struct sas_task *task,case SAS_PROTOCOL_SATA |SAS_PROTOCOL_STP :hisi_sas_task_prep_ata (hisi_hba, slot);break ; +case SAS_PROTOCOL_NONE : +if (abort) { +hisi_sas_task_prep_abort (hisi_hba, abort, slot, sas_dev->device_id); +break ; + } + fallthrough;default : -dev_err (dev,"task prep: unknown/unsupported proto (0x%x)\n" , +dev_err (hisi_hba->dev,"task prep: unknown/unsupported proto (0x%x)\n" , task->task_proto);break ; }
@@ -548,29 +477,22 @@ static int hisi_sas_task_prep(struct sas_task *task,spin_lock (&dq->lock); hisi_hba->hw->start_delivery (dq);spin_unlock (&dq->lock); - -return 0 ; - -err_out_dif_dma_unmap: -if (!sas_protocol_ata (task->task_proto)) -hisi_sas_dif_dma_unmap (hisi_hba, task, n_elem_dif); -err_out_dma_unmap: -hisi_sas_dma_unmap (hisi_hba, task, n_elem, - n_elem_req); -prep_out: -dev_err (dev,"task prep: failed[%d]!\n" , rc); -return rc; }static int hisi_sas_task_exec (struct sas_task *task,gfp_t gfp_flags, -bool is_tmf,struct hisi_sas_tmf_task *tmf) +struct hisi_sas_tmf_task *tmf) { -u32 rc; -struct hisi_hba *hisi_hba; -struct device *dev; +int n_elem =0 , n_elem_dif =0 , n_elem_req =0 ;struct domain_device *device = task->dev;struct asd_sas_port *sas_port = device->port; +struct hisi_sas_device *sas_dev = device->lldd_dev; +struct scsi_cmnd *scmd =NULL ;struct hisi_sas_dq *dq =NULL ; +struct hisi_sas_port *port; +struct hisi_hba *hisi_hba; +struct hisi_sas_slot *slot; +struct device *dev; +int rc;if (!sas_port) {struct task_status_struct *ts = &task->task_status;
@@ -597,11 +519,94 @@ static int hisi_sas_task_exec(struct sas_task *task, gfp_t gfp_flags,up (&hisi_hba->sem); } +if (DEV_IS_GONE (sas_dev)) { +if (sas_dev) +dev_info (dev,"task prep: device %d not ready\n" , + sas_dev->device_id); +else +dev_info (dev,"task prep: device %016llx not ready\n" , +SAS_ADDR (device->sas_addr)); + +return -ECOMM ; + } + +if (task->uldd_task) { +struct ata_queued_cmd *qc; + +if (dev_is_sata (device)) { + qc = task->uldd_task; + scmd = qc->scsicmd; + }else { + scmd = task->uldd_task; + } + } + +if (scmd) { +unsigned int dq_index; +u32 blk_tag; + + blk_tag =blk_mq_unique_tag (scsi_cmd_to_rq (scmd)); + dq_index =blk_mq_unique_tag_to_hwq (blk_tag); + dq = &hisi_hba->dq[dq_index]; + }else { +struct Scsi_Host *shost = hisi_hba->shost; +struct blk_mq_queue_map *qmap = &shost->tag_set.map[HCTX_TYPE_DEFAULT ]; +int queue = qmap->mq_map[raw_smp_processor_id ()]; + + dq = &hisi_hba->dq[queue]; + } + + port =to_hisi_sas_port (sas_port); +if (port && !port->port_attached) { +dev_info (dev,"task prep: %s port%d not attach device\n" , + (dev_is_sata (device)) ? +"SATA/STP" :"SAS" , + device->port->id); + +return -ECOMM ; + } + + rc =hisi_sas_dma_map (hisi_hba, task, &n_elem, + &n_elem_req); +if (rc <0 ) + goto prep_out; + +if (!sas_protocol_ata (task->task_proto)) { + rc =hisi_sas_dif_dma_map (hisi_hba, &n_elem_dif, task); +if (rc <0 ) + goto err_out_dma_unmap; + } + +if (hisi_hba->hw->slot_index_alloc) + rc = hisi_hba->hw->slot_index_alloc (hisi_hba, device); +else + rc =hisi_sas_slot_index_alloc (hisi_hba, scmd); + +if (rc <0 ) + goto err_out_dif_dma_unmap; + + slot = &hisi_hba->slot_info[rc]; + slot->n_elem = n_elem; + slot->n_elem_dif = n_elem_dif; + slot->task = task; + slot->port = port; + + slot->tmf = tmf; + slot->is_internal = tmf; +/* protect task_prep and start_delivery sequence */ - rc =hisi_sas_task_prep (task, &dq, is_tmf, tmf); -if (rc) -dev_err (dev,"task exec: failed[%d]!\n" , rc); +hisi_sas_task_deliver (hisi_hba, slot, dq, sas_dev,NULL , tmf); +return 0 ; + +err_out_dif_dma_unmap: +if (!sas_protocol_ata (task->task_proto)) +hisi_sas_dif_dma_unmap (hisi_hba, task, n_elem_dif); +err_out_dma_unmap: +hisi_sas_dma_unmap (hisi_hba, task, n_elem, + n_elem_req); +prep_out: +dev_err (dev,"task exec: failed[%d]!\n" , rc);return rc; }
@@ -1089,7 +1094,7 @@ static void hisi_sas_dev_gone(struct domain_device *device)static int hisi_sas_queue_command (struct sas_task *task,gfp_t gfp_flags) { -return hisi_sas_task_exec (task, gfp_flags,0 ,NULL ); +return hisi_sas_task_exec (task, gfp_flags,NULL ); } static int hisi_sas_phy_set_linkrate(struct hisi_hba *hisi_hba, int phy_no,
@@ -1221,8 +1226,7 @@ static int hisi_sas_exec_internal_tmf_task(struct domain_device *device, task->slow_task->timer.expires = jiffies +TASK_TIMEOUT ;add_timer (&task->slow_task->timer); - res =hisi_sas_task_exec (task,GFP_KERNEL ,1 , tmf); - + res =hisi_sas_task_exec (task,GFP_KERNEL , tmf);if (res) {del_timer (&task->slow_task->timer); dev_err(dev, "abort tmf: executing internal task failed: %d\n",
@@ -1976,12 +1980,9 @@ hisi_sas_internal_abort_task_exec(struct hisi_hba *hisi_hba, int device_id,struct hisi_sas_device *sas_dev = device->lldd_dev;struct device *dev = hisi_hba->dev;struct hisi_sas_port *port; -struct hisi_sas_slot *slot;struct asd_sas_port *sas_port = device->port; -struct hisi_sas_cmd_hdr *cmd_hdr_base; -int dlvry_queue_slot, dlvry_queue, n_elem =0 , rc, slot_idx; -unsigned long flags; -int wr_q_index; +struct hisi_sas_slot *slot; +int slot_idx;if (unlikely (test_bit (HISI_SAS_REJECT_CMD_BIT , &hisi_hba->flags)))return -EINVAL ;
@@ -1992,58 +1993,24 @@ hisi_sas_internal_abort_task_exec(struct hisi_hba *hisi_hba, int device_id, port =to_hisi_sas_port (sas_port);/* simply get a slot and send abort command */ - rc =hisi_sas_slot_index_alloc (hisi_hba,NULL ); -if (rc <0 ) + slot_idx =hisi_sas_slot_index_alloc (hisi_hba,NULL ); +if (slot_idx <0 ) goto err_out; - slot_idx = rc; slot = &hisi_hba->slot_info[slot_idx]; - -spin_lock (&dq->lock); - wr_q_index = dq->wr_point; - dq->wr_point = (dq->wr_point +1 ) %HISI_SAS_QUEUE_SLOTS ; -list_add_tail (&slot->delivery, &dq->list); -spin_unlock (&dq->lock); -spin_lock (&sas_dev->lock); -list_add_tail (&slot->entry, &sas_dev->list); -spin_unlock (&sas_dev->lock); - - dlvry_queue = dq->id; - dlvry_queue_slot = wr_q_index; - - slot->device_id = sas_dev->device_id; - slot->n_elem = n_elem; - slot->dlvry_queue = dlvry_queue; - slot->dlvry_queue_slot = dlvry_queue_slot; - cmd_hdr_base = hisi_hba->cmd_hdr[dlvry_queue]; - slot->cmd_hdr = &cmd_hdr_base[dlvry_queue_slot]; + slot->n_elem =0 ; slot->task = task; slot->port = port; slot->is_internal = true; - task->lldd_task = slot; -memset (slot->cmd_hdr,0 ,sizeof (struct hisi_sas_cmd_hdr )); -memset (hisi_sas_cmd_hdr_addr_mem (slot),0 ,HISI_SAS_COMMAND_TABLE_SZ ); -memset (hisi_sas_status_buf_addr_mem (slot),0 , -sizeof (struct hisi_sas_err_record )); - -hisi_sas_task_prep_abort (hisi_hba, abort, slot, device_id); - -spin_lock_irqsave (&task->task_state_lock, flags); - task->task_state_flags |=SAS_TASK_AT_INITIATOR ; -spin_unlock_irqrestore (&task->task_state_lock, flags); -WRITE_ONCE (slot->ready,1 ); -/* send abort command to the chip */ -spin_lock (&dq->lock); - hisi_hba->hw->start_delivery (dq); -spin_unlock (&dq->lock); +hisi_sas_task_deliver (hisi_hba, slot, dq, sas_dev, abort,NULL );return 0 ; err_out: -dev_err (dev,"internal abort task prep: failed[%d]!\n" , rc); +dev_err (dev,"internal abort task prep: failed[%d]!\n" , slot_idx); -return rc; +return slot_idx; }/**
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 123/373 scsi: hisi_sas: Fix setting of hisi_sas_slot.is_internal
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: John Garry <[email protected]>
[ Upstream commit c763ec4c10f78678d6d4415646237f07109a5a5f ]
The hisi_sas_slot.is_internal member is not set properly for ATA commands which the driver sends directly. A TMF struct pointer is normally used as a test to set this, but it is NULL for those commands. It's not ideal, but pass an empty TMF struct to set that member properly.
Stable-dep-of: 8aa580cd9284 ("scsi: hisi_sas: Enable force phy when SATA disk directly connected")
--- drivers/scsi/hisi_sas/hisi_sas_main.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/scsi/hisi_sas/hisi_sas_main.c +6 -8
@@ -408,8 +408,7 @@ void hisi_sas_task_deliver(struct hisi_hba *hisi_hba,struct hisi_sas_slot *slot, struct hisi_sas_dq *dq, struct hisi_sas_device *sas_dev, - struct hisi_sas_internal_abort *abort, - struct hisi_sas_tmf_task *tmf) + struct hisi_sas_internal_abort *abort) { struct hisi_sas_cmd_hdr *cmd_hdr_base;int dlvry_queue_slot, dlvry_queue;
@@ -435,8 +434,6 @@ void hisi_sas_task_deliver(struct hisi_hba *hisi_hba, cmd_hdr_base = hisi_hba->cmd_hdr[dlvry_queue]; slot->cmd_hdr = &cmd_hdr_base[dlvry_queue_slot]; - slot->tmf = tmf; - slot->is_internal = tmf; task->lldd_task = slot;memset (slot->cmd_hdr,0 ,sizeof (struct hisi_sas_cmd_hdr ));
@@ -595,7 +592,7 @@ static int hisi_sas_task_exec(struct sas_task *task, gfp_t gfp_flags, slot->is_internal = tmf;/* protect task_prep and start_delivery sequence */ -hisi_sas_task_deliver (hisi_hba, slot, dq, sas_dev,NULL , tmf); +hisi_sas_task_deliver (hisi_hba, slot, dq, sas_dev,NULL );return 0 ;
@@ -1333,12 +1330,13 @@ static int hisi_sas_softreset_ata_disk(struct domain_device *device)struct hisi_hba *hisi_hba =dev_to_hisi_hba (device);struct device *dev = hisi_hba->dev;int s =sizeof (struct host_to_dev_fis ); +struct hisi_sas_tmf_task tmf = {};ata_for_each_link (link, ap,EDGE ) {int pmp =sata_srst_pmp (link);hisi_sas_fill_ata_reset_cmd (link->device,1 , pmp, fis); - rc =hisi_sas_exec_internal_tmf_task (device, fis, s,NULL ); + rc =hisi_sas_exec_internal_tmf_task (device, fis, s, &tmf);if (rc !=TMF_RESP_FUNC_COMPLETE )break ; }
@@ -1349,7 +1347,7 @@ static int hisi_sas_softreset_ata_disk(struct domain_device *device)hisi_sas_fill_ata_reset_cmd (link->device,0 , pmp, fis); rc =hisi_sas_exec_internal_tmf_task (device, fis, - s,NULL ); + s, &tmf);if (rc !=TMF_RESP_FUNC_COMPLETE )dev_err (dev,"ata disk %016llx de-reset failed\n" ,SAS_ADDR (device->sas_addr));
@@ -2003,7 +2001,7 @@ hisi_sas_internal_abort_task_exec(struct hisi_hba *hisi_hba, int device_id, slot->port = port; slot->is_internal = true; -hisi_sas_task_deliver (hisi_hba, slot, dq, sas_dev, abort,NULL ); +hisi_sas_task_deliver (hisi_hba, slot, dq, sas_dev, abort);return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 124/373 scsi: libsas: Delete lldd_clear_aca callback
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: John Garry <[email protected]>
[ Upstream commit 25882c82f850e3e972a973e0af310b3e58de38fd ]
This callback is never called, so remove support.
Stable-dep-of: 8aa580cd9284 ("scsi: hisi_sas: Enable force phy when SATA disk directly connected")
--- Documentation/scsi/libsas.rst | 2 -- drivers/scsi/aic94xx/aic94xx.h | 1 - drivers/scsi/aic94xx/aic94xx_init.c | 1 - drivers/scsi/aic94xx/aic94xx_tmf.c | 9 --------- drivers/scsi/hisi_sas/hisi_sas_main.c | 12 ------------ drivers/scsi/isci/init.c | 1 - drivers/scsi/isci/task.c | 18 ------------------ drivers/scsi/isci/task.h | 4 ---- drivers/scsi/mvsas/mv_init.c | 1 - drivers/scsi/mvsas/mv_sas.c | 11 ----------- drivers/scsi/mvsas/mv_sas.h | 1 - drivers/scsi/pm8001/pm8001_init.c | 1 - drivers/scsi/pm8001/pm8001_sas.c | 8 -------- drivers/scsi/pm8001/pm8001_sas.h | 1 - include/scsi/libsas.h | 1 - 15 files changed, 72 deletions(-)
Documentation/scsi/libsas.rst +0 -2
@@ -207,7 +207,6 @@ Management Functions (TMFs) described in SAM:: /* Task Management Functions. Must be called from process context. */ int (*lldd_abort_task)(struct sas_task *); int (*lldd_abort_task_set)(struct domain_device *, u8 *lun); - int (*lldd_clear_aca)(struct domain_device *, u8 *lun); int (*lldd_clear_task_set)(struct domain_device *, u8 *lun); int (*lldd_I_T_nexus_reset)(struct domain_device *); int (*lldd_lu_reset)(struct domain_device *, u8 *lun);
@@ -262,7 +261,6 @@ can look like this (called last thing from probe()) my_ha->sas_ha.lldd_abort_task = my_abort_task; my_ha->sas_ha.lldd_abort_task_set = my_abort_task_set; - my_ha->sas_ha.lldd_clear_aca = my_clear_aca; my_ha->sas_ha.lldd_clear_task_set = my_clear_task_set; my_ha->sas_ha.lldd_I_T_nexus_reset= NULL; (2) my_ha->sas_ha.lldd_lu_reset = my_lu_reset;
drivers/scsi/aic94xx/aic94xx.h +0 -1
@@ -60,7 +60,6 @@ void asd_set_dmamode(struct domain_device *dev);/* ---------- TMFs ---------- */ int asd_abort_task (struct sas_task *);int asd_abort_task_set (struct domain_device *,u8 *lun); -int asd_clear_aca (struct domain_device *,u8 *lun);int asd_clear_task_set (struct domain_device *,u8 *lun);int asd_lu_reset (struct domain_device *,u8 *lun);int asd_I_T_nexus_reset (struct domain_device *dev);
drivers/scsi/aic94xx/aic94xx_init.c +0 -1
@@ -960,7 +960,6 @@ static struct sas_domain_function_template aic94xx_transport_functions = { .lldd_abort_task = asd_abort_task, .lldd_abort_task_set = asd_abort_task_set, - .lldd_clear_aca = asd_clear_aca, .lldd_clear_task_set = asd_clear_task_set, .lldd_I_T_nexus_reset = asd_I_T_nexus_reset, .lldd_lu_reset = asd_lu_reset,
drivers/scsi/aic94xx/aic94xx_tmf.c +0 -9
@@ -644,15 +644,6 @@ int asd_abort_task_set(struct domain_device *dev, u8 *lun)return res; } -int asd_clear_aca (struct domain_device *dev,u8 *lun) -{ -int res =asd_initiate_ssp_tmf (dev, lun,TMF_CLEAR_ACA ,0 ); - -if (res ==TMF_RESP_FUNC_COMPLETE ) -asd_clear_nexus_I_T_L (dev, lun); -return res; -} -int asd_clear_task_set (struct domain_device *dev,u8 *lun) {int res =asd_initiate_ssp_tmf (dev, lun,TMF_CLEAR_TASK_SET ,0 );
drivers/scsi/hisi_sas/hisi_sas_main.c +0 -12
@@ -1753,17 +1753,6 @@ static int hisi_sas_abort_task_set(struct domain_device *device, u8 *lun)return rc; } -static int hisi_sas_clear_aca (struct domain_device *device,u8 *lun) -{ -struct hisi_sas_tmf_task tmf_task; -int rc; - - tmf_task.tmf =TMF_CLEAR_ACA ; - rc =hisi_sas_debug_issue_ssp_tmf (device, lun, &tmf_task); - -return rc; -} -#define I_T_NEXUS_RESET_PHYUP_TIMEOUT (2 * HZ)static int hisi_sas_debug_I_T_nexus_reset (struct domain_device *device)
@@ -2275,7 +2264,6 @@ static struct sas_domain_function_template hisi_sas_transport_ops = { .lldd_control_phy = hisi_sas_control_phy, .lldd_abort_task = hisi_sas_abort_task, .lldd_abort_task_set = hisi_sas_abort_task_set, - .lldd_clear_aca = hisi_sas_clear_aca, .lldd_I_T_nexus_reset = hisi_sas_I_T_nexus_reset, .lldd_lu_reset = hisi_sas_lu_reset, .lldd_query_task = hisi_sas_query_task,
drivers/scsi/isci/init.c +0 -1
@@ -191,7 +191,6 @@ static struct sas_domain_function_template isci_transport_ops = {/* Task Management Functions. Must be called from process context. */ .lldd_abort_task = isci_task_abort_task, .lldd_abort_task_set = isci_task_abort_task_set, - .lldd_clear_aca = isci_task_clear_aca, .lldd_clear_task_set = isci_task_clear_task_set, .lldd_I_T_nexus_reset = isci_task_I_T_nexus_reset, .lldd_lu_reset = isci_task_lu_reset,
drivers/scsi/isci/task.c +0 -18
@@ -625,24 +625,6 @@ int isci_task_abort_task_set( } -/** -* isci_task_clear_aca() - This function is one of the SAS Domain Template -* functions. This is one of the Task Management functoins called by libsas. -* @d_device: This parameter specifies the domain device associated with this -* request. -* @lun: This parameter specifies the lun associated with this request. -* -* status, zero indicates success. -*/ -int isci_task_clear_aca ( -struct domain_device *d_device, -u8 *lun) -{ -return TMF_RESP_FUNC_FAILED ; -} - - -/** * isci_task_clear_task_set() - This function is one of the SAS Domain Template * functions. This is one of the Task Management functoins called by libsas.
drivers/scsi/isci/task.h +0 -4
@@ -140,10 +140,6 @@ int isci_task_abort_task_set(struct domain_device *d_device, u8 *lun); -int isci_task_clear_aca ( -struct domain_device *d_device, -u8 *lun); -int isci_task_clear_task_set (struct domain_device *d_device,u8 *lun);
drivers/scsi/mvsas/mv_init.c +0 -1
@@ -64,7 +64,6 @@ static struct sas_domain_function_template mvs_transport_ops = { .lldd_abort_task = mvs_abort_task, .lldd_abort_task_set = mvs_abort_task_set, - .lldd_clear_aca = mvs_clear_aca, .lldd_clear_task_set = mvs_clear_task_set, .lldd_I_T_nexus_reset = mvs_I_T_nexus_reset, .lldd_lu_reset = mvs_lu_reset,
drivers/scsi/mvsas/mv_sas.c +0 -11
@@ -1548,17 +1548,6 @@ int mvs_abort_task_set(struct domain_device *dev, u8 *lun)return rc; } -int mvs_clear_aca (struct domain_device *dev,u8 *lun) -{ -int rc =TMF_RESP_FUNC_FAILED ; -struct mvs_tmf_task tmf_task; - - tmf_task.tmf =TMF_CLEAR_ACA ; - rc =mvs_debug_issue_ssp_tmf (dev, lun, &tmf_task); - -return rc; -} -int mvs_clear_task_set (struct domain_device *dev,u8 *lun) {int rc =TMF_RESP_FUNC_FAILED ;
drivers/scsi/mvsas/mv_sas.h +0 -1
@@ -441,7 +441,6 @@ int mvs_scan_finished(struct Scsi_Host *shost, unsigned long time);int mvs_queue_command (struct sas_task *task,gfp_t gfp_flags);int mvs_abort_task (struct sas_task *task);int mvs_abort_task_set (struct domain_device *dev,u8 *lun); -int mvs_clear_aca (struct domain_device *dev,u8 *lun);int mvs_clear_task_set (struct domain_device *dev,u8 * lun);void mvs_port_formed (struct asd_sas_phy *sas_phy);void mvs_port_deformed (struct asd_sas_phy *sas_phy);
drivers/scsi/pm8001/pm8001_init.c +0 -1
@@ -123,7 +123,6 @@ static struct sas_domain_function_template pm8001_transport_ops = { .lldd_abort_task = pm8001_abort_task, .lldd_abort_task_set = pm8001_abort_task_set, - .lldd_clear_aca = pm8001_clear_aca, .lldd_clear_task_set = pm8001_clear_task_set, .lldd_I_T_nexus_reset = pm8001_I_T_nexus_reset, .lldd_lu_reset = pm8001_lu_reset,
drivers/scsi/pm8001/pm8001_sas.c +0 -8
@@ -1341,14 +1341,6 @@ int pm8001_abort_task_set(struct domain_device *dev, u8 *lun)return pm8001_issue_ssp_tmf (dev, lun, &tmf_task); } -int pm8001_clear_aca (struct domain_device *dev,u8 *lun) -{ -struct pm8001_tmf_task tmf_task; - - tmf_task.tmf =TMF_CLEAR_ACA ; -return pm8001_issue_ssp_tmf (dev, lun, &tmf_task); -} -int pm8001_clear_task_set (struct domain_device *dev,u8 *lun) {struct pm8001_tmf_task tmf_task;
drivers/scsi/pm8001/pm8001_sas.h +0 -1
@@ -645,7 +645,6 @@ int pm8001_scan_finished(struct Scsi_Host *shost, unsigned long time);int pm8001_queue_command (struct sas_task *task,gfp_t gfp_flags);int pm8001_abort_task (struct sas_task *task);int pm8001_abort_task_set (struct domain_device *dev,u8 *lun); -int pm8001_clear_aca (struct domain_device *dev,u8 *lun);int pm8001_clear_task_set (struct domain_device *dev,u8 *lun);int pm8001_dev_found (struct domain_device *dev);void pm8001_dev_gone (struct domain_device *dev);
include/scsi/libsas.h +0 -1
@@ -636,7 +636,6 @@ struct sas_domain_function_template {/* Task Management Functions. Must be called from process context. */ int (*lldd_abort_task)(struct sas_task *);int (*lldd_abort_task_set)(struct domain_device *,u8 *lun); -int (*lldd_clear_aca)(struct domain_device *,u8 *lun);int (*lldd_clear_task_set)(struct domain_device *,u8 *lun);int (*lldd_I_T_nexus_reset)(struct domain_device *);int (*lldd_ata_check_ready)(struct domain_device *);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 125/373 scsi: libsas: Add struct sas_tmf_task
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: John Garry <[email protected]>
[ Upstream commit bbfe82cdbaf84e6622ceb6f3447c8c4bb7dde7ab ]
Some of the LLDDs which use libsas have their own definition of a struct to hold TMF info, so add a common struct for libsas.
Also add an interim force phy id field for hisi_sas driver, which will be removed once the STP "TMF" code is factored out.
Even though some LLDDs (pm8001) use a u32 for the tag, u16 will be adequate, as that named driver only uses tags in range [0, 1024).
Stable-dep-of: 8aa580cd9284 ("scsi: hisi_sas: Enable force phy when SATA disk directly connected")
--- drivers/scsi/hisi_sas/hisi_sas.h | 9 +-------- drivers/scsi/hisi_sas/hisi_sas_main.c | 22 +++++++++++----------- drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 2 +- drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 4 ++-- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 2 +- drivers/scsi/mvsas/mv_defs.h | 5 ----- drivers/scsi/mvsas/mv_sas.c | 20 ++++++++++---------- drivers/scsi/pm8001/pm8001_hwi.c | 4 ++-- drivers/scsi/pm8001/pm8001_sas.c | 18 +++++++++--------- drivers/scsi/pm8001/pm8001_sas.h | 10 +++------- include/scsi/libsas.h | 9 +++++++++ 11 files changed, 49 insertions(+), 56 deletions(-)
drivers/scsi/hisi_sas/hisi_sas.h +1 -8
@@ -234,13 +234,6 @@ struct hisi_sas_device {spinlock_t lock;/* For protecting slots */ }; -struct hisi_sas_tmf_task { -int force_phy; -int phy_id; -u8 tmf; -u16 tag_of_task_to_be_managed; -}; -struct hisi_sas_slot {struct list_head entry;struct list_head delivery;
@@ -259,7 +252,7 @@ struct hisi_sas_slot {dma_addr_t cmd_hdr_dma;struct timer_list internal_abort_timer;bool is_internal; -struct hisi_sas_tmf_task *tmf; +struct sas_tmf_task *tmf;/* Do not reorder/change members after here */ void *buf;dma_addr_t buf_dma;
drivers/scsi/hisi_sas/hisi_sas_main.c +11 -11
@@ -11,7 +11,7 @@ ((!dev) || (dev->dev_type == SAS_PHY_UNUSED))static int hisi_sas_debug_issue_ssp_tmf (struct domain_device *device, -u8 *lun,struct hisi_sas_tmf_task *tmf); +u8 *lun,struct sas_tmf_task *tmf); static int hisi_sas_internal_task_abort(struct hisi_hba *hisi_hba, struct domain_device *device,
@@ -477,7 +477,7 @@ void hisi_sas_task_deliver(struct hisi_hba *hisi_hba, }static int hisi_sas_task_exec (struct sas_task *task,gfp_t gfp_flags, -struct hisi_sas_tmf_task *tmf) +struct sas_tmf_task *tmf) {int n_elem =0 , n_elem_dif =0 , n_elem_req =0 ;struct domain_device *device = task->dev;
@@ -691,7 +691,7 @@ static int hisi_sas_init_device(struct domain_device *device) {int rc =TMF_RESP_FUNC_COMPLETE ;struct scsi_lun lun; -struct hisi_sas_tmf_task tmf_task; +struct sas_tmf_task tmf_task;int retry =HISI_SAS_DISK_RECOVER_CNT ;struct hisi_hba *hisi_hba =dev_to_hisi_hba (device);struct device *dev = hisi_hba->dev;
@@ -1195,7 +1195,7 @@ static void hisi_sas_tmf_timedout(struct timer_list *t)#define INTERNAL_ABORT_TIMEOUT (6 * HZ)static int hisi_sas_exec_internal_tmf_task (struct domain_device *device,void *parameter,u32 para_len, -struct hisi_sas_tmf_task *tmf) +struct sas_tmf_task *tmf) {struct hisi_sas_device *sas_dev = device->lldd_dev;struct hisi_hba *hisi_hba = sas_dev->hisi_hba;
@@ -1330,7 +1330,7 @@ static int hisi_sas_softreset_ata_disk(struct domain_device *device)struct hisi_hba *hisi_hba =dev_to_hisi_hba (device);struct device *dev = hisi_hba->dev;int s =sizeof (struct host_to_dev_fis ); -struct hisi_sas_tmf_task tmf = {}; +struct sas_tmf_task tmf = {};ata_for_each_link (link, ap,EDGE ) {int pmp =sata_srst_pmp (link);
@@ -1364,7 +1364,7 @@ static int hisi_sas_softreset_ata_disk(struct domain_device *device) }static int hisi_sas_debug_issue_ssp_tmf (struct domain_device *device, -u8 *lun,struct hisi_sas_tmf_task *tmf) +u8 *lun,struct sas_tmf_task *tmf) {struct sas_ssp_task ssp_task;
@@ -1469,7 +1469,7 @@ static void hisi_sas_send_ata_reset_each_phy(struct hisi_hba *hisi_hba,struct asd_sas_port *sas_port, struct domain_device *device) { - struct hisi_sas_tmf_task tmf_task = { .force_phy = 1 }; + struct sas_tmf_task tmf_task = { .force_phy = 1 };struct ata_port *ap = device->sata_dev.ap;struct device *dev = hisi_hba->dev;int s =sizeof (struct host_to_dev_fis );
@@ -1624,7 +1624,7 @@ static int hisi_sas_controller_reset(struct hisi_hba *hisi_hba)static int hisi_sas_abort_task (struct sas_task *task) {struct scsi_lun lun; -struct hisi_sas_tmf_task tmf_task; +struct sas_tmf_task tmf_task;struct domain_device *device = task->dev;struct hisi_sas_device *sas_dev = device->lldd_dev;struct hisi_hba *hisi_hba;
@@ -1733,7 +1733,7 @@ static int hisi_sas_abort_task_set(struct domain_device *device, u8 *lun) {struct hisi_hba *hisi_hba =dev_to_hisi_hba (device);struct device *dev = hisi_hba->dev; -struct hisi_sas_tmf_task tmf_task; +struct sas_tmf_task tmf_task;int rc; rc = hisi_sas_internal_task_abort(hisi_hba, device,
@@ -1868,7 +1868,7 @@ static int hisi_sas_lu_reset(struct domain_device *device, u8 *lun)hisi_sas_release_task (hisi_hba, device);sas_put_local_phy (phy); }else { -struct hisi_sas_tmf_task tmf_task = { .tmf =TMF_LU_RESET }; +struct sas_tmf_task tmf_task = { .tmf =TMF_LU_RESET }; rc =hisi_sas_debug_issue_ssp_tmf (device, lun, &tmf_task);if (rc ==TMF_RESP_FUNC_COMPLETE )
@@ -1926,7 +1926,7 @@ static int hisi_sas_clear_nexus_ha(struct sas_ha_struct *sas_ha)static int hisi_sas_query_task (struct sas_task *task) {struct scsi_lun lun; -struct hisi_sas_tmf_task tmf_task; +struct sas_tmf_task tmf_task;int rc =TMF_RESP_FUNC_FAILED ;if (task->lldd_task && task->task_proto &SAS_PROTOCOL_SSP ) {
drivers/scsi/hisi_sas/hisi_sas_v1_hw.c +1 -1
@@ -958,7 +958,7 @@ static void prep_ssp_v1_hw(struct hisi_hba *hisi_hba,struct hisi_sas_port *port = slot->port;struct sas_ssp_task *ssp_task = &task->ssp_task;struct scsi_cmnd *scsi_cmnd = ssp_task->cmd; -struct hisi_sas_tmf_task *tmf = slot->tmf; +struct sas_tmf_task *tmf = slot->tmf;int has_data =0 , priority = !!tmf;u8 *buf_cmd, fburst =0 ;u32 dw1, dw2;
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c +2 -2
@@ -1742,7 +1742,7 @@ static void prep_ssp_v2_hw(struct hisi_hba *hisi_hba,struct hisi_sas_port *port = slot->port;struct sas_ssp_task *ssp_task = &task->ssp_task;struct scsi_cmnd *scsi_cmnd = ssp_task->cmd; -struct hisi_sas_tmf_task *tmf = slot->tmf; +struct sas_tmf_task *tmf = slot->tmf;int has_data =0 , priority = !!tmf;u8 *buf_cmd;u32 dw1 =0 , dw2 =0 ;
@@ -2499,7 +2499,7 @@ static void prep_ata_v2_hw(struct hisi_hba *hisi_hba,struct hisi_sas_cmd_hdr *hdr = slot->cmd_hdr;struct asd_sas_port *sas_port = device->port;struct hisi_sas_port *port =to_hisi_sas_port (sas_port); -struct hisi_sas_tmf_task *tmf = slot->tmf; +struct sas_tmf_task *tmf = slot->tmf;u8 *buf_cmd;int has_data =0 , hdr_tag =0 ;u32 dw0, dw1 =0 , dw2 =0 ;
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +1 -1
@@ -1223,7 +1223,7 @@ static void prep_ssp_v3_hw(struct hisi_hba *hisi_hba,struct hisi_sas_port *port = slot->port;struct sas_ssp_task *ssp_task = &task->ssp_task;struct scsi_cmnd *scsi_cmnd = ssp_task->cmd; -struct hisi_sas_tmf_task *tmf = slot->tmf; +struct sas_tmf_task *tmf = slot->tmf;int has_data =0 , priority = !!tmf;unsigned char prot_op;u8 *buf_cmd;
drivers/scsi/mvsas/mv_defs.h +0 -5
@@ -486,9 +486,4 @@ enum datapres_field { SENSE_DATA = 2, }; -/* define task management IU */ -struct mvs_tmf_task { -u8 tmf; -u16 tag_of_task_to_be_managed; -};#endif
drivers/scsi/mvsas/mv_sas.c +10 -10
@@ -551,7 +551,7 @@ static int mvs_task_prep_ata(struct mvs_info *mvi,static int mvs_task_prep_ssp (struct mvs_info *mvi,struct mvs_task_exec_info *tei,int is_tmf, -struct mvs_tmf_task *tmf) +struct sas_tmf_task *tmf) {struct sas_task *task = tei->task;struct mvs_cmd_hdr *hdr = tei->hdr;
@@ -691,7 +691,7 @@ static int mvs_task_prep_ssp(struct mvs_info *mvi,#define DEV_IS_GONE (mvi_dev) ((!mvi_dev || (mvi_dev->dev_type == SAS_PHY_UNUSED)))static int mvs_task_prep (struct sas_task *task,struct mvs_info *mvi,int is_tmf, -struct mvs_tmf_task *tmf,int *pass) +struct sas_tmf_task *tmf,int *pass) {struct domain_device *dev = task->dev;struct mvs_device *mvi_dev = dev->lldd_dev;
@@ -837,7 +837,7 @@ static int mvs_task_prep(struct sas_task *task, struct mvs_info *mvi, int is_tmfstatic int mvs_task_exec (struct sas_task *task,gfp_t gfp_flags,struct completion *completion,int is_tmf, -struct mvs_tmf_task *tmf) +struct sas_tmf_task *tmf) {struct mvs_info *mvi =NULL ;u32 rc =0 ;
@@ -1275,7 +1275,7 @@ static void mvs_tmf_timedout(struct timer_list *t)#define MVS_TASK_TIMEOUT 20static int mvs_exec_internal_tmf_task (struct domain_device *dev, -void *parameter,u32 para_len,struct mvs_tmf_task *tmf) +void *parameter,u32 para_len,struct sas_tmf_task *tmf) {int res, retry;struct sas_task *task =NULL ;
@@ -1350,7 +1350,7 @@ static int mvs_exec_internal_tmf_task(struct domain_device *dev, }static int mvs_debug_issue_ssp_tmf (struct domain_device *dev, -u8 *lun,struct mvs_tmf_task *tmf) +u8 *lun,struct sas_tmf_task *tmf) {struct sas_ssp_task ssp_task;if (!(dev->tproto &SAS_PROTOCOL_SSP ))
@@ -1382,7 +1382,7 @@ int mvs_lu_reset(struct domain_device *dev, u8 *lun) {unsigned long flags;int rc =TMF_RESP_FUNC_FAILED ; -struct mvs_tmf_task tmf_task; +struct sas_tmf_task tmf_task;struct mvs_device * mvi_dev = dev->lldd_dev;struct mvs_info *mvi = mvi_dev->mvi_info;
@@ -1426,7 +1426,7 @@ int mvs_query_task(struct sas_task *task) {u32 tag;struct scsi_lun lun; -struct mvs_tmf_task tmf_task; +struct sas_tmf_task tmf_task;int rc =TMF_RESP_FUNC_FAILED ;if (task->lldd_task && task->task_proto &SAS_PROTOCOL_SSP ) {
@@ -1463,7 +1463,7 @@ int mvs_query_task(struct sas_task *task)int mvs_abort_task (struct sas_task *task) {struct scsi_lun lun; -struct mvs_tmf_task tmf_task; +struct sas_tmf_task tmf_task;struct domain_device *dev = task->dev;struct mvs_device *mvi_dev = (struct mvs_device *)dev->lldd_dev;struct mvs_info *mvi;
@@ -1540,7 +1540,7 @@ int mvs_abort_task(struct sas_task *task)int mvs_abort_task_set (struct domain_device *dev,u8 *lun) {int rc; -struct mvs_tmf_task tmf_task; +struct sas_tmf_task tmf_task; tmf_task.tmf =TMF_ABORT_TASK_SET ; rc =mvs_debug_issue_ssp_tmf (dev, lun, &tmf_task);
@@ -1551,7 +1551,7 @@ int mvs_abort_task_set(struct domain_device *dev, u8 *lun)int mvs_clear_task_set (struct domain_device *dev,u8 *lun) {int rc =TMF_RESP_FUNC_FAILED ; -struct mvs_tmf_task tmf_task; +struct sas_tmf_task tmf_task; tmf_task.tmf =TMF_CLEAR_TASK_SET ; rc =mvs_debug_issue_ssp_tmf (dev, lun, &tmf_task);
drivers/scsi/pm8001/pm8001_hwi.c +2 -2
@@ -4624,7 +4624,7 @@ int pm8001_chip_abort_task(struct pm8001_hba_info *pm8001_ha,* @tmf: task management function. */ int pm8001_chip_ssp_tm_req (struct pm8001_hba_info *pm8001_ha, -struct pm8001_ccb_info *ccb,struct pm8001_tmf_task *tmf) +struct pm8001_ccb_info *ccb,struct sas_tmf_task *tmf) {struct sas_task *task = ccb->task;struct domain_device *dev = task->dev;
@@ -4636,7 +4636,7 @@ int pm8001_chip_ssp_tm_req(struct pm8001_hba_info *pm8001_ha,memset (&sspTMCmd,0 ,sizeof (sspTMCmd)); sspTMCmd.device_id =cpu_to_le32 (pm8001_dev->device_id); - sspTMCmd.relate_tag =cpu_to_le32 (tmf->tag_of_task_to_be_managed); + sspTMCmd.relate_tag =cpu_to_le32 ((u32 )tmf->tag_of_task_to_be_managed); sspTMCmd.tmf =cpu_to_le32 (tmf->tmf);memcpy (sspTMCmd.lun, task->ssp_task.LUN,8 ); sspTMCmd.tag =cpu_to_le32 (ccb->ccb_tag);
drivers/scsi/pm8001/pm8001_sas.c +9 -9
@@ -335,7 +335,7 @@ static int pm8001_task_prep_ata(struct pm8001_hba_info *pm8001_ha,* @tmf: the task management IU */ static int pm8001_task_prep_ssp_tm (struct pm8001_hba_info *pm8001_ha, -struct pm8001_ccb_info *ccb,struct pm8001_tmf_task *tmf) +struct pm8001_ccb_info *ccb,struct sas_tmf_task *tmf) {return PM8001_CHIP_DISP ->ssp_tm_req (pm8001_ha, ccb, tmf); }
@@ -378,7 +378,7 @@ static int sas_find_local_port_id(struct domain_device *dev)* @tmf: the task management IU */ static int pm8001_task_exec (struct sas_task *task, -gfp_t gfp_flags,int is_tmf,struct pm8001_tmf_task *tmf) +gfp_t gfp_flags,int is_tmf,struct sas_tmf_task *tmf) {struct domain_device *dev = task->dev;struct pm8001_hba_info *pm8001_ha;
@@ -715,7 +715,7 @@ static void pm8001_tmf_timedout(struct timer_list *t)* this function, note it is also with the task execute interface. */ static int pm8001_exec_internal_tmf_task (struct domain_device *dev, -void *parameter,u32 para_len,struct pm8001_tmf_task *tmf) +void *parameter,u32 para_len,struct sas_tmf_task *tmf) {int res, retry;struct sas_task *task =NULL ;
@@ -906,7 +906,7 @@ void pm8001_dev_gone(struct domain_device *dev) }static int pm8001_issue_ssp_tmf (struct domain_device *dev, -u8 *lun,struct pm8001_tmf_task *tmf) +u8 *lun,struct sas_tmf_task *tmf) {struct sas_ssp_task ssp_task;if (!(dev->tproto &SAS_PROTOCOL_SSP ))
@@ -1108,7 +1108,7 @@ int pm8001_I_T_nexus_event_handler(struct domain_device *dev)int pm8001_lu_reset (struct domain_device *dev,u8 *lun) {int rc =TMF_RESP_FUNC_FAILED ; -struct pm8001_tmf_task tmf_task; +struct sas_tmf_task tmf_task;struct pm8001_device *pm8001_dev = dev->lldd_dev;struct pm8001_hba_info *pm8001_ha =pm8001_find_ha_by_dev (dev);DECLARE_COMPLETION_ONSTACK (completion_setstate);
@@ -1137,7 +1137,7 @@ int pm8001_query_task(struct sas_task *task) {u32 tag =0xdeadbeef ;struct scsi_lun lun; -struct pm8001_tmf_task tmf_task; +struct sas_tmf_task tmf_task;int rc =TMF_RESP_FUNC_FAILED ;if (unlikely (!task || !task->lldd_task || !task->dev))return rc;
@@ -1186,7 +1186,7 @@ int pm8001_abort_task(struct sas_task *task)struct pm8001_hba_info *pm8001_ha;struct scsi_lun lun;struct pm8001_device *pm8001_dev; -struct pm8001_tmf_task tmf_task; +struct sas_tmf_task tmf_task;int rc =TMF_RESP_FUNC_FAILED , ret;u32 phy_id;struct sas_task_slow slow_task;
@@ -1335,7 +1335,7 @@ int pm8001_abort_task(struct sas_task *task)int pm8001_abort_task_set (struct domain_device *dev,u8 *lun) { -struct pm8001_tmf_task tmf_task; +struct sas_tmf_task tmf_task; tmf_task.tmf =TMF_ABORT_TASK_SET ;return pm8001_issue_ssp_tmf (dev, lun, &tmf_task);
@@ -1343,7 +1343,7 @@ int pm8001_abort_task_set(struct domain_device *dev, u8 *lun)int pm8001_clear_task_set (struct domain_device *dev,u8 *lun) { -struct pm8001_tmf_task tmf_task; +struct sas_tmf_task tmf_task;struct pm8001_device *pm8001_dev = dev->lldd_dev;struct pm8001_hba_info *pm8001_ha =pm8001_find_ha_by_dev (dev);
drivers/scsi/pm8001/pm8001_sas.h +3 -7
@@ -99,11 +99,7 @@ extern const struct pm8001_dispatch pm8001_80xx_dispatch;struct pm8001_hba_info ;struct pm8001_ccb_info ;struct pm8001_device ; -/* define task management IU */ -struct pm8001_tmf_task { -u8 tmf; -u32 tag_of_task_to_be_managed; -}; +struct pm8001_ioctl_payload {u32 signature;u16 major_function;
@@ -203,7 +199,7 @@ struct pm8001_dispatch { struct pm8001_device *pm8001_dev, u8 flag, u32 task_tag, u32 cmd_tag);int (*ssp_tm_req)(struct pm8001_hba_info *pm8001_ha, -struct pm8001_ccb_info *ccb,struct pm8001_tmf_task *tmf); +struct pm8001_ccb_info *ccb,struct sas_tmf_task *tmf);int (*get_nvmd_req)(struct pm8001_hba_info *pm8001_ha,void *payload);int (*set_nvmd_req)(struct pm8001_hba_info *pm8001_ha,void *payload); int (*fw_flash_update_req)(struct pm8001_hba_info *pm8001_ha,
@@ -682,7 +678,7 @@ int pm8001_chip_set_nvmd_req(struct pm8001_hba_info *pm8001_ha, void *payload);int pm8001_chip_get_nvmd_req (struct pm8001_hba_info *pm8001_ha,void *payload);int pm8001_chip_ssp_tm_req (struct pm8001_hba_info *pm8001_ha,struct pm8001_ccb_info *ccb, -struct pm8001_tmf_task *tmf); +struct sas_tmf_task *tmf);int pm8001_chip_abort_task (struct pm8001_hba_info *pm8001_ha,struct pm8001_device *pm8001_dev,u8 flag,u32 task_tag,u32 cmd_tag);
include/scsi/libsas.h +9 -0
@@ -576,6 +576,15 @@ struct sas_ssp_task {struct scsi_cmnd *cmd; }; +struct sas_tmf_task { +u8 tmf; +u16 tag_of_task_to_be_managed; + +/* Temp */ +int force_phy; +int phy_id; +}; +struct sas_task {struct domain_device *dev;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 126/373 scsi: hisi_sas: Enable force phy when SATA disk directly connected
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xingui Yang <[email protected]>
[ Upstream commit 8aa580cd92843b60d4d6331f3b0a9e8409bb70eb ]
when a SATA disk is directly connected the SAS controller determines the disk to which I/Os are delivered based on the port ID in the DQ entry.
When many phys are disconnected and reconnect, the port ID of phys were changed and used by other link, resulting in I/O being sent to incorrect disk. Data inconsistency on the SATA disk may occur during I/O retries using the old port ID. So enable force phy, then force the command to be executed in a certain phy, and if the actual phy ID of the port does not match the phy configured in the command, the chip will stop delivering the I/O to disk.
--- drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 9 +++++++-- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 14 ++++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-)
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c +7 -2
@@ -2500,6 +2500,7 @@ static void prep_ata_v2_hw(struct hisi_hba *hisi_hba,struct asd_sas_port *sas_port = device->port;struct hisi_sas_port *port =to_hisi_sas_port (sas_port);struct sas_tmf_task *tmf = slot->tmf; +int phy_id;u8 *buf_cmd;int has_data =0 , hdr_tag =0 ;u32 dw0, dw1 =0 , dw2 =0 ;
@@ -2507,10 +2508,14 @@ static void prep_ata_v2_hw(struct hisi_hba *hisi_hba,/* create header */ /* dw0 */ dw0 = port->id <<CMD_HDR_PORT_OFF ; -if (parent_dev &&dev_is_expander (parent_dev->dev_type)) +if (parent_dev &&dev_is_expander (parent_dev->dev_type)) { dw0 |=3 <<CMD_HDR_CMD_OFF ; -else + }else { + phy_id = device->phy->identify.phy_identifier; + dw0 |= (1U << phy_id) <<CMD_HDR_PHY_ID_OFF ; + dw0 |=CMD_HDR_FORCE_PHY_MSK ; dw0 |=4 <<CMD_HDR_CMD_OFF ; + }if (tmf && tmf->force_phy) { dw0 |=CMD_HDR_FORCE_PHY_MSK ;
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +12 -2
@@ -356,6 +356,10 @@#define CMD_HDR_RESP_REPORT_MSK (0x1 << CMD_HDR_RESP_REPORT_OFF)#define CMD_HDR_TLR_CTRL_OFF 6#define CMD_HDR_TLR_CTRL_MSK (0x3 << CMD_HDR_TLR_CTRL_OFF) +#define CMD_HDR_PHY_ID_OFF 8 +#define CMD_HDR_PHY_ID_MSK (0x1ff << CMD_HDR_PHY_ID_OFF) +#define CMD_HDR_FORCE_PHY_OFF 17 +#define CMD_HDR_FORCE_PHY_MSK (0x1U << CMD_HDR_FORCE_PHY_OFF)#define CMD_HDR_PORT_OFF 18#define CMD_HDR_PORT_MSK (0xf << CMD_HDR_PORT_OFF)#define CMD_HDR_PRIORITY_OFF 27
@@ -1384,15 +1388,21 @@ static void prep_ata_v3_hw(struct hisi_hba *hisi_hba,struct hisi_sas_cmd_hdr *hdr = slot->cmd_hdr;struct asd_sas_port *sas_port = device->port;struct hisi_sas_port *port =to_hisi_sas_port (sas_port); +int phy_id;u8 *buf_cmd;int has_data =0 , hdr_tag =0 ;u32 dw1 =0 , dw2 =0 ; hdr->dw0 =cpu_to_le32 (port->id <<CMD_HDR_PORT_OFF ); -if (parent_dev &&dev_is_expander (parent_dev->dev_type)) +if (parent_dev &&dev_is_expander (parent_dev->dev_type)) { hdr->dw0 |=cpu_to_le32 (3 <<CMD_HDR_CMD_OFF ); -else + }else { + phy_id = device->phy->identify.phy_identifier; + hdr->dw0 |=cpu_to_le32 ((1U << phy_id) + <<CMD_HDR_PHY_ID_OFF ); + hdr->dw0 |=CMD_HDR_FORCE_PHY_MSK ; hdr->dw0 |=cpu_to_le32 (4U <<CMD_HDR_CMD_OFF ); + }switch (task->data_dir) {case DMA_TO_DEVICE :
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 127/373 wifi: at76c50x: fix use after free access in at76_disconnect
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 27c7e63b3cb1a20bb78ed4a36c561ea4579fd7da ]
The memory pointed to by priv is freed at the end of at76_delete_device function (using ieee80211_free_hw). But the code then accesses the udev field of the freed object to put the USB device. This may also lead to a memory leak of the usb device. Fix this by using udev from interface.
--- drivers/net/wireless/atmel/at76c50x-usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/atmel/at76c50x-usb.c +1 -1
@@ -2553,7 +2553,7 @@ static void at76_disconnect(struct usb_interface *interface)wiphy_info (priv->hw->wiphy,"disconnecting\n" );at76_delete_device (priv); -usb_put_dev (priv->udev); +usb_put_dev (interface_to_usbdev (interface));dev_info (&interface->dev,"disconnected\n" ); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 128/373 wifi: mac80211: Update skbs control block key in ieee80211_tx_dequeue()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Remi Pommarel <[email protected]>
[ Upstream commit a104042e2bf6528199adb6ca901efe7b60c2c27f ]
The ieee80211 skb control block key (set when skb was queued) could have been removed before ieee80211_tx_dequeue() call. ieee80211_tx_dequeue() already called ieee80211_tx_h_select_key() to get the current key, but the latter do not update the key in skb control block in case it is NULL. Because some drivers actually use this key in their TX callbacks (e.g. ath1{1,2}k_mac_op_tx()) this could lead to the use after free below:
BUG: KASAN: slab-use-after-free in ath11k_mac_op_tx+0x590/0x61c Read of size 4 at addr ffffff803083c248 by task kworker/u16:4/1440 CPU: 3 UID: 0 PID: 1440 Comm: kworker/u16:4 Not tainted 6.13.0-ge128f627f404 #2 Hardware name: HW (DT) Workqueue: bat_events batadv_send_outstanding_bcast_packet Call trace: show_stack+0x14/0x1c (C) dump_stack_lvl+0x58/0x74 print_report+0x164/0x4c0 kasan_report+0xac/0xe8 __asan_report_load4_noabort+0x1c/0x24 ath11k_mac_op_tx+0x590/0x61c ieee80211_handle_wake_tx_queue+0x12c/0x1c8 ieee80211_queue_skb+0xdcc/0x1b4c ieee80211_tx+0x1ec/0x2bc ieee80211_xmit+0x224/0x324 __ieee80211_subif_start_xmit+0x85c/0xcf8 ieee80211_subif_start_xmit+0xc0/0xec4 dev_hard_start_xmit+0xf4/0x28c __dev_queue_xmit+0x6ac/0x318c batadv_send_skb_packet+0x38c/0x4b0 batadv_send_outstanding_bcast_packet+0x110/0x328 process_one_work+0x578/0xc10 worker_thread+0x4bc/0xc7c kthread+0x2f8/0x380 ret_from_fork+0x10/0x20 Allocated by task 1906: kasan_save_stack+0x28/0x4c kasan_save_track+0x1c/0x40 kasan_save_alloc_info+0x3c/0x4c __kasan_kmalloc+0xac/0xb0 __kmalloc_noprof+0x1b4/0x380 ieee80211_key_alloc+0x3c/0xb64 ieee80211_add_key+0x1b4/0x71c nl80211_new_key+0x2b4/0x5d8 genl_family_rcv_msg_doit+0x198/0x240 <...> Freed by task 1494: kasan_save_stack+0x28/0x4c kasan_save_track+0x1c/0x40 kasan_save_free_info+0x48/0x94 __kasan_slab_free+0x48/0x60 kfree+0xc8/0x31c kfree_sensitive+0x70/0x80 ieee80211_key_free_common+0x10c/0x174 ieee80211_free_keys+0x188/0x46c ieee80211_stop_mesh+0x70/0x2cc ieee80211_leave_mesh+0x1c/0x60 cfg80211_leave_mesh+0xe0/0x280 cfg80211_leave+0x1e0/0x244 <...>
Reset SKB control block key before calling ieee80211_tx_h_select_key() to avoid that.
--- net/mac80211/tx.c | 1 + 1 file changed, 1 insertion(+)
net/mac80211/tx.c +1 -0
@@ -3704,6 +3704,7 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw,* The key can be removed while the packet was queued, so need to call * this here to get the current key. */ + info->control.hw_key =NULL ; r =ieee80211_tx_h_select_key (&tx);if (r !=TX_CONTINUE ) {ieee80211_free_txskb (&local->hw, skb);
Signature · 1 line
2.39.5
Re: [PATCH 5.15 128/373] wifi: mac80211: Update skbs control block key in ieee80211_tx_dequeue()
Hello,
Quoted 1 line · Greg Kroah-Hartman
5.15-stable review patch. If anyone has any objections, please let me know.
This patch should not be included in any stable version.
Signature · 1 line
Remi
Quoted 99 lines
------------------
From: Remi Pommarel <[email protected]>
[ Upstream commit
a104042e2bf6528199adb6ca901efe7b60c2c27f]The ieee80211 skb control block key (set when skb was queued) could have been removed before
ieee80211_tx_dequeue()call.ieee80211_tx_dequeue()already calledieee80211_tx_h_select_key()to get the current key, but the latter do not update the key in skb control block in case it is NULL. Because some drivers actually use this key in their TX callbacks (e.g. ath1{1,2}k_mac_op_tx()) this could lead to the use after free below:BUG: KASAN: slab-use-after-free in ath11k_mac_op_tx+0x590/0x61c Read of size 4 at addr ffffff803083c248 by task kworker/u16:4/1440 CPU: 3 UID: 0 PID: 1440 Comm: kworker/u16:4 Not tainted 6.13.0-ge128f627f404 #2 Hardware name: HW (DT) Workqueue: bat_events batadv_send_outstanding_bcast_packet Call trace: show_stack+0x14/0x1c (C) dump_stack_lvl+0x58/0x74 print_report+0x164/0x4c0 kasan_report+0xac/0xe8 __asan_report_load4_noabort+0x1c/0x24 ath11k_mac_op_tx+0x590/0x61c ieee80211_handle_wake_tx_queue+0x12c/0x1c8 ieee80211_queue_skb+0xdcc/0x1b4c ieee80211_tx+0x1ec/0x2bc ieee80211_xmit+0x224/0x324 __ieee80211_subif_start_xmit+0x85c/0xcf8 ieee80211_subif_start_xmit+0xc0/0xec4 dev_hard_start_xmit+0xf4/0x28c __dev_queue_xmit+0x6ac/0x318c batadv_send_skb_packet+0x38c/0x4b0 batadv_send_outstanding_bcast_packet+0x110/0x328 process_one_work+0x578/0xc10 worker_thread+0x4bc/0xc7c kthread+0x2f8/0x380 ret_from_fork+0x10/0x20 Allocated by task 1906: kasan_save_stack+0x28/0x4c kasan_save_track+0x1c/0x40 kasan_save_alloc_info+0x3c/0x4c __kasan_kmalloc+0xac/0xb0 __kmalloc_noprof+0x1b4/0x380 ieee80211_key_alloc+0x3c/0xb64 ieee80211_add_key+0x1b4/0x71c nl80211_new_key+0x2b4/0x5d8 genl_family_rcv_msg_doit+0x198/0x240 <...> Freed by task 1494: kasan_save_stack+0x28/0x4c kasan_save_track+0x1c/0x40 kasan_save_free_info+0x48/0x94 __kasan_slab_free+0x48/0x60 kfree+0xc8/0x31c kfree_sensitive+0x70/0x80 ieee80211_key_free_common+0x10c/0x174 ieee80211_free_keys+0x188/0x46c ieee80211_stop_mesh+0x70/0x2cc ieee80211_leave_mesh+0x1c/0x60 cfg80211_leave_mesh+0xe0/0x280 cfg80211_leave+0x1e0/0x244 <...>Reset SKB control block key before calling
ieee80211_tx_h_select_key()to avoid that.Fixes bb42f2d13ffc ("mac80211: Move reorder-sensitive TX handlers to after TXQ dequeue")Signed-off-by Remi Pommarel <[email protected]>Link https://patch.msgid.link/06aa507b853ca385ceded81c18b0a6dd0f081bc8.1742833382.git.repk@triplefau.lt open hereSigned-off-by Johannes Berg <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- net/mac80211/tx.c | 1 + 1 file changed, 1 insertion(+)net/mac80211/tx.c +1
-0@@ -3704,6 +3704,7 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw,* The key can be removed while the packet was queued, so need to call * this here to get the current key. */ + info->control.hw_key =NULL ; r =ieee80211_tx_h_select_key (&tx);if (r !=TX_CONTINUE ) {ieee80211_free_txskb (&local->hw, skb);Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerRe: [PATCH 5.15 128/373] wifi: mac80211: Update skbs control block key in ieee80211_tx_dequeue()
Quoted 6 lines · Remi Pommarel
Hello,
Quoted 1 line · Greg Kroah-Hartman
5.15-stable review patch. If anyone has any objections, please let me know.
This patch should not be included in any stable version.
Why not? It is documented to fix a bug, is that not correct?
thanks,
greg k-h
Re: [PATCH 5.15 128/373] wifi: mac80211: Update skbs control block key in ieee80211_tx_dequeue()
Quoted 9 lines · Greg Kroah-Hartman
Quoted 6 lines · Remi Pommarel
Hello,
Quoted 1 line · Greg Kroah-Hartman
5.15-stable review patch. If anyone has any objections, please let me know.
This patch should not be included in any stable version.
Why not? It is documented to fix a bug, is that not correct?
This has been reverted later on as it introduced a regression in mediatek driver.
But I missed that you also queued the revert for stable. So false alarm here, you can keep the commit and its revert for stable or drop the two; both scenario are fine with me.
Thanks.
Signature · 1 line
Remi
Greg Kroah-Hartman
maintainerPATCH 129/373 wifi: mac80211: Purge vif txq in ieee80211_do_stop()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Remi Pommarel <[email protected]>
[ Upstream commit 378677eb8f44621ecc9ce659f7af61e5baa94d81 ]
After ieee80211_do_stop() SKB from vif's txq could still be processed. Indeed another concurrent vif schedule_and_wake_txq call could cause those packets to be dequeued (see ieee80211_handle_wake_tx_queue()) without checking the sdata current state.
Because vif.drv_priv is now cleared in this function, this could lead to driver crash.
For example in ath12k, ahvif is store in vif.drv_priv. Thus if ath12k_mac_op_tx() is called after ieee80211_do_stop(), ahvif->ah can be NULL, leading the ath12k_warn(ahvif->ah,...) call in this function to trigger the NULL deref below.
Unable to handle kernel paging request at virtual address dfffffc000000001
KASAN: null-ptr-deref in range [0x0000000000000008-0x000000000000000f]
batman_adv: bat0: Interface deactivated: brbh1337
Mem abort info:
ESR = 0x0000000096000004
EC = 0x25: DABT (current EL), IL = 32 bits
SET = 0, FnV = 0
EA = 0, S1PTW = 0
FSC = 0x04: level 0 translation fault
Data abort info:
ISV = 0, ISS = 0x00000004, ISS2 = 0x00000000
CM = 0, WnR = 0, TnD = 0, TagAccess = 0
GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0
[dfffffc000000001] address between user and kernel address ranges
Internal error: Oops: 0000000096000004 [#1] SMP
CPU: 1 UID: 0 PID: 978 Comm: lbd Not tainted 6.13.0-g633f875b8f1e #114
Hardware name: HW (DT)
pstate: 10000005 (nzcV daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--)
pc : ath12k_mac_op_tx+0x6cc/0x29b8 [ath12k]
lr : ath12k_mac_op_tx+0x174/0x29b8 [ath12k]
sp : ffffffc086ace450
x29: ffffffc086ace450 x28: 0000000000000000 x27: 1ffffff810d59ca4
x26: ffffff801d05f7c0 x25: 0000000000000000 x24: 000000004000001e
x23: ffffff8009ce4926 x22: ffffff801f9c0800 x21: ffffff801d05f7f0
x20: ffffff8034a19f40 x19: 0000000000000000 x18: ffffff801f9c0958
x17: ffffff800bc0a504 x16: dfffffc000000000 x15: ffffffc086ace4f8
x14: ffffff801d05f83c x13: 0000000000000000 x12: ffffffb003a0bf03
x11: 0000000000000000 x10: ffffffb003a0bf02 x9 : ffffff8034a19f40
x8 : ffffff801d05f818 x7 : 1ffffff0069433dc x6 : ffffff8034a19ee0
x5 : ffffff801d05f7f0 x4 : 0000000000000000 x3 : 0000000000000001
x2 : 0000000000000000 x1 : dfffffc000000000 x0 : 0000000000000008
Call trace:
ath12k_mac_op_tx+0x6cc/0x29b8 [ath12k] (P)
ieee80211_handle_wake_tx_queue+0x16c/0x260
ieee80211_queue_skb+0xeec/0x1d20
ieee80211_tx+0x200/0x2c8
ieee80211_xmit+0x22c/0x338
__ieee80211_subif_start_xmit+0x7e8/0xc60
ieee80211_subif_start_xmit+0xc4/0xee0
__ieee80211_subif_start_xmit_8023.isra.0+0x854/0x17a0
ieee80211_subif_start_xmit_8023+0x124/0x488
dev_hard_start_xmit+0x160/0x5a8
__dev_queue_xmit+0x6f8/0x3120
br_dev_queue_push_xmit+0x120/0x4a8
__br_forward+0xe4/0x2b0
deliver_clone+0x5c/0xd0
br_flood+0x398/0x580
br_dev_xmit+0x454/0x9f8
dev_hard_start_xmit+0x160/0x5a8
__dev_queue_xmit+0x6f8/0x3120
ip6_finish_output2+0xc28/0x1b60
__ip6_finish_output+0x38c/0x638
ip6_output+0x1b4/0x338
ip6_local_out+0x7c/0xa8
ip6_send_skb+0x7c/0x1b0
ip6_push_pending_frames+0x94/0xd0
rawv6_sendmsg+0x1a98/0x2898
inet_sendmsg+0x94/0xe0
__sys_sendto+0x1e4/0x308
__arm64_sys_sendto+0xc4/0x140
do_el0_svc+0x110/0x280
el0_svc+0x20/0x60
el0t_64_sync_handler+0x104/0x138
el0t_64_sync+0x154/0x158To avoid that, empty vif's txq at ieee80211_do_stop() so no packet could be dequeued after ieee80211_do_stop() (new packets cannot be queued because SDATA_STATE_RUNNING is cleared at this point).
--- net/mac80211/iface.c | 3 +++ 1 file changed, 3 insertions(+)
net/mac80211/iface.c +3 -0
@@ -585,6 +585,9 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, bool going_doif (sdata->vif.type ==NL80211_IFTYPE_AP_VLAN )ieee80211_txq_remove_vlan (local, sdata); +if (sdata->vif.txq) +ieee80211_txq_purge (sdata->local,to_txq_info (sdata->vif.txq)); + sdata->bss =NULL ;if (local->open_count ==0 )
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 130/373 wifi: wl1251: fix memory leak in wl1251_tx_work
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 a0f0dc96de03ffeefc2a177b7f8acde565cb77f4 ]
The skb dequeued from tx_queue is lost when wl1251_ps_elp_wakeup fails with a -ETIMEDOUT error. Fix that by queueing the skb back to tx_queue.
--- drivers/net/wireless/ti/wl1251/tx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/ti/wl1251/tx.c +3 -1
@@ -342,8 +342,10 @@ void wl1251_tx_work(struct work_struct *work)while ((skb =skb_dequeue (&wl->tx_queue))) {if (!woken_up) { ret =wl1251_ps_elp_wakeup (wl); -if (ret <0 ) +if (ret <0 ) { +skb_queue_head (&wl->tx_queue, skb); goto out; + } woken_up = true; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 131/373 scsi: iscsi: Fix missing scsi_host_put() in error path
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miaoqian Lin <[email protected]>
[ Upstream commit 72eea84a1092b50a10eeecfeba4b28ac9f1312ab ]
Add goto to ensure scsi_host_put() is called in all error paths of iscsi_set_host_param() function. This fixes a potential memory leak when strlen() check fails.
--- drivers/scsi/scsi_transport_iscsi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/scsi/scsi_transport_iscsi.c +5 -2
@@ -3228,11 +3228,14 @@ iscsi_set_host_param(struct iscsi_transport *transport, }/* see similar check in iscsi_if_set_param() */ -if (strlen (data) > ev->u.set_host_param.len) -return -EINVAL ; +if (strlen (data) > ev->u.set_host_param.len) { + err = -EINVAL ; + goto out; + } err = transport->set_host_param (shost, ev->u.set_host_param.param, data, ev->u.set_host_param.len); +out:scsi_host_put (shost);return err; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 132/373 md/raid10: fix missing discard IO accounting
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 d05af90d6218e9c8f1c2026990c3f53c1b41bfb0 ]
md_account_bio() is not called from raid10_handle_discard(), now that we handle bitmap inside md_account_bio(), also fix missing bitmap_startwrite for discard.
Test whole disk discard for 20G raid10:
Before:
Device d/s dMB/s drqm/s %drqm d_await dareq-sz
md0 48.00 16.00 0.00 0.00 5.42 341.33
After:
Device d/s dMB/s drqm/s %drqm d_await dareq-sz
md0 68.00 20462.00 0.00 0.00 2.65 308133.65
--- drivers/md/raid10.c | 1 + 1 file changed, 1 insertion(+)
drivers/md/raid10.c +1 -0
@@ -1771,6 +1771,7 @@ static int raid10_handle_discard(struct mddev *mddev, struct bio *bio)* The discard bio returns only first r10bio finishes */ if (first_copy) { +md_account_bio (mddev, &bio); r10_bio->master_bio = bio;set_bit (R10BIO_Discard, &r10_bio->state); first_copy = false;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 133/373 RDMA/usnic: Fix passing zero to PTR_ERR in usnic_ib_pci_probe()
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 95ba3850fed03e01b422ab5d7943aeba130c9723 ]
drivers/infiniband/hw/usnic/usnic_ib_main.c:590
usnic_ib_pci_probe() warn: passing zero to 'PTR_ERR'
Make usnic_ib_device_add() return NULL on fail path, also remove useless NULL check for usnic_ib_discover_pf()
--- drivers/infiniband/hw/usnic/usnic_ib_main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/infiniband/hw/usnic/usnic_ib_main.c +7 -7
@@ -380,7 +380,7 @@ static void *usnic_ib_device_add(struct pci_dev *dev)if (!us_ibdev) {usnic_err ("Device %s context alloc failed\n" ,netdev_name (pci_get_drvdata (dev))); -return ERR_PTR (-EFAULT ); +return NULL ; } us_ibdev->ufdev =usnic_fwd_dev_alloc (dev);
@@ -500,8 +500,8 @@ static struct usnic_ib_dev *usnic_ib_discover_pf(struct usnic_vnic *vnic) } us_ibdev =usnic_ib_device_add (parent_pci); -if (IS_ERR_OR_NULL (us_ibdev)) { - us_ibdev = us_ibdev ? us_ibdev :ERR_PTR (-EFAULT ); +if (!us_ibdev) { + us_ibdev =ERR_PTR (-EFAULT ); goto out; }
@@ -564,10 +564,10 @@ static int usnic_ib_pci_probe(struct pci_dev *pdev, } pf =usnic_ib_discover_pf (vf->vnic); -if (IS_ERR_OR_NULL (pf)) { -usnic_err ("Failed to discover pf of vnic %s with err%ld\n" , -pci_name (pdev),PTR_ERR (pf)); - err = pf ?PTR_ERR (pf) : -EFAULT ; +if (IS_ERR (pf)) { + err =PTR_ERR (pf); +usnic_err ("Failed to discover pf of vnic %s with err%d\n" , +pci_name (pdev), err); goto out_clean_vnic; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 134/373 RDMA/hns: Fix wrong maximum DMA segment size
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chengchang Tang <[email protected]>
[ Upstream commit 9beb2c91fb86e0be70a5833c6730441fa3c9efa8 ]
Set maximum DMA segment size to 2G instead of UINT_MAX due to HW limit.
--- drivers/infiniband/hw/hns/hns_roce_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/hns/hns_roce_main.c +1 -1
@@ -544,7 +544,7 @@ static int hns_roce_register_device(struct hns_roce_dev *hr_dev)if (ret)return ret; } -dma_set_max_seg_size (dev,UINT_MAX ); +dma_set_max_seg_size (dev,SZ_2G ); ret =ib_register_device (ib_dev,"hns_%d" , dev);if (ret) {dev_err (dev,"ib_register_device failed!\n" );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 135/373 RDMA/core: Silence oversized kvmalloc() warning
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shay Drory <[email protected]>
[ Upstream commit 9a0e6f15029e1a8a21e40f06fd05aa52b7f063de ]
syzkaller triggered an oversized kvmalloc() warning. Silence it by adding __GFP_NOWARN.
syzkaller log:
WARNING: CPU: 7 PID: 518 at mm/util.c:665 __kvmalloc_node_noprof+0x175/0x180 CPU: 7 UID: 0 PID: 518 Comm: c_repro Not tainted 6.11.0-rc6+ #6 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.13.0-0-gf21b5a4aeb02-prebuilt.qemu.org 04/01/2014 RIP: 0010:__kvmalloc_node_noprof+0x175/0x180 RSP: 0018:ffffc90001e67c10 EFLAGS: 00010246 RAX: 0000000000000100 RBX: 0000000000000400 RCX: ffffffff8149d46b RDX: 0000000000000000 RSI: ffff8881030fae80 RDI: 0000000000000002 RBP: 000000712c800000 R08: 0000000000000100 R09: 0000000000000000 R10: ffffc90001e67c10 R11: 0030ae0601000000 R12: 0000000000000000 R13: 0000000000000000 R14: 00000000ffffffff R15: 0000000000000000 FS: 00007fde79159740(0000) GS:ffff88813bdc0000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000020000180 CR3: 0000000105eb4005 CR4: 00000000003706b0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> ib_umem_odp_get+0x1f6/0x390 mlx5_ib_reg_user_mr+0x1e8/0x450 ib_uverbs_reg_mr+0x28b/0x440 ib_uverbs_write+0x7d3/0xa30 vfs_write+0x1ac/0x6c0 ksys_write+0x134/0x170 ? __sanitizer_cov_trace_pc+0x1c/0x50 do_syscall_64+0x50/0x110 entry_SYSCALL_64_after_hwframe+0x76/0x7e
--- drivers/infiniband/core/umem_odp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/infiniband/core/umem_odp.c +4 -2
@@ -78,12 +78,14 @@ static inline int ib_init_umem_odp(struct ib_umem_odp *umem_odp, npfns = (end - start) >>PAGE_SHIFT ; umem_odp->pfn_list =kvcalloc ( - npfns,sizeof (*umem_odp->pfn_list),GFP_KERNEL ); + npfns,sizeof (*umem_odp->pfn_list), +GFP_KERNEL | __GFP_NOWARN);if (!umem_odp->pfn_list)return -ENOMEM ; umem_odp->dma_list =kvcalloc ( - ndmas,sizeof (*umem_odp->dma_list),GFP_KERNEL ); + ndmas,sizeof (*umem_odp->dma_list), +GFP_KERNEL | __GFP_NOWARN);if (!umem_odp->dma_list) { ret = -ENOMEM ; goto out_pfn_list;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 136/373 Bluetooth: hci_event: Fix sending MGMT_EV_DEVICE_FOUND for invalid address
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 eb73b5a9157221f405b4fe32751da84ee46b7a25 ]
This fixes sending MGMT_EV_DEVICE_FOUND for invalid address (00:00:00:00:00:00) which is a regression introduced by a2ec905d1e16 ("Bluetooth: fix kernel oops in store_pending_adv_report") since in the attempt to skip storing data for extended advertisement it actually made the code to skip the entire if statement supposed to send MGMT_EV_DEVICE_FOUND without attempting to use the last_addr_adv which is garanteed to be invalid for extended advertisement since we never store anything on it.
--- net/bluetooth/hci_event.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/bluetooth/hci_event.c +3 -2
@@ -5777,11 +5777,12 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr,* event or send an immediate device found event if the data * should not be stored for later. */ -if (!ext_adv && !has_pending_adv_report (hdev)) { +if (!has_pending_adv_report (hdev)) {/* If the report will trigger a SCAN_REQ store it for * later merging. */ -if (type ==LE_ADV_IND || type ==LE_ADV_SCAN_IND ) { +if (!ext_adv && (type ==LE_ADV_IND || + type ==LE_ADV_SCAN_IND )) {store_pending_adv_report (hdev, bdaddr, bdaddr_type, rssi, flags, data, len);return ;
Signature · 1 line
2.39.5