4.19.283-rc1 review
Subsystems (11)
Greg Kroah-Hartman
maintainercover 4.19.283-rc1 review
This is the start of the stable review cycle for the 4.19.283 release. There are 191 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed, 17 May 2023 16:16:37 +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/v4.x/stable-review/patch-4.19.283-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-4.19.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.19.283-rc1
Tetsuo Handa <[email protected]>
mm/page_alloc: fix potential deadlock on zonelist_update_seq seqlock
Tetsuo Handa <[email protected]>
printk: declare printk_deferred_{enter,safe}() in include/linux/printk.h
Lukas Wunner <[email protected]>
PCI: pciehp: Fix AB-BA deadlock between reset_lock and device_lock
Hans de Goede <[email protected]>
PCI: pciehp: Use down_read/write_nested(reset_lock) to fix lockdep errors
Christoph Böhmwalder <[email protected]>
drbd: correctly submit flush bio on barrier
Ilpo Järvinen <[email protected]>
serial: 8250: Fix serial8250_tx_empty() race with DMA Tx
Ilpo Järvinen <[email protected]>
tty: Prevent writing chars during tcsetattr TCSADRAIN/FLUSH
Theodore Ts'o <[email protected]>
ext4: fix invalid free tracking in ext4_xattr_move_to_block()
Theodore Ts'o <[email protected]>
ext4: remove a BUG_ON in ext4_mb_release_group_pa()
Theodore Ts'o <[email protected]>
ext4: bail out of ext4_xattr_ibody_get() fails for any reason
Theodore Ts'o <[email protected]>
ext4: add bounds checking in get_max_inline_xattr_value_size()
Theodore Ts'o <[email protected]>
ext4: improve error recovery code paths in __ext4_remount()
Tudor Ambarus <[email protected]>
ext4: avoid a potential slab-out-of-bounds in ext4_group_desc_csum
Ye Bin <[email protected]>
ext4: fix WARNING in mb_find_extent
Ping Cheng <[email protected]>
HID: wacom: Set a default resolution for older tablets
James Cowgill <[email protected]>
drm/panel: otm8009a: Set backlight parent to panel device
Krzysztof Kozlowski <[email protected]>
ARM: dts: s5pv210: correct MIPI CSIS clock name
Krzysztof Kozlowski <[email protected]>
ARM: dts: exynos: fix WM8960 clock name in Itop Elite
Randy Dunlap <[email protected]>
sh: nmi_debug: fix return value of __setup handler
Randy Dunlap <[email protected]>
sh: init: use OF_EARLY_FLATTREE for early init
Randy Dunlap <[email protected]>
sh: math-emu: fix macro redefined warning
Andrey Avdeev <[email protected]>
platform/x86: touchscreen_dmi: Add info for the Dexp Ursus KX210i
Pawel Witek <[email protected]>
cifs: fix pcchunk length type in smb2_copychunk_range
Anastasia Belova <[email protected]>
btrfs: print-tree: parent bytenr must be aligned to sector size
Filipe Manana <[email protected]>
btrfs: fix btrfs_prev_leaf() to not return the same key twice
Yang Jihong <[email protected]>
perf symbols: Fix return incorrect build_id size in elf_read_build_id()
Markus Elfring <[email protected]>
perf map: Delete two variable initialisations before null pointer checks in sort__sym_from_cmp()
Kajol Jain <[email protected]>
perf vendor events power9: Remove UTF-8 characters from JSON files
Florian Fainelli <[email protected]>
net: bcmgenet: Remove phy_stop() from bcmgenet_netif_stop()
Wenliang Wang <[email protected]>
virtio_net: suppress cpu stall when free_unused_bufs
Xuan Zhuo <[email protected]>
virtio_net: split free_unused_bufs()
Ruliang Lin <[email protected]>
ALSA: caiaq: input: Add error handling for unsupported input methods in snd_usb_caiaq_input_init
Chia-I Wu <[email protected]>
drm/amdgpu: add a missing lock for AMDGPU_SCHED
Bas Nieuwenhuizen <[email protected]>
drm/amdgpu: Add command to override the context priority.
Rex Zhu <[email protected]>
drm/amdgpu: Put enable gfx off feature to a delay thread
Rex Zhu <[email protected]>
drm/amdgpu: Add amdgpu_gfx_off_ctrl function
Kuniyuki Iwashima <[email protected]>
af_packet: Don't send zero-byte data in packet_sendmsg_spkt().
David Howells <[email protected]>
rxrpc: Fix hard call timeout units
Victor Nogueira <[email protected]>
net/sched: act_mirred: Add carrier check
Maxim Korotkov <[email protected]>
writeback: fix call of incorrect macro
Angelo Dureghello <[email protected]>
net: dsa: mv88e6xxx: add mv88e6321 rsvd2cpu
Andrew Lunn <[email protected]>
net: dsa: mv88e6xxx: Add missing watchdog ops for 6320 family
Cong Wang <[email protected]>
sit: update dev->needed_headroom in ipip6_tunnel_bind_dev()
Zhang Zhengming <[email protected]>
relayfs: fix out-of-bounds access in relay_file_read
Pengcheng Yang <[email protected]>
kernel/relay.c: fix read_pos error when multiple readers
Yeongjin Gil <[email protected]>
dm verity: fix error handling for check_at_most_once on FEC
Akilesh Kailash <[email protected]>
dm verity: skip redundant verity_handle_err() on I/O errors
Zhang Yuchen <[email protected]>
ipmi: fix SSIF not responding under certain cond.
Corey Minyard <[email protected]>
ipmi_ssif: Rename idle state and check
Corey Minyard <[email protected]>
ipmi: Fix how the lower layers are told to watch for messages
Corey Minyard <[email protected]>
ipmi: Fix SSIF flag requests
Joel Fernandes (Google) <[email protected]>
tick/nohz: Fix cpu_is_hotpluggable() by checking with nohz subsystem
Frederic Weisbecker <[email protected]>
nohz: Add TICK_DEP_BIT_RCU
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: deactivate anonymous set from preparation phase
Thomas Gleixner <[email protected]>
debugobject: Ensure pool refill (again)
Adrian Hunter <[email protected]>
perf auxtrace: Fix address filter entire kernel size
Mike Snitzer <[email protected]>
dm ioctl: fix nested locking in table_clear() to remove deadlock concern
Mikulas Patocka <[email protected]>
dm flakey: fix a crash with invalid table line
Mike Snitzer <[email protected]>
dm integrity: call kmem_cache_destroy() in dm_integrity_init() error path
Stefan Haberland <[email protected]>
s390/dasd: fix hanging blockdevice after request requeue
Qu Wenruo <[email protected]>
btrfs: scrub: reject unsupported scrub flags
Quentin Schulz <[email protected]>
clk: rockchip: rk3399: allow clk_cifout to force clk_cifout_src to reparent
Bitterblue Smith <[email protected]>
wifi: rtl8xxxu: RTL8192EU always needs full init
Li Nan <[email protected]>
md/raid10: fix null-ptr-deref in raid10_sync_request
Ryusuke Konishi <[email protected]>
nilfs2: fix infinite loop in nilfs_mdt_get_block()
Ryusuke Konishi <[email protected]>
nilfs2: do not write dirty data after degenerating to read-only
Helge Deller <[email protected]>
parisc: Fix argument pointer in real64_call_asm()
Claudiu Beznea <[email protected]>
dmaengine: at_xdmac: do not enable all cyclic channels
Gaosheng Cui <[email protected]>
phy: tegra: xusb: Add missing tegra_xusb_port_unregister for usb2_port and ulpi_port
AngeloGioacchino Del Regno <[email protected]>
pwm: mtk-disp: Disable shadow registers before setting backlight values
Jitao Shi <[email protected]>
pwm: mtk-disp: Adjust the clocks to avoid them mismatch
Uwe Kleine-König <[email protected]>
pwm: mtk-disp: Don't check the return code of pwmchip_remove()
Stafford Horne <[email protected]>
openrisc: Properly store r31 to pt_regs on unhandled exceptions
Mark Zhang <[email protected]>
RDMA/mlx5: Use correct device num_ports when modify DC
Dai Ngo <[email protected]>
SUNRPC: remove the maximum number of retries in call_bind_status
Trond Myklebust <[email protected]>
NFSv4.1: Always send a RECLAIM_COMPLETE after establishing lease
Patrick Kelsey <[email protected]>
IB/hfi1: Fix SDMA mmu_rb_node not being evicted in LRU order
Clément Léger <[email protected]>
clk: add missing of_node_put() in "assigned-clocks" property parsing
Sebastian Reichel <[email protected]>
power: supply: generic-adc-battery: fix unit scaling
Dan Carpenter <[email protected]>
RDMA/mlx4: Prevent shift wrapping in set_user_sq_size()
Natalia Petrova <[email protected]>
RDMA/rdmavt: Delete unnecessary NULL check
Yang Jihong <[email protected]>
perf/core: Fix hardlockup failure caused by perf throttle
Nathan Lynch <[email protected]>
powerpc/rtas: use memmove for potentially overlapping buffer copy
Randy Dunlap <[email protected]>
macintosh: via-pmu-led: requires ATA to be set
Randy Dunlap <[email protected]>
powerpc/sysdev/tsi108: fix resource printk format warnings
Randy Dunlap <[email protected]>
powerpc/wii: fix resource printk format warnings
Randy Dunlap <[email protected]>
powerpc/mpc512x: fix resource printk format warning
Liang He <[email protected]>
macintosh/windfarm_smu_sat: Add missing of_node_put()
Jishnu Prakash <[email protected]>
spmi: Add a check for remove callback when removing a SPMI driver
Philipp Hortmann <[email protected]>
staging: rtl8192e: Fix W_DISABLE# does not work after stop/start
Florian Fainelli <[email protected]>
serial: 8250: Add missing wakeup event reporting
Shenwei Wang <[email protected]>
tty: serial: fsl_lpuart: adjust buffer length to the intended size
Yinhao Hu <[email protected]>
usb: chipidea: fix missing goto in ci_hdrc_probe
John Paul Adrian Glaubitz <[email protected]>
sh: sq: Fix incorrect element size for allocating bitmap buffer
Kevin Brodsky <[email protected]>
uapi/linux/const.h: prefer ISO-friendly __typeof__
Dhruva Gole <[email protected]>
spi: cadence-quadspi: fix suspend-resume implementations
Vignesh Raghavendra <[email protected]>
mtd: spi-nor: cadence-quadspi: Handle probe deferral while requesting DMA channel
Vignesh Raghavendra <[email protected]>
mtd: spi-nor: cadence-quadspi: Don't initialize rx_dma_complete on failure
Vignesh Raghavendra <[email protected]>
mtd: spi-nor: cadence-quadspi: Make driver independent of flash geometry
Randy Dunlap <[email protected]>
ia64: salinfo: placate defined-but-not-used warning
Randy Dunlap <[email protected]>
ia64: mm/contig: fix section mismatch warning/error
Miquel Raynal <[email protected]>
of: Fix modalias string generation
Dae R. Jeong <[email protected]>
vmci_host: fix a race condition in vmci_host_poll() causing GPF
Christophe Leroy <[email protected]>
spi: fsl-spi: Fix CPM/QE mode Litte Endian
Uwe Kleine-König <[email protected]>
spi: qup: Don't skip cleanup in remove's error path
Wang Li <[email protected]>
spi: qup: fix PM reference leak in spi_qup_remove()
Randy Dunlap <[email protected]>
linux/vt_buffer.h: allow either builtin or modular for macros
Zheng Wang <[email protected]>
usb: gadget: udc: renesas_usb3: Fix use after free bug in renesas_usb3_remove due to race condition
Marco Pagani <[email protected]>
fpga: bridge: fix kernel-doc parameter description
Wolfram Sang <[email protected]>
usb: host: xhci-rcar: remove leftover quirk handling
John Stultz <[email protected]>
pstore: Revert pmsg_lock back to a normal mutex
Kuniyuki Iwashima <[email protected]>
tcp/udp: Fix memleaks of sk and zerocopy skbs with TX timestamp.
Gencen Gan <[email protected]>
net: amd: Fix link leak when verifying config failed
Kuniyuki Iwashima <[email protected]>
netlink: Use copy_to_user() for optval in netlink_getsockopt().
Liu Jian <[email protected]>
Revert "Bluetooth: btsdio: fix use after free bug in btsdio_remove due to unfinished work"
Ziyang Xuan <[email protected]>
ipv4: Fix potential uninit variable access bug in __ip_make_skb()
Florian Westphal <[email protected]>
netfilter: nf_tables: don't write table validation state without mutex
Joe Damato <[email protected]>
ixgbe: Enable setting RSS table to default values
Joe Damato <[email protected]>
ixgbe: Allow flow hash to be set via ethtool
Johannes Berg <[email protected]>
wifi: iwlwifi: mvm: check firmware response size
Emmanuel Grumbach <[email protected]>
wifi: iwlwifi: make the loop for card preparation effective
Yu Kuai <[email protected]>
md/raid10: fix memleak of md thread
Christoph Hellwig <[email protected]>
md: update the optimal I/O size on reshape
Yu Kuai <[email protected]>
md/raid10: fix memleak for 'conf->bio_split'
Yu Kuai <[email protected]>
md/raid10: fix leak of 'r10bio->remaining' for recovery
Herbert Xu <[email protected]>
crypto: drbg - Only fail when jent is unavailable in FIPS mode
Nicolai Stange <[email protected]>
crypto: drbg - make drbg_prepare_hrng() handle jent instantiation errors
Quentin Monnet <[email protected]>
bpftool: Fix bug for long instructions in program CFG dumps
Wei Chen <[email protected]>
wifi: rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_reg()
Wei Chen <[email protected]>
wifi: rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_rfreg()
Larry Finger <[email protected]>
rtlwifi: Replace RT_TRACE with rtl_dbg
Larry Finger <[email protected]>
rtlwifi: Start changing RT_TRACE into rtl_dbg
Larry Finger <[email protected]>
rtlwifi: rtl_pci: Fix memory leak when hardware init fails
Danila Chernetsov <[email protected]>
scsi: megaraid: Fix mega_cmd_done() CMDID_INT_CMDS
Mike Christie <[email protected]>
scsi: target: iscsit: Fix TAS handling during conn cleanup
Eric Dumazet <[email protected]>
net/packet: convert po->auxdata to an atomic flag
Eric Dumazet <[email protected]>
net/packet: convert po->origdev to an atomic flag
Vadim Fedorenko <[email protected]>
vlan: partially enable SIOCSHWTSTAMP in container
Alexander Mikhalitsyn <[email protected]>
scm: fix MSG_CTRUNC setting condition for SO_PASSSEC
Luis Gerhorst <[email protected]>
tools: bpftool: Remove invalid \' json escape
Fedor Pchelkin <[email protected]>
wifi: ath6kl: reduce WARN to dev_dbg() in callback
Dan Carpenter <[email protected]>
wifi: ath5k: fix an off by one check in ath5k_eeprom_read_freq_list()
Fedor Pchelkin <[email protected]>
wifi: ath9k: hif_usb: fix memory leak of remain_skbs
Alexey V. Vissarionov <[email protected]>
wifi: ath6kl: minor fix for allocation size
Thomas Gleixner <[email protected]>
debugobject: Prevent init race with static objects
Waiman Long <[email protected]>
debugobjects: Move printk out of db->lock critical sections
Waiman Long <[email protected]>
debugobjects: Add percpu free pools
Sumit Garg <[email protected]>
arm64: kgdb: Set PSTATE.SS to 1 to re-enable single-step
Saurabh Sengar <[email protected]>
x86/ioapic: Don't return 0 from arch_dynirq_lower_bound()
Florian Fainelli <[email protected]>
media: rc: gpio-ir-recv: Fix support for wake-up
Miaoqian Lin <[email protected]>
media: rcar_fdp1: Fix refcount leak in probe and remove function
Tang Bin <[email protected]>
media: rcar_fdp1: Fix the correct variable assignments
Zheng Wang <[email protected]>
media: saa7134: fix use after free bug in saa7134_finidev due to race condition
Zheng Wang <[email protected]>
media: dm1105: Fix use after free bug in dm1105_remove due to race condition
Uros Bizjak <[email protected]>
x86/apic: Fix atomic update of offset in reserve_eilvt_offset()
Johan Hovold <[email protected]>
drm/msm/adreno: drop bogus pm_runtime_set_active()
Rob Clark <[email protected]>
drm/msm/adreno: Defer enabling runpm until hw_init()
Mukesh Ojha <[email protected]>
firmware: qcom_scm: Clear download bit during reboot
Dan Carpenter <[email protected]>
media: av7110: prevent underflow in write_ts_to_decoder()
Dafna Hirschfeld <[email protected]>
media: uapi: add MEDIA_BUS_FMT_METADATA_FIXED media bus format.
Jiasheng Jiang <[email protected]>
media: bdisp: Add missing check for create_workqueue
Manivannan Sadhasivam <[email protected]>
ARM: dts: qcom: ipq4019: Fix the PCI I/O port range
Qiuxu Zhuo <[email protected]>
EDAC/skx: Fix overflows on the DRAM row address mapping arrays
Qiuxu Zhuo <[email protected]>
EDAC, skx: Move debugfs node under EDAC's hierarchy
Dom Cobley <[email protected]>
drm/probe-helper: Cancel previous job before starting new one
Maíra Canal <[email protected]>
drm/vgem: add missing mutex_destroy
Rob Clark <[email protected]>
drm/rockchip: Drop unbalanced obj unref
Paul Moore <[email protected]>
selinux: ensure av_permissions.h is built when needed
Ondrej Mosnacek <[email protected]>
selinux: fix Makefile dependencies of flask.h
Mårten Lindahl <[email protected]>
ubifs: Free memory for tmpfile name
Wang YanQing <[email protected]>
ubi: Fix return value overwrite issue in try_write_vid_and_data()
Zhihao Cheng <[email protected]>
ubifs: Fix memleak when insert_old_idx() failed
Zhihao Cheng <[email protected]>
Revert "ubifs: dirty_cow_znode: Fix memleak in error handling path"
Reid Tonking <[email protected]>
i2c: omap: Fix standard mode false ACK readings
Sean Christopherson <[email protected]>
KVM: nVMX: Emulate NOPs in L2, and PAUSE if it's not intercepted
Roberto Sassu <[email protected]>
reiserfs: Add security prefix to xattr name in reiserfs_security_write()
Johannes Berg <[email protected]>
ring-buffer: Sync IRQ works before buffer destruction
Heiner Kallweit <[email protected]>
pwm: meson: Fix axg ao mux parents
Jiaxun Yang <[email protected]>
MIPS: fw: Allow firmware to pass a empty env
Johan Hovold <[email protected]>
xhci: fix debugfs register accesses while suspended
Geert Uytterhoeven <[email protected]>
debugfs: regset32: Add Runtime PM support
Nuno Sá <[email protected]>
staging: iio: resolver: ads1210: fix config mode
Arnaldo Carvalho de Melo <[email protected]>
perf sched: Cast PTHREAD_STACK_MIN to int as it may turn into sysconf(__SC_THREAD_STACK_MIN_VALUE)
Johan Hovold <[email protected]>
USB: dwc3: fix runtime pm imbalance on unbind
Randy Dunlap <[email protected]>
IMA: allow/fix UML builds
Jiping Ma <[email protected]>
stmmac: debugfs entry name is not be changed when udev rename device name.
Hans de Goede <[email protected]>
ASoC: Intel: bytcr_rt5640: Add quirk for the Acer Iconia One 7 B1-750
Patrik Dahlström <[email protected]>
iio: adc: palmas_gpadc: fix NULL dereference on rmmod
Arınç ÜNAL <[email protected]>
USB: serial: option: add UNISOC vendor and TOZED LT70C product
Ruihan Li <[email protected]>
bluetooth: Perform careful capability checks in hci_sock_ioctl()
Jisoo Jang <[email protected]>
wifi: brcmfmac: slab-out-of-bounds read in brcmf_get_assoc_ies()
-------------
Diffstat:
Documentation/media/uapi/v4l/subdev-formats.rst | 27 ++ Makefile | 4 +- arch/arm/boot/dts/exynos4412-itop-elite.dts | 2 +- arch/arm/boot/dts/qcom-ipq4019.dtsi | 4 +- arch/arm/boot/dts/s5pv210.dtsi | 2 +- arch/arm64/include/asm/debug-monitors.h | 1 + arch/arm64/kernel/debug-monitors.c | 5 + arch/arm64/kernel/kgdb.c | 2 + arch/ia64/kernel/salinfo.c | 2 +- arch/ia64/mm/contig.c | 2 +- arch/mips/fw/lib/cmdline.c | 2 +- arch/openrisc/kernel/entry.S | 6 +- arch/parisc/kernel/real2.S | 5 +- arch/powerpc/kernel/rtas.c | 2 +- arch/powerpc/platforms/512x/clock-commonclk.c | 2 +- arch/powerpc/platforms/embedded6xx/flipper-pic.c | 2 +- arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 2 +- arch/powerpc/platforms/embedded6xx/wii.c | 4 +- arch/powerpc/sysdev/tsi108_pci.c | 5 +- arch/sh/kernel/cpu/sh4/sq.c | 2 +- arch/sh/kernel/head_32.S | 6 +- arch/sh/kernel/nmi_debug.c | 4 +- arch/sh/kernel/setup.c | 4 +- arch/sh/math-emu/sfp-util.h | 4 - arch/x86/kernel/apic/apic.c | 5 +- arch/x86/kernel/apic/io_apic.c | 14 +- arch/x86/kvm/vmx/vmx.c | 15 ++ crypto/drbg.c | 16 +- drivers/base/cpu.c | 3 +- drivers/block/drbd/drbd_receiver.c | 2 +- drivers/bluetooth/btsdio.c | 1 - drivers/char/ipmi/ipmi_msghandler.c | 119 +++++--- drivers/char/ipmi/ipmi_si_intf.c | 5 +- drivers/char/ipmi/ipmi_ssif.c | 118 +++++--- drivers/clk/clk-conf.c | 12 +- drivers/clk/rockchip/clk-rk3399.c | 2 +- drivers/dma/at_xdmac.c | 5 +- drivers/edac/skx_edac.c | 29 +- drivers/firmware/qcom_scm.c | 3 +- drivers/fpga/fpga-bridge.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 7 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 17 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 40 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 47 +++- drivers/gpu/drm/drm_probe_helper.c | 5 +- drivers/gpu/drm/msm/adreno/adreno_device.c | 7 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 1 - drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 3 - drivers/gpu/drm/vgem/vgem_fence.c | 1 + drivers/hid/wacom_wac.c | 12 +- drivers/i2c/busses/i2c-omap.c | 2 +- drivers/iio/adc/palmas_gpadc.c | 2 +- drivers/infiniband/hw/hfi1/mmu_rb.c | 13 +- drivers/infiniband/hw/mlx4/qp.c | 8 +- drivers/infiniband/hw/mlx5/qp.c | 2 +- drivers/infiniband/sw/rdmavt/qp.c | 2 - drivers/macintosh/Kconfig | 1 + drivers/macintosh/windfarm_smu_sat.c | 1 + drivers/md/dm-flakey.c | 4 +- drivers/md/dm-integrity.c | 8 +- drivers/md/dm-ioctl.c | 7 +- drivers/md/dm-verity-target.c | 17 +- drivers/md/raid10.c | 96 +++---- drivers/md/raid5.c | 10 +- drivers/media/pci/dm1105/dm1105.c | 1 + drivers/media/pci/saa7134/saa7134-ts.c | 1 + drivers/media/pci/saa7134/saa7134-vbi.c | 1 + drivers/media/pci/saa7134/saa7134-video.c | 1 + drivers/media/pci/ttpci/av7110_av.c | 4 +- drivers/media/platform/rcar_fdp1.c | 18 +- drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 2 + drivers/media/rc/gpio-ir-recv.c | 2 + drivers/misc/vmw_vmci/vmci_host.c | 8 +- drivers/mtd/spi-nor/cadence-quadspi.c | 72 +++-- drivers/mtd/ubi/eba.c | 19 +- drivers/net/dsa/mv88e6xxx/chip.c | 3 + drivers/net/ethernet/amd/nmclan_cs.c | 2 +- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 1 - drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 23 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 32 +++ drivers/net/virtio_net.c | 43 +-- drivers/net/wireless/ath/ath5k/eeprom.c | 2 +- drivers/net/wireless/ath/ath6kl/bmi.c | 2 +- drivers/net/wireless/ath/ath6kl/htc_pipe.c | 4 +- drivers/net/wireless/ath/ath9k/hif_usb.c | 19 ++ .../broadcom/brcm80211/brcmfmac/cfg80211.c | 5 + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 10 + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 3 +- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 1 + drivers/net/wireless/realtek/rtlwifi/base.c | 144 +++++----- drivers/net/wireless/realtek/rtlwifi/cam.c | 82 +++--- drivers/net/wireless/realtek/rtlwifi/core.c | 259 +++++++++--------- drivers/net/wireless/realtek/rtlwifi/debug.c | 16 +- drivers/net/wireless/realtek/rtlwifi/debug.h | 11 + drivers/net/wireless/realtek/rtlwifi/efuse.c | 72 ++--- drivers/net/wireless/realtek/rtlwifi/pci.c | 284 +++++++++---------- drivers/net/wireless/realtek/rtlwifi/ps.c | 98 +++---- drivers/net/wireless/realtek/rtlwifi/regd.c | 18 +- drivers/net/wireless/realtek/rtlwifi/usb.c | 18 +- drivers/of/device.c | 7 +- drivers/pci/hotplug/pciehp.h | 3 + drivers/pci/hotplug/pciehp_core.c | 2 +- drivers/pci/hotplug/pciehp_hpc.c | 19 +- drivers/pci/hotplug/pciehp_pci.c | 15 ++ drivers/phy/tegra/xusb.c | 2 + drivers/platform/x86/touchscreen_dmi.c | 24 ++ drivers/power/supply/generic-adc-battery.c | 3 + drivers/pwm/pwm-meson.c | 2 +- drivers/pwm/pwm-mtk-disp.c | 98 ++++--- drivers/s390/block/dasd.c | 2 +- drivers/scsi/megaraid.c | 1 + drivers/spi/spi-fsl-spi.c | 12 +- drivers/spi/spi-qup.c | 20 +- drivers/spmi/spmi.c | 3 +- drivers/staging/iio/resolver/ad2s1210.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 + drivers/target/iscsi/iscsi_target.c | 16 +- drivers/tty/serial/8250/8250.h | 12 + drivers/tty/serial/8250/8250_port.c | 16 +- drivers/tty/serial/fsl_lpuart.c | 2 +- drivers/tty/tty_io.c | 4 +- drivers/tty/tty_ioctl.c | 47 +++- drivers/usb/chipidea/core.c | 2 +- drivers/usb/dwc3/core.c | 1 + drivers/usb/gadget/udc/renesas_usb3.c | 1 + drivers/usb/host/xhci-debugfs.c | 1 + drivers/usb/host/xhci-rcar.c | 3 - drivers/usb/serial/option.c | 6 + fs/btrfs/ctree.c | 32 ++- fs/btrfs/ioctl.c | 5 + fs/btrfs/print-tree.c | 6 +- fs/cifs/smb2ops.c | 2 +- fs/debugfs/file.c | 8 + fs/ext4/balloc.c | 25 ++ fs/ext4/inline.c | 14 +- fs/ext4/mballoc.c | 6 +- fs/ext4/super.c | 19 +- fs/ext4/xattr.c | 5 +- fs/fs-writeback.c | 2 +- fs/nfs/nfs4state.c | 4 + fs/nilfs2/bmap.c | 16 +- fs/nilfs2/segment.c | 5 +- fs/pstore/pmsg.c | 7 +- fs/reiserfs/xattr_security.c | 8 +- fs/ubifs/dir.c | 1 + fs/ubifs/tnc.c | 144 ++++++---- include/linux/debugfs.h | 1 + include/linux/ipmi_smi.h | 36 ++- include/linux/netfilter/nfnetlink.h | 1 - include/linux/printk.h | 19 ++ include/linux/sunrpc/sched.h | 3 +- include/linux/tick.h | 9 +- include/linux/tty.h | 2 + include/linux/vt_buffer.h | 2 +- include/net/netfilter/nf_tables.h | 1 + include/net/scm.h | 13 +- include/trace/events/timer.h | 3 +- include/uapi/drm/amdgpu_drm.h | 3 +- include/uapi/linux/btrfs.h | 1 + include/uapi/linux/const.h | 2 +- include/uapi/linux/media-bus-format.h | 8 + kernel/events/core.c | 4 +- kernel/relay.c | 18 +- kernel/time/tick-sched.c | 18 +- kernel/trace/ring_buffer.c | 4 + lib/debugobjects.c | 300 ++++++++++++++------- mm/page_alloc.c | 16 ++ net/8021q/vlan_dev.c | 2 +- net/bluetooth/hci_sock.c | 9 +- net/core/skbuff.c | 3 + net/ipv4/ip_output.c | 16 +- net/ipv6/sit.c | 8 +- net/netfilter/nf_tables_api.c | 20 +- net/netfilter/nfnetlink.c | 2 - net/netfilter/nft_dynset.c | 2 +- net/netfilter/nft_lookup.c | 2 +- net/netfilter/nft_objref.c | 2 +- net/netlink/af_netlink.c | 67 ++--- net/packet/af_packet.c | 20 +- net/packet/diag.c | 4 +- net/packet/internal.h | 26 +- net/rxrpc/sendmsg.c | 2 +- net/sched/act_mirred.c | 2 +- net/sunrpc/clnt.c | 3 - net/sunrpc/sched.c | 1 - security/integrity/ima/Kconfig | 2 +- security/selinux/Makefile | 4 +- sound/soc/intel/boards/bytcr_rt5640.c | 12 + sound/usb/caiaq/input.c | 1 + tools/bpf/bpftool/json_writer.c | 3 - tools/bpf/bpftool/xlated_dumper.c | 7 + tools/perf/builtin-sched.c | 2 +- .../perf/pmu-events/arch/powerpc/power9/other.json | 4 +- .../pmu-events/arch/powerpc/power9/pipeline.json | 2 +- tools/perf/util/auxtrace.c | 5 +- tools/perf/util/sort.c | 3 +- tools/perf/util/symbol-elf.c | 2 +- 198 files changed, 2146 insertions(+), 1240 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/191 wifi: brcmfmac: slab-out-of-bounds read in brcmf_get_assoc_ies()
From: Jisoo Jang <[email protected]>
commit 0da40e018fd034d87c9460123fa7f897b69fdee7 upstream.
Fix a slab-out-of-bounds read that occurs in kmemdup() called from brcmf_get_assoc_ies().
The bug could occur when assoc_info->req_len, data from a URB provided by a USB device, is bigger than the size of buffer which is defined as WL_EXTRA_BUF_MAX.
Add the size check for req_len/resp_len of assoc_info.
Found by a modified version of syzkaller.
[ 46.592467][ T7] ================================================================== [ 46.594687][ T7] BUG: KASAN: slab-out-of-bounds in kmemdup+0x3e/0x50 [ 46.596572][ T7] Read of size 3014656 at addr ffff888019442000 by task kworker/0:1/7 [ 46.598575][ T7] [ 46.599157][ T7] CPU: 0 PID: 7 Comm: kworker/0:1 Tainted: G O 5.14.0+ #145 [ 46.601333][ T7] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.1-0-ga5cab58e9a3f-prebuilt.qemu.org 04/01/2014 [ 46.604360][ T7] Workqueue: events brcmf_fweh_event_worker [ 46.605943][ T7] Call Trace: [ 46.606584][ T7] dump_stack_lvl+0x8e/0xd1 [ 46.607446][ T7] print_address_description.constprop.0.cold+0x93/0x334 [ 46.608610][ T7] ? kmemdup+0x3e/0x50 [ 46.609341][ T7] kasan_report.cold+0x79/0xd5 [ 46.610151][ T7] ? kmemdup+0x3e/0x50 [ 46.610796][ T7] kasan_check_range+0x14e/0x1b0 [ 46.611691][ T7] memcpy+0x20/0x60 [ 46.612323][ T7] kmemdup+0x3e/0x50 [ 46.612987][ T7] brcmf_get_assoc_ies+0x967/0xf60 [ 46.613904][ T7] ? brcmf_notify_vif_event+0x3d0/0x3d0 [ 46.614831][ T7] ? lock_chain_count+0x20/0x20 [ 46.615683][ T7] ? mark_lock.part.0+0xfc/0x2770 [ 46.616552][ T7] ? lock_chain_count+0x20/0x20 [ 46.617409][ T7] ? mark_lock.part.0+0xfc/0x2770 [ 46.618244][ T7] ? lock_chain_count+0x20/0x20 [ 46.619024][ T7] brcmf_bss_connect_done.constprop.0+0x241/0x2e0 [ 46.620019][ T7] ? brcmf_parse_configure_security.isra.0+0x2a0/0x2a0 [ 46.620818][ T7] ? __lock_acquire+0x181f/0x5790 [ 46.621462][ T7] brcmf_notify_connect_status+0x448/0x1950 [ 46.622134][ T7] ? rcu_read_lock_bh_held+0xb0/0xb0 [ 46.622736][ T7] ? brcmf_cfg80211_join_ibss+0x7b0/0x7b0 [ 46.623390][ T7] ? find_held_lock+0x2d/0x110 [ 46.623962][ T7] ? brcmf_fweh_event_worker+0x19f/0xc60 [ 46.624603][ T7] ? mark_held_locks+0x9f/0xe0 [ 46.625145][ T7] ? lockdep_hardirqs_on_prepare+0x3e0/0x3e0 [ 46.625871][ T7] ? brcmf_cfg80211_join_ibss+0x7b0/0x7b0 [ 46.626545][ T7] brcmf_fweh_call_event_handler.isra.0+0x90/0x100 [ 46.627338][ T7] brcmf_fweh_event_worker+0x557/0xc60 [ 46.627962][ T7] ? brcmf_fweh_call_event_handler.isra.0+0x100/0x100 [ 46.628736][ T7] ? rcu_read_lock_sched_held+0xa1/0xd0 [ 46.629396][ T7] ? rcu_read_lock_bh_held+0xb0/0xb0 [ 46.629970][ T7] ? lockdep_hardirqs_on_prepare+0x273/0x3e0 [ 46.630649][ T7] process_one_work+0x92b/0x1460 [ 46.631205][ T7] ? pwq_dec_nr_in_flight+0x330/0x330 [ 46.631821][ T7] ? rwlock_bug.part.0+0x90/0x90 [ 46.632347][ T7] worker_thread+0x95/0xe00 [ 46.632832][ T7] ? __kthread_parkme+0x115/0x1e0 [ 46.633393][ T7] ? process_one_work+0x1460/0x1460 [ 46.633957][ T7] kthread+0x3a1/0x480 [ 46.634369][ T7] ? set_kthread_struct+0x120/0x120 [ 46.634933][ T7] ret_from_fork+0x1f/0x30 [ 46.635431][ T7] [ 46.635687][ T7] Allocated by task 7: [ 46.636151][ T7] kasan_save_stack+0x1b/0x40 [ 46.636628][ T7] __kasan_kmalloc+0x7c/0x90 [ 46.637108][ T7] kmem_cache_alloc_trace+0x19e/0x330 [ 46.637696][ T7] brcmf_cfg80211_attach+0x4a0/0x4040 [ 46.638275][ T7] brcmf_attach+0x389/0xd40 [ 46.638739][ T7] brcmf_usb_probe+0x12de/0x1690 [ 46.639279][ T7] usb_probe_interface+0x2aa/0x760 [ 46.639820][ T7] really_probe+0x205/0xb70 [ 46.640342][ T7] __driver_probe_device+0x311/0x4b0 [ 46.640876][ T7] driver_probe_device+0x4e/0x150 [ 46.641445][ T7] __device_attach_driver+0x1cc/0x2a0 [ 46.642000][ T7] bus_for_each_drv+0x156/0x1d0 [ 46.642543][ T7] __device_attach+0x23f/0x3a0 [ 46.643065][ T7] bus_probe_device+0x1da/0x290 [ 46.643644][ T7] device_add+0xb7b/0x1eb0 [ 46.644130][ T7] usb_set_configuration+0xf59/0x16f0 [ 46.644720][ T7] usb_generic_driver_probe+0x82/0xa0 [ 46.645295][ T7] usb_probe_device+0xbb/0x250 [ 46.645786][ T7] really_probe+0x205/0xb70 [ 46.646258][ T7] __driver_probe_device+0x311/0x4b0 [ 46.646804][ T7] driver_probe_device+0x4e/0x150 [ 46.647387][ T7] __device_attach_driver+0x1cc/0x2a0 [ 46.647926][ T7] bus_for_each_drv+0x156/0x1d0 [ 46.648454][ T7] __device_attach+0x23f/0x3a0 [ 46.648939][ T7] bus_probe_device+0x1da/0x290 [ 46.649478][ T7] device_add+0xb7b/0x1eb0 [ 46.649936][ T7] usb_new_device.cold+0x49c/0x1029 [ 46.650526][ T7] hub_event+0x1c98/0x3950 [ 46.650975][ T7] process_one_work+0x92b/0x1460 [ 46.651535][ T7] worker_thread+0x95/0xe00 [ 46.651991][ T7] kthread+0x3a1/0x480 [ 46.652413][ T7] ret_from_fork+0x1f/0x30 [ 46.652885][ T7] [ 46.653131][ T7] The buggy address belongs to the object at ffff888019442000 [ 46.653131][ T7] which belongs to the cache kmalloc-2k of size 2048 [ 46.654669][ T7] The buggy address is located 0 bytes inside of [ 46.654669][ T7] 2048-byte region [ffff888019442000, ffff888019442800) [ 46.656137][ T7] The buggy address belongs to the page: [ 46.656720][ T7] page:ffffea0000651000 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x19440 [ 46.657792][ T7] head:ffffea0000651000 order:3 compound_mapcount:0 compound_pincount:0 [ 46.658673][ T7] flags: 0x100000000010200(slab|head|node=0|zone=1) [ 46.659422][ T7] raw: 0100000000010200 0000000000000000 dead000000000122 ffff888100042000 [ 46.660363][ T7] raw: 0000000000000000 0000000000080008 00000001ffffffff 0000000000000000 [ 46.661236][ T7] page dumped because: kasan: bad access detected [ 46.661956][ T7] page_owner tracks the page as allocated [ 46.662588][ T7] page last allocated via order 3, migratetype Unmovable, gfp_mask 0x52a20(GFP_ATOMIC|__GFP_NOWARN|__GFP_NORETRY|__GFP_COMP), pid 7, ts 31136961085, free_ts 0 [ 46.664271][ T7] prep_new_page+0x1aa/0x240 [ 46.664763][ T7] get_page_from_freelist+0x159a/0x27c0 [ 46.665340][ T7] __alloc_pages+0x2da/0x6a0 [ 46.665847][ T7] alloc_pages+0xec/0x1e0 [ 46.666308][ T7] allocate_slab+0x380/0x4e0 [ 46.666770][ T7] ___slab_alloc+0x5bc/0x940 [ 46.667264][ T7] __slab_alloc+0x6d/0x80 [ 46.667712][ T7] kmem_cache_alloc_trace+0x30a/0x330 [ 46.668299][ T7] brcmf_usbdev_qinit.constprop.0+0x50/0x470 [ 46.668885][ T7] brcmf_usb_probe+0xc97/0x1690 [ 46.669438][ T7] usb_probe_interface+0x2aa/0x760 [ 46.669988][ T7] really_probe+0x205/0xb70 [ 46.670487][ T7] __driver_probe_device+0x311/0x4b0 [ 46.671031][ T7] driver_probe_device+0x4e/0x150 [ 46.671604][ T7] __device_attach_driver+0x1cc/0x2a0 [ 46.672192][ T7] bus_for_each_drv+0x156/0x1d0 [ 46.672739][ T7] page_owner free stack trace missing [ 46.673335][ T7] [ 46.673620][ T7] Memory state around the buggy address: [ 46.674213][ T7] ffff888019442700: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 46.675083][ T7] ffff888019442780: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 46.675994][ T7] >ffff888019442800: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [ 46.676875][ T7] ^ [ 46.677323][ T7] ffff888019442880: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [ 46.678190][ T7] ffff888019442900: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc [ 46.679052][ T7] ================================================================== [ 46.679945][ T7] Disabling lock debugging due to kernel taint [ 46.680725][ T7] Kernel panic - not syncing:
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +5 -0
@@ -5362,6 +5362,11 @@ static s32 brcmf_get_assoc_ies(struct br (struct brcmf_cfg80211_assoc_ielen_le *)cfg->extra_buf; req_len =le32_to_cpu (assoc_info->req_len); resp_len =le32_to_cpu (assoc_info->resp_len); +if (req_len >WL_EXTRA_BUF_MAX || resp_len >WL_EXTRA_BUF_MAX ) { +brcmf_err ("invalid lengths in assoc info: req %u resp %u\n" , + req_len, resp_len); +return -EINVAL ; + }if (req_len) { err = brcmf_fil_iovar_data_get(ifp, "assoc_req_ies", cfg->extra_buf,
Greg Kroah-Hartman
maintainerPATCH 2/191 bluetooth: Perform careful capability checks in hci_sock_ioctl()
In reply to Greg Kroah-HartmanFrom: Ruihan Li <[email protected]>
commit 25c150ac103a4ebeed0319994c742a90634ddf18 upstream.
Previously, capability was checked using capable(), which verified that the caller of the ioctl system call had the required capability. In addition, the result of the check would be stored in the HCI_SOCK_TRUSTED flag, making it persistent for the socket.
However, malicious programs can abuse this approach by deliberately sharing an HCI socket with a privileged task. The HCI socket will be marked as trusted when the privileged task occasionally makes an ioctl call.
This problem can be solved by using sk_capable() to check capability, which ensures that not only the current task but also the socket opener has the specified capability, thus reducing the risk of privilege escalation through the previously identified vulnerability.
--- net/bluetooth/hci_sock.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
net/bluetooth/hci_sock.c +8 -1
@@ -989,7 +989,14 @@ static int hci_sock_ioctl(struct socketif (hci_sock_gen_cookie (sk)) {struct sk_buff *skb; -if (capable (CAP_NET_ADMIN )) +/* Perform careful checks before setting the HCI_SOCK_TRUSTED +* flag. Make sure that not only the current task but also +* the socket opener has the required capability, since +* privileged programs can be tricked into making ioctl calls +* on HCI sockets, and the socket should not be marked as +* trusted simply because the ioctl caller is privileged. +*/ +if (sk_capable (sk,CAP_NET_ADMIN ))hci_sock_set_flag (sk,HCI_SOCK_TRUSTED );/* Send event to monitor */
Greg Kroah-Hartman
maintainerPATCH 3/191 USB: serial: option: add UNISOC vendor and TOZED LT70C product
In reply to Greg Kroah-HartmanFrom: Arınç ÜNAL <[email protected]>
commit a095edfc15f0832e046ae23964e249ef5c95af87 upstream.
Add UNISOC vendor ID and TOZED LT70-C modem which is based from UNISOC SL8563. The modem supports the NCM mode. Interface 0 is used for running the AT commands. Interface 12 is the ADB interface.
T: Bus=01 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 6 Spd=480 MxCh= 0 D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=1782 ProdID=4055 Rev=04.04 S: Manufacturer=Unisoc Phone S: Product=Unisoc Phone S: SerialNumber=<redacted> C: #Ifs=14 Cfg#= 1 Atr=c0 MxPwr=500mA I: If#= 0 Alt= 0 #EPs= 1 Cls=02(commc) Sub=0d Prot=00 Driver=cdc_ncm E: Ad=82(I) Atr=03(Int.) MxPS= 16 Ivl=32ms I: If#= 1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=01 Driver=cdc_ncm E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I: If#=10 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=8b(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I: If#=11 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=8c(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I: If#=12 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none) E: Ad=09(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=8d(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I: If#=13 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=0a(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=8e(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I: If#= 2 Alt= 0 #EPs= 1 Cls=02(commc) Sub=0d Prot=00 Driver=cdc_ncm E: Ad=84(I) Atr=03(Int.) MxPS= 16 Ivl=32ms I: If#= 3 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=01 Driver=cdc_ncm E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I: If#= 4 Alt= 0 #EPs= 1 Cls=02(commc) Sub=0d Prot=00 Driver=cdc_ncm E: Ad=86(I) Atr=03(Int.) MxPS= 16 Ivl=32ms I: If#= 5 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=01 Driver=cdc_ncm E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I: If#= 6 Alt= 0 #EPs= 1 Cls=02(commc) Sub=0d Prot=00 Driver=cdc_ncm E: Ad=88(I) Atr=03(Int.) MxPS= 16 Ivl=32ms I: If#= 7 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=01 Driver=cdc_ncm E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I: If#= 8 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=89(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I: If#= 9 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=8a(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
--- drivers/usb/serial/option.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/usb/serial/option.c +6 -0
@@ -595,6 +595,11 @@ static void option_instat_callback(struc#define SIERRA_VENDOR_ID 0x1199#define SIERRA_PRODUCT_EM9191 0x90d3 +/* UNISOC (Spreadtrum) products */ +#define UNISOC_VENDOR_ID 0x1782 +/* TOZED LT70-C based on UNISOC SL8563 uses UNISOC's vendor ID */ +#define TOZED_PRODUCT_LT70C 0x4055 +/* Device flags */ /* Highest interface number which can be used with NCTRL() and RSVD() */
@@ -2225,6 +2230,7 @@ static const struct usb_device_id option { USB_DEVICE_AND_INTERFACE_INFO(OPPO_VENDOR_ID, OPPO_PRODUCT_R11, 0xff, 0xff, 0x30) }, { USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9191, 0xff, 0xff, 0x30) }, { 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) }, { } /* Terminating entry */ };MODULE_DEVICE_TABLE (usb, option_ids);
Greg Kroah-Hartman
maintainerPATCH 4/191 iio: adc: palmas_gpadc: fix NULL dereference on rmmod
In reply to Greg Kroah-HartmanFrom: Patrik Dahlström <[email protected]>
[ Upstream commit 49f76c499d38bf67803438eee88c8300d0f6ce09 ]
Calling dev_to_iio_dev() on a platform device pointer is undefined and will make adc NULL.
--- drivers/iio/adc/palmas_gpadc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/palmas_gpadc.c +1 -1
@@ -633,7 +633,7 @@ static int palmas_gpadc_probe(struct platform_device *pdev)static int palmas_gpadc_remove (struct platform_device *pdev) { -struct iio_dev *indio_dev =dev_to_iio_dev (&pdev->dev); +struct iio_dev *indio_dev =dev_get_drvdata (&pdev->dev);struct palmas_gpadc *adc =iio_priv (indio_dev);if (adc->wakeup1_enable || adc->wakeup2_enable)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 5/191 ASoC: Intel: bytcr_rt5640: Add quirk for the Acer Iconia One 7 B1-750
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit e38c5e80c3d293a883c6f1d553f2146ec0bda35e ]
The Acer Iconia One 7 B1-750 tablet mostly works fine with the defaults for an Bay Trail CR tablet. Except for the internal mic, instead of an analog mic on IN3 a digital mic on DMIC1 is uses.
Add a quirk with these settings for this tablet.
--- sound/soc/intel/boards/bytcr_rt5640.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
sound/soc/intel/boards/bytcr_rt5640.c +12 -0
@@ -400,6 +400,18 @@ static int byt_rt5640_aif1_hw_params(str/* Please keep this list alphabetically sorted */ static const struct dmi_system_id byt_rt5640_quirk_table[] = { + {/* Acer Iconia One 7 B1-750 */ + .matches = { +DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"Insyde" ), +DMI_EXACT_MATCH (DMI_PRODUCT_NAME ,"VESPA2" ), + }, + .driver_data = (void *)(BYT_RT5640_DMIC1_MAP | +BYT_RT5640_JD_SRC_JD1_IN4P | +BYT_RT5640_OVCD_TH_1500UA | +BYT_RT5640_OVCD_SF_0P75 | +BYT_RT5640_SSP0_AIF1 | +BYT_RT5640_MCLK_EN ), + }, {/* Acer Iconia Tab 8 W1-810 */ .matches = {DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"Acer" ),
Greg Kroah-Hartman
maintainerPATCH 6/191 stmmac: debugfs entry name is not be changed when udev rename device name.
In reply to Greg Kroah-HartmanFrom: Jiping Ma <[email protected]>
commit 481a7d154cbbd5ca355cc01cc8969876b240eded upstream.
Add one notifier for udev changes net device name.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +32 -0
@@ -114,6 +114,7 @@ MODULE_PARM_DESC(chain_mode, "To use chastatic irqreturn_t stmmac_interrupt (int irq,void *dev_id);#ifdef CONFIG_DEBUG_FS +static const struct net_device_ops stmmac_netdev_ops;static int stmmac_init_fs (struct net_device *dev);static void stmmac_exit_fs (struct net_device *dev);#endif
@@ -4034,6 +4035,34 @@ static const struct file_operations stmm .release = single_release, }; +/* Use network device events to rename debugfs file entries. +*/ +static int stmmac_device_event (struct notifier_block *unused, +unsigned long event,void *ptr) +{ +struct net_device *dev =netdev_notifier_info_to_dev (ptr); +struct stmmac_priv *priv =netdev_priv (dev); + +if (dev->netdev_ops != &stmmac_netdev_ops) + goto done; + +switch (event) { +case NETDEV_CHANGENAME : +if (priv->dbgfs_dir) + priv->dbgfs_dir =debugfs_rename (stmmac_fs_dir, + priv->dbgfs_dir, + stmmac_fs_dir, + dev->name); +break ; + } +done: +return NOTIFY_DONE ; +} + +static struct notifier_block stmmac_notifier = { + .notifier_call = stmmac_device_event, +}; +static int stmmac_init_fs (struct net_device *dev) {struct stmmac_priv *priv =netdev_priv (dev);
@@ -4072,6 +4101,8 @@ static int stmmac_init_fs(struct net_devreturn -ENOMEM ; } +register_netdevice_notifier (&stmmac_notifier); +return 0 ; }
@@ -4079,6 +4110,7 @@ static void stmmac_exit_fs(struct net_de {struct stmmac_priv *priv =netdev_priv (dev); +unregister_netdevice_notifier (&stmmac_notifier);debugfs_remove_recursive (priv->dbgfs_dir); }#endif /* CONFIG_DEBUG_FS */
Greg Kroah-Hartman
maintainerPATCH 7/191 IMA: allow/fix UML builds
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
commit 644f17412f5acf01a19af9d04a921937a2bc86c6 upstream.
UML supports HAS_IOMEM since 0bbadafdc49d (um: allow disabling NO_IOMEM).
Current IMA build on UML fails on allmodconfig (with TCG_TPM=m):
ld: security/integrity/ima/ima_queue.o: in function `ima_add_template_entry':
ima_queue.c:(.text+0x2d9): undefined reference to `tpm_pcr_extend'
ld: security/integrity/ima/ima_init.o: in function `ima_init':
ima_init.c:(.init.text+0x43f): undefined reference to `tpm_default_chip'
ld: security/integrity/ima/ima_crypto.o: in function `ima_calc_boot_aggregate_tfm':
ima_crypto.c:(.text+0x1044): undefined reference to `tpm_pcr_read'
ld: ima_crypto.c:(.text+0x10d8): undefined reference to `tpm_pcr_read'
Modify the IMA Kconfig entry so that it selects TCG_TPM if HAS_IOMEM is set, regardless of the UML Kconfig setting.
This updates TCG_TPM from =m to =y and fixes the linker errors.
--- security/integrity/ima/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/integrity/ima/Kconfig +1 -1
@@ -7,7 +7,7 @@ config IMA select CRYPTO_HMAC select CRYPTO_SHA1 select CRYPTO_HASH_INFO - select TCG_TPM if HAS_IOMEM && !UML + select TCG_TPM if HAS_IOMEM select TCG_TIS if TCG_TPM && X86 select TCG_CRB if TCG_TPM && ACPI select TCG_IBMVTPM if TCG_TPM && PPC_PSERIES
Re: [PATCH 4.19 007/191] IMA: allow/fix UML builds
Hi Greg,
Quoted 6 lines · Greg Kroah-Hartman
From: Randy Dunlap <[email protected]>
commit
644f17412f5acf01a19af9d04a921937a2bc86c6upstream.UML supports
HAS_IOMEMsince0bbadafdc49d(um: allow disablingNO_IOMEM).
0bbadafdc49d is in v5.14.
Was it backported to older versions?
Quoted 11 lines
Current IMA build on UML fails on allmodconfig (with TCG_TPM=m):
ld:
security/integrity/ima/ima_queue.o: in function `ima_add_template_entry':
ima_queue.c:(.text+0x2d9): undefined reference to `tpm_pcr_extend'
ld:security/integrity/ima/ima_init.o: in function `ima_init':
ima_init.c:(.init.text+0x43f): undefined reference to `tpm_default_chip'
ld:security/integrity/ima/ima_crypto.o: in function `ima_calc_boot_aggregate_tfm':
ima_crypto.c:(.text+0x1044): undefined reference to `tpm_pcr_read'
ld: ima_crypto.c:(.text+0x10d8): undefined reference to `tpm_pcr_read'
Quoted 6 lines
Modify the IMA
Kconfigentry so that it selectsTCG_TPMifHAS_IOMEMis set, regardless of the UMLKconfigsetting.
This updatesTCG_TPMfrom =m to =y and fixes the linker errors.Fixes f4a0391dfa91 ("ima: fix Kconfig dependencies")Cc Stable <[email protected]> # v5.14+
"v5.14+"
Quoted 15 lines
Signed-off-by Randy Dunlap <[email protected]>Cc Fabio Estevam <[email protected]>Cc Richard Weinberger <[email protected]>Cc Anton Ivanov <[email protected]>Cc Johannes Berg <[email protected]>Signed-off-by Mimi Zohar <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- security/integrity/ima/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/integrity/ima/Kconfig config IMA · line 13
Quoted 8 lines
security/integrity/ima/Kconfig +1
-1@@ -7,7 +7,7 @@ config IMA select CRYPTO_HMAC select CRYPTO_SHA1 select CRYPTO_HASH_INFO - select TCG_TPM if HAS_IOMEM && !UML + select TCG_TPM if HAS_IOMEM select TCG_TIS if TCG_TPM && X86 select TCG_CRB if TCG_TPM && ACPI select TCG_IBMVTPM if TCG_TPM && PPC_PSERIES
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Greg Kroah-Hartman
maintainerRe: [PATCH 4.19 007/191] IMA: allow/fix UML builds
Quoted 6 lines · Geert Uytterhoeven
Hi Greg,
Quoted 2 lines · Greg Kroah-Hartman
From: Randy Dunlap <[email protected]>
Quoted 7 lines
Quoted 4 lines
commit
644f17412f5acf01a19af9d04a921937a2bc86c6upstream.UML supports
HAS_IOMEMsince0bbadafdc49d(um: allow disablingNO_IOMEM).
0bbadafdc49dis in v5.14.
Was it backported to older versions?
Nope.
Quoted 10 lines
Quoted 10 lines
Current IMA build on UML fails on allmodconfig (with TCG_TPM=m):
ld:
security/integrity/ima/ima_queue.o: in function `ima_add_template_entry':
ima_queue.c:(.text+0x2d9): undefined reference to `tpm_pcr_extend'
ld:security/integrity/ima/ima_init.o: in function `ima_init':
ima_init.c:(.init.text+0x43f): undefined reference to `tpm_default_chip'
ld:security/integrity/ima/ima_crypto.o: in function `ima_calc_boot_aggregate_tfm':
ima_crypto.c:(.text+0x1044): undefined reference to `tpm_pcr_read'
ld: ima_crypto.c:(.text+0x10d8): undefined reference to `tpm_pcr_read'
Quoted 5 lines
Quoted 5 lines
Modify the IMA
Kconfigentry so that it selectsTCG_TPMifHAS_IOMEMis set, regardless of the UMLKconfigsetting.
This updatesTCG_TPMfrom =m to =y and fixes the linker errors.Fixes f4a0391dfa91 ("ima: fix Kconfig dependencies")
This is what I triggered off of.
Quoted 3 lines
Quoted 1 line
Cc Stable <[email protected]> # v5.14+"v5.14+"
Sorry, good catch, I'll go drop this from all of the older queues.
thanks for the review!
greg k-h
Greg Kroah-Hartman
maintainerPATCH 8/191 USB: dwc3: fix runtime pm imbalance on unbind
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 44d257e9012ee8040e41d224d0e5bfb5ef5427ea upstream.
Make sure to balance the runtime PM usage count on driver unbind by adding back the pm_runtime_allow() call that had been erroneously removed.
--- drivers/usb/dwc3/core.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/dwc3/core.c +1 -0
@@ -1563,6 +1563,7 @@ static int dwc3_remove(struct platform_ddwc3_core_exit (dwc);dwc3_ulpi_exit (dwc); +pm_runtime_allow (&pdev->dev);pm_runtime_disable (&pdev->dev);pm_runtime_put_noidle (&pdev->dev);pm_runtime_set_suspended (&pdev->dev);
Greg Kroah-Hartman
maintainerPATCH 9/191 perf sched: Cast PTHREAD_STACK_MIN to int as it may turn into sysconf(__SC_THREAD_STACK_MIN_VALUE)
In reply to Greg Kroah-HartmanFrom: Arnaldo Carvalho de Melo <[email protected]>
commit d08c84e01afa7a7eee6badab25d5420fa847f783 upstream.
In fedora rawhide the PTHREAD_STACK_MIN define may end up expanded to a sysconf() call, and that will return 'long int', breaking the build:
45 fedora:rawhide : FAIL gcc version 11.1.1 20210623 (Red Hat 11.1.1-6) (GCC)
builtin-sched.c: In function 'create_tasks':
/git/perf-5.14.0-rc1/tools/include/linux/kernel.h:43:24: error: comparison of distinct pointer types lacks a cast [-Werror]
43 | (void) (&_max1 == &_max2); \
| ^~
builtin-sched.c:673:34: note: in expansion of macro 'max'
673 | (size_t) max(16 * 1024, PTHREAD_STACK_MIN));
| ^~~
cc1: all warnings being treated as errors
$ grep __sysconf /usr/include/*/*.h /usr/include/bits/pthread_stack_min-dynamic.h:extern long int __sysconf (int __name) __THROW; /usr/include/bits/pthread_stack_min-dynamic.h:# define PTHREAD_STACK_MIN __sysconf (__SC_THREAD_STACK_MIN_VALUE) /usr/include/bits/time.h:extern long int __sysconf (int); /usr/include/bits/time.h:# define CLK_TCK ((__clock_t) __sysconf (2)) /* 2 is _SC_CLK_TCK */ $
So cast it to int to cope with that.
--- tools/perf/builtin-sched.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-sched.c +1 -1
@@ -659,7 +659,7 @@ static void create_tasks(struct perf_sch err =pthread_attr_init (&attr);BUG_ON (err); err =pthread_attr_setstacksize (&attr, - (size_t )max (16 *1024 ,PTHREAD_STACK_MIN )); + (size_t )max (16 *1024 , (int )PTHREAD_STACK_MIN ));BUG_ON (err); err =pthread_mutex_lock (&sched->start_work_mutex);BUG_ON (err);
Greg Kroah-Hartman
maintainerPATCH 10/191 staging: iio: resolver: ads1210: fix config mode
In reply to Greg Kroah-HartmanFrom: Nuno Sá <[email protected]>
commit 16313403d873ff17a587818b61f84c8cb4971cef upstream.
As stated in the device datasheet [1], bits a0 and a1 have to be set to 1 for the configuration mode.
[1]: https://www.analog.com/media/en/technical-documentation/data-sheets/ad2s1210.pdf
--- drivers/staging/iio/resolver/ad2s1210.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/iio/resolver/ad2s1210.c +1 -1
@@ -85,7 +85,7 @@ struct ad2s1210_state {static const int ad2s1210_mode_vals[4 ][2 ] = { [MOD_POS ] = {0 ,0 }, [MOD_VEL ] = {0 ,1 }, - [MOD_CONFIG ] = {1 ,0 }, + [MOD_CONFIG ] = {1 ,1 }, }; static inline void ad2s1210_set_mode(enum ad2s1210_mode mode,
Greg Kroah-Hartman
maintainerPATCH 11/191 debugfs: regset32: Add Runtime PM support
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
commit 30332eeefec8f83afcea00c360f99ef64b87f220 upstream.
Hardware registers of devices under control of power management cannot be accessed at all times. If such a device is suspended, register accesses may lead to undefined behavior, like reading bogus values, or causing exceptions or system lock-ups.
Extend struct debugfs_regset32 with an optional field to let device drivers specify the device the registers in the set belong to. This allows debugfs_show_regset32() to make sure the device is resumed while its registers are being read.
--- fs/debugfs/file.c | 8 ++++++++ include/linux/debugfs.h | 1 + 2 files changed, 9 insertions(+)
fs/debugfs/file.c +8 -0
@@ -18,6 +18,7 @@#include <linux/slab.h> #include <linux/atomic.h> #include <linux/device.h> +#include <linux/pm_runtime.h> #include <linux/poll.h> #include "internal.h"
@@ -1084,7 +1085,14 @@ static int debugfs_show_regset32(struct {struct debugfs_regset32 *regset = s->private; +if (regset->dev) +pm_runtime_get_sync (regset->dev); +debugfs_print_regs32 (s, regset->regs, regset->nregs, regset->base,"" ); + +if (regset->dev) +pm_runtime_put (regset->dev); +return 0 ; }
include/linux/debugfs.h +1 -0
@@ -35,6 +35,7 @@ struct debugfs_regset32 {const struct debugfs_reg32 *regs;int nregs;void __iomem *base; +struct device *dev;/* Optional device for Runtime PM */ };extern struct dentry *arch_debugfs_dir;
Greg Kroah-Hartman
maintainerPATCH 12/191 xhci: fix debugfs register accesses while suspended
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 735baf1b23458f71a8b15cb924af22c9ff9cd125 upstream.
Wire up the debugfs regset device pointer so that the controller is resumed before accessing registers to avoid crashing or locking up if it happens to be runtime suspended.
--- drivers/usb/host/xhci-debugfs.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/host/xhci-debugfs.c +1 -0
@@ -132,6 +132,7 @@ static void xhci_debugfs_regset(struct x regset->regs = regs; regset->nregs = nregs; regset->base = hcd->regs + base; + regset->dev = hcd->self.controller;debugfs_create_regset32 ((const char *)rgs->name,0444 , parent, regset); }
Greg Kroah-Hartman
maintainerPATCH 13/191 MIPS: fw: Allow firmware to pass a empty env
In reply to Greg Kroah-HartmanFrom: Jiaxun Yang <[email protected]>
commit ee1809ed7bc456a72dc8410b475b73021a3a68d5 upstream.
fw_getenv will use env entry to determine style of env, however it is legal for firmware to just pass a empty list.
Check if first entry exist before running strchr to avoid null pointer dereference.
--- arch/mips/fw/lib/cmdline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/fw/lib/cmdline.c +1 -1
@@ -51,7 +51,7 @@ char *fw_getenv(char *envname) {char *result =NULL ; -if (_fw_envp !=NULL ) { +if (_fw_envp !=NULL &&fw_envp (0 ) !=NULL ) {/* * Return a pointer to the given environment variable. * YAMON uses "name", "value" pairs, while U-Boot uses
Greg Kroah-Hartman
maintainerPATCH 14/191 pwm: meson: Fix axg ao mux parents
In reply to Greg Kroah-HartmanFrom: Heiner Kallweit <[email protected]>
commit eb411c0cf59ae6344b34bc6f0d298a22b300627e upstream.
This fix is basically the same as 9bce02ef0dfa ("pwm: meson: Fix the G12A AO clock parents order"). Vendor driver referenced there has xtal as first parent also for axg ao. In addition fix the name of the aoclk81 clock. Apparently name aoclk81 as used by the vendor driver was changed when mainlining the axg clock driver.
--- drivers/pwm/pwm-meson.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pwm/pwm-meson.c +1 -1
@@ -425,7 +425,7 @@ static const struct meson_pwm_data pwm_a };static const char *const pwm_axg_ao_parent_names[] = { -"aoclk81" ,"xtal" ,"fclk_div4" ,"fclk_div5" +"xtal" ,"axg_ao_clk81" ,"fclk_div4" ,"fclk_div5" };static const struct meson_pwm_data pwm_axg_ao_data = {
Greg Kroah-Hartman
maintainerPATCH 15/191 ring-buffer: Sync IRQ works before buffer destruction
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
commit 675751bb20634f981498c7d66161584080cc061e upstream.
If something was written to the buffer just before destruction, it may be possible (maybe not in a real system, but it did happen in ARCH=um with time-travel) to destroy the ringbuffer before the IRQ work ran, leading this KASAN report (or a crash without KASAN):
BUG: KASAN: slab-use-after-free in irq_work_run_list+0x11a/0x13a
Read of size 8 at addr 000000006d640a48 by task swapper/0
CPU: 0 PID: 0 Comm: swapper Tainted: G W O 6.3.0-rc1 #7
Stack:
60c4f20f 0c203d48 41b58ab3 60f224fc
600477fa 60f35687 60c4f20f 601273dd
00000008 6101eb00 6101eab0 615be548
Call Trace:
[<60047a58>] show_stack+0x25e/0x282
[<60c609e0>] dump_stack_lvl+0x96/0xfd
[<60c50d4c>] print_report+0x1a7/0x5a8
[<603078d3>] kasan_report+0xc1/0xe9
[<60308950>] __asan_report_load8_noabort+0x1b/0x1d
[<60232844>] irq_work_run_list+0x11a/0x13a
[<602328b4>] irq_work_tick+0x24/0x34
[<6017f9dc>] update_process_times+0x162/0x196
[<6019f335>] tick_sched_handle+0x1a4/0x1c3
[<6019fd9e>] tick_sched_timer+0x79/0x10c
[<601812b9>] __hrtimer_run_queues.constprop.0+0x425/0x695
[<60182913>] hrtimer_interrupt+0x16c/0x2c4
[<600486a3>] um_timer+0x164/0x183
[...]
Allocated by task 411:
save_stack_trace+0x99/0xb5
stack_trace_save+0x81/0x9b
kasan_save_stack+0x2d/0x54
kasan_set_track+0x34/0x3e
kasan_save_alloc_info+0x25/0x28
____kasan_kmalloc+0x8b/0x97
__kasan_kmalloc+0x10/0x12
__kmalloc+0xb2/0xe8
load_elf_phdrs+0xee/0x182
[...]
The buggy address belongs to the object at 000000006d640800
which belongs to the cache kmalloc-1k of size 1024
The buggy address is located 584 bytes inside of
freed 1024-byte region [000000006d640800, 000000006d640c00)Add the appropriate irq_work_sync() so the work finishes before the buffers are destroyed.
Prior to the commit in the Fixes tag below, there was only a single global IRQ work, so this issue didn't exist.
--- kernel/trace/ring_buffer.c | 4 ++++ 1 file changed, 4 insertions(+)
kernel/trace/ring_buffer.c +4 -0
@@ -1326,6 +1326,8 @@ static void rb_free_cpu_buffer(struct ristruct list_head *head = cpu_buffer->pages;struct buffer_page *bpage, *tmp; +irq_work_sync (&cpu_buffer->irq_work.work); +free_buffer_page (cpu_buffer->reader_page);if (head) {
@@ -1431,6 +1433,8 @@ ring_buffer_free(struct ring_buffer *bufcpuhp_state_remove_instance (CPUHP_TRACE_RB_PREPARE , &buffer->node); +irq_work_sync (&buffer->irq_work.work); +for_each_buffer_cpu (buffer, cpu)rb_free_cpu_buffer (buffer->buffers[cpu]);
Greg Kroah-Hartman
maintainerPATCH 16/191 reiserfs: Add security prefix to xattr name in reiserfs_security_write()
In reply to Greg Kroah-HartmanFrom: Roberto Sassu <[email protected]>
commit d82dcd9e21b77d338dc4875f3d4111f0db314a7c upstream.
Reiserfs sets a security xattr at inode creation time in two stages: first, it calls reiserfs_security_init() to obtain the xattr from active LSMs; then, it calls reiserfs_security_write() to actually write that xattr.
Unfortunately, it seems there is a wrong expectation that LSMs provide the full xattr name in the form 'security.<suffix>'. However, LSMs always provided just the suffix, causing reiserfs to not write the xattr at all (if the suffix is shorter than the prefix), or to write an xattr with the wrong name.
Add a temporary buffer in reiserfs_security_write(), and write to it the full xattr name, before passing it to reiserfs_xattr_set_handle().
Also replace the name length check with a check that the full xattr name is not larger than XATTR_NAME_MAX.
--- fs/reiserfs/xattr_security.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
fs/reiserfs/xattr_security.c +6 -2
@@ -81,11 +81,15 @@ int reiserfs_security_write(struct reisestruct inode *inode, struct reiserfs_security_handle *sec) { + char xattr_name[XATTR_NAME_MAX + 1] = XATTR_SECURITY_PREFIX;int error; -if (strlen (sec->name) <sizeof (XATTR_SECURITY_PREFIX )) + +if (XATTR_SECURITY_PREFIX_LEN +strlen (sec->name) >XATTR_NAME_MAX )return -EINVAL ; - error =reiserfs_xattr_set_handle (th, inode, sec->name, sec->value, +strlcat (xattr_name, sec->name,sizeof (xattr_name)); + + error =reiserfs_xattr_set_handle (th, inode, xattr_name, sec->value, sec->length,XATTR_CREATE );if (error == -ENODATA || error == -EOPNOTSUPP ) error =0 ;
Greg Kroah-Hartman
maintainerPATCH 17/191 KVM: nVMX: Emulate NOPs in L2, and PAUSE if its not intercepted
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
commit 4984563823f0034d3533854c1b50e729f5191089 upstream.
Extend VMX's nested intercept logic for emulated instructions to handle "pause" interception, in quotes because KVM's emulator doesn't filter out NOPs when checking for nested intercepts. Failure to allow emulation of NOPs results in KVM injecting a #UD into L2 on any NOP that collides with the emulator's definition of PAUSE, i.e. on all single-byte NOPs.
For PAUSE itself, honor L1's PAUSE-exiting control, but ignore PLE to avoid unnecessarily injecting a #UD into L2. Per the SDM, the first execution of PAUSE after VM-Entry is treated as the beginning of a new loop, i.e. will never trigger a PLE VM-Exit, and so L1 can't expect any given execution of PAUSE to deterministically exit.
... the processor considers this execution to be the first execution of PAUSE in a loop. (It also does so for the first execution of PAUSE at CPL 0 after VM entry.)
All that said, the PLE side of things is currently a moot point, as KVM doesn't expose PLE to L1.
Note, vmx_check_intercept() is still wildly broken when L1 wants to intercept an instruction, as KVM injects a #UD instead of synthesizing a nested VM-Exit. That issue extends far beyond NOP/PAUSE and needs far more effort to fix, i.e. is a problem for the future.
--- arch/x86/kvm/vmx/vmx.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
arch/x86/kvm/vmx/vmx.c +15 -0
@@ -13878,6 +13878,21 @@ static int vmx_check_intercept(struct kv/* FIXME: produce nested vmexit and return X86EMUL_INTERCEPTED. */ break ; +case x86_intercept_pause: +/* +* PAUSE is a single-byte NOP with a REPE prefix, i.e. collides +* with vanilla NOPs in the emulator. Apply the interception +* check only to actual PAUSE instructions. Don't check +* PAUSE-loop-exiting, software can't expect a given PAUSE to +* exit, i.e. KVM is within its rights to allow L2 to execute +* the PAUSE. +*/ +if ((info->rep_prefix !=REPE_PREFIX ) || + !nested_cpu_has2 (vmcs12,CPU_BASED_PAUSE_EXITING )) +return X86EMUL_CONTINUE ; + +break ; +/* TODO: check more intercepts... */ default :break ;
Greg Kroah-Hartman
maintainerPATCH 18/191 i2c: omap: Fix standard mode false ACK readings
In reply to Greg Kroah-HartmanFrom: Reid Tonking <[email protected]>
commit c770657bd2611b077ec1e7b1fe6aa92f249399bd upstream.
Using standard mode, rare false ACK responses were appearing with i2cdetect tool. This was happening due to NACK interrupt triggering ISR thread before register access interrupt was ready. Removing the NACK interrupt's ability to trigger ISR thread lets register access ready interrupt do this instead.
--- drivers/i2c/busses/i2c-omap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/busses/i2c-omap.c +1 -1
@@ -1027,7 +1027,7 @@ omap_i2c_isr(int irq, void *dev_id)u16 stat; stat =omap_i2c_read_reg (omap,OMAP_I2C_STAT_REG ); - mask =omap_i2c_read_reg (omap,OMAP_I2C_IE_REG ); + mask =omap_i2c_read_reg (omap,OMAP_I2C_IE_REG ) & ~OMAP_I2C_STAT_NACK ;if (stat & mask) ret =IRQ_WAKE_THREAD ;
Greg Kroah-Hartman
maintainerPATCH 19/191 Revert "ubifs: dirty_cow_znode: Fix memleak in error handling path"
In reply to Greg Kroah-HartmanFrom: Zhihao Cheng <[email protected]>
commit 7d01cb27f6aebc54efbe28d8961a973b8f795b13 upstream.
This reverts commit 122deabfe1428 (ubifs: dirty_cow_znode: Fix memleak in error handling path).
After commit 122deabfe1428 applied, if insert_old_idx() failed, old index neither exists in TNC nor in old-index tree. Which means that old index node could be overwritten in layout_leb_in_gaps(), then ubifs image will be corrupted in power-cut.
--- fs/ubifs/tnc.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
fs/ubifs/tnc.c +1 -8
@@ -279,18 +279,11 @@ static struct ubifs_znode *dirty_cow_znoif (zbr->len) { err =insert_old_idx (c, zbr->lnum, zbr->offs);if (unlikely (err)) -/* -* Obsolete znodes will be freed by tnc_destroy_cnext() -* or free_obsolete_znodes(), copied up znodes should -* be added back to tnc and freed by -* ubifs_destroy_tnc_subtree(). -*/ - goto out; +return ERR_PTR (err); err =add_idx_dirt (c, zbr->lnum, zbr->len); }else err =0 ; -out: zbr->znode = zn; zbr->lnum =0 ; zbr->offs =0 ;
Greg Kroah-Hartman
maintainerPATCH 20/191 ubifs: Fix memleak when insert_old_idx() failed
In reply to Greg Kroah-HartmanFrom: Zhihao Cheng <[email protected]>
commit b5fda08ef213352ac2df7447611eb4d383cce929 upstream.
Following process will cause a memleak for copied up znode:
dirty_cow_znode
zn = copy_znode(c, znode);
err = insert_old_idx(c, zbr->lnum, zbr->offs);
if (unlikely(err))
return ERR_PTR(err); // No one refers to zn.
Fetch a reproducer in [Link].
Function copy_znode() is split into 2 parts: resource allocation and znode replacement, insert_old_idx() is split in similar way, so resource cleanup could be done in error handling path without corrupting metadata(mem & disk).
It's okay that old index inserting is put behind of add_idx_dirt(), old index is used in layout_leb_in_gaps(), so the two processes do not depend on each other.
--- fs/ubifs/tnc.c | 137 ++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 87 insertions(+), 50 deletions(-)
fs/ubifs/tnc.c +87 -50
@@ -56,6 +56,33 @@ enum { NOT_ON_MEDIA = 3, }; +static void do_insert_old_idx (struct ubifs_info *c, +struct ubifs_old_idx *old_idx) +{ +struct ubifs_old_idx *o; +struct rb_node **p, *parent =NULL ; + + p = &c->old_idx.rb_node; +while (*p) { + parent = *p; + o = rb_entry(parent, struct ubifs_old_idx, rb); +if (old_idx->lnum < o->lnum) + p = &(*p)->rb_left; +else if (old_idx->lnum > o->lnum) + p = &(*p)->rb_right; +else if (old_idx->offs < o->offs) + p = &(*p)->rb_left; +else if (old_idx->offs > o->offs) + p = &(*p)->rb_right; +else { +ubifs_err (c,"old idx added twice!" ); +kfree (old_idx); + } + } +rb_link_node (&old_idx->rb, parent, p); +rb_insert_color (&old_idx->rb, &c->old_idx); +} +/** * insert_old_idx - record an index node obsoleted since the last commit start. * @c: UBIFS file-system description object
@@ -81,35 +108,15 @@ enum {*/ static int insert_old_idx (struct ubifs_info *c,int lnum,int offs) { -struct ubifs_old_idx *old_idx, *o; -struct rb_node **p, *parent =NULL ; +struct ubifs_old_idx *old_idx; old_idx =kmalloc (sizeof (struct ubifs_old_idx ),GFP_NOFS );if (unlikely (!old_idx))return -ENOMEM ; old_idx->lnum = lnum; old_idx->offs = offs; +do_insert_old_idx (c, old_idx); - p = &c->old_idx.rb_node; -while (*p) { - parent = *p; - o = rb_entry(parent, struct ubifs_old_idx, rb); -if (lnum < o->lnum) - p = &(*p)->rb_left; -else if (lnum > o->lnum) - p = &(*p)->rb_right; -else if (offs < o->offs) - p = &(*p)->rb_left; -else if (offs > o->offs) - p = &(*p)->rb_right; -else { -ubifs_err (c,"old idx added twice!" ); -kfree (old_idx); -return 0 ; - } - } -rb_link_node (&old_idx->rb, parent, p); -rb_insert_color (&old_idx->rb, &c->old_idx);return 0 ; }
@@ -211,23 +218,6 @@ static struct ubifs_znode *copy_znode(st__set_bit (DIRTY_ZNODE , &zn->flags);__clear_bit (COW_ZNODE , &zn->flags); -ubifs_assert (c, !ubifs_zn_obsolete (znode)); -__set_bit (OBSOLETE_ZNODE , &znode->flags); - -if (znode->level !=0 ) { -int i; -const int n = zn->child_cnt; - -/* The children now have new parent */ -for (i =0 ; i < n; i++) { -struct ubifs_zbranch *zbr = &zn->zbranch[i]; - -if (zbr->znode) - zbr->znode->parent = zn; - } - } - -atomic_long_inc (&c->dirty_zn_cnt);return zn; }
@@ -246,6 +236,42 @@ static int add_idx_dirt(struct ubifs_inf }/** +* replace_znode - replace old znode with new znode. +* @c: UBIFS file-system description object +* @new_zn: new znode +* @old_zn: old znode +* @zbr: the branch of parent znode +* +* Replace old znode with new znode in TNC. +*/ +static void replace_znode (struct ubifs_info *c,struct ubifs_znode *new_zn, +struct ubifs_znode *old_zn,struct ubifs_zbranch *zbr) +{ +ubifs_assert (c, !ubifs_zn_obsolete (old_zn)); +__set_bit (OBSOLETE_ZNODE , &old_zn->flags); + +if (old_zn->level !=0 ) { +int i; +const int n = new_zn->child_cnt; + +/* The children now have new parent */ +for (i =0 ; i < n; i++) { +struct ubifs_zbranch *child = &new_zn->zbranch[i]; + +if (child->znode) + child->znode->parent = new_zn; + } + } + + zbr->znode = new_zn; + zbr->lnum =0 ; + zbr->offs =0 ; + zbr->len =0 ; + +atomic_long_inc (&c->dirty_zn_cnt); +} + +/** * dirty_cow_znode - ensure a znode is not being committed. * @c: UBIFS file-system description object * @zbr: branch of znode to check
@@ -277,21 +303,32 @@ static struct ubifs_znode *dirty_cow_znoreturn zn;if (zbr->len) { - err =insert_old_idx (c, zbr->lnum, zbr->offs); -if (unlikely (err)) -return ERR_PTR (err); +struct ubifs_old_idx *old_idx; + + old_idx =kmalloc (sizeof (struct ubifs_old_idx ),GFP_NOFS ); +if (unlikely (!old_idx)) { + err = -ENOMEM ; + goto out; + } + old_idx->lnum = zbr->lnum; + old_idx->offs = zbr->offs; + err =add_idx_dirt (c, zbr->lnum, zbr->len); - }else - err =0 ; +if (err) { +kfree (old_idx); + goto out; + } - zbr->znode = zn; - zbr->lnum =0 ; - zbr->offs =0 ; - zbr->len =0 ; +do_insert_old_idx (c, old_idx); + } + +replace_znode (c, zn, znode, zbr); -if (unlikely (err)) -return ERR_PTR (err);return zn; + +out: +kfree (zn); +return ERR_PTR (err); }/**
Greg Kroah-Hartman
maintainerPATCH 21/191 ubi: Fix return value overwrite issue in try_write_vid_and_data()
In reply to Greg Kroah-HartmanFrom: Wang YanQing <[email protected]>
commit 31a149d5c13c4cbcf97de3435817263a2d8c9d6e upstream.
The commit 2d78aee426d8 ("UBI: simplify LEB write and atomic LEB change code") adds helper function, try_write_vid_and_data(), to simplify the code, but this helper function has bug, it will return 0 (success) when ubi_io_write_vid_hdr() or the ubi_io_write_data() return error number (-EIO, etc), because the return value of ubi_wl_put_peb() will overwrite the original return value.
This issue will cause unexpected data loss issue, because the caller of this function and UBIFS willn't know the data is lost.
--- drivers/mtd/ubi/eba.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
drivers/mtd/ubi/eba.c +14 -5
@@ -960,7 +960,7 @@ static int try_write_vid_and_data(struct int offset, int len) {struct ubi_device *ubi = vol->ubi; -int pnum, opnum, err, vol_id = vol->vol_id; +int pnum, opnum, err, err2, vol_id = vol->vol_id; pnum =ubi_wl_get_peb (ubi);if (pnum <0 ) {
@@ -995,10 +995,19 @@ static int try_write_vid_and_data(struct out_put:up_read (&ubi->fm_eba_sem); -if (err && pnum >=0 ) - err =ubi_wl_put_peb (ubi, vol_id, lnum, pnum,1 ); -else if (!err && opnum >=0 ) - err =ubi_wl_put_peb (ubi, vol_id, lnum, opnum,0 ); +if (err && pnum >=0 ) { + err2 =ubi_wl_put_peb (ubi, vol_id, lnum, pnum,1 ); +if (err2) { +ubi_warn (ubi,"failed to return physical eraseblock %d, error %d" , + pnum, err2); + } + }else if (!err && opnum >=0 ) { + err2 =ubi_wl_put_peb (ubi, vol_id, lnum, opnum,0 ); +if (err2) { +ubi_warn (ubi,"failed to return physical eraseblock %d, error %d" , + opnum, err2); + } + }return err; }
Greg Kroah-Hartman
maintainerPATCH 22/191 ubifs: Free memory for tmpfile name
In reply to Greg Kroah-HartmanFrom: Mårten Lindahl <[email protected]>
commit 1fb815b38bb31d6af9bd0540b8652a0d6fe6cfd3 upstream.
When opening a ubifs tmpfile on an encrypted directory, function fscrypt_setup_filename allocates memory for the name that is to be stored in the directory entry, but after the name has been copied to the directory entry inode, the memory is not freed.
When running kmemleak on it we see that it is registered as a leak. The report below is triggered by a simple program 'tmpfile' just opening a tmpfile:
unreferenced object 0xffff88810178f380 (size 32):
comm "tmpfile", pid 509, jiffies 4294934744 (age 1524.742s)
backtrace:
__kmem_cache_alloc_node
__kmalloc
fscrypt_setup_filename
ubifs_tmpfile
vfs_tmpfile
path_openatFree this memory after it has been copied to the inode.
--- fs/ubifs/dir.c | 1 + 1 file changed, 1 insertion(+)
fs/ubifs/dir.c +1 -0
@@ -445,6 +445,7 @@ static int do_tmpfile(struct inode *dir,mutex_unlock (&dir_ui->ui_mutex);ubifs_release_budget (c, &req); +fscrypt_free_filename (&nm);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 23/191 selinux: fix Makefile dependencies of flask.h
In reply to Greg Kroah-HartmanFrom: Ondrej Mosnacek <[email protected]>
[ Upstream commit bcab1adeaad4b39a1e04cb98979a367d08253f03 ]
Make the flask.h target depend on the genheaders binary instead of classmap.h to ensure that it is rebuilt if any of the dependencies of genheaders are changed.
Notably this fixes flask.h not being rebuilt wheninitial_sid_to_string.h is modified.
--- security/selinux/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
security/selinux/Makefile +2 -2
@@ -19,8 +19,8 @@ ccflags-y := -I$(srctree)/security/selinux -I$(srctree)/security/selinux/include $(addprefix $(obj)/,$(selinux-y)): $(obj)/flask.h quiet_cmd_flask = GEN $(obj)/flask.h $(obj)/av_permissions.h - cmd_flask = scripts/selinux/genheaders/genheaders $(obj)/flask.h $(obj)/av_permissions.h + cmd_flask = $< $(obj)/flask.h $(obj)/av_permissions.h targets += flask.h av_permissions.h -$(obj)/flask.h: $(src)/include/classmap.h FORCE +$(obj)/flask.h: scripts/selinux/genheaders/genheaders FORCE $(call if_changed,flask)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 24/191 selinux: ensure av_permissions.h is built when needed
In reply to Greg Kroah-HartmanFrom: Paul Moore <[email protected]>
[ Upstream commit 4ce1f694eb5d8ca607fed8542d32a33b4f1217a5 ]
The Makefile rule responsible for building flask.h and av_permissions.h only lists flask.h as a target which means that av_permissions.h is only generated when flask.h needs to be generated. This patch fixes this by adding av_permissions.h as a target to the rule.
--- security/selinux/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/selinux/Makefile +1 -1
@@ -22,5 +22,5 @@ quiet_cmd_flask = GEN $(obj)/flask.h $(obj)/av_permissions.h cmd_flask = $< $(obj)/flask.h $(obj)/av_permissions.h targets += flask.h av_permissions.h -$(obj)/flask.h: scripts/selinux/genheaders/genheaders FORCE +$(obj)/flask.h $(obj)/av_permissions.h &: scripts/selinux/genheaders/genheaders FORCE $(call if_changed,flask)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 25/191 drm/rockchip: Drop unbalanced obj unref
In reply to Greg Kroah-HartmanFrom: Rob Clark <[email protected]>
[ Upstream commit 8ee3b0e85f6ccd9e6c527bc50eaba774c3bb18d0 ]
In the error path, rockchip_drm_gem_object_mmap() is dropping an obj reference that it doesn't own.
--- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 3 --- 1 file changed, 3 deletions(-)
drivers/gpu/drm/rockchip/rockchip_drm_gem.c +0 -3
@@ -270,9 +270,6 @@ static int rockchip_drm_gem_object_mmap(struct drm_gem_object *obj,else ret =rockchip_drm_gem_object_mmap_dma (obj, vma); -if (ret) -drm_gem_vm_close (vma); -return ret; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 26/191 drm/vgem: add missing mutex_destroy
In reply to Greg Kroah-HartmanFrom: Maíra Canal <[email protected]>
[ Upstream commit 7c18189b14b33c1fbf76480b1bd217877c086e67 ]
vgem_fence_open() instantiates a mutex for a particular fence instance, but never destroys it by calling mutex_destroy() in vgem_fence_close().
So, add the missing mutex_destroy() to guarantee proper resource destruction.
--- drivers/gpu/drm/vgem/vgem_fence.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/vgem/vgem_fence.c +1 -0
@@ -280,4 +280,5 @@ void vgem_fence_close(struct vgem_file *vfile) {idr_for_each (&vfile->fence_idr, __vgem_fence_idr_fini, vfile);idr_destroy (&vfile->fence_idr); +mutex_destroy (&vfile->fence_mutex); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 27/191 drm/probe-helper: Cancel previous job before starting new one
In reply to Greg Kroah-HartmanFrom: Dom Cobley <[email protected]>
[ Upstream commit a8e47884f1906cd7440fafa056adc8817568e73e ]
Currently we schedule a call to output_poll_execute from drm_kms_helper_poll_enable for 10s in future. Later we try to replace that in drm_helper_probe_single_connector_modes with a 0s schedule with delayed_event set.
But as there is already a job in the queue this fails, and the immediate job we wanted with delayed_event set doesn't occur until 10s later.
And that call acts as if connector state has changed, reprobing modes. This has a side effect of waking up a display that has been blanked.
Make sure we cancel the old job before submitting the immediate one.
--- drivers/gpu/drm/drm_probe_helper.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_probe_helper.c +3 -2
@@ -459,8 +459,9 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector,*/ dev->mode_config.delayed_event = true;if (dev->mode_config.poll_enabled) -schedule_delayed_work (&dev->mode_config.output_poll_work, -0 ); +mod_delayed_work (system_wq, + &dev->mode_config.output_poll_work, +0 ); }/* Re-enable polling in case the global poll config changed. */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 28/191 EDAC, skx: Move debugfs node under EDACs hierarchy
In reply to Greg Kroah-HartmanFrom: Qiuxu Zhuo <[email protected]>
[ Upstream commit 85b9c8bfee67ed151c44861c71adc816fc1b46a9 ]
The debugfs node is /sys/kernel/debug/skx_edac_test. Rename it and move under EDAC debugfs root directory. Remove the unused 'skx_fake_addr' and remove the 'skx_test' on error.
Stable-dep-of: 71b1e3ba3fed ("EDAC/skx: Fix overflows on the DRAM row address mapping arrays")
--- drivers/edac/skx_edac.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-)
drivers/edac/skx_edac.c +12 -13
@@ -896,12 +896,11 @@ static bool skx_decode(struct decoded_addr *res)#ifdef CONFIG_EDAC_DEBUG /* -* Debug feature. Make /sys/kernel/debug/skx_edac_test/addr. -* Write an address to this file to exercise the address decode -* logic in this driver. +* Debug feature. +* Exercise the address decode logic by writing an address to +* /sys/kernel/debug/edac/skx_test/addr. */ static struct dentry *skx_test; -static u64 skx_fake_addr;static int debugfs_u64_set (void *data,u64 val) {
@@ -912,19 +911,19 @@ static int debugfs_u64_set(void *data, u64 val)return 0 ; } -DEFINE_SIMPLE_ATTRIBUTE (fops_u64_wo,NULL , debugfs_u64_set,"%llu\n" ); -static struct dentry *mydebugfs_create (const char *name,umode_t mode, -struct dentry *parent,u64 *value) -{ -return debugfs_create_file (name, mode, parent, value, &fops_u64_wo); -} -static void setup_skx_debug (void ) { - skx_test =debugfs_create_dir ("skx_edac_test" ,NULL ); -mydebugfs_create ("addr" ,S_IWUSR , skx_test, &skx_fake_addr); + skx_test =edac_debugfs_create_dir ("skx_test" ); +if (!skx_test) +return ; + +if (!edac_debugfs_create_file ("addr" ,0200 , skx_test, +NULL , &fops_u64_wo)) { +debugfs_remove (skx_test); + skx_test =NULL ; + } }static void teardown_skx_debug (void )
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 29/191 EDAC/skx: Fix overflows on the DRAM row address mapping arrays
In reply to Greg Kroah-HartmanFrom: Qiuxu Zhuo <[email protected]>
[ Upstream commit 71b1e3ba3fed5a34c5fac6d3a15c2634b04c1eb7 ]
The current DRAM row address mapping arrays skx_{open,close}_row[] only support ranks with sizes up to 16G. Decoding a rank address to a DRAM row address for a 32G rank by using either one of the above arrays by the skx_edac driver, will result in an overflow on the array.
For a 32G rank, the most significant DRAM row address bit (the bit17) is mapped from the bit34 of the rank address. Add this new mapping item to both arrays to fix the overflow issue.
--- drivers/edac/skx_edac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/edac/skx_edac.c +2 -2
@@ -825,13 +825,13 @@ static bool skx_rir_decode(struct decoded_addr *res) }static u8 skx_close_row[] = { -15 ,16 ,17 ,18 ,20 ,21 ,22 ,28 ,10 ,11 ,12 ,13 ,29 ,30 ,31 ,32 ,33 +15 ,16 ,17 ,18 ,20 ,21 ,22 ,28 ,10 ,11 ,12 ,13 ,29 ,30 ,31 ,32 ,33 ,34 };static u8 skx_close_column[] = {3 ,4 ,5 ,14 ,19 ,23 ,24 ,25 ,26 ,27 };static u8 skx_open_row[] = { -14 ,15 ,16 ,20 ,28 ,21 ,22 ,23 ,24 ,25 ,26 ,27 ,29 ,30 ,31 ,32 ,33 +14 ,15 ,16 ,20 ,28 ,21 ,22 ,23 ,24 ,25 ,26 ,27 ,29 ,30 ,31 ,32 ,33 ,34 };static u8 skx_open_column[] = {3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 30/191 ARM: dts: qcom: ipq4019: Fix the PCI I/O port range
In reply to Greg Kroah-HartmanFrom: Manivannan Sadhasivam <[email protected]>
[ Upstream commit 2540279e9a9e74fc880d1e4c83754ecfcbe290a0 ]
For 1MiB of the I/O region, the I/O ports of the legacy PCI devices are located in the range of 0x0 to 0x100000. Hence, fix the bogus PCI address (0x40200000) specified in the ranges property for I/O region.
While at it, let's use the missing 0x prefix for the addresses.
--- arch/arm/boot/dts/qcom-ipq4019.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/qcom-ipq4019.dtsi +2 -2
@@ -387,8 +387,8 @@ #address-cells = <3>; #size-cells = <2>; - ranges = <0x81000000 0 0x40200000 0x40200000 0 0x00100000>, - <0x82000000 0 0x40300000 0x40300000 0 0x00d00000>; + ranges = <0x81000000 0x0 0x00000000 0x40200000 0x0 0x00100000>, + <0x82000000 0x0 0x40300000 0x40300000 0x0 0x00d00000>; interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "msi";
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 31/191 media: bdisp: Add missing check for create_workqueue
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 2371adeab717d8fe32144a84f3491a03c5838cfb ]
Add the check for the return value of the create_workqueue in order to avoid NULL pointer dereference.
--- drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/platform/sti/bdisp/bdisp-v4l2.c +2 -0
@@ -1312,6 +1312,8 @@ static int bdisp_probe(struct platform_device *pdev)init_waitqueue_head (&bdisp->irq_queue);INIT_DELAYED_WORK (&bdisp->timeout_work, bdisp_irq_timeout); bdisp->work_queue =create_workqueue (BDISP_NAME ); +if (!bdisp->work_queue) +return -ENOMEM ;spin_lock_init (&bdisp->slock);mutex_init (&bdisp->lock);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 32/191 media: uapi: add MEDIA_BUS_FMT_METADATA_FIXED media bus format.
In reply to Greg Kroah-HartmanFrom: Dafna Hirschfeld <[email protected]>
[ Upstream commit 6ad253cc3436269fc6bcff03d704c672f368da0a ]
MEDIA_BUS_FMT_METADATA_FIXED should be used when the same driver handles both sides of the link and the bus format is a fixed metadata format that is not configurable from userspace.
The width and height will be set to 0 for this format.
Stable-dep-of: eed9496a0501 ("media: av7110: prevent underflow in write_ts_to_decoder()")
--- .../media/uapi/v4l/subdev-formats.rst | 27 +++++++++++++++++++ include/uapi/linux/media-bus-format.h | 8 ++++++ 2 files changed, 35 insertions(+)
Documentation/media/uapi/v4l/subdev-formats.rst +27 -0
@@ -7565,3 +7565,30 @@ formats. - 0x5001 - Interleaved raw UYVY and JPEG image format with embedded meta-data used by Samsung S3C73MX camera sensors. + +.. _v4l2-mbus-metadata-fmts: + +Metadata Formats +^^^^^^^^^^^^^^^^ + +This section lists all metadata formats. + +The following table lists the existing metadata formats. + +.. tabularcolumns:: |p{8.0cm}|p{1.4cm}|p{7.7cm}| + +.. flat-table:: Metadata formats + :header-rows: 1 + :stub-columns: 0 + + * - Identifier + - Code + - Comments + * .. _MEDIA-BUS-FMT-METADATA-FIXED: + + - MEDIA_BUS_FMT_METADATA_FIXED + - 0x7001 + - This format should be used when the same driver handles + both sides of the link and the bus format is a fixed + metadata format that is not configurable from userspace. + Width and height will be set to 0 for this format.
include/uapi/linux/media-bus-format.h +8 -0
@@ -153,4 +153,12 @@/* HSV - next is 0x6002 */ #define MEDIA_BUS_FMT_AHSV8888_1X32 0x6001 +/* +* This format should be used when the same driver handles +* both sides of the link and the bus format is a fixed +* metadata format that is not configurable from userspace. +* Width and height will be set to 0 for this format. +*/ +#define MEDIA_BUS_FMT_METADATA_FIXED 0x7001 +#endif /* __LINUX_MEDIA_BUS_FORMAT_H */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 33/191 media: av7110: prevent underflow in write_ts_to_decoder()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit eed9496a0501357aa326ddd6b71408189ed872eb ]
The buf[4] value comes from the user via ts_play(). It is a value in the u8 range. The final length we pass to av7110_ipack_instant_repack() is "len - (buf[4] + 1) - 4" so add a check to ensure that the length is not negative. It's not clear that passing a negative len value does anything bad necessarily, but it's not best practice.
With the new bounds checking the "if (!len)" condition is no longer possible or required so remove that.
--- drivers/media/pci/ttpci/av7110_av.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/pci/ttpci/av7110_av.c +2 -2
@@ -836,10 +836,10 @@ static int write_ts_to_decoder(struct av7110 *av7110, int type, const u8 *buf, sav7110_ipack_flush (ipack);if (buf[3 ] &ADAPT_FIELD ) { +if (buf[4 ] > len -1 -4 ) +return 0 ; len -= buf[4 ] +1 ; buf += buf[4 ] +1 ; -if (!len) -return 0 ; }av7110_ipack_instant_repack (buf +4 , len -4 , ipack);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 34/191 firmware: qcom_scm: Clear download bit during reboot
In reply to Greg Kroah-HartmanFrom: Mukesh Ojha <[email protected]>
[ Upstream commit 781d32d1c9709fd25655c4e3e3e15370ae4ae4db ]
During normal restart of a system download bit should be cleared irrespective of whether download mode is set or not.
--- drivers/firmware/qcom_scm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/firmware/qcom_scm.c +1 -2
@@ -586,8 +586,7 @@ static int qcom_scm_probe(struct platform_device *pdev)static void qcom_scm_shutdown (struct platform_device *pdev) {/* Clean shutdown, disable download mode to allow normal restart */ -if (download_mode) -qcom_scm_set_download_mode (false); +qcom_scm_set_download_mode (false); }static const struct of_device_id qcom_scm_dt_match[] = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 35/191 drm/msm/adreno: Defer enabling runpm until hw_init()
In reply to Greg Kroah-HartmanFrom: Rob Clark <[email protected]>
[ Upstream commit 4b18299b33655fa9672b774b6df774dc03d6aee8 ]
To avoid preventing the display from coming up before the rootfs is mounted, without resorting to packing fw in the initrd, the GPU has this limbo state where the device is probed, but we aren't ready to start sending commands to it. This is particularly problematic for a6xx, since the GMU (which requires fw to be loaded) is the one that is controlling the power/clk/icc votes.
So defer enabling runpm until we are ready to call gpu->hw_init(), as that is a point where we know we have all the needed fw and are ready to start sending commands to the coproc's.
Patchwork: https://patchwork.freedesktop.org/patch/489337/
Stable-dep-of: db7662d076c9 ("drm/msm/adreno: drop bogus pm_runtime_set_active()")
--- drivers/gpu/drm/msm/adreno/adreno_device.c | 6 ++++++ drivers/gpu/drm/msm/adreno/adreno_gpu.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/adreno_device.c +6 -0
@@ -190,6 +190,12 @@ struct msm_gpu *adreno_load_gpu(struct drm_device *dev)if (ret)return NULL ; +/* +* Now that we have firmware loaded, and are ready to begin +* booting the gpu, go ahead and enable runpm: +*/ +pm_runtime_enable (&pdev->dev); +/* Make sure pm runtime is active and reset any previous errors */ pm_runtime_set_active (&pdev->dev);
drivers/gpu/drm/msm/adreno/adreno_gpu.c +0 -1
@@ -725,7 +725,6 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev,pm_runtime_set_autosuspend_delay (&pdev->dev, adreno_gpu->info->inactive_period);pm_runtime_use_autosuspend (&pdev->dev); -pm_runtime_enable (&pdev->dev);return msm_gpu_init (drm, pdev, &adreno_gpu->base, &funcs->base, adreno_gpu->info->name, &adreno_gpu_config);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 36/191 drm/msm/adreno: drop bogus pm_runtime_set_active()
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
[ Upstream commit db7662d076c973072d788bd0e8130e04430307a1 ]
The runtime PM status can only be updated while runtime PM is disabled.
Drop the bogus pm_runtime_set_active() call that was made after enabling runtime PM and which (incidentally but correctly) left the runtime PM status set to 'suspended'.
Patchwork: https://patchwork.freedesktop.org/patch/524972/
--- drivers/gpu/drm/msm/adreno/adreno_device.c | 3 --- 1 file changed, 3 deletions(-)
drivers/gpu/drm/msm/adreno/adreno_device.c +0 -3
@@ -196,9 +196,6 @@ struct msm_gpu *adreno_load_gpu(struct drm_device *dev)*/ pm_runtime_enable (&pdev->dev); -/* Make sure pm runtime is active and reset any previous errors */ -pm_runtime_set_active (&pdev->dev); - ret =pm_runtime_get_sync (&pdev->dev);if (ret <0 ) {dev_err (dev->dev,"Couldn't power up the GPU: %d\n" , ret);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 37/191 x86/apic: Fix atomic update of offset in reserve_eilvt_offset()
In reply to Greg Kroah-HartmanFrom: Uros Bizjak <[email protected]>
[ Upstream commit f96fb2df3eb31ede1b34b0521560967310267750 ]
The detection of atomic update failure in reserve_eilvt_offset() is not correct. The value returned by atomic_cmpxchg() should be compared to the old value from the location to be updated.
If these two are the same, then atomic update succeeded and "eilvt_offsets[offset]" location is updated to "new" in an atomic way.
Otherwise, the atomic update failed and it should be retried with the value from "eilvt_offsets[offset]" - exactly what atomic_try_cmpxchg() does in a correct and more optimal way.
--- arch/x86/kernel/apic/apic.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/x86/kernel/apic/apic.c +2 -3
@@ -403,10 +403,9 @@ static unsigned int reserve_eilvt_offset(int offset, unsigned int new)if (vector && !eilvt_entry_is_changeable (vector, new))/* may not change if vectors are different */ return rsvd; - rsvd =atomic_cmpxchg (&eilvt_offsets[offset], rsvd, new); - }while (rsvd != new); + }while (!atomic_try_cmpxchg (&eilvt_offsets[offset], &rsvd, new)); - rsvd &= ~APIC_EILVT_MASKED ; + rsvd = new & ~APIC_EILVT_MASKED ;if (rsvd && rsvd != vector)pr_info ("LVT offset %d assigned for vector 0x%02x\n" , offset, rsvd);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 38/191 media: dm1105: Fix use after free bug in dm1105_remove due to race condition
In reply to Greg Kroah-HartmanFrom: Zheng Wang <[email protected]>
[ Upstream commit 5abda7a16698d4d1f47af1168d8fa2c640116b4a ]
In dm1105_probe, it called dm1105_ir_init and bound &dm1105->ir.work with dm1105_emit_key.
When it handles IRQ request with dm1105_irq, it may call schedule_work to start the work.
When we call dm1105_remove to remove the driver, there may be a sequence as follows:
Fix it by finishing the work before cleanup in dm1105_remove
CPU0 CPU1
|dm1105_emit_key
dm1105_remove |
dm1105_ir_exit |
rc_unregister_device |
rc_free_device |
rc_dev_release |
kfree(dev); |
|
| rc_keydown
| //use--- drivers/media/pci/dm1105/dm1105.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/pci/dm1105/dm1105.c +1 -0
@@ -1188,6 +1188,7 @@ static void dm1105_remove(struct pci_dev *pdev)struct dvb_demux *dvbdemux = &dev->demux;struct dmx_demux *dmx = &dvbdemux->dmx; +cancel_work_sync (&dev->ir.work);dm1105_ir_exit (dev); dmx->close (dmx);dvb_net_release (&dev->dvbnet);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 39/191 media: saa7134: fix use after free bug in saa7134_finidev due to race condition
In reply to Greg Kroah-HartmanFrom: Zheng Wang <[email protected]>
[ Upstream commit 30cf57da176cca80f11df0d9b7f71581fe601389 ]
In saa7134_initdev, it will call saa7134_hwinit1. There are three function invoking here: saa7134_video_init1, saa7134_ts_init1 and saa7134_vbi_init1.
All of them will init a timer with same function. Take saa7134_video_init1 as an example. It'll bound &dev->video_q.timeout with saa7134_buffer_timeout.
In buffer_activate, the timer funtcion is started.
If we remove the module or device which will call saa7134_finidev to make cleanup, there may be a unfinished work. The possible sequence is as follows, which will cause a typical UAF bug.
Fix it by canceling the timer works accordingly before cleanup in saa7134_finidev.
CPU0 CPU1
|saa7134_buffer_timeout
saa7134_finidev |
kfree(dev); |
|
| saa7134_buffer_next
| //use dev--- drivers/media/pci/saa7134/saa7134-ts.c | 1 + drivers/media/pci/saa7134/saa7134-vbi.c | 1 + drivers/media/pci/saa7134/saa7134-video.c | 1 + 3 files changed, 3 insertions(+)
drivers/media/pci/saa7134/saa7134-ts.c +1 -0
@@ -309,6 +309,7 @@ int saa7134_ts_start(struct saa7134_dev *dev)int saa7134_ts_fini (struct saa7134_dev *dev) { +del_timer_sync (&dev->ts_q.timeout);saa7134_pgtable_free (dev->pci, &dev->ts_q.pt);return 0 ; }
drivers/media/pci/saa7134/saa7134-vbi.c +1 -0
@@ -194,6 +194,7 @@ int saa7134_vbi_init1(struct saa7134_dev *dev)int saa7134_vbi_fini (struct saa7134_dev *dev) {/* nothing */ +del_timer_sync (&dev->vbi_q.timeout);return 0 ; }
drivers/media/pci/saa7134/saa7134-video.c +1 -0
@@ -2213,6 +2213,7 @@ int saa7134_video_init1(struct saa7134_dev *dev)void saa7134_video_fini (struct saa7134_dev *dev) { +del_timer_sync (&dev->video_q.timeout);/* free stuff */ vb2_queue_release (&dev->video_vbq);saa7134_pgtable_free (dev->pci, &dev->video_q.pt);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 40/191 media: rcar_fdp1: Fix the correct variable assignments
In reply to Greg Kroah-HartmanFrom: Tang Bin <[email protected]>
[ Upstream commit af88c2adbb72a09ab1bb5c37ba388c98fecca69b ]
In the function fdp1_probe(), when get irq failed, the function platform_get_irq() log an error message, so remove redundant message here. And the variable type of "ret" is int, the "fdp1->irq" is unsigned int, when irq failed, this place maybe wrong, thus fix it.
Stable-dep-of: c766c90faf93 ("media: rcar_fdp1: Fix refcount leak in probe and remove function")
--- drivers/media/platform/rcar_fdp1.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/media/platform/rcar_fdp1.c +3 -4
@@ -2287,11 +2287,10 @@ static int fdp1_probe(struct platform_device *pdev)return PTR_ERR (fdp1->regs);/* Interrupt service routine registration */ - fdp1->irq = ret =platform_get_irq (pdev,0 ); -if (ret <0 ) { -dev_err (&pdev->dev,"cannot find IRQ\n" ); + ret =platform_get_irq (pdev,0 ); +if (ret <0 )return ret; - } + fdp1->irq = ret; ret =devm_request_irq (&pdev->dev, fdp1->irq, fdp1_irq_handler,0 ,dev_name (&pdev->dev), fdp1);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 41/191 media: rcar_fdp1: Fix refcount leak in probe and remove function
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit c766c90faf93897b77c9c5daa603cffab85ba907 ]
rcar_fcp_get() take reference, which should be balanced with rcar_fcp_put(). Add missing rcar_fcp_put() in fdp1_remove and the error paths of fdp1_probe() to fix this.
--- drivers/media/platform/rcar_fdp1.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/media/platform/rcar_fdp1.c +8 -3
@@ -2313,8 +2313,10 @@ static int fdp1_probe(struct platform_device *pdev)/* Determine our clock rate */ clk =clk_get (&pdev->dev,NULL ); -if (IS_ERR (clk)) -return PTR_ERR (clk); +if (IS_ERR (clk)) { + ret =PTR_ERR (clk); + goto put_dev; + } fdp1->clk_rate =clk_get_rate (clk);clk_put (clk);
@@ -2323,7 +2325,7 @@ static int fdp1_probe(struct platform_device *pdev) ret =v4l2_device_register (&pdev->dev, &fdp1->v4l2_dev);if (ret) {v4l2_err (&fdp1->v4l2_dev,"Failed to register video device\n" ); -return ret; + goto put_dev; }/* M2M registration */
@@ -2388,6 +2390,8 @@ static int fdp1_probe(struct platform_device *pdev) unreg_dev:v4l2_device_unregister (&fdp1->v4l2_dev); +put_dev: +rcar_fcp_put (fdp1->fcp);return ret; }
@@ -2399,6 +2403,7 @@ static int fdp1_remove(struct platform_device *pdev)video_unregister_device (&fdp1->vfd);v4l2_device_unregister (&fdp1->v4l2_dev);pm_runtime_disable (&pdev->dev); +rcar_fcp_put (fdp1->fcp);return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 42/191 media: rc: gpio-ir-recv: Fix support for wake-up
In reply to Greg Kroah-HartmanFrom: Florian Fainelli <[email protected]>
[ Upstream commit 9c592f8ab114875fdb3b2040f01818e53de44991 ]
The driver was intended from the start to be a wake-up source for the system, however due to the absence of a suitable call to device_set_wakeup_capable(), the device_may_wakeup() call used to decide whether to enable the GPIO interrupt as a wake-up source would never happen. Lookup the DT standard "wakeup-source" property and call device_init_wakeup() to ensure the device is flagged as being wakeup capable.
--- drivers/media/rc/gpio-ir-recv.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/rc/gpio-ir-recv.c +2 -0
@@ -91,6 +91,8 @@ static int gpio_ir_recv_probe(struct platform_device *pdev) rcdev->map_name =RC_MAP_EMPTY ; gpio_dev->rcdev = rcdev; +if (of_property_read_bool (np,"wakeup-source" )) +device_init_wakeup (dev, true); rc =devm_rc_register_device (dev, rcdev);if (rc <0 ) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 43/191 x86/ioapic: Dont return 0 from arch_dynirq_lower_bound()
In reply to Greg Kroah-HartmanFrom: Saurabh Sengar <[email protected]>
[ Upstream commit 5af507bef93c09a94fb8f058213b489178f4cbe5 ]
arch_dynirq_lower_bound() is invoked by the core interrupt code to retrieve the lowest possible Linux interrupt number for dynamically allocated interrupts like MSI.
The x86 implementation uses this to exclude the IO/APIC GSI space. This works correctly as long as there is an IO/APIC registered, but returns 0 if not. This has been observed in VMs where the BIOS does not advertise an IO/APIC.
0 is an invalid interrupt number except for the legacy timer interrupt on x86. The return value is unchecked in the core code, so it ends up to allocate interrupt number 0 which is subsequently considered to be invalid by the caller, e.g. the MSI allocation code.
The function has already a check for 0 in the case that an IO/APIC is registered, as ioapic_dynirq_base is 0 in case of device tree setups.
Consolidate this and zero check for both ioapic_dynirq_base and gsi_top, which is used in the case that no IO/APIC is registered.
--- arch/x86/kernel/apic/io_apic.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
arch/x86/kernel/apic/io_apic.c +9 -5
@@ -2449,17 +2449,21 @@ static int io_apic_get_redir_entries(int ioapic)unsigned int arch_dynirq_lower_bound (unsigned int from) { +unsigned int ret; +/* * dmar_alloc_hwirq() may be called before setup_IO_APIC(), so use * gsi_top if ioapic_dynirq_base hasn't been initialized yet. */ -if (!ioapic_initialized) -return gsi_top; + ret = ioapic_dynirq_base ? : gsi_top; +/* -* For DT enabled machines ioapic_dynirq_base is irrelevant and not -* updated. So simply return @from if ioapic_dynirq_base == 0. +* For DT enabled machines ioapic_dynirq_base is irrelevant and +* always 0. gsi_top can be 0 if there is no IO/APIC registered. +* 0 is an invalid interrupt number for dynamic allocations. Return +* @from instead. */ -return ioapic_dynirq_base ? : from; +return ret ? : from; }#ifdef CONFIG_X86_32
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 44/191 arm64: kgdb: Set PSTATE.SS to 1 to re-enable single-step
In reply to Greg Kroah-HartmanFrom: Sumit Garg <[email protected]>
[ Upstream commit af6c0bd59f4f3ad5daad2f7b777954b1954551d5 ]
Currently only the first attempt to single-step has any effect. After that all further stepping remains "stuck" at the same program counter value.
Refer to the ARM Architecture Reference Manual (ARM DDI 0487E.a) D2.12, PSTATE.SS=1 should be set at each step before transferring the PE to the 'Active-not-pending' state. The problem here is PSTATE.SS=1 is not set since the second single-step.
After the first single-step, the PE transferes to the 'Inactive' state, with PSTATE.SS=0 and MDSCR.SS=1, thus PSTATE.SS won't be set to 1 due to kernel_active_single_step()=true. Then the PE transferes to the 'Active-pending' state when ERET and returns to the debugger by step exception.
Before this patch:
==================
Entering kdb (current=0xffff3376039f0000, pid 1) on processor 0 due to Keyboard Entry [0]kdb>
[0]kdb>
[0]kdb> bp write_sysrq_trigger
Instruction(i) BP #0 at 0xffffa45c13d09290 (write_sysrq_trigger)
is enabled addr at ffffa45c13d09290, hardtype=0 installed=0
[0]kdb> go
$ echo h > /proc/sysrq-trigger
Entering kdb (current=0xffff4f7e453f8000, pid 175) on processor 1 due to Breakpoint @ 0xffffad651a309290 [1]kdb> ss
Entering kdb (current=0xffff4f7e453f8000, pid 175) on processor 1 due to SS trap @ 0xffffad651a309294 [1]kdb> ss
Entering kdb (current=0xffff4f7e453f8000, pid 175) on processor 1 due to SS trap @ 0xffffad651a309294 [1]kdb>
After this patch:
=================
Entering kdb (current=0xffff6851c39f0000, pid 1) on processor 0 due to Keyboard Entry [0]kdb> bp write_sysrq_trigger
Instruction(i) BP #0 at 0xffffc02d2dd09290 (write_sysrq_trigger)
is enabled addr at ffffc02d2dd09290, hardtype=0 installed=0
[0]kdb> go
$ echo h > /proc/sysrq-trigger
Entering kdb (current=0xffff6851c53c1840, pid 174) on processor 1 due to Breakpoint @ 0xffffc02d2dd09290 [1]kdb> ss
Entering kdb (current=0xffff6851c53c1840, pid 174) on processor 1 due to SS trap @ 0xffffc02d2dd09294 [1]kdb> ss
Entering kdb (current=0xffff6851c53c1840, pid 174) on processor 1 due to SS trap @ 0xffffc02d2dd09298 [1]kdb> ss
Entering kdb (current=0xffff6851c53c1840, pid 174) on processor 1 due to SS trap @ 0xffffc02d2dd0929c [1]kdb>
--- arch/arm64/include/asm/debug-monitors.h | 1 + arch/arm64/kernel/debug-monitors.c | 5 +++++ arch/arm64/kernel/kgdb.c | 2 ++ 3 files changed, 8 insertions(+)
arch/arm64/include/asm/debug-monitors.h +1 -0
@@ -125,6 +125,7 @@ void user_regs_reset_single_step(struct user_pt_regs *regs,void kernel_enable_single_step (struct pt_regs *regs);void kernel_disable_single_step (void );int kernel_active_single_step (void ); +void kernel_rewind_single_step (struct pt_regs *regs);#ifdef CONFIG_HAVE_HW_BREAKPOINT int reinstall_suspended_bps (struct pt_regs *regs);
arch/arm64/kernel/debug-monitors.c +5 -0
@@ -437,6 +437,11 @@ int kernel_active_single_step(void) }NOKPROBE_SYMBOL (kernel_active_single_step); +void kernel_rewind_single_step (struct pt_regs *regs) +{ +set_regs_spsr_ss (regs); +} +/* ptrace API */ void user_enable_single_step (struct task_struct *task) {
arch/arm64/kernel/kgdb.c +2 -0
@@ -234,6 +234,8 @@ int kgdb_arch_handle_exception(int exception_vector, int signo,*/ if (!kernel_active_single_step ())kernel_enable_single_step (linux_regs); +else +kernel_rewind_single_step (linux_regs); err =0 ;break ;default :
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 45/191 debugobjects: Add percpu free pools
In reply to Greg Kroah-HartmanFrom: Waiman Long <[email protected]>
[ Upstream commit d86998b17a01050c0232231fa481e65ef8171ca6 ]
When a multi-threaded workload does a lot of small memory object allocations and deallocations, it may cause the allocation and freeing of many debug objects. This will make the global pool_lock a bottleneck in the performance of the workload. Since interrupts are disabled when acquiring the pool_lock, it may even cause hard lockups to happen.
To reduce contention of the global pool_lock, add a percpu debug object free pool that can be used to buffer some of the debug object allocation and freeing requests without acquiring the pool_lock. Each CPU will now have a percpu free pool that can hold up to a maximum of 64 debug objects. Allocation and freeing requests will go to the percpu free pool first. If that fails, the pool_lock will be taken and the global free pool will be used.
The presence or absence of obj_cache is used as a marker to see if the percpu cache should be used.
Stable-dep-of: 63a759694eed ("debugobject: Prevent init race with static objects")
--- lib/debugobjects.c | 115 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 91 insertions(+), 24 deletions(-)
lib/debugobjects.c +91 -24
@@ -25,6 +25,7 @@#define ODEBUG_POOL_SIZE 1024#define ODEBUG_POOL_MIN_LEVEL 256 +#define ODEBUG_POOL_PERCPU_SIZE 64#define ODEBUG_CHUNK_SHIFT PAGE_SHIFT#define ODEBUG_CHUNK_SIZE (1 << ODEBUG_CHUNK_SHIFT)
@@ -35,6 +36,17 @@ struct debug_bucket {raw_spinlock_t lock; }; +/* +* Debug object percpu free list +* Access is protected by disabling irq +*/ +struct debug_percpu_free { +struct hlist_head free_objs; +int obj_free; +}; + +static DEFINE_PER_CPU(struct debug_percpu_free, percpu_obj_pool); +static struct debug_bucket obj_hash[ODEBUG_HASH_SIZE ];static struct debug_obj obj_static_pool[ODEBUG_POOL_SIZE ]__initdata ;
@@ -44,13 +56,19 @@ static DEFINE_RAW_SPINLOCK(pool_lock);static HLIST_HEAD (obj_pool);static HLIST_HEAD (obj_to_free); +/* +* Because of the presence of percpu free pools, obj_pool_free will +* under-count those in the percpu free pools. Similarly, obj_pool_used +* will over-count those in the percpu free pools. Adjustments will be +* made at debug_stats_show(). Both obj_pool_min_free and obj_pool_max_used +* can be off. +*/ static int obj_pool_min_free =ODEBUG_POOL_SIZE ;static int obj_pool_free =ODEBUG_POOL_SIZE ;static int obj_pool_used;static int obj_pool_max_used;/* The number of objs on the global free list */ static int obj_nr_tofree; -static struct kmem_cache *obj_cache;static int debug_objects_maxchain__read_mostly ;static int __maybe_unused debug_objects_maxchecked__read_mostly ;
@@ -63,6 +81,7 @@ static int debug_objects_pool_size __read_mostlystatic int debug_objects_pool_min_level__read_mostly =ODEBUG_POOL_MIN_LEVEL ;static struct debug_obj_descr *descr_test__read_mostly ; +static struct kmem_cache *obj_cache__read_mostly ;/* * Track numbers of kmem_cache_alloc()/free() calls done.
@@ -162,6 +181,21 @@ static struct debug_obj *lookup_object(void *addr, struct debug_bucket *b)return NULL ; } +/* +* Allocate a new object from the hlist +*/ +static struct debug_obj *__alloc_object (struct hlist_head *list) +{ +struct debug_obj *obj =NULL ; + +if (list->first) { + obj =hlist_entry (list->first,typeof (*obj), node); +hlist_del (&obj->node); + } + +return obj; +} +/* * Allocate a new object. If the pool is empty, switch off the debugger. * Must be called with interrupts disabled.
@@ -169,20 +203,21 @@ static struct debug_obj *lookup_object(void *addr, struct debug_bucket *b)static struct debug_obj *alloc_object (void *addr,struct debug_bucket *b,struct debug_obj_descr *descr) { -struct debug_obj *obj =NULL ; - -raw_spin_lock (&pool_lock); -if (obj_pool.first) { - obj =hlist_entry (obj_pool.first,typeof (*obj), node); - - obj->object = addr; - obj->descr = descr; - obj->state =ODEBUG_STATE_NONE ; - obj->astate =0 ; -hlist_del (&obj->node); +struct debug_percpu_free *percpu_pool; +struct debug_obj *obj; -hlist_add_head (&obj->node, &b->list); +if (likely (obj_cache)) { + percpu_pool =this_cpu_ptr (&percpu_obj_pool); + obj =__alloc_object (&percpu_pool->free_objs); +if (obj) { + percpu_pool->obj_free--; + goto init_obj; + } + } +raw_spin_lock (&pool_lock); + obj =__alloc_object (&obj_pool); +if (obj) { obj_pool_used++;if (obj_pool_used > obj_pool_max_used) obj_pool_max_used = obj_pool_used;
@@ -193,6 +228,14 @@ alloc_object(void *addr, struct debug_bucket *b, struct debug_obj_descr *descr) }raw_spin_unlock (&pool_lock); +init_obj: +if (obj) { + obj->object = addr; + obj->descr = descr; + obj->state =ODEBUG_STATE_NONE ; + obj->astate =0 ; +hlist_add_head (&obj->node, &b->list); + }return obj; }
@@ -247,8 +290,21 @@ static bool __free_object(struct debug_obj *obj) {unsigned long flags;bool work; +struct debug_percpu_free *percpu_pool; -raw_spin_lock_irqsave (&pool_lock, flags); +local_irq_save (flags); +/* +* Try to free it into the percpu pool first. +*/ + percpu_pool =this_cpu_ptr (&percpu_obj_pool); +if (obj_cache && percpu_pool->obj_free <ODEBUG_POOL_PERCPU_SIZE ) { +hlist_add_head (&obj->node, &percpu_pool->free_objs); + percpu_pool->obj_free++; +local_irq_restore (flags); +return false; + } + +raw_spin_lock (&pool_lock); work = (obj_pool_free > debug_objects_pool_size) && obj_cache; obj_pool_used--;
@@ -259,7 +315,8 @@ static bool __free_object(struct debug_obj *obj) obj_pool_free++;hlist_add_head (&obj->node, &obj_pool); } -raw_spin_unlock_irqrestore (&pool_lock, flags); +raw_spin_unlock (&pool_lock); +local_irq_restore (flags);return work; }
@@ -822,13 +879,19 @@ void debug_check_no_obj_freed(const void *address, unsigned long size)static int debug_stats_show (struct seq_file *m,void *v) { +int cpu, obj_percpu_free =0 ; + +for_each_possible_cpu (cpu) + obj_percpu_free +=per_cpu (percpu_obj_pool.obj_free, cpu); +seq_printf (m,"max_chain :%d\n" , debug_objects_maxchain);seq_printf (m,"max_checked :%d\n" , debug_objects_maxchecked);seq_printf (m,"warnings :%d\n" , debug_objects_warnings);seq_printf (m,"fixups :%d\n" , debug_objects_fixups); -seq_printf (m,"pool_free :%d\n" , obj_pool_free); +seq_printf (m,"pool_free :%d\n" , obj_pool_free + obj_percpu_free); +seq_printf (m,"pool_pcp_free :%d\n" , obj_percpu_free);seq_printf (m,"pool_min_free :%d\n" , obj_pool_min_free); -seq_printf (m,"pool_used :%d\n" , obj_pool_used); +seq_printf (m,"pool_used :%d\n" , obj_pool_used - obj_percpu_free);seq_printf (m,"pool_max_used :%d\n" , obj_pool_max_used);seq_printf (m,"on_free_list :%d\n" , obj_nr_tofree);seq_printf (m,"objs_allocated:%d\n" , debug_objects_allocated);
@@ -1177,9 +1240,20 @@ static int __init debug_objects_replace_static_objects(void)*/ void __init debug_objects_mem_init (void ) { +int cpu; +if (!debug_objects_enabled)return ; +/* +* Initialize the percpu object pools +* +* Initialization is not strictly necessary, but was done for +* completeness. +*/ +for_each_possible_cpu (cpu) +INIT_HLIST_HEAD (&per_cpu (percpu_obj_pool.free_objs, cpu)); + obj_cache = kmem_cache_create("debug_objects_cache", sizeof (struct debug_obj), 0, SLAB_DEBUG_OBJECTS | SLAB_NOLEAKTRACE,
@@ -1191,11 +1265,4 @@ void __init debug_objects_mem_init(void)pr_warn ("out of memory.\n" ); }else debug_objects_selftest (); - -/* -* Increase the thresholds for allocating and freeing objects -* according to the number of possible CPUs available in the system. -*/ - debug_objects_pool_size +=num_possible_cpus () *32 ; - debug_objects_pool_min_level +=num_possible_cpus () *4 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 46/191 debugobjects: Move printk out of db->lock critical sections
In reply to Greg Kroah-HartmanFrom: Waiman Long <[email protected]>
[ Upstream commit d5f34153e526903abe71869dbbc898bfc0f69373 ]
The db->lock is a raw spinlock and so the lock hold time is supposed to be short. This will not be the case when printk() is being involved in some of the critical sections. In order to avoid the long hold time, in case some messages need to be printed, the debug_object_is_on_stack() and debug_print_object() calls are now moved out of those critical sections.
Stable-dep-of: 63a759694eed ("debugobject: Prevent init race with static objects")
--- lib/debugobjects.c | 58 +++++++++++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 19 deletions(-)
lib/debugobjects.c +39 -19
@@ -429,6 +429,7 @@ static void __debug_object_init(void *addr, struct debug_obj_descr *descr, int onstack) {enum debug_obj_state state; +bool check_stack = false;struct debug_bucket *db;struct debug_obj *obj;unsigned long flags;
@@ -448,7 +449,7 @@ __debug_object_init(void *addr, struct debug_obj_descr *descr, int onstack)debug_objects_oom ();return ; } -debug_object_is_on_stack (addr, onstack); + check_stack = true; }switch (obj->state) {
@@ -459,20 +460,23 @@ __debug_object_init(void *addr, struct debug_obj_descr *descr, int onstack)break ;case ODEBUG_STATE_ACTIVE : -debug_print_object (obj,"init" ); state = obj->state;raw_spin_unlock_irqrestore (&db->lock, flags); +debug_print_object (obj,"init" );debug_object_fixup (descr->fixup_init, addr, state);return ;case ODEBUG_STATE_DESTROYED : +raw_spin_unlock_irqrestore (&db->lock, flags);debug_print_object (obj,"init" ); -break ; +return ;default :break ; }raw_spin_unlock_irqrestore (&db->lock, flags); +if (check_stack) +debug_object_is_on_stack (addr, onstack); }/**
@@ -530,6 +534,8 @@ int debug_object_activate(void *addr, struct debug_obj_descr *descr) obj =lookup_object (addr, db);if (obj) { +bool print_object = false; +switch (obj->state) {case ODEBUG_STATE_INIT :case ODEBUG_STATE_INACTIVE :
@@ -538,14 +544,14 @@ int debug_object_activate(void *addr, struct debug_obj_descr *descr)break ;case ODEBUG_STATE_ACTIVE : -debug_print_object (obj,"activate" ); state = obj->state;raw_spin_unlock_irqrestore (&db->lock, flags); +debug_print_object (obj,"activate" ); ret =debug_object_fixup (descr->fixup_activate, addr, state);return ret ?0 : -EINVAL ;case ODEBUG_STATE_DESTROYED : -debug_print_object (obj,"activate" ); + print_object = true; ret = -EINVAL ;break ;default :
@@ -553,10 +559,13 @@ int debug_object_activate(void *addr, struct debug_obj_descr *descr)break ; }raw_spin_unlock_irqrestore (&db->lock, flags); +if (print_object) +debug_print_object (obj,"activate" );return ret; }raw_spin_unlock_irqrestore (&db->lock, flags); +/* * We are here when a static object is activated. We * let the type specific code confirm whether this is
@@ -588,6 +597,7 @@ void debug_object_deactivate(void *addr, struct debug_obj_descr *descr)struct debug_bucket *db;struct debug_obj *obj;unsigned long flags; +bool print_object = false;if (!debug_objects_enabled)return ;
@@ -605,24 +615,27 @@ void debug_object_deactivate(void *addr, struct debug_obj_descr *descr)if (!obj->astate) obj->state =ODEBUG_STATE_INACTIVE ;else -debug_print_object (obj,"deactivate" ); + print_object = true;break ;case ODEBUG_STATE_DESTROYED : -debug_print_object (obj,"deactivate" ); + print_object = true;break ;default :break ; } - }else { + } + +raw_spin_unlock_irqrestore (&db->lock, flags); +if (!obj) {struct debug_obj o = { .object = addr, .state =ODEBUG_STATE_NOTAVAILABLE , .descr = descr };debug_print_object (&o,"deactivate" ); + }else if (print_object) { +debug_print_object (obj,"deactivate" ); } - -raw_spin_unlock_irqrestore (&db->lock, flags); }EXPORT_SYMBOL_GPL (debug_object_deactivate);
@@ -637,6 +650,7 @@ void debug_object_destroy(void *addr, struct debug_obj_descr *descr)struct debug_bucket *db;struct debug_obj *obj;unsigned long flags; +bool print_object = false;if (!debug_objects_enabled)return ;
@@ -656,20 +670,22 @@ void debug_object_destroy(void *addr, struct debug_obj_descr *descr) obj->state =ODEBUG_STATE_DESTROYED ;break ;case ODEBUG_STATE_ACTIVE : -debug_print_object (obj,"destroy" ); state = obj->state;raw_spin_unlock_irqrestore (&db->lock, flags); +debug_print_object (obj,"destroy" );debug_object_fixup (descr->fixup_destroy, addr, state);return ;case ODEBUG_STATE_DESTROYED : -debug_print_object (obj,"destroy" ); + print_object = true;break ;default :break ; } out_unlock:raw_spin_unlock_irqrestore (&db->lock, flags); +if (print_object) +debug_print_object (obj,"destroy" ); }EXPORT_SYMBOL_GPL (debug_object_destroy);
@@ -698,9 +714,9 @@ void debug_object_free(void *addr, struct debug_obj_descr *descr)switch (obj->state) {case ODEBUG_STATE_ACTIVE : -debug_print_object (obj,"free" ); state = obj->state;raw_spin_unlock_irqrestore (&db->lock, flags); +debug_print_object (obj,"free" );debug_object_fixup (descr->fixup_free, addr, state);return ;default :
@@ -773,6 +789,7 @@ debug_object_active_state(void *addr, struct debug_obj_descr *descr,struct debug_bucket *db;struct debug_obj *obj;unsigned long flags; +bool print_object = false;if (!debug_objects_enabled)return ;
@@ -788,22 +805,25 @@ debug_object_active_state(void *addr, struct debug_obj_descr *descr,if (obj->astate == expect) obj->astate = next;else -debug_print_object (obj,"active_state" ); + print_object = true;break ;default : -debug_print_object (obj,"active_state" ); + print_object = true;break ; } - }else { + } + +raw_spin_unlock_irqrestore (&db->lock, flags); +if (!obj) {struct debug_obj o = { .object = addr, .state =ODEBUG_STATE_NOTAVAILABLE , .descr = descr };debug_print_object (&o,"active_state" ); + }else if (print_object) { +debug_print_object (obj,"active_state" ); } - -raw_spin_unlock_irqrestore (&db->lock, flags); }EXPORT_SYMBOL_GPL (debug_object_active_state);
@@ -839,10 +859,10 @@ static void __debug_check_no_obj_freed(const void *address, unsigned long size)switch (obj->state) {case ODEBUG_STATE_ACTIVE : -debug_print_object (obj,"free" ); descr = obj->descr; state = obj->state;raw_spin_unlock_irqrestore (&db->lock, flags); +debug_print_object (obj,"free" );debug_object_fixup (descr->fixup_free, (void *) oaddr, state); goto repeat;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 47/191 debugobject: Prevent init race with static objects
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
[ Upstream commit 63a759694eed61025713b3e14dd827c8548daadc ]
Statically initialized objects are usually not initialized via the init() function of the subsystem. They are special cased and the subsystem provides a function to validate whether an object which is not yet tracked by debugobjects is statically initialized. This means the object is started to be tracked on first use, e.g. activation.
This works perfectly fine, unless there are two concurrent operations on that object. Schspa decoded the problem:
T0 T1
debug_object_assert_init(addr)
lock_hash_bucket()
obj = lookup_object(addr);
if (!obj) {
unlock_hash_bucket();
- > preemption
lock_subsytem_object(addr);
activate_object(addr)
lock_hash_bucket();
obj = lookup_object(addr);
if (!obj) {
unlock_hash_bucket();
if (is_static_object(addr))
init_and_track(addr);
lock_hash_bucket();
obj = lookup_object(addr);
obj->state = ACTIVATED;
unlock_hash_bucket();
subsys function modifies content of addr,
so static object detection does
not longer work.
unlock_subsytem_object(addr);
if (is_static_object(addr)) <- Fails
debugobject emits a warning and invokes the fixup function which
reinitializes the already active object in the worst case.This race exists forever, but was never observed until mod_timer() got a debug_object_assert_init() added which is outside of the timer base lock held section right at the beginning of the function to cover the lockless early exit points too.
Rework the code so that the lookup, the static object check and the tracking object association happens atomically under the hash bucket lock. This prevents the issue completely as all callers are serialized on the hash bucket lock and therefore cannot observe inconsistent state.
--- lib/debugobjects.c | 125 ++++++++++++++++++++++++--------------------- 1 file changed, 66 insertions(+), 59 deletions(-)
lib/debugobjects.c +66 -59
@@ -196,10 +196,6 @@ static struct debug_obj *__alloc_object(struct hlist_head *list)return obj; } -/* -* Allocate a new object. If the pool is empty, switch off the debugger. -* Must be called with interrupts disabled. -*/ static struct debug_obj *alloc_object (void *addr,struct debug_bucket *b,struct debug_obj_descr *descr) {
@@ -425,11 +421,49 @@ static void debug_object_is_on_stack(void *addr, int onstack)WARN_ON (1 ); } +static struct debug_obj *lookup_object_or_alloc (void *addr,struct debug_bucket *b, +struct debug_obj_descr *descr, +bool onstack,bool alloc_ifstatic) +{ +struct debug_obj *obj =lookup_object (addr, b); +enum debug_obj_state state =ODEBUG_STATE_NONE ; + +if (likely (obj)) +return obj; + +/* +* debug_object_init() unconditionally allocates untracked +* objects. It does not matter whether it is a static object or +* not. +* +* debug_object_assert_init() and debug_object_activate() allow +* allocation only if the descriptor callback confirms that the +* object is static and considered initialized. For non-static +* objects the allocation needs to be done from the fixup callback. +*/ +if (unlikely (alloc_ifstatic)) { +if (!descr->is_static_object || !descr->is_static_object (addr)) +return ERR_PTR (-ENOENT ); +/* Statically allocated objects are considered initialized */ + state =ODEBUG_STATE_INIT ; + } + + obj =alloc_object (addr, b, descr); +if (likely (obj)) { + obj->state = state; +debug_object_is_on_stack (addr, onstack); +return obj; + } + +/* Out of memory. Do the cleanup outside of the locked region */ + debug_objects_enabled =0 ; +return NULL ; +} +static void __debug_object_init (void *addr,struct debug_obj_descr *descr,int onstack) {enum debug_obj_state state; -bool check_stack = false;struct debug_bucket *db;struct debug_obj *obj;unsigned long flags;
@@ -440,16 +474,11 @@ __debug_object_init(void *addr, struct debug_obj_descr *descr, int onstack)raw_spin_lock_irqsave (&db->lock, flags); - obj =lookup_object (addr, db); -if (!obj) { - obj =alloc_object (addr, db, descr); -if (!obj) { - debug_objects_enabled =0 ; -raw_spin_unlock_irqrestore (&db->lock, flags); -debug_objects_oom (); -return ; - } - check_stack = true; + obj =lookup_object_or_alloc (addr, db, descr, onstack, false); +if (unlikely (!obj)) { +raw_spin_unlock_irqrestore (&db->lock, flags); +debug_objects_oom (); +return ; }switch (obj->state) {
@@ -475,8 +504,6 @@ __debug_object_init(void *addr, struct debug_obj_descr *descr, int onstack) }raw_spin_unlock_irqrestore (&db->lock, flags); -if (check_stack) -debug_object_is_on_stack (addr, onstack); }/**
@@ -516,14 +543,12 @@ EXPORT_SYMBOL_GPL(debug_object_init_on_stack);*/ int debug_object_activate (void *addr,struct debug_obj_descr *descr) { +struct debug_obj o = { .object = addr, .state =ODEBUG_STATE_NOTAVAILABLE , .descr = descr };enum debug_obj_state state;struct debug_bucket *db;struct debug_obj *obj;unsigned long flags;int ret; -struct debug_obj o = { .object = addr, - .state =ODEBUG_STATE_NOTAVAILABLE , - .descr = descr };if (!debug_objects_enabled)return 0 ;
@@ -532,8 +557,8 @@ int debug_object_activate(void *addr, struct debug_obj_descr *descr)raw_spin_lock_irqsave (&db->lock, flags); - obj =lookup_object (addr, db); -if (obj) { + obj =lookup_object_or_alloc (addr, db, descr, false, true); +if (likely (!IS_ERR_OR_NULL (obj))) {bool print_object = false;switch (obj->state) {
@@ -566,24 +591,16 @@ int debug_object_activate(void *addr, struct debug_obj_descr *descr)raw_spin_unlock_irqrestore (&db->lock, flags); -/* -* We are here when a static object is activated. We -* let the type specific code confirm whether this is -* true or not. if true, we just make sure that the -* static object is tracked in the object tracker. If -* not, this must be a bug, so we try to fix it up. -*/ -if (descr->is_static_object && descr->is_static_object (addr)) { -/* track this static object */ -debug_object_init (addr, descr); -debug_object_activate (addr, descr); - }else { -debug_print_object (&o,"activate" ); - ret =debug_object_fixup (descr->fixup_activate, addr, -ODEBUG_STATE_NOTAVAILABLE ); -return ret ?0 : -EINVAL ; +/* If NULL the allocation has hit OOM */ +if (!obj) { +debug_objects_oom (); +return 0 ; } -return 0 ; + +/* Object is neither static nor tracked. It's not initialized */ +debug_print_object (&o,"activate" ); + ret =debug_object_fixup (descr->fixup_activate, addr,ODEBUG_STATE_NOTAVAILABLE ); +return ret ?0 : -EINVAL ; }EXPORT_SYMBOL_GPL (debug_object_activate);
@@ -737,6 +754,7 @@ EXPORT_SYMBOL_GPL(debug_object_free);*/ void debug_object_assert_init (void *addr,struct debug_obj_descr *descr) { +struct debug_obj o = { .object = addr, .state =ODEBUG_STATE_NOTAVAILABLE , .descr = descr };struct debug_bucket *db;struct debug_obj *obj;unsigned long flags;
@@ -747,31 +765,20 @@ void debug_object_assert_init(void *addr, struct debug_obj_descr *descr) db =get_bucket ((unsigned long ) addr);raw_spin_lock_irqsave (&db->lock, flags); + obj =lookup_object_or_alloc (addr, db, descr, false, true); +raw_spin_unlock_irqrestore (&db->lock, flags); +if (likely (!IS_ERR_OR_NULL (obj))) +return ; - obj =lookup_object (addr, db); +/* If NULL the allocation has hit OOM */ if (!obj) { -struct debug_obj o = { .object = addr, - .state =ODEBUG_STATE_NOTAVAILABLE , - .descr = descr }; - -raw_spin_unlock_irqrestore (&db->lock, flags); -/* -* Maybe the object is static, and we let the type specific -* code confirm. Track this static object if true, else invoke -* fixup. -*/ -if (descr->is_static_object && descr->is_static_object (addr)) { -/* Track this static object */ -debug_object_init (addr, descr); - }else { -debug_print_object (&o,"assert_init" ); -debug_object_fixup (descr->fixup_assert_init, addr, -ODEBUG_STATE_NOTAVAILABLE ); - } +debug_objects_oom ();return ; } -raw_spin_unlock_irqrestore (&db->lock, flags); +/* Object is neither tracked nor static. It's not initialized. */ +debug_print_object (&o,"assert_init" ); +debug_object_fixup (descr->fixup_assert_init, addr,ODEBUG_STATE_NOTAVAILABLE ); }EXPORT_SYMBOL_GPL (debug_object_assert_init);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 48/191 wifi: ath6kl: minor fix for allocation size
In reply to Greg Kroah-HartmanFrom: Alexey V. Vissarionov <[email protected]>
[ Upstream commit 778f83f889e7fca37780d9640fcbd0229ae38eaa ]
Although the "param" pointer occupies more or equal space compared to "*param", the allocation size should use the size of variable itself.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/net/wireless/ath/ath6kl/bmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath6kl/bmi.c +1 -1
@@ -246,7 +246,7 @@ int ath6kl_bmi_execute(struct ath6kl *ar, u32 addr, u32 *param)return -EACCES ; } - size =sizeof (cid) +sizeof (addr) +sizeof (param); + size =sizeof (cid) +sizeof (addr) +sizeof (*param);if (size > ar->bmi.max_cmd_size) {WARN_ON (1 );return -EINVAL ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 49/191 wifi: ath9k: hif_usb: fix memory leak of remain_skbs
In reply to Greg Kroah-HartmanFrom: Fedor Pchelkin <[email protected]>
[ Upstream commit 7654cc03eb699297130b693ec34e25f77b17c947 ]
hif_dev->remain_skb is allocated and used exclusively in ath9k_hif_usb_rx_stream(). It is implied that an allocated remain_skb is processed and subsequently freed (in error paths) only during the next call of ath9k_hif_usb_rx_stream().
So, if the urbs are deallocated between those two calls due to the device deinitialization or suspend, it is possible that ath9k_hif_usb_rx_stream() is not called next time and the allocated remain_skb is leaked. Our local Syzkaller instance was able to trigger that.
remain_skb makes sense when receiving two consecutive urbs which are logically linked together, i.e. a specific data field from the first skb indicates a cached skb to be allocated, memcpy'd with some data and subsequently processed in the next call to ath9k_hif_usb_rx_stream(). Urbs deallocation supposedly makes that link irrelevant so we need to free the cached skb in those cases.
Fix the leak by introducing a function to explicitly free remain_skb (if it is not NULL) when the rx urbs have been deallocated. remain_skb is NULL when it has not been allocated at all (hif_dev struct is kzalloced) or when it has been processed in next call to ath9k_hif_usb_rx_stream().
Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
--- drivers/net/wireless/ath/ath9k/hif_usb.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
drivers/net/wireless/ath/ath9k/hif_usb.c +19 -0
@@ -534,6 +534,24 @@ static struct ath9k_htc_hif hif_usb = { .send = hif_usb_send, }; +/* Need to free remain_skb allocated in ath9k_hif_usb_rx_stream +* in case ath9k_hif_usb_rx_stream wasn't called next time to +* process the buffer and subsequently free it. +*/ +static void ath9k_hif_usb_free_rx_remain_skb (struct hif_device_usb *hif_dev) +{ +unsigned long flags; + +spin_lock_irqsave (&hif_dev->rx_lock, flags); +if (hif_dev->remain_skb) { +dev_kfree_skb_any (hif_dev->remain_skb); + hif_dev->remain_skb =NULL ; + hif_dev->rx_remain_len =0 ; +RX_STAT_INC (hif_dev, skb_dropped); + } +spin_unlock_irqrestore (&hif_dev->rx_lock, flags); +} +static void ath9k_hif_usb_rx_stream (struct hif_device_usb *hif_dev,struct sk_buff *skb) {
@@ -868,6 +886,7 @@ static int ath9k_hif_usb_alloc_tx_urbs(struct hif_device_usb *hif_dev)static void ath9k_hif_usb_dealloc_rx_urbs (struct hif_device_usb *hif_dev) {usb_kill_anchored_urbs (&hif_dev->rx_submitted); +ath9k_hif_usb_free_rx_remain_skb (hif_dev); }static int ath9k_hif_usb_alloc_rx_urbs (struct hif_device_usb *hif_dev)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 50/191 wifi: ath5k: fix an off by one check in ath5k_eeprom_read_freq_list()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 4c856ee12df85aabd437c3836ed9f68d94268358 ]
This loop checks that i < max at the start of loop but then it does i++ which could put it past the end of the array. It's harmless to check again and prevent a potential out of bounds.
--- drivers/net/wireless/ath/ath5k/eeprom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath5k/eeprom.c +1 -1
@@ -529,7 +529,7 @@ ath5k_eeprom_read_freq_list(struct ath5k_hw *ah, int *offset, int max, ee->ee_n_piers[mode]++; freq2 = (val >>8 ) &0xff ; -if (!freq2) +if (!freq2 || i >= max)break ; pc[i++].freq = ath5k_eeprom_bin2freq(ee,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 51/191 wifi: ath6kl: reduce WARN to dev_dbg() in callback
In reply to Greg Kroah-HartmanFrom: Fedor Pchelkin <[email protected]>
[ Upstream commit 75c4a8154cb6c7239fb55d5550f481f6765fb83c ]
The warn is triggered on a known race condition, documented in the code above the test, that is correctly handled. Using WARN() hinders automated testing. Reducing severity.
--- drivers/net/wireless/ath/ath6kl/htc_pipe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath6kl/htc_pipe.c +2 -2
@@ -963,8 +963,8 @@ static int ath6kl_htc_pipe_rx_complete(struct ath6kl *ar, struct sk_buff *skb,* Thus the possibility of ar->htc_target being NULL * via ath6kl_recv_complete -> ath6kl_usb_io_comp_work. */ -if (WARN_ON_ONCE (!target)) { -ath6kl_err ("Target not yet initialized\n" ); +if (!target) { +ath6kl_dbg (ATH6KL_DBG_HTC ,"Target not yet initialized\n" ); status = -EINVAL ; goto free_skb; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 52/191 tools: bpftool: Remove invalid \ json escape
In reply to Greg Kroah-HartmanFrom: Luis Gerhorst <[email protected]>
[ Upstream commit c679bbd611c08b0559ffae079330bc4e5574696a ]
RFC8259 ("The JavaScript Object Notation (JSON) Data Interchange Format") only specifies \", \\, \/, \b, \f, \n, \r, and \r as valid two-character escape sequences. This does not include \', which is not required in JSON because it exclusively uses double quotes as string separators.
Solidus (/) may be escaped, but does not have to. Only reverse solidus (\), double quotes ("), and the control characters have to be escaped. Therefore, with this fix, bpftool correctly supports all valid two-character escape sequences (but still does not support characters that require multi-character escape sequences).
Witout this fix, attempting to load a JSON file generated by bpftool using Python 3.10.6's default json.load() may fail with the error "Invalid \escape" if the file contains the invalid escaped single quote (\').
--- tools/bpf/bpftool/json_writer.c | 3 --- 1 file changed, 3 deletions(-)
tools/bpf/bpftool/json_writer.c +0 -3
@@ -84,9 +84,6 @@ static void jsonw_puts(json_writer_t *self, const char *str)case '"' :fputs ("\\\"" , self->out);break ; -case '\'' : -fputs ("\\\'" , self->out); -break ;default :putc (*str, self->out); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 53/191 scm: fix MSG_CTRUNC setting condition for SO_PASSSEC
In reply to Greg Kroah-HartmanFrom: Alexander Mikhalitsyn <[email protected]>
[ Upstream commit a02d83f9947d8f71904eda4de046630c3eb6802c ]
Currently, kernel would set MSG_CTRUNC flag if msg_control buffer wasn't provided and SO_PASSCRED was set or if there was pending SCM_RIGHTS.
For some reason we have no corresponding check for SO_PASSSEC.
In the recvmsg(2) doc we have:
MSG_CTRUNC
indicates that some control data was discarded due to lack of space in the buffer for ancillary data.
So, we need to set MSG_CTRUNC flag for all types of SCM.
This change can break applications those don't check MSG_CTRUNC flag.
v2:
- commit message was rewritten according to Eric's suggestion
--- include/net/scm.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
include/net/scm.h +12 -1
@@ -105,16 +105,27 @@ static inline void scm_passec(struct socket *sock, struct msghdr *msg, struct sc } } } + +static inline bool scm_has_secdata (struct socket *sock) +{ +return test_bit (SOCK_PASSSEC , &sock->flags); +}#else static inline void scm_passec (struct socket *sock,struct msghdr *msg,struct scm_cookie *scm) { } + +static inline bool scm_has_secdata (struct socket *sock) +{ +return false; +}#endif /* CONFIG_SECURITY_NETWORK */ static __inline__void scm_recv (struct socket *sock,struct msghdr *msg,struct scm_cookie *scm,int flags) {if (!msg->msg_control) { -if (test_bit (SOCK_PASSCRED , &sock->flags) || scm->fp) +if (test_bit (SOCK_PASSCRED , &sock->flags) || scm->fp || +scm_has_secdata (sock)) msg->msg_flags |=MSG_CTRUNC ;scm_destroy (scm);return ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 54/191 vlan: partially enable SIOCSHWTSTAMP in container
In reply to Greg Kroah-HartmanFrom: Vadim Fedorenko <[email protected]>
[ Upstream commit 731b73dba359e3ff00517c13aa0daa82b34ff466 ]
Setting timestamp filter was explicitly disabled on vlan devices in containers because it might affect other processes on the host. But it's absolutely legit in case when real device is in the same namespace.
--- net/8021q/vlan_dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/8021q/vlan_dev.c +1 -1
@@ -369,7 +369,7 @@ static int vlan_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)switch (cmd) {case SIOCSHWTSTAMP : -if (!net_eq (dev_net (dev), &init_net)) +if (!net_eq (dev_net (dev),dev_net (real_dev)))break ;case SIOCGMIIPHY :case SIOCGMIIREG :
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 55/191 net/packet: convert po->origdev to an atomic flag
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit ee5675ecdf7a4e713ed21d98a70c2871d6ebed01 ]
syzbot/KCAN reported that po->origdev can be read
while another thread is changing its value.
We can avoid this splat by converting this field
to an actual bit.
Following patches will convert remaining 1bit fields.
--- net/packet/af_packet.c | 10 ++++------ net/packet/diag.c | 2 +- net/packet/internal.h | 22 +++++++++++++++++++++- 3 files changed, 26 insertions(+), 8 deletions(-)
net/packet/af_packet.c +4 -6
@@ -2105,7 +2105,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, sll = &PACKET_SKB_CB (skb)->sa.ll; sll->sll_hatype = dev->type; sll->sll_pkttype = skb->pkt_type; -if (unlikely (po->origdev)) +if (unlikely (packet_sock_flag (po,PACKET_SOCK_ORIGDEV ))) sll->sll_ifindex = orig_dev->ifindex;else sll->sll_ifindex = dev->ifindex;
@@ -2371,7 +2371,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, sll->sll_hatype = dev->type; sll->sll_protocol = skb->protocol; sll->sll_pkttype = skb->pkt_type; -if (unlikely (po->origdev)) +if (unlikely (packet_sock_flag (po,PACKET_SOCK_ORIGDEV ))) sll->sll_ifindex = orig_dev->ifindex;else sll->sll_ifindex = dev->ifindex;
@@ -3841,9 +3841,7 @@ packet_setsockopt(struct socket *sock, int level, int optname, char __user *optvif (copy_from_user (&val, optval,sizeof (val)))return -EFAULT ; -lock_sock (sk); - po->origdev = !!val; -release_sock (sk); +packet_sock_flag_set (po,PACKET_SOCK_ORIGDEV , val);return 0 ; }case PACKET_VNET_HDR :
@@ -3976,7 +3974,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname, val = po->auxdata;break ;case PACKET_ORIGDEV : - val = po->origdev; + val =packet_sock_flag (po,PACKET_SOCK_ORIGDEV );break ;case PACKET_VNET_HDR : val = po->has_vnet_hdr;
net/packet/diag.c +1 -1
@@ -24,7 +24,7 @@ static int pdiag_put_info(const struct packet_sock *po, struct sk_buff *nlskb) pinfo.pdi_flags |=PDI_RUNNING ;if (po->auxdata) pinfo.pdi_flags |=PDI_AUXDATA ; -if (po->origdev) +if (packet_sock_flag (po,PACKET_SOCK_ORIGDEV )) pinfo.pdi_flags |=PDI_ORIGDEV ;if (po->has_vnet_hdr) pinfo.pdi_flags |=PDI_VNETHDR ;
net/packet/internal.h +21 -1
@@ -115,9 +115,9 @@ struct packet_sock {int copy_thresh;spinlock_t bind_lock;struct mutex pg_vec_lock; +unsigned long flags;unsigned int running;/* bind_lock must be held */ unsigned int auxdata:1, /* writer must hold sock lock */ - origdev:1, has_vnet_hdr:1, tp_loss:1, tp_tx_has_off:1;
@@ -142,4 +142,24 @@ static struct packet_sock *pkt_sk(struct sock *sk) return (struct packet_sock *)sk; } +enum packet_sock_flags { +PACKET_SOCK_ORIGDEV , +}; + +static inline void packet_sock_flag_set (struct packet_sock *po, +enum packet_sock_flags flag, +bool val) +{ +if (val) +set_bit (flag, &po->flags); +else +clear_bit (flag, &po->flags); +} + +static inline bool packet_sock_flag (const struct packet_sock *po, +enum packet_sock_flags flag) +{ +return test_bit (flag, &po->flags); +} +#endif
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 56/191 net/packet: convert po->auxdata to an atomic flag
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit fd53c297aa7b077ae98a3d3d2d3aa278a1686ba6 ]
po->auxdata can be read while another thread is changing its value, potentially raising KCSAN splat.
Convert it to PACKET_SOCK_AUXDATA flag.
--- net/packet/af_packet.c | 8 +++----- net/packet/diag.c | 2 +- net/packet/internal.h | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-)
net/packet/af_packet.c +3 -5
@@ -3444,7 +3444,7 @@ static int packet_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,memcpy (msg->msg_name, &PACKET_SKB_CB (skb)->sa, copy_len); } -if (pkt_sk (sk)->auxdata) { +if (packet_sock_flag (pkt_sk (sk),PACKET_SOCK_AUXDATA )) {struct tpacket_auxdata aux; aux.tp_status =TP_STATUS_USER ;
@@ -3827,9 +3827,7 @@ packet_setsockopt(struct socket *sock, int level, int optname, char __user *optvif (copy_from_user (&val, optval,sizeof (val)))return -EFAULT ; -lock_sock (sk); - po->auxdata = !!val; -release_sock (sk); +packet_sock_flag_set (po,PACKET_SOCK_AUXDATA , val);return 0 ; }case PACKET_ORIGDEV :
@@ -3971,7 +3969,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,break ;case PACKET_AUXDATA : - val = po->auxdata; + val =packet_sock_flag (po,PACKET_SOCK_AUXDATA );break ;case PACKET_ORIGDEV : val =packet_sock_flag (po,PACKET_SOCK_ORIGDEV );
net/packet/diag.c +1 -1
@@ -22,7 +22,7 @@ static int pdiag_put_info(const struct packet_sock *po, struct sk_buff *nlskb) pinfo.pdi_flags =0 ;if (po->running) pinfo.pdi_flags |=PDI_RUNNING ; -if (po->auxdata) +if (packet_sock_flag (po,PACKET_SOCK_AUXDATA )) pinfo.pdi_flags |=PDI_AUXDATA ;if (packet_sock_flag (po,PACKET_SOCK_ORIGDEV )) pinfo.pdi_flags |=PDI_ORIGDEV ;
net/packet/internal.h +2 -2
@@ -117,8 +117,7 @@ struct packet_sock {struct mutex pg_vec_lock;unsigned long flags;unsigned int running;/* bind_lock must be held */ - unsigned int auxdata:1, /* writer must hold sock lock */ - has_vnet_hdr:1, + unsigned int has_vnet_hdr:1, /* writer must hold sock lock */ tp_loss:1, tp_tx_has_off:1;int pressure;
@@ -144,6 +143,7 @@ static struct packet_sock *pkt_sk(struct sock *sk)enum packet_sock_flags {PACKET_SOCK_ORIGDEV , +PACKET_SOCK_AUXDATA , }; static inline void packet_sock_flag_set(struct packet_sock *po,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 57/191 scsi: target: iscsit: Fix TAS handling during conn cleanup
In reply to Greg Kroah-HartmanFrom: Mike Christie <[email protected]>
[ Upstream commit cc79da306ebb2edb700c3816b90219223182ac3c ]
Fix a bug added in commit f36199355c64 ("scsi: target: iscsi: Fix cmd abort fabric stop race").
If CMD_T_TAS is set on the se_cmd we must call iscsit_free_cmd() to do the last put on the cmd and free it, because the connection is down and we will not up sending the response and doing the put from the normal I/O path.
Add a check for CMD_T_TAS in iscsit_release_commands_from_conn() so we now detect this case and run iscsit_free_cmd().
--- drivers/target/iscsi/iscsi_target.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/target/iscsi/iscsi_target.c +9 -7
@@ -4056,9 +4056,12 @@ static void iscsit_release_commands_from_conn(struct iscsi_conn *conn)list_for_each_entry_safe (cmd, cmd_tmp, &tmp_list, i_conn_node) {struct se_cmd *se_cmd = &cmd->se_cmd; -if (se_cmd->se_tfo !=NULL ) { -spin_lock_irq (&se_cmd->t_state_lock); -if (se_cmd->transport_state &CMD_T_ABORTED ) { +if (!se_cmd->se_tfo) +continue ; + +spin_lock_irq (&se_cmd->t_state_lock); +if (se_cmd->transport_state &CMD_T_ABORTED ) { +if (!(se_cmd->transport_state &CMD_T_TAS ))/* * LIO's abort path owns the cleanup for this, * so put it back on the list and let
@@ -4066,11 +4069,10 @@ static void iscsit_release_commands_from_conn(struct iscsi_conn *conn)*/ list_move_tail (&cmd->i_conn_node, &conn->conn_cmd_list); - }else { - se_cmd->transport_state |=CMD_T_FABRIC_STOP ; - } -spin_unlock_irq (&se_cmd->t_state_lock); + }else { + se_cmd->transport_state |=CMD_T_FABRIC_STOP ; } +spin_unlock_irq (&se_cmd->t_state_lock); }spin_unlock_bh (&conn->cmd_lock);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 58/191 scsi: megaraid: Fix mega_cmd_done() CMDID_INT_CMDS
In reply to Greg Kroah-HartmanFrom: Danila Chernetsov <[email protected]>
[ Upstream commit 75cb113cd43f06aaf4f1bda0069cfd5b98e909eb ]
When cmdid == CMDID_INT_CMDS, the 'cmds' pointer is NULL but is dereferenced below.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/scsi/megaraid.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/megaraid.c +1 -0
@@ -1444,6 +1444,7 @@ mega_cmd_done(adapter_t *adapter, u8 completed[], int nstatus, int status)*/ if (cmdid ==CMDID_INT_CMDS ) { scb = &adapter->int_scb; + cmd = scb->cmd;list_del_init (&scb->list); scb->state =SCB_FREE ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 59/191 rtlwifi: rtl_pci: Fix memory leak when hardware init fails
In reply to Greg Kroah-HartmanFrom: Larry Finger <[email protected]>
[ Upstream commit 8cc782cd997dc4eb3ac183228d563727884ba874 ]
If the call to hw_init() fails for any of the drivers, the driver will leak memory that was allocated in BT coexistence setup. Technically, each of the drivers should have done this free; however placing it in rtl_pci fixes all the drivers with only a single patch.
Stable-dep-of: 905a9241e4e8 ("wifi: rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_rfreg()")
--- drivers/net/wireless/realtek/rtlwifi/pci.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/realtek/rtlwifi/pci.c +2 -0
@@ -1817,6 +1817,8 @@ static int rtl_pci_start(struct ieee80211_hw *hw)if (err) {RT_TRACE (rtlpriv,COMP_INIT ,DBG_DMESG ,"Failed to config hardware!\n" ); +kfree (rtlpriv->btcoexist.btc_context); +kfree (rtlpriv->btcoexist.wifi_only_context);return err; } rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RETRY_LIMIT,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 60/191 rtlwifi: Start changing RT_TRACE into rtl_dbg
In reply to Greg Kroah-HartmanFrom: Larry Finger <[email protected]>
[ Upstream commit 78a7245d84300cd616dbce26e6fc42a039a62279 ]
The macro name RT_TRACE makes it seem that it is used for tracing, when is actually used for debugging. Change the name to RT_DEBUG.
This step creates the new macro while keeping the old RT_TRACE to allow building. It will be removed at the end of the patch series.
Stable-dep-of: 905a9241e4e8 ("wifi: rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_rfreg()")
--- drivers/net/wireless/realtek/rtlwifi/debug.h | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/net/wireless/realtek/rtlwifi/debug.h +11 -0
@@ -181,6 +181,10 @@ void _rtl_dbg_print_data(struct rtl_priv *rtlpriv, u64 comp, int level,const char *titlestring, const void *hexdata, int hexdatalen); +#define rtl_dbg (rtlpriv, comp, level, fmt, ...) \ + _rtl_dbg_trace(rtlpriv, comp, level, \ + fmt, ##__VA_ARGS__) +#define RT_TRACE (rtlpriv, comp, level, fmt, ...) \ _rtl_dbg_trace(rtlpriv, comp, level, \ fmt, ##__VA_ARGS__)
@@ -197,6 +201,13 @@ void _rtl_dbg_print_data(struct rtl_priv *rtlpriv, u64 comp, int level,struct rtl_priv ; +__printf(4, 5) +static inline void rtl_dbg (struct rtl_priv *rtlpriv, +u64 comp,int level, +const char *fmt, ...) +{ +} + __printf(4, 5) static inline void RT_TRACE(struct rtl_priv *rtlpriv, u64 comp, int level,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 61/191 rtlwifi: Replace RT_TRACE with rtl_dbg
In reply to Greg Kroah-HartmanFrom: Larry Finger <[email protected]>
[ Upstream commit f108a420e50a62e0bc5cdcd7d4a2440986b526e3 ]
The macro name RT_TRACE makes it seem that it is used for tracing, when is actually used for debugging. Change the name to rtl_dbg. Any Sparse errors exposed by this change were also fixed.
Stable-dep-of: 905a9241e4e8 ("wifi: rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_rfreg()")
--- drivers/net/wireless/realtek/rtlwifi/base.c | 144 +++++----- drivers/net/wireless/realtek/rtlwifi/cam.c | 82 +++--- drivers/net/wireless/realtek/rtlwifi/core.c | 259 ++++++++--------- drivers/net/wireless/realtek/rtlwifi/debug.c | 4 +- drivers/net/wireless/realtek/rtlwifi/efuse.c | 72 ++--- drivers/net/wireless/realtek/rtlwifi/pci.c | 282 +++++++++---------- drivers/net/wireless/realtek/rtlwifi/ps.c | 98 +++---- drivers/net/wireless/realtek/rtlwifi/regd.c | 18 +- drivers/net/wireless/realtek/rtlwifi/usb.c | 18 +- 9 files changed, 488 insertions(+), 489 deletions(-)
drivers/net/wireless/realtek/rtlwifi/base.c +72 -72
@@ -217,8 +217,8 @@ static void _rtl_init_hw_ht_capab(struct ieee80211_hw *hw, }else {if (get_rf_type (rtlphy) ==RF_1T2R ||get_rf_type (rtlphy) ==RF_2T2R ) { -RT_TRACE (rtlpriv,COMP_INIT ,DBG_DMESG , -"1T2R or 2T2R\n" ); +rtl_dbg (rtlpriv,COMP_INIT ,DBG_DMESG , +"1T2R or 2T2R\n" ); ht_cap->mcs.rx_mask[0 ] =0xFF ; ht_cap->mcs.rx_mask[1 ] =0xFF ; ht_cap->mcs.rx_mask[4 ] =0x01 ;
@@ -226,7 +226,7 @@ static void _rtl_init_hw_ht_capab(struct ieee80211_hw *hw, ht_cap->mcs.rx_highest =cpu_to_le16 (MAX_BIT_RATE_40MHZ_MCS15 ); }else if (get_rf_type (rtlphy) ==RF_1T1R ) { -RT_TRACE (rtlpriv,COMP_INIT ,DBG_DMESG ,"1T1R\n" ); +rtl_dbg (rtlpriv,COMP_INIT ,DBG_DMESG ,"1T1R\n" ); ht_cap->mcs.rx_mask[0 ] =0xFF ; ht_cap->mcs.rx_mask[1 ] =0x00 ;
@@ -1344,7 +1344,7 @@ bool rtl_tx_mgmt_proc(struct ieee80211_hw *hw, struct sk_buff *skb) rtlpriv->cfg->ops->chk_switch_dmdp (hw); }if (ieee80211_is_auth (fc)) { -RT_TRACE (rtlpriv,COMP_SEND ,DBG_DMESG ,"MAC80211_LINKING\n" ); +rtl_dbg (rtlpriv,COMP_SEND ,DBG_DMESG ,"MAC80211_LINKING\n" ); mac->link_state =MAC80211_LINKING ;/* Dul mac */
@@ -1405,7 +1405,7 @@ bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)if (mac->act_scanning)return false; -RT_TRACE (rtlpriv, (COMP_SEND |COMP_RECV ),DBG_DMESG , +rtl_dbg (rtlpriv, (COMP_SEND |COMP_RECV ),DBG_DMESG ,"%s ACT_ADDBAREQ From :%pM\n" , is_tx ?"Tx" :"Rx" , hdr->addr2); RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, "req\n",
@@ -1420,8 +1420,8 @@ bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx)rcu_read_lock (); sta =rtl_find_sta (hw, hdr->addr3);if (sta ==NULL ) { -RT_TRACE (rtlpriv,COMP_SEND |COMP_RECV , -DBG_DMESG ,"sta is NULL\n" ); +rtl_dbg (rtlpriv,COMP_SEND |COMP_RECV , +DBG_DMESG ,"sta is NULL\n" );rcu_read_unlock ();return true; }
@@ -1448,13 +1448,13 @@ bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx) }break ;case ACT_ADDBARSP : -RT_TRACE (rtlpriv, (COMP_SEND |COMP_RECV ),DBG_DMESG , -"%s ACT_ADDBARSP From :%pM\n" , - is_tx ?"Tx" :"Rx" , hdr->addr2); +rtl_dbg (rtlpriv, (COMP_SEND |COMP_RECV ),DBG_DMESG , +"%s ACT_ADDBARSP From :%pM\n" , + is_tx ?"Tx" :"Rx" , hdr->addr2);break ;case ACT_DELBA : -RT_TRACE (rtlpriv, (COMP_SEND |COMP_RECV ),DBG_DMESG , -"ACT_ADDBADEL From :%pM\n" , hdr->addr2); +rtl_dbg (rtlpriv, (COMP_SEND |COMP_RECV ),DBG_DMESG , +"ACT_ADDBADEL From :%pM\n" , hdr->addr2);break ; }break ;
@@ -1539,9 +1539,9 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx,/* 68 : UDP BOOTP client * 67 : UDP BOOTP server */ -RT_TRACE (rtlpriv, (COMP_SEND |COMP_RECV ), -DBG_DMESG ,"dhcp %s !!\n" , - (is_tx) ?"Tx" :"Rx" ); +rtl_dbg (rtlpriv, (COMP_SEND |COMP_RECV ), +DBG_DMESG ,"dhcp %s !!\n" , + (is_tx) ?"Tx" :"Rx" );if (is_tx) setup_special_tx(rtlpriv, ppsc,
@@ -1560,8 +1560,8 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx, rtlpriv->btcoexist.btc_info.in_4way = true; rtlpriv->btcoexist.btc_info.in_4way_ts = jiffies; -RT_TRACE (rtlpriv, (COMP_SEND |COMP_RECV ),DBG_DMESG , -"802.1X %s EAPOL pkt!!\n" , (is_tx) ?"Tx" :"Rx" ); +rtl_dbg (rtlpriv, (COMP_SEND |COMP_RECV ),DBG_DMESG , +"802.1X %s EAPOL pkt!!\n" , (is_tx) ?"Tx" :"Rx" );if (is_tx) { rtlpriv->ra.is_special_data = true;
@@ -1603,12 +1603,12 @@ static void rtl_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb, info =IEEE80211_SKB_CB (skb);ieee80211_tx_info_clear_status (info);if (ack) { -RT_TRACE (rtlpriv,COMP_TX_REPORT ,DBG_LOUD , -"tx report: ack\n" ); +rtl_dbg (rtlpriv,COMP_TX_REPORT ,DBG_LOUD , +"tx report: ack\n" ); info->flags |=IEEE80211_TX_STAT_ACK ; }else { -RT_TRACE (rtlpriv,COMP_TX_REPORT ,DBG_LOUD , -"tx report: not ack\n" ); +rtl_dbg (rtlpriv,COMP_TX_REPORT ,DBG_LOUD , +"tx report: not ack\n" ); info->flags &= ~IEEE80211_TX_STAT_ACK ; }ieee80211_tx_status_irqsafe (hw, skb);
@@ -1646,8 +1646,8 @@ static u16 rtl_get_tx_report_sn(struct ieee80211_hw *hw, tx_report->last_sent_time = jiffies; tx_info->sn = sn; tx_info->send_time = tx_report->last_sent_time; -RT_TRACE (rtlpriv,COMP_TX_REPORT ,DBG_DMESG , -"Send TX-Report sn=0x%X\n" , sn); +rtl_dbg (rtlpriv,COMP_TX_REPORT ,DBG_DMESG , +"Send TX-Report sn=0x%X\n" , sn);return sn; }
@@ -1694,9 +1694,9 @@ void rtl_tx_report_handler(struct ieee80211_hw *hw, u8 *tmp_buf, u8 c2h_cmd_len)break ; } } -RT_TRACE (rtlpriv,COMP_TX_REPORT ,DBG_DMESG , -"Recv TX-Report st=0x%02X sn=0x%X retry=0x%X\n" , - st, sn, retry); +rtl_dbg (rtlpriv,COMP_TX_REPORT ,DBG_DMESG , +"Recv TX-Report st=0x%02X sn=0x%X retry=0x%X\n" , + st, sn, retry); }EXPORT_SYMBOL_GPL (rtl_tx_report_handler);
@@ -1709,9 +1709,9 @@ bool rtl_check_tx_report_acked(struct ieee80211_hw *hw)return true;if (time_before (tx_report->last_sent_time +3 *HZ , jiffies)) { -RT_TRACE (rtlpriv,COMP_TX_REPORT ,DBG_WARNING , -"Check TX-Report timeout!! s_sn=0x%X r_sn=0x%X\n" , - tx_report->last_sent_sn, tx_report->last_recv_sn); +rtl_dbg (rtlpriv,COMP_TX_REPORT ,DBG_WARNING , +"Check TX-Report timeout!! s_sn=0x%X r_sn=0x%X\n" , + tx_report->last_sent_sn, tx_report->last_recv_sn);return true;/* 3 sec. (timeout) seen as acked */ }
@@ -1727,8 +1727,8 @@ void rtl_wait_tx_report_acked(struct ieee80211_hw *hw, u32 wait_ms)if (rtl_check_tx_report_acked (hw))break ;usleep_range (1000 ,2000 ); -RT_TRACE (rtlpriv,COMP_SEC ,DBG_DMESG , -"Wait 1ms (%d/%d) to disable key.\n" , i, wait_ms); +rtl_dbg (rtlpriv,COMP_SEC ,DBG_DMESG , +"Wait 1ms (%d/%d) to disable key.\n" , i, wait_ms); } }
@@ -1790,9 +1790,9 @@ int rtl_tx_agg_start(struct ieee80211_hw *hw, struct ieee80211_vif *vif,return -ENXIO ; tid_data = &sta_entry->tids[tid]; -RT_TRACE (rtlpriv,COMP_SEND ,DBG_DMESG , -"on ra = %pM tid = %d seq:%d\n" , sta->addr, tid, - *ssn); +rtl_dbg (rtlpriv,COMP_SEND ,DBG_DMESG , +"on ra = %pM tid = %d seq:%d\n" , sta->addr, tid, + *ssn); tid_data->agg.agg_state =RTL_AGG_START ;
@@ -1809,8 +1809,8 @@ int rtl_tx_agg_stop(struct ieee80211_hw *hw, struct ieee80211_vif *vif,if (sta ==NULL )return -EINVAL ; -RT_TRACE (rtlpriv,COMP_SEND ,DBG_DMESG , -"on ra = %pM tid = %d\n" , sta->addr, tid); +rtl_dbg (rtlpriv,COMP_SEND ,DBG_DMESG , +"on ra = %pM tid = %d\n" , sta->addr, tid);if (unlikely (tid >=MAX_TID_COUNT ))return -EINVAL ;
@@ -1849,8 +1849,8 @@ int rtl_rx_agg_start(struct ieee80211_hw *hw,return -ENXIO ; tid_data = &sta_entry->tids[tid]; -RT_TRACE (rtlpriv,COMP_RECV ,DBG_DMESG , -"on ra = %pM tid = %d\n" , sta->addr, tid); +rtl_dbg (rtlpriv,COMP_RECV ,DBG_DMESG , +"on ra = %pM tid = %d\n" , sta->addr, tid); tid_data->agg.rx_agg_state =RTL_RX_AGG_START ;return 0 ;
@@ -1865,8 +1865,8 @@ int rtl_rx_agg_stop(struct ieee80211_hw *hw,if (sta ==NULL )return -EINVAL ; -RT_TRACE (rtlpriv,COMP_SEND ,DBG_DMESG , -"on ra = %pM tid = %d\n" , sta->addr, tid); +rtl_dbg (rtlpriv,COMP_SEND ,DBG_DMESG , +"on ra = %pM tid = %d\n" , sta->addr, tid);if (unlikely (tid >=MAX_TID_COUNT ))return -EINVAL ;
@@ -1885,8 +1885,8 @@ int rtl_tx_agg_oper(struct ieee80211_hw *hw,if (sta ==NULL )return -EINVAL ; -RT_TRACE (rtlpriv,COMP_SEND ,DBG_DMESG , -"on ra = %pM tid = %d\n" , sta->addr, tid); +rtl_dbg (rtlpriv,COMP_SEND ,DBG_DMESG , +"on ra = %pM tid = %d\n" , sta->addr, tid);if (unlikely (tid >=MAX_TID_COUNT ))return -EINVAL ;
@@ -1906,9 +1906,9 @@ void rtl_rx_ampdu_apply(struct rtl_priv *rtlpriv) btc_ops->btc_get_ampdu_cfg (rtlpriv, &reject_agg, &ctrl_agg_size, &agg_size); -RT_TRACE (rtlpriv,COMP_BT_COEXIST ,DBG_DMESG , -"Set RX AMPDU: coex - reject=%d, ctrl_agg_size=%d, size=%d" , - reject_agg, ctrl_agg_size, agg_size); +rtl_dbg (rtlpriv,COMP_BT_COEXIST ,DBG_DMESG , +"Set RX AMPDU: coex - reject=%d, ctrl_agg_size=%d, size=%d" , + reject_agg, ctrl_agg_size, agg_size); rtlpriv->hw->max_rx_aggregation_subframes = (ctrl_agg_size ? agg_size :IEEE80211_MAX_AMPDU_BUF_HT );
@@ -1996,9 +1996,9 @@ void rtl_scan_list_expire(struct ieee80211_hw *hw)list_del (&entry->list); rtlpriv->scan_list.num--; -RT_TRACE (rtlpriv,COMP_SCAN ,DBG_LOUD , -"BSSID=%pM is expire in scan list (total=%d)\n" , - entry->bssid, rtlpriv->scan_list.num); +rtl_dbg (rtlpriv,COMP_SCAN ,DBG_LOUD , +"BSSID=%pM is expire in scan list (total=%d)\n" , + entry->bssid, rtlpriv->scan_list.num);kfree (entry); }
@@ -2032,9 +2032,9 @@ void rtl_collect_scan_list(struct ieee80211_hw *hw, struct sk_buff *skb)if (memcmp (entry->bssid, hdr->addr3,ETH_ALEN ) ==0 ) {list_del_init (&entry->list); entry_found = true; -RT_TRACE (rtlpriv,COMP_SCAN ,DBG_LOUD , -"Update BSSID=%pM to scan list (total=%d)\n" , - hdr->addr3, rtlpriv->scan_list.num); +rtl_dbg (rtlpriv,COMP_SCAN ,DBG_LOUD , +"Update BSSID=%pM to scan list (total=%d)\n" , + hdr->addr3, rtlpriv->scan_list.num);break ; } }
@@ -2048,9 +2048,9 @@ void rtl_collect_scan_list(struct ieee80211_hw *hw, struct sk_buff *skb)memcpy (entry->bssid, hdr->addr3,ETH_ALEN ); rtlpriv->scan_list.num++; -RT_TRACE (rtlpriv,COMP_SCAN ,DBG_LOUD , -"Add BSSID=%pM to scan list (total=%d)\n" , - hdr->addr3, rtlpriv->scan_list.num); +rtl_dbg (rtlpriv,COMP_SCAN ,DBG_LOUD , +"Add BSSID=%pM to scan list (total=%d)\n" , + hdr->addr3, rtlpriv->scan_list.num); } entry->age = jiffies;
@@ -2213,8 +2213,8 @@ void rtl_watchdog_wq_callback(void *data)if ((rtlpriv->link_info.bcn_rx_inperiod + rtlpriv->link_info.num_rx_inperiod) ==0 ) { rtlpriv->link_info.roam_times++; -RT_TRACE (rtlpriv,COMP_ERR ,DBG_DMESG , -"AP off for %d s\n" , +rtl_dbg (rtlpriv,COMP_ERR ,DBG_DMESG , +"AP off for %d s\n" , (rtlpriv->link_info.roam_times *2 ));/* if we can't recv beacon for 10s,
@@ -2325,11 +2325,11 @@ static void rtl_c2h_content_parsing(struct ieee80211_hw *hw,switch (cmd_id) {case C2H_DBG : -RT_TRACE (rtlpriv,COMP_FW ,DBG_LOUD ,"[C2H], C2H_DBG!!\n" ); +rtl_dbg (rtlpriv,COMP_FW ,DBG_LOUD ,"[C2H], C2H_DBG!!\n" );break ;case C2H_TXBF : -RT_TRACE (rtlpriv,COMP_FW ,DBG_TRACE , -"[C2H], C2H_TXBF!!\n" ); +rtl_dbg (rtlpriv,COMP_FW ,DBG_TRACE , +"[C2H], C2H_TXBF!!\n" );break ;case C2H_TX_REPORT :rtl_tx_report_handler (hw, cmd_buf, cmd_len);
@@ -2339,20 +2339,20 @@ static void rtl_c2h_content_parsing(struct ieee80211_hw *hw, hal_ops->c2h_ra_report_handler (hw, cmd_buf, cmd_len);break ;case C2H_BT_INFO : -RT_TRACE (rtlpriv,COMP_FW ,DBG_TRACE , -"[C2H], C2H_BT_INFO!!\n" ); +rtl_dbg (rtlpriv,COMP_FW ,DBG_TRACE , +"[C2H], C2H_BT_INFO!!\n" );if (rtlpriv->cfg->ops->get_btc_status ()) btc_ops->btc_btinfo_notify (rtlpriv, cmd_buf, cmd_len);break ;case C2H_BT_MP : -RT_TRACE (rtlpriv,COMP_FW ,DBG_TRACE , -"[C2H], C2H_BT_MP!!\n" ); +rtl_dbg (rtlpriv,COMP_FW ,DBG_TRACE , +"[C2H], C2H_BT_MP!!\n" );if (rtlpriv->cfg->ops->get_btc_status ()) btc_ops->btc_btmpinfo_notify (rtlpriv, cmd_buf, cmd_len);break ;default : -RT_TRACE (rtlpriv,COMP_FW ,DBG_TRACE , -"[C2H], Unknown packet!! cmd_id(%#X)!\n" , cmd_id); +rtl_dbg (rtlpriv,COMP_FW ,DBG_TRACE , +"[C2H], Unknown packet!! cmd_id(%#X)!\n" , cmd_id);break ; } }
@@ -2376,8 +2376,8 @@ void rtl_c2hcmd_launcher(struct ieee80211_hw *hw, int exec)if (!skb)break ; -RT_TRACE (rtlpriv,COMP_FW ,DBG_DMESG ,"C2H rx_desc_shift=%d\n" , - *((u8 *)skb->cb)); +rtl_dbg (rtlpriv,COMP_FW ,DBG_DMESG ,"C2H rx_desc_shift=%d\n" , + *((u8 *)skb->cb));RT_PRINT_DATA (rtlpriv,COMP_FW ,DBG_DMESG ,"C2H data: " , skb->data, skb->len);
@@ -2721,29 +2721,29 @@ void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len) (memcmp(mac->bssid, ap5_6, 3) == 0) || vendor == PEER_ATH) { vendor =PEER_ATH ; -RT_TRACE (rtlpriv,COMP_MAC80211 ,DBG_LOUD ,"=>ath find\n" ); +rtl_dbg (rtlpriv,COMP_MAC80211 ,DBG_LOUD ,"=>ath find\n" ); } else if ((memcmp(mac->bssid, ap4_4, 3) == 0) || (memcmp(mac->bssid, ap4_5, 3) == 0) || (memcmp(mac->bssid, ap4_1, 3) == 0) || (memcmp(mac->bssid, ap4_2, 3) == 0) || (memcmp(mac->bssid, ap4_3, 3) == 0) || vendor == PEER_RAL) { -RT_TRACE (rtlpriv,COMP_MAC80211 ,DBG_LOUD ,"=>ral find\n" ); +rtl_dbg (rtlpriv,COMP_MAC80211 ,DBG_LOUD ,"=>ral find\n" ); vendor =PEER_RAL ; } else if (memcmp(mac->bssid, ap6_1, 3) == 0 || vendor == PEER_CISCO) { vendor =PEER_CISCO ; -RT_TRACE (rtlpriv,COMP_MAC80211 ,DBG_LOUD ,"=>cisco find\n" ); +rtl_dbg (rtlpriv,COMP_MAC80211 ,DBG_LOUD ,"=>cisco find\n" ); } else if ((memcmp(mac->bssid, ap3_1, 3) == 0) || (memcmp(mac->bssid, ap3_2, 3) == 0) || (memcmp(mac->bssid, ap3_3, 3) == 0) || vendor == PEER_BROAD) { -RT_TRACE (rtlpriv,COMP_MAC80211 ,DBG_LOUD ,"=>broad find\n" ); +rtl_dbg (rtlpriv,COMP_MAC80211 ,DBG_LOUD ,"=>broad find\n" ); vendor =PEER_BROAD ; } else if (memcmp(mac->bssid, ap7_1, 3) == 0 || vendor == PEER_MARV) { vendor =PEER_MARV ; -RT_TRACE (rtlpriv,COMP_MAC80211 ,DBG_LOUD ,"=>marv find\n" ); +rtl_dbg (rtlpriv,COMP_MAC80211 ,DBG_LOUD ,"=>marv find\n" ); } mac->vendor = vendor;
drivers/net/wireless/realtek/rtlwifi/cam.c +40 -42
147 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/core.c +130 -129
599 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/debug.c +2 -2
@@ -425,8 +425,8 @@ static ssize_t rtl_debugfs_set_write_rfreg(struct file *filp, &path, &addr, &bitmask, &data);if (num !=4 ) { -RT_TRACE (rtlpriv,COMP_ERR ,DBG_DMESG , -"Format is <path> <addr> <mask> <data>\n" ); +rtl_dbg (rtlpriv,COMP_ERR ,DBG_DMESG , +"Format is <path> <addr> <mask> <data>\n" );return count; }
drivers/net/wireless/realtek/rtlwifi/efuse.c +36 -36
157 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/pci.c +141 -141
551 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/ps.c +49 -49
203 lines not on this page · raw message
drivers/net/wireless/realtek/rtlwifi/regd.c +9 -9
@@ -434,13 +434,13 @@ int rtl_regd_init(struct ieee80211_hw *hw, rtlpriv->regd.country_code =channel_plan_to_country_code (rtlpriv->efuse.channel_plan); -RT_TRACE (rtlpriv,COMP_REGD ,DBG_DMESG , -"rtl: EEPROM regdomain: 0x%0x country code: %d\n" , - rtlpriv->efuse.channel_plan, rtlpriv->regd.country_code); +rtl_dbg (rtlpriv,COMP_REGD ,DBG_DMESG , +"rtl: EEPROM regdomain: 0x%0x country code: %d\n" , + rtlpriv->efuse.channel_plan, rtlpriv->regd.country_code);if (rtlpriv->regd.country_code >=COUNTRY_CODE_MAX ) { -RT_TRACE (rtlpriv,COMP_REGD ,DBG_DMESG , -"rtl: EEPROM indicates invalid country code, world wide 13 should be used\n" ); +rtl_dbg (rtlpriv,COMP_REGD ,DBG_DMESG , +"rtl: EEPROM indicates invalid country code, world wide 13 should be used\n" ); rtlpriv->regd.country_code =COUNTRY_CODE_WORLD_WIDE_13 ; }
@@ -455,9 +455,9 @@ int rtl_regd_init(struct ieee80211_hw *hw, rtlpriv->regd.alpha2[1 ] ='0' ; } -RT_TRACE (rtlpriv,COMP_REGD ,DBG_TRACE , -"rtl: Country alpha2 being used: %c%c\n" , - rtlpriv->regd.alpha2[0 ], rtlpriv->regd.alpha2[1 ]); +rtl_dbg (rtlpriv,COMP_REGD ,DBG_TRACE , +"rtl: Country alpha2 being used: %c%c\n" , + rtlpriv->regd.alpha2[0 ], rtlpriv->regd.alpha2[1 ]);_rtl_regd_init_wiphy (&rtlpriv->regd, wiphy, reg_notifier);
@@ -469,7 +469,7 @@ void rtl_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request)struct ieee80211_hw *hw =wiphy_to_ieee80211_hw (wiphy);struct rtl_priv *rtlpriv =rtl_priv (hw); -RT_TRACE (rtlpriv,COMP_REGD ,DBG_LOUD ,"\n" ); +rtl_dbg (rtlpriv,COMP_REGD ,DBG_LOUD ,"\n" );_rtl_reg_notifier_apply (wiphy, request, &rtlpriv->regd); }
drivers/net/wireless/realtek/rtlwifi/usb.c +9 -9
@@ -282,14 +282,14 @@ static int _rtl_usb_init_tx(struct ieee80211_hw *hw) ? USB_HIGH_SPEED_BULK_SIZE :USB_FULL_SPEED_BULK_SIZE ; -RT_TRACE (rtlpriv,COMP_INIT ,DBG_DMESG ,"USB Max Bulk-out Size=%d\n" , - rtlusb->max_bulk_out_size); +rtl_dbg (rtlpriv,COMP_INIT ,DBG_DMESG ,"USB Max Bulk-out Size=%d\n" , + rtlusb->max_bulk_out_size);for (i =0 ; i < __RTL_TXQ_NUM; i++) {u32 ep_num = rtlusb->ep_map.ep_mapping[i];if (!ep_num) { -RT_TRACE (rtlpriv,COMP_INIT ,DBG_DMESG , -"Invalid endpoint map setting!\n" ); +rtl_dbg (rtlpriv,COMP_INIT ,DBG_DMESG , +"Invalid endpoint map setting!\n" );return -EINVAL ; } }
@@ -358,10 +358,10 @@ static int _rtl_usb_init(struct ieee80211_hw *hw)else if (usb_endpoint_dir_out (pep_desc)) rtlusb->out_ep_nums++; -RT_TRACE (rtlpriv,COMP_INIT ,DBG_DMESG , -"USB EP(0x%02x), MaxPacketSize=%d, Interval=%d\n" , - pep_desc->bEndpointAddress, pep_desc->wMaxPacketSize, - pep_desc->bInterval); +rtl_dbg (rtlpriv,COMP_INIT ,DBG_DMESG , +"USB EP(0x%02x), MaxPacketSize=%d, Interval=%d\n" , + pep_desc->bEndpointAddress, pep_desc->wMaxPacketSize, + pep_desc->bInterval); }if (rtlusb->in_ep_nums < rtlpriv->cfg->usb_interface_cfg->in_ep_num) {pr_err ("Too few input end points found\n" );
@@ -960,7 +960,7 @@ static void _rtl_usb_tx_preprocess(struct ieee80211_hw *hw,memset (&tcb_desc,0 ,sizeof (struct rtl_tcb_desc ));if (ieee80211_is_auth (fc)) { -RT_TRACE (rtlpriv,COMP_SEND ,DBG_DMESG ,"MAC80211_LINKING\n" ); +rtl_dbg (rtlpriv,COMP_SEND ,DBG_DMESG ,"MAC80211_LINKING\n" ); }if (rtlpriv->psc.sw_ps_enabled) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 62/191 wifi: rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_rfreg()
In reply to Greg Kroah-HartmanFrom: Wei Chen <[email protected]>
[ Upstream commit 905a9241e4e8c15d2c084fee916280514848fe35 ]
If there is a failure during copy_from_user or user-provided data buffer is invalid, rtl_debugfs_set_write_rfreg should return negative error code instead of a positive value count.
Fix this bug by returning correct error code. Moreover, the check of buffer against null is removed since it will be handled by copy_from_user.
--- drivers/net/wireless/realtek/rtlwifi/debug.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtlwifi/debug.c +3 -3
@@ -416,8 +416,8 @@ static ssize_t rtl_debugfs_set_write_rfreg(struct file *filp, tmp_len = (count >sizeof (tmp) -1 ?sizeof (tmp) -1 : count); -if (!buffer ||copy_from_user (tmp, buffer, tmp_len)) -return count; +if (copy_from_user (tmp, buffer, tmp_len)) +return -EFAULT ; tmp[tmp_len] ='\0' ;
@@ -427,7 +427,7 @@ static ssize_t rtl_debugfs_set_write_rfreg(struct file *filp,if (num !=4 ) {rtl_dbg (rtlpriv,COMP_ERR ,DBG_DMESG ,"Format is <path> <addr> <mask> <data>\n" ); -return count; +return -EINVAL ; }rtl_set_rfreg (hw, path, addr, bitmask, data);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 63/191 wifi: rtlwifi: fix incorrect error codes in rtl_debugfs_set_write_reg()
In reply to Greg Kroah-HartmanFrom: Wei Chen <[email protected]>
[ Upstream commit 5dbe1f8eb8c5ac69394400a5b86fd81775e96c43 ]
If there is a failure during copy_from_user or user-provided data buffer is invalid, rtl_debugfs_set_write_reg should return negative error code instead of a positive value count.
Fix this bug by returning correct error code. Moreover, the check of buffer against null is removed since it will be handled by copy_from_user.
--- drivers/net/wireless/realtek/rtlwifi/debug.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtlwifi/debug.c +3 -3
@@ -319,8 +319,8 @@ static ssize_t rtl_debugfs_set_write_reg(struct file *filp, tmp_len = (count >sizeof (tmp) -1 ?sizeof (tmp) -1 : count); -if (!buffer ||copy_from_user (tmp, buffer, tmp_len)) -return count; +if (copy_from_user (tmp, buffer, tmp_len)) +return -EFAULT ; tmp[tmp_len] ='\0' ;
@@ -328,7 +328,7 @@ static ssize_t rtl_debugfs_set_write_reg(struct file *filp, num =sscanf (tmp,"%x %x %x" , &addr, &val, &len);if (num !=3 ) -return count; +return -EINVAL ;switch (len) {case 1 :
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 64/191 bpftool: Fix bug for long instructions in program CFG dumps
In reply to Greg Kroah-HartmanFrom: Quentin Monnet <[email protected]>
[ Upstream commit 67cf52cdb6c8fa6365d29106555dacf95c9fd374 ]
When dumping the control flow graphs for programs using the 16-byte long load instruction, we need to skip the second part of this instruction when looking for the next instruction to process. Otherwise, we end up printing "BUG_ld_00" from the kernel disassembler in the CFG.
--- tools/bpf/bpftool/xlated_dumper.c | 7 +++++++ 1 file changed, 7 insertions(+)
tools/bpf/bpftool/xlated_dumper.c +7 -0
@@ -336,8 +336,15 @@ void dump_xlated_for_graph(struct dump_data *dd, void *buf_start, void *buf_end,struct bpf_insn *insn_start = buf_start;struct bpf_insn *insn_end = buf_end;struct bpf_insn *cur = insn_start; +bool double_insn = false;for (; cur <= insn_end; cur++) { +if (double_insn) { + double_insn = false; +continue ; + } + double_insn = cur->code == (BPF_LD |BPF_IMM |BPF_DW ); +printf ("% 4d: " , (int )(cur - insn_start + start_idx));print_bpf_insn (&cbs, cur, true);if (cur != insn_end)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 65/191 crypto: drbg - make drbg_prepare_hrng() handle jent instantiation errors
In reply to Greg Kroah-HartmanFrom: Nicolai Stange <[email protected]>
[ Upstream commit 559edd47cce4cc407d606b4d7f376822816fd4b8 ]
Now that drbg_prepare_hrng() doesn't do anything but to instantiate a jitterentropy crypto_rng instance, it looks a little odd to have the related error handling at its only caller, drbg_instantiate().
Move the handling of jitterentropy allocation failures from drbg_instantiate() close to the allocation itself in drbg_prepare_hrng().
There is no change in behaviour.
Stable-dep-of: 686cd976b6dd ("crypto: drbg - Only fail when jent is unavailable in FIPS mode")
--- crypto/drbg.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
crypto/drbg.c +8 -8
@@ -1512,6 +1512,14 @@ static int drbg_prepare_hrng(struct drbg_state *drbg)return 0 ; drbg->jent =crypto_alloc_rng ("jitterentropy_rng" ,0 ,0 ); +if (IS_ERR (drbg->jent)) { +const int err =PTR_ERR (drbg->jent); + + drbg->jent =NULL ; +if (fips_enabled || err != -ENOENT ) +return err; +pr_info ("DRBG: Continuing without Jitter RNG\n" ); + }return 0 ; }
@@ -1567,14 +1575,6 @@ static int drbg_instantiate(struct drbg_state *drbg, struct drbg_string *pers,if (ret) goto free_everything; -if (IS_ERR (drbg->jent)) { - ret =PTR_ERR (drbg->jent); - drbg->jent =NULL ; -if (fips_enabled || ret != -ENOENT ) - goto free_everything; -pr_info ("DRBG: Continuing without Jitter RNG\n" ); - } - reseed = false; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 66/191 crypto: drbg - Only fail when jent is unavailable in FIPS mode
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
[ Upstream commit 686cd976b6ddedeeb1a1fb09ba53a891d3cc9a03 ]
When jent initialisation fails for any reason other than ENOENT, the entire drbg fails to initialise, even when we're not in FIPS mode. This is wrong because we can still use the kernel RNG when we're not in FIPS mode.
Change it so that it only fails when we are in FIPS mode.
--- crypto/drbg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
crypto/drbg.c +1 -1
@@ -1516,7 +1516,7 @@ static int drbg_prepare_hrng(struct drbg_state *drbg)const int err =PTR_ERR (drbg->jent); drbg->jent =NULL ; -if (fips_enabled || err != -ENOENT ) +if (fips_enabled)return err;pr_info ("DRBG: Continuing without Jitter RNG\n" ); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 67/191 md/raid10: fix leak of r10bio->remaining for recovery
In reply to Greg Kroah-HartmanFrom: Yu Kuai <[email protected]>
[ Upstream commit 26208a7cffd0c7cbf14237ccd20c7270b3ffeb7e ]
raid10_sync_request() will add 'r10bio->remaining' for both rdev and replacement rdev. However, if the read io fails, recovery_request_write() returns without issuing the write io, in this case, end_sync_request() is only called once and 'remaining' is leaked, cause an io hang.
Fix the problem by decreasing 'remaining' according to if 'bio' and 'repl_bio' is valid.
--- drivers/md/raid10.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-)
drivers/md/raid10.c +13 -10
@@ -2266,11 +2266,22 @@ static void recovery_request_write(struct mddev *mddev, struct r10bio *r10_bio) {struct r10conf *conf = mddev->private;int d; -struct bio *wbio, *wbio2; +struct bio *wbio = r10_bio->devs[1 ].bio; +struct bio *wbio2 = r10_bio->devs[1 ].repl_bio; + +/* Need to test wbio2->bi_end_io before we call +* generic_make_request as if the former is NULL, +* the latter is free to free wbio2. +*/ +if (wbio2 && !wbio2->bi_end_io) + wbio2 =NULL ;if (!test_bit (R10BIO_Uptodate, &r10_bio->state)) {fix_recovery_read_error (r10_bio); -end_sync_request (r10_bio); +if (wbio->bi_end_io) +end_sync_request (r10_bio); +if (wbio2) +end_sync_request (r10_bio);return ; }
@@ -2279,14 +2290,6 @@ static void recovery_request_write(struct mddev *mddev, struct r10bio *r10_bio)* and submit the write request */ d = r10_bio->devs[1 ].devnum; - wbio = r10_bio->devs[1 ].bio; - wbio2 = r10_bio->devs[1 ].repl_bio; -/* Need to test wbio2->bi_end_io before we call -* generic_make_request as if the former is NULL, -* the latter is free to free wbio2. -*/ -if (wbio2 && !wbio2->bi_end_io) - wbio2 =NULL ;if (wbio->bi_end_io) {atomic_inc (&conf->mirrors[d].rdev->nr_pending);md_sync_acct (conf->mirrors[d].rdev->bdev,bio_sectors (wbio));
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 68/191 md/raid10: fix memleak for conf->bio_split
In reply to Greg Kroah-HartmanFrom: Yu Kuai <[email protected]>
[ Upstream commit c9ac2acde53f5385de185bccf6aaa91cf9ac1541 ]
In the error path of raid10_run(), 'conf' need be freed, however, 'conf->bio_split' is missed and memory will be leaked.
Since there are 3 places to free 'conf', factor out a helper to fix the problem.
--- drivers/md/raid10.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-)
drivers/md/raid10.c +17 -20
@@ -3671,6 +3671,20 @@ static int setup_geo(struct geom *geo, struct mddev *mddev, enum geo_type new)return nc*fc; } +static void raid10_free_conf (struct r10conf *conf) +{ +if (!conf) +return ; + +mempool_exit (&conf->r10bio_pool); +kfree (conf->mirrors); +kfree (conf->mirrors_old); +kfree (conf->mirrors_new); +safe_put_page (conf->tmppage); +bioset_exit (&conf->bio_split); +kfree (conf); +} +static struct r10conf *setup_conf (struct mddev *mddev) {struct r10conf *conf =NULL ;
@@ -3753,13 +3767,7 @@ static struct r10conf *setup_conf(struct mddev *mddev)return conf; out: -if (conf) { -mempool_exit (&conf->r10bio_pool); -kfree (conf->mirrors); -safe_put_page (conf->tmppage); -bioset_exit (&conf->bio_split); -kfree (conf); - } +raid10_free_conf (conf);return ERR_PTR (err); }
@@ -3973,10 +3981,7 @@ static int raid10_run(struct mddev *mddev) out_free_conf:md_unregister_thread (&mddev->thread); -mempool_exit (&conf->r10bio_pool); -safe_put_page (conf->tmppage); -kfree (conf->mirrors); -kfree (conf); +raid10_free_conf (conf); mddev->private =NULL ; out:return -EIO ;
@@ -3984,15 +3989,7 @@ static int raid10_run(struct mddev *mddev)static void raid10_free (struct mddev *mddev,void *priv) { -struct r10conf *conf = priv; - -mempool_exit (&conf->r10bio_pool); -safe_put_page (conf->tmppage); -kfree (conf->mirrors); -kfree (conf->mirrors_old); -kfree (conf->mirrors_new); -bioset_exit (&conf->bio_split); -kfree (conf); +raid10_free_conf (priv); }static void raid10_quiesce (struct mddev *mddev,int quiesce)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 69/191 md: update the optimal I/O size on reshape
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit 16ef510139315a2147ee7525796f8dbd4e4b7864 ]
The raid5 and raid10 drivers currently update the read-ahead size, but not the optimal I/O size on reshape. To prepare for deriving the read-ahead size from the optimal I/O size make sure it is updated as well.
Stable-dep-of: f0ddb83da3cb ("md/raid10: fix memleak of md thread")
--- drivers/md/raid10.c | 22 ++++++++++++++-------- drivers/md/raid5.c | 10 ++++++++-- 2 files changed, 22 insertions(+), 10 deletions(-)
drivers/md/raid10.c +14 -8
@@ -3771,10 +3771,20 @@ static struct r10conf *setup_conf(struct mddev *mddev)return ERR_PTR (err); } +static void raid10_set_io_opt (struct r10conf *conf) +{ +int raid_disks = conf->geo.raid_disks; + +if (!(conf->geo.raid_disks % conf->geo.near_copies)) + raid_disks /= conf->geo.near_copies; +blk_queue_io_opt (conf->mddev->queue, (conf->mddev->chunk_sectors <<9 ) * + raid_disks); +} +static int raid10_run (struct mddev *mddev) {struct r10conf *conf; -int i, disk_idx, chunk_size; +int i, disk_idx;struct raid10_info *disk;struct md_rdev *rdev;sector_t size;
@@ -3810,18 +3820,13 @@ static int raid10_run(struct mddev *mddev) mddev->thread = conf->thread; conf->thread =NULL ; - chunk_size = mddev->chunk_sectors <<9 ;if (mddev->queue) {blk_queue_max_discard_sectors (mddev->queue, mddev->chunk_sectors);blk_queue_max_write_same_sectors (mddev->queue,0 );blk_queue_max_write_zeroes_sectors (mddev->queue,0 ); -blk_queue_io_min (mddev->queue, chunk_size); -if (conf->geo.raid_disks % conf->geo.near_copies) -blk_queue_io_opt (mddev->queue, chunk_size * conf->geo.raid_disks); -else -blk_queue_io_opt (mddev->queue, chunk_size * - (conf->geo.raid_disks / conf->geo.near_copies)); +blk_queue_io_min (mddev->queue, mddev->chunk_sectors <<9 ); +raid10_set_io_opt (conf); }rdev_for_each (rdev, mddev) {
@@ -4724,6 +4729,7 @@ static void end_reshape(struct r10conf *conf) stripe /= conf->geo.near_copies;if (conf->mddev->queue->backing_dev_info->ra_pages <2 * stripe) conf->mddev->queue->backing_dev_info->ra_pages =2 * stripe; +raid10_set_io_opt (conf); } conf->fullsync =0 ; }
drivers/md/raid5.c +8 -2
@@ -7153,6 +7153,12 @@ static int only_parity(int raid_disk, int algo, int raid_disks, int max_degradedreturn 0 ; } +static void raid5_set_io_opt (struct r5conf *conf) +{ +blk_queue_io_opt (conf->mddev->queue, (conf->chunk_sectors <<9 ) * + (conf->raid_disks - conf->max_degraded)); +} +static int raid5_run (struct mddev *mddev) {struct r5conf *conf;
@@ -7442,8 +7448,7 @@ static int raid5_run(struct mddev *mddev) chunk_size = mddev->chunk_sectors <<9 ;blk_queue_io_min (mddev->queue, chunk_size); -blk_queue_io_opt (mddev->queue, chunk_size * - (conf->raid_disks - conf->max_degraded)); +raid5_set_io_opt (conf); mddev->queue->limits.raid_partial_stripes_expensive =1 ;/* * We can only discard a whole stripe. It doesn't make sense to
@@ -8037,6 +8042,7 @@ static void end_reshape(struct r5conf *conf) / PAGE_SIZE);if (conf->mddev->queue->backing_dev_info->ra_pages <2 * stripe) conf->mddev->queue->backing_dev_info->ra_pages =2 * stripe; +raid5_set_io_opt (conf); } } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 70/191 md/raid10: fix memleak of md thread
In reply to Greg Kroah-HartmanFrom: Yu Kuai <[email protected]>
[ Upstream commit f0ddb83da3cbbf8a1f9087a642c448ff52ee9abd ]
In raid10_run(), if setup_conf() succeed and raid10_run() failed before setting 'mddev->thread', then in the error path 'conf->thread' is not freed.
Fix the problem by setting 'mddev->thread' right after setup_conf().
--- drivers/md/raid10.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/md/raid10.c +3 -3
@@ -3805,6 +3805,9 @@ static int raid10_run(struct mddev *mddev)if (!conf) goto out; + mddev->thread = conf->thread; + conf->thread =NULL ; +if (mddev_is_clustered (conf->mddev)) {int fc, fo;
@@ -3817,9 +3820,6 @@ static int raid10_run(struct mddev *mddev) } } - mddev->thread = conf->thread; - conf->thread =NULL ; -if (mddev->queue) {blk_queue_max_discard_sectors (mddev->queue, mddev->chunk_sectors);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 71/191 wifi: iwlwifi: make the loop for card preparation effective
In reply to Greg Kroah-HartmanFrom: Emmanuel Grumbach <[email protected]>
[ Upstream commit 28965ec0b5d9112585f725660e2ff13218505ace ]
Since we didn't reset t to 0, only the first iteration of the loop did checked the ready bit several times.
Quoted 1 line
From the second iteration and on, we just tested the bit once and
continued to the next iteration.
--- drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/pcie/trans.c +2 -1
@@ -666,7 +666,6 @@ static int iwl_pcie_set_hw_ready(struct iwl_trans *trans)int iwl_pcie_prepare_card_hw (struct iwl_trans *trans) {int ret; -int t =0 ;int iter;IWL_DEBUG_INFO (trans,"iwl_trans_prepare_card_hw enter\n" );
@@ -681,6 +680,8 @@ int iwl_pcie_prepare_card_hw(struct iwl_trans *trans)usleep_range (1000 ,2000 );for (iter =0 ; iter <10 ; iter++) { +int t =0 ; +/* If HW is not ready, prepare the conditions to check again */ iwl_set_bit (trans,CSR_HW_IF_CONFIG_REG ,CSR_HW_IF_CONFIG_REG_PREPARE );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 72/191 wifi: iwlwifi: mvm: check firmware response size
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
[ Upstream commit 13513cec93ac9902d0b896976d8bab3758a9881c ]
Check the firmware response size for responses to the memory read/write command in debugfs before using it.
--- drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c +10 -0
@@ -1835,6 +1835,11 @@ static ssize_t iwl_dbgfs_mem_read(struct file *file, char __user *user_buf,if (ret <0 )return ret; +if (iwl_rx_packet_payload_len (hcmd.resp_pkt) <sizeof (*rsp)) { + ret = -EIO ; + goto out; + } + rsp = (void *)hcmd.resp_pkt->data;if (le32_to_cpu (rsp->status) !=DEBUG_MEM_STATUS_SUCCESS ) { ret = -ENXIO ;
@@ -1912,6 +1917,11 @@ static ssize_t iwl_dbgfs_mem_write(struct file *file,if (ret <0 )return ret; +if (iwl_rx_packet_payload_len (hcmd.resp_pkt) <sizeof (*rsp)) { + ret = -EIO ; + goto out; + } + rsp = (void *)hcmd.resp_pkt->data;if (rsp->status !=DEBUG_MEM_STATUS_SUCCESS ) { ret = -ENXIO ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 73/191 ixgbe: Allow flow hash to be set via ethtool
In reply to Greg Kroah-HartmanFrom: Joe Damato <[email protected]>
[ Upstream commit 4f3ed1293feb9502dc254b05802faf1ad3317ac6 ]
ixgbe currently returns EINVAL whenever the flowhash it set by ethtool because the ethtool code in the kernel passes a non-zero value for hfunc that ixgbe should allow.
When ethtool is called with ETHTOOL_SRXFHINDIR, ethtool_set_rxfh_indir will call ixgbe's set_rxfh function with ETH_RSS_HASH_NO_CHANGE. This value should be accepted.
When ethtool is called with ETHTOOL_SRSSH, ethtool_set_rxfh will call ixgbe's set_rxfh function with rxfh.hfunc, which appears to be hardcoded in ixgbe to always be ETH_RSS_HASH_TOP. This value should also be accepted.
Before this patch:
$ sudo ethtool -L eth1 combined 10 $ sudo ethtool -X eth1 default Cannot set RX flow hash configuration: Invalid argument
After this patch:
$ sudo ethtool -L eth1 combined 10
$ sudo ethtool -X eth1 default
$ sudo ethtool -x eth1
RX flow hash indirection table for eth1 with 10 RX ring(s):
0: 0 1 2 3 4 5 6 7
8: 8 9 0 1 2 3 4 5
16: 6 7 8 9 0 1 2 3
24: 4 5 6 7 8 9 0 1
...--- drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c +2 -2
@@ -3005,8 +3005,8 @@ static int ixgbe_set_rxfh(struct net_device *netdev, const u32 *indir,int i;u32 reta_entries =ixgbe_rss_indir_tbl_entries (adapter); -if (hfunc) -return -EINVAL ; +if (hfunc !=ETH_RSS_HASH_NO_CHANGE && hfunc !=ETH_RSS_HASH_TOP ) +return -EOPNOTSUPP ;/* Fill out the redirection table */ if (indir) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 74/191 ixgbe: Enable setting RSS table to default values
In reply to Greg Kroah-HartmanFrom: Joe Damato <[email protected]>
[ Upstream commit e85d3d55875f7a1079edfbc4e4e98d6f8aea9ac7 ]
ethtool uses ETHTOOL_GRXRINGS to compute how many queues are supported by RSS. The driver should return the smaller of either:
- The maximum number of RSS queues the device supports, OR
- The number of RX queues configured
Prior to this change, running ethtool -X $iface default fails if the number of queues configured is larger than the number supported by RSS, even though changing the queue count correctly resets the flowhash to use all supported queues.
Other drivers (for example, i40e) will succeed but the flow hash will reset to support the maximum number of queues supported by RSS, even if that amount is smaller than the configured amount.
Prior to this change:
$ sudo ethtool -L eth1 combined 20
$ sudo ethtool -x eth1
RX flow hash indirection table for eth1 with 20 RX ring(s):
0: 0 1 2 3 4 5 6 7
8: 8 9 10 11 12 13 14 15
16: 0 1 2 3 4 5 6 7
24: 8 9 10 11 12 13 14 15
32: 0 1 2 3 4 5 6 7
...You can see that the flowhash was correctly set to use the maximum number of queues supported by the driver (16).
However, asking the NIC to reset to "default" fails:
$ sudo ethtool -X eth1 default Cannot set RX flow hash configuration: Invalid argument
After this change, the flowhash can be reset to default which will use all of the available RSS queues (16) or the configured queue count, whichever is smaller.
Starting with eth1 which has 10 queues and a flowhash distributing to all 10 queues:
$ sudo ethtool -x eth1
RX flow hash indirection table for eth1 with 10 RX ring(s):
0: 0 1 2 3 4 5 6 7
8: 8 9 0 1 2 3 4 5
16: 6 7 8 9 0 1 2 3
...Increasing the queue count to 48 resets the flowhash to distribute to 16 queues, as it did before this patch:
$ sudo ethtool -L eth1 combined 48
$ sudo ethtool -x eth1
RX flow hash indirection table for eth1 with 16 RX ring(s):
0: 0 1 2 3 4 5 6 7
8: 8 9 10 11 12 13 14 15
16: 0 1 2 3 4 5 6 7
...Due to the other bugfix in this series, the flowhash can be set to use queues 0-5:
$ sudo ethtool -X eth1 equal 5
$ sudo ethtool -x eth1
RX flow hash indirection table for eth1 with 16 RX ring(s):
0: 0 1 2 3 4 0 1 2
8: 3 4 0 1 2 3 4 0
16: 1 2 3 4 0 1 2 3
...Due to this bugfix, the flowhash can be reset to default and use 16 queues:
$ sudo ethtool -X eth1 default
$ sudo ethtool -x eth1
RX flow hash indirection table for eth1 with 16 RX ring(s):
0: 0 1 2 3 4 5 6 7
8: 8 9 10 11 12 13 14 15
16: 0 1 2 3 4 5 6 7
...--- .../net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c +10 -9
@@ -2539,6 +2539,14 @@ static int ixgbe_get_rss_hash_opts(struct ixgbe_adapter *adapter,return 0 ; } +static int ixgbe_rss_indir_tbl_max (struct ixgbe_adapter *adapter) +{ +if (adapter->hw.mac.type < ixgbe_mac_X550) +return 16 ; +else +return 64 ; +} +static int ixgbe_get_rxnfc (struct net_device *dev,struct ethtool_rxnfc *cmd,u32 *rule_locs) {
@@ -2547,7 +2555,8 @@ static int ixgbe_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,switch (cmd->cmd) {case ETHTOOL_GRXRINGS : - cmd->data = adapter->num_rx_queues; + cmd->data =min_t (int, adapter->num_rx_queues, +ixgbe_rss_indir_tbl_max (adapter)); ret =0 ;break ;case ETHTOOL_GRXCLSRLCNT :
@@ -2949,14 +2958,6 @@ static int ixgbe_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)return ret; } -static int ixgbe_rss_indir_tbl_max (struct ixgbe_adapter *adapter) -{ -if (adapter->hw.mac.type < ixgbe_mac_X550) -return 16 ; -else -return 64 ; -} -static u32 ixgbe_get_rxfh_key_size (struct net_device *netdev) {return IXGBE_RSS_KEY_SIZE ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 75/191 netfilter: nf_tables: dont write table validation state without mutex
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
[ Upstream commit 9a32e9850686599ed194ccdceb6cd3dd56b2d9b9 ]
The ->cleanup callback needs to be removed, this doesn't work anymore as the transaction mutex is already released in the ->abort function.
Just do it after a successful validation pass, this either happens from commit or abort phases where transaction mutex is held.
--- include/linux/netfilter/nfnetlink.h | 1 - net/netfilter/nf_tables_api.c | 8 ++------ net/netfilter/nfnetlink.c | 2 -- 3 files changed, 2 insertions(+), 9 deletions(-)
include/linux/netfilter/nfnetlink.h +0 -1
@@ -32,7 +32,6 @@ struct nfnetlink_subsystem {struct module *owner;int (*commit)(struct net *net,struct sk_buff *skb);int (*abort)(struct net *net,struct sk_buff *skb); -void (*cleanup)(struct net *net);bool (*valid_genid)(struct net *net,u32 genid); };
net/netfilter/nf_tables_api.c +2 -6
@@ -6241,6 +6241,8 @@ static int nf_tables_validate(struct net *net)if (nft_table_validate (net, table) <0 )return -EAGAIN ; } + +nft_validate_state_update (net,NFT_VALIDATE_SKIP );break ; }
@@ -6767,11 +6769,6 @@ static int __nf_tables_abort(struct net *net)return 0 ; } -static void nf_tables_cleanup (struct net *net) -{ -nft_validate_state_update (net,NFT_VALIDATE_SKIP ); -} -static int nf_tables_abort (struct net *net,struct sk_buff *skb) {int ret =__nf_tables_abort (net);
@@ -6802,7 +6799,6 @@ static const struct nfnetlink_subsystem nf_tables_subsys = { .cb = nf_tables_cb, .commit = nf_tables_commit, .abort = nf_tables_abort, - .cleanup = nf_tables_cleanup, .valid_genid = nf_tables_valid_genid, .owner = THIS_MODULE, };
net/netfilter/nfnetlink.c +0 -2
@@ -495,8 +495,6 @@ static void nfnetlink_rcv_batch(struct sk_buff *skb, struct nlmsghdr *nlh, }else { ss->abort (net, oskb); } -if (ss->cleanup) - ss->cleanup (net);nfnl_err_deliver (&err_list, oskb);kfree_skb (skb);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 76/191 ipv4: Fix potential uninit variable access bug in __ip_make_skb()
In reply to Greg Kroah-HartmanFrom: Ziyang Xuan <[email protected]>
[ Upstream commit 99e5acae193e369b71217efe6f1dad42f3f18815 ]
Like commit ea30388baebc ("ipv6: Fix an uninit variable access bug in __ip6_make_skb()"). icmphdr does not in skb linear region under the scenario of SOCK_RAW socket. Access icmp_hdr(skb)->type directly will trigger the uninit variable access bug.
Use a local variable icmp_type to carry the correct value in different scenarios.
--- net/ipv4/ip_output.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
net/ipv4/ip_output.c +13 -3
@@ -1443,9 +1443,19 @@ struct sk_buff *__ip_make_skb(struct sock *sk, cork->dst =NULL ;skb_dst_set (skb, &rt->dst); -if (iph->protocol ==IPPROTO_ICMP ) -icmp_out_count (net, ((struct icmphdr *) -skb_transport_header (skb))->type); +if (iph->protocol ==IPPROTO_ICMP ) { +u8 icmp_type; + +/* For such sockets, transhdrlen is zero when do ip_append_data(), +* so icmphdr does not in skb linear region and can not get icmp_type +* by icmp_hdr(skb)->type. +*/ +if (sk->sk_type ==SOCK_RAW && !inet_sk (sk)->hdrincl) + icmp_type = fl4->fl4_icmp_type; +else + icmp_type =icmp_hdr (skb)->type; +icmp_out_count (net, icmp_type); + }ip_cork_release (cork); out:
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 77/191 Revert "Bluetooth: btsdio: fix use after free bug in btsdio_remove due to unfinished work"
In reply to Greg Kroah-HartmanFrom: Liu Jian <[email protected]>
[ Upstream commit db2bf510bd5d57f064d9e1db395ed86a08320c54 ]
This reverts commit 1e9ac114c4428fdb7ff4635b45d4f46017e8916f.
This patch introduces a possible null-ptr-def problem. Revert it. And the fixed bug by this patch have resolved by commit 73f7b171b7c0 ("Bluetooth:
btsdio: fix use after free bug in btsdio_remove due to race condition").
--- drivers/bluetooth/btsdio.c | 1 - 1 file changed, 1 deletion(-)
drivers/bluetooth/btsdio.c +0 -1
@@ -353,7 +353,6 @@ static void btsdio_remove(struct sdio_func *func)BT_DBG ("func %p" , func); -cancel_work_sync (&data->work);if (!data)return ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 78/191 netlink: Use copy_to_user() for optval in netlink_getsockopt().
In reply to Greg Kroah-HartmanFrom: Kuniyuki Iwashima <[email protected]>
[ Upstream commit d913d32cc2707e9cd24fe6fa6d7d470e9c728980 ]
Brad Spencer provided a detailed report [0] that when calling getsockopt() for AF_NETLINK, some SOL_NETLINK options set only 1 byte even though such options require at least sizeof(int) as length.
The options return a flag value that fits into 1 byte, but such behaviour confuses users who do not initialise the variable before calling getsockopt() and do not strictly check the returned value as char.
Currently, netlink_getsockopt() uses put_user() to copy data to optlen and optval, but put_user() casts the data based on the pointer, char *optval. As a result, only 1 byte is set to optval.
To avoid this behaviour, we need to use copy_to_user() or cast optval for put_user().
Note that this changes the behaviour on big-endian systems, but we document that the size of optval is int in the man page.
$ man 7 netlink
...
Socket options
To set or get a netlink socket option, call getsockopt(2) to read
or setsockopt(2) to write the option with the option level argument
set to SOL_NETLINK. Unless otherwise noted, optval is a pointer to
an int.--- net/netlink/af_netlink.c | 67 +++++++++++++--------------------------- 1 file changed, 22 insertions(+), 45 deletions(-)
net/netlink/af_netlink.c +22 -45
@@ -1738,7 +1738,8 @@ static int netlink_getsockopt(struct socket *sock, int level, int optname, {struct sock *sk = sock->sk;struct netlink_sock *nlk =nlk_sk (sk); -int len, val, err; +unsigned int flag; +int len, val;if (level !=SOL_NETLINK )return -ENOPROTOOPT ;
@@ -1750,39 +1751,17 @@ static int netlink_getsockopt(struct socket *sock, int level, int optname,switch (optname) {case NETLINK_PKTINFO : -if (len <sizeof (int )) -return -EINVAL ; - len =sizeof (int ); - val = nlk->flags &NETLINK_F_RECV_PKTINFO ?1 :0 ; -if (put_user (len, optlen) || -put_user (val, optval)) -return -EFAULT ; - err =0 ; + flag =NETLINK_F_RECV_PKTINFO ;break ;case NETLINK_BROADCAST_ERROR : -if (len <sizeof (int )) -return -EINVAL ; - len =sizeof (int ); - val = nlk->flags &NETLINK_F_BROADCAST_SEND_ERROR ?1 :0 ; -if (put_user (len, optlen) || -put_user (val, optval)) -return -EFAULT ; - err =0 ; + flag =NETLINK_F_BROADCAST_SEND_ERROR ;break ;case NETLINK_NO_ENOBUFS : -if (len <sizeof (int )) -return -EINVAL ; - len =sizeof (int ); - val = nlk->flags &NETLINK_F_RECV_NO_ENOBUFS ?1 :0 ; -if (put_user (len, optlen) || -put_user (val, optval)) -return -EFAULT ; - err =0 ; + flag =NETLINK_F_RECV_NO_ENOBUFS ;break ;case NETLINK_LIST_MEMBERSHIPS : { -int pos, idx, shift; +int pos, idx, shift, err =0 ; - err =0 ;netlink_lock_table ();for (pos =0 ; pos *8 < nlk->ngroups; pos +=sizeof (u32)) {if (len - pos <sizeof (u32))
@@ -1799,31 +1778,29 @@ static int netlink_getsockopt(struct socket *sock, int level, int optname,if (put_user (ALIGN (nlk->ngroups /8 ,sizeof (u32)), optlen)) err = -EFAULT ;netlink_unlock_table (); -break ; +return err; }case NETLINK_CAP_ACK : -if (len <sizeof (int )) -return -EINVAL ; - len =sizeof (int ); - val = nlk->flags &NETLINK_F_CAP_ACK ?1 :0 ; -if (put_user (len, optlen) || -put_user (val, optval)) -return -EFAULT ; - err =0 ; + flag =NETLINK_F_CAP_ACK ;break ;case NETLINK_EXT_ACK : -if (len <sizeof (int )) -return -EINVAL ; - len =sizeof (int ); - val = nlk->flags &NETLINK_F_EXT_ACK ?1 :0 ; -if (put_user (len, optlen) ||put_user (val, optval)) -return -EFAULT ; - err =0 ; + flag =NETLINK_F_EXT_ACK ;break ;default : - err = -ENOPROTOOPT ; +return -ENOPROTOOPT ; } -return err; + +if (len <sizeof (int )) +return -EINVAL ; + + len =sizeof (int ); + val = nlk->flags & flag ?1 :0 ; + +if (put_user (len, optlen) || +copy_to_user (optval, &val, len)) +return -EFAULT ; + +return 0 ; }static void netlink_cmsg_recv_pktinfo (struct msghdr *msg,struct sk_buff *skb)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 79/191 net: amd: Fix link leak when verifying config failed
In reply to Greg Kroah-HartmanFrom: Gencen Gan <[email protected]>
[ Upstream commit d325c34d9e7e38d371c0a299d415e9b07f66a1fb ]
After failing to verify configuration, it returns directly without releasing link, which may cause memory leak.
Paolo Abeni thinks that the whole code of this driver is quite "suboptimal" and looks unmainatained since at least ~15y, so he suggests that we could simply remove the whole driver, please take it into consideration.
Simon Horman suggests that the fix label should be set to "Linux-2.6.12-rc2" considering that the problem has existed since the driver was introduced and the commit above doesn't seem to exist in net/net-next.
--- drivers/net/ethernet/amd/nmclan_cs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/amd/nmclan_cs.c +1 -1
@@ -652,7 +652,7 @@ static int nmclan_config(struct pcmcia_device *link) }else {pr_notice ("mace id not found: %x %x should be 0x40 0x?9\n" , sig[0 ], sig[1 ]); -return -ENODEV ; + goto failed; } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 80/191 tcp/udp: Fix memleaks of sk and zerocopy skbs with TX timestamp.
In reply to Greg Kroah-HartmanFrom: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 50749f2dd6854a41830996ad302aef2ffaf011d8 ]
syzkaller reported [0] memory leaks of an UDP socket and ZEROCOPY skbs. We can reproduce the problem with these sequences:
sk = socket(AF_INET, SOCK_DGRAM, 0) sk.setsockopt(SOL_SOCKET, SO_TIMESTAMPING, SOF_TIMESTAMPING_TX_SOFTWARE) sk.setsockopt(SOL_SOCKET, SO_ZEROCOPY, 1)
sk.sendto(b'', MSG_ZEROCOPY, ('127.0.0.1', 53))
sk.close()
sendmsg() calls msg_zerocopy_alloc(), which allocates a skb, sets skb->cb->ubuf.refcnt to 1, and calls sock_hold(). Here, struct ubuf_info_msgzc indirectly holds a refcnt of the socket. When the skb is sent, __skb_tstamp_tx() clones it and puts the clone into the socket's error queue with the TX timestamp.
When the original skb is received locally, skb_copy_ubufs() calls skb_unclone(), and pskb_expand_head() increments skb->cb->ubuf.refcnt. This additional count is decremented while freeing the skb, but struct ubuf_info_msgzc still has a refcnt, so __msg_zerocopy_callback() is not called.
The last refcnt is not released unless we retrieve the TX timestamped skb by recvmsg(). Since we clear the error queue in inet_sock_destruct() after the socket's refcnt reaches 0, there is a circular dependency. If we close() the socket holding such skbs, we never call sock_put() and leak the count, sk, and skb.
TCP has the same problem, and commit e0c8bccd40fc ("net: stream:
purge sk_error_queue in sk_stream_kill_queues()") tried to fix it by calling skb_queue_purge() during close(). However, there is a small chance that skb queued in a qdisc or device could be put into the error queue after the skb_queue_purge() call.
In __skb_tstamp_tx(), the cloned skb should not have a reference to the ubuf to remove the circular dependency, but skb_clone() does not call skb_copy_ubufs() for zerocopy skb. So, we need to call skb_orphan_frags_rx() for the cloned skb to call skb_copy_ubufs().
[0]:
BUG: memory leak
unreferenced object 0xffff88800c6d2d00 (size 1152):
comm "syz-executor392", pid 264, jiffies 4294785440 (age 13.044s)
hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 cd af e8 81 00 00 00 00 ................
02 00 07 40 00 00 00 00 00 00 00 00 00 00 00 00 ...@............
backtrace:
[<0000000055636812>] sk_prot_alloc+0x64/0x2a0 net/core/sock.c:2024
[<0000000054d77b7a>] sk_alloc+0x3b/0x800 net/core/sock.c:2083
[<0000000066f3c7e0>] inet_create net/ipv4/af_inet.c:319 [inline]
[<0000000066f3c7e0>] inet_create+0x31e/0xe40 net/ipv4/af_inet.c:245
[<000000009b83af97>] __sock_create+0x2ab/0x550 net/socket.c:1515
[<00000000b9b11231>] sock_create net/socket.c:1566 [inline]
[<00000000b9b11231>] __sys_socket_create net/socket.c:1603 [inline]
[<00000000b9b11231>] __sys_socket_create net/socket.c:1588 [inline]
[<00000000b9b11231>] __sys_socket+0x138/0x250 net/socket.c:1636
[<000000004fb45142>] __do_sys_socket net/socket.c:1649 [inline]
[<000000004fb45142>] __se_sys_socket net/socket.c:1647 [inline]
[<000000004fb45142>] __x64_sys_socket+0x73/0xb0 net/socket.c:1647
[<0000000066999e0e>] do_syscall_x64 arch/x86/entry/common.c:50 [inline]
[<0000000066999e0e>] do_syscall_64+0x38/0x90 arch/x86/entry/common.c:80
[<0000000017f238c1>] entry_SYSCALL_64_after_hwframe+0x63/0xcd
BUG: memory leak
unreferenced object 0xffff888017633a00 (size 240):
comm "syz-executor392", pid 264, jiffies 4294785440 (age 13.044s)
hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 2d 6d 0c 80 88 ff ff .........-m.....
backtrace:
[<000000002b1c4368>] __alloc_skb+0x229/0x320 net/core/skbuff.c:497
[<00000000143579a6>] alloc_skb include/linux/skbuff.h:1265 [inline]
[<00000000143579a6>] sock_omalloc+0xaa/0x190 net/core/sock.c:2596
[<00000000be626478>] msg_zerocopy_alloc net/core/skbuff.c:1294 [inline]
[<00000000be626478>] msg_zerocopy_realloc+0x1ce/0x7f0 net/core/skbuff.c:1370
[<00000000cbfc9870>] __ip_append_data+0x2adf/0x3b30 net/ipv4/ip_output.c:1037
[<0000000089869146>] ip_make_skb+0x26c/0x2e0 net/ipv4/ip_output.c:1652
[<00000000098015c2>] udp_sendmsg+0x1bac/0x2390 net/ipv4/udp.c:1253
[<0000000045e0e95e>] inet_sendmsg+0x10a/0x150 net/ipv4/af_inet.c:819
[<000000008d31bfde>] sock_sendmsg_nosec net/socket.c:714 [inline]
[<000000008d31bfde>] sock_sendmsg+0x141/0x190 net/socket.c:734
[<0000000021e21aa4>] __sys_sendto+0x243/0x360 net/socket.c:2117
[<00000000ac0af00c>] __do_sys_sendto net/socket.c:2129 [inline]
[<00000000ac0af00c>] __se_sys_sendto net/socket.c:2125 [inline]
[<00000000ac0af00c>] __x64_sys_sendto+0xe1/0x1c0 net/socket.c:2125
[<0000000066999e0e>] do_syscall_x64 arch/x86/entry/common.c:50 [inline]
[<0000000066999e0e>] do_syscall_64+0x38/0x90 arch/x86/entry/common.c:80
[<0000000017f238c1>] entry_SYSCALL_64_after_hwframe+0x63/0xcd--- net/core/skbuff.c | 3 +++ 1 file changed, 3 insertions(+)
net/core/skbuff.c +3 -0
@@ -4445,6 +4445,9 @@ void __skb_tstamp_tx(struct sk_buff *orig_skb, skb =alloc_skb (0 ,GFP_ATOMIC ); }else { skb =skb_clone (orig_skb,GFP_ATOMIC ); + +if (skb_orphan_frags_rx (skb,GFP_ATOMIC )) +return ; }if (!skb)return ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 81/191 pstore: Revert pmsg_lock back to a normal mutex
In reply to Greg Kroah-HartmanFrom: John Stultz <[email protected]>
[ Upstream commit 5239a89b06d6b199f133bf0ffea421683187f257 ]
This reverts commit 76d62f24db07f22ccf9bc18ca793c27d4ebef721.
So while priority inversion on the pmsg_lock is an occasional problem that an rt_mutex would help with, in uses where logging is writing to pmsg heavily from multiple threads, the pmsg_lock can be heavily contended.
After this change landed, it was reported that cases where the mutex locking overhead was commonly adding on the order of 10s of usecs delay had suddenly jumped to ~msec delay with rtmutex.
It seems the slight differences in the locks under this level of contention causes the normal mutexes to utilize the spinning optimizations, while the rtmutexes end up in the sleeping slowpath (which allows additional threads to pile on trying to take the lock).
In this case, it devolves to a worse case senerio where the lock acquisition and scheduling overhead dominates, and each thread is waiting on the order of ~ms to do ~us of work.
Obviously, having tons of threads all contending on a single lock for logging is non-optimal, so the proper fix is probably reworking pstore pmsg to have per-cpu buffers so we don't have contention.
Additionally, Steven Rostedt has provided some furhter optimizations for rtmutexes that improves the rtmutex spinning path, but at least in my testing, I still see the test tripping into the sleeping path on rtmutexes while utilizing the spinning path with mutexes.
But in the short term, lets revert the change to the rt_mutex and go back to normal mutexes to avoid a potentially major performance regression. And we can work on optimizations to both rtmutexes and finer-grained locking for pstore pmsg in the future.
--- fs/pstore/pmsg.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
fs/pstore/pmsg.c +3 -4
@@ -15,10 +15,9 @@#include <linux/device.h> #include <linux/fs.h> #include <linux/uaccess.h> -#include <linux/rtmutex.h> #include "internal.h" -static DEFINE_RT_MUTEX (pmsg_lock); +static DEFINE_MUTEX (pmsg_lock);static ssize_t write_pmsg (struct file *file,const char __user *buf,size_t count,loff_t *ppos)
@@ -37,9 +36,9 @@ static ssize_t write_pmsg(struct file *file, const char __user *buf,if (!access_ok (VERIFY_READ , buf, count))return -EFAULT ; -rt_mutex_lock (&pmsg_lock); +mutex_lock (&pmsg_lock); ret = psinfo->write_user (&record, buf); -rt_mutex_unlock (&pmsg_lock); +mutex_unlock (&pmsg_lock);return ret ? ret : count; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 82/191 usb: host: xhci-rcar: remove leftover quirk handling
In reply to Greg Kroah-HartmanFrom: Wolfram Sang <[email protected]>
[ Upstream commit 5d67f4861884762ebc2bddb5d667444e45f25782 ]
Loading V3 firmware does not need a quirk anymore, remove the leftover code.
--- drivers/usb/host/xhci-rcar.c | 3 --- 1 file changed, 3 deletions(-)
drivers/usb/host/xhci-rcar.c +0 -3
@@ -74,7 +74,6 @@ MODULE_FIRMWARE(XHCI_RCAR_FIRMWARE_NAME_V3);/* For soc_device_attribute */ #define RCAR_XHCI_FIRMWARE_V2 BIT(0)/* FIRMWARE V2 */ -#define RCAR_XHCI_FIRMWARE_V3 BIT(1)/* FIRMWARE V3 */ static const struct soc_device_attribute rcar_quirks_match[] = { {
@@ -156,8 +155,6 @@ static int xhci_rcar_download_firmware(struct usb_hcd *hcd)if (quirks &RCAR_XHCI_FIRMWARE_V2 ) firmware_name =XHCI_RCAR_FIRMWARE_NAME_V2 ; -else if (quirks &RCAR_XHCI_FIRMWARE_V3 ) - firmware_name =XHCI_RCAR_FIRMWARE_NAME_V3 ;else firmware_name = priv->firmware_name;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 83/191 fpga: bridge: fix kernel-doc parameter description
In reply to Greg Kroah-HartmanFrom: Marco Pagani <[email protected]>
[ Upstream commit 7ef1a2c1c9dffa177ecc3ea50b7f5ee63a621137 ]
Fix the kernel-doc description for the "struct fpga_image_info *info" parameter of the fpga_bridge_get() function.
--- drivers/fpga/fpga-bridge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/fpga/fpga-bridge.c +1 -1
@@ -121,7 +121,7 @@ static int fpga_bridge_dev_match(struct device *dev, const void *data)/** * fpga_bridge_get - get an exclusive reference to a fpga bridge * @dev: parent device that fpga bridge was registered with -* @info: fpga manager info +* @info: fpga image specific information * * Given a device, get an exclusive reference to a fpga bridge. *
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 84/191 usb: gadget: udc: renesas_usb3: Fix use after free bug in renesas_usb3_remove due to race condition
In reply to Greg Kroah-HartmanFrom: Zheng Wang <[email protected]>
[ Upstream commit 2b947f8769be8b8181dc795fd292d3e7120f5204 ]
In renesas_usb3_probe, role_work is bound with renesas_usb3_role_work. renesas_usb3_start will be called to start the work.
If we remove the driver which will call usbhs_remove, there may be an unfinished work. The possible sequence is as follows:
CPU0 CPU1
renesas_usb3_role_workrenesas_usb3_removeusb_role_switch_unregisterdevice_unregister
kfree(sw)
//free usb3->role_sw
usb_role_switch_set_role
//use usb3->role_swThe usb3->role_sw could be freed under such circumstance and then used in usb_role_switch_set_role.
This bug was found by static analysis. And note that removing a driver is a root-only operation, and should never happen in normal case. But the root user may directly remove the device which will also trigger the remove function.
Fix it by canceling the work before cleanup in the renesas_usb3_remove.
--- drivers/usb/gadget/udc/renesas_usb3.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/gadget/udc/renesas_usb3.c +1 -0
@@ -2478,6 +2478,7 @@ static int renesas_usb3_remove(struct platform_device *pdev)debugfs_remove_recursive (usb3->dentry);device_remove_file (&pdev->dev, &dev_attr_role); +cancel_work_sync (&usb3->role_work);usb_role_switch_unregister (usb3->role_sw);usb_del_gadget_udc (&usb3->gadget);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 85/191 linux/vt_buffer.h: allow either builtin or modular for macros
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 2b76ffe81e32afd6d318dc4547e2ba8c46207b77 ]
Fix build errors on ARCH=alpha when CONFIG_MDA_CONSOLE=m. This allows the ARCH macros to be the only ones defined.
In file included from ../drivers/video/console/mdacon.c:37:../arch/alpha/include/asm/vga.h:17:40: error: expected identifier or '(' before 'volatile'
17 | static inline void scr_writew(u16 val, volatile u16 *addr)
| ^~~~~~~~../include/linux/vt_buffer.h:24:34: note: in definition of macro 'scr_writew'
24 | #define scr_writew(val, addr) (*(addr) = (val))
| ^~~~../include/linux/vt_buffer.h:24:40: error: expected ')' before '=' token
24 | #define scr_writew(val, addr) (*(addr) = (val))
| ^../arch/alpha/include/asm/vga.h:17:20: note: in expansion of macro 'scr_writew'
17 | static inline void scr_writew(u16 val, volatile u16 *addr)
| ^~~~~~~~~~
../arch/alpha/include/asm/vga.h:25:29: error: expected identifier or '(' before 'volatile'
25 | static inline u16 scr_readw(volatile const u16 *addr)
| ^~~~~~~~
--- include/linux/vt_buffer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/vt_buffer.h +1 -1
@@ -16,7 +16,7 @@#include <linux/string.h> -#if defined(CONFIG_VGA_CONSOLE ) || defined(CONFIG_MDA_CONSOLE ) +#if IS_ENABLED (CONFIG_VGA_CONSOLE ) ||IS_ENABLED (CONFIG_MDA_CONSOLE )#include <asm/vga.h> #endif
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 86/191 spi: qup: fix PM reference leak in spi_qup_remove()
In reply to Greg Kroah-HartmanFrom: Wang Li <[email protected]>
[ Upstream commit cec77e0a249892ceb10061bf17b63f9fb111d870 ]
pm_runtime_get_sync will increment pm usage counter even it failed. Forgetting to putting operation will result in reference leak here. Fix it by replacing it with pm_runtime_resume_and_get to keep usage counter balanced.
Stable-dep-of: 61f49171a43a ("spi: qup: Don't skip cleanup in remove's error path")
--- drivers/spi/spi-qup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-qup.c +1 -1
@@ -1249,7 +1249,7 @@ static int spi_qup_remove(struct platform_device *pdev)struct spi_qup *controller =spi_master_get_devdata (master);int ret; - ret =pm_runtime_get_sync (&pdev->dev); + ret =pm_runtime_resume_and_get (&pdev->dev);if (ret <0 )return ret;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 87/191 spi: qup: Dont skip cleanup in removes error path
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 61f49171a43ab1f80c73c5c88c508770c461e0f2 ]
Returning early in a platform driver's remove callback is wrong. In this case the dma resources are not released in the error path. this is never retried later and so this is a permanent leak. To fix this, only skip hardware disabling if waking the device fails.
--- drivers/spi/spi-qup.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
drivers/spi/spi-qup.c +13 -9
@@ -1249,18 +1249,22 @@ static int spi_qup_remove(struct platform_device *pdev)struct spi_qup *controller =spi_master_get_devdata (master);int ret; - ret =pm_runtime_resume_and_get (&pdev->dev); -if (ret <0 ) -return ret; + ret =pm_runtime_get_sync (&pdev->dev); - ret =spi_qup_set_state (controller,QUP_STATE_RESET ); -if (ret) -return ret; +if (ret >=0 ) { + ret =spi_qup_set_state (controller,QUP_STATE_RESET ); +if (ret) +dev_warn (&pdev->dev,"failed to reset controller (%pe)\n" , +ERR_PTR (ret)); -spi_qup_release_dma (master); +clk_disable_unprepare (controller->cclk); +clk_disable_unprepare (controller->iclk); + }else { +dev_warn (&pdev->dev,"failed to resume, skip hw disable (%pe)\n" , +ERR_PTR (ret)); + } -clk_disable_unprepare (controller->cclk); -clk_disable_unprepare (controller->iclk); +spi_qup_release_dma (master);pm_runtime_put_noidle (&pdev->dev);pm_runtime_disable (&pdev->dev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 88/191 spi: fsl-spi: Fix CPM/QE mode Litte Endian
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
[ Upstream commit c20c57d9868d7f9fd1b2904c7801b07e128f6322 ]
CPM has the same problem as QE so for CPM also use the fix added by commit 0398fb70940e ("spi/spi_mpc8xxx: Fix QE mode Litte Endian"):
CPM mode uses Little Endian so words > 8 bits are byte swapped. Workaround this by always enforcing wordsize 8 for 16 and 32 bits words. Unfortunately this will not work for LSB transfers where wordsize is > 8 bits so disable these for now.
Also limit the workaround to 16 and 32 bits words because it can only work for multiples of 8-bits.
--- drivers/spi/spi-fsl-spi.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/spi/spi-fsl-spi.c +7 -5
@@ -205,8 +205,8 @@ static int mspi_apply_qe_mode_quirks(struct spi_mpc8xxx_cs *cs,struct spi_device *spi, int bits_per_word) { -/* QE uses Little Endian for words > 8 -* so transform all words > 8 into 8 bits +/* CPM/QE uses Little Endian for words > 8 +* so transform 16 and 32 bits words into 8 bits * Unfortnatly that doesn't work for LSB so * reject these for now */ /* Note: 32 bits word, LSB works iff
@@ -214,9 +214,11 @@ static int mspi_apply_qe_mode_quirks(struct spi_mpc8xxx_cs *cs,if (spi->mode &SPI_LSB_FIRST && bits_per_word >8 )return -EINVAL ; -if (bits_per_word >8 ) +if (bits_per_word <=8 ) +return bits_per_word; +if (bits_per_word ==16 || bits_per_word ==32 )return 8 ;/* pretend its 8 bits */ -return bits_per_word; +return -EINVAL ; } static int fsl_spi_setup_transfer(struct spi_device *spi,
@@ -246,7 +248,7 @@ static int fsl_spi_setup_transfer(struct spi_device *spi, bits_per_word =mspi_apply_cpu_mode_quirks (cs, spi, mpc8xxx_spi, bits_per_word); - else if (mpc8xxx_spi->flags & SPI_QE) + else bits_per_word =mspi_apply_qe_mode_quirks (cs, spi, bits_per_word);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 89/191 vmci_host: fix a race condition in vmci_host_poll() causing GPF
In reply to Greg Kroah-HartmanFrom: Dae R. Jeong <[email protected]>
[ Upstream commit ae13381da5ff0e8e084c0323c3cc0a945e43e9c7 ]
During fuzzing, a general protection fault is observed in vmci_host_poll().
general protection fault, probably for non-canonical address 0xdffffc0000000019: 0000 [#1] PREEMPT SMP KASAN KASAN: null-ptr-deref in range [0x00000000000000c8-0x00000000000000cf] RIP: 0010:__lock_acquire+0xf3/0x5e00 kernel/locking/lockdep.c:4926 <- omitting registers -> Call Trace: <TASK> lock_acquire+0x1a4/0x4a0 kernel/locking/lockdep.c:5672 __raw_spin_lock_irqsave include/linux/spinlock_api_smp.h:110 [inline] _raw_spin_lock_irqsave+0xb3/0x100 kernel/locking/spinlock.c:162 add_wait_queue+0x3d/0x260 kernel/sched/wait.c:22 poll_wait include/linux/poll.h:49 [inline] vmci_host_poll+0xf8/0x2b0 drivers/misc/vmw_vmci/vmci_host.c:174 vfs_poll include/linux/poll.h:88 [inline] do_pollfd fs/select.c:873 [inline] do_poll fs/select.c:921 [inline] do_sys_poll+0xc7c/0x1aa0 fs/select.c:1015 __do_sys_ppoll fs/select.c:1121 [inline] __se_sys_ppoll+0x2cc/0x330 fs/select.c:1101 do_syscall_x64 arch/x86/entry/common.c:51 [inline] do_syscall_64+0x4e/0xa0 arch/x86/entry/common.c:82 entry_SYSCALL_64_after_hwframe+0x46/0xb0
Example thread interleaving that causes the general protection fault is as follows:
CPU1 (vmci_host_poll) CPU2 (vmci_host_do_init_context)
----- -----
// Read uninitialized context
context = vmci_host_dev->context;
// Initialize context
vmci_host_dev->context = vmci_ctx_create();
vmci_host_dev->ct_type = VMCIOBJ_CONTEXT;if (vmci_host_dev->ct_type == VMCIOBJ_CONTEXT) {
// Dereferencing the wrong pointer
poll_wait(..., &context->host_context);
}In this scenario, vmci_host_poll() reads vmci_host_dev->context first, and then reads vmci_host_dev->ct_type to check that vmci_host_dev->context is initialized. However, since these two reads are not atomically executed, there is a chance of a race condition as described above.
To fix this race condition, read vmci_host_dev->context after checking the value of vmci_host_dev->ct_type so that vmci_host_poll() always reads an initialized context.
--- drivers/misc/vmw_vmci/vmci_host.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/misc/vmw_vmci/vmci_host.c +7 -1
@@ -169,10 +169,16 @@ static int vmci_host_close(struct inode *inode, struct file *filp)static __poll_t vmci_host_poll (struct file *filp,poll_table *wait) {struct vmci_host_dev *vmci_host_dev = filp->private_data; -struct vmci_ctx *context = vmci_host_dev->context; +struct vmci_ctx *context;__poll_t mask =0 ;if (vmci_host_dev->ct_type ==VMCIOBJ_CONTEXT ) { +/* +* Read context only if ct_type == VMCIOBJ_CONTEXT to make +* sure that context is initialized +*/ + context = vmci_host_dev->context; +/* Check for VMCI calls to this VM context. */ if (wait) poll_wait(filp, &context->host_context.wait_queue,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 90/191 of: Fix modalias string generation
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
[ Upstream commit b19a4266c52de78496fe40f0b37580a3b762e67d ]
The helper generating an OF based modalias (of_device_get_modalias()) works fine, but due to the use of snprintf() internally it needs a buffer one byte longer than what should be needed just for the entire string (excluding the '\0'). Most users of this helper are sysfs hooks providing the modalias string to users. They all provide a PAGE_SIZE buffer which is way above the number of bytes required to fit the modalias string and hence do not suffer from this issue.
There is another user though, of_device_request_module(), which is only called by drivers/usb/common/ulpi.c. This request module function is faulty, but maybe because in most cases there is an alternative, ULPI driver users have not noticed it.
In this function, of_device_get_modalias() is called twice. The first time without buffer just to get the number of bytes required by the modalias string (excluding the null byte), and a second time, after buffer allocation, to fill the buffer. The allocation asks for an additional byte, in order to store the trailing '\0'. However, the buffer *length* provided to of_device_get_modalias() excludes this extra byte. The internal use of snprintf() with a length that is exactly the number of bytes to be written has the effect of using the last available byte to store a '\0', which then smashes the last character of the modalias string.
Provide the actual size of the buffer to of_device_get_modalias() to fix this issue.
Note: the "str[size - 1] = '\0';" line is not really needed as snprintf will anyway end the string with a null byte, but there is a possibility that this function might be called on a struct device_node without compatible, in this case snprintf() would not be executed. So we keep it just to avoid possible unbounded strings.
--- drivers/of/device.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/of/device.c +5 -2
@@ -258,12 +258,15 @@ int of_device_request_module(struct device *dev)if (size <0 )return size; - str =kmalloc (size +1 ,GFP_KERNEL ); +/* Reserve an additional byte for the trailing '\0' */ + size++; + + str =kmalloc (size,GFP_KERNEL );if (!str)return -ENOMEM ;of_device_get_modalias (dev, str, size); - str[size] ='\0' ; + str[size -1 ] ='\0' ; ret =request_module (str);kfree (str);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 91/191 ia64: mm/contig: fix section mismatch warning/error
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 58deeb4ef3b054498747d0929d94ac53ab90981f ]
alloc_per_cpu_data() is called by find_memory(), which is marked as __init. Therefore alloc_per_cpu_data() can also be marked as __init to remedy this modpost problem.
WARNING: modpost: vmlinux.o: section mismatch in reference: alloc_per_cpu_data (section: .text) -> memblock_alloc_try_nid (section: .init.text)
--- arch/ia64/mm/contig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/ia64/mm/contig.c +1 -1
@@ -82,7 +82,7 @@ void *per_cpu_init(void)return __per_cpu_start + __per_cpu_offset[smp_processor_id ()]; } -static inline void +static inline __init void alloc_per_cpu_data (void ) { cpu_data = __alloc_bootmem(PERCPU_PAGE_SIZE * num_possible_cpus(),
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 92/191 ia64: salinfo: placate defined-but-not-used warning
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 0de155752b152d6bcd96b5b5bf20af336abd183a ]
When CONFIG_PROC_FS is not set, proc_salinfo_show() is not used. Mark the function as __maybe_unused to quieten the warning message.
../arch/ia64/kernel/salinfo.c:584:12: warning: 'proc_salinfo_show' defined but not used [-Wunused-function]
584 | static int proc_salinfo_show(struct seq_file *m, void *v)
| ^~~~~~~~~~~~~~~~~
--- arch/ia64/kernel/salinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/ia64/kernel/salinfo.c +1 -1
@@ -580,7 +580,7 @@ static int salinfo_cpu_pre_down(unsigned int cpu)* 'data' contains an integer that corresponds to the feature we're * testing */ -static int proc_salinfo_show (struct seq_file *m,void *v) +static int __maybe_unused proc_salinfo_show (struct seq_file *m,void *v) {unsigned long data = (unsigned long )v;seq_puts (m, (sal_platform_features & data) ?"1\n" :"0\n" );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 93/191 mtd: spi-nor: cadence-quadspi: Make driver independent of flash geometry
In reply to Greg Kroah-HartmanFrom: Vignesh Raghavendra <[email protected]>
[ Upstream commit 834b4e8d344139ba64cda22099b2b2ef6c9a542d ]
Drop configuration of Flash size, erase size and page size configuration. Flash size is needed only if using AHB decoder (BIT 23 of CONFIG_REG) which is not used by the driver.
Erase size and page size are needed if IP is configured to send WREN automatically. But since SPI NOR layer takes care of sending WREN, there is no need to configure these fields either.
Therefore drop these in preparation to move the driver to spi-mem framework where flash geometry is not visible to controller driver.
Stable-dep-of: 2087e85bb66e ("spi: cadence-quadspi: fix suspend-resume implementations")
--- drivers/mtd/spi-nor/cadence-quadspi.c | 36 +-------------------------- 1 file changed, 1 insertion(+), 35 deletions(-)
drivers/mtd/spi-nor/cadence-quadspi.c +1 -35
@@ -80,9 +80,6 @@ struct cqspi_st {dma_addr_t mmap_phys_base;int current_cs; -int current_page_size; -int current_erase_size; -int current_addr_width;unsigned long master_ref_clk_hz;bool is_decoded_cs;u32 fifo_depth;
@@ -734,32 +731,6 @@ static void cqspi_chipselect(struct spi_nor *nor)writel (reg, reg_base +CQSPI_REG_CONFIG ); } -static void cqspi_configure_cs_and_sizes (struct spi_nor *nor) -{ -struct cqspi_flash_pdata *f_pdata = nor->priv; -struct cqspi_st *cqspi = f_pdata->cqspi; -void __iomem *iobase = cqspi->iobase; -unsigned int reg; - -/* configure page size and block size. */ - reg =readl (iobase +CQSPI_REG_SIZE ); - reg &= ~(CQSPI_REG_SIZE_PAGE_MASK <<CQSPI_REG_SIZE_PAGE_LSB ); - reg &= ~(CQSPI_REG_SIZE_BLOCK_MASK <<CQSPI_REG_SIZE_BLOCK_LSB ); - reg &= ~CQSPI_REG_SIZE_ADDRESS_MASK ; - reg |= (nor->page_size <<CQSPI_REG_SIZE_PAGE_LSB ); - reg |= (ilog2 (nor->mtd.erasesize) <<CQSPI_REG_SIZE_BLOCK_LSB ); - reg |= (nor->addr_width -1 ); -writel (reg, iobase +CQSPI_REG_SIZE ); - -/* configure the chip select */ -cqspi_chipselect (nor); - -/* Store the new configuration of the controller */ - cqspi->current_page_size = nor->page_size; - cqspi->current_erase_size = nor->mtd.erasesize; - cqspi->current_addr_width = nor->addr_width; -} -static unsigned int calculate_ticks_for_ns (const unsigned int ref_clk_hz,const unsigned int ns_val) {
@@ -865,18 +836,13 @@ static void cqspi_configure(struct spi_nor *nor)int switch_cs = (cqspi->current_cs != f_pdata->cs);int switch_ck = (cqspi->sclk != sclk); -if ((cqspi->current_page_size != nor->page_size) || - (cqspi->current_erase_size != nor->mtd.erasesize) || - (cqspi->current_addr_width != nor->addr_width)) - switch_cs =1 ; -if (switch_cs || switch_ck)cqspi_controller_enable (cqspi,0 );/* Switch chip select. */ if (switch_cs) { cqspi->current_cs = f_pdata->cs; -cqspi_configure_cs_and_sizes (nor); +cqspi_chipselect (nor); }/* Setup baudrate divisor and delays */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 94/191 mtd: spi-nor: cadence-quadspi: Dont initialize rx_dma_complete on failure
In reply to Greg Kroah-HartmanFrom: Vignesh Raghavendra <[email protected]>
[ Upstream commit 48aae57f0f9f57797772bd462b4d64902b1b4ae1 ]
If driver fails to acquire DMA channel then don't initialize rx_dma_complete struct as it won't be used.
Stable-dep-of: 2087e85bb66e ("spi: cadence-quadspi: fix suspend-resume implementations")
--- drivers/mtd/spi-nor/cadence-quadspi.c | 1 + 1 file changed, 1 insertion(+)
drivers/mtd/spi-nor/cadence-quadspi.c +1 -0
@@ -1173,6 +1173,7 @@ static void cqspi_request_mmap_dma(struct cqspi_st *cqspi)if (IS_ERR (cqspi->rx_chan)) {dev_err (&cqspi->pdev->dev,"No Rx DMA available\n" ); cqspi->rx_chan =NULL ; +return ; }init_completion (&cqspi->rx_dma_complete); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 95/191 mtd: spi-nor: cadence-quadspi: Handle probe deferral while requesting DMA channel
In reply to Greg Kroah-HartmanFrom: Vignesh Raghavendra <[email protected]>
[ Upstream commit 935da5e5100f57d843cac4781b21f1c235059aa0 ]
dma_request_chan_by_mask() can throw EPROBE_DEFER if DMA provider is not yet probed. Currently driver just falls back to using PIO mode (which is less efficient) in this case. Instead return probe deferral error as is so that driver will be re probed once DMA provider is available.
Stable-dep-of: 2087e85bb66e ("spi: cadence-quadspi: fix suspend-resume implementations")
--- drivers/mtd/spi-nor/cadence-quadspi.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
drivers/mtd/spi-nor/cadence-quadspi.c +13 -5
@@ -1162,7 +1162,7 @@ static void cqspi_controller_init(struct cqspi_st *cqspi)cqspi_controller_enable (cqspi,1 ); } -static void cqspi_request_mmap_dma (struct cqspi_st *cqspi) +static int cqspi_request_mmap_dma (struct cqspi_st *cqspi) {dma_cap_mask_t mask;
@@ -1171,11 +1171,16 @@ static void cqspi_request_mmap_dma(struct cqspi_st *cqspi) cqspi->rx_chan =dma_request_chan_by_mask (&mask);if (IS_ERR (cqspi->rx_chan)) { -dev_err (&cqspi->pdev->dev,"No Rx DMA available\n" ); +int ret =PTR_ERR (cqspi->rx_chan); + +if (ret != -EPROBE_DEFER ) +dev_err (&cqspi->pdev->dev,"No Rx DMA available\n" ); cqspi->rx_chan =NULL ; -return ; +return ret; }init_completion (&cqspi->rx_dma_complete); + +return 0 ; }static int cqspi_setup_flash (struct cqspi_st *cqspi,struct device_node *np)
@@ -1256,8 +1261,11 @@ static int cqspi_setup_flash(struct cqspi_st *cqspi, struct device_node *np)dev_dbg (nor->dev,"using direct mode for %s\n" , mtd->name); -if (!cqspi->rx_chan) -cqspi_request_mmap_dma (cqspi); +if (!cqspi->rx_chan) { + ret =cqspi_request_mmap_dma (cqspi); +if (ret == -EPROBE_DEFER ) + goto err; + } } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 96/191 spi: cadence-quadspi: fix suspend-resume implementations
In reply to Greg Kroah-HartmanFrom: Dhruva Gole <[email protected]>
[ Upstream commit 2087e85bb66ee3652dafe732bb9b9b896229eafc ]
The cadence QSPI driver misbehaves after performing a full system suspend resume:
...
spi-nor spi0.0: resume() failed
...
This results in a flash connected via OSPI interface after system suspend- resume to be unusable.
fix these suspend and resume functions.
--- drivers/mtd/spi-nor/cadence-quadspi.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
drivers/mtd/spi-nor/cadence-quadspi.c +16 -3
@@ -1412,17 +1412,30 @@ static int cqspi_remove(struct platform_device *pdev)static int cqspi_suspend (struct device *dev) {struct cqspi_st *cqspi =dev_get_drvdata (dev); +struct spi_master *master =dev_get_drvdata (dev); +int ret; + ret =spi_master_suspend (master);cqspi_controller_enable (cqspi,0 ); -return 0 ; + +clk_disable_unprepare (cqspi->clk); + +return ret; }static int cqspi_resume (struct device *dev) {struct cqspi_st *cqspi =dev_get_drvdata (dev); +struct spi_master *master =dev_get_drvdata (dev); -cqspi_controller_enable (cqspi,1 ); -return 0 ; +clk_prepare_enable (cqspi->clk); +cqspi_wait_idle (cqspi); +cqspi_controller_init (cqspi); + + cqspi->current_cs =-1 ; + cqspi->sclk =0 ; + +return spi_master_resume (master); }static const struct dev_pm_ops cqspi__dev_pm_ops = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 97/191 uapi/linux/const.h: prefer ISO-friendly __typeof__
In reply to Greg Kroah-HartmanFrom: Kevin Brodsky <[email protected]>
[ Upstream commit 31088f6f7906253ef4577f6a9b84e2d42447dba0 ]
typeof is (still) a GNU extension, which means that it cannot be used when building ISO C (e.g. -std=c99). It should therefore be avoided in uapi headers in favour of the ISO-friendly __typeof__.
Unfortunately this issue could not be detected by CONFIG_UAPI_HEADER_TEST=y as the __ALIGN_KERNEL() macro is not expanded in any uapi header.
This matters from a userspace perspective, not a kernel one. uapi headers and their contents are expected to be usable in a variety of situations, and in particular when building ISO C applications (with -std=c99 or similar).
This particular problem can be reproduced by trying to use the __ALIGN_KERNEL macro directly in application code, say:
#include <linux/const.h>
int align(int x, int a)
{
return __KERNEL_ALIGN(x, a);
}and trying to build that with -std=c99.
--- include/uapi/linux/const.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/const.h +1 -1
@@ -28,7 +28,7 @@#define _BITUL (x) (_UL(1) << (x))#define _BITULL (x) (_ULL(1) << (x)) -#define __ALIGN_KERNEL (x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1) +#define __ALIGN_KERNEL (x, a) __ALIGN_KERNEL_MASK(x, (__typeof__(x))(a) - 1)#define __ALIGN_KERNEL_MASK (x, mask) (((x) + (mask)) & ~(mask))#define __KERNEL_DIV_ROUND_UP (n, d) (((n) + (d) - 1) / (d))
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 98/191 sh: sq: Fix incorrect element size for allocating bitmap buffer
In reply to Greg Kroah-HartmanFrom: John Paul Adrian Glaubitz <[email protected]>
[ Upstream commit 80f746e2bd0e1da3fdb49a53570e54a1a225faac ]
The Store Queue code allocates a bitmap buffer with the size of multiple of sizeof(long) in sq_api_init(). While the buffer size is calculated correctly, the code uses the wrong element size to allocate the buffer which results in the allocated bitmap buffer being too small.
Fix this by allocating the buffer with kcalloc() with element size sizeof(long) instead of kzalloc() whose elements size defaults to sizeof(char).
--- arch/sh/kernel/cpu/sh4/sq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/sh/kernel/cpu/sh4/sq.c +1 -1
@@ -383,7 +383,7 @@ static int __init sq_api_init(void)if (unlikely (!sq_cache))return ret; - sq_bitmap =kzalloc (size,GFP_KERNEL ); + sq_bitmap =kcalloc (size,sizeof (long ),GFP_KERNEL );if (unlikely (!sq_bitmap)) goto out;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 99/191 usb: chipidea: fix missing goto in `ci_hdrc_probe`
In reply to Greg Kroah-HartmanFrom: Yinhao Hu <[email protected]>
[ Upstream commit d6f712f53b79f5017cdcefafb7a5aea9ec52da5d ]
Quoted 1 line
From the comment of
ci_usb_phy_init, it returns an error code if
usb_phy_init has failed, and it should do some clean up, not just return directly.
Fix this by goto the error handling.
--- drivers/usb/chipidea/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/chipidea/core.c +1 -1
@@ -984,7 +984,7 @@ static int ci_hdrc_probe(struct platform_device *pdev) ret =ci_usb_phy_init (ci);if (ret) {dev_err (dev,"unable to init phy: %d\n" , ret); -return ret; + goto ulpi_exit; } ci->hw_bank.phys = res->start;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 100/191 tty: serial: fsl_lpuart: adjust buffer length to the intended size
In reply to Greg Kroah-HartmanFrom: Shenwei Wang <[email protected]>
[ Upstream commit f73fd750552524b06b5d77ebfdd106ccc8fcac61 ]
Based on the fls function definition provided below, we should not subtract 1 to obtain the correct buffer length:
fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
--- drivers/tty/serial/fsl_lpuart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/fsl_lpuart.c +1 -1
@@ -994,7 +994,7 @@ static inline int lpuart_start_rx_dma(struct lpuart_port *sport)* 10ms at any baud rate. */ sport->rx_dma_rng_buf_len = (DMA_RX_TIMEOUT * baud / bits /1000 ) *2 ; - sport->rx_dma_rng_buf_len = (1 << (fls (sport->rx_dma_rng_buf_len) -1 )); + sport->rx_dma_rng_buf_len = (1 <<fls (sport->rx_dma_rng_buf_len));if (sport->rx_dma_rng_buf_len <16 ) sport->rx_dma_rng_buf_len =16 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 101/191 serial: 8250: Add missing wakeup event reporting
In reply to Greg Kroah-HartmanFrom: Florian Fainelli <[email protected]>
[ Upstream commit 0ba9e3a13c6adfa99e32b2576d20820ab10ad48a ]
An 8250 UART configured as a wake-up source would not have reported itself through sysfs as being the source of wake-up, correct that.
--- drivers/tty/serial/8250/8250_port.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/tty/serial/8250/8250_port.c +4 -0
@@ -19,6 +19,7 @@#include <linux/moduleparam.h> #include <linux/ioport.h> #include <linux/init.h> +#include <linux/irq.h> #include <linux/console.h> #include <linux/sysrq.h> #include <linux/delay.h>
@@ -1885,6 +1886,7 @@ int serial8250_handle_irq(struct uart_port *port, unsigned int iir)unsigned char status;unsigned long flags;struct uart_8250_port *up =up_to_u8250p (port); +struct tty_port *tport = &port->state->port;bool skip_rx = false;if (iir &UART_IIR_NO_INT )
@@ -1908,6 +1910,8 @@ int serial8250_handle_irq(struct uart_port *port, unsigned int iir) skip_rx = true;if (status & (UART_LSR_DR |UART_LSR_BI ) && !skip_rx) { +if (irqd_is_wakeup_set (irq_get_irq_data (port->irq))) +pm_wakeup_event (tport->tty->dev,0 );if (!up->dma ||handle_rx_dma (up, iir)) status =serial8250_rx_chars (up, status); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 102/191 staging: rtl8192e: Fix W_DISABLE# does not work after stop/start
In reply to Greg Kroah-HartmanFrom: Philipp Hortmann <[email protected]>
[ Upstream commit 3fac2397f562eb669ddc2f45867a253f3fc26184 ]
When loading the driver for rtl8192e, the W_DISABLE# switch is working as intended. But when the WLAN is turned off in software and then turned on again the W_DISABLE# does not work anymore. Reason for this is that in the function _rtl92e_dm_check_rf_ctrl_gpio() the bfirst_after_down is checked and returned when true. bfirst_after_down is set true when switching the WLAN off in software. But it is not set to false again when WLAN is turned on again.
Add bfirst_after_down = false in _rtl92e_sta_up to reset bit and fix above described bug.
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 + 1 file changed, 1 insertion(+)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +1 -0
@@ -778,6 +778,7 @@ static int _rtl92e_sta_up(struct net_device *dev, bool is_silent_reset)else netif_wake_queue (dev); + priv->bfirst_after_down = false;return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 103/191 spmi: Add a check for remove callback when removing a SPMI driver
In reply to Greg Kroah-HartmanFrom: Jishnu Prakash <[email protected]>
[ Upstream commit b56eef3e16d888883fefab47425036de80dd38fc ]
When removing a SPMI driver, there can be a crash due to NULL pointer dereference if it does not have a remove callback defined. This is one such call trace observed when removing the QCOM SPMI PMIC driver:
dump_backtrace.cfi_jt+0x0/0x8 dump_stack_lvl+0xd8/0x16c panic+0x188/0x498 __cfi_slowpath+0x0/0x214 __cfi_slowpath+0x1dc/0x214 spmi_drv_remove+0x16c/0x1e0 device_release_driver_internal+0x468/0x79c driver_detach+0x11c/0x1a0 bus_remove_driver+0xc4/0x124 driver_unregister+0x58/0x84 cleanup_module+0x1c/0xc24 [qcom_spmi_pmic] __do_sys_delete_module+0x3ec/0x53c __arm64_sys_delete_module+0x18/0x28 el0_svc_common+0xdc/0x294 el0_svc+0x38/0x9c el0_sync_handler+0x8c/0xf0 el0_sync+0x1b4/0x1c0
If a driver has all its resources allocated through devm_() APIs and does not need any other explicit cleanup, it would not require a remove callback to be defined. Hence, add a check for remove callback presence before calling it when removing a SPMI driver.
--- drivers/spmi/spmi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/spmi/spmi.c +2 -1
@@ -356,7 +356,8 @@ static int spmi_drv_remove(struct device *dev)const struct spmi_driver *sdrv =to_spmi_driver (dev->driver);pm_runtime_get_sync (dev); - sdrv->remove (to_spmi_device (dev)); +if (sdrv->remove) + sdrv->remove (to_spmi_device (dev));pm_runtime_put_noidle (dev);pm_runtime_disable (dev);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 104/191 macintosh/windfarm_smu_sat: Add missing of_node_put()
In reply to Greg Kroah-HartmanFrom: Liang He <[email protected]>
[ Upstream commit 631cf002826007ab7415258ee647dcaf8845ad5a ]
We call of_node_get() in wf_sat_probe() after sat is created, so we need the of_node_put() before *kfree(sat)*.
--- drivers/macintosh/windfarm_smu_sat.c | 1 + 1 file changed, 1 insertion(+)
drivers/macintosh/windfarm_smu_sat.c +1 -0
@@ -172,6 +172,7 @@ static void wf_sat_release(struct kref *ref)if (sat->nr >=0 ) sats[sat->nr] =NULL ; +of_node_put (sat->node);kfree (sat); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 105/191 powerpc/mpc512x: fix resource printk format warning
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 7538c97e2b80ff6b7a8ea2ecf16a04355461b439 ]
Use "%pa" format specifier for resource_size_t to avoid a compiler printk format warning.
../arch/powerpc/platforms/512x/clock-commonclk.c: In function 'mpc5121_clk_provide_backwards_compat':../arch/powerpc/platforms/512x/clock-commonclk.c:989:44: error: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'resource_size_t' {aka 'long long unsigned int'} [-Werror=format=]
989 | snprintf(devname, sizeof(devname), "%08x.%s", res.start, np->name); \
| ^~~~~~~~~ ~~~~~~~~~
| |
| resource_size_t {aka long long unsigned int}Prevents 24 such warnings.
--- arch/powerpc/platforms/512x/clock-commonclk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/platforms/512x/clock-commonclk.c +1 -1
@@ -985,7 +985,7 @@ static void mpc5121_clk_provide_migration_support(void)#define NODE_PREP do { \ of_address_to_resource(np, 0, &res); \ - snprintf(devname, sizeof(devname), "%08x.%s", res.start, np->name); \ + snprintf(devname, sizeof(devname), "%pa.%s", &res.start, np->name); \ } while (0)#define NODE_CHK (clkname, clkitem, regnode, regflag) do { \
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 106/191 powerpc/wii: fix resource printk format warnings
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 7b69600d4da0049244e9be2f5ef5a2f8e04fcd9a ]
Use "%pa" format specifier for resource_size_t to avoid compiler printk format warnings.
../arch/powerpc/platforms/embedded6xx/flipper-pic.c: In function 'flipper_pic_init':../include/linux/kern_levels.h:5:25: error: format '%x' expects argument of type 'unsigned int', but argument 2 has type 'resource_size_t' {aka 'long long unsigned int'} [-Werror=format=] ../arch/powerpc/platforms/embedded6xx/flipper-pic.c:148:9: note: in expansion of macro 'pr_info'
148 | pr_info("controller at 0x%08x mapped to 0x%p\n", res.start, io_base);
| ^~~~~~~../arch/powerpc/platforms/embedded6xx/hlwd-pic.c: In function 'hlwd_pic_init':../include/linux/kern_levels.h:5:25: error: format '%x' expects argument of type 'unsigned int', but argument 2 has type 'resource_size_t' {aka 'long long unsigned int'} [-Werror=format=] ../arch/powerpc/platforms/embedded6xx/hlwd-pic.c:174:9: note: in expansion of macro 'pr_info'
174 | pr_info("controller at 0x%08x mapped to 0x%p\n", res.start, io_base);
| ^~~~~~~../arch/powerpc/platforms/embedded6xx/wii.c: In function 'wii_ioremap_hw_regs':../include/linux/kern_levels.h:5:25: error: format '%x' expects argument of type 'unsigned int', but argument 3 has type 'resource_size_t' {aka 'long long unsigned int'} [-Werror=format=] ../arch/powerpc/platforms/embedded6xx/wii.c:77:17: note: in expansion of macro 'pr_info'
77 | pr_info("%s at 0x%08x mapped to 0x%p\n", name,
| ^~~~~~~--- arch/powerpc/platforms/embedded6xx/flipper-pic.c | 2 +- arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 2 +- arch/powerpc/platforms/embedded6xx/wii.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
arch/powerpc/platforms/embedded6xx/flipper-pic.c +1 -1
@@ -149,7 +149,7 @@ static struct irq_domain * __init flipper_pic_init(struct device_node *np) } io_base =ioremap (res.start,resource_size (&res)); -pr_info ("controller at 0x%08x mapped to 0x%p\n" , res.start, io_base); +pr_info ("controller at 0x%pa mapped to 0x%p\n" , &res.start, io_base);__flipper_quiesce (io_base);
arch/powerpc/platforms/embedded6xx/hlwd-pic.c +1 -1
@@ -178,7 +178,7 @@ static struct irq_domain *hlwd_pic_init(struct device_node *np)return NULL ; } -pr_info ("controller at 0x%08x mapped to 0x%p\n" , res.start, io_base); +pr_info ("controller at 0x%pa mapped to 0x%p\n" , &res.start, io_base);__hlwd_quiesce (io_base);
arch/powerpc/platforms/embedded6xx/wii.c +2 -2
@@ -122,8 +122,8 @@ static void __iomem *wii_ioremap_hw_regs(char *name, char *compatible) hw_regs =ioremap (res.start,resource_size (&res));if (hw_regs) { -pr_info ("%s at 0x%08x mapped to 0x%p\n" , name, - res.start, hw_regs); +pr_info ("%s at 0x%pa mapped to 0x%p\n" , name, + &res.start, hw_regs); } out_put:
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 107/191 powerpc/sysdev/tsi108: fix resource printk format warnings
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 55d8bd02cc1b9f1063993b5c42c9cabf4af67dea ]
Use "%pa" format specifier for resource_size_t to avoid a compiler printk format warning.
arch/powerpc/sysdev/tsi108_pci.c: In function 'tsi108_setup_pci':
include/linux/kern_levels.h:5:25: error: format '%x' expects argument of type 'unsigned int', but argument 2 has type 'resource_size_t'
--- arch/powerpc/sysdev/tsi108_pci.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/powerpc/sysdev/tsi108_pci.c +2 -3
@@ -229,9 +229,8 @@ int __init tsi108_setup_pci(struct device_node *dev, u32 cfg_phys, int primary) (hose)->ops = &tsi108_direct_pci_ops; -printk (KERN_INFO "Found tsi108 PCI host bridge at 0x%08x. " -"Firmware bus number: %d->%d\n" , - rsrc.start, hose->first_busno, hose->last_busno); +pr_info ("Found tsi108 PCI host bridge at 0x%pa. Firmware bus number: %d->%d\n" , + &rsrc.start, hose->first_busno, hose->last_busno);/* Interpret the "ranges" property */ /* This also maps the I/O region and sets isa_io/mem_base */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 108/191 macintosh: via-pmu-led: requires ATA to be set
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 05dce4ba125336875cd3eed3c1503fa81cd2f691 ]
LEDS_TRIGGER_DISK depends on ATA, so selecting LEDS_TRIGGER_DISK when ATA is not set/enabled causes a Kconfig warning:
WARNING: unmet direct dependencies detected for LEDS_TRIGGER_DISK
Depends on [n]: NEW_LEDS [=y] && LEDS_TRIGGERS [=y] && ATA [=n]
Selected by [y]:
- ADB_PMU_LED_DISK [=y] && MACINTOSH_DRIVERS [=y] && ADB_PMU_LED [=y] && LEDS_CLASS [=y]
Fix this by making ADB_PMU_LED_DISK depend on ATA.
Seen on both PPC32 and PPC64.
--- drivers/macintosh/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/macintosh/Kconfig +1 -0
@@ -83,6 +83,7 @@ config ADB_PMU_LED config ADB_PMU_LED_DISK bool "Use front LED as DISK LED by default" + depends on ATA depends on ADB_PMU_LED depends on LEDS_CLASS select LEDS_TRIGGERS
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 109/191 powerpc/rtas: use memmove for potentially overlapping buffer copy
In reply to Greg Kroah-HartmanFrom: Nathan Lynch <[email protected]>
[ Upstream commit 271208ee5e335cb1ad280d22784940daf7ddf820 ]
Using memcpy() isn't safe when buf is identical to rtas_err_buf, which can happen during boot before slab is up. Full context which may not be obvious from the diff:
if (altbuf) {
buf = altbuf;
} else {
buf = rtas_err_buf;
if (slab_is_available())
buf = kmalloc(RTAS_ERROR_LOG_MAX, GFP_ATOMIC);
}
if (buf)
memcpy(buf, rtas_err_buf, RTAS_ERROR_LOG_MAX);This was found by inspection and I'm not aware of it causing problems in practice. It appears to have been introduced by commit 033ef338b6e0 ("powerpc: Merge rtas.c into arch/powerpc/kernel"); the old ppc64 version of this code did not have this problem.
Use memmove() instead.
--- arch/powerpc/kernel/rtas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/rtas.c +1 -1
@@ -401,7 +401,7 @@ static char *__fetch_rtas_last_error(char *altbuf) buf =kmalloc (RTAS_ERROR_LOG_MAX ,GFP_ATOMIC ); }if (buf) -memcpy (buf, rtas_err_buf,RTAS_ERROR_LOG_MAX ); +memmove (buf, rtas_err_buf,RTAS_ERROR_LOG_MAX ); }return buf;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 110/191 perf/core: Fix hardlockup failure caused by perf throttle
In reply to Greg Kroah-HartmanFrom: Yang Jihong <[email protected]>
[ Upstream commit 15def34e2635ab7e0e96f1bc32e1b69609f14942 ]
commit e050e3f0a71bf ("perf: Fix broken interrupt rate throttling") introduces a change in throttling threshold judgment. Before this, compare hwc->interrupts and max_samples_per_tick, then increase hwc->interrupts by 1, but this commit reverses order of these two behaviors, causing the semantics of max_samples_per_tick to change. In literal sense of "max_samples_per_tick", if hwc->interrupts == max_samples_per_tick, it should not be throttled, therefore, the judgment condition should be changed to "hwc->interrupts > max_samples_per_tick".
In fact, this may cause the hardlockup to fail, The minimum value of max_samples_per_tick may be 1, in this case, the return value of __perf_event_account_interrupt function is 1.
As a result, nmi_watchdog gets throttled, which would stop PMU (Use x86 architecture as an example, see x86_pmu_handle_irq).
--- kernel/events/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/events/core.c +2 -2
@@ -7843,8 +7843,8 @@ __perf_event_account_interrupt(struct perf_event *event, int throttle) hwc->interrupts =1 ; }else { hwc->interrupts++; -if (unlikely (throttle - && hwc->interrupts >= max_samples_per_tick)) { +if (unlikely (throttle && + hwc->interrupts > max_samples_per_tick)) {__this_cpu_inc (perf_throttled_count);tick_dep_set_cpu (smp_processor_id (),TICK_DEP_BIT_PERF_EVENTS ); hwc->interrupts =MAX_INTERRUPTS ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 111/191 RDMA/rdmavt: Delete unnecessary NULL check
In reply to Greg Kroah-HartmanFrom: Natalia Petrova <[email protected]>
[ Upstream commit b73a0b80c69de77d8d4942abb37066531c0169b2 ]
There is no need to check 'rdi->qp_dev' for NULL. The field 'qp_dev' is created in rvt_register_device() which will fail if the 'qp_dev' allocation fails in rvt_driver_qp_init(). Overwise this pointer doesn't changed and passed to rvt_qp_exit() by the next step.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/infiniband/sw/rdmavt/qp.c | 2 -- 1 file changed, 2 deletions(-)
drivers/infiniband/sw/rdmavt/qp.c +0 -2
@@ -321,8 +321,6 @@ void rvt_qp_exit(struct rvt_dev_info *rdi)if (qps_inuse)rvt_pr_err (rdi,"QP memory leak! %u still in use\n" , qps_inuse); -if (!rdi->qp_dev) -return ;kfree (rdi->qp_dev->qp_table);free_qpn_table (&rdi->qp_dev->qpn_table);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 112/191 RDMA/mlx4: Prevent shift wrapping in set_user_sq_size()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit d50b3c73f1ac20dabc53dc6e9d64ce9c79a331eb ]
The ucmd->log_sq_bb_count variable is controlled by the user so this shift can wrap. Fix it by using check_shl_overflow() in the same way that it was done in commit 515f60004ed9 ("RDMA/hns: Prevent undefined behavior in hns_roce_set_user_sq_size()").
--- drivers/infiniband/hw/mlx4/qp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/infiniband/hw/mlx4/qp.c +6 -2
@@ -436,9 +436,13 @@ static int set_user_sq_size(struct mlx4_ib_dev *dev,struct mlx4_ib_qp *qp, struct mlx4_ib_create_qp *ucmd) { + u32 cnt; +/* Sanity check SQ size before proceeding */ -if ((1 << ucmd->log_sq_bb_count) > dev->dev->caps.max_wqes || - ucmd->log_sq_stride > +if (check_shl_overflow (1 , ucmd->log_sq_bb_count, &cnt) || + cnt > dev->dev->caps.max_wqes) +return -EINVAL ; +if (ucmd->log_sq_stride >ilog2 (roundup_pow_of_two (dev->dev->caps.max_sq_desc_sz)) || ucmd->log_sq_stride <MLX4_IB_MIN_SQ_STRIDE )return -EINVAL ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 113/191 power: supply: generic-adc-battery: fix unit scaling
In reply to Greg Kroah-HartmanFrom: Sebastian Reichel <[email protected]>
[ Upstream commit 44263f50065969f2344808388bd589740f026167 ]
power-supply properties are reported in µV, µA and µW. The IIO API provides mV, mA, mW, so the values need to be multiplied by 1000.
--- drivers/power/supply/generic-adc-battery.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/power/supply/generic-adc-battery.c +3 -0
@@ -138,6 +138,9 @@ static int read_channel(struct gab *adc_bat, enum power_supply_property psp, result);if (ret <0 )pr_err ("read channel error\n" ); +else + *result *=1000 ; +return ret; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 114/191 clk: add missing of_node_put() in "assigned-clocks" property parsing
In reply to Greg Kroah-HartmanFrom: Clément Léger <[email protected]>
[ Upstream commit 27a6e1b09a782517fddac91259970ac466a3f7b6 ]
When returning from of_parse_phandle_with_args(), the np member of the of_phandle_args structure should be put after usage. Add missing of_node_put() calls in both __set_clk_parents() and __set_clk_rates().
--- drivers/clk/clk-conf.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/clk/clk-conf.c +10 -2
@@ -36,9 +36,12 @@ static int __set_clk_parents(struct device_node *node, bool clk_supplier)else return rc; } -if (clkspec.np == node && !clk_supplier) +if (clkspec.np == node && !clk_supplier) { +of_node_put (clkspec.np);return 0 ; + } pclk =of_clk_get_from_provider (&clkspec); +of_node_put (clkspec.np);if (IS_ERR (pclk)) {if (PTR_ERR (pclk) != -EPROBE_DEFER ) pr_warn("clk: couldn't get parent clock %d for %pOF\n",
@@ -51,10 +54,12 @@ static int __set_clk_parents(struct device_node *node, bool clk_supplier)if (rc <0 ) goto err;if (clkspec.np == node && !clk_supplier) { +of_node_put (clkspec.np); rc =0 ; goto err; } clk =of_clk_get_from_provider (&clkspec); +of_node_put (clkspec.np);if (IS_ERR (clk)) {if (PTR_ERR (clk) != -EPROBE_DEFER ) pr_warn("clk: couldn't get assigned clock %d for %pOF\n",
@@ -96,10 +101,13 @@ static int __set_clk_rates(struct device_node *node, bool clk_supplier)else return rc; } -if (clkspec.np == node && !clk_supplier) +if (clkspec.np == node && !clk_supplier) { +of_node_put (clkspec.np);return 0 ; + } clk =of_clk_get_from_provider (&clkspec); +of_node_put (clkspec.np);if (IS_ERR (clk)) {if (PTR_ERR (clk) != -EPROBE_DEFER ) pr_warn("clk: couldn't get clock %d for %pOF\n",
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 115/191 IB/hfi1: Fix SDMA mmu_rb_node not being evicted in LRU order
In reply to Greg Kroah-HartmanFrom: Patrick Kelsey <[email protected]>
[ Upstream commit 9fe8fec5e43d5a80f43cbf61aaada1b047a1eb61 ]
hfi1_mmu_rb_remove_unless_exact() did not move mmu_rb_node objects in mmu_rb_handler->lru_list after getting a cache hit on an mmu_rb_node.
As a result, hfi1_mmu_rb_evict() was not guaranteed to evict truly least-recently used nodes.
This could be a performance issue for an application when that application:
- Uses some long-lived buffers frequently.
- Uses a large number of buffers once.
- Hits the mmu_rb_handler cache size or pinned-page limits, forcing mmu_rb_handler cache entries to be evicted.
In this case, the one-time use buffers cause the long-lived buffer entries to eventually filter to the end of the LRU list where hfi1_mmu_rb_evict() will consider evicting a frequently-used long-lived entry instead of evicting one of the one-time use entries.
Fix this by inserting new mmu_rb_node at the tail of mmu_rb_handler->lru_list and move mmu_rb_ndoe to the tail of mmu_rb_handler->lru_list when the mmu_rb_node is a hit in hfi1_mmu_rb_remove_unless_exact(). Change hfi1_mmu_rb_evict() to evict from the head of mmu_rb_handler->lru_list instead of the tail.
--- drivers/infiniband/hw/hfi1/mmu_rb.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/infiniband/hw/hfi1/mmu_rb.c +6 -7
@@ -175,7 +175,7 @@ int hfi1_mmu_rb_insert(struct mmu_rb_handler *handler, goto unlock; }__mmu_int_rb_insert (mnode, &handler->root); -list_add (&mnode->list, &handler->lru_list); +list_add_tail (&mnode->list, &handler->lru_list); ret = handler->ops->insert (handler->ops_arg, mnode);if (ret) {
@@ -222,8 +222,10 @@ bool hfi1_mmu_rb_remove_unless_exact(struct mmu_rb_handler *handler,spin_lock_irqsave (&handler->lock, flags); node =__mmu_rb_search (handler, addr, len);if (node) { -if (node->addr == addr && node->len == len) +if (node->addr == addr && node->len == len) { +list_move_tail (&node->list, &handler->lru_list); goto unlock; + }__mmu_int_rb_remove (node, &handler->root);list_del (&node->list);/* remove from LRU list */ ret = true;
@@ -244,8 +246,7 @@ void hfi1_mmu_rb_evict(struct mmu_rb_handler *handler, void *evict_arg)INIT_LIST_HEAD (&del_list);spin_lock_irqsave (&handler->lock, flags); -list_for_each_entry_safe_reverse (rbnode, ptr, &handler->lru_list, - list) { +list_for_each_entry_safe (rbnode, ptr, &handler->lru_list, list) {if (handler->ops->evict (handler->ops_arg, rbnode, evict_arg, &stop)) {__mmu_int_rb_remove (rbnode, &handler->root);
@@ -257,9 +258,7 @@ void hfi1_mmu_rb_evict(struct mmu_rb_handler *handler, void *evict_arg) }spin_unlock_irqrestore (&handler->lock, flags); -while (!list_empty (&del_list)) { - rbnode = list_first_entry(&del_list, struct mmu_rb_node, list); -list_del (&rbnode->list); +list_for_each_entry_safe (rbnode, ptr, &del_list, list) { handler->ops->remove (handler->ops_arg, rbnode); } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 116/191 NFSv4.1: Always send a RECLAIM_COMPLETE after establishing lease
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit 40882deb83c29d8df4470d4e5e7f137b6acf7ad1 ]
The spec requires that we always at least send a RECLAIM_COMPLETE when we're done establishing the lease and recovering any state.
--- fs/nfs/nfs4state.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/nfs/nfs4state.c +4 -0
@@ -66,6 +66,8 @@#define OPENOWNER_POOL_SIZE 8 +static void nfs4_state_start_reclaim_reboot (struct nfs_client *clp); +const nfs4_stateid zero_stateid = { { .data = {0 } }, .type =NFS4_SPECIAL_STATEID_TYPE ,
@@ -338,6 +340,8 @@ int nfs41_init_clientid(struct nfs_client *clp, struct rpc_cred *cred) status =nfs4_proc_create_session (clp, cred);if (status !=0 ) goto out; +if (!(clp->cl_exchange_flags &EXCHGID4_FLAG_CONFIRMED_R )) +nfs4_state_start_reclaim_reboot (clp);nfs41_finish_session_reset (clp);nfs_mark_client_ready (clp,NFS_CS_READY ); out:
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 117/191 SUNRPC: remove the maximum number of retries in call_bind_status
In reply to Greg Kroah-HartmanFrom: Dai Ngo <[email protected]>
[ Upstream commit 691d0b782066a6eeeecbfceb7910a8f6184e6105 ]
Currently call_bind_status places a hard limit of 3 to the number of retries on EACCES error. This limit was done to prevent NLM unlock requests from being hang forever when the server keeps returning garbage. However this change causes problem for cases when NLM service takes longer than 9 seconds to register with the port mapper after a restart.
This patch removes this hard coded limit and let the RPC handles the retry based on the standard hard/soft task semantics.
--- include/linux/sunrpc/sched.h | 3 +-- net/sunrpc/clnt.c | 3 --- net/sunrpc/sched.c | 1 - 3 files changed, 1 insertion(+), 6 deletions(-)
include/linux/sunrpc/sched.h +1 -2
@@ -88,8 +88,7 @@ struct rpc_task {#endif unsigned char tk_priority : 2,/* Task priority */ tk_garb_retry : 2, - tk_cred_retry : 2, - tk_rebind_retry : 2; + tk_cred_retry : 2; };typedef void (*rpc_action )(struct rpc_task *);
net/sunrpc/clnt.c +0 -3
@@ -1814,9 +1814,6 @@ call_bind_status(struct rpc_task *task) status = -EOPNOTSUPP ;break ; } -if (task->tk_rebind_retry ==0 ) -break ; - task->tk_rebind_retry--;rpc_delay (task,3 *HZ ); goto retry_timeout;case -ETIMEDOUT :
net/sunrpc/sched.c +0 -1
@@ -709,7 +709,6 @@ rpc_init_task_statistics(struct rpc_task *task)/* Initialize retry counters */ task->tk_garb_retry =2 ; task->tk_cred_retry =2 ; - task->tk_rebind_retry =2 ;/* starting timestamp */ task->tk_start =ktime_get ();
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 118/191 RDMA/mlx5: Use correct device num_ports when modify DC
In reply to Greg Kroah-HartmanFrom: Mark Zhang <[email protected]>
[ Upstream commit 746aa3c8cb1a650ff2583497ac646e505831b9b9 ]
Just like other QP types, when modify DC, the port_num should be compared with dev->num_ports, instead of HCA_CAP.num_ports. Otherwise Multi-port vHCA on DC may not work.
--- drivers/infiniband/hw/mlx5/qp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/mlx5/qp.c +1 -1
@@ -3350,7 +3350,7 @@ static int mlx5_ib_modify_dct(struct ib_qp *ibqp, struct ib_qp_attr *attr,return -EINVAL ;if (attr->port_num ==0 || - attr->port_num >MLX5_CAP_GEN (dev->mdev, num_ports)) { + attr->port_num > dev->num_ports) {mlx5_ib_dbg (dev,"invalid port number %d. number of ports is %d\n" , attr->port_num, dev->num_ports);return -EINVAL ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 119/191 openrisc: Properly store r31 to pt_regs on unhandled exceptions
In reply to Greg Kroah-HartmanFrom: Stafford Horne <[email protected]>
[ Upstream commit 812489ac4dd91144a74ce65ecf232252a2e406fb ]
In commit 91993c8c2ed5 ("openrisc: use shadow registers to save regs on exception") the unhandled exception path was changed to do an early store of r30 instead of r31. The entry code was not updated and r31 is not getting stored to pt_regs.
This patch updates the entry handler to store r31 instead of r30. We also remove some misleading commented out store r30 and r31 instructrions.
I noticed this while working on adding floating point exception handling, This issue probably would never impact anything since we kill the process or Oops right away on unhandled exceptions.
--- arch/openrisc/kernel/entry.S | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
arch/openrisc/kernel/entry.S +2 -4
@@ -177,7 +177,6 @@ handler: ;\ l.sw PT_GPR28(r1),r28 ;\ l.sw PT_GPR29(r1),r29 ;\ /* r30 already save */ ;\ -/* l.sw PT_GPR30(r1),r30*/ ;\ l.sw PT_GPR31(r1),r31 ;\ TRACE_IRQS_OFF_ENTRY ;\ /* Store -1 in orig_gpr11 for non-syscall exceptions */ ;\
@@ -215,9 +214,8 @@ handler: ;\ l.sw PT_GPR27(r1),r27 ;\ l.sw PT_GPR28(r1),r28 ;\ l.sw PT_GPR29(r1),r29 ;\ - /* r31 already saved */ ;\ - l.sw PT_GPR30(r1),r30 ;\ -/* l.sw PT_GPR31(r1),r31 */ ;\ + /* r30 already saved */ ;\ + l.sw PT_GPR31(r1),r31 ;\ /* Store -1 in orig_gpr11 for non-syscall exceptions */ ;\ l.addi r30,r0,-1 ;\ l.sw PT_ORIG_GPR11(r1),r30 ;\
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 120/191 pwm: mtk-disp: Dont check the return code of pwmchip_remove()
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 9b7b5736ffd5da6f8f6329ebe5f1829cbcf8afae ]
pwmchip_remove() returns always 0. Don't use the value to make it possible to eventually change the function to return void. Also the driver core ignores the return value of mtk_disp_pwm_remove().
Stable-dep-of: 36dd7f530ae7 ("pwm: mtk-disp: Disable shadow registers before setting backlight values")
--- drivers/pwm/pwm-mtk-disp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/pwm/pwm-mtk-disp.c +2 -3
@@ -248,13 +248,12 @@ static int mtk_disp_pwm_probe(struct platform_device *pdev)static int mtk_disp_pwm_remove (struct platform_device *pdev) {struct mtk_disp_pwm *mdp =platform_get_drvdata (pdev); -int ret; - ret =pwmchip_remove (&mdp->chip); +pwmchip_remove (&mdp->chip);clk_unprepare (mdp->clk_mm);clk_unprepare (mdp->clk_main); -return ret; +return 0 ; }static const struct mtk_pwm_data mt2701_pwm_data = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 121/191 pwm: mtk-disp: Adjust the clocks to avoid them mismatch
In reply to Greg Kroah-HartmanFrom: Jitao Shi <[email protected]>
[ Upstream commit d7a4e582587d97a586b1f7709e3bddcf35928e96 ]
The clks "main" and "mm" are prepared in .probe() (and unprepared in .remove()). This results in the clocks being on during suspend which results in unnecessarily increased power consumption.
Remove the clock operations from .probe() and .remove(). Add the clk_prepare_enable() in .enable() and the clk_disable_unprepare() in .disable().
Stable-dep-of: 36dd7f530ae7 ("pwm: mtk-disp: Disable shadow registers before setting backlight values")
--- drivers/pwm/pwm-mtk-disp.c | 91 +++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 50 deletions(-)
drivers/pwm/pwm-mtk-disp.c +41 -50
@@ -82,6 +82,19 @@ static int mtk_disp_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,u64 div, rate;int err; + err =clk_prepare_enable (mdp->clk_main); +if (err <0 ) { +dev_err (chip->dev,"Can't enable mdp->clk_main: %pe\n" ,ERR_PTR (err)); +return err; + } + + err =clk_prepare_enable (mdp->clk_mm); +if (err <0 ) { +dev_err (chip->dev,"Can't enable mdp->clk_mm: %pe\n" ,ERR_PTR (err)); +clk_disable_unprepare (mdp->clk_main); +return err; + } +/* * Find period, high_width and clk_div to suit duty_ns and period_ns. * Calculate proper div value to keep period value in the bound.
@@ -95,8 +108,11 @@ static int mtk_disp_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, rate =clk_get_rate (mdp->clk_main); clk_div =div_u64 (rate * period_ns,NSEC_PER_SEC ) >>PWM_PERIOD_BIT_WIDTH ; -if (clk_div >PWM_CLKDIV_MAX ) +if (clk_div >PWM_CLKDIV_MAX ) { +clk_disable_unprepare (mdp->clk_mm); +clk_disable_unprepare (mdp->clk_main);return -EINVAL ; + } div =NSEC_PER_SEC * (clk_div +1 ); period =div64_u64 (rate * period_ns, div);
@@ -106,16 +122,6 @@ static int mtk_disp_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, high_width =div64_u64 (rate * duty_ns, div); value = period | (high_width <<PWM_HIGH_WIDTH_SHIFT ); - err =clk_enable (mdp->clk_main); -if (err <0 ) -return err; - - err =clk_enable (mdp->clk_mm); -if (err <0 ) { -clk_disable (mdp->clk_main); -return err; - } -mtk_disp_pwm_update_bits (mdp, mdp->data->con0,PWM_CLKDIV_MASK , clk_div <<PWM_CLKDIV_SHIFT );
@@ -130,10 +136,21 @@ static int mtk_disp_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,mtk_disp_pwm_update_bits (mdp, mdp->data->commit, mdp->data->commit_mask,0x0 ); + }else { +/* +* For MT2701, disable double buffer before writing register +* and select manual mode and use PWM_PERIOD/PWM_HIGH_WIDTH. +*/ +mtk_disp_pwm_update_bits (mdp, mdp->data->bls_debug, + mdp->data->bls_debug_mask, + mdp->data->bls_debug_mask); +mtk_disp_pwm_update_bits (mdp, mdp->data->con0, + mdp->data->con0_sel, + mdp->data->con0_sel); } -clk_disable (mdp->clk_mm); -clk_disable (mdp->clk_main); +clk_disable_unprepare (mdp->clk_mm); +clk_disable_unprepare (mdp->clk_main);return 0 ; }
@@ -143,13 +160,16 @@ static int mtk_disp_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)struct mtk_disp_pwm *mdp =to_mtk_disp_pwm (chip);int err; - err =clk_enable (mdp->clk_main); -if (err <0 ) + err =clk_prepare_enable (mdp->clk_main); +if (err <0 ) { +dev_err (chip->dev,"Can't enable mdp->clk_main: %pe\n" ,ERR_PTR (err));return err; + } - err =clk_enable (mdp->clk_mm); + err =clk_prepare_enable (mdp->clk_mm);if (err <0 ) { -clk_disable (mdp->clk_main); +dev_err (chip->dev,"Can't enable mdp->clk_mm: %pe\n" ,ERR_PTR (err)); +clk_disable_unprepare (mdp->clk_main);return err; }
@@ -166,8 +186,8 @@ static void mtk_disp_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)mtk_disp_pwm_update_bits (mdp,DISP_PWM_EN , mdp->data->enable_mask,0x0 ); -clk_disable (mdp->clk_mm); -clk_disable (mdp->clk_main); +clk_disable_unprepare (mdp->clk_mm); +clk_disable_unprepare (mdp->clk_main); }static const struct pwm_ops mtk_disp_pwm_ops = {
@@ -202,14 +222,6 @@ static int mtk_disp_pwm_probe(struct platform_device *pdev)if (IS_ERR (mdp->clk_mm))return PTR_ERR (mdp->clk_mm); - ret =clk_prepare (mdp->clk_main); -if (ret <0 ) -return ret; - - ret =clk_prepare (mdp->clk_mm); -if (ret <0 ) - goto disable_clk_main; - mdp->chip.dev = &pdev->dev; mdp->chip.ops = &mtk_disp_pwm_ops; mdp->chip.base =-1 ;
@@ -217,32 +229,13 @@ static int mtk_disp_pwm_probe(struct platform_device *pdev) ret =pwmchip_add (&mdp->chip);if (ret <0 ) { -dev_err (&pdev->dev,"pwmchip_add() failed: %d\n" , ret); - goto disable_clk_mm; +dev_err (&pdev->dev,"pwmchip_add() failed: %pe\n" ,ERR_PTR (ret)); +return ret; }platform_set_drvdata (pdev, mdp); -/* -* For MT2701, disable double buffer before writing register -* and select manual mode and use PWM_PERIOD/PWM_HIGH_WIDTH. -*/ -if (!mdp->data->has_commit) { -mtk_disp_pwm_update_bits (mdp, mdp->data->bls_debug, - mdp->data->bls_debug_mask, - mdp->data->bls_debug_mask); -mtk_disp_pwm_update_bits (mdp, mdp->data->con0, - mdp->data->con0_sel, - mdp->data->con0_sel); - } -return 0 ; - -disable_clk_mm: -clk_unprepare (mdp->clk_mm); -disable_clk_main: -clk_unprepare (mdp->clk_main); -return ret; }static int mtk_disp_pwm_remove (struct platform_device *pdev)
@@ -250,8 +243,6 @@ static int mtk_disp_pwm_remove(struct platform_device *pdev)struct mtk_disp_pwm *mdp =platform_get_drvdata (pdev);pwmchip_remove (&mdp->chip); -clk_unprepare (mdp->clk_mm); -clk_unprepare (mdp->clk_main);return 0 ; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 122/191 pwm: mtk-disp: Disable shadow registers before setting backlight values
In reply to Greg Kroah-HartmanFrom: AngeloGioacchino Del Regno <[email protected]>
[ Upstream commit 36dd7f530ae7d9ce9e853ffb8aa337de65c6600b ]
If shadow registers usage is not desired, disable that before performing any write to CON0/1 registers in the .apply() callback, otherwise we may lose clkdiv or period/width updates.
--- drivers/pwm/pwm-mtk-disp.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)
drivers/pwm/pwm-mtk-disp.c +13 -11
@@ -122,6 +122,19 @@ static int mtk_disp_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, high_width =div64_u64 (rate * duty_ns, div); value = period | (high_width <<PWM_HIGH_WIDTH_SHIFT ); +if (mdp->data->bls_debug && !mdp->data->has_commit) { +/* +* For MT2701, disable double buffer before writing register +* and select manual mode and use PWM_PERIOD/PWM_HIGH_WIDTH. +*/ +mtk_disp_pwm_update_bits (mdp, mdp->data->bls_debug, + mdp->data->bls_debug_mask, + mdp->data->bls_debug_mask); +mtk_disp_pwm_update_bits (mdp, mdp->data->con0, + mdp->data->con0_sel, + mdp->data->con0_sel); + } +mtk_disp_pwm_update_bits (mdp, mdp->data->con0,PWM_CLKDIV_MASK , clk_div <<PWM_CLKDIV_SHIFT );
@@ -136,17 +149,6 @@ static int mtk_disp_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,mtk_disp_pwm_update_bits (mdp, mdp->data->commit, mdp->data->commit_mask,0x0 ); - }else { -/* -* For MT2701, disable double buffer before writing register -* and select manual mode and use PWM_PERIOD/PWM_HIGH_WIDTH. -*/ -mtk_disp_pwm_update_bits (mdp, mdp->data->bls_debug, - mdp->data->bls_debug_mask, - mdp->data->bls_debug_mask); -mtk_disp_pwm_update_bits (mdp, mdp->data->con0, - mdp->data->con0_sel, - mdp->data->con0_sel); }clk_disable_unprepare (mdp->clk_mm);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 123/191 phy: tegra: xusb: Add missing tegra_xusb_port_unregister for usb2_port and ulpi_port
In reply to Greg Kroah-HartmanFrom: Gaosheng Cui <[email protected]>
[ Upstream commit e024854048e733391b31fe5a398704b31b9af803 ]
The tegra_xusb_port_unregister should be called when usb2_port and ulpi_port map fails in tegra_xusb_add_usb2_port() or in tegra_xusb_add_ulpi_port(), fix it.
--- drivers/phy/tegra/xusb.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/phy/tegra/xusb.c +2 -0
@@ -583,6 +583,7 @@ static int tegra_xusb_add_usb2_port(struct tegra_xusb_padctl *padctl, usb2->base.lane = usb2->base.ops->map (&usb2->base);if (IS_ERR (usb2->base.lane)) { err =PTR_ERR (usb2->base.lane); +tegra_xusb_port_unregister (&usb2->base); goto out; }
@@ -635,6 +636,7 @@ static int tegra_xusb_add_ulpi_port(struct tegra_xusb_padctl *padctl, ulpi->base.lane = ulpi->base.ops->map (&ulpi->base);if (IS_ERR (ulpi->base.lane)) { err =PTR_ERR (ulpi->base.lane); +tegra_xusb_port_unregister (&ulpi->base); goto out; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 124/191 dmaengine: at_xdmac: do not enable all cyclic channels
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit f8435befd81dd85b7b610598551fadf675849bc1 ]
Do not global enable all the cyclic channels in at_xdmac_resume(). Instead save the global status in at_xdmac_suspend() and re-enable the cyclic channel only if it was active before suspend.
--- drivers/dma/at_xdmac.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/dma/at_xdmac.c +4 -1
@@ -223,6 +223,7 @@ struct at_xdmac {int irq;struct clk *clk;u32 save_gim; +u32 save_gs;struct dma_pool *at_xdmac_desc_pool;struct at_xdmac_chan chan[0 ]; };
@@ -1878,6 +1879,7 @@ static int atmel_xdmac_suspend(struct device *dev) } } atxdmac->save_gim =at_xdmac_read (atxdmac,AT_XDMAC_GIM ); + atxdmac->save_gs =at_xdmac_read (atxdmac,AT_XDMAC_GS );at_xdmac_off (atxdmac);clk_disable_unprepare (atxdmac->clk);
@@ -1914,7 +1916,8 @@ static int atmel_xdmac_resume(struct device *dev)at_xdmac_chan_write (atchan,AT_XDMAC_CNDC , atchan->save_cndc);at_xdmac_chan_write (atchan,AT_XDMAC_CIE , atchan->save_cim);wmb (); -at_xdmac_write (atxdmac,AT_XDMAC_GE , atchan->mask); +if (atxdmac->save_gs & atchan->mask) +at_xdmac_write (atxdmac,AT_XDMAC_GE , atchan->mask); } }return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 125/191 parisc: Fix argument pointer in real64_call_asm()
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
commit 6e3220ba3323a2c24be834aebf5d6e9f89d0993f upstream.
Fix the argument pointer (ap) to point to real-mode memory instead of virtual memory.
It's interesting that this issue hasn't shown up earlier, as this could have happened with any 64-bit PDC ROM code.
I just noticed it because I suddenly faced a HPMC while trying to execute the 64-bit STI ROM code of an Visualize-FXe graphics card for the STI text console.
--- arch/parisc/kernel/real2.S | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/parisc/kernel/real2.S +2 -3
@@ -248,9 +248,6 @@ ENTRY_CFI(real64_call_asm) /* save fn */ copy %arg2, %r31 - /* set up the new ap */ - ldo 64(%arg1), %r29 - /* load up the arg registers from the saved arg area */ /* 32-bit calling convention passes first 4 args in registers */ ldd 0*REG_SZ(%arg1), %arg0 /* note overwriting arg0 */
@@ -262,7 +259,9 @@ ENTRY_CFI(real64_call_asm) ldd 7*REG_SZ(%arg1), %r19 ldd 1*REG_SZ(%arg1), %arg1 /* do this one last! */ + /* set up real-mode stack and real-mode ap */ tophys_r1 %sp + ldo -16(%sp), %r29 /* Reference param save area */ b,l rfi_virt2real,%r2 nop
Greg Kroah-Hartman
maintainerPATCH 126/191 nilfs2: do not write dirty data after degenerating to read-only
In reply to Greg Kroah-HartmanFrom: Ryusuke Konishi <[email protected]>
commit 28a65b49eb53e172d23567005465019658bfdb4d upstream.
According to syzbot's report, mark_buffer_dirty() called from nilfs_segctor_do_construct() outputs a warning with some patterns after nilfs2 detects metadata corruption and degrades to read-only mode.
After such read-only degeneration, page cache data may be cleared through nilfs_clear_dirty_page() which may also clear the uptodate flag for their buffer heads. However, even after the degeneration, log writes are still performed by unmount processing etc., which causes mark_buffer_dirty() to be called for buffer heads without the "uptodate" flag and causes the warning.
Since any writes should not be done to a read-only file system in the first place, this fixes the warning in mark_buffer_dirty() by letting nilfs_segctor_do_construct() abort early if in read-only mode.
This also changes the retry check of nilfs_segctor_write_out() to avoid unnecessary log write retries if it detects -EROFS that nilfs_segctor_do_construct() returned.
--- fs/nilfs2/segment.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/nilfs2/segment.c +4 -1
@@ -2039,6 +2039,9 @@ static int nilfs_segctor_do_construct(ststruct the_nilfs *nilfs = sci->sc_super->s_fs_info;int err; +if (sb_rdonly (sci->sc_super)) +return -EROFS ; +nilfs_sc_cstage_set (sci,NILFS_ST_INIT ); sci->sc_cno = nilfs->ns_cno;
@@ -2724,7 +2727,7 @@ static void nilfs_segctor_write_out(struflush_work (&sci->sc_iput_work); - }while (ret && retrycount-- >0 ); + }while (ret && ret != -EROFS && retrycount-- >0 ); }/**
Greg Kroah-Hartman
maintainerPATCH 127/191 nilfs2: fix infinite loop in nilfs_mdt_get_block()
In reply to Greg Kroah-HartmanFrom: Ryusuke Konishi <[email protected]>
commit a6a491c048882e7e424d407d32cba0b52d9ef2bf upstream.
If the disk image that nilfs2 mounts is corrupted and a virtual block address obtained by block lookup for a metadata file is invalid, nilfs_bmap_lookup_at_level() may return the same internal return code as -ENOENT, meaning the block does not exist in the metadata file.
This duplication of return codes confuses nilfs_mdt_get_block(), causing it to read and create a metadata block indefinitely.
In particular, if this happens to the inode metadata file, ifile, semaphore i_rwsem can be left held, causing task hangs in lock_mount.
Fix this issue by making nilfs_bmap_lookup_at_level() treat virtual block address translation failures with -ENOENT as metadata corruption instead of returning the error code.
--- fs/nilfs2/bmap.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
fs/nilfs2/bmap.c +12 -4
@@ -67,20 +67,28 @@ int nilfs_bmap_lookup_at_level(struct nidown_read (&bmap->b_sem); ret = bmap->b_ops->bop_lookup (bmap, key, level, ptrp); -if (ret <0 ) { - ret =nilfs_bmap_convert_error (bmap, __func__, ret); +if (ret <0 ) goto out; - } +if (NILFS_BMAP_USE_VBN (bmap)) { ret =nilfs_dat_translate (nilfs_bmap_get_dat (bmap), *ptrp, &blocknr);if (!ret) *ptrp = blocknr; +else if (ret == -ENOENT ) { +/* +* If there was no valid entry in DAT for the block +* address obtained by b_ops->bop_lookup, then pass +* internal code -EINVAL to nilfs_bmap_convert_error +* to treat it as metadata corruption. +*/ + ret = -EINVAL ; + } } out:up_read (&bmap->b_sem); -return ret; +return nilfs_bmap_convert_error (bmap, __func__, ret); } int nilfs_bmap_lookup_contig(struct nilfs_bmap *bmap, __u64 key, __u64 *ptrp,
Greg Kroah-Hartman
maintainerPATCH 128/191 md/raid10: fix null-ptr-deref in raid10_sync_request
In reply to Greg Kroah-HartmanFrom: Li Nan <[email protected]>
commit a405c6f0229526160aa3f177f65e20c86fce84c5 upstream.
init_resync() inits mempool and sets conf->have_replacemnt at the beginning of sync, close_sync() frees the mempool when sync is completed.
After [1] recovery might be skipped and init_resync() is called but close_sync() is not. null-ptr-deref occurs with r10bio->dev[i].repl_bio.
The following is one way to reproduce the issue.
1) create a array, wait for resync to complete, mddev->recovery_cp is set to MaxSector.
2) recovery is woken and it is skipped. conf->have_replacement is set to 0 in init_resync(). close_sync() not called.
3) some io errors and rdev A is set to WantReplacement.
4) a new device is added and set to A's replacement.
5) recovery is woken, A have replacement, but conf->have_replacemnt is
0. r10bio->dev[i].repl_bio will not be alloced and null-ptr-deref occurs.
Fix it by not calling init_resync() if recovery skipped.
[1] commit 7e83ccbecd60 ("md/raid10: Allow skipping recovery when clean arrays are assembled")
--- drivers/md/raid10.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/md/raid10.c +4 -4
@@ -2957,10 +2957,6 @@ static sector_t raid10_sync_request(strusector_t chunk_mask = conf->geo.chunk_mask;int page_idx =0 ; -if (!mempool_initialized (&conf->r10buf_pool)) -if (init_resync (conf)) -return 0 ; -/* * Allow skipping a full rebuild for incremental assembly * of a clean array, like RAID1 does.
@@ -2976,6 +2972,10 @@ static sector_t raid10_sync_request(strureturn mddev->dev_sectors - sector_nr; } +if (!mempool_initialized (&conf->r10buf_pool)) +if (init_resync (conf)) +return 0 ; + skipped: max_sector = mddev->dev_sectors; if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery) ||
Greg Kroah-Hartman
maintainerPATCH 129/191 wifi: rtl8xxxu: RTL8192EU always needs full init
In reply to Greg Kroah-HartmanFrom: Bitterblue Smith <[email protected]>
commit d46e04ccd40457a0119b76e11ab64a2ad403e138 upstream.
Always run the entire init sequence (rtl8xxxu_init_device()) for RTL8192EU. It's what the vendor driver does too.
This fixes a bug where the device is unable to connect after rebooting:
wlp3s0f3u2: send auth to ... (try 1/3)
wlp3s0f3u2: send auth to ... (try 2/3)
wlp3s0f3u2: send auth to ... (try 3/3)
wlp3s0f3u2: authentication with ... timed out
Rebooting leaves the device powered on (partially? at least the firmware is still running), but not really in a working state.
--- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c +1 -0
@@ -1710,6 +1710,7 @@ struct rtl8xxxu_fileops rtl8192eu_fops = .rx_desc_size = sizeof(struct rtl8xxxu_rxdesc24), .has_s0s1 = 0, .gen2_thermal_meter = 1, + .needs_full_init = 1, .adda_1t_init = 0x0fc01616, .adda_1t_path_on = 0x0fc01616, .adda_2t_path_on_a = 0x0fc01616,
Greg Kroah-Hartman
maintainerPATCH 130/191 clk: rockchip: rk3399: allow clk_cifout to force clk_cifout_src to reparent
In reply to Greg Kroah-HartmanFrom: Quentin Schulz <[email protected]>
commit 933bf364e152cd60902cf9585c2ba310d593e69f upstream.
clk_cifout is derived from clk_cifout_src through an integer divider limited to 32. clk_cifout_src is a child of either cpll, gpll or npll without any possibility of a divider of any sort. The default clock parent is cpll.
Let's allow clk_cifout to ask its parent clk_cifout_src to reparent in order to find the real closest possible rate for clk_cifout and not one derived from cpll only.
--- drivers/clk/rockchip/clk-rk3399.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/rockchip/clk-rk3399.c +1 -1
@@ -1267,7 +1267,7 @@ static struct rockchip_clk_branch rk3399 RK3399_CLKSEL_CON(56), 6, 2, MFLAGS, RK3399_CLKGATE_CON(10), 7, GFLAGS), -COMPOSITE_NOGATE (SCLK_CIF_OUT ,"clk_cifout" , mux_clk_cif_p,0 , +COMPOSITE_NOGATE (SCLK_CIF_OUT ,"clk_cifout" , mux_clk_cif_p,CLK_SET_RATE_PARENT , RK3399_CLKSEL_CON(56), 5, 1, MFLAGS, 0, 5, DFLAGS),/* gic */
Greg Kroah-Hartman
maintainerPATCH 131/191 btrfs: scrub: reject unsupported scrub flags
In reply to Greg Kroah-HartmanFrom: Qu Wenruo <[email protected]>
commit 604e6681e114d05a2e384c4d1e8ef81918037ef5 upstream.
Since the introduction of scrub interface, the only flag that we support is BTRFS_SCRUB_READONLY. Thus there is no sanity checks, if there are some undefined flags passed in, we just ignore them.
This is problematic if we want to introduce new scrub flags, as we have no way to determine if such flags are supported.
Address the problem by introducing a check for the flags, and if unsupported flags are set, return -EOPNOTSUPP to inform the user space.
This check should be backported for all supported kernels before any new scrub flags are introduced.
--- fs/btrfs/ioctl.c | 5 +++++ include/uapi/linux/btrfs.h | 1 + 2 files changed, 6 insertions(+)
fs/btrfs/ioctl.c +5 -0
@@ -4722,6 +4722,11 @@ static long btrfs_ioctl_scrub(struct filif (IS_ERR (sa))return PTR_ERR (sa); +if (sa->flags & ~BTRFS_SCRUB_SUPPORTED_FLAGS ) { + ret = -EOPNOTSUPP ; + goto out; + } +if (!(sa->flags &BTRFS_SCRUB_READONLY )) { ret =mnt_want_write_file (file);if (ret)
include/uapi/linux/btrfs.h +1 -0
@@ -162,6 +162,7 @@ struct btrfs_scrub_progress { };#define BTRFS_SCRUB_READONLY 1 +#define BTRFS_SCRUB_SUPPORTED_FLAGS (BTRFS_SCRUB_READONLY)struct btrfs_ioctl_scrub_args {__u64 devid;/* in */ __u64 start;/* in */
Greg Kroah-Hartman
maintainerPATCH 132/191 s390/dasd: fix hanging blockdevice after request requeue
In reply to Greg Kroah-HartmanFrom: Stefan Haberland <[email protected]>
commit d8898ee50edecacdf0141f26fd90acf43d7e9cd7 upstream.
The DASD driver does not kick the requeue list when requeuing IO requests to the blocklayer. This might lead to hanging blockdevice when there is no other trigger for this.
Fix by automatically kick the requeue list when requeuing DASD requests to the blocklayer.
--- drivers/s390/block/dasd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/block/dasd.c +1 -1
@@ -2841,7 +2841,7 @@ static int _dasd_requeue_request(structreturn 0 ;spin_lock_irq (&cqr->dq->lock); req = (struct request *) cqr->callback_data; -blk_mq_requeue_request (req, false); +blk_mq_requeue_request (req, true);spin_unlock_irq (&cqr->dq->lock);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 133/191 dm integrity: call kmem_cache_destroy() in dm_integrity_init() error path
In reply to Greg Kroah-HartmanFrom: Mike Snitzer <[email protected]>
commit 6b79a428c02769f2a11f8ae76bf866226d134887 upstream.
Otherwise the journal_io_cache will leak if dm_register_target() fails.
--- drivers/md/dm-integrity.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/md/dm-integrity.c +5 -3
@@ -3689,11 +3689,13 @@ int __init dm_integrity_init(void) } r =dm_register_target (&integrity_target); - -if (r <0 ) +if (r <0 ) {DMERR ("register failed %d" , r); +kmem_cache_destroy (journal_io_cache); +return r; + } -return r; +return 0 ; }void dm_integrity_exit (void )
Greg Kroah-Hartman
maintainerPATCH 134/191 dm flakey: fix a crash with invalid table line
In reply to Greg Kroah-HartmanFrom: Mikulas Patocka <[email protected]>
commit 98dba02d9a93eec11bffbb93c7c51624290702d2 upstream.
This command will crash with NULL pointer dereference:
dmsetup create flakey --table \
"0 blockdev --getsize /dev/ram0 flakey /dev/ram0 0 0 1 2 corrupt_bio_byte 512"
Fix the crash by checking if arg_name is non-NULL before comparing it.
--- drivers/md/dm-flakey.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/md/dm-flakey.c +2 -2
@@ -124,9 +124,9 @@ static int parse_features(struct dm_arg_* Direction r or w? */ arg_name =dm_shift_arg (as); -if (!strcasecmp (arg_name,"w" )) +if (arg_name && !strcasecmp (arg_name,"w" )) fc->corrupt_bio_rw =WRITE ; -else if (!strcasecmp (arg_name,"r" )) +else if (arg_name && !strcasecmp (arg_name,"r" )) fc->corrupt_bio_rw =READ ;else { ti->error ="Invalid corrupt bio direction (r or w)" ;
Greg Kroah-Hartman
maintainerPATCH 135/191 dm ioctl: fix nested locking in table_clear() to remove deadlock concern
In reply to Greg Kroah-HartmanFrom: Mike Snitzer <[email protected]>
commit 3d32aaa7e66d5c1479a3c31d6c2c5d45dd0d3b89 upstream.
syzkaller found the following problematic rwsem locking (with write lock already held):
down_read+0x9d/0x450 kernel/locking/rwsem.c:1509 dm_get_inactive_table+0x2b/0xc0 drivers/md/dm-ioctl.c:773 __dev_status+0x4fd/0x7c0 drivers/md/dm-ioctl.c:844 table_clear+0x197/0x280 drivers/md/dm-ioctl.c:1537
In table_clear, it first acquires a write lock
https://elixir.bootlin.com/linux/v6.2/source/drivers/md/dm-ioctl.c#L1520down_write(&_hash_lock);
Then before the lock is released at L1539, there is a path shown above:table_clear -> __dev_status -> dm_get_inactive_table -> down_read
https://elixir.bootlin.com/linux/v6.2/source/drivers/md/dm-ioctl.c#L773down_read(&_hash_lock);
It tries to acquire the same read lock again, resulting in the deadlock problem.
Fix this by moving table_clear()'s __dev_status() call to after its up_write(&_hash_lock);
--- drivers/md/dm-ioctl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/md/dm-ioctl.c +4 -3
@@ -1410,11 +1410,12 @@ static int table_clear(struct file *filp hc->new_map =NULL ; } - param->flags &= ~DM_INACTIVE_PRESENT_FLAG ; - -__dev_status (hc->md, param); md = hc->md;up_write (&_hash_lock); + + param->flags &= ~DM_INACTIVE_PRESENT_FLAG ; +__dev_status (md, param); +if (old_map) {dm_sync_table (md);dm_table_destroy (old_map);
Greg Kroah-Hartman
maintainerPATCH 136/191 perf auxtrace: Fix address filter entire kernel size
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
commit 1f9f33ccf0320be21703d9195dd2b36a1c9a07cb upstream.
kallsyms is not completely in address order.
In find_entire_kern_cb(), calculate the kernel end from the maximum address not the last symbol.
Example:
Before:
$ sudo cat /proc/kallsyms | grep ' [twTw] ' | tail -1
ffffffffc00b8bd0 t bpf_prog_6deef7357e7b4530 [bpf]
$ sudo cat /proc/kallsyms | grep ' [twTw] ' | sort | tail -1
ffffffffc15e0cc0 t iwl_mvm_exit [iwlmvm]
$ perf.d093603a05aa record -v --kcore -e intel_pt// --filter 'filter *' -- uname |& grep filter
Address filter: filter 0xffffffff93200000/0x2ceba000After:
$ perf.8fb0f7a01f8e record -v --kcore -e intel_pt// --filter 'filter *' -- uname |& grep filter
Address filter: filter 0xffffffff93200000/0x2e3e2000--- tools/perf/util/auxtrace.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/perf/util/auxtrace.c +4 -1
@@ -1793,6 +1793,7 @@ static int find_entire_kern_cb(void *arg char type, u64 start) {struct sym_args *args = arg; +u64 size;if (!kallsyms__is_function (type))return 0 ;
@@ -1802,7 +1803,9 @@ static int find_entire_kern_cb(void *arg args->start = start; }/* Don't know exactly where the kernel ends, so we add a page */ - args->size =round_up (start, page_size) + page_size - args->start; + size =round_up (start, page_size) + page_size - args->start; +if (size > args->size) + args->size = size;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 137/191 debugobject: Ensure pool refill (again)
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
commit 0af462f19e635ad522f28981238334620881badc upstream.
The recent fix to ensure atomicity of lookup and allocation inadvertently broke the pool refill mechanism.
Prior to that change debug_objects_activate() and debug_objecs_assert_init() invoked debug_objecs_init() to set up the tracking object for statically initialized objects. That's not longer the case and debug_objecs_init() is now the only place which does pool refills.
Depending on the number of statically initialized objects this can be enough to actually deplete the pool, which was observed by Ido via a debugobjects OOM warning.
Restore the old behaviour by adding explicit refill opportunities to debug_objects_activate() and debug_objecs_assert_init().
--- lib/debugobjects.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
lib/debugobjects.c +15 -1
@@ -460,6 +460,16 @@ static struct debug_obj *lookup_object_oreturn NULL ; } +static void debug_objects_fill_pool (void ) +{ +/* +* On RT enabled kernels the pool refill must happen in preemptible +* context: +*/ +if (!IS_ENABLED (CONFIG_PREEMPT_RT ) ||preemptible ()) +fill_pool (); +} +static void __debug_object_init (void *addr,struct debug_obj_descr *descr,int onstack) {
@@ -468,7 +478,7 @@ __debug_object_init(void *addr, struct dstruct debug_obj *obj;unsigned long flags; -fill_pool (); +debug_objects_fill_pool (); db =get_bucket ((unsigned long ) addr);
@@ -553,6 +563,8 @@ int debug_object_activate(void *addr, stif (!debug_objects_enabled)return 0 ; +debug_objects_fill_pool (); + db =get_bucket ((unsigned long ) addr);raw_spin_lock_irqsave (&db->lock, flags);
@@ -762,6 +774,8 @@ void debug_object_assert_init(void *addrif (!debug_objects_enabled)return ; +debug_objects_fill_pool (); + db =get_bucket ((unsigned long ) addr);raw_spin_lock_irqsave (&db->lock, flags);
Greg Kroah-Hartman
maintainerPATCH 138/191 netfilter: nf_tables: deactivate anonymous set from preparation phase
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
commit c1592a89942e9678f7d9c8030efa777c0d57edab upstream.
Toggle deleted anonymous sets as inactive in the next generation, so users cannot perform any update on it. Clear the generation bitmask in case the transaction is aborted.
The following KASAN splat shows a set element deletion for a bound anonymous set that has been already removed in the same transaction.
[ 64.921510] ================================================================== [ 64.923123] BUG: KASAN: wild-memory-access in nf_tables_commit+0xa24/0x1490 [nf_tables] [ 64.924745] Write of size 8 at addr dead000000000122 by task test/890 [ 64.927903] CPU: 3 PID: 890 Comm: test Not tainted 6.3.0+ #253 [ 64.931120] Call Trace: [ 64.932699] <TASK> [ 64.934292] dump_stack_lvl+0x33/0x50 [ 64.935908] ? nf_tables_commit+0xa24/0x1490 [nf_tables] [ 64.937551] kasan_report+0xda/0x120 [ 64.939186] ? nf_tables_commit+0xa24/0x1490 [nf_tables] [ 64.940814] nf_tables_commit+0xa24/0x1490 [nf_tables] [ 64.942452] ? __kasan_slab_alloc+0x2d/0x60 [ 64.944070] ? nf_tables_setelem_notify+0x190/0x190 [nf_tables] [ 64.945710] ? kasan_set_track+0x21/0x30 [ 64.947323] nfnetlink_rcv_batch+0x709/0xd90 [nfnetlink] [ 64.948898] ? nfnetlink_rcv_msg+0x480/0x480 [nfnetlink]
--- include/net/netfilter/nf_tables.h | 1 + net/netfilter/nf_tables_api.c | 12 ++++++++++++ net/netfilter/nft_dynset.c | 2 +- net/netfilter/nft_lookup.c | 2 +- net/netfilter/nft_objref.c | 2 +- 5 files changed, 16 insertions(+), 3 deletions(-)
include/net/netfilter/nf_tables.h +1 -0
@@ -471,6 +471,7 @@ struct nft_set_binding { };enum nft_trans_phase ; +void nf_tables_activate_set (const struct nft_ctx *ctx,struct nft_set *set);void nf_tables_deactivate_set (const struct nft_ctx *ctx,struct nft_set *set,struct nft_set_binding *binding,enum nft_trans_phase phase);
net/netfilter/nf_tables_api.c +12 -0
@@ -3758,12 +3758,24 @@ void nf_tables_unbind_set(const struct n }EXPORT_SYMBOL_GPL (nf_tables_unbind_set); +void nf_tables_activate_set (const struct nft_ctx *ctx,struct nft_set *set) +{ +if (nft_set_is_anonymous (set)) +nft_clear (ctx->net, set); + + set->use++; +} +EXPORT_SYMBOL_GPL (nf_tables_activate_set); +void nf_tables_deactivate_set (const struct nft_ctx *ctx,struct nft_set *set,struct nft_set_binding *binding,enum nft_trans_phase phase) {switch (phase) {case NFT_TRANS_PREPARE : +if (nft_set_is_anonymous (set)) +nft_deactivate_next (ctx->net, set); + set->use--;return ;case NFT_TRANS_ABORT :
net/netfilter/nft_dynset.c +1 -1
@@ -248,7 +248,7 @@ static void nft_dynset_activate(const st {struct nft_dynset *priv =nft_expr_priv (expr); - priv->set->use++; +nf_tables_activate_set (ctx, priv->set); } static void nft_dynset_destroy(const struct nft_ctx *ctx,
net/netfilter/nft_lookup.c +1 -1
@@ -132,7 +132,7 @@ static void nft_lookup_activate(const st {struct nft_lookup *priv =nft_expr_priv (expr); - priv->set->use++; +nf_tables_activate_set (ctx, priv->set); } static void nft_lookup_destroy(const struct nft_ctx *ctx,
net/netfilter/nft_objref.c +1 -1
@@ -182,7 +182,7 @@ static void nft_objref_map_activate(cons {struct nft_objref_map *priv =nft_expr_priv (expr); - priv->set->use++; +nf_tables_activate_set (ctx, priv->set); } static void nft_objref_map_destroy(const struct nft_ctx *ctx,
Greg Kroah-Hartman
maintainerPATCH 139/191 nohz: Add TICK_DEP_BIT_RCU
In reply to Greg Kroah-HartmanFrom: Frederic Weisbecker <[email protected]>
[ Upstream commit 01b4c39901e087ceebae2733857248de81476bd8 ]
If a nohz_full CPU is looping in the kernel, the scheduling-clock tick might nevertheless remain disabled. In !PREEMPT kernels, this can prevent RCU's attempts to enlist the aid of that CPU's executions of cond_resched(), which can in turn result in an arbitrarily delayed grace period and thus an OOM. RCU therefore needs a way to enable a holdout nohz_full CPU's scheduler-clock interrupt.
This commit therefore provides a new TICK_DEP_BIT_RCU value which RCU can pass to tick_dep_set_cpu() and friends to force on the scheduler-clock interrupt for a specified CPU or task. In some cases, rcutorture needs to turn on the scheduler-clock tick, so this commit also exports the relevant symbols to GPL-licensed modules.
Stable-dep-of: 58d766824264 ("tick/nohz: Fix cpu_is_hotpluggable() by checking with nohz subsystem")
--- include/linux/tick.h | 7 ++++++- include/trace/events/timer.h | 3 ++- kernel/time/tick-sched.c | 7 +++++++ 3 files changed, 15 insertions(+), 2 deletions(-)
include/linux/tick.h +6 -1
@@ -102,7 +102,8 @@ enum tick_dep_bits {TICK_DEP_BIT_POSIX_TIMER =0 ,TICK_DEP_BIT_PERF_EVENTS =1 ,TICK_DEP_BIT_SCHED =2 , - TICK_DEP_BIT_CLOCK_UNSTABLE = 3 +TICK_DEP_BIT_CLOCK_UNSTABLE =3 , + TICK_DEP_BIT_RCU = 4 };#define TICK_DEP_MASK_NONE 0
@@ -110,6 +111,7 @@ enum tick_dep_bits {#define TICK_DEP_MASK_PERF_EVENTS (1 << TICK_DEP_BIT_PERF_EVENTS)#define TICK_DEP_MASK_SCHED (1 << TICK_DEP_BIT_SCHED)#define TICK_DEP_MASK_CLOCK_UNSTABLE (1 << TICK_DEP_BIT_CLOCK_UNSTABLE) +#define TICK_DEP_MASK_RCU (1 << TICK_DEP_BIT_RCU)#ifdef CONFIG_NO_HZ_COMMON extern bool tick_nohz_enabled;
@@ -257,6 +259,9 @@ static inline bool tick_nohz_full_enabled(void) { return false; }static inline bool tick_nohz_full_cpu (int cpu) {return false; }static inline void tick_nohz_full_add_cpus_to (struct cpumask *mask) { } +static inline void tick_nohz_dep_set_cpu (int cpu,enum tick_dep_bits bit) { } +static inline void tick_nohz_dep_clear_cpu (int cpu,enum tick_dep_bits bit) { } +static inline void tick_dep_set (enum tick_dep_bits bit) { }static inline void tick_dep_clear (enum tick_dep_bits bit) { }static inline void tick_dep_set_cpu (int cpu,enum tick_dep_bits bit) { }
include/trace/events/timer.h +2 -1
@@ -362,7 +362,8 @@ TRACE_EVENT(itimer_expire, tick_dep_name(POSIX_TIMER) \ tick_dep_name(PERF_EVENTS) \ tick_dep_name(SCHED) \ - tick_dep_name_end(CLOCK_UNSTABLE) + tick_dep_name(CLOCK_UNSTABLE) \ + tick_dep_name_end(RCU) #undef tick_dep_name#undef tick_dep_mask_name
kernel/time/tick-sched.c +7 -0
@@ -199,6 +199,11 @@ static bool check_tick_dependency(atomic_t *dep)return true; } +if (val &TICK_DEP_MASK_RCU ) { +trace_tick_stop (0 ,TICK_DEP_MASK_RCU ); +return true; + } +return false; }
@@ -325,6 +330,7 @@ void tick_nohz_dep_set_cpu(int cpu, enum tick_dep_bits bit)preempt_enable (); } } +EXPORT_SYMBOL_GPL (tick_nohz_dep_set_cpu);void tick_nohz_dep_clear_cpu (int cpu,enum tick_dep_bits bit) {
@@ -332,6 +338,7 @@ void tick_nohz_dep_clear_cpu(int cpu, enum tick_dep_bits bit)atomic_andnot (BIT (bit), &ts->tick_dep_mask); } +EXPORT_SYMBOL_GPL (tick_nohz_dep_clear_cpu);/* * Set a per-task tick dependency. Posix CPU timers need this in order to elapse
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 140/191 tick/nohz: Fix cpu_is_hotpluggable() by checking with nohz subsystem
In reply to Greg Kroah-HartmanFrom: Joel Fernandes (Google) <[email protected]>
[ Upstream commit 58d7668242647e661a20efe065519abd6454287e ]
For CONFIG_NO_HZ_FULL systems, the tick_do_timer_cpu cannot be offlined. However, cpu_is_hotpluggable() still returns true for those CPUs. This causes torture tests that do offlining to end up trying to offline this CPU causing test failures. Such failure happens on all architectures.
Fix the repeated error messages thrown by this (even if the hotplug errors are harmless) by asking the opinion of the nohz subsystem on whether the CPU can be hotplugged.
[ Apply Frederic Weisbecker feedback on refactoring tick_nohz_cpu_down(). ]
For drivers/base/ portion:
--- drivers/base/cpu.c | 3 ++- include/linux/tick.h | 2 ++ kernel/time/tick-sched.c | 11 ++++++++--- 3 files changed, 12 insertions(+), 4 deletions(-)
drivers/base/cpu.c +2 -1
@@ -494,7 +494,8 @@ static const struct attribute_group *cpu_root_attr_groups[] = {bool cpu_is_hotpluggable (unsigned cpu) {struct device *dev =get_cpu_device (cpu); - return dev && container_of(dev, struct cpu, dev)->hotpluggable; + return dev && container_of(dev, struct cpu, dev)->hotpluggable + &&tick_nohz_cpu_hotpluggable (cpu); }EXPORT_SYMBOL_GPL (cpu_is_hotpluggable);
include/linux/tick.h +2 -0
@@ -197,6 +197,7 @@ extern void tick_nohz_dep_set_signal(struct signal_struct *signal, enum tick_dep_bits bit);extern void tick_nohz_dep_clear_signal (struct signal_struct *signal,enum tick_dep_bits bit); +extern bool tick_nohz_cpu_hotpluggable (unsigned int cpu);/* * The below are tick_nohz_[set,clear]_dep() wrappers that optimize off-cases
@@ -261,6 +262,7 @@ static inline void tick_nohz_full_add_cpus_to(struct cpumask *mask) { }static inline void tick_nohz_dep_set_cpu (int cpu,enum tick_dep_bits bit) { }static inline void tick_nohz_dep_clear_cpu (int cpu,enum tick_dep_bits bit) { } +static inline bool tick_nohz_cpu_hotpluggable (unsigned int cpu) {return true; }static inline void tick_dep_set (enum tick_dep_bits bit) { }static inline void tick_dep_clear (enum tick_dep_bits bit) { }
kernel/time/tick-sched.c +8 -3
@@ -406,7 +406,7 @@ void __init tick_nohz_full_setup(cpumask_var_t cpumask) tick_nohz_full_running = true; } -static int tick_nohz_cpu_down (unsigned int cpu) +bool tick_nohz_cpu_hotpluggable (unsigned int cpu) {/* * The boot CPU handles housekeeping duty (unbound timers,
@@ -414,8 +414,13 @@ static int tick_nohz_cpu_down(unsigned int cpu)* CPUs. It must remain online when nohz full is enabled. */ if (tick_nohz_full_running && tick_do_timer_cpu == cpu) -return -EBUSY ; -return 0 ; +return false; +return true; +} + +static int tick_nohz_cpu_down (unsigned int cpu) +{ +return tick_nohz_cpu_hotpluggable (cpu) ?0 : -EBUSY ; }void __init tick_nohz_init (void )
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 141/191 ipmi: Fix SSIF flag requests
In reply to Greg Kroah-HartmanFrom: Corey Minyard <[email protected]>
[ Upstream commit a1466ec5b671651b848df17fc9233ecbb7d35f9f ]
Commit 89986496de141 ("ipmi: Turn off all activity on an idle ipmi interface") modified the IPMI code to only request events when the driver had somethine waiting for events. The SSIF code, however, was using the event fetch request to also fetch the flags.
Add a timer and the proper handling for the upper layer telling whether flags fetches are required.
Stable-dep-of: 6d2555cde291 ("ipmi: fix SSIF not responding under certain cond.")
--- drivers/char/ipmi/ipmi_ssif.c | 64 ++++++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 12 deletions(-)
drivers/char/ipmi/ipmi_ssif.c +52 -12
@@ -88,6 +88,12 @@#define SSIF_MSG_JIFFIES ((SSIF_MSG_USEC * 1000) / TICK_NSEC)#define SSIF_MSG_PART_JIFFIES ((SSIF_MSG_PART_USEC * 1000) / TICK_NSEC) +/* +* Timeout for the watch, only used for get flag timer. +*/ +#define SSIF_WATCH_TIMEOUT_MSEC 100 +#define SSIF_WATCH_TIMEOUT_JIFFIES msecs_to_jiffies(SSIF_WATCH_TIMEOUT_MSEC) +enum ssif_intf_state {SSIF_NORMAL ,SSIF_GETTING_FLAGS ,
@@ -268,6 +274,9 @@ struct ssif_info {struct timer_list retry_timer;int retries_left; +bool need_watch;/* Need to look for flags? */ +struct timer_list watch_timer;/* Flag fetch timer. */ +/* Info from SSIF cmd */ unsigned char max_xmit_msg_size;unsigned char max_recv_msg_size;
@@ -558,6 +567,26 @@ static void retry_timeout(struct timer_list *t)start_get (ssif_info); } +static void watch_timeout (struct timer_list *t) +{ +struct ssif_info *ssif_info =from_timer (ssif_info, t, watch_timer); +unsigned long oflags, *flags; + +if (ssif_info->stopping) +return ; + + flags =ipmi_ssif_lock_cond (ssif_info, &oflags); +if (ssif_info->need_watch) { +mod_timer (&ssif_info->watch_timer, + jiffies +SSIF_WATCH_TIMEOUT_JIFFIES ); +if (SSIF_IDLE (ssif_info)) { +start_flag_fetch (ssif_info, flags);/* Releases lock */ +return ; + } + ssif_info->req_flags = true; + } +ipmi_ssif_unlock_cond (ssif_info, flags); +}static void ssif_alert (struct i2c_client *client,enum i2c_alert_protocol type,unsigned int data)
@@ -1103,8 +1132,7 @@ static int get_smi_info(void *send_info, struct ipmi_smi_info *data) }/* -* Instead of having our own timer to periodically check the message -* flags, we let the message handler drive us. +* Upper layer wants us to request events. */ static void request_events (void *send_info) {
@@ -1115,18 +1143,27 @@ static void request_events(void *send_info)return ; flags =ipmi_ssif_lock_cond (ssif_info, &oflags); -/* -* Request flags first, not events, because the lower layer -* doesn't have a way to send an attention. But make sure -* event checking still happens. -*/ ssif_info->req_events = true; -if (SSIF_IDLE (ssif_info)) -start_flag_fetch (ssif_info, flags); -else { - ssif_info->req_flags = true; -ipmi_ssif_unlock_cond (ssif_info, flags); +ipmi_ssif_unlock_cond (ssif_info, flags); +} + +/* +* Upper layer is changing the flag saying whether we need to request +* flags periodically or not. +*/ +static void ssif_set_need_watch (void *send_info,bool enable) +{ +struct ssif_info *ssif_info = (struct ssif_info *) send_info; +unsigned long oflags, *flags; + + flags =ipmi_ssif_lock_cond (ssif_info, &oflags); +if (enable != ssif_info->need_watch) { + ssif_info->need_watch = enable; +if (ssif_info->need_watch) +mod_timer (&ssif_info->watch_timer, + jiffies +SSIF_WATCH_TIMEOUT_JIFFIES ); } +ipmi_ssif_unlock_cond (ssif_info, flags); } static int ssif_start_processing(void *send_info,
@@ -1253,6 +1290,7 @@ static void shutdown_ssif(void *send_info)schedule_timeout (1 ); ssif_info->stopping = true; +del_timer_sync (&ssif_info->watch_timer);del_timer_sync (&ssif_info->retry_timer);if (ssif_info->thread) {complete (&ssif_info->wake_thread);
@@ -1632,6 +1670,7 @@ static int ssif_probe(struct i2c_client *client, const struct i2c_device_id *id)spin_lock_init (&ssif_info->lock); ssif_info->ssif_state =SSIF_NORMAL ;timer_setup (&ssif_info->retry_timer, retry_timeout,0 ); +timer_setup (&ssif_info->watch_timer, watch_timeout,0 );for (i =0 ; i <SSIF_NUM_STATS ; i++)atomic_set (&ssif_info->stats[i],0 );
@@ -1645,6 +1684,7 @@ static int ssif_probe(struct i2c_client *client, const struct i2c_device_id *id) ssif_info->handlers.get_smi_info = get_smi_info; ssif_info->handlers.sender = sender; ssif_info->handlers.request_events = request_events; + ssif_info->handlers.set_need_watch = ssif_set_need_watch; {unsigned int thread_num;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 142/191 ipmi: Fix how the lower layers are told to watch for messages
In reply to Greg Kroah-HartmanFrom: Corey Minyard <[email protected]>
[ Upstream commit c65ea996595005be470fbfa16711deba414fd33b ]
The IPMI driver has a mechanism to tell the lower layers it needs to watch for messages, commands, and watchdogs (so it doesn't needlessly poll). However, it needed some extensions, it needed a way to tell what is being waited for so it could set the timeout appropriately.
The update to the lower layer was also being done once a second at best because it was done in the main timeout handler. However, if a command is sent and a response message is coming back, it needed to be started immediately. So modify the code to update immediately if it needs to be enabled. Disable is still lazy.
Stable-dep-of: 6d2555cde291 ("ipmi: fix SSIF not responding under certain cond.")
--- drivers/char/ipmi/ipmi_msghandler.c | 119 ++++++++++++++++++++-------- drivers/char/ipmi/ipmi_si_intf.c | 5 +- drivers/char/ipmi/ipmi_ssif.c | 26 +++--- include/linux/ipmi_smi.h | 36 +++++++-- 4 files changed, 134 insertions(+), 52 deletions(-)
drivers/char/ipmi/ipmi_msghandler.c +85 -34
@@ -536,9 +536,22 @@ struct ipmi_smi {unsigned int waiting_events_count;/* How many events in queue? */ char delivering_events;char event_msg_printed; + +/* How many users are waiting for events? */ atomic_t event_waiters;unsigned int ticks_to_req_ev; -int last_needs_timer; + +/* How many users are waiting for commands? */ +atomic_t command_waiters; + +/* How many users are waiting for watchdogs? */ +atomic_t watchdog_waiters; + +/* +* Tells what the lower layer has last been asked to watch for, +* messages and/or watchdogs. Protected by xmit_msgs_lock. +*/ +unsigned int last_watch_mask;/* * The event receiver for my BMC, only really used at panic
@@ -1085,6 +1098,29 @@ static int intf_err_seq(struct ipmi_smi *intf,return rv; } +/* Must be called with xmit_msgs_lock held. */ +static void smi_tell_to_watch (struct ipmi_smi *intf, +unsigned int flags, +struct ipmi_smi_msg *smi_msg) +{ +if (flags &IPMI_WATCH_MASK_CHECK_MESSAGES ) { +if (!smi_msg) +return ; + +if (!smi_msg->needs_response) +return ; + } + +if (!intf->handlers->set_need_watch) +return ; + +if ((intf->last_watch_mask & flags) == flags) +return ; + + intf->last_watch_mask |= flags; + intf->handlers->set_need_watch (intf->send_info, + intf->last_watch_mask); +}static void free_user_work (struct work_struct *work) {
@@ -1164,8 +1200,9 @@ int ipmi_create_user(unsigned int if_num,spin_unlock_irqrestore (&intf->seq_lock, flags);if (handler->ipmi_watchdog_pretimeout) {/* User wants pretimeouts, so make sure to watch for them. */ -if (atomic_inc_return (&intf->event_waiters) ==1 ) -need_waiter (intf); +if (atomic_inc_return (&intf->watchdog_waiters) ==1 ) +smi_tell_to_watch (intf,IPMI_WATCH_MASK_CHECK_WATCHDOG , +NULL ); }srcu_read_unlock (&ipmi_interfaces_srcu, index); *user = new_user;
@@ -1239,7 +1276,7 @@ static void _ipmi_destroy_user(struct ipmi_user *user) user->handler->shutdown (user->handler_data);if (user->handler->ipmi_watchdog_pretimeout) -atomic_dec (&intf->event_waiters); +atomic_dec (&intf->watchdog_waiters);if (user->gets_events)atomic_dec (&intf->event_waiters);
@@ -1597,8 +1634,8 @@ int ipmi_register_for_cmd(struct ipmi_user *user, goto out_unlock; } -if (atomic_inc_return (&intf->event_waiters) ==1 ) -need_waiter (intf); +if (atomic_inc_return (&intf->command_waiters) ==1 ) +smi_tell_to_watch (intf,IPMI_WATCH_MASK_CHECK_COMMANDS ,NULL );list_add_rcu (&rcvr->link, &intf->cmd_rcvrs);
@@ -1648,7 +1685,7 @@ int ipmi_unregister_for_cmd(struct ipmi_user *user,synchronize_rcu ();release_ipmi_user (user, index);while (rcvrs) { -atomic_dec (&intf->event_waiters); +atomic_dec (&intf->command_waiters); rcvr = rcvrs; rcvrs = rcvr->next;kfree (rcvr);
@@ -1765,22 +1802,21 @@ static struct ipmi_smi_msg *smi_add_send_msg(struct ipmi_smi *intf,return smi_msg; } -static void smi_send (struct ipmi_smi *intf,const struct ipmi_smi_handlers *handlers,struct ipmi_smi_msg *smi_msg,int priority) {int run_to_completion = intf->run_to_completion; +unsigned long flags =0 ; -if (run_to_completion) { - smi_msg =smi_add_send_msg (intf, smi_msg, priority); - }else { -unsigned long flags; - +if (!run_to_completion)spin_lock_irqsave (&intf->xmit_msgs_lock, flags); - smi_msg =smi_add_send_msg (intf, smi_msg, priority); + smi_msg =smi_add_send_msg (intf, smi_msg, priority); + +smi_tell_to_watch (intf,IPMI_WATCH_MASK_CHECK_MESSAGES , smi_msg); + +if (!run_to_completion)spin_unlock_irqrestore (&intf->xmit_msgs_lock, flags); - }if (smi_msg) handlers->sender (intf->send_info, smi_msg);
@@ -1978,6 +2014,9 @@ static int i_ipmi_req_ipmb(struct ipmi_smi *intf, ipmb_seq, broadcast, source_address, source_lun); +/* We will be getting a response in the BMC message queue. */ + smi_msg->needs_response = true; +/* * Copy the message into the recv message data, so we * can retransmit it later if necessary.
@@ -2165,6 +2204,7 @@ static int i_ipmi_request(struct ipmi_user *user, goto out; } } + smi_msg->needs_response = false;rcu_read_lock ();if (intf->in_shutdown) {
@@ -3386,6 +3426,8 @@ int ipmi_add_smi(struct module *owner,INIT_LIST_HEAD (&intf->hp_xmit_msgs);spin_lock_init (&intf->events_lock);atomic_set (&intf->event_waiters,0 ); +atomic_set (&intf->watchdog_waiters,0 ); +atomic_set (&intf->command_waiters,0 ); intf->ticks_to_req_ev =IPMI_REQUEST_EV_TIME ;INIT_LIST_HEAD (&intf->waiting_events); intf->waiting_events_count =0 ;
@@ -4404,6 +4446,9 @@ static void smi_recv_tasklet(unsigned long val) intf->curr_msg = newmsg; } } + +smi_tell_to_watch (intf,IPMI_WATCH_MASK_CHECK_MESSAGES , newmsg); +if (!run_to_completion)spin_unlock_irqrestore (&intf->xmit_msgs_lock, flags);if (newmsg)
@@ -4531,7 +4576,7 @@ static void check_msg_timeout(struct ipmi_smi *intf, struct seq_table *ent,struct list_head *timeouts, unsigned long timeout_period, int slot, unsigned long *flags, - unsigned int *waiting_msgs) + unsigned int *watch_mask) { struct ipmi_recv_msg *msg;
@@ -4543,7 +4588,7 @@ static void check_msg_timeout(struct ipmi_smi *intf, struct seq_table *ent,if (timeout_period < ent->timeout) { ent->timeout -= timeout_period; - (*waiting_msgs)++; + *watch_mask |=IPMI_WATCH_MASK_CHECK_MESSAGES ;return ; }
@@ -4562,7 +4607,7 @@ static void check_msg_timeout(struct ipmi_smi *intf, struct seq_table *ent,struct ipmi_smi_msg *smi_msg;/* More retries, send again. */ - (*waiting_msgs)++; + *watch_mask |=IPMI_WATCH_MASK_CHECK_MESSAGES ;/* * Start with the max timer, set to normal timer after
@@ -4614,13 +4659,13 @@ static unsigned int ipmi_timeout_handler(struct ipmi_smi *intf,struct ipmi_recv_msg *msg, *msg2;unsigned long flags;int i; -unsigned int waiting_msgs =0 ; +unsigned int watch_mask =0 ;if (!intf->bmc_registered) {kref_get (&intf->refcount);if (!schedule_work (&intf->bmc_reg_work)) {kref_put (&intf->refcount, intf_free); - waiting_msgs++; + watch_mask |=IPMI_WATCH_MASK_INTERNAL ; } }
@@ -4640,7 +4685,7 @@ static unsigned int ipmi_timeout_handler(struct ipmi_smi *intf,for (i =0 ; i <IPMI_IPMB_NUM_SEQ ; i++)check_msg_timeout (intf, &intf->seq_table[i], &timeouts, timeout_period, i, - &flags, &waiting_msgs); + &flags, &watch_mask);spin_unlock_irqrestore (&intf->seq_lock, flags);list_for_each_entry_safe (msg, msg2, &timeouts, link)
@@ -4671,7 +4716,7 @@ static unsigned int ipmi_timeout_handler(struct ipmi_smi *intf,tasklet_schedule (&intf->recv_tasklet); -return waiting_msgs; +return watch_mask; }static void ipmi_request_event (struct ipmi_smi *intf)
@@ -4691,37 +4736,43 @@ static atomic_t stop_operation;static void ipmi_timeout (struct timer_list *unused) {struct ipmi_smi *intf; -int nt =0 , index; +unsigned int watch_mask =0 ; +int index; +unsigned long flags;if (atomic_read (&stop_operation))return ; index =srcu_read_lock (&ipmi_interfaces_srcu);list_for_each_entry_rcu (intf, &ipmi_interfaces, link) { -int lnt =0 ; -if (atomic_read (&intf->event_waiters)) { intf->ticks_to_req_ev--;if (intf->ticks_to_req_ev ==0 ) {ipmi_request_event (intf); intf->ticks_to_req_ev =IPMI_REQUEST_EV_TIME ; } - lnt++; + watch_mask |=IPMI_WATCH_MASK_INTERNAL ; } - lnt +=ipmi_timeout_handler (intf,IPMI_TIMEOUT_TIME ); +if (atomic_read (&intf->watchdog_waiters)) + watch_mask |=IPMI_WATCH_MASK_CHECK_WATCHDOG ; - lnt = !!lnt; -if (lnt != intf->last_needs_timer && - intf->handlers->set_need_watch) - intf->handlers->set_need_watch (intf->send_info, lnt); - intf->last_needs_timer = lnt; +if (atomic_read (&intf->command_waiters)) + watch_mask |=IPMI_WATCH_MASK_CHECK_COMMANDS ; + + watch_mask |=ipmi_timeout_handler (intf,IPMI_TIMEOUT_TIME ); - nt += lnt; +spin_lock_irqsave (&intf->xmit_msgs_lock, flags); +if (watch_mask != intf->last_watch_mask && + intf->handlers->set_need_watch) + intf->handlers->set_need_watch (intf->send_info, + watch_mask); + intf->last_watch_mask = watch_mask; +spin_unlock_irqrestore (&intf->xmit_msgs_lock, flags); }srcu_read_unlock (&ipmi_interfaces_srcu, index); -if (nt) +if (watch_mask)mod_timer (&ipmi_timer, jiffies +IPMI_TIMEOUT_JIFFIES ); }
drivers/char/ipmi/ipmi_si_intf.c +4 -1
@@ -1073,10 +1073,13 @@ static void request_events(void *send_info)atomic_set (&smi_info->req_events,1 ); } -static void set_need_watch (void *send_info,bool enable) +static void set_need_watch (void *send_info,unsigned int watch_mask) {struct smi_info *smi_info = send_info;unsigned long flags; +int enable; + + enable = !!(watch_mask & ~IPMI_WATCH_MASK_INTERNAL );atomic_set (&smi_info->need_watch, enable);spin_lock_irqsave (&smi_info->si_lock, flags);
drivers/char/ipmi/ipmi_ssif.c +16 -10
@@ -91,8 +91,8 @@/* * Timeout for the watch, only used for get flag timer. */ -#define SSIF_WATCH_TIMEOUT_MSEC 100 -#define SSIF_WATCH_TIMEOUT_JIFFIES msecs_to_jiffies(SSIF_WATCH_TIMEOUT_MSEC) +#define SSIF_WATCH_MSG_TIMEOUT msecs_to_jiffies(10) +#define SSIF_WATCH_WATCHDOG_TIMEOUT msecs_to_jiffies(250)enum ssif_intf_state {SSIF_NORMAL ,
@@ -274,7 +274,7 @@ struct ssif_info {struct timer_list retry_timer;int retries_left; -bool need_watch;/* Need to look for flags? */ +long watch_timeout;/* Timeout for flags check, 0 if off. */ struct timer_list watch_timer;/* Flag fetch timer. */ /* Info from SSIF cmd */
@@ -576,9 +576,9 @@ static void watch_timeout(struct timer_list *t)return ; flags =ipmi_ssif_lock_cond (ssif_info, &oflags); -if (ssif_info->need_watch) { +if (ssif_info->watch_timeout) {mod_timer (&ssif_info->watch_timer, - jiffies +SSIF_WATCH_TIMEOUT_JIFFIES ); + jiffies + ssif_info->watch_timeout);if (SSIF_IDLE (ssif_info)) {start_flag_fetch (ssif_info, flags);/* Releases lock */ return ;
@@ -1151,17 +1151,23 @@ static void request_events(void *send_info)* Upper layer is changing the flag saying whether we need to request * flags periodically or not. */ -static void ssif_set_need_watch (void *send_info,bool enable) +static void ssif_set_need_watch (void *send_info,unsigned int watch_mask) {struct ssif_info *ssif_info = (struct ssif_info *) send_info;unsigned long oflags, *flags; +long timeout =0 ; + +if (watch_mask &IPMI_WATCH_MASK_CHECK_MESSAGES ) + timeout =SSIF_WATCH_MSG_TIMEOUT ; +else if (watch_mask & ~IPMI_WATCH_MASK_INTERNAL ) + timeout =SSIF_WATCH_WATCHDOG_TIMEOUT ; flags =ipmi_ssif_lock_cond (ssif_info, &oflags); -if (enable != ssif_info->need_watch) { - ssif_info->need_watch = enable; -if (ssif_info->need_watch) +if (timeout != ssif_info->watch_timeout) { + ssif_info->watch_timeout = timeout; +if (ssif_info->watch_timeout)mod_timer (&ssif_info->watch_timer, - jiffies +SSIF_WATCH_TIMEOUT_JIFFIES ); + jiffies + ssif_info->watch_timeout); }ipmi_ssif_unlock_cond (ssif_info, flags); }
include/linux/ipmi_smi.h +29 -7
@@ -30,6 +30,17 @@ struct device;/* Structure for the low-level drivers. */ typedef struct ipmi_smi *ipmi_smi_t ; +/* +* Flags for set_check_watch() below. Tells if the SMI should be +* waiting for watchdog timeouts, commands and/or messages. There is +* also an internal flag for the message handler, SMIs should ignore +* it. +*/ +#define IPMI_WATCH_MASK_INTERNAL (1 << 0) +#define IPMI_WATCH_MASK_CHECK_MESSAGES (1 << 1) +#define IPMI_WATCH_MASK_CHECK_WATCHDOG (1 << 2) +#define IPMI_WATCH_MASK_CHECK_COMMANDS (1 << 3) +/* * Messages to/from the lower layer. The smi interface will take one * of these to send. After the send has occurred and a response has
@@ -55,8 +66,16 @@ struct ipmi_smi_msg {int rsp_size;unsigned char rsp[IPMI_MAX_MSG_LENGTH ]; -/* Will be called when the system is done with the message -(presumably to free it). */ +/* +* There should be a response message coming back in the BMC +* message queue. +*/ +bool needs_response; + +/* +* Will be called when the system is done with the message +* (presumably to free it). +*/ void (*done)(struct ipmi_smi_msg *msg); };
@@ -105,12 +124,15 @@ struct ipmi_smi_handlers {/* * Called by the upper layer when some user requires that the -* interface watch for events, received messages, watchdog -* pretimeouts, or not. Used by the SMI to know if it should -* watch for these. This may be NULL if the SMI does not -* implement it. +* interface watch for received messages and watchdog +* pretimeouts (basically do a "Get Flags", or not. Used by +* the SMI to know if it should watch for these. This may be +* NULL if the SMI does not implement it. watch_mask is from +* IPMI_WATCH_MASK_xxx above. The interface should run slower +* timeouts for just watchdog checking or faster timeouts when +* waiting for the message queue. */ -void (*set_need_watch)(void *send_info,bool enable); +void (*set_need_watch)(void *send_info,unsigned int watch_mask);/* * Called when flushing all pending messages.
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 143/191 ipmi_ssif: Rename idle state and check
In reply to Greg Kroah-HartmanFrom: Corey Minyard <[email protected]>
[ Upstream commit 8230831c43a328c2be6d28c65d3f77e14c59986b ]
Rename the SSIF_IDLE() to IS_SSIF_IDLE(), since that is more clear, and rename SSIF_NORMAL to SSIF_IDLE, since that's more accurate.
Stable-dep-of: 6d2555cde291 ("ipmi: fix SSIF not responding under certain cond.")
--- drivers/char/ipmi/ipmi_ssif.c | 46 +++++++++++++++++------------------ 1 file changed, 23 insertions(+), 23 deletions(-)
drivers/char/ipmi/ipmi_ssif.c +23 -23
@@ -95,7 +95,7 @@#define SSIF_WATCH_WATCHDOG_TIMEOUT msecs_to_jiffies(250)enum ssif_intf_state { -SSIF_NORMAL , +SSIF_IDLE ,SSIF_GETTING_FLAGS ,SSIF_GETTING_EVENTS ,SSIF_CLEARING_FLAGS ,
@@ -103,8 +103,8 @@ enum ssif_intf_state {/* FIXME - add watchdog stuff. */ }; -#define SSIF_IDLE (ssif) ((ssif)->ssif_state == SSIF_NORMAL \ - && (ssif)->curr_msg == NULL) +#define IS_SSIF_IDLE (ssif) ((ssif)->ssif_state == SSIF_IDLE \ + && (ssif)->curr_msg == NULL)/* * Indexes into stats[] in ssif_info below.
@@ -349,9 +349,9 @@ static void return_hosed_msg(struct ssif_info *ssif_info,/* * Must be called with the message lock held. This will release the -* message lock. Note that the caller will check SSIF_IDLE and start a -* new operation, so there is no need to check for new messages to -* start in here. +* message lock. Note that the caller will check IS_SSIF_IDLE and +* start a new operation, so there is no need to check for new +* messages to start in here. */ static void start_clear_flags (struct ssif_info *ssif_info,unsigned long *flags) {
@@ -368,7 +368,7 @@ static void start_clear_flags(struct ssif_info *ssif_info, unsigned long *flags)if (start_send (ssif_info, msg,3 ) !=0 ) {/* Error, just go to normal state. */ - ssif_info->ssif_state =SSIF_NORMAL ; + ssif_info->ssif_state =SSIF_IDLE ; } }
@@ -383,7 +383,7 @@ static void start_flag_fetch(struct ssif_info *ssif_info, unsigned long *flags) mb[0 ] = (IPMI_NETFN_APP_REQUEST <<2 ); mb[1 ] =IPMI_GET_MSG_FLAGS_CMD ;if (start_send (ssif_info, mb,2 ) !=0 ) - ssif_info->ssif_state =SSIF_NORMAL ; + ssif_info->ssif_state =SSIF_IDLE ; } static void check_start_send(struct ssif_info *ssif_info, unsigned long *flags,
@@ -394,7 +394,7 @@ static void check_start_send(struct ssif_info *ssif_info, unsigned long *flags, flags =ipmi_ssif_lock_cond (ssif_info, &oflags); ssif_info->curr_msg =NULL ; - ssif_info->ssif_state =SSIF_NORMAL ; + ssif_info->ssif_state =SSIF_IDLE ;ipmi_ssif_unlock_cond (ssif_info, flags);ipmi_free_smi_msg (msg); }
@@ -408,7 +408,7 @@ static void start_event_fetch(struct ssif_info *ssif_info, unsigned long *flags) msg =ipmi_alloc_smi_msg ();if (!msg) { - ssif_info->ssif_state =SSIF_NORMAL ; + ssif_info->ssif_state =SSIF_IDLE ;ipmi_ssif_unlock_cond (ssif_info, flags);return ; }
@@ -431,7 +431,7 @@ static void start_recv_msg_fetch(struct ssif_info *ssif_info, msg =ipmi_alloc_smi_msg ();if (!msg) { - ssif_info->ssif_state =SSIF_NORMAL ; + ssif_info->ssif_state =SSIF_IDLE ;ipmi_ssif_unlock_cond (ssif_info, flags);return ; }
@@ -449,9 +449,9 @@ static void start_recv_msg_fetch(struct ssif_info *ssif_info,/* * Must be called with the message lock held. This will release the -* message lock. Note that the caller will check SSIF_IDLE and start a -* new operation, so there is no need to check for new messages to -* start in here. +* message lock. Note that the caller will check IS_SSIF_IDLE and +* start a new operation, so there is no need to check for new +* messages to start in here. */ static void handle_flags (struct ssif_info *ssif_info,unsigned long *flags) {
@@ -467,7 +467,7 @@ static void handle_flags(struct ssif_info *ssif_info, unsigned long *flags)/* Events available. */ start_event_fetch (ssif_info, flags); else { - ssif_info->ssif_state =SSIF_NORMAL ; + ssif_info->ssif_state =SSIF_IDLE ;ipmi_ssif_unlock_cond (ssif_info, flags); } }
@@ -579,7 +579,7 @@ static void watch_timeout(struct timer_list *t)if (ssif_info->watch_timeout) {mod_timer (&ssif_info->watch_timer, jiffies + ssif_info->watch_timeout); -if (SSIF_IDLE (ssif_info)) { +if (IS_SSIF_IDLE (ssif_info)) {start_flag_fetch (ssif_info, flags);/* Releases lock */ return ; }
@@ -776,7 +776,7 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result, }switch (ssif_info->ssif_state) { -case SSIF_NORMAL : +case SSIF_IDLE :ipmi_ssif_unlock_cond (ssif_info, flags);if (!msg)break ;
@@ -794,7 +794,7 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result,* Error fetching flags, or invalid length, * just give up for now. */ - ssif_info->ssif_state =SSIF_NORMAL ; + ssif_info->ssif_state =SSIF_IDLE ;ipmi_ssif_unlock_cond (ssif_info, flags);pr_warn (PFX "Error getting flags: %d %d, %x\n" , result, len, (len >=3 ) ? data[2 ] :0 );
@@ -825,7 +825,7 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result,pr_warn (PFX "Invalid response clearing flags: %x %x\n" , data[0 ], data[1 ]); } - ssif_info->ssif_state =SSIF_NORMAL ; + ssif_info->ssif_state =SSIF_IDLE ;ipmi_ssif_unlock_cond (ssif_info, flags);break ;
@@ -901,7 +901,7 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result, } flags =ipmi_ssif_lock_cond (ssif_info, &oflags); -if (SSIF_IDLE (ssif_info) && !ssif_info->stopping) { +if (IS_SSIF_IDLE (ssif_info) && !ssif_info->stopping) {if (ssif_info->req_events)start_event_fetch (ssif_info, flags);else if (ssif_info->req_flags)
@@ -1070,7 +1070,7 @@ static void start_next_msg(struct ssif_info *ssif_info, unsigned long *flags)unsigned long oflags; restart: -if (!SSIF_IDLE (ssif_info)) { +if (!IS_SSIF_IDLE (ssif_info)) {ipmi_ssif_unlock_cond (ssif_info, flags);return ; }
@@ -1292,7 +1292,7 @@ static void shutdown_ssif(void *send_info)dev_set_drvdata (&ssif_info->client->dev,NULL );/* make sure the driver is not looking for flags any more. */ -while (ssif_info->ssif_state !=SSIF_NORMAL ) +while (ssif_info->ssif_state !=SSIF_IDLE )schedule_timeout (1 ); ssif_info->stopping = true;
@@ -1674,7 +1674,7 @@ static int ssif_probe(struct i2c_client *client, const struct i2c_device_id *id) }spin_lock_init (&ssif_info->lock); - ssif_info->ssif_state =SSIF_NORMAL ; + ssif_info->ssif_state =SSIF_IDLE ;timer_setup (&ssif_info->retry_timer, retry_timeout,0 );timer_setup (&ssif_info->watch_timer, watch_timeout,0 );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 144/191 ipmi: fix SSIF not responding under certain cond.
In reply to Greg Kroah-HartmanFrom: Zhang Yuchen <[email protected]>
[ Upstream commit 6d2555cde2918409b0331560e66f84a0ad4849c6 ]
The ipmi communication is not restored after a specific version of BMC is upgraded on our server.
The ipmi driver does not respond after printing the following log:
ipmi_ssif: Invalid response getting flags: 1c 1
I found that after entering this branch, ssif_info->ssif_state always holds SSIF_GETTING_FLAGS and never return to IDLE.
As a result, the driver cannot be loaded, because the driver status is checked during the unload process and must be IDLE in shutdown_ssif():
while (ssif_info->ssif_state != SSIF_IDLE)
schedule_timeout(1);The process trigger this problem is:
1. One msg timeout and next msg start send, and call ssif_set_need_watch().
2. ssif_set_need_watch()->watch_timeout()->start_flag_fetch() change ssif_state to SSIF_GETTING_FLAGS.
3. In msg_done_handler() ssif_state == SSIF_GETTING_FLAGS, if an error message is received, the second branch does not modify the ssif_state.
4. All retry action need IS_SSIF_IDLE() == True. Include retry action in watch_timeout(), msg_done_handler(). Sending msg does not work either. SSIF_IDLE is also checked in start_next_msg().
5. The only thing that can be triggered in the SSIF driver is watch_timeout(), after destory_user(), this timer will stop too.
So, if enter this branch, the ssif_state will remain SSIF_GETTING_FLAGS and can't send msg, no timer started, can't unload.
We did a comparative test before and after adding this patch, and the result is effective.
Message-Id: <[email protected]>
--- drivers/char/ipmi/ipmi_ssif.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/char/ipmi/ipmi_ssif.c +2 -2
@@ -801,9 +801,9 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result, }else if (data[0 ] != (IPMI_NETFN_APP_REQUEST |1 ) <<2 || data[1 ] !=IPMI_GET_MSG_FLAGS_CMD ) {/* -* Don't abort here, maybe it was a queued -* response to a previous command. +* Recv error response, give up. */ + ssif_info->ssif_state =SSIF_IDLE ;ipmi_ssif_unlock_cond (ssif_info, flags);pr_warn (PFX "Invalid response getting flags: %x %x\n" , data[0 ], data[1 ]);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 145/191 dm verity: skip redundant verity_handle_err() on I/O errors
In reply to Greg Kroah-HartmanFrom: Akilesh Kailash <[email protected]>
[ Upstream commit 2c0468e054c0adb660ac055fc396622ec7235df9 ]
Without FEC, dm-verity won't call verity_handle_err() when I/O fails, but with FEC enabled, it currently does even if an I/O error has occurred.
If there is an I/O error and FEC correction fails, return the error instead of calling verity_handle_err() again.
Stable-dep-of: e8c5d45f82ce ("dm verity: fix error handling for check_at_most_once on FEC")
--- drivers/md/dm-verity-target.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/md/dm-verity-target.c +12 -3
@@ -471,6 +471,7 @@ static int verity_verify_io(struct dm_verity_io *io)struct bvec_iter start;unsigned b;struct crypto_wait wait; +struct bio *bio =dm_bio_from_per_bio_data (io, v->ti->per_io_data_size);for (b =0 ; b < io->n_blocks; b++) {int r;
@@ -525,9 +526,17 @@ static int verity_verify_io(struct dm_verity_io *io)else if (verity_fec_decode (v, io,DM_VERITY_BLOCK_TYPE_DATA , cur_block,NULL , &start) ==0 )continue ; -else if (verity_handle_err (v,DM_VERITY_BLOCK_TYPE_DATA , - cur_block)) -return -EIO ; +else { +if (bio->bi_status) { +/* +* Error correction failed; Just return error +*/ +return -EIO ; + } +if (verity_handle_err (v,DM_VERITY_BLOCK_TYPE_DATA , + cur_block)) +return -EIO ; + } }return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 146/191 dm verity: fix error handling for check_at_most_once on FEC
In reply to Greg Kroah-HartmanFrom: Yeongjin Gil <[email protected]>
[ Upstream commit e8c5d45f82ce0c238a4817739892fe8897a3dcc3 ]
In verity_end_io(), if bi_status is not BLK_STS_OK, it can be return directly. But if FEC configured, it is desired to correct the data page through verity_verify_io. And the return value will be converted to blk_status and passed to verity_finish_io().
BTW, when a bit is set in v->validated_blocks, verity_verify_io() skips verification regardless of I/O error for the corresponding bio. In this case, the I/O error could not be returned properly, and as a result, there is a problem that abnormal data could be read for the corresponding block.
To fix this problem, when an I/O error occurs, do not skip verification even if the bit related is set in v->validated_blocks.
--- drivers/md/dm-verity-target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-verity-target.c +1 -1
@@ -478,7 +478,7 @@ static int verity_verify_io(struct dm_verity_io *io)sector_t cur_block = io->block + b;struct ahash_request *req =verity_io_hash_req (v, io); -if (v->validated_blocks && +if (v->validated_blocks && bio->bi_status ==BLK_STS_OK &&likely (test_bit (cur_block, v->validated_blocks))) {verity_bv_skip_block (v, io, &io->iter);continue ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 147/191 kernel/relay.c: fix read_pos error when multiple readers
In reply to Greg Kroah-HartmanFrom: Pengcheng Yang <[email protected]>
[ Upstream commit 341a7213e5c1ce274cc0f02270054905800ea660 ]
When reading, read_pos should start with bytes_consumed, not file->f_pos. Because when there is more than one reader, the read_pos corresponding to file->f_pos may have been consumed, which will cause the data that has been consumed to be read and the bytes_consumed update error.
Stable-dep-of: 43ec16f1450f ("relayfs: fix out-of-bounds access in relay_file_read")
--- kernel/relay.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
kernel/relay.c +7 -10
@@ -997,14 +997,14 @@ static void relay_file_read_consume(struct rchan_buf *buf,/* * relay_file_read_avail - boolean, are there unconsumed bytes available? */ -static int relay_file_read_avail (struct rchan_buf *buf,size_t read_pos) +static int relay_file_read_avail (struct rchan_buf *buf) {size_t subbuf_size = buf->chan->subbuf_size;size_t n_subbufs = buf->chan->n_subbufs;size_t produced = buf->subbufs_produced;size_t consumed = buf->subbufs_consumed; -relay_file_read_consume (buf, read_pos,0 ); +relay_file_read_consume (buf,0 ,0 ); consumed = buf->subbufs_consumed;
@@ -1065,23 +1065,20 @@ static size_t relay_file_read_subbuf_avail(size_t read_pos,/** * relay_file_read_start_pos - find the first available byte to read -* @read_pos: file read position * @buf: relay channel buffer * -* If the @read_pos is in the middle of padding, return the +* If the read_pos is in the middle of padding, return the * position of the first actually available byte, otherwise * return the original value. */ -static size_t relay_file_read_start_pos (size_t read_pos, -struct rchan_buf *buf) +static size_t relay_file_read_start_pos (struct rchan_buf *buf) {size_t read_subbuf, padding, padding_start, padding_end;size_t subbuf_size = buf->chan->subbuf_size;size_t n_subbufs = buf->chan->n_subbufs;size_t consumed = buf->subbufs_consumed % n_subbufs; +size_t read_pos = consumed * subbuf_size + buf->bytes_consumed; -if (!read_pos) - read_pos = consumed * subbuf_size + buf->bytes_consumed; read_subbuf = read_pos / subbuf_size; padding = buf->padding[read_subbuf]; padding_start = (read_subbuf +1 ) * subbuf_size - padding;
@@ -1137,10 +1134,10 @@ static ssize_t relay_file_read(struct file *filp, do { void *from; - if (!relay_file_read_avail(buf, *ppos)) + if (!relay_file_read_avail(buf)) break; - read_start = relay_file_read_start_pos(*ppos, buf); + read_start = relay_file_read_start_pos(buf); avail = relay_file_read_subbuf_avail(read_start, buf); if (!avail) break;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 148/191 relayfs: fix out-of-bounds access in relay_file_read
In reply to Greg Kroah-HartmanFrom: Zhang Zhengming <[email protected]>
[ Upstream commit 43ec16f1450f4936025a9bdf1a273affdb9732c1 ]
There is a crash in relay_file_read, as the var from point to the end of last subbuf.
The oops looks something like:
pc : __arch_copy_to_user+0x180/0x310 lr : relay_file_read+0x20c/0x2c8 Call trace: __arch_copy_to_user+0x180/0x310 full_proxy_read+0x68/0x98 vfs_read+0xb0/0x1d0 ksys_read+0x6c/0xf0 __arm64_sys_read+0x20/0x28 el0_svc_common.constprop.3+0x84/0x108 do_el0_svc+0x74/0x90 el0_svc+0x1c/0x28 el0_sync_handler+0x88/0xb0 el0_sync+0x148/0x180
We get the condition by analyzing the vmcore:
1). The last produced byte and last consumed byte
both at the end of the last subbuf
2). A softirq calls function(e.g __blk_add_trace)
to write relay buffer occurs when an program is calling
relay_file_read_avail().
relay_file_read
relay_file_read_avail
relay_file_read_consume(buf, 0, 0);
//interrupted by softirq who will write subbuf
....
return 1;
//read_start point to the end of the last subbuf
read_start = relay_file_read_start_pos
//avail is equal to subsize
avail = relay_file_read_subbuf_avail
//from points to an invalid memory address
from = buf->start + read_start
//system is crashed
copy_to_user(buffer, from, avail)--- kernel/relay.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/relay.c +2 -1
@@ -1077,7 +1077,8 @@ static size_t relay_file_read_start_pos(struct rchan_buf *buf)size_t subbuf_size = buf->chan->subbuf_size;size_t n_subbufs = buf->chan->n_subbufs;size_t consumed = buf->subbufs_consumed % n_subbufs; -size_t read_pos = consumed * subbuf_size + buf->bytes_consumed; +size_t read_pos = (consumed * subbuf_size + buf->bytes_consumed) + % (n_subbufs * subbuf_size); read_subbuf = read_pos / subbuf_size; padding = buf->padding[read_subbuf];
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 149/191 sit: update dev->needed_headroom in ipip6_tunnel_bind_dev()
In reply to Greg Kroah-HartmanFrom: Cong Wang <[email protected]>
[ Upstream commit c88f8d5cd95fd039cff95d682b8e71100c001df0 ]
When a tunnel device is bound with the underlying device, its dev->needed_headroom needs to be updated properly. IPv4 tunnels already do the same in ip_tunnel_bind_dev(). Otherwise we may not have enough header room for skb, especially after commit b17f709a2401 ("gue: TX support for using remote checksum offload option").
--- net/ipv6/sit.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
net/ipv6/sit.c +5 -3
@@ -1053,12 +1053,13 @@ static netdev_tx_t sit_tunnel_xmit(struct sk_buff *skb,static void ipip6_tunnel_bind_dev (struct net_device *dev) { +struct ip_tunnel *tunnel =netdev_priv (dev); +int t_hlen = tunnel->hlen +sizeof (struct iphdr );struct net_device *tdev =NULL ; -struct ip_tunnel *tunnel; +int hlen =LL_MAX_HEADER ;const struct iphdr *iph;struct flowi4 fl4; - tunnel =netdev_priv (dev); iph = &tunnel->parms.iph;if (iph->daddr) {
@@ -1081,14 +1082,15 @@ static void ipip6_tunnel_bind_dev(struct net_device *dev) tdev =__dev_get_by_index (tunnel->net, tunnel->parms.link);if (tdev && !netif_is_l3_master (tdev)) { -int t_hlen = tunnel->hlen +sizeof (struct iphdr );int mtu; mtu = tdev->mtu - t_hlen;if (mtu <IPV6_MIN_MTU ) mtu =IPV6_MIN_MTU ;WRITE_ONCE (dev->mtu, mtu); + hlen = tdev->hard_header_len + tdev->needed_headroom; } + dev->needed_headroom = t_hlen + hlen; } static void ipip6_tunnel_update(struct ip_tunnel *t, struct ip_tunnel_parm *p,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 150/191 net: dsa: mv88e6xxx: Add missing watchdog ops for 6320 family
In reply to Greg Kroah-HartmanFrom: Andrew Lunn <[email protected]>
[ Upstream commit 9c7f37e5ca14f5b04894b1b699a9903885cdafa6 ]
The 6320 family of switches uses the same watchdog registers as the 6390.
Stable-dep-of: 6686317855c6 ("net: dsa: mv88e6xxx: add mv88e6321 rsvd2cpu")
--- drivers/net/dsa/mv88e6xxx/chip.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/dsa/mv88e6xxx/chip.c +2 -0
@@ -3601,6 +3601,7 @@ static const struct mv88e6xxx_ops mv88e6320_ops = { .stats_get_stats = mv88e6320_stats_get_stats, .set_cpu_port = mv88e6095_g1_set_cpu_port, .set_egress_port = mv88e6095_g1_set_egress_port, + .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, .reset = mv88e6352_g1_reset,
@@ -3643,6 +3644,7 @@ static const struct mv88e6xxx_ops mv88e6321_ops = { .stats_get_stats = mv88e6320_stats_get_stats, .set_cpu_port = mv88e6095_g1_set_cpu_port, .set_egress_port = mv88e6095_g1_set_egress_port, + .watchdog_ops = &mv88e6390_watchdog_ops, .reset = mv88e6352_g1_reset, .vtu_getnext = mv88e6185_g1_vtu_getnext, .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 151/191 net: dsa: mv88e6xxx: add mv88e6321 rsvd2cpu
In reply to Greg Kroah-HartmanFrom: Angelo Dureghello <[email protected]>
[ Upstream commit 6686317855c6997671982d4489ccdd946f644957 ]
Add rsvd2cpu capability for mv88e6321 model, to allow proper bpdu processing.
--- drivers/net/dsa/mv88e6xxx/chip.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/dsa/mv88e6xxx/chip.c +1 -0
@@ -3645,6 +3645,7 @@ static const struct mv88e6xxx_ops mv88e6321_ops = { .set_cpu_port = mv88e6095_g1_set_cpu_port, .set_egress_port = mv88e6095_g1_set_egress_port, .watchdog_ops = &mv88e6390_watchdog_ops, + .mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu, .reset = mv88e6352_g1_reset, .vtu_getnext = mv88e6185_g1_vtu_getnext, .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 152/191 writeback: fix call of incorrect macro
In reply to Greg Kroah-HartmanFrom: Maxim Korotkov <[email protected]>
[ Upstream commit 3e46c89c74f2c38e5337d2cf44b0b551adff1cb4 ]
the variable 'history' is of type u16, it may be an error that the hweight32 macro was used for it
I guess macro hweight16 should be used
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- fs/fs-writeback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/fs-writeback.c +1 -1
@@ -702,7 +702,7 @@ void wbc_detach_inode(struct writeback_control *wbc)* is okay. The main goal is avoiding keeping an inode on * the wrong wb for an extended period of time. */ -if (hweight32 (history) >WB_FRN_HIST_THR_SLOTS ) +if (hweight16 (history) >WB_FRN_HIST_THR_SLOTS )inode_switch_wbs (inode, max_id); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 153/191 net/sched: act_mirred: Add carrier check
In reply to Greg Kroah-HartmanFrom: Victor Nogueira <[email protected]>
[ Upstream commit 526f28bd0fbdc699cda31426928802650c1528e5 ]
There are cases where the device is adminstratively UP, but operationally down. For example, we have a physical device (Nvidia ConnectX-6 Dx, 25Gbps) who's cable was pulled out, here is its ip link output:
5: ens2f1: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc mq state DOWN mode DEFAULT group default qlen 1000
link/ether b8:ce:f6:4b:68:35 brd ff:ff:ff:ff:ff:ff
altname enp179s0f1np1As you can see, it's administratively UP but operationally down. In this case, sending a packet to this port caused a nasty kernel hang (so nasty that we were unable to capture it). Aborting a transmit based on operational status (in addition to administrative status) fixes the issue.
v1->v2: Add fixes tagv2->v3: Remove blank line between tags + add change log, suggested by Leon
--- net/sched/act_mirred.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sched/act_mirred.c +1 -1
@@ -220,7 +220,7 @@ static int tcf_mirred_act(struct sk_buff *skb, const struct tc_action *a, goto out; } -if (unlikely (!(dev->flags &IFF_UP ))) { +if (unlikely (!(dev->flags &IFF_UP )) || !netif_carrier_ok (dev)) {net_notice_ratelimited ("tc mirred to Houston: device %s is down\n" , dev->name); goto out;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 154/191 rxrpc: Fix hard call timeout units
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit 0d098d83c5d9e107b2df7f5e11f81492f56d2fe7 ]
The hard call timeout is specified in the RXRPC_SET_CALL_TIMEOUT cmsg in seconds, so fix the point at which sendmsg() applies it to the call to convert to jiffies from seconds, not milliseconds.
--- net/rxrpc/sendmsg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/rxrpc/sendmsg.c +1 -1
@@ -709,7 +709,7 @@ int rxrpc_do_sendmsg(struct rxrpc_sock *rx, struct msghdr *msg, size_t len)/* Fall through */ case 1 :if (p.call.timeouts.hard >0 ) { - j =msecs_to_jiffies (p.call.timeouts.hard); + j = p.call.timeouts.hard *HZ ; now = jiffies; j += now;WRITE_ONCE (call->expect_term_by, j);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 155/191 af_packet: Dont send zero-byte data in packet_sendmsg_spkt().
In reply to Greg Kroah-HartmanFrom: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 6a341729fb31b4c5df9f74f24b4b1c98410c9b87 ]
syzkaller reported a warning below [0].
We can reproduce it by sending 0-byte data from the (AF_PACKET, SOCK_PACKET) socket via some devices whose dev->hard_header_len is 0.
struct sockaddr_pkt addr = {
.spkt_family = AF_PACKET,
.spkt_device = "tun0",
};
int fd;
fd = socket(AF_PACKET, SOCK_PACKET, 0);
sendto(fd, NULL, 0, 0, (struct sockaddr *)&addr, sizeof(addr));We have a similar fix for the (AF_PACKET, SOCK_RAW) socket as commit dc633700f00f ("net/af_packet: check len when min_header_len equals to 0").
Let's add the same test for the SOCK_PACKET socket.
[0]:skb_assert_len
WARNING: CPU: 1 PID: 19945 at include/linux/skbuff.h:2552 skb_assert_len include/linux/skbuff.h:2552 [inline] WARNING: CPU: 1 PID: 19945 at include/linux/skbuff.h:2552 __dev_queue_xmit+0x1f26/0x31d0 net/core/dev.c:4159 Modules linked in: CPU: 1 PID: 19945 Comm: syz-executor.0 Not tainted 6.3.0-rc7-02330-gca6270c12e20 #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.0-0-gd239552ce722-prebuilt.qemu.org 04/01/2014 RIP: 0010:skb_assert_len include/linux/skbuff.h:2552 [inline] RIP: 0010:__dev_queue_xmit+0x1f26/0x31d0 net/core/dev.c:4159 Code: 89 de e8 1d a2 85 fd 84 db 75 21 e8 64 a9 85 fd 48 c7 c6 80 2a 1f 86 48 c7 c7 c0 06 1f 86 c6 05 23 cf 27 04 01 e8 fa ee 56 fd <0f> 0b e8 43 a9 85 fd 0f b6 1d 0f cf 27 04 31 ff 89 de e8 e3 a1 85 RSP: 0018:ffff8880217af6e0 EFLAGS: 00010282 RAX: 0000000000000000 RBX: 0000000000000000 RCX: ffffc90001133000 RDX: 0000000000040000 RSI: ffffffff81186922 RDI: 0000000000000001 RBP: ffff8880217af8b0 R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000001 R11: 0000000000000001 R12: ffff888030045640 R13: ffff8880300456b0 R14: ffff888030045650 R15: ffff888030045718 FS: 00007fc5864da640(0000) GS:ffff88806cd00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000020005740 CR3: 000000003f856003 CR4: 0000000000770ee0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 PKRU: 55555554 Call Trace: <TASK> dev_queue_xmit include/linux/netdevice.h:3085 [inline] packet_sendmsg_spkt+0xc4b/0x1230 net/packet/af_packet.c:2066 sock_sendmsg_nosec net/socket.c:724 [inline] sock_sendmsg+0x1b4/0x200 net/socket.c:747 ____sys_sendmsg+0x331/0x970 net/socket.c:2503 ___sys_sendmsg+0x11d/0x1c0 net/socket.c:2557 __sys_sendmmsg+0x18c/0x430 net/socket.c:2643 __do_sys_sendmmsg net/socket.c:2672 [inline] __se_sys_sendmmsg net/socket.c:2669 [inline] __x64_sys_sendmmsg+0x9c/0x100 net/socket.c:2669 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3c/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x72/0xdc RIP: 0033:0x7fc58791de5d Code: ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 73 9f 1b 00 f7 d8 64 89 01 48 RSP: 002b:00007fc5864d9cc8 EFLAGS: 00000246 ORIG_RAX: 0000000000000133 RAX: ffffffffffffffda RBX: 00000000004bbf80 RCX: 00007fc58791de5d RDX: 0000000000000001 RSI: 0000000020005740 RDI: 0000000000000004 RBP: 00000000004bbf80 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 000000000000000b R14: 00007fc58797e530 R15: 0000000000000000 </TASK> ---[ end trace 0000000000000000 ]---
skb len=0 headroom=16 headlen=0 tailroom=304 mac=(16,0) net=(16,-1) trans=-1 shinfo(txflags=0 nr_frags=0 gso(size=0 type=0 segs=0)) csum(0x0 ip_summed=0 complete_sw=0 valid=0 level=0) hash(0x0 sw=0 l4=0) proto=0x0000 pkttype=0 iif=0 dev name=sit0 feat=0x00000006401d7869
sk family=17 type=10 proto=0
--- net/packet/af_packet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/packet/af_packet.c +1 -1
@@ -1955,7 +1955,7 @@ static int packet_sendmsg_spkt(struct socket *sock, struct msghdr *msg, goto retry; } -if (!dev_validate_header (dev, skb->data, len)) { +if (!dev_validate_header (dev, skb->data, len) || !skb->len) { err = -EINVAL ; goto out_unlock; }
Signature · 1 line
2.39.2