5.4.274-rc1 review
Subsystems (2)
Greg Kroah-Hartman
maintainercover 5.4.274-rc1 review
This is the start of the stable review cycle for the 5.4.274 release. There are 215 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 Sat, 13 Apr 2024 09:53:55 +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.4.274-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.4.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.4.274-rc1
Zhang Shurong <[email protected]>
firmware: meson_sm: fix to avoid potential NULL pointer dereference
Hangbin Liu <[email protected]>
ip_gre: do not report erspan version on GRE interface
William Tu <[email protected]>
erspan: Check IFLA_GRE_ERSPAN_VER is set.
Vasiliy Kovalev <[email protected]>
VMCI: Fix possible memcpy() run-time warning in vmci_datagram_invoke_guest_handler()
Luiz Augusto von Dentz <[email protected]>
Bluetooth: btintel: Fixe build regression
Juergen Gross <[email protected]>
x86/alternative: Don't call text_poke() in lazy TLB mode
Chris Wilson <[email protected]>
drm/i915/gt: Reset queue_priority_hint on parking
David Hildenbrand <[email protected]>
x86/mm/pat: fix VM_PAT handling in COW mappings
David Hildenbrand <[email protected]>
virtio: reenable config if freezing device failed
Guo Mengqi <[email protected]>
drm/vkms: call drm_atomic_helper_shutdown before drm_dev_put()
Thadeu Lima de Souza Cascardo <[email protected]>
tty: n_gsm: require CAP_NET_ADMIN to attach N_GSM0710 ldisc
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: discard table flag update with pending basechain deletion
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: release mutex after nft_gc_seq_end from abort path
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: release batch on table validation from abort path
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: reject new basechain after table flag update
Roman Smirnov <[email protected]>
fbmon: prevent division by zero in fb_videomode_from_videomode()
Aleksandr Burakov <[email protected]>
fbdev: viafb: fix typo in hw_bitblt_1 and hw_bitblt_2
Colin Ian King <[email protected]>
usb: sl811-hcd: only defined function checkdone if QUIRK2 is defined
Marco Felsch <[email protected]>
usb: typec: tcpci: add generic tcpci fallback compatible
Petre Rodan <[email protected]>
tools: iio: replace seekdir() in iio_generic_buffer
Ricardo B. Marliere <[email protected]>
ktest: force $buildonly = 1 for 'make_warnings_file' test type
Gergo Koteles <[email protected]>
Input: allocate keycode for Display refresh rate toggle
Roman Smirnov <[email protected]>
block: prevent division by zero in blk_rq_stat_sum()
Daniel Drake <[email protected]>
Revert "ACPI: PM: Block ASUS B1400CEAE from suspend to idle by default"
Dai Ngo <[email protected]>
SUNRPC: increase size of rpc_wait_queue.qlen from unsigned short to unsigned int
Aric Cyr <[email protected]>
drm/amd/display: Fix nanosec stat overflow
Arnd Bergmann <[email protected]>
media: sta2x11: fix irq handler cast
Alex Henrie <[email protected]>
isofs: handle CDs with bad root inode but good Joliet root directory
Justin Tee <[email protected]>
scsi: lpfc: Fix possible memory leak in lpfc_rcv_padisc()
Tetsuo Handa <[email protected]>
sysv: don't call sb_bread() with pointers_lock held
Kunwu Chan <[email protected]>
Input: synaptics-rmi4 - fail probing if memory allocation for "phys" fails
Edward Adam Davis <[email protected]>
Bluetooth: btintel: Fix null ptr deref in btintel_read_version
David Sterba <[email protected]>
btrfs: send: handle path ref underflow in header iterate_inode_ref()
David Sterba <[email protected]>
btrfs: export: handle invalid inode or root reference in btrfs_get_parent()
David Sterba <[email protected]>
btrfs: handle chunk tree lookup error in btrfs_relocate_sys_chunks()
Samasth Norway Ananda <[email protected]>
tools/power x86_energy_perf_policy: Fix file leak in get_pkg_num()
Shannon Nelson <[email protected]>
ionic: set adminq irq affinity
Johan Jonker <[email protected]>
arm64: dts: rockchip: fix rk3399 hdmi ports node
Johan Jonker <[email protected]>
arm64: dts: rockchip: fix rk3328 hdmi ports node
John Ogness <[email protected]>
panic: Flush kernel log buffer at the end
Harshit Mogalapalli <[email protected]>
VMCI: Fix memcpy() run-time warning in dg_dispatch_as_host()
Markus Elfring <[email protected]>
batman-adv: Improve exception handling in batadv_throw_uevent()
Markus Elfring <[email protected]>
batman-adv: Return directly after a failed batadv_dat_select_candidates() in batadv_dat_forward_data()
Dmitry Antipov <[email protected]>
wifi: ath9k: fix LNA selection in ath_ant_try_scan()
Sumanth Korikkar <[email protected]>
s390/entry: align system call table on 8 bytes
Borislav Petkov (AMD) <[email protected]>
x86/mce: Make sure to grab mce_sysfs_mutex in set_bank()
I Gede Agastya Darma Laksana <[email protected]>
ALSA: hda/realtek: Update Panasonic CF-SZ6 quirk to support headset with microphone
Arnd Bergmann <[email protected]>
ata: sata_mv: Fix PCI device ID table declaration compilation warning
Arnd Bergmann <[email protected]>
scsi: mylex: Fix sysfs buffer lengths
Arnd Bergmann <[email protected]>
ata: sata_sx4: fix pdc20621_get_from_dimm() on 64-bit
Stephen Lee <[email protected]>
ASoC: ops: Fix wraparound for mask in snd_soc_get_volsw
Paul Barker <[email protected]>
net: ravb: Always process TX descriptor ring
Eric Dumazet <[email protected]>
erspan: make sure erspan_base_hdr is present in skb->head
William Tu <[email protected]>
erspan: Add type I version 0 support.
John Sperbeck <[email protected]>
init: open /initrd.image with O_LARGEFILE
Christoph Hellwig <[email protected]>
initramfs: switch initramfs unpacking to struct file based APIs
Christoph Hellwig <[email protected]>
fs: add a vfs_fchmod helper
Christoph Hellwig <[email protected]>
fs: add a vfs_fchown helper
Dan Carpenter <[email protected]>
staging: vc04_services: fix information leak in create_component()
Arnd Bergmann <[email protected]>
staging: vc04_services: changen strncpy() to strscpy_pad()
Dave Stevenson <[email protected]>
staging: mmal-vchiq: Fix client_component for 64 bit kernel
Dave Stevenson <[email protected]>
staging: mmal-vchiq: Allocate and free components as required
Aleksandr Loktionov <[email protected]>
i40e: fix vf may be used uninitialized in this function warning
Kuniyuki Iwashima <[email protected]>
ipv6: Fix infinite recursion in fib6_dump_done().
Jakub Kicinski <[email protected]>
selftests: reuseaddr_conflict: add missing new line at the end of the output
Piotr Wejman <[email protected]>
net: stmmac: fix rx queue priority assignment
Eric Dumazet <[email protected]>
net/sched: act_skbmod: prevent kernel-infoleak
Jakub Sitnicki <[email protected]>
bpf, sockmap: Prevent lock inversion deadlock in map delete elem
Ziyang Xuan <[email protected]>
netfilter: nf_tables: Fix potential data-race in __nft_flowtable_type_get()
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: flush pending destroy work before exit_net release
Vlastimil Babka <[email protected]>
mm, vmscan: prevent infinite loop for costly GFP_NOIO | __GFP_RETRY_MAYFAIL allocations
Ingo Molnar <[email protected]>
Revert "x86/mm/ident_map: Use gbpages only where full GB page should be mapped."
Alex Williamson <[email protected]>
vfio/platform: Create persistent IRQ handlers
Alex Williamson <[email protected]>
vfio/pci: Create persistent INTx handler
Alex Williamson <[email protected]>
vfio: Introduce interface to flush virqfd inject workqueue
Alex Williamson <[email protected]>
vfio/pci: Lock external INTx masking ops
Alex Williamson <[email protected]>
vfio/pci: Disable auto-enable of exclusive INTx IRQ
Mahmoud Adam <[email protected]>
net/rds: fix possible cp null dereference
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: disallow timeout for anonymous sets
Bastien Nocera <[email protected]>
Bluetooth: Fix TOCTOU in HCI debugfs implementation
Hui Wang <[email protected]>
Bluetooth: hci_event: set the conn encrypted before conn establishes
Sandipan Das <[email protected]>
x86/cpufeatures: Add new word for scattered features
Heiner Kallweit <[email protected]>
r8169: fix issue caused by buggy BIOS on certain boards with RTL8168d
Arnd Bergmann <[email protected]>
dm integrity: fix out-of-range warning
Eric Dumazet <[email protected]>
tcp: properly terminate timers for kernel sockets
Przemek Kitszel <[email protected]>
ixgbe: avoid sleeping allocation in ixgbe_ipsec_vf_add_sa()
Ryosuke Yasuoka <[email protected]>
nfc: nci: Fix uninit-value in nci_dev_up and nci_ntf_packet
Alan Stern <[email protected]>
USB: core: Fix deadlock in usb_deauthorize_interface()
Muhammad Usama Anjum <[email protected]>
scsi: lpfc: Correct size for wqe for memset()
Kim Phillips <[email protected]>
x86/cpu: Enable STIBP on AMD if Automatic IBRS is enabled
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix command flush on cable pull
yuan linyu <[email protected]>
usb: udc: remove warning when queue disabled ep
Minas Harutyunyan <[email protected]>
usb: dwc2: gadget: LPM flow fix
Minas Harutyunyan <[email protected]>
usb: dwc2: host: Fix ISOC flow in DDMA mode
Minas Harutyunyan <[email protected]>
usb: dwc2: host: Fix hibernation flow
Minas Harutyunyan <[email protected]>
usb: dwc2: host: Fix remote wakeup from hibernation
Guilherme G. Piccoli <[email protected]>
scsi: core: Fix unremoved procfs host directory regression
Duoming Zhou <[email protected]>
ALSA: sh: aica: reorder cleanup operations to avoid UAF bugs
Oliver Neukum <[email protected]>
usb: cdc-wdm: close race between read and workqueue
Mikko Rapeli <[email protected]>
mmc: core: Avoid negative index with array access
Mikko Rapeli <[email protected]>
mmc: core: Initialize mmc_blk_ioc_data
Max Filippov <[email protected]>
exec: Fix NOMMU linux_binprm::exec in transfer_args_to_stack()
Felix Fietkau <[email protected]>
wifi: mac80211: check/clear fast rx for non-4addr sta VLAN changes
Zi Yan <[email protected]>
mm/migrate: set swap entry values of THP tail pages properly.
Liu Shixin <[email protected]>
mm/memory-failure: fix an incorrect use of tail pages
Yangxi Xiang <[email protected]>
vt: fix memory overlapping when deleting chars in the buffer
Matthew Wilcox (Oracle) <[email protected]>
bounds: support non-power-of-two CONFIG_NR_CPUS
Nathan Chancellor <[email protected]>
powerpc: xor_vmx: Add '-mhard-float' to CFLAGS
Tim Schumacher <[email protected]>
efivarfs: Request at most 512 bytes for variable names
Yang Jihong <[email protected]>
perf/core: Fix reentry problem in perf_output_read_group()
Zhong Jinghua <[email protected]>
loop: loop_set_status_from_info() check before assignment
Siddh Raman Pant <[email protected]>
loop: Check for overflow while configuring loop
Martijn Coenen <[email protected]>
loop: Factor out configuring loop from status
Martijn Coenen <[email protected]>
loop: Refactor loop_set_status() size calculation
Martijn Coenen <[email protected]>
loop: Factor out setting loop device size
Martijn Coenen <[email protected]>
loop: Remove sector_t truncation checks
Martijn Coenen <[email protected]>
loop: Call loop_config_discard() only after new config is applied
Genjian Zhang <[email protected]>
Revert "loop: Check for overflow while configuring loop"
Goldwyn Rodrigues <[email protected]>
btrfs: allocate btrfs_ioctl_defrag_range_args on stack
John Ogness <[email protected]>
printk: Update @console_may_schedule in console_trylock_spinning()
Maximilian Heyne <[email protected]>
xen/events: close evtchn after mapping cleanup
Rui Qi <[email protected]>
x86/speculation: Support intra-function call validation
Alexandre Chartre <[email protected]>
objtool: Add support for intra-function calls
Alexandre Chartre <[email protected]>
objtool: is_fentry_call() crashes if call has no destination
Bart Van Assche <[email protected]>
fs/aio: Check IOCB_AIO_RW before the struct aio_kiocb conversion
Nicolas Pitre <[email protected]>
vt: fix unicode buffer corruption when deleting characters
Sherry Sun <[email protected]>
tty: serial: fsl_lpuart: avoid idle preamble pending if CTS is enabled
Mathias Nyman <[email protected]>
usb: port: Don't try to peer unused USB ports based on location
Krishna Kurapati <[email protected]>
usb: gadget: ncm: Fix handling of zero block length packets
Alan Stern <[email protected]>
USB: usb-storage: Prevent divide-by-0 error in isd200_ata_command
Kailang Yang <[email protected]>
ALSA: hda/realtek - Fix headset Mic no show at resume back for Lenovo ALC897 platform
Nathan Chancellor <[email protected]>
xfrm: Avoid clang fortify warning in copy_to_user_tmpl()
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: reject constant set with timeout
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: disallow anonymous set with timeout flag
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: mark set as dead when unbinding anonymous set with timeout
Ian Abbott <[email protected]>
comedi: comedi_test: Prevent timers rescheduling during deletion
Mikulas Patocka <[email protected]>
dm snapshot: fix lockup in dm_exception_table_exit
Conrad Kostecki <[email protected]>
ahci: asm1064: asm1166: don't limit reported ports
Andrey Jr. Melnikov <[email protected]>
ahci: asm1064: correct count of reported ports
Borislav Petkov (AMD) <[email protected]>
x86/CPU/AMD: Update the Zenbleed microcode revisions
Ryusuke Konishi <[email protected]>
nilfs2: prevent kernel bug at submit_bh_wbc()
Joe Perches <[email protected]>
nilfs2: use a more common logging style
Ryusuke Konishi <[email protected]>
nilfs2: fix failure to detect DAT corruption in btree and direct mappings
Qiang Zhang <[email protected]>
memtest: use {READ,WRITE}_ONCE in memory scanning
Jani Nikula <[email protected]>
drm/vc4: hdmi: do not return negative values from .get_modes()
Jani Nikula <[email protected]>
drm/imx/ipuv3: do not return negative values from .get_modes()
Jani Nikula <[email protected]>
drm/exynos: do not return negative values from .get_modes()
Harald Freudenberger <[email protected]>
s390/zcrypt: fix reference counting on zcrypt card objects
Sean Anderson <[email protected]>
soc: fsl: qbman: Use raw spinlock for cgr_lock
Sean Anderson <[email protected]>
soc: fsl: qbman: Add CGR update function
Sean Anderson <[email protected]>
soc: fsl: qbman: Add helper for sanity checking cgr ops
Sean Anderson <[email protected]>
soc: fsl: qbman: Always disable interrupts when taking cgr_lock
Steven Rostedt (Google) <[email protected]>
ring-buffer: Fix full_waiters_pending in poll
Steven Rostedt (Google) <[email protected]>
ring-buffer: Fix resetting of shortest_full
Alex Williamson <[email protected]>
vfio/platform: Disable virqfds on cleanup
Nathan Chancellor <[email protected]>
kbuild: Move -Wenum-{compare-conditional,enum-conversion} into W=1
Samuel Thibault <[email protected]>
speakup: Fix 8bit characters from direct synth
Christophe JAILLET <[email protected]>
slimbus: core: Remove usage of the deprecated ida_simple_xx() API
Jerome Brunet <[email protected]>
nvmem: meson-efuse: fix function pointer type mismatch
Carlo Caione <[email protected]>
firmware: meson_sm: Rework driver as a proper platform driver
Maximilian Heyne <[email protected]>
ext4: fix corruption during on-line resize
Josua Mayer <[email protected]>
hwmon: (amc6821) add of_match table
Dominique Martinet <[email protected]>
mmc: core: Fix switch on gp3 partition
Yu Kuai <[email protected]>
dm-raid: fix lockdep waring in "pers->hot_add_disk"
Song Liu <[email protected]>
Revert "Revert "md/raid5: Wait for MD_SB_CHANGE_PENDING in raid5d""
Rafael J. Wysocki <[email protected]>
PCI/PM: Drain runtime-idle callbacks before driver removal
Uwe Kleine-König <[email protected]>
PCI: Drop pci_device_remove() test of pci_dev->driver
Filipe Manana <[email protected]>
btrfs: fix off-by-one chunk length calculation at contains_pending_extent()
Miklos Szeredi <[email protected]>
fuse: don't unhash root
Max Reitz <[email protected]>
fuse: drop fuse_conn parameter where possible
Max Reitz <[email protected]>
fuse: store fuse_conn in fuse_req
Wolfram Sang <[email protected]>
mmc: tmio: avoid concurrent runs of mmc_request_done()
Qingliang Li <[email protected]>
PM: sleep: wakeirq: fix wake irq warning in system suspend
Toru Katagiri <[email protected]>
USB: serial: cp210x: add pid/vid for TDK NC0110013M and MM0110113M
Aurélien Jacobs <[email protected]>
USB: serial: option: add MeiG Smart SLM320 product
Christian Häggström <[email protected]>
USB: serial: cp210x: add ID for MGP Instruments PDS100
Cameron Williams <[email protected]>
USB: serial: add device ID for VeriFone adapter
Daniel Vogelbacher <[email protected]>
USB: serial: ftdi_sio: add support for GMC Z216C Adapter IR-USB
Michael Ellerman <[email protected]>
powerpc/fsl: Fix mfpmr build errors with newer binutils
Gabor Juhos <[email protected]>
clk: qcom: mmcc-msm8974: fix terminating of frequency table arrays
Gabor Juhos <[email protected]>
clk: qcom: mmcc-apq8084: fix terminating of frequency table arrays
Gabor Juhos <[email protected]>
clk: qcom: gcc-ipq8074: fix terminating of frequency table arrays
Maulik Shah <[email protected]>
PM: suspend: Set mem_sleep_current during kernel command line setup
Guenter Roeck <[email protected]>
parisc: Strip upper 32 bit of sum in csum_ipv6_magic for 64-bit builds
Guenter Roeck <[email protected]>
parisc: Fix csum_ipv6_magic on 64-bit systems
Guenter Roeck <[email protected]>
parisc: Fix csum_ipv6_magic on 32-bit systems
Guenter Roeck <[email protected]>
parisc: Fix ip_fast_csum
Helge Deller <[email protected]>
parisc: Do not hardcode registers in checksum functions
Arseniy Krasnov <[email protected]>
mtd: rawnand: meson: fix scrambling mode value in command macro
Zhang Yi <[email protected]>
ubi: correct the calculation of fastmap size
Richard Weinberger <[email protected]>
ubi: Check for too small LEB size in VTBL code
Matthew Wilcox (Oracle) <[email protected]>
ubifs: Set page uptodate in the correct place
Jan Kara <[email protected]>
fat: fix uninitialized field in nostale filehandles
Baokun Li <[email protected]>
ext4: correct best extent lstart adjustment logic
SeongJae Park <[email protected]>
selftests/mqueue: Set timeout to 180 seconds
Damian Muszynski <[email protected]>
crypto: qat - resolve race condition during AER recovery
Svyatoslav Pankratov <[email protected]>
crypto: qat - fix double free during reset
Randy Dunlap <[email protected]>
sparc: vDSO: fix return value of __setup handler
Randy Dunlap <[email protected]>
sparc64: NMI watchdog: fix return value of __setup handler
Sean Christopherson <[email protected]>
KVM: Always flush async #PF workqueue when vCPU is being destroyed
Gui-Dong Han <[email protected]>
media: xc4000: Fix atomicity violation in xc4000_get_frequency
Hugo Villeneuve <[email protected]>
serial: max310x: fix NULL pointer dereference in I2C instantiation
Duje Mihanović <[email protected]>
arm: dts: marvell: Fix maxium->maxim typo in brownstone dts
Lubomir Rintel <[email protected]>
ARM: dts: mmp2-brownstone: Don't redeclare phandle references
Roberto Sassu <[email protected]>
smack: Handle SMACK64TRANSMUTE in smack_inode_setsecurity()
Roberto Sassu <[email protected]>
smack: Set SMACK64TRANSMUTE only for dirs in smack_inode_setxattr()
Amit Pundir <[email protected]>
clk: qcom: gcc-sdm845: Add soft dependency on rpmhpd
Hidenori Kobayashi <[email protected]>
media: staging: ipu3-imgu: Set fields before media_entity_pads_init()
Zheng Wang <[email protected]>
wifi: brcmfmac: Fix use-after-free bug in brcmf_cfg80211_detach
Thomas Gleixner <[email protected]>
timers: Rename del_timer_sync() to timer_delete_sync()
Thomas Gleixner <[email protected]>
timers: Use del_timer_sync() even on UP
Thomas Gleixner <[email protected]>
timers: Update kernel-doc for various functions
Borislav Petkov <[email protected]>
x86/bugs: Use sysfs_emit()
Kim Phillips <[email protected]>
x86/cpu: Support AMD Automatic IBRS
Lin Yujun <[email protected]>
Documentation/hw-vuln: Update spectre doc
-------------
Diffstat:
Documentation/admin-guide/hw-vuln/spectre.rst | 18 +- Documentation/admin-guide/kernel-parameters.txt | 6 +- Makefile | 4 +- arch/arm/boot/dts/mmp2-brownstone.dts | 330 ++++++++++----------- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 11 +- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 12 +- arch/parisc/include/asm/checksum.h | 107 +++---- arch/powerpc/include/asm/reg_fsl_emb.h | 11 +- arch/powerpc/lib/Makefile | 2 +- arch/s390/kernel/entry.S | 1 + arch/sparc/kernel/nmi.c | 2 +- arch/sparc/vdso/vma.c | 7 +- arch/x86/include/asm/cpufeature.h | 6 +- arch/x86/include/asm/cpufeatures.h | 4 +- arch/x86/include/asm/disabled-features.h | 3 +- arch/x86/include/asm/mmu_context.h | 9 + arch/x86/include/asm/msr-index.h | 2 + arch/x86/include/asm/nospec-branch.h | 7 + arch/x86/include/asm/required-features.h | 3 +- arch/x86/include/asm/unwind_hints.h | 2 +- arch/x86/kernel/cpu/amd.c | 10 +- arch/x86/kernel/cpu/bugs.c | 117 ++++---- arch/x86/kernel/cpu/common.c | 19 +- arch/x86/kernel/cpu/mce/core.c | 4 +- arch/x86/mm/ident_map.c | 23 +- arch/x86/mm/pat.c | 50 +++- block/blk-stat.c | 2 +- drivers/acpi/sleep.c | 12 - drivers/ata/ahci.c | 5 - drivers/ata/sata_mv.c | 63 ++-- drivers/ata/sata_sx4.c | 6 +- drivers/base/power/wakeirq.c | 4 +- drivers/block/loop.c | 187 +++++++----- drivers/bluetooth/btintel.c | 2 +- drivers/clk/qcom/gcc-ipq8074.c | 2 + drivers/clk/qcom/gcc-sdm845.c | 1 + drivers/clk/qcom/mmcc-apq8084.c | 2 + drivers/clk/qcom/mmcc-msm8974.c | 2 + drivers/crypto/qat/qat_common/adf_aer.c | 23 +- drivers/firmware/efi/vars.c | 17 +- drivers/firmware/meson/meson_sm.c | 96 ++++-- .../gpu/drm/amd/display/modules/inc/mod_stats.h | 4 +- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 4 +- drivers/gpu/drm/exynos/exynos_hdmi.c | 4 +- drivers/gpu/drm/i915/gt/intel_engine_pm.c | 3 - drivers/gpu/drm/i915/gt/intel_lrc.c | 3 + drivers/gpu/drm/imx/parallel-display.c | 4 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- drivers/gpu/drm/vkms/vkms_drv.c | 2 +- drivers/hwmon/amc6821.c | 11 + drivers/input/rmi4/rmi_driver.c | 6 +- drivers/md/dm-integrity.c | 2 +- drivers/md/dm-raid.c | 2 + drivers/md/dm-snap.c | 4 +- drivers/md/raid5.c | 12 + drivers/media/pci/sta2x11/sta2x11_vip.c | 9 +- drivers/media/tuners/xc4000.c | 4 +- drivers/misc/vmw_vmci/vmci_datagram.c | 6 +- drivers/mmc/core/block.c | 14 +- drivers/mmc/host/tmio_mmc_core.c | 2 + drivers/mtd/nand/raw/meson_nand.c | 2 +- drivers/mtd/ubi/fastmap.c | 7 +- drivers/mtd/ubi/vtbl.c | 6 + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 34 +-- drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 16 +- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 5 +- drivers/net/ethernet/realtek/r8169_main.c | 9 + drivers/net/ethernet/renesas/ravb_main.c | 7 +- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 40 ++- .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 38 ++- drivers/net/wireless/ath/ath9k/antenna.c | 2 +- .../broadcom/brcm80211/brcmfmac/cfg80211.c | 4 +- drivers/nvmem/meson-efuse.c | 43 ++- drivers/pci/pci-driver.c | 23 +- drivers/s390/crypto/zcrypt_api.c | 2 + drivers/scsi/hosts.c | 7 +- drivers/scsi/lpfc/lpfc_nportdisc.c | 6 +- drivers/scsi/lpfc/lpfc_nvmet.c | 2 +- drivers/scsi/myrb.c | 20 +- drivers/scsi/myrs.c | 24 +- drivers/scsi/qla2xxx/qla_target.c | 10 + drivers/slimbus/core.c | 4 +- drivers/soc/fsl/qbman/qman.c | 98 ++++-- drivers/staging/comedi/drivers/comedi_test.c | 30 +- drivers/staging/media/ipu3/ipu3-v4l2.c | 16 +- drivers/staging/speakup/synth.c | 4 +- .../vc04_services/bcm2835-camera/mmal-vchiq.c | 40 ++- .../vc04_services/bcm2835-camera/mmal-vchiq.h | 2 + drivers/tty/n_gsm.c | 3 + drivers/tty/serial/fsl_lpuart.c | 7 +- drivers/tty/serial/max310x.c | 7 +- drivers/tty/vt/vt.c | 4 +- drivers/usb/class/cdc-wdm.c | 6 +- drivers/usb/core/port.c | 5 +- drivers/usb/core/sysfs.c | 16 +- drivers/usb/dwc2/core.h | 14 + drivers/usb/dwc2/core_intr.c | 63 ++-- drivers/usb/dwc2/gadget.c | 4 + drivers/usb/dwc2/hcd.c | 47 ++- drivers/usb/dwc2/hcd_ddma.c | 17 +- drivers/usb/dwc2/hw.h | 2 +- drivers/usb/gadget/function/f_ncm.c | 2 +- drivers/usb/gadget/udc/core.c | 4 +- drivers/usb/host/sl811-hcd.c | 2 + drivers/usb/serial/cp210x.c | 4 + drivers/usb/serial/ftdi_sio.c | 2 + drivers/usb/serial/ftdi_sio_ids.h | 6 + drivers/usb/serial/option.c | 6 + drivers/usb/storage/isd200.c | 23 +- drivers/usb/typec/tcpm/tcpci.c | 1 + drivers/vfio/pci/vfio_pci_intrs.c | 188 +++++++----- drivers/vfio/platform/vfio_platform_irq.c | 106 ++++--- drivers/vfio/virqfd.c | 21 ++ drivers/video/fbdev/core/fbmon.c | 7 +- drivers/video/fbdev/via/accel.c | 4 +- drivers/virtio/virtio.c | 10 +- drivers/xen/events/events_base.c | 5 +- fs/aio.c | 8 +- fs/btrfs/export.c | 9 +- fs/btrfs/ioctl.c | 25 +- fs/btrfs/send.c | 10 +- fs/btrfs/volumes.c | 14 +- fs/exec.c | 1 + fs/ext4/mballoc.c | 17 +- fs/ext4/resize.c | 3 +- fs/fat/nfs.c | 6 + fs/fuse/dev.c | 83 +++--- fs/fuse/fuse_i.h | 6 +- fs/fuse/inode.c | 7 +- fs/fuse/virtio_fs.c | 8 +- fs/isofs/inode.c | 18 +- fs/nilfs2/alloc.c | 38 +-- fs/nilfs2/btree.c | 51 ++-- fs/nilfs2/cpfile.c | 10 +- fs/nilfs2/dat.c | 14 +- fs/nilfs2/direct.c | 23 +- fs/nilfs2/gcinode.c | 2 +- fs/nilfs2/ifile.c | 4 +- fs/nilfs2/inode.c | 31 +- fs/nilfs2/ioctl.c | 37 ++- fs/nilfs2/mdt.c | 2 +- fs/nilfs2/namei.c | 6 +- fs/nilfs2/nilfs.h | 9 + fs/nilfs2/page.c | 11 +- fs/nilfs2/recovery.c | 32 +- fs/nilfs2/segbuf.c | 2 +- fs/nilfs2/segment.c | 38 +-- fs/nilfs2/sufile.c | 29 +- fs/nilfs2/super.c | 57 ++-- fs/nilfs2/sysfs.c | 29 +- fs/nilfs2/the_nilfs.c | 85 +++--- fs/open.c | 38 ++- fs/sysv/itree.c | 10 +- fs/ubifs/file.c | 13 +- include/linux/firmware/meson/meson_sm.h | 15 +- include/linux/frame.h | 11 + include/linux/fs.h | 3 + include/linux/gfp.h | 9 + include/linux/sunrpc/sched.h | 2 +- include/linux/timer.h | 18 +- include/linux/vfio.h | 2 + include/net/erspan.h | 19 +- include/net/inet_connection_sock.h | 1 + include/net/sock.h | 7 + include/soc/fsl/qman.h | 9 + include/uapi/linux/input-event-codes.h | 1 + init/initramfs.c | 45 +-- kernel/bounds.c | 2 +- kernel/events/core.c | 9 + kernel/panic.c | 8 + kernel/power/suspend.c | 1 + kernel/printk/printk.c | 6 + kernel/time/timer.c | 160 ++++++---- kernel/trace/ring_buffer.c | 51 +++- mm/compaction.c | 7 +- mm/memory-failure.c | 2 +- mm/memory.c | 4 + mm/memtest.c | 4 +- mm/migrate.c | 6 +- mm/page_alloc.c | 10 +- mm/vmscan.c | 5 +- net/batman-adv/distributed-arp-table.c | 3 +- net/batman-adv/main.c | 14 +- net/bluetooth/hci_debugfs.c | 64 ++-- net/bluetooth/hci_event.c | 25 ++ net/core/sock_map.c | 6 + net/ipv4/inet_connection_sock.c | 14 + net/ipv4/ip_gre.c | 104 +++++-- net/ipv4/tcp.c | 2 + net/ipv6/ip6_fib.c | 14 +- net/ipv6/ip6_gre.c | 3 + net/mac80211/cfg.c | 5 +- net/netfilter/nf_tables_api.c | 74 ++++- net/nfc/nci/core.c | 5 + net/rds/rdma.c | 2 +- net/sched/act_skbmod.c | 10 +- net/xfrm/xfrm_user.c | 3 + scripts/Makefile.extrawarn | 2 + security/smack/smack_lsm.c | 12 +- sound/pci/hda/patch_realtek.c | 9 +- sound/sh/aica.c | 17 +- sound/soc/soc-ops.c | 2 +- tools/iio/iio_utils.c | 2 +- tools/objtool/Documentation/stack-validation.txt | 8 + tools/objtool/arch/x86/decode.c | 6 + tools/objtool/check.c | 64 +++- .../x86_energy_perf_policy.c | 1 + tools/testing/ktest/ktest.pl | 1 + tools/testing/selftests/mqueue/setting | 1 + tools/testing/selftests/net/reuseaddr_conflict.c | 2 +- virt/kvm/async_pf.c | 31 +- 211 files changed, 2599 insertions(+), 1489 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/215 Documentation/hw-vuln: Update spectre doc
5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lin Yujun <[email protected]>
commit 06cb31cc761823ef444ba4e1df11347342a6e745 upstream.
commit 7c693f54c873691 ("x86/speculation: Add spectre_v2=ibrs option to support Kernel IBRS")
adds the "ibrs " option in Documentation/admin-guide/kernel-parameters.txt but omits it to Documentation/admin-guide/hw-vuln/spectre.rst, add it.
--- Documentation/admin-guide/hw-vuln/spectre.rst | 1 + 1 file changed, 1 insertion(+)
Documentation/admin-guide/hw-vuln/spectre.rst +1 -0
@@ -625,6 +625,7 @@ kernel command line. eibrs enhanced IBRS eibrs,retpoline enhanced IBRS + Retpolines eibrs,lfence enhanced IBRS + LFENCE + ibrs use IBRS to protect kernel Not specifying this option is equivalent to spectre_v2=auto.
Greg Kroah-Hartman
maintainerPATCH 2/215 x86/cpu: Support AMD Automatic IBRS
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kim Phillips <[email protected]>
commit e7862eda309ecfccc36bb5558d937ed3ace07f3f upstream.
The AMD Zen4 core supports a new feature called Automatic IBRS.
It is a "set-and-forget" feature that means that, like Intel's Enhanced IBRS, h/w manages its IBRS mitigation resources automatically across CPL transitions.
The feature is advertised by CPUID_Fn80000021_EAX bit 8 and is enabled by setting MSR C000_0080 (EFER) bit 21.
Enable Automatic IBRS by default if the CPU feature is present. It typically provides greater performance over the incumbent generic retpolines mitigation.
Reuse the SPECTRE_V2_EIBRS spectre_v2_mitigation enum. AMD Automatic IBRS and Intel Enhanced IBRS have similar enablement. Add NO_EIBRS_PBRSB to cpu_vuln_whitelist, since AMD Automatic IBRS isn't affected by PBRSB-eIBRS.
The kernel command line option spectre_v2=eibrs is used to select AMD Automatic IBRS, if available.
--- Documentation/admin-guide/hw-vuln/spectre.rst | 6 +++--- Documentation/admin-guide/kernel-parameters.txt | 6 +++--- arch/x86/include/asm/cpufeatures.h | 2 ++ arch/x86/include/asm/msr-index.h | 2 ++ arch/x86/kernel/cpu/bugs.c | 20 ++++++++++++-------- arch/x86/kernel/cpu/common.c | 19 +++++++++++-------- 6 files changed, 33 insertions(+), 22 deletions(-)
Documentation/admin-guide/hw-vuln/spectre.rst +3 -3
@@ -622,9 +622,9 @@ kernel command line. retpoline,generic Retpolines retpoline,lfence LFENCE; indirect branch retpoline,amd alias for retpoline,lfence - eibrs enhanced IBRS - eibrs,retpoline enhanced IBRS + Retpolines - eibrs,lfence enhanced IBRS + LFENCE + eibrs Enhanced/Auto IBRS + eibrs,retpoline Enhanced/Auto IBRS + Retpolines + eibrs,lfence Enhanced/Auto IBRS + LFENCE ibrs use IBRS to protect kernel Not specifying this option is equivalent to
Documentation/admin-guide/kernel-parameters.txt +3 -3
@@ -4600,9 +4600,9 @@ retpoline,generic - Retpolines retpoline,lfence - LFENCE; indirect branch retpoline,amd - alias for retpoline,lfence - eibrs - enhanced IBRS - eibrs,retpoline - enhanced IBRS + Retpolines - eibrs,lfence - enhanced IBRS + LFENCE + eibrs - Enhanced/Auto IBRS + eibrs,retpoline - Enhanced/Auto IBRS + Retpolines + eibrs,lfence - Enhanced/Auto IBRS + LFENCE ibrs - use IBRS to protect kernel Not specifying this option is equivalent to
arch/x86/include/asm/cpufeatures.h +2 -0
@@ -382,6 +382,8 @@#define X86_FEATURE_SEV_ES (19*32+ 3)/* AMD Secure Encrypted Virtualization - Encrypted State */ #define X86_FEATURE_SME_COHERENT (19*32+10)/* "" AMD hardware-enforced cache coherency */ +#define X86_FEATURE_AUTOIBRS (20*32+ 8)/* "" Automatic IBRS */ +/* * BUG word(s) */
arch/x86/include/asm/msr-index.h +2 -0
@@ -30,6 +30,7 @@#define _EFER_SVME 12/* Enable virtualization */ #define _EFER_LMSLE 13/* Long Mode Segment Limit Enable */ #define _EFER_FFXSR 14/* Enable Fast FXSAVE/FXRSTOR */ +#define _EFER_AUTOIBRS 21/* Enable Automatic IBRS */ #define EFER_SCE (1<<_EFER_SCE)#define EFER_LME (1<<_EFER_LME)
@@ -38,6 +39,7 @@#define EFER_SVME (1<<_EFER_SVME)#define EFER_LMSLE (1<<_EFER_LMSLE)#define EFER_FFXSR (1<<_EFER_FFXSR) +#define EFER_AUTOIBRS (1<<_EFER_AUTOIBRS)/* Intel MSRs. Some also available on other CPUs */
arch/x86/kernel/cpu/bugs.c +12 -8
@@ -1187,9 +1187,9 @@ static const char * const spectre_v2_str [SPECTRE_V2_NONE] = "Vulnerable", [SPECTRE_V2_RETPOLINE] = "Mitigation: Retpolines", [SPECTRE_V2_LFENCE] = "Mitigation: LFENCE", - [SPECTRE_V2_EIBRS] = "Mitigation: Enhanced IBRS", - [SPECTRE_V2_EIBRS_LFENCE] = "Mitigation: Enhanced IBRS + LFENCE", - [SPECTRE_V2_EIBRS_RETPOLINE] = "Mitigation: Enhanced IBRS + Retpolines", + [SPECTRE_V2_EIBRS] = "Mitigation: Enhanced / Automatic IBRS", + [SPECTRE_V2_EIBRS_LFENCE] = "Mitigation: Enhanced / Automatic IBRS + LFENCE", + [SPECTRE_V2_EIBRS_RETPOLINE] = "Mitigation: Enhanced / Automatic IBRS + Retpolines", [SPECTRE_V2_IBRS] = "Mitigation: IBRS", };
@@ -1258,7 +1258,7 @@ static enum spectre_v2_mitigation_cmd __ cmd == SPECTRE_V2_CMD_EIBRS_LFENCE || cmd == SPECTRE_V2_CMD_EIBRS_RETPOLINE) && !boot_cpu_has(X86_FEATURE_IBRS_ENHANCED)) { -pr_err ("%s selected but CPU doesn't have eIBRS. Switching to AUTO select\n" , +pr_err ("%s selected but CPU doesn't have Enhanced or Automatic IBRS. Switching to AUTO select\n" , mitigation_options[i].option);return SPECTRE_V2_CMD_AUTO ; }
@@ -1436,8 +1436,12 @@ static void __init spectre_v2_select_mitpr_err (SPECTRE_V2_EIBRS_EBPF_MSG );if (spectre_v2_in_ibrs_mode (mode)) { - x86_spec_ctrl_base |=SPEC_CTRL_IBRS ; -update_spec_ctrl (x86_spec_ctrl_base); +if (boot_cpu_has (X86_FEATURE_AUTOIBRS )) { +msr_set_bit (MSR_EFER , _EFER_AUTOIBRS); + }else { + x86_spec_ctrl_base |=SPEC_CTRL_IBRS ; +update_spec_ctrl (x86_spec_ctrl_base); + } }switch (mode) {
@@ -1521,8 +1525,8 @@ static void __init spectre_v2_select_mit/* * Retpoline protects the kernel, but doesn't protect firmware. IBRS * and Enhanced IBRS protect firmware too, so enable IBRS around -* firmware calls only when IBRS / Enhanced IBRS aren't otherwise -* enabled. +* firmware calls only when IBRS / Enhanced / Automatic IBRS aren't +* otherwise enabled. * * Use "mode" to check Enhanced IBRS instead of boot_cpu_has(), because * the user might select retpoline on the kernel command line and if
arch/x86/kernel/cpu/common.c +11 -8
@@ -1100,8 +1100,8 @@ static const __initconst struct x86_cpu_VULNWL_AMD (0x12 ,NO_MELTDOWN |NO_SSB |NO_L1TF |NO_MDS |NO_SWAPGS |NO_ITLB_MULTIHIT |NO_MMIO ),/* FAMILY_ANY must be last, otherwise 0x0f - 0x12 matches won't work */ -VULNWL_AMD (X86_FAMILY_ANY ,NO_MELTDOWN |NO_L1TF |NO_MDS |NO_SWAPGS |NO_ITLB_MULTIHIT |NO_MMIO ), -VULNWL_HYGON (X86_FAMILY_ANY ,NO_MELTDOWN |NO_L1TF |NO_MDS |NO_SWAPGS |NO_ITLB_MULTIHIT |NO_MMIO ), +VULNWL_AMD (X86_FAMILY_ANY ,NO_MELTDOWN |NO_L1TF |NO_MDS |NO_SWAPGS |NO_ITLB_MULTIHIT |NO_MMIO |NO_EIBRS_PBRSB ), +VULNWL_HYGON (X86_FAMILY_ANY ,NO_MELTDOWN |NO_L1TF |NO_MDS |NO_SWAPGS |NO_ITLB_MULTIHIT |NO_MMIO |NO_EIBRS_PBRSB ),/* Zhaoxin Family 7 */ VULNWL(CENTAUR, 7, X86_MODEL_ANY, NO_SPECTRE_V2 | NO_MMIO),
@@ -1220,8 +1220,16 @@ static void __init cpu_set_bug_bits(stru !cpu_has(c, X86_FEATURE_AMD_SSB_NO))setup_force_cpu_bug (X86_BUG_SPEC_STORE_BYPASS ); -if (ia32_cap &ARCH_CAP_IBRS_ALL ) +/* +* AMD's AutoIBRS is equivalent to Intel's eIBRS - use the Intel feature +* flag and protect from vendor-specific bugs via the whitelist. +*/ +if ((ia32_cap &ARCH_CAP_IBRS_ALL ) ||cpu_has (c,X86_FEATURE_AUTOIBRS )) {setup_force_cpu_cap (X86_FEATURE_IBRS_ENHANCED ); +if (!cpu_matches (cpu_vuln_whitelist,NO_EIBRS_PBRSB ) && + !(ia32_cap &ARCH_CAP_PBRSB_NO )) +setup_force_cpu_bug (X86_BUG_EIBRS_PBRSB ); + }if (!cpu_matches (cpu_vuln_whitelist,NO_MDS ) && !(ia32_cap &ARCH_CAP_MDS_NO )) {
@@ -1283,11 +1291,6 @@ static void __init cpu_set_bug_bits(strusetup_force_cpu_bug (X86_BUG_RETBLEED ); } -if (cpu_has (c,X86_FEATURE_IBRS_ENHANCED ) && - !cpu_matches (cpu_vuln_whitelist,NO_EIBRS_PBRSB ) && - !(ia32_cap &ARCH_CAP_PBRSB_NO )) -setup_force_cpu_bug (X86_BUG_EIBRS_PBRSB ); -/* * Check if CPU is vulnerable to GDS. If running in a virtual machine on * an affected processor, the VMM may have disabled the use of GATHER by
Greg Kroah-Hartman
maintainerPATCH 3/215 x86/bugs: Use sysfs_emit()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Borislav Petkov <[email protected]>
commit 1d30800c0c0ae1d086ffad2bdf0ba4403370f132 upstream.
Those mitigations are very talkative; use the printing helper which pays attention to the buffer size.
--- arch/x86/kernel/cpu/bugs.c | 82 ++++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 41 deletions(-)
arch/x86/kernel/cpu/bugs.c +41 -41
@@ -2148,69 +2148,69 @@ static const char * const l1tf_vmx_statestatic ssize_t l1tf_show_state (char *buf) {if (l1tf_vmx_mitigation ==VMENTER_L1D_FLUSH_AUTO ) -return sprintf (buf,"%s\n" ,L1TF_DEFAULT_MSG ); +return sysfs_emit (buf,"%s\n" ,L1TF_DEFAULT_MSG );if (l1tf_vmx_mitigation ==VMENTER_L1D_FLUSH_EPT_DISABLED || (l1tf_vmx_mitigation ==VMENTER_L1D_FLUSH_NEVER &&sched_smt_active ())) { -return sprintf (buf,"%s; VMX: %s\n" ,L1TF_DEFAULT_MSG , - l1tf_vmx_states[l1tf_vmx_mitigation]); +return sysfs_emit (buf,"%s; VMX: %s\n" ,L1TF_DEFAULT_MSG , + l1tf_vmx_states[l1tf_vmx_mitigation]); } -return sprintf (buf,"%s; VMX: %s, SMT %s\n" ,L1TF_DEFAULT_MSG , - l1tf_vmx_states[l1tf_vmx_mitigation], -sched_smt_active () ?"vulnerable" :"disabled" ); +return sysfs_emit (buf,"%s; VMX: %s, SMT %s\n" ,L1TF_DEFAULT_MSG , + l1tf_vmx_states[l1tf_vmx_mitigation], +sched_smt_active () ?"vulnerable" :"disabled" ); }static ssize_t itlb_multihit_show_state (char *buf) {if (itlb_multihit_kvm_mitigation) -return sprintf (buf,"KVM: Mitigation: Split huge pages\n" ); +return sysfs_emit (buf,"KVM: Mitigation: Split huge pages\n" );else -return sprintf (buf,"KVM: Vulnerable\n" ); +return sysfs_emit (buf,"KVM: Vulnerable\n" ); }#else static ssize_t l1tf_show_state (char *buf) { -return sprintf (buf,"%s\n" ,L1TF_DEFAULT_MSG ); +return sysfs_emit (buf,"%s\n" ,L1TF_DEFAULT_MSG ); }static ssize_t itlb_multihit_show_state (char *buf) { -return sprintf (buf,"Processor vulnerable\n" ); +return sysfs_emit (buf,"Processor vulnerable\n" ); }#endif static ssize_t mds_show_state (char *buf) {if (boot_cpu_has (X86_FEATURE_HYPERVISOR )) { -return sprintf (buf,"%s; SMT Host state unknown\n" , - mds_strings[mds_mitigation]); +return sysfs_emit (buf,"%s; SMT Host state unknown\n" , + mds_strings[mds_mitigation]); }if (boot_cpu_has (X86_BUG_MSBDS_ONLY )) { -return sprintf (buf,"%s; SMT %s\n" , mds_strings[mds_mitigation], - (mds_mitigation ==MDS_MITIGATION_OFF ?"vulnerable" : -sched_smt_active () ?"mitigated" :"disabled" )); +return sysfs_emit (buf,"%s; SMT %s\n" , mds_strings[mds_mitigation], + (mds_mitigation ==MDS_MITIGATION_OFF ?"vulnerable" : +sched_smt_active () ?"mitigated" :"disabled" )); } -return sprintf (buf,"%s; SMT %s\n" , mds_strings[mds_mitigation], -sched_smt_active () ?"vulnerable" :"disabled" ); +return sysfs_emit (buf,"%s; SMT %s\n" , mds_strings[mds_mitigation], +sched_smt_active () ?"vulnerable" :"disabled" ); }static ssize_t tsx_async_abort_show_state (char *buf) {if ((taa_mitigation ==TAA_MITIGATION_TSX_DISABLED ) || (taa_mitigation ==TAA_MITIGATION_OFF )) -return sprintf (buf,"%s\n" , taa_strings[taa_mitigation]); +return sysfs_emit (buf,"%s\n" , taa_strings[taa_mitigation]);if (boot_cpu_has (X86_FEATURE_HYPERVISOR )) { -return sprintf (buf,"%s; SMT Host state unknown\n" , - taa_strings[taa_mitigation]); +return sysfs_emit (buf,"%s; SMT Host state unknown\n" , + taa_strings[taa_mitigation]); } -return sprintf (buf,"%s; SMT %s\n" , taa_strings[taa_mitigation], -sched_smt_active () ?"vulnerable" :"disabled" ); +return sysfs_emit (buf,"%s; SMT %s\n" , taa_strings[taa_mitigation], +sched_smt_active () ?"vulnerable" :"disabled" ); }static ssize_t mmio_stale_data_show_state (char *buf)
@@ -2278,33 +2278,33 @@ static char *pbrsb_eibrs_state(void)static ssize_t spectre_v2_show_state (char *buf) {if (spectre_v2_enabled ==SPECTRE_V2_LFENCE ) -return sprintf (buf,"Vulnerable: LFENCE\n" ); +return sysfs_emit (buf,"Vulnerable: LFENCE\n" );if (spectre_v2_enabled ==SPECTRE_V2_EIBRS &&unprivileged_ebpf_enabled ()) -return sprintf (buf,"Vulnerable: eIBRS with unprivileged eBPF\n" ); +return sysfs_emit (buf,"Vulnerable: eIBRS with unprivileged eBPF\n" );if (sched_smt_active () &&unprivileged_ebpf_enabled () && spectre_v2_enabled ==SPECTRE_V2_EIBRS_LFENCE ) -return sprintf (buf,"Vulnerable: eIBRS+LFENCE with unprivileged eBPF and SMT\n" ); +return sysfs_emit (buf,"Vulnerable: eIBRS+LFENCE with unprivileged eBPF and SMT\n" ); -return sprintf (buf,"%s%s%s%s%s%s%s\n" , - spectre_v2_strings[spectre_v2_enabled], -ibpb_state (), -boot_cpu_has (X86_FEATURE_USE_IBRS_FW ) ?", IBRS_FW" :"" , -stibp_state (), -boot_cpu_has (X86_FEATURE_RSB_CTXSW ) ?", RSB filling" :"" , -pbrsb_eibrs_state (), -spectre_v2_module_string ()); +return sysfs_emit (buf,"%s%s%s%s%s%s%s\n" , + spectre_v2_strings[spectre_v2_enabled], +ibpb_state (), +boot_cpu_has (X86_FEATURE_USE_IBRS_FW ) ?", IBRS_FW" :"" , +stibp_state (), +boot_cpu_has (X86_FEATURE_RSB_CTXSW ) ?", RSB filling" :"" , +pbrsb_eibrs_state (), +spectre_v2_module_string ()); }static ssize_t srbds_show_state (char *buf) { -return sprintf (buf,"%s\n" , srbds_strings[srbds_mitigation]); +return sysfs_emit (buf,"%s\n" , srbds_strings[srbds_mitigation]); }static ssize_t retbleed_show_state (char *buf) { -return sprintf (buf,"%s\n" , retbleed_strings[retbleed_mitigation]); +return sysfs_emit (buf,"%s\n" , retbleed_strings[retbleed_mitigation]); }static ssize_t gds_show_state (char *buf)
@@ -2316,26 +2316,26 @@ static ssize_t cpu_show_common(struct de char *buf, unsigned int bug) {if (!boot_cpu_has_bug (bug)) -return sprintf (buf,"Not affected\n" ); +return sysfs_emit (buf,"Not affected\n" );switch (bug) {case X86_BUG_CPU_MELTDOWN :if (boot_cpu_has (X86_FEATURE_PTI )) -return sprintf (buf,"Mitigation: PTI\n" ); +return sysfs_emit (buf,"Mitigation: PTI\n" );if (hypervisor_is_type (X86_HYPER_XEN_PV )) -return sprintf (buf,"Unknown (XEN PV detected, hypervisor mitigation required)\n" ); +return sysfs_emit (buf,"Unknown (XEN PV detected, hypervisor mitigation required)\n" );break ;case X86_BUG_SPECTRE_V1 : -return sprintf (buf,"%s\n" , spectre_v1_strings[spectre_v1_mitigation]); +return sysfs_emit (buf,"%s\n" , spectre_v1_strings[spectre_v1_mitigation]);case X86_BUG_SPECTRE_V2 :return spectre_v2_show_state (buf);case X86_BUG_SPEC_STORE_BYPASS : -return sprintf (buf,"%s\n" , ssb_strings[ssb_mode]); +return sysfs_emit (buf,"%s\n" , ssb_strings[ssb_mode]);case X86_BUG_L1TF :if (boot_cpu_has (X86_FEATURE_L1TF_PTEINV ))
@@ -2368,7 +2368,7 @@ static ssize_t cpu_show_common(struct debreak ; } -return sprintf (buf,"Vulnerable\n" ); +return sysfs_emit (buf,"Vulnerable\n" ); }ssize_t cpu_show_meltdown (struct device *dev,struct device_attribute *attr,char *buf)
Greg Kroah-Hartman
maintainerPATCH 4/215 timers: Update kernel-doc for various functions
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
[ Upstream commit 14f043f1340bf30bc60af127bff39f55889fef26 ]
The kernel-doc of timer related functions is partially uncomprehensible word salad. Rewrite it to make it useful.
Stable-dep-of: 0f7352557a35 ("wifi: brcmfmac: Fix use-after-free bug in brcmf_cfg80211_detach")
--- kernel/time/timer.c | 148 +++++++++++++++++++++++++++----------------- 1 file changed, 90 insertions(+), 58 deletions(-)
kernel/time/timer.c +90 -58
@@ -1072,14 +1072,16 @@ __mod_timer(struct timer_list *timer, unsigned long expires, unsigned int option }/** -* mod_timer_pending - modify a pending timer's timeout -* @timer: the pending timer to be modified -* @expires: new timeout in jiffies +* mod_timer_pending - Modify a pending timer's timeout +* @timer: The pending timer to be modified +* @expires: New absolute timeout in jiffies * -* mod_timer_pending() is the same for pending timers as mod_timer(), -* but will not re-activate and modify already deleted timers. +* mod_timer_pending() is the same for pending timers as mod_timer(), but +* will not activate inactive timers. * -* It is useful for unserialized use of timers. +* Return: +* * %0 - The timer was inactive and not modified +* * %1 - The timer was active and requeued to expire at @expires */ int mod_timer_pending (struct timer_list *timer,unsigned long expires) {
@@ -1088,24 +1090,27 @@ int mod_timer_pending(struct timer_list *timer, unsigned long expires)EXPORT_SYMBOL (mod_timer_pending);/** -* mod_timer - modify a timer's timeout -* @timer: the timer to be modified -* @expires: new timeout in jiffies -* -* mod_timer() is a more efficient way to update the expire field of an -* active timer (if the timer is inactive it will be activated) +* mod_timer - Modify a timer's timeout +* @timer: The timer to be modified +* @expires: New absolute timeout in jiffies * * mod_timer(timer, expires) is equivalent to: * * del_timer(timer); timer->expires = expires; add_timer(timer); * +* mod_timer() is more efficient than the above open coded sequence. In +* case that the timer is inactive, the del_timer() part is a NOP. The +* timer is in any case activated with the new expiry time @expires. +* * Note that if there are multiple unserialized concurrent users of the * same timer, then mod_timer() is the only safe way to modify the timeout, * since add_timer() cannot modify an already running timer. * -* The function returns whether it has modified a pending timer or not. -* (ie. mod_timer() of an inactive timer returns 0, mod_timer() of an -* active timer returns 1.) +* Return: +* * %0 - The timer was inactive and started +* * %1 - The timer was active and requeued to expire at @expires or +* the timer was active and not modified because @expires did +* not change the effective expiry time */ int mod_timer (struct timer_list *timer,unsigned long expires) {
@@ -1116,11 +1121,18 @@ EXPORT_SYMBOL(mod_timer);/** * timer_reduce - Modify a timer's timeout if it would reduce the timeout * @timer: The timer to be modified -* @expires: New timeout in jiffies +* @expires: New absolute timeout in jiffies * * timer_reduce() is very similar to mod_timer(), except that it will only -* modify a running timer if that would reduce the expiration time (it will -* start a timer that isn't running). +* modify an enqueued timer if that would reduce the expiration time. If +* @timer is not enqueued it starts the timer. +* +* Return: +* * %0 - The timer was inactive and started +* * %1 - The timer was active and requeued to expire at @expires or +* the timer was active and not modified because @expires +* did not change the effective expiry time such that the +* timer would expire earlier than already scheduled */ int timer_reduce (struct timer_list *timer,unsigned long expires) {
@@ -1129,18 +1141,21 @@ int timer_reduce(struct timer_list *timer, unsigned long expires)EXPORT_SYMBOL (timer_reduce);/** -* add_timer - start a timer -* @timer: the timer to be added +* add_timer - Start a timer +* @timer: The timer to be started * -* The kernel will do a ->function(@timer) callback from the -* timer interrupt at the ->expires point in the future. The -* current time is 'jiffies'. +* Start @timer to expire at @timer->expires in the future. @timer->expires +* is the absolute expiry time measured in 'jiffies'. When the timer expires +* timer->function(timer) will be invoked from soft interrupt context. * -* The timer's ->expires, ->function fields must be set prior calling this -* function. +* The @timer->expires and @timer->function fields must be set prior +* to calling this function. +* +* If @timer->expires is already in the past @timer will be queued to +* expire at the next timer tick. * -* Timers with an ->expires field in the past will be executed in the next -* timer tick. +* This can only operate on an inactive timer. Attempts to invoke this on +* an active timer are rejected with a warning. */ void add_timer (struct timer_list *timer) {
@@ -1150,11 +1165,13 @@ void add_timer(struct timer_list *timer)EXPORT_SYMBOL (add_timer);/** -* add_timer_on - start a timer on a particular CPU -* @timer: the timer to be added -* @cpu: the CPU to start it on +* add_timer_on - Start a timer on a particular CPU +* @timer: The timer to be started +* @cpu: The CPU to start it on +* +* Same as add_timer() except that it starts the timer on the given CPU. * -* This is not very scalable on SMP. Double adds are not possible. +* See add_timer() for further details. */ void add_timer_on (struct timer_list *timer,int cpu) {
@@ -1189,15 +1206,18 @@ void add_timer_on(struct timer_list *timer, int cpu)EXPORT_SYMBOL_GPL (add_timer_on);/** -* del_timer - deactivate a timer. -* @timer: the timer to be deactivated -* -* del_timer() deactivates a timer - this works on both active and inactive -* timers. -* -* The function returns whether it has deactivated a pending timer or not. -* (ie. del_timer() of an inactive timer returns 0, del_timer() of an -* active timer returns 1.) +* del_timer - Deactivate a timer. +* @timer: The timer to be deactivated +* +* The function only deactivates a pending timer, but contrary to +* del_timer_sync() it does not take into account whether the timer's +* callback function is concurrently executed on a different CPU or not. +* It neither prevents rearming of the timer. If @timer can be rearmed +* concurrently then the return value of this function is meaningless. +* +* Return: +* * %0 - The timer was not pending +* * %1 - The timer was pending and deactivated */ int del_timer (struct timer_list *timer) {
@@ -1219,10 +1239,19 @@ EXPORT_SYMBOL(del_timer);/** * try_to_del_timer_sync - Try to deactivate a timer -* @timer: timer to delete +* @timer: Timer to deactivate +* +* This function tries to deactivate a timer. On success the timer is not +* queued and the timer callback function is not running on any CPU. * -* This function tries to deactivate a timer. Upon successful (ret >= 0) -* exit the timer is not queued and the handler is not running on any CPU. +* This function does not guarantee that the timer cannot be rearmed right +* after dropping the base lock. That needs to be prevented by the calling +* code if necessary. +* +* Return: +* * %0 - The timer was not pending +* * %1 - The timer was pending and deactivated +* * %-1 - The timer callback function is running on a different CPU */ int try_to_del_timer_sync (struct timer_list *timer) {
@@ -1318,23 +1347,19 @@ static inline void del_timer_wait_running(struct timer_list *timer) { }#if defined(CONFIG_SMP ) || defined(CONFIG_PREEMPT_RT )/** -* del_timer_sync - deactivate a timer and wait for the handler to finish. -* @timer: the timer to be deactivated -* -* This function only differs from del_timer() on SMP: besides deactivating -* the timer it also makes sure the handler has finished executing on other -* CPUs. +* del_timer_sync - Deactivate a timer and wait for the handler to finish. +* @timer: The timer to be deactivated * * Synchronization rules: Callers must prevent restarting of the timer, * otherwise this function is meaningless. It must not be called from * interrupt contexts unless the timer is an irqsafe one. The caller must -* not hold locks which would prevent completion of the timer's -* handler. The timer's handler must not call add_timer_on(). Upon exit the -* timer is not queued and the handler is not running on any CPU. +* not hold locks which would prevent completion of the timer's callback +* function. The timer's handler must not call add_timer_on(). Upon exit +* the timer is not queued and the handler is not running on any CPU. * -* Note: For !irqsafe timers, you must not hold locks that are held in -* interrupt context while calling this function. Even if the lock has -* nothing to do with the timer in question. Here's why:: +* For !irqsafe timers, the caller must not hold locks that are held in +* interrupt context. Even if the lock has nothing to do with the timer in +* question. Here's why:: * * CPU0 CPU1 * ---- ----
@@ -1348,10 +1373,17 @@ static inline void del_timer_wait_running(struct timer_list *timer) { }* while (base->running_timer == mytimer); * * Now del_timer_sync() will never return and never release somelock. -* The interrupt on the other CPU is waiting to grab somelock but -* it has interrupted the softirq that CPU0 is waiting to finish. +* The interrupt on the other CPU is waiting to grab somelock but it has +* interrupted the softirq that CPU0 is waiting to finish. +* +* This function cannot guarantee that the timer is not rearmed again by +* some concurrent or preempting code, right after it dropped the base +* lock. If there is the possibility of a concurrent rearm then the return +* value of the function is meaningless. * -* The function returns whether it has deactivated a pending timer or not. +* Return: +* * %0 - The timer was not pending +* * %1 - The timer was pending and deactivated */ int del_timer_sync (struct timer_list *timer) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 5/215 timers: Use del_timer_sync() even on UP
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
[ Upstream commit 168f6b6ffbeec0b9333f3582e4cf637300858db5 ]
del_timer_sync() is assumed to be pointless on uniprocessor systems and can be mapped to del_timer() because in theory del_timer() can never be invoked while the timer callback function is executed.
This is not entirely true because del_timer() can be invoked from interrupt context and therefore hit in the middle of a running timer callback.
Contrary to that del_timer_sync() is not allowed to be invoked from interrupt context unless the affected timer is marked with TIMER_IRQSAFE. del_timer_sync() has proper checks in place to detect such a situation.
Give up on the UP optimization and make del_timer_sync() unconditionally available.
Stable-dep-of: 0f7352557a35 ("wifi: brcmfmac: Fix use-after-free bug in brcmf_cfg80211_detach")
--- include/linux/timer.h | 7 +------ kernel/time/timer.c | 2 -- 2 files changed, 1 insertion(+), 8 deletions(-)
include/linux/timer.h +1 -6
@@ -182,12 +182,7 @@ extern int timer_reduce(struct timer_list *timer, unsigned long expires);extern void add_timer (struct timer_list *timer);extern int try_to_del_timer_sync (struct timer_list *timer); - -#if defined(CONFIG_SMP ) || defined(CONFIG_PREEMPT_RT ) -extern int del_timer_sync (struct timer_list *timer); -#else -# define del_timer_sync (t) del_timer(t) -#endif +extern int del_timer_sync (struct timer_list *timer);#define del_singleshot_timer_sync (t) del_timer_sync(t)
kernel/time/timer.c +0 -2
@@ -1345,7 +1345,6 @@ static inline void timer_sync_wait_running(struct timer_base *base) { }static inline void del_timer_wait_running (struct timer_list *timer) { }#endif -#if defined(CONFIG_SMP ) || defined(CONFIG_PREEMPT_RT )/** * del_timer_sync - Deactivate a timer and wait for the handler to finish. * @timer: The timer to be deactivated
@@ -1419,7 +1418,6 @@ int del_timer_sync(struct timer_list *timer)return ret; }EXPORT_SYMBOL (del_timer_sync); -#endif static void call_timer_fn(struct timer_list *timer, void (*fn)(struct timer_list *),
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 6/215 timers: Rename del_timer_sync() to timer_delete_sync()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
[ Upstream commit 9b13df3fb64ee95e2397585404e442afee2c7d4f ]
The timer related functions do not have a strict timer_ prefixed namespace which is really annoying.
Rename del_timer_sync() to timer_delete_sync() and provide del_timer_sync() as a wrapper. Document that del_timer_sync() is not for new code.
Stable-dep-of: 0f7352557a35 ("wifi: brcmfmac: Fix use-after-free bug in brcmf_cfg80211_detach")
--- include/linux/timer.h | 15 ++++++++++++++- kernel/time/timer.c | 18 +++++++++--------- 2 files changed, 23 insertions(+), 10 deletions(-)
include/linux/timer.h +14 -1
@@ -182,7 +182,20 @@ extern int timer_reduce(struct timer_list *timer, unsigned long expires);extern void add_timer (struct timer_list *timer);extern int try_to_del_timer_sync (struct timer_list *timer); -extern int del_timer_sync (struct timer_list *timer); +extern int timer_delete_sync (struct timer_list *timer); + +/** +* del_timer_sync - Delete a pending timer and wait for a running callback +* @timer: The timer to be deleted +* +* See timer_delete_sync() for detailed explanation. +* +* Do not use in new code. Use timer_delete_sync() instead. +*/ +static inline int del_timer_sync (struct timer_list *timer) +{ +return timer_delete_sync (timer); +}#define del_singleshot_timer_sync (t) del_timer_sync(t)
kernel/time/timer.c +9 -9
@@ -1031,7 +1031,7 @@ __mod_timer(struct timer_list *timer, unsigned long expires, unsigned int option/* * We are trying to schedule the timer on the new base. * However we can't change timer's base while it is running, -* otherwise del_timer_sync() can't detect that the timer's +* otherwise timer_delete_sync() can't detect that the timer's * handler yet has not finished. This also guarantees that the * timer is serialized wrt itself. */
@@ -1210,7 +1210,7 @@ EXPORT_SYMBOL_GPL(add_timer_on);* @timer: The timer to be deactivated * * The function only deactivates a pending timer, but contrary to -* del_timer_sync() it does not take into account whether the timer's +* timer_delete_sync() it does not take into account whether the timer's * callback function is concurrently executed on a different CPU or not. * It neither prevents rearming of the timer. If @timer can be rearmed * concurrently then the return value of this function is meaningless.
@@ -1346,7 +1346,7 @@ static inline void del_timer_wait_running(struct timer_list *timer) { }#endif /** -* del_timer_sync - Deactivate a timer and wait for the handler to finish. +* timer_delete_sync - Deactivate a timer and wait for the handler to finish. * @timer: The timer to be deactivated * * Synchronization rules: Callers must prevent restarting of the timer,
@@ -1368,10 +1368,10 @@ static inline void del_timer_wait_running(struct timer_list *timer) { }* spin_lock_irq(somelock); * <IRQ> * spin_lock(somelock); -* del_timer_sync(mytimer); +* timer_delete_sync(mytimer); * while (base->running_timer == mytimer); * -* Now del_timer_sync() will never return and never release somelock. +* Now timer_delete_sync() will never return and never release somelock. * The interrupt on the other CPU is waiting to grab somelock but it has * interrupted the softirq that CPU0 is waiting to finish. *
@@ -1384,7 +1384,7 @@ static inline void del_timer_wait_running(struct timer_list *timer) { }* * %0 - The timer was not pending * * %1 - The timer was pending and deactivated */ -int del_timer_sync (struct timer_list *timer) +int timer_delete_sync (struct timer_list *timer) {int ret;
@@ -1417,7 +1417,7 @@ int del_timer_sync(struct timer_list *timer)return ret; } -EXPORT_SYMBOL (del_timer_sync); +EXPORT_SYMBOL (timer_delete_sync); static void call_timer_fn(struct timer_list *timer, void (*fn)(struct timer_list *),
@@ -1439,8 +1439,8 @@ static void call_timer_fn(struct timer_list *timer,#endif /* * Couple the lock chain with the lock chain at -* del_timer_sync() by acquiring the lock_map around the fn() -* call here and in del_timer_sync(). +* timer_delete_sync() by acquiring the lock_map around the fn() +* call here and in timer_delete_sync(). */ lock_map_acquire (&lockdep_map);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 7/215 wifi: brcmfmac: Fix use-after-free bug in brcmf_cfg80211_detach
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zheng Wang <[email protected]>
[ Upstream commit 0f7352557a35ab7888bc7831411ec8a3cbe20d78 ]
This is the candidate patch of CVE-2023-47233 :
https://nvd.nist.gov/vuln/detail/CVE-2023-47233
In brcm80211 driver,it starts with the following invoking chain to start init a timeout worker:
->brcmf_usb_probe
->brcmf_usb_probe_cb
->brcmf_attach
->brcmf_bus_started
->brcmf_cfg80211_attach
->wl_init_priv
->brcmf_init_escan
->INIT_WORK(&cfg->escan_timeout_work,
brcmf_cfg80211_escan_timeout_worker);If we disconnect the USB by hotplug, it will call brcmf_usb_disconnect to make cleanup. The invoking chain is :
brcmf_usb_disconnect
->brcmf_usb_disconnect_cb
->brcmf_detach
->brcmf_cfg80211_detach
->kfree(cfg);While the timeout woker may still be running. This will cause a use-after-free bug on cfg in brcmf_cfg80211_escan_timeout_worker.
Fix it by deleting the timer and canceling the worker in brcmf_cfg80211_detach.
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +2 -2
@@ -710,8 +710,7 @@ s32 brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg, scan_request = cfg->scan_request; cfg->scan_request =NULL ; -if (timer_pending (&cfg->escan_timeout)) -del_timer_sync (&cfg->escan_timeout); +timer_delete_sync (&cfg->escan_timeout);if (fw_abort) {/* Do a scan abort to stop the driver's scan engine */
@@ -7240,6 +7239,7 @@ void brcmf_cfg80211_detach(struct brcmf_cfg80211_info *cfg)brcmf_btcoex_detach (cfg);wiphy_unregister (cfg->wiphy);wl_deinit_priv (cfg); +cancel_work_sync (&cfg->escan_timeout_work);brcmf_free_wiphy (cfg->wiphy);kfree (cfg); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 8/215 media: staging: ipu3-imgu: Set fields before media_entity_pads_init()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hidenori Kobayashi <[email protected]>
[ Upstream commit 87318b7092670d4086bfec115a0280a60c51c2dd ]
The imgu driver fails to probe with the following message because it does not set the pad's flags before calling media_entity_pads_init().
[ 14.596315] ipu3-imgu 0000:00:05.0: failed initialize subdev media entity (-22) [ 14.596322] ipu3-imgu 0000:00:05.0: failed to register subdev0 ret (-22) [ 14.596327] ipu3-imgu 0000:00:05.0: failed to register pipes (-22) [ 14.596331] ipu3-imgu 0000:00:05.0: failed to create V4L2 devices (-22)
Fix the initialization order so that the driver probe succeeds. The ops initialization is also moved together for readability.
--- drivers/staging/media/ipu3/ipu3-v4l2.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/staging/media/ipu3/ipu3-v4l2.c +8 -8
@@ -1115,6 +1115,11 @@ static int imgu_v4l2_subdev_register(struct imgu_device *imgu,struct imgu_media_pipe *imgu_pipe = &imgu->imgu_pipe[pipe];/* Initialize subdev media entity */ + imgu_sd->subdev.entity.ops = &imgu_media_ops; +for (i =0 ; i <IMGU_NODE_NUM ; i++) { + imgu_sd->subdev_pads[i].flags = imgu_pipe->nodes[i].output ? +MEDIA_PAD_FL_SINK :MEDIA_PAD_FL_SOURCE ; + } r =media_entity_pads_init (&imgu_sd->subdev.entity,IMGU_NODE_NUM , imgu_sd->subdev_pads);if (r) {
@@ -1122,11 +1127,6 @@ static int imgu_v4l2_subdev_register(struct imgu_device *imgu, "failed initialize subdev media entity (%d)\n", r);return r; } - imgu_sd->subdev.entity.ops = &imgu_media_ops; -for (i =0 ; i <IMGU_NODE_NUM ; i++) { - imgu_sd->subdev_pads[i].flags = imgu_pipe->nodes[i].output ? -MEDIA_PAD_FL_SINK :MEDIA_PAD_FL_SOURCE ; - }/* Initialize subdev */ v4l2_subdev_init (&imgu_sd->subdev, &imgu_subdev_ops);
@@ -1221,15 +1221,15 @@ static int imgu_v4l2_node_setup(struct imgu_device *imgu, unsigned int pipe, }/* Initialize media entities */ + node->vdev_pad.flags = node->output ? +MEDIA_PAD_FL_SOURCE :MEDIA_PAD_FL_SINK ; + vdev->entity.ops =NULL ; r =media_entity_pads_init (&vdev->entity,1 , &node->vdev_pad);if (r) {dev_err (dev,"failed initialize media entity (%d)\n" , r);mutex_destroy (&node->lock);return r; } - node->vdev_pad.flags = node->output ? -MEDIA_PAD_FL_SOURCE :MEDIA_PAD_FL_SINK ; - vdev->entity.ops =NULL ;/* Initialize vbq */ vbq->type = node->vdev_fmt.type;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 9/215 clk: qcom: gcc-sdm845: Add soft dependency on rpmhpd
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Amit Pundir <[email protected]>
[ Upstream commit 1d9054e3a4fd36e2949e616f7360bdb81bcc1921 ]
With the addition of RPMh power domain to the GCC node in device tree, we noticed a significant delay in getting the UFS driver probed on AOSP which futher led to mount failures because Android do not support rootwait. So adding a soft dependency on RPMh power domain which informs modprobe to load rpmhpd module before gcc-sdm845.
--- drivers/clk/qcom/gcc-sdm845.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/qcom/gcc-sdm845.c +1 -0
@@ -3646,3 +3646,4 @@ module_exit(gcc_sdm845_exit);MODULE_DESCRIPTION ("QTI GCC SDM845 Driver" );MODULE_LICENSE ("GPL v2" );MODULE_ALIAS ("platform:gcc-sdm845" ); +MODULE_SOFTDEP ("pre: rpmhpd" );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 10/215 smack: Set SMACK64TRANSMUTE only for dirs in smack_inode_setxattr()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roberto Sassu <[email protected]>
[ Upstream commit 9c82169208dde516510aaba6bbd8b13976690c5d ]
Since the SMACK64TRANSMUTE xattr makes sense only for directories, enforce this restriction in smack_inode_setxattr().
--- security/smack/smack_lsm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
security/smack/smack_lsm.c +2 -1
@@ -1290,7 +1290,8 @@ static int smack_inode_setxattr(struct dentry *dentry, const char *name, check_star =1 ; }else if (strcmp (name,XATTR_NAME_SMACKTRANSMUTE ) ==0 ) { check_priv =1 ; -if (size !=TRANS_TRUE_SIZE || +if (!S_ISDIR (d_backing_inode (dentry)->i_mode) || + size !=TRANS_TRUE_SIZE ||strncmp (value,TRANS_TRUE ,TRANS_TRUE_SIZE ) !=0 ) rc = -EINVAL ; }else
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 11/215 smack: Handle SMACK64TRANSMUTE in smack_inode_setsecurity()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roberto Sassu <[email protected]>
[ Upstream commit ac02f007d64eb2769d0bde742aac4d7a5fc6e8a5 ]
If the SMACK64TRANSMUTE xattr is provided, and the inode is a directory, update the in-memory inode flags by setting SMK_INODE_TRANSMUTE.
--- security/smack/smack_lsm.c | 9 +++++++++ 1 file changed, 9 insertions(+)
security/smack/smack_lsm.c +9 -0
@@ -2717,6 +2717,15 @@ static int smack_inode_setsecurity(struct inode *inode, const char *name,if (value ==NULL || size >SMK_LONGLABEL || size ==0 )return -EINVAL ; +if (strcmp (name,XATTR_SMACK_TRANSMUTE ) ==0 ) { +if (!S_ISDIR (inode->i_mode) || size !=TRANS_TRUE_SIZE || +strncmp (value,TRANS_TRUE ,TRANS_TRUE_SIZE ) !=0 ) +return -EINVAL ; + + nsp->smk_flags |=SMK_INODE_TRANSMUTE ; +return 0 ; + } + skp =smk_import_entry (value, size);if (IS_ERR (skp))return PTR_ERR (skp);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 12/215 ARM: dts: mmp2-brownstone: Dont redeclare phandle references
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lubomir Rintel <[email protected]>
[ Upstream commit 5a56cf3e8738f5d31d8c024d0c62a4c2bfe76fb2 ]
Extend the nodes by their phandle references instead of recreating the tree and declaring references of the same names.
Stable-dep-of: 831e0cd4f9ee ("arm: dts: marvell: Fix maxium->maxim typo in brownstone dts")
--- arch/arm/boot/dts/mmp2-brownstone.dts | 332 +++++++++++++------------- 1 file changed, 165 insertions(+), 167 deletions(-)
arch/arm/boot/dts/mmp2-brownstone.dts +165 -167
@@ -19,176 +19,174 @@ memory { device_type = "memory"; reg = <0x00000000 0x08000000>; }; +}; + +&uart3 { + status = "okay"; +}; - soc { - apb@d4000000 { - uart3: uart@d4018000 { - status = "okay"; - }; - twsi1: i2c@d4011000 { - status = "okay"; - pmic: max8925@3c { - compatible = "maxium,max8925"; - reg = <0x3c>; - interrupts = <1>; - interrupt-parent = <&intcmux4>; - interrupt-controller; - #interrupt-cells = <1>; - maxim,tsc-irq = <0>; +&twsi1 { + status = "okay"; + pmic: max8925@3c { + compatible = "maxium,max8925"; + reg = <0x3c>; + interrupts = <1>; + interrupt-parent = <&intcmux4>; + interrupt-controller; + #interrupt-cells = <1>; + maxim,tsc-irq = <0>; - regulators { - SDV1 { - regulator-min-microvolt = <637500>; - regulator-max-microvolt = <1425000>; - regulator-boot-on; - regulator-always-on; - }; - SDV2 { - regulator-min-microvolt = <650000>; - regulator-max-microvolt = <2225000>; - regulator-boot-on; - regulator-always-on; - }; - SDV3 { - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <3900000>; - regulator-boot-on; - regulator-always-on; - }; - LDO1 { - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <3900000>; - regulator-boot-on; - regulator-always-on; - }; - LDO2 { - regulator-min-microvolt = <650000>; - regulator-max-microvolt = <2250000>; - regulator-boot-on; - regulator-always-on; - }; - LDO3 { - regulator-min-microvolt = <650000>; - regulator-max-microvolt = <2250000>; - regulator-boot-on; - regulator-always-on; - }; - LDO4 { - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <3900000>; - regulator-boot-on; - regulator-always-on; - }; - LDO5 { - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <3900000>; - regulator-boot-on; - regulator-always-on; - }; - LDO6 { - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <3900000>; - regulator-boot-on; - regulator-always-on; - }; - LDO7 { - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <3900000>; - regulator-boot-on; - regulator-always-on; - }; - LDO8 { - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <3900000>; - regulator-boot-on; - regulator-always-on; - }; - LDO9 { - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <3900000>; - regulator-boot-on; - regulator-always-on; - }; - LDO10 { - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <3900000>; - }; - LDO11 { - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <3900000>; - regulator-boot-on; - regulator-always-on; - }; - LDO12 { - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <3900000>; - regulator-boot-on; - regulator-always-on; - }; - LDO13 { - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <3900000>; - regulator-boot-on; - regulator-always-on; - }; - LDO14 { - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <3900000>; - regulator-boot-on; - regulator-always-on; - }; - LDO15 { - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <3900000>; - regulator-boot-on; - regulator-always-on; - }; - LDO16 { - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <3900000>; - regulator-boot-on; - regulator-always-on; - }; - LDO17 { - regulator-min-microvolt = <650000>; - regulator-max-microvolt = <2250000>; - regulator-boot-on; - regulator-always-on; - }; - LDO18 { - regulator-min-microvolt = <650000>; - regulator-max-microvolt = <2250000>; - regulator-boot-on; - regulator-always-on; - }; - LDO19 { - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <3900000>; - regulator-boot-on; - regulator-always-on; - }; - LDO20 { - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <3900000>; - regulator-boot-on; - regulator-always-on; - }; - }; - backlight { - maxim,max8925-dual-string = <0>; - }; - charger { - batt-detect = <0>; - topoff-threshold = <1>; - fast-charge = <7>; - no-temp-support = <0>; - no-insert-detect = <0>; - }; - }; - }; - rtc: rtc@d4010000 { - status = "okay"; + regulators { + SDV1 { + regulator-min-microvolt = <637500>; + regulator-max-microvolt = <1425000>; + regulator-boot-on; + regulator-always-on; + }; + SDV2 { + regulator-min-microvolt = <650000>; + regulator-max-microvolt = <2225000>; + regulator-boot-on; + regulator-always-on; + }; + SDV3 { + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <3900000>; + regulator-boot-on; + regulator-always-on; + }; + LDO1 { + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <3900000>; + regulator-boot-on; + regulator-always-on; + }; + LDO2 { + regulator-min-microvolt = <650000>; + regulator-max-microvolt = <2250000>; + regulator-boot-on; + regulator-always-on; + }; + LDO3 { + regulator-min-microvolt = <650000>; + regulator-max-microvolt = <2250000>; + regulator-boot-on; + regulator-always-on; + }; + LDO4 { + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <3900000>; + regulator-boot-on; + regulator-always-on; + }; + LDO5 { + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <3900000>; + regulator-boot-on; + regulator-always-on; + }; + LDO6 { + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <3900000>; + regulator-boot-on; + regulator-always-on; + }; + LDO7 { + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <3900000>; + regulator-boot-on; + regulator-always-on; + }; + LDO8 { + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <3900000>; + regulator-boot-on; + regulator-always-on; + }; + LDO9 { + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <3900000>; + regulator-boot-on; + regulator-always-on; + }; + LDO10 { + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <3900000>; }; + LDO11 { + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <3900000>; + regulator-boot-on; + regulator-always-on; + }; + LDO12 { + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <3900000>; + regulator-boot-on; + regulator-always-on; + }; + LDO13 { + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <3900000>; + regulator-boot-on; + regulator-always-on; + }; + LDO14 { + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <3900000>; + regulator-boot-on; + regulator-always-on; + }; + LDO15 { + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <3900000>; + regulator-boot-on; + regulator-always-on; + }; + LDO16 { + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <3900000>; + regulator-boot-on; + regulator-always-on; + }; + LDO17 { + regulator-min-microvolt = <650000>; + regulator-max-microvolt = <2250000>; + regulator-boot-on; + regulator-always-on; + }; + LDO18 { + regulator-min-microvolt = <650000>; + regulator-max-microvolt = <2250000>; + regulator-boot-on; + regulator-always-on; + }; + LDO19 { + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <3900000>; + regulator-boot-on; + regulator-always-on; + }; + LDO20 { + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <3900000>; + regulator-boot-on; + regulator-always-on; + }; + }; + backlight { + maxim,max8925-dual-string = <0>; + }; + charger { + batt-detect = <0>; + topoff-threshold = <1>; + fast-charge = <7>; + no-temp-support = <0>; + no-insert-detect = <0>; }; }; }; + +&rtc { + status = "okay"; +};
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 13/215 arm: dts: marvell: Fix maxium->maxim typo in brownstone dts
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Duje Mihanović <[email protected]>
[ Upstream commit 831e0cd4f9ee15a4f02ae10b67e7fdc10eb2b4fc ]
Fix an obvious spelling error in the PMIC compatible in the MMP2 Brownstone DTS file.
[krzysztof: Just 10 years to take a patch, not bad! Rephrased commit
msg]
--- arch/arm/boot/dts/mmp2-brownstone.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/mmp2-brownstone.dts +1 -1
@@ -28,7 +28,7 @@ &uart3 { &twsi1 { status = "okay"; pmic: max8925@3c { - compatible = "maxium,max8925"; + compatible = "maxim,max8925"; reg = <0x3c>; interrupts = <1>; interrupt-parent = <&intcmux4>;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 14/215 serial: max310x: fix NULL pointer dereference in I2C instantiation
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hugo Villeneuve <[email protected]>
[ Upstream commit 0d27056c24efd3d63a03f3edfbcfc4827086b110 ]
When trying to instantiate a max14830 device from userspace:
echo max14830 0x60 > /sys/bus/i2c/devices/i2c-2/new_device
we get the following error:
Unable to handle kernel NULL pointer dereference at virtual address...
...
Call trace:
max310x_i2c_probe+0x48/0x170 [max310x]
i2c_device_probe+0x150/0x2a0
...Add check for validity of devtype to prevent the error, and abort probe with a meaningful error message.
--- drivers/tty/serial/max310x.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/tty/serial/max310x.c +5 -2
@@ -1636,13 +1636,16 @@ static unsigned short max310x_i2c_slave_addr(unsigned short addr,static int max310x_i2c_probe (struct i2c_client *client) { -const struct max310x_devtype *devtype = -device_get_match_data (&client->dev); +const struct max310x_devtype *devtype;struct i2c_client *port_client;struct regmap *regmaps[4 ];unsigned int i;u8 port_addr; + devtype =device_get_match_data (&client->dev); +if (!devtype) +return dev_err_probe (&client->dev, -ENODEV ,"Failed to match device\n" ); +if (client->addr < devtype->slave_addr.min || client->addr > devtype->slave_addr.max) return dev_err_probe(&client->dev, -EINVAL,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 15/215 media: xc4000: Fix atomicity violation in xc4000_get_frequency
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gui-Dong Han <[email protected]>
[ Upstream commit 36d503ad547d1c75758a6fcdbec2806f1b6aeb41 ]
In xc4000_get_frequency():
*freq = priv->freq_hz + priv->freq_offset;
The code accesses priv->freq_hz and priv->freq_offset without holding any lock.
In xc4000_set_params():
// Code that updates priv->freq_hz and priv->freq_offset ...
xc4000_get_frequency() and xc4000_set_params() may execute concurrently, risking inconsistent reads of priv->freq_hz and priv->freq_offset. Since these related data may update during reading, it can result in incorrect frequency calculation, leading to atomicity violations.
This possible bug is found by an experimental static analysis tool developed by our team, BassCheck[1]. This tool analyzes the locking APIs to extract function pairs that can be concurrently executed, and then analyzes the instructions in the paired functions to identify possible concurrency bugs including data races and atomicity violations. The above possible bug is reported when our tool analyzes the source code of Linux 6.2.
To address this issue, it is proposed to add a mutex lock pair in xc4000_get_frequency() to ensure atomicity. With this patch applied, our tool no longer reports the possible bug, with the kernel configuration allyesconfig for x86_64. Due to the lack of associated hardware, we cannot test the patch in runtime testing, and just verify it according to the code logic.
[1] https://sites.google.com/view/basscheck/
--- drivers/media/tuners/xc4000.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/tuners/xc4000.c +2 -2
@@ -1517,10 +1517,10 @@ static int xc4000_get_frequency(struct dvb_frontend *fe, u32 *freq) {struct xc4000_priv *priv = fe->tuner_priv; +mutex_lock (&priv->lock); *freq = priv->freq_hz + priv->freq_offset;if (debug) { -mutex_lock (&priv->lock);if ((priv->cur_fw.type & (BASE |FM |DTV6 |DTV7 |DTV78 |DTV8 )) ==BASE ) {u16 snr =0 ;
@@ -1531,8 +1531,8 @@ static int xc4000_get_frequency(struct dvb_frontend *fe, u32 *freq)return 0 ; } } -mutex_unlock (&priv->lock); } +mutex_unlock (&priv->lock);dprintk (1 ,"%s()\n" , __func__);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 16/215 KVM: Always flush async #PF workqueue when vCPU is being destroyed
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
[ Upstream commit 3d75b8aa5c29058a512db29da7cbee8052724157 ]
Always flush the per-vCPU async #PF workqueue when a vCPU is clearing its completion queue, e.g. when a VM and all its vCPUs is being destroyed. KVM must ensure that none of its workqueue callbacks is running when the last reference to the KVM _module_ is put. Gifting a reference to the associated VM prevents the workqueue callback from dereferencing freed vCPU/VM memory, but does not prevent the KVM module from being unloaded before the callback completes.
Drop the misguided VM refcount gifting, as calling kvm_put_kvm() from async_pf_execute() if kvm_put_kvm() flushes the async #PF workqueue will result in deadlock. async_pf_execute() can't return until kvm_put_kvm() finishes, and kvm_put_kvm() can't return until async_pf_execute() finishes:
WARNING: CPU: 8 PID: 251 at virt/kvm/kvm_main.c:1435 kvm_put_kvm+0x2d/0x320 [kvm]
Modules linked in: vhost_net vhost vhost_iotlb tap kvm_intel kvm irqbypass
CPU: 8 PID: 251 Comm: kworker/8:1 Tainted: G W 6.6.0-rc1-e7af8d17224a-x86/gmem-vm #119
Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 0.0.0 02/06/2015
Workqueue: events async_pf_execute [kvm]
RIP: 0010:kvm_put_kvm+0x2d/0x320 [kvm]
Call Trace:
<TASK>
async_pf_execute+0x198/0x260 [kvm]
process_one_work+0x145/0x2d0
worker_thread+0x27e/0x3a0
kthread+0xba/0xe0
ret_from_fork+0x2d/0x50
ret_from_fork_asm+0x11/0x20
</TASK>
---[ end trace 0000000000000000 ]---
INFO: task kworker/8:1:251 blocked for more than 120 seconds.
Tainted: G W 6.6.0-rc1-e7af8d17224a-x86/gmem-vm #119
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
task:kworker/8:1 state:D stack:0 pid:251 ppid:2 flags:0x00004000
Workqueue: events async_pf_execute [kvm]
Call Trace:
<TASK>
__schedule+0x33f/0xa40
schedule+0x53/0xc0
schedule_timeout+0x12a/0x140
__wait_for_common+0x8d/0x1d0
__flush_work.isra.0+0x19f/0x2c0
kvm_clear_async_pf_completion_queue+0x129/0x190 [kvm]
kvm_arch_destroy_vm+0x78/0x1b0 [kvm]
kvm_put_kvm+0x1c1/0x320 [kvm]
async_pf_execute+0x198/0x260 [kvm]
process_one_work+0x145/0x2d0
worker_thread+0x27e/0x3a0
kthread+0xba/0xe0
ret_from_fork+0x2d/0x50
ret_from_fork_asm+0x11/0x20
</TASK>If kvm_clear_async_pf_completion_queue() actually flushes the workqueue, then there's no need to gift async_pf_execute() a reference because all invocations of async_pf_execute() will be forced to complete before the vCPU and its VM are destroyed/freed. And that in turn fixes the module unloading bug as __fput() won't do module_put() on the last vCPU reference until the vCPU has been freed, e.g. if closing the vCPU file also puts the last reference to the KVM module.
Note that kvm_check_async_pf_completion() may also take the work item off the completion queue and so also needs to flush the work queue, as the work will not be seen by kvm_clear_async_pf_completion_queue(). Waiting on the workqueue could theoretically delay a vCPU due to waiting for the work to complete, but that's a very, very small chance, and likely a very small delay. kvm_arch_async_page_present_queued() unconditionally makes a new request, i.e. will effectively delay entering the guest, so the remaining work is really just:
trace_kvm_async_pf_completed(addr, cr2_or_gpa);
__kvm_vcpu_wake_up(vcpu);
mmput(mm);and mmput() can't drop the last reference to the page tables if the vCPU is still alive, i.e. the vCPU won't get stuck tearing down page tables.
Add a helper to do the flushing, specifically to deal with "wakeup all" work items, as they aren't actually work items, i.e. are never placed in a workqueue. Trying to flush a bogus workqueue entry rightly makes __flush_work() complain (kudos to whoever added that sanity check).
Note, commit 5f6de5cbebee ("KVM: Prevent module exit until all VMs are freed") *tried* to fix the module refcounting issue by having VMs grab a reference to the module, but that only made the bug slightly harder to hit as it gave async_pf_execute() a bit more time to complete before the KVM module could be unloaded.
--- virt/kvm/async_pf.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-)
virt/kvm/async_pf.c +26 -5
@@ -98,7 +98,27 @@ static void async_pf_execute(struct work_struct *work)swake_up_one (&vcpu->wq);mmput (mm); -kvm_put_kvm (vcpu->kvm); +} + +static void kvm_flush_and_free_async_pf_work (struct kvm_async_pf *work) +{ +/* +* The async #PF is "done", but KVM must wait for the work item itself, +* i.e. async_pf_execute(), to run to completion. If KVM is a module, +* KVM must ensure *no* code owned by the KVM (the module) can be run +* after the last call to module_put(). Note, flushing the work item +* is always required when the item is taken off the completion queue. +* E.g. even if the vCPU handles the item in the "normal" path, the VM +* could be terminated before async_pf_execute() completes. +* +* Wake all events skip the queue and go straight done, i.e. don't +* need to be flushed (but sanity check that the work wasn't queued). +*/ +if (work->wakeup_all) +WARN_ON_ONCE (work->work.func); +else +flush_work (&work->work); +kmem_cache_free (async_pf_cache, work); }void kvm_clear_async_pf_completion_queue (struct kvm_vcpu *vcpu)
@@ -125,7 +145,6 @@ void kvm_clear_async_pf_completion_queue(struct kvm_vcpu *vcpu)#else if (cancel_work_sync (&work->work)) {mmput (work->mm); -kvm_put_kvm (vcpu->kvm);/* == work->vcpu->kvm */ kmem_cache_free (async_pf_cache, work); }#endif
@@ -137,7 +156,10 @@ void kvm_clear_async_pf_completion_queue(struct kvm_vcpu *vcpu)list_first_entry (&vcpu->async_pf.done,typeof (*work), link);list_del (&work->link); -kmem_cache_free (async_pf_cache, work); + +spin_unlock (&vcpu->async_pf.lock); +kvm_flush_and_free_async_pf_work (work); +spin_lock (&vcpu->async_pf.lock); }spin_unlock (&vcpu->async_pf.lock);
@@ -161,7 +183,7 @@ void kvm_check_async_pf_completion(struct kvm_vcpu *vcpu)list_del (&work->queue); vcpu->async_pf.queued--; -kmem_cache_free (async_pf_cache, work); +kvm_flush_and_free_async_pf_work (work); } }
@@ -190,7 +212,6 @@ int kvm_setup_async_pf(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, work->arch = *arch; work->mm = current->mm;mmget (work->mm); -kvm_get_kvm (work->vcpu->kvm);/* this can't really happen otherwise gfn_to_pfn_async would succeed */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 17/215 sparc64: NMI watchdog: fix return value of __setup handler
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Randy Dunlap <[email protected]>
[ Upstream commit 3ed7c61e49d65dacb96db798c0ab6fcd55a1f20f ]
__setup() handlers should return 1 to obsolete_checksetup() in init/main.c to indicate that the boot option has been handled. A return of 0 causes the boot option/value to be listed as an Unknown kernel parameter and added to init's (limited) argument or environment strings. Also, error return codes don't mean anything to obsolete_checksetup() -- only non-zero (usually 1) or zero. So return 1 from setup_nmi_watchdog().
--- arch/sparc/kernel/nmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/sparc/kernel/nmi.c +1 -1
@@ -274,7 +274,7 @@ static int __init setup_nmi_watchdog(char *str)if (!strncmp (str,"panic" ,5 )) panic_on_timeout =1 ; -return 0 ; +return 1 ; }__setup ("nmi_watchdog=" , setup_nmi_watchdog);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 18/215 sparc: vDSO: fix return value of __setup handler
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Randy Dunlap <[email protected]>
[ Upstream commit 5378f00c935bebb846b1fdb0e79cb76c137c56b5 ]
__setup() handlers should return 1 to obsolete_checksetup() in init/main.c to indicate that the boot option has been handled. A return of 0 causes the boot option/value to be listed as an Unknown kernel parameter and added to init's (limited) argument or environment strings. Also, error return codes don't mean anything to obsolete_checksetup() -- only non-zero (usually 1) or zero. So return 1 from vdso_setup().
--- arch/sparc/vdso/vma.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
arch/sparc/vdso/vma.c +3 -4
@@ -449,9 +449,8 @@ static __init int vdso_setup(char *s)unsigned long val; err =kstrtoul (s,10 , &val); -if (err) -return err; - vdso_enabled = val; -return 0 ; +if (!err) + vdso_enabled = val; +return 1 ; }__setup ("vdso=" , vdso_setup);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 19/215 crypto: qat - fix double free during reset
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Svyatoslav Pankratov <[email protected]>
[ Upstream commit 01aed663e6c421aeafc9c330bda630976b50a764 ]
There is no need to free the reset_data structure if the recovery is unsuccessful and the reset is synchronous. The function adf_dev_aer_schedule_reset() handles the cleanup properly. Only asynchronous resets require such structure to be freed inside the reset worker.
Stable-dep-of: 7d42e097607c ("crypto: qat - resolve race condition during AER recovery")
--- drivers/crypto/qat/qat_common/adf_aer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/crypto/qat/qat_common/adf_aer.c +2 -1
@@ -139,7 +139,8 @@ static void adf_device_reset_worker(struct work_struct *work)if (adf_dev_init (accel_dev) ||adf_dev_start (accel_dev)) {/* The device hanged and we can't restart it so stop here */ dev_err (&GET_DEV (accel_dev),"Restart device failed\n" ); -kfree (reset_data); +if (reset_data->mode ==ADF_DEV_RESET_ASYNC ) +kfree (reset_data);WARN (1 ,"QAT: device restart failed. Device is unusable\n" );return ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 20/215 crypto: qat - resolve race condition during AER recovery
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damian Muszynski <[email protected]>
[ Upstream commit 7d42e097607c4d246d99225bf2b195b6167a210c ]
During the PCI AER system's error recovery process, the kernel driver may encounter a race condition with freeing the reset_data structure's memory. If the device restart will take more than 10 seconds the function scheduling that restart will exit due to a timeout, and the reset_data structure will be freed. However, this data structure is used for completion notification after the restart is completed, which leads to a UAF bug.
This results in a KFENCE bug notice.
BUG: KFENCE: use-after-free read in adf_device_reset_worker+0x38/0xa0 [intel_qat] Use-after-free read at 0x00000000bc56fddf (in kfence-#142): adf_device_reset_worker+0x38/0xa0 [intel_qat] process_one_work+0x173/0x340
To resolve this race condition, the memory associated to the container of the work_struct is freed on the worker if the timeout expired, otherwise on the function that schedules the worker.
The timeout detection can be done by checking if the caller is still waiting for completion or not by using completion_done() function.
--- drivers/crypto/qat/qat_common/adf_aer.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
drivers/crypto/qat/qat_common/adf_aer.c +16 -6
@@ -139,7 +139,8 @@ static void adf_device_reset_worker(struct work_struct *work)if (adf_dev_init (accel_dev) ||adf_dev_start (accel_dev)) {/* The device hanged and we can't restart it so stop here */ dev_err (&GET_DEV (accel_dev),"Restart device failed\n" ); -if (reset_data->mode ==ADF_DEV_RESET_ASYNC ) +if (reset_data->mode ==ADF_DEV_RESET_ASYNC || +completion_done (&reset_data->compl))kfree (reset_data);WARN (1 ,"QAT: device restart failed. Device is unusable\n" );return ;
@@ -147,11 +148,19 @@ static void adf_device_reset_worker(struct work_struct *work)adf_dev_restarted_notify (accel_dev);clear_bit (ADF_STATUS_RESTARTING , &accel_dev->status); -/* The dev is back alive. Notify the caller if in sync mode */ -if (reset_data->mode ==ADF_DEV_RESET_SYNC ) -complete (&reset_data->compl); -else +/* +* The dev is back alive. Notify the caller if in sync mode +* +* If device restart will take a more time than expected, +* the schedule_reset() function can timeout and exit. This can be +* detected by calling the completion_done() function. In this case +* the reset_data structure needs to be freed here. +*/ +if (reset_data->mode ==ADF_DEV_RESET_ASYNC || +completion_done (&reset_data->compl))kfree (reset_data); +else +complete (&reset_data->compl); } static int adf_dev_aer_schedule_reset(struct adf_accel_dev *accel_dev,
@@ -184,8 +193,9 @@ static int adf_dev_aer_schedule_reset(struct adf_accel_dev *accel_dev,dev_err (&GET_DEV (accel_dev),"Reset device timeout expired\n" ); ret = -EFAULT ; + }else { +kfree (reset_data); } -kfree (reset_data);return ret; }return 0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 21/215 selftests/mqueue: Set timeout to 180 seconds
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: SeongJae Park <[email protected]>
[ Upstream commit 85506aca2eb4ea41223c91c5fe25125953c19b13 ]
While mq_perf_tests runs with the default kselftest timeout limit, which is 45 seconds, the test takes about 60 seconds to complete on i3.metal AWS instances. Hence, the test always times out. Increase the timeout to 180 seconds.
--- tools/testing/selftests/mqueue/setting | 1 + 1 file changed, 1 insertion(+) create mode 100644 tools/testing/selftests/mqueue/setting
tools/testing/selftests/mqueue/setting new file +1 -0
@@ -0,0 +1 @@ +timeout=180
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 22/215 ext4: correct best extent lstart adjustment logic
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baokun Li <[email protected]>
[ Upstream commit 4fbf8bc733d14bceb16dda46a3f5e19c6a9621c5 ]
When yangerkun review commit 93cdf49f6eca ("ext4: Fix best extent lstart adjustment logic in ext4_mb_new_inode_pa()"), it was found that the best extent did not completely cover the original request after adjusting the best extent lstart in ext4_mb_new_inode_pa() as follows:
original request: 2/10(8)
normalized request: 0/64(64)
best extent: 0/9(9)
When we check if best ex can be kept at start of goal, ac_o_ex.fe_logical is 2 less than the adjusted best extent logical end 9, so we think the adjustment is done. But obviously 0/9(9) doesn't cover 2/10(8), so we should determine here if the original request logical end is less than or equal to the adjusted best extent logical end.
In addition, add a comment stating when adjusted best_ex will not cover the original request, and remove the duplicate assertion because adjusting lstart makes no change to b_ex.fe_len.
--- fs/ext4/mballoc.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
fs/ext4/mballoc.c +11 -6
@@ -3692,10 +3692,16 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) .fe_len = ac->ac_g_ex.fe_len, };loff_t orig_goal_end =extent_logical_end (sbi, &ex); +loff_t o_ex_end =extent_logical_end (sbi, &ac->ac_o_ex); -/* we can't allocate as much as normalizer wants. -* so, found space must get proper lstart -* to cover original request */ +/* +* We can't allocate as much as normalizer wants, so we try +* to get proper lstart to cover the original request, except +* when the goal doesn't cover the original request as below: +* +* orig_ex:2045/2055(10), isize:8417280 -> normalized:0/2048 +* best_ex:0/200(200) -> adjusted: 1848/2048(200) +*/ BUG_ON (ac->ac_g_ex.fe_logical > ac->ac_o_ex.fe_logical);BUG_ON (ac->ac_g_ex.fe_len < ac->ac_o_ex.fe_len);
@@ -3707,7 +3713,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)* 1. Check if best ex can be kept at end of goal and still * cover original start * 2. Else, check if best ex can be kept at start of goal and -* still cover original start +* still cover original end * 3. Else, keep the best ex at start of original request. */ ex.fe_len = ac->ac_b_ex.fe_len;
@@ -3717,7 +3723,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) goto adjust_bex; ex.fe_logical = ac->ac_g_ex.fe_logical; -if (ac->ac_o_ex.fe_logical <extent_logical_end (sbi, &ex)) +if (o_ex_end <=extent_logical_end (sbi, &ex)) goto adjust_bex; ex.fe_logical = ac->ac_o_ex.fe_logical;
@@ -3725,7 +3731,6 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) ac->ac_b_ex.fe_logical = ex.fe_logical;BUG_ON (ac->ac_o_ex.fe_logical < ac->ac_b_ex.fe_logical); -BUG_ON (ac->ac_o_ex.fe_len > ac->ac_b_ex.fe_len);BUG_ON (extent_logical_end (sbi, &ex) > orig_goal_end); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 23/215 fat: fix uninitialized field in nostale filehandles
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
[ Upstream commit fde2497d2bc3a063d8af88b258dbadc86bd7b57c ]
When fat_encode_fh_nostale() encodes file handle without a parent it stores only first 10 bytes of the file handle. However the length of the file handle must be a multiple of 4 so the file handle is actually 12 bytes long and the last two bytes remain uninitialized. This is not great at we potentially leak uninitialized information with the handle to userspace. Properly initialize the full handle length.
--- fs/fat/nfs.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/fat/nfs.c +6 -0
@@ -130,6 +130,12 @@ fat_encode_fh_nostale(struct inode *inode, __u32 *fh, int *lenp, fid->parent_i_gen = parent->i_generation; type =FILEID_FAT_WITH_PARENT ; *lenp =FAT_FID_SIZE_WITH_PARENT ; + }else { +/* +* We need to initialize this field because the fh is actually +* 12 bytes long +*/ + fid->parent_i_pos_hi =0 ; }return type;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 24/215 ubifs: Set page uptodate in the correct place
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthew Wilcox (Oracle) <[email protected]>
[ Upstream commit 723012cab779eee8228376754e22c6594229bf8f ]
Page cache reads are lockless, so setting the freshly allocated page uptodate before we've overwritten it with the data it's supposed to have in it will allow a simultaneous reader to see old data. Move the call to SetPageUptodate into ubifs_write_end(), which is after we copied the new data into the page.
--- fs/ubifs/file.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
fs/ubifs/file.c +4 -9
@@ -262,9 +262,6 @@ static int write_begin_slow(struct address_space *mapping,return err; } } - -SetPageUptodate (page); -ClearPageError (page); }if (PagePrivate (page))
@@ -463,9 +460,6 @@ static int ubifs_write_begin(struct file *file, struct address_space *mapping,return err; } } - -SetPageUptodate (page); -ClearPageError (page); } err =allocate_budget (c, page, ui, appending);
@@ -475,10 +469,8 @@ static int ubifs_write_begin(struct file *file, struct address_space *mapping,* If we skipped reading the page because we were going to * write all of it, then it is not up to date. */ -if (skipped_read) { +if (skipped_read)ClearPageChecked (page); -ClearPageUptodate (page); - }/* * Budgeting failed which means it would have to force * write-back but didn't, because we set the @fast flag in the
@@ -569,6 +561,9 @@ static int ubifs_write_end(struct file *file, struct address_space *mapping, goto out; } +if (len ==PAGE_SIZE ) +SetPageUptodate (page); +if (!PagePrivate (page)) {SetPagePrivate (page);atomic_long_inc (&c->dirty_pg_cnt);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 25/215 ubi: Check for too small LEB size in VTBL code
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Weinberger <[email protected]>
[ Upstream commit 68a24aba7c593eafa8fd00f2f76407b9b32b47a9 ]
If the LEB size is smaller than a volume table record we cannot have volumes.
In this case abort attaching.
--- drivers/mtd/ubi/vtbl.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/mtd/ubi/vtbl.c +6 -0
@@ -791,6 +791,12 @@ int ubi_read_volume_table(struct ubi_device *ubi, struct ubi_attach_info *ai)* The number of supported volumes is limited by the eraseblock size * and by the UBI_MAX_VOLUMES constant. */ + +if (ubi->leb_size <UBI_VTBL_RECORD_SIZE ) { +ubi_err (ubi,"LEB size too small for a volume record" ); +return -EINVAL ; + } + ubi->vtbl_slots = ubi->leb_size /UBI_VTBL_RECORD_SIZE ;if (ubi->vtbl_slots >UBI_MAX_VOLUMES ) ubi->vtbl_slots =UBI_MAX_VOLUMES ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 26/215 ubi: correct the calculation of fastmap size
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Yi <[email protected]>
[ Upstream commit 7f174ae4f39e8475adcc09d26c5a43394689ad6c ]
Now that the calculation of fastmap size in ubi_calc_fm_size() is incorrect since it miss each user volume's ubi_fm_eba structure and the Internal UBI volume info. Let's correct the calculation.
--- drivers/mtd/ubi/fastmap.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/mtd/ubi/fastmap.c +4 -3
@@ -86,9 +86,10 @@ size_t ubi_calc_fm_size(struct ubi_device *ubi)sizeof (struct ubi_fm_scan_pool ) +sizeof (struct ubi_fm_scan_pool ) + (ubi->peb_count *sizeof (struct ubi_fm_ec )) + - (sizeof (struct ubi_fm_eba ) + - (ubi->peb_count *sizeof (__be32))) + -sizeof (struct ubi_fm_volhdr ) *UBI_MAX_VOLUMES ; + ((sizeof (struct ubi_fm_eba ) + +sizeof (struct ubi_fm_volhdr )) * + (UBI_MAX_VOLUMES +UBI_INT_VOL_COUNT )) + + (ubi->peb_count *sizeof (__be32));return roundup (size, ubi->leb_size); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 27/215 mtd: rawnand: meson: fix scrambling mode value in command macro
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arseniy Krasnov <[email protected]>
[ Upstream commit ef6f463599e16924cdd02ce5056ab52879dc008c ]
Scrambling mode is enabled by value (1 << 19). NFC_CMD_SCRAMBLER_ENABLE is already (1 << 19), so there is no need to shift it again in CMDRWGEN macro.
--- drivers/mtd/nand/raw/meson_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/nand/raw/meson_nand.c +1 -1
@@ -59,7 +59,7 @@#define CMDRWGEN (cmd_dir, ran, bch, short_mode, page_size, pages) \ ( \ (cmd_dir) | \ - ((ran) << 19) | \ + (ran) | \ ((bch) << 14) | \ ((short_mode) << 13) | \ (((page_size) & 0x7f) << 6) | \
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 28/215 parisc: Do not hardcode registers in checksum functions
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Helge Deller <[email protected]>
[ Upstream commit 52b2d91752a82d9350981eb3b3ffc4b325c84ba9 ]
Do not hardcode processor registers r19 to r22 as scratch registers. Instead let the compiler decide, which may give better optimization results when the functions get inlined.
Stable-dep-of: a2abae8f0b63 ("parisc: Fix ip_fast_csum")
--- arch/parisc/include/asm/checksum.h | 101 +++++++++++++++-------------- 1 file changed, 52 insertions(+), 49 deletions(-)
arch/parisc/include/asm/checksum.h +52 -49
@@ -42,31 +42,32 @@ extern __wsum csum_partial_copy_from_user(const void __user *src,static inline __sum16 ip_fast_csum (const void *iph,unsigned int ihl) {unsigned int sum; +unsigned long t0, t1, t2; __asm__ __volatile__ (" ldws,ma 4(%1), %0\n" " addib,<= -4, %2, 2f\n" "\n" -" ldws 4(%1), %%r20\n" -" ldws 8(%1), %%r21\n" -" add %0, %%r20, %0\n" -" ldws,ma 12(%1), %%r19\n" -" addc %0, %%r21, %0\n" -" addc %0, %%r19, %0\n" -"1: ldws,ma 4(%1), %%r19\n" +" ldws 4(%1), %4\n" +" ldws 8(%1), %5\n" +" add %0, %4, %0\n" +" ldws,ma 12(%1), %3\n" +" addc %0, %5, %0\n" +" addc %0, %3, %0\n" +"1: ldws,ma 4(%1), %3\n" " addib,< 0, %2, 1b\n" -" addc %0, %%r19, %0\n" +" addc %0, %3, %0\n" "\n" -" extru %0, 31, 16, %%r20\n" -" extru %0, 15, 16, %%r21\n" -" addc %%r20, %%r21, %0\n" -" extru %0, 15, 16, %%r21\n" -" add %0, %%r21, %0\n" +" extru %0, 31, 16, %4\n" +" extru %0, 15, 16, %5\n" +" addc %4, %5, %0\n" +" extru %0, 15, 16, %5\n" +" add %0, %5, %0\n" " subi -1, %0, %0\n" "2:\n" - :"=r" (sum),"=r" (iph),"=r" (ihl) + :"=r" (sum),"=r" (iph),"=r" (ihl),"=r" (t0),"=r" (t1),"=r" (t2) :"1" (iph),"2" (ihl) - :"r19" ,"r20" ,"r21" ,"memory" ); + :"memory" );return (__force __sum16 )sum; }
@@ -126,6 +127,10 @@ static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr, __u32 len, __u8 proto, __wsum sum) { + unsigned long t0, t1, t2, t3; + + len += proto;/* add 16-bit proto + len */ + __asm__ __volatile__ (#if BITS_PER_LONG >32
@@ -136,20 +141,19 @@ static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr,** Try to keep 4 registers with "live" values ahead of the ALU. */ -" ldd,ma 8(%1), %%r19\n" /* get 1st saddr word */ -" ldd,ma 8(%2), %%r20\n" /* get 1st daddr word */ -" add %8, %3, %3\n" /* add 16-bit proto + len */ -" add %%r19, %0, %0\n" -" ldd,ma 8(%1), %%r21\n" /* 2cd saddr */ -" ldd,ma 8(%2), %%r22\n" /* 2cd daddr */ -" add,dc %%r20, %0, %0\n" -" add,dc %%r21, %0, %0\n" -" add,dc %%r22, %0, %0\n" +" ldd,ma 8(%1), %4\n" /* get 1st saddr word */ +" ldd,ma 8(%2), %5\n" /* get 1st daddr word */ +" add %4, %0, %0\n" +" ldd,ma 8(%1), %6\n" /* 2nd saddr */ +" ldd,ma 8(%2), %7\n" /* 2nd daddr */ +" add,dc %5, %0, %0\n" +" add,dc %6, %0, %0\n" +" add,dc %7, %0, %0\n" " add,dc %3, %0, %0\n" /* fold in proto+len | carry bit */ -" extrd,u %0, 31, 32, %%r19\n" /* copy upper half down */ -" depdi 0, 31, 32, %0\n" /* clear upper half */ -" add %%r19, %0, %0\n" /* fold into 32-bits */ -" addc 0, %0, %0\n" /* add carry */ +" extrd,u %0, 31, 32, %4\n" /* copy upper half down */ +" depdi 0, 31, 32, %0\n" /* clear upper half */ +" add %4, %0, %0\n" /* fold into 32-bits */ +" addc 0, %0, %0\n" /* add carry */ #else
@@ -158,30 +162,29 @@ static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr,** Insn stream is serialized on the carry bit here too. ** result from the previous operation (eg r0 + x) */ - -" ldw,ma 4(%1), %%r19\n" /* get 1st saddr word */ -" ldw,ma 4(%2), %%r20\n" /* get 1st daddr word */ -" add %8, %3, %3\n" /* add 16-bit proto + len */ -" add %%r19, %0, %0\n" -" ldw,ma 4(%1), %%r21\n" /* 2cd saddr */ -" addc %%r20, %0, %0\n" -" ldw,ma 4(%2), %%r22\n" /* 2cd daddr */ -" addc %%r21, %0, %0\n" -" ldw,ma 4(%1), %%r19\n" /* 3rd saddr */ -" addc %%r22, %0, %0\n" -" ldw,ma 4(%2), %%r20\n" /* 3rd daddr */ -" addc %%r19, %0, %0\n" -" ldw,ma 4(%1), %%r21\n" /* 4th saddr */ -" addc %%r20, %0, %0\n" -" ldw,ma 4(%2), %%r22\n" /* 4th daddr */ -" addc %%r21, %0, %0\n" -" addc %%r22, %0, %0\n" +" ldw,ma 4(%1), %4\n" /* get 1st saddr word */ +" ldw,ma 4(%2), %5\n" /* get 1st daddr word */ +" add %4, %0, %0\n" +" ldw,ma 4(%1), %6\n" /* 2nd saddr */ +" addc %5, %0, %0\n" +" ldw,ma 4(%2), %7\n" /* 2nd daddr */ +" addc %6, %0, %0\n" +" ldw,ma 4(%1), %4\n" /* 3rd saddr */ +" addc %7, %0, %0\n" +" ldw,ma 4(%2), %5\n" /* 3rd daddr */ +" addc %4, %0, %0\n" +" ldw,ma 4(%1), %6\n" /* 4th saddr */ +" addc %5, %0, %0\n" +" ldw,ma 4(%2), %7\n" /* 4th daddr */ +" addc %6, %0, %0\n" +" addc %7, %0, %0\n" " addc %3, %0, %0\n" /* fold in proto+len, catch carry */ #endif - : "=r" (sum), "=r" (saddr), "=r" (daddr), "=r" (len) - : "0" (sum), "1" (saddr), "2" (daddr), "3" (len), "r" (proto) - : "r19", "r20", "r21", "r22", "memory"); + : "=r" (sum), "=r" (saddr), "=r" (daddr), "=r" (len), + "=r" (t0), "=r" (t1), "=r" (t2), "=r" (t3) + : "0" (sum), "1" (saddr), "2" (daddr), "3" (len) + : "memory"); return csum_fold(sum); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 29/215 parisc: Fix ip_fast_csum
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guenter Roeck <[email protected]>
[ Upstream commit a2abae8f0b638c31bb9799d9dd847306e0d005bd ]
IP checksum unit tests report the following error when run on hppa/hppa64.
# test_ip_fast_csum: ASSERTION FAILED at lib/checksum_kunit.c:463
Expected ( u64)csum_result == ( u64)expected, but
( u64)csum_result == 33754 (0x83da)
( u64)expected == 10946 (0x2ac2)
not ok 4 test_ip_fast_csum0x83da is the expected result if the IP header length is 20 bytes. 0x2ac2 is the expected result if the IP header length is 24 bytes. The test fails with an IP header length of 24 bytes. It appears that ip_fast_csum() always returns the checksum for a 20-byte header, no matter how long the header actually is.
Code analysis shows a suspicious assembler sequence in ip_fast_csum().
" addc %0, %3, %0\n" "1: ldws,ma 4(%1), %3\n" " addib,< 0, %2, 1b\n" <---
While my understanding of HPPA assembler is limited, it does not seem to make much sense to subtract 0 from a register and to expect the result to ever be negative. Subtracting 1 from the length parameter makes more sense. On top of that, the operation should be repeated if and only if the result is still > 0, so change the suspicious instruction to
" addib,> -1, %2, 1b\n"
The IP checksum unit test passes after this change.
--- arch/parisc/include/asm/checksum.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/parisc/include/asm/checksum.h +1 -1
@@ -55,7 +55,7 @@ static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl)" addc %0, %5, %0\n" " addc %0, %3, %0\n" "1: ldws,ma 4(%1), %3\n" -" addib,< 0, %2, 1b\n" +" addib,> -1, %2, 1b\n" " addc %0, %3, %0\n" "\n" " extru %0, 31, 16, %4\n"
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 30/215 parisc: Fix csum_ipv6_magic on 32-bit systems
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guenter Roeck <[email protected]>
[ Upstream commit 4408ba75e4ba80c91fde7e10bccccf388f5c09be ]
Calculating the IPv6 checksum on 32-bit systems missed overflows when adding the proto+len fields into the checksum. This results in the following unit test failure.
# test_csum_ipv6_magic: ASSERTION FAILED at lib/checksum_kunit.c:506
Expected ( u64)csum_result == ( u64)expected, but
( u64)csum_result == 46722 (0xb682)
( u64)expected == 46721 (0xb681)
not ok 5 test_csum_ipv6_magicThis is probably rarely seen in the real world because proto+len are usually small values which will rarely result in overflows when calculating the checksum. However, the unit test code uses large values for the length field, causing the test to fail.
Fix the problem by adding the missing carry into the final checksum.
--- arch/parisc/include/asm/checksum.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/parisc/include/asm/checksum.h +2 -1
@@ -178,7 +178,8 @@ static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr," ldw,ma 4(%2), %7\n" /* 4th daddr */ " addc %6, %0, %0\n" " addc %7, %0, %0\n" -" addc %3, %0, %0\n" /* fold in proto+len, catch carry */ +" addc %3, %0, %0\n" /* fold in proto+len */ +" addc 0, %0, %0\n" /* add carry */ #endif : "=r" (sum), "=r" (saddr), "=r" (daddr), "=r" (len),
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 31/215 parisc: Fix csum_ipv6_magic on 64-bit systems
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guenter Roeck <[email protected]>
[ Upstream commit 4b75b12d70506e31fc02356bbca60f8d5ca012d0 ]
hppa 64-bit systems calculates the IPv6 checksum using 64-bit add operations. The last add folds protocol and length fields into the 64-bit result. While unlikely, this operation can overflow. The overflow can be triggered with a code sequence such as the following.
/* try to trigger massive overflows */ memset(tmp_buf, 0xff, sizeof(struct in6_addr)); csum_result = csum_ipv6_magic((struct in6_addr *)tmp_buf, (struct in6_addr *)tmp_buf, 0xffff, 0xff, 0xffffffff);
Fix the problem by adding any overflows from the final add operation into the calculated checksum. Fortunately, we can do this without additional cost by replacing the add operation used to fold the checksum into 32 bit with "add,dc" to add in the missing carry.
--- arch/parisc/include/asm/checksum.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/parisc/include/asm/checksum.h +2 -2
@@ -152,8 +152,8 @@ static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr," add,dc %3, %0, %0\n" /* fold in proto+len | carry bit */ " extrd,u %0, 31, 32, %4\n" /* copy upper half down */ " depdi 0, 31, 32, %0\n" /* clear upper half */ -" add %4, %0, %0\n" /* fold into 32-bits */ -" addc 0, %0, %0\n" /* add carry */ +" add,dc %4, %0, %0\n" /* fold into 32-bits, plus carry */ +" addc 0, %0, %0\n" /* add final carry */ #else
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 32/215 parisc: Strip upper 32 bit of sum in csum_ipv6_magic for 64-bit builds
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guenter Roeck <[email protected]>
[ Upstream commit 0568b6f0d863643db2edcc7be31165740c89fa82 ]
IPv6 checksum tests with unaligned addresses on 64-bit builds result in unexpected failures.
Expected expected == csum_result, but
expected == 46591 (0xb5ff)
csum_result == 46381 (0xb52d)with alignment offset 1
Oddly enough, the problem disappeared after adding test code into the beginning of csum_ipv6_magic().
As it turns out, the 'sum' parameter of csum_ipv6_magic() is declared as __wsum, which is a 32-bit variable. However, it is treated as 64-bit variable in the 64-bit assembler code. Tests showed that the upper 32 bit of the register used to pass the variable are _not_ cleared when entering the function. This can result in checksum calculation errors.
Clearing the upper 32 bit of 'sum' as first operation in the assembler code fixes the problem.
--- arch/parisc/include/asm/checksum.h | 1 + 1 file changed, 1 insertion(+)
arch/parisc/include/asm/checksum.h +1 -0
@@ -141,6 +141,7 @@ static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr,** Try to keep 4 registers with "live" values ahead of the ALU. */ +" depdi 0, 31, 32, %0\n" /* clear upper half of incoming checksum */ " ldd,ma 8(%1), %4\n" /* get 1st saddr word */ " ldd,ma 8(%2), %5\n" /* get 1st daddr word */ " add %4, %0, %0\n"
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 33/215 PM: suspend: Set mem_sleep_current during kernel command line setup
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maulik Shah <[email protected]>
[ Upstream commit 9bc4ffd32ef8943f5c5a42c9637cfd04771d021b ]
psci_init_system_suspend() invokes suspend_set_ops() very early during bootup even before kernel command line for mem_sleep_default is setup. This leads to kernel command line mem_sleep_default=s2idle not working as mem_sleep_current gets changed to deep via suspend_set_ops() and never changes back to s2idle.
Set mem_sleep_current along with mem_sleep_default during kernel command line setup as default suspend mode.
--- kernel/power/suspend.c | 1 + 1 file changed, 1 insertion(+)
kernel/power/suspend.c +1 -0
@@ -187,6 +187,7 @@ static int __init mem_sleep_default_setup(char *str)if (mem_sleep_labels[state] && !strcmp (str, mem_sleep_labels[state])) { mem_sleep_default = state; + mem_sleep_current = state;break ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 34/215 clk: qcom: gcc-ipq8074: fix terminating of frequency table arrays
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gabor Juhos <[email protected]>
[ Upstream commit 1040ef5ed95d6fd2628bad387d78a61633e09429 ]
The frequency table arrays are supposed to be terminated with an empty element. Add such entry to the end of the arrays where it is missing in order to avoid possible out-of-bound access when the table is traversed by functions like qcom_find_freq() or qcom_find_freq_floor().
Only compile tested.
--- drivers/clk/qcom/gcc-ipq8074.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clk/qcom/gcc-ipq8074.c +2 -0
@@ -972,6 +972,7 @@ static struct clk_rcg2 pcie0_axi_clk_src = {static const struct freq_tbl ftbl_pcie_aux_clk_src[] = {F (19200000 ,P_XO ,1 ,0 ,0 ), + { } };static struct clk_rcg2 pcie0_aux_clk_src = {
@@ -1077,6 +1078,7 @@ static const struct freq_tbl ftbl_sdcc_ice_core_clk_src[] = {F (19200000 ,P_XO ,1 ,0 ,0 ),F (160000000 ,P_GPLL0 ,5 ,0 ,0 ), F(308570000, P_GPLL6, 3.5, 0, 0), + { } }; static struct clk_rcg2 sdcc1_ice_core_clk_src = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 35/215 clk: qcom: mmcc-apq8084: fix terminating of frequency table arrays
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gabor Juhos <[email protected]>
[ Upstream commit a903cfd38d8dee7e754fb89fd1bebed99e28003d ]
The frequency table arrays are supposed to be terminated with an empty element. Add such entry to the end of the arrays where it is missing in order to avoid possible out-of-bound access when the table is traversed by functions like qcom_find_freq() or qcom_find_freq_floor().
Only compile tested.
--- drivers/clk/qcom/mmcc-apq8084.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clk/qcom/mmcc-apq8084.c +2 -0
@@ -333,6 +333,7 @@ static struct freq_tbl ftbl_mmss_axi_clk[] = {F (333430000 ,P_MMPLL1 ,3.5 ,0 ,0 ),F (400000000 ,P_MMPLL0 ,2 ,0 ,0 ), F(466800000, P_MMPLL1, 2.5, 0, 0), + { } }; static struct clk_rcg2 mmss_axi_clk_src = {
@@ -357,6 +358,7 @@ static struct freq_tbl ftbl_ocmemnoc_clk[] = {F (150000000 ,P_GPLL0 ,4 ,0 ,0 ),F (228570000 ,P_MMPLL0 ,3.5 ,0 ,0 ), F(320000000, P_MMPLL0, 2.5, 0, 0), + { } }; static struct clk_rcg2 ocmemnoc_clk_src = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 36/215 clk: qcom: mmcc-msm8974: fix terminating of frequency table arrays
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gabor Juhos <[email protected]>
[ Upstream commit e2c02a85bf53ae86d79b5fccf0a75ac0b78e0c96 ]
The frequency table arrays are supposed to be terminated with an empty element. Add such entry to the end of the arrays where it is missing in order to avoid possible out-of-bound access when the table is traversed by functions like qcom_find_freq() or qcom_find_freq_floor().
Only compile tested.
--- drivers/clk/qcom/mmcc-msm8974.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clk/qcom/mmcc-msm8974.c +2 -0
@@ -283,6 +283,7 @@ static struct freq_tbl ftbl_mmss_axi_clk[] = {F (291750000 ,P_MMPLL1 ,4 ,0 ,0 ),F (400000000 ,P_MMPLL0 ,2 ,0 ,0 ), F(466800000, P_MMPLL1, 2.5, 0, 0), + { } }; static struct clk_rcg2 mmss_axi_clk_src = {
@@ -307,6 +308,7 @@ static struct freq_tbl ftbl_ocmemnoc_clk[] = {F (150000000 ,P_GPLL0 ,4 ,0 ,0 ),F (291750000 ,P_MMPLL1 ,4 ,0 ,0 ), F(400000000, P_MMPLL0, 2, 0, 0), + { } }; static struct clk_rcg2 ocmemnoc_clk_src = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 37/215 powerpc/fsl: Fix mfpmr build errors with newer binutils
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Ellerman <[email protected]>
[ Upstream commit 5f491356b7149564ab22323ccce79c8d595bfd0c ]
Binutils 2.38 complains about the use of mfpmr when building ppc6xx_defconfig:
CC arch/powerpc/kernel/pmc.o
{standard input}: Assembler messages:
{standard input}:45: Error: unrecognized opcode: mfpmr' {standard input}:56: Error: unrecognized opcode: mtpmr'
This is because by default the kernel is built with -mcpu=powerpc, and the mt/mfpmr instructions are not defined.
It can be avoided by enabling CONFIG_E300C3_CPU, but just adding that to the defconfig will leave open the possibility of randconfig failures.
So add machine directives around the mt/mfpmr instructions to tell binutils how to assemble them.
--- arch/powerpc/include/asm/reg_fsl_emb.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
arch/powerpc/include/asm/reg_fsl_emb.h +9 -2
@@ -12,9 +12,16 @@#ifndef __ASSEMBLY__/* Performance Monitor Registers */ #define mfpmr (rn) ({unsigned int rval; \ - asm volatile("mfpmr %0," __stringify(rn) \ + asm volatile(".machine push; " \ + ".machine e300; " \ + "mfpmr %0," __stringify(rn) ";" \ + ".machine pop; " \ : "=r" (rval)); rval;}) -#define mtpmr (rn, v) asm volatile("mtpmr " __stringify(rn) ",%0" : : "r" (v)) +#define mtpmr (rn, v) asm volatile(".machine push; " \ + ".machine e300; " \ + "mtpmr " __stringify(rn) ",%0; " \ + ".machine pop; " \ + : : "r" (v))#endif /* __ASSEMBLY__ */ /* Freescale Book E Performance Monitor APU Registers */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 38/215 USB: serial: ftdi_sio: add support for GMC Z216C Adapter IR-USB
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Vogelbacher <[email protected]>
[ Upstream commit 3fb7bc4f3a98c48981318b87cf553c5f115fd5ca ]
The GMC IR-USB adapter cable utilizes a FTDI FT232R chip.
Add VID/PID for this adapter so it can be used as serial device via ftdi_sio.
--- drivers/usb/serial/ftdi_sio.c | 2 ++ drivers/usb/serial/ftdi_sio_ids.h | 6 ++++++ 2 files changed, 8 insertions(+)
drivers/usb/serial/ftdi_sio.c +2 -0
@@ -1055,6 +1055,8 @@ static const struct usb_device_id id_table_combined[] = { .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, { USB_DEVICE(FTDI_VID, FTDI_FALCONIA_JTAG_UNBUF_PID), .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, +/* GMC devices */ + { USB_DEVICE(GMC_VID, GMC_Z216C_PID) }, { }/* Terminating entry */ };
drivers/usb/serial/ftdi_sio_ids.h +6 -0
@@ -1599,3 +1599,9 @@#define UBLOX_VID 0x1546#define UBLOX_C099F9P_ZED_PID 0x0502#define UBLOX_C099F9P_ODIN_PID 0x0503 + +/* +* GMC devices +*/ +#define GMC_VID 0x1cd7 +#define GMC_Z216C_PID 0x0217/* GMC Z216C Adapter IR-USB */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 39/215 USB: serial: add device ID for VeriFone adapter
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cameron Williams <[email protected]>
[ Upstream commit cda704809797a8a86284f9df3eef5e62ec8a3175 ]
Add device ID for a (probably fake) CP2102 UART device.
lsusb -v output:
Device Descriptor:
bLength 18
bDescriptorType 1
bcdUSB 1.10
bDeviceClass 0 [unknown] bDeviceSubClass 0 [unknown] bDeviceProtocol 0 bMaxPacketSize0 64 idVendor 0x11ca VeriFone Inc idProduct 0x0212 Verifone USB to Printer bcdDevice 1.00 iManufacturer 1 Silicon Labs iProduct 2 Verifone USB to Printer iSerial 3 0001 bNumConfigurations 1
Configuration Descriptor:
bLength 9
bDescriptorType 2
wTotalLength 0x0020
bNumInterfaces 1
bConfigurationValue 1
iConfiguration 0
bmAttributes 0x80
(Bus Powered)
MaxPower 100mA
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 0
bAlternateSetting 0
bNumEndpoints 2
bInterfaceClass 255 Vendor Specific Class
bInterfaceSubClass 0 [unknown]
bInterfaceProtocol 0
iInterface 2 Verifone USB to Printer
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x81 EP 1 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x01 EP 1 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 0
Device Status: 0x0000
(Bus Powered)
--- drivers/usb/serial/cp210x.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/serial/cp210x.c +1 -0
@@ -178,6 +178,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x10C4, 0xF004) }, /* Elan Digital Systems USBcount50 */ { USB_DEVICE(0x10C5, 0xEA61) }, /* Silicon Labs MobiData GPRS USB Modem */ { USB_DEVICE(0x10CE, 0xEA6A) }, /* Silicon Labs MobiData GPRS USB Modem 100EU */ + { USB_DEVICE(0x11CA, 0x0212) }, /* Verifone USB to Printer (UART, CP2102) */ { USB_DEVICE(0x12B8, 0xEC60) }, /* Link G4 ECU */ { USB_DEVICE(0x12B8, 0xEC62) }, /* Link G4+ ECU */ { USB_DEVICE(0x13AD, 0x9999) }, /* Baltech card reader */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 40/215 USB: serial: cp210x: add ID for MGP Instruments PDS100
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Häggström <[email protected]>
[ Upstream commit a0d9d868491a362d421521499d98308c8e3a0398 ]
The radiation meter has the text MGP Instruments PDS-100G or PDS-100GN produced by Mirion Technologies. Tested by forcing the driver association with
echo 10c4 863c > /sys/bus/usb-serial/drivers/cp210x/new_id
and then setting the serial port in 115200 8N1 mode. The device announces ID_USB_VENDOR_ENC=Silicon\x20Labs and ID_USB_MODEL_ENC=PDS100
--- drivers/usb/serial/cp210x.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/serial/cp210x.c +1 -0
@@ -145,6 +145,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x10C4, 0x85EA) }, /* AC-Services IBUS-IF */ { USB_DEVICE(0x10C4, 0x85EB) }, /* AC-Services CIS-IBUS */ { USB_DEVICE(0x10C4, 0x85F8) }, /* Virtenio Preon32 */ + { USB_DEVICE(0x10C4, 0x863C) }, /* MGP Instruments PDS100 */ { USB_DEVICE(0x10C4, 0x8664) }, /* AC-Services CAN-IF */ { USB_DEVICE(0x10C4, 0x8665) }, /* AC-Services OBD-IF */ { USB_DEVICE(0x10C4, 0x87ED) }, /* IMST USB-Stick for Smart Meter */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 41/215 USB: serial: option: add MeiG Smart SLM320 product
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aurélien Jacobs <[email protected]>
[ Upstream commit 46809c51565b83881aede6cdf3b0d25254966a41 ]
Update the USB serial option driver to support MeiG Smart SLM320.
ID 2dee:4d41 UNISOC UNISOC-8910
T: Bus=01 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 9 Spd=480 MxCh= 0
D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1
P: Vendor=2dee ProdID=4d41 Rev=00.00
S: Manufacturer=UNISOC
S: Product=UNISOC-8910
C: #Ifs= 8 Cfg#= 1 Atr=e0 MxPwr=400mA
I: If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I: If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I: If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I: If#= 3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E: Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I: If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I: If#= 5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E: Ad=06(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I: If#= 6 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E: Ad=07(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I: If#= 7 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E: Ad=08(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E: Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
Tested successfully a PPP LTE connection using If#= 0. Not sure of the purpose of every other serial interfaces.
--- drivers/usb/serial/option.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/usb/serial/option.c +6 -0
@@ -613,6 +613,11 @@ static void option_instat_callback(struct urb *urb);/* Luat Air72*U series based on UNISOC UIS8910 uses UNISOC's vendor ID */ #define LUAT_PRODUCT_AIR720U 0x4e00 +/* MeiG Smart Technology products */ +#define MEIGSMART_VENDOR_ID 0x2dee +/* MeiG Smart SLM320 based on UNISOC UIS8910 */ +#define MEIGSMART_PRODUCT_SLM320 0x4d41 +/* Device flags */ /* Highest interface number which can be used with NCTRL() and RSVD() */
@@ -2282,6 +2287,7 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9191, 0xff, 0, 0) }, { USB_DEVICE_AND_INTERFACE_INFO(UNISOC_VENDOR_ID, TOZED_PRODUCT_LT70C, 0xff, 0, 0) }, { USB_DEVICE_AND_INTERFACE_INFO(UNISOC_VENDOR_ID, LUAT_PRODUCT_AIR720U, 0xff, 0, 0) }, + { USB_DEVICE_AND_INTERFACE_INFO(MEIGSMART_VENDOR_ID, MEIGSMART_PRODUCT_SLM320, 0xff, 0, 0) }, { } /* Terminating entry */ };MODULE_DEVICE_TABLE (usb, option_ids);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 42/215 USB: serial: cp210x: add pid/vid for TDK NC0110013M and MM0110113M
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Toru Katagiri <[email protected]>
[ Upstream commit b1a8da9ff1395c4879b4bd41e55733d944f3d613 ]
TDK NC0110013M and MM0110113M have custom USB IDs for CP210x, so we need to add them to the driver.
--- drivers/usb/serial/cp210x.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/serial/cp210x.c +2 -0
@@ -57,6 +57,8 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x0471, 0x066A) }, /* AKTAKOM ACE-1001 cable */ { USB_DEVICE(0x0489, 0xE000) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */ { USB_DEVICE(0x0489, 0xE003) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */ + { USB_DEVICE(0x04BF, 0x1301) }, /* TDK Corporation NC0110013M - Network Controller */ + { USB_DEVICE(0x04BF, 0x1303) }, /* TDK Corporation MM0110113M - i3 Micro Module */ { USB_DEVICE(0x0745, 0x1000) }, /* CipherLab USB CCD Barcode Scanner 1000 */ { USB_DEVICE(0x0846, 0x1100) }, /* NetGear Managed Switch M4100 series, M5300 series, M7100 series */ { USB_DEVICE(0x08e6, 0x5501) }, /* Gemalto Prox-PU/CU contactless smartcard reader */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 43/215 PM: sleep: wakeirq: fix wake irq warning in system suspend
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qingliang Li <[email protected]>
[ Upstream commit e7a7681c859643f3f2476b2a28a494877fd89442 ]
When driver uses pm_runtime_force_suspend() as the system suspend callback function and registers the wake irq with reverse enable ordering, the wake irq will be re-enabled when entering system suspend, triggering an 'Unbalanced enable for IRQ xxx' warning. In this scenario, the call sequence during system suspend is as follows:
suspend_devices_and_enter()
-> dpm_suspend_start()
-> dpm_run_callback()
-> pm_runtime_force_suspend()
-> dev_pm_enable_wake_irq_check()
-> dev_pm_enable_wake_irq_complete()
-> suspend_enter()
-> dpm_suspend_noirq()
-> device_wakeup_arm_wake_irqs()
-> dev_pm_arm_wake_irq()To fix this issue, complete the setting of WAKE_IRQ_DEDICATED_ENABLED flag in dev_pm_enable_wake_irq_complete() to avoid redundant irq enablement.
--- drivers/base/power/wakeirq.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/base/power/wakeirq.c +3 -1
@@ -365,8 +365,10 @@ void dev_pm_enable_wake_irq_complete(struct device *dev)return ;if (wirq->status &WAKE_IRQ_DEDICATED_MANAGED && - wirq->status &WAKE_IRQ_DEDICATED_REVERSE ) + wirq->status &WAKE_IRQ_DEDICATED_REVERSE ) {enable_irq (wirq->irq); + wirq->status |=WAKE_IRQ_DEDICATED_ENABLED ; + } }/**
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 44/215 mmc: tmio: avoid concurrent runs of mmc_request_done()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wolfram Sang <[email protected]>
[ Upstream commit e8d1b41e69d72c62865bebe8f441163ec00b3d44 ]
With the to-be-fixed commit, the reset_work handler cleared 'host->mrq' outside of the spinlock protected critical section. That leaves a small race window during execution of 'tmio_mmc_reset()' where the done_work handler could grab a pointer to the now invalid 'host->mrq'. Both would use it to call mmc_request_done() causing problems (see link below).
However, 'host->mrq' cannot simply be cleared earlier inside the critical section. That would allow new mrqs to come in asynchronously while the actual reset of the controller still needs to be done. So, like 'tmio_mmc_set_ios()', an ERR_PTR is used to prevent new mrqs from coming in but still avoiding concurrency between work handlers.
--- drivers/mmc/host/tmio_mmc_core.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/mmc/host/tmio_mmc_core.c +2 -0
@@ -217,6 +217,8 @@ static void tmio_mmc_reset_work(struct work_struct *work)else mrq->cmd->error = -ETIMEDOUT ; +/* No new calls yet, but disallow concurrent tmio_mmc_done_work() */ + host->mrq =ERR_PTR (-EBUSY ); host->cmd =NULL ; host->data =NULL ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 45/215 fuse: store fuse_conn in fuse_req
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Max Reitz <[email protected]>
[ Upstream commit 24754db2728a87c513cc480c70c09072a7a40ba6 ]
Every fuse_req belongs to a fuse_conn. Right now, we always know which fuse_conn that is based on the respective device, but we want to allow multiple (sub)mounts per single connection, and then the corresponding filesystem is not going to be so trivial to obtain.
Storing a pointer to the associated fuse_conn in every fuse_req will allow us to trivially find any request's superblock (and thus filesystem) even then.
Stable-dep-of: b1fe686a765e ("fuse: don't unhash root")
--- fs/fuse/dev.c | 13 +++++++------ fs/fuse/fuse_i.h | 3 +++ 2 files changed, 10 insertions(+), 6 deletions(-)
fs/fuse/dev.c +7 -6
@@ -40,20 +40,21 @@ static struct fuse_dev *fuse_get_dev(struct file *file)return READ_ONCE (file->private_data); } -static void fuse_request_init (struct fuse_req *req) +static void fuse_request_init (struct fuse_conn *fc,struct fuse_req *req) {INIT_LIST_HEAD (&req->list);INIT_LIST_HEAD (&req->intr_entry);init_waitqueue_head (&req->waitq);refcount_set (&req->count,1 );__set_bit (FR_PENDING , &req->flags); + req->fc = fc; } -static struct fuse_req *fuse_request_alloc (gfp_t flags) +static struct fuse_req *fuse_request_alloc (struct fuse_conn *fc,gfp_t flags) {struct fuse_req *req =kmem_cache_zalloc (fuse_req_cachep, flags);if (req) -fuse_request_init (req); +fuse_request_init (fc, req);return req; }
@@ -125,7 +126,7 @@ static struct fuse_req *fuse_get_req(struct fuse_conn *fc, bool for_background)if (fc->conn_error) goto out; - req =fuse_request_alloc (GFP_KERNEL ); + req =fuse_request_alloc (fc,GFP_KERNEL ); err = -ENOMEM ;if (!req) {if (for_background)
@@ -480,7 +481,7 @@ ssize_t fuse_simple_request(struct fuse_conn *fc, struct fuse_args *args)if (args->force) {atomic_inc (&fc->num_waiting); - req =fuse_request_alloc (GFP_KERNEL | __GFP_NOFAIL); + req =fuse_request_alloc (fc,GFP_KERNEL | __GFP_NOFAIL);if (!args->nocreds)fuse_force_creds (fc, req);
@@ -547,7 +548,7 @@ int fuse_simple_background(struct fuse_conn *fc, struct fuse_args *args,if (args->force) {WARN_ON (!args->nocreds); - req =fuse_request_alloc (gfp_flags); + req =fuse_request_alloc (fc, gfp_flags);if (!req)return -ENOMEM ;__set_bit (FR_BACKGROUND , &req->flags);
fs/fuse/fuse_i.h +3 -0
@@ -363,6 +363,9 @@ struct fuse_req {/** virtio-fs's physically contiguous buffer for in and out args */ void *argbuf;#endif + +/** fuse_conn this request belongs to */ +struct fuse_conn *fc; };struct fuse_iqueue ;
Signature · 1 line
2.43.0
Re: [PATCH 5.4 045/215] fuse: store fuse_conn in fuse_req
Quoted 14 lines · Greg Kroah-Hartman
5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Max Reitz <[email protected]>
[ Upstream commit
24754db2728a87c513cc480c70c09072a7a40ba6]Every
fuse_reqbelongs to afuse_conn. Right now, we always know whichfuse_connthat is based on the respective device, but we want to allow multiple (sub)mounts per single connection, and then the corresponding filesystem is not going to be so trivial to obtain.
Quoted 8 lines
Storing a pointer to the associated
fuse_connin everyfuse_reqwill allow us to trivially find any request's superblock (and thus filesystem) even then.Signed-off-by Max Reitz <[email protected]>Reviewed-by Stefan Hajnoczi <[email protected]>Signed-off-by Miklos Szeredi <[email protected]>Stable-dep-of:
b1fe686a765e("fuse: don't unhash root")
Why are this and the following patch marked as dependencies of b1fe686a765e ("fuse: don't unhash root")?
I think they are completely independent. While backporting them is
probably harmless, it should not be needed.
Thanks,
Miklos
Greg Kroah-Hartman
maintainerRe: [PATCH 5.4 045/215] fuse: store fuse_conn in fuse_req
Quoted 25 lines · Miklos Szeredi
Quoted 14 lines · Greg Kroah-Hartman
5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Max Reitz <[email protected]>
[ Upstream commit
24754db2728a87c513cc480c70c09072a7a40ba6]Every
fuse_reqbelongs to afuse_conn. Right now, we always know whichfuse_connthat is based on the respective device, but we want to allow multiple (sub)mounts per single connection, and then the corresponding filesystem is not going to be so trivial to obtain.Quoted 8 lines
Storing a pointer to the associated
fuse_connin everyfuse_reqwill allow us to trivially find any request's superblock (and thus filesystem) even then.Signed-off-by Max Reitz <[email protected]>Reviewed-by Stefan Hajnoczi <[email protected]>Signed-off-by Miklos Szeredi <[email protected]>Stable-dep-of:
b1fe686a765e("fuse: don't unhash root")
Quoted 5 lines
Why are this and the following patch marked as dependencies of
b1fe686a765e("fuse: don't unhash root")?I think they are completely independent. While backporting them is
probably harmless, it should not be needed.
Good point, they were not needed, now dropped both of them, thanks for the review!
greg k-h
Greg Kroah-Hartman
maintainerPATCH 46/215 fuse: drop fuse_conn parameter where possible
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Max Reitz <[email protected]>
[ Upstream commit 8f622e9497bbbd5df4675edf782500cd9fe961ba ]
With the last commit, all functions that handle some existing fuse_req no longer need to be given the associated fuse_conn, because they can get it from the fuse_req object.
Stable-dep-of: b1fe686a765e ("fuse: don't unhash root")
--- fs/fuse/dev.c | 70 +++++++++++++++++++++++++-------------------- fs/fuse/fuse_i.h | 2 +- fs/fuse/virtio_fs.c | 8 ++---- 3 files changed, 43 insertions(+), 37 deletions(-)
fs/fuse/dev.c +39 -31
@@ -101,7 +101,7 @@ static void fuse_drop_waiting(struct fuse_conn *fc) } } -static void fuse_put_request (struct fuse_conn *fc,struct fuse_req *req); +static void fuse_put_request (struct fuse_req *req);static struct fuse_req *fuse_get_req (struct fuse_conn *fc,bool for_background) {
@@ -144,7 +144,7 @@ static struct fuse_req *fuse_get_req(struct fuse_conn *fc, bool for_background)if (unlikely (req->in.h.uid == ((uid_t)-1 ) || req->in.h.gid == ((gid_t)-1 ))) { -fuse_put_request (fc, req); +fuse_put_request (req);return ERR_PTR (-EOVERFLOW ); }return req;
@@ -154,8 +154,10 @@ static struct fuse_req *fuse_get_req(struct fuse_conn *fc, bool for_background)return ERR_PTR (err); } -static void fuse_put_request (struct fuse_conn *fc,struct fuse_req *req) +static void fuse_put_request (struct fuse_req *req) { +struct fuse_conn *fc = req->fc; +if (refcount_dec_and_test (&req->count)) {if (test_bit (FR_BACKGROUND , &req->flags)) {/*
@@ -274,8 +276,9 @@ static void flush_bg_queue(struct fuse_conn *fc)* the 'end' callback is called if given, else the reference to the * request is released */ -void fuse_request_end (struct fuse_conn *fc,struct fuse_req *req) +void fuse_request_end (struct fuse_req *req) { +struct fuse_conn *fc = req->fc;struct fuse_iqueue *fiq = &fc->iq;if (test_and_set_bit (FR_FINISHED , &req->flags))
@@ -326,12 +329,14 @@ void fuse_request_end(struct fuse_conn *fc, struct fuse_req *req)if (test_bit (FR_ASYNC , &req->flags)) req->args->end (fc, req->args, req->out.h.error); put_request: -fuse_put_request (fc, req); +fuse_put_request (req); }EXPORT_SYMBOL_GPL (fuse_request_end); -static int queue_interrupt (struct fuse_iqueue *fiq,struct fuse_req *req) +static int queue_interrupt (struct fuse_req *req) { +struct fuse_iqueue *fiq = &req->fc->iq; +spin_lock (&fiq->lock);/* Check for we've sent request to interrupt this req */ if (unlikely (!test_bit (FR_INTERRUPTED , &req->flags))) {
@@ -358,8 +363,9 @@ static int queue_interrupt(struct fuse_iqueue *fiq, struct fuse_req *req)return 0 ; } -static void request_wait_answer (struct fuse_conn *fc,struct fuse_req *req) +static void request_wait_answer (struct fuse_req *req) { +struct fuse_conn *fc = req->fc;struct fuse_iqueue *fiq = &fc->iq;int err;
@@ -374,7 +380,7 @@ static void request_wait_answer(struct fuse_conn *fc, struct fuse_req *req)/* matches barrier in fuse_dev_do_read() */ smp_mb__after_atomic ();if (test_bit (FR_SENT , &req->flags)) -queue_interrupt (fiq, req); +queue_interrupt (req); }if (!test_bit (FR_FORCE , &req->flags)) {
@@ -403,9 +409,9 @@ static void request_wait_answer(struct fuse_conn *fc, struct fuse_req *req)wait_event (req->waitq,test_bit (FR_FINISHED , &req->flags)); } -static void __fuse_request_send (struct fuse_conn *fc,struct fuse_req *req) +static void __fuse_request_send (struct fuse_req *req) { -struct fuse_iqueue *fiq = &fc->iq; +struct fuse_iqueue *fiq = &req->fc->iq;BUG_ON (test_bit (FR_BACKGROUND , &req->flags));spin_lock (&fiq->lock);
@@ -419,7 +425,7 @@ static void __fuse_request_send(struct fuse_conn *fc, struct fuse_req *req)__fuse_get_request (req);queue_request_and_unlock (fiq, req); -request_wait_answer (fc, req); +request_wait_answer (req);/* Pairs with smp_wmb() in fuse_request_end() */ smp_rmb (); }
@@ -458,8 +464,10 @@ static void fuse_adjust_compat(struct fuse_conn *fc, struct fuse_args *args) } } -static void fuse_force_creds (struct fuse_conn *fc,struct fuse_req *req) +static void fuse_force_creds (struct fuse_req *req) { +struct fuse_conn *fc = req->fc; + req->in.h.uid =from_kuid_munged (fc->user_ns,current_fsuid ()); req->in.h.gid =from_kgid_munged (fc->user_ns,current_fsgid ()); req->in.h.pid =pid_nr_ns (task_pid (current), fc->pid_ns);
@@ -484,7 +492,7 @@ ssize_t fuse_simple_request(struct fuse_conn *fc, struct fuse_args *args) req =fuse_request_alloc (fc,GFP_KERNEL | __GFP_NOFAIL);if (!args->nocreds) -fuse_force_creds (fc, req); +fuse_force_creds (req);__set_bit (FR_WAITING , &req->flags);__set_bit (FR_FORCE , &req->flags);
@@ -501,20 +509,20 @@ ssize_t fuse_simple_request(struct fuse_conn *fc, struct fuse_args *args)if (!args->noreply)__set_bit (FR_ISREPLY , &req->flags); -__fuse_request_send (fc, req); +__fuse_request_send (req); ret = req->out.h.error;if (!ret && args->out_argvar) {BUG_ON (args->out_numargs ==0 ); ret = args->out_args[args->out_numargs -1 ].size; } -fuse_put_request (fc, req); +fuse_put_request (req);return ret; } -static bool fuse_request_queue_background (struct fuse_conn *fc, -struct fuse_req *req) +static bool fuse_request_queue_background (struct fuse_req *req) { +struct fuse_conn *fc = req->fc;bool queued = false;WARN_ON (!test_bit (FR_BACKGROUND , &req->flags));
@@ -561,8 +569,8 @@ int fuse_simple_background(struct fuse_conn *fc, struct fuse_args *args,fuse_args_to_req (req, args); -if (!fuse_request_queue_background (fc, req)) { -fuse_put_request (fc, req); +if (!fuse_request_queue_background (req)) { +fuse_put_request (req);return -ENOTCONN ; }
@@ -592,7 +600,7 @@ static int fuse_simple_notify_reply(struct fuse_conn *fc, }else { err = -ENODEV ;spin_unlock (&fiq->lock); -fuse_put_request (fc, req); +fuse_put_request (req); }return err;
@@ -1277,7 +1285,7 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file,/* SETXATTR is special, since it may contain too large data */ if (args->opcode ==FUSE_SETXATTR ) req->out.h.error = -E2BIG ; -fuse_request_end (fc, req); +fuse_request_end (req); goto restart; }spin_lock (&fpq->lock);
@@ -1320,8 +1328,8 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file,/* matches barrier in request_wait_answer() */ smp_mb__after_atomic ();if (test_bit (FR_INTERRUPTED , &req->flags)) -queue_interrupt (fiq, req); -fuse_put_request (fc, req); +queue_interrupt (req); +fuse_put_request (req);return reqsize;
@@ -1329,7 +1337,7 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file,if (!test_bit (FR_PRIVATE , &req->flags))list_del_init (&req->list);spin_unlock (&fpq->lock); -fuse_request_end (fc, req); +fuse_request_end (req);return err; err_unlock:
@@ -1911,9 +1919,9 @@ static ssize_t fuse_dev_do_write(struct fuse_dev *fud,else if (oh.error == -ENOSYS ) fc->no_interrupt =1 ;else if (oh.error == -EAGAIN ) - err =queue_interrupt (&fc->iq, req); + err =queue_interrupt (req); -fuse_put_request (fc, req); +fuse_put_request (req); goto copy_finish; }
@@ -1943,7 +1951,7 @@ static ssize_t fuse_dev_do_write(struct fuse_dev *fud,list_del_init (&req->list);spin_unlock (&fpq->lock); -fuse_request_end (fc, req); +fuse_request_end (req); out:return err ? err : nbytes;
@@ -2079,7 +2087,7 @@ static __poll_t fuse_dev_poll(struct file *file, poll_table *wait) }/* Abort all requests on the given list (pending or processing) */ -static void end_requests (struct fuse_conn *fc,struct list_head *head) +static void end_requests (struct list_head *head) {while (!list_empty (head)) {struct fuse_req *req;
@@ -2087,7 +2095,7 @@ static void end_requests(struct fuse_conn *fc, struct list_head *head) req->out.h.error = -ECONNABORTED ;clear_bit (FR_SENT , &req->flags);list_del_init (&req->list); -fuse_request_end (fc, req); +fuse_request_end (req); } }
@@ -2182,7 +2190,7 @@ void fuse_abort_conn(struct fuse_conn *fc)wake_up_all (&fc->blocked_waitq);spin_unlock (&fc->lock); -end_requests (fc, &to_end); +end_requests (&to_end); }else {spin_unlock (&fc->lock); }
@@ -2212,7 +2220,7 @@ int fuse_dev_release(struct inode *inode, struct file *file)list_splice_init (&fpq->processing[i], &to_end);spin_unlock (&fpq->lock); -end_requests (fc, &to_end); +end_requests (&to_end);/* Are we the last open device? */ if (atomic_dec_and_test (&fc->dev_count)) {
fs/fuse/fuse_i.h +1 -1
@@ -941,7 +941,7 @@ int fuse_simple_background(struct fuse_conn *fc, struct fuse_args *args,/** * End a finished request */ -void fuse_request_end (struct fuse_conn *fc,struct fuse_req *req); +void fuse_request_end (struct fuse_req *req);/* Abort all requests */ void fuse_abort_conn (struct fuse_conn *fc);
fs/fuse/virtio_fs.c +3 -5
@@ -268,7 +268,6 @@ static void virtio_fs_request_dispatch_work(struct work_struct *work)struct fuse_req *req; struct virtio_fs_vq *fsvq = container_of(work, struct virtio_fs_vq, dispatch_work.work); -struct fuse_conn *fc = fsvq->fud->fc;int ret;pr_debug ("virtio-fs: worker %s called.\n" , __func__);
@@ -283,7 +282,7 @@ static void virtio_fs_request_dispatch_work(struct work_struct *work)list_del_init (&req->list);spin_unlock (&fsvq->lock); -fuse_request_end (fc, req); +fuse_request_end (req); }/* Dispatch pending requests */
@@ -314,7 +313,7 @@ static void virtio_fs_request_dispatch_work(struct work_struct *work)spin_unlock (&fsvq->lock);pr_err ("virtio-fs: virtio_fs_enqueue_req() failed %d\n" , ret); -fuse_request_end (fc, req); +fuse_request_end (req); } } }
@@ -453,7 +452,6 @@ static void virtio_fs_request_complete(struct fuse_req *req, struct virtio_fs_vq *fsvq) {struct fuse_pqueue *fpq = &fsvq->fud->pq; -struct fuse_conn *fc = fsvq->fud->fc;struct fuse_args *args;struct fuse_args_pages *ap;unsigned int len, i, thislen;
@@ -486,7 +484,7 @@ static void virtio_fs_request_complete(struct fuse_req *req,clear_bit (FR_SENT , &req->flags);spin_unlock (&fpq->lock); -fuse_request_end (fc, req); +fuse_request_end (req);spin_lock (&fsvq->lock);dec_in_flight_req (fsvq);spin_unlock (&fsvq->lock);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 47/215 fuse: dont unhash root
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miklos Szeredi <[email protected]>
[ Upstream commit b1fe686a765e6c0d71811d825b5a1585a202b777 ]
The root inode is assumed to be always hashed. Do not unhash the root inode even if it is marked BAD.
--- fs/fuse/fuse_i.h | 1 - fs/fuse/inode.c | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-)
fs/fuse/fuse_i.h +0 -1
@@ -795,7 +795,6 @@ static inline u64 fuse_get_attr_version(struct fuse_conn *fc)static inline void fuse_make_bad (struct inode *inode) { -remove_inode_hash (inode);set_bit (FUSE_I_BAD , &get_fuse_inode (inode)->state); }
fs/fuse/inode.c +5 -2
@@ -313,8 +313,11 @@ struct inode *fuse_iget(struct super_block *sb, u64 nodeid, }else if ((inode->i_mode ^ attr->mode) &S_IFMT ) {/* Inode has changed type, any I/O on the old should fail */ fuse_make_bad (inode); -iput (inode); - goto retry; +if (inode !=d_inode (sb->s_root)) { +remove_inode_hash (inode); +iput (inode); + goto retry; + } } fi =get_fuse_inode (inode);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 48/215 btrfs: fix off-by-one chunk length calculation at contains_pending_extent()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Filipe Manana <[email protected]>
[ Upstream commit ae6bd7f9b46a29af52ebfac25d395757e2031d0d ]
At contains_pending_extent() the value of the end offset of a chunk we found in the device's allocation state io tree is inclusive, so when we calculate the length we pass to the in_range() macro, we must sum 1 to the expression "physical_end - physical_offset".
In practice the wrong calculation should be harmless as chunks sizes are never 1 byte and we should never have 1 byte ranges of unallocated space. Nevertheless fix the wrong calculation.
--- fs/btrfs/volumes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/volumes.c +1 -1
@@ -1638,7 +1638,7 @@ static bool contains_pending_extent(struct btrfs_device *device, u64 *start,if (in_range (physical_start, *start, len) ||in_range (*start, physical_start, - physical_end - physical_start)) { + physical_end +1 - physical_start)) { *start = physical_end +1 ;return true; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 49/215 PCI: Drop pci_device_remove() test of pci_dev->driver
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit 097d9d414433315122f759ee6c2d8a7417a8ff0f ]
When the driver core calls pci_device_remove(), there is a driver bound to the device, so pci_dev->driver is never NULL.
Remove the unnecessary test of pci_dev->driver.
Stable-dep-of: 9d5286d4e7f6 ("PCI/PM: Drain runtime-idle callbacks before driver removal")
--- drivers/pci/pci-driver.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/pci/pci-driver.c +7 -9
@@ -439,16 +439,14 @@ static int pci_device_remove(struct device *dev)struct pci_dev *pci_dev =to_pci_dev (dev);struct pci_driver *drv = pci_dev->driver; -if (drv) { -if (drv->remove) { -pm_runtime_get_sync (dev); - drv->remove (pci_dev); -pm_runtime_put_noidle (dev); - } -pcibios_free_irq (pci_dev); - pci_dev->driver =NULL ; -pci_iov_remove (pci_dev); +if (drv->remove) { +pm_runtime_get_sync (dev); + drv->remove (pci_dev); +pm_runtime_put_noidle (dev); } +pcibios_free_irq (pci_dev); + pci_dev->driver =NULL ; +pci_iov_remove (pci_dev);/* Undo the runtime PM settings in local_pci_probe() */ pm_runtime_put_sync (dev);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 50/215 PCI/PM: Drain runtime-idle callbacks before driver removal
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafael J. Wysocki <[email protected]>
[ Upstream commit 9d5286d4e7f68beab450deddbb6a32edd5ecf4bf ]
A race condition between the .runtime_idle() callback and the .remove() callback in the rtsx_pcr PCI driver leads to a kernel crash due to an unhandled page fault [1].
The problem is that rtsx_pci_runtime_idle() is not expected to be running after pm_runtime_get_sync() has been called, but the latter doesn't really guarantee that. It only guarantees that the suspend and resume callbacks will not be running when it returns.
However, if a .runtime_idle() callback is already running when pm_runtime_get_sync() is called, the latter will notice that the runtime PM status of the device is RPM_ACTIVE and it will return right away without waiting for the former to complete. In fact, it cannot wait for .runtime_idle() to complete because it may be called from that callback (it arguably does not make much sense to do that, but it is not strictly prohibited).
Thus in general, whoever is providing a .runtime_idle() callback needs to protect it from running in parallel with whatever code runs after pm_runtime_get_sync(). [Note that .runtime_idle() will not start after pm_runtime_get_sync() has returned, but it may continue running then if it has started earlier.]
One way to address that race condition is to call pm_runtime_barrier() after pm_runtime_get_sync() (not before it, because a nonzero value of the runtime PM usage counter is necessary to prevent runtime PM callbacks from being invoked) to wait for the .runtime_idle() callback to complete should it be running at that point. A suitable place for doing that is in pci_device_remove() which calls pm_runtime_get_sync() before removing the driver, so it may as well call pm_runtime_barrier() subsequently, which will prevent the race in question from occurring, not just in the rtsx_pcr driver, but in any PCI drivers providing .runtime_idle() callbacks.
--- drivers/pci/pci-driver.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/pci/pci-driver.c +7 -0
@@ -441,6 +441,13 @@ static int pci_device_remove(struct device *dev)if (drv->remove) {pm_runtime_get_sync (dev); +/* +* If the driver provides a .runtime_idle() callback and it has +* started to run already, it may continue to run in parallel +* with the code below, so wait until all of the runtime PM +* activity has completed. +*/ +pm_runtime_barrier (dev); drv->remove (pci_dev);pm_runtime_put_noidle (dev); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 51/215 Revert "Revert "md/raid5: Wait for MD_SB_CHANGE_PENDING in raid5d""
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Song Liu <[email protected]>
[ Upstream commit 3445139e3a594be77eff48bc17eff67cf983daed ]
This reverts commit bed9e27baf52a09b7ba2a3714f1e24e17ced386d.
The original set [1][2] was expected to undo a suboptimal fix in [2], and replace it with a better fix [1]. However, as reported by Dan Moulding [2] causes an issue with raid5 with journal device.
Revert [2] for now to close the issue. We will follow up on another issue reported by Juxiao Bi, as [2] is expected to fix it. We believe this is a good trade-off, because the latter issue happens less freqently.
In the meanwhile, we will NOT revert [1], as it contains the right logic.
[1] commit d6e035aad6c0 ("md: bypass block throttle for superblock update")
[2] commit bed9e27baf52 ("Revert "md/raid5: Wait for MD_SB_CHANGE_PENDING in raid5d"")
--- drivers/md/raid5.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/md/raid5.c +12 -0
@@ -36,6 +36,7 @@*/ #include <linux/blkdev.h> +#include <linux/delay.h> #include <linux/kthread.h> #include <linux/raid/pq.h> #include <linux/async_tx.h>
@@ -6334,7 +6335,18 @@ static void raid5d(struct md_thread *thread)spin_unlock_irq (&conf->device_lock);md_check_recovery (mddev);spin_lock_irq (&conf->device_lock); + +/* +* Waiting on MD_SB_CHANGE_PENDING below may deadlock +* seeing md_check_recovery() is needed to clear +* the flag when using mdmon. +*/ +continue ; } + +wait_event_lock_irq (mddev->sb_wait, + !test_bit (MD_SB_CHANGE_PENDING , &mddev->sb_flags), + conf->device_lock); }pr_debug ("%d stripes handled\n" , handled);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 52/215 dm-raid: fix lockdep waring in "pers->hot_add_disk"
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yu Kuai <[email protected]>
[ Upstream commit 95009ae904b1e9dca8db6f649f2d7c18a6e42c75 ]
The lockdep assert is added by commit a448af25becf ("md/raid10: remove rcu protection to access rdev from conf") in print_conf(). And I didn't notice that dm-raid is calling "pers->hot_add_disk" without holding 'reconfig_mutex'.
"pers->hot_add_disk" read and write many fields that is protected by 'reconfig_mutex', and raid_resume() already grab the lock in other contex. Hence fix this problem by protecting "pers->host_add_disk" with the lock.
--- drivers/md/dm-raid.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/md/dm-raid.c +2 -0
@@ -4027,7 +4027,9 @@ static void raid_resume(struct dm_target *ti)* Take this opportunity to check whether any failed * devices are reachable again. */ +mddev_lock_nointr (mddev);attempt_restore_of_faulty_devices (rs); +mddev_unlock (mddev); }if (test_and_clear_bit (RT_FLAG_RS_SUSPENDED , &rs->runtime_flags)) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 53/215 mmc: core: Fix switch on gp3 partition
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dominique Martinet <[email protected]>
[ Upstream commit 4af59a8df5ea930038cd3355e822f5eedf4accc1 ]
Commit e7794c14fd73 ("mmc: rpmb: fixes pause retune on all RPMB partitions.") added a mask check for 'part_type', but the mask used was wrong leading to the code intended for rpmb also being executed for GP3.
On some MMCs (but not all) this would make gp3 partition inaccessible:
armadillo:~# head -c 1 < /dev/mmcblk2gp3 head: standard input: I/O error armadillo:~# dmesg -c [ 422.976583] mmc2: running CQE recovery [ 423.058182] mmc2: running CQE recovery [ 423.137607] mmc2: running CQE recovery [ 423.137802] blk_update_request: I/O error, dev mmcblk2gp3, sector 0 op 0x0:(READ) flags 0x80700 phys_seg 4 prio class 0 [ 423.237125] mmc2: running CQE recovery [ 423.318206] mmc2: running CQE recovery [ 423.397680] mmc2: running CQE recovery [ 423.397837] blk_update_request: I/O error, dev mmcblk2gp3, sector 0 op 0x0:(READ) flags 0x0 phys_seg 1 prio class 0 [ 423.408287] Buffer I/O error on dev mmcblk2gp3, logical block 0, async page read
the part_type values of interest here are defined as follow:
main 0
boot0 1
boot1 2
rpmb 3 gp0 4 gp1 5 gp2 6 gp3 7
so mask with EXT_CSD_PART_CONFIG_ACC_MASK (7) to correctly identify rpmb
--- drivers/mmc/core/block.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/mmc/core/block.c +6 -4
@@ -873,10 +873,11 @@ static const struct block_device_operations mmc_bdops = {static int mmc_blk_part_switch_pre (struct mmc_card *card,unsigned int part_type) { -const unsigned int mask =EXT_CSD_PART_CONFIG_ACC_RPMB ; +const unsigned int mask =EXT_CSD_PART_CONFIG_ACC_MASK ; +const unsigned int rpmb =EXT_CSD_PART_CONFIG_ACC_RPMB ;int ret =0 ; -if ((part_type & mask) == mask) { +if ((part_type & mask) == rpmb) {if (card->ext_csd.cmdq_en) { ret =mmc_cmdq_disable (card);if (ret)
@@ -891,10 +892,11 @@ static int mmc_blk_part_switch_pre(struct mmc_card *card,static int mmc_blk_part_switch_post (struct mmc_card *card,unsigned int part_type) { -const unsigned int mask =EXT_CSD_PART_CONFIG_ACC_RPMB ; +const unsigned int mask =EXT_CSD_PART_CONFIG_ACC_MASK ; +const unsigned int rpmb =EXT_CSD_PART_CONFIG_ACC_RPMB ;int ret =0 ; -if ((part_type & mask) == mask) { +if ((part_type & mask) == rpmb) {mmc_retune_unpause (card->host);if (card->reenable_cmdq && !card->ext_csd.cmdq_en) ret =mmc_cmdq_enable (card);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 54/215 hwmon: (amc6821) add of_match table
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josua Mayer <[email protected]>
[ Upstream commit 3f003fda98a7a8d5f399057d92e6ed56b468657c ]
Add of_match table for "ti,amc6821" compatible string.
This fixes automatic driver loading by userspace when using device-tree, and if built as a module like major linux distributions do.
While devices probe just fine with i2c_device_id table, userspace can't match the "ti,amc6821" compatible string from dt with the plain "amc6821" device id. As a result, the kernel module can not be loaded.
--- drivers/hwmon/amc6821.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/hwmon/amc6821.c +11 -0
@@ -935,10 +935,21 @@ static const struct i2c_device_id amc6821_id[] = {MODULE_DEVICE_TABLE (i2c, amc6821_id); +static const struct of_device_id __maybe_unused amc6821_of_match[] = { + { + .compatible ="ti,amc6821" , + .data = (void *)amc6821, + }, + { } +}; + +MODULE_DEVICE_TABLE (of, amc6821_of_match); +static struct i2c_driver amc6821_driver = { .class =I2C_CLASS_HWMON , .driver = { .name ="amc6821" , + .of_match_table =of_match_ptr (amc6821_of_match), }, .probe = amc6821_probe, .id_table = amc6821_id,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 55/215 ext4: fix corruption during on-line resize
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maximilian Heyne <[email protected]>
[ Upstream commit a6b3bfe176e8a5b05ec4447404e412c2a3fc92cc ]
We observed a corruption during on-line resize of a file system that is larger than 16 TiB with 4k block size. With having more then 2^32 blocks resize_inode is turned off by default by mke2fs. The issue can be reproduced on a smaller file system for convenience by explicitly turning off resize_inode. An on-line resize across an 8 GiB boundary (the size of a meta block group in this setup) then leads to a corruption:
dev=/dev/<some_dev> # should be >= 16 GiB mkdir -p /corruption /sbin/mke2fs -t ext4 -b 4096 -O ^resize_inode $dev $((2 * 2**21 - 2**15)) mount -t ext4 $dev /corruption dd if=/dev/zero bs=4096 of=/corruption/test count=$((2*2**21 - 4*2**15)) sha1sum /corruption/test # 79d2658b39dcfd77274e435b0934028adafaab11 /corruption/test /sbin/resize2fs $dev $((2*2**21)) # drop page cache to force reload the block from disk echo 1 > /proc/sys/vm/drop_caches
sha1sum /corruption/test
# 3c2abc63cbf1a94c9e6977e0fbd72cd832c4d5c3 /corruption/test
2^21 = 2^15*2^6 equals 8 GiB whereof 2^15 is the number of blocks per block group and 2^6 are the number of block groups that make a meta block group.
The last checksum might be different depending on how the file is laid out across the physical blocks. The actual corruption occurs at physical block 63*2^15 = 2064384 which would be the location of the backup of the meta block group's block descriptor. During the on-line resize the file system will be converted to meta_bg starting at s_first_meta_bg which is 2 in the example - meaning all block groups after 16 GiB. However, in ext4_flex_group_add we might add block groups that are not part of the first meta block group yet. In the reproducer we achieved this by substracting the size of a whole block group from the point where the meta block group would start. This must be considered when updating the backup block group descriptors to follow the non-meta_bg layout. The fix is to add a test whether the group to add is already part of the meta block group or not.
--- fs/ext4/resize.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/ext4/resize.c +2 -1
@@ -1567,7 +1567,8 @@ static int ext4_flex_group_add(struct super_block *sb,int gdb_num = group /EXT4_DESC_PER_BLOCK (sb);int gdb_num_end = ((group + flex_gd->count -1 ) /EXT4_DESC_PER_BLOCK (sb)); -int meta_bg =ext4_has_feature_meta_bg (sb); +int meta_bg =ext4_has_feature_meta_bg (sb) && + gdb_num >=le32_to_cpu (es->s_first_meta_bg);sector_t padding_blocks = meta_bg ?0 : sbi->s_sbh->b_blocknr -ext4_group_first_block_no (sb,0 );sector_t old_gdb =0 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 56/215 firmware: meson_sm: Rework driver as a proper platform driver
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Carlo Caione <[email protected]>
[ Upstream commit 8cde3c2153e8f57be884c0e73f18bc4de150e870 ]
The secure monitor driver is currently a frankenstein driver which is registered as a platform driver but its functionality goes through a global struct accessed by the consumer drivers using exported helper functions.
Try to tidy up the driver moving the firmware struct into the driver data and make the consumer drivers referencing the secure-monitor using a new property in the DT.
Currently only the nvmem driver is using this API so we can fix it in the same commit.
Stable-dep-of: cbd38332c140 ("nvmem: meson-efuse: fix function pointer type mismatch")
--- drivers/firmware/meson/meson_sm.c | 94 +++++++++++++++++-------- drivers/nvmem/meson-efuse.c | 24 ++++++- include/linux/firmware/meson/meson_sm.h | 15 ++-- 3 files changed, 94 insertions(+), 39 deletions(-)
drivers/firmware/meson/meson_sm.c +64 -30
@@ -54,8 +54,6 @@ struct meson_sm_firmware {void __iomem *sm_shmem_out_base; }; -static struct meson_sm_firmware fw; -static u32 meson_sm_get_cmd (const struct meson_sm_chip *chip,unsigned int cmd_index) {
@@ -90,6 +88,7 @@ static void __iomem *meson_sm_map_shmem(u32 cmd_shmem, unsigned int size)/** * meson_sm_call - generic SMC32 call to the secure-monitor * +* @fw: Pointer to secure-monitor firmware * @cmd_index: Index of the SMC32 function ID * @ret: Returned value * @arg0: SMC32 Argument 0
@@ -100,15 +99,15 @@ static void __iomem *meson_sm_map_shmem(u32 cmd_shmem, unsigned int size)* * Return: 0 on success, a negative value on error */ -int meson_sm_call (unsigned int cmd_index,u32 *ret,u32 arg0, -u32 arg1,u32 arg2,u32 arg3,u32 arg4) +int meson_sm_call (struct meson_sm_firmware *fw,unsigned int cmd_index, +u32 *ret,u32 arg0,u32 arg1,u32 arg2,u32 arg3,u32 arg4) {u32 cmd, lret; -if (!fw.chip) +if (!fw->chip)return -ENOENT ; - cmd =meson_sm_get_cmd (fw.chip, cmd_index); + cmd =meson_sm_get_cmd (fw->chip, cmd_index);if (!cmd)return -EINVAL ;
@@ -124,6 +123,7 @@ EXPORT_SYMBOL(meson_sm_call);/** * meson_sm_call_read - retrieve data from secure-monitor * +* @fw: Pointer to secure-monitor firmware * @buffer: Buffer to store the retrieved data * @bsize: Size of the buffer * @cmd_index: Index of the SMC32 function ID
@@ -137,22 +137,23 @@ EXPORT_SYMBOL(meson_sm_call);* When 0 is returned there is no guarantee about the amount of * data read and bsize bytes are copied in buffer. */ -int meson_sm_call_read (void *buffer,unsigned int bsize,unsigned int cmd_index, -u32 arg0,u32 arg1,u32 arg2,u32 arg3,u32 arg4) +int meson_sm_call_read (struct meson_sm_firmware *fw,void *buffer, +unsigned int bsize,unsigned int cmd_index,u32 arg0, +u32 arg1,u32 arg2,u32 arg3,u32 arg4) {u32 size;int ret; -if (!fw.chip) +if (!fw->chip)return -ENOENT ; -if (!fw.chip->cmd_shmem_out_base) +if (!fw->chip->cmd_shmem_out_base)return -EINVAL ; -if (bsize > fw.chip->shmem_size) +if (bsize > fw->chip->shmem_size)return -EINVAL ; -if (meson_sm_call (cmd_index, &size, arg0, arg1, arg2, arg3, arg4) <0 ) +if (meson_sm_call (fw, cmd_index, &size, arg0, arg1, arg2, arg3, arg4) <0 )return -EINVAL ;if (size > bsize)
@@ -164,7 +165,7 @@ int meson_sm_call_read(void *buffer, unsigned int bsize, unsigned int cmd_index, size = bsize;if (buffer) -memcpy (buffer, fw.sm_shmem_out_base, size); +memcpy (buffer, fw->sm_shmem_out_base, size);return ret; }
@@ -173,6 +174,7 @@ EXPORT_SYMBOL(meson_sm_call_read);/** * meson_sm_call_write - send data to secure-monitor * +* @fw: Pointer to secure-monitor firmware * @buffer: Buffer containing data to send * @size: Size of the data to send * @cmd_index: Index of the SMC32 function ID
@@ -184,23 +186,24 @@ EXPORT_SYMBOL(meson_sm_call_read);* * Return: size of sent data on success, a negative value on error */ -int meson_sm_call_write (void *buffer,unsigned int size,unsigned int cmd_index, -u32 arg0,u32 arg1,u32 arg2,u32 arg3,u32 arg4) +int meson_sm_call_write (struct meson_sm_firmware *fw,void *buffer, +unsigned int size,unsigned int cmd_index,u32 arg0, +u32 arg1,u32 arg2,u32 arg3,u32 arg4) {u32 written; -if (!fw.chip) +if (!fw->chip)return -ENOENT ; -if (size > fw.chip->shmem_size) +if (size > fw->chip->shmem_size)return -EINVAL ; -if (!fw.chip->cmd_shmem_in_base) +if (!fw->chip->cmd_shmem_in_base)return -EINVAL ; -memcpy (fw.sm_shmem_in_base, buffer, size); +memcpy (fw->sm_shmem_in_base, buffer, size); -if (meson_sm_call (cmd_index, &written, arg0, arg1, arg2, arg3, arg4) <0 ) +if (meson_sm_call (fw, cmd_index, &written, arg0, arg1, arg2, arg3, arg4) <0 )return -EINVAL ;if (!written)
@@ -210,6 +213,24 @@ int meson_sm_call_write(void *buffer, unsigned int size, unsigned int cmd_index, }EXPORT_SYMBOL (meson_sm_call_write); +/** +* meson_sm_get - get pointer to meson_sm_firmware structure. +* +* @sm_node: Pointer to the secure-monitor Device Tree node. +* +* Return: NULL is the secure-monitor device is not ready. +*/ +struct meson_sm_firmware *meson_sm_get (struct device_node *sm_node) +{ +struct platform_device *pdev =of_find_device_by_node (sm_node); + +if (!pdev) +return NULL ; + +return platform_get_drvdata (pdev); +} +EXPORT_SYMBOL_GPL (meson_sm_get); +#define SM_CHIP_ID_LENGTH 119#define SM_CHIP_ID_OFFSET 4#define SM_CHIP_ID_SIZE 12
@@ -217,14 +238,18 @@ EXPORT_SYMBOL(meson_sm_call_write);static ssize_t serial_show (struct device *dev,struct device_attribute *attr,char *buf) { +struct platform_device *pdev =to_platform_device (dev); +struct meson_sm_firmware *fw;uint8_t *id_buf;int ret; + fw =platform_get_drvdata (pdev); + id_buf =kmalloc (SM_CHIP_ID_LENGTH ,GFP_KERNEL );if (!id_buf)return -ENOMEM ; - ret =meson_sm_call_read (id_buf,SM_CHIP_ID_LENGTH ,SM_GET_CHIP_ID , + ret =meson_sm_call_read (fw, id_buf,SM_CHIP_ID_LENGTH ,SM_GET_CHIP_ID ,0 ,0 ,0 ,0 ,0 );if (ret <0 ) {kfree (id_buf);
@@ -268,25 +293,34 @@ static const struct of_device_id meson_sm_ids[] = {static int __init meson_sm_probe (struct platform_device *pdev) { +struct device *dev = &pdev->dev;const struct meson_sm_chip *chip; +struct meson_sm_firmware *fw; + + fw =devm_kzalloc (dev,sizeof (*fw),GFP_KERNEL ); +if (!fw) +return -ENOMEM ; - chip =of_match_device (meson_sm_ids, &pdev->dev)->data; + chip =of_match_device (meson_sm_ids, dev)->data;if (chip->cmd_shmem_in_base) { - fw.sm_shmem_in_base =meson_sm_map_shmem (chip->cmd_shmem_in_base, - chip->shmem_size); -if (WARN_ON (!fw.sm_shmem_in_base)) + fw->sm_shmem_in_base =meson_sm_map_shmem (chip->cmd_shmem_in_base, + chip->shmem_size); +if (WARN_ON (!fw->sm_shmem_in_base)) goto out; }if (chip->cmd_shmem_out_base) { - fw.sm_shmem_out_base =meson_sm_map_shmem (chip->cmd_shmem_out_base, - chip->shmem_size); -if (WARN_ON (!fw.sm_shmem_out_base)) + fw->sm_shmem_out_base =meson_sm_map_shmem (chip->cmd_shmem_out_base, + chip->shmem_size); +if (WARN_ON (!fw->sm_shmem_out_base)) goto out_in_base; } - fw.chip = chip; + fw->chip = chip; + +platform_set_drvdata (pdev, fw); +pr_info ("secure-monitor enabled\n" );if (sysfs_create_group (&pdev->dev.kobj, &meson_sm_sysfs_attr_group))
@@ -295,7 +329,7 @@ static int __init meson_sm_probe(struct platform_device *pdev)return 0 ; out_in_base: -iounmap (fw.sm_shmem_in_base); +iounmap (fw->sm_shmem_in_base); out:return -EINVAL ; }
drivers/nvmem/meson-efuse.c +21 -3
@@ -17,14 +17,18 @@static int meson_efuse_read (void *context,unsigned int offset,void *val,size_t bytes) { -return meson_sm_call_read ((u8 *)val, bytes,SM_EFUSE_READ , offset, +struct meson_sm_firmware *fw = context; + +return meson_sm_call_read (fw, (u8 *)val, bytes,SM_EFUSE_READ , offset, bytes,0 ,0 ,0 ); }static int meson_efuse_write (void *context,unsigned int offset,void *val,size_t bytes) { -return meson_sm_call_write ((u8 *)val, bytes,SM_EFUSE_WRITE , offset, +struct meson_sm_firmware *fw = context; + +return meson_sm_call_write (fw, (u8 *)val, bytes,SM_EFUSE_WRITE , offset, bytes,0 ,0 ,0 ); }
@@ -37,12 +41,25 @@ MODULE_DEVICE_TABLE(of, meson_efuse_match);static int meson_efuse_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev; +struct meson_sm_firmware *fw; +struct device_node *sm_np;struct nvmem_device *nvmem;struct nvmem_config *econfig;struct clk *clk;unsigned int size;int ret; + sm_np =of_parse_phandle (pdev->dev.of_node,"secure-monitor" ,0 ); +if (!sm_np) { +dev_err (&pdev->dev,"no secure-monitor node\n" ); +return -ENODEV ; + } + + fw =meson_sm_get (sm_np); +of_node_put (sm_np); +if (!fw) +return -EPROBE_DEFER ; + clk =devm_clk_get (dev,NULL );if (IS_ERR (clk)) { ret =PTR_ERR (clk);
@@ -65,7 +82,7 @@ static int meson_efuse_probe(struct platform_device *pdev)return ret; } -if (meson_sm_call (SM_EFUSE_USER_MAX , &size,0 ,0 ,0 ,0 ,0 ) <0 ) { +if (meson_sm_call (fw,SM_EFUSE_USER_MAX , &size,0 ,0 ,0 ,0 ,0 ) <0 ) {dev_err (dev,"failed to get max user" );return -EINVAL ; }
@@ -81,6 +98,7 @@ static int meson_efuse_probe(struct platform_device *pdev) econfig->reg_read = meson_efuse_read; econfig->reg_write = meson_efuse_write; econfig->size = size; + econfig->priv = fw; nvmem =devm_nvmem_register (&pdev->dev, econfig);
include/linux/firmware/meson/meson_sm.h +9 -6
@@ -16,11 +16,14 @@ enum {struct meson_sm_firmware ; -int meson_sm_call (unsigned int cmd_index,u32 *ret,u32 arg0,u32 arg1, -u32 arg2,u32 arg3,u32 arg4); -int meson_sm_call_write (void *buffer,unsigned int b_size,unsigned int cmd_index, -u32 arg0,u32 arg1,u32 arg2,u32 arg3,u32 arg4); -int meson_sm_call_read (void *buffer,unsigned int bsize,unsigned int cmd_index, -u32 arg0,u32 arg1,u32 arg2,u32 arg3,u32 arg4); +int meson_sm_call (struct meson_sm_firmware *fw,unsigned int cmd_index, +u32 *ret,u32 arg0,u32 arg1,u32 arg2,u32 arg3,u32 arg4); +int meson_sm_call_write (struct meson_sm_firmware *fw,void *buffer, +unsigned int b_size,unsigned int cmd_index,u32 arg0, +u32 arg1,u32 arg2,u32 arg3,u32 arg4); +int meson_sm_call_read (struct meson_sm_firmware *fw,void *buffer, +unsigned int bsize,unsigned int cmd_index,u32 arg0, +u32 arg1,u32 arg2,u32 arg3,u32 arg4); +struct meson_sm_firmware *meson_sm_get (struct device_node *firmware_node);#endif /* _MESON_SM_FW_H_ */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 57/215 nvmem: meson-efuse: fix function pointer type mismatch
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jerome Brunet <[email protected]>
[ Upstream commit cbd38332c140829ab752ba4e727f98be5c257f18 ]
clang-16 warns about casting functions to incompatible types, as is done here to call clk_disable_unprepare:
drivers/nvmem/meson-efuse.c:78:12: error: cast from 'void (*)(struct clk *)' to 'void (*)(void *)' converts to incompatible function type [-Werror,-Wcast-function-type-strict]
78 | (void(*)(void *))clk_disable_unprepare,
The pattern of getting, enabling and setting a disable callback for a clock can be replaced with devm_clk_get_enabled(), which also fixes this warning.
--- drivers/nvmem/meson-efuse.c | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-)
drivers/nvmem/meson-efuse.c +3 -22
@@ -47,7 +47,6 @@ static int meson_efuse_probe(struct platform_device *pdev)struct nvmem_config *econfig;struct clk *clk;unsigned int size; -int ret; sm_np =of_parse_phandle (pdev->dev.of_node,"secure-monitor" ,0 );if (!sm_np) {
@@ -60,27 +59,9 @@ static int meson_efuse_probe(struct platform_device *pdev)if (!fw)return -EPROBE_DEFER ; - clk =devm_clk_get (dev,NULL ); -if (IS_ERR (clk)) { - ret =PTR_ERR (clk); -if (ret != -EPROBE_DEFER ) -dev_err (dev,"failed to get efuse gate" ); -return ret; - } - - ret =clk_prepare_enable (clk); -if (ret) { -dev_err (dev,"failed to enable gate" ); -return ret; - } - - ret =devm_add_action_or_reset (dev, - (void (*)(void *))clk_disable_unprepare, - clk); -if (ret) { -dev_err (dev,"failed to add disable callback" ); -return ret; - } + clk =devm_clk_get_enabled (dev,NULL ); +if (IS_ERR (clk)) +return dev_err_probe (dev,PTR_ERR (clk),"failed to get efuse gate" );if (meson_sm_call (fw,SM_EFUSE_USER_MAX , &size,0 ,0 ,0 ,0 ,0 ) <0 ) {dev_err (dev,"failed to get max user" );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 58/215 slimbus: core: Remove usage of the deprecated ida_simple_xx() API
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <[email protected]>
[ Upstream commit 89ffa4cccec54467446f141a79b9e36893079fb8 ]
ida_alloc() and ida_free() should be preferred to the deprecated ida_simple_get() and ida_simple_remove().
Note that the upper limit of ida_simple_get() is exclusive, but the one of ida_alloc_range() is inclusive. So change this change allows one more device. Previously address 0xFE was never used.
--- drivers/slimbus/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/slimbus/core.c +2 -2
@@ -439,8 +439,8 @@ static int slim_device_alloc_laddr(struct slim_device *sbdev,if (ret <0 ) goto err; }else if (report_present) { - ret =ida_simple_get (&ctrl->laddr_ida, -0 ,SLIM_LA_MANAGER -1 ,GFP_KERNEL ); + ret =ida_alloc_max (&ctrl->laddr_ida, +SLIM_LA_MANAGER -1 ,GFP_KERNEL );if (ret <0 ) goto err;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 59/215 speakup: Fix 8bit characters from direct synth
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Samuel Thibault <[email protected]>
[ Upstream commit b6c8dafc9d86eb77e502bb018ec4105e8d2fbf78 ]
When userland echoes 8bit characters to /dev/synth with e.g.
echo -e '\xe9' > /dev/synth
synth_write would get characters beyond 0x7f, and thus negative when char is signed. When given to synth_buffer_add which takes a u16, this would sign-extend and produce a U+ffxy character rather than U+xy. Users thus get garbled text instead of accents in their output.
Let's fix this by making sure that we read unsigned characters.
--- drivers/staging/speakup/synth.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/staging/speakup/synth.c +3 -1
@@ -208,8 +208,10 @@ void spk_do_flush(void)wake_up_process (speakup_task); } -void synth_write (const char *buf,size_t count) +void synth_write (const char *_buf,size_t count) { +const unsigned char *buf = (const unsigned char *) _buf; +while (count--)synth_buffer_add (*buf++);synth_start ();
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 60/215 kbuild: Move -Wenum-{compare-conditional,enum-conversion} into W=1
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Chancellor <[email protected]>
[ Upstream commit 75b5ab134bb5f657ef7979a59106dce0657e8d87 ]
Clang enables -Wenum-enum-conversion and -Wenum-compare-conditional under -Wenum-conversion. A recent change in Clang strengthened these warnings and they appear frequently in common builds, primarily due to several instances in common headers but there are quite a few drivers that have individual instances as well.
include/linux/vmstat.h:508:43: warning: arithmetic between different enumeration types ('enum zone_stat_item' and 'enum numa_stat_item') [-Wenum-enum-conversion]
508 | return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
| ~~~~~~~~~~~~~~~~~~~~~ ^
509 | item];
| ~~~~ drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c:955:24: warning: conditional expression between different enumeration types ('enum iwl_mac_beacon_flags' and 'enum iwl_mac_beacon_flags_v1') [-Wenum-compare-conditional]
955 | flags |= is_new_rate ? IWL_MAC_BEACON_CCK
| ^ ~~~~~~~~~~~~~~~~~~
956 | : IWL_MAC_BEACON_CCK_V1;
| ~~~~~~~~~~~~~~~~~~~~~
drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c:1120:21: warning: conditional expression between different enumeration types ('enum iwl_mac_beacon_flags' and 'enum iwl_mac_beacon_flags_v1') [-Wenum-compare-conditional]
1120 | 0) > 10 ?
| ^
1121 | IWL_MAC_BEACON_FILS :
| ~~~~~~~~~~~~~~~~~~~
1122 | IWL_MAC_BEACON_FILS_V1;
| ~~~~~~~~~~~~~~~~~~~~~~Doing arithmetic between or returning two different types of enums could be a bug, so each of the instance of the warning needs to be evaluated. Unfortunately, as mentioned above, there are many instances of this warning in many different configurations, which can break the build when CONFIG_WERROR is enabled.
To avoid introducing new instances of the warnings while cleaning up the disruption for the majority of users, disable these warnings for the default build while leaving them on for W=1 builds.
--- scripts/Makefile.extrawarn | 2 ++ 1 file changed, 2 insertions(+)
scripts/Makefile.extrawarn +2 -0
@@ -51,6 +51,8 @@ KBUILD_CFLAGS += -Wno-format-zero-length KBUILD_CFLAGS += $(call cc-disable-warning, pointer-to-enum-cast) KBUILD_CFLAGS += $(call cc-disable-warning, unaligned-access) KBUILD_CFLAGS += $(call cc-disable-warning, cast-function-type-strict) +KBUILD_CFLAGS += -Wno-enum-compare-conditional +KBUILD_CFLAGS += -Wno-enum-enum-conversion endif endif
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 61/215 vfio/platform: Disable virqfds on cleanup
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Williamson <[email protected]>
[ Upstream commit fcdc0d3d40bc26c105acf8467f7d9018970944ae ]
irqfds for mask and unmask that are not specifically disabled by the user are leaked. Remove any irqfds during cleanup
--- drivers/vfio/platform/vfio_platform_irq.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/vfio/platform/vfio_platform_irq.c +4 -1
@@ -321,8 +321,11 @@ void vfio_platform_irq_cleanup(struct vfio_platform_device *vdev) {int i; -for (i =0 ; i < vdev->num_irqs; i++) +for (i =0 ; i < vdev->num_irqs; i++) { +vfio_virqfd_disable (&vdev->irqs[i].mask); +vfio_virqfd_disable (&vdev->irqs[i].unmask);vfio_set_trigger (vdev, i,-1 ,NULL ); + } vdev->num_irqs =0 ;kfree (vdev->irqs);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 62/215 ring-buffer: Fix resetting of shortest_full
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Google) <[email protected]>
[ Upstream commit 68282dd930ea38b068ce2c109d12405f40df3f93 ]
The "shortest_full" variable is used to keep track of the waiter that is waiting for the smallest amount on the ring buffer before being woken up. When a tasks waits on the ring buffer, it passes in a "full" value that is a percentage. 0 means wake up on any data. 1-100 means wake up from 1% to 100% full buffer.
As all waiters are on the same wait queue, the wake up happens for the waiter with the smallest percentage.
The problem is that the smallest_full on the cpu_buffer that stores the smallest amount doesn't get reset when all the waiters are woken up. It does get reset when the ring buffer is reset (echo > /sys/kernel/tracing/trace).
This means that tasks may be woken up more often then when they want to be. Instead, have the shortest_full field get reset just before waking up all the tasks. If the tasks wait again, they will update the shortest_full before sleeping.
Also add locking around setting of shortest_full in the poll logic, and change "work" to "rbwork" to match the variable name for rb_irq_work structures that are used in other places.
Stable-dep-of: 8145f1c35fa6 ("ring-buffer: Fix full_waiters_pending in poll")
--- kernel/trace/ring_buffer.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-)
kernel/trace/ring_buffer.c +23 -7
@@ -601,8 +601,19 @@ static void rb_wake_up_waiters(struct irq_work *work)wake_up_all (&rbwork->waiters);if (rbwork->full_waiters_pending || rbwork->wakeup_full) { +/* Only cpu_buffer sets the above flags */ +struct ring_buffer_per_cpu *cpu_buffer = + container_of(rbwork, struct ring_buffer_per_cpu, irq_work); + +/* Called from interrupt context */ +raw_spin_lock (&cpu_buffer->reader_lock); rbwork->wakeup_full = false; rbwork->full_waiters_pending = false; + +/* Waking up all waiters, they will reset the shortest full */ + cpu_buffer->shortest_full =0 ; +raw_spin_unlock (&cpu_buffer->reader_lock); +wake_up_all (&rbwork->full_waiters); } }
@@ -731,28 +742,33 @@ __poll_t ring_buffer_poll_wait(struct ring_buffer *buffer, int cpu, struct file *filp, poll_table *poll_table, int full) { struct ring_buffer_per_cpu *cpu_buffer; -struct rb_irq_work *work; +struct rb_irq_work *rbwork;if (cpu ==RING_BUFFER_ALL_CPUS ) { - work = &buffer->irq_work; + rbwork = &buffer->irq_work; full =0 ; }else {if (!cpumask_test_cpu (cpu, buffer->cpumask))return EPOLLERR ; cpu_buffer = buffer->buffers[cpu]; - work = &cpu_buffer->irq_work; + rbwork = &cpu_buffer->irq_work; }if (full) { -poll_wait (filp, &work->full_waiters, poll_table); - work->full_waiters_pending = true; +unsigned long flags; + +poll_wait (filp, &rbwork->full_waiters, poll_table); + +raw_spin_lock_irqsave (&cpu_buffer->reader_lock, flags); + rbwork->full_waiters_pending = true;if (!cpu_buffer->shortest_full || cpu_buffer->shortest_full > full) cpu_buffer->shortest_full = full; +raw_spin_unlock_irqrestore (&cpu_buffer->reader_lock, flags); }else { -poll_wait (filp, &work->waiters, poll_table); - work->waiters_pending = true; +poll_wait (filp, &rbwork->waiters, poll_table); + rbwork->waiters_pending = true; }/*
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 63/215 ring-buffer: Fix full_waiters_pending in poll
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt (Google) <[email protected]>
[ Upstream commit 8145f1c35fa648da662078efab299c4467b85ad5 ]
If a reader of the ring buffer is doing a poll, and waiting for the ring buffer to hit a specific watermark, there could be a case where it gets into an infinite ping-pong loop.
The poll code has:
rbwork->full_waiters_pending = true;
if (!cpu_buffer->shortest_full ||
cpu_buffer->shortest_full > full)
cpu_buffer->shortest_full = full;The writer will see full_waiters_pending and check if the ring buffer is filled over the percentage of the shortest_full value. If it is, it calls an irq_work to wake up all the waiters.
But the code could get into a circular loop:
CPU 0 CPU 1
----- -----
[ Poll ]
[ shortest_full = 0 ]
rbwork->full_waiters_pending = true;
if (rbwork->full_waiters_pending &&
[ buffer percent ] > shortest_full) {
rbwork->wakeup_full = true;
[ queue_irqwork ]cpu_buffer->shortest_full = full;
[ IRQ work ]
if (rbwork->wakeup_full) {
cpu_buffer->shortest_full = 0;
wakeup poll waiters;
[woken]
if ([ buffer percent ] > full)
break;
rbwork->full_waiters_pending = true;
if (rbwork->full_waiters_pending &&
[ buffer percent ] > shortest_full) {
rbwork->wakeup_full = true;
[ queue_irqwork ]cpu_buffer->shortest_full = full;
[ IRQ work ]
if (rbwork->wakeup_full) {
cpu_buffer->shortest_full = 0;
wakeup poll waiters;[woken]
[ Wash, rinse, repeat! ]
In the poll, the shortest_full needs to be set before the full_pending_waiters, as once that is set, the writer will compare the current shortest_full (which is incorrect) to decide to call the irq_work, which will reset the shortest_full (expecting the readers to update it).
Also move the setting of full_waiters_pending after the check if the ring buffer has the required percentage filled. There's no reason to tell the writer to wake up waiters if there are no waiters.
--- kernel/trace/ring_buffer.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-)
kernel/trace/ring_buffer.c +20 -7
@@ -761,16 +761,32 @@ __poll_t ring_buffer_poll_wait(struct ring_buffer *buffer, int cpu,poll_wait (filp, &rbwork->full_waiters, poll_table);raw_spin_lock_irqsave (&cpu_buffer->reader_lock, flags); - rbwork->full_waiters_pending = true;if (!cpu_buffer->shortest_full || cpu_buffer->shortest_full > full) cpu_buffer->shortest_full = full;raw_spin_unlock_irqrestore (&cpu_buffer->reader_lock, flags); - }else { -poll_wait (filp, &rbwork->waiters, poll_table); - rbwork->waiters_pending = true; +if (full_hit (buffer, cpu, full)) +return EPOLLIN |EPOLLRDNORM ; +/* +* Only allow full_waiters_pending update to be seen after +* the shortest_full is set. If the writer sees the +* full_waiters_pending flag set, it will compare the +* amount in the ring buffer to shortest_full. If the amount +* in the ring buffer is greater than the shortest_full +* percent, it will call the irq_work handler to wake up +* this list. The irq_handler will reset shortest_full +* back to zero. That's done under the reader_lock, but +* the below smp_mb() makes sure that the update to +* full_waiters_pending doesn't leak up into the above. +*/ +smp_mb (); + rbwork->full_waiters_pending = true; +return 0 ; } +poll_wait (filp, &rbwork->waiters, poll_table); + rbwork->waiters_pending = true; +/* * There's a tight race between setting the waiters_pending and * checking if the ring buffer is empty. Once the waiters_pending bit
@@ -786,9 +802,6 @@ __poll_t ring_buffer_poll_wait(struct ring_buffer *buffer, int cpu,*/ smp_mb (); -if (full) -return full_hit (buffer, cpu, full) ?EPOLLIN |EPOLLRDNORM :0 ; -if ((cpu ==RING_BUFFER_ALL_CPUS && !ring_buffer_empty (buffer)) || (cpu !=RING_BUFFER_ALL_CPUS && !ring_buffer_empty_cpu (buffer, cpu)))return EPOLLIN |EPOLLRDNORM ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 64/215 soc: fsl: qbman: Always disable interrupts when taking cgr_lock
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Anderson <[email protected]>
[ Upstream commit 584c2a9184a33a40fceee838f856de3cffa19be3 ]
smp_call_function_single disables IRQs when executing the callback. To prevent deadlocks, we must disable IRQs when taking cgr_lock elsewhere. This is already done by qman_update_cgr and qman_delete_cgr; fix the other lockers.
--- drivers/soc/fsl/qbman/qman.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/soc/fsl/qbman/qman.c +5 -5
@@ -1461,11 +1461,11 @@ static void qm_congestion_task(struct work_struct *work)union qm_mc_result *mcr;struct qman_cgr *cgr; -spin_lock (&p->cgr_lock); +spin_lock_irq (&p->cgr_lock);qm_mc_start (&p->p);qm_mc_commit (&p->p,QM_MCC_VERB_QUERYCONGESTION );if (!qm_mc_result_timeout (&p->p, &mcr)) { -spin_unlock (&p->cgr_lock); +spin_unlock_irq (&p->cgr_lock);dev_crit (p->config->dev,"QUERYCONGESTION timeout\n" );qman_p_irqsource_add (p,QM_PIRQ_CSCI );return ;
@@ -1481,7 +1481,7 @@ static void qm_congestion_task(struct work_struct *work)list_for_each_entry (cgr, &p->cgr_cbs, node)if (cgr->cb &&qman_cgrs_get (&c, cgr->cgrid)) cgr->cb (p, cgr,qman_cgrs_get (&rr, cgr->cgrid)); -spin_unlock (&p->cgr_lock); +spin_unlock_irq (&p->cgr_lock);qman_p_irqsource_add (p,QM_PIRQ_CSCI ); }
@@ -2438,7 +2438,7 @@ int qman_create_cgr(struct qman_cgr *cgr, u32 flags,preempt_enable (); cgr->chan = p->config->channel; -spin_lock (&p->cgr_lock); +spin_lock_irq (&p->cgr_lock);if (opts) {struct qm_mcc_initcgr local_opts = *opts;
@@ -2475,7 +2475,7 @@ int qman_create_cgr(struct qman_cgr *cgr, u32 flags, qman_cgrs_get(&p->cgrs[1], cgr->cgrid)) cgr->cb(p, cgr, 1); out: -spin_unlock (&p->cgr_lock); +spin_unlock_irq (&p->cgr_lock);put_affine_portal ();return ret; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 65/215 soc: fsl: qbman: Add helper for sanity checking cgr ops
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Anderson <[email protected]>
[ Upstream commit d0e17a4653cebc2c8a20251c837dd1fcec5014d9 ]
This breaks out/combines get_affine_portal and the cgr sanity check in preparation for the next commit. No functional change intended.
Stable-dep-of: fbec4e7fed89 ("soc: fsl: qbman: Use raw spinlock for cgr_lock")
--- drivers/soc/fsl/qbman/qman.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-)
drivers/soc/fsl/qbman/qman.c +19 -10
@@ -2481,13 +2481,8 @@ int qman_create_cgr(struct qman_cgr *cgr, u32 flags, }EXPORT_SYMBOL (qman_create_cgr); -int qman_delete_cgr (struct qman_cgr *cgr) +static struct qman_portal *qman_cgr_get_affine_portal (struct qman_cgr *cgr) { -unsigned long irqflags; -struct qm_mcr_querycgr cgr_state; -struct qm_mcc_initcgr local_opts; -int ret =0 ; -struct qman_cgr *i;struct qman_portal *p =get_affine_portal ();if (cgr->chan != p->config->channel) {
@@ -2495,10 +2490,25 @@ int qman_delete_cgr(struct qman_cgr *cgr)dev_err (p->config->dev,"CGR not owned by current portal" );dev_dbg (p->config->dev," create 0x%x, delete 0x%x\n" , cgr->chan, p->config->channel); - - ret = -EINVAL ; - goto put_portal; +put_affine_portal (); +return NULL ; } + +return p; +} + +int qman_delete_cgr (struct qman_cgr *cgr) +{ +unsigned long irqflags; +struct qm_mcr_querycgr cgr_state; +struct qm_mcc_initcgr local_opts; +int ret =0 ; +struct qman_cgr *i; +struct qman_portal *p =qman_cgr_get_affine_portal (cgr); + +if (!p) +return -EINVAL ; +memset (&local_opts,0 ,sizeof (struct qm_mcc_initcgr ));spin_lock_irqsave (&p->cgr_lock, irqflags);list_del (&cgr->node);
@@ -2526,7 +2536,6 @@ int qman_delete_cgr(struct qman_cgr *cgr)list_add (&cgr->node, &p->cgr_cbs); release_lock:spin_unlock_irqrestore (&p->cgr_lock, irqflags); -put_portal:put_affine_portal ();return ret; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 66/215 soc: fsl: qbman: Add CGR update function
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Anderson <[email protected]>
[ Upstream commit 914f8b228ede709274b8c80514b352248ec9da00 ]
This adds a function to update a CGR with new parameters. qman_create_cgr can almost be used for this (with flags=0), but it's not suitable because it also registers the callback function. The _safe variant was modeled off of qman_cgr_delete_safe. However, we handle multiple arguments and a return value.
Stable-dep-of: fbec4e7fed89 ("soc: fsl: qbman: Use raw spinlock for cgr_lock")
--- drivers/soc/fsl/qbman/qman.c | 48 ++++++++++++++++++++++++++++++++++++ include/soc/fsl/qman.h | 9 +++++++ 2 files changed, 57 insertions(+)
drivers/soc/fsl/qbman/qman.c +48 -0
@@ -2566,6 +2566,54 @@ void qman_delete_cgr_safe(struct qman_cgr *cgr) }EXPORT_SYMBOL (qman_delete_cgr_safe); +static int qman_update_cgr (struct qman_cgr *cgr,struct qm_mcc_initcgr *opts) +{ +int ret; +unsigned long irqflags; +struct qman_portal *p =qman_cgr_get_affine_portal (cgr); + +if (!p) +return -EINVAL ; + +spin_lock_irqsave (&p->cgr_lock, irqflags); + ret =qm_modify_cgr (cgr,0 , opts); +spin_unlock_irqrestore (&p->cgr_lock, irqflags); +put_affine_portal (); +return ret; +} + +struct update_cgr_params { +struct qman_cgr *cgr; +struct qm_mcc_initcgr *opts; +int ret; +}; + +static void qman_update_cgr_smp_call (void *p) +{ +struct update_cgr_params *params = p; + + params->ret =qman_update_cgr (params->cgr, params->opts); +} + +int qman_update_cgr_safe (struct qman_cgr *cgr,struct qm_mcc_initcgr *opts) +{ +struct update_cgr_params params = { + .cgr = cgr, + .opts = opts, + }; + +preempt_disable (); +if (qman_cgr_cpus[cgr->cgrid] !=smp_processor_id ()) +smp_call_function_single (qman_cgr_cpus[cgr->cgrid], + qman_update_cgr_smp_call, ¶ms, + true); +else + params.ret =qman_update_cgr (cgr, opts); +preempt_enable (); +return params.ret; +} +EXPORT_SYMBOL (qman_update_cgr_safe); +/* Cleanup FQs */ static int _qm_mr_consume_and_match_verb (struct qm_portal *p,int v)
include/soc/fsl/qman.h +9 -0
@@ -1159,6 +1159,15 @@ int qman_delete_cgr(struct qman_cgr *cgr);*/ void qman_delete_cgr_safe (struct qman_cgr *cgr); +/** +* qman_update_cgr_safe - Modifies a congestion group object from any CPU +* @cgr: the 'cgr' object to modify +* @opts: state of the CGR settings +* +* This will select the proper CPU and modify the CGR settings. +*/ +int qman_update_cgr_safe (struct qman_cgr *cgr,struct qm_mcc_initcgr *opts); +/** * qman_query_cgr_congested - Queries CGR's congestion status * @cgr: the 'cgr' object to query
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 67/215 soc: fsl: qbman: Use raw spinlock for cgr_lock
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Anderson <[email protected]>
[ Upstream commit fbec4e7fed89b579f2483041fabf9650fb0dd6bc ]
smp_call_function always runs its callback in hard IRQ context, even on PREEMPT_RT, where spinlocks can sleep. So we need to use a raw spinlock for cgr_lock to ensure we aren't waiting on a sleeping task.
Although this bug has existed for a while, it was not apparent until commit ef2a8d5478b9 ("net: dpaa: Adjust queue depth on rate change") which invokes smp_call_function_single via qman_update_cgr_safe every time a link goes up or down.
--- drivers/soc/fsl/qbman/qman.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-)
drivers/soc/fsl/qbman/qman.c +14 -11
@@ -996,7 +996,7 @@ struct qman_portal {/* linked-list of CSCN handlers. */ struct list_head cgr_cbs;/* list lock */ -spinlock_t cgr_lock; +raw_spinlock_t cgr_lock;struct work_struct congestion_work;struct work_struct mr_work;char irqname[MAX_IRQNAME ];
@@ -1286,7 +1286,7 @@ static int qman_create_portal(struct qman_portal *portal,/* if the given mask is NULL, assume all CGRs can be seen */ qman_cgrs_fill (&portal->cgrs[0 ]);INIT_LIST_HEAD (&portal->cgr_cbs); -spin_lock_init (&portal->cgr_lock); +raw_spin_lock_init (&portal->cgr_lock);INIT_WORK (&portal->congestion_work, qm_congestion_task);INIT_WORK (&portal->mr_work, qm_mr_process_task); portal->bits =0 ;
@@ -1461,11 +1461,14 @@ static void qm_congestion_task(struct work_struct *work)union qm_mc_result *mcr;struct qman_cgr *cgr; -spin_lock_irq (&p->cgr_lock); +/* +* FIXME: QM_MCR_TIMEOUT is 10ms, which is too long for a raw spinlock! +*/ +raw_spin_lock_irq (&p->cgr_lock);qm_mc_start (&p->p);qm_mc_commit (&p->p,QM_MCC_VERB_QUERYCONGESTION );if (!qm_mc_result_timeout (&p->p, &mcr)) { -spin_unlock_irq (&p->cgr_lock); +raw_spin_unlock_irq (&p->cgr_lock);dev_crit (p->config->dev,"QUERYCONGESTION timeout\n" );qman_p_irqsource_add (p,QM_PIRQ_CSCI );return ;
@@ -1481,7 +1484,7 @@ static void qm_congestion_task(struct work_struct *work)list_for_each_entry (cgr, &p->cgr_cbs, node)if (cgr->cb &&qman_cgrs_get (&c, cgr->cgrid)) cgr->cb (p, cgr,qman_cgrs_get (&rr, cgr->cgrid)); -spin_unlock_irq (&p->cgr_lock); +raw_spin_unlock_irq (&p->cgr_lock);qman_p_irqsource_add (p,QM_PIRQ_CSCI ); }
@@ -2438,7 +2441,7 @@ int qman_create_cgr(struct qman_cgr *cgr, u32 flags,preempt_enable (); cgr->chan = p->config->channel; -spin_lock_irq (&p->cgr_lock); +raw_spin_lock_irq (&p->cgr_lock);if (opts) {struct qm_mcc_initcgr local_opts = *opts;
@@ -2475,7 +2478,7 @@ int qman_create_cgr(struct qman_cgr *cgr, u32 flags, qman_cgrs_get(&p->cgrs[1], cgr->cgrid)) cgr->cb(p, cgr, 1); out: -spin_unlock_irq (&p->cgr_lock); +raw_spin_unlock_irq (&p->cgr_lock);put_affine_portal ();return ret; }
@@ -2510,7 +2513,7 @@ int qman_delete_cgr(struct qman_cgr *cgr)return -EINVAL ;memset (&local_opts,0 ,sizeof (struct qm_mcc_initcgr )); -spin_lock_irqsave (&p->cgr_lock, irqflags); +raw_spin_lock_irqsave (&p->cgr_lock, irqflags);list_del (&cgr->node);/* * If there are no other CGR objects for this CGRID in the list,
@@ -2535,7 +2538,7 @@ int qman_delete_cgr(struct qman_cgr *cgr)/* add back to the list */ list_add (&cgr->node, &p->cgr_cbs); release_lock: -spin_unlock_irqrestore (&p->cgr_lock, irqflags); +raw_spin_unlock_irqrestore (&p->cgr_lock, irqflags);put_affine_portal ();return ret; }
@@ -2575,9 +2578,9 @@ static int qman_update_cgr(struct qman_cgr *cgr, struct qm_mcc_initcgr *opts)if (!p)return -EINVAL ; -spin_lock_irqsave (&p->cgr_lock, irqflags); +raw_spin_lock_irqsave (&p->cgr_lock, irqflags); ret =qm_modify_cgr (cgr,0 , opts); -spin_unlock_irqrestore (&p->cgr_lock, irqflags); +raw_spin_unlock_irqrestore (&p->cgr_lock, irqflags);put_affine_portal ();return ret; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 68/215 s390/zcrypt: fix reference counting on zcrypt card objects
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Harald Freudenberger <[email protected]>
[ Upstream commit 50ed48c80fecbe17218afed4f8bed005c802976c ]
Tests with hot-plugging crytpo cards on KVM guests with debug kernel build revealed an use after free for the load field of the struct zcrypt_card. The reason was an incorrect reference handling of the zcrypt card object which could lead to a free of the zcrypt card object while it was still in use.
This is an example of the slab message:
kernel: 0x00000000885a7512-0x00000000885a7513 @offset=1298. First byte 0x68 instead of 0x6b
kernel: Allocated in zcrypt_card_alloc+0x36/0x70 [zcrypt] age=18046 cpu=3 pid=43
kernel: kmalloc_trace+0x3f2/0x470
kernel: zcrypt_card_alloc+0x36/0x70 [zcrypt]
kernel: zcrypt_cex4_card_probe+0x26/0x380 [zcrypt_cex4]
kernel: ap_device_probe+0x15c/0x290
kernel: really_probe+0xd2/0x468
kernel: driver_probe_device+0x40/0xf0
kernel: __device_attach_driver+0xc0/0x140
kernel: bus_for_each_drv+0x8c/0xd0
kernel: __device_attach+0x114/0x198
kernel: bus_probe_device+0xb4/0xc8
kernel: device_add+0x4d2/0x6e0
kernel: ap_scan_adapter+0x3d0/0x7c0
kernel: ap_scan_bus+0x5a/0x3b0
kernel: ap_scan_bus_wq_callback+0x40/0x60
kernel: process_one_work+0x26e/0x620
kernel: worker_thread+0x21c/0x440
kernel: Freed in zcrypt_card_put+0x54/0x80 [zcrypt] age=9024 cpu=3 pid=43
kernel: kfree+0x37e/0x418
kernel: zcrypt_card_put+0x54/0x80 [zcrypt]
kernel: ap_device_remove+0x4c/0xe0
kernel: device_release_driver_internal+0x1c4/0x270
kernel: bus_remove_device+0x100/0x188
kernel: device_del+0x164/0x3c0
kernel: device_unregister+0x30/0x90
kernel: ap_scan_adapter+0xc8/0x7c0
kernel: ap_scan_bus+0x5a/0x3b0
kernel: ap_scan_bus_wq_callback+0x40/0x60
kernel: process_one_work+0x26e/0x620
kernel: worker_thread+0x21c/0x440
kernel: kthread+0x150/0x168
kernel: __ret_from_fork+0x3c/0x58
kernel: ret_from_fork+0xa/0x30
kernel: Slab 0x00000372022169c0 objects=20 used=18 fp=0x00000000885a7c88 flags=0x3ffff00000000a00(workingset|slab|node=0|zone=1|lastcpupid=0x1ffff)
kernel: Object 0x00000000885a74b8 @offset=1208 fp=0x00000000885a7c88
kernel: Redzone 00000000885a74b0: bb bb bb bb bb bb bb bb ........
kernel: Object 00000000885a74b8: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk
kernel: Object 00000000885a74c8: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk
kernel: Object 00000000885a74d8: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk
kernel: Object 00000000885a74e8: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk
kernel: Object 00000000885a74f8: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk
kernel: Object 00000000885a7508: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 68 4b 6b 6b 6b a5 kkkkkkkkkkhKkkk.
kernel: Redzone 00000000885a7518: bb bb bb bb bb bb bb bb ........
kernel: Padding 00000000885a756c: 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a ZZZZZZZZZZZZ
kernel: CPU: 0 PID: 387 Comm: systemd-udevd Not tainted 6.8.0-HF #2
kernel: Hardware name: IBM 3931 A01 704 (KVM/Linux)
kernel: Call Trace:
kernel: [<00000000ca5ab5b8>] dump_stack_lvl+0x90/0x120
kernel: [<00000000c99d78bc>] check_bytes_and_report+0x114/0x140
kernel: [<00000000c99d53cc>] check_object+0x334/0x3f8
kernel: [<00000000c99d820c>] alloc_debug_processing+0xc4/0x1f8
kernel: [<00000000c99d852e>] get_partial_node.part.0+0x1ee/0x3e0
kernel: [<00000000c99d94ec>] ___slab_alloc+0xaf4/0x13c8
kernel: [<00000000c99d9e38>] __slab_alloc.constprop.0+0x78/0xb8
kernel: [<00000000c99dc8dc>] __kmalloc+0x434/0x590
kernel: [<00000000c9b4c0ce>] ext4_htree_store_dirent+0x4e/0x1c0
kernel: [<00000000c9b908a2>] htree_dirblock_to_tree+0x17a/0x3f0
kernel: [<00000000c9b919dc>] ext4_htree_fill_tree+0x134/0x400
kernel: [<00000000c9b4b3d0>] ext4_dx_readdir+0x160/0x2f0
kernel: [<00000000c9b4bedc>] ext4_readdir+0x5f4/0x760
kernel: [<00000000c9a7efc4>] iterate_dir+0xb4/0x280
kernel: [<00000000c9a7f1ea>] __do_sys_getdents64+0x5a/0x120
kernel: [<00000000ca5d6946>] __do_syscall+0x256/0x310
kernel: [<00000000ca5eea10>] system_call+0x70/0x98
kernel: INFO: lockdep is turned off.
kernel: FIX kmalloc-96: Restoring Poison 0x00000000885a7512-0x00000000885a7513=0x6b
kernel: FIX kmalloc-96: Marking all objects usedThe fix is simple: Before use of the queue not only the queue object but also the card object needs to increase it's reference count with a call to zcrypt_card_get(). Similar after use of the queue not only the queue but also the card object's reference count is decreased with zcrypt_card_put().
--- drivers/s390/crypto/zcrypt_api.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/s390/crypto/zcrypt_api.c +2 -0
@@ -574,6 +574,7 @@ static inline struct zcrypt_queue *zcrypt_pick_queue(struct zcrypt_card *zc, {if (!zq || !try_module_get (zq->queue->ap_dev.drv->driver.owner))return NULL ; +zcrypt_card_get (zc);zcrypt_queue_get (zq);get_device (&zq->queue->ap_dev.device);atomic_add (weight, &zc->load);
@@ -593,6 +594,7 @@ static inline void zcrypt_drop_queue(struct zcrypt_card *zc,atomic_sub (weight, &zq->load);put_device (&zq->queue->ap_dev.device);zcrypt_queue_put (zq); +zcrypt_card_put (zc);module_put (mod); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 69/215 drm/exynos: do not return negative values from .get_modes()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jani Nikula <[email protected]>
[ Upstream commit 13d5b040363c7ec0ac29c2de9cf661a24a8aa531 ]
The .get_modes() hooks aren't supposed to return negative error codes. Return 0 for no modes, whatever the reason.
--- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 4 ++-- drivers/gpu/drm/exynos/exynos_hdmi.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/exynos/exynos_drm_vidi.c +2 -2
@@ -308,14 +308,14 @@ static int vidi_get_modes(struct drm_connector *connector)*/ if (!ctx->raw_edid) {DRM_DEV_DEBUG_KMS (ctx->dev,"raw_edid is null.\n" ); -return -EFAULT ; +return 0 ; } edid_len = (1 + ctx->raw_edid->extensions) *EDID_LENGTH ; edid =kmemdup (ctx->raw_edid, edid_len,GFP_KERNEL );if (!edid) {DRM_DEV_DEBUG_KMS (ctx->dev,"failed to allocate edid\n" ); -return -ENOMEM ; +return 0 ; }drm_connector_update_edid_property (connector, edid);
drivers/gpu/drm/exynos/exynos_hdmi.c +2 -2
@@ -876,11 +876,11 @@ static int hdmi_get_modes(struct drm_connector *connector)int ret;if (!hdata->ddc_adpt) -return -ENODEV ; +return 0 ; edid =drm_get_edid (connector, hdata->ddc_adpt);if (!edid) -return -ENODEV ; +return 0 ; hdata->dvi_mode = !drm_detect_hdmi_monitor (edid); DRM_DEV_DEBUG_KMS(hdata->dev, "%s : width[%d] x height[%d]\n",
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 70/215 drm/imx/ipuv3: do not return negative values from .get_modes()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jani Nikula <[email protected]>
[ Upstream commit c2da9ada64962fcd2e6395ed9987b9874ea032d3 ]
The .get_modes() hooks aren't supposed to return negative error codes. Return 0 for no modes, whatever the reason.
--- drivers/gpu/drm/imx/parallel-display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/imx/parallel-display.c +2 -2
@@ -63,14 +63,14 @@ static int imx_pd_connector_get_modes(struct drm_connector *connector)int ret;if (!mode) -return -EINVAL ; +return 0 ; ret =of_get_drm_display_mode (np, &imxpd->mode, &imxpd->bus_flags,OF_USE_NATIVE_MODE );if (ret) {drm_mode_destroy (connector->dev, mode); -return ret; +return 0 ; }drm_mode_copy (mode, &imxpd->mode);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 71/215 drm/vc4: hdmi: do not return negative values from .get_modes()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jani Nikula <[email protected]>
[ Upstream commit abf493988e380f25242c1023275c68bd3579c9ce ]
The .get_modes() hooks aren't supposed to return negative error codes. Return 0 for no modes, whatever the reason.
--- drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/vc4/vc4_hdmi.c +1 -1
@@ -236,7 +236,7 @@ static int vc4_hdmi_connector_get_modes(struct drm_connector *connector) edid =drm_get_edid (connector, vc4->hdmi->ddc);cec_s_phys_addr_from_edid (vc4->hdmi->cec_adap, edid);if (!edid) -return -ENODEV ; +return 0 ; vc4_encoder->hdmi_monitor =drm_detect_hdmi_monitor (edid);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 72/215 memtest: use {READ,WRITE}_ONCE in memory scanning
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qiang Zhang <[email protected]>
[ Upstream commit 82634d7e24271698e50a3ec811e5f50de790a65f ]
memtest failed to find bad memory when compiled with clang. So use {WRITE,READ}_ONCE to access memory to avoid compiler over optimization.
--- mm/memtest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
mm/memtest.c +2 -2
@@ -46,10 +46,10 @@ static void __init memtest(u64 pattern, phys_addr_t start_phys, phys_addr_t size last_bad =0 ;for (p = start; p < end; p++) - *p = pattern; +WRITE_ONCE (*p, pattern);for (p = start; p < end; p++, start_phys_aligned += incr) { -if (*p == pattern) +if (READ_ONCE (*p) == pattern)continue ;if (start_phys_aligned == last_bad + incr) { last_bad += incr;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 73/215 nilfs2: fix failure to detect DAT corruption in btree and direct mappings
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
[ Upstream commit f2f26b4a84a0ef41791bd2d70861c8eac748f4ba ]
Patch series "nilfs2: fix kernel bug at submit_bh_wbc()".
This resolves a kernel BUG reported by syzbot. Since there are two flaws involved, I've made each one a separate patch.
The first patch alone resolves the syzbot-reported bug, but I think both fixes should be sent to stable, so I've tagged them as such.
This patch (of 2):
Syzbot has reported a kernel bug in submit_bh_wbc() when writing file data to a nilfs2 file system whose metadata is corrupted.
There are two flaws involved in this issue.
The first flaw is that when nilfs_get_block() locates a data block using btree or direct mapping, if the disk address translation routine nilfs_dat_translate() fails with internal code -ENOENT due to DAT metadata corruption, it can be passed back to nilfs_get_block(). This causes nilfs_get_block() to misidentify an existing block as non-existent, causing both data block lookup and insertion to fail inconsistently.
The second flaw is that nilfs_get_block() returns a successful status in this inconsistent state. This causes the caller __block_write_begin_int() or others to request a read even though the buffer is not mapped, resulting in a BUG_ON check for the BH_Mapped flag in submit_bh_wbc() failing.
This fixes the first issue by changing the return value to code -EINVAL when a conversion using DAT fails with code -ENOENT, avoiding the conflicting condition that leads to the kernel bug described above. Here, code -EINVAL indicates that metadata corruption was detected during the block lookup, which will be properly handled as a file system error and converted to -EIO when passing through the nilfs2 bmap layer.
--- fs/nilfs2/btree.c | 9 +++++++-- fs/nilfs2/direct.c | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-)
fs/nilfs2/btree.c +7 -2
@@ -724,7 +724,7 @@ static int nilfs_btree_lookup_contig(const struct nilfs_bmap *btree, dat =nilfs_bmap_get_dat (btree); ret =nilfs_dat_translate (dat, ptr, &blocknr);if (ret <0 ) - goto out; + goto dat_error; ptr = blocknr; } cnt =1 ;
@@ -743,7 +743,7 @@ static int nilfs_btree_lookup_contig(const struct nilfs_bmap *btree,if (dat) { ret =nilfs_dat_translate (dat, ptr2, &blocknr);if (ret <0 ) - goto out; + goto dat_error; ptr2 = blocknr; }if (ptr2 != ptr + cnt || ++cnt == maxblocks)
@@ -782,6 +782,11 @@ static int nilfs_btree_lookup_contig(const struct nilfs_bmap *btree, out:nilfs_btree_free_path (path);return ret; + + dat_error: +if (ret == -ENOENT ) + ret = -EINVAL ;/* Notify bmap layer of metadata corruption */ + goto out; } static void nilfs_btree_promote_key(struct nilfs_bmap *btree,
fs/nilfs2/direct.c +7 -2
@@ -66,7 +66,7 @@ static int nilfs_direct_lookup_contig(const struct nilfs_bmap *direct, dat =nilfs_bmap_get_dat (direct); ret =nilfs_dat_translate (dat, ptr, &blocknr);if (ret <0 ) -return ret; + goto dat_error; ptr = blocknr; }
@@ -79,7 +79,7 @@ static int nilfs_direct_lookup_contig(const struct nilfs_bmap *direct,if (dat) { ret =nilfs_dat_translate (dat, ptr2, &blocknr);if (ret <0 ) -return ret; + goto dat_error; ptr2 = blocknr; }if (ptr2 != ptr + cnt)
@@ -87,6 +87,11 @@ static int nilfs_direct_lookup_contig(const struct nilfs_bmap *direct, } *ptrp = ptr;return cnt; + + dat_error: +if (ret == -ENOENT ) + ret = -EINVAL ;/* Notify bmap layer of metadata corruption */ +return ret; } static __u64
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 74/215 nilfs2: use a more common logging style
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joe Perches <[email protected]>
[ Upstream commit a1d0747a393a079631130d61faa2a61027d1c789 ]
Add macros for nilfs_<level>(sb, fmt, ...) and convert the uses of 'nilfs_msg(sb, KERN_<LEVEL>, ...)' to 'nilfs_<level>(sb, ...)' so nilfs2 uses a logging style more like the typical kernel logging style.
Miscellanea:
o Realign arguments for these uses
Stable-dep-of: 269cdf353b5b ("nilfs2: prevent kernel bug at submit_bh_wbc()")
--- fs/nilfs2/alloc.c | 38 +++++++++---------- fs/nilfs2/btree.c | 42 ++++++++++----------- fs/nilfs2/cpfile.c | 10 ++--- fs/nilfs2/dat.c | 14 +++---- fs/nilfs2/direct.c | 14 ++++--- fs/nilfs2/gcinode.c | 2 +- fs/nilfs2/ifile.c | 4 +- fs/nilfs2/inode.c | 29 +++++++-------- fs/nilfs2/ioctl.c | 37 +++++++++---------- fs/nilfs2/mdt.c | 2 +- fs/nilfs2/namei.c | 6 +-- fs/nilfs2/nilfs.h | 9 +++++ fs/nilfs2/page.c | 11 +++--- fs/nilfs2/recovery.c | 32 +++++++--------- fs/nilfs2/segbuf.c | 2 +- fs/nilfs2/segment.c | 38 +++++++++---------- fs/nilfs2/sufile.c | 29 +++++++-------- fs/nilfs2/super.c | 57 ++++++++++++++--------------- fs/nilfs2/sysfs.c | 29 +++++++-------- fs/nilfs2/the_nilfs.c | 85 ++++++++++++++++++++----------------------- 20 files changed, 239 insertions(+), 251 deletions(-)
fs/nilfs2/alloc.c +19 -19
@@ -614,10 +614,10 @@ void nilfs_palloc_commit_free_entry(struct inode *inode, lock =nilfs_mdt_bgl_lock (inode, group);if (!nilfs_clear_bit_atomic (lock, group_offset, bitmap)) -nilfs_msg (inode->i_sb,KERN_WARNING , -"%s (ino=%lu): entry number %llu already freed" , - __func__, inode->i_ino, - (unsigned long long )req->pr_entry_nr); +nilfs_warn (inode->i_sb, +"%s (ino=%lu): entry number %llu already freed" , + __func__, inode->i_ino, + (unsigned long long )req->pr_entry_nr);else nilfs_palloc_group_desc_add_entries (desc, lock,1 );
@@ -655,10 +655,10 @@ void nilfs_palloc_abort_alloc_entry(struct inode *inode, lock =nilfs_mdt_bgl_lock (inode, group);if (!nilfs_clear_bit_atomic (lock, group_offset, bitmap)) -nilfs_msg (inode->i_sb,KERN_WARNING , -"%s (ino=%lu): entry number %llu already freed" , - __func__, inode->i_ino, - (unsigned long long )req->pr_entry_nr); +nilfs_warn (inode->i_sb, +"%s (ino=%lu): entry number %llu already freed" , + __func__, inode->i_ino, + (unsigned long long )req->pr_entry_nr);else nilfs_palloc_group_desc_add_entries (desc, lock,1 );
@@ -764,10 +764,10 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems) do { if (!nilfs_clear_bit_atomic(lock, group_offset, bitmap)) { - nilfs_msg(inode->i_sb, KERN_WARNING, - "%s (ino=%lu): entry number %llu already freed", - __func__, inode->i_ino, - (unsigned long long)entry_nrs[j]); + nilfs_warn(inode->i_sb, + "%s (ino=%lu): entry number %llu already freed", + __func__, inode->i_ino, + (unsigned long long)entry_nrs[j]); } else { n++; }
@@ -809,10 +809,10 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems) ret =nilfs_palloc_delete_entry_block (inode, last_nrs[k]);if (ret && ret != -ENOENT ) -nilfs_msg (inode->i_sb,KERN_WARNING , -"error %d deleting block that object (entry=%llu, ino=%lu) belongs to" , - ret, (unsigned long long )last_nrs[k], - inode->i_ino); +nilfs_warn (inode->i_sb, +"error %d deleting block that object (entry=%llu, ino=%lu) belongs to" , + ret, (unsigned long long )last_nrs[k], + inode->i_ino); } desc_kaddr =kmap_atomic (desc_bh->b_page);
@@ -827,9 +827,9 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems)if (nfree ==nilfs_palloc_entries_per_group (inode)) { ret =nilfs_palloc_delete_bitmap_block (inode, group);if (ret && ret != -ENOENT ) -nilfs_msg (inode->i_sb,KERN_WARNING , -"error %d deleting bitmap block of group=%lu, ino=%lu" , - ret, group, inode->i_ino); +nilfs_warn (inode->i_sb, +"error %d deleting bitmap block of group=%lu, ino=%lu" , + ret, group, inode->i_ino); } }return 0 ;
fs/nilfs2/btree.c +21 -21
78 lines not on this page · raw message
fs/nilfs2/cpfile.c +4 -6
@@ -322,7 +322,7 @@ int nilfs_cpfile_delete_checkpoints(struct inode *cpfile,int ret, ncps, nicps, nss, count, i;if (unlikely (start ==0 || start > end)) { -nilfs_msg (cpfile->i_sb,KERN_ERR , +nilfs_err (cpfile->i_sb,"cannot delete checkpoints: invalid range [%llu, %llu)" , (unsigned long long )start, (unsigned long long )end);return -EINVAL ;
@@ -376,7 +376,7 @@ int nilfs_cpfile_delete_checkpoints(struct inode *cpfile, cpfile, cno);if (ret ==0 )continue ; -nilfs_msg (cpfile->i_sb,KERN_ERR , +nilfs_err (cpfile->i_sb,"error %d deleting checkpoint block" , ret);break ;
@@ -981,12 +981,10 @@ int nilfs_cpfile_read(struct super_block *sb, size_t cpsize,int err;if (cpsize > sb->s_blocksize) { -nilfs_msg (sb,KERN_ERR , -"too large checkpoint size: %zu bytes" , cpsize); +nilfs_err (sb,"too large checkpoint size: %zu bytes" , cpsize);return -EINVAL ; }else if (cpsize <NILFS_MIN_CHECKPOINT_SIZE ) { -nilfs_msg (sb,KERN_ERR , -"too small checkpoint size: %zu bytes" , cpsize); +nilfs_err (sb,"too small checkpoint size: %zu bytes" , cpsize);return -EINVAL ; }
fs/nilfs2/dat.c +7 -7
@@ -354,11 +354,11 @@ int nilfs_dat_move(struct inode *dat, __u64 vblocknr, sector_t blocknr) kaddr =kmap_atomic (entry_bh->b_page); entry =nilfs_palloc_block_get_entry (dat, vblocknr, entry_bh, kaddr);if (unlikely (entry->de_blocknr ==cpu_to_le64 (0 ))) { -nilfs_msg (dat->i_sb,KERN_CRIT , -"%s: invalid vblocknr = %llu, [%llu, %llu)" , - __func__, (unsigned long long )vblocknr, - (unsigned long long )le64_to_cpu (entry->de_start), - (unsigned long long )le64_to_cpu (entry->de_end)); +nilfs_crit (dat->i_sb, +"%s: invalid vblocknr = %llu, [%llu, %llu)" , + __func__, (unsigned long long )vblocknr, + (unsigned long long )le64_to_cpu (entry->de_start), + (unsigned long long )le64_to_cpu (entry->de_end));kunmap_atomic (kaddr);brelse (entry_bh);return -EINVAL ;
@@ -485,11 +485,11 @@ int nilfs_dat_read(struct super_block *sb, size_t entry_size,int err;if (entry_size > sb->s_blocksize) { -nilfs_msg (sb,KERN_ERR ,"too large DAT entry size: %zu bytes" , +nilfs_err (sb,"too large DAT entry size: %zu bytes" , entry_size);return -EINVAL ; }else if (entry_size <NILFS_MIN_DAT_ENTRY_SIZE ) { -nilfs_msg (sb,KERN_ERR ,"too small DAT entry size: %zu bytes" , +nilfs_err (sb,"too small DAT entry size: %zu bytes" , entry_size);return -EINVAL ; }
fs/nilfs2/direct.c +8 -6
@@ -333,16 +333,18 @@ static int nilfs_direct_assign(struct nilfs_bmap *bmap, key =nilfs_bmap_data_get_key (bmap, *bh);if (unlikely (key >NILFS_DIRECT_KEY_MAX )) { -nilfs_msg (bmap->b_inode->i_sb,KERN_CRIT , -"%s (ino=%lu): invalid key: %llu" , __func__, - bmap->b_inode->i_ino, (unsigned long long )key); +nilfs_crit (bmap->b_inode->i_sb, +"%s (ino=%lu): invalid key: %llu" , + __func__, + bmap->b_inode->i_ino, (unsigned long long )key);return -EINVAL ; } ptr =nilfs_direct_get_ptr (bmap, key);if (unlikely (ptr ==NILFS_BMAP_INVALID_PTR )) { -nilfs_msg (bmap->b_inode->i_sb,KERN_CRIT , -"%s (ino=%lu): invalid pointer: %llu" , __func__, - bmap->b_inode->i_ino, (unsigned long long )ptr); +nilfs_crit (bmap->b_inode->i_sb, +"%s (ino=%lu): invalid pointer: %llu" , + __func__, + bmap->b_inode->i_ino, (unsigned long long )ptr);return -EINVAL ; }
fs/nilfs2/gcinode.c +1 -1
@@ -143,7 +143,7 @@ int nilfs_gccache_wait_and_mark_dirty(struct buffer_head *bh)if (!buffer_uptodate (bh)) {struct inode *inode = bh->b_page->mapping->host; -nilfs_msg (inode->i_sb,KERN_ERR , +nilfs_err (inode->i_sb,"I/O error reading %s block for GC (ino=%lu, vblocknr=%llu)" ,buffer_nilfs_node (bh) ?"node" :"data" , inode->i_ino, (unsigned long long )bh->b_blocknr);
fs/nilfs2/ifile.c +2 -2
@@ -142,8 +142,8 @@ int nilfs_ifile_get_inode_block(struct inode *ifile, ino_t ino, err =nilfs_palloc_get_entry_block (ifile, ino,0 , out_bh);if (unlikely (err)) -nilfs_msg (sb,KERN_WARNING ,"error %d reading inode: ino=%lu" , - err, (unsigned long )ino); +nilfs_warn (sb,"error %d reading inode: ino=%lu" , + err, (unsigned long )ino);return err; }
fs/nilfs2/inode.c +14 -15
@@ -107,10 +107,10 @@ int nilfs_get_block(struct inode *inode, sector_t blkoff,* However, the page having this block must * be locked in this case. */ -nilfs_msg (inode->i_sb,KERN_WARNING , -"%s (ino=%lu): a race condition while inserting a data block at offset=%llu" , - __func__, inode->i_ino, - (unsigned long long )blkoff); +nilfs_warn (inode->i_sb, +"%s (ino=%lu): a race condition while inserting a data block at offset=%llu" , + __func__, inode->i_ino, + (unsigned long long )blkoff); err =0 ; }nilfs_transaction_abort (inode->i_sb);
@@ -862,9 +862,8 @@ static void nilfs_truncate_bmap(struct nilfs_inode_info *ii, goto repeat; failed: -nilfs_msg (ii->vfs_inode.i_sb,KERN_WARNING , -"error %d truncating bmap (ino=%lu)" , ret, - ii->vfs_inode.i_ino); +nilfs_warn (ii->vfs_inode.i_sb,"error %d truncating bmap (ino=%lu)" , + ret, ii->vfs_inode.i_ino); }void nilfs_truncate (struct inode *inode)
@@ -1097,9 +1096,9 @@ int nilfs_set_file_dirty(struct inode *inode, unsigned int nr_dirty)* This will happen when somebody is freeing * this inode. */ -nilfs_msg (inode->i_sb,KERN_WARNING , -"cannot set file dirty (ino=%lu): the file is being freed" , - inode->i_ino); +nilfs_warn (inode->i_sb, +"cannot set file dirty (ino=%lu): the file is being freed" , + inode->i_ino);spin_unlock (&nilfs->ns_inode_lock);return -EINVAL ;/* * NILFS_I_DIRTY may remain for
@@ -1128,9 +1127,9 @@ int __nilfs_mark_inode_dirty(struct inode *inode, int flags) err =nilfs_load_inode_block (inode, &ibh);if (unlikely (err)) { -nilfs_msg (inode->i_sb,KERN_WARNING , -"cannot mark inode dirty (ino=%lu): error %d loading inode block" , - inode->i_ino, err); +nilfs_warn (inode->i_sb, +"cannot mark inode dirty (ino=%lu): error %d loading inode block" , + inode->i_ino, err);return err; }nilfs_update_inode (inode, ibh, flags);
@@ -1156,8 +1155,8 @@ void nilfs_dirty_inode(struct inode *inode, int flags)struct nilfs_mdt_info *mdi =NILFS_MDT (inode);if (is_bad_inode (inode)) { -nilfs_msg (inode->i_sb,KERN_WARNING , -"tried to mark bad_inode dirty. ignored." ); +nilfs_warn (inode->i_sb, +"tried to mark bad_inode dirty. ignored." );dump_stack ();return ; }
fs/nilfs2/ioctl.c +18 -19
@@ -569,25 +569,25 @@ static int nilfs_ioctl_move_inode_block(struct inode *inode,if (unlikely (ret <0 )) {if (ret == -ENOENT ) -nilfs_msg (inode->i_sb,KERN_CRIT , -"%s: invalid virtual block address (%s): ino=%llu, cno=%llu, offset=%llu, blocknr=%llu, vblocknr=%llu" , - __func__, vdesc->vd_flags ?"node" :"data" , - (unsigned long long )vdesc->vd_ino, - (unsigned long long )vdesc->vd_cno, - (unsigned long long )vdesc->vd_offset, - (unsigned long long )vdesc->vd_blocknr, - (unsigned long long )vdesc->vd_vblocknr); +nilfs_crit (inode->i_sb, +"%s: invalid virtual block address (%s): ino=%llu, cno=%llu, offset=%llu, blocknr=%llu, vblocknr=%llu" , + __func__, vdesc->vd_flags ?"node" :"data" , + (unsigned long long )vdesc->vd_ino, + (unsigned long long )vdesc->vd_cno, + (unsigned long long )vdesc->vd_offset, + (unsigned long long )vdesc->vd_blocknr, + (unsigned long long )vdesc->vd_vblocknr);return ret; }if (unlikely (!list_empty (&bh->b_assoc_buffers))) { -nilfs_msg (inode->i_sb,KERN_CRIT , -"%s: conflicting %s buffer: ino=%llu, cno=%llu, offset=%llu, blocknr=%llu, vblocknr=%llu" , - __func__, vdesc->vd_flags ?"node" :"data" , - (unsigned long long )vdesc->vd_ino, - (unsigned long long )vdesc->vd_cno, - (unsigned long long )vdesc->vd_offset, - (unsigned long long )vdesc->vd_blocknr, - (unsigned long long )vdesc->vd_vblocknr); +nilfs_crit (inode->i_sb, +"%s: conflicting %s buffer: ino=%llu, cno=%llu, offset=%llu, blocknr=%llu, vblocknr=%llu" , + __func__, vdesc->vd_flags ?"node" :"data" , + (unsigned long long )vdesc->vd_ino, + (unsigned long long )vdesc->vd_cno, + (unsigned long long )vdesc->vd_offset, + (unsigned long long )vdesc->vd_blocknr, + (unsigned long long )vdesc->vd_vblocknr);brelse (bh);return -EEXIST ; }
@@ -837,8 +837,7 @@ int nilfs_ioctl_prepare_clean_segments(struct the_nilfs *nilfs,return 0 ; failed: -nilfs_msg (nilfs->ns_sb,KERN_ERR ,"error %d preparing GC: %s" , ret, - msg); +nilfs_err (nilfs->ns_sb,"error %d preparing GC: %s" , ret, msg);return ret; }
@@ -947,7 +946,7 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp, ret =nilfs_ioctl_move_blocks (inode->i_sb, &argv[0 ], kbufs[0 ]);if (ret <0 ) { -nilfs_msg (inode->i_sb,KERN_ERR , +nilfs_err (inode->i_sb,"error %d preparing GC: cannot read source blocks" , ret); }else {
fs/nilfs2/mdt.c +1 -1
@@ -199,7 +199,7 @@ static int nilfs_mdt_read_block(struct inode *inode, unsigned long block, out_no_wait: err = -EIO ;if (!buffer_uptodate (first_bh)) { -nilfs_msg (inode->i_sb,KERN_ERR , +nilfs_err (inode->i_sb,"I/O error reading meta-data file (ino=%lu, block-offset=%lu)" , inode->i_ino, block); goto failed_bh;
fs/nilfs2/namei.c +3 -3
@@ -272,9 +272,9 @@ static int nilfs_do_unlink(struct inode *dir, struct dentry *dentry) goto out;if (!inode->i_nlink) { -nilfs_msg (inode->i_sb,KERN_WARNING , -"deleting nonexistent file (ino=%lu), %d" , - inode->i_ino, inode->i_nlink); +nilfs_warn (inode->i_sb, +"deleting nonexistent file (ino=%lu), %d" , + inode->i_ino, inode->i_nlink);set_nlink (inode,1 ); } err =nilfs_delete_entry (de, page);
fs/nilfs2/nilfs.h +9 -0
@@ -319,6 +319,15 @@ void __nilfs_error(struct super_block *sb, const char *function,#endif /* CONFIG_PRINTK */ +#define nilfs_crit (sb, fmt, ...) \ + nilfs_msg(sb, KERN_CRIT, fmt, ##__VA_ARGS__) +#define nilfs_err (sb, fmt, ...) \ + nilfs_msg(sb, KERN_ERR, fmt, ##__VA_ARGS__) +#define nilfs_warn (sb, fmt, ...) \ + nilfs_msg(sb, KERN_WARNING, fmt, ##__VA_ARGS__) +#define nilfs_info (sb, fmt, ...) \ + nilfs_msg(sb, KERN_INFO, fmt, ##__VA_ARGS__) +extern struct nilfs_super_block *nilfs_read_super_block (struct super_block *,u64 ,int ,struct buffer_head **); extern int nilfs_store_magic_and_option(struct super_block *,
fs/nilfs2/page.c +5 -6
@@ -399,9 +399,8 @@ void nilfs_clear_dirty_page(struct page *page, bool silent)BUG_ON (!PageLocked (page));if (!silent) -nilfs_msg (sb,KERN_WARNING , -"discard dirty page: offset=%lld, ino=%lu" , -page_offset (page), inode->i_ino); +nilfs_warn (sb,"discard dirty page: offset=%lld, ino=%lu" , +page_offset (page), inode->i_ino);ClearPageUptodate (page);ClearPageMappedToDisk (page);
@@ -417,9 +416,9 @@ void nilfs_clear_dirty_page(struct page *page, bool silent) do { lock_buffer(bh); if (!silent) - nilfs_msg(sb, KERN_WARNING, - "discard dirty block: blocknr=%llu, size=%zu", - (u64)bh->b_blocknr, bh->b_size); + nilfs_warn(sb, + "discard dirty block: blocknr=%llu, size=%zu", + (u64)bh->b_blocknr, bh->b_size); set_mask_bits(&bh->b_state, clear_bits, 0); unlock_buffer(bh);
fs/nilfs2/recovery.c +14 -18
@@ -51,7 +51,7 @@ static int nilfs_warn_segment_error(struct super_block *sb, int err)switch (err) {case NILFS_SEG_FAIL_IO : -nilfs_msg (sb,KERN_ERR ,"I/O error reading segment" ); +nilfs_err (sb,"I/O error reading segment" );return -EIO ;case NILFS_SEG_FAIL_MAGIC : msg ="Magic number mismatch" ;
@@ -72,10 +72,10 @@ static int nilfs_warn_segment_error(struct super_block *sb, int err) msg ="No super root in the last segment" ;break ;default : -nilfs_msg (sb,KERN_ERR ,"unrecognized segment error %d" , err); +nilfs_err (sb,"unrecognized segment error %d" , err);return -EINVAL ; } -nilfs_msg (sb,KERN_WARNING ,"invalid segment: %s" , msg); +nilfs_warn (sb,"invalid segment: %s" , msg);return -EINVAL ; }
@@ -544,10 +544,10 @@ static int nilfs_recover_dsync_blocks(struct the_nilfs *nilfs,put_page (page); failed_inode: -nilfs_msg (sb,KERN_WARNING , -"error %d recovering data block (ino=%lu, block-offset=%llu)" , - err, (unsigned long )rb->ino, - (unsigned long long )rb->blkoff); +nilfs_warn (sb, +"error %d recovering data block (ino=%lu, block-offset=%llu)" , + err, (unsigned long )rb->ino, + (unsigned long long )rb->blkoff);if (!err2) err2 = err; next:
@@ -670,8 +670,7 @@ static int nilfs_do_roll_forward(struct the_nilfs *nilfs, }if (nsalvaged_blocks) { -nilfs_msg (sb,KERN_INFO ,"salvaged %lu blocks" , - nsalvaged_blocks); +nilfs_info (sb,"salvaged %lu blocks" , nsalvaged_blocks); ri->ri_need_recovery =NILFS_RECOVERY_ROLLFORWARD_DONE ; } out:
@@ -682,7 +681,7 @@ static int nilfs_do_roll_forward(struct the_nilfs *nilfs, confused: err = -EINVAL ; failed: -nilfs_msg (sb,KERN_ERR , +nilfs_err (sb,"error %d roll-forwarding partial segment at blocknr = %llu" , err, (unsigned long long )pseg_start); goto out;
@@ -704,8 +703,8 @@ static void nilfs_finish_roll_forward(struct the_nilfs *nilfs,set_buffer_dirty (bh); err =sync_dirty_buffer (bh);if (unlikely (err)) -nilfs_msg (nilfs->ns_sb,KERN_WARNING , -"buffer sync write failed during post-cleaning of recovery." ); +nilfs_warn (nilfs->ns_sb, +"buffer sync write failed during post-cleaning of recovery." );brelse (bh); }
@@ -740,8 +739,7 @@ int nilfs_salvage_orphan_logs(struct the_nilfs *nilfs, err =nilfs_attach_checkpoint (sb, ri->ri_cno, true, &root);if (unlikely (err)) { -nilfs_msg (sb,KERN_ERR , -"error %d loading the latest checkpoint" , err); +nilfs_err (sb,"error %d loading the latest checkpoint" , err);return err; }
@@ -752,8 +750,7 @@ int nilfs_salvage_orphan_logs(struct the_nilfs *nilfs,if (ri->ri_need_recovery ==NILFS_RECOVERY_ROLLFORWARD_DONE ) { err =nilfs_prepare_segment_for_recovery (nilfs, sb, ri);if (unlikely (err)) { -nilfs_msg (sb,KERN_ERR , -"error %d preparing segment for recovery" , +nilfs_err (sb,"error %d preparing segment for recovery" , err); goto failed; }
@@ -767,8 +764,7 @@ int nilfs_salvage_orphan_logs(struct the_nilfs *nilfs,nilfs_detach_log_writer (sb);if (unlikely (err)) { -nilfs_msg (sb,KERN_ERR , -"error %d writing segment for recovery" , +nilfs_err (sb,"error %d writing segment for recovery" , err); goto failed; }
fs/nilfs2/segbuf.c +1 -1
@@ -511,7 +511,7 @@ static int nilfs_segbuf_wait(struct nilfs_segment_buffer *segbuf) }while (--segbuf->sb_nbio >0 );if (unlikely (atomic_read (&segbuf->sb_err) >0 )) { - nilfs_msg(segbuf->sb_super, KERN_ERR, + nilfs_err(segbuf->sb_super, "I/O error writing log (start-blocknr=%llu, block-count=%lu) in segment %llu", (unsigned long long)segbuf->sb_pseg_start, segbuf->sb_sum.nblocks,
fs/nilfs2/segment.c +19 -19
@@ -158,7 +158,7 @@ static int nilfs_prepare_segment_lock(struct super_block *sb,* it is saved and will be restored on * nilfs_transaction_commit(). */ -nilfs_msg (sb,KERN_WARNING ,"journal info from a different FS" ); +nilfs_warn (sb,"journal info from a different FS" ); save = current->journal_info; }if (!ti) {
@@ -1983,9 +1983,9 @@ static int nilfs_segctor_collect_dirty_files(struct nilfs_sc_info *sci, err =nilfs_ifile_get_inode_block ( ifile, ii->vfs_inode.i_ino, &ibh);if (unlikely (err)) { -nilfs_msg (sci->sc_super,KERN_WARNING , -"log writer: error %d getting inode block (ino=%lu)" , - err, ii->vfs_inode.i_ino); +nilfs_warn (sci->sc_super, +"log writer: error %d getting inode block (ino=%lu)" , + err, ii->vfs_inode.i_ino);return err; }spin_lock (&nilfs->ns_inode_lock);
@@ -2495,7 +2495,7 @@ int nilfs_clean_segments(struct super_block *sb, struct nilfs_argv *argv,if (likely (!err))break ; -nilfs_msg (sb,KERN_WARNING ,"error %d cleaning segments" , err); +nilfs_warn (sb,"error %d cleaning segments" , err);set_current_state (TASK_INTERRUPTIBLE );schedule_timeout (sci->sc_interval); }
@@ -2503,9 +2503,9 @@ int nilfs_clean_segments(struct super_block *sb, struct nilfs_argv *argv,int ret =nilfs_discard_segments (nilfs, sci->sc_freesegs, sci->sc_nfreesegs);if (ret) { -nilfs_msg (sb,KERN_WARNING , -"error %d on discard request, turning discards off for the device" , - ret); +nilfs_warn (sb, +"error %d on discard request, turning discards off for the device" , + ret);nilfs_clear_opt (nilfs,DISCARD ); } }
@@ -2586,9 +2586,9 @@ static int nilfs_segctor_thread(void *arg)/* start sync. */ sci->sc_task = current;wake_up (&sci->sc_wait_task);/* for nilfs_segctor_start_thread() */ -nilfs_msg (sci->sc_super,KERN_INFO , -"segctord starting. Construction interval = %lu seconds, CP frequency < %lu seconds" , - sci->sc_interval /HZ , sci->sc_mjcp_freq /HZ ); +nilfs_info (sci->sc_super, +"segctord starting. Construction interval = %lu seconds, CP frequency < %lu seconds" , + sci->sc_interval /HZ , sci->sc_mjcp_freq /HZ );spin_lock (&sci->sc_state_lock); loop:
@@ -2661,8 +2661,8 @@ static int nilfs_segctor_start_thread(struct nilfs_sc_info *sci)if (IS_ERR (t)) {int err =PTR_ERR (t); -nilfs_msg (sci->sc_super,KERN_ERR , -"error %d creating segctord thread" , err); +nilfs_err (sci->sc_super,"error %d creating segctord thread" , + err);return err; }wait_event (sci->sc_wait_task, sci->sc_task !=NULL );
@@ -2772,14 +2772,14 @@ static void nilfs_segctor_destroy(struct nilfs_sc_info *sci)nilfs_segctor_write_out (sci);if (!list_empty (&sci->sc_dirty_files)) { -nilfs_msg (sci->sc_super,KERN_WARNING , -"disposed unprocessed dirty file(s) when stopping log writer" ); +nilfs_warn (sci->sc_super, +"disposed unprocessed dirty file(s) when stopping log writer" );nilfs_dispose_list (nilfs, &sci->sc_dirty_files,1 ); }if (!list_empty (&sci->sc_iput_queue)) { -nilfs_msg (sci->sc_super,KERN_WARNING , -"disposed unprocessed inode(s) in iput queue when stopping log writer" ); +nilfs_warn (sci->sc_super, +"disposed unprocessed inode(s) in iput queue when stopping log writer" );nilfs_dispose_list (nilfs, &sci->sc_iput_queue,1 ); }
@@ -2858,8 +2858,8 @@ void nilfs_detach_log_writer(struct super_block *sb)spin_lock (&nilfs->ns_inode_lock);if (!list_empty (&nilfs->ns_dirty_files)) {list_splice_init (&nilfs->ns_dirty_files, &garbage_list); -nilfs_msg (sb,KERN_WARNING , -"disposed unprocessed dirty file(s) when detaching log writer" ); +nilfs_warn (sb, +"disposed unprocessed dirty file(s) when detaching log writer" ); }spin_unlock (&nilfs->ns_inode_lock);up_write (&nilfs->ns_segctor_sem);
fs/nilfs2/sufile.c +13 -16
@@ -171,9 +171,9 @@ int nilfs_sufile_updatev(struct inode *sufile, __u64 *segnumv, size_t nsegs,down_write (&NILFS_MDT (sufile)->mi_sem);for (seg = segnumv; seg < segnumv + nsegs; seg++) {if (unlikely (*seg >=nilfs_sufile_get_nsegments (sufile))) { -nilfs_msg (sufile->i_sb,KERN_WARNING , -"%s: invalid segment number: %llu" , - __func__, (unsigned long long )*seg); +nilfs_warn (sufile->i_sb, +"%s: invalid segment number: %llu" , + __func__, (unsigned long long )*seg); nerr++; } }
@@ -230,9 +230,8 @@ int nilfs_sufile_update(struct inode *sufile, __u64 segnum, int create,int ret;if (unlikely (segnum >=nilfs_sufile_get_nsegments (sufile))) { -nilfs_msg (sufile->i_sb,KERN_WARNING , -"%s: invalid segment number: %llu" , - __func__, (unsigned long long )segnum); +nilfs_warn (sufile->i_sb,"%s: invalid segment number: %llu" , + __func__, (unsigned long long )segnum);return -EINVAL ; }down_write (&NILFS_MDT (sufile)->mi_sem);
@@ -410,9 +409,8 @@ void nilfs_sufile_do_cancel_free(struct inode *sufile, __u64 segnum, kaddr =kmap_atomic (su_bh->b_page); su =nilfs_sufile_block_get_segment_usage (sufile, segnum, su_bh, kaddr);if (unlikely (!nilfs_segment_usage_clean (su))) { -nilfs_msg (sufile->i_sb,KERN_WARNING , -"%s: segment %llu must be clean" , __func__, - (unsigned long long )segnum); +nilfs_warn (sufile->i_sb,"%s: segment %llu must be clean" , + __func__, (unsigned long long )segnum);kunmap_atomic (kaddr);return ; }
@@ -468,9 +466,8 @@ void nilfs_sufile_do_free(struct inode *sufile, __u64 segnum, kaddr =kmap_atomic (su_bh->b_page); su =nilfs_sufile_block_get_segment_usage (sufile, segnum, su_bh, kaddr);if (nilfs_segment_usage_clean (su)) { -nilfs_msg (sufile->i_sb,KERN_WARNING , -"%s: segment %llu is already clean" , - __func__, (unsigned long long )segnum); +nilfs_warn (sufile->i_sb,"%s: segment %llu is already clean" , + __func__, (unsigned long long )segnum);kunmap_atomic (kaddr);return ; }
@@ -1213,12 +1210,12 @@ int nilfs_sufile_read(struct super_block *sb, size_t susize,int err;if (susize > sb->s_blocksize) { -nilfs_msg (sb,KERN_ERR , -"too large segment usage size: %zu bytes" , susize); +nilfs_err (sb,"too large segment usage size: %zu bytes" , + susize);return -EINVAL ; }else if (susize <NILFS_MIN_SEGMENT_USAGE_SIZE ) { -nilfs_msg (sb,KERN_ERR , -"too small segment usage size: %zu bytes" , susize); +nilfs_err (sb,"too small segment usage size: %zu bytes" , + susize);return -EINVAL ; }
fs/nilfs2/super.c +27 -30
183 lines not on this page · raw message
fs/nilfs2/sysfs.c +13 -16
@@ -261,8 +261,8 @@ nilfs_checkpoints_checkpoints_number_show(struct nilfs_checkpoints_attr *attr, err =nilfs_cpfile_get_stat (nilfs->ns_cpfile, &cpstat);up_read (&nilfs->ns_segctor_sem);if (err <0 ) { -nilfs_msg (nilfs->ns_sb,KERN_ERR , -"unable to get checkpoint stat: err=%d" , err); +nilfs_err (nilfs->ns_sb,"unable to get checkpoint stat: err=%d" , + err);return err; }
@@ -284,8 +284,8 @@ nilfs_checkpoints_snapshots_number_show(struct nilfs_checkpoints_attr *attr, err =nilfs_cpfile_get_stat (nilfs->ns_cpfile, &cpstat);up_read (&nilfs->ns_segctor_sem);if (err <0 ) { -nilfs_msg (nilfs->ns_sb,KERN_ERR , -"unable to get checkpoint stat: err=%d" , err); +nilfs_err (nilfs->ns_sb,"unable to get checkpoint stat: err=%d" , + err);return err; }
@@ -403,8 +403,8 @@ nilfs_segments_dirty_segments_show(struct nilfs_segments_attr *attr, err =nilfs_sufile_get_stat (nilfs->ns_sufile, &sustat);up_read (&nilfs->ns_segctor_sem);if (err <0 ) { -nilfs_msg (nilfs->ns_sb,KERN_ERR , -"unable to get segment stat: err=%d" , err); +nilfs_err (nilfs->ns_sb,"unable to get segment stat: err=%d" , + err);return err; }
@@ -777,15 +777,15 @@ nilfs_superblock_sb_update_frequency_store(struct nilfs_superblock_attr *attr, err =kstrtouint (skip_spaces (buf),0 , &val);if (err) { -nilfs_msg (nilfs->ns_sb,KERN_ERR , -"unable to convert string: err=%d" , err); +nilfs_err (nilfs->ns_sb,"unable to convert string: err=%d" , + err);return err; }if (val <NILFS_SB_FREQ ) { val =NILFS_SB_FREQ ; -nilfs_msg (nilfs->ns_sb,KERN_WARNING , -"superblock update frequency cannot be lesser than 10 seconds" ); +nilfs_warn (nilfs->ns_sb, +"superblock update frequency cannot be lesser than 10 seconds" ); }down_write (&nilfs->ns_sem);
@@ -988,8 +988,7 @@ int nilfs_sysfs_create_device_group(struct super_block *sb) nilfs->ns_dev_subgroups =kzalloc (devgrp_size,GFP_KERNEL );if (unlikely (!nilfs->ns_dev_subgroups)) { err = -ENOMEM ; -nilfs_msg (sb,KERN_ERR , -"unable to allocate memory for device group" ); +nilfs_err (sb,"unable to allocate memory for device group" ); goto failed_create_device_group; }
@@ -1098,15 +1097,13 @@ int __init nilfs_sysfs_init(void) nilfs_kset =kset_create_and_add (NILFS_ROOT_GROUP_NAME ,NULL , fs_kobj);if (!nilfs_kset) { err = -ENOMEM ; -nilfs_msg (NULL ,KERN_ERR , -"unable to create sysfs entry: err=%d" , err); +nilfs_err (NULL ,"unable to create sysfs entry: err=%d" , err); goto failed_sysfs_init; } err =sysfs_create_group (&nilfs_kset->kobj, &nilfs_feature_attr_group);if (unlikely (err)) { -nilfs_msg (NULL ,KERN_ERR , -"unable to create feature group: err=%d" , err); +nilfs_err (NULL ,"unable to create feature group: err=%d" , err); goto cleanup_sysfs_init; }
fs/nilfs2/the_nilfs.c +40 -45
221 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 75/215 nilfs2: prevent kernel bug at submit_bh_wbc()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
[ Upstream commit 269cdf353b5bdd15f1a079671b0f889113865f20 ]
Fix a bug where nilfs_get_block() returns a successful status when searching and inserting the specified block both fail inconsistently. If this inconsistent behavior is not due to a previously fixed bug, then an unexpected race is occurring, so return a temporary error -EAGAIN instead.
This prevents callers such as __block_write_begin_int() from requesting a read into a buffer that is not mapped, which would cause the BUG_ON check for the BH_Mapped flag in submit_bh_wbc() to fail.
--- fs/nilfs2/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nilfs2/inode.c +1 -1
@@ -111,7 +111,7 @@ int nilfs_get_block(struct inode *inode, sector_t blkoff,"%s (ino=%lu): a race condition while inserting a data block at offset=%llu" , __func__, inode->i_ino, (unsigned long long)blkoff); - err =0 ; + err = -EAGAIN ; }nilfs_transaction_abort (inode->i_sb); goto out;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 76/215 x86/CPU/AMD: Update the Zenbleed microcode revisions
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Borislav Petkov (AMD) <[email protected]>
[ Upstream commit 5c84b051bd4e777cf37aaff983277e58c99618d5 ]
Update them to the correct revision numbers.
--- arch/x86/kernel/cpu/amd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/x86/kernel/cpu/amd.c +5 -5
@@ -998,11 +998,11 @@ static bool cpu_has_zenbleed_microcode(void)u32 good_rev =0 ;switch (boot_cpu_data.x86_model) { - case 0x30 ... 0x3f: good_rev = 0x0830107a; break; - case 0x60 ... 0x67: good_rev = 0x0860010b; break; - case 0x68 ... 0x6f: good_rev = 0x08608105; break; - case 0x70 ... 0x7f: good_rev = 0x08701032; break; - case 0xa0 ... 0xaf: good_rev = 0x08a00008; break; + case 0x30 ... 0x3f: good_rev = 0x0830107b; break; + case 0x60 ... 0x67: good_rev = 0x0860010c; break; + case 0x68 ... 0x6f: good_rev = 0x08608107; break; + case 0x70 ... 0x7f: good_rev = 0x08701033; break; + case 0xa0 ... 0xaf: good_rev = 0x08a00009; break;default :return false;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 77/215 ahci: asm1064: correct count of reported ports
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrey Jr. Melnikov <[email protected]>
[ Upstream commit 9815e39617541ef52d0dfac4be274ad378c6dc09 ]
The ASM1064 SATA host controller always reports wrongly, that it has 24 ports. But in reality, it only has four ports.
before:
ahci 0000:04:00.0: SSS flag set, parallel bus scan disabled
ahci 0000:04:00.0: AHCI 0001.0301 32 slots 24 ports 6 Gbps 0xffff0f impl SATA mode ahci 0000:04:00.0: flags: 64bit ncq sntf stag pm led only pio sxs deso sadm sds apst
after:
ahci 0000:04:00.0: ASM1064 has only four ports
ahci 0000:04:00.0: forcing port_map 0xffff0f -> 0xf
ahci 0000:04:00.0: SSS flag set, parallel bus scan disabled
ahci 0000:04:00.0: AHCI 0001.0301 32 slots 24 ports 6 Gbps 0xf impl SATA mode ahci 0000:04:00.0: flags: 64bit ncq sntf stag pm led only pio sxs deso sadm sds apst
Stable-dep-of: 6cd8adc3e189 ("ahci: asm1064: asm1166: don't limit reported ports")
--- drivers/ata/ahci.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/ata/ahci.c +11 -3
@@ -626,9 +626,17 @@ MODULE_PARM_DESC(mobile_lpm_policy, "Default LPM policy for mobile chipsets");static void ahci_pci_save_initial_config (struct pci_dev *pdev,struct ahci_host_priv *hpriv) { -if (pdev->vendor ==PCI_VENDOR_ID_ASMEDIA && pdev->device ==0x1166 ) { -dev_info (&pdev->dev,"ASM1166 has only six ports\n" ); - hpriv->saved_port_map =0x3f ; +if (pdev->vendor ==PCI_VENDOR_ID_ASMEDIA ) { +switch (pdev->device) { +case 0x1166 : +dev_info (&pdev->dev,"ASM1166 has only six ports\n" ); + hpriv->saved_port_map =0x3f ; +break ; +case 0x1064 : +dev_info (&pdev->dev,"ASM1064 has only four ports\n" ); + hpriv->saved_port_map =0xf ; +break ; + } }if (pdev->vendor ==PCI_VENDOR_ID_JMICRON && pdev->device ==0x2361 ) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 78/215 ahci: asm1064: asm1166: dont limit reported ports
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Conrad Kostecki <[email protected]>
[ Upstream commit 6cd8adc3e18960f6e59d797285ed34ef473cc896 ]
Previously, patches have been added to limit the reported count of SATA ports for asm1064 and asm1166 SATA controllers, as those controllers do report more ports than physically having.
While it is allowed to report more ports than physically having in CAP.NP, it is not allowed to report more ports than physically having in the PI (Ports Implemented) register, which is what these HBAs do. (This is a AHCI spec violation.)
Unfortunately, it seems that the PMP implementation in these ASMedia HBAs is also violating the AHCI and SATA-IO PMP specification.
What these HBAs do is that they do not report that they support PMP (CAP.SPM (Supports Port Multiplier) is not set).
Instead, they have decided to add extra "virtual" ports in the PI register that is used if a port multiplier is connected to any of the physical ports of the HBA.
Enumerating the devices behind the PMP as specified in the AHCI and SATA-IO specifications, by using PMP READ and PMP WRITE commands to the physical ports of the HBA is not possible, you have to use the "virtual" ports.
This is of course bad, because this gives us no way to detect the device and vendor ID of the PMP actually connected to the HBA, which means that we can not apply the proper PMP quirks for the PMP that is connected to the HBA.
Limiting the port map will thus stop these controllers from working with SATA Port Multipliers.
This patch reverts both patches for asm1064 and asm1166, so old behavior is restored and SATA PMP will work again, but it will also reintroduce the (minutes long) extra boot time for the ASMedia controllers that do not have a PMP connected (either on the PCIe card itself, or an external PMP).
However, a longer boot time for some, is the lesser evil compared to some other users not being able to detect their drives at all.
--- drivers/ata/ahci.c | 13 ------------- 1 file changed, 13 deletions(-)
drivers/ata/ahci.c +0 -13
@@ -626,19 +626,6 @@ MODULE_PARM_DESC(mobile_lpm_policy, "Default LPM policy for mobile chipsets");static void ahci_pci_save_initial_config (struct pci_dev *pdev,struct ahci_host_priv *hpriv) { -if (pdev->vendor ==PCI_VENDOR_ID_ASMEDIA ) { -switch (pdev->device) { -case 0x1166 : -dev_info (&pdev->dev,"ASM1166 has only six ports\n" ); - hpriv->saved_port_map =0x3f ; -break ; -case 0x1064 : -dev_info (&pdev->dev,"ASM1064 has only four ports\n" ); - hpriv->saved_port_map =0xf ; -break ; - } - } -if (pdev->vendor ==PCI_VENDOR_ID_JMICRON && pdev->device ==0x2361 ) {dev_info (&pdev->dev,"JMB361 has only one port\n" ); hpriv->force_port_map =1 ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 79/215 dm snapshot: fix lockup in dm_exception_table_exit
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikulas Patocka <[email protected]>
[ Upstream commit 6e7132ed3c07bd8a6ce3db4bb307ef2852b322dc ]
There was reported lockup when we exit a snapshot with many exceptions. Fix this by adding "cond_resched" to the loop that frees the exceptions.
--- drivers/md/dm-snap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/md/dm-snap.c +3 -1
@@ -685,8 +685,10 @@ static void dm_exception_table_exit(struct dm_exception_table *et,for (i =0 ; i < size; i++) { slot = et->table + i; -hlist_bl_for_each_entry_safe (ex, pos, n, slot, hash_list) +hlist_bl_for_each_entry_safe (ex, pos, n, slot, hash_list) {kmem_cache_free (mem, ex); +cond_resched (); + } }vfree (et->table);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 80/215 comedi: comedi_test: Prevent timers rescheduling during deletion
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
commit f53641a6e849034a44bf80f50245a75d7a376025 upstream.
The comedi_test devices have a couple of timers (ai_timer and ao_timer) that can be started to simulate hardware interrupts. Their expiry functions normally reschedule the timer. The driver code calls either del_timer_sync() or del_timer() to delete the timers from the queue, but does not currently prevent the timers from rescheduling themselves so synchronized deletion may be ineffective.
Add a couple of boolean members (one for each timer: ai_timer_enable and ao_timer_enable) to the device private data structure to indicate whether the timers are allowed to reschedule themselves. Set the member to true when adding the timer to the queue, and to false when deleting the timer from the queue in the waveform_ai_cancel() and waveform_ao_cancel() functions.
The del_timer_sync() function is also called from the waveform_detach() function, but the timer enable members will already be set to false when that function is called, so no change is needed there.
--- drivers/staging/comedi/drivers/comedi_test.c | 30 +++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-)
drivers/staging/comedi/drivers/comedi_test.c +26 -4
@@ -87,6 +87,8 @@ struct waveform_private {struct comedi_device *dev;/* parent comedi device */ u64 ao_last_scan_time;/* time of previous AO scan in usec */ unsigned int ao_scan_period;/* AO scan period in usec */ + bool ai_timer_enable:1; /* should AI timer be running? */ + bool ao_timer_enable:1; /* should AO timer be running? */unsigned short ao_loopbacks[N_CHANS ]; };
@@ -236,8 +238,12 @@ static void waveform_ai_timer(struct tim time_increment = devpriv->ai_convert_time - now; else time_increment =1 ; -mod_timer (&devpriv->ai_timer, - jiffies +usecs_to_jiffies (time_increment)); +spin_lock (&dev->spinlock); +if (devpriv->ai_timer_enable) { +mod_timer (&devpriv->ai_timer, + jiffies +usecs_to_jiffies (time_increment)); + } +spin_unlock (&dev->spinlock); } overrun:
@@ -393,9 +399,12 @@ static int waveform_ai_cmd(struct comedi* Seem to need an extra jiffy here, otherwise timer expires slightly * early! */ +spin_lock_bh (&dev->spinlock); + devpriv->ai_timer_enable = true; devpriv->ai_timer.expires = jiffies +usecs_to_jiffies (devpriv->ai_convert_period) +1 ;add_timer (&devpriv->ai_timer); +spin_unlock_bh (&dev->spinlock);return 0 ; }
@@ -404,6 +413,9 @@ static int waveform_ai_cancel(struct com {struct waveform_private *devpriv = dev->private; +spin_lock_bh (&dev->spinlock); + devpriv->ai_timer_enable = false; +spin_unlock_bh (&dev->spinlock);if (in_softirq ()) {/* Assume we were called from the timer routine itself. */ del_timer (&devpriv->ai_timer);
@@ -495,8 +507,12 @@ static void waveform_ao_timer(struct timunsigned int time_inc = devpriv->ao_last_scan_time + devpriv->ao_scan_period - now; -mod_timer (&devpriv->ao_timer, - jiffies +usecs_to_jiffies (time_inc)); +spin_lock (&dev->spinlock); +if (devpriv->ao_timer_enable) { +mod_timer (&devpriv->ao_timer, + jiffies +usecs_to_jiffies (time_inc)); + } +spin_unlock (&dev->spinlock); } underrun:
@@ -517,9 +533,12 @@ static int waveform_ao_inttrig_start(str async->inttrig =NULL ; devpriv->ao_last_scan_time =ktime_to_us (ktime_get ()); +spin_lock_bh (&dev->spinlock); + devpriv->ao_timer_enable = true; devpriv->ao_timer.expires = jiffies +usecs_to_jiffies (devpriv->ao_scan_period);add_timer (&devpriv->ao_timer); +spin_unlock_bh (&dev->spinlock);return 1 ; }
@@ -604,6 +623,9 @@ static int waveform_ao_cancel(struct comstruct waveform_private *devpriv = dev->private; s->async->inttrig =NULL ; +spin_lock_bh (&dev->spinlock); + devpriv->ao_timer_enable = false; +spin_unlock_bh (&dev->spinlock);if (in_softirq ()) {/* Assume we were called from the timer routine itself. */ del_timer (&devpriv->ao_timer);
Greg Kroah-Hartman
maintainerPATCH 81/215 netfilter: nf_tables: mark set as dead when unbinding anonymous set with timeout
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
commit 552705a3650bbf46a22b1adedc1b04181490fc36 upstream.
While the rhashtable set gc runs asynchronously, a race allows it to collect elements from anonymous sets with timeouts while it is being released from the commit path.
Mingi Cho originally reported this issue in a different path in 6.1.x with a pipapo set with low timeouts which is not possible upstream since 7395dfacfff6 ("netfilter: nf_tables: use timestamp to check for set element timeout").
Fix this by setting on the dead flag for anonymous sets to skip async gc in this case.
According to 08e4c8c5919f ("netfilter: nf_tables: mark newset as dead on transaction abort"), Florian plans to accelerate abort path by releasing objects via workqueue, therefore, this sets on the dead flag for abort path too.
--- net/netfilter/nf_tables_api.c | 1 + 1 file changed, 1 insertion(+)
net/netfilter/nf_tables_api.c +1 -0
@@ -4073,6 +4073,7 @@ static void nf_tables_unbind_set(const sif (list_empty (&set->bindings) &&nft_set_is_anonymous (set)) {list_del_rcu (&set->list); + set->dead =1 ;if (event)nf_tables_set_notify (ctx, set,NFT_MSG_DELSET ,GFP_KERNEL );
Greg Kroah-Hartman
maintainerPATCH 82/215 netfilter: nf_tables: disallow anonymous set with timeout flag
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
commit 16603605b667b70da974bea8216c93e7db043bf1 upstream.
Anonymous sets are never used with timeout from userspace, reject this. Exception to this rule is NFT_SET_EVAL to ensure legacy meters still work.
--- net/netfilter/nf_tables_api.c | 3 +++ 1 file changed, 3 insertions(+)
net/netfilter/nf_tables_api.c +3 -0
@@ -3769,6 +3769,9 @@ static int nf_tables_newset(struct net *if ((flags & (NFT_SET_EVAL |NFT_SET_OBJECT )) == (NFT_SET_EVAL |NFT_SET_OBJECT ))return -EOPNOTSUPP ; +if ((flags & (NFT_SET_ANONYMOUS |NFT_SET_TIMEOUT |NFT_SET_EVAL )) == + (NFT_SET_ANONYMOUS |NFT_SET_TIMEOUT )) +return -EOPNOTSUPP ; } dtype =0 ;
Greg Kroah-Hartman
maintainerPATCH 83/215 netfilter: nf_tables: reject constant set with timeout
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pablo Neira Ayuso <[email protected]>
commit 5f4fc4bd5cddb4770ab120ce44f02695c4505562 upstream.
This set combination is weird: it allows for elements to be added/deleted, but once bound to the rule it cannot be updated anymore. Eventually, all elements expire, leading to an empty set which cannot be updated anymore. Reject this flags combination.
--- net/netfilter/nf_tables_api.c | 3 +++ 1 file changed, 3 insertions(+)
net/netfilter/nf_tables_api.c +3 -0
@@ -3772,6 +3772,9 @@ static int nf_tables_newset(struct net *if ((flags & (NFT_SET_ANONYMOUS |NFT_SET_TIMEOUT |NFT_SET_EVAL )) == (NFT_SET_ANONYMOUS |NFT_SET_TIMEOUT ))return -EOPNOTSUPP ; +if ((flags & (NFT_SET_CONSTANT |NFT_SET_TIMEOUT )) == + (NFT_SET_CONSTANT |NFT_SET_TIMEOUT )) +return -EOPNOTSUPP ; } dtype =0 ;
Greg Kroah-Hartman
maintainerPATCH 84/215 xfrm: Avoid clang fortify warning in copy_to_user_tmpl()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Chancellor <[email protected]>
commit 1a807e46aa93ebad1dfbed4f82dc3bf779423a6e upstream.
After a couple recent changes in LLVM, there is a warning (or error with CONFIG_WERROR=y or W=e) from the compile time fortify source routines, specifically the memset() in copy_to_user_tmpl().
In file included from net/xfrm/xfrm_user.c:14:
...
include/linux/fortify-string.h:438:4: error: call to '__write_overflow_field' declared with 'warning' attribute: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror,-Wattribute-warning]
438 | __write_overflow_field(p_size_field, size);
| ^1 error generated.
While ->xfrm_nr has been validated against XFRM_MAX_DEPTH when its value is first assigned in copy_templates() by calling validate_tmpl() first (so there should not be any issue in practice), LLVM/clang cannot really deduce that across the boundaries of these functions. Without that knowledge, it cannot assume that the loop stops before i is greater than XFRM_MAX_DEPTH, which would indeed result a stack buffer overflow in the memset().
To make the bounds of ->xfrm_nr clear to the compiler and add additional defense in case copy_to_user_tmpl() is ever used in a path where ->xfrm_nr has not been properly validated against XFRM_MAX_DEPTH first, add an explicit bound check and early return, which clears up the warning.
--- net/xfrm/xfrm_user.c | 3 +++ 1 file changed, 3 insertions(+)
net/xfrm/xfrm_user.c +3 -0
@@ -1704,6 +1704,9 @@ static int copy_to_user_tmpl(struct xfrmif (xp->xfrm_nr ==0 )return 0 ; +if (xp->xfrm_nr >XFRM_MAX_DEPTH ) +return -ENOBUFS ; +for (i =0 ; i < xp->xfrm_nr; i++) {struct xfrm_user_tmpl *up = &vec[i];struct xfrm_tmpl *kp = &xp->xfrm_vec[i];
Greg Kroah-Hartman
maintainerPATCH 85/215 ALSA: hda/realtek - Fix headset Mic no show at resume back for Lenovo ALC897 platform
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kailang Yang <[email protected]>
commit d397b6e56151099cf3b1f7bfccb204a6a8591720 upstream.
Headset Mic will no show at resume back.
This patch will fix this issue.
--- sound/pci/hda/patch_realtek.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
sound/pci/hda/patch_realtek.c +5 -2
@@ -9796,8 +9796,7 @@ static void alc897_hp_automute_hook(strusnd_hda_gen_hp_automute (codec, jack); vref = spec->gen.hp_jack_present ? (PIN_HP |AC_PINCTL_VREF_100 ) :PIN_HP ; -snd_hda_codec_write (codec,0x1b ,0 ,AC_VERB_SET_PIN_WIDGET_CONTROL , - vref); +snd_hda_set_pin_ctl (codec,0x1b , vref); } static void alc897_fixup_lenovo_headset_mic(struct hda_codec *codec,
@@ -9806,6 +9805,10 @@ static void alc897_fixup_lenovo_headset_struct alc_spec *spec = codec->spec;if (action ==HDA_FIXUP_ACT_PRE_PROBE ) { spec->gen.hp_automute_hook = alc897_hp_automute_hook; + spec->no_shutup_pins =1 ; + } +if (action ==HDA_FIXUP_ACT_PROBE ) { +snd_hda_set_pin_ctl_cache (codec,0x1a ,PIN_IN |AC_PINCTL_VREF_100 ); } }
Greg Kroah-Hartman
maintainerPATCH 86/215 USB: usb-storage: Prevent divide-by-0 error in isd200_ata_command
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Stern <[email protected]>
commit 014bcf41d946b36a8f0b8e9b5d9529efbb822f49 upstream.
The isd200 sub-driver in usb-storage uses the HEADS and SECTORS values in the ATA ID information to calculate cylinder and head values when creating a CDB for READ or WRITE commands. The calculation involves division and modulus operations, which will cause a crash if either of these values is 0. While this never happens with a genuine device, it could happen with a flawed or subversive emulation, as reported by the syzbot fuzzer.
Protect against this possibility by refusing to bind to the device if either the ATA_ID_HEADS or ATA_ID_SECTORS value in the device's ID information is 0. This requires isd200_Initialization() to return a negative error code when initialization fails; currently it always returns 0 (even when there is an error).
--- drivers/usb/storage/isd200.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-)
drivers/usb/storage/isd200.c +18 -5
@@ -1105,7 +1105,7 @@ static void isd200_dump_driveid(struct ustatic int isd200_get_inquiry_data (struct us_data *us ) {struct isd200_info *info = (struct isd200_info *)us->extra; -int retStatus =ISD200_GOOD ; +int retStatus;u16 *id = info->id;usb_stor_dbg (us,"Entering isd200_get_inquiry_data\n" );
@@ -1137,6 +1137,13 @@ static int isd200_get_inquiry_data( struisd200_fix_driveid (id);isd200_dump_driveid (us, id); +/* Prevent division by 0 in isd200_scsi_to_ata() */ +if (id[ATA_ID_HEADS ] ==0 || id[ATA_ID_SECTORS ] ==0 ) { +usb_stor_dbg (us," Invalid ATA Identify data\n" ); + retStatus =ISD200_ERROR ; + goto Done; + } +memset (&info->InquiryData,0 ,sizeof (info->InquiryData));/* Standard IDE interface only supports disks */
@@ -1202,6 +1209,7 @@ static int isd200_get_inquiry_data( stru } } + Done:usb_stor_dbg (us,"Leaving isd200_get_inquiry_data %08X\n" , retStatus);return (retStatus);
@@ -1481,22 +1489,27 @@ static int isd200_init_info(struct us_dastatic int isd200_Initialization (struct us_data *us) { +int rc =0 ; +usb_stor_dbg (us,"ISD200 Initialization...\n" );/* Initialize ISD200 info struct */ -if (isd200_init_info (us) ==ISD200_ERROR ) { +if (isd200_init_info (us) <0 ) {usb_stor_dbg (us,"ERROR Initializing ISD200 Info struct\n" ); + rc = -ENOMEM ; }else {/* Get device specific data */ -if (isd200_get_inquiry_data (us) !=ISD200_GOOD ) +if (isd200_get_inquiry_data (us) !=ISD200_GOOD ) {usb_stor_dbg (us,"ISD200 Initialization Failure\n" ); -else + rc = -EINVAL ; + }else {usb_stor_dbg (us,"ISD200 Initialization complete\n" ); + } } -return 0 ; +return rc; }
Greg Kroah-Hartman
maintainerPATCH 87/215 usb: gadget: ncm: Fix handling of zero block length packets
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krishna Kurapati <[email protected]>
commit f90ce1e04cbcc76639d6cba0fdbd820cd80b3c70 upstream.
While connecting to a Linux host with CDC_NCM_NTB_DEF_SIZE_TX set to 65536, it has been observed that we receive short packets, which come at interval of 5-10 seconds sometimes and have block length zero but still contain 1-2 valid datagrams present.
According to the NCM spec:
"If wBlockLength = 0x0000, the block is terminated by a short packet. In this case, the USB transfer must still be shorter than dwNtbInMaxSize or dwNtbOutMaxSize. If exactly dwNtbInMaxSize or dwNtbOutMaxSize bytes are sent, and the size is a multiple of wMaxPacketSize for the given pipe, then no ZLP shall be sent.
wBlockLength= 0x0000 must be used with extreme care, because of the possibility that the host and device may get out of sync, and because of test issues.
wBlockLength = 0x0000 allows the sender to reduce latency by starting to send a very large NTB, and then shortening it when the sender discovers that there’s not sufficient data to justify sending a large NTB"
However, there is a potential issue with the current implementation, as it checks for the occurrence of multiple NTBs in a single giveback by verifying if the leftover bytes to be processed is zero or not. If the block length reads zero, we would process the same NTB infintely because the leftover bytes is never zero and it leads to a crash. Fix this by bailing out if block length reads zero.
--- drivers/usb/gadget/function/f_ncm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/gadget/function/f_ncm.c +1 -1
@@ -1357,7 +1357,7 @@ parse_ntb:if (to_process ==1 && (*(unsigned char *)(ntb_ptr + block_len) ==0x00 )) { to_process--; - }else if (to_process >0 ) { + }else if ((to_process >0 ) && (block_len !=0 )) { ntb_ptr = (unsigned char *)(ntb_ptr + block_len); goto parse_ntb; }
Greg Kroah-Hartman
maintainerPATCH 88/215 usb: port: Dont try to peer unused USB ports based on location
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mathias Nyman <[email protected]>
commit 69c63350e573367f9c8594162288cffa8a26d0d1 upstream.
Unused USB ports may have bogus location data in ACPI PLD tables. This causes port peering failures as these unused USB2 and USB3 ports location may match.
Due to these failures the driver prints a
"usb: port power management may be unreliable" warning, and unnecessarily blocks port power off during runtime suspend.
This was debugged on a couple DELL systems where the unused ports all returned zeroes in their location data.
Similar bugreports exist for other systems.
Don't try to peer or match ports that have connect type set to USB_PORT_NOT_USED.
--- drivers/usb/core/port.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/usb/core/port.c +3 -2
@@ -450,7 +450,7 @@ static int match_location(struct usb_devstruct usb_hub *peer_hub =usb_hub_to_struct_hub (peer_hdev);struct usb_device *hdev =to_usb_device (port_dev->dev.parent->parent); -if (!peer_hub) +if (!peer_hub || port_dev->connect_type ==USB_PORT_NOT_USED )return 0 ; hcd =bus_to_hcd (hdev->bus);
@@ -461,7 +461,8 @@ static int match_location(struct usb_devfor (port1 =1 ; port1 <= peer_hdev->maxchild; port1++) { peer = peer_hub->ports[port1 -1 ]; -if (peer && peer->location == port_dev->location) { +if (peer && peer->connect_type !=USB_PORT_NOT_USED && + peer->location == port_dev->location) {link_peers_report (port_dev, peer);return 1 ;/* done */ }
Greg Kroah-Hartman
maintainerPATCH 89/215 tty: serial: fsl_lpuart: avoid idle preamble pending if CTS is enabled
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sherry Sun <[email protected]>
commit 74cb7e0355fae9641f825afa389d3fba3b617714 upstream.
If the remote uart device is not connected or not enabled after booting up, the CTS line is high by default. At this time, if we enable the flow control when opening the device(for example, using “stty -F /dev/ttyLP4 crtscts” command), there will be a pending idle preamble(first writing 0 and then writing 1 to UARTCTRL_TE will queue an idle preamble) that cannot be sent out, resulting in the uart port fail to close(waiting for TX empty), so the user space stty will have to wait for a long time or forever.
This is an LPUART IP bug(idle preamble has higher priority than CTS), here add a workaround patch to enable TX CTS after enabling UARTCTRL_TE, so that the idle preamble does not get stuck due to CTS is deasserted.
--- drivers/tty/serial/fsl_lpuart.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/tty/serial/fsl_lpuart.c +5 -2
@@ -2025,9 +2025,12 @@ lpuart32_set_termios(struct uart_port *p UARTCTRL);lpuart32_serial_setbrg (sport, baud); -lpuart32_write (&sport->port, modem,UARTMODIR ); -lpuart32_write (&sport->port, ctrl,UARTCTRL ); +/* disable CTS before enabling UARTCTRL_TE to avoid pending idle preamble */ +lpuart32_write (&sport->port, modem & ~UARTMODIR_TXCTSE ,UARTMODIR );/* restore control register */ +lpuart32_write (&sport->port, ctrl,UARTCTRL ); +/* re-enable the CTS if needed */ +lpuart32_write (&sport->port, modem,UARTMODIR );if (old && sport->lpuart_dma_rx_use) {if (!lpuart_start_rx_dma (sport))
Greg Kroah-Hartman
maintainerPATCH 90/215 vt: fix unicode buffer corruption when deleting characters
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolas Pitre <[email protected]>
commit 1581dafaf0d34bc9c428a794a22110d7046d186d upstream.
This is the same issue that was fixed for the VGA text buffer in commit 39cdb68c64d8 ("vt: fix memory overlapping when deleting chars in the buffer"). The cure is also the same i.e. replace memcpy() with memmove() due to the overlaping buffers.
--- drivers/tty/vt/vt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/vt/vt.c +1 -1
@@ -405,7 +405,7 @@ static void vc_uniscr_delete(struct vc_dchar32_t *ln = uniscr->lines[vc->vc_y];unsigned int x = vc->vc_x, cols = vc->vc_cols; -memcpy (&ln[x], &ln[x + nr], (cols - x - nr) *sizeof (*ln)); +memmove (&ln[x], &ln[x + nr], (cols - x - nr) *sizeof (*ln));memset32 (&ln[cols - nr],' ' , nr); } }
Greg Kroah-Hartman
maintainerPATCH 91/215 fs/aio: Check IOCB_AIO_RW before the struct aio_kiocb conversion
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bart Van Assche <[email protected]>
commit 961ebd120565cb60cebe21cb634fbc456022db4a upstream.
The first kiocb_set_cancel_fn() argument may point at a struct kiocb that is not embedded inside struct aio_kiocb. With the current code, depending on the compiler, the req->ki_ctx read happens either before the IOCB_AIO_RW test or after that test. Move the req->ki_ctx read such that it is guaranteed that the IOCB_AIO_RW test happens first.
--- fs/aio.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
fs/aio.c +6 -2
@@ -566,8 +566,8 @@ static int aio_setup_ring(struct kioctxvoid kiocb_set_cancel_fn (struct kiocb *iocb,kiocb_cancel_fn *cancel) { - struct aio_kiocb *req = container_of(iocb, struct aio_kiocb, rw); -struct kioctx *ctx = req->ki_ctx; +struct aio_kiocb *req; +struct kioctx *ctx;unsigned long flags;/*
@@ -577,9 +577,13 @@ void kiocb_set_cancel_fn(struct kiocb *iif (!(iocb->ki_flags &IOCB_AIO_RW ))return ; + req = container_of(iocb, struct aio_kiocb, rw); +if (WARN_ON_ONCE (!list_empty (&req->ki_list)))return ; + ctx = req->ki_ctx; +spin_lock_irqsave (&ctx->ctx_lock, flags);list_add_tail (&req->ki_list, &ctx->active_reqs); req->ki_cancel = cancel;
Greg Kroah-Hartman
maintainerPATCH 92/215 objtool: is_fentry_call() crashes if call has no destination
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexandre Chartre <[email protected]>
commit 87cf61fe848ca8ddf091548671e168f52e8a718e upstream.
Fix is_fentry_call() so that it works if a call has no destination set (call_dest). This needs to be done in order to support intra- function calls.
--- tools/objtool/check.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/objtool/check.c +1 -1
@@ -1367,7 +1367,7 @@ static int decode_sections(struct objtoostatic bool is_fentry_call (struct instruction *insn) { -if (insn->type ==INSN_CALL && +if (insn->type ==INSN_CALL && insn->call_dest && insn->call_dest->type ==STT_NOTYPE && !strcmp (insn->call_dest->name,"__fentry__" ))return true;
Greg Kroah-Hartman
maintainerPATCH 93/215 objtool: Add support for intra-function calls
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexandre Chartre <[email protected]>
commit 8aa8eb2a8f5b3305a95f39957dd2b715fa668e21 upstream.
Change objtool to support intra-function calls. On x86, an intra-function call is represented in objtool as a push onto the stack (of the return address), and a jump to the destination address. That way the stack information is correctly updated and the call flow is still accurate.
--- include/linux/frame.h | 11 ++++ tools/objtool/Documentation/stack-validation.txt | 8 ++ tools/objtool/arch/x86/decode.c | 6 ++ tools/objtool/check.c | 62 +++++++++++++++++++++-- 4 files changed, 83 insertions(+), 4 deletions(-)
include/linux/frame.h +11 -0
@@ -15,9 +15,20 @@ static void __used __section(.discard.func_stack_frame_non_standard) \ *__func_stack_frame_non_standard_##func = func +/* +* This macro indicates that the following intra-function call is valid. +* Any non-annotated intra-function call will cause objtool to issue a warning. + */ +#define ANNOTATE_INTRA_FUNCTION_CALL \ + 999: \ + .pushsection .discard.intra_function_calls; \ + .long 999b; \ + .popsection; +#else /* !CONFIG_STACK_VALIDATION */ #define STACK_FRAME_NON_STANDARD (func) +#define ANNOTATE_INTRA_FUNCTION_CALL #endif /* CONFIG_STACK_VALIDATION */
tools/objtool/Documentation/stack-validation.txt +8 -0
@@ -290,6 +290,14 @@ they mean, and suggestions for how to fi https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70646 +11. file.o: warning: unannotated intra-function call + + This warning means that a direct call is done to a destination which + is not at the beginning of a function. If this is a legit call, you + can remove this warning by putting the ANNOTATE_INTRA_FUNCTION_CALL + directive right before the call. + + If the error doesn't seem to make sense, it could be a bug in objtool. Feel free to ask the objtool maintainer for help.
tools/objtool/arch/x86/decode.c +6 -0
@@ -437,6 +437,12 @@ int arch_decode_instruction(struct elf *case 0xe8 : *type =INSN_CALL ; +/* +* For the impact on the stack, a CALL behaves like +* a PUSH of an immediate value (the return address). +*/ + op->src.type =OP_SRC_CONST ; + op->dest.type =OP_DEST_PUSH ;break ;case 0xfc :
tools/objtool/check.c +58 -4
86 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 94/215 x86/speculation: Support intra-function call validation
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rui Qi <[email protected]>
commit 8afd1c7da2b0 ("x86/speculation: Change FILL_RETURN_BUFFER
to work with objtool") does not support intra-function call stack validation, which causes kernel live patching to fail.
This commit adds support for this, and after testing, the kernel
live patching feature is restored to normal.
--- arch/x86/include/asm/nospec-branch.h | 7 +++++++ arch/x86/include/asm/unwind_hints.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)
arch/x86/include/asm/nospec-branch.h +7 -0
@@ -13,6 +13,8 @@#include <asm/unwind_hints.h> #include <asm/percpu.h> +#include <linux/frame.h> +#include <asm/unwind_hints.h> /* * This should be used immediately before a retpoline alternative. It tells * objtool where the retpolines are so that it can make sense of the control
@@ -51,14 +53,18 @@#define __FILL_RETURN_BUFFER (reg, nr, sp) \ mov $(nr/2), reg; \ 771: \ + ANNOTATE_INTRA_FUNCTION_CALL; \ call 772f; \ 773:/* speculation trap */ \ +UNWIND_HINT_EMPTY ; \ pause; \ lfence; \ jmp 773b; \ 772: \ +ANNOTATE_INTRA_FUNCTION_CALL ; \ call 774f; \ 775: /* speculation trap */ \ +UNWIND_HINT_EMPTY ; \ pause; \ lfence; \ jmp 775b; \
@@ -152,6 +158,7 @@ .endm .macro ISSUE_UNBALANCED_RET_GUARD +ANNOTATE_INTRA_FUNCTION_CALL ; call .Lunbalanced_ret_guard_\@ int3 .Lunbalanced_ret_guard_\@:
arch/x86/include/asm/unwind_hints.h +1 -1
@@ -101,7 +101,7 @@ ".popsection\n\t"#define UNWIND_HINT_SAVE UNWIND_HINT(0, 0, UNWIND_HINT_TYPE_SAVE, 0) - +#define UNWIND_HINT_EMPTY #define UNWIND_HINT_RESTORE UNWIND_HINT(0, 0, UNWIND_HINT_TYPE_RESTORE, 0)#endif /* __ASSEMBLY__ */
Greg Kroah-Hartman
maintainerPATCH 95/215 xen/events: close evtchn after mapping cleanup
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maximilian Heyne <[email protected]>
commit fa765c4b4aed2d64266b694520ecb025c862c5a9 upstream.
shutdown_pirq and startup_pirq are not taking the irq_mapping_update_lock because they can't due to lock inversion. Both are called with the irq_desc->lock being taking. The lock order, however, is first irq_mapping_update_lock and then irq_desc->lock.
This opens multiple races:
- shutdown_pirq can be interrupted by a function that allocates an event channel:
CPU0 CPU1
shutdown_pirq {
xen_evtchn_close(e)
__startup_pirq {
EVTCHNOP_bind_pirq
-> returns just freed evtchn e
set_evtchn_to_irq(e, irq)
}
xen_irq_info_cleanup() {
set_evtchn_to_irq(e, -1)
}
} Assume here event channel e refers here to the same event channel number.
After this race the evtchn_to_irq mapping for e is invalid (-1).
- __startup_pirq races with __unbind_from_irq in a similar way. Because __startup_pirq doesn't take irq_mapping_update_lock it can grab the evtchn that __unbind_from_irq is currently freeing and cleaning up. In this case even though the event channel is allocated, its mapping can be unset in evtchn_to_irq.
The fix is to first cleanup the mappings and then close the event channel. In this way, when an event channel gets allocated it's potential previous evtchn_to_irq mappings are guaranteed to be unset already. This is also the reverse order of the allocation where first the event channel is allocated and then the mappings are setup.
On a 5.10 kernel prior to commit 3fcdaf3d7634 ("xen/events: modify internal [un]bind interfaces"), we hit a BUG like the following during probing of NVMe devices. The issue is that during nvme_setup_io_queues, pci_free_irq is called for every device which results in a call to shutdown_pirq. With many nvme devices it's therefore likely to hit this race during boot because there will be multiple calls to shutdown_pirq and startup_pirq are running potentially in parallel.
------------[ cut here ]------------ blkfront: xvda: barrier or flush: disabled; persistent grants: enabled; indirect descriptors: enabled; bounce buffer: enabled kernel BUG at drivers/xen/events/events_base.c:499! invalid opcode: 0000 [#1] SMP PTI CPU: 44 PID: 375 Comm: kworker/u257:23 Not tainted 5.10.201-191.748.amzn2.x86_64 #1 Hardware name: Xen HVM domU, BIOS 4.11.amazon 08/24/2006 Workqueue: nvme-reset-wq nvme_reset_work RIP: 0010:bind_evtchn_to_cpu+0xdf/0xf0 Code: 5d 41 5e c3 cc cc cc cc 44 89 f7 e8 2b 55 ad ff 49 89 c5 48 85 c0 0f 84 64 ff ff ff 4c 8b 68 30 41 83 fe ff 0f 85 60 ff ff ff <0f> 0b 66 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 0f 1f 44 00 00 RSP: 0000:ffffc9000d533b08 EFLAGS: 00010046 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000006 RDX: 0000000000000028 RSI: 00000000ffffffff RDI: 00000000ffffffff RBP: ffff888107419680 R08: 0000000000000000 R09: ffffffff82d72b00 R10: 0000000000000000 R11: 0000000000000000 R12: 00000000000001ed R13: 0000000000000000 R14: 00000000ffffffff R15: 0000000000000002 FS: 0000000000000000(0000) GS:ffff88bc8b500000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000000 CR3: 0000000002610001 CR4: 00000000001706e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: ? show_trace_log_lvl+0x1c1/0x2d9 ? show_trace_log_lvl+0x1c1/0x2d9 ? set_affinity_irq+0xdc/0x1c0 ? __die_body.cold+0x8/0xd ? die+0x2b/0x50 ? do_trap+0x90/0x110 ? bind_evtchn_to_cpu+0xdf/0xf0 ? do_error_trap+0x65/0x80 ? bind_evtchn_to_cpu+0xdf/0xf0 ? exc_invalid_op+0x4e/0x70 ? bind_evtchn_to_cpu+0xdf/0xf0 ? asm_exc_invalid_op+0x12/0x20 ? bind_evtchn_to_cpu+0xdf/0xf0 ? bind_evtchn_to_cpu+0xc5/0xf0 set_affinity_irq+0xdc/0x1c0 irq_do_set_affinity+0x1d7/0x1f0 irq_setup_affinity+0xd6/0x1a0 irq_startup+0x8a/0xf0 __setup_irq+0x639/0x6d0 ? nvme_suspend+0x150/0x150 request_threaded_irq+0x10c/0x180 ? nvme_suspend+0x150/0x150 pci_request_irq+0xa8/0xf0 ? __blk_mq_free_request+0x74/0xa0 queue_request_irq+0x6f/0x80 nvme_create_queue+0x1af/0x200 nvme_create_io_queues+0xbd/0xf0 nvme_setup_io_queues+0x246/0x320 ? nvme_irq_check+0x30/0x30 nvme_reset_work+0x1c8/0x400 process_one_work+0x1b0/0x350 worker_thread+0x49/0x310 ? process_one_work+0x350/0x350 kthread+0x11b/0x140 ? __kthread_bind_mask+0x60/0x60 ret_from_fork+0x22/0x30 Modules linked in: ---[ end trace a11715de1eee1873 ]---
--- drivers/xen/events/events_base.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/xen/events/events_base.c +2 -3
@@ -825,8 +825,8 @@ static void shutdown_pirq(struct irq_datreturn ;do_mask (info,EVT_MASK_REASON_EXPLICIT ); -xen_evtchn_close (evtchn);xen_irq_info_cleanup (info); +xen_evtchn_close (evtchn); }static void enable_pirq (struct irq_data *data)
@@ -869,8 +869,6 @@ static void __unbind_from_irq(unsigned iif (VALID_EVTCHN (evtchn)) {unsigned int cpu =cpu_from_irq (irq); -xen_evtchn_close (evtchn); -switch (type_from_irq (irq)) {case IRQT_VIRQ :per_cpu (virq_to_irq, cpu)[virq_from_irq (irq)] =-1 ;
@@ -883,6 +881,7 @@ static void __unbind_from_irq(unsigned i }xen_irq_info_cleanup (info); +xen_evtchn_close (evtchn); }xen_free_irq (irq);
Greg Kroah-Hartman
maintainerPATCH 96/215 printk: Update @console_may_schedule in console_trylock_spinning()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: John Ogness <[email protected]>
[ Upstream commit 8076972468584d4a21dab9aa50e388b3ea9ad8c7 ]
console_trylock_spinning() may takeover the console lock from a schedulable context. Update @console_may_schedule to make sure it reflects a trylock acquire.
--- kernel/printk/printk.c | 6 ++++++ 1 file changed, 6 insertions(+)
kernel/printk/printk.c +6 -0
@@ -1787,6 +1787,12 @@ static int console_trylock_spinning(void)*/ mutex_acquire (&console_lock_dep_map,0 ,1 , _THIS_IP_); +/* +* Update @console_may_schedule for trylock because the previous +* owner may have been schedulable. +*/ + console_may_schedule =0 ; +return 1 ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 97/215 btrfs: allocate btrfs_ioctl_defrag_range_args on stack
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Goldwyn Rodrigues <[email protected]>
commit c853a5783ebe123847886d432354931874367292 upstream.
Instead of using kmalloc() to allocate btrfs_ioctl_defrag_range_args, allocate btrfs_ioctl_defrag_range_args on stack, the size is reasonably small and ioctls are called in process context.
sizeof(btrfs_ioctl_defrag_range_args) = 48
[ This patch is needed to fix a memory leak of "range" that was introduced when commit 173431b274a9 ("btrfs: defrag: reject unknown flags of btrfs_ioctl_defrag_range_args") was backported to kernels lacking this patch. Now with these two patches applied in reverse order, range->flags needed to change back to range.flags.
This bug was discovered and resolved using Coverity Static Analysis Security Testing (SAST) by Synopsys, Inc.]
--- fs/btrfs/ioctl.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-)
fs/btrfs/ioctl.c +8 -17
@@ -3057,7 +3057,7 @@ static int btrfs_ioctl_defrag(struct fil {struct inode *inode =file_inode (file);struct btrfs_root *root =BTRFS_I (inode)->root; -struct btrfs_ioctl_defrag_range_args *range; +struct btrfs_ioctl_defrag_range_args range = {0 };int ret; ret =mnt_want_write_file (file);
@@ -3089,37 +3089,28 @@ static int btrfs_ioctl_defrag(struct fil goto out; } - range =kzalloc (sizeof (*range),GFP_KERNEL ); -if (!range) { - ret = -ENOMEM ; - goto out; - } -if (argp) { -if (copy_from_user (range, argp, -sizeof (*range))) { +if (copy_from_user (&range, argp,sizeof (range))) { ret = -EFAULT ; -kfree (range); goto out; } -if (range->flags & ~BTRFS_DEFRAG_RANGE_FLAGS_SUPP ) { +if (range.flags & ~BTRFS_DEFRAG_RANGE_FLAGS_SUPP ) { ret = -EOPNOTSUPP ; goto out; }/* compression requires us to start the IO */ -if ((range->flags &BTRFS_DEFRAG_RANGE_COMPRESS )) { - range->flags |=BTRFS_DEFRAG_RANGE_START_IO ; - range->extent_thresh = (u32)-1 ; +if ((range.flags &BTRFS_DEFRAG_RANGE_COMPRESS )) { + range.flags |=BTRFS_DEFRAG_RANGE_START_IO ; + range.extent_thresh = (u32)-1 ; } }else {/* the rest are all set to zero by kzalloc */ - range->len = (u64)-1 ; + range.len = (u64)-1 ; } ret =btrfs_defrag_file (file_inode (file), file, - range,BTRFS_OLDEST_GENERATION ,0 ); + &range,BTRFS_OLDEST_GENERATION ,0 );if (ret >0 ) ret =0 ; -kfree (range);break ;default : ret = -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 98/215 Revert "loop: Check for overflow while configuring loop"
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Genjian Zhang <[email protected]>
This reverts commit 13b2856037a651ba3ab4a8b25ecab3e791926da3.
This patch lost a unlock loop_ctl_mutex in loop_get_status(...), which caused syzbot to report a UAF issue.The upstream patch does not have this issue. Therefore, we revert this patch and directly apply the upstream patch later on.
Risk use-after-free as reported by syzbot：
[ 84.669496] ================================================================== [ 84.670021] BUG: KASAN: use-after-free in __mutex_lock.isra.9+0xc13/0xcb0 [ 84.670433] Read of size 4 at addr ffff88808dba43b8 by task syz-executor.22/14230 [ 84.670885] [ 84.670987] CPU: 1 PID: 14230 Comm: syz-executor.22 Not tainted 5.4.270 #4 [ 84.671397] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.13.0-1kylin1 04/01/2014 [ 84.671927] Call Trace: [ 84.672085] dump_stack+0x94/0xc7 [ 84.672293] ? __mutex_lock.isra.9+0xc13/0xcb0 [ 84.672569] print_address_description.constprop.6+0x16/0x220 [ 84.672915] ? __mutex_lock.isra.9+0xc13/0xcb0 [ 84.673187] ? __mutex_lock.isra.9+0xc13/0xcb0 [ 84.673462] __kasan_report.cold.9+0x1a/0x32 [ 84.673723] ? __mutex_lock.isra.9+0xc13/0xcb0 [ 84.673993] kasan_report+0x10/0x20 [ 84.674208] __mutex_lock.isra.9+0xc13/0xcb0 [ 84.674468] ? __mutex_lock.isra.9+0x617/0xcb0 [ 84.674739] ? ww_mutex_lock_interruptible+0x100/0x100 [ 84.675055] ? ww_mutex_lock_interruptible+0x100/0x100 [ 84.675369] ? kobject_get_unless_zero+0x144/0x190 [ 84.675668] ? kobject_del+0x60/0x60 [ 84.675893] ? __module_get+0x120/0x120 [ 84.676128] ? __mutex_lock_slowpath+0x10/0x10 [ 84.676399] mutex_lock_killable+0xde/0xf0 [ 84.676652] ? __mutex_lock_killable_slowpath+0x10/0x10 [ 84.676967] ? __mutex_lock_slowpath+0x10/0x10 [ 84.677243] ? disk_block_events+0x1d/0x120 [ 84.677509] lo_open+0x16/0xc0 [ 84.677701] ? lo_compat_ioctl+0x160/0x160 [ 84.677954] __blkdev_get+0xb0f/0x1160 [ 84.678185] ? bd_may_claim+0xd0/0xd0 [ 84.678410] ? bdev_disk_changed+0x190/0x190 [ 84.678674] ? _raw_spin_lock+0x7c/0xd0 [ 84.678915] ? _raw_write_lock_bh+0xd0/0xd0 [ 84.679172] blkdev_get+0x9b/0x290 [ 84.679381] ? ihold+0x1a/0x40 [ 84.679574] blkdev_open+0x1bd/0x240 [ 84.679794] do_dentry_open+0x439/0x1000 [ 84.680035] ? blkdev_get_by_dev+0x60/0x60 [ 84.680286] ? __x64_sys_fchdir+0x1a0/0x1a0 [ 84.680557] ? inode_permission+0x86/0x320 [ 84.680814] path_openat+0x998/0x4120 [ 84.681044] ? stack_trace_consume_entry+0x160/0x160 [ 84.681348] ? do_futex+0x136/0x1880 [ 84.681568] ? path_mountpoint+0xb50/0xb50 [ 84.681823] ? save_stack+0x4d/0x80 [ 84.682038] ? save_stack+0x19/0x80 [ 84.682253] ? __kasan_kmalloc.constprop.6+0xc1/0xd0 [ 84.682553] ? kmem_cache_alloc+0xc7/0x210 [ 84.682804] ? getname_flags+0xc4/0x560 [ 84.683045] ? do_sys_open+0x1ce/0x450 [ 84.683272] ? do_syscall_64+0x9a/0x330 [ 84.683509] ? entry_SYSCALL_64_after_hwframe+0x5c/0xc1 [ 84.683826] ? _raw_spin_lock+0x7c/0xd0 [ 84.684063] ? _raw_write_lock_bh+0xd0/0xd0 [ 84.684319] ? futex_exit_release+0x60/0x60 [ 84.684574] ? kasan_unpoison_shadow+0x30/0x40 [ 84.684844] ? __kasan_kmalloc.constprop.6+0xc1/0xd0 [ 84.685149] ? get_partial_node.isra.83.part.84+0x1e5/0x340 [ 84.685485] ? __fget_light+0x1d1/0x550 [ 84.685721] do_filp_open+0x197/0x270 [ 84.685946] ? may_open_dev+0xd0/0xd0 [ 84.686172] ? kasan_unpoison_shadow+0x30/0x40 [ 84.686443] ? __kasan_kmalloc.constprop.6+0xc1/0xd0 [ 84.686743] ? __alloc_fd+0x1a3/0x580 [ 84.686973] do_sys_open+0x2c7/0x450 [ 84.687195] ? filp_open+0x60/0x60 [ 84.687406] ? __x64_sys_timer_settime32+0x280/0x280 [ 84.687707] do_syscall_64+0x9a/0x330 [ 84.687931] ? syscall_return_slowpath+0x17a/0x230 [ 84.688221] entry_SYSCALL_64_after_hwframe+0x5c/0xc1 [ 84.688524] [ 84.688622] Allocated by task 14056: [ 84.688842] save_stack+0x19/0x80 [ 84.689044] __kasan_kmalloc.constprop.6+0xc1/0xd0 [ 84.689333] kmem_cache_alloc_node+0xe2/0x230 [ 84.689600] copy_process+0x165c/0x72d0 [ 84.689833] _do_fork+0xf9/0x9a0 [ 84.690032] __x64_sys_clone+0x17a/0x200 [ 84.690271] do_syscall_64+0x9a/0x330 [ 84.690496] entry_SYSCALL_64_after_hwframe+0x5c/0xc1 [ 84.690800] [ 84.690903] Freed by task 0: [ 84.691081] save_stack+0x19/0x80 [ 84.691287] __kasan_slab_free+0x125/0x170 [ 84.691535] kmem_cache_free+0x7a/0x2a0 [ 84.691774] __put_task_struct+0x1ec/0x4a0 [ 84.692023] delayed_put_task_struct+0x178/0x1d0 [ 84.692303] rcu_core+0x538/0x16c0 [ 84.692512] __do_softirq+0x175/0x63d [ 84.692741] [ 84.692840] The buggy address belongs to the object at ffff88808dba4380 [ 84.692840] which belongs to the cache task_struct of size 3328 [ 84.693584] The buggy address is located 56 bytes inside of [ 84.693584] 3328-byte region [ffff88808dba4380, ffff88808dba5080) [ 84.694272] The buggy address belongs to the page: [ 84.694563] page:ffffea000236e800 refcount:1 mapcount:0 mapping:ffff8881838acdc0 index:0x0 compound_mapcount: 0 [ 84.695166] flags: 0x100000000010200(slab|head) [ 84.695457] raw: 0100000000010200 dead000000000100 dead000000000122 ffff8881838acdc0 [ 84.695919] raw: 0000000000000000 0000000000090009 00000001ffffffff 0000000000000000 [ 84.696375] page dumped because: kasan: bad access detected [ 84.696705] [ 84.696801] Memory state around the buggy address: [ 84.697089] ffff88808dba4280: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ 84.697519] ffff88808dba4300: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [ 84.697945] >ffff88808dba4380: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ 84.698371] ^ [ 84.698674] ffff88808dba4400: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ 84.699111] ffff88808dba4480: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb [ 84.699537] ================================================================== [ 84.699965] Disabling lock debugging due to kernel taint
--- drivers/block/loop.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/block/loop.c +0 -5
@@ -1397,11 +1397,6 @@ loop_get_status(struct loop_device *lo, info->lo_number = lo->lo_number; info->lo_offset = lo->lo_offset; info->lo_sizelimit = lo->lo_sizelimit; - -/* loff_t vars have been assigned __u64 */ -if (lo->lo_offset <0 || lo->lo_sizelimit <0 ) -return -EOVERFLOW ; - info->lo_flags = lo->lo_flags;memcpy (info->lo_file_name, lo->lo_file_name,LO_NAME_SIZE );memcpy (info->lo_crypt_name, lo->lo_crypt_name,LO_NAME_SIZE );
Greg Kroah-Hartman
maintainerPATCH 99/215 loop: Call loop_config_discard() only after new config is applied
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martijn Coenen <[email protected]>
[ Upstream commit 7c5014b0987a30e4989c90633c198aced454c0ec ]
loop_set_status() calls loop_config_discard() to configure discard for the loop device; however, the discard configuration depends on whether the loop device uses encryption, and when we call it the encryption configuration has not been updated yet. Move the call down so we apply the correct discard configuration based on the new configuration.
--- drivers/block/loop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/block/loop.c +2 -2
@@ -1332,8 +1332,6 @@ loop_set_status(struct loop_device *lo, } } -loop_config_discard (lo); -memcpy (lo->lo_file_name, info->lo_file_name,LO_NAME_SIZE );memcpy (lo->lo_crypt_name, info->lo_crypt_name,LO_NAME_SIZE ); lo->lo_file_name[LO_NAME_SIZE -1 ] =0 ;
@@ -1357,6 +1355,8 @@ loop_set_status(struct loop_device *lo, lo->lo_key_owner = uid; } +loop_config_discard (lo); +/* update dio if lo_offset or transfer is changed */ __loop_update_dio (lo, lo->use_dio);
Greg Kroah-Hartman
maintainerPATCH 100/215 loop: Remove sector_t truncation checks
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martijn Coenen <[email protected]>
[ Upstream commit 083a6a50783ef54256eec3499e6575237e0e3d53 ]
sector_t is now always u64, so we don't need to check for truncation.
--- drivers/block/loop.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-)
drivers/block/loop.c +7 -14
@@ -226,24 +226,20 @@ static void __loop_update_dio(struct looblk_mq_unfreeze_queue (lo->lo_queue); } -static int +static void figure_loop_size (struct loop_device *lo,loff_t offset,loff_t sizelimit) {loff_t size =get_size (offset, sizelimit, lo->lo_backing_file); -sector_t x = (sector_t )size;struct block_device *bdev = lo->lo_device; -if (unlikely ((loff_t )x != size)) -return -EFBIG ;if (lo->lo_offset != offset) lo->lo_offset = offset;if (lo->lo_sizelimit != sizelimit) lo->lo_sizelimit = sizelimit; -set_capacity (lo->lo_disk, x); +set_capacity (lo->lo_disk, size);bd_set_size (bdev, (loff_t )get_capacity (bdev->bd_disk) <<9 );/* let user-space know about the new size */ kobject_uevent (&disk_to_dev (bdev->bd_disk)->kobj,KOBJ_CHANGE ); -return 0 ; } static inline int
@@ -1002,10 +998,8 @@ static int loop_set_fd(struct loop_devic !file->f_op->write_iter) lo_flags |=LO_FLAGS_READ_ONLY ; - error = -EFBIG ; size =get_loop_size (lo, file); -if ((loff_t )(sector_t )size != size) - goto out_unlock; + error =loop_prepare_queue (lo);if (error) goto out_unlock;
@@ -1326,10 +1320,7 @@ loop_set_status(struct loop_device *lo, lo->lo_device->bd_inode->i_mapping->nrpages); goto out_unfreeze; } -if (figure_loop_size (lo, info->lo_offset, info->lo_sizelimit)) { - err = -EFBIG ; - goto out_unfreeze; - } +figure_loop_size (lo, info->lo_offset, info->lo_sizelimit); }memcpy (lo->lo_file_name, info->lo_file_name,LO_NAME_SIZE );
@@ -1532,7 +1523,9 @@ static int loop_set_capacity(struct loopif (unlikely (lo->lo_state != Lo_bound))return -ENXIO ; -return figure_loop_size (lo, lo->lo_offset, lo->lo_sizelimit); +figure_loop_size (lo, lo->lo_offset, lo->lo_sizelimit); + +return 0 ; }static int loop_set_dio (struct loop_device *lo,unsigned long arg)
Greg Kroah-Hartman
maintainerPATCH 101/215 loop: Factor out setting loop device size
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martijn Coenen <[email protected]>
[ Upstream commit 5795b6f5607f7e4db62ddea144727780cb351a9b ]
This code is used repeatedly.
--- drivers/block/loop.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-)
drivers/block/loop.c +21 -9
@@ -226,20 +226,35 @@ static void __loop_update_dio(struct looblk_mq_unfreeze_queue (lo->lo_queue); } +/** +* loop_set_size() - sets device size and notifies userspace +* @lo: struct loop_device to set the size for +* @size: new size of the loop device +* +* Callers must validate that the size passed into this function fits into +* a sector_t, eg using loop_validate_size() +*/ +static void loop_set_size (struct loop_device *lo,loff_t size) +{ +struct block_device *bdev = lo->lo_device; + +set_capacity (lo->lo_disk, size); +bd_set_size (bdev, size <<SECTOR_SHIFT ); +/* let user-space know about the new size */ +kobject_uevent (&disk_to_dev (bdev->bd_disk)->kobj,KOBJ_CHANGE ); +} +static void figure_loop_size (struct loop_device *lo,loff_t offset,loff_t sizelimit) {loff_t size =get_size (offset, sizelimit, lo->lo_backing_file); -struct block_device *bdev = lo->lo_device;if (lo->lo_offset != offset) lo->lo_offset = offset;if (lo->lo_sizelimit != sizelimit) lo->lo_sizelimit = sizelimit; -set_capacity (lo->lo_disk, size); -bd_set_size (bdev, (loff_t )get_capacity (bdev->bd_disk) <<9 ); -/* let user-space know about the new size */ -kobject_uevent (&disk_to_dev (bdev->bd_disk)->kobj,KOBJ_CHANGE ); + +loop_set_size (lo, size); } static inline int
@@ -1033,11 +1048,8 @@ static int loop_set_fd(struct loop_devicloop_update_rotational (lo);loop_update_dio (lo); -set_capacity (lo->lo_disk, size); -bd_set_size (bdev, size <<9 );loop_sysfs_init (lo); -/* let user-space know about the new size */ -kobject_uevent (&disk_to_dev (bdev->bd_disk)->kobj,KOBJ_CHANGE ); +loop_set_size (lo, size);set_blocksize (bdev,S_ISBLK (inode->i_mode) ?block_size (inode->i_bdev) :PAGE_SIZE );
Greg Kroah-Hartman
maintainerPATCH 102/215 loop: Refactor loop_set_status() size calculation
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martijn Coenen <[email protected]>
[ Upstream commit b0bd158dd630bd47640e0e418c062cda1e0da5ad ]
figure_loop_size() calculates the loop size based on the passed in parameters, but at the same time it updates the offset and sizelimit parameters in the loop device configuration. That is a somewhat unexpected side effect of a function with this name, and it is only only needed by one of the two callers of this function - loop_set_status().
Move the lo_offset and lo_sizelimit assignment back into loop_set_status(), and use the newly factored out functions to validate and apply the newly calculated size. This allows us to get rid of figure_loop_size() in a follow-up commit.
--- drivers/block/loop.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-)
drivers/block/loop.c +19 -18
@@ -249,11 +249,6 @@ figure_loop_size(struct loop_device *lo, {loff_t size =get_size (offset, sizelimit, lo->lo_backing_file); -if (lo->lo_offset != offset) - lo->lo_offset = offset; -if (lo->lo_sizelimit != sizelimit) - lo->lo_sizelimit = sizelimit; -loop_set_size (lo, size); }
@@ -1271,6 +1266,7 @@ loop_set_status(struct loop_device *lo,kuid_t uid =current_uid ();struct block_device *bdev;bool partscan = false; +bool size_changed = false; err =mutex_lock_killable (&loop_ctl_mutex);if (err)
@@ -1292,6 +1288,7 @@ loop_set_status(struct loop_device *lo,if (lo->lo_offset != info->lo_offset || lo->lo_sizelimit != info->lo_sizelimit) { + size_changed = true;sync_blockdev (lo->lo_device);invalidate_bdev (lo->lo_device); }
@@ -1299,6 +1296,15 @@ loop_set_status(struct loop_device *lo,/* I/O need to be drained during transfer transition */ blk_mq_freeze_queue (lo->lo_queue); +if (size_changed && lo->lo_device->bd_inode->i_mapping->nrpages) { +/* If any pages were dirtied after invalidate_bdev(), try again */ + err = -EAGAIN ; +pr_warn ("%s: loop%d (%s) has still dirty pages (nrpages=%lu)\n" , + __func__, lo->lo_number, lo->lo_file_name, + lo->lo_device->bd_inode->i_mapping->nrpages); + goto out_unfreeze; + } + err =loop_release_xfer (lo);if (err) goto out_unfreeze;
@@ -1322,19 +1328,8 @@ loop_set_status(struct loop_device *lo,if (err) goto out_unfreeze; -if (lo->lo_offset != info->lo_offset || - lo->lo_sizelimit != info->lo_sizelimit) { -/* kill_bdev should have truncated all the pages */ -if (lo->lo_device->bd_inode->i_mapping->nrpages) { - err = -EAGAIN ; -pr_warn ("%s: loop%d (%s) has still dirty pages (nrpages=%lu)\n" , - __func__, lo->lo_number, lo->lo_file_name, - lo->lo_device->bd_inode->i_mapping->nrpages); - goto out_unfreeze; - } -figure_loop_size (lo, info->lo_offset, info->lo_sizelimit); - } - + lo->lo_offset = info->lo_offset; + lo->lo_sizelimit = info->lo_sizelimit;memcpy (lo->lo_file_name, info->lo_file_name,LO_NAME_SIZE );memcpy (lo->lo_crypt_name, info->lo_crypt_name,LO_NAME_SIZE ); lo->lo_file_name[LO_NAME_SIZE -1 ] =0 ;
@@ -1358,6 +1353,12 @@ loop_set_status(struct loop_device *lo, lo->lo_key_owner = uid; } +if (size_changed) { +loff_t new_size =get_size (lo->lo_offset, lo->lo_sizelimit, + lo->lo_backing_file); +loop_set_size (lo, new_size); + } +loop_config_discard (lo);/* update dio if lo_offset or transfer is changed */
Greg Kroah-Hartman
maintainerPATCH 103/215 loop: Factor out configuring loop from status
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martijn Coenen <[email protected]>
[ Upstream commit 0c3796c244598122a5d59d56f30d19390096817f ]
Factor out this code into a separate function, so it can be reused by other code more easily.
--- drivers/block/loop.c | 117 +++++++++++++++++++++++++++++---------------------- 1 file changed, 67 insertions(+), 50 deletions(-)
drivers/block/loop.c +67 -50
@@ -1258,75 +1258,43 @@ static int loop_clr_fd(struct loop_devicreturn __loop_clr_fd (lo, false); } +/** +* loop_set_status_from_info - configure device from loop_info +* @lo: struct loop_device to configure +* @info: struct loop_info64 to configure the device with +* +* Configures the loop device parameters according to the passed +* in loop_info64 configuration. +*/ static int -loop_set_status (struct loop_device *lo,const struct loop_info64 *info) +loop_set_status_from_info (struct loop_device *lo, +const struct loop_info64 *info) {int err;struct loop_func_table *xfer;kuid_t uid =current_uid (); -struct block_device *bdev; -bool partscan = false; -bool size_changed = false; - err =mutex_lock_killable (&loop_ctl_mutex); -if (err) -return err; -if (lo->lo_encrypt_key_size && - !uid_eq (lo->lo_key_owner, uid) && - !capable (CAP_SYS_ADMIN )) { - err = -EPERM ; - goto out_unlock; - } -if (lo->lo_state != Lo_bound) { - err = -ENXIO ; - goto out_unlock; - } -if ((unsigned int ) info->lo_encrypt_key_size >LO_KEY_SIZE ) { - err = -EINVAL ; - goto out_unlock; - } - -if (lo->lo_offset != info->lo_offset || - lo->lo_sizelimit != info->lo_sizelimit) { - size_changed = true; -sync_blockdev (lo->lo_device); -invalidate_bdev (lo->lo_device); - } - -/* I/O need to be drained during transfer transition */ -blk_mq_freeze_queue (lo->lo_queue); - -if (size_changed && lo->lo_device->bd_inode->i_mapping->nrpages) { -/* If any pages were dirtied after invalidate_bdev(), try again */ - err = -EAGAIN ; -pr_warn ("%s: loop%d (%s) has still dirty pages (nrpages=%lu)\n" , - __func__, lo->lo_number, lo->lo_file_name, - lo->lo_device->bd_inode->i_mapping->nrpages); - goto out_unfreeze; - } +if ((unsigned int ) info->lo_encrypt_key_size >LO_KEY_SIZE ) +return -EINVAL ; err =loop_release_xfer (lo);if (err) - goto out_unfreeze; +return err;if (info->lo_encrypt_type) {unsigned int type = info->lo_encrypt_type; -if (type >=MAX_LO_CRYPT ) { - err = -EINVAL ; - goto out_unfreeze; - } +if (type >=MAX_LO_CRYPT ) +return -EINVAL ; xfer = xfer_funcs[type]; -if (xfer ==NULL ) { - err = -EINVAL ; - goto out_unfreeze; - } +if (xfer ==NULL ) +return -EINVAL ; }else xfer =NULL ; err =loop_init_xfer (lo, xfer, info);if (err) - goto out_unfreeze; +return err; lo->lo_offset = info->lo_offset; lo->lo_sizelimit = info->lo_sizelimit;
@@ -1353,6 +1321,55 @@ loop_set_status(struct loop_device *lo, lo->lo_key_owner = uid; } +return 0 ; +} + +static int +loop_set_status (struct loop_device *lo,const struct loop_info64 *info) +{ +int err; +struct block_device *bdev; +kuid_t uid =current_uid (); +bool partscan = false; +bool size_changed = false; + + err =mutex_lock_killable (&loop_ctl_mutex); +if (err) +return err; +if (lo->lo_encrypt_key_size && + !uid_eq (lo->lo_key_owner, uid) && + !capable (CAP_SYS_ADMIN )) { + err = -EPERM ; + goto out_unlock; + } +if (lo->lo_state != Lo_bound) { + err = -ENXIO ; + goto out_unlock; + } + +if (lo->lo_offset != info->lo_offset || + lo->lo_sizelimit != info->lo_sizelimit) { + size_changed = true; +sync_blockdev (lo->lo_device); +invalidate_bdev (lo->lo_device); + } + +/* I/O need to be drained during transfer transition */ +blk_mq_freeze_queue (lo->lo_queue); + +if (size_changed && lo->lo_device->bd_inode->i_mapping->nrpages) { +/* If any pages were dirtied after invalidate_bdev(), try again */ + err = -EAGAIN ; +pr_warn ("%s: loop%d (%s) has still dirty pages (nrpages=%lu)\n" , + __func__, lo->lo_number, lo->lo_file_name, + lo->lo_device->bd_inode->i_mapping->nrpages); + goto out_unfreeze; + } + + err =loop_set_status_from_info (lo, info); +if (err) + goto out_unfreeze; +if (size_changed) {loff_t new_size =get_size (lo->lo_offset, lo->lo_sizelimit, lo->lo_backing_file);
Greg Kroah-Hartman
maintainerPATCH 104/215 loop: Check for overflow while configuring loop
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Siddh Raman Pant <[email protected]>
[ Upstream commit c490a0b5a4f36da3918181a8acdc6991d967c5f3 ]
The userspace can configure a loop using an ioctl call, wherein a configuration of type loop_config is passed (see lo_ioctl()'s case on line 1550 of drivers/block/loop.c). This proceeds to call loop_configure() which in turn calls loop_set_status_from_info() (see line 1050 of loop.c), passing &config->info which is of type loop_info64*. This function then sets the appropriate values, like the offset.
loop_device has lo_offset of type loff_t (see line 52 of loop.c), which is typdef-chained to long long, whereas loop_info64 has lo_offset of type __u64 (see line 56 of include/uapi/linux/loop.h).
The function directly copies offset from info to the device as follows (See line 980 of loop.c):
lo->lo_offset = info->lo_offset;
This results in an overflow, which triggers a warning in iomap_iter() due to a call to iomap_iter_done() which has:
WARN_ON_ONCE(iter->iomap.offset > iter->pos);
Thus, check for negative value during loop_set_status_from_info().
Bug report: https://syzkaller.appspot.com/bug?id=c620fe14aac810396d3c3edc9ad73848bf69a29e
--- drivers/block/loop.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/block/loop.c +5 -0
@@ -1298,6 +1298,11 @@ loop_set_status_from_info(struct loop_de lo->lo_offset = info->lo_offset; lo->lo_sizelimit = info->lo_sizelimit; + +/* loff_t vars have been assigned __u64 */ +if (lo->lo_offset <0 || lo->lo_sizelimit <0 ) +return -EOVERFLOW ; +memcpy (lo->lo_file_name, info->lo_file_name,LO_NAME_SIZE );memcpy (lo->lo_crypt_name, info->lo_crypt_name,LO_NAME_SIZE ); lo->lo_file_name[LO_NAME_SIZE -1 ] =0 ;
Greg Kroah-Hartman
maintainerPATCH 105/215 loop: loop_set_status_from_info() check before assignment
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhong Jinghua <[email protected]>
[ Upstream commit 9f6ad5d533d1c71e51bdd06a5712c4fbc8768dfa ]
In loop_set_status_from_info(), lo->lo_offset and lo->lo_sizelimit should be checked before reassignment, because if an overflow error occurs, the original correct value will be changed to the wrong value, and it will not be changed back.
More, the original patch did not solve the problem, the value was set and ioctl returned an error, but the subsequent io used the value in the loop driver, which still caused an alarm:
loop_handle_cmd
do_req_filebacked
loff_t pos = ((loff_t) blk_rq_pos(rq) << 9) + lo->lo_offset; lo_rw_aio
cmd->iocb.ki_pos = pos
--- drivers/block/loop.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/block/loop.c +4 -4
@@ -1296,13 +1296,13 @@ loop_set_status_from_info(struct loop_deif (err)return err; +/* Avoid assigning overflow values */ +if (info->lo_offset >LLONG_MAX || info->lo_sizelimit >LLONG_MAX ) +return -EOVERFLOW ; + lo->lo_offset = info->lo_offset; lo->lo_sizelimit = info->lo_sizelimit; -/* loff_t vars have been assigned __u64 */ -if (lo->lo_offset <0 || lo->lo_sizelimit <0 ) -return -EOVERFLOW ; -memcpy (lo->lo_file_name, info->lo_file_name,LO_NAME_SIZE );memcpy (lo->lo_crypt_name, info->lo_crypt_name,LO_NAME_SIZE ); lo->lo_file_name[LO_NAME_SIZE -1 ] =0 ;
Greg Kroah-Hartman
maintainerPATCH 106/215 perf/core: Fix reentry problem in perf_output_read_group()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yang Jihong <[email protected]>
commit 6b959ba22d34ca793ffdb15b5715457c78e38b1a upstream.
perf_output_read_group may respond to IPI request of other cores and invoke __perf_install_in_context function. As a result, hwc configuration is modified. causing inconsistency and unexpected consequences.
Interrupts are not disabled when perf_output_read_group reads PMU counter. In this case, IPI request may be received from other cores.
As a result, PMU configuration is modified and an error occurs when reading PMU counter:
CPU0 CPU1
__se_sys_perf_event_open
perf_install_in_context
perf_output_read_group smp_call_function_single
for_each_sibling_event(sub, leader) { generic_exec_single
if ((sub != event) && remote_function
(sub->state == PERF_EVENT_STATE_ACTIVE)) |
<enter IPI handler: __perf_install_in_context> <----RAISE IPI-----+
__perf_install_in_context
ctx_resched
event_sched_out
armpmu_del
...
hwc->idx = -1; // event->hwc.idx is set to -1
...
<exit IPI>
sub->pmu->read(sub);
armpmu_read
armv8pmu_read_counter
armv8pmu_read_hw_counter
int idx = event->hw.idx; // idx = -1
u64 val = armv8pmu_read_evcntr(idx);
u32 counter = ARMV8_IDX_TO_COUNTER(idx); // invalid counter = 30
read_pmevcntrn(counter) // undefined instruction--- kernel/events/core.c | 9 +++++++++ 1 file changed, 9 insertions(+)
kernel/events/core.c +9 -0
@@ -6372,9 +6372,16 @@ static void perf_output_read_group(struc {struct perf_event *leader = event->group_leader, *sub;u64 read_format = event->attr.read_format; +unsigned long flags;u64 values[6 ];int n =0 ; +/* +* Disabling interrupts avoids all counter scheduling +* (context switches, timer based rotation and IPIs). +*/ +local_irq_save (flags); + values[n++] =1 + leader->nr_siblings;if (read_format &PERF_FORMAT_TOTAL_TIME_ENABLED )
@@ -6410,6 +6417,8 @@ static void perf_output_read_group(struc__output_copy (handle, values, n *sizeof (u64)); } + +local_irq_restore (flags); }#define PERF_FORMAT_TOTAL_TIMES (PERF_FORMAT_TOTAL_TIME_ENABLED|\
Greg Kroah-Hartman
maintainerPATCH 107/215 efivarfs: Request at most 512 bytes for variable names
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tim Schumacher <[email protected]>
commit f45812cc23fb74bef62d4eb8a69fe7218f4b9f2a upstream.
Work around a quirk in a few old (2011-ish) UEFI implementations, where a call to GetNextVariableName with a buffer size larger than 512 bytes will always return EFI_INVALID_PARAMETER.
There is some lore around EFI variable names being up to 1024 bytes in size, but this has no basis in the UEFI specification, and the upper bounds are typically platform specific, and apply to the entire variable (name plus payload).
Given that Linux does not permit creating files with names longer than NAME_MAX (255) bytes, 512 bytes (== 256 UTF-16 characters) is a reasonable limit.
--- drivers/firmware/efi/vars.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
drivers/firmware/efi/vars.c +11 -6
@@ -427,7 +427,7 @@ int efivar_init(int (*func)(efi_char16_t void *data, bool duplicates, struct list_head *head) { const struct efivar_operations *ops; -unsigned long variable_name_size =1024 ; +unsigned long variable_name_size =512 ;efi_char16_t *variable_name;efi_status_t status;efi_guid_t vendor_guid;
@@ -450,12 +450,13 @@ int efivar_init(int (*func)(efi_char16_t }/* -* Per EFI spec, the maximum storage allocated for both -* the variable name and variable data is 1024 bytes. +* A small set of old UEFI implementations reject sizes +* above a certain threshold, the lowest seen in the wild +* is 512. */ do { - variable_name_size = 1024; + variable_name_size = 512; status = ops->get_next_variable(&variable_name_size, variable_name,
@@ -499,9 +500,13 @@ int efivar_init(int (*func)(efi_char16_tbreak ;case EFI_NOT_FOUND :break ; +case EFI_BUFFER_TOO_SMALL : +pr_warn ("efivars: Variable name size exceeds maximum (%lu > 512)\n" , + variable_name_size); + status =EFI_NOT_FOUND ; +break ;default : -printk (KERN_WARNING "efivars: get_next_variable: status=%lx\n" , - status); +pr_warn ("efivars: get_next_variable: status=%lx\n" , status); status =EFI_NOT_FOUND ;break ; }
Greg Kroah-Hartman
maintainerPATCH 108/215 powerpc: xor_vmx: Add -mhard-float to CFLAGS
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Chancellor <[email protected]>
commit 35f20786c481d5ced9283ff42de5c69b65e5ed13 upstream.
arch/powerpc/lib/xor_vmx.o is built with '-msoft-float' (from the main powerpc Makefile) and '-maltivec' (from its CFLAGS), which causes an error when building with clang after a recent change in main:
error: option '-msoft-float' cannot be specified with '-maltivec' make[6]: *** [scripts/Makefile.build:243: arch/powerpc/lib/xor_vmx.o] Error 1
Explicitly add '-mhard-float' before '-maltivec' in xor_vmx.o's CFLAGS to override the previous inclusion of '-msoft-float' (as the last option wins), which matches how other areas of the kernel use '-maltivec', such as AMDGPU.
--- arch/powerpc/lib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/lib/Makefile +1 -1
@@ -61,6 +61,6 @@ obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o obj-$(CONFIG_FTR_FIXUP_SELFTEST) += feature-fixups-test.o obj-$(CONFIG_ALTIVEC) += xor_vmx.o xor_vmx_glue.o -CFLAGS_xor_vmx.o += -maltivec $(call cc-option,-mabi=altivec) +CFLAGS_xor_vmx.o += -mhard-float -maltivec $(call cc-option,-mabi=altivec) obj-$(CONFIG_PPC64) += $(obj64-y)
Greg Kroah-Hartman
maintainerPATCH 109/215 bounds: support non-power-of-two CONFIG_NR_CPUS
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthew Wilcox (Oracle) <[email protected]>
commit f2d5dcb48f7ba9e3ff249d58fc1fa963d374e66a upstream.
ilog2() rounds down, so for example when PowerPC 85xx sets CONFIG_NR_CPUS to 24, we will only allocate 4 bits to store the number of CPUs instead of
5. Use bits_per() instead, which rounds up. Found by code inspection. The effect of this would probably be a misaccounting when doing NUMA balancing, so to a user, it would only be a performance penalty. The effects may be more wide-spread; it's hard to tell.
--- kernel/bounds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bounds.c +1 -1
@@ -19,7 +19,7 @@ int main(void)DEFINE (NR_PAGEFLAGS , __NR_PAGEFLAGS);DEFINE (MAX_NR_ZONES , __MAX_NR_ZONES);#ifdef CONFIG_SMP -DEFINE (NR_CPUS_BITS ,ilog2 (CONFIG_NR_CPUS )); +DEFINE (NR_CPUS_BITS ,bits_per (CONFIG_NR_CPUS ));#endif DEFINE (SPINLOCK_SIZE ,sizeof (spinlock_t));/* End of constants */
Greg Kroah-Hartman
maintainerPATCH 110/215 vt: fix memory overlapping when deleting chars in the buffer
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yangxi Xiang <[email protected]>
commit 39cdb68c64d84e71a4a717000b6e5de208ee60cc upstream.
A memory overlapping copy occurs when deleting a long line. This memory overlapping copy can cause data corruption when scr_memcpyw is optimized to memcpy because memcpy does not ensure its behavior if the destination buffer overlaps with the source buffer. The line buffer is not always broken, because the memcpy utilizes the hardware acceleration, whose result is not deterministic.
Fix this problem by using replacing the scr_memcpyw with scr_memmovew.
[ KN: vc_state is not a separate structure in LTS v4.19, v5.4. Adjusted the patch
accordingly by using vc_x instead of state.x for backport. ]
--- drivers/tty/vt/vt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/vt/vt.c +1 -1
@@ -855,7 +855,7 @@ static void delete_char(struct vc_data *unsigned short *p = (unsigned short *) vc->vc_pos;vc_uniscr_delete (vc, nr); -scr_memcpyw (p, p + nr, (vc->vc_cols - vc->vc_x - nr) *2 ); +scr_memmovew (p, p + nr, (vc->vc_cols - vc->vc_x - nr) *2 );scr_memsetw (p + vc->vc_cols - vc->vc_x - nr, vc->vc_video_erase_char, nr *2 ); vc->vc_need_wrap =0 ;
Greg Kroah-Hartman
maintainerPATCH 111/215 mm/memory-failure: fix an incorrect use of tail pages
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Liu Shixin <[email protected]>
When backport commit c79c5a0a00a9 to 5.4-stable, there is a mistake change. The head page instead of tail page should be passed to try_to_unmap(), otherwise unmap will failed as follows.
Memory failure: 0x121c10: failed to unmap page (mapcount=1) Memory failure: 0x121c10: recovery action for unmapping failed page: Ignored
--- mm/memory-failure.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/memory-failure.c +1 -1
@@ -1030,7 +1030,7 @@ static bool hwpoison_user_mappings(strucif (kill)collect_procs (hpage, &tokill, flags &MF_ACTION_REQUIRED ); - unmap_success =try_to_unmap (p, ttu); + unmap_success =try_to_unmap (hpage, ttu);if (!unmap_success)pr_err ("Memory failure: %#lx: failed to unmap page (mapcount=%d)\n" , pfn,page_mapcount (p));
Greg Kroah-Hartman
maintainerPATCH 112/215 mm/migrate: set swap entry values of THP tail pages properly.
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zi Yan <[email protected]>
The tail pages in a THP can have swap entry information stored in their private field. When migrating to a new page, all tail pages of the new page need to update ->private to avoid future data corruption.
This fix is stable-only, since after commit 07e09c483cbe ("mm/huge_memory:
work on folio->swap instead of page->private when splitting folio"), subpages of a swapcached THP no longer requires the maintenance.
Adding THPs to the swapcache was introduced in commit 38d8b4e6bdc87 ("mm, THP, swap: delay splitting THP during swap out"), where each subpage of a THP added to the swapcache had its own swapcache entry and required the ->private field to point to the correct swapcache entry. Later, when THP migration functionality was implemented in commit 616b8371539a6 ("mm: thp: enable thp migration in generic path"), it initially did not handle the subpages of swapcached THPs, failing to update their ->private fields or replace the subpage pointers in the swapcache. Subsequently, commit e71769ae5260 ("mm: enable thp migration for shmem thp") addressed the swapcache update aspect. This patch fixes the update of subpage ->private fields.
--- mm/migrate.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
mm/migrate.c +5 -1
@@ -441,8 +441,12 @@ int migrate_page_move_mapping(struct addif (PageSwapBacked (page)) {__SetPageSwapBacked (newpage);if (PageSwapCache (page)) { +int i; +SetPageSwapCache (newpage); -set_page_private (newpage,page_private (page)); +for (i =0 ; i < (1 <<compound_order (page)); i++) +set_page_private (newpage + i, +page_private (page + i)); } }else {VM_BUG_ON_PAGE (PageSwapCache (page), page);
Greg Kroah-Hartman
maintainerPATCH 113/215 wifi: mac80211: check/clear fast rx for non-4addr sta VLAN changes
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Felix Fietkau <[email protected]>
commit 4f2bdb3c5e3189297e156b3ff84b140423d64685 upstream.
When moving a station out of a VLAN and deleting the VLAN afterwards, the fast_rx entry still holds a pointer to the VLAN's netdev, which can cause use-after-free bugs. Fix this by immediately calling ieee80211_check_fast_rx after the VLAN change.
--- net/mac80211/cfg.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
net/mac80211/cfg.c +2 -3
@@ -1670,15 +1670,14 @@ static int ieee80211_change_station(stru }if (sta->sdata->vif.type ==NL80211_IFTYPE_AP_VLAN && - sta->sdata->u.vlan.sta) { -ieee80211_clear_fast_rx (sta); + sta->sdata->u.vlan.sta)RCU_INIT_POINTER (sta->sdata->u.vlan.sta,NULL ); - }if (test_sta_flag (sta,WLAN_STA_AUTHORIZED ))ieee80211_vif_dec_num_mcast (sta->sdata); sta->sdata = vlansdata; +ieee80211_check_fast_rx (sta);ieee80211_check_fast_xmit (sta);if (test_sta_flag (sta,WLAN_STA_AUTHORIZED )) {
Greg Kroah-Hartman
maintainerPATCH 114/215 exec: Fix NOMMU linux_binprm::exec in transfer_args_to_stack()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Max Filippov <[email protected]>
commit 2aea94ac14d1e0a8ae9e34febebe208213ba72f7 upstream.
In NOMMU kernel the value of linux_binprm::p is the offset inside the temporary program arguments array maintained in separate pages in the linux_binprm::page. linux_binprm::exec being a copy of linux_binprm::p thus must be adjusted when that array is copied to the user stack. Without that adjustment the value passed by the NOMMU kernel to the ELF program in the AT_EXECFN entry of the aux array doesn't make any sense and it may break programs that try to access memory pointed to by that entry.
Adjust linux_binprm::exec before the successful return from the transfer_args_to_stack().
--- fs/exec.c | 1 + 1 file changed, 1 insertion(+)
fs/exec.c +1 -0
@@ -836,6 +836,7 @@ int transfer_args_to_stack(struct linux_ goto out; } + bprm->exec += *sp_location -MAX_ARG_PAGES *PAGE_SIZE ; *sp_location = sp; out:
Greg Kroah-Hartman
maintainerPATCH 115/215 mmc: core: Initialize mmc_blk_ioc_data
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikko Rapeli <[email protected]>
commit 0cdfe5b0bf295c0dee97436a8ed13336933a0211 upstream.
Commit 4d0c8d0aef63 ("mmc: core: Use mrq.sbc in close-ended ffu") adds flags uint to struct mmc_blk_ioc_data, but it does not get initialized for RPMB ioctls which now fails.
Let's fix this by always initializing the struct and flags to zero.
--- drivers/mmc/core/block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/core/block.c +1 -1
@@ -358,7 +358,7 @@ static struct mmc_blk_ioc_data *mmc_blk_struct mmc_blk_ioc_data *idata;int err; - idata =kmalloc (sizeof (*idata),GFP_KERNEL ); + idata =kzalloc (sizeof (*idata),GFP_KERNEL );if (!idata) { err = -ENOMEM ; goto out;
Greg Kroah-Hartman
maintainerPATCH 116/215 mmc: core: Avoid negative index with array access
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikko Rapeli <[email protected]>
commit cf55a7acd1ed38afe43bba1c8a0935b51d1dc014 upstream.
Commit 4d0c8d0aef63 ("mmc: core: Use mrq.sbc in close-ended ffu") assigns prev_idata = idatas[i - 1], but doesn't check that the iterator i is greater than zero. Let's fix this by adding a check.
--- drivers/mmc/core/block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/core/block.c +1 -1
@@ -511,7 +511,7 @@ static int __mmc_blk_ioctl_cmd(struct mmif (idata->flags &MMC_BLK_IOC_DROP )return 0 ; -if (idata->flags &MMC_BLK_IOC_SBC ) +if (idata->flags &MMC_BLK_IOC_SBC && i >0 ) prev_idata = idatas[i -1 ];/*
Greg Kroah-Hartman
maintainerPATCH 117/215 usb: cdc-wdm: close race between read and workqueue
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
commit 339f83612f3a569b194680768b22bf113c26a29d upstream.
wdm_read() cannot race with itself. However, in service_outstanding_interrupt() it can race with the workqueue, which can be triggered by error handling.
Hence we need to make sure that the WDM_RESPONDING flag is not just only set but tested.
--- drivers/usb/class/cdc-wdm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/usb/class/cdc-wdm.c +5 -1
@@ -471,6 +471,7 @@ out_free_mem:static int service_outstanding_interrupt (struct wdm_device *desc) {int rv =0 ; +int used;/* submit read urb only if the device is waiting for it */ if (!desc->resp_count || !--desc->resp_count)
@@ -485,7 +486,10 @@ static int service_outstanding_interrupt goto out; } -set_bit (WDM_RESPONDING , &desc->flags); + used =test_and_set_bit (WDM_RESPONDING , &desc->flags); +if (used) + goto out; +spin_unlock_irq (&desc->iuspin); rv =usb_submit_urb (desc->response,GFP_KERNEL );spin_lock_irq (&desc->iuspin);
Greg Kroah-Hartman
maintainerPATCH 118/215 ALSA: sh: aica: reorder cleanup operations to avoid UAF bugs
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Duoming Zhou <[email protected]>
commit 051e0840ffa8ab25554d6b14b62c9ab9e4901457 upstream.
The dreamcastcard->timer could schedule the spu_dma_work and the spu_dma_work could also arm the dreamcastcard->timer.
When the snd_pcm_substream is closing, the aica_channel will be deallocated. But it could still be dereferenced in the worker thread. The reason is that del_timer() will return directly regardless of whether the timer handler is running or not and the worker could be rescheduled in the timer handler. As a result, the UAF bug will happen. The racy situation is shown below:
(Thread 1) | (Thread 2)
snd_aicapcm_pcm_close() |
... | run_spu_dma() //worker
| mod_timer()
flush_work() |
del_timer() | aica_period_elapsed() //timer
kfree(dreamcastcard->channel) | schedule_work()
| run_spu_dma() //worker
... | dreamcastcard->channel-> //USEIn order to mitigate this bug and other possible corner cases, call mod_timer() conditionally in run_spu_dma(), then implement PCM sync_stop op to cancel both the timer and worker. The sync_stop op will be called from PCM core appropriately when needed.
Message-ID: <[email protected]>
--- sound/sh/aica.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
sound/sh/aica.c +14 -3
@@ -279,7 +279,8 @@ static void run_spu_dma(struct work_stru dreamcastcard->clicks++;if (unlikely (dreamcastcard->clicks >=AICA_PERIOD_NUMBER )) dreamcastcard->clicks %=AICA_PERIOD_NUMBER ; -mod_timer (&dreamcastcard->timer, jiffies +1 ); +if (snd_pcm_running (dreamcastcard->substream)) +mod_timer (&dreamcastcard->timer, jiffies +1 ); } }
@@ -291,6 +292,8 @@ static void aica_period_elapsed(struct t/*timer function - so cannot sleep */ int play_period;struct snd_pcm_runtime *runtime; +if (!snd_pcm_running (substream)) +return ; runtime = substream->runtime; dreamcastcard = substream->pcm->private_data;/* Have we played out an additional period? */
@@ -351,12 +354,19 @@ static int snd_aicapcm_pcm_open(struct sreturn 0 ; } +static int snd_aicapcm_pcm_sync_stop (struct snd_pcm_substream *substream) +{ +struct snd_card_aica *dreamcastcard = substream->pcm->private_data; + +del_timer_sync (&dreamcastcard->timer); +cancel_work_sync (&dreamcastcard->spu_dma_work); +return 0 ; +} +static int snd_aicapcm_pcm_close (struct snd_pcm_substream *substream) {struct snd_card_aica *dreamcastcard = substream->pcm->private_data; -flush_work (&(dreamcastcard->spu_dma_work)); -del_timer (&dreamcastcard->timer); dreamcastcard->substream =NULL ;kfree (dreamcastcard->channel);spu_disable ();
@@ -422,6 +432,7 @@ static const struct snd_pcm_ops snd_aica .prepare = snd_aicapcm_pcm_prepare, .trigger = snd_aicapcm_pcm_trigger, .pointer = snd_aicapcm_pcm_pointer, + .sync_stop = snd_aicapcm_pcm_sync_stop, };/* TO DO: set up to handle more than one pcm instance */
Greg Kroah-Hartman
maintainerPATCH 119/215 scsi: core: Fix unremoved procfs host directory regression
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guilherme G. Piccoli <[email protected]>
commit f23a4d6e07570826fe95023ca1aa96a011fa9f84 upstream.
Commit fc663711b944 ("scsi: core: Remove the /proc/scsi/${proc_name} directory earlier") fixed a bug related to modules loading/unloading, by adding a call to scsi_proc_hostdir_rm() on scsi_remove_host(). But that led to a potential duplicate call to the hostdir_rm() routine, since it's also called from scsi_host_dev_release(). That triggered a regression report, which was then fixed by commit be03df3d4bfe ("scsi: core: Fix a procfs host directory removal regression"). The fix just dropped the hostdir_rm() call from dev_release().
But it happens that this proc directory is created on scsi_host_alloc(), and that function "pairs" with scsi_host_dev_release(), while scsi_remove_host() pairs with scsi_add_host(). In other words, it seems the reason for removing the proc directory on dev_release() was meant to cover cases in which a SCSI host structure was allocated, but the call to scsi_add_host() didn't happen. And that pattern happens to exist in some error paths, for example.
Syzkaller causes that by using USB raw gadget device, error'ing on usb-storage driver, at usb_stor_probe2(). By checking that path, we can see that the BadDevice label leads to a scsi_host_put() after a SCSI host allocation, but there's no call to scsi_add_host() in such path. That leads to messages like this in dmesg (and a leak of the SCSI host proc structure):
usb-storage 4-1:87.51: USB Mass Storage device detected proc_dir_entry 'scsi/usb-storage' already registered
WARNING: CPU: 1 PID: 3519 at fs/proc/generic.c:377 proc_register+0x347/0x4e0 fs/proc/generic.c:376
The proper fix seems to still call scsi_proc_hostdir_rm() on dev_release(), but guard that with the state check for SHOST_CREATED; there is even a comment in scsi_host_dev_release() detailing that: such conditional is meant for cases where the SCSI host was allocated but there was no calls to {add,remove}_host(), like the usb-storage case.
This is what we propose here and with that, the error path of usb-storage does not trigger the warning anymore.
--- drivers/scsi/hosts.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/scsi/hosts.c +4 -3
@@ -331,12 +331,13 @@ static void scsi_host_dev_release(structif (shost->shost_state ==SHOST_CREATED ) {/* -* Free the shost_dev device name here if scsi_host_alloc() -* and scsi_host_put() have been called but neither +* Free the shost_dev device name and remove the proc host dir +* here if scsi_host_{alloc,put}() have been called but neither * scsi_host_add() nor scsi_host_remove() has been called. * This avoids that the memory allocated for the shost_dev -* name is leaked. +* name as well as the proc dir structure are leaked. */ +scsi_proc_hostdir_rm (shost->hostt);kfree (dev_name (&shost->shost_dev)); }
Greg Kroah-Hartman
maintainerPATCH 120/215 usb: dwc2: host: Fix remote wakeup from hibernation
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Minas Harutyunyan <[email protected]>
commit bae2bc73a59c200db53b6c15fb26bb758e2c6108 upstream.
Starting from core v4.30a changed order of programming GPWRDN_PMUACTV to 0 in case of exit from hibernation on remote wakeup signaling from device.
--- drivers/usb/dwc2/core.h | 1 + drivers/usb/dwc2/hcd.c | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-)
drivers/usb/dwc2/core.h +1 -0
@@ -1087,6 +1087,7 @@ struct dwc2_hsotg {bool needs_byte_swap;/* DWC OTG HW Release versions */ +#define DWC2_CORE_REV_4_30a 0x4f54430a#define DWC2_CORE_REV_2_71a 0x4f54271a#define DWC2_CORE_REV_2_72a 0x4f54272a#define DWC2_CORE_REV_2_80a 0x4f54280a
drivers/usb/dwc2/hcd.c +13 -4
@@ -5523,10 +5523,12 @@ int dwc2_host_exit_hibernation(struct dwdwc2_writel (hsotg, hr->hcfg,HCFG );/* De-assert Wakeup Logic */ - gpwrdn =dwc2_readl (hsotg,GPWRDN ); - gpwrdn &= ~GPWRDN_PMUACTV ; -dwc2_writel (hsotg, gpwrdn,GPWRDN ); -udelay (10 ); +if (!(rem_wakeup && hsotg->hw_params.snpsid >= DWC2_CORE_REV_4_30a)) { + gpwrdn =dwc2_readl (hsotg,GPWRDN ); + gpwrdn &= ~GPWRDN_PMUACTV ; +dwc2_writel (hsotg, gpwrdn,GPWRDN ); +udelay (10 ); + } hprt0 = hr->hprt0; hprt0 |=HPRT0_PWR ;
@@ -5551,6 +5553,13 @@ int dwc2_host_exit_hibernation(struct dw hprt0 |=HPRT0_RES ;dwc2_writel (hsotg, hprt0,HPRT0 ); +/* De-assert Wakeup Logic */ +if ((rem_wakeup && hsotg->hw_params.snpsid >= DWC2_CORE_REV_4_30a)) { + gpwrdn =dwc2_readl (hsotg,GPWRDN ); + gpwrdn &= ~GPWRDN_PMUACTV ; +dwc2_writel (hsotg, gpwrdn,GPWRDN ); +udelay (10 ); + }/* Wait for Resume time and then program HPRT again */ mdelay (100 ); hprt0 &= ~HPRT0_RES ;
Greg Kroah-Hartman
maintainerPATCH 121/215 usb: dwc2: host: Fix hibernation flow
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Minas Harutyunyan <[email protected]>
commit 3c7b9856a82227db01a20171d2e24c7ce305d59b upstream.
Added to backup/restore registers HFLBADDR, HCCHARi, HCSPLTi, HCTSIZi, HCDMAi and HCDMABi.
--- drivers/usb/dwc2/core.h | 12 ++++++++++++ drivers/usb/dwc2/hcd.c | 18 ++++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-)
drivers/usb/dwc2/core.h +12 -0
@@ -743,8 +743,14 @@ struct dwc2_dregs_backup {* struct dwc2_hregs_backup - Holds host registers state before * entering partial power down * @hcfg: Backup of HCFG register +* @hflbaddr: Backup of HFLBADDR register * @haintmsk: Backup of HAINTMSK register +* @hcchar: Backup of HCCHAR register +* @hcsplt: Backup of HCSPLT register * @hcintmsk: Backup of HCINTMSK register +* @hctsiz: Backup of HCTSIZ register +* @hdma: Backup of HCDMA register +* @hcdmab: Backup of HCDMAB register * @hprt0: Backup of HPTR0 register * @hfir: Backup of HFIR register * @hptxfsiz: Backup of HPTXFSIZ register
@@ -752,8 +758,14 @@ struct dwc2_dregs_backup {*/ struct dwc2_hregs_backup {u32 hcfg; +u32 hflbaddr;u32 haintmsk; +u32 hcchar[MAX_EPS_CHANNELS ]; +u32 hcsplt[MAX_EPS_CHANNELS ];u32 hcintmsk[MAX_EPS_CHANNELS ]; +u32 hctsiz[MAX_EPS_CHANNELS ]; +u32 hcidma[MAX_EPS_CHANNELS ]; +u32 hcidmab[MAX_EPS_CHANNELS ];u32 hprt0;u32 hfir;u32 hptxfsiz;
drivers/usb/dwc2/hcd.c +16 -2
@@ -5319,9 +5319,16 @@ int dwc2_backup_host_registers(struct dw/* Backup Host regs */ hr = &hsotg->hr_backup; hr->hcfg =dwc2_readl (hsotg,HCFG ); + hr->hflbaddr =dwc2_readl (hsotg,HFLBADDR ); hr->haintmsk =dwc2_readl (hsotg,HAINTMSK ); -for (i =0 ; i < hsotg->params.host_channels; ++i) +for (i =0 ; i < hsotg->params.host_channels; ++i) { + hr->hcchar[i] =dwc2_readl (hsotg,HCCHAR (i)); + hr->hcsplt[i] =dwc2_readl (hsotg,HCSPLT (i)); hr->hcintmsk[i] =dwc2_readl (hsotg,HCINTMSK (i)); + hr->hctsiz[i] =dwc2_readl (hsotg,HCTSIZ (i)); + hr->hcidma[i] =dwc2_readl (hsotg,HCDMA (i)); + hr->hcidmab[i] =dwc2_readl (hsotg,HCDMAB (i)); + } hr->hprt0 =dwc2_read_hprt0 (hsotg); hr->hfir =dwc2_readl (hsotg,HFIR );
@@ -5355,10 +5362,17 @@ int dwc2_restore_host_registers(struct d hr->valid = false;dwc2_writel (hsotg, hr->hcfg,HCFG ); +dwc2_writel (hsotg, hr->hflbaddr,HFLBADDR );dwc2_writel (hsotg, hr->haintmsk,HAINTMSK ); -for (i =0 ; i < hsotg->params.host_channels; ++i) +for (i =0 ; i < hsotg->params.host_channels; ++i) { +dwc2_writel (hsotg, hr->hcchar[i],HCCHAR (i)); +dwc2_writel (hsotg, hr->hcsplt[i],HCSPLT (i));dwc2_writel (hsotg, hr->hcintmsk[i],HCINTMSK (i)); +dwc2_writel (hsotg, hr->hctsiz[i],HCTSIZ (i)); +dwc2_writel (hsotg, hr->hcidma[i],HCDMA (i)); +dwc2_writel (hsotg, hr->hcidmab[i],HCDMAB (i)); + }dwc2_writel (hsotg, hr->hprt0,HPRT0 );dwc2_writel (hsotg, hr->hfir,HFIR );
Greg Kroah-Hartman
maintainerPATCH 122/215 usb: dwc2: host: Fix ISOC flow in DDMA mode
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Minas Harutyunyan <[email protected]>
commit b258e42688501cadb1a6dd658d6f015df9f32d8f upstream.
Fixed ISOC completion flow in DDMA mode. Added isoc descriptor actual length value and update urb's start_frame value.
Fixed initialization of ISOC DMA descriptors flow.
--- drivers/usb/dwc2/hcd.c | 12 ++++++++++-- drivers/usb/dwc2/hcd_ddma.c | 17 +++++++++++------ drivers/usb/dwc2/hw.h | 2 +- 3 files changed, 22 insertions(+), 9 deletions(-)
drivers/usb/dwc2/hcd.c +10 -2
@@ -2736,8 +2736,11 @@ enum dwc2_transaction_type dwc2_hcd_sele hsotg->available_host_channels--; } qh = list_entry(qh_ptr, struct dwc2_qh, qh_list_entry); -if (dwc2_assign_and_init_hc (hsotg, qh)) +if (dwc2_assign_and_init_hc (hsotg, qh)) { +if (hsotg->params.uframe_sched) + hsotg->available_host_channels++;break ; + }/* * Move the QH from the periodic ready schedule to the
@@ -2770,8 +2773,11 @@ enum dwc2_transaction_type dwc2_hcd_sele hsotg->available_host_channels--; } -if (dwc2_assign_and_init_hc (hsotg, qh)) +if (dwc2_assign_and_init_hc (hsotg, qh)) { +if (hsotg->params.uframe_sched) + hsotg->available_host_channels++;break ; + }/* * Move the QH from the non-periodic inactive schedule to the
@@ -4125,6 +4131,8 @@ void dwc2_host_complete(struct dwc2_hsot urb->actual_length);if (usb_pipetype (urb->pipe) ==PIPE_ISOCHRONOUS ) { +if (!hsotg->params.dma_desc_enable) + urb->start_frame = qtd->qh->start_active_frame; urb->error_count =dwc2_hcd_urb_get_error_count (qtd->urb);for (i =0 ; i < urb->number_of_packets; ++i) { urb->iso_frame_desc[i].actual_length =
drivers/usb/dwc2/hcd_ddma.c +11 -6
@@ -589,7 +589,7 @@ static void dwc2_init_isoc_dma_desc(stru idx = qh->td_last; inc = qh->host_interval; hsotg->frame_number =dwc2_hcd_get_frame_number (hsotg); - cur_idx =dwc2_frame_list_idx (hsotg->frame_number); + cur_idx = idx; next_idx =dwc2_desclist_idx_inc (qh->td_last, inc, qh->dev_speed);/*
@@ -896,6 +896,8 @@ static int dwc2_cmpl_host_isoc_dma_desc( {struct dwc2_dma_desc *dma_desc;struct dwc2_hcd_iso_packet_desc *frame_desc; +u16 frame_desc_idx; +struct urb *usb_urb = qtd->urb->priv;u16 remain =0 ;int rc =0 ;
@@ -908,8 +910,11 @@ static int dwc2_cmpl_host_isoc_dma_desc( DMA_FROM_DEVICE); dma_desc = &qh->desc_list[idx]; + frame_desc_idx = (idx - qtd->isoc_td_first) & (usb_urb->number_of_packets -1 ); - frame_desc = &qtd->urb->iso_descs[qtd->isoc_frame_index_last]; + frame_desc = &qtd->urb->iso_descs[frame_desc_idx]; +if (idx == qtd->isoc_td_first) + usb_urb->start_frame =dwc2_hcd_get_frame_number (hsotg); dma_desc->buf = (u32)(qtd->urb->dma + frame_desc->offset);if (chan->ep_is_in) remain = (dma_desc->status & HOST_DMA_ISOC_NBYTES_MASK) >>
@@ -930,7 +935,7 @@ static int dwc2_cmpl_host_isoc_dma_desc( frame_desc->status =0 ; } -if (++qtd->isoc_frame_index == qtd->urb->packet_count) { +if (++qtd->isoc_frame_index == usb_urb->number_of_packets) {/* * urb->status is not used for isoc transfers here. The * individual frame_desc status are used instead.
@@ -1035,11 +1040,11 @@ static void dwc2_complete_isoc_xfer_ddmareturn ; idx =dwc2_desclist_idx_inc (idx, qh->host_interval, chan->speed); -if (!rc) +if (rc ==0 )continue ; -if (rc ==DWC2_CMPL_DONE ) -break ; +if (rc ==DWC2_CMPL_DONE || rc ==DWC2_CMPL_STOP ) + goto stop_scan;/* rc == DWC2_CMPL_STOP */
drivers/usb/dwc2/hw.h +1 -1
@@ -718,7 +718,7 @@#define TXSTS_QTOP_TOKEN_MASK (0x3 << 25)#define TXSTS_QTOP_TOKEN_SHIFT 25#define TXSTS_QTOP_TERMINATE BIT(24) -#define TXSTS_QSPCAVAIL_MASK (0xff << 16) +#define TXSTS_QSPCAVAIL_MASK (0x7f << 16)#define TXSTS_QSPCAVAIL_SHIFT 16#define TXSTS_FSPCAVAIL_MASK (0xffff << 0)#define TXSTS_FSPCAVAIL_SHIFT 0
Greg Kroah-Hartman
maintainerPATCH 123/215 usb: dwc2: gadget: LPM flow fix
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Minas Harutyunyan <[email protected]>
commit 5d69a3b54e5a630c90d82a4c2bdce3d53dc78710 upstream.
Added functionality to exit from L1 state by device initiation using remote wakeup signaling, in case when function driver queuing request while core in L1 state.
--- drivers/usb/dwc2/core.h | 1 drivers/usb/dwc2/core_intr.c | 65 ++++++++++++++++++++++++++++--------------- drivers/usb/dwc2/gadget.c | 4 ++ 3 files changed, 48 insertions(+), 22 deletions(-)
drivers/usb/dwc2/core.h +1 -0
@@ -1334,6 +1334,7 @@ int dwc2_backup_global_registers(structint dwc2_restore_global_registers (struct dwc2_hsotg *hsotg);void dwc2_enable_acg (struct dwc2_hsotg *hsotg); +void dwc2_wakeup_from_lpm_l1 (struct dwc2_hsotg *hsotg,bool remotewakeup);/* This function should be called on every hardware interrupt. */ irqreturn_t dwc2_handle_common_intr (int irq,void *dev);
drivers/usb/dwc2/core_intr.c +43 -22
97 lines not on this page · raw message
drivers/usb/dwc2/gadget.c +4 -0
@@ -1416,6 +1416,10 @@ static int dwc2_hsotg_ep_queue(struct us ep->name, req, req->length, req->buf, req->no_interrupt, req->zero, req->short_not_ok); +if (hs->lx_state ==DWC2_L1 ) { +dwc2_wakeup_from_lpm_l1 (hs, true); + } +/* Prevent new request submission when controller is suspended */ if (hs->lx_state !=DWC2_L0 ) { dev_dbg(hs->dev, "%s: submit request only in active state\n",
Greg Kroah-Hartman
maintainerPATCH 124/215 usb: udc: remove warning when queue disabled ep
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: yuan linyu <[email protected]>
commit 2a587a035214fa1b5ef598aea0b81848c5b72e5e upstream.
It is possible trigger below warning message from mass storage function,
WARNING: CPU: 6 PID: 3839 at drivers/usb/gadget/udc/core.c:294 usb_ep_queue+0x7c/0x104 pc : usb_ep_queue+0x7c/0x104 lr : fsg_main_thread+0x494/0x1b3c
Root cause is mass storage function try to queue request from main thread, but other thread may already disable ep when function disable.
As there is no function failure in the driver, in order to avoid effort to fix warning, change WARN_ON_ONCE() in usb_ep_queue() to pr_debug().
--- drivers/usb/gadget/udc/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/gadget/udc/core.c +3 -1
@@ -273,7 +273,9 @@ int usb_ep_queue(struct usb_ep *ep, {int ret =0 ; -if (WARN_ON_ONCE (!ep->enabled && ep->address)) { +if (!ep->enabled && ep->address) { +pr_debug ("USB gadget: queue request to disabled ep 0x%x (%s)\n" , + ep->address, ep->name); ret = -ESHUTDOWN ; goto out; }
Greg Kroah-Hartman
maintainerPATCH 125/215 scsi: qla2xxx: Fix command flush on cable pull
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Quinn Tran <[email protected]>
commit a27d4d0e7de305def8a5098a614053be208d1aa1 upstream.
System crash due to command failed to flush back to SCSI layer.
BUG: unable to handle kernel NULL pointer dereference at 0000000000000000 PGD 0 P4D 0 Oops: 0000 [#1] SMP NOPTI CPU: 27 PID: 793455 Comm: kworker/u130:6 Kdump: loaded Tainted: G OE --------- - - 4.18.0-372.9.1.el8.x86_64 #1 Hardware name: HPE ProLiant DL360 Gen10/ProLiant DL360 Gen10, BIOS U32 09/03/2021 Workqueue: nvme-wq nvme_fc_connect_ctrl_work [nvme_fc] RIP: 0010:__wake_up_common+0x4c/0x190 Code: 24 10 4d 85 c9 74 0a 41 f6 01 04 0f 85 9d 00 00 00 48 8b 43 08 48 83 c3 08 4c 8d 48 e8 49 8d 41 18 48 39 c3 0f 84 f0 00 00 00 <49> 8b 41 18 89 54 24 08 31 ed 4c 8d 70 e8 45 8b 29 41 f6 c5 04 75 RSP: 0018:ffff95f3e0cb7cd0 EFLAGS: 00010086 RAX: 0000000000000000 RBX: ffff8b08d3b26328 RCX: 0000000000000000 RDX: 0000000000000001 RSI: 0000000000000003 RDI: ffff8b08d3b26320 RBP: 0000000000000001 R08: 0000000000000000 R09: ffffffffffffffe8 R10: 0000000000000000 R11: ffff95f3e0cb7a60 R12: ffff95f3e0cb7d20 R13: 0000000000000003 R14: 0000000000000000 R15: 0000000000000000 FS: 0000000000000000(0000) GS:ffff8b2fdf6c0000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000000 CR3: 0000002f1e410002 CR4: 00000000007706e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 PKRU: 55555554 Call Trace: __wake_up_common_lock+0x7c/0xc0 qla_nvme_ls_req+0x355/0x4c0 [qla2xxx] qla2xxx [0000:12:00.1]-f084:3: qlt_free_session_done: se_sess 0000000000000000 / sess ffff8ae1407ca000 from port 21:32:00:02:ac:07:ee:b8 loop_id 0x02 s_id 01:02:00 logout 1 keep 0 els_logo 0 ? __nvme_fc_send_ls_req+0x260/0x380 [nvme_fc] qla2xxx [0000:12:00.1]-207d:3: FCPort 21:32:00:02:ac:07:ee:b8 state transitioned from ONLINE to LOST - portid=010200. ? nvme_fc_send_ls_req.constprop.42+0x1a/0x45 [nvme_fc] qla2xxx [0000:12:00.1]-2109:3: qla2x00_schedule_rport_del 21320002ac07eeb8. rport ffff8ae598122000 roles 1 ? nvme_fc_connect_ctrl_work.cold.63+0x1e3/0xa7d [nvme_fc] qla2xxx [0000:12:00.1]-f084:3: qlt_free_session_done: se_sess 0000000000000000 / sess ffff8ae14801e000 from port 21:32:01:02:ad:f7:ee:b8 loop_id 0x04 s_id 01:02:01 logout 1 keep 0 els_logo 0 ? __switch_to+0x10c/0x450 ? process_one_work+0x1a7/0x360 qla2xxx [0000:12:00.1]-207d:3: FCPort 21:32:01:02:ad:f7:ee:b8 state transitioned from ONLINE to LOST - portid=010201. ? worker_thread+0x1ce/0x390 ? create_worker+0x1a0/0x1a0 qla2xxx [0000:12:00.1]-2109:3: qla2x00_schedule_rport_del 21320102adf7eeb8. rport ffff8ae3b2312800 roles 70 ? kthread+0x10a/0x120 qla2xxx [0000:12:00.1]-2112:3: qla_nvme_unregister_remote_port: unregister remoteport on ffff8ae14801e000 21320102adf7eeb8 ? set_kthread_struct+0x40/0x40 qla2xxx [0000:12:00.1]-2110:3: remoteport_delete of ffff8ae14801e000 21320102adf7eeb8 completed. ? ret_from_fork+0x1f/0x40 qla2xxx [0000:12:00.1]-f086:3: qlt_free_session_done: waiting for sess ffff8ae14801e000 logout
The system was under memory stress where driver was not able to allocate an SRB to carry out error recovery of cable pull. The failure to flush causes upper layer to start modifying scsi_cmnd. When the system frees up some memory, the subsequent cable pull trigger another command flush. At this point the driver access a null pointer when attempting to DMA unmap the SGL.
Add a check to make sure commands are flush back on session tear down to prevent the null pointer access.
--- drivers/scsi/qla2xxx/qla_target.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/scsi/qla2xxx/qla_target.c +10 -0
@@ -1040,6 +1040,16 @@ void qlt_free_session_done(struct work_s "%s: sess %p logout completed\n", __func__, sess); } +/* check for any straggling io left behind */ +if (!(sess->flags &FCF_FCP2_DEVICE ) && +qla2x00_eh_wait_for_pending_commands (sess->vha, sess->d_id.b24,0 ,WAIT_TARGET )) { +ql_log (ql_log_warn, vha,0x3027 , +"IO not return. Resetting.\n" ); +set_bit (ISP_ABORT_NEEDED , &vha->dpc_flags); +qla2xxx_wake_dpc (vha); +qla2x00_wait_for_chip_reset (vha); + } +if (sess->logo_ack_needed) { sess->logo_ack_needed =0 ; qla24xx_async_notify_ack(vha, sess,
Greg Kroah-Hartman
maintainerPATCH 126/215 x86/cpu: Enable STIBP on AMD if Automatic IBRS is enabled
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kim Phillips <[email protected]>
commit fd470a8beed88440b160d690344fbae05a0b9b1b upstream.
Unlike Intel's Enhanced IBRS feature, AMD's Automatic IBRS does not provide protection to processes running at CPL3/user mode, see section "Extended Feature Enable Register (EFER)" in the APM v2 at
https://bugzilla.kernel.org/attachment.cgi?id=304652
Explicitly enable STIBP to protect against cross-thread CPL3 branch target injections on systems with Automatic IBRS enabled.
Also update the relevant documentation.
--- Documentation/admin-guide/hw-vuln/spectre.rst | 11 +++++++---- arch/x86/kernel/cpu/bugs.c | 15 +++++++++------ 2 files changed, 16 insertions(+), 10 deletions(-)
Documentation/admin-guide/hw-vuln/spectre.rst +7 -4
@@ -484,11 +484,14 @@ Spectre variant 2 Systems which support enhanced IBRS (eIBRS) enable IBRS protection once at boot, by setting the IBRS bit, and they're automatically protected against - Spectre v2 variant attacks, including cross-thread branch target injections - on SMT systems (STIBP). In other words, eIBRS enables STIBP too. + Spectre v2 variant attacks. - Legacy IBRS systems clear the IBRS bit on exit to userspace and - therefore explicitly enable STIBP for that + On Intel's enhanced IBRS systems, this includes cross-thread branch target + injections on SMT systems (STIBP). In other words, Intel eIBRS enables + STIBP, too. + + AMD Automatic IBRS does not protect userspace, and Legacy IBRS systems clear + the IBRS bit on exit to userspace, therefore both explicitly enable STIBP. The retpoline mitigation is turned on by default on vulnerable CPUs. It can be forced on or off by the administrator
arch/x86/kernel/cpu/bugs.c +9 -6
@@ -1153,19 +1153,21 @@ spectre_v2_user_select_mitigation(void) }/* -* If no STIBP, enhanced IBRS is enabled, or SMT impossible, STIBP +* If no STIBP, Intel enhanced IBRS is enabled, or SMT impossible, STIBP * is not required. * -* Enhanced IBRS also protects against cross-thread branch target +* Intel's Enhanced IBRS also protects against cross-thread branch target * injection in user-mode as the IBRS bit remains always set which * implicitly enables cross-thread protections. However, in legacy IBRS * mode, the IBRS bit is set only on kernel entry and cleared on return -* to userspace. This disables the implicit cross-thread protection, -* so allow for STIBP to be selected in that case. +* to userspace. AMD Automatic IBRS also does not protect userspace. +* These modes therefore disable the implicit cross-thread protection, +* so allow for STIBP to be selected in those cases. */ if (!boot_cpu_has (X86_FEATURE_STIBP ) || !smt_possible || -spectre_v2_in_eibrs_mode (spectre_v2_enabled)) + (spectre_v2_in_eibrs_mode (spectre_v2_enabled) && + !boot_cpu_has (X86_FEATURE_AUTOIBRS )))return ;/*
@@ -2232,7 +2234,8 @@ static ssize_t mmio_stale_data_show_statstatic char *stibp_state (void ) { -if (spectre_v2_in_eibrs_mode (spectre_v2_enabled)) +if (spectre_v2_in_eibrs_mode (spectre_v2_enabled) && + !boot_cpu_has (X86_FEATURE_AUTOIBRS ))return "" ;switch (spectre_v2_user_stibp) {
Greg Kroah-Hartman
maintainerPATCH 127/215 scsi: lpfc: Correct size for wqe for memset()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Muhammad Usama Anjum <[email protected]>
commit 28d41991182c210ec1654f8af2e140ef4cc73f20 upstream.
The wqe is of type lpfc_wqe128. It should be memset with the same type.
--- drivers/scsi/lpfc/lpfc_nvmet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_nvmet.c +1 -1
@@ -1392,7 +1392,7 @@ lpfc_nvmet_setup_io_context(struct lpfc_ wqe = &nvmewqe->wqe;/* Initialize WQE */ -memset (wqe,0 ,sizeof (union lpfc_wqe )); +memset (wqe,0 ,sizeof (*wqe)); ctx_buf->iocbq->context1 =NULL ;spin_lock (&phba->sli4_hba.sgl_list_lock);
Greg Kroah-Hartman
maintainerPATCH 128/215 USB: core: Fix deadlock in usb_deauthorize_interface()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Stern <[email protected]>
commit 80ba43e9f799cbdd83842fc27db667289b3150f5 upstream.
Among the attribute file callback routines in drivers/usb/core/sysfs.c, the interface_authorized_store() function is the only one which acquires a device lock on an ancestor device: It calls usb_deauthorize_interface(), which locks the interface's parent USB device.
The will lead to deadlock if another process already owns that lock and tries to remove the interface, whether through a configuration change or because the device has been disconnected. As part of the removal procedure, device_del() waits for all ongoing sysfs attribute callbacks to complete. But usb_deauthorize_interface() can't complete until the device lock has been released, and the lock won't be released until the removal has finished.
The mechanism provided by sysfs to prevent this kind of deadlock is to use the sysfs_break_active_protection() function, which tells sysfs not to wait for the attribute callback.
Reported-and-tested by: Yue Sun <[email protected]> Reported by: xingwei lee <[email protected]>
--- drivers/usb/core/sysfs.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
drivers/usb/core/sysfs.c +13 -3
@@ -1190,14 +1190,24 @@ static ssize_t interface_authorized_stor {struct usb_interface *intf =to_usb_interface (dev);bool val; +struct kernfs_node *kn;if (strtobool (buf, &val) !=0 )return -EINVAL ; -if (val) +if (val) {usb_authorize_interface (intf); -else -usb_deauthorize_interface (intf); + }else { +/* +* Prevent deadlock if another process is concurrently +* trying to unregister intf. +*/ + kn =sysfs_break_active_protection (&dev->kobj, &attr->attr); +if (kn) { +usb_deauthorize_interface (intf); +sysfs_unbreak_active_protection (kn); + } + }return count; }
Greg Kroah-Hartman
maintainerPATCH 129/215 nfc: nci: Fix uninit-value in nci_dev_up and nci_ntf_packet
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryosuke Yasuoka <[email protected]>
[ Upstream commit d24b03535e5eb82e025219c2f632b485409c898f ]
syzbot reported the following uninit-value access issue [1][2]:
nci_rx_work() parses and processes received packet. When the payload length is zero, each message type handler reads uninitialized payload and KMSAN detects this issue. The receipt of a packet with a zero-size payload is considered unexpected, and therefore, such packets should be silently discarded.
This patch resolved this issue by checking payload size before calling each message type handler codes.
--- net/nfc/nci/core.c | 5 +++++ 1 file changed, 5 insertions(+)
net/nfc/nci/core.c +5 -0
@@ -1499,6 +1499,11 @@ static void nci_rx_work(struct work_struct *work)nfc_send_to_raw_sock (ndev->nfc_dev, skb,RAW_PAYLOAD_NCI ,NFC_DIRECTION_RX ); +if (!nci_plen (skb->data)) { +kfree_skb (skb); +break ; + } +/* Process frame */ switch (nci_mt (skb->data)) {case NCI_MT_RSP_PKT :
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 130/215 ixgbe: avoid sleeping allocation in ixgbe_ipsec_vf_add_sa()
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Przemek Kitszel <[email protected]>
[ Upstream commit aec806fb4afba5fe80b09e29351379a4292baa43 ]
Change kzalloc() flags used in ixgbe_ipsec_vf_add_sa() to GFP_ATOMIC, to avoid sleeping in IRQ context.
Dan Carpenter, with the help of Smatch, has found following issue:
The patch eda0333ac293: "ixgbe: add VF IPsec management" from Aug 13, 2018 (linux-next), leads to the following Smatch static checker
warning: drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c:917 ixgbe_ipsec_vf_add_sa()
warn: sleeping in IRQ context
The call tree that Smatch is worried about is:ixgbe_msix_other() <- IRQ handler
-> ixgbe_msg_task()
-> ixgbe_rcv_msg_from_vf()
-> ixgbe_ipsec_vf_add_sa()
--- drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c +8 -8
@@ -909,7 +909,13 @@ int ixgbe_ipsec_vf_add_sa(struct ixgbe_adapter *adapter, u32 *msgbuf, u32 vf) goto err_out; } - xs =kzalloc (sizeof (*xs),GFP_KERNEL ); + algo =xfrm_aead_get_byname (aes_gcm_name,IXGBE_IPSEC_AUTH_BITS ,1 ); +if (unlikely (!algo)) { + err = -ENOENT ; + goto err_out; + } + + xs =kzalloc (sizeof (*xs),GFP_ATOMIC );if (unlikely (!xs)) { err = -ENOMEM ; goto err_out;
@@ -925,14 +931,8 @@ int ixgbe_ipsec_vf_add_sa(struct ixgbe_adapter *adapter, u32 *msgbuf, u32 vf)memcpy (&xs->id.daddr.a4, sam->addr,sizeof (xs->id.daddr.a4)); xs->xso.dev = adapter->netdev; - algo =xfrm_aead_get_byname (aes_gcm_name,IXGBE_IPSEC_AUTH_BITS ,1 ); -if (unlikely (!algo)) { - err = -ENOENT ; - goto err_xs; - } - aead_len =sizeof (*xs->aead) +IXGBE_IPSEC_KEY_BITS /8 ; - xs->aead =kzalloc (aead_len,GFP_KERNEL ); + xs->aead =kzalloc (aead_len,GFP_ATOMIC );if (unlikely (!xs->aead)) { err = -ENOMEM ; goto err_xs;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 131/215 tcp: properly terminate timers for kernel sockets
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 151c9c724d05d5b0dd8acd3e11cb69ef1f2dbada ]
We had various syzbot reports about tcp timers firing after the corresponding netns has been dismantled.
Fortunately Josef Bacik could trigger the issue more often, and could test a patch I wrote two years ago.
When TCP sockets are closed, we call inet_csk_clear_xmit_timers() to 'stop' the timers.
inet_csk_clear_xmit_timers() can be called from any context, including when socket lock is held.
This is the reason it uses sk_stop_timer(), aka del_timer(). This means that ongoing timers might finish much later.
For user sockets, this is fine because each running timer holds a reference on the socket, and the user socket holds a reference on the netns.
For kernel sockets, we risk that the netns is freed before timer can complete, because kernel sockets do not hold reference on the netns.
This patch adds inet_csk_clear_xmit_timers_sync() function that using sk_stop_timer_sync() to make sure all timers are terminated before the kernel socket is released. Modules using kernel sockets close them in their netns exit() handler.
Also add sock_not_owned_by_me() helper to get LOCKDEP support : inet_csk_clear_xmit_timers_sync() must not be called while socket lock is held.
It is very possible we can revert in the future commit 3a58f13a881e ("net: rds: acquire refcount on TCP sockets") which attempted to solve the issue in rds only. (net/smc/af_smc.c and net/mptcp/subflow.c have similar code)
We probably can remove the check_net() tests from tcp_out_of_resources() and __tcp_close() in the future.
--- include/net/inet_connection_sock.h | 1 + include/net/sock.h | 7 +++++++ net/ipv4/inet_connection_sock.c | 14 ++++++++++++++ net/ipv4/tcp.c | 2 ++ 4 files changed, 24 insertions(+)
include/net/inet_connection_sock.h +1 -0
@@ -176,6 +176,7 @@ void inet_csk_init_xmit_timers(struct sock *sk,void (*delack_handler)(struct timer_list *), void (*keepalive_handler)(struct timer_list *));void inet_csk_clear_xmit_timers (struct sock *sk); +void inet_csk_clear_xmit_timers_sync (struct sock *sk);static inline void inet_csk_schedule_ack (struct sock *sk) {
include/net/sock.h +7 -0
@@ -1605,6 +1605,13 @@ static inline void sock_owned_by_me(const struct sock *sk)#endif } +static inline void sock_not_owned_by_me (const struct sock *sk) +{ +#ifdef CONFIG_LOCKDEP +WARN_ON_ONCE (lockdep_sock_is_held (sk) && debug_locks); +#endif +} +static inline bool sock_owned_by_user (const struct sock *sk) {sock_owned_by_me (sk);
net/ipv4/inet_connection_sock.c +14 -0
@@ -560,6 +560,20 @@ void inet_csk_clear_xmit_timers(struct sock *sk) }EXPORT_SYMBOL (inet_csk_clear_xmit_timers); +void inet_csk_clear_xmit_timers_sync (struct sock *sk) +{ +struct inet_connection_sock *icsk =inet_csk (sk); + +/* ongoing timer handlers need to acquire socket lock. */ +sock_not_owned_by_me (sk); + + icsk->icsk_pending = icsk->icsk_ack.pending =0 ; + +sk_stop_timer_sync (sk, &icsk->icsk_retransmit_timer); +sk_stop_timer_sync (sk, &icsk->icsk_delack_timer); +sk_stop_timer_sync (sk, &sk->sk_timer); +} +void inet_csk_delete_keepalive_timer (struct sock *sk) {sk_stop_timer (sk, &sk->sk_timer);
net/ipv4/tcp.c +2 -0
@@ -2529,6 +2529,8 @@ void tcp_close(struct sock *sk, long timeout)lock_sock (sk);__tcp_close (sk, timeout);release_sock (sk); +if (!sk->sk_net_refcnt) +inet_csk_clear_xmit_timers_sync (sk);sock_put (sk); }EXPORT_SYMBOL (tcp_close);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 132/215 dm integrity: fix out-of-range warning
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit 8e91c2342351e0f5ef6c0a704384a7f6fc70c3b2 ]
Depending on the value of CONFIG_HZ, clang complains about a pointless comparison:
drivers/md/dm-integrity.c:4085:12: error: result of comparison of
constant 42949672950 with expression of type 'unsigned int' is always false [-Werror,-Wtautological-constant-out-of-range-compare] if (val >= (uint64_t)UINT_MAX * 1000 / HZ) {
As the check remains useful for other configurations, shut up the warning by adding a second type cast to uint64_t.
--- drivers/md/dm-integrity.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-integrity.c +1 -1
@@ -3755,7 +3755,7 @@ static int dm_integrity_ctr(struct dm_target *ti, unsigned argc, char **argv) }else if (sscanf (opt_string,"sectors_per_bit:%llu%c" , &llval, &dummy) ==1 ) { log2_sectors_per_bitmap_bit = !llval ?0 :__ilog2_u64 (llval); }else if (sscanf (opt_string,"bitmap_flush_interval:%u%c" , &val, &dummy) ==1 ) { -if (val >= (uint64_t )UINT_MAX *1000 /HZ ) { +if ((uint64_t )val >= (uint64_t )UINT_MAX *1000 /HZ ) { r = -EINVAL ; ti->error ="Invalid bitmap_flush_interval argument" ; goto bad;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 133/215 r8169: fix issue caused by buggy BIOS on certain boards with RTL8168d
In reply to Greg Kroah-Hartman5.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiner Kallweit <[email protected]>
commit 5d872c9f46bd2ea3524af3c2420a364a13667135 upstream.
On some boards with this chip version the BIOS is buggy and misses to reset the PHY page selector. This results in the PHY ID read accessing registers on a different page, returning a more or less random value. Fix this by resetting the page selector first.
--- drivers/net/ethernet/realtek/r8169_main.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/net/ethernet/realtek/r8169_main.c +9 -0
@@ -6851,6 +6851,15 @@ static int r8169_mdio_register(struct rtstruct mii_bus *new_bus;int ret; +/* On some boards with this chip version the BIOS is buggy and misses +* to reset the PHY page selector. This results in the PHY ID read +* accessing registers on a different page, returning a more or +* less random value. Fix this by resetting the page selector first. +*/ +if (tp->mac_version ==RTL_GIGA_MAC_VER_25 || + tp->mac_version ==RTL_GIGA_MAC_VER_26 ) +r8169_mdio_write (tp,0x1f ,0 ); + new_bus =devm_mdiobus_alloc (&pdev->dev);if (!new_bus)return -ENOMEM ;