5.15.203-rc1 review
Subsystems (7)
Greg Kroah-Hartman
maintainercover 5.15.203-rc1 review
This is the start of the stable review cycle for the 5.15.203 release. There are 570 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 Wed, 15 Apr 2026 15:57:08 +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.203-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.203-rc1
Jens Axboe <[email protected]>
io_uring/poll: correctly handle io_poll_add() return value on update
Manivannan Sadhasivam <[email protected]>
Revert "PCI: Enable ACS after configuring IOMMU for OF platforms"
Sean Heelan <[email protected]>
ksmbd: Fix dangling pointer in krb_authenticate
Namjae Jeon <[email protected]>
ksmbd: Fix refcount leak when invalid session is found on session lookup
Maarten Lankhorst <[email protected]>
drm: Fix use-after-free on framebuffers and property blobs when calling drm_dev_unplug
Luiz Augusto von Dentz <[email protected]>
Bluetooth: L2CAP: Fix accepting multiple L2CAP_ECRED_CONN_REQ
Johan Hovold <[email protected]>
i2c: cp2615: fix serial string NULL-deref at probe
Justin Stitt <[email protected]>
i2c: cp2615: replace deprecated strncpy with strscpy
Namjae Jeon <[email protected]>
ksmbd: replace hardcoded hdr2_len with offsetof() in smb2_calc_max_out_buf_len()
Namjae Jeon <[email protected]>
ksmbd: fix potencial OOB in get_file_all_info() for compound requests
Luo Haiyang <[email protected]>
tracing: Fix potential deadlock in cpu hotplug with osnoise
Nikunj A Dadhania <[email protected]>
x86/cpu: Enable FSGSBASE early in cpu_init_exception_handling()
Jinjiang Tu <[email protected]>
mm/huge_memory: fix folio isn't locked in softleaf_to_folio()
Josef Bacik <[email protected]>
scsi: target: tcm_loop: Drain commands in target_reset handler
Kevin Hao <[email protected]>
net: macb: Move devm_{free,request}_irq() out of spin lock area
Sean Christopherson <[email protected]>
KVM: x86/mmu: Drop/zap existing present SPTE even when creating an MMIO SPTE
Claudiu Beznea <[email protected]>
dmaengine: sh: rz-dmac: Protect the driver specific lists
Claudiu Beznea <[email protected]>
dmaengine: sh: rz-dmac: Move CHCTRL updates under spinlock
Yuto Ohnuki <[email protected]>
xfs: save ailp before dropping the AIL lock in push callbacks
Jiayuan Chen <[email protected]>
ext4: fix use-after-free in update_super_work when racing with umount
Zqiang <[email protected]>
ext4: fix the might_sleep() warnings in kvfree()
Li Chen <[email protected]>
ext4: publish jinode after initialization
Jimmy Hu <[email protected]>
usb: gadget: uvc: fix NULL pointer dereference during unbind race
Kuen-Han Tsai <[email protected]>
usb: gadget: u_ether: Fix race between gether_disconnect and eth_stop
Michael Zimmermann <[email protected]>
usb: gadget: f_hid: move list and spinlock inits from bind to alloc
Greg Kroah-Hartman <[email protected]>
net: rfkill: prevent unlimited numbers of rfkill events from being created
Andrea Mayer <[email protected]>
seg6: separate dst_cache for input and output paths in seg6 lwtunnel
Matthieu Baerts (NGI0) <[email protected]>
Revert "mptcp: add needs_id for netlink appending addr"
GuoHan Zhao <[email protected]>
xen/privcmd: unregister xenstore notifier on module exit
Florian Westphal <[email protected]>
netlink: add nla be16/32 types to minlen array
David Howells <[email protected]>
rxrpc: Fix key/keyring checks in setsockopt(RXRPC_SECURITY_KEY/KEYRING)
Luxiao Xu <[email protected]>
rxrpc: fix reference count leak in rxrpc_server_keyring()
Tyllis Xu <[email protected]>
net: stmmac: fix integer underflow in chain mode
Pengpeng Hou <[email protected]>
net: qualcomm: qca_uart: report the consumed byte on RX skb allocation failure
Johan Hovold <[email protected]>
mmc: vub300: fix NULL-deref on disconnect
Sebastian Brzezinka <[email protected]>
drm/i915/gt: fix refcount underflow in intel_engine_park_heartbeat
David Carlier <[email protected]>
net: altera-tse: fix skb leak on DMA mapping error in tse_start_xmit()
Muhammad Alifa Ramdhan <[email protected]>
net/tls: fix use-after-free in -EBUSY error path of tls_do_encryption
Ruide Cao <[email protected]>
batman-adv: reject oversized global TT response buffers
Pengpeng Hou <[email protected]>
nfc: pn533: allocate rx skb before consuming bytes
Shawn Guo <[email protected]>
arm64: dts: hisilicon: hi3798cv200: Add missing dma-ranges
Shawn Guo <[email protected]>
arm64: dts: hisilicon: poplar: Correct PCIe reset GPIO polarity
Thomas Fourier <[email protected]>
wifi: brcmsmac: Fix dma_free_coherent() size
Oleh Konko <[email protected]>
tipc: fix bc_ackers underflow on duplicate GRP_ACK_MSG
Tuan Do <[email protected]>
netfilter: nft_ct: fix use-after-free in timeout object destroy
John Johansen <[email protected]>
apparmor: fix race between freeing data and fs accessing it
John Johansen <[email protected]>
apparmor: fix race on rawdata dereference
John Johansen <[email protected]>
apparmor: fix differential encoding verification
John Johansen <[email protected]>
apparmor: fix unprivileged local user can do privileged policy management
John Johansen <[email protected]>
apparmor: Fix double free of ns_name in aa_replace_profiles()
Massimiliano Pellizzer <[email protected]>
apparmor: fix missing bounds check on DEFAULT table in verify_dfa()
Massimiliano Pellizzer <[email protected]>
apparmor: fix side-effect bug in match_char() macro usage
John Johansen <[email protected]>
apparmor: fix: limit the number of levels of policy namespaces
Massimiliano Pellizzer <[email protected]>
apparmor: replace recursive profile removal with iterative approach
Massimiliano Pellizzer <[email protected]>
apparmor: fix memory leak in verify_header
Massimiliano Pellizzer <[email protected]>
apparmor: validate DFA start states are in bounds in unpack_pdb
Nuno Sa <[email protected]>
iio: adc: ad7923: Fix buffer overflow for tx_buf and ring_xfer
Kent Gibson <[email protected]>
gpiolib: cdev: fix uninitialised kfifo
Ricardo Ribalda <[email protected]>
media: uvcvideo: Use heuristic to find stream entity
Thadeu Lima de Souza Cascardo <[email protected]>
media: uvcvideo: Mark invalid entities with id UVC_INVALID_ENTITY_ID
Dmitry Torokhov <[email protected]>
Input: uinput - take event lock when submitting FF request "event"
Mikhail Gavrilov <[email protected]>
Input: uinput - fix circular locking dependency with ff-core
Jiayuan Chen <[email protected]>
mptcp: fix slab-use-after-free in __inet_lookup_established
Greg Kroah-Hartman <[email protected]>
xfrm_user: fix info leak in build_report()
Johan Hovold <[email protected]>
wifi: rt2x00usb: fix devres lifetime
Eric Biggers <[email protected]>
lib/crypto: chacha: Zeroize permuted_state before it leaves scope
Rafael J. Wysocki <[email protected]>
ACPI: EC: Evaluate orphan _REG under EC device
Alexander Popov <[email protected]>
wifi: virt_wifi: remove SET_NETDEV_DEV to avoid use-after-free
Jens Axboe <[email protected]>
io_uring/tctx: work around xa_store() allocation error issue
Taegu Ha <[email protected]>
usb: gadget: f_uac1_legacy: validate control request size
Kuen-Han Tsai <[email protected]>
usb: gadget: f_rndis: Protect RNDIS options with mutex
Kuen-Han Tsai <[email protected]>
usb: gadget: f_subset: Fix unbalanced refcnt in geth_free
Navaneeth K <[email protected]>
staging: rtl8723bs: fix out-of-bounds read in rtw_get_ie() parser
Shuhao Fu <[email protected]>
smb: client: Fix refcount leak for cifs_sb_tlink
Matt Johnston <[email protected]>
net: mctp: Don't access ifa_index when missing
Quanmin Yan <[email protected]>
fbcon: Set fb_display[i]->mode to NULL when the mode is released
Marc Kleine-Budde <[email protected]>
can: gs_usb: gs_usb_receive_bulk_callback(): fix error message
Marc Kleine-Budde <[email protected]>
can: gs_usb: gs_usb_receive_bulk_callback(): unanchor URL on usb_submit_urb() error
Marc Kleine-Budde <[email protected]>
can: gs_usb: gs_usb_receive_bulk_callback(): fix URB memory leak
Sebastian Urban <[email protected]>
usb: gadget: dummy_hcd: fix premature URB completion when ZLP follows partial transfer
Alan Stern <[email protected]>
USB: dummy-hcd: Fix interrupt synchronization error
Alan Stern <[email protected]>
USB: dummy-hcd: Fix locking/synchronization error
Konrad Dybcio <[email protected]>
thunderbolt: Fix property read in nhi_wake_supported()
Yufan Chen <[email protected]>
net: ftgmac100: fix ring allocation unwind on open failure
Yang Yang <[email protected]>
vxlan: validate ND option lengths in vxlan_na_create
Yifan Wu <[email protected]>
netfilter: ipset: drop logically empty buckets in mtype_del
Ian Abbott <[email protected]>
comedi: me4000: Fix potential overrun of firmware buffer
Ian Abbott <[email protected]>
comedi: me_daq: Fix potential overrun of firmware buffer
Ian Abbott <[email protected]>
comedi: ni_atmio16d: Fix invalid clean-up after failed attach
Ian Abbott <[email protected]>
comedi: Reinit dev->spinlock between attachments to low-level drivers
Deepanshu Kartikey <[email protected]>
comedi: dt2815: add hardware detection to prevent crash
Oliver Neukum <[email protected]>
cdc-acm: new quirk for EPSON HMD
Yang Yang <[email protected]>
bridge: br_nd_send: validate ND option lengths
Claudiu Beznea <[email protected]>
phy: renesas: rcar-gen3-usb2: Assert PLL reset on PHY power off
Claudiu Beznea <[email protected]>
phy: renesas: rcar-gen3-usb2: Lock around hardware registers and driver data
Claudiu Beznea <[email protected]>
phy: renesas: rcar-gen3-usb2: Move IRQ request in probe
Claudiu Beznea <[email protected]>
phy: renesas: rcar-gen3-usb2: Fix role detection on unbind/bind
Cengiz Can <[email protected]>
nvmet-tcp: fix use-before-check of sg in bounds validation
Yongchao Wu <[email protected]>
usb: cdns3: gadget: fix state inconsistency on gadget init failure
Yongchao Wu <[email protected]>
usb: cdns3: gadget: fix NULL pointer dereference in ep_queue
Juno Choi <[email protected]>
usb: dwc2: gadget: Fix spin_lock/unlock mismatch in dwc2_hsotg_udc_stop()
Justin Chen <[email protected]>
usb: ehci-brcm: fix sleep during atomic
Heitor Alves de Siqueira <[email protected]>
usb: usbtmc: Flush anchored URBs in usbtmc_release
Guangshuo Li <[email protected]>
usb: ulpi: fix double free in ulpi_register_interface() error path
Miao Li <[email protected]>
usb: quirks: add DELAY_INIT quirk for another Silicon Motion flash drive
Ethan Tidmore <[email protected]>
iio: gyro: mpu3050: Fix out-of-sequence free_irq()
Ethan Tidmore <[email protected]>
iio: gyro: mpu3050: Move iio_device_register() to correct location
Ethan Tidmore <[email protected]>
iio: gyro: mpu3050: Fix irq resource leak
Ethan Tidmore <[email protected]>
iio: gyro: mpu3050: Fix incorrect free_irq() variable
Francesco Lavra <[email protected]>
iio: imu: st_lsm6dsx: Set FIFO ODR for accelerometer and gyroscope only
David Lechner <[email protected]>
iio: light: vcnl4035: fix scan buffer on big-endian
Antoniu Miclaus <[email protected]>
iio: dac: ad5770r: fix error return in ad5770r_read_raw()
Zoltan Illes <[email protected]>
Input: xpad - add support for Razer Wolverine V3 Pro
Christoffer Sandberg <[email protected]>
Input: i8042 - add TUXEDO InfinityBook Max 16 Gen10 AMD to i8042 quirk table
Bart Van Assche <[email protected]>
Input: synaptics-rmi4 - fix a locking bug in an error path
JP Hein <[email protected]>
USB: core: add NO_LPM quirk for Razer Kiyo Pro webcam
Wanquan Zhong <[email protected]>
USB: serial: option: add support for Rolling Wireless RW135R-GL
Frej Drejhammar <[email protected]>
USB: serial: io_edgeport: add support for Blackbox IC135A
Thomas Zimmermann <[email protected]>
drm/ast: dp501: Fix initialization of SCU2C
Sanman Pradhan <[email protected]>
hwmon: (occ) Fix division by zero in occ_show_power_1()
Maciej W. Rozycki <[email protected]>
MIPS: Fix the GCC version check for `__multi3' workaround
Oleh Konko <[email protected]>
Bluetooth: SMP: force responder MITM requirements before building the pairing response
Oleh Konko <[email protected]>
Bluetooth: SMP: derive legacy responder STK authentication from MITM state
Takashi Iwai <[email protected]>
ALSA: ctxfi: Fix missing SPDIFI1 index handling
Berk Cem Goksel <[email protected]>
ALSA: caiaq: fix stack out-of-bounds read in init_card
Ernestas Kulik <[email protected]>
USB: serial: option: add MeiG Smart SRM825WN
Yasuaki Torimaru <[email protected]>
wifi: wilc1000: fix u8 overflow in SSID scan buffer size calculation
Greg Kroah-Hartman <[email protected]>
drm/ioc32: stop speculation on the drm_compat_ioctl path
Paul Walmsley <[email protected]>
riscv: kgdb: fix several debug register assignment bugs
Sanman Pradhan <[email protected]>
hwmon: (occ) Fix missing newline in occ_show_extended()
Sanman Pradhan <[email protected]>
hwmon: (tps53679) Fix device ID comparison and printing in tps53676_identify()
Sanman Pradhan <[email protected]>
hwmon: (pxe1610) Check return value of page-select write in probe
Qi Tang <[email protected]>
bpf: reject direct access to nullable PTR_TO_BUF pointers
Eric Dumazet <[email protected]>
ipv6: avoid overflows in ip6_datagram_send_ctl()
Luka Gejak <[email protected]>
net: hsr: fix VLAN add unwind on slave errors
Xiang Mei <[email protected]>
net/sched: cls_flow: fix NULL pointer dereference on shared blocks
Xiang Mei <[email protected]>
net/sched: cls_fw: fix NULL pointer dereference on shared blocks
Martin Schiller <[email protected]>
net/x25: Fix overflow when accumulating packets
Martin Schiller <[email protected]>
net/x25: Fix potential double free of skb
Saeed Mahameed <[email protected]>
net/mlx5: Avoid "No data available" when FW version queries fail
Fedor Pchelkin <[email protected]>
net: macb: properly unregister fixed rate clocks
Fedor Pchelkin <[email protected]>
net: macb: fix clk handling on PCI glue driver removal
Weiming Shi <[email protected]>
rds: ib: reject FRMR registration before IB connection is established
Keenan Dong <[email protected]>
Bluetooth: MGMT: validate LTK enc_size on load
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: reject immediate NF_QUEUE verdict
Pablo Neira Ayuso <[email protected]>
netfilter: x_tables: restrict xt_check_match/xt_check_target extensions for NFPROTO_ARP
Qi Tang <[email protected]>
netfilter: ctnetlink: zero expect NAT fields when CTA_EXPECT_NAT absent
Qi Tang <[email protected]>
netfilter: nf_conntrack_helper: pass helper to expect cleanup
Florian Westphal <[email protected]>
netfilter: ipset: use nla_strcmp for IPSET_ATTR_NAME attr
Florian Westphal <[email protected]>
netfilter: x_tables: ensure names are nul-terminated
Florian Westphal <[email protected]>
netfilter: nfnetlink_log: account for netlink header size
Pablo Neira Ayuso <[email protected]>
netfilter: flowtable: strictly check for maximum number of actions
Zhengchuan Liang <[email protected]>
net: ipv6: flowlabel: defer exclusive option free until RCU teardown
Alexei Starovoitov <[email protected]>
bpf: Fix regsafe() for pointers to packet
Suraj Gupta <[email protected]>
net: xilinx: axienet: Correct BD length masks to match AXIDMA IP spec
Pengpeng Hou <[email protected]>
NFC: pn533: bound the UART receive buffer
Yochai Eisenrich <[email protected]>
net: sched: cls_api: fix tc_chain_fill_node to initialize tcm_info to zero to prevent an info-leak
Paolo Abeni <[email protected]>
ipv6: prevent possible UaF in addrconf_permanent_addr()
Xiang Mei <[email protected]>
net/sched: sch_hfsc: fix divide-by-zero in rtsc_min()
Yang Yang <[email protected]>
bridge: br_nd_send: linearize skb before parsing ND options
Eric Dumazet <[email protected]>
ip6_tunnel: clear skb2->cb[] in ip4ip6_err()
Eric Dumazet <[email protected]>
ipv6: icmp: clear skb2->cb[] in ip6_err_gen_icmpv6_unreach()
Thomas Bogendoerfer <[email protected]>
tg3: Fix race for querying speed/duplex
Yochai Eisenrich <[email protected]>
net: ipv6: ndisc: fix ndisc_ra_useropt to initialize nduseropt_padX fields to zero to prevent an info-leak
Jiayuan Chen <[email protected]>
net: qrtr: replace qrtr_tx_flow radix_tree with xarray to fix memory leak
Norbert Szetei <[email protected]>
crypto: af-alg - fix NULL pointer dereference in scatterwalk
Frank Li <[email protected]>
dt-bindings: auxdisplay: ht16k33: Use unevaluatedProperties to fix common property warning
ZhengYuan Huang <[email protected]>
btrfs: reject root items with drop_progress and zero drop_level
Lee Jones <[email protected]>
HID: multitouch: Check to ensure report responses match the request
Josh Poimboeuf <[email protected]>
objtool: Fix Clang jump table detection
Johannes Thumshirn <[email protected]>
btrfs: don't take device_list_mutex when querying zone info
Deepanshu Kartikey <[email protected]>
atm: lec: fix use-after-free in sock_def_readable()
Benoît Sevens <[email protected]>
HID: wacom: fix out-of-bounds read in wacom_intuos_bt_irq
Davidlohr Bueso <[email protected]>
futex: Clear stale exiting pointer in futex_lock_pi() retry path
Tomi Valkeinen <[email protected]>
dmaengine: xilinx_dma: Fix reset related timeout with two-channel AXIDMA
Radhey Shyam Pandey <[email protected]>
dmaengine: xilinx_dma: Program interrupt delay timeout
Vinicius Costa Gomes <[email protected]>
dmaengine: idxd: Fix freeing the allocated ida too late
Christophe JAILLET <[email protected]>
dmaengine: idxd: Remove usage of the deprecated ida_simple_xx() API
Filipe Manana <[email protected]>
btrfs: fix lost error when running device stats on multiple devices fs
Mark Harmstone <[email protected]>
btrfs: fix super block offset in error message in btrfs_validate_super()
Marek Vasut <[email protected]>
dmaengine: xilinx: xilinx_dma: Fix unmasked residue subtraction
Marek Vasut <[email protected]>
dmaengine: xilinx: xilinx_dma: Fix residue calculation for cyclic DMA
Marek Vasut <[email protected]>
dmaengine: xilinx: xilinx_dma: Fix dma_device directions
Felix Gu <[email protected]>
phy: ti: j721e-wiz: Fix device node reference leak in wiz_get_lane_phy_types()
Vinicius Costa Gomes <[email protected]>
dmaengine: idxd: Fix not releasing workqueue on .release()
Theodore Ts'o <[email protected]>
ext4: always drain queued discard work in ext4_mb_release()
Baokun Li <[email protected]>
ext4: fix iloc.bh leak in ext4_fc_replay_inode() error paths
Helen Koike <[email protected]>
ext4: reject mount if bigalloc with s_first_data_block != 0
Ye Bin <[email protected]>
ext4: avoid allocate block from corrupted group in ext4_mb_find_by_goal()
Jan Kara <[email protected]>
ext4: make recently_deleted() properly work with lazy itable initialization
Deepanshu Kartikey <[email protected]>
ext4: convert inline data to extents when truncate exceeds inline size
Yuto Ohnuki <[email protected]>
xfs: stop reclaim before pushing AIL during unmount
Milos Nikic <[email protected]>
jbd2: gracefully abort on checkpointing state corruptions
Greg Kroah-Hartman <[email protected]>
scsi: ses: Handle positive SCSI error from ses_recv_diag()
Tyllis Xu <[email protected]>
scsi: ibmvfc: Fix OOB access in ibmvfc_discover_targets_done()
Zhan Xusheng <[email protected]>
alarmtimer: Fix argument order in alarm_timer_forward()
Jiucheng Xu <[email protected]>
erofs: add GFP_NOIO in the bio completion if needed
xietangxin <[email protected]>
virtio_net: Fix UAF on dst_ops when IFF_XMIT_DST_RELEASE is cleared and napi_tx is false
Yuchan Nam <[email protected]>
media: mc, v4l2: serialize REINIT and REQBUFS with req_queue_mutex
Viresh Kumar <[email protected]>
cpufreq: conservative: Reset requested_freq on limits change
Ali Norouzi <[email protected]>
can: gw: fix OOB heap access in cgw_csum_crc8_rel()
Vasily Gorbik <[email protected]>
s390/barrier: Make array_index_mask_nospec() __always_inline
Greg Kroah-Hartman <[email protected]>
s390/syscalls: Add spectre boundary for syscall dispatch table
Marc Kleine-Budde <[email protected]>
spi: spi-fsl-lpspi: fix teardown order issue (UAF)
Jihed Chaibi <[email protected]>
ASoC: adau1372: Fix clock leak on PLL lock failure
Jihed Chaibi <[email protected]>
ASoC: adau1372: Fix unchecked clk_prepare_enable() return value
Marc Buerg <[email protected]>
sysctl: fix uninitialized variable in proc_do_large_bitmap
Sanman Pradhan <[email protected]>
hwmon: (adm1177) fix sysfs ABI violation and current unit conversion
Weiming Shi <[email protected]>
ACPI: EC: clean up handlers on probe failure in acpi_ec_setup()
Rafael J. Wysocki <[email protected]>
ACPI: EC: Install address space handler at the namespace root
Hans de Goede <[email protected]>
ACPI: EC: Fix ECDT probe ordering issues
Hans de Goede <[email protected]>
ACPI: EC: Fix EC address space handler unregistration
Hans de Goede <[email protected]>
ACPICA: Allow address_space_handler Install and _REG execution as 2 separate steps
Hans de Goede <[email protected]>
ACPICA: include/acpi/acpixf.h: Fix indentation
Cezary Rojewski <[email protected]>
ASoC: Intel: catpt: Fix the device initialization
Samasth Norway Ananda <[email protected]>
drm/i915/gmbus: fix spurious timeout on 512-byte burst reads
Mike Rapoport (Microsoft) <[email protected]>
x86/efi: efi_unmap_boot_services: fix calculation of ranges_to_free size
Yihang Li <[email protected]>
scsi: scsi_transport_sas: Fix the maximum channel scanning issue
Tatyana Nikolova <[email protected]>
RDMA/irdma: Return EINVAL for invalid arp index error
Anil Samal <[email protected]>
RDMA/irdma: Fix deadlock during netdev reset with active connections
Tatyana Nikolova <[email protected]>
RDMA/irdma: Remove reset check from irdma_modify_qp_to_err()
Ivan Barrera <[email protected]>
RDMA/irdma: Clean up unnecessary dereference of event->cm_node
Tatyana Nikolova <[email protected]>
RDMA/irdma: Remove a NOP wait_event() in irdma_modify_qp_roce()
Tatyana Nikolova <[email protected]>
RDMA/irdma: Update ibqp state to error if QP is already in error state
Chuck Lever <[email protected]>
RDMA/rw: Fall back to direct SGE on MR pool exhaustion
Andy Shevchenko <[email protected]>
regmap: Synchronize cache for the page selector
Paolo Valerio <[email protected]>
net: macb: use the current queue number for stats
David Carlier <[email protected]>
netfilter: ctnetlink: use netlink policy range checks
Florian Westphal <[email protected]>
netlink: allow be16 and be32 types in all uint policy checks
Florian Westphal <[email protected]>
netlink: introduce bigendian integer types
Jakub Kicinski <[email protected]>
netlink: hide validation union fields from kdoc
Florian Westphal <[email protected]>
netfilter: nft_payload: reject out-of-range attributes via policy
Florian Westphal <[email protected]>
netlink: introduce NLA_POLICY_MAX_BE
Weiming Shi <[email protected]>
netfilter: nf_conntrack_sip: fix use of uninitialized rtp_addr in process_sdp
Pablo Neira Ayuso <[email protected]>
netfilter: nf_conntrack_expect: skip expectations in other netns via proc
Ren Wei <[email protected]>
netfilter: ip6t_rt: reject oversized addrnr in rt_mt6_check()
Weiming Shi <[email protected]>
netfilter: nfnetlink_log: fix uninitialized padding leak in NFULA_PAYLOAD
Pengpeng Hou <[email protected]>
Bluetooth: btusb: clamp SCO altsetting table indices
Hyunwoo Kim <[email protected]>
Bluetooth: L2CAP: Fix ERTM re-init and zero pdu_len infinite loop
Miguel Ojeda <[email protected]>
dma-mapping: add missing inline for dma_free_attrs
Wei Fang <[email protected]>
net: enetc: fix the output issue of 'ethtool --show-ring'
Yochai Eisenrich <[email protected]>
net: fix fanout UAF in packet_release() via NETDEV_UP race
Alok Tiwari <[email protected]>
platform/olpc: olpc-xo175-ec: Fix overflow error message to print inlen
Sabrina Dubroca <[email protected]>
rtnetlink: count IFLA_INFO_SLAVE_KIND in if_nlmsg_size
Qi Tang <[email protected]>
net/smc: fix double-free of smc_spd_priv when tee() duplicates splice pipe buffer
Yang Yang <[email protected]>
openvswitch: validate MPLS set/set_masked payload length
Toke Høiland-Jørgensen <[email protected]>
net: openvswitch: Avoid releasing netdev before teardown completes
Jakub Kicinski <[email protected]>
nfc: nci: fix circular locking dependency in nci_close_device
Mohammad Heib <[email protected]>
ionic: fix persistent MAC address override on PF
Luca Leonardo Scorcia <[email protected]>
pinctrl: mediatek: common: Fix probe failure for devices without EINT
Helen Koike <[email protected]>
Bluetooth: L2CAP: Fix null-ptr-deref on l2cap_sock_ready_cb
Anas Iqbal <[email protected]>
Bluetooth: hci_ll: Fix firmware leak on error path
Hyunwoo Kim <[email protected]>
Bluetooth: SCO: Fix use-after-free in sco_recv_frame() due to missing sock_hold
Hyunwoo Kim <[email protected]>
Bluetooth: L2CAP: Validate PDU length before reading SDU length in l2cap_ecred_data_rcv()
Oliver Hartkopp <[email protected]>
can: statistics: add missing atomic access in hot path
Eric Dumazet <[email protected]>
af_key: validate families in pfkey_send_migrate()
Sabrina Dubroca <[email protected]>
esp: fix skb leak with espintcp and async crypto
Steffen Klassert <[email protected]>
xfrm: Fix the usage of skb->sk
Sabrina Dubroca <[email protected]>
xfrm: call xdo_dev_state_delete during state update
Uzair Mughal <[email protected]>
ALSA: hda/realtek: Add headset jack quirk for Thinkpad X390
Isaac J. Manjarres <[email protected]>
dma-buf: Include ioctl.h in UAPI header
Mark Brown <[email protected]>
ASoC: fsl_easrc: Fix event generation in fsl_easrc_iec958_put_bits()
Mark Brown <[email protected]>
ASoC: fsl_easrc: Fix event generation in fsl_easrc_iec958_set_reg()
Ihor Solodrai <[email protected]>
module: Fix kernel panic when a symbol st_shndx is out of bounds
Romain Sioen <[email protected]>
HID: mcp2221: cancel last I2C command on read error
Valentin Spreckels <[email protected]>
net: usb: r8152: add TRENDnet TUC-ET2G
Günther Noack <[email protected]>
HID: magicmouse: avoid memory leak in magicmouse_report_fixup()
Julius Lehmann <[email protected]>
HID: magicmouse: fix battery reporting for Apple Magic Trackpad 2
Keith Busch <[email protected]>
nvme-pci: ensure we're polling a polled queue
Hans de Goede <[email protected]>
platform/x86: touchscreen_dmi: Add quirk for y-inverted Goodix touchscreen on SUPI S10
Leif Skunberg <[email protected]>
platform/x86: intel-hid: Enable 5-button array on ThinkPad X1 Fold 16 Gen 1
Keith Busch <[email protected]>
nvme-pci: cap queue creation to used queues
Peter Metz <[email protected]>
platform/x86: intel-hid: Add Dell 14 Plus 2-in-1 to dmi_vgbs_allow_list
Günther Noack <[email protected]>
HID: asus: avoid memory leak in asus_report_fixup()
Kumar Kartikeya Dwivedi <[email protected]>
bpf: Release module BTF IDR before module unload
Danilo Krummrich <[email protected]>
sh: platform_early: remove pdev->driver_override check
Juergen Gross <[email protected]>
xen/privcmd: add boot control for restricted usage in domU
Juergen Gross <[email protected]>
xen/privcmd: restrict usage in unprivileged domU
Florian Westphal <[email protected]>
netfilter: nft_set_pipapo: split gc into unlink and reclaim phase
Florian Westphal <[email protected]>
netfilter: nf_tables: de-constify set commit ops function argument
Josh Law <[email protected]>
tools/bootconfig: fix fd leak in load_xbc_file() on fstat failure
Josh Law <[email protected]>
lib/bootconfig: check xbc_init_node() return in override path
Rahul Bukte <[email protected]>
drm/i915/gt: Check set_default_submission() before deferencing
Hyunwoo Kim <[email protected]>
ksmbd: fix use-after-free of share_conf in compound request
Kamal Dasu <[email protected]>
mtd: rawnand: brcmnand: skip DMA during panic write
Kamal Dasu <[email protected]>
mtd: rawnand: serialize lock/unlock against other NAND operations
Christophe JAILLET <[email protected]>
i2c: fsi: Fix a potential leak in fsi_i2c_probe()
Sanman Pradhan <[email protected]>
hwmon: (pmbus/isl68137) Fix unchecked return value and use sysfs_emit()
Weiming Shi <[email protected]>
icmp: fix NULL pointer dereference in icmp_tag_validation()
Anas Iqbal <[email protected]>
net: dsa: bcm_sf2: fix missing clk_disable_unprepare() in error paths
Muhammad Hammad Ijaz <[email protected]>
net: mvpp2: guard flow control update with global_tx_fc in buffer switching
Weiming Shi <[email protected]>
nfnetlink_osf: validate individual option lengths in fingerprints
Xiang Mei <[email protected]>
net: bonding: fix NULL deref in bond_debug_rlb_hash_show
Xiang Mei <[email protected]>
udp_tunnel: fix NULL deref caused by udp_sock_create6 when CONFIG_IPV6=n
Fedor Pchelkin <[email protected]>
net: macb: fix uninitialized rx_fs_lock
Rafael J. Wysocki <[email protected]>
ACPI: processor: Fix previous acpi_processor_errata_piix4() fix
Guenter Roeck <[email protected]>
wifi: wlcore: Return -ENOMEM instead of -EAGAIN if there is not enough headroom
Xiang Mei <[email protected]>
wifi: mac80211: fix NULL deref in mesh_matches_local()
Kohei Enju <[email protected]>
igc: fix missing update of skb->tail in igc_xmit_frame()
Nikola Z. Ivanov <[email protected]>
net: usb: aqc111: Do not perform PM inside suspend callback
Jiayuan Chen <[email protected]>
net/smc: fix NULL dereference and UAF in smc_tcp_syn_recv_sock()
Wen Gu <[email protected]>
net/smc: Fix slab-out-of-bounds issue in fallback
Wen Gu <[email protected]>
net/smc: Only save the original clcsock callback functions
Bart Van Assche <[email protected]>
PM: runtime: Fix a race condition related to device removal
Rafael J. Wysocki <[email protected]>
sched: idle: Consolidate the handling of two special cases
Dipayaan Roy <[email protected]>
net: mana: fix use-after-free in mana_hwc_destroy_channel() by reordering teardown
Dexuan Cui <[email protected]>
net: mana: Improve the HWC error handling
Justin Chen <[email protected]>
net: bcmgenet: increase WoL poll timeout
Jenny Guanni Qu <[email protected]>
netfilter: nf_conntrack_h323: check for zero length in DecodeQ931()
Jenny Guanni Qu <[email protected]>
netfilter: xt_time: use unsigned int for monthday bit shift
Pablo Neira Ayuso <[email protected]>
netfilter: xt_CT: drop pending enqueued packets on template removal
Pablo Neira Ayuso <[email protected]>
netfilter: nft_ct: drop pending enqueued packets on removal
Andrii Melnychenko <[email protected]>
netfilter: nft_ct: add seqadj extension for natted connections
Jenny Guanni Qu <[email protected]>
netfilter: nf_conntrack_h323: fix OOB read in decode_int() CONS case
Lukas Johannes Möller <[email protected]>
netfilter: nf_conntrack_sip: fix Content-Length u32 truncation in sip_help_tcp()
Hyunwoo Kim <[email protected]>
netfilter: ctnetlink: fix use-after-free in ctnetlink_dump_exp_ct()
Florian Westphal <[email protected]>
netfilter: ctnetlink: remove refcounting in expectation dumpers
Jiayuan Chen <[email protected]>
net/rose: fix NULL pointer dereference in rose_transmit_link on reconnect
Dmitry Baryshkov <[email protected]>
Bluetooth: qca: fix ROM version reading on WCN3998 chips
Luiz Augusto von Dentz <[email protected]>
Bluetooth: HIDP: Fix possible UAF
Christian Eggers <[email protected]>
Bluetooth: SMP: make SM/PER/KDU/BI-04-C happy
Christian Eggers <[email protected]>
Bluetooth: LE L2CAP: Disconnect if sum of payload sizes exceed SDU
Christian Eggers <[email protected]>
Bluetooth: LE L2CAP: Disconnect if received packet's SDU exceeds IMTU
Felix Gu <[email protected]>
firmware: arm_scpi: Fix device_node reference leak in probe path
Jonathan Cameron <[email protected]>
of: Add cleanup.h based auto release via __free(device_node) markings
Peddolla Harshavardhan Reddy <[email protected]>
wifi: cfg80211: cancel pmsr_free_wk in cfg80211_pmsr_wdev_down
Kuniyuki Iwashima <[email protected]>
wifi: mac80211: Fix static_branch_dec() underflow for aql_disable.
Richard Genoud <[email protected]>
soc: fsl: qbman: fix race condition in qman_destroy_fq
ZhengYuan Huang <[email protected]>
btrfs: tree-checker: fix misleading root drop_level error message
Yang Yang <[email protected]>
batman-adv: avoid OGM aggregation when skb tailroom is insufficient
Maíra Canal <[email protected]>
pmdomain: bcm: bcm2835-power: Increase ASB control timeout
Matthieu Baerts (NGI0) <[email protected]>
mptcp: pm: avoid sending RM_ADDR over same subflow
Natalie Vock <[email protected]>
drm/amd/display: Use GFP_ATOMIC in dc_create_stream_for_sink
Andrew Lunn <[email protected]>
net: phy: register phy led_triggers during probe to avoid AB-BA deadlock
Thorsten Blum <[email protected]>
smb: client: Don't log plaintext credentials in cifs_set_cifscreds
Jason Gunthorpe <[email protected]>
RDMA/irdma: Fix kernel stack leak in irdma_create_user_ah()
Daniil Dulov <[email protected]>
wifi: cfg80211: cancel rfkill_block work in wiphy_unregister()
Johannes Berg <[email protected]>
wifi: cfg80211: move scan done work to wiphy work
Daniel Hodges <[email protected]>
wifi: libertas: fix use-after-free in lbs_free_adapter()
Jan Kara <[email protected]>
ext4: always allocate blocks only from groups inode can use
Namjae Jeon <[email protected]>
ksmbd: fix null pointer dereference error in generate_encryptionkey
Brian Foster <[email protected]>
ext4: fix dirtyclusters double decrement on fs shutdown
Zhang Yi <[email protected]>
ext4: drop extent cache when splitting extent fails
Zhang Yi <[email protected]>
ext4: don't set EXT4_GET_BLOCKS_CONVERT when splitting before submitting I/O
Fedor Pchelkin <[email protected]>
ksmbd: call ksmbd_vfs_kern_path_end_removing() on some error paths
Jeongjun Park <[email protected]>
drm/exynos: vidi: use ctx->lock to protect struct vidi_context member variables related to memory alloc/free
Jeongjun Park <[email protected]>
drm/exynos: vidi: fix to avoid directly dereferencing user pointer
Jeongjun Park <[email protected]>
drm/exynos: vidi: use priv->vidi_dev for ctx lookup in vidi_connection_ioctl()
Ankit Garg <[email protected]>
gve: defer interrupt enabling until NAPI registration
Frederic Weisbecker <[email protected]>
net: Handle napi_schedule() calls from non-interrupt
Huacai Chen <[email protected]>
net: stmmac: dwmac-loongson: Set clk_csr_i to 100-150MHz
David Hildenbrand (Red Hat) <[email protected]>
mm/hugetlb: fix excessive IPI broadcasts when unsharing PMD tables using mmu_gather
David Hildenbrand (Red Hat) <[email protected]>
mm/rmap: fix two comments related to huge_pmd_unshare()
David Hildenbrand (Red Hat) <[email protected]>
mm/hugetlb: fix two comments related to huge_pmd_unshare()
David Hildenbrand (Red Hat) <[email protected]>
mm/hugetlb: fix hugetlb_pmd_shared()
Jane Chu <[email protected]>
mm/hugetlb: fix copy_hugetlb_page_range() to use ->pt_share_count
Miaohe Lin <[email protected]>
mm/hugetlb: make detecting shared pte more reliable
Alex Deucher <[email protected]>
drm/radeon: apply state adjust rules to some additional HAINAN vairants
Maciej Andrzejewski ICEYE <[email protected]>
serial: uartlite: fix PM runtime usage count underflow on probe
Ilpo Järvinen <[email protected]>
serial: 8250: Add late synchronize_irq() to shutdown to handle DW UART BUSY
Raul E Rangel <[email protected]>
serial: 8250: Fix TX deadlock when using DMA
Martin Roukala (né Peres) <[email protected]>
serial: 8250_pci: add support for the AX99100
Guanghui Feng <[email protected]>
iommu/vt-d: Fix intel iommu iotlb sync hardlockup and retry
Finn Thain <[email protected]>
mtd: Avoid boot crash in RedBoot partition table parser
Chen Ni <[email protected]>
mtd: rawnand: cadence: Fix error check for dma_alloc_coherent() in cadence_nand_init()
Olivier Sobrie <[email protected]>
mtd: rawnand: pl353: make sure optimal timings are applied
Luke Wang <[email protected]>
mmc: sdhci: fix timing selection for 1-bit bus width
Matthew Schwartz <[email protected]>
mmc: sdhci-pci-gli: fix GL9750 DMA write corruption
Lukas Johannes Möller <[email protected]>
Bluetooth: L2CAP: Validate L2CAP_INFO_RSP payload length before access
Lukas Johannes Möller <[email protected]>
Bluetooth: L2CAP: Fix type confusion in l2cap_ecred_reconf_rsp()
Fedor Pchelkin <[email protected]>
net: macb: fix use-after-free access to PTP clock
Ian Ray <[email protected]>
NFC: nxp-nci: allow GPIOs to sleep
Ira Weiny <[email protected]>
nvdimm/bus: Fix potential use after free in asynchronous initialization
Jeff Layton <[email protected]>
sunrpc: fix cache_request leak in cache_release
Julien Stephan <[email protected]>
driver: iio: add missing checks on iio_info's callback access
Jens Axboe <[email protected]>
io_uring/io-wq: check IO_WQ_BIT_EXIT inside work run loop
Eric Dumazet <[email protected]>
l2tp: do not use sock_hold() in pppol2tp_session_get_sock()
Paul Chaignon <[email protected]>
bpf: Forget ranges when refining tnum after JSET
Adrian Hunter <[email protected]>
i3c: mipi-i3c-hci: Add missing TID field to no-op command descriptor
Adrian Hunter <[email protected]>
i3c: mipi-i3c-hci: Restart DMA ring correctly after dequeue abort
Adrian Hunter <[email protected]>
i3c: mipi-i3c-hci: Use ETIMEDOUT instead of ETIME for timeout errors
Jean-Baptiste Maneyrol <[email protected]>
iio: imu: inv_icm42600: fix odr switch to the same value
Antoniu Miclaus <[email protected]>
iio: gyro: mpu3050-i2c: fix pm_runtime error handling
Antoniu Miclaus <[email protected]>
iio: gyro: mpu3050-core: fix pm_runtime error handling
Chris Spencer <[email protected]>
iio: chemical: bme680: Fix measurement wait duration calculation
Lukas Schmid <[email protected]>
iio: potentiometer: mcp4131: fix double application of wiper shift
Antoniu Miclaus <[email protected]>
iio: chemical: sps30_i2c: fix buffer size in sps30_i2c_read_meas()
Antoniu Miclaus <[email protected]>
iio: chemical: sps30_serial: fix buffer size in sps30_serial_read_meas()
Oleksij Rempel <[email protected]>
iio: dac: ds4424: reject -128 RAW value
Filipe Manana <[email protected]>
btrfs: abort transaction on failure to update root in the received subvol ioctl
Josh Law <[email protected]>
lib/bootconfig: check bounds before writing in __xbc_open_brace()
Josh Law <[email protected]>
lib/bootconfig: fix snprintf truncation check in xbc_node_compose_key_after()
Shashank Balaji <[email protected]>
x86/apic: Disable x2apic on resume if the kernel expects so
Junxiao Bi <[email protected]>
scsi: core: Fix error handling for scsi_alloc_sdev()
Josh Law <[email protected]>
lib/bootconfig: fix off-by-one in xbc_verify_tree() unclosed brace error
Darrick J. Wong <[email protected]>
xfs: fix undersized l_iclog_roundoff values
Calvin Owens <[email protected]>
tracing: Fix trace_buf_size= cmdline parameter with sizes >= 2G
Alysa Liu <[email protected]>
drm/amdgpu: Fix use-after-free race in VM acquire
Fan Wu <[email protected]>
net: ethernet: arc: emac: quiesce interrupts before requesting IRQ
Jian Zhang <[email protected]>
net: ncsi: fix skb leak in error paths
Helge Deller <[email protected]>
parisc: Fix initial page table creation for boot
Sanman Pradhan <[email protected]>
hwmon: (pmbus/q54sj108a2) fix stack overflow in debugfs read
Dave Airlie <[email protected]>
nouveau/dpcd: return EBUSY for aux xfer if the device is asleep
Helge Deller <[email protected]>
parisc: Increase initial mapping to 64 MB with KALLSYMS
Sven Eckelmann <[email protected]>
batman-adv: Avoid double-rtnl_lock ELP metric worker
Jakub Staniszewski <[email protected]>
ice: fix retry for AQ command 0x06EE
Long Li <[email protected]>
net: mana: Ring doorbell at 4 CQ wraparounds
Ariel Silver <[email protected]>
media: dvb-net: fix OOB access in ULE extension header tables
Greg Kroah-Hartman <[email protected]>
staging: rtl8723bs: properly validate the data in rtw_get_ie_ex()
Luka Gejak <[email protected]>
staging: rtl8723bs: fix potential out-of-bounds read in rtw_restruct_wmm_ie
Marc Zyngier <[email protected]>
irqchip/gic-v3-its: Limit number of per-device MSIs to the range the ITS supports
Andy Shevchenko <[email protected]>
device property: Allow secondary lookup in fwnode_get_next_child_node()
Steven Rostedt <[email protected]>
time/jiffies: Mark jiffies_64_to_clock_t() notrace
Randy Dunlap <[email protected]>
time: add kernel-doc in time.c
Max Kellermann <[email protected]>
ceph: fix i_nlink underrun during async unlink
Ilya Dryomov <[email protected]>
libceph: admit message frames only in CEPH_CON_S_OPEN state
Raphael Zimmer <[email protected]>
libceph: Use u32 for non-negative values in ceph_monmap_decode()
Ilya Dryomov <[email protected]>
libceph: prevent potential out-of-bounds reads in process_message_header()
Ilya Dryomov <[email protected]>
libceph: reject preamble if control segment is empty
Raphael Zimmer <[email protected]>
libceph: Fix potential out-of-bounds access in ceph_handle_auth_reply()
Mehul Rao <[email protected]>
tipc: fix divide-by-zero in tipc_sk_filter_connect()
Penghe Geng <[email protected]>
mmc: core: Avoid bitfield RMW for claim/retune flags
Felix Gu <[email protected]>
mmc: mmci: Fix device_node reference leak in of_get_dml_pipe_index()
Kalesh Singh <[email protected]>
mm/tracing: rss_stat: ensure curr is false from kthread context
Ziyi Guo <[email protected]>
usb: image: mdc800: kill download URB on timeout
Oliver Neukum <[email protected]>
usb: mdc800: handle signal and read racing
Fan Wu <[email protected]>
usb: renesas_usbhs: fix use-after-free in ISR during device removal
Oliver Neukum <[email protected]>
usb: class: cdc-wdm: fix reordering issue in read code path
Alan Stern <[email protected]>
USB: core: Limit the length of unkillable synchronous timeouts
Alan Stern <[email protected]>
USB: usbtmc: Use usb_bulk_msg_killable() with user-specified timeouts
Alan Stern <[email protected]>
USB: usbcore: Introduce usb_bulk_msg_killable()
Marc Zyngier <[email protected]>
usb: cdc-acm: Restore CAP_BRK functionnality to CH343
Gabor Juhos <[email protected]>
usb: core: don't power off roothub PHYs if phy_set_mode() fails
Greg Kroah-Hartman <[email protected]>
usb: misc: uss720: properly clean up reference in uss720_probe()
Oliver Neukum <[email protected]>
usb: yurex: fix race in probe
Zilin Guan <[email protected]>
usb: xhci: Fix memory leak in xhci_disable_slot()
Christoffer Sandberg <[email protected]>
usb/core/quirks: Add Huawei ME906S-device to wakeup quirk
Oleksij Rempel <[email protected]>
net: usb: lan78xx: skip LTM configuration for LAN7850
Oleksij Rempel <[email protected]>
net: usb: lan78xx: fix silent drop of packets with checksum errors
Qingye Zhao <[email protected]>
cgroup: fix race between task migration and iteration
Sasha Levin <[email protected]>
Revert "arm64: dts: qcom: sdm845-oneplus: Mark l14a regulator as boot-on"
Alok Tiwari <[email protected]>
octeontx2-af: devlink: fix NIX RAS reporter to use RAS interrupt status
Przemek Kitszel <[email protected]>
octeontx2-af: devlink health: use retained error fmsg API
Alok Tiwari <[email protected]>
octeontx2-af: devlink: fix NIX RAS reporter recovery condition
Casey Connolly <[email protected]>
ASoC: detect empty DMI strings
Chen Ni <[email protected]>
ASoC: amd: acp3x-rt5682-max9836: Add missing error check for clock acquisition
Ben Dooks <[email protected]>
ACPI: OSL: fix __iomem type on return from acpi_os_map_generic_address()
Matt Vollrath <[email protected]>
e1000/e1000e: Fix leak in DMA error cleanup
Alok Tiwari <[email protected]>
i40e: fix src IP mask checks and memcpy argument names in cloud filter
Sungwoo Kim <[email protected]>
nvme-pci: Fix slab-out-of-bounds in nvme_dbbuf_set
Rafael J. Wysocki <[email protected]>
sched: idle: Make skipping governor callbacks more consistent
Peng Fan <[email protected]>
regulator: pca9450: Correct interrupt type
Frieder Schrempf <[email protected]>
regulator: pca9450: Make IRQ optional
Yuan Tan <[email protected]>
netfilter: xt_IDLETIMER: reject rev0 reuse of ALARM timer labels
Hyunwoo Kim <[email protected]>
netfilter: nfnetlink_cthelper: fix OOB read in nfnl_cthelper_dump_table()
Hyunwoo Kim <[email protected]>
netfilter: nfnetlink_queue: fix entry leak in bridge verdict error path
David Dull <[email protected]>
netfilter: x_tables: guard option walkers against 1-byte tail reads
Jenny Guanni Qu <[email protected]>
netfilter: nft_set_pipapo: fix stack out-of-bounds read in pipapo_drop()
Wenyuan Li <[email protected]>
can: hi311x: hi3110_open(): add check for hi3110_power_enable() return value
Shuangpeng Bai <[email protected]>
serial: caif: hold tty->link reference in ldisc_open and ser_release
matteo.cotifava <[email protected]>
ASoC: soc-core: flush delayed work before removing DAIs and widgets
Amadeusz Sławiński <[email protected]>
ASoC: core: Do not call link_exit() on uninitialized rtd objects
Cezary Rojewski <[email protected]>
ASoC: core: Exit all links before removing their components
Kuninori Morimoto <[email protected]>
ASoC: soc-core: accept zero format at snd_soc_runtime_set_dai_fmt()
matteo.cotifava <[email protected]>
ASoC: soc-core: drop delayed_work_pending() check before flush
Weiming Shi <[email protected]>
net/sched: teql: fix NULL pointer dereference in iptunnel_xmit on TEQL slave xmit
Gal Pressman <[email protected]>
net/mlx5e: Fix DMA FIFO desync on error CQE SQ recovery
Hangbin Liu <[email protected]>
bonding: handle BOND_LINK_FAIL, BOND_LINK_BACK as valid link states
Eric Badger <[email protected]>
xprtrdma: Decrement re_receiving on the early exit paths
J. Neuschäfer <[email protected]>
powerpc: 83xx: km83xx: Fix keymile vendor prefix
Tzung-Bi Shih <[email protected]>
remoteproc: mediatek: Unprepare SCP clock during system suspend
Bjorn Andersson <[email protected]>
remoteproc: sysmon: Correct subsys_name_len type in QMI request
Christophe Leroy (CS GROUP) <[email protected]>
powerpc/uaccess: Fix inline assembly for clang build on PPC32
Takashi Iwai <[email protected]>
ALSA: usb-audio: Check max frame size for implicit feedback mode, too
Takashi Iwai <[email protected]>
ALSA: usb-audio: Avoid implicit feedback mode on DIYINHK USB Audio 2.0
Tomas Henzl <[email protected]>
scsi: ses: Fix devices attaching to different hosts
Sofia Schneider <[email protected]>
ACPI: OSI: Add DMI quirk for Acer Aspire One D255
Al Viro <[email protected]>
unshare: fix unshare_fs() handling
Ranjan Kumar <[email protected]>
scsi: mpi3mr: Add NULL checks when resetting request and reply queues
Piotr Mazek <[email protected]>
ACPI: PM: Save NVS memory on Lenovo G70-35
Jan Kiszka <[email protected]>
scsi: storvsc: Fix scheduling while atomic on PREEMPT_RT
Victor Nogueira <[email protected]>
net/sched: Only allow act_ct to bind to clsact/ingress qdiscs and shared blocks
Jiayuan Chen <[email protected]>
net: ipv6: fix panic when IPv4 route references loopback IPv6 nexthop
Fernando Fernandez Mancera <[email protected]>
net: vxlan: fix nd_tbl NULL dereference when IPv6 is disabled
Fernando Fernandez Mancera <[email protected]>
net: bridge: fix nd_tbl NULL dereference when IPv6 is disabled
Ovidiu Panait <[email protected]>
net: stmmac: Fix error handling in VLAN add and delete paths
Jakub Kicinski <[email protected]>
nfc: rawsock: cancel tx_work before socket teardown
Jakub Kicinski <[email protected]>
nfc: nci: clear NCI_DATA_EXCHANGE before calling completion callback
Jakub Kicinski <[email protected]>
nfc: nci: free skb on nci_transceive early error paths
Ian Ray <[email protected]>
net: nfc: nci: Fix zero-length proprietary notifications
Koichiro Den <[email protected]>
net: sched: avoid qdisc_reset_all_tx_gt() vs dequeue race for lockless qdiscs
Raju Rangoju <[email protected]>
amd-xgbe: fix sleep while atomic on suspend/resume
Jakub Kicinski <[email protected]>
ipv6: fix NULL pointer deref in ip6_rt_get_dev_rcu()
David Thomson <[email protected]>
xen/acpi-processor: fix _CST detection using undersized evaluation buffer
Eric Dumazet <[email protected]>
indirect_call_wrapper: do not reevaluate function pointer
Bart Van Assche <[email protected]>
wifi: wlcore: Fix a locking bug
Bart Van Assche <[email protected]>
wifi: cw1200: Fix locking in error paths
Alban Bedel <[email protected]>
can: mcp251x: fix deadlock in error path of mcp251x_open
Oliver Hartkopp <[email protected]>
can: bcm: fix locking for bcm_op runtime updates
Jiayuan Chen <[email protected]>
atm: lec: fix null-ptr-deref in lec_arp_clear_vccs
Guenter Roeck <[email protected]>
dpaa2-switch: Fix interrupt storm after receiving bad if_id in IRQ handler
Ioana Ciornei <[email protected]>
dpaa2-switch: do not clear any interrupts automatically
Vladimir Oltean <[email protected]>
net: dpaa2-switch: serialize changes to priv->mac with a mutex
Vladimir Oltean <[email protected]>
net: dpaa2-switch replace direct MAC access with dpaa2_switch_port_has_mac()
Vladimir Oltean <[email protected]>
net: dpaa2-switch: assign port_priv->mac after dpaa2_mac_connect() call
Vladimir Oltean <[email protected]>
net: dpaa2: replace dpaa2_mac_is_type_fixed() with dpaa2_mac_is_type_phy()
Chintan Vankar <[email protected]>
net: ethernet: ti: am65-cpsw-nuss/cpsw-ale: Fix multicast entry handling in ALE table
Jonathan Teh <[email protected]>
platform/x86: thinkpad_acpi: Fix errors reading battery thresholds
Paolo Abeni <[email protected]>
selftests: mptcp: more stable simult_flows tests
Junxiao Bi <[email protected]>
scsi: core: Fix refcount leak for tagset_refcnt
Lars Ellenberg <[email protected]>
drbd: fix "LOGIC BUG" in drbd_al_begin_io_nonblock()
Phillip Lougher <[email protected]>
Squashfs: check metadata block offset is within range
Davide Caratti <[email protected]>
net/sched: ets: fix divide by zero in the offload path
Jason Gunthorpe <[email protected]>
IB/mthca: Add missed mthca_unmap_user_db() for mthca_create_srq()
Vahagn Vardanian <[email protected]>
wifi: mac80211: fix NULL pointer dereference in mesh_rx_csa_frame()
Johannes Berg <[email protected]>
wifi: radiotap: reject radiotap with unknown bits
Jun Seo <[email protected]>
ALSA: usb-audio: Use correct version for UAC3 header validation
Kurt Borja <[email protected]>
platform/x86: dell-wmi: Add audio/mic mute key codes
Thorsten Blum <[email protected]>
platform/x86: dell-wmi-sysman: Don't hex dump plaintext password data
Mike Rapoport (Microsoft) <[email protected]>
x86/efi: defer freeing of boot services memory
Greg Kroah-Hartman <[email protected]>
HID: Add HID_CLAIMED_INPUT guards in raw_event callbacks missing them
Greg Kroah-Hartman <[email protected]>
can: usb: etas_es58x: correctly anchor the urb in the read bulk callback
Greg Kroah-Hartman <[email protected]>
can: ucan: Fix infinite loop from zero-length messages
Greg Kroah-Hartman <[email protected]>
can: ems_usb: ems_usb_read_bulk_callback(): check the proper length of a message
Greg Kroah-Hartman <[email protected]>
net: usb: pegasus: validate USB endpoints
Greg Kroah-Hartman <[email protected]>
net: usb: kalmia: validate USB endpoints
Greg Kroah-Hartman <[email protected]>
net: usb: kaweth: validate USB endpoints
Greg Kroah-Hartman <[email protected]>
nfc: pn533: properly drop the usb interface reference on disconnect
Jens Axboe <[email protected]>
media: dvb-core: fix wrong reinitialization of ringbuffer on reopen
Jann Horn <[email protected]>
eventpoll: Fix integer overflow in ep_loop_check_proc()
Ethan Nelson-Moore <[email protected]>
net: arcnet: com20020-pci: fix support for 2.5Mbit cards
Takashi Iwai <[email protected]>
ALSA: hda/conexant: Fix headphone jack handling on Acer Swift SF314
Andrey Vatoropin <[email protected]>
fbcon: check return value of con2fb_acquire_newinfo()
Daniel Vetter <[email protected]>
fbcon: move more common code into fb_open()
Daniel Vetter <[email protected]>
fbcon: Extract fbcon_open/release helpers
Daniel Vetter <[email protected]>
fbcon: Use delayed work for cursor
Namjae Jeon <[email protected]>
ksmbd: fix infinite loop caused by next_smb2_rcv_hdr_off reset in error paths
Gui-Dong Han <[email protected]>
hwmon: (max16065) Use READ/WRITE_ONCE to avoid compiler optimization induced race
Takashi Iwai <[email protected]>
ALSA: hda/conexant: Add quirk for HP ZBook Studio G4
Thomas Richard (TI) <[email protected]>
usb: cdns3: fix role switching during resume
Théo Lebrun <[email protected]>
usb: cdns3: call cdns_power_is_lost() only once in cdns_resume()
Hongyu Xie <[email protected]>
usb: cdns3: remove redundant if branch
Johan Hovold <[email protected]>
clk: tegra: tegra124-emc: fix device leak on set_rate()
Johan Hovold <[email protected]>
mfd: omap-usb-host: Fix OF populate on driver rebind
Uwe Kleine-König <[email protected]>
mfd: omap-usb-host: Convert to platform remove callback returning void
Johan Hovold <[email protected]>
mfd: qcom-pm8xxx: Fix OF populate on driver rebind
Uwe Kleine-König <[email protected]>
mfd: qcom-pm8xxx: Convert to platform remove callback returning void
Dmitry Baryshkov <[email protected]>
mfd: qcom-pm8xxx: switch away from using chained IRQ handlers
Johan Hovold <[email protected]>
bus: omap-ocp2scp: fix OF populate on driver rebind
Uwe Kleine-König <[email protected]>
bus: omap-ocp2scp: Convert to platform remove callback returning void
Johan Hovold <[email protected]>
drm/tegra: dsi: fix device leak on probe
Damien Le Moal <[email protected]>
ata: libata-scsi: refactor ata_scsi_translate()
Hannes Reinecke <[email protected]>
ata: libata: remove pointless VPRINTK() calls
Hannes Reinecke <[email protected]>
ata: libata-scsi: drop DPRINTK calls for cdb translation
Bart Van Assche <[email protected]>
scsi: ata: Call scsi_done() directly
Wentao Liang <[email protected]>
ARM: omap2: Fix reference count leaks in omap_control_init()
Wang Qing <[email protected]>
ARM: OMAP2+: add missing of_node_put before break and return
Johan Hovold <[email protected]>
memory: mtk-smi: fix device leak on larb probe
Uwe Kleine-König <[email protected]>
memory: mtk-smi: Convert to platform remove callback returning void
Kohei Enju <[email protected]>
bpf: Fix stack-out-of-bounds write in devmap
Mark Harmstone <[email protected]>
btrfs: fix incorrect key offset in error message in check_dev_extent_item()
Takashi Iwai <[email protected]>
ALSA: usb-audio: Use inclusive terms
Takashi Iwai <[email protected]>
ALSA: usb-audio: Cap the packet size pre-calculations
Peter Wang <[email protected]>
scsi: ufs: core: Move link recovery for hibern8 exit failure to wl_resume
Bart Van Assche <[email protected]>
scsi: ufs: core: Always initialize the UIC done completion
Geoffrey D. Bennett <[email protected]>
ALSA: usb-audio: Remove VALIDATE_RATES quirk for Focusrite devices
Jussi Laako <[email protected]>
ALSA: usb-audio: Update for native DSD support quirks
Mathias Krause <[email protected]>
scsi: lpfc: Properly set WC for DPP mapping
Ben Hutchings <[email protected]>
ip6_tunnel: Fix usage of skb_vlan_inet_prepare()
Thomas Weißschuh <[email protected]>
ARM: clean up the memset64() C wrapper
-------------
Diffstat:
.../bindings/auxdisplay/holtek,ht16k33.yaml | 2 +- Documentation/hwmon/adm1177.rst | 8 +- .../ethernet/freescale/dpaa2/mac-phy-support.rst | 9 +- Makefile | 4 +- arch/arm/include/asm/string.h | 14 +- arch/arm/mach-omap2/cm_common.c | 8 +- arch/arm/mach-omap2/control.c | 29 +- arch/arm/mach-omap2/prm_common.c | 8 +- .../boot/dts/hisilicon/hi3798cv200-poplar.dts | 2 +- arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi | 1 + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 1 - arch/mips/lib/multi3.c | 6 +- arch/parisc/include/asm/pgtable.h | 2 +- arch/parisc/kernel/head.S | 7 +- arch/powerpc/include/asm/uaccess.h | 2 +- arch/powerpc/platforms/83xx/km83xx.c | 4 +- arch/riscv/kernel/kgdb.c | 7 +- arch/s390/include/asm/barrier.h | 4 +- arch/s390/kernel/syscall.c | 2 + arch/sh/drivers/platform_early.c | 4 - arch/x86/include/asm/efi.h | 2 +- arch/x86/kernel/apic/apic.c | 6 + arch/x86/kernel/cpu/common.c | 18 +- arch/x86/kvm/mmu/mmu.c | 13 +- arch/x86/platform/efi/efi.c | 2 +- arch/x86/platform/efi/quirks.c | 55 ++- crypto/af_alg.c | 4 +- drivers/acpi/acpi_processor.c | 15 +- drivers/acpi/acpica/acevents.h | 4 + drivers/acpi/acpica/evregion.c | 6 +- drivers/acpi/acpica/evxfregn.c | 146 ++++++- drivers/acpi/ec.c | 52 ++- drivers/acpi/osi.c | 13 + drivers/acpi/osl.c | 2 +- drivers/acpi/sleep.c | 8 + drivers/ata/libata-core.c | 3 - drivers/ata/libata-sata.c | 4 +- drivers/ata/libata-scsi.c | 153 +++---- drivers/ata/libata-sff.c | 4 - drivers/ata/libata.h | 1 - drivers/base/power/runtime.c | 1 + drivers/base/property.c | 27 +- drivers/base/regmap/regmap.c | 30 +- drivers/block/drbd/drbd_actlog.c | 53 +-- drivers/block/drbd/drbd_interval.h | 5 +- drivers/bluetooth/btqca.c | 2 + drivers/bluetooth/btusb.c | 5 +- drivers/bluetooth/hci_ll.c | 2 + drivers/bus/omap-ocp2scp.c | 19 +- drivers/clk/tegra/clk-tegra124-emc.c | 2 +- drivers/comedi/drivers.c | 8 + drivers/comedi/drivers/dt2815.c | 12 + drivers/comedi/drivers/me4000.c | 16 +- drivers/comedi/drivers/me_daq.c | 35 +- drivers/comedi/drivers/ni_atmio16d.c | 3 +- drivers/cpufreq/cpufreq_conservative.c | 12 + drivers/cpufreq/cpufreq_governor.c | 3 + drivers/cpufreq/cpufreq_governor.h | 1 + drivers/cpuidle/cpuidle.c | 10 - drivers/dma/idxd/cdev.c | 10 +- drivers/dma/idxd/sysfs.c | 1 + drivers/dma/sh/rz-dmac.c | 33 +- drivers/dma/xilinx/xilinx_dma.c | 66 +-- drivers/firmware/arm_scpi.c | 5 +- drivers/firmware/efi/mokvar-table.c | 2 +- drivers/gpio/gpiolib-cdev.c | 13 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 6 +- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 2 +- drivers/gpu/drm/ast/ast_dp501.c | 2 +- drivers/gpu/drm/drm_file.c | 5 +- drivers/gpu/drm/drm_ioc32.c | 2 + drivers/gpu/drm/drm_mode_config.c | 9 +- drivers/gpu/drm/exynos/exynos_drm_drv.h | 1 + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 72 +++- drivers/gpu/drm/i915/display/intel_gmbus.c | 4 +- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 3 +- drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 26 +- drivers/gpu/drm/nouveau/nouveau_connector.c | 3 + drivers/gpu/drm/radeon/si_dpm.c | 4 +- drivers/gpu/drm/tegra/dsi.c | 6 +- drivers/hid/hid-asus.c | 15 +- drivers/hid/hid-cmedia.c | 2 +- drivers/hid/hid-creative-sb0540.c | 2 +- drivers/hid/hid-magicmouse.c | 6 +- drivers/hid/hid-mcp2221.c | 2 + drivers/hid/hid-multitouch.c | 7 + drivers/hid/hid-zydacron.c | 2 +- drivers/hid/wacom_wac.c | 10 + drivers/hwmon/adm1177.c | 54 ++- drivers/hwmon/max16065.c | 26 +- drivers/hwmon/occ/common.c | 19 +- drivers/hwmon/pmbus/isl68137.c | 7 +- drivers/hwmon/pmbus/pxe1610.c | 5 +- drivers/hwmon/pmbus/q54sj108a2.c | 19 +- drivers/hwmon/pmbus/tps53679.c | 4 +- drivers/i2c/busses/i2c-cp2615.c | 5 +- drivers/i2c/busses/i2c-fsi.c | 1 + drivers/i3c/master/mipi-i3c-hci/cmd.h | 1 + drivers/i3c/master/mipi-i3c-hci/cmd_v1.c | 2 +- drivers/i3c/master/mipi-i3c-hci/cmd_v2.c | 2 +- drivers/i3c/master/mipi-i3c-hci/core.c | 6 +- drivers/i3c/master/mipi-i3c-hci/dma.c | 4 +- drivers/iio/adc/ad7923.c | 4 +- drivers/iio/chemical/bme680_core.c | 2 +- drivers/iio/chemical/sps30_i2c.c | 2 +- drivers/iio/chemical/sps30_serial.c | 2 +- drivers/iio/dac/ad5770r.c | 2 +- drivers/iio/dac/ds4424.c | 2 +- drivers/iio/gyro/mpu3050-core.c | 50 ++- drivers/iio/gyro/mpu3050-i2c.c | 3 +- drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c | 2 + drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c | 2 + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 4 + drivers/iio/industrialio-core.c | 7 +- drivers/iio/industrialio-event.c | 9 + drivers/iio/inkern.c | 35 +- drivers/iio/light/vcnl4035.c | 18 +- drivers/iio/potentiometer/mcp4131.c | 2 +- drivers/infiniband/core/rw.c | 27 +- drivers/infiniband/hw/irdma/cm.c | 29 +- drivers/infiniband/hw/irdma/utils.c | 2 - drivers/infiniband/hw/irdma/verbs.c | 9 +- drivers/infiniband/hw/mthca/mthca_provider.c | 5 +- drivers/input/joystick/xpad.c | 2 + drivers/input/misc/uinput.c | 35 +- drivers/input/rmi4/rmi_f54.c | 4 +- drivers/input/serio/i8042-acpipnpio.h | 7 + drivers/iommu/intel/dmar.c | 3 +- drivers/irqchip/irq-gic-v3-its.c | 4 + drivers/media/dvb-core/dmxdev.c | 4 +- drivers/media/dvb-core/dvb_net.c | 3 + drivers/media/mc/mc-request.c | 5 + drivers/media/usb/uvc/uvc_driver.c | 88 ++-- drivers/media/usb/uvc/uvcvideo.h | 2 + drivers/media/v4l2-core/v4l2-ioctl.c | 5 +- drivers/memory/mtk-smi.c | 11 +- drivers/mfd/omap-usb-host.c | 11 +- drivers/mfd/qcom-pm8xxx.c | 53 +-- drivers/mmc/host/mmci_qcom_dml.c | 1 + drivers/mmc/host/sdhci-pci-gli.c | 9 + drivers/mmc/host/sdhci.c | 9 +- drivers/mmc/host/vub300.c | 2 +- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 6 +- drivers/mtd/nand/raw/cadence-nand-controller.c | 2 +- drivers/mtd/nand/raw/nand_base.c | 14 +- drivers/mtd/nand/raw/pl35x-nand-controller.c | 3 + drivers/mtd/parsers/redboot.c | 6 +- drivers/net/arcnet/com20020-pci.c | 16 +- drivers/net/bonding/bond_debugfs.c | 16 +- drivers/net/bonding/bond_main.c | 8 +- drivers/net/caif/caif_serial.c | 3 + drivers/net/can/spi/hi311x.c | 5 +- drivers/net/can/spi/mcp251x.c | 15 +- drivers/net/can/usb/ems_usb.c | 7 +- drivers/net/can/usb/etas_es58x/es58x_core.c | 7 +- drivers/net/can/usb/gs_usb.c | 11 +- drivers/net/can/usb/ucan.c | 2 +- drivers/net/dsa/bcm_sf2.c | 8 +- drivers/net/ethernet/altera/altera_tse_main.c | 1 + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 10 - drivers/net/ethernet/amd/xgbe/xgbe-main.c | 1 - drivers/net/ethernet/amd/xgbe/xgbe.h | 3 - drivers/net/ethernet/arc/emac_main.c | 11 + drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 2 +- drivers/net/ethernet/broadcom/tg3.c | 2 +- drivers/net/ethernet/cadence/macb_main.c | 18 +- drivers/net/ethernet/cadence/macb_pci.c | 10 +- drivers/net/ethernet/cadence/macb_ptp.c | 4 +- drivers/net/ethernet/faraday/ftgmac100.c | 28 +- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 7 +- drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h | 10 +- .../freescale/dpaa2/dpaa2-switch-ethtool.c | 34 +- .../net/ethernet/freescale/dpaa2/dpaa2-switch.c | 57 ++- .../net/ethernet/freescale/dpaa2/dpaa2-switch.h | 9 +- .../net/ethernet/freescale/enetc/enetc_ethtool.c | 2 + drivers/net/ethernet/google/gve/gve.h | 1 + drivers/net/ethernet/google/gve/gve_main.c | 5 +- drivers/net/ethernet/intel/e1000/e1000_main.c | 2 - drivers/net/ethernet/intel/e1000e/netdev.c | 2 - drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 14 +- drivers/net/ethernet/intel/ice/ice_common.c | 1 + drivers/net/ethernet/intel/ice/ice_ethtool.c | 35 +- drivers/net/ethernet/intel/igc/igc_main.c | 7 +- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 4 +- .../ethernet/marvell/octeontx2/af/rvu_devlink.c | 468 ++++++--------------- drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 4 +- .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 1 - drivers/net/ethernet/mellanox/mlx5/core/fw.c | 49 ++- .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 4 +- drivers/net/ethernet/microsoft/mana/gdma_main.c | 4 - drivers/net/ethernet/microsoft/mana/hw_channel.c | 77 ++-- drivers/net/ethernet/microsoft/mana/mana_en.c | 23 +- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 17 +- drivers/net/ethernet/qualcomm/qca_uart.c | 2 +- drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 11 +- .../net/ethernet/stmicro/stmmac/dwmac-loongson.c | 2 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 18 +- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 +- drivers/net/ethernet/ti/cpsw_ale.c | 9 +- drivers/net/ethernet/xilinx/xilinx_axienet.h | 4 +- drivers/net/phy/phy_device.c | 13 +- drivers/net/usb/aqc111.c | 12 +- drivers/net/usb/kalmia.c | 7 + drivers/net/usb/kaweth.c | 13 + drivers/net/usb/lan78xx.c | 8 +- drivers/net/usb/lan78xx.h | 3 + drivers/net/usb/pegasus.c | 13 +- drivers/net/usb/r8152.c | 1 + drivers/net/virtio_net.c | 1 + drivers/net/vxlan/vxlan_core.c | 11 +- .../net/wireless/broadcom/brcm80211/brcmsmac/dma.c | 2 +- drivers/net/wireless/marvell/libertas/main.c | 4 +- drivers/net/wireless/microchip/wilc1000/hif.c | 2 +- drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 2 +- drivers/net/wireless/st/cw1200/pm.c | 2 + drivers/net/wireless/ti/wlcore/main.c | 4 +- drivers/net/wireless/ti/wlcore/tx.c | 2 +- drivers/net/wireless/virt_wifi.c | 1 - drivers/nfc/nxp-nci/i2c.c | 4 +- drivers/nfc/pn533/uart.c | 14 +- drivers/nfc/pn533/usb.c | 1 + drivers/nvdimm/bus.c | 5 +- drivers/nvme/host/pci.c | 13 +- drivers/nvme/target/tcp.c | 6 +- drivers/pci/pci-driver.c | 8 - drivers/pci/pci.c | 10 +- drivers/pci/pci.h | 1 - drivers/phy/renesas/phy-rcar-gen3-usb2.c | 123 +++--- drivers/phy/ti/phy-j721e-wiz.c | 2 + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 9 +- drivers/platform/olpc/olpc-xo175-ec.c | 2 +- drivers/platform/x86/dell/dell-wmi-base.c | 6 + .../dell/dell-wmi-sysman/passwordattr-interface.c | 1 - drivers/platform/x86/intel/hid.c | 13 + drivers/platform/x86/thinkpad_acpi.c | 6 +- drivers/platform/x86/touchscreen_dmi.c | 18 + drivers/regulator/pca9450-regulator.c | 41 +- drivers/remoteproc/mtk_scp.c | 39 ++ drivers/remoteproc/qcom_sysmon.c | 2 +- drivers/scsi/ibmvscsi/ibmvfc.c | 3 +- drivers/scsi/lpfc/lpfc_init.c | 2 + drivers/scsi/lpfc/lpfc_sli.c | 36 +- drivers/scsi/lpfc/lpfc_sli4.h | 3 + drivers/scsi/mpi3mr/mpi3mr_fw.c | 32 +- drivers/scsi/scsi_scan.c | 7 +- drivers/scsi/scsi_transport_sas.c | 2 +- drivers/scsi/ses.c | 7 +- drivers/scsi/storvsc_drv.c | 5 +- drivers/scsi/ufs/ufshcd.c | 29 +- drivers/soc/bcm/bcm2835-power.c | 27 +- drivers/soc/fsl/qbman/qman.c | 24 +- drivers/spi/spi-fsl-lpspi.c | 3 +- drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 29 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 5 +- drivers/target/loopback/tcm_loop.c | 52 ++- drivers/thunderbolt/nhi.c | 2 +- drivers/tty/serial/8250/8250_dma.c | 15 + drivers/tty/serial/8250/8250_pci.c | 17 + drivers/tty/serial/8250/8250_port.c | 6 + drivers/tty/serial/uartlite.c | 1 + drivers/usb/cdns3/cdns3-gadget.c | 4 + drivers/usb/cdns3/core.c | 11 +- drivers/usb/class/cdc-acm.c | 14 + drivers/usb/class/cdc-acm.h | 2 + drivers/usb/class/cdc-wdm.c | 4 +- drivers/usb/class/usbtmc.c | 9 +- drivers/usb/common/ulpi.c | 5 +- drivers/usb/core/message.c | 100 ++++- drivers/usb/core/phy.c | 8 +- drivers/usb/core/quirks.c | 7 + drivers/usb/dwc2/gadget.c | 2 + drivers/usb/gadget/function/f_hid.c | 11 +- drivers/usb/gadget/function/f_rndis.c | 3 + drivers/usb/gadget/function/f_subset.c | 7 + drivers/usb/gadget/function/f_uac1_legacy.c | 47 ++- drivers/usb/gadget/function/f_uvc.c | 46 +- drivers/usb/gadget/function/u_ether.c | 8 +- drivers/usb/gadget/function/uvc.h | 3 + drivers/usb/gadget/function/uvc_v4l2.c | 13 +- drivers/usb/gadget/udc/dummy_hcd.c | 42 +- drivers/usb/host/ehci-brcm.c | 4 +- drivers/usb/host/xhci.c | 4 +- drivers/usb/image/mdc800.c | 6 +- drivers/usb/misc/uss720.c | 2 +- drivers/usb/misc/yurex.c | 2 +- drivers/usb/renesas_usbhs/common.c | 9 + drivers/usb/serial/io_edgeport.c | 3 + drivers/usb/serial/io_usbvend.h | 1 + drivers/usb/serial/option.c | 4 + drivers/video/fbdev/core/fbcon.c | 262 ++++++------ drivers/video/fbdev/core/fbcon.h | 4 +- drivers/video/fbdev/core/fbmem.c | 2 + drivers/xen/privcmd.c | 76 +++- drivers/xen/xen-acpi-processor.c | 7 +- fs/btrfs/disk-io.c | 4 +- fs/btrfs/ioctl.c | 3 +- fs/btrfs/tree-checker.c | 21 +- fs/btrfs/volumes.c | 5 +- fs/btrfs/zoned.c | 6 +- fs/ceph/dir.c | 15 +- fs/cifs/connect.c | 1 - fs/cifs/inode.c | 6 +- fs/cifs/smb2ops.c | 8 +- fs/erofs/zdata.c | 3 + fs/eventpoll.c | 5 +- fs/ext4/ext4.h | 1 + fs/ext4/extents.c | 22 +- fs/ext4/fast_commit.c | 17 +- fs/ext4/ialloc.c | 6 + fs/ext4/inode.c | 27 +- fs/ext4/mballoc.c | 69 ++- fs/ext4/super.c | 22 +- fs/ext4/sysfs.c | 10 +- fs/jbd2/checkpoint.c | 15 +- fs/ksmbd/mgmt/user_session.c | 4 +- fs/ksmbd/server.c | 6 +- fs/ksmbd/smb2pdu.c | 63 ++- fs/squashfs/cache.c | 3 + fs/xfs/xfs_dquot_item.c | 9 +- fs/xfs/xfs_inode_item.c | 9 +- fs/xfs/xfs_log.c | 2 + fs/xfs/xfs_mount.c | 7 +- include/acpi/acpixf.h | 142 ++++--- include/asm-generic/tlb.h | 77 +++- include/linux/dma-mapping.h | 4 +- include/linux/fbcon.h | 2 + include/linux/hugetlb.h | 17 +- include/linux/indirect_call_wrapper.h | 18 +- include/linux/irqchip/arm-gic-v3.h | 1 + include/linux/mm_types.h | 1 + include/linux/mmc/host.h | 9 +- include/linux/netfilter/ipset/ip_set.h | 2 +- include/linux/of.h | 2 + include/linux/security.h | 1 + include/linux/swapops.h | 20 +- include/linux/usb.h | 8 +- include/linux/usb/r8152.h | 1 + include/net/act_api.h | 1 + include/net/netfilter/nf_conntrack_timeout.h | 1 + include/net/netfilter/nf_tables.h | 7 +- include/net/netlink.h | 39 +- include/net/sch_generic.h | 10 + include/net/udp_tunnel.h | 2 +- include/sound/soc.h | 2 + include/trace/events/kmem.h | 8 +- include/uapi/linux/dma-buf.h | 1 + include/uapi/linux/netfilter/nf_conntrack_common.h | 4 + io_uring/io-wq.c | 2 +- io_uring/io_uring.c | 39 +- kernel/bpf/btf.c | 24 +- kernel/bpf/devmap.c | 22 +- kernel/bpf/verifier.c | 14 +- kernel/cgroup/cgroup.c | 1 + kernel/fork.c | 2 +- kernel/futex/core.c | 3 +- kernel/module.c | 7 + kernel/sched/idle.c | 39 +- kernel/sysctl.c | 2 +- kernel/time/alarmtimer.c | 2 +- kernel/time/time.c | 171 +++++++- kernel/trace/trace.c | 6 +- kernel/trace/trace_osnoise.c | 8 +- lib/bootconfig.c | 9 +- lib/crypto/chacha.c | 4 + lib/nlattr.c | 22 + mm/hugetlb.c | 141 ++++--- mm/mmu_gather.c | 33 ++ mm/rmap.c | 38 +- net/atm/lec.c | 98 +++-- net/atm/lec.h | 2 +- net/batman-adv/bat_iv_ogm.c | 3 + net/batman-adv/bat_v_elp.c | 10 +- net/batman-adv/hard-interface.c | 8 +- net/batman-adv/hard-interface.h | 1 + net/batman-adv/translation-table.c | 9 +- net/bluetooth/hidp/core.c | 16 +- net/bluetooth/l2cap_core.c | 55 ++- net/bluetooth/l2cap_sock.c | 3 + net/bluetooth/mgmt.c | 3 + net/bluetooth/sco.c | 10 +- net/bluetooth/smp.c | 13 +- net/bridge/br_arp_nd_proxy.c | 18 +- net/bridge/br_device.c | 2 +- net/bridge/br_input.c | 2 +- net/can/af_can.c | 4 +- net/can/af_can.h | 2 +- net/can/bcm.c | 1 + net/can/gw.c | 6 +- net/can/proc.c | 3 +- net/ceph/auth.c | 6 +- net/ceph/messenger_v2.c | 31 +- net/ceph/mon_client.c | 6 +- net/core/dev.c | 2 +- net/core/rtnetlink.c | 9 +- net/hsr/hsr_device.c | 32 +- net/ipv4/esp4.c | 11 +- net/ipv4/icmp.c | 4 +- net/ipv6/addrconf.c | 6 +- net/ipv6/datagram.c | 10 + net/ipv6/esp6.c | 11 +- net/ipv6/icmp.c | 3 + net/ipv6/ip6_flowlabel.c | 5 - net/ipv6/ip6_tunnel.c | 7 +- net/ipv6/ndisc.c | 3 + net/ipv6/netfilter/ip6t_rt.c | 4 + net/ipv6/route.c | 11 +- net/ipv6/seg6_iptunnel.c | 41 +- net/ipv6/xfrm6_output.c | 4 +- net/key/af_key.c | 19 +- net/l2tp/l2tp_ppp.c | 25 +- net/mac80211/debugfs.c | 14 +- net/mac80211/mesh.c | 6 + net/mctp/device.c | 17 +- net/mptcp/pm.c | 2 +- net/mptcp/pm_netlink.c | 81 ++-- net/mptcp/protocol.c | 2 + net/mptcp/protocol.h | 3 + net/mptcp/subflow.c | 15 +- net/ncsi/ncsi-aen.c | 3 +- net/ncsi/ncsi-rsp.c | 16 +- net/netfilter/ipset/ip_set_core.c | 4 +- net/netfilter/ipset/ip_set_hash_gen.h | 2 +- net/netfilter/ipset/ip_set_list_set.c | 4 +- net/netfilter/nf_conntrack_expect.c | 4 + net/netfilter/nf_conntrack_h323_asn1.c | 4 + net/netfilter/nf_conntrack_helper.c | 2 +- net/netfilter/nf_conntrack_netlink.c | 89 ++-- net/netfilter/nf_conntrack_proto_tcp.c | 10 +- net/netfilter/nf_conntrack_sip.c | 20 +- net/netfilter/nf_flow_table_offload.c | 196 ++++++--- net/netfilter/nf_tables_api.c | 12 +- net/netfilter/nfnetlink_cthelper.c | 8 +- net/netfilter/nfnetlink_log.c | 10 +- net/netfilter/nfnetlink_osf.c | 13 + net/netfilter/nfnetlink_queue.c | 4 +- net/netfilter/nft_ct.c | 11 +- net/netfilter/nft_payload.c | 6 +- net/netfilter/nft_set_pipapo.c | 59 ++- net/netfilter/nft_set_pipapo.h | 2 + net/netfilter/x_tables.c | 23 + net/netfilter/xt_CT.c | 4 + net/netfilter/xt_IDLETIMER.c | 6 + net/netfilter/xt_cgroup.c | 6 + net/netfilter/xt_dccp.c | 4 +- net/netfilter/xt_rateest.c | 5 + net/netfilter/xt_tcpudp.c | 6 +- net/netfilter/xt_time.c | 4 +- net/nfc/nci/core.c | 31 +- net/nfc/nci/data.c | 12 +- net/nfc/rawsock.c | 11 + net/openvswitch/flow_netlink.c | 2 + net/openvswitch/vport-netdev.c | 9 +- net/packet/af_packet.c | 1 + net/qrtr/af_qrtr.c | 31 +- net/rds/ib_rdma.c | 7 +- net/rfkill/core.c | 37 +- net/rose/af_rose.c | 5 + net/rxrpc/af_rxrpc.c | 6 - net/rxrpc/key.c | 2 +- net/rxrpc/server_key.c | 3 + net/sched/act_ct.c | 6 + net/sched/cls_api.c | 8 + net/sched/cls_flow.c | 10 +- net/sched/cls_fw.c | 14 +- net/sched/sch_ets.c | 12 +- net/sched/sch_hfsc.c | 4 +- net/sched/sch_teql.c | 1 + net/smc/af_smc.c | 152 +++++-- net/smc/smc.h | 34 ++ net/smc/smc_close.c | 7 +- net/smc/smc_rx.c | 9 +- net/sunrpc/cache.c | 26 +- net/sunrpc/xprtrdma/verbs.c | 7 +- net/tipc/group.c | 6 +- net/tipc/socket.c | 2 + net/tls/tls_sw.c | 10 + net/wireless/core.c | 4 +- net/wireless/core.h | 4 +- net/wireless/pmsr.c | 1 + net/wireless/radiotap.c | 4 +- net/wireless/scan.c | 14 +- net/x25/x25_in.c | 9 +- net/x25/x25_subr.c | 1 + net/xfrm/xfrm_interface_core.c | 2 +- net/xfrm/xfrm_output.c | 7 +- net/xfrm/xfrm_policy.c | 2 +- net/xfrm/xfrm_state.c | 1 + net/xfrm/xfrm_user.c | 1 + security/apparmor/apparmorfs.c | 228 ++++++---- security/apparmor/include/label.h | 16 +- security/apparmor/include/lib.h | 12 + security/apparmor/include/match.h | 1 + security/apparmor/include/policy.h | 13 +- security/apparmor/include/policy_ns.h | 2 + security/apparmor/include/policy_unpack.h | 83 ++-- security/apparmor/label.c | 12 +- security/apparmor/match.c | 58 ++- security/apparmor/policy.c | 82 +++- security/apparmor/policy_ns.c | 2 + security/apparmor/policy_unpack.c | 74 +++- security/security.c | 1 + sound/pci/ctxfi/ctdaio.c | 1 + sound/pci/hda/patch_conexant.c | 11 + sound/pci/hda/patch_realtek.c | 1 + sound/soc/amd/acp3x-rt5682-max9836.c | 9 +- sound/soc/codecs/adau1372.c | 34 +- sound/soc/fsl/fsl_easrc.c | 14 +- sound/soc/intel/catpt/device.c | 10 +- sound/soc/intel/catpt/dsp.c | 3 - sound/soc/meson/meson-codec-glue.c | 3 - sound/soc/soc-core.c | 44 +- sound/usb/caiaq/device.c | 2 +- sound/usb/endpoint.c | 10 +- sound/usb/quirks.c | 38 +- sound/usb/validate.c | 2 +- tools/bootconfig/main.c | 7 +- tools/objtool/check.c | 5 +- tools/testing/selftests/net/mptcp/simult_flows.sh | 11 +- 518 files changed, 5450 insertions(+), 2789 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/570 ARM: clean up the memset64() C wrapper
5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Weißschuh <[email protected]>
[ Upstream commit b52343d1cb47bb27ca32a3f4952cc2fd3cd165bf ]
The current logic to split the 64-bit argument into its 32-bit halves is byte-order specific and a bit clunky. Use a union instead which is easier to read and works in all cases.
GCC still generates the same machine code.
While at it, rename the arguments of the __memset64() prototype to actually reflect their semantics.
--- arch/arm/include/asm/string.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
arch/arm/include/asm/string.h +9 -5
@@ -39,13 +39,17 @@ static inline void *memset32(uint32_t *p, uint32_t v, __kernel_size_t n) }#define __HAVE_ARCH_MEMSET64 -extern void *__memset64 (uint64_t *,uint32_t low,__kernel_size_t ,uint32_t hi); +extern void *__memset64 (uint64_t *,uint32_t first,__kernel_size_t ,uint32_t second);static inline void *memset64 (uint64_t *p,uint64_t v,__kernel_size_t n) { -if (IS_ENABLED (CONFIG_CPU_LITTLE_ENDIAN )) -return __memset64 (p, v, n *8 , v >>32 ); -else -return __memset64 (p, v >>32 , n *8 , v); +union { +uint64_t val; +struct { +uint32_t first, second; + }; + } word = { .val = v }; + +return __memset64 (p, word.first, n *8 , word.second); }/*
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 2/570 ip6_tunnel: Fix usage of skb_vlan_inet_prepare()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <[email protected]>
Backports of commit 81c734dae203 "ip6_tunnel: use skb_vlan_inet_prepare() in __ip6_tnl_rcv()" broke IPv6 tunnelling in stable branches 5.10-6.12 inclusive. This is because the return value of skb_vlan_inet_prepare() had the opposite sense (0 for error rather than for success) before commit 9990ddf47d416 "net: tunnel: make skb_vlan_inet_prepare() return drop reasons".
For branches including commit c504e5c2f964 "net: skb: introduce kfree_skb_reason()" etc. (i.e. 6.1 and newer) it was simple to backport commit 9990ddf47d416, but for 5.10 and 5.15 that doesn't seem to be practical.
So just reverse the sense of the return value test here.
--- net/ipv6/ip6_tunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv6/ip6_tunnel.c +1 -1
@@ -846,7 +846,7 @@ static int __ip6_tnl_rcv(struct ip6_tnl *tunnel, struct sk_buff *skb,skb_reset_network_header (skb); -if (skb_vlan_inet_prepare (skb, true)) { +if (!skb_vlan_inet_prepare (skb, true)) {DEV_STATS_INC (tunnel->dev, rx_length_errors);DEV_STATS_INC (tunnel->dev, rx_errors); goto drop;
Signature · 1 line
2.51.0
Re: [PATCH 5.15 002/570] ip6_tunnel: Fix usage of skb_vlan_inet_prepare()
Hi Ben, Greg, Sasha,
Quoted 13 lines · Greg Kroah-Hartman
5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <[email protected]>
Backports of commit
81c734dae203"ip6_tunnel: useskb_vlan_inet_prepare()in__ip6_tnl_rcv()" broke IPv6 tunnelling in stable branches 5.10-6.12 inclusive. This is because the return value ofskb_vlan_inet_prepare()had the opposite sense (0 for error rather than for success) before commit9990ddf47d416"net: tunnel: makeskb_vlan_inet_prepare()return drop reasons".
Quoted 4 lines
For branches including commit
c504e5c2f964"net: skb: introducekfree_skb_reason()" etc. (i.e. 6.1 and newer) it was simple to backport commit9990ddf47d416, but for 5.10 and 5.15 that doesn't seem to be practical.
We have seen ltp-net failing after this LTS update on downstream kernel(UEK)
mainline : v5.17-rc1 - c504e5c2f964 net: skb:
introduce kfree_skb_reason()
stable-5.15 : v5.15.58 - 5158e18225c0 net: skb:
introduce kfree_skb_reason()
So this is not needed for 5.15.y. This needs to be reverted for 5.15.y, looks good for 5.10.y
Thanks to Alex for reporting this.
Ben, thoughts ?
Regards,
Harshit
Quoted 24 lines
So just reverse the sense of the return value test here.
Fixes f9c5c5b791d3 ("ip6_tunnel: use skb_vlan_inet_prepare() in __ip6_tnl_rcv()")Fixes 64c71d60a21a ("ip6_tunnel: use skb_vlan_inet_prepare() in __ip6_tnl_rcv()")Signed-off-by Ben Hutchings <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- net/ipv6/ip6_tunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/ipv6/ip6_tunnel.c +1
-1@@ -846,7 +846,7 @@ static int __ip6_tnl_rcv(struct ip6_tnl *tunnel, struct sk_buff *skb,skb_reset_network_header (skb); -if (skb_vlan_inet_prepare (skb, true)) { +if (!skb_vlan_inet_prepare (skb, true)) {DEV_STATS_INC (tunnel->dev, rx_length_errors);DEV_STATS_INC (tunnel->dev, rx_errors); goto drop;
Re: [PATCH 5.15 002/570] ip6_tunnel: Fix usage of skb_vlan_inet_prepare()
Quoted 21 lines · Harshit Mogalapalli
Hi Ben, Greg, Sasha,
Quoted 13 lines · Greg Kroah-Hartman
5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <[email protected]>
Backports of commit
81c734dae203"ip6_tunnel: useskb_vlan_inet_prepare()in__ip6_tnl_rcv()" broke IPv6 tunnelling in stable branches 5.10-6.12 inclusive. This is because the return value ofskb_vlan_inet_prepare()had the opposite sense (0 for error rather than for success) before commit9990ddf47d416"net: tunnel: makeskb_vlan_inet_prepare()return drop reasons".Quoted 4 lines
For branches including commit
c504e5c2f964"net: skb: introducekfree_skb_reason()" etc. (i.e. 6.1 and newer) it was simple to backport commit9990ddf47d416, but for 5.10 and 5.15 that doesn't seem to be practical.
Quoted 8 lines
We have seen ltp-net failing after this LTS update on downstream kernel(UEK)
mainline : v5.17-rc1 - c504e5c2f964 net: skb:introduce
kfree_skb_reason()
stable-5.15 : v5.15.58 -5158e18225c0net: skb:
introducekfree_skb_reason()So this is not needed for 5.15.y.
I don't know about that test failure, but your analysis is wrong. The dependency of the original fix was commit 9990ddf47d416 "net: tunnel:
make skb_vlan_inet_prepare() return drop reasons" which changed the sense of skb_vlan_inet_prepare()'s return value and has not been backported to 5.15. That in turn depended on the commit you are looking at.
Quoted 1 line
This needs to be reverted for 5.15.y, looks good for 5.10.y
[...]
I started looking at how to fix the regression in 5.10, which does not have a backport of commit c504e5c2f964, and did not notice that it had been backported to 5.15. So this patch probably could be reverted and replaced with a backport of commit 9990ddf47d416. But simply reverting it would not be correct.
Ben.
Signature · 2 lines
Ben Hutchings - Debian developer, member of kernel, installer and LTS teams
Re: [PATCH 5.15 002/570] ip6_tunnel: Fix usage of skb_vlan_inet_prepare()
Hi Ben,
Quoted 21 lines
Quoted 21 lines
Quoted 9 lines
From: Ben Hutchings <[email protected]>
Backports of commit
81c734dae203"ip6_tunnel: useskb_vlan_inet_prepare()in__ip6_tnl_rcv()" broke IPv6 tunnelling in stable branches 5.10-6.12 inclusive. This is because the return value ofskb_vlan_inet_prepare()had the opposite sense (0 for error rather than for success) before commit9990ddf47d416"net: tunnel: makeskb_vlan_inet_prepare()return drop reasons".Quoted 4 lines
For branches including commit
c504e5c2f964"net: skb: introducekfree_skb_reason()" etc. (i.e. 6.1 and newer) it was simple to backport commit9990ddf47d416, but for 5.10 and 5.15 that doesn't seem to be practical.We have seen ltp-net failing after this LTS update on downstream kernel(UEK)
mainline : v5.17-rc1 - c504e5c2f964 net: skb: introduce kfree_skb_reason() stable-5.15 : v5.15.58 - 5158e18225c0 net: skb:introduce
kfree_skb_reason()
Quoted 8 lines
Quoted 1 line
So this is not needed for 5.15.y.
I don't know about that test failure, but your analysis is wrong. The dependency of the original fix was commit
9990ddf47d416"net: tunnel:
makeskb_vlan_inet_prepare()return drop reasons" which changed the sense of skb_vlan_inet_prepare()'s return value and has not been backported to 5.15. That in turn depended on the commit you are looking at.
Thanks a lot for explaining, We had 9990ddf47d416 for our kernels hence it reasons out why we saw failure after pulling this patch.
Thanks for the help.
Quoted 10 lines
Quoted 2 lines
This needs to be reverted for 5.15.y, looks good for 5.10.y
[...]
I started looking at how to fix the regression in 5.10, which does not have a backport of commit
c504e5c2f964, and did not notice that it had been backported to 5.15. So this patch probably could be reverted and replaced with a backport of commit9990ddf47d416. But simply reverting it would not be correct.
Sure maybe 5.15.y doesn't really have the LTP-net stress problem. I got confused with this part of commit message:
"""
Quoted 4 lines
Quoted 4 lines
For branches including commit
c504e5c2f964"net: skb: introducekfree_skb_reason()" etc. (i.e. 6.1 and newer) it was simple to backport commit9990ddf47d416, but for 5.10 and 5.15 that doesn't seem to be practical.
"""
thanks for explaining and sorry for the noise.
Regards,
Harshit
Quoted 2 lines
Ben.
Greg Kroah-Hartman
maintainerPATCH 3/570 scsi: lpfc: Properly set WC for DPP mapping
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mathias Krause <[email protected]>
[ Upstream commit bffda93a51b40afd67c11bf558dc5aae83ca0943 ]
Using set_memory_wc() to enable write-combining for the DPP portion of the MMIO mapping is wrong as set_memory_*() is meant to operate on RAM only, not MMIO mappings. In fact, as used currently triggers a BUG_ON() with enabled CONFIG_DEBUG_VIRTUAL.
Simply map the DPP region separately and in addition to the already existing mappings, avoiding any possible negative side effects for these.
--- drivers/scsi/lpfc/lpfc_init.c | 2 ++ drivers/scsi/lpfc/lpfc_sli.c | 36 +++++++++++++++++++++++++++++------ drivers/scsi/lpfc/lpfc_sli4.h | 3 +++ 3 files changed, 35 insertions(+), 6 deletions(-)
drivers/scsi/lpfc/lpfc_init.c +2 -0
@@ -11812,6 +11812,8 @@ lpfc_sli4_pci_mem_unset(struct lpfc_hba *phba)iounmap (phba->sli4_hba.conf_regs_memmap_p);if (phba->sli4_hba.dpp_regs_memmap_p)iounmap (phba->sli4_hba.dpp_regs_memmap_p); +if (phba->sli4_hba.dpp_regs_memmap_wc_p) +iounmap (phba->sli4_hba.dpp_regs_memmap_wc_p);break ;case LPFC_SLI_INTF_IF_TYPE_1 :default :
drivers/scsi/lpfc/lpfc_sli.c +30 -6
@@ -16161,6 +16161,32 @@ lpfc_dual_chute_pci_bar_map(struct lpfc_hba *phba, uint16_t pci_barset)return NULL ; } +static __maybe_unused void __iomem * +lpfc_dpp_wc_map (struct lpfc_hba *phba,uint8_t dpp_barset) +{ + +/* DPP region is supposed to cover 64-bit BAR2 */ +if (dpp_barset !=WQ_PCI_BAR_4_AND_5 ) { +lpfc_log_msg (phba,KERN_WARNING ,LOG_INIT , +"3273 dpp_barset x%x != WQ_PCI_BAR_4_AND_5\n" , + dpp_barset); +return NULL ; + } + +if (!phba->sli4_hba.dpp_regs_memmap_wc_p) { +void __iomem *dpp_map; + + dpp_map =ioremap_wc (phba->pci_bar2_map, +pci_resource_len (phba->pcidev, +PCI_64BIT_BAR4 )); + +if (dpp_map) + phba->sli4_hba.dpp_regs_memmap_wc_p = dpp_map; + } + +return phba->sli4_hba.dpp_regs_memmap_wc_p; +} +/** * lpfc_modify_hba_eq_delay - Modify Delay Multiplier on EQs * @phba: HBA structure that EQs are on.
@@ -17071,9 +17097,6 @@ lpfc_wq_create(struct lpfc_hba *phba, struct lpfc_queue *wq,uint8_t dpp_barset;uint32_t dpp_offset;uint8_t wq_create_version; -#ifdef CONFIG_X86 -unsigned long pg_addr; -#endif /* sanity check on queue memory */ if (!wq || !cq)
@@ -17259,14 +17282,15 @@ lpfc_wq_create(struct lpfc_hba *phba, struct lpfc_queue *wq,#ifdef CONFIG_X86 /* Enable combined writes for DPP aperture */ - pg_addr = (unsigned long )(wq->dpp_regaddr) &PAGE_MASK ; - rc =set_memory_wc (pg_addr,1 ); -if (rc) { + bar_memmap_p =lpfc_dpp_wc_map (phba, dpp_barset); +if (!bar_memmap_p) {lpfc_printf_log (phba,KERN_ERR ,LOG_INIT ,"3272 Cannot setup Combined " "Write on WQ[%d] - disable DPP\n" , wq->queue_id); phba->cfg_enable_dpp =0 ; + }else { + wq->dpp_regaddr = bar_memmap_p + dpp_offset; }#else phba->cfg_enable_dpp =0 ;
drivers/scsi/lpfc/lpfc_sli4.h +3 -0
@@ -781,6 +781,9 @@ struct lpfc_sli4_hba {void __iomem *dpp_regs_memmap_p;/* Kernel memory mapped address for * dpp registers */ +void __iomem *dpp_regs_memmap_wc_p;/* Kernel memory mapped address for +* dpp registers with write combining +*/ union { struct { /* IF Type 0, BAR 0 PCI cfg space reg mem map */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 4/570 ALSA: usb-audio: Update for native DSD support quirks
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jussi Laako <[email protected]>
[ Upstream commit f7fea075edfa085c25eb34c44ceacf3602537f98 ]
Maintenance patch for native DSD support.
Remove incorrect T+A device quirks. Move set of device quirks to vendor quirks. Add set of missing device and vendor quirks.
Stable-dep-of: a8cc55bf81a4 ("ALSA: usb-audio: Remove VALIDATE_RATES quirk for Focusrite devices")
--- sound/usb/quirks.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-)
sound/usb/quirks.c +28 -6
@@ -1631,8 +1631,10 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip,/* XMOS based USB DACs */ switch (chip->usb_id) { -case USB_ID (0x1511 ,0x0037 ):/* AURALiC VEGA */ -case USB_ID (0x21ed ,0xd75a ):/* Accuphase DAC-60 option card */ +case USB_ID (0x139f ,0x5504 ):/* Nagra DAC */ +case USB_ID (0x20b1 ,0x3089 ):/* Mola-Mola DAC */ +case USB_ID (0x2522 ,0x0007 ):/* LH Labs Geek Out 1V5 */ +case USB_ID (0x2522 ,0x0009 ):/* LH Labs Geek Pulse X Inifinity 2V0 */ case USB_ID (0x2522 ,0x0012 ):/* LH Labs VI DAC Infinity */ case USB_ID (0x2772 ,0x0230 ):/* Pro-Ject Pre Box S2 Digital */ if (fp->altsetting ==2 )
@@ -1642,14 +1644,18 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip,case USB_ID (0x0d8c ,0x0316 ):/* Hegel HD12 DSD */ case USB_ID (0x10cb ,0x0103 ):/* The Bit Opus #3; with fp->dsd_raw */ case USB_ID (0x16d0 ,0x06b2 ):/* NuPrime DAC-10 */ -case USB_ID (0x16d0 ,0x09dd ):/* Encore mDSD */ +case USB_ID (0x16d0 ,0x06b4 ):/* NuPrime Audio HD-AVP/AVA */ case USB_ID (0x16d0 ,0x0733 ):/* Furutech ADL Stratos */ +case USB_ID (0x16d0 ,0x09d8 ):/* NuPrime IDA-8 */ case USB_ID (0x16d0 ,0x09db ):/* NuPrime Audio DAC-9 */ +case USB_ID (0x16d0 ,0x09dd ):/* Encore mDSD */ case USB_ID (0x1db5 ,0x0003 ):/* Bryston BDA3 */ +case USB_ID (0x20a0 ,0x4143 ):/* WaveIO USB Audio 2.0 */ case USB_ID (0x22e1 ,0xca01 ):/* HDTA Serenade DSD */ case USB_ID (0x249c ,0x9326 ):/* M2Tech Young MkIII */ case USB_ID (0x2616 ,0x0106 ):/* PS Audio NuWave DAC */ case USB_ID (0x2622 ,0x0041 ):/* Audiolab M-DAC+ */ +case USB_ID (0x278b ,0x5100 ):/* Rotel RC-1590 */ case USB_ID (0x27f7 ,0x3002 ):/* W4S DAC-2v2SE */ case USB_ID (0x29a2 ,0x0086 ):/* Mutec MC3+ USB */ case USB_ID (0x6b42 ,0x0042 ):/* MSB Technology */
@@ -1659,9 +1665,6 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip,/* Amanero Combo384 USB based DACs with native DSD support */ case USB_ID (0x16d0 ,0x071a ):/* Amanero - Combo384 */ -case USB_ID (0x2ab6 ,0x0004 ):/* T+A DAC8DSD-V2.0, MP1000E-V2.0, MP2000R-V2.0, MP2500R-V2.0, MP3100HV-V2.0 */ -case USB_ID (0x2ab6 ,0x0005 ):/* T+A USB HD Audio 1 */ -case USB_ID (0x2ab6 ,0x0006 ):/* T+A USB HD Audio 2 */ if (fp->altsetting ==2 ) {switch (le16_to_cpu (chip->dev->descriptor.bcdDevice)) {case 0x199 :
@@ -1817,6 +1820,9 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { QUIRK_FLAG_IFACE_DELAY),DEVICE_FLG (0x0644 ,0x805f ,/* TEAC Model 12 */ QUIRK_FLAG_FORCE_IFACE_RESET ), +DEVICE_FLG (0x0644 ,0x806b ,/* TEAC UD-701 */ +QUIRK_FLAG_ITF_USB_DSD_DAC |QUIRK_FLAG_CTL_MSG_DELAY | +QUIRK_FLAG_IFACE_DELAY ),DEVICE_FLG (0x06f8 ,0xb000 ,/* Hercules DJ Console (Windows Edition) */ QUIRK_FLAG_IGNORE_CTL_ERROR ), DEVICE_FLG(0x06f8, 0xd002, /* Hercules DJ Console (Macintosh Edition) */
@@ -1871,6 +1877,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { QUIRK_FLAG_ITF_USB_DSD_DAC | QUIRK_FLAG_CTL_MSG_DELAY),DEVICE_FLG (0x154e ,0x3006 ,/* Marantz SA-14S1 */ QUIRK_FLAG_ITF_USB_DSD_DAC |QUIRK_FLAG_CTL_MSG_DELAY ), +DEVICE_FLG (0x154e ,0x300b ,/* Marantz SA-KI RUBY / SA-12 */ +QUIRK_FLAG_DSD_RAW ),DEVICE_FLG (0x154e ,0x500e ,/* Denon DN-X1600 */ QUIRK_FLAG_IGNORE_CLOCK_SOURCE ), DEVICE_FLG(0x1686, 0x00dd, /* Zoom R16/24 */
@@ -1925,6 +1933,10 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { QUIRK_FLAG_SHARE_MEDIA_DEVICE | QUIRK_FLAG_ALIGN_TRANSFER),DEVICE_FLG (0x21b4 ,0x0081 ,/* AudioQuest DragonFly */ QUIRK_FLAG_GET_SAMPLE_RATE ), +DEVICE_FLG (0x21b4 ,0x0230 ,/* Ayre QB-9 Twenty */ +QUIRK_FLAG_DSD_RAW ), +DEVICE_FLG (0x21b4 ,0x0232 ,/* Ayre QX-5 Twenty */ +QUIRK_FLAG_DSD_RAW ),DEVICE_FLG (0x2522 ,0x0007 ,/* LH Labs Geek Out HD Audio 1V5 */ QUIRK_FLAG_SET_IFACE_FIRST ), DEVICE_FLG(0x262a, 0x9302, /* ddHiFi TC44C */
@@ -1967,12 +1979,18 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { QUIRK_FLAG_VALIDATE_RATES),VENDOR_FLG (0x1235 ,/* Focusrite Novation */ QUIRK_FLAG_VALIDATE_RATES ), +VENDOR_FLG (0x1511 ,/* AURALiC */ +QUIRK_FLAG_DSD_RAW ),VENDOR_FLG (0x152a ,/* Thesycon devices */ QUIRK_FLAG_DSD_RAW ), +VENDOR_FLG (0x18d1 ,/* iBasso devices */ +QUIRK_FLAG_DSD_RAW ),VENDOR_FLG (0x1de7 ,/* Phoenix Audio */ QUIRK_FLAG_GET_SAMPLE_RATE ),VENDOR_FLG (0x20b1 ,/* XMOS based devices */ QUIRK_FLAG_DSD_RAW ), +VENDOR_FLG (0x21ed ,/* Accuphase Laboratory */ +QUIRK_FLAG_DSD_RAW ),VENDOR_FLG (0x22d9 ,/* Oppo */ QUIRK_FLAG_DSD_RAW ), VENDOR_FLG(0x23ba, /* Playback Design */
@@ -1988,10 +2006,14 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { QUIRK_FLAG_DSD_RAW),VENDOR_FLG (0x2ab6 ,/* T+A devices */ QUIRK_FLAG_DSD_RAW ), +VENDOR_FLG (0x2d87 ,/* Cayin device */ +QUIRK_FLAG_DSD_RAW ),VENDOR_FLG (0x3336 ,/* HEM devices */ QUIRK_FLAG_DSD_RAW ),VENDOR_FLG (0x3353 ,/* Khadas devices */ QUIRK_FLAG_DSD_RAW ), +VENDOR_FLG (0x35f4 ,/* MSB Technology */ +QUIRK_FLAG_DSD_RAW ),VENDOR_FLG (0x3842 ,/* EVGA */ QUIRK_FLAG_DSD_RAW ), VENDOR_FLG(0xc502, /* HiBy devices */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 5/570 ALSA: usb-audio: Remove VALIDATE_RATES quirk for Focusrite devices
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geoffrey D. Bennett <[email protected]>
[ Upstream commit a8cc55bf81a45772cad44c83ea7bb0e98431094a ]
Remove QUIRK_FLAG_VALIDATE_RATES for Focusrite. With the previous commit, focusrite_valid_sample_rate() produces correct rate tables without USB probing.
QUIRK_FLAG_VALIDATE_RATES sends SET_CUR requests for each rate (~25ms each) and leaves the device at 192kHz. This is a problem because that
rate: 1) disables the internal mixer, so outputs are silent until an application opens the PCM and sets a lower rate, and 2) the Air and Safe modes get disabled.
--- sound/usb/quirks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/quirks.c +1 -1
@@ -1978,7 +1978,7 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {VENDOR_FLG (0x07fd ,/* MOTU */ QUIRK_FLAG_VALIDATE_RATES ),VENDOR_FLG (0x1235 ,/* Focusrite Novation */ -QUIRK_FLAG_VALIDATE_RATES ), +0 ),VENDOR_FLG (0x1511 ,/* AURALiC */ QUIRK_FLAG_DSD_RAW ), VENDOR_FLG(0x152a, /* Thesycon devices */
Signature · 1 line
2.51.0
Re: [PATCH 5.15 005/570] ALSA: usb-audio: Remove VALIDATE_RATES quirk for Focusrite devices
Quoted 11 lines · Greg Kroah-Hartman
5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geoffrey D. Bennett <[email protected]>
[ Upstream commit
a8cc55bf81a45772cad44c83ea7bb0e98431094a]Remove
QUIRK_FLAG_VALIDATE_RATESfor Focusrite. With the previous commit,focusrite_valid_sample_rate()produces correct rate tables without USB probing.
Hi Greg,
This commit depends on its predecessor 24d2d3c5f940 ("ALSA: usb-audio:
Improve Focusrite sample rate filtering") which was not picked up for stable because it didn't have a Fixes tag. It has been added to 6.19 and 6.18 but not 6.12, 6.6, 6.1, 5.15.
Without the rate filtering patch, the Focusrite Scarlett 18i8 3rd Gen gets all sample rates advertised on every altsetting instead of the correct per-altsetting subset.
There are also subsequent fixes:
a0dafdbd1049 ALSA: usb-audio: Exclude Scarlett 2i2 1st Gen (8016) from SKIP_IFACE_SETUP f025ac8c698a ALSA: usb-audio: Exclude Scarlett Solo 1st Gen from SKIP_IFACE_SETUP 990a8b0732cf ALSA: usb-audio: Exclude Scarlett 2i4 1st Gen from SKIP_IFACE_SETUP 8780f561f671 ALSA: usb-audio: Exclude Scarlett 2i2 1st Gen from SKIP_IFACE_SETUP
and a just-submitted fix for the Scarlett 18i20 1st Gen.
Regards,
Geoffrey.
Sasha Levin
maintainerRe: [PATCH 5.15 005/570] ALSA: usb-audio: Remove VALIDATE_RATES quirk for Focusrite devices
Quoted 3 lines · Geoffrey D. Bennett
This commit depends on its predecessor
24d2d3c5f940("ALSA: usb-audio:
Improve Focusrite sample rate filtering") which was not picked up for stable because it didn't have a Fixes tag.
Dropped from the 5.15 queue along with its dependency:
- "ALSA: usb-audio: Update for native DSD support quirks"
Thanks.
Greg Kroah-Hartman
maintainerPATCH 6/570 scsi: ufs: core: Always initialize the UIC done completion
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bart Van Assche <[email protected]>
[ Upstream commit b1e8c53749adb795bfb0bf4e2f7836e26684bb90 ]
Simplify __ufshcd_send_uic_cmd() by always initializing the uic_cmd::done completion. This is fine since the time required to initialize a completion is small compared to the time required to process an UIC command.
Stable-dep-of: 62c015373e1c ("scsi: ufs: core: Move link recovery for hibern8 exit failure to wl_resume")
--- drivers/scsi/ufs/ufshcd.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/scsi/ufs/ufshcd.c +4 -7
@@ -2300,13 +2300,11 @@ ufshcd_wait_for_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd)* __ufshcd_send_uic_cmd - Send UIC commands and retrieve the result * @hba: per adapter instance * @uic_cmd: UIC command -* @completion: initialize the completion only if this is set to true * * Returns 0 only if success. */ static int -__ufshcd_send_uic_cmd (struct ufs_hba *hba,struct uic_command *uic_cmd, -bool completion) +__ufshcd_send_uic_cmd (struct ufs_hba *hba,struct uic_command *uic_cmd) {lockdep_assert_held (&hba->uic_cmd_mutex);
@@ -2316,8 +2314,7 @@ __ufshcd_send_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd,return -EIO ; } -if (completion) -init_completion (&uic_cmd->done); +init_completion (&uic_cmd->done); uic_cmd->cmd_active =1 ;ufshcd_dispatch_uic_cmd (hba, uic_cmd);
@@ -2340,7 +2337,7 @@ int ufshcd_send_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd)mutex_lock (&hba->uic_cmd_mutex);ufshcd_add_delay_before_dme_cmd (hba); - ret =__ufshcd_send_uic_cmd (hba, uic_cmd, true); + ret =__ufshcd_send_uic_cmd (hba, uic_cmd);if (!ret) ret =ufshcd_wait_for_uic_cmd (hba, uic_cmd);
@@ -3969,7 +3966,7 @@ static int ufshcd_uic_pwr_ctrl(struct ufs_hba *hba, struct uic_command *cmd) reenable_intr = true; }spin_unlock_irqrestore (hba->host->host_lock, flags); - ret =__ufshcd_send_uic_cmd (hba, cmd, false); + ret =__ufshcd_send_uic_cmd (hba, cmd);if (ret) { dev_err(hba->dev, "pwr ctrl cmd 0x%x with mode 0x%x uic error %d\n",
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 7/570 scsi: ufs: core: Move link recovery for hibern8 exit failure to wl_resume
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Wang <[email protected]>
[ Upstream commit 62c015373e1cdb1cdca824bd2dbce2dac0819467 ]
Move the link recovery trigger from ufshcd_uic_pwr_ctrl() to __ufshcd_wl_resume(). Ensure link recovery is only attempted when hibern8 exit fails during resume, not during hibern8 enter in suspend. Improve error handling and prevent unnecessary link recovery attempts.
--- drivers/scsi/ufs/ufshcd.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/scsi/ufs/ufshcd.c +9 -9
@@ -4018,14 +4018,6 @@ static int ufshcd_uic_pwr_ctrl(struct ufs_hba *hba, struct uic_command *cmd)spin_unlock_irqrestore (hba->host->host_lock, flags);mutex_unlock (&hba->uic_cmd_mutex); -/* -* If the h8 exit fails during the runtime resume process, it becomes -* stuck and cannot be recovered through the error handler. To fix -* this, use link recovery instead of the error handler. -*/ -if (ret && hba->pm_op_in_progress) - ret =ufshcd_link_recovery (hba); -return ret; }
@@ -8914,7 +8906,15 @@ static int __ufshcd_wl_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op) }else {dev_err (hba->dev,"%s: hibern8 exit failed %d\n" , __func__, ret); - goto vendor_suspend; +/* +* If the h8 exit fails during the runtime resume +* process, it becomes stuck and cannot be recovered +* through the error handler. To fix this, use link +* recovery instead of the error handler. +*/ + ret =ufshcd_link_recovery (hba); +if (ret) + goto vendor_suspend; } }else if (ufshcd_is_link_off (hba)) {/*
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 8/570 ALSA: usb-audio: Cap the packet size pre-calculations
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 7fe8dec3f628e9779f1631576f8e693370050348 ]
We calculate the possible packet sizes beforehand for adaptive and synchronous endpoints, but we didn't take care of the max frame size for those pre-calculated values. When a device or a bus limits the packet size, a high sample rate or a high number of channels may lead to the packet sizes that are larger than the given limit, which results in an error from the USB core at submitting URBs.
As a simple workaround, just add the sanity checks of pre-calculated packet sizes to have the upper boundary of ep->maxframesize.
--- sound/usb/endpoint.c | 3 +++ 1 file changed, 3 insertions(+)
sound/usb/endpoint.c +3 -0
@@ -1387,6 +1387,9 @@ int snd_usb_endpoint_set_params(struct snd_usb_audio *chip, goto unlock; } + ep->packsize[0 ] =min (ep->packsize[0 ], ep->maxframesize); + ep->packsize[1 ] =min (ep->packsize[1 ], ep->maxframesize); +/* calculate the frequency in 16.16 format */ ep->freqm = ep->freqn; ep->freqshift =INT_MIN ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 9/570 ALSA: usb-audio: Use inclusive terms
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 4e9113c533acee2ba1f72fd68ee6ecd36b64484e ]
Replace the remaining with inclusive terms; it's only this function name we overlooked at the previous conversion.
--- sound/usb/endpoint.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/usb/endpoint.c +3 -3
@@ -159,8 +159,8 @@ int snd_usb_endpoint_implicit_feedback_sink(struct snd_usb_endpoint *ep)* This won't be used for implicit feedback which takes the packet size * returned from the sync source */ -static int slave_next_packet_size (struct snd_usb_endpoint *ep, -unsigned int avail) +static int synced_next_packet_size (struct snd_usb_endpoint *ep, +unsigned int avail) {unsigned long flags;unsigned int phase;
@@ -229,7 +229,7 @@ int snd_usb_endpoint_next_packet_size(struct snd_usb_endpoint *ep, }if (ep->sync_source) -return slave_next_packet_size (ep, avail); +return synced_next_packet_size (ep, avail);else return next_packet_size (ep, avail); }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 10/570 btrfs: fix incorrect key offset in error message in check_dev_extent_item()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Harmstone <[email protected]>
[ Upstream commit 511dc8912ae3e929c1a182f5e6b2326516fd42a0 ]
Fix the error message in check_dev_extent_item(), when an overlapping stripe is encountered. For dev extents, objectid is the disk number and offset the physical address, so prev_key->objectid should actually be prev_key->offset.
(I can't take any credit for this one - this was discovered by Chris and his friend Claude.)
--- fs/btrfs/tree-checker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/tree-checker.c +1 -1
@@ -1680,7 +1680,7 @@ static int check_dev_extent_item(const struct extent_buffer *leaf,if (unlikely (prev_key->offset + prev_len > key->offset)) {generic_err (leaf, slot,"dev extent overlap, prev offset %llu len %llu current offset %llu" , - prev_key->objectid, prev_len, key->offset); + prev_key->offset, prev_len, key->offset);return -EUCLEAN ; } }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 11/570 bpf: Fix stack-out-of-bounds write in devmap
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kohei Enju <[email protected]>
[ Upstream commit b7bf516c3ecd9a2aae2dc2635178ab87b734fef1 ]
get_upper_ifindexes() iterates over all upper devices and writes their indices into an array without checking bounds.
Also the callers assume that the max number of upper devices is MAX_NEST_DEV and allocate excluded_devices[1+MAX_NEST_DEV] on the stack, but that assumption is not correct and the number of upper devices could be larger than MAX_NEST_DEV (e.g., many macvlans), causing a stack-out-of-bounds write.
Add a max parameter to get_upper_ifindexes() to avoid the issue. When there are too many upper devices, return -EOVERFLOW and abort the redirect.
To reproduce, create more than MAX_NEST_DEV(8) macvlans on a device with an XDP program attached using BPF_F_BROADCAST | BPF_F_EXCLUDE_INGRESS. Then send a packet to the device to trigger the XDP redirect path.
--- kernel/bpf/devmap.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
kernel/bpf/devmap.c +17 -5
@@ -570,18 +570,22 @@ static inline bool is_ifindex_excluded(int *excluded, int num_excluded, int ifin }/* Get ifindex of each upper device. 'indexes' must be able to hold at -* least MAX_NEST_DEV elements. -* Returns the number of ifindexes added. +* least 'max' elements. +* Returns the number of ifindexes added, or -EOVERFLOW if there are too +* many upper devices. */ -static int get_upper_ifindexes (struct net_device *dev,int *indexes) +static int get_upper_ifindexes (struct net_device *dev,int *indexes,int max) {struct net_device *upper;struct list_head *iter;int n =0 ;netdev_for_each_upper_dev_rcu (dev, upper, iter) { +if (n >= max) +return -EOVERFLOW ; indexes[n++] = upper->ifindex; } +return n; }
@@ -597,7 +601,11 @@ int dev_map_enqueue_multi(struct xdp_frame *xdpf, struct net_device *dev_rx,int err;if (exclude_ingress) { - num_excluded =get_upper_ifindexes (dev_rx, excluded_devices); + num_excluded =get_upper_ifindexes (dev_rx, excluded_devices, +ARRAY_SIZE (excluded_devices) -1 ); +if (num_excluded <0 ) +return num_excluded; + excluded_devices[num_excluded++] = dev_rx->ifindex; }
@@ -715,7 +723,11 @@ int dev_map_redirect_multi(struct net_device *dev, struct sk_buff *skb,int err;if (exclude_ingress) { - num_excluded =get_upper_ifindexes (dev, excluded_devices); + num_excluded =get_upper_ifindexes (dev, excluded_devices, +ARRAY_SIZE (excluded_devices) -1 ); +if (num_excluded <0 ) +return num_excluded; + excluded_devices[num_excluded++] = dev->ifindex; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 12/570 memory: mtk-smi: Convert to platform remove callback returning void
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 08c1aeaa45ce0fd18912e92c6705586c8aa5240f ]
The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is ignored (apart from emitting a warning) and this typically results in resource leaks.
To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new(), which already returns void. Eventually after all drivers are converted, .remove_new() will be renamed to .remove().
Trivially convert this driver from always returning zero in the remove callback to the void returning variant.
Stable-dep-of: 9dae65913b32 ("memory: mtk-smi: fix device leak on larb probe")
--- drivers/memory/mtk-smi.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/memory/mtk-smi.c +4 -6
@@ -375,14 +375,13 @@ static int mtk_smi_larb_probe(struct platform_device *pdev)return component_add (dev, &mtk_smi_larb_component_ops); } -static int mtk_smi_larb_remove (struct platform_device *pdev) +static void mtk_smi_larb_remove (struct platform_device *pdev) {struct mtk_smi_larb *larb =platform_get_drvdata (pdev);device_link_remove (&pdev->dev, larb->smi_common_dev);pm_runtime_disable (&pdev->dev);component_del (&pdev->dev, &mtk_smi_larb_component_ops); -return 0 ; }static int __maybe_unused mtk_smi_larb_resume (struct device *dev)
@@ -419,7 +418,7 @@ static const struct dev_pm_ops smi_larb_pm_ops = {static struct platform_driver mtk_smi_larb_driver = { .probe = mtk_smi_larb_probe, - .remove = mtk_smi_larb_remove, + .remove_new = mtk_smi_larb_remove, .driver = { .name ="mtk-smi-larb" , .of_match_table = mtk_smi_larb_of_ids,
@@ -549,10 +548,9 @@ static int mtk_smi_common_probe(struct platform_device *pdev)return 0 ; } -static int mtk_smi_common_remove (struct platform_device *pdev) +static void mtk_smi_common_remove (struct platform_device *pdev) {pm_runtime_disable (&pdev->dev); -return 0 ; }static int __maybe_unused mtk_smi_common_resume (struct device *dev)
@@ -588,7 +586,7 @@ static const struct dev_pm_ops smi_common_pm_ops = {static struct platform_driver mtk_smi_common_driver = { .probe = mtk_smi_common_probe, - .remove = mtk_smi_common_remove, + .remove_new = mtk_smi_common_remove, .driver = { .name ="mtk-smi-common" , .of_match_table = mtk_smi_common_of_ids,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 13/570 memory: mtk-smi: fix device leak on larb probe
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit 9dae65913b32d05dbc8ff4b8a6bf04a0e49a8eb6 ]
Make sure to drop the reference taken when looking up the SMI device during larb probe on late probe failure (e.g. probe deferral) and on driver unbind.
--- drivers/memory/mtk-smi.c | 1 + 1 file changed, 1 insertion(+)
drivers/memory/mtk-smi.c +1 -0
@@ -382,6 +382,7 @@ static void mtk_smi_larb_remove(struct platform_device *pdev)device_link_remove (&pdev->dev, larb->smi_common_dev);pm_runtime_disable (&pdev->dev);component_del (&pdev->dev, &mtk_smi_larb_component_ops); +put_device (larb->smi_common_dev); }static int __maybe_unused mtk_smi_larb_resume (struct device *dev)
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 14/570 ARM: OMAP2+: add missing of_node_put before break and return
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wang Qing <[email protected]>
[ Upstream commit 883f464c1d23663047eda4f2bcf622365e2d0dd0 ]
Fix following coccicheck warning:
WARNING: Function "for_each_matching_node_and_match" should have of_node_put() before return.
Early exits from for_each_matching_node_and_match should decrement the node reference counter.
Message-Id: <[email protected]>
Stable-dep-of: 93a04ab480c8 ("ARM: omap2: Fix reference count leaks in omap_control_init()")
--- arch/arm/mach-omap2/cm_common.c | 8 ++++++-- arch/arm/mach-omap2/control.c | 19 ++++++++++++++----- arch/arm/mach-omap2/prm_common.c | 8 ++++++-- 3 files changed, 26 insertions(+), 9 deletions(-)
arch/arm/mach-omap2/cm_common.c +6 -2
@@ -320,8 +320,10 @@ int __init omap2_cm_base_init(void) data = (struct omap_prcm_init_data *)match->data; ret =of_address_to_resource (np,0 , &res); -if (ret) +if (ret) { +of_node_put (np);return ret; + }if (data->index ==TI_CLKM_CM ) mem = &cm_base;
@@ -367,8 +369,10 @@ int __init omap_cm_init(void)continue ; ret =omap2_clk_provider_init (np, data->index,NULL , data->mem); -if (ret) +if (ret) { +of_node_put (np);return ret; + } }return 0 ;
arch/arm/mach-omap2/control.c +14 -5
@@ -769,8 +769,10 @@ int __init omap2_control_base_init(void) data = (struct control_init_data *)match->data; mem =of_iomap (np,0 ); -if (!mem) +if (!mem) { +of_node_put (np);return -ENOMEM ; + }if (data->index ==TI_CLKM_CTRL ) { omap2_ctrl_base = mem;
@@ -810,22 +812,24 @@ int __init omap_control_init(void)if (scm_conf) { syscon =syscon_node_to_regmap (scm_conf); -if (IS_ERR (syscon)) -return PTR_ERR (syscon); +if (IS_ERR (syscon)) { + ret =PTR_ERR (syscon); + goto of_node_put; + }if (of_get_child_by_name (scm_conf,"clocks" )) { ret =omap2_clk_provider_init (scm_conf, data->index, syscon,NULL );if (ret) -return ret; + goto of_node_put; } }else {/* No scm_conf found, direct access */ ret =omap2_clk_provider_init (np, data->index,NULL , data->mem);if (ret) -return ret; + goto of_node_put; } }
@@ -836,6 +840,11 @@ int __init omap_control_init(void) }return 0 ; + +of_node_put: +of_node_put (np); +return ret; + }/**
arch/arm/mach-omap2/prm_common.c +6 -2
@@ -752,8 +752,10 @@ int __init omap2_prm_base_init(void) data = (struct omap_prcm_init_data *)match->data; ret =of_address_to_resource (np,0 , &res); -if (ret) +if (ret) { +of_node_put (np);return ret; + } data->mem =ioremap (res.start,resource_size (&res));
@@ -799,8 +801,10 @@ int __init omap_prcm_init(void) data = match->data; ret =omap2_clk_provider_init (np, data->index,NULL , data->mem); -if (ret) +if (ret) { +of_node_put (np);return ret; + } }omap_cm_init ();
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 15/570 ARM: omap2: Fix reference count leaks in omap_control_init()
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 93a04ab480c8bbcb7d9004be139c538c8a0c1bc8 ]
The of_get_child_by_name() function increments the reference count of child nodes, causing multiple reference leaks in omap_control_init():
1. scm_conf node never released in normal/error paths
2. clocks node leak when checking existence
3. Missing scm_conf release before np in error paths
Fix these leaks by adding proper of_node_put() calls and separate error handling.
--- arch/arm/mach-omap2/control.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
arch/arm/mach-omap2/control.c +10 -4
@@ -793,7 +793,7 @@ int __init omap2_control_base_init(void)*/ int __init omap_control_init (void ) { -struct device_node *np, *scm_conf; +struct device_node *np, *scm_conf, *clocks_node;const struct of_device_id *match;const struct omap_prcm_init_data *data;int ret;
@@ -814,16 +814,19 @@ int __init omap_control_init(void)if (IS_ERR (syscon)) { ret =PTR_ERR (syscon); - goto of_node_put; + goto err_put_scm_conf; } -if (of_get_child_by_name (scm_conf,"clocks" )) { + clocks_node =of_get_child_by_name (scm_conf,"clocks" ); +if (clocks_node) { +of_node_put (clocks_node); ret =omap2_clk_provider_init (scm_conf, data->index, syscon,NULL );if (ret) - goto of_node_put; + goto err_put_scm_conf; } +of_node_put (scm_conf); }else {/* No scm_conf found, direct access */ ret = omap2_clk_provider_init(np, data->index, NULL,
@@ -841,6 +844,9 @@ int __init omap_control_init(void)return 0 ; +err_put_scm_conf: +if (scm_conf) +of_node_put (scm_conf); of_node_put:of_node_put (np);return ret;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 16/570 scsi: ata: Call scsi_done() directly
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bart Van Assche <[email protected]>
[ Upstream commit 58bf201dfc032eadbb31eaf817b467bed17f753d ]
Conditional statements are faster than indirect calls. Hence call scsi_done() directly.
Stable-dep-of: bb3a8154b1a1 ("ata: libata-scsi: refactor ata_scsi_translate()")
--- drivers/ata/libata-sata.c | 2 +- drivers/ata/libata-scsi.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/ata/libata-sata.c +1 -1
@@ -1276,7 +1276,7 @@ int ata_sas_queuecmd(struct scsi_cmnd *cmd, struct ata_port *ap) rc =__ata_scsi_queuecmd (cmd, ap->link.device); else { cmd->result = (DID_BAD_TARGET <<16 ); - cmd->scsi_done (cmd); +scsi_done (cmd); }return rc; }
drivers/ata/libata-scsi.c +7 -7
@@ -634,7 +634,7 @@ static struct ata_queued_cmd *ata_scsi_qc_new(struct ata_device *dev, qc =ata_qc_new_init (dev,scsi_cmd_to_rq (cmd)->tag);if (qc) { qc->scsicmd = cmd; - qc->scsidone = cmd->scsi_done; + qc->scsidone = scsi_done; qc->sg =scsi_sglist (cmd); qc->n_elem =scsi_sg_count (cmd);
@@ -643,7 +643,7 @@ static struct ata_queued_cmd *ata_scsi_qc_new(struct ata_device *dev, qc->flags |=ATA_QCFLAG_QUIET ; }else { cmd->result = (DID_OK <<16 ) |SAM_STAT_TASK_SET_FULL ; - cmd->scsi_done (cmd); +scsi_done (cmd); }return qc;
@@ -1750,14 +1750,14 @@ static int ata_scsi_translate(struct ata_device *dev, struct scsi_cmnd *cmd, early_finish:ata_qc_free (qc); - cmd->scsi_done (cmd); +scsi_done (cmd);DPRINTK ("EXIT - early finish (good or error)\n" );return 0 ; err_did:ata_qc_free (qc); cmd->result = (DID_ERROR <<16 ); - cmd->scsi_done (cmd); +scsi_done (cmd); err_mem:DPRINTK ("EXIT - internal\n" );return 0 ;
@@ -4068,7 +4068,7 @@ int __ata_scsi_queuecmd(struct scsi_cmnd *scmd, struct ata_device *dev)DPRINTK ("bad CDB len=%u, scsi_op=0x%02x, max=%u\n" , scmd->cmd_len, scsi_op, dev->cdb_len); scmd->result =DID_ERROR <<16 ; - scmd->scsi_done (scmd); +scsi_done (scmd);return 0 ; }
@@ -4110,7 +4110,7 @@ int ata_scsi_queuecmd(struct Scsi_Host *shost, struct scsi_cmnd *cmd) rc =__ata_scsi_queuecmd (cmd, dev); else { cmd->result = (DID_BAD_TARGET <<16 ); - cmd->scsi_done (cmd); +scsi_done (cmd); }spin_unlock_irqrestore (ap->lock, irq_flags);
@@ -4239,7 +4239,7 @@ void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd)break ; } - cmd->scsi_done (cmd); +scsi_done (cmd); }int ata_scsi_add_hosts (struct ata_host *host,struct scsi_host_template *sht)
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 17/570 ata: libata-scsi: drop DPRINTK calls for cdb translation
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 1fe9fb71b2ffcedd794daacf4db2056a6cb5199e ]
Drop DPRINTK calls for cdb translation as they are already covered by other traces, and also drop the DPRINTK calls in ata_scsi_hotplug().
Stable-dep-of: bb3a8154b1a1 ("ata: libata-scsi: refactor ata_scsi_translate()")
--- drivers/ata/libata-scsi.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-)
drivers/ata/libata-scsi.c +1 -19
@@ -1472,9 +1472,6 @@ static unsigned int ata_scsi_verify_xlat(struct ata_queued_cmd *qc) head = track % dev->heads; sect = (u32 )block % dev->sectors +1 ; -DPRINTK ("block %u track %u cyl %u head %u sect %u\n" , - (u32 )block, track, cyl, head, sect); -/* Check whether the converted CHS can fit. Cylinder: 0-65535 Head: 0-15
@@ -1597,7 +1594,6 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc) goto invalid_fld;break ;default : -DPRINTK ("no-byte command\n" ); fp =0 ; goto invalid_fld; }
@@ -1751,7 +1747,6 @@ static int ata_scsi_translate(struct ata_device *dev, struct scsi_cmnd *cmd, early_finish:ata_qc_free (qc);scsi_done (cmd); -DPRINTK ("EXIT - early finish (good or error)\n" );return 0 ; err_did:
@@ -1759,12 +1754,10 @@ static int ata_scsi_translate(struct ata_device *dev, struct scsi_cmnd *cmd, cmd->result = (DID_ERROR <<16 );scsi_done (cmd); err_mem: -DPRINTK ("EXIT - internal\n" );return 0 ; defer:ata_qc_free (qc); -DPRINTK ("EXIT - defer\n" );if (rc ==ATA_DEFER_LINK )return SCSI_MLQUEUE_DEVICE_BUSY ;else
@@ -2491,8 +2484,6 @@ static void atapi_request_sense(struct ata_queued_cmd *qc)struct ata_port *ap = qc->ap;struct scsi_cmnd *cmd = qc->scsicmd; -DPRINTK ("ATAPI request sense\n" ); -memset (cmd->sense_buffer,0 ,SCSI_SENSE_BUFFERSIZE );#ifdef CONFIG_ATA_SFF
@@ -2531,8 +2522,6 @@ static void atapi_request_sense(struct ata_queued_cmd *qc) qc->complete_fn = atapi_sense_complete;ata_qc_issue (qc); - -DPRINTK ("EXIT\n" ); }/*
@@ -2642,7 +2631,6 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc) qc->tf.flags |=ATA_TFLAG_ISADDR |ATA_TFLAG_DEVICE ;if (scmd->sc_data_direction ==DMA_TO_DEVICE ) { qc->tf.flags |=ATA_TFLAG_WRITE ; -DPRINTK ("direction: write\n" ); } qc->tf.command =ATA_CMD_PACKET ;
@@ -4065,8 +4053,6 @@ int __ata_scsi_queuecmd(struct scsi_cmnd *scmd, struct ata_device *dev)return 0 ; bad_cdb_len: -DPRINTK ("bad CDB len=%u, scsi_op=0x%02x, max=%u\n" , - scmd->cmd_len, scsi_op, dev->cdb_len); scmd->result =DID_ERROR <<16 ;scsi_done (scmd);return 0 ;
@@ -4532,12 +4518,9 @@ void ata_scsi_hotplug(struct work_struct *work) container_of(work, struct ata_port, hotplug_task.work);int i; -if (ap->pflags &ATA_PFLAG_UNLOADING ) { -DPRINTK ("ENTER/EXIT - unloading\n" ); +if (ap->pflags &ATA_PFLAG_UNLOADING )return ; - } -DPRINTK ("ENTER\n" );mutex_lock (&ap->scsi_scan_mutex);/* Unplug detached devices. We cannot use link iterator here
@@ -4553,7 +4536,6 @@ void ata_scsi_hotplug(struct work_struct *work)ata_scsi_scan_host (ap,0 );mutex_unlock (&ap->scsi_scan_mutex); -DPRINTK ("EXIT\n" ); }/**
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 18/570 ata: libata: remove pointless VPRINTK() calls
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 e1553351d747cbcd62db01d579dff916edcc782c ]
Most of the information is already covered by tracepoints (if not downright pointless), so remove the VPRINTK() calls. And while we're at it, remove ata_scsi_dump_cdb(), too, as this information can be retrieved from scsi tracing.
Stable-dep-of: bb3a8154b1a1 ("ata: libata-scsi: refactor ata_scsi_translate()")
--- drivers/ata/libata-core.c | 3 --- drivers/ata/libata-sata.c | 2 -- drivers/ata/libata-scsi.c | 42 --------------------------------------- drivers/ata/libata-sff.c | 4 ---- drivers/ata/libata.h | 1 - 5 files changed, 52 deletions(-)
drivers/ata/libata-core.c +0 -3
@@ -4486,8 +4486,6 @@ static void ata_sg_clean(struct ata_queued_cmd *qc)WARN_ON_ONCE (sg ==NULL ); -VPRINTK ("unmapping %u sg elements\n" , qc->n_elem); -if (qc->n_elem)dma_unmap_sg (ap->dev, sg, qc->orig_n_elem, dir);
@@ -4519,7 +4517,6 @@ static int ata_sg_setup(struct ata_queued_cmd *qc)if (n_elem <1 )return -1 ; -VPRINTK ("%d sg elements mapped\n" , n_elem); qc->orig_n_elem = qc->n_elem; qc->n_elem = n_elem; qc->flags |=ATA_QCFLAG_DMAMAP ;
drivers/ata/libata-sata.c +0 -2
@@ -1270,8 +1270,6 @@ int ata_sas_queuecmd(struct scsi_cmnd *cmd, struct ata_port *ap) {int rc =0 ; -ata_scsi_dump_cdb (ap, cmd); -if (likely (ata_dev_enabled (ap->link.device))) rc =__ata_scsi_queuecmd (cmd, ap->link.device);else {
drivers/ata/libata-scsi.c +0 -42
120 lines not on this page · raw message
drivers/ata/libata-sff.c +0 -4
@@ -888,8 +888,6 @@ static void atapi_pio_bytes(struct ata_queued_cmd *qc)if (unlikely (!bytes)) goto atapi_check; -VPRINTK ("ata%u: xfering %d bytes\n" , ap->print_id, bytes); -if (unlikely (__atapi_pio_bytes (qc, bytes))) goto err_out;ata_sff_sync (ap);/* flush */
@@ -2614,7 +2612,6 @@ static void ata_bmdma_fill_sg(struct ata_queued_cmd *qc) prd[pi].addr =cpu_to_le32 (addr); prd[pi].flags_len =cpu_to_le32 (len &0xffff ); -VPRINTK ("PRD[%u] = (0x%X, 0x%X)\n" , pi, addr, len); pi++; sg_len -= len;
@@ -2674,7 +2671,6 @@ static void ata_bmdma_fill_sg_dumb(struct ata_queued_cmd *qc) prd[++pi].addr =cpu_to_le32 (addr +0x8000 ); } prd[pi].flags_len =cpu_to_le32 (blen); -VPRINTK ("PRD[%u] = (0x%X, 0x%X)\n" , pi, addr, len); pi++; sg_len -= len;
drivers/ata/libata.h +0 -1
@@ -150,7 +150,6 @@ extern int ata_scsi_user_scan(struct Scsi_Host *shost, unsigned int channel, unsigned int id, u64 lun);void ata_scsi_sdev_config (struct scsi_device *sdev);int ata_scsi_dev_config (struct scsi_device *sdev,struct ata_device *dev); -void ata_scsi_dump_cdb (struct ata_port *ap,struct scsi_cmnd *cmd);int __ata_scsi_queuecmd (struct scsi_cmnd *scmd,struct ata_device *dev);/* libata-eh.c */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 19/570 ata: libata-scsi: refactor ata_scsi_translate()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damien Le Moal <[email protected]>
[ Upstream commit bb3a8154b1a1dc2c86d037482c0a2cf9186829ed ]
Factor out of ata_scsi_translate() the code handling queued command deferral using the port qc_defer callback and issuing the queued command with ata_qc_issue() into the new function ata_scsi_qc_issue(), and simplify the goto used in ata_scsi_translate().
While at it, also add a lockdep annotation to check that the port lock is held when ata_scsi_translate() is called.
No functional changes.
--- drivers/ata/libata-scsi.c | 81 ++++++++++++++++++++++++--------------- 1 file changed, 50 insertions(+), 31 deletions(-)
drivers/ata/libata-scsi.c +50 -31
@@ -1670,6 +1670,42 @@ static void ata_scsi_qc_complete(struct ata_queued_cmd *qc)ata_qc_done (qc); } +static int ata_scsi_qc_issue (struct ata_port *ap,struct ata_queued_cmd *qc) +{ +int ret; + +if (!ap->ops->qc_defer) + goto issue; + +/* Check if the command needs to be deferred. */ + ret = ap->ops->qc_defer (qc); +switch (ret) { +case 0 : +break ; +case ATA_DEFER_LINK : + ret =SCSI_MLQUEUE_DEVICE_BUSY ; +break ; +case ATA_DEFER_PORT : + ret =SCSI_MLQUEUE_HOST_BUSY ; +break ; +default : +WARN_ON_ONCE (1 ); + ret =SCSI_MLQUEUE_HOST_BUSY ; +break ; + } + +if (ret) { +/* Force a requeue of the command to defer its execution. */ +ata_qc_free (qc); +return ret; + } + +issue: +ata_qc_issue (qc); + +return 0 ; +} +/** * ata_scsi_translate - Translate then issue SCSI command to ATA device * @dev: ATA device to which the command is addressed
@@ -1693,66 +1729,49 @@ static void ata_scsi_qc_complete(struct ata_queued_cmd *qc)* spin_lock_irqsave(host lock) * * RETURNS: -* 0 on success, SCSI_ML_QUEUE_DEVICE_BUSY if the command -* needs to be deferred. +* 0 on success, SCSI_ML_QUEUE_DEVICE_BUSY or SCSI_MLQUEUE_HOST_BUSY if the +* command needs to be deferred. */ static int ata_scsi_translate (struct ata_device *dev,struct scsi_cmnd *cmd,ata_xlat_func_t xlat_func) {struct ata_port *ap = dev->link->ap;struct ata_queued_cmd *qc; -int rc; +lockdep_assert_held (ap->lock); + +/* +* ata_scsi_qc_new() calls scsi_done(cmd) in case of failure. So we +* have nothing further to do when allocating a qc fails. +*/ qc =ata_scsi_qc_new (dev, cmd);if (!qc) - goto err_mem; +return 0 ;/* data is present; dma-map it */ if (cmd->sc_data_direction ==DMA_FROM_DEVICE || cmd->sc_data_direction ==DMA_TO_DEVICE ) {if (unlikely (scsi_bufflen (cmd) <1 )) {ata_dev_warn (dev,"WARNING: zero len r/w req\n" ); - goto err_did; + cmd->result = (DID_ERROR <<16 ); + goto done; }ata_sg_init (qc,scsi_sglist (cmd),scsi_sg_count (cmd)); - qc->dma_dir = cmd->sc_data_direction; } qc->complete_fn = ata_scsi_qc_complete;if (xlat_func (qc)) - goto early_finish; - -if (ap->ops->qc_defer) { -if ((rc = ap->ops->qc_defer (qc))) - goto defer; - } - -/* select device, send command to hardware */ -ata_qc_issue (qc); + goto done; -return 0 ; - -early_finish: -ata_qc_free (qc); -scsi_done (cmd); -return 0 ; +return ata_scsi_qc_issue (ap, qc); -err_did: +done:ata_qc_free (qc); - cmd->result = (DID_ERROR <<16 );scsi_done (cmd); -err_mem:return 0 ; - -defer: -ata_qc_free (qc); -if (rc ==ATA_DEFER_LINK ) -return SCSI_MLQUEUE_DEVICE_BUSY ; -else -return SCSI_MLQUEUE_HOST_BUSY ; }struct ata_scsi_args {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 20/570 drm/tegra: dsi: fix device leak on probe
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit bfef062695570842cf96358f2f46f4c6642c6689 ]
Make sure to drop the reference taken when looking up the companion (ganged) device and its driver data during probe().
Note that holding a reference to a device does not prevent its driver data from going away so there is no point in keeping the reference.
--- drivers/gpu/drm/tegra/dsi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/tegra/dsi.c +2 -4
@@ -1539,11 +1539,9 @@ static int tegra_dsi_ganged_probe(struct tegra_dsi *dsi)return -EPROBE_DEFER ; dsi->slave =platform_get_drvdata (gangster); - -if (!dsi->slave) { -put_device (&gangster->dev); +put_device (&gangster->dev); +if (!dsi->slave)return -EPROBE_DEFER ; - } dsi->slave->master = dsi; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 21/570 bus: omap-ocp2scp: Convert to platform remove callback returning void
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 854f89a5b56354ba4135e0e1f0e57ab2caee59ee ]
The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is ignored (apart from emitting a warning) and this typically results in resource leaks.
To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new(), which already returns void. Eventually after all drivers are converted, .remove_new() will be renamed to .remove().
Trivially convert this driver from always returning zero in the remove callback to the void returning variant.
Stable-dep-of: 5eb63e9bb65d ("bus: omap-ocp2scp: fix OF populate on driver rebind")
--- drivers/bus/omap-ocp2scp.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/bus/omap-ocp2scp.c +2 -4
@@ -84,12 +84,10 @@ static int omap_ocp2scp_probe(struct platform_device *pdev)return ret; } -static int omap_ocp2scp_remove (struct platform_device *pdev) +static void omap_ocp2scp_remove (struct platform_device *pdev) {pm_runtime_disable (&pdev->dev);device_for_each_child (&pdev->dev,NULL , ocp2scp_remove_devices); - -return 0 ; }#ifdef CONFIG_OF
@@ -103,7 +101,7 @@ MODULE_DEVICE_TABLE(of, omap_ocp2scp_id_table);static struct platform_driver omap_ocp2scp_driver = { .probe = omap_ocp2scp_probe, - .remove = omap_ocp2scp_remove, + .remove_new = omap_ocp2scp_remove, .driver = { .name ="omap-ocp2scp" , .of_match_table =of_match_ptr (omap_ocp2scp_id_table),
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 22/570 bus: omap-ocp2scp: fix OF populate on driver rebind
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit 5eb63e9bb65d88abde647ced50fe6ad40c11de1a ]
Since commit c6e126de43e7 ("of: Keep track of populated platform devices") child devices will not be created by of_platform_populate() if the devices had previously been deregistered individually so that the OF_POPULATED flag is still set in the corresponding OF nodes.
Switch to using of_platform_depopulate() instead of open coding so that the child devices are created if the driver is rebound.
--- drivers/bus/omap-ocp2scp.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
drivers/bus/omap-ocp2scp.c +2 -11
@@ -17,15 +17,6 @@#define OCP2SCP_TIMING 0x18#define SYNC2_MASK 0xf -static int ocp2scp_remove_devices (struct device *dev,void *c) -{ -struct platform_device *pdev =to_platform_device (dev); - -platform_device_unregister (pdev); - -return 0 ; -} -static int omap_ocp2scp_probe (struct platform_device *pdev) {int ret;
@@ -79,7 +70,7 @@ static int omap_ocp2scp_probe(struct platform_device *pdev)pm_runtime_disable (&pdev->dev); err0: -device_for_each_child (&pdev->dev,NULL , ocp2scp_remove_devices); +of_platform_depopulate (&pdev->dev);return ret; }
@@ -87,7 +78,7 @@ static int omap_ocp2scp_probe(struct platform_device *pdev)static void omap_ocp2scp_remove (struct platform_device *pdev) {pm_runtime_disable (&pdev->dev); -device_for_each_child (&pdev->dev,NULL , ocp2scp_remove_devices); +of_platform_depopulate (&pdev->dev); }#ifdef CONFIG_OF
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 23/570 mfd: qcom-pm8xxx: switch away from using chained IRQ handlers
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit d3546ccdce4bc07fcf0648bfe865dbcd6d961afc ]
PM8xxx PMIC family uses GPIO as parent IRQ. Using it together with the irq_set_chained_handler_and_data() results in warnings from the GPIOLIB (see 461c1a7d4733 ("gpiolib: override irq_enable/disable")) as in this path the IRQ resources are not allocated (and thus the corresponding GPIO is not marked as used for the IRQ. Use request_irq so that the IRQ resources are proprely setup.
[ 0.803271] ------------[ cut here ]------------ [ 0.803338] WARNING: CPU: 3 PID: 1 at drivers/gpio/gpiolib.c:3207 gpiochip_enable_irq+0xa4/0xa8 [ 0.803470] Modules linked in: [ 0.803542] CPU: 3 PID: 1 Comm: swapper/0 Not tainted 5.14.0-rc6-next-20210820-postmarketos-qcom-apq8064+ #1 [ 0.803645] Hardware name: Generic DT based system [ 0.803710] Backtrace: [ 0.803777] [<c0e3493c>] (dump_backtrace) from [<c0e34d00>] (show_stack+0x20/0x24) [ 0.803911] r7:00000c87 r6:c07062dc r5:60000093 r4:c11d0f54 [ 0.803980] [<c0e34ce0>] (show_stack) from [<c0e38314>] (dump_stack_lvl+0x48/0x54) [ 0.804097] [<c0e382cc>] (dump_stack_lvl) from [<c0e38338>] (dump_stack+0x18/0x1c) [ 0.804217] r5:00000009 r4:c11fe208 [ 0.804274] [<c0e38320>] (dump_stack) from [<c03219c8>] (__warn+0xfc/0x114) [ 0.804387] [<c03218cc>] (__warn) from [<c0e35334>] (warn_slowpath_fmt+0x74/0xd0) [ 0.804509] r7:c07062dc r6:00000c87 r5:c11fe208 r4:00000000 [ 0.804577] [<c0e352c4>] (warn_slowpath_fmt) from [<c07062dc>] (gpiochip_enable_irq+0xa4/0xa8) [ 0.804716] r8:c27b6200 r7:c27aec00 r6:c27aec18 r5:cf77a448 r4:c02225f0 [ 0.804789] [<c0706238>] (gpiochip_enable_irq) from [<c0706348>] (gpiochip_irq_enable+0x28/0x38) [ 0.804921] r5:cf77a448 r4:c27aec18 [ 0.804977] [<c0706320>] (gpiochip_irq_enable) from [<c03897a0>] (irq_enable+0x48/0x78) [ 0.805111] r5:00000000 r4:c27aec00 [ 0.805167] [<c0389758>] (irq_enable) from [<c0389850>] (__irq_startup+0x80/0xbc) [ 0.805286] r5:00000000 r4:c27aec00 [ 0.805343] [<c03897d0>] (__irq_startup) from [<c038996c>] (irq_startup+0xe0/0x18c) [ 0.805468] r7:c27aec00 r6:00000001 r5:00000000 r4:c27aec00 [ 0.805535] [<c038988c>] (irq_startup) from [<c0389a54>] (irq_activate_and_startup+0x3c/0x74) [ 0.805669] r7:c27aec00 r6:00000001 r5:c27aec00 r4:00000000 [ 0.805736] [<c0389a18>] (irq_activate_and_startup) from [<c0389b58>] (__irq_do_set_handler+0xcc/0x1c0) [ 0.805875] r7:c27aec00 r6:c0383710 r5:c08a16b0 r4:00000001 [ 0.805943] [<c0389a8c>] (__irq_do_set_handler) from [<c0389d80>] (irq_set_chained_handler_and_data+0x60/0x98) [ 0.806087] r7:c27b5c10 r6:c27aed40 r5:c08a16b0 r4:c27aec00 [ 0.806154] [<c0389d20>] (irq_set_chained_handler_and_data) from [<c08a1660>] (pm8xxx_probe+0x1fc/0x24c) [ 0.806298] r6:0000003a r5:0000003a r4:c27b5c00 [ 0.806359] [<c08a1464>] (pm8xxx_probe) from [<c0871420>] (platform_probe+0x6c/0xc8) [ 0.806495] r10:c2507080 r9:e8bea2cc r8:c165e0e0 r7:c165e0e0 r6:c15f08f8 r5:c27b5c10 [ 0.806582] r4:00000000 [ 0.806632] [<c08713b4>] (platform_probe) from [<c086e280>] (really_probe+0xe8/0x460) [ 0.806769] r7:c165e0e0 r6:c15f08f8 r5:00000000 r4:c27b5c10 [ 0.806837] [<c086e198>] (really_probe) from [<c086e6a8>] (__driver_probe_device+0xb0/0x22c) [ 0.806975] r7:c27b5c10 r6:cf70fba4 r5:c15f08f8 r4:c27b5c10 [ 0.807042] [<c086e5f8>] (__driver_probe_device) from [<c086e868>] (driver_probe_device+0x44/0xe0) [ 0.807188] r9:e8bea2cc r8:00000000 r7:c27b5c10 r6:cf70fba4 r5:c16ae4b4 r4:c16ae4b0 [ 0.807271] [<c086e824>] (driver_probe_device) from [<c086ecd8>] (__device_attach_driver+0xb4/0x12c) [ 0.807421] r9:e8bea2cc r8:c15eec08 r7:c27b5c10 r6:cf70fba4 r5:c15f08f8 r4:00000001 [ 0.807506] [<c086ec24>] (__device_attach_driver) from [<c086c06c>] (bus_for_each_drv+0x94/0xe4) [ 0.807651] r7:c16ae484 r6:c086ec24 r5:cf70fba4 r4:00000000 [ 0.807718] [<c086bfd8>] (bus_for_each_drv) from [<c086e0e0>] (__device_attach+0x104/0x19c) [ 0.807852] r6:00000001 r5:c27b5c54 r4:c27b5c10 [ 0.807913] [<c086dfdc>] (__device_attach) from [<c086eef4>] (device_initial_probe+0x1c/0x20) [ 0.808050] r6:c27b5c10 r5:c15ef1b0 r4:c27b5c10 [ 0.808111] [<c086eed8>] (device_initial_probe) from [<c086d00c>] (bus_probe_device+0x94/0x9c) [ 0.808240] [<c086cf78>] (bus_probe_device) from [<c086a60c>] (device_add+0x404/0x8f4) [ 0.808370] r7:c16ae484 r6:c251ba10 r5:00000000 r4:c27b5c10 [ 0.808439] [<c086a208>] (device_add) from [<c0a82f50>] (of_device_add+0x44/0x4c) [ 0.808581] r10:c144c854 r9:00000001 r8:e8bea314 r7:c251ba10 r6:00000000 r5:00000000 [ 0.808669] r4:c27b5c00 [ 0.808718] [<c0a82f0c>] (of_device_add) from [<c0a836cc>] (of_platform_device_create_pdata+0xa0/0xc8) [ 0.808850] [<c0a8362c>] (of_platform_device_create_pdata) from [<c0a83908>] (of_platform_bus_create+0x1f0/0x514) [ 0.809005] r9:00000001 r8:c251ba10 r7:00000000 r6:00000000 r5:00000000 r4:e8bea2b0 [ 0.809086] [<c0a83718>] (of_platform_bus_create) from [<c0a83e04>] (of_platform_populate+0x98/0x128) [ 0.809233] r10:c144c854 r9:00000001 r8:c251ba10 r7:00000000 r6:00000000 r5:e8bea170 [ 0.809321] r4:e8bea2b0 [ 0.809371] [<c0a83d6c>] (of_platform_populate) from [<c0a83f20>] (devm_of_platform_populate+0x60/0xa8) [ 0.809521] r9:0000011d r8:c165e0e0 r7:e8bea170 r6:c2c34f40 r5:c2cac140 r4:c251ba10 [ 0.809604] [<c0a83ec0>] (devm_of_platform_populate) from [<c08a212c>] (ssbi_probe+0x138/0x16c) [ 0.809738] r6:c2c34f40 r5:c251ba10 r4:ff822700 [ 0.809800] [<c08a1ff4>] (ssbi_probe) from [<c0871420>] (platform_probe+0x6c/0xc8) [ 0.809923] r7:c165e0e0 r6:c15f0a80 r5:c251ba10 r4:00000000 [ 0.809989] [<c08713b4>] (platform_probe) from [<c086e280>] (really_probe+0xe8/0x460) [ 0.810120] r7:c165e0e0 r6:c15f0a80 r5:00000000 r4:c251ba10 [ 0.810187] [<c086e198>] (really_probe) from [<c086e6a8>] (__driver_probe_device+0xb0/0x22c) [ 0.810325] r7:c251ba10 r6:c15f0a80 r5:c15f0a80 r4:c251ba10 [ 0.810393] [<c086e5f8>] (__driver_probe_device) from [<c086e868>] (driver_probe_device+0x44/0xe0) [ 0.810539] r9:0000011d r8:00000000 r7:c251ba10 r6:c15f0a80 r5:c16ae4b4 r4:c16ae4b0 [ 0.810623] [<c086e824>] (driver_probe_device) from [<c086ee2c>] (__driver_attach+0xdc/0x188) [ 0.810766] r9:0000011d r8:c144c834 r7:00000000 r6:c15f0a80 r5:c251ba10 r4:00000000 [ 0.810849] [<c086ed50>] (__driver_attach) from [<c086bf60>] (bus_for_each_dev+0x88/0xd4) [ 0.810985] r7:00000000 r6:c086ed50 r5:c15f0a80 r4:00000000 [ 0.811052] [<c086bed8>] (bus_for_each_dev) from [<c086dad4>] (driver_attach+0x2c/0x30) [ 0.811182] r6:c15ef1b0 r5:c2c34e80 r4:c15f0a80 [ 0.811243] [<c086daa8>] (driver_attach) from [<c086d2dc>] (bus_add_driver+0x180/0x21c) [ 0.811364] [<c086d15c>] (bus_add_driver) from [<c086fa6c>] (driver_register+0x84/0x118) [ 0.811492] r7:00000000 r6:ffffe000 r5:c1428210 r4:c15f0a80 [ 0.811558] [<c086f9e8>] (driver_register) from [<c0871174>] (__platform_driver_register+0x2c/0x34) [ 0.811683] r5:c1428210 r4:c16524a0 [ 0.811739] [<c0871148>] (__platform_driver_register) from [<c1428234>] (ssbi_driver_init+0x24/0x28) [ 0.811868] [<c1428210>] (ssbi_driver_init) from [<c0302394>] (do_one_initcall+0x68/0x2c8) [ 0.811990] [<c030232c>] (do_one_initcall) from [<c140147c>] (kernel_init_freeable+0x1dc/0x23c) [ 0.812135] r7:cf7b0400 r6:c130339c r5:00000007 r4:c147f6a0 [ 0.812204] [<c14012a0>] (kernel_init_freeable) from [<c0e40e60>] (kernel_init+0x20/0x138) [ 0.812345] r10:00000000 r9:00000000 r8:00000000 r7:00000000 r6:00000000 r5:c0e40e40 [ 0.812433] r4:00000000 [ 0.812483] [<c0e40e40>] (kernel_init) from [<c0300150>] (ret_from_fork+0x14/0x24) [ 0.812596] Exception stack(0xcf70ffb0 to 0xcf70fff8) [ 0.812684] ffa0: 00000000 00000000 00000000 00000000 [ 0.812809] ffc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 [ 0.812923] ffe0: 00000000 00000000 00000000 00000000 00000013 00000000 [ 0.813008] r5:c0e40e40 r4:00000000 [ 0.813075] ---[ end trace ad2443eee078d094 ]---
Stable-dep-of: 27a8acea47a9 ("mfd: qcom-pm8xxx: Fix OF populate on driver rebind")
--- drivers/mfd/qcom-pm8xxx.c | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-)
drivers/mfd/qcom-pm8xxx.c +16 -23
@@ -65,7 +65,7 @@struct pm_irq_data {int num_irqs;struct irq_chip *irq_chip; -void (*irq_handler)(struct irq_desc *desc); +irq_handler_t irq_handler; };struct pm_irq_chip {
@@ -169,19 +169,16 @@ static int pm8xxx_irq_master_handler(struct pm_irq_chip *chip, int master)return ret; } -static void pm8xxx_irq_handler (struct irq_desc *desc) +static irqreturn_t pm8xxx_irq_handler (int irq,void *data) { -struct pm_irq_chip *chip =irq_desc_get_handler_data (desc); -struct irq_chip *irq_chip =irq_desc_get_chip (desc); +struct pm_irq_chip *chip = data;unsigned int root;int i, ret, masters =0 ; -chained_irq_enter (irq_chip, desc); - ret =regmap_read (chip->regmap,SSBI_REG_ADDR_IRQ_ROOT , &root);if (ret) {pr_err ("Can't read root status ret=%d\n" , ret); -return ; +return IRQ_NONE ; }/* on pm8xxx series masters start from bit 1 of the root */
@@ -192,7 +189,7 @@ static void pm8xxx_irq_handler(struct irq_desc *desc)if (masters & (1 << i))pm8xxx_irq_master_handler (chip, i); -chained_irq_exit (irq_chip, desc); +return IRQ_HANDLED ; } static void pm8821_irq_block_handler(struct pm_irq_chip *chip,
@@ -230,19 +227,17 @@ static inline void pm8821_irq_master_handler(struct pm_irq_chip *chip,pm8821_irq_block_handler (chip, master, block); } -static void pm8821_irq_handler (struct irq_desc *desc) +static irqreturn_t pm8821_irq_handler (int irq,void *data) { -struct pm_irq_chip *chip =irq_desc_get_handler_data (desc); -struct irq_chip *irq_chip =irq_desc_get_chip (desc); +struct pm_irq_chip *chip = data;unsigned int master;int ret; -chained_irq_enter (irq_chip, desc); ret =regmap_read (chip->regmap,PM8821_SSBI_REG_ADDR_IRQ_MASTER0 , &master);if (ret) {pr_err ("Failed to read master 0 ret=%d\n" , ret); - goto done; +return IRQ_NONE ; }/* bits 1 through 7 marks the first 7 blocks in master 0 */
@@ -251,19 +246,18 @@ static void pm8821_irq_handler(struct irq_desc *desc)/* bit 0 marks if master 1 contains any bits */ if (!(master &BIT (0 ))) - goto done; +return IRQ_NONE ; ret =regmap_read (chip->regmap,PM8821_SSBI_REG_ADDR_IRQ_MASTER1 , &master);if (ret) {pr_err ("Failed to read master 1 ret=%d\n" , ret); - goto done; +return IRQ_NONE ; }pm8821_irq_master_handler (chip,1 , master); -done: -chained_irq_exit (irq_chip, desc); +return IRQ_HANDLED ; }static void pm8xxx_irq_mask_ack (struct irq_data *d)
@@ -574,14 +568,15 @@ static int pm8xxx_probe(struct platform_device *pdev)if (!chip->irqdomain)return -ENODEV ; -irq_set_chained_handler_and_data (irq, data->irq_handler, chip); + rc =devm_request_irq (&pdev->dev, irq, data->irq_handler,0 ,dev_name (&pdev->dev), chip); +if (rc) +return rc; +irq_set_irq_wake (irq,1 ); rc =of_platform_populate (pdev->dev.of_node,NULL ,NULL , &pdev->dev); -if (rc) { -irq_set_chained_handler_and_data (irq,NULL ,NULL ); +if (rc)irq_domain_remove (chip->irqdomain); - }return rc; }
@@ -594,11 +589,9 @@ static int pm8xxx_remove_child(struct device *dev, void *unused)static int pm8xxx_remove (struct platform_device *pdev) { -int irq =platform_get_irq (pdev,0 );struct pm_irq_chip *chip =platform_get_drvdata (pdev);device_for_each_child (&pdev->dev,NULL , pm8xxx_remove_child); -irq_set_chained_handler_and_data (irq,NULL ,NULL );irq_domain_remove (chip->irqdomain);return 0 ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 24/570 mfd: qcom-pm8xxx: Convert to platform remove callback returning void
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 19ea1d3953017518d85db35b69b5aea9bc64d630 ]
The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is ignored (apart from emitting a warning) and this typically results in resource leaks.
To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new(), which already returns void. Eventually after all drivers are converted, .remove_new() will be renamed to .remove().
Trivially convert this driver from always returning zero in the remove callback to the void returning variant.
Stable-dep-of: 27a8acea47a9 ("mfd: qcom-pm8xxx: Fix OF populate on driver rebind")
--- drivers/mfd/qcom-pm8xxx.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/mfd/qcom-pm8xxx.c +2 -4
@@ -587,19 +587,17 @@ static int pm8xxx_remove_child(struct device *dev, void *unused)return 0 ; } -static int pm8xxx_remove (struct platform_device *pdev) +static void pm8xxx_remove (struct platform_device *pdev) {struct pm_irq_chip *chip =platform_get_drvdata (pdev);device_for_each_child (&pdev->dev,NULL , pm8xxx_remove_child);irq_domain_remove (chip->irqdomain); - -return 0 ; }static struct platform_driver pm8xxx_driver = { .probe = pm8xxx_probe, - .remove = pm8xxx_remove, + .remove_new = pm8xxx_remove, .driver = { .name ="pm8xxx-core" , .of_match_table = pm8xxx_id_table,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 25/570 mfd: qcom-pm8xxx: Fix OF populate on driver rebind
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit 27a8acea47a93fea6ad0e2df4c20a9b51490e4d9 ]
Since commit c6e126de43e7 ("of: Keep track of populated platform devices") child devices will not be created by of_platform_populate() if the devices had previously been deregistered individually so that the OF_POPULATED flag is still set in the corresponding OF nodes.
Switch to using of_platform_depopulate() instead of open coding so that the child devices are created if the driver is rebound.
--- drivers/mfd/qcom-pm8xxx.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/mfd/qcom-pm8xxx.c +1 -7
@@ -581,17 +581,11 @@ static int pm8xxx_probe(struct platform_device *pdev)return rc; } -static int pm8xxx_remove_child (struct device *dev,void *unused) -{ -platform_device_unregister (to_platform_device (dev)); -return 0 ; -} -static void pm8xxx_remove (struct platform_device *pdev) {struct pm_irq_chip *chip =platform_get_drvdata (pdev); -device_for_each_child (&pdev->dev,NULL , pm8xxx_remove_child); +of_platform_depopulate (&pdev->dev);irq_domain_remove (chip->irqdomain); }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 26/570 mfd: omap-usb-host: Convert to platform remove callback returning void
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 418d1e74f8597e0b2d5d0d6e1be8f1f47e68f0a4 ]
The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is ignored (apart from emitting a warning) and this typically results in resource leaks.
To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new(), which already returns void. Eventually after all drivers are converted, .remove_new() will be renamed to .remove().
Trivially convert this driver from always returning zero in the remove callback to the void returning variant.
Stable-dep-of: 24804ba508a3 ("mfd: omap-usb-host: Fix OF populate on driver rebind")
--- drivers/mfd/omap-usb-host.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/mfd/omap-usb-host.c +2 -3
@@ -818,13 +818,12 @@ static int usbhs_omap_remove_child(struct device *dev, void *data)* * Reverses the effect of usbhs_omap_probe(). */ -static int usbhs_omap_remove (struct platform_device *pdev) +static void usbhs_omap_remove (struct platform_device *pdev) {pm_runtime_disable (&pdev->dev);/* remove children */ device_for_each_child (&pdev->dev,NULL , usbhs_omap_remove_child); -return 0 ; }static const struct dev_pm_ops usbhsomap_dev_pm_ops = {
@@ -847,7 +846,7 @@ static struct platform_driver usbhs_omap_driver = { .of_match_table = usbhs_omap_dt_ids, }, .probe = usbhs_omap_probe, - .remove = usbhs_omap_remove, + .remove_new = usbhs_omap_remove, };MODULE_AUTHOR ("Keshava Munegowda <[email protected]>" );
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 27/570 mfd: omap-usb-host: Fix OF populate on driver rebind
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit 24804ba508a3e240501c521685a1c4eb9f574f8e ]
Since commit c6e126de43e7 ("of: Keep track of populated platform devices") child devices will not be created by of_platform_populate() if the devices had previously been deregistered individually so that the OF_POPULATED flag is still set in the corresponding OF nodes.
Switch to using of_platform_depopulate() instead of open coding so that the child devices are created if the driver is rebound.
--- drivers/mfd/omap-usb-host.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/mfd/omap-usb-host.c +4 -2
@@ -822,8 +822,10 @@ static void usbhs_omap_remove(struct platform_device *pdev) {pm_runtime_disable (&pdev->dev); -/* remove children */ -device_for_each_child (&pdev->dev,NULL , usbhs_omap_remove_child); +if (pdev->dev.of_node) +of_platform_depopulate (&pdev->dev); +else +device_for_each_child (&pdev->dev,NULL , usbhs_omap_remove_child); }static const struct dev_pm_ops usbhsomap_dev_pm_ops = {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 28/570 clk: tegra: tegra124-emc: fix device leak on set_rate()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit da61439c63d34ae6503d080a847f144d587e3a48 ]
Make sure to drop the reference taken when looking up the EMC device and its driver data on first set_rate().
Note that holding a reference to a device does not prevent its driver data from going away so there is no point in keeping the reference.
--- drivers/clk/tegra/clk-tegra124-emc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/tegra/clk-tegra124-emc.c +1 -1
@@ -197,8 +197,8 @@ static struct tegra_emc *emc_ensure_emc_driver(struct tegra_clk_emc *tegra) tegra->emc_node =NULL ; tegra->emc =platform_get_drvdata (pdev); +put_device (&pdev->dev);if (!tegra->emc) { -put_device (&pdev->dev);pr_err ("%s: cannot find EMC driver\n" , __func__);return NULL ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 29/570 usb: cdns3: remove redundant if branch
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hongyu Xie <[email protected]>
[ Upstream commit dedab674428f8a99468a4864c067128ba9ea83a6 ]
cdns->role_sw->dev->driver_data gets set in routines showing below, cdns_init
sw_desc.driver_data = cdns;
cdns->role_sw = usb_role_switch_register(dev, &sw_desc);
dev_set_drvdata(&sw->dev, desc->driver_data);In cdns_resume,cdns->role = cdns_role_get(cdns->role_sw); //line redundant
struct cdns *cdns = usb_role_switch_get_drvdata(sw);
dev_get_drvdata(&sw->dev)
return dev->driver_datareturn cdns->role;
"line redundant" equals to,
cdns->role = cdns->role;
So fix this if branch.
Stable-dep-of: 87e4b043b98a ("usb: cdns3: fix role switching during resume")
--- drivers/usb/cdns3/core.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/usb/cdns3/core.c +1 -3
@@ -528,9 +528,7 @@ int cdns_resume(struct cdns *cdns)int ret =0 ;if (cdns_power_is_lost (cdns)) { -if (cdns->role_sw) { - cdns->role =cdns_role_get (cdns->role_sw); - }else { +if (!cdns->role_sw) { real_role =cdns_hw_role_state_machine (cdns);if (real_role != cdns->role) { ret =cdns_hw_role_switch (cdns);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 30/570 usb: cdns3: call cdns_power_is_lost() only once in cdns_resume()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Théo Lebrun <[email protected]>
[ Upstream commit 17c6526b333cfd89a4c888a6f7c876c8c326e5ae ]
cdns_power_is_lost() does a register read.
Call it only once rather than twice.
Stable-dep-of: 87e4b043b98a ("usb: cdns3: fix role switching during resume")
--- drivers/usb/cdns3/core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/usb/cdns3/core.c +3 -2
@@ -523,11 +523,12 @@ EXPORT_SYMBOL_GPL(cdns_suspend);int cdns_resume (struct cdns *cdns) { +bool power_lost =cdns_power_is_lost (cdns);enum usb_role real_role;bool role_changed = false;int ret =0 ; -if (cdns_power_is_lost (cdns)) { +if (power_lost) {if (!cdns->role_sw) { real_role =cdns_hw_role_state_machine (cdns);if (real_role != cdns->role) {
@@ -550,7 +551,7 @@ int cdns_resume(struct cdns *cdns) }if (cdns->roles[cdns->role]->resume) - cdns->roles[cdns->role]->resume (cdns,cdns_power_is_lost (cdns)); + cdns->roles[cdns->role]->resume (cdns, power_lost);return 0 ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 31/570 usb: cdns3: fix role switching during resume
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Richard (TI) <[email protected]>
[ Upstream commit 87e4b043b98a1d269be0b812f383881abee0ca45 ]
If the role change while we are suspended, the cdns3 driver switches to the new mode during resume. However, switching to host mode in this context causes a NULL pointer dereference.
The host role's start() operation registers a xhci-hcd device, but its probe is deferred while we are in the resume path. The host role's resume() operation assumes the xhci-hcd device is already probed, which is not the case, leading to the dereference. Since the start() operation of the new role is already called, the resume operation can be skipped.
So skip the resume operation for the new role if a role switch occurs during resume. Once the resume sequence is complete, the xhci-hcd device can be probed in case of host mode.
Unable to handle kernel NULL pointer dereference at virtual address 0000000000000208
Mem abort info:
...
Data abort info:
...
[0000000000000208] pgd=0000000000000000, p4d=0000000000000000
Internal error: Oops: 0000000096000004 [#1] SMP Modules linked in: CPU: 0 UID: 0 PID: 146 Comm: sh Not tainted 6.19.0-rc7-00013-g6e64f4aabfae-dirty #135 PREEMPT Hardware name: Texas Instruments J7200 EVM (DT) pstate: 20000005 (nzCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : usb_hcd_is_primary_hcd+0x0/0x1c lr : cdns_host_resume+0x24/0x5c ... Call trace: usb_hcd_is_primary_hcd+0x0/0x1c (P) cdns_resume+0x6c/0xbc cdns3_controller_resume.isra.0+0xe8/0x17c cdns3_plat_resume+0x18/0x24 platform_pm_resume+0x2c/0x68 dpm_run_callback+0x90/0x248 device_resume+0x100/0x24c dpm_resume+0x190/0x2ec dpm_resume_end+0x18/0x34 suspend_devices_and_enter+0x2b0/0xa44 pm_suspend+0x16c/0x5fc state_store+0x80/0xec kobj_attr_store+0x18/0x2c sysfs_kf_write+0x7c/0x94 kernfs_fop_write_iter+0x130/0x1dc vfs_write+0x240/0x370 ksys_write+0x70/0x108 __arm64_sys_write+0x1c/0x28 invoke_syscall+0x48/0x10c el0_svc_common.constprop.0+0x40/0xe0 do_el0_svc+0x1c/0x28 el0_svc+0x34/0x108 el0t_64_sync_handler+0xa0/0xe4 el0t_64_sync+0x198/0x19c Code: 52800003 f9407ca5 d63f00a0 17ffffe4 (f9410401) ---[ end trace 0000000000000000 ]---
--- drivers/usb/cdns3/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/cdns3/core.c +1 -1
@@ -550,7 +550,7 @@ int cdns_resume(struct cdns *cdns) } } -if (cdns->roles[cdns->role]->resume) +if (!role_changed && cdns->roles[cdns->role]->resume) cdns->roles[cdns->role]->resume (cdns, power_lost);return 0 ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 32/570 ALSA: hda/conexant: Add quirk for HP ZBook Studio G4
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 1585cf83e98db32463e5d54161b06a5f01fe9976 ]
It was reported that we need the same quirk for HP ZBook Studio G4 (SSID 103c:826b) as other HP models to make the mute-LED working.
--- sound/pci/hda/patch_conexant.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_conexant.c +1 -0
@@ -1099,6 +1099,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = {SND_PCI_QUIRK (0x103c ,0x8174 ,"HP Spectre x360" ,CXT_FIXUP_HP_SPECTRE ),SND_PCI_QUIRK (0x103c ,0x822e ,"HP ProBook 440 G4" ,CXT_FIXUP_MUTE_LED_GPIO ),SND_PCI_QUIRK (0x103c ,0x8231 ,"HP ProBook 450 G4" ,CXT_FIXUP_MUTE_LED_GPIO ), +SND_PCI_QUIRK (0x103c ,0x826b ,"HP ZBook Studio G4" ,CXT_FIXUP_MUTE_LED_GPIO ),SND_PCI_QUIRK (0x103c ,0x828c ,"HP EliteBook 840 G4" ,CXT_FIXUP_HP_DOCK ),SND_PCI_QUIRK (0x103c ,0x8299 ,"HP 800 G3 SFF" ,CXT_FIXUP_HP_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x103c, 0x829a, "HP 800 G3 DM", CXT_FIXUP_HP_MIC_NO_PRESENCE),
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 33/570 hwmon: (max16065) Use READ/WRITE_ONCE to avoid compiler optimization induced race
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gui-Dong Han <[email protected]>
[ Upstream commit 007be4327e443d79c9dd9e56dc16c36f6395d208 ]
Simply copying shared data to a local variable cannot prevent data races. The compiler is allowed to optimize away the local copy and re-read the shared memory, causing a Time-of-Check Time-of-Use (TOCTOU) issue if the data changes between the check and the usage.
To enforce the use of the local variable, use READ_ONCE() when reading the shared data and WRITE_ONCE() when updating it. Apply these macros to the three identified locations (curr_sense, adc, and fault) where local variables are used for error validation, ensuring the value remains consistent.
--- drivers/hwmon/max16065.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/hwmon/max16065.c +13 -13
@@ -151,27 +151,27 @@ static struct max16065_data *max16065_update_device(struct device *dev)int i;for (i =0 ; i < data->num_adc; i++) - data->adc[i] - =max16065_read_adc (client,MAX16065_ADC (i)); +WRITE_ONCE (data->adc[i], +max16065_read_adc (client,MAX16065_ADC (i)));if (data->have_current) { - data->adc[MAX16065_NUM_ADC ] - =max16065_read_adc (client,MAX16065_CSP_ADC ); - data->curr_sense - =i2c_smbus_read_byte_data (client, -MAX16065_CURR_SENSE ); +WRITE_ONCE (data->adc[MAX16065_NUM_ADC ], +max16065_read_adc (client,MAX16065_CSP_ADC )); +WRITE_ONCE (data->curr_sense, +i2c_smbus_read_byte_data (client,MAX16065_CURR_SENSE )); }for (i =0 ; i <2 ; i++) - data->fault[i] - =i2c_smbus_read_byte_data (client,MAX16065_FAULT (i)); +WRITE_ONCE (data->fault[i], +i2c_smbus_read_byte_data (client,MAX16065_FAULT (i)));/* * MAX16067 and MAX16068 have separate undervoltage and * overvoltage alarm bits. Squash them together. */ if (data->chip == max16067 || data->chip == max16068) - data->fault[0 ] |= data->fault[1 ]; +WRITE_ONCE (data->fault[0 ], + data->fault[0 ] | data->fault[1 ]); data->last_updated = jiffies; data->valid =1 ;
@@ -185,7 +185,7 @@ static ssize_t max16065_alarm_show(struct device *dev, {struct sensor_device_attribute_2 *attr2 =to_sensor_dev_attr_2 (da);struct max16065_data *data =max16065_update_device (dev); -int val = data->fault[attr2->nr]; +int val =READ_ONCE (data->fault[attr2->nr]);if (val <0 )return val;
@@ -203,7 +203,7 @@ static ssize_t max16065_input_show(struct device *dev, {struct sensor_device_attribute *attr =to_sensor_dev_attr (da);struct max16065_data *data =max16065_update_device (dev); -int adc = data->adc[attr->index]; +int adc =READ_ONCE (data->adc[attr->index]);if (unlikely (adc <0 ))return adc;
@@ -216,7 +216,7 @@ static ssize_t max16065_current_show(struct device *dev, struct device_attribute *da, char *buf) { struct max16065_data *data = max16065_update_device(dev); -int curr_sense = data->curr_sense; +int curr_sense =READ_ONCE (data->curr_sense);if (unlikely (curr_sense <0 ))return curr_sense;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 34/570 ksmbd: fix infinite loop caused by next_smb2_rcv_hdr_off reset in error paths
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <[email protected]>
[ Upstream commit 010eb01ce23b34b50531448b0da391c7f05a72af ]
The problem occurs when a signed request fails smb2 signature verification check. In __process_request(), if check_sign_req() returns an error, set_smb2_rsp_status(work, STATUS_ACCESS_DENIED) is called. set_smb2_rsp_status() set work->next_smb2_rcv_hdr_off as zero. By resetting next_smb2_rcv_hdr_off to zero, the pointer to the next command in the chain is lost. Consequently, is_chained_smb2_message() continues to point to the same request header instead of advancing. If the header's NextCommand field is non-zero, the function returns true, causing __handle_ksmbd_work() to repeatedly process the same failed request in an infinite loop. This results in the kernel log being flooded with "bad smb2 signature" messages and high CPU usage.
This patch fixes the issue by changing the return value from SERVER_HANDLER_CONTINUE to SERVER_HANDLER_ABORT. This ensures that the processing loop terminates immediately rather than attempting to continue from an invalidated offset.
--- fs/ksmbd/server.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/ksmbd/server.c +3 -3
@@ -126,21 +126,21 @@ static int __process_request(struct ksmbd_work *work, struct ksmbd_conn *conn, andx_again:if (command >= conn->max_cmds) { conn->ops->set_rsp_status (work,STATUS_INVALID_PARAMETER ); -return SERVER_HANDLER_CONTINUE ; +return SERVER_HANDLER_ABORT ; } cmds = &conn->cmds[command];if (!cmds->proc) {ksmbd_debug (SMB ,"*** not implemented yet cmd = %x\n" , command); conn->ops->set_rsp_status (work,STATUS_NOT_IMPLEMENTED ); -return SERVER_HANDLER_CONTINUE ; +return SERVER_HANDLER_ABORT ; }if (work->sess && conn->ops->is_sign_req (work, command)) { ret = conn->ops->check_sign_req (work);if (!ret) { conn->ops->set_rsp_status (work,STATUS_ACCESS_DENIED ); -return SERVER_HANDLER_CONTINUE ; +return SERVER_HANDLER_ABORT ; } }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 35/570 fbcon: Use delayed work for cursor
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Vetter <[email protected]>
[ Upstream commit 3b0fb6ab25dda03f6077bf8fce9407bb0d4db6ea ]
Allows us to delete a bunch of hand-rolled stuff using a timer plus a separate work). Also to simplify the code we initialize the cursor_work completely when we allocate the fbcon_ops structure, instead of trying to cope with console re-initialization.
The motiviation here is that fbcon code stops using the fb_info.queue, which helps with locking issues around cleanup and all that in a later patch.
Also note that this allows us to ditch the hand-rolled work cleanup in fbcon_exit - we already call fbcon_del_cursor_timer, which takes care of everything. Plus this was racy anyway.
v2:
- Only INIT_DELAYED_WORK when kzalloc succeeded (Tetsuo)
- Explain that we replace both the timer and a work with the combined delayed_work (Javier)
Stable-dep-of: 011a0502801c ("fbcon: check return value of con2fb_acquire_newinfo()")
--- drivers/video/fbdev/core/fbcon.c | 85 +++++++++++++------------------- drivers/video/fbdev/core/fbcon.h | 4 +- 2 files changed, 35 insertions(+), 54 deletions(-)
drivers/video/fbdev/core/fbcon.c +33 -52
@@ -342,8 +342,8 @@ static int get_color(struct vc_data *vc, struct fb_info *info,static void fb_flashcursor (struct work_struct *work) { - struct fb_info *info = container_of(work, struct fb_info, queue); -struct fbcon_ops *ops = info->fbcon_par; + struct fbcon_ops *ops = container_of(work, struct fbcon_ops, cursor_work.work); +struct fb_info *info;struct vc_data *vc =NULL ;int c;int mode;
@@ -356,7 +356,10 @@ static void fb_flashcursor(struct work_struct *work)if (ret ==0 )return ; -if (ops && ops->currcon !=-1 ) +/* protected by console_lock */ + info = ops->info; + +if (ops->currcon !=-1 ) vc = vc_cons[ops->currcon].d; if (!vc || !con_is_visible(vc) ||
@@ -372,42 +375,25 @@ static void fb_flashcursor(struct work_struct *work) ops->cursor (vc, info, mode,get_color (vc, info, c,1 ),get_color (vc, info, c,0 ));console_unlock (); -} -static void cursor_timer_handler (struct timer_list *t) -{ -struct fbcon_ops *ops =from_timer (ops, t, cursor_timer); -struct fb_info *info = ops->info; - -queue_work (system_power_efficient_wq, &info->queue); -mod_timer (&ops->cursor_timer, jiffies + ops->cur_blink_jiffies); +queue_delayed_work (system_power_efficient_wq, &ops->cursor_work, + ops->cur_blink_jiffies); } -static void fbcon_add_cursor_timer (struct fb_info *info) +static void fbcon_add_cursor_work (struct fb_info *info) {struct fbcon_ops *ops = info->fbcon_par; -if ((!info->queue.func || info->queue.func == fb_flashcursor) && - !(ops->flags &FBCON_FLAGS_CURSOR_TIMER ) && - !fbcon_cursor_noblink) { -if (!info->queue.func) -INIT_WORK (&info->queue, fb_flashcursor); - -timer_setup (&ops->cursor_timer, cursor_timer_handler,0 ); -mod_timer (&ops->cursor_timer, jiffies + ops->cur_blink_jiffies); - ops->flags |=FBCON_FLAGS_CURSOR_TIMER ; - } +if (!fbcon_cursor_noblink) +queue_delayed_work (system_power_efficient_wq, &ops->cursor_work, + ops->cur_blink_jiffies); } -static void fbcon_del_cursor_timer (struct fb_info *info) +static void fbcon_del_cursor_work (struct fb_info *info) {struct fbcon_ops *ops = info->fbcon_par; -if (info->queue.func == fb_flashcursor && - ops->flags &FBCON_FLAGS_CURSOR_TIMER ) { -del_timer_sync (&ops->cursor_timer); - ops->flags &= ~FBCON_FLAGS_CURSOR_TIMER ; - } +cancel_delayed_work_sync (&ops->cursor_work); }#ifndef MODULE
@@ -711,6 +697,8 @@ static int con2fb_acquire_newinfo(struct vc_data *vc, struct fb_info *info, }if (!err) { +INIT_DELAYED_WORK (&ops->cursor_work, fb_flashcursor); + ops->cur_blink_jiffies =HZ /5 ; ops->info = info; info->fbcon_par = ops;
@@ -745,7 +733,7 @@ static int con2fb_release_oldinfo(struct vc_data *vc, struct fb_info *oldinfo, }if (!err) { -fbcon_del_cursor_timer (oldinfo); +fbcon_del_cursor_work (oldinfo);kfree (ops->cursor_state.mask);kfree (ops->cursor_data);kfree (ops->cursor_src);
@@ -862,7 +850,7 @@ static int set_con2fb_map(int unit, int newidx, int user) logo_shown != FBCON_LOGO_DONTSHOW);if (!found) -fbcon_add_cursor_timer (info); +fbcon_add_cursor_work (info); con2fb_map_boot[unit] = newidx;con2fb_init_display (vc, info, unit, show_logo); }
@@ -959,6 +947,8 @@ static const char *fbcon_startup(void)return NULL ; } +INIT_DELAYED_WORK (&ops->cursor_work, fb_flashcursor); + ops->currcon =-1 ; ops->graphics =1 ; ops->cur_rotate =-1 ;
@@ -999,7 +989,7 @@ static const char *fbcon_startup(void) info->var.yres, info->var.bits_per_pixel); -fbcon_add_cursor_timer (info); +fbcon_add_cursor_work (info);return display_desc; }
@@ -1185,7 +1175,7 @@ static void fbcon_deinit(struct vc_data *vc) goto finished;if (con_is_visible (vc)) -fbcon_del_cursor_timer (info); +fbcon_del_cursor_work (info); ops->flags &= ~FBCON_FLAGS_INIT ; finished:
@@ -1318,9 +1308,9 @@ static void fbcon_cursor(struct vc_data *vc, int mode)return ;if (vc->vc_cursor_type &CUR_SW ) -fbcon_del_cursor_timer (info); +fbcon_del_cursor_work (info);else -fbcon_add_cursor_timer (info); +fbcon_add_cursor_work (info); ops->cursor_flash = (mode ==CM_ERASE ) ?0 :1 ;
@@ -2126,14 +2116,14 @@ static bool fbcon_switch(struct vc_data *vc) }if (old_info != info) -fbcon_del_cursor_timer (old_info); +fbcon_del_cursor_work (old_info); }if (fbcon_is_inactive (vc, info) || ops->blank_state !=FB_BLANK_UNBLANK ) -fbcon_del_cursor_timer (info); +fbcon_del_cursor_work (info);else -fbcon_add_cursor_timer (info); +fbcon_add_cursor_work (info);set_blitting_type (vc, info); ops->cursor_reset =1 ;
@@ -2241,9 +2231,9 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)if (mode_switch ||fbcon_is_inactive (vc, info) || ops->blank_state !=FB_BLANK_UNBLANK ) -fbcon_del_cursor_timer (info); +fbcon_del_cursor_work (info);else -fbcon_add_cursor_timer (info); +fbcon_add_cursor_work (info);return 0 ; }
@@ -3240,7 +3230,7 @@ static ssize_t show_cursor_blink(struct device *device,if (!ops) goto err; - blink = (ops->flags &FBCON_FLAGS_CURSOR_TIMER ) ?1 :0 ; + blink =delayed_work_pending (&ops->cursor_work); err:console_unlock ();return snprintf (buf,PAGE_SIZE ,"%d\n" , blink);
@@ -3269,10 +3259,10 @@ static ssize_t store_cursor_blink(struct device *device,if (blink) { fbcon_cursor_noblink =0 ; -fbcon_add_cursor_timer (info); +fbcon_add_cursor_work (info); }else { fbcon_cursor_noblink =1 ; -fbcon_del_cursor_timer (info); +fbcon_del_cursor_work (info); } err:
@@ -3385,15 +3375,9 @@ static void fbcon_exit(void)#endif for_each_registered_fb (i) { -int pending =0 ; - mapped =0 ; info = registered_fb[i]; -if (info->queue.func) - pending =cancel_work_sync (&info->queue); -pr_debug ("fbcon: %s pending work\n" , (pending ?"canceled" :"no" )); -for (j = first_fb_vc; j <= last_fb_vc; j++) {if (con2fb_map[j] == i) { mapped =1 ;
@@ -3409,15 +3393,12 @@ static void fbcon_exit(void)if (info->fbcon_par) {struct fbcon_ops *ops = info->fbcon_par; -fbcon_del_cursor_timer (info); +fbcon_del_cursor_work (info);kfree (ops->cursor_src);kfree (ops->cursor_state.mask);kfree (info->fbcon_par); info->fbcon_par =NULL ; } - -if (info->queue.func == fb_flashcursor) - info->queue.func =NULL ; } } }
drivers/video/fbdev/core/fbcon.h +2 -2
@@ -14,11 +14,11 @@#include <linux/types.h> #include <linux/vt_buffer.h> #include <linux/vt_kern.h> +#include <linux/workqueue.h> #include <asm/io.h> #define FBCON_FLAGS_INIT 1 -#define FBCON_FLAGS_CURSOR_TIMER 2/* * This is the interface between the low-level console driver and the
@@ -68,7 +68,7 @@ struct fbcon_ops {int (*update_start)(struct fb_info *info);int (*rotate_font)(struct fb_info *info,struct vc_data *vc);struct fb_var_screeninfo var;/* copy of the current fb_var_screeninfo */ -struct timer_list cursor_timer;/* Cursor timer */ +struct delayed_work cursor_work;/* Cursor timer */ struct fb_cursor cursor_state;struct fbcon_display *p;struct fb_info *info;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 36/570 fbcon: Extract fbcon_open/release helpers
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Vetter <[email protected]>
[ Upstream commit bd6026a8c4e6b7edf4bafcb71da885b284b8f4fd ]
There's two minor behaviour changes in here:
- in error paths we now consistently call fb_ops->fb_release
- fb_release really can't fail (fbmem.c ignores it too) and there's no reasonable cleanup we can do anyway.
Note that everything in fbcon.c is protected by the big console_lock() lock (especially all the global variables), so the minor changes in ordering of setup/cleanup do not matter.
v2: Explain a bit better why this is all correct (Sam)
Stable-dep-of: 011a0502801c ("fbcon: check return value of con2fb_acquire_newinfo()")
--- drivers/video/fbdev/core/fbcon.c | 107 +++++++++++++++---------------- 1 file changed, 53 insertions(+), 54 deletions(-)
drivers/video/fbdev/core/fbcon.c +53 -54
@@ -676,19 +676,37 @@ static int fbcon_invalid_charcount(struct fb_info *info, unsigned charcount)#endif /* CONFIG_MISC_TILEBLITTING */ +static int fbcon_open (struct fb_info *info) +{ +if (!try_module_get (info->fbops->owner)) +return -ENODEV ; + +if (info->fbops->fb_open && + info->fbops->fb_open (info,0 )) { +module_put (info->fbops->owner); +return -ENODEV ; + } + +return 0 ; +} + +static void fbcon_release (struct fb_info *info) +{ +if (info->fbops->fb_release) + info->fbops->fb_release (info,0 ); + +module_put (info->fbops->owner); +}static int con2fb_acquire_newinfo (struct vc_data *vc,struct fb_info *info,int unit,int oldidx) {struct fbcon_ops *ops =NULL ; -int err =0 ; - -if (!try_module_get (info->fbops->owner)) - err = -ENODEV ; +int err; -if (!err && info->fbops->fb_open && - info->fbops->fb_open (info,0 )) - err = -ENODEV ; + err =fbcon_open (info); +if (err) +return err;if (!err) { ops =kzalloc (sizeof (struct fbcon_ops ),GFP_KERNEL );
@@ -709,7 +727,7 @@ static int con2fb_acquire_newinfo(struct vc_data *vc, struct fb_info *info,if (err) { con2fb_map[unit] = oldidx; -module_put (info->fbops->owner); +fbcon_release (info); }return err;
@@ -720,45 +738,34 @@ static int con2fb_release_oldinfo(struct vc_data *vc, struct fb_info *oldinfo, int oldidx, int found) {struct fbcon_ops *ops = oldinfo->fbcon_par; -int err =0 , ret; +int ret; -if (oldinfo->fbops->fb_release && - oldinfo->fbops->fb_release (oldinfo,0 )) { - con2fb_map[unit] = oldidx; -if (!found && newinfo->fbops->fb_release) - newinfo->fbops->fb_release (newinfo,0 ); -if (!found) -module_put (newinfo->fbops->owner); - err = -ENODEV ; - } +fbcon_release (oldinfo); -if (!err) { -fbcon_del_cursor_work (oldinfo); -kfree (ops->cursor_state.mask); -kfree (ops->cursor_data); -kfree (ops->cursor_src); -kfree (ops->fontbuffer); -kfree (oldinfo->fbcon_par); - oldinfo->fbcon_par =NULL ; -module_put (oldinfo->fbops->owner); -/* -If oldinfo and newinfo are driving the same hardware, -the fb_release() method of oldinfo may attempt to -restore the hardware state. This will leave the -newinfo in an undefined state. Thus, a call to -fb_set_par() may be needed for the newinfo. -*/ -if (newinfo && newinfo->fbops->fb_set_par) { - ret = newinfo->fbops->fb_set_par (newinfo); +fbcon_del_cursor_work (oldinfo); +kfree (ops->cursor_state.mask); +kfree (ops->cursor_data); +kfree (ops->cursor_src); +kfree (ops->fontbuffer); +kfree (oldinfo->fbcon_par); + oldinfo->fbcon_par =NULL ; +/* +If oldinfo and newinfo are driving the same hardware, +the fb_release() method of oldinfo may attempt to +restore the hardware state. This will leave the +newinfo in an undefined state. Thus, a call to +fb_set_par() may be needed for the newinfo. +*/ +if (newinfo && newinfo->fbops->fb_set_par) { + ret = newinfo->fbops->fb_set_par (newinfo); -if (ret) -printk (KERN_ERR "con2fb_release_oldinfo: " -"detected unhandled fb_set_par error, " -"error code %d\n" , ret); - } +if (ret) +printk (KERN_ERR "con2fb_release_oldinfo: " +"detected unhandled fb_set_par error, " +"error code %d\n" , ret); } -return err; +return 0 ; } static void con2fb_init_display(struct vc_data *vc, struct fb_info *info,
@@ -914,7 +921,6 @@ static const char *fbcon_startup(void)struct fbcon_display *p = &fb_display[fg_console];struct vc_data *vc = vc_cons[fg_console].d;const struct font_desc *font =NULL ; -struct module *owner;struct fb_info *info =NULL ;struct fbcon_ops *ops;int rows, cols;
@@ -933,17 +939,12 @@ static const char *fbcon_startup(void)if (!info)return NULL ; - owner = info->fbops->owner; -if (!try_module_get (owner)) +if (fbcon_open (info))return NULL ; -if (info->fbops->fb_open && info->fbops->fb_open (info,0 )) { -module_put (owner); -return NULL ; - } ops =kzalloc (sizeof (struct fbcon_ops ),GFP_KERNEL );if (!ops) { -module_put (owner); +fbcon_release (info);return NULL ; }
@@ -3386,10 +3387,6 @@ static void fbcon_exit(void) }if (mapped) { -if (info->fbops->fb_release) - info->fbops->fb_release (info,0 ); -module_put (info->fbops->owner); -if (info->fbcon_par) {struct fbcon_ops *ops = info->fbcon_par;
@@ -3399,6 +3396,8 @@ static void fbcon_exit(void)kfree (info->fbcon_par); info->fbcon_par =NULL ; } + +fbcon_release (info); } } }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 37/570 fbcon: move more common code into fb_open()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Vetter <[email protected]>
[ Upstream commit d443d93864726ad68c0a741d1e7b03934a9af143 ]
No idea why con2fb_acquire_newinfo() initializes much less than fbcon_startup(), but so be it. From a quick look most of the un-initialized stuff should be fairly harmless, but who knows.
Note that the error handling for the con2fb_acquire_newinfo() failure case was very strange: Callers updated con2fb_map to the new value before calling this function, but upon error con2fb_acquire_newinfo reset it to the old value. Since I removed the call to fbcon_release anyway that strange error path was sticking out like a sore thumb, hence I removed it. Which also allows us to remove the oldidx parameter from that function.
v2: Explain what's going on with oldidx and error paths (Sam)
v3: Drop unused variable (0day)
v4: Rebased over bisect fix in previous patch, unchagend end result.
Stable-dep-of: 011a0502801c ("fbcon: check return value of con2fb_acquire_newinfo()")
--- drivers/video/fbdev/core/fbcon.c | 75 +++++++++++++------------------- 1 file changed, 30 insertions(+), 45 deletions(-)
drivers/video/fbdev/core/fbcon.c +30 -45
@@ -676,8 +676,18 @@ static int fbcon_invalid_charcount(struct fb_info *info, unsigned charcount)#endif /* CONFIG_MISC_TILEBLITTING */ +static void fbcon_release (struct fb_info *info) +{ +if (info->fbops->fb_release) + info->fbops->fb_release (info,0 ); + +module_put (info->fbops->owner); +} +static int fbcon_open (struct fb_info *info) { +struct fbcon_ops *ops; +if (!try_module_get (info->fbops->owner))return -ENODEV ;
@@ -687,48 +697,31 @@ static int fbcon_open(struct fb_info *info)return -ENODEV ; } -return 0 ; -} + ops =kzalloc (sizeof (struct fbcon_ops ),GFP_KERNEL ); +if (!ops) { +fbcon_release (info); +return -ENOMEM ; + } -static void fbcon_release (struct fb_info *info) -{ -if (info->fbops->fb_release) - info->fbops->fb_release (info,0 ); +INIT_DELAYED_WORK (&ops->cursor_work, fb_flashcursor); + ops->info = info; + info->fbcon_par = ops; + ops->cur_blink_jiffies =HZ /5 ; -module_put (info->fbops->owner); +return 0 ; }static int con2fb_acquire_newinfo (struct vc_data *vc,struct fb_info *info, -int unit,int oldidx) +int unit) { -struct fbcon_ops *ops =NULL ;int err; err =fbcon_open (info);if (err)return err; -if (!err) { - ops =kzalloc (sizeof (struct fbcon_ops ),GFP_KERNEL ); -if (!ops) - err = -ENOMEM ; - } - -if (!err) { -INIT_DELAYED_WORK (&ops->cursor_work, fb_flashcursor); - - ops->cur_blink_jiffies =HZ /5 ; - ops->info = info; - info->fbcon_par = ops; - -if (vc) -set_blitting_type (vc, info); - } - -if (err) { - con2fb_map[unit] = oldidx; -fbcon_release (info); - } +if (vc) +set_blitting_type (vc, info);return err; }
@@ -840,9 +833,11 @@ static int set_con2fb_map(int unit, int newidx, int user) found =search_fb_in_map (newidx); - con2fb_map[unit] = newidx; -if (!err && !found) - err =con2fb_acquire_newinfo (vc, info, unit, oldidx); +if (!err && !found) { + err =con2fb_acquire_newinfo (vc, info, unit); +if (!err) + con2fb_map[unit] = newidx; + }/* * If old fb is not mapped to any of the consoles,
@@ -942,20 +937,10 @@ static const char *fbcon_startup(void)if (fbcon_open (info))return NULL ; - ops =kzalloc (sizeof (struct fbcon_ops ),GFP_KERNEL ); -if (!ops) { -fbcon_release (info); -return NULL ; - } - -INIT_DELAYED_WORK (&ops->cursor_work, fb_flashcursor); - + ops = info->fbcon_par; ops->currcon =-1 ; ops->graphics =1 ; ops->cur_rotate =-1 ; - ops->cur_blink_jiffies =HZ /5 ; - ops->info = info; - info->fbcon_par = ops; p->con_rotate = initial_rotation;if (p->con_rotate ==-1 )
@@ -1023,7 +1008,7 @@ static void fbcon_init(struct vc_data *vc, bool init)return ;if (!info->fbcon_par) -con2fb_acquire_newinfo (vc, info, vc->vc_num,-1 ); +con2fb_acquire_newinfo (vc, info, vc->vc_num);/* If we are not the first console on this fb, copy the font from that console */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 38/570 fbcon: check return value of con2fb_acquire_newinfo()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrey Vatoropin <[email protected]>
[ Upstream commit 011a0502801c8536f64141a2b61362c14f456544 ]
If fbcon_open() fails when called from con2fb_acquire_newinfo() then info->fbcon_par pointer remains NULL which is later dereferenced.
Add check for return value of the function con2fb_acquire_newinfo() to avoid it.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/video/fbdev/core/fbcon.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/video/fbdev/core/fbcon.c +2 -1
@@ -1008,7 +1008,8 @@ static void fbcon_init(struct vc_data *vc, bool init)return ;if (!info->fbcon_par) -con2fb_acquire_newinfo (vc, info, vc->vc_num); +if (con2fb_acquire_newinfo (vc, info, vc->vc_num)) +return ;/* If we are not the first console on this fb, copy the font from that console */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 39/570 ALSA: hda/conexant: Fix headphone jack handling on Acer Swift SF314
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 7bc0df86c2384bc1e2012a2c946f82305054da64 ]
Acer Swift SF314 (SSID 1025:136d) needs a bit of tweaks of the pin configurations for NID 0x16 and 0x19 to make the headphone / headset jack working. NID 0x17 can remain as is for the working speaker, and the built-in mic is supported via SOF.
--- sound/pci/hda/patch_conexant.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
sound/pci/hda/patch_conexant.c +10 -0
@@ -312,6 +312,7 @@ enum {CXT_PINCFG_SWS_JS201D ,CXT_PINCFG_TOP_SPEAKER ,CXT_FIXUP_HP_A_U , + CXT_FIXUP_ACER_SWIFT_HP, };/* for hda_fixup_thinkpad_acpi() */
@@ -1042,6 +1043,14 @@ static const struct hda_fixup cxt_fixups[] = { .type = HDA_FIXUP_FUNC, .v.func = cxt_fixup_hp_a_u, }, + [CXT_FIXUP_ACER_SWIFT_HP] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl []) { + {0x16 ,0x0321403f },/* Headphone */ + {0x19 ,0x40f001f0 },/* Mic */ + { } + }, + }, };static const struct snd_pci_quirk cxt5045_fixups[] = {
@@ -1091,6 +1100,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = {SND_PCI_QUIRK (0x1025 ,0x0543 ,"Acer Aspire One 522" ,CXT_FIXUP_STEREO_DMIC ),SND_PCI_QUIRK (0x1025 ,0x054c ,"Acer Aspire 3830TG" ,CXT_FIXUP_ASPIRE_DMIC ),SND_PCI_QUIRK (0x1025 ,0x054f ,"Acer Aspire 4830T" ,CXT_FIXUP_ASPIRE_DMIC ), +SND_PCI_QUIRK (0x1025 ,0x136d ,"Acer Swift SF314" ,CXT_FIXUP_ACER_SWIFT_HP ),SND_PCI_QUIRK (0x103c ,0x8079 ,"HP EliteBook 840 G3" ,CXT_FIXUP_HP_DOCK ),SND_PCI_QUIRK (0x103c ,0x807C ,"HP EliteBook 820 G3" ,CXT_FIXUP_HP_DOCK ), SND_PCI_QUIRK(0x103c, 0x80FD, "HP ProBook 640 G2", CXT_FIXUP_HP_DOCK),
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 40/570 net: arcnet: com20020-pci: fix support for 2.5Mbit cards
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ethan Nelson-Moore <[email protected]>
[ Upstream commit c7d9be66b71af490446127c6ffcb66d6bb71b8b9 ]
Commit 8c14f9c70327 ("ARCNET: add com20020 PCI IDs with metadata") converted the com20020-pci driver to use a card info structure instead of a single flag mask in driver_data. However, it failed to take into account that in the original code, driver_data of 0 indicates a card with no special flags, not a card that should not have any card info structure. This introduced a null pointer dereference when cards with no flags were probed.
Commit bd6f1fd5d33d ("net: arcnet: com20020: Fix null-ptr-deref in com20020pci_probe()") then papered over this issue by rejecting cards with no driver_data instead of resolving the problem at its source.
Fix the original issue by introducing a new card info structure for 2.5Mbit cards that does not set any flags and using it if no driver_data is present.
--- drivers/net/arcnet/com20020-pci.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
drivers/net/arcnet/com20020-pci.c +15 -1
@@ -114,6 +114,8 @@ static const struct attribute_group com20020_state_group = { .attrs = com20020_state_attrs, }; +static struct com20020_pci_card_info card_info_2p5mbit; +static void com20020pci_remove (struct pci_dev *pdev); static int com20020pci_probe(struct pci_dev *pdev,
@@ -139,7 +141,7 @@ static int com20020pci_probe(struct pci_dev *pdev, ci = (struct com20020_pci_card_info *)id->driver_data;if (!ci) -return -EINVAL ; + ci = &card_info_2p5mbit; priv->ci = ci; mm = &ci->misc_map;
@@ -346,6 +348,18 @@ static struct com20020_pci_card_info card_info_5mbit = { .flags = ARC_IS_5MBIT, }; +static struct com20020_pci_card_info card_info_2p5mbit = { + .name ="ARC-PCI" , + .devcount =1 , + .chan_map_tbl = { + { + .bar =2 , + .offset =0x00 , + .size =0x08 , + }, + }, +}; +static struct com20020_pci_card_info card_info_sohard = { .name ="SOHARD SH ARC-PCI" , .devcount =1 ,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 41/570 eventpoll: Fix integer overflow in ep_loop_check_proc()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jann Horn <[email protected]>
commit fdcfce93073d990ed4b71752e31ad1c1d6e9d58b upstream.
If a recursive call to ep_loop_check_proc() hits the result = INT_MAX, an integer overflow will occur in the calling ep_loop_check_proc() at result = max(result, ep_loop_check_proc(ep_tovisit, depth + 1) + 1), breaking the recursion depth check.
Fix it by using a different placeholder value that can't lead to an overflow.
--- fs/eventpoll.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/eventpoll.c +3 -2
@@ -1952,7 +1952,8 @@ static int ep_poll(struct eventpoll *ep,* @ep: the &struct eventpoll to be currently checked. * @depth: Current depth of the path being checked. * -* Return: depth of the subtree, or INT_MAX if we found a loop or went too deep. +* Return: depth of the subtree, or a value bigger than EP_MAX_NESTS if we found +* a loop or went too deep. */ static int ep_loop_check_proc (struct eventpoll *ep,int depth) {
@@ -1971,7 +1972,7 @@ static int ep_loop_check_proc(struct evestruct eventpoll *ep_tovisit; ep_tovisit = epi->ffd.file->private_data;if (ep_tovisit == inserting_into || depth >EP_MAX_NESTS ) - result =INT_MAX ; + result =EP_MAX_NESTS +1 ;else result =max (result,ep_loop_check_proc (ep_tovisit, depth +1 ) +1 );if (result >EP_MAX_NESTS )
Greg Kroah-Hartman
maintainerPATCH 42/570 media: dvb-core: fix wrong reinitialization of ringbuffer on reopen
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
commit bfbc0b5b32a8f28ce284add619bf226716a59bc0 upstream.
dvb_dvr_open() calls dvb_ringbuffer_init() when a new reader opens the DVR device. dvb_ringbuffer_init() calls init_waitqueue_head(), which reinitializes the waitqueue list head to empty.
Since dmxdev->dvr_buffer.queue is a shared waitqueue (all opens of the same DVR device share it), this orphans any existing waitqueue entries from io_uring poll or epoll, leaving them with stale prev/next pointers while the list head is reset to {self, self}.
The waitqueue and spinlock in dvr_buffer are already properly initialized once in dvb_dmxdev_init(). The open path only needs to reset the buffer data pointer, size, and read/write positions.
Replace the dvb_ringbuffer_init() call in dvb_dvr_open() with direct assignment of data/size and a call to dvb_ringbuffer_reset(), which properly resets pread, pwrite, and error with correct memory ordering without touching the waitqueue or spinlock.
--- drivers/media/dvb-core/dmxdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/dvb-core/dmxdev.c +3 -1
@@ -178,7 +178,9 @@ static int dvb_dvr_open(struct inode *inmutex_unlock (&dmxdev->mutex);return -ENOMEM ; } -dvb_ringbuffer_init (&dmxdev->dvr_buffer, mem,DVR_BUFFER_SIZE ); + dmxdev->dvr_buffer.data = mem; + dmxdev->dvr_buffer.size =DVR_BUFFER_SIZE ; +dvb_ringbuffer_reset (&dmxdev->dvr_buffer);if (dmxdev->may_do_mmap)dvb_vb2_init (&dmxdev->dvr_vb2_ctx,"dvr" , file->f_flags &O_NONBLOCK );
Greg Kroah-Hartman
maintainerPATCH 43/570 nfc: pn533: properly drop the usb interface reference on disconnect
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 12133a483dfa832241fbbf09321109a0ea8a520e upstream.
When the device is disconnected from the driver, there is a "dangling" reference count on the usb interface that was grabbed in the probe callback. Fix this up by properly dropping the reference after we are done with it.
--- drivers/nfc/pn533/usb.c | 1 + 1 file changed, 1 insertion(+)
drivers/nfc/pn533/usb.c +1 -0
@@ -629,6 +629,7 @@ static void pn533_usb_disconnect(structusb_free_urb (phy->out_urb);usb_free_urb (phy->ack_urb);kfree (phy->ack_buffer); +usb_put_dev (phy->udev);nfc_info (&interface->dev,"NXP PN533 NFC device disconnected\n" ); }
Greg Kroah-Hartman
maintainerPATCH 44/570 net: usb: kaweth: validate USB endpoints
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 4b063c002ca759d1b299988ee23f564c9609c875 upstream.
The kaweth driver should validate that the device it is probing has the proper number and types of USB endpoints it is expecting before it binds to it. If a malicious device were to not have the same urbs the driver will crash later on when it blindly accesses these endpoints.
--- drivers/net/usb/kaweth.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/net/usb/kaweth.c +13 -0
@@ -883,6 +883,13 @@ static int kaweth_probe(const eth_addr_t bcast_addr = {0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF };int result =0 ;int rv = -EIO ; +static const u8 bulk_ep_addr[] = { +1 |USB_DIR_IN , +2 |USB_DIR_OUT , +0 }; +static const u8 int_ep_addr[] = { +3 |USB_DIR_IN , +0 }; dev_dbg(dev, "Kawasaki Device Probe (Device number:%d): 0x%4.4x:0x%4.4x:0x%4.4x\n",
@@ -896,6 +903,12 @@ static int kaweth_probe( (int )udev->descriptor.bLength, (int)udev->descriptor.bDescriptorType); +if (!usb_check_bulk_endpoints (intf, bulk_ep_addr) || + !usb_check_int_endpoints (intf, int_ep_addr)) { +dev_err (dev,"couldn't find required endpoints\n" ); +return -ENODEV ; + } + netdev =alloc_etherdev (sizeof (*kaweth));if (!netdev)return -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 45/570 net: usb: kalmia: validate USB endpoints
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit c58b6c29a4c9b8125e8ad3bca0637e00b71e2693 upstream.
The kalmia driver should validate that the device it is probing has the proper number and types of USB endpoints it is expecting before it binds to it. If a malicious device were to not have the same urbs the driver will crash later on when it blindly accesses these endpoints.
--- drivers/net/usb/kalmia.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/usb/kalmia.c +7 -0
@@ -132,11 +132,18 @@ kalmia_bind(struct usbnet *dev, struct u {int status;u8 ethernet_addr[ETH_ALEN ]; +static const u8 ep_addr[] = { +1 |USB_DIR_IN , +2 |USB_DIR_OUT , +0 };/* Don't bind to AT command interface */ if (intf->cur_altsetting->desc.bInterfaceClass !=USB_CLASS_VENDOR_SPEC )return -EINVAL ; +if (!usb_check_bulk_endpoints (intf, ep_addr)) +return -ENODEV ; + dev->in =usb_rcvbulkpipe (dev->udev,0x81 &USB_ENDPOINT_NUMBER_MASK ); dev->out =usb_sndbulkpipe (dev->udev,0x02 &USB_ENDPOINT_NUMBER_MASK ); dev->status =NULL ;
Greg Kroah-Hartman
maintainerPATCH 46/570 net: usb: pegasus: validate USB endpoints
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 11de1d3ae5565ed22ef1f89d73d8f2d00322c699 upstream.
The pegasus driver should validate that the device it is probing has the proper number and types of USB endpoints it is expecting before it binds to it. If a malicious device were to not have the same urbs the driver will crash later on when it blindly accesses these endpoints.
--- drivers/net/usb/pegasus.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/net/usb/pegasus.c +12 -1
@@ -815,8 +815,19 @@ static void unlink_all_urbs(pegasus_t *pstatic int alloc_urbs (pegasus_t *pegasus) { +static const u8 bulk_ep_addr[] = { +1 |USB_DIR_IN , +2 |USB_DIR_OUT , +0 }; +static const u8 int_ep_addr[] = { +3 |USB_DIR_IN , +0 };int res = -ENOMEM ; +if (!usb_check_bulk_endpoints (pegasus->intf, bulk_ep_addr) || + !usb_check_int_endpoints (pegasus->intf, int_ep_addr)) +return -ENODEV ; + pegasus->rx_urb =usb_alloc_urb (0 ,GFP_KERNEL );if (!pegasus->rx_urb) {return res;
@@ -1171,6 +1182,7 @@ static int pegasus_probe(struct usb_inte pegasus =netdev_priv (net); pegasus->dev_index = dev_index; + pegasus->intf = intf; res =alloc_urbs (pegasus);if (res <0 ) {
@@ -1182,7 +1194,6 @@ static int pegasus_probe(struct usb_inteINIT_DELAYED_WORK (&pegasus->carrier_check, check_carrier); - pegasus->intf = intf; pegasus->usb = dev; pegasus->net = net;
Greg Kroah-Hartman
maintainerPATCH 47/570 can: ems_usb: ems_usb_read_bulk_callback(): check the proper length of a message
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 38a01c9700b0dcafe97dfa9dc7531bf4a245deff upstream.
When looking at the data in a USB urb, the actual_length is the size of the buffer passed to the driver, not the transfer_buffer_length which is set by the driver as the max size of the buffer.
When parsing the messages in ems_usb_read_bulk_callback() properly check the size both at the beginning of parsing the message to make sure it is big enough for the expected structure, and at the end of the message to make sure we don't overflow past the end of the buffer for the next message.
--- drivers/net/can/usb/ems_usb.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/can/usb/ems_usb.c +6 -1
@@ -444,6 +444,11 @@ static void ems_usb_read_bulk_callback(s start =CPC_HEADER_SIZE ;while (msg_count) { +if (start +CPC_MSG_HEADER_LEN > urb->actual_length) { +netdev_err (netdev,"format error\n" ); +break ; + } + msg = (struct ems_cpc_msg *)&ibuf[start];switch (msg->type) {
@@ -473,7 +478,7 @@ static void ems_usb_read_bulk_callback(s start +=CPC_MSG_HEADER_LEN + msg->length; msg_count--; -if (start > urb->transfer_buffer_length) { +if (start > urb->actual_length) {netdev_err (netdev,"format error\n" );break ; }
Greg Kroah-Hartman
maintainerPATCH 48/570 can: ucan: Fix infinite loop from zero-length messages
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 1e446fd0582ad8be9f6dafb115fc2e7245f9bea7 upstream.
If a broken ucan device gets a message with the message length field set to 0, then the driver will loop for forever in ucan_read_bulk_callback(), hanging the system. If the length is 0, just skip the message and go on to the next one.
This has been fixed in the kvaser_usb driver in the past in commit 0c73772cd2b8 ("can: kvaser_usb: leaf: Fix potential infinite loop in command parsers"), so there must be some broken devices out there like this somewhere.
--- drivers/net/can/usb/ucan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/can/usb/ucan.c +1 -1
@@ -747,7 +747,7 @@ static void ucan_read_bulk_callback(stru len =le16_to_cpu (m->len);/* check sanity (length of content) */ -if (urb->actual_length - pos < len) { +if ((len ==0 ) || (urb->actual_length - pos < len)) {netdev_warn (up->netdev,"invalid message (short; no data; l:%d)\n" , urb->actual_length);
Greg Kroah-Hartman
maintainerPATCH 49/570 can: usb: etas_es58x: correctly anchor the urb in the read bulk callback
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 5eaad4f768266f1f17e01232ffe2ef009f8129b7 upstream.
When submitting an urb, that is using the anchor pattern, it needs to be anchored before submitting it otherwise it could be leaked if usb_kill_anchored_urbs() is called. This logic is correctly done elsewhere in the driver, except in the read bulk callback so do that here also.
--- drivers/net/can/usb/etas_es58x/es58x_core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/can/usb/etas_es58x/es58x_core.c +6 -1
@@ -1467,12 +1467,17 @@ static void es58x_read_bulk_callback(str urb->transfer_buffer, urb->transfer_buffer_length, es58x_read_bulk_callback, es58x_dev); +usb_anchor_urb (urb, &es58x_dev->rx_urbs); ret =usb_submit_urb (urb,GFP_ATOMIC ); +if (!ret) +return ; + +usb_unanchor_urb (urb);if (ret == -ENODEV ) {for (i =0 ; i < es58x_dev->num_can_ch; i++)if (es58x_dev->netdev[i])netif_device_detach (es58x_dev->netdev[i]); - }else if (ret) + }else dev_err_ratelimited (dev,"Failed resubmitting read bulk urb: %pe\n" ,ERR_PTR (ret));
Greg Kroah-Hartman
maintainerPATCH 50/570 HID: Add HID_CLAIMED_INPUT guards in raw_event callbacks missing them
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit ecfa6f34492c493a9a1dc2900f3edeb01c79946b upstream.
In commit 2ff5baa9b527 ("HID: appleir: Fix potential NULL dereference at raw event handle"), we handle the fact that raw event callbacks can happen even for a HID device that has not been "claimed" causing a crash if a broken device were attempted to be connected to the system.
Fix up the remaining in-tree HID drivers that forgot to add this same check to resolve the same issue.
--- drivers/hid/hid-cmedia.c | 2 +- drivers/hid/hid-creative-sb0540.c | 2 +- drivers/hid/hid-zydacron.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/hid/hid-cmedia.c +1 -1
@@ -99,7 +99,7 @@ static int cmhid_raw_event(struct hid_de {struct cmhid *cm =hid_get_drvdata (hid); -if (len !=CM6533_JD_RAWEV_LEN ) +if (len !=CM6533_JD_RAWEV_LEN || !(hid->claimed &HID_CLAIMED_INPUT )) goto out;if (memcmp (data+CM6533_JD_SFX_OFFSET , ji_sfx,sizeof (ji_sfx))) goto out;
drivers/hid/hid-creative-sb0540.c +1 -1
@@ -153,7 +153,7 @@ static int creative_sb0540_raw_event(stru64 code, main_code;int key; -if (len !=6 ) +if (len !=6 || !(hid->claimed &HID_CLAIMED_INPUT ))return 0 ;/* From daemons/hw_hiddev.c sb0540_rec() in lirc */
drivers/hid/hid-zydacron.c +1 -1
@@ -114,7 +114,7 @@ static int zc_raw_event(struct hid_devicunsigned key;unsigned short index; -if (report->id == data[0 ]) { +if (report->id == data[0 ] && (hdev->claimed &HID_CLAIMED_INPUT )) {/* break keys */ for (index =0 ; index <4 ; index++) {
Greg Kroah-Hartman
maintainerPATCH 51/570 x86/efi: defer freeing of boot services memory
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mike Rapoport (Microsoft) <[email protected]>
commit a4b0bf6a40f3c107c67a24fbc614510ef5719980 upstream.
efi_free_boot_services() frees memory occupied by EFI_BOOT_SERVICES_CODE and EFI_BOOT_SERVICES_DATA using memblock_free_late().
There are two issue with that: memblock_free_late() should be used for memory allocated with memblock_alloc() while the memory reserved with memblock_reserve() should be freed with free_reserved_area().
More acutely, with CONFIG_DEFERRED_STRUCT_PAGE_INIT=y efi_free_boot_services() is called before deferred initialization of the memory map is complete.
Benjamin Herrenschmidt reports that this causes a leak of ~140MB of RAM on EC2 t3a.nano instances which only have 512MB or RAM.
If the freed memory resides in the areas that memory map for them is still uninitialized, they won't be actually freed because memblock_free_late() calls memblock_free_pages() and the latter skips uninitialized pages.
Using free_reserved_area() at this point is also problematic because __free_page() accesses the buddy of the freed page and that again might end up in uninitialized part of the memory map.
Delaying the entire efi_free_boot_services() could be problematic because in addition to freeing boot services memory it updates efi.memmap without any synchronization and that's undesirable late in boot when there is concurrency.
More robust approach is to only defer freeing of the EFI boot services memory.
Split efi_free_boot_services() in two. First efi_unmap_boot_services() collects ranges that should be freed into an array then efi_free_boot_services() later frees them after deferred init is complete.
--- arch/x86/include/asm/efi.h | 2 - arch/x86/platform/efi/efi.c | 2 - arch/x86/platform/efi/quirks.c | 55 ++++++++++++++++++++++++++++++++++-- drivers/firmware/efi/mokvar-table.c | 2 - 4 files changed, 55 insertions(+), 6 deletions(-)
arch/x86/include/asm/efi.h +1 -1
@@ -156,7 +156,7 @@ extern void __init efi_apply_memmap_quirextern int __init efi_reuse_config (u64 tables,int nr_tables);extern void efi_delete_dummy_variable (void );extern void efi_crash_gracefully_on_page_fault (unsigned long phys_addr); -extern void efi_free_boot_services (void ); +extern void efi_unmap_boot_services (void );void efi_enter_mm (void );void efi_leave_mm (void );
arch/x86/platform/efi/efi.c +1 -1
@@ -831,7 +831,7 @@ static void __init __efi_enter_virtual_m }efi_check_for_embedded_firmwares (); -efi_free_boot_services (); +efi_unmap_boot_services ();if (!efi_is_mixed ())efi_native_runtime_setup ();
arch/x86/platform/efi/quirks.c +52 -3
89 lines not on this page · raw message
drivers/firmware/efi/mokvar-table.c +1 -1
@@ -85,7 +85,7 @@ static struct kobject *mokvar_kobj;* as an alternative to ordinary EFI variables, due to platform-dependent * limitations. The memory occupied by this table is marked as reserved. * -* This routine must be called before efi_free_boot_services() in order +* This routine must be called before efi_unmap_boot_services() in order * to guarantee that it can mark the table as reserved. * * Implicit inputs:
Greg Kroah-Hartman
maintainerPATCH 52/570 platform/x86: dell-wmi-sysman: Dont hex dump plaintext password data
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thorsten Blum <[email protected]>
commit d1a196e0a6dcddd03748468a0e9e3100790fc85c upstream.
set_new_password() hex dumps the entire buffer, which contains plaintext password data, including current and new passwords. Remove the hex dump to avoid leaking credentials.
--- drivers/platform/x86/dell/dell-wmi-sysman/passwordattr-interface.c | 1 - 1 file changed, 1 deletion(-)
drivers/platform/x86/dell/dell-wmi-sysman/passwordattr-interface.c +0 -1
@@ -93,7 +93,6 @@ int set_new_password(const char *passworif (ret <0 ) goto out; -print_hex_dump_bytes ("set new password data: " ,DUMP_PREFIX_NONE , buffer, buffer_size); ret =call_password_interface (wmi_priv.password_attr_wdev, buffer, buffer_size);/* on success copy the new password to current password */ if (!ret)
Greg Kroah-Hartman
maintainerPATCH 53/570 platform/x86: dell-wmi: Add audio/mic mute key codes
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kurt Borja <[email protected]>
commit 26a7601471f62b95d56a81c3a8ccb551b5a6630f upstream.
Add audio/mic mute key codes found in Alienware m18 r1 AMD.
--- drivers/platform/x86/dell/dell-wmi-base.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/platform/x86/dell/dell-wmi-base.c +6 -0
@@ -79,6 +79,12 @@ static const struct dmi_system_id dell_wstatic const struct key_entry dell_wmi_keymap_type_0000[] = { {KE_IGNORE ,0x003a , {KEY_CAPSLOCK } }, +/* Audio mute toggle */ + {KE_KEY ,0x0109 , {KEY_MUTE } }, + +/* Mic mute toggle */ + {KE_KEY ,0x0150 , {KEY_MICMUTE } }, +/* Meta key lock */ {KE_IGNORE ,0xe000 , {KEY_RIGHTMETA } },
Greg Kroah-Hartman
maintainerPATCH 54/570 ALSA: usb-audio: Use correct version for UAC3 header validation
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jun Seo <[email protected]>
commit 54f9d645a5453d0bfece0c465d34aaf072ea99fa upstream.
The entry of the validators table for UAC3 AC header descriptor is defined with the wrong protocol version UAC_VERSION_2, while it should have been UAC_VERSION_3. This results in the validator never matching for actual UAC3 devices (protocol == UAC_VERSION_3), causing their header descriptors to bypass validation entirely. A malicious USB device presenting a truncated UAC3 header could exploit this to cause out-of-bounds reads when the driver later accesses unvalidated descriptor fields.
The bug was introduced in the same commit as the recently fixed UAC3 feature unit sub-type typo, and appears to be from the same copy-paste error when the UAC3 section was created from the UAC2 section.
--- sound/usb/validate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/validate.c +1 -1
@@ -281,7 +281,7 @@ static const struct usb_desc_validator a/* UAC_VERSION_2, UAC2_SAMPLE_RATE_CONVERTER: not implemented yet */ /* UAC3 */ - FIXED(UAC_VERSION_2, UAC_HEADER, struct uac3_ac_header_descriptor), + FIXED(UAC_VERSION_3, UAC_HEADER, struct uac3_ac_header_descriptor),FIXED (UAC_VERSION_3 ,UAC_INPUT_TERMINAL , struct uac3_input_terminal_descriptor), FIXED(UAC_VERSION_3, UAC_OUTPUT_TERMINAL,
Greg Kroah-Hartman
maintainerPATCH 55/570 wifi: radiotap: reject radiotap with unknown bits
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
commit c854758abe0b8d86f9c43dc060ff56a0ee5b31e0 upstream.
The radiotap parser is currently only used with the radiotap namespace (not with vendor namespaces), but if the undefined field 18 is used, the alignment/size is unknown as well. In this case, iterator->_next_ns_data isn't initialized (it's only set for skipping vendor namespaces), and syzbot points out that we later compare against this uninitialized value.
Fix this by moving the rejection of unknown radiotap fields down to after the in-namespace lookup, so it will really use iterator->_next_ns_data only for vendor namespaces, even in case undefined fields are present.
--- net/wireless/radiotap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/wireless/radiotap.c +2 -2
@@ -239,14 +239,14 @@ int ieee80211_radiotap_iterator_next(default :if (!iterator->current_namespace || iterator->_arg_index >= iterator->current_namespace->n_bits) { -if (iterator->current_namespace == &radiotap_ns) -return -ENOENT ; align =0 ; }else { align = iterator->current_namespace->align_size[iterator->_arg_index].align; size = iterator->current_namespace->align_size[iterator->_arg_index].size; }if (!align) { +if (iterator->current_namespace == &radiotap_ns) +return -ENOENT ;/* skip all subsequent data */ iterator->_arg = iterator->_next_ns_data;/* give up on this namespace */
Greg Kroah-Hartman
maintainerPATCH 56/570 wifi: mac80211: fix NULL pointer dereference in mesh_rx_csa_frame()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vahagn Vardanian <[email protected]>
commit 017c1792525064a723971f0216e6ef86a8c7af11 upstream.
In mesh_rx_csa_frame(), elems->mesh_chansw_params_ie is dereferenced at lines 1638 and 1642 without a prior NULL check:
ifmsh->chsw_ttl = elems->mesh_chansw_params_ie->mesh_ttl;
...
pre_value = le16_to_cpu(elems->mesh_chansw_params_ie->mesh_pre_value);The mesh_matches_local() check above only validates the Mesh ID, Mesh Configuration, and Supported Rates IEs. It does not verify the presence of the Mesh Channel Switch Parameters IE (element ID 118). When a received CSA action frame omits that IE, ieee802_11_parse_elems() leaves elems->mesh_chansw_params_ie as NULL, and the unconditional dereference causes a kernel NULL pointer dereference.
A remote mesh peer with an established peer link (PLINK_ESTAB) can trigger this by sending a crafted SPECTRUM_MGMT/CHL_SWITCH action frame that includes a matching Mesh ID and Mesh Configuration IE but omits the Mesh Channel Switch Parameters IE. No authentication beyond the default open mesh peering is required.
Crash confirmed on kernel 6.17.0-5-generic via mac80211_hwsim:
BUG: kernel NULL pointer dereference, address: 0000000000000000 Oops: Oops: 0000 [#1] SMP NOPTI RIP: 0010:ieee80211_mesh_rx_queued_mgmt+0x143/0x2a0 [mac80211] CR2: 0000000000000000
Fix by adding a NULL check for mesh_chansw_params_ie after mesh_matches_local() returns, consistent with how other optional IEs are guarded throughout the mesh code.
The bug has been present since v3.13 (released 2014-01-19).
--- net/mac80211/mesh.c | 3 +++ 1 file changed, 3 insertions(+)
net/mac80211/mesh.c +3 -0
@@ -1477,6 +1477,9 @@ static void mesh_rx_csa_frame(struct ieeif (!mesh_matches_local (sdata, elems)) goto free; +if (!elems->mesh_chansw_params_ie) + goto free; + ifmsh->chsw_ttl = elems->mesh_chansw_params_ie->mesh_ttl;if (!--ifmsh->chsw_ttl) fwd_csa = false;
Greg Kroah-Hartman
maintainerPATCH 57/570 IB/mthca: Add missed mthca_unmap_user_db() for mthca_create_srq()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Gunthorpe <[email protected]>
commit 117942ca43e2e3c3d121faae530989931b7f67e1 upstream.
Fix a user triggerable leak on the system call failure path.
--- drivers/infiniband/hw/mthca/mthca_provider.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/infiniband/hw/mthca/mthca_provider.c +3 -2
@@ -436,6 +436,8 @@ static int mthca_create_srq(struct ib_srif (context &&ib_copy_to_udata (udata, &srq->srqn,sizeof (__u32))) {mthca_free_srq (to_mdev (ibsrq->device), srq); +mthca_unmap_user_db (to_mdev (ibsrq->device), &context->uar, + context->db_tab, ucmd.db_index);return -EFAULT ; }
@@ -444,6 +446,7 @@ static int mthca_create_srq(struct ib_srstatic int mthca_destroy_srq (struct ib_srq *srq,struct ib_udata *udata) { +mthca_free_srq (to_mdev (srq->device),to_msrq (srq));if (udata) {struct mthca_ucontext *context = rdma_udata_to_drv_context(
@@ -454,8 +457,6 @@ static int mthca_destroy_srq(struct ib_smthca_unmap_user_db (to_mdev (srq->device), &context->uar, context->db_tab,to_msrq (srq)->db_index); } - -mthca_free_srq (to_mdev (srq->device),to_msrq (srq));return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 58/570 net/sched: ets: fix divide by zero in the offload path
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Davide Caratti <[email protected]>
commit e35626f610f3d2b7953ccddf6a77453da22b3a9e upstream.
Offloading ETS requires computing each class' WRR weight: this is done by averaging over the sums of quanta as 'q_sum' and 'q_psum'. Using unsigned int, the same integer size as the individual DRR quanta, can overflow and even cause division by zero, like it happened in the following splat:
Oops: divide error: 0000 [#1] SMP PTI CPU: 13 UID: 0 PID: 487 Comm: tc Tainted: G E 6.19.0-virtme #45 PREEMPT(full) Tainted: [E]=UNSIGNED_MODULE Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011 RIP: 0010:ets_offload_change+0x11f/0x290 [sch_ets] Code: e4 45 31 ff eb 03 41 89 c7 41 89 cb 89 ce 83 f9 0f 0f 87 b7 00 00 00 45 8b 08 31 c0 45 01 cc 45 85 c9 74 09 41 6b c4 64 31 d2 <41> f7 f2 89 c2 44 29 fa 45 89 df 41 83 fb 0f 0f 87 c7 00 00 00 44 RSP: 0018:ffffd0a180d77588 EFLAGS: 00010246 RAX: 00000000ffffff38 RBX: ffff8d3d482ca000 RCX: 0000000000000000 RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffffd0a180d77660 RBP: ffffd0a180d77690 R08: ffff8d3d482ca2d8 R09: 00000000fffffffe R10: 0000000000000000 R11: 0000000000000000 R12: 00000000fffffffe R13: ffff8d3d472f2000 R14: 0000000000000003 R15: 0000000000000000 FS: 00007f440b6c2740(0000) GS:ffff8d3dc9803000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000000003cdd2000 CR3: 0000000007b58002 CR4: 0000000000172ef0 Call Trace: <TASK> ets_qdisc_change+0x870/0xf40 [sch_ets] qdisc_create+0x12b/0x540 tc_modify_qdisc+0x6d7/0xbd0 rtnetlink_rcv_msg+0x168/0x6b0 netlink_rcv_skb+0x5c/0x110 netlink_unicast+0x1d6/0x2b0 netlink_sendmsg+0x22e/0x470 ____sys_sendmsg+0x38a/0x3c0 ___sys_sendmsg+0x99/0xe0 __sys_sendmsg+0x8a/0xf0 do_syscall_64+0x111/0xf80 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7f440b81c77e Code: 4d 89 d8 e8 d4 bc 00 00 4c 8b 5d f8 41 8b 93 08 03 00 00 59 5e 48 83 f8 fc 74 11 c9 c3 0f 1f 80 00 00 00 00 48 8b 45 10 0f 05 <c9> c3 83 e2 39 83 fa 08 75 e7 e8 13 ff ff ff 0f 1f 00 f3 0f 1e fa RSP: 002b:00007fff951e4c10 EFLAGS: 00000202 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 0000000000481820 RCX: 00007f440b81c77e RDX: 0000000000000000 RSI: 00007fff951e4cd0 RDI: 0000000000000003 RBP: 00007fff951e4c20 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000202 R12: 00007fff951f4fa8 R13: 00000000699ddede R14: 00007f440bb01000 R15: 0000000000486980 </TASK> Modules linked in: sch_ets(E) netdevsim(E) ---[ end trace 0000000000000000 ]--- RIP: 0010:ets_offload_change+0x11f/0x290 [sch_ets] Code: e4 45 31 ff eb 03 41 89 c7 41 89 cb 89 ce 83 f9 0f 0f 87 b7 00 00 00 45 8b 08 31 c0 45 01 cc 45 85 c9 74 09 41 6b c4 64 31 d2 <41> f7 f2 89 c2 44 29 fa 45 89 df 41 83 fb 0f 0f 87 c7 00 00 00 44 RSP: 0018:ffffd0a180d77588 EFLAGS: 00010246 RAX: 00000000ffffff38 RBX: ffff8d3d482ca000 RCX: 0000000000000000 RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffffd0a180d77660 RBP: ffffd0a180d77690 R08: ffff8d3d482ca2d8 R09: 00000000fffffffe R10: 0000000000000000 R11: 0000000000000000 R12: 00000000fffffffe R13: ffff8d3d472f2000 R14: 0000000000000003 R15: 0000000000000000 FS: 00007f440b6c2740(0000) GS:ffff8d3dc9803000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000000003cdd2000 CR3: 0000000007b58002 CR4: 0000000000172ef0 Kernel panic - not syncing: Fatal exception Kernel Offset: 0x30000000 from 0xffffffff81000000 (relocation range: 0xffffffff80000000-0xffffffffbfffffff) ---[ end Kernel panic - not syncing: Fatal exception ]---
Fix this using 64-bit integers for 'q_sum' and 'q_psum'.
--- net/sched/sch_ets.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
net/sched/sch_ets.c +8 -4
@@ -115,12 +115,12 @@ static void ets_offload_change(struct Qdstruct ets_sched *q =qdisc_priv (sch);struct tc_ets_qopt_offload qopt;unsigned int w_psum_prev =0 ; -unsigned int q_psum =0 ; -unsigned int q_sum =0 ;unsigned int quantum;unsigned int w_psum;unsigned int weight;unsigned int i; +u64 q_psum =0 ; +u64 q_sum =0 ;if (!tc_can_offload (dev) || !dev->netdev_ops->ndo_setup_tc)return ;
@@ -138,8 +138,12 @@ static void ets_offload_change(struct Qdfor (i =0 ; i < q->nbands; i++) { quantum = q->classes[i].quantum; - q_psum += quantum; - w_psum = quantum ? q_psum *100 / q_sum :0 ; +if (quantum) { + q_psum += quantum; + w_psum =div64_u64 (q_psum *100 , q_sum); + }else { + w_psum =0 ; + } weight = w_psum - w_psum_prev; w_psum_prev = w_psum;
Greg Kroah-Hartman
maintainerPATCH 59/570 Squashfs: check metadata block offset is within range
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Phillip Lougher <[email protected]>
commit fdb24a820a5832ec4532273282cbd4f22c291a0d upstream.
Syzkaller reports a "general protection fault in squashfs_copy_data"
This is ultimately caused by a corrupted index look-up table, which produces a negative metadata block offset.
This is subsequently passed to squashfs_copy_data (via squashfs_read_metadata) where the negative offset causes an out of bounds access.
The fix is to check that the offset is within range in squashfs_read_metadata. This will trap this and other cases.
--- fs/squashfs/cache.c | 3 +++ 1 file changed, 3 insertions(+)
fs/squashfs/cache.c +3 -0
@@ -340,6 +340,9 @@ int squashfs_read_metadata(struct super_if (unlikely (length <0 ))return -EIO ; +if (unlikely (*offset <0 || *offset >=SQUASHFS_METADATA_SIZE )) +return -EIO ; +while (length) { entry =squashfs_cache_get (sb, msblk->block_cache, *block,0 );if (entry->error) {
Greg Kroah-Hartman
maintainerPATCH 60/570 drbd: fix "LOGIC BUG" in drbd_al_begin_io_nonblock()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lars Ellenberg <[email protected]>
commit ab140365fb62c0bdab22b2f516aff563b2559e3b upstream.
Even though we check that we "should" be able to do lc_get_cumulative() while holding the device->al_lock spinlock, it may still fail, if some other code path decided to do lc_try_lock() with bad timing.
If that happened, we logged "LOGIC BUG for enr=...", but still did not return an error.
The rest of the code now assumed that this request has references for the relevant activity log extents.
The implcations are that during an active resync, mutual exclusivity of resync versus application IO is not guaranteed. And a potential crash at this point may not realizs that these extents could have been target of in-flight IO and would need to be resynced just in case.
Also, once the request completes, it will give up activity log references it does not even hold, which will trigger a BUG_ON(refcnt == 0) in lc_put().
Fix:
Do not crash the kernel for a condition that is harmless during normal
operation: also catch "e->refcnt == 0", not only "e == NULL" when being noisy about "al_complete_io() called on inactive extent %u\n".
And do not try to be smart and "guess" whether something will work, then be surprised when it does not.
Deal with the fact that it may or may not work. If it does not, remember a possible "partially in activity log" state (only possible for requests that cross extent boundaries), and return an error code from drbd_al_begin_io_nonblock().
A latter call for the same request will then resume from where we left off.
--- drivers/block/drbd/drbd_actlog.c | 53 ++++++++++++++++--------------------- drivers/block/drbd/drbd_interval.h | 5 ++- 2 files changed, 27 insertions(+), 31 deletions(-)
drivers/block/drbd/drbd_actlog.c +23 -30
@@ -483,38 +483,20 @@ void drbd_al_begin_io(struct drbd_deviceint drbd_al_begin_io_nonblock (struct drbd_device *device,struct drbd_interval *i) { -struct lru_cache *al = device->act_log;/* for bios crossing activity log extent boundaries, * we may need to activate two extents in one go */ unsigned first = i->sector >> (AL_EXTENT_SHIFT -9 );unsigned last = i->size ==0 ? first : (i->sector + (i->size >>9 ) -1 ) >> (AL_EXTENT_SHIFT -9 ); -unsigned nr_al_extents; -unsigned available_update_slots;unsigned enr; -D_ASSERT (device, first <= last); - - nr_al_extents =1 + last - first;/* worst case: all touched extends are cold. */ - available_update_slots =min (al->nr_elements - al->used, - al->max_pending_changes - al->pending_changes); - -/* We want all necessary updates for a given request within the same transaction -* We could first check how many updates are *actually* needed, -* and use that instead of the worst-case nr_al_extents */ -if (available_update_slots < nr_al_extents) { -/* Too many activity log extents are currently "hot". -* -* If we have accumulated pending changes already, -* we made progress. -* -* If we cannot get even a single pending change through, -* stop the fast path until we made some progress, -* or requests to "cold" extents could be starved. */ -if (!al->pending_changes) -__set_bit (__LC_STARVING, &device->act_log->flags); -return -ENOBUFS ; +if (i->partially_in_al_next_enr) { +D_ASSERT (device, first < i->partially_in_al_next_enr); +D_ASSERT (device, last >= i->partially_in_al_next_enr); + first = i->partially_in_al_next_enr; } +D_ASSERT (device, first <= last); +/* Is resync active in this area? */ for (enr = first; enr <= last; enr++) {struct lc_element *tmp;
@@ -529,14 +511,21 @@ int drbd_al_begin_io_nonblock(struct drb } } -/* Checkout the refcounts. -* Given that we checked for available elements and update slots above, -* this has to be successful. */ +/* Try to checkout the refcounts. */ for (enr = first; enr <= last; enr++) {struct lc_element *al_ext; al_ext =lc_get_cumulative (device->act_log, enr); -if (!al_ext) -drbd_info (device,"LOGIC BUG for enr=%u\n" , enr); + +if (!al_ext) { +/* Did not work. We may have exhausted the possible +* changes per transaction. Or raced with someone +* "locking" it against changes. +* Remember where to continue from. +*/ +if (enr > first) + i->partially_in_al_next_enr = enr; +return -ENOBUFS ; + } }return 0 ; }
@@ -556,7 +545,11 @@ void drbd_al_complete_io(struct drbd_devfor (enr = first; enr <= last; enr++) { extent =lc_find (device->act_log, enr); -if (!extent) { +/* Yes, this masks a bug elsewhere. However, during normal +* operation this is harmless, so no need to crash the kernel +* by the BUG_ON(refcount == 0) in lc_put(). +*/ +if (!extent || extent->refcnt ==0 ) {drbd_err (device,"al_complete_io() called on inactive extent %u\n" , enr);continue ; }
drivers/block/drbd/drbd_interval.h +4 -1
@@ -8,12 +8,15 @@struct drbd_interval {struct rb_node rb;sector_t sector;/* start sector of the interval */ -unsigned int size;/* size in bytes */ sector_t end;/* highest interval end in subtree */ +unsigned int size;/* size in bytes */ unsigned int local:1 /* local or remote request? */ ;unsigned int waiting:1 ;/* someone is waiting for completion */ unsigned int completed:1 ;/* this has been completed already; * ignore for conflict detection */ + +/* to resume a partially successful drbd_al_begin_io_nonblock(); */ +unsigned int partially_in_al_next_enr; };static inline void drbd_clear_interval (struct drbd_interval *i)
Greg Kroah-Hartman
maintainerPATCH 61/570 scsi: core: Fix refcount leak for tagset_refcnt
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Junxiao Bi <[email protected]>
commit 1ac22c8eae81366101597d48360718dff9b9d980 upstream.
This leak will cause a hang when tearing down the SCSI host. For example, iscsid hangs with the following call trace:
[130120.652718] scsi_alloc_sdev: Allocation failure during SCSI scanning, some SCSI devices might not be configured
PID: 2528 TASK: ffff9d0408974e00 CPU: 3 COMMAND: "iscsid"
#0 [ffffb5b9c134b9e0] __schedule at ffffffff860657d4
#1 [ffffb5b9c134ba28] schedule at ffffffff86065c6f
#2 [ffffb5b9c134ba40] schedule_timeout at ffffffff86069fb0
#3 [ffffb5b9c134bab0] __wait_for_common at ffffffff8606674f
#4 [ffffb5b9c134bb10] scsi_remove_host at ffffffff85bfe84b
#5 [ffffb5b9c134bb30] iscsi_sw_tcp_session_destroy at ffffffffc03031c4 [iscsi_tcp] #6 [ffffb5b9c134bb48] iscsi_if_recv_msg at ffffffffc0292692 [scsi_transport_iscsi] #7 [ffffb5b9c134bb98] iscsi_if_rx at ffffffffc02929c2 [scsi_transport_iscsi] #8 [ffffb5b9c134bbf0] netlink_unicast at ffffffff85e551d6
#9 [ffffb5b9c134bc38] netlink_sendmsg at ffffffff85e554ef
--- drivers/scsi/scsi_scan.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/scsi_scan.c +1 -0
@@ -340,6 +340,7 @@ static struct scsi_device *scsi_alloc_sd* since we use this queue depth most of times. */ if (scsi_realloc_sdev_budget_map (sdev, depth)) { +kref_put (&sdev->host->tagset_refcnt, scsi_mq_free_tags);put_device (&starget->dev);kfree (sdev); goto out;
Greg Kroah-Hartman
maintainerPATCH 62/570 selftests: mptcp: more stable simult_flows tests
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paolo Abeni <[email protected]>
commit 8c09412e584d9bcc0e71d758ec1008d1c8d1a326 upstream.
By default, the netem qdisc can keep up to 1000 packets under its belly to deal with the configured rate and delay. The simult flows test-case simulates very low speed links, to avoid problems due to slow CPUs and the TCP stack tend to transmit at a slightly higher rate than the (virtual) link constraints.
All the above causes a relatively large amount of packets being enqueued in the netem qdiscs - the longer the transfer, the longer the queue - producing increasingly high TCP RTT samples and consequently increasingly larger receive buffer size due to DRS.
When the receive buffer size becomes considerably larger than the needed size, the tests results can flake, i.e. because minimal inaccuracy in the pacing rate can lead to a single subflow usage towards the end of the connection for a considerable amount of data.
Address the issue explicitly setting netem limits suitable for the configured link speeds and unflake all the affected tests.
--- tools/testing/selftests/net/mptcp/simult_flows.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
tools/testing/selftests/net/mptcp/simult_flows.sh +7 -4
@@ -234,10 +234,13 @@ run_test() for dev in ns2eth1 ns2eth2; do tc -n $ns2 qdisc del dev $dev root >/dev/null 2>&1 done - tc -n $ns1 qdisc add dev ns1eth1 root netem rate ${rate1}mbit $delay1 - tc -n $ns1 qdisc add dev ns1eth2 root netem rate ${rate2}mbit $delay2 - tc -n $ns2 qdisc add dev ns2eth1 root netem rate ${rate1}mbit $delay1 - tc -n $ns2 qdisc add dev ns2eth2 root netem rate ${rate2}mbit $delay2 + + # keep the queued pkts number low, or the RTT estimator will see + # increasing latency over time. + tc -n $ns1 qdisc add dev ns1eth1 root netem rate ${rate1}mbit $delay1 limit 50 + tc -n $ns1 qdisc add dev ns1eth2 root netem rate ${rate2}mbit $delay2 limit 50 + tc -n $ns2 qdisc add dev ns2eth1 root netem rate ${rate1}mbit $delay1 limit 50 + tc -n $ns2 qdisc add dev ns2eth2 root netem rate ${rate2}mbit $delay2 limit 50 # time is measured in ms, account for transfer size, aggregated link speed # and header overhead (10%)
Greg Kroah-Hartman
maintainerPATCH 63/570 platform/x86: thinkpad_acpi: Fix errors reading battery thresholds
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonathan Teh <[email protected]>
[ Upstream commit 53e977b1d50c46f2c4ec3865cd13a822f58ad3cd ]
Check whether the battery supports the relevant charge threshold before reading the value to silence these errors:
thinkpad_acpi: acpi_evalf(BCTG, dd, ...) failed: AE_NOT_FOUND
ACPI: \_SB_.PCI0.LPC_.EC__.HKEY: BCTG: evaluate failedthinkpad_acpi: acpi_evalf(BCSG, dd, ...) failed: AE_NOT_FOUND
ACPI: \_SB_.PCI0.LPC_.EC__.HKEY: BCSG: evaluate failed
when reading the charge thresholds via sysfs on platforms that do not support them such as the ThinkPad T400.
--- drivers/platform/x86/thinkpad_acpi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/platform/x86/thinkpad_acpi.c +4 -2
@@ -9460,14 +9460,16 @@ static int tpacpi_battery_get(int what, int battery, int *ret) {switch (what) {case THRESHOLD_START : - if ACPI_FAILURE(tpacpi_battery_acpi_eval(GET_START, ret, battery)) +if (!battery_info.batteries[battery].start_support || +ACPI_FAILURE (tpacpi_battery_acpi_eval (GET_START , ret, battery)))return -ENODEV ;/* The value is in the low 8 bits of the response */ *ret = *ret &0xFF ;return 0 ;case THRESHOLD_STOP : - if ACPI_FAILURE(tpacpi_battery_acpi_eval(GET_STOP, ret, battery)) +if (!battery_info.batteries[battery].stop_support || +ACPI_FAILURE (tpacpi_battery_acpi_eval (GET_STOP , ret, battery)))return -ENODEV ;/* Value is in lower 8 bits */ *ret = *ret &0xFF ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 64/570 net: ethernet: ti: am65-cpsw-nuss/cpsw-ale: Fix multicast entry handling in ALE table
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chintan Vankar <[email protected]>
[ Upstream commit be11a537224d72b906db6b98510619770298c8a4 ]
In the current implementation, flushing multicast entries in MAC mode incorrectly deletes entries for all ports instead of only the target port, disrupting multicast traffic on other ports. The cause is adding multicast entries by setting only host port bit, and not setting the MAC port bits.
Fix this by setting the MAC port's bit in the port mask while adding the multicast entry. Also fix the flush logic to preserve the host port bit during removal of MAC port and free ALE entries when mask contains only host port.
--- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 +- drivers/net/ethernet/ti/cpsw_ale.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-)
drivers/net/ethernet/ti/am65-cpsw-nuss.c +1 -1
@@ -320,7 +320,7 @@ static void am65_cpsw_nuss_ndo_slave_set_rx_mode(struct net_device *ndev)cpsw_ale_set_allmulti (common->ale, ndev->flags &IFF_ALLMULTI , port->port_id); - port_mask =ALE_PORT_HOST ; + port_mask =BIT (port->port_id) |ALE_PORT_HOST ;/* Clear all mcast from ALE */ cpsw_ale_flush_multicast (common->ale, port_mask,-1 );
drivers/net/ethernet/ti/cpsw_ale.c +4 -5
@@ -420,14 +420,13 @@ static void cpsw_ale_flush_mcast(struct cpsw_ale *ale, u32 *ale_entry, ale->port_mask_bits);if ((mask & port_mask) ==0 )return ;/* ports dont intersect, not interested */ - mask &= ~port_mask; + mask &= (~port_mask |ALE_PORT_HOST ); -/* free if only remaining port is host port */ -if (mask) +if (mask ==0x0 || mask ==ALE_PORT_HOST ) +cpsw_ale_set_entry_type (ale_entry,ALE_TYPE_FREE ); +else cpsw_ale_set_port_mask (ale_entry, mask, ale->port_mask_bits); -else -cpsw_ale_set_entry_type (ale_entry,ALE_TYPE_FREE ); }int cpsw_ale_flush_multicast (struct cpsw_ale *ale,int port_mask,int vid)
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 65/570 net: dpaa2: replace dpaa2_mac_is_type_fixed() with dpaa2_mac_is_type_phy()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Oltean <[email protected]>
[ Upstream commit 320fefa9e2edc67011e235ea1d50f0d00ddfe004 ]
dpaa2_mac_is_type_fixed() is a header with no implementation and no callers, which is referenced from the documentation though. It can be deleted.
On the other hand, it would be useful to reuse the code between dpaa2_eth_is_type_phy() and dpaa2_switch_port_is_type_phy(). That common code should be called dpaa2_mac_is_type_phy(), so let's create that.
The removal and the addition are merged into the same patch because, in fact, is_type_phy() is the logical opposite of is_type_fixed().
Stable-dep-of: 74badb9c20b1 ("dpaa2-switch: Fix interrupt storm after receiving bad if_id in IRQ handler")
--- .../ethernet/freescale/dpaa2/mac-phy-support.rst | 9 ++++++--- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 7 +------ drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h | 10 ++++++++-- drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.h | 7 +------ 4 files changed, 16 insertions(+), 17 deletions(-)
Documentation/networking/device_drivers/ethernet/freescale/dpaa2/mac-phy-support.rst +6 -3
@@ -181,10 +181,13 @@ when necessary using the below listed API:: - int dpaa2_mac_connect(struct dpaa2_mac *mac); - void dpaa2_mac_disconnect(struct dpaa2_mac *mac); -A phylink integration is necessary only when the partner DPMAC is not of TYPE_FIXED. -One can check for this condition using the below API:: +A phylink integration is necessary only when the partner DPMAC is not of +``TYPE_FIXED``. This means it is either of ``TYPE_PHY``, or of +``TYPE_BACKPLANE`` (the difference being the two that in the ``TYPE_BACKPLANE`` +mode, the MC firmware does not access the PCS registers). One can check for +this condition using the following helper:: - - bool dpaa2_mac_is_type_fixed(struct fsl_mc_device *dpmac_dev,struct fsl_mc_io *mc_io); + - static inline bool dpaa2_mac_is_type_phy(struct dpaa2_mac *mac); Before connection to a MAC, the caller must allocate and populate the dpaa2_mac structure with the associated net_device, a pointer to the MC portal
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h +1 -6
@@ -711,12 +711,7 @@ static inline unsigned int dpaa2_eth_rx_head_room(struct dpaa2_eth_priv *priv)static inline bool dpaa2_eth_is_type_phy (struct dpaa2_eth_priv *priv) { -if (priv->mac && - (priv->mac->attr.link_type ==DPMAC_LINK_TYPE_PHY || - priv->mac->attr.link_type ==DPMAC_LINK_TYPE_BACKPLANE )) -return true; - -return false; +return dpaa2_mac_is_type_phy (priv->mac); }static inline bool dpaa2_eth_has_mac (struct dpaa2_eth_priv *priv)
drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h +8 -2
@@ -27,8 +27,14 @@ struct dpaa2_mac {struct fwnode_handle *fw_node; }; -bool dpaa2_mac_is_type_fixed (struct fsl_mc_device *dpmac_dev, -struct fsl_mc_io *mc_io); +static inline bool dpaa2_mac_is_type_phy (struct dpaa2_mac *mac) +{ +if (!mac) +return false; + +return mac->attr.link_type ==DPMAC_LINK_TYPE_PHY || + mac->attr.link_type ==DPMAC_LINK_TYPE_BACKPLANE ; +}int dpaa2_mac_open (struct dpaa2_mac *mac);
drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.h +1 -6
@@ -230,12 +230,7 @@ static inline bool dpaa2_switch_supports_cpu_traffic(struct ethsw_core *ethsw)static inline bool dpaa2_switch_port_is_type_phy (struct ethsw_port_priv *port_priv) { -if (port_priv->mac && - (port_priv->mac->attr.link_type ==DPMAC_LINK_TYPE_PHY || - port_priv->mac->attr.link_type ==DPMAC_LINK_TYPE_BACKPLANE )) -return true; - -return false; +return dpaa2_mac_is_type_phy (port_priv->mac); }static inline bool dpaa2_switch_port_has_mac (struct ethsw_port_priv *port_priv)
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 66/570 net: dpaa2-switch: assign port_priv->mac after dpaa2_mac_connect() call
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Oltean <[email protected]>
[ Upstream commit 88d64367cea019fa6197d0d97a85ac90279919b7 ]
The dpaa2-switch has the exact same locking requirements when connected to a DPMAC, so it needs port_priv->mac to always point either to NULL, or to a DPMAC with a fully initialized phylink instance.
Make the same preparatory change in the dpaa2-switch driver as in the dpaa2-eth one.
Stable-dep-of: 74badb9c20b1 ("dpaa2-switch: Fix interrupt storm after receiving bad if_id in IRQ handler")
--- .../ethernet/freescale/dpaa2/dpaa2-switch.c | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-)
drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c +12 -9
@@ -1456,9 +1456,8 @@ static int dpaa2_switch_port_connect_mac(struct ethsw_port_priv *port_priv) err =dpaa2_mac_open (mac);if (err) goto err_free_mac; - port_priv->mac = mac; -if (dpaa2_switch_port_is_type_phy (port_priv)) { +if (dpaa2_mac_is_type_phy (mac)) { err =dpaa2_mac_connect (mac);if (err) { netdev_err(port_priv->netdev,
@@ -1468,11 +1467,12 @@ static int dpaa2_switch_port_connect_mac(struct ethsw_port_priv *port_priv) } } + port_priv->mac = mac; +return 0 ; err_close_mac:dpaa2_mac_close (mac); - port_priv->mac =NULL ; err_free_mac:kfree (mac); out_put_device:
@@ -1482,15 +1482,18 @@ static int dpaa2_switch_port_connect_mac(struct ethsw_port_priv *port_priv)static void dpaa2_switch_port_disconnect_mac (struct ethsw_port_priv *port_priv) { -if (dpaa2_switch_port_is_type_phy (port_priv)) -dpaa2_mac_disconnect (port_priv->mac); +struct dpaa2_mac *mac = port_priv->mac; -if (!dpaa2_switch_port_has_mac (port_priv)) + port_priv->mac =NULL ; + +if (!mac)return ; -dpaa2_mac_close (port_priv->mac); -kfree (port_priv->mac); - port_priv->mac =NULL ; +if (dpaa2_mac_is_type_phy (mac)) +dpaa2_mac_disconnect (mac); + +dpaa2_mac_close (mac); +kfree (mac); }static irqreturn_t dpaa2_switch_irq0_handler_thread (int irq_num,void *arg)
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 67/570 net: dpaa2-switch replace direct MAC access with dpaa2_switch_port_has_mac()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Oltean <[email protected]>
[ Upstream commit bc230671bfb25c2d3c225f674fe6c03cea88d22e ]
The helper function will gain a lockdep annotation in a future patch. Make sure to benefit from it.
Stable-dep-of: 74badb9c20b1 ("dpaa2-switch: Fix interrupt storm after receiving bad if_id in IRQ handler")
--- drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-ethtool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-ethtool.c +1 -1
@@ -196,7 +196,7 @@ static void dpaa2_switch_ethtool_get_stats(struct net_device *netdev, dpaa2_switch_ethtool_counters[i].name, err); } -if (port_priv->mac) +if (dpaa2_switch_port_has_mac (port_priv))dpaa2_mac_get_ethtool_stats (port_priv->mac, data + i); }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 68/570 net: dpaa2-switch: serialize changes to priv->mac with a mutex
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Oltean <[email protected]>
[ Upstream commit 3c7f44fa9c4c8a9154935ca49e4cf45c14240335 ]
The dpaa2-switch driver uses a DPMAC in the same way as the dpaa2-eth driver, so we need to duplicate the locking solution established by the previous change to the switch driver as well.
Stable-dep-of: 74badb9c20b1 ("dpaa2-switch: Fix interrupt storm after receiving bad if_id in IRQ handler")
--- .../freescale/dpaa2/dpaa2-switch-ethtool.c | 32 +++++++++++++++---- .../ethernet/freescale/dpaa2/dpaa2-switch.c | 31 ++++++++++++++++-- .../ethernet/freescale/dpaa2/dpaa2-switch.h | 2 ++ 3 files changed, 55 insertions(+), 10 deletions(-)
drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-ethtool.c +25 -7
@@ -60,11 +60,18 @@ dpaa2_switch_get_link_ksettings(struct net_device *netdev, {struct ethsw_port_priv *port_priv =netdev_priv (netdev);struct dpsw_link_state state = {0 }; -int err =0 ; +int err; + +mutex_lock (&port_priv->mac_lock); -if (dpaa2_switch_port_is_type_phy (port_priv)) -return phylink_ethtool_ksettings_get (port_priv->mac->phylink, - link_ksettings); +if (dpaa2_switch_port_is_type_phy (port_priv)) { + err =phylink_ethtool_ksettings_get (port_priv->mac->phylink, + link_ksettings); +mutex_unlock (&port_priv->mac_lock); +return err; + } + +mutex_unlock (&port_priv->mac_lock); err = dpsw_if_get_link_state(port_priv->ethsw_data->mc_io, 0, port_priv->ethsw_data->dpsw_handle,
@@ -99,9 +106,16 @@ dpaa2_switch_set_link_ksettings(struct net_device *netdev,bool if_running;int err =0 , ret; -if (dpaa2_switch_port_is_type_phy (port_priv)) -return phylink_ethtool_ksettings_set (port_priv->mac->phylink, - link_ksettings); +mutex_lock (&port_priv->mac_lock); + +if (dpaa2_switch_port_is_type_phy (port_priv)) { + err =phylink_ethtool_ksettings_set (port_priv->mac->phylink, + link_ksettings); +mutex_unlock (&port_priv->mac_lock); +return err; + } + +mutex_unlock (&port_priv->mac_lock);/* Interface needs to be down to change link settings */ if_running =netif_running (netdev);
@@ -196,8 +210,12 @@ static void dpaa2_switch_ethtool_get_stats(struct net_device *netdev, dpaa2_switch_ethtool_counters[i].name, err); } +mutex_lock (&port_priv->mac_lock); +if (dpaa2_switch_port_has_mac (port_priv))dpaa2_mac_get_ethtool_stats (port_priv->mac, data + i); + +mutex_unlock (&port_priv->mac_lock); }const struct ethtool_ops dpaa2_switch_port_ethtool_ops = {
drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c +28 -3
@@ -602,8 +602,11 @@ static int dpaa2_switch_port_link_state_update(struct net_device *netdev)/* When we manage the MAC/PHY using phylink there is no need * to manually update the netif_carrier. +* We can avoid locking because we are called from the "link changed" +* IRQ handler, which is the same as the "endpoint changed" IRQ handler +* (the writer to port_priv->mac), so we cannot race with it. */ -if (dpaa2_switch_port_is_type_phy (port_priv)) +if (dpaa2_mac_is_type_phy (port_priv->mac))return 0 ;/* Interrupts are received even though no one issued an 'ifconfig up'
@@ -683,6 +686,8 @@ static int dpaa2_switch_port_open(struct net_device *netdev)struct ethsw_core *ethsw = port_priv->ethsw_data;int err; +mutex_lock (&port_priv->mac_lock); +if (!dpaa2_switch_port_is_type_phy (port_priv)) {/* Explicitly set carrier off, otherwise * netif_carrier_ok() will return true and cause 'ip link show'
@@ -696,6 +701,7 @@ static int dpaa2_switch_port_open(struct net_device *netdev) port_priv->ethsw_data->dpsw_handle, port_priv->idx);if (err) { +mutex_unlock (&port_priv->mac_lock);netdev_err (netdev,"dpsw_if_enable err %d\n" , err);return err; }
@@ -705,6 +711,8 @@ static int dpaa2_switch_port_open(struct net_device *netdev)if (dpaa2_switch_port_is_type_phy (port_priv))phylink_start (port_priv->mac->phylink); +mutex_unlock (&port_priv->mac_lock); +return 0 ; }
@@ -714,6 +722,8 @@ static int dpaa2_switch_port_stop(struct net_device *netdev)struct ethsw_core *ethsw = port_priv->ethsw_data;int err; +mutex_lock (&port_priv->mac_lock); +if (dpaa2_switch_port_is_type_phy (port_priv)) {phylink_stop (port_priv->mac->phylink); }else {
@@ -721,6 +731,8 @@ static int dpaa2_switch_port_stop(struct net_device *netdev)netif_carrier_off (netdev); } +mutex_unlock (&port_priv->mac_lock); + err =dpsw_if_disable (port_priv->ethsw_data->mc_io,0 , port_priv->ethsw_data->dpsw_handle, port_priv->idx);
@@ -1467,7 +1479,9 @@ static int dpaa2_switch_port_connect_mac(struct ethsw_port_priv *port_priv) } } +mutex_lock (&port_priv->mac_lock); port_priv->mac = mac; +mutex_unlock (&port_priv->mac_lock);return 0 ;
@@ -1482,9 +1496,12 @@ static int dpaa2_switch_port_connect_mac(struct ethsw_port_priv *port_priv)static void dpaa2_switch_port_disconnect_mac (struct ethsw_port_priv *port_priv) { -struct dpaa2_mac *mac = port_priv->mac; +struct dpaa2_mac *mac; +mutex_lock (&port_priv->mac_lock); + mac = port_priv->mac; port_priv->mac =NULL ; +mutex_unlock (&port_priv->mac_lock);if (!mac)return ;
@@ -1503,6 +1520,7 @@ static irqreturn_t dpaa2_switch_irq0_handler_thread(int irq_num, void *arg)struct ethsw_port_priv *port_priv;u32 status = ~0 ;int err, if_id; +bool had_mac; err =dpsw_get_irq_status (ethsw->mc_io,0 , ethsw->dpsw_handle,DPSW_IRQ_INDEX_IF , &status);
@@ -1525,7 +1543,12 @@ static irqreturn_t dpaa2_switch_irq0_handler_thread(int irq_num, void *arg)if (status &DPSW_IRQ_EVENT_ENDPOINT_CHANGED ) {rtnl_lock (); -if (dpaa2_switch_port_has_mac (port_priv)) +/* We can avoid locking because the "endpoint changed" IRQ +* handler is the only one who changes priv->mac at runtime, +* so we are not racing with anyone. +*/ + had_mac = !!port_priv->mac; +if (had_mac)dpaa2_switch_port_disconnect_mac (port_priv);else dpaa2_switch_port_connect_mac (port_priv);
@@ -3281,6 +3304,8 @@ static int dpaa2_switch_probe_port(struct ethsw_core *ethsw, port_priv->netdev = port_netdev; port_priv->ethsw_data = ethsw; +mutex_init (&port_priv->mac_lock); + port_priv->idx = port_idx; port_priv->stp_state =BR_STATE_FORWARDING ;
drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.h +2 -0
@@ -161,6 +161,8 @@ struct ethsw_port_priv {struct dpaa2_switch_filter_block *filter_block;struct dpaa2_mac *mac; +/* Protects against changes to port_priv->mac */ +struct mutex mac_lock; };/* Switch data */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 69/570 dpaa2-switch: do not clear any interrupts automatically
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ioana Ciornei <[email protected]>
[ Upstream commit f6da276479c63ca29774bc331a537b92f0550c45 ]
The DPSW object has multiple event sources multiplexed over the same IRQ. The driver has the capability to configure only some of these events to trigger the IRQ.
The dpsw_get_irq_status() can clear events automatically based on the value stored in the 'status' variable passed to it. We don't want that to happen because we could get into a situation when we are clearing more events than we actually handled.
Just resort to manually clearing the events that we handled. Also, since status is not used on the out path we remove its initialization to zero.
This change does not have a user-visible effect because the dpaa2-switch driver enables and handles all the DPSW events which exist at the moment.
Stable-dep-of: 74badb9c20b1 ("dpaa2-switch: Fix interrupt storm after receiving bad if_id in IRQ handler")
--- drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c +2 -2
@@ -1518,9 +1518,9 @@ static irqreturn_t dpaa2_switch_irq0_handler_thread(int irq_num, void *arg)struct device *dev = (struct device *)arg;struct ethsw_core *ethsw =dev_get_drvdata (dev);struct ethsw_port_priv *port_priv; -u32 status = ~0 ;int err, if_id;bool had_mac; +u32 status; err =dpsw_get_irq_status (ethsw->mc_io,0 , ethsw->dpsw_handle,DPSW_IRQ_INDEX_IF , &status);
@@ -1555,12 +1555,12 @@ static irqreturn_t dpaa2_switch_irq0_handler_thread(int irq_num, void *arg)rtnl_unlock (); } -out: err =dpsw_clear_irq_status (ethsw->mc_io,0 , ethsw->dpsw_handle,DPSW_IRQ_INDEX_IF , status);if (err)dev_err (dev,"Can't clear irq status (err %d)\n" , err); +out:return IRQ_HANDLED ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 70/570 dpaa2-switch: Fix interrupt storm after receiving bad if_id in IRQ handler
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guenter Roeck <[email protected]>
[ Upstream commit 74badb9c20b1a9c02a95c735c6d3cd6121679c93 ]
Commit 31a7a0bbeb00 ("dpaa2-switch: add bounds check for if_id in IRQ handler") introduces a range check for if_id to avoid an out-of-bounds access. If an out-of-bounds if_id is detected, the interrupt status is not cleared. This may result in an interrupt storm.
Clear the interrupt status after detecting an out-of-bounds if_id to avoid the problem.
Found by an experimental AI code review agent at Google.
--- drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c +2 -1
@@ -1532,7 +1532,7 @@ static irqreturn_t dpaa2_switch_irq0_handler_thread(int irq_num, void *arg) if_id = (status &0xFFFF0000 ) >>16 ;if (if_id >= ethsw->sw_attr.num_ifs) {dev_err (dev,"Invalid if_id %d in IRQ status\n" , if_id); - goto out; + goto out_clear; } port_priv = ethsw->ports[if_id];
@@ -1555,6 +1555,7 @@ static irqreturn_t dpaa2_switch_irq0_handler_thread(int irq_num, void *arg)rtnl_unlock (); } +out_clear: err =dpsw_clear_irq_status (ethsw->mc_io,0 , ethsw->dpsw_handle,DPSW_IRQ_INDEX_IF , status);if (err)
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 71/570 atm: lec: fix null-ptr-deref in lec_arp_clear_vccs
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiayuan Chen <[email protected]>
[ Upstream commit 101bacb303e89dc2e0640ae6a5e0fb97c4eb45bb ]
syzkaller reported a null-ptr-deref in lec_arp_clear_vccs(). This issue can be easily reproduced using the syzkaller reproducer.
In the ATM LANE (LAN Emulation) module, the same atm_vcc can be shared by multiple lec_arp_table entries (e.g., via entry->vcc or entry->recv_vcc). When the underlying VCC is closed, lec_vcc_close() iterates over all ARP entries and calls lec_arp_clear_vccs() for each matched entry.
For example, when lec_vcc_close() iterates through the hlists in priv->lec_arp_empty_ones or other ARP tables:
1. In the first iteration, for the first matched ARP entry sharing the VCC, lec_arp_clear_vccs() frees the associated vpriv (which is vcc->user_back) and sets vcc->user_back to NULL.
2. In the second iteration, for the next matched ARP entry sharing the same VCC, lec_arp_clear_vccs() is called again. It obtains a NULL vpriv from vcc->user_back (via LEC_VCC_PRIV(vcc)) and then attempts to dereference it via vcc->pop = vpriv->old_pop, leading to a null-ptr-deref crash.
Fix this by adding a null check for vpriv before dereferencing it. If vpriv is already NULL, it means the VCC has been cleared by a previous call, so we can safely skip the cleanup and just clear the entry's vcc/recv_vcc pointers.
The entire cleanup block (including vcc_release_async()) is placed inside the vpriv guard because a NULL vpriv indicates the VCC has already been fully released by a prior iteration — repeating the teardown would redundantly set flags and trigger callbacks on an already-closing socket.
The Fixes tag points to the initial commit because the entry->vcc path has been vulnerable since the original code. The entry->recv_vcc path was later added by commit 8d9f73c0ad2f ("atm: fix a memory leak of vcc->user_back") with the same pattern, and both paths are fixed here.
--- net/atm/lec.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-)
net/atm/lec.c +15 -11
@@ -1262,24 +1262,28 @@ static void lec_arp_clear_vccs(struct lec_arp_table *entry)struct lec_vcc_priv *vpriv =LEC_VCC_PRIV (vcc);struct net_device *dev = (struct net_device *)vcc->proto_data; - vcc->pop = vpriv->old_pop; -if (vpriv->xoff) -netif_wake_queue (dev); -kfree (vpriv); - vcc->user_back =NULL ; - vcc->push = entry->old_push; -vcc_release_async (vcc, -EPIPE ); +if (vpriv) { + vcc->pop = vpriv->old_pop; +if (vpriv->xoff) +netif_wake_queue (dev); +kfree (vpriv); + vcc->user_back =NULL ; + vcc->push = entry->old_push; +vcc_release_async (vcc, -EPIPE ); + } entry->vcc =NULL ; }if (entry->recv_vcc) {struct atm_vcc *vcc = entry->recv_vcc;struct lec_vcc_priv *vpriv =LEC_VCC_PRIV (vcc); -kfree (vpriv); - vcc->user_back =NULL ; +if (vpriv) { +kfree (vpriv); + vcc->user_back =NULL ; - entry->recv_vcc->push = entry->old_recv_push; -vcc_release_async (entry->recv_vcc, -EPIPE ); + entry->recv_vcc->push = entry->old_recv_push; +vcc_release_async (entry->recv_vcc, -EPIPE ); + } entry->recv_vcc =NULL ; } }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 72/570 can: bcm: fix locking for bcm_op runtime updates
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Hartkopp <[email protected]>
[ Upstream commit c35636e91e392e1540949bbc67932167cb48bc3a ]
Commit c2aba69d0c36 ("can: bcm: add locking for bcm_op runtime updates") added a locking for some variables that can be modified at runtime when updating the sending bcm_op with a new TX_SETUP command in bcm_tx_setup().
Usually the RX_SETUP only handles and filters incoming traffic with one
exception: When the RX_RTR_FRAME flag is set a predefined CAN frame is sent when a specific RTR frame is received. Therefore the rx bcm_op uses bcm_can_tx() which uses the bcm_tx_lock that was only initialized in bcm_tx_setup(). Add the missing spin_lock_init() when allocating the bcm_op in bcm_rx_setup() to handle the RTR case properly.
--- net/can/bcm.c | 1 + 1 file changed, 1 insertion(+)
net/can/bcm.c +1 -0
@@ -1123,6 +1123,7 @@ static int bcm_rx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,if (!op)return -ENOMEM ; +spin_lock_init (&op->bcm_tx_lock); op->can_id = msg_head->can_id; op->nframes = msg_head->nframes; op->cfsiz =CFSIZ (msg_head->flags);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 73/570 can: mcp251x: fix deadlock in error path of mcp251x_open
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alban Bedel <[email protected]>
[ Upstream commit ab3f894de216f4a62adc3b57e9191888cbf26885 ]
The mcp251x_open() function call free_irq() in its error path with the mpc_lock mutex held. But if an interrupt already occurred the interrupt handler will be waiting for the mpc_lock and free_irq() will deadlock waiting for the handler to finish.
This issue is similar to the one fixed in commit 7dd9c26bd6cf ("can:
mcp251x: fix deadlock if an interrupt occurs during mcp251x_open") but for the error path.
To solve this issue move the call to free_irq() after the lock is released. Setting priv->force_quit = 1 beforehand ensure that the IRQ handler will exit right away once it acquired the lock.
--- drivers/net/can/spi/mcp251x.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
drivers/net/can/spi/mcp251x.c +14 -1
@@ -1207,6 +1207,7 @@ static int mcp251x_open(struct net_device *net) {struct mcp251x_priv *priv =netdev_priv (net);struct spi_device *spi = priv->spi; +bool release_irq = false;unsigned long flags =0 ;int ret;
@@ -1252,12 +1253,24 @@ static int mcp251x_open(struct net_device *net)return 0 ; out_free_irq: -free_irq (spi->irq, priv); +/* The IRQ handler might be running, and if so it will be waiting +* for the lock. But free_irq() must wait for the handler to finish +* so calling it here would deadlock. +* +* Setting priv->force_quit will let the handler exit right away +* without any access to the hardware. This make it safe to call +* free_irq() after the lock is released. +*/ + priv->force_quit =1 ; + release_irq = true; +mcp251x_hw_sleep (spi); out_close:mcp251x_power_enable (priv->transceiver,0 );close_candev (net);mutex_unlock (&priv->mcp_lock); +if (release_irq) +free_irq (spi->irq, priv);return ret; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 74/570 wifi: cw1200: Fix locking in error paths
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bart Van Assche <[email protected]>
[ Upstream commit d98c24617a831e92e7224a07dcaed2dd0b02af96 ]
cw1200_wow_suspend() must only return with priv->conf_mutex locked if it returns zero. This mutex must be unlocked if an error is returned. Add mutex_unlock() calls to the error paths from which that call is missing. This has been detected by the Clang thread-safety analyzer.
--- drivers/net/wireless/st/cw1200/pm.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/st/cw1200/pm.c +2 -0
@@ -264,12 +264,14 @@ int cw1200_wow_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)wiphy_err (priv->hw->wiphy,"PM request failed: %d. WoW is disabled.\n" , ret);cw1200_wow_resume (hw); +mutex_unlock (&priv->conf_mutex);return -EBUSY ; }/* Force resume if event is coming from the device. */ if (atomic_read (&priv->bh_rx)) {cw1200_wow_resume (hw); +mutex_unlock (&priv->conf_mutex);return -EAGAIN ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 75/570 wifi: wlcore: Fix a locking bug
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bart Van Assche <[email protected]>
[ Upstream commit 72c6df8f284b3a49812ce2ac136727ace70acc7c ]
Make sure that wl->mutex is locked before it is unlocked. This has been detected by the Clang thread-safety analyzer.
--- drivers/net/wireless/ti/wlcore/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ti/wlcore/main.c +2 -2
@@ -1813,6 +1813,8 @@ static int __maybe_unused wl1271_op_resume(struct ieee80211_hw *hw) wl->wow_enabled);WARN_ON (!wl->wow_enabled); +mutex_lock (&wl->mutex); + ret =pm_runtime_force_resume (wl->dev);if (ret <0 ) {wl1271_error ("ELP wakeup failure!" );
@@ -1829,8 +1831,6 @@ static int __maybe_unused wl1271_op_resume(struct ieee80211_hw *hw) run_irq_work = true;spin_unlock_irqrestore (&wl->wl_lock, flags); -mutex_lock (&wl->mutex); -/* test the recovery flag before calling any SDIO functions */ pending_recovery =test_bit (WL1271_FLAG_RECOVERY_IN_PROGRESS , &wl->flags);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 76/570 indirect_call_wrapper: do not reevaluate function pointer
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 710f5c76580306cdb9ec51fac8fcf6a8faff7821 ]
We have an increasing number of READ_ONCE(xxx->function) combined with INDIRECT_CALL_[1234]() helpers.
Unfortunately this forces INDIRECT_CALL_[1234]() to read xxx->function many times, which is not what we wanted.
Fix these macros so that xxx->function value is not reloaded.
$ scripts/bloat-o-meter -t vmlinux.0 vmlinux add/remove: 0/0 grow/shrink: 1/65 up/down: 122/-1084 (-962) Function old new delta ip_push_pending_frames 59 181 +122 ip6_finish_output 687 681 -6 __udp_enqueue_schedule_skb 1078 1072 -6 ioam6_output 2319 2312 -7 xfrm4_rcv_encap_finish2 64 56 -8 xfrm4_output 297 289 -8 vrf_ip_local_out 278 270 -8 vrf_ip6_local_out 278 270 -8 seg6_input_finish 64 56 -8 rpl_output 700 692 -8 ipmr_forward_finish 124 116 -8 ip_forward_finish 143 135 -8 ip6mr_forward2_finish 100 92 -8 ip6_forward_finish 73 65 -8 input_action_end_bpf 1091 1083 -8 dst_input 52 44 -8 __xfrm6_output 801 793 -8 __xfrm4_output 83 75 -8 bpf_input 500 491 -9 __tcp_check_space 530 521 -9 input_action_end_dt6 291 280 -11 vti6_tnl_xmit 1634 1622 -12 bpf_xmit 1203 1191 -12 rpl_input 497 483 -14 rawv6_send_hdrinc 1355 1341 -14 ndisc_send_skb 1030 1016 -14 ipv6_srh_rcv 1377 1363 -14 ip_send_unicast_reply 1253 1239 -14 ip_rcv_finish 226 212 -14 ip6_rcv_finish 300 286 -14 input_action_end_x_core 205 191 -14 input_action_end_x 355 341 -14 input_action_end_t 205 191 -14 input_action_end_dx6_finish 127 113 -14 input_action_end_dx4_finish 373 359 -14 input_action_end_dt4 426 412 -14 input_action_end_core 186 172 -14 input_action_end_b6_encap 292 278 -14 input_action_end_b6 198 184 -14 igmp6_send 1332 1318 -14 ip_sublist_rcv 864 848 -16 ip6_sublist_rcv 1091 1075 -16 ipv6_rpl_srh_rcv 1937 1920 -17 xfrm_policy_queue_process 1246 1228 -18 seg6_output_core 903 885 -18 mld_sendpack 856 836 -20 NF_HOOK 756 736 -20 vti_tunnel_xmit 1447 1426 -21 input_action_end_dx6 664 642 -22 input_action_end 1502 1480 -22 sock_sendmsg_nosec 134 111 -23 ip6mr_forward2 388 364 -24 sock_recvmsg_nosec 134 109 -25 seg6_input_core 836 810 -26 ip_send_skb 172 146 -26 ip_local_out 140 114 -26 ip6_local_out 140 114 -26 __sock_sendmsg 162 136 -26 __ip_queue_xmit 1196 1170 -26 __ip_finish_output 405 379 -26 ipmr_queue_fwd_xmit 373 346 -27 sock_recvmsg 173 145 -28 ip6_xmit 1635 1607 -28 xfrm_output_resume 1418 1389 -29 ip_build_and_send_pkt 625 591 -34 dst_output 504 432 -72 Total: Before=25217686, After=25216724, chg -0.00%
--- include/linux/indirect_call_wrapper.h | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
include/linux/indirect_call_wrapper.h +11 -7
@@ -16,22 +16,26 @@*/ #define INDIRECT_CALL_1 (f, f1, ...) \ ({ \ - likely(f == f1) ? f1(__VA_ARGS__) : f(__VA_ARGS__); \ + typeof(f) __f1 = (f); \ + likely(__f1 == f1) ? f1(__VA_ARGS__) : __f1(__VA_ARGS__); \ })#define INDIRECT_CALL_2 (f, f2, f1, ...) \ ({ \ - likely(f == f2) ? f2(__VA_ARGS__) : \ - INDIRECT_CALL_1(f, f1, __VA_ARGS__); \ + typeof(f) __f2 = (f); \ + likely(__f2 == f2) ? f2(__VA_ARGS__) : \ + INDIRECT_CALL_1(__f2, f1, __VA_ARGS__); \ })#define INDIRECT_CALL_3 (f, f3, f2, f1, ...) \ ({ \ - likely(f == f3) ? f3(__VA_ARGS__) : \ - INDIRECT_CALL_2(f, f2, f1, __VA_ARGS__); \ + typeof(f) __f3 = (f); \ + likely(__f3 == f3) ? f3(__VA_ARGS__) : \ + INDIRECT_CALL_2(__f3, f2, f1, __VA_ARGS__); \ })#define INDIRECT_CALL_4 (f, f4, f3, f2, f1, ...) \ ({ \ - likely(f == f4) ? f4(__VA_ARGS__) : \ - INDIRECT_CALL_3(f, f3, f2, f1, __VA_ARGS__); \ + typeof(f) __f4 = (f); \ + likely(__f4 == f4) ? f4(__VA_ARGS__) : \ + INDIRECT_CALL_3(__f4, f3, f2, f1, __VA_ARGS__); \ })#define INDIRECT_CALLABLE_DECLARE (f) f
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 77/570 xen/acpi-processor: fix _CST detection using undersized evaluation buffer
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Thomson <[email protected]>
[ Upstream commit 8b57227d59a86fc06d4f09de08f98133680f2cae ]
read_acpi_id() attempts to evaluate _CST using a stack buffer of sizeof(union acpi_object) (48 bytes), but _CST returns a nested Package of sub-Packages (one per C-state, each containing a register descriptor, type, latency, and power) requiring hundreds of bytes. The evaluation always fails with AE_BUFFER_OVERFLOW.
On modern systems using FFH/MWAIT entry (where pblk is zero), this causes the function to return before setting the acpi_id_cst_present bit. In check_acpi_ids(), flags.power is then zero for all Phase 2 CPUs (physical CPUs beyond dom0's vCPU count), so push_cxx_to_hypervisor() is never called for them.
On a system with dom0_max_vcpus=2 and 8 physical CPUs, only PCPUs 0-1 receive C-state data. PCPUs 2-7 are stuck in C0/C1 idle, unable to enter C2/C3. This costs measurable wall power (4W observed on an Intel Core Ultra 7 265K with Xen 4.20).
The function never uses the _CST return value -- it only needs to know whether _CST exists. Replace the broken acpi_evaluate_object() call with acpi_has_method(), which correctly detects _CST presence using acpi_get_handle() without any buffer allocation. This brings C-state detection to parity with the P-state path, which already works correctly for Phase 2 CPUs.
Message-ID: <[email protected]>
--- drivers/xen/xen-acpi-processor.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/xen/xen-acpi-processor.c +2 -5
@@ -379,11 +379,8 @@ read_acpi_id(acpi_handle handle, u32 lvl, void *context, void **rv) acpi_psd[acpi_id].domain); } - status =acpi_evaluate_object (handle,"_CST" ,NULL , &buffer); -if (ACPI_FAILURE (status)) { -if (!pblk) -return AE_OK ; - } +if (!pblk && !acpi_has_method (handle,"_CST" )) +return AE_OK ;/* .. and it has a C-state */ __set_bit (acpi_id, acpi_id_cst_present);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 78/570 ipv6: fix NULL pointer deref in ip6_rt_get_dev_rcu()
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 2ffb4f5c2ccb2fa1c049dd11899aee7967deef5a ]
l3mdev_master_dev_rcu() can return NULL when the slave device is being un-slaved from a VRF. All other callers deal with this, but we lost the fallback to loopback in ip6_rt_pcpu_alloc() -> ip6_rt_get_dev_rcu() with commit 4832c30d5458 ("net: ipv6: put host and anycast routes on device with address").
KASAN: null-ptr-deref in range [0x0000000000000108-0x000000000000010f] RIP: 0010:ip6_rt_pcpu_alloc (net/ipv6/route.c:1418) Call Trace: ip6_pol_route (net/ipv6/route.c:2318) fib6_rule_lookup (net/ipv6/fib6_rules.c:115) ip6_route_output_flags (net/ipv6/route.c:2607) vrf_process_v6_outbound (drivers/net/vrf.c:437)
I was tempted to rework the un-slaving code to clear the flag first and insert synchronize_rcu() before we remove the upper. But looks like the explicit fallback to loopback_dev is an established pattern. And I guess avoiding the synchronize_rcu() is nice, too.
--- net/ipv6/route.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/ipv6/route.c +2 -1
@@ -1018,7 +1018,8 @@ static struct net_device *ip6_rt_get_dev_rcu(const struct fib6_result *res)*/ if (netif_is_l3_slave (dev) && !rt6_need_strict (&res->f6i->fib6_dst.addr)) - dev =l3mdev_master_dev_rcu (dev); + dev =l3mdev_master_dev_rcu (dev) ? : +dev_net (dev)->loopback_dev;else if (!netif_is_l3_master (dev)) dev =dev_net (dev)->loopback_dev;/* last case is netif_is_l3_master(dev) is true in which
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 79/570 amd-xgbe: fix sleep while atomic on suspend/resume
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Raju Rangoju <[email protected]>
[ Upstream commit e2f27363aa6d983504c6836dd0975535e2e9dba0 ]
The xgbe_powerdown() and xgbe_powerup() functions use spinlocks (spin_lock_irqsave) while calling functions that may sleep:
- napi_disable() can sleep waiting for NAPI polling to complete
- flush_workqueue() can sleep waiting for pending work items
This causes a "BUG: scheduling while atomic" error during suspend/resume cycles on systems using the AMD XGBE Ethernet controller.
The spinlock protection in these functions is unnecessary as these functions are called from suspend/resume paths which are already serialized by the PM core
Fix this by removing the spinlock. Since only code that takes this lock is xgbe_powerdown() and xgbe_powerup(), remove it completely.
--- drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 10 ---------- drivers/net/ethernet/amd/xgbe/xgbe-main.c | 1 - drivers/net/ethernet/amd/xgbe/xgbe.h | 3 --- 3 files changed, 14 deletions(-)
drivers/net/ethernet/amd/xgbe/xgbe-drv.c +0 -10
@@ -1181,7 +1181,6 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller) {struct xgbe_prv_data *pdata =netdev_priv (netdev);struct xgbe_hw_if *hw_if = &pdata->hw_if; -unsigned long flags;DBGPR ("-->xgbe_powerdown\n" );
@@ -1192,8 +1191,6 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller)return -EINVAL ; } -spin_lock_irqsave (&pdata->lock, flags); -if (caller ==XGMAC_DRIVER_CONTEXT )netif_device_detach (netdev);
@@ -1209,8 +1206,6 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller) pdata->power_down =1 ; -spin_unlock_irqrestore (&pdata->lock, flags); -DBGPR ("<--xgbe_powerdown\n" );return 0 ;
@@ -1220,7 +1215,6 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller) {struct xgbe_prv_data *pdata =netdev_priv (netdev);struct xgbe_hw_if *hw_if = &pdata->hw_if; -unsigned long flags;DBGPR ("-->xgbe_powerup\n" );
@@ -1231,8 +1225,6 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller)return -EINVAL ; } -spin_lock_irqsave (&pdata->lock, flags); - pdata->power_down =0 ;xgbe_napi_enable (pdata,0 );
@@ -1247,8 +1239,6 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller)xgbe_start_timers (pdata); -spin_unlock_irqrestore (&pdata->lock, flags); -DBGPR ("<--xgbe_powerup\n" );return 0 ;
drivers/net/ethernet/amd/xgbe/xgbe-main.c +0 -1
@@ -185,7 +185,6 @@ struct xgbe_prv_data *xgbe_alloc_pdata(struct device *dev) pdata->netdev = netdev; pdata->dev = dev; -spin_lock_init (&pdata->lock);spin_lock_init (&pdata->xpcs_lock);mutex_init (&pdata->rss_mutex);spin_lock_init (&pdata->tstamp_lock);
drivers/net/ethernet/amd/xgbe/xgbe.h +0 -3
@@ -1050,9 +1050,6 @@ struct xgbe_prv_data {unsigned int pp3;unsigned int pp4; -/* Overall device lock */ -spinlock_t lock; -/* XPCS indirect addressing lock */ spinlock_t xpcs_lock;unsigned int xpcs_window_def_reg;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 80/570 net: sched: avoid qdisc_reset_all_tx_gt() vs dequeue race for lockless qdiscs
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Koichiro Den <[email protected]>
[ Upstream commit 7f083faf59d14c04e01ec05a7507f036c965acf8 ]
When shrinking the number of real tx queues, netif_set_real_num_tx_queues() calls qdisc_reset_all_tx_gt() to flush qdiscs for queues which will no longer be used.
qdisc_reset_all_tx_gt() currently serializes qdisc_reset() with qdisc_lock(). However, for lockless qdiscs, the dequeue path is serialized by qdisc_run_begin/end() using qdisc->seqlock instead, so qdisc_reset() can run concurrently with __qdisc_run() and free skbs while they are still being dequeued, leading to UAF.
This can easily be reproduced on e.g. virtio-net by imposing heavy traffic while frequently changing the number of queue pairs:
iperf3 -ub0 -c $peer -t 0 &
while :; do
ethtool -L eth0 combined 1
ethtool -L eth0 combined 2
done
With KASAN enabled, this leads to reports like:
BUG: KASAN: slab-use-after-free in __qdisc_run+0x133f/0x1760 ... Call Trace: <TASK> ... __qdisc_run+0x133f/0x1760 __dev_queue_xmit+0x248f/0x3550 ip_finish_output2+0xa42/0x2110 ip_output+0x1a7/0x410 ip_send_skb+0x2e6/0x480 udp_send_skb+0xb0a/0x1590 udp_sendmsg+0x13c9/0x1fc0 ... </TASK> Allocated by task 1270 on cpu 5 at 44.558414s: ... alloc_skb_with_frags+0x84/0x7c0 sock_alloc_send_pskb+0x69a/0x830 __ip_append_data+0x1b86/0x48c0 ip_make_skb+0x1e8/0x2b0 udp_sendmsg+0x13a6/0x1fc0 ... Freed by task 1306 on cpu 3 at 44.558445s: ... kmem_cache_free+0x117/0x5e0 pfifo_fast_reset+0x14d/0x580 qdisc_reset+0x9e/0x5f0 netif_set_real_num_tx_queues+0x303/0x840 virtnet_set_channels+0x1bf/0x260 [virtio_net] ethnl_set_channels+0x684/0xae0 ethnl_default_set_doit+0x31a/0x890 ...
Serialize qdisc_reset_all_tx_gt() against the lockless dequeue path by taking qdisc->seqlock for TCQ_F_NOLOCK qdiscs, matching the serialization model already used by dev_reset_queue().
Additionally clear QDISC_STATE_NON_EMPTY after reset so the qdisc state reflects an empty queue, avoiding needless re-scheduling.
--- include/net/sch_generic.h | 10 ++++++++++ 1 file changed, 10 insertions(+)
include/net/sch_generic.h +10 -0
@@ -742,13 +742,23 @@ static inline bool skb_skip_tc_classify(struct sk_buff *skb)static inline void qdisc_reset_all_tx_gt (struct net_device *dev,unsigned int i) {struct Qdisc *qdisc; +bool nolock;for (; i < dev->num_tx_queues; i++) { qdisc =rtnl_dereference (netdev_get_tx_queue (dev, i)->qdisc);if (qdisc) { + nolock = qdisc->flags &TCQ_F_NOLOCK ; + +if (nolock) +spin_lock_bh (&qdisc->seqlock);spin_lock_bh (qdisc_lock (qdisc));qdisc_reset (qdisc);spin_unlock_bh (qdisc_lock (qdisc)); +if (nolock) { +clear_bit (__QDISC_STATE_MISSED, &qdisc->state); +clear_bit (__QDISC_STATE_DRAINING, &qdisc->state); +spin_unlock_bh (&qdisc->seqlock); + } } } }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 81/570 net: nfc: nci: Fix zero-length proprietary notifications
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Ray <[email protected]>
[ Upstream commit f7d92f11bd33a6eb49c7c812255ef4ab13681f0f ]
NCI NFC controllers may have proprietary OIDs with zero-length payload. One example is: drivers/nfc/nxp-nci/core.c, NXP_NCI_RF_TXLDO_ERROR_NTF.
Allow a zero length payload in proprietary notifications *only*.
Before:
-- >8 --
kernel: nci: nci_recv_frame: len 3
-- >8 --
After:
-- >8 --
kernel: nci: nci_recv_frame: len 3
kernel: nci: nci_ntf_packet: NCI RX: MT=ntf, PBF=0, GID=0x1, OID=0x23, plen=0
kernel: nci: nci_ntf_packet: unknown ntf opcode 0x123
kernel: nfc nfc0: NFC: RF transmitter couldn't start. Bad power and/or configuration? -- >8 --
After fixing the hardware:
-- >8 --
kernel: nci: nci_recv_frame: len 27
kernel: nci: nci_ntf_packet: NCI RX: MT=ntf, PBF=0, GID=0x1, OID=0x5, plen=24
kernel: nci: nci_rf_intf_activated_ntf_packet: rf_discovery_id 1 -- >8 --
--- net/nfc/nci/core.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
net/nfc/nci/core.c +11 -1
@@ -1474,10 +1474,20 @@ static bool nci_valid_size(struct sk_buff *skb)BUILD_BUG_ON (NCI_CTRL_HDR_SIZE !=NCI_DATA_HDR_SIZE );if (skb->len < hdr_size || - !nci_plen (skb->data) || skb->len < hdr_size +nci_plen (skb->data)) {return false; } + +if (!nci_plen (skb->data)) { +/* Allow zero length in proprietary notifications (0x20 - 0x3F). */ +if (nci_opcode_oid (nci_opcode (skb->data)) >=0x20 && +nci_mt (skb->data) ==NCI_MT_NTF_PKT ) +return true; + +/* Disallow zero length otherwise. */ +return false; + } +return true; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 82/570 nfc: nci: free skb on nci_transceive early error paths
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 7bd4b0c4779f978a6528c9b7937d2ca18e936e2c ]
nci_transceive() takes ownership of the skb passed by the caller, but the -EPROTO, -EINVAL, and -EBUSY error paths return without freeing it.
Due to issues clearing NCI_DATA_EXCHANGE fixed by subsequent changes the nci/nci_dev selftest hits the error path occasionally in NIPA, and kmemleak detects leaks:
unreferenced object 0xff11000015ce6a40 (size 640):
comm "nci_dev", pid 3954, jiffies 4295441246
hex dump (first 32 bytes):
6b 6b 6b 6b 00 a4 00 0c 02 e1 03 6b 6b 6b 6b 6b kkkk.......kkkkk 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk
backtrace (crc 7c40cc2a):
kmem_cache_alloc_node_noprof+0x492/0x630
__alloc_skb+0x11e/0x5f0
alloc_skb_with_frags+0xc6/0x8f0
sock_alloc_send_pskb+0x326/0x3f0
nfc_alloc_send_skb+0x94/0x1d0
rawsock_sendmsg+0x162/0x4c0
do_syscall_64+0x117/0xfc0--- net/nfc/nci/core.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
net/nfc/nci/core.c +7 -2
@@ -1027,18 +1027,23 @@ static int nci_transceive(struct nfc_dev *nfc_dev, struct nfc_target *target,struct nci_conn_info *conn_info; conn_info = ndev->rf_conn_info; -if (!conn_info) +if (!conn_info) { +kfree_skb (skb);return -EPROTO ; + }pr_debug ("target_idx %d, len %d\n" , target->idx, skb->len);if (!ndev->target_active_prot) {pr_err ("unable to exchange data, no active target\n" ); +kfree_skb (skb);return -EINVAL ; } -if (test_and_set_bit (NCI_DATA_EXCHANGE , &ndev->flags)) +if (test_and_set_bit (NCI_DATA_EXCHANGE , &ndev->flags)) { +kfree_skb (skb);return -EBUSY ; + }/* store cb and context to be used on receiving data */ conn_info->data_exchange_cb = cb;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 83/570 nfc: nci: clear NCI_DATA_EXCHANGE before calling completion callback
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 0efdc02f4f6d52f8ca5d5889560f325a836ce0a8 ]
Move clear_bit(NCI_DATA_EXCHANGE) before invoking the data exchange callback in nci_data_exchange_complete().
The callback (e.g. rawsock_data_exchange_complete) may immediately schedule another data exchange via schedule_work(tx_work). On a multi-CPU system, tx_work can run and reach nci_transceive() before the current nci_data_exchange_complete() clears the flag, causing test_and_set_bit(NCI_DATA_EXCHANGE) to return -EBUSY and the new transfer to fail.
This causes intermittent flakes in nci/nci_dev in NIPA:
# # RUN NCI.NCI1_0.t4t_tag_read ...
# # t4t_tag_read: Test terminated by timeout
# # FAIL NCI.NCI1_0.t4t_tag_read
# not ok 3 NCI.NCI1_0.t4t_tag_read
--- net/nfc/nci/data.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
net/nfc/nci/data.c +8 -4
@@ -33,7 +33,8 @@ void nci_data_exchange_complete(struct nci_dev *ndev, struct sk_buff *skb, conn_info =nci_get_conn_info_by_conn_id (ndev, conn_id);if (!conn_info) {kfree_skb (skb); - goto exit; +clear_bit (NCI_DATA_EXCHANGE , &ndev->flags); +return ; } cb = conn_info->data_exchange_cb;
@@ -45,6 +46,12 @@ void nci_data_exchange_complete(struct nci_dev *ndev, struct sk_buff *skb,del_timer_sync (&ndev->data_timer);clear_bit (NCI_DATA_EXCHANGE_TO , &ndev->flags); +/* Mark the exchange as done before calling the callback. +* The callback (e.g. rawsock_data_exchange_complete) may +* want to immediately queue another data exchange. +*/ +clear_bit (NCI_DATA_EXCHANGE , &ndev->flags); +if (cb) {/* forward skb to nfc core */ cb (cb_context, skb, err);
@@ -54,9 +61,6 @@ void nci_data_exchange_complete(struct nci_dev *ndev, struct sk_buff *skb,/* no waiting callback, free skb */ kfree_skb (skb); } - -exit: -clear_bit (NCI_DATA_EXCHANGE , &ndev->flags); }/* ----------------- NCI TX Data ----------------- */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 84/570 nfc: rawsock: cancel tx_work before socket teardown
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 d793458c45df2aed498d7f74145eab7ee22d25aa ]
In rawsock_release(), cancel any pending tx_work and purge the write queue before orphaning the socket. rawsock_tx_work runs on the system workqueue and calls nfc_data_exchange which dereferences the NCI device. Without synchronization, tx_work can race with socket and device teardown when a process is killed (e.g. by SIGKILL), leading to use-after-free or leaked references.
Set SEND_SHUTDOWN first so that if tx_work is already running it will see the flag and skip transmitting, then use cancel_work_sync to wait for any in-progress execution to finish, and finally purge any remaining queued skbs.
--- net/nfc/rawsock.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
net/nfc/rawsock.c +11 -0
@@ -66,6 +66,17 @@ static int rawsock_release(struct socket *sock)if (sock->type ==SOCK_RAW )nfc_sock_unlink (&raw_sk_list, sk); +if (sk->sk_state ==TCP_ESTABLISHED ) { +/* Prevent rawsock_tx_work from starting new transmits and +* wait for any in-progress work to finish. This must happen +* before the socket is orphaned to avoid a race where +* rawsock_tx_work runs after the NCI device has been freed. +*/ + sk->sk_shutdown |=SEND_SHUTDOWN ; +cancel_work_sync (&nfc_rawsock (sk)->tx_work); +rawsock_write_queue_purge (sk); + } +sock_orphan (sk);sock_put (sk);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 85/570 net: stmmac: Fix error handling in VLAN add and delete paths
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ovidiu Panait <[email protected]>
[ Upstream commit 35dfedce442c4060cfe5b98368bc9643fb995716 ]
stmmac_vlan_rx_add_vid() updates active_vlans and the VLAN hash register before writing the HW filter entry. If the filter write fails, it leaves a stale VID in active_vlans and the hash register.
stmmac_vlan_rx_kill_vid() has the reverse problem: it clears active_vlans before removing the HW filter. On failure, the VID is gone from active_vlans but still present in the HW filter table.
To fix this, reorder the operations to update the hash table first, then attempt the HW filter operation. If the HW filter fails, roll back both the active_vlans bitmap and the hash table by calling stmmac_vlan_update() again.
--- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +14 -4
@@ -6281,9 +6281,13 @@ static int stmmac_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vidif (priv->hw->num_vlan) { ret =stmmac_add_hw_vlan_rx_fltr (priv, ndev, priv->hw, proto, vid); -if (ret) +if (ret) { +clear_bit (vid, priv->active_vlans); +stmmac_vlan_update (priv, is_double); goto err_pm_put; + } } + err_pm_put:pm_runtime_put (priv->device);
@@ -6306,15 +6310,21 @@ static int stmmac_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vi is_double = true;clear_bit (vid, priv->active_vlans); + ret =stmmac_vlan_update (priv, is_double); +if (ret) { +set_bit (vid, priv->active_vlans); + goto del_vlan_error; + }if (priv->hw->num_vlan) { ret =stmmac_del_hw_vlan_rx_fltr (priv, ndev, priv->hw, proto, vid); -if (ret) +if (ret) { +set_bit (vid, priv->active_vlans); +stmmac_vlan_update (priv, is_double); goto del_vlan_error; + } } - ret =stmmac_vlan_update (priv, is_double); - del_vlan_error:pm_runtime_put (priv->device);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 86/570 net: bridge: fix nd_tbl NULL dereference when IPv6 is disabled
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fernando Fernandez Mancera <[email protected]>
[ Upstream commit e5e890630533bdc15b26a34bb8e7ef539bdf1322 ]
When booting with the 'ipv6.disable=1' parameter, the nd_tbl is never initialized because inet6_init() exits before ndisc_init() is called which initializes it. Then, if neigh_suppress is enabled and an ICMPv6 Neighbor Discovery packet reaches the bridge, br_do_suppress_nd() will dereference ipv6_stub->nd_tbl which is NULL, passing it to neigh_lookup(). This causes a kernel NULL pointer dereference.
BUG: kernel NULL pointer dereference, address: 0000000000000268 Oops: 0000 [#1] PREEMPT SMP NOPTI [...] RIP: 0010:neigh_lookup+0x16/0xe0 [...] Call Trace: <IRQ> ? neigh_lookup+0x16/0xe0 br_do_suppress_nd+0x160/0x290 [bridge] br_handle_frame_finish+0x500/0x620 [bridge] br_handle_frame+0x353/0x440 [bridge] __netif_receive_skb_core.constprop.0+0x298/0x1110 __netif_receive_skb_one_core+0x3d/0xa0 process_backlog+0xa0/0x140 __napi_poll+0x2c/0x170 net_rx_action+0x2c4/0x3a0 handle_softirqs+0xd0/0x270 do_softirq+0x3f/0x60
Fix this by replacing IS_ENABLED(IPV6) call with ipv6_mod_enabled() in the callers. This is in essence disabling NS/NA suppression when IPv6 is disabled.
--- net/bridge/br_device.c | 2 +- net/bridge/br_input.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
net/bridge/br_device.c +1 -1
@@ -70,7 +70,7 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev) eth_hdr(skb)->h_proto == htons(ETH_P_RARP)) && br_opt_get(br, BROPT_NEIGH_SUPPRESS_ENABLED)) {br_do_proxy_suppress_arp (skb, br, vid,NULL ); - } else if (IS_ENABLED(CONFIG_IPV6) && + } else if (ipv6_mod_enabled() && skb->protocol == htons(ETH_P_IPV6) && br_opt_get(br, BROPT_NEIGH_SUPPRESS_ENABLED) && pskb_may_pull(skb, sizeof(struct ipv6hdr) +
net/bridge/br_input.c +1 -1
@@ -130,7 +130,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb (skb->protocol == htons(ETH_P_ARP) || skb->protocol == htons(ETH_P_RARP))) {br_do_proxy_suppress_arp (skb, br, vid, p); - } else if (IS_ENABLED(CONFIG_IPV6) && + } else if (ipv6_mod_enabled() && skb->protocol == htons(ETH_P_IPV6) && br_opt_get(br, BROPT_NEIGH_SUPPRESS_ENABLED) && pskb_may_pull(skb, sizeof(struct ipv6hdr) +
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 87/570 net: vxlan: fix nd_tbl NULL dereference when IPv6 is disabled
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fernando Fernandez Mancera <[email protected]>
[ Upstream commit 168ff39e4758897d2eee4756977d036d52884c7e ]
When booting with the 'ipv6.disable=1' parameter, the nd_tbl is never initialized because inet6_init() exits before ndisc_init() is called which initializes it. If an IPv6 packet is injected into the interface, route_shortcircuit() is called and a NULL pointer dereference happens on neigh_lookup().
BUG: kernel NULL pointer dereference, address: 0000000000000380 Oops: Oops: 0000 [#1] SMP NOPTI [...] RIP: 0010:neigh_lookup+0x20/0x270 [...] Call Trace: <TASK> vxlan_xmit+0x638/0x1ef0 [vxlan] dev_hard_start_xmit+0x9e/0x2e0 __dev_queue_xmit+0xbee/0x14e0 packet_sendmsg+0x116f/0x1930 __sys_sendto+0x1f5/0x200 __x64_sys_sendto+0x24/0x30 do_syscall_64+0x12f/0x1590 entry_SYSCALL_64_after_hwframe+0x76/0x7e
Fix this by adding an early check on route_shortcircuit() when protocol is ETH_P_IPV6. Note that ipv6_mod_enabled() cannot be used here because VXLAN can be built-in even when IPv6 is built as a module.
--- drivers/net/vxlan/vxlan_core.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/vxlan/vxlan_core.c +5 -0
@@ -2259,6 +2259,11 @@ static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb) {struct ipv6hdr *pip6; +/* check if nd_tbl is not initiliazed due to +* ipv6.disable=1 set during boot +*/ +if (!ipv6_stub->nd_tbl) +return false;if (!pskb_may_pull (skb,sizeof (struct ipv6hdr )))return false; pip6 =ipv6_hdr (skb);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 88/570 net: ipv6: fix panic when IPv4 route references loopback IPv6 nexthop
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiayuan Chen <[email protected]>
[ Upstream commit 21ec92774d1536f71bdc90b0e3d052eff99cf093 ]
When a standalone IPv6 nexthop object is created with a loopback device (e.g., "ip -6 nexthop add id 100 dev lo"), fib6_nh_init() misclassifies it as a reject route. This is because nexthop objects have no destination prefix (fc_dst=::), causing fib6_is_reject() to match any loopback nexthop. The reject path skips fib_nh_common_init(), leaving nhc_pcpu_rth_output unallocated. If an IPv4 route later references this nexthop, __mkroute_output() dereferences NULL nhc_pcpu_rth_output and panics.
Simplify the check in fib6_nh_init() to only match explicit reject routes (RTF_REJECT) instead of using fib6_is_reject(). The loopback promotion heuristic in fib6_is_reject() is handled separately by ip6_route_info_create_nh(). After this change, the three cases behave as follows:
1. Explicit reject route ("ip -6 route add unreachable 2001:db8::/64"):
RTF_REJECT is set, enters reject path, skips fib_nh_common_init(). No behavior change.
2. Implicit loopback reject route ("ip -6 route add 2001:db8::/32 dev lo"):
RTF_REJECT is not set, takes normal path, fib_nh_common_init() is called. ip6_route_info_create_nh() still promotes it to reject afterward. nhc_pcpu_rth_output is allocated but unused, which is harmless.
3. Standalone nexthop object ("ip -6 nexthop add id 100 dev lo"):
RTF_REJECT is not set, takes normal path, fib_nh_common_init() is called. nhc_pcpu_rth_output is properly allocated, fixing the crash when IPv4 routes reference this nexthop.
--- net/ipv6/route.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
net/ipv6/route.c +3 -5
@@ -3519,7 +3519,6 @@ int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh, {struct net_device *dev =NULL ;struct inet6_dev *idev =NULL ; -int addr_type;int err; fib6_nh->fib_nh_family =AF_INET6 ;
@@ -3560,11 +3559,10 @@ int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh, fib6_nh->fib_nh_weight =1 ; -/* We cannot add true routes via loopback here, -* they would result in kernel looping; promote them to reject routes +/* Reset the nexthop device to the loopback device in case of reject +* routes. */ - addr_type =ipv6_addr_type (&cfg->fc_dst); -if (fib6_is_reject (cfg->fc_flags, dev, addr_type)) { +if (cfg->fc_flags &RTF_REJECT ) {/* hold loopback dev/idev if we haven't done so. */ if (dev != net->loopback_dev) {if (dev) {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 89/570 net/sched: Only allow act_ct to bind to clsact/ingress qdiscs and shared blocks
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Victor Nogueira <[email protected]>
commit 11cb63b0d1a0685e0831ae3c77223e002ef18189 upstream.
As Paolo said earlier [1]:
"Since the blamed commit below, classify can return TC_ACT_CONSUMED while the current skb being held by the defragmentation engine. As reported by GangMin Kim, if such packet is that may cause a UaF when the defrag engine later on tries to tuch again such packet."
act_ct was never meant to be used in the egress path, however some users are attaching it to egress today [2]. Attempting to reach a middle ground, we noticed that, while most qdiscs are not handling TC_ACT_CONSUMED, clsact/ingress qdiscs are. With that in mind, we address the issue by only allowing act_ct to bind to clsact/ingress qdiscs and shared blocks. That way it's still possible to attach act_ct to egress (albeit only with clsact).
[1] https://lore.kernel.org/netdev/674b8cbfc385c6f37fb29a1de08d8fe5c2b0fbee.1771321118.git.pabeni@redhat.com/
[2] https://lore.kernel.org/netdev/[email protected]/
--- include/net/act_api.h | 1 + net/sched/act_ct.c | 6 ++++++ net/sched/cls_api.c | 7 +++++++ 3 files changed, 14 insertions(+)
include/net/act_api.h +1 -0
@@ -65,6 +65,7 @@ struct tc_action {#define TCA_ACT_FLAGS_BIND (1U << (TCA_ACT_FLAGS_USER_BITS + 1))#define TCA_ACT_FLAGS_REPLACE (1U << (TCA_ACT_FLAGS_USER_BITS + 2))#define TCA_ACT_FLAGS_NO_RTNL (1U << (TCA_ACT_FLAGS_USER_BITS + 3)) +#define TCA_ACT_FLAGS_AT_INGRESS_OR_CLSACT (1U << (TCA_ACT_FLAGS_USER_BITS + 5))/* Update lastuse only if needed, to avoid dirtying a cache line. * We use a temp variable to avoid fetching jiffies twice.
net/sched/act_ct.c +6 -0
@@ -1273,6 +1273,12 @@ static int tcf_ct_init(struct net *net,return -EINVAL ; } +if (bind && !(flags &TCA_ACT_FLAGS_AT_INGRESS_OR_CLSACT )) { +NL_SET_ERR_MSG_MOD (extack, +"Attaching ct to a non ingress/clsact qdisc is unsupported" ); +return -EOPNOTSUPP ; + } + err =nla_parse_nested (tb,TCA_CT_MAX , nla, ct_policy, extack);if (err <0 )return err;
net/sched/cls_api.c +7 -0
@@ -1934,6 +1934,11 @@ static void tfilter_put(struct tcf_proto tp->ops->put (tp, fh); } +static bool is_ingress_or_clsact (struct tcf_block *block,struct Qdisc *q) +{ +return tcf_block_shared (block) || (q && !!(q->flags &TCQ_F_INGRESS )); +} +static int tc_new_tfilter (struct sk_buff *skb,struct nlmsghdr *n,struct netlink_ext_ack *extack) {
@@ -2128,6 +2133,8 @@ replay: flags |=TCA_ACT_FLAGS_REPLACE ;if (!rtnl_held) flags |=TCA_ACT_FLAGS_NO_RTNL ; +if (is_ingress_or_clsact (block, q)) + flags |=TCA_ACT_FLAGS_AT_INGRESS_OR_CLSACT ; err = tp->ops->change (net, skb, tp, cl, t->tcm_handle, tca, &fh, flags, extack);if (err ==0 ) {
Greg Kroah-Hartman
maintainerPATCH 90/570 scsi: storvsc: Fix scheduling while atomic on PREEMPT_RT
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kiszka <[email protected]>
[ Upstream commit 57297736c08233987e5d29ce6584c6ca2a831b12 ]
This resolves the follow splat and lock-up when running with PREEMPT_RT enabled on Hyper-V:
[ 415.140818] BUG: scheduling while atomic: stress-ng-iomix/1048/0x00000002
[ 415.140822] INFO: lockdep is turned off.
[ 415.140823] Modules linked in: intel_rapl_msr intel_rapl_common intel_uncore_frequency_common intel_pmc_core pmt_telemetry pmt_discovery pmt_class intel_pmc_ssram_telemetry intel_vsec ghash_clmulni_intel aesni_intel rapl binfmt_misc nls_ascii nls_cp437 vfat fat snd_pcm hyperv_drm snd_timer drm_client_lib drm_shmem_helper snd sg soundcore drm_kms_helper pcspkr hv_balloon hv_utils evdev joydev drm configfs efi_pstore nfnetlink vsock_loopback vmw_vsock_virtio_transport_common hv_sock vmw_vsock_vmci_transport vsock vmw_vmci efivarfs autofs4 ext4 crc16 mbcache jbd2 sr_mod sd_mod cdrom hv_storvsc serio_raw hid_generic scsi_transport_fc hid_hyperv scsi_mod hid hv_netvsc hyperv_keyboard scsi_common
[ 415.140846] Preemption disabled at:
[ 415.140847] [<ffffffffc0656171>] storvsc_queuecommand+0x2e1/0xbe0 [hv_storvsc]
[ 415.140854] CPU: 8 UID: 0 PID: 1048 Comm: stress-ng-iomix Not tainted 6.19.0-rc7 #30 PREEMPT_{RT,(full)}
[ 415.140856] Hardware name: Microsoft Corporation Virtual Machine/Virtual Machine, BIOS Hyper-V UEFI Release v4.1 09/04/2024
[ 415.140857] Call Trace:
[ 415.140861] <TASK>
[ 415.140861] ? storvsc_queuecommand+0x2e1/0xbe0 [hv_storvsc]
[ 415.140863] dump_stack_lvl+0x91/0xb0
[ 415.140870] __schedule_bug+0x9c/0xc0
[ 415.140875] __schedule+0xdf6/0x1300
[ 415.140877] ? rtlock_slowlock_locked+0x56c/0x1980
[ 415.140879] ? rcu_is_watching+0x12/0x60
[ 415.140883] schedule_rtlock+0x21/0x40
[ 415.140885] rtlock_slowlock_locked+0x502/0x1980
[ 415.140891] rt_spin_lock+0x89/0x1e0
[ 415.140893] hv_ringbuffer_write+0x87/0x2a0
[ 415.140899] vmbus_sendpacket_mpb_desc+0xb6/0xe0
[ 415.140900] ? rcu_is_watching+0x12/0x60
[ 415.140902] storvsc_queuecommand+0x669/0xbe0 [hv_storvsc]
[ 415.140904] ? HARDIRQ_verbose+0x10/0x10
[ 415.140908] ? __rq_qos_issue+0x28/0x40
[ 415.140911] scsi_queue_rq+0x760/0xd80 [scsi_mod]
[ 415.140926] __blk_mq_issue_directly+0x4a/0xc0
[ 415.140928] blk_mq_issue_direct+0x87/0x2b0
[ 415.140931] blk_mq_dispatch_queue_requests+0x120/0x440
[ 415.140933] blk_mq_flush_plug_list+0x7a/0x1a0
[ 415.140935] __blk_flush_plug+0xf4/0x150
[ 415.140940] __submit_bio+0x2b2/0x5c0
[ 415.140944] ? submit_bio_noacct_nocheck+0x272/0x360
[ 415.140946] submit_bio_noacct_nocheck+0x272/0x360
[ 415.140951] ext4_read_bh_lock+0x3e/0x60 [ext4]
[ 415.140995] ext4_block_write_begin+0x396/0x650 [ext4]
[ 415.141018] ? __pfx_ext4_da_get_block_prep+0x10/0x10 [ext4]
[ 415.141038] ext4_da_write_begin+0x1c4/0x350 [ext4]
[ 415.141060] generic_perform_write+0x14e/0x2c0
[ 415.141065] ext4_buffered_write_iter+0x6b/0x120 [ext4]
[ 415.141083] vfs_write+0x2ca/0x570
[ 415.141087] ksys_write+0x76/0xf0
[ 415.141089] do_syscall_64+0x99/0x1490
[ 415.141093] ? rcu_is_watching+0x12/0x60
[ 415.141095] ? finish_task_switch.isra.0+0xdf/0x3d0
[ 415.141097] ? rcu_is_watching+0x12/0x60
[ 415.141098] ? lock_release+0x1f0/0x2a0
[ 415.141100] ? rcu_is_watching+0x12/0x60
[ 415.141101] ? finish_task_switch.isra.0+0xe4/0x3d0
[ 415.141103] ? rcu_is_watching+0x12/0x60
[ 415.141104] ? __schedule+0xb34/0x1300
[ 415.141106] ? hrtimer_try_to_cancel+0x1d/0x170
[ 415.141109] ? do_nanosleep+0x8b/0x160
[ 415.141111] ? hrtimer_nanosleep+0x89/0x100
[ 415.141114] ? __pfx_hrtimer_wakeup+0x10/0x10
[ 415.141116] ? xfd_validate_state+0x26/0x90
[ 415.141118] ? rcu_is_watching+0x12/0x60
[ 415.141120] ? do_syscall_64+0x1e0/0x1490
[ 415.141121] ? do_syscall_64+0x1e0/0x1490
[ 415.141123] ? rcu_is_watching+0x12/0x60
[ 415.141124] ? do_syscall_64+0x1e0/0x1490
[ 415.141125] ? do_syscall_64+0x1e0/0x1490
[ 415.141127] ? irqentry_exit+0x140/0x7e0
[ 415.141129] entry_SYSCALL_64_after_hwframe+0x76/0x7eget_cpu() disables preemption while the spinlock hv_ringbuffer_write is using is converted to an rt-mutex under PREEMPT_RT.
--- drivers/scsi/storvsc_drv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/scsi/storvsc_drv.c +3 -2
@@ -1910,8 +1910,9 @@ static int storvsc_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *scmnd) cmd_request->payload_sz = payload_sz;/* Invokes the vsc to start an IO */ - ret =storvsc_do_io (dev, cmd_request,get_cpu ()); -put_cpu (); +migrate_disable (); + ret =storvsc_do_io (dev, cmd_request,smp_processor_id ()); +migrate_enable ();if (ret == -EAGAIN ) {if (payload_sz >sizeof (cmd_request->mpb))
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 91/570 ACPI: PM: Save NVS memory on Lenovo G70-35
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Piotr Mazek <[email protected]>
[ Upstream commit 023cd6d90f8aa2ef7b72d84be84a18e61ecebd64 ]
[821d6f0359b0614792ab8e2fb93b503e25a65079] prevented machines produced later than 2012 from saving NVS region to accelerate S3.
Despite being made after 2012, Lenovo G70-35 still needs NVS memory saving during S3. A quirk is introduced for this platform.
--- drivers/acpi/sleep.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/acpi/sleep.c +8 -0
@@ -369,6 +369,14 @@ static const struct dmi_system_id acpisleep_dmi_table[] __initconst = { DMI_MATCH(DMI_PRODUCT_NAME, "80E1"), }, }, + { + .callback = init_nvs_save_s3, + .ident = "Lenovo G70-35", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "80Q5"), + }, + },/* * ThinkPad X1 Tablet(2016) cannot do suspend-to-idle using * the Low Power S0 Idle firmware interface (see
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 92/570 scsi: mpi3mr: Add NULL checks when resetting request and reply queues
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ranjan Kumar <[email protected]>
[ Upstream commit fa96392ebebc8fade2b878acb14cce0f71016503 ]
The driver encountered a crash during resource cleanup when the reply and request queues were NULL due to freed memory. This issue occurred when the creation of reply or request queues failed, and the driver freed the memory first, but attempted to mem set the content of the freed memory, leading to a system crash.
Add NULL pointer checks for reply and request queues before accessing the reply/request memory during cleanup
--- drivers/scsi/mpi3mr/mpi3mr_fw.c | 34 ++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-)
drivers/scsi/mpi3mr/mpi3mr_fw.c +19 -15
@@ -3534,21 +3534,25 @@ void mpi3mr_memset_buffers(struct mpi3mr_ioc *mrioc)memset (mrioc->devrem_bitmap,0 , mrioc->devrem_bitmap_sz);for (i =0 ; i < mrioc->num_queues; i++) { - mrioc->op_reply_qinfo[i].qid =0 ; - mrioc->op_reply_qinfo[i].ci =0 ; - mrioc->op_reply_qinfo[i].num_replies =0 ; - mrioc->op_reply_qinfo[i].ephase =0 ; -atomic_set (&mrioc->op_reply_qinfo[i].pend_ios,0 ); -atomic_set (&mrioc->op_reply_qinfo[i].in_use,0 ); -mpi3mr_memset_op_reply_q_buffers (mrioc, i); - - mrioc->req_qinfo[i].ci =0 ; - mrioc->req_qinfo[i].pi =0 ; - mrioc->req_qinfo[i].num_requests =0 ; - mrioc->req_qinfo[i].qid =0 ; - mrioc->req_qinfo[i].reply_qid =0 ; -spin_lock_init (&mrioc->req_qinfo[i].q_lock); -mpi3mr_memset_op_req_q_buffers (mrioc, i); +if (mrioc->op_reply_qinfo) { + mrioc->op_reply_qinfo[i].qid =0 ; + mrioc->op_reply_qinfo[i].ci =0 ; + mrioc->op_reply_qinfo[i].num_replies =0 ; + mrioc->op_reply_qinfo[i].ephase =0 ; +atomic_set (&mrioc->op_reply_qinfo[i].pend_ios,0 ); +atomic_set (&mrioc->op_reply_qinfo[i].in_use,0 ); +mpi3mr_memset_op_reply_q_buffers (mrioc, i); + } + +if (mrioc->req_qinfo) { + mrioc->req_qinfo[i].ci =0 ; + mrioc->req_qinfo[i].pi =0 ; + mrioc->req_qinfo[i].num_requests =0 ; + mrioc->req_qinfo[i].qid =0 ; + mrioc->req_qinfo[i].reply_qid =0 ; +spin_lock_init (&mrioc->req_qinfo[i].q_lock); +mpi3mr_memset_op_req_q_buffers (mrioc, i); + } } }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 93/570 unshare: fix unshare_fs() handling
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
[ Upstream commit 6c4b2243cb6c0755159bd567130d5e12e7b10d9f ]
There's an unpleasant corner case in unshare(2), when we have a CLONE_NEWNS in flags and current->fs hadn't been shared at all; in that case copy_mnt_ns() gets passed current->fs instead of a private copy, which causes interesting warts in proof of correctness]
Quoted 1 line
I guess if private means
fs->users== 1, the condition could still be true.
Unfortunately, it's worse than just a convoluted proof of correctness. Consider the case when we have CLONE_NEWCGROUP in addition to CLONE_NEWNS (and current->fs->users == 1).
We pass current->fs to copy_mnt_ns(), all right. Suppose it succeeds and flips current->fs->{pwd,root} to corresponding locations in the new namespace. Now we proceed to copy_cgroup_ns(), which fails (e.g. with -ENOMEM). We call put_mnt_ns() on the namespace created by copy_mnt_ns(), it's destroyed and its mount tree is dissolved, but... current->fs->root and current->fs->pwd are both left pointing to now detached mounts.
They are pinning those, so it's not a UAF, but it leaves the calling process with unshare(2) failing with -ENOMEM _and_ leaving it with pwd and root on detached isolated mounts. The last part is clearly a bug.
There is other fun related to that mess (races with pivot_root(), including the one between pivot_root() and fork(), of all things), but this one is easy to isolate and fix - treat CLONE_NEWNS as "allocate a new fs_struct even if it hadn't been shared in the first place". Sure, we could go for something like "if both CLONE_NEWNS *and* one of the things that might end up failing after copy_mnt_ns() call in create_new_namespaces() are set, force allocation of new fs_struct", but let's keep it simple - the cost of copy_fs_struct() is trivial.
Another benefit is that copy_mnt_ns() with CLONE_NEWNS *always* gets a freshly allocated fs_struct, yet to be attached to anything. That seriously simplifies the analysis...
FWIW, that bug had been there since the introduction of unshare(2) ;-/
--- kernel/fork.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/fork.c +1 -1
@@ -3086,7 +3086,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)return 0 ;/* don't need lock here; in the worst case we'll do useless copy */ -if (fs->users ==1 ) +if (!(unshare_flags &CLONE_NEWNS ) && fs->users ==1 )return 0 ; *new_fsp =copy_fs_struct (fs);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 94/570 ACPI: OSI: Add DMI quirk for Acer Aspire One D255
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sofia Schneider <[email protected]>
[ Upstream commit 5ede90206273ff156a778254f0f972a55e973c89 ]
The screen backlight turns off during boot (specifically during udev device initialization) when returning true for _OSI("Windows 2009").
Analyzing the device's DSDT reveals that the firmware takes a different code path when Windows 7 is reported, which leads to the backlight shutoff. Add a DMI quirk to invoke dmi_disable_osi_win7 for this model.
--- drivers/acpi/osi.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/acpi/osi.c +13 -0
@@ -413,6 +413,19 @@ static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = { }, }, +/* +* The screen backlight turns off during udev device creation +* when returning true for _OSI("Windows 2009") +*/ + { + .callback = dmi_disable_osi_win7, + .ident = "Acer Aspire One D255", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "AOD255"), + }, + }, + /* * The wireless hotkey does not work on those machines when * returning true for _OSI("Windows 2012")
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 95/570 scsi: ses: Fix devices attaching to different hosts
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomas Henzl <[email protected]>
[ Upstream commit 70ca8caa96ce473647054f5c7b9dab5423902402 ]
On a multipath SAS system some devices don't end up with correct symlinks from the SCSI device to its enclosure. Some devices even have enclosure links pointing to enclosures attached to different SCSI hosts.
ses_match_to_enclosure() calls enclosure_for_each_device() which iterates over all enclosures on the system, not just enclosures attached to the current SCSI host.
Replace the iteration with a direct call to ses_enclosure_find_by_addr().
--- drivers/scsi/ses.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/scsi/ses.c +2 -3
@@ -497,9 +497,8 @@ struct efd { };static int ses_enclosure_find_by_addr (struct enclosure_device *edev, -void *data) +struct efd *efd) { -struct efd *efd = data;int i;struct ses_component *scomp;
@@ -652,7 +651,7 @@ static void ses_match_to_enclosure(struct enclosure_device *edev,if (efd.addr) { efd.dev = &sdev->sdev_gendev; -enclosure_for_each_device (ses_enclosure_find_by_addr, &efd); +ses_enclosure_find_by_addr (edev, &efd); } }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 96/570 ALSA: usb-audio: Avoid implicit feedback mode on DIYINHK USB Audio 2.0
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit c5bf24c8aba1ff711226ee0f039ff01a5754692b ]
Although DIYINHK USB Audio 2.0 (ID 20b1:2009) shows the implicit feedback source for the capture stream, this would cause several problems for the playback. Namely, the device can get wMaxPackSize 1024 for 24/32 bit format with 6 channels, and when a high sample rate like 352.8kHz or 384kHz is played, the packet size overflows the max limit. Also, the device has another two playback altsets, and those aren't properly handled with the implicit feedback.
Since the device has been working well even before introducing the implicit feedback, we can assume that it works fine in the async mode. This patch adds the explicit skip of the implicit fb detection to make the playback running in the async mode.
--- sound/usb/quirks.c | 2 ++ 1 file changed, 2 insertions(+)
sound/usb/quirks.c +2 -0
@@ -1929,6 +1929,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { QUIRK_FLAG_SHARE_MEDIA_DEVICE | QUIRK_FLAG_ALIGN_TRANSFER),DEVICE_FLG (0x2040 ,0x7281 ,/* Hauppauge HVR-950Q-MXL */ QUIRK_FLAG_SHARE_MEDIA_DEVICE |QUIRK_FLAG_ALIGN_TRANSFER ), +DEVICE_FLG (0x20b1 ,0x2009 ,/* XMOS Ltd DIYINHK USB Audio 2.0 */ +QUIRK_FLAG_SKIP_IMPLICIT_FB |QUIRK_FLAG_DSD_RAW ),DEVICE_FLG (0x2040 ,0x8200 ,/* Hauppauge Woodbury */ QUIRK_FLAG_SHARE_MEDIA_DEVICE |QUIRK_FLAG_ALIGN_TRANSFER ), DEVICE_FLG(0x21b4, 0x0081, /* AudioQuest DragonFly */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 97/570 ALSA: usb-audio: Check max frame size for implicit feedback mode, too
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 7cb2a5422f5bbdf1cf32eae0eda41000485b9346 ]
When the packet sizes are taken from the capture stream in the implicit feedback mode, the sizes might be larger than the upper boundary defined by the descriptor. As already done for other transfer modes, we have to cap the sizes accordingly at sending, otherwise this would lead to an error in USB core at submission of URBs.
--- sound/usb/endpoint.c | 1 + 1 file changed, 1 insertion(+)
sound/usb/endpoint.c +1 -0
@@ -223,6 +223,7 @@ int snd_usb_endpoint_next_packet_size(struct snd_usb_endpoint *ep, packet = ctx->packet_size[idx];if (packet) { + packet =min (packet, ep->maxframesize);if (avail && packet >= avail)return -EAGAIN ;return packet;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 98/570 powerpc/uaccess: Fix inline assembly for clang build on PPC32
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe Leroy (CS GROUP) <[email protected]>
[ Upstream commit 0ee95a1d458630272d0415d0ffa9424fcb606c90 ]
Test robot reports the following error with clang-16.0.6:
In file included from kernel/rseq.c:75:
include/linux/rseq_entry.h:141:3: error: invalid operand for instruction
unsafe_get_user(offset, &ucs->post_commit_offset, efault);
^
include/linux/uaccess.h:608:2: note: expanded from macro 'unsafe_get_user'
arch_unsafe_get_user(x, ptr, local_label); \
^
arch/powerpc/include/asm/uaccess.h:518:2: note: expanded from macro 'arch_unsafe_get_user'
__get_user_size_goto(__gu_val, __gu_addr, sizeof(*(p)), e); \
^
arch/powerpc/include/asm/uaccess.h:284:2: note: expanded from macro '__get_user_size_goto'
__get_user_size_allowed(x, ptr, size, __gus_retval); \
^
arch/powerpc/include/asm/uaccess.h:275:10: note: expanded from macro '__get_user_size_allowed'
case 8: __get_user_asm2(x, (u64 __user *)ptr, retval); break; \
^
arch/powerpc/include/asm/uaccess.h:258:4: note: expanded from macro '__get_user_asm2'
" li %1+1,0\n" \
^
<inline asm>:7:5: note: instantiated into assembly here
li 31+1,0
^
1 error generated.On PPC32, for 64 bits vars a pair of registers is used. Usually the lower register in the pair is the high part and the higher register is the low part. GCC uses r3/r4 ... r11/r12 ... r14/r15 ... r30/r31
In older kernel code inline assembly was using %1 and %1+1 to represent 64 bits values. However here it looks like clang uses r31 as high part, allthough r32 doesn't exist hence the error.
Allthoug %1+1 should work, most places now use %L1 instead of %1+1, so let's do the same here.
With that change, the build doesn't fail anymore and a disassembly shows clang uses r17/r18 and r31/r14 pair when GCC would have used r16/r17 and r30/r31:
Disassembly of section .fixup: 00000000 <.fixup>: 0: 38 a0 ff f2 li r5,-14 4: 3a 20 00 00 li r17,0 8: 3a 40 00 00 li r18,0 c: 48 00 00 00 b c <.fixup+0xc> c: R_PPC_REL24 .text+0xbc 10: 38 a0 ff f2 li r5,-14 14: 3b e0 00 00 li r31,0 18: 39 c0 00 00 li r14,0 1c: 48 00 00 00 b 1c <.fixup+0x1c> 1c: R_PPC_REL24 .text+0x144
--- arch/powerpc/include/asm/uaccess.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/include/asm/uaccess.h +1 -1
@@ -228,7 +228,7 @@ __gus_failed: \".section .fixup,\"ax\"\n" \"4: li %0,%3\n" \" li %1,0\n" \ -" li %1+1,0\n" \ +" li %L1,0\n" \" b 3b\n" \".previous\n" \EX_TABLE (1b ,4b ) \
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 99/570 remoteproc: sysmon: Correct subsys_name_len type in QMI request
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjorn Andersson <[email protected]>
[ Upstream commit da994db94e60f9a9411108ddf4d1836147ad4c9c ]
The QMI message encoder has up until recently read a single byte (as elem_size == 1), but with the introduction of big endian support it's become apparent that this field is expected to be a full u32 - regardless of the size of the length in the encoded message (which is what elem_size specifies).
The result is that the encoder now reads past the length byte and rejects the unreasonably large length formed when including the following 3 bytes from the subsys_name array.
Fix this by changing to the expected type.
--- drivers/remoteproc/qcom_sysmon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/remoteproc/qcom_sysmon.c +1 -1
@@ -204,7 +204,7 @@ static struct qmi_elem_info ssctl_shutdown_resp_ei[] = { };struct ssctl_subsys_event_req { -u8 subsys_name_len; +u32 subsys_name_len;char subsys_name[SSCTL_SUBSYS_NAME_LENGTH ];u32 event;u8 evt_driven_valid;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 100/570 remoteproc: mediatek: Unprepare SCP clock during system suspend
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tzung-Bi Shih <[email protected]>
[ Upstream commit 35c3f72a2d55dbf52f28f4ecae51c76be1acf545 ]
Prior to commit d935187cfb27 ("remoteproc: mediatek: Break lock dependency to prepare_lock"), scp->clk was prepared and enabled only when it needs to communicate with the SCP. The commit d935187cfb27 moved the prepare operation to remoteproc's prepare(), keeping the clock prepared as long as the SCP is running.
The power consumption due to the prolonged clock preparation can be negligible when the system is running, as SCP is designed to be a very power efficient processor.
However, the clock remains prepared even when the system enters system suspend. This prevents the underlying clock controller (and potentially the parent PLLs) from shutting down, which increases power consumption and may block the system from entering deep sleep states.
Add suspend and resume callbacks. Unprepare the clock in suspend() if it was active and re-prepare it in resume() to ensure the clock is properly disabled during system suspend, while maintaining the "always prepared" semantics while the system is active. The driver doesn't implement .attach() callback, hence it only checks for RPROC_RUNNING.
--- drivers/remoteproc/mtk_scp.c | 39 ++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+)
drivers/remoteproc/mtk_scp.c +39 -0
@@ -906,12 +906,51 @@ static const struct of_device_id mtk_scp_of_match[] = { };MODULE_DEVICE_TABLE (of, mtk_scp_of_match); +static int __maybe_unused scp_suspend (struct device *dev) +{ +struct mtk_scp *scp =dev_get_drvdata (dev); +struct rproc *rproc = scp->rproc; + +/* +* Only unprepare if the SCP is running and holding the clock. +* +* Note: `scp_ops` doesn't implement .attach() callback, hence +* `rproc->state` can never be RPROC_ATTACHED. Otherwise, it +* should also be checked here. +*/ +if (rproc->state ==RPROC_RUNNING ) +clk_unprepare (scp->clk); +return 0 ; +} + +static int __maybe_unused scp_resume (struct device *dev) +{ +struct mtk_scp *scp =dev_get_drvdata (dev); +struct rproc *rproc = scp->rproc; + +/* +* Only prepare if the SCP was running and holding the clock. +* +* Note: `scp_ops` doesn't implement .attach() callback, hence +* `rproc->state` can never be RPROC_ATTACHED. Otherwise, it +* should also be checked here. +*/ +if (rproc->state ==RPROC_RUNNING ) +return clk_prepare (scp->clk); +return 0 ; +} + +static const struct dev_pm_ops scp_pm_ops = { +SET_SYSTEM_SLEEP_PM_OPS (scp_suspend, scp_resume) +}; +static struct platform_driver mtk_scp_driver = { .probe = scp_probe, .remove = scp_remove, .driver = { .name ="mtk-scp" , .of_match_table = mtk_scp_of_match, + .pm = &scp_pm_ops, }, };
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 101/570 powerpc: 83xx: km83xx: Fix keymile vendor prefix
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: J. Neuschäfer <[email protected]>
[ Upstream commit 691417ffe7821721e0a28bd25ad8c0dc0d4ae4ad ]
When kmeter.c was refactored into km83xx.c in 2011, the "keymile" vendor prefix was changed to upper-case "Keymile". The devicetree at arch/powerpc/boot/dts/kmeter1.dts never underwent the same change, suggesting that this was simply a mistake.
--- arch/powerpc/platforms/83xx/km83xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/platforms/83xx/km83xx.c +2 -2
@@ -156,8 +156,8 @@ machine_device_initcall(mpc83xx_km, mpc83xx_declare_of_platform_devices);/* list of the supported boards */ static char *board[]__initdata = { -"Keymile,KMETER1" , -"Keymile,kmpbec8321" , +"keymile,KMETER1" , +"keymile,kmpbec8321" ,NULL };
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 102/570 xprtrdma: Decrement re_receiving on the early exit paths
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Badger <[email protected]>
[ Upstream commit 7b6275c80a0c81c5f8943272292dfe67730ce849 ]
In the event that rpcrdma_post_recvs() fails to create a work request (due to memory allocation failure, say) or otherwise exits early, we should decrement ep->re_receiving before returning. Otherwise we will hang in rpcrdma_xprt_drain() as re_receiving will never reach zero and the completion will never be triggered.
On a system with high memory pressure, this can appear as the following hung task:
INFO: task kworker/u385:17:8393 blocked for more than 122 seconds.
Tainted: G S E 6.19.0 #3
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
task:kworker/u385:17 state:D stack:0 pid:8393 tgid:8393 ppid:2 task_flags:0x4248060 flags:0x00080000
Workqueue: xprtiod xprt_autoclose [sunrpc]
Call Trace:
<TASK>
__schedule+0x48b/0x18b0
? ib_post_send_mad+0x247/0xae0 [ib_core]
schedule+0x27/0xf0
schedule_timeout+0x104/0x110
__wait_for_common+0x98/0x180
? __pfx_schedule_timeout+0x10/0x10
wait_for_completion+0x24/0x40
rpcrdma_xprt_disconnect+0x444/0x460 [rpcrdma]
xprt_rdma_close+0x12/0x40 [rpcrdma]
xprt_autoclose+0x5f/0x120 [sunrpc]
process_one_work+0x191/0x3e0
worker_thread+0x2e3/0x420
? __pfx_worker_thread+0x10/0x10
kthread+0x10d/0x230
? __pfx_kthread+0x10/0x10
ret_from_fork+0x273/0x2b0
? __pfx_kthread+0x10/0x10
ret_from_fork_asm+0x1a/0x30--- net/sunrpc/xprtrdma/verbs.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
net/sunrpc/xprtrdma/verbs.c +4 -3
@@ -1390,7 +1390,7 @@ void rpcrdma_post_recvs(struct rpcrdma_xprt *r_xprt, int needed, bool temp) needed +=RPCRDMA_MAX_RECV_BATCH ;if (atomic_inc_return (&ep->re_receiving) >1 ) - goto out; + goto out_dec;/* fast path: all needed reps can be found on the free list */ wr =NULL ;
@@ -1417,7 +1417,7 @@ void rpcrdma_post_recvs(struct rpcrdma_xprt *r_xprt, int needed, bool temp) ++count; }if (!wr) - goto out; + goto out_dec; rc =ib_post_recv (ep->re_id->qp, wr, (const struct ib_recv_wr **)&bad_wr);
@@ -1432,9 +1432,10 @@ void rpcrdma_post_recvs(struct rpcrdma_xprt *r_xprt, int needed, bool temp) --count; } } + +out_dec:if (atomic_dec_return (&ep->re_receiving) >0 )complete (&ep->re_done); - out:trace_xprtrdma_post_recvs (r_xprt, count); ep->re_receive_count += count;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 103/570 bonding: handle BOND_LINK_FAIL, BOND_LINK_BACK as valid link states
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hangbin Liu <[email protected]>
[ Upstream commit 3348be7978f450ede0c308a4e8416ac716cf1015 ]
Before the fixed commit, we check slave->new_link during commit state, which values are only BOND_LINK_{NOCHANGE, UP, DOWN}. After the commit, we start using slave->link_new_state, which state also could be BOND_LINK_{FAIL, BACK}.
For example, when we set updelay/downdelay, after a failover, the slave->link_new_state could be set to BOND_LINK_{FAIL, BACK} in bond_miimon_inspect(). And later in bond_miimon_commit(), it will treat it as invalid and print an error, which would cause confusion for users.
[ 106.440254] bond0: (slave veth2): link status down for interface, disabling it in 200 ms [ 106.440265] bond0: (slave veth2): invalid new link 1 on slave [ 106.648276] bond0: (slave veth2): link status definitely down, disabling slave [ 107.480271] bond0: (slave veth2): link status up, enabling it in 200 ms [ 107.480288] bond0: (slave veth2): invalid new link 3 on slave [ 107.688302] bond0: (slave veth2): link status definitely up, 10000 Mbps full duplex
Let's handle BOND_LINK_{FAIL, BACK} as valid link states.
--- drivers/net/bonding/bond_main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/net/bonding/bond_main.c +7 -1
@@ -2715,8 +2715,14 @@ static void bond_miimon_commit(struct bonding *bond)continue ; +case BOND_LINK_FAIL : +case BOND_LINK_BACK : +slave_dbg (bond->dev, slave->dev,"link_new_state %d on slave\n" , + slave->link_new_state); +continue ; +default : -slave_err (bond->dev, slave->dev,"invalid new link %d on slave\n" , +slave_err (bond->dev, slave->dev,"invalid link_new_state %d on slave\n" , slave->link_new_state);bond_propose_link_state (slave,BOND_LINK_NOCHANGE );
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 104/570 net/mlx5e: Fix DMA FIFO desync on error CQE SQ recovery
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gal Pressman <[email protected]>
[ Upstream commit 1633111d69053512d099658d4a05fc736fab36b0 ]
In case of a TX error CQE, a recovery flow is triggered, mlx5e_reset_txqsq_cc_pc() resets dma_fifo_cc to 0 but not dma_fifo_pc, desyncing the DMA FIFO producer and consumer.
After recovery, the producer pushes new DMA entries at the old dma_fifo_pc, while the consumer reads from position 0. This causes us to unmap stale DMA addresses from before the recovery.
The DMA FIFO is a purely software construct with no HW counterpart. At the point of reset, all WQEs have been flushed so dma_fifo_cc is already equal to dma_fifo_pc. There is no need to reset either counter, similar to how skb_fifo pc/cc are untouched.
Remove the 'dma_fifo_cc = 0' reset.
This fixes the following WARNING:
WARNING: CPU: 0 PID: 0 at drivers/iommu/dma-iommu.c:1240 iommu_dma_unmap_page+0x79/0x90
Modules linked in: mlx5_vdpa vringh vdpa bonding mlx5_ib mlx5_vfio_pci ipip mlx5_fwctl tunnel4 mlx5_core ib_ipoib geneve ip6_gre ip_gre gre nf_tables ip6_tunnel rdma_ucm ib_uverbs ib_umad vfio_pci vfio_pci_core act_mirred act_skbedit act_vlan vhost_net vhost tap ip6table_mangle ip6table_nat ip6table_filter ip6_tables iptable_mangle cls_matchall nfnetlink_cttimeout act_gact cls_flower sch_ingress vhost_iotlb iptable_raw tunnel6 vfio_iommu_type1 vfio openvswitch nsh rpcsec_gss_krb5 auth_rpcgss oid_registry xt_conntrack xt_MASQUERADE nf_conntrack_netlink nfnetlink iptable_nat nf_nat xt_addrtype br_netfilter overlay zram zsmalloc rpcrdma ib_iser libiscsi scsi_transport_iscsi rdma_cm iw_cm ib_cm ib_core fuse [last unloaded: nf_tables]
CPU: 0 UID: 0 PID: 0 Comm: swapper/0 Not tainted 6.13.0-rc5_for_upstream_min_debug_2024_12_30_21_33 #1
Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.13.0-0-gf21b5a4aeb02-prebuilt.qemu.org 04/01/2014
RIP: 0010:iommu_dma_unmap_page+0x79/0x90
Code: 2b 4d 3b 21 72 26 4d 3b 61 08 73 20 49 89 d8 44 89 f9 5b 4c 89 f2 4c 89 e6 48 89 ef 5d 41 5c 41 5d 41 5e 41 5f e9 c7 ae 9e ff <0f> 0b 5b 5d 41 5c 41 5d 41 5e 41 5f c3 66 2e 0f 1f 84 00 00 00 00
Call Trace:
<IRQ>
? __warn+0x7d/0x110
? iommu_dma_unmap_page+0x79/0x90
? report_bug+0x16d/0x180
? handle_bug+0x4f/0x90
? exc_invalid_op+0x14/0x70
? asm_exc_invalid_op+0x16/0x20
? iommu_dma_unmap_page+0x79/0x90
? iommu_dma_unmap_page+0x2e/0x90
dma_unmap_page_attrs+0x10d/0x1b0
mlx5e_tx_wi_dma_unmap+0xbe/0x120 [mlx5_core]
mlx5e_poll_tx_cq+0x16d/0x690 [mlx5_core]
mlx5e_napi_poll+0x8b/0xac0 [mlx5_core]
__napi_poll+0x24/0x190
net_rx_action+0x32a/0x3b0
? mlx5_eq_comp_int+0x7e/0x270 [mlx5_core]
? notifier_call_chain+0x35/0xa0
handle_softirqs+0xc9/0x270
irq_exit_rcu+0x71/0xd0
common_interrupt+0x7f/0xa0
</IRQ>
<TASK>
asm_common_interrupt+0x22/0x40--- drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c +0 -1
@@ -30,7 +30,6 @@ static void mlx5e_reset_txqsq_cc_pc(struct mlx5e_txqsq *sq)"SQ 0x%x: cc (0x%x) != pc (0x%x)\n" , sq->sqn, sq->cc, sq->pc); sq->cc =0 ; - sq->dma_fifo_cc =0 ; sq->pc =0 ; }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 105/570 net/sched: teql: fix NULL pointer dereference in iptunnel_xmit on TEQL slave xmit
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Weiming Shi <[email protected]>
[ Upstream commit 0cc0c2e661af418bbf7074179ea5cfffc0a5c466 ]
teql_master_xmit() calls netdev_start_xmit(skb, slave) to transmit through slave devices, but does not update skb->dev to the slave device beforehand.
When a gretap tunnel is a TEQL slave, the transmit path reaches iptunnel_xmit() which saves dev = skb->dev (still pointing to teql0 master) and later calls iptunnel_xmit_stats(dev, pkt_len). This function does:
get_cpu_ptr(dev->tstats)
Since teql_master_setup() does not set dev->pcpu_stat_type to NETDEV_PCPU_STAT_TSTATS, the core network stack never allocates tstats for teql0, so dev->tstats is NULL. get_cpu_ptr(NULL) computes NULL + __per_cpu_offset[cpu], resulting in a page fault.
BUG: unable to handle page fault for address: ffff8880e6659018 #PF: supervisor write access in kernel mode #PF: error_code(0x0002) - not-present page PGD 68bc067 P4D 68bc067 PUD 0 Oops: Oops: 0002 [#1] SMP KASAN PTI RIP: 0010:iptunnel_xmit (./include/net/ip_tunnels.h:664 net/ipv4/ip_tunnel_core.c:89) Call Trace: <TASK> ip_tunnel_xmit (net/ipv4/ip_tunnel.c:847) __gre_xmit (net/ipv4/ip_gre.c:478) gre_tap_xmit (net/ipv4/ip_gre.c:779) teql_master_xmit (net/sched/sch_teql.c:319) dev_hard_start_xmit (net/core/dev.c:3887) sch_direct_xmit (net/sched/sch_generic.c:347) __dev_queue_xmit (net/core/dev.c:4802) neigh_direct_output (net/core/neighbour.c:1660) ip_finish_output2 (net/ipv4/ip_output.c:237) __ip_finish_output.part.0 (net/ipv4/ip_output.c:315) ip_mc_output (net/ipv4/ip_output.c:369) ip_send_skb (net/ipv4/ip_output.c:1508) udp_send_skb (net/ipv4/udp.c:1195) udp_sendmsg (net/ipv4/udp.c:1485) inet_sendmsg (net/ipv4/af_inet.c:859) __sys_sendto (net/socket.c:2206)
Fix this by setting skb->dev = slave before calling netdev_start_xmit(), so that tunnel xmit functions see the correct slave device with properly allocated tstats.
--- net/sched/sch_teql.c | 1 + 1 file changed, 1 insertion(+)
net/sched/sch_teql.c +1 -0
@@ -315,6 +315,7 @@ static netdev_tx_t teql_master_xmit(struct sk_buff *skb, struct net_device *dev)if (__netif_tx_trylock (slave_txq)) {unsigned int length =qdisc_pkt_len (skb); + skb->dev = slave;if (!netif_xmit_frozen_or_stopped (slave_txq) &&netdev_start_xmit (skb, slave, slave_txq, false) ==NETDEV_TX_OK ) {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 106/570 ASoC: soc-core: drop delayed_work_pending() check before flush
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: matteo.cotifava <[email protected]>
[ Upstream commit 3c99c9f0ed60582c1c9852b685d78d5d3a50de63 ]
The delayed_work_pending() check before flush_delayed_work() in soc_free_pcm_runtime() is unnecessary and racy. flush_delayed_work() is safe to call unconditionally - it is a no-op when no work is pending. Remove the check.
The original check was added by commit 9c9b65203492 ("ASoC: core:
only flush inited work during free") but delayed_work_pending() followed by flush_delayed_work() has a time-of-check/time-of-use window where work can become pending between the two calls.
--- sound/soc/soc-core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
sound/soc/soc-core.c +1 -2
@@ -400,8 +400,7 @@ static void soc_free_pcm_runtime(struct snd_soc_pcm_runtime *rtd)list_del (&rtd->list); -if (delayed_work_pending (&rtd->delayed_work)) -flush_delayed_work (&rtd->delayed_work); +flush_delayed_work (&rtd->delayed_work);snd_soc_pcm_component_free (rtd);/*
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 107/570 ASoC: soc-core: accept zero format at snd_soc_runtime_set_dai_fmt()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuninori Morimoto <[email protected]>
[ Upstream commit 7db07e37e13cfd46039d82aed91092185eac6565 ]
Do nothing if format was zero at snd_soc_runtime_set_dai_fmt(). soc-core.c can be more simple code by this patch.
Stable-dep-of: 95bc5c225513 ("ASoC: soc-core: flush delayed work before removing DAIs and widgets")
--- sound/soc/meson/meson-codec-glue.c | 3 --- sound/soc/soc-core.c | 11 ++++++----- 2 files changed, 6 insertions(+), 8 deletions(-)
sound/soc/meson/meson-codec-glue.c +0 -3
@@ -113,9 +113,6 @@ int meson_codec_glue_output_startup(struct snd_pcm_substream *substream,/* Replace link params with the input params */ rtd->dai_link->params = &in_data->params; -if (!in_data->fmt) -return 0 ; -return snd_soc_runtime_set_dai_fmt (rtd, in_data->fmt); }EXPORT_SYMBOL_GPL (meson_codec_glue_output_startup);
sound/soc/soc-core.c +6 -5
@@ -1244,6 +1244,9 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,unsigned int i;int ret; +if (!dai_fmt) +return 0 ; +for_each_rtd_codec_dais (rtd, i, codec_dai) { ret =snd_soc_dai_set_fmt (codec_dai, dai_fmt);if (ret !=0 && ret != -ENOTSUPP )
@@ -1288,11 +1291,9 @@ static int soc_init_pcm_runtime(struct snd_soc_card *card,return ret;snd_soc_runtime_get_dai_fmt (rtd); -if (dai_link->dai_fmt) { - ret =snd_soc_runtime_set_dai_fmt (rtd, dai_link->dai_fmt); -if (ret) -return ret; - } + ret =snd_soc_runtime_set_dai_fmt (rtd, dai_link->dai_fmt); +if (ret) +return ret;/* add DPCM sysfs entries */ soc_dpcm_debugfs_add (rtd);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 108/570 ASoC: core: Exit all links before removing their components
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cezary Rojewski <[email protected]>
[ Upstream commit c7eb967d70446971413061effca3226578cb4dab ]
Flows leading to link->init() and link->exit() are not symmetric. Currently the relevant part of card probe sequence goes as:
for_each_card_rtds(card, rtd) for_each_rtd_components(rtd, i, component) component->probe() for_each_card_rtds(card, rtd) for_each_rtd_dais(rtd, i, dai) dai->probe() for_each_card_rtds(card, rtd) rtd->init()
On the other side, equivalent remove sequence goes as:
for_each_card_rtds(card, rtd) for_each_rtd_dais(rtd, i, dai) dai->remove() for_each_card_rtds(card, rtd) for_each_rtd_components(rtd, i, component) component->remove() for_each_card_rtds(card, rtd) rtd->exit()
what can lead to errors as link->exit() may still operate on resources owned by its components despite the probability of them being freed during the component->remove().
This change modifies the remove sequence to:
for_each_card_rtds(card, rtd) rtd->exit() for_each_card_rtds(card, rtd) for_each_rtd_dais(rtd, i, dai) dai->remove() for_each_card_rtds(card, rtd) for_each_rtd_components(rtd, i, component) component->remove()
so code found in link->exit() is safe to touch any component stuff as component->remove() has not been called yet.
Stable-dep-of: 95bc5c225513 ("ASoC: soc-core: flush delayed work before removing DAIs and widgets")
--- sound/soc/soc-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/soc-core.c +3 -3
@@ -963,9 +963,6 @@ void snd_soc_remove_pcm_runtime(struct snd_soc_card *card,lockdep_assert_held (&client_mutex); -/* release machine specific resources */ -snd_soc_link_exit (rtd); -/* * Notify the machine driver for extra destruction */
@@ -1923,6 +1920,9 @@ static void soc_cleanup_card_resources(struct snd_soc_card *card)snd_soc_dapm_shutdown (card); +/* release machine specific resources */ +for_each_card_rtds (card, rtd) +snd_soc_link_exit (rtd);/* remove and free each DAI */ soc_remove_link_dais (card);soc_remove_link_components (card);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 109/570 ASoC: core: Do not call link_exit() on uninitialized rtd objects
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Amadeusz Sławiński <[email protected]>
[ Upstream commit dd9f9cc1e6b9391140afa5cf27bb47c9e2a08d02 ]
On init we have sequence:
for_each_card_prelinks(card, i, dai_link) {
ret = snd_soc_add_pcm_runtime(card, dai_link);
ret = init_some_other_things(...);
if (ret)
goto probe_end:
for_each_card_rtds(card, rtd) {
ret = soc_init_pcm_runtime(card, rtd);probe_end:
while on exit:
for_each_card_rtds(card, rtd) snd_soc_link_exit(rtd);
If init_some_other_things() step fails due to error we end up with not fully setup rtds and try to call snd_soc_link_exit on them, which depending on contents on .link_exit handler, can end up dereferencing NULL pointer.
Stable-dep-of: 95bc5c225513 ("ASoC: soc-core: flush delayed work before removing DAIs and widgets")
--- include/sound/soc.h | 2 ++ sound/soc/soc-core.c | 20 +++++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-)
include/sound/soc.h +2 -0
@@ -1082,6 +1082,8 @@ struct snd_soc_pcm_runtime { unsigned int pop_wait:1; unsigned int fe_compr:1; /* for Dynamic PCM */ +bool initialized; +int num_components;struct snd_soc_component *components[];/* CPU/Codec/Platform */ };
sound/soc/soc-core.c +15 -5
@@ -1290,7 +1290,7 @@ static int soc_init_pcm_runtime(struct snd_soc_card *card,snd_soc_runtime_get_dai_fmt (rtd); ret =snd_soc_runtime_set_dai_fmt (rtd, dai_link->dai_fmt);if (ret) -return ret; + goto err;/* add DPCM sysfs entries */ soc_dpcm_debugfs_add (rtd);
@@ -1315,17 +1315,26 @@ static int soc_init_pcm_runtime(struct snd_soc_card *card,/* create compress_device if possible */ ret =snd_soc_dai_compress_new (cpu_dai, rtd, num);if (ret != -ENOTSUPP ) -return ret; + goto err;/* create the pcm */ ret =soc_new_pcm (rtd, num);if (ret <0 ) {dev_err (card->dev,"ASoC: can't create pcm %s :%d\n" , dai_link->stream_name, ret); -return ret; + goto err; } -return snd_soc_pcm_dai_new (rtd); + ret =snd_soc_pcm_dai_new (rtd); +if (ret <0 ) + goto err; + + rtd->initialized = true; + +return 0 ; +err: +snd_soc_link_exit (rtd); +return ret; } static void soc_set_name_prefix(struct snd_soc_card *card,
@@ -1922,7 +1931,8 @@ static void soc_cleanup_card_resources(struct snd_soc_card *card)/* release machine specific resources */ for_each_card_rtds (card, rtd) -snd_soc_link_exit (rtd); +if (rtd->initialized) +snd_soc_link_exit (rtd);/* remove and free each DAI */ soc_remove_link_dais (card);soc_remove_link_components (card);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 110/570 ASoC: soc-core: flush delayed work before removing DAIs and widgets
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: matteo.cotifava <[email protected]>
[ Upstream commit 95bc5c225513fc3c4ce169563fb5e3929fbb938b ]
When a sound card is unbound while a PCM stream is open, a use-after-free can occur in snd_soc_dapm_stream_event(), called from the close_delayed_work workqueue handler.
During unbind, snd_soc_unbind_card() flushes delayed work and then calls soc_cleanup_card_resources(). Inside cleanup, snd_card_disconnect_sync() releases all PCM file descriptors, and the resulting PCM close path can call snd_soc_dapm_stream_stop() which schedules new delayed work with a pmdown_time timer delay. Since this happens after the flush in snd_soc_unbind_card(), the new work is not caught. soc_remove_link_components() then frees DAPM widgets before this work fires, leading to the use-after-free.
The existing flush in soc_free_pcm_runtime() also cannot help as it runs after soc_remove_link_components() has already freed the widgets.
Add a flush in soc_cleanup_card_resources() after snd_card_disconnect_sync() (after which no new PCM closes can schedule further delayed work) and before soc_remove_link_dais() and soc_remove_link_components() (which tear down the structures the delayed work accesses).
--- sound/soc/soc-core.c | 3 +++ 1 file changed, 3 insertions(+)
sound/soc/soc-core.c +3 -0
@@ -1933,6 +1933,9 @@ static void soc_cleanup_card_resources(struct snd_soc_card *card)for_each_card_rtds (card, rtd)if (rtd->initialized)snd_soc_link_exit (rtd); +/* flush delayed work before removing DAIs and DAPM widgets */ +snd_soc_flush_all_delayed_work (card); +/* remove and free each DAI */ soc_remove_link_dais (card);soc_remove_link_components (card);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 111/570 serial: caif: hold tty->link reference in ldisc_open and ser_release
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shuangpeng Bai <[email protected]>
[ Upstream commit 288598d80a068a0e9281de35bcb4ce495f189e2a ]
A reproducer triggers a KASAN slab-use-after-free in pty_write_room() when caif_serial's TX path calls tty_write_room(). The faulting access is on tty->link->port.
Hold an extra kref on tty->link for the lifetime of the caif_serial line
discipline: get it in ldisc_open() and drop it in ser_release(), and also drop it on the ldisc_open() error path.
With this change applied, the reproducer no longer triggers the UAF in my testing.
--- drivers/net/caif/caif_serial.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/caif/caif_serial.c +3 -0
@@ -311,6 +311,7 @@ static void ser_release(struct work_struct *work)dev_close (ser->dev);unregister_netdevice (ser->dev);debugfs_deinit (ser); +tty_kref_put (tty->link);tty_kref_put (tty); }rtnl_unlock ();
@@ -345,6 +346,7 @@ static int ldisc_open(struct tty_struct *tty) ser =netdev_priv (dev); ser->tty =tty_kref_get (tty); +tty_kref_get (tty->link); ser->dev = dev;debugfs_init (ser, tty); tty->receive_room =N_TTY_BUF_SIZE ;
@@ -353,6 +355,7 @@ static int ldisc_open(struct tty_struct *tty)rtnl_lock (); result =register_netdevice (dev);if (result) { +tty_kref_put (tty->link);tty_kref_put (tty);rtnl_unlock ();free_netdev (dev);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 112/570 can: hi311x: hi3110_open(): add check for hi3110_power_enable() return value
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wenyuan Li <[email protected]>
[ Upstream commit 47bba09b14fa21712398febf36cb14fd4fc3bded ]
In hi3110_open(), the return value of hi3110_power_enable() is not checked. If power enable fails, the device may not function correctly, while the driver still returns success.
Add a check for the return value and propagate the error accordingly.
--- drivers/net/can/spi/hi311x.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/can/spi/hi311x.c +4 -1
@@ -751,7 +751,9 @@ static int hi3110_open(struct net_device *net)return ret;mutex_lock (&priv->hi3110_lock); -hi3110_power_enable (priv->transceiver,1 ); + ret =hi3110_power_enable (priv->transceiver,1 ); +if (ret) + goto out_close_candev; priv->force_quit =0 ; priv->tx_skb =NULL ;
@@ -798,6 +800,7 @@ static int hi3110_open(struct net_device *net)hi3110_hw_sleep (spi); out_close:hi3110_power_enable (priv->transceiver,0 ); + out_close_candev:close_candev (net);mutex_unlock (&priv->hi3110_lock);return ret;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 113/570 netfilter: nft_set_pipapo: fix stack out-of-bounds read in pipapo_drop()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jenny Guanni Qu <[email protected]>
[ Upstream commit d6d8cd2db236a9dd13dbc2d05843b3445cc964b5 ]
pipapo_drop() passes rulemap[i + 1].n to pipapo_unmap() as the to_offset argument on every iteration, including the last one where i == m->field_count - 1. This reads one element past the end of the stack-allocated rulemap array (declared as rulemap[NFT_PIPAPO_MAX_FIELDS] with NFT_PIPAPO_MAX_FIELDS == 16).
Although pipapo_unmap() returns early when is_last is true without using the to_offset value, the argument is evaluated at the call site before the function body executes, making this a genuine out-of-bounds stack read confirmed by KASAN:
BUG: KASAN: stack-out-of-bounds in pipapo_drop+0x50c/0x57c [nf_tables] Read of size 4 at addr ffff8000810e71a4
This frame has 1 object:
[32, 160) 'rulemap'
The buggy address is at offset 164 -- exactly 4 bytes past the end of the rulemap array.
Pass 0 instead of rulemap[i + 1].n on the last iteration to avoid the out-of-bounds read.
--- net/netfilter/nft_set_pipapo.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/netfilter/nft_set_pipapo.c +2 -1
@@ -1541,6 +1541,7 @@ static void pipapo_drop(struct nft_pipapo_match *m,int i;nft_pipapo_for_each_field (f, i, m) { +bool last = i == m->field_count -1 ;int g;for (g =0 ; g < f->groups; g++) {
@@ -1560,7 +1561,7 @@ static void pipapo_drop(struct nft_pipapo_match *m, }pipapo_unmap (f->mt, f->rules, rulemap[i].to, rulemap[i].n, - rulemap[i +1 ].n, i == m->field_count -1 ); + last ?0 : rulemap[i +1 ].n, last);if (pipapo_resize (f, f->rules, f->rules - rulemap[i].n)) {/* We can ignore this, a failure to shrink tables down * doesn't make tables invalid.
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 114/570 netfilter: x_tables: guard option walkers against 1-byte tail reads
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Dull <[email protected]>
[ Upstream commit cfe770220ac2dbd3e104c6b45094037455da81d4 ]
When the last byte of options is a non-single-byte option kind, walkers that advance with i += op[i + 1] ? : 1 can read op[i + 1] past the end of the option area.
Add an explicit i == optlen - 1 check before dereferencing op[i + 1] in xt_tcpudp and xt_dccp option walkers.
--- net/netfilter/xt_dccp.c | 4 ++-- net/netfilter/xt_tcpudp.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-)
net/netfilter/xt_dccp.c +2 -2
@@ -62,10 +62,10 @@ dccp_find_option(u_int8_t option,return true; } -if (op[i] <2 ) +if (op[i] <2 || i == optlen -1 ) i++;else - i += op[i+1 ]?:1 ; + i += op[i +1 ] ? :1 ; }spin_unlock_bh (&dccp_buflock);
net/netfilter/xt_tcpudp.c +4 -2
@@ -56,8 +56,10 @@ tcp_find_option(u_int8_t option,for (i =0 ; i < optlen; ) {if (op[i] == option)return !invert; -if (op[i] <2 ) i++; -else i += op[i+1 ]?:1 ; +if (op[i] <2 || i == optlen -1 ) + i++; +else + i += op[i +1 ] ? :1 ; }return invert;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 115/570 netfilter: nfnetlink_queue: fix entry leak in bridge verdict error path
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hyunwoo Kim <[email protected]>
[ Upstream commit f1ba83755d81c6fc66ac7acd723d238f974091e9 ]
nfqnl_recv_verdict() calls find_dequeue_entry() to remove the queue entry from the queue data structures, taking ownership of the entry. For PF_BRIDGE packets, it then calls nfqa_parse_bridge() to parse VLAN attributes. If nfqa_parse_bridge() returns an error (e.g. NFQA_VLAN present but NFQA_VLAN_TCI missing), the function returns immediately without freeing the dequeued entry or its sk_buff.
This leaks the nf_queue_entry, its associated sk_buff, and all held references (net_device refcounts, struct net refcount). Repeated triggering exhausts kernel memory.
Fix this by dropping the entry via nfqnl_reinject() with NF_DROP verdict on the error path, consistent with other error handling in this file.
--- net/netfilter/nfnetlink_queue.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/netfilter/nfnetlink_queue.c +3 -1
@@ -1250,8 +1250,10 @@ static int nfqnl_recv_verdict(struct sk_buff *skb, const struct nfnl_info *info,if (entry->state.pf ==PF_BRIDGE ) { err =nfqa_parse_bridge (entry, nfqa); -if (err <0 ) +if (err <0 ) { +nfqnl_reinject (entry,NF_DROP );return err; + } }if (nfqa[NFQA_PAYLOAD ]) {
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 116/570 netfilter: nfnetlink_cthelper: fix OOB read in nfnl_cthelper_dump_table()
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hyunwoo Kim <[email protected]>
[ Upstream commit 6dcee8496d53165b2d8a5909b3050b62ae71fe89 ]
nfnl_cthelper_dump_table() has a 'goto restart' that jumps to a label inside the for loop body. When the "last" helper saved in cb->args[1] is deleted between dump rounds, every entry fails the (cur != last) check, so cb->args[1] is never cleared. The for loop finishes with cb->args[0] == nf_ct_helper_hsize, and the 'goto restart' jumps back into the loop body bypassing the bounds check, causing an 8-byte out-of-bounds read on nf_ct_helper_hash[nf_ct_helper_hsize].
The 'goto restart' block was meant to re-traverse the current bucket when "last" is no longer found, but it was placed after the for loop instead of inside it. Move the block into the for loop body so that the restart only occurs while cb->args[0] is still within bounds.
BUG: KASAN: slab-out-of-bounds in nfnl_cthelper_dump_table+0x9f/0x1b0 Read of size 8 at addr ffff888104ca3000 by task poc_cthelper/131 Call Trace: nfnl_cthelper_dump_table+0x9f/0x1b0 netlink_dump+0x333/0x880 netlink_recvmsg+0x3e2/0x4b0 sock_recvmsg+0xde/0xf0 __sys_recvfrom+0x150/0x200 __x64_sys_recvfrom+0x76/0x90 do_syscall_64+0xc3/0x6e0 Allocated by task 1: __kvmalloc_node_noprof+0x21b/0x700 nf_ct_alloc_hashtable+0x65/0xd0 nf_conntrack_helper_init+0x21/0x60 nf_conntrack_init_start+0x18d/0x300 nf_conntrack_standalone_init+0x12/0xc0
--- net/netfilter/nfnetlink_cthelper.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/netfilter/nfnetlink_cthelper.c +4 -4
@@ -599,10 +599,10 @@ nfnl_cthelper_dump_table(struct sk_buff *skb, struct netlink_callback *cb) goto out; } } - } -if (cb->args[1 ]) { - cb->args[1 ] =0 ; - goto restart; +if (cb->args[1 ]) { + cb->args[1 ] =0 ; + goto restart; + } } out:rcu_read_unlock ();
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 117/570 netfilter: xt_IDLETIMER: reject rev0 reuse of ALARM timer labels
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuan Tan <[email protected]>
[ Upstream commit 329f0b9b48ee6ab59d1ab72fef55fe8c6463a6cf ]
IDLETIMER revision 0 rules reuse existing timers by label and always call mod_timer() on timer->timer.
If the label was created first by revision 1 with XT_IDLETIMER_ALARM, the object uses alarm timer semantics and timer->timer is never initialized. Reusing that object from revision 0 causes mod_timer() on an uninitialized timer_list, triggering debugobjects warnings and possible panic when panic_on_warn=1.
Fix this by rejecting revision 0 rule insertion when an existing timer with the same label is of ALARM type.
--- net/netfilter/xt_IDLETIMER.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/netfilter/xt_IDLETIMER.c +6 -0
@@ -320,6 +320,12 @@ static int idletimer_tg_checkentry(const struct xt_tgchk_param *par) info->timer =__idletimer_tg_find_by_label (info->label);if (info->timer) { +if (info->timer->timer_type &XT_IDLETIMER_ALARM ) { +pr_debug ("Adding/Replacing rule with same label and different timer type is not allowed\n" ); +mutex_unlock (&list_mutex); +return -EINVAL ; + } + info->timer->refcnt++;mod_timer (&info->timer->timer,msecs_to_jiffies (info->timeout *1000 ) + jiffies);
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 118/570 regulator: pca9450: Make IRQ optional
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frieder Schrempf <[email protected]>
[ Upstream commit 83808c54064eef620ad8645dfdcaffe125551532 ]
The IRQ line might not be connected on some boards. Allow the driver to be probed without it.
Stable-dep-of: 5d0efaf47ee9 ("regulator: pca9450: Correct interrupt type")
--- drivers/regulator/pca9450-regulator.c | 41 +++++++++++++-------------- 1 file changed, 19 insertions(+), 22 deletions(-)
drivers/regulator/pca9450-regulator.c +19 -22
@@ -704,11 +704,6 @@ static int pca9450_i2c_probe(struct i2c_client *i2c,unsigned int device_id, i;int ret; -if (!i2c->irq) { -dev_err (&i2c->dev,"No IRQ configured?\n" ); -return -EINVAL ; - } - pca9450 =devm_kzalloc (&i2c->dev,sizeof (struct pca9450 ),GFP_KERNEL );if (!pca9450)return -ENOMEM ;
@@ -775,23 +770,25 @@ static int pca9450_i2c_probe(struct i2c_client *i2c, } } - ret =devm_request_threaded_irq (pca9450->dev, pca9450->irq,NULL , - pca9450_irq_handler, - (IRQF_TRIGGER_FALLING |IRQF_ONESHOT ), -"pca9450-irq" , pca9450); -if (ret !=0 ) { -dev_err (pca9450->dev,"Failed to request IRQ: %d\n" , - pca9450->irq); -return ret; - } -/* Unmask all interrupt except PWRON/WDOG/RSVD */ - ret =regmap_update_bits (pca9450->regmap,PCA9450_REG_INT1_MSK , -IRQ_VR_FLT1 |IRQ_VR_FLT2 |IRQ_LOWVSYS | -IRQ_THERM_105 |IRQ_THERM_125 , -IRQ_PWRON |IRQ_WDOGB |IRQ_RSVD ); -if (ret) { -dev_err (&i2c->dev,"Unmask irq error\n" ); -return ret; +if (pca9450->irq) { + ret =devm_request_threaded_irq (pca9450->dev, pca9450->irq,NULL , + pca9450_irq_handler, + (IRQF_TRIGGER_FALLING |IRQF_ONESHOT ), +"pca9450-irq" , pca9450); +if (ret !=0 ) { +dev_err (pca9450->dev,"Failed to request IRQ: %d\n" , + pca9450->irq); +return ret; + } +/* Unmask all interrupt except PWRON/WDOG/RSVD */ + ret =regmap_update_bits (pca9450->regmap,PCA9450_REG_INT1_MSK , +IRQ_VR_FLT1 |IRQ_VR_FLT2 |IRQ_LOWVSYS | +IRQ_THERM_105 |IRQ_THERM_125 , +IRQ_PWRON |IRQ_WDOGB |IRQ_RSVD ); +if (ret) { +dev_err (&i2c->dev,"Unmask irq error\n" ); +return ret; + } }/* Clear PRESET_EN bit in BUCK123_DVS to use DVS registers */
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 119/570 regulator: pca9450: Correct interrupt type
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peng Fan <[email protected]>
[ Upstream commit 5d0efaf47ee90ac60efae790acee3a3ed99ebf80 ]
Kernel warning on i.MX8MP-EVK when doing module test:
irq: type mismatch, failed to map hwirq-3 for gpio@30200000!
Per PCA945[X] specification: The IRQ_B pin is pulled low when any unmasked interrupt bit status is changed and it is released high once application processor read INT1 register.
So the interrupt should be configured as IRQF_TRIGGER_LOW, not IRQF_TRIGGER_FALLING.
--- drivers/regulator/pca9450-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/pca9450-regulator.c +1 -1
@@ -773,7 +773,7 @@ static int pca9450_i2c_probe(struct i2c_client *i2c,if (pca9450->irq) { ret =devm_request_threaded_irq (pca9450->dev, pca9450->irq,NULL , pca9450_irq_handler, - (IRQF_TRIGGER_FALLING |IRQF_ONESHOT ), + (IRQF_TRIGGER_LOW |IRQF_ONESHOT ),"pca9450-irq" , pca9450);if (ret !=0 ) { dev_err(pca9450->dev, "Failed to request IRQ: %d\n",
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 120/570 sched: idle: Make skipping governor callbacks more consistent
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafael J. Wysocki <[email protected]>
[ Upstream commit d557640e4ce589a24dca5ca7ce3b9680f471325f ]
If the cpuidle governor .select() callback is skipped because there is only one idle state in the cpuidle driver, the .reflect() callback should be skipped as well, at least for consistency (if not for correctness), so do it.
--- drivers/cpuidle/cpuidle.c | 10 ---------- kernel/sched/idle.c | 11 ++++++++++- 2 files changed, 10 insertions(+), 11 deletions(-)
drivers/cpuidle/cpuidle.c +0 -10
@@ -319,16 +319,6 @@ int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv,int cpuidle_select (struct cpuidle_driver *drv,struct cpuidle_device *dev,bool *stop_tick) { -/* -* If there is only a single idle state (or none), there is nothing -* meaningful for the governor to choose. Skip the governor and -* always use state 0 with the tick running. -*/ -if (drv->state_count <=1 ) { - *stop_tick = false; -return 0 ; - } -return cpuidle_curr_governor->select (drv, dev, stop_tick); }
kernel/sched/idle.c +10 -1
@@ -223,7 +223,7 @@ static void cpuidle_idle_call(void) next_state =cpuidle_find_deepest_state (drv, dev, max_latency_ns);call_cpuidle (drv, dev, next_state); - }else { + }else if (drv->state_count >1 ) {bool stop_tick = true;/*
@@ -241,6 +241,15 @@ static void cpuidle_idle_call(void)* Give the governor an opportunity to reflect on the outcome */ cpuidle_reflect (dev, entered_state); + }else { +tick_nohz_idle_retain_tick (); + +/* +* If there is only a single idle state (or none), there is +* nothing meaningful for the governor to choose. Skip the +* governor and always use state 0. +*/ +call_cpuidle (drv, dev,0 ); } exit_idle:
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 121/570 nvme-pci: Fix slab-out-of-bounds in nvme_dbbuf_set
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sungwoo Kim <[email protected]>
[ Upstream commit b4e78f1427c7d6859229ae9616df54e1fc05a516 ]
dev->online_queues is a count incremented in nvme_init_queue. Thus, valid indices are 0 through dev->online_queues − 1.
This patch fixes the loop condition to ensure the index stays within the valid range. Index 0 is excluded because it is the admin queue.
KASAN splat:
==================================================================
BUG: KASAN: slab-out-of-bounds in nvme_dbbuf_free drivers/nvme/host/pci.c:377 [inline] BUG: KASAN: slab-out-of-bounds in nvme_dbbuf_set+0x39c/0x400 drivers/nvme/host/pci.c:404 Read of size 2 at addr ffff88800592a574 by task kworker/u8:5/74 CPU: 0 UID: 0 PID: 74 Comm: kworker/u8:5 Not tainted 6.19.0-dirty #10 PREEMPT(voluntary) Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.3-0-ga6ed6b701f0a-prebuilt.qemu.org 04/01/2014 Workqueue: nvme-reset-wq nvme_reset_work Call Trace: <TASK> __dump_stack lib/dump_stack.c:94 [inline] dump_stack_lvl+0xea/0x150 lib/dump_stack.c:120 print_address_description mm/kasan/report.c:378 [inline] print_report+0xce/0x5d0 mm/kasan/report.c:482 kasan_report+0xdc/0x110 mm/kasan/report.c:595 __asan_report_load2_noabort+0x18/0x20 mm/kasan/report_generic.c:379 nvme_dbbuf_free drivers/nvme/host/pci.c:377 [inline] nvme_dbbuf_set+0x39c/0x400 drivers/nvme/host/pci.c:404 nvme_reset_work+0x36b/0x8c0 drivers/nvme/host/pci.c:3252 process_one_work+0x956/0x1aa0 kernel/workqueue.c:3257 process_scheduled_works kernel/workqueue.c:3340 [inline] worker_thread+0x65c/0xe60 kernel/workqueue.c:3421 kthread+0x41a/0x930 kernel/kthread.c:463 ret_from_fork+0x6f8/0x8c0 arch/x86/kernel/process.c:158 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:246 </TASK> Allocated by task 34 on cpu 1 at 4.241550s: kasan_save_stack+0x2c/0x60 mm/kasan/common.c:57 kasan_save_track+0x1c/0x70 mm/kasan/common.c:78 kasan_save_alloc_info+0x3c/0x50 mm/kasan/generic.c:570 poison_kmalloc_redzone mm/kasan/common.c:398 [inline] __kasan_kmalloc+0xb5/0xc0 mm/kasan/common.c:415 kasan_kmalloc include/linux/kasan.h:263 [inline] __do_kmalloc_node mm/slub.c:5657 [inline] __kmalloc_node_noprof+0x2bf/0x8d0 mm/slub.c:5663 kmalloc_array_node_noprof include/linux/slab.h:1075 [inline] nvme_pci_alloc_dev drivers/nvme/host/pci.c:3479 [inline] nvme_probe+0x2f1/0x1820 drivers/nvme/host/pci.c:3534 local_pci_probe+0xef/0x1c0 drivers/pci/pci-driver.c:324 pci_call_probe drivers/pci/pci-driver.c:392 [inline] __pci_device_probe drivers/pci/pci-driver.c:417 [inline] pci_device_probe+0x743/0x920 drivers/pci/pci-driver.c:451 call_driver_probe drivers/base/dd.c:583 [inline] really_probe+0x29b/0xb70 drivers/base/dd.c:661 __driver_probe_device+0x3b0/0x4a0 drivers/base/dd.c:803 driver_probe_device+0x56/0x1f0 drivers/base/dd.c:833 __driver_attach_async_helper+0x155/0x340 drivers/base/dd.c:1159 async_run_entry_fn+0xa6/0x4b0 kernel/async.c:129 process_one_work+0x956/0x1aa0 kernel/workqueue.c:3257 process_scheduled_works kernel/workqueue.c:3340 [inline] worker_thread+0x65c/0xe60 kernel/workqueue.c:3421 kthread+0x41a/0x930 kernel/kthread.c:463 ret_from_fork+0x6f8/0x8c0 arch/x86/kernel/process.c:158 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:246 The buggy address belongs to the object at ffff88800592a000 which belongs to the cache kmalloc-2k of size 2048
The buggy address is located 244 bytes to the right of
allocated 1152-byte region [ffff88800592a000, ffff88800592a480)
The buggy address belongs to the physical page: page: refcount:0 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x5928 head: order:3 mapcount:0 entire_mapcount:0 nr_pages_mapped:0 pincount:0 anon flags: 0xfffffc0000040(head|node=0|zone=1|lastcpupid=0x1fffff) page_type: f5(slab) raw: 000fffffc0000040 ffff888001042000 0000000000000000 dead000000000001 raw: 0000000000000000 0000000000080008 00000000f5000000 0000000000000000
head: 000fffffc0000040 ffff888001042000 0000000000000000 dead000000000001
head: 0000000000000000 0000000000080008 00000000f5000000 0000000000000000
head: 000fffffc0000003 ffffea0000164a01 00000000ffffffff 00000000ffffffff
head: ffffffffffffffff 0000000000000000 00000000ffffffff 0000000000000008
page dumped because: kasan: bad access detected
Memory state around the buggy address:
ffff88800592a400: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
ffff88800592a480: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
>ffff88800592a500: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
^
ffff88800592a580: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
ffff88800592a600: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
==================================================================--- drivers/nvme/host/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/host/pci.c +1 -1
@@ -321,7 +321,7 @@ static void nvme_dbbuf_set(struct nvme_dev *dev)/* Free memory and continue on */ nvme_dbbuf_dma_free (dev); -for (i =1 ; i <= dev->online_queues; i++) +for (i =1 ; i < dev->online_queues; i++)nvme_dbbuf_free (&dev->queues[i]); } }
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 122/570 i40e: fix src IP mask checks and memcpy argument names in cloud filter
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alok Tiwari <[email protected]>
[ Upstream commit e809085f492842ce7a519c9ef72d40f4bca89c13 ]
Fix following issues in the IPv4 and IPv6 cloud filter handling logic in both the add and delete paths:
- The source-IP mask check incorrectly compares mask.src_ip[0] against tcf.dst_ip[0]. Update it to compare against tcf.src_ip[0]. This likely goes unnoticed because the check is in an "else if" path that only executes when dst_ip is not set, most cloud filter use cases focus on destination-IP matching, and the buggy condition can accidentally evaluate true in some cases.
- memcpy() for the IPv4 source address incorrectly uses ARRAY_SIZE(tcf.dst_ip) instead of ARRAY_SIZE(tcf.src_ip), although both arrays are the same size.
- The IPv4 memcpy operations used ARRAY_SIZE(tcf.dst_ip) and ARRAY_SIZE (tcf.src_ip), Update these to use sizeof(cfilter->ip.v4.dst_ip) and sizeof(cfilter->ip.v4.src_ip) to ensure correct and explicit copy size.
- In the IPv6 delete path, memcmp() uses sizeof(src_ip6) when comparing dst_ip6 fields. Replace this with sizeof(dst_ip6) to make the intent explicit, even though both fields are struct in6_addr.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +7 -7
@@ -3715,10 +3715,10 @@ static int i40e_vc_del_cloud_filter(struct i40e_vf *vf, u8 *msg) cfilter.n_proto =ETH_P_IP ;if (mask.dst_ip[0 ] & tcf.dst_ip[0 ])memcpy (&cfilter.ip.v4.dst_ip, tcf.dst_ip, -ARRAY_SIZE (tcf.dst_ip)); -else if (mask.src_ip[0 ] & tcf.dst_ip[0 ]) +sizeof (cfilter.ip.v4.dst_ip)); +else if (mask.src_ip[0 ] & tcf.src_ip[0 ])memcpy (&cfilter.ip.v4.src_ip, tcf.src_ip, -ARRAY_SIZE (tcf.dst_ip)); +sizeof (cfilter.ip.v4.src_ip));break ;case VIRTCHNL_TCP_V6_FLOW : cfilter.n_proto =ETH_P_IPV6 ;
@@ -3773,7 +3773,7 @@ static int i40e_vc_del_cloud_filter(struct i40e_vf *vf, u8 *msg)/* for ipv6, mask is set for all sixteen bytes (4 words) */ if (cfilter.n_proto ==ETH_P_IPV6 && mask.dst_ip[3 ])if (memcmp (&cfilter.ip.v6.dst_ip6, &cf->ip.v6.dst_ip6, -sizeof (cfilter.ip.v6.src_ip6))) +sizeof (cfilter.ip.v6.dst_ip6)))continue ;if (mask.vlan_id)if (cfilter.vlan_id != cf->vlan_id)
@@ -3859,10 +3859,10 @@ static int i40e_vc_add_cloud_filter(struct i40e_vf *vf, u8 *msg) cfilter->n_proto =ETH_P_IP ;if (mask.dst_ip[0 ] & tcf.dst_ip[0 ])memcpy (&cfilter->ip.v4.dst_ip, tcf.dst_ip, -ARRAY_SIZE (tcf.dst_ip)); -else if (mask.src_ip[0 ] & tcf.dst_ip[0 ]) +sizeof (cfilter->ip.v4.dst_ip)); +else if (mask.src_ip[0 ] & tcf.src_ip[0 ])memcpy (&cfilter->ip.v4.src_ip, tcf.src_ip, -ARRAY_SIZE (tcf.dst_ip)); +sizeof (cfilter->ip.v4.src_ip));break ;case VIRTCHNL_TCP_V6_FLOW : cfilter->n_proto =ETH_P_IPV6 ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 123/570 e1000/e1000e: Fix leak in DMA error cleanup
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matt Vollrath <[email protected]>
[ Upstream commit e94eaef11142b01f77bf8ba4d0b59720b7858109 ]
If an error is encountered while mapping TX buffers, the driver should unmap any buffers already mapped for that skb.
Because count is incremented after a successful mapping, it will always match the correct number of unmappings needed when dma_error is reached. Decrementing count before the while loop in dma_error causes an off-by-one error. If any mapping was successful before an unsuccessful mapping, exactly one DMA mapping would leak.
In these commits, a faulty while condition caused an infinite loop in dma_error:
Commit 03b1320dfcee ("e1000e: remove use of skb_dma_map from e1000e driver")
Commit 602c0554d7b0 ("e1000: remove use of skb_dma_map from e1000 driver")
Commit c1fa347f20f1 ("e1000/e1000e/igb/igbvf/ixgb/ixgbe: Fix tests of unsigned in *_tx_map()") fixed the infinite loop, but introduced the off-by-one error.
This issue may still exist in the igbvf driver, but I did not address it in this patch.
--- drivers/net/ethernet/intel/e1000/e1000_main.c | 2 -- drivers/net/ethernet/intel/e1000e/netdev.c | 2 -- 2 files changed, 4 deletions(-)
drivers/net/ethernet/intel/e1000/e1000_main.c +0 -2
@@ -2950,8 +2950,6 @@ static int e1000_tx_map(struct e1000_adapter *adapter, dma_error:dev_err (&pdev->dev,"TX DMA map failed\n" ); buffer_info->dma =0 ; -if (count) - count--;while (count--) {if (i ==0 )
drivers/net/ethernet/intel/e1000e/netdev.c +0 -2
@@ -5637,8 +5637,6 @@ static int e1000_tx_map(struct e1000_ring *tx_ring, struct sk_buff *skb, dma_error:dev_err (&pdev->dev,"Tx DMA map failed\n" ); buffer_info->dma =0 ; -if (count) - count--;while (count--) {if (i ==0 )
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 124/570 ACPI: OSL: fix __iomem type on return from acpi_os_map_generic_address()
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 393815f57651101f1590632092986d1d5a3a41bd ]
The pointer returned from acpi_os_map_generic_address() is tagged with __iomem, so make the rv it is returned to also of void __iomem * type.
Fixes the following sparse warning:
drivers/acpi/osl.c:1686:20: warning: incorrect type in assignment (different address spaces)drivers/acpi/osl.c:1686:20: expected void *rvdrivers/acpi/osl.c:1686:20: got void [noderef] __iomem *
--- drivers/acpi/osl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/osl.c +1 -1
@@ -1739,7 +1739,7 @@ acpi_status __init acpi_os_initialize(void)* Use acpi_os_map_generic_address to pre-map the reset * register if it's in system memory. */ -void *rv; +void __iomem *rv; rv =acpi_os_map_generic_address (&acpi_gbl_FADT.reset_register); pr_debug("%s: Reset register mapping %s\n", __func__,
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 125/570 ASoC: amd: acp3x-rt5682-max9836: Add missing error check for clock acquisition
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen Ni <[email protected]>
[ Upstream commit 53f3a900e9a383d47af7253076e19f510c5708d0 ]
The acp3x_5682_init() function did not check the return value of clk_get(), which could lead to dereferencing error pointers in rt5682_clk_enable().
Fix this by:
1. Changing clk_get() to the device-managed devm_clk_get().
2. Adding proper IS_ERR() checks for both clock acquisitions.
--- sound/soc/amd/acp3x-rt5682-max9836.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
sound/soc/amd/acp3x-rt5682-max9836.c +7 -2
@@ -83,8 +83,13 @@ static int acp3x_5682_init(struct snd_soc_pcm_runtime *rtd)return ret; } - rt5682_dai_wclk =clk_get (component->dev,"rt5682-dai-wclk" ); - rt5682_dai_bclk =clk_get (component->dev,"rt5682-dai-bclk" ); + rt5682_dai_wclk =devm_clk_get (component->dev,"rt5682-dai-wclk" ); +if (IS_ERR (rt5682_dai_wclk)) +return PTR_ERR (rt5682_dai_wclk); + + rt5682_dai_bclk =devm_clk_get (component->dev,"rt5682-dai-bclk" ); +if (IS_ERR (rt5682_dai_bclk)) +return PTR_ERR (rt5682_dai_bclk); ret = snd_soc_card_jack_new(card, "Headset Jack", SND_JACK_HEADSET | SND_JACK_LINEOUT |
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 126/570 ASoC: detect empty DMI strings
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Casey Connolly <[email protected]>
[ Upstream commit a9683730e8b1d632674f81844ed03ddfbe4821c0 ]
Some bootloaders like recent versions of U-Boot may install some DMI properties with empty values rather than not populate them. This manages to make its way through the validator and cleanup resulting in a rogue hyphen being appended to the card longname.
--- sound/soc/soc-core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/soc-core.c +4 -1
@@ -1665,12 +1665,15 @@ static void cleanup_dmi_name(char *name)/* * Check if a DMI field is valid, i.e. not containing any string -* in the black list. +* in the black list and not the empty string. */ static int is_dmi_valid (const char *field) {int i =0 ; +if (!field[0 ]) +return 0 ; +while (dmi_blacklist[i]) {if (strstr (field, dmi_blacklist[i]))return 0 ;
Signature · 1 line
2.51.0
Greg Kroah-Hartman
maintainerPATCH 127/570 octeontx2-af: devlink: fix NIX RAS reporter recovery condition
In reply to Greg Kroah-Hartman5.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alok Tiwari <[email protected]>
[ Upstream commit dc26ca99b835e21e76a58b1463b84adb0ca34f58 ]
The NIX RAS health reporter recovery routine checks nix_af_rvu_int to decide whether to re-enable NIX_AF_RAS interrupts. This is the RVU interrupt status field and is unrelated to RAS events, so the recovery flow may incorrectly skip re-enabling NIX_AF_RAS interrupts.
Check nix_af_rvu_ras instead before writing NIX_AF_RAS_ENA_W1S.
--- drivers/net/ethernet/marvell/octeontx2/af/rvu_devlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu_devlink.c +1 -1
@@ -578,7 +578,7 @@ static int rvu_hw_nix_ras_recover(struct devlink_health_reporter *reporter,if (blkaddr <0 )return blkaddr; -if (nix_event_ctx->nix_af_rvu_int) +if (nix_event_ctx->nix_af_rvu_ras)rvu_write64 (rvu, blkaddr,NIX_AF_RAS_ENA_W1S , ~0ULL );return 0 ;
Signature · 1 line
2.51.0