5.10.42-rc1 review
Subsystems (5)
Greg Kroah-Hartman
maintainercover 5.10.42-rc1 review
This is the start of the stable review cycle for the 5.10.42 release. There are 252 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, 02 Jun 2021 13:06:20 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.42-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.10.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.10.42-rc1
Chunfeng Yun <[email protected]>
usb: core: reduce power-on-good delay time of root hub
Chinmay Agarwal <[email protected]>
neighbour: Prevent Race condition in neighbour subsytem
Masahiro Yamada <[email protected]>
scripts/clang-tools: switch explicitly to Python 3
Johan Hovold <[email protected]>
net: hso: bail out on interrupt URB allocation failure
Greg Kroah-Hartman <[email protected]>
Revert "Revert "ALSA: usx2y: Fix potential NULL pointer dereference""
Trond Myklebust <[email protected]>
SUNRPC: More fixes for backlog congestion
Liu Jian <[email protected]>
bpftool: Add sock_release help info for cgroup attach/prog load command
Yunsheng Lin <[email protected]>
net: hns3: check the return of skb_checksum_help()
Magnus Karlsson <[email protected]>
samples/bpf: Consider frame size in tx_only of xdpsock sample
Greg Kroah-Hartman <[email protected]>
i915: fix build warning in intel_dp_get_link_status()
Stefan Chulski <[email protected]>
net: mvpp2: add buffer header handling in RX
Vlad Buslov <[email protected]>
net: zero-initialize tc skb extension on allocation
Randy Dunlap <[email protected]>
MIPS: ralink: export rt_sysc_membase for rt2880_wdt.c
Randy Dunlap <[email protected]>
MIPS: alchemy: xxs1500: add gpio-au1000.h header file
George McCollister <[email protected]>
net: hsr: fix mac_len checks
Taehee Yoo <[email protected]>
sch_dsmark: fix a NULL deref in qdisc_reset()
Stefan Roese <[email protected]>
net: ethernet: mtk_eth_soc: Fix packet statistics support for MT7628/88
kernel test robot <[email protected]>
ALSA: usb-audio: scarlett2: snd_scarlett_gen2_controls_create() can be static
Francesco Ruggeri <[email protected]>
ipv6: record frag_max_size in atomic fragments in input path
Aleksander Jan Bajkowski <[email protected]>
net: lantiq: fix memory corruption in RX ring
Dan Carpenter <[email protected]>
scsi: libsas: Use _safe() loop in sas_resume_port()
Stephen Boyd <[email protected]>
ASoC: qcom: lpass-cpu: Use optional clk APIs
Jesse Brandeburg <[email protected]>
ixgbe: fix large MTU request from VF
Jussi Maki <[email protected]>
bpf: Set mac_len in bpf_skb_change_head
Yinjun Zhang <[email protected]>
bpf, offload: Reorder offload callback 'prepare' in verifier
Dan Carpenter <[email protected]>
ASoC: cs35l33: fix an error code in probe()
Dan Carpenter <[email protected]>
staging: emxx_udc: fix loop in _nbu2ss_nuke()
Raju Rangoju <[email protected]>
cxgb4: avoid accessing registers when clearing filters
Lu Baolu <[email protected]>
iommu/vt-d: Use user privilege for RID2PASID translation
Jian Shen <[email protected]>
net: hns3: put off calling register_netdev() until client initialize complete
Jiaran Zhang <[email protected]>
net: hns3: fix incorrect resp_msg issue
Bixuan Cui <[email protected]>
iommu/virtio: Add missing MODULE_DEVICE_TABLE
David Awogbemila <[email protected]>
gve: Correct SKB queue index validation.
Catherine Sullivan <[email protected]>
gve: Upgrade memory barrier in poll routine
David Awogbemila <[email protected]>
gve: Add NULL pointer checks when freeing irqs.
David Awogbemila <[email protected]>
gve: Update mgmt_msix_idx if num_ntfy changes
Catherine Sullivan <[email protected]>
gve: Check TX QPL was actually assigned
Julian Wiedmann <[email protected]>
net/smc: remove device from smcd_dev_list after failed device_add()
Taehee Yoo <[email protected]>
mld: fix panic in mld_newpack()
Michael Chan <[email protected]>
bnxt_en: Fix context memory setup for 64K page size.
Andy Gospodarek <[email protected]>
bnxt_en: Include new P5 HV definition in VF check.
Zhen Lei <[email protected]>
net: bnx2: Fix error return code in bnx2_init_board()
Dan Carpenter <[email protected]>
net: hso: check for allocation failure in hso_create_bulk_serial_device()
Yunsheng Lin <[email protected]>
net: sched: fix tx action reschedule issue with stopped queue
Yunsheng Lin <[email protected]>
net: sched: fix tx action rescheduling issue during deactivation
Yunsheng Lin <[email protected]>
net: sched: fix packet stuck problem for lockless qdisc
Jim Ma <[email protected]>
tls splice: check SPLICE_F_NONBLOCK instead of MSG_DONTWAIT
Tao Liu <[email protected]>
openvswitch: meter: fix race when getting now_ms.
Ayush Sawal <[email protected]>
cxgb4/ch_ktls: Clear resources when pf4 device is removed
Christophe JAILLET <[email protected]>
net: mdio: octeon: Fix some double free issues
Christophe JAILLET <[email protected]>
net: mdio: thunder: Fix a double free issue in the .remove function
Dan Carpenter <[email protected]>
chelsio/chtls: unlock on error in chtls_pt_recvmsg()
Fugang Duan <[email protected]>
net: fec: fix the potential memory leak in fec_enet_init()
Richard Sanger <[email protected]>
net: packetmmap: fix only tx timestamp on request
Paolo Abeni <[email protected]>
net: really orphan skbs tied to closing sk
Andy Shevchenko <[email protected]>
spi: Assume GPIO CS active high in ACPI case
Eric Farman <[email protected]>
vfio-ccw: Check initialized flag in cp_init()
Alex Elder <[email protected]>
net: ipa: memory region array is variable size
Joakim Zhang <[email protected]>
net: stmmac: Fix MAC WoL not working if PHY does not support WoL
Richard Fitzgerald <[email protected]>
ASoC: cs42l42: Regmap must use_single_read/write
Zou Wei <[email protected]>
interconnect: qcom: Add missing MODULE_DEVICE_TABLE
Subbaraman Narayanamurthy <[email protected]>
interconnect: qcom: bcm-voter: add a missing of_node_put()
Vladimir Oltean <[email protected]>
net: dsa: fix error code getting shifted with 4 in dsa_slave_get_sset_count
Christophe JAILLET <[email protected]>
net: netcp: Fix an error message
Rikard Falkeborn <[email protected]>
linux/bits.h: fix compilation error with GENMASK
Gulam Mohamed <[email protected]>
block: fix a race between del_gendisk and BLKRRPART
Hans de Goede <[email protected]>
platform/x86: touchscreen_dmi: Add info for the Chuwi Hi10 Pro (CWI529) tablet
Christian König <[email protected]>
drm/amdgpu: stop touching sched.ready in the backend
Lang Yu <[email protected]>
drm/amd/amdgpu: fix a potential deadlock in gpu reset
xinhui pan <[email protected]>
drm/amdgpu: Fix a use-after-free
Jingwen Chen <[email protected]>
drm/amd/amdgpu: fix refcount leak
Chris Park <[email protected]>
drm/amd/display: Disconnect non-DP with no EDID
Steve French <[email protected]>
SMB3: incorrect file id in requests compounded with open
Teava Radu <[email protected]>
platform/x86: touchscreen_dmi: Add info for the Mediacom Winpad 7.0 W700 tablet
Andy Shevchenko <[email protected]>
platform/x86: intel_punit_ipc: Append MODULE_DEVICE_TABLE for ACPI
Shyam Sundar S K <[email protected]>
platform/x86: hp-wireless: add AMD's hardware id to the supported list
Josef Bacik <[email protected]>
btrfs: do not BUG_ON in link_to_fixup_dir
Filipe Manana <[email protected]>
btrfs: release path before starting transaction when cloning inline extent
Ajish Koshy <[email protected]>
scsi: pm80xx: Fix drives missing during rmmod/insmod loop
Peter Zijlstra <[email protected]>
openrisc: Define memory barrier mb
Matt Wang <[email protected]>
scsi: BusLogic: Fix 64-bit system enumeration error for Buslogic
Peter Wang <[email protected]>
scsi: ufs: ufs-mediatek: Fix power down spec violation
Boris Burkov <[email protected]>
btrfs: return whole extents in fiemap
Greg Kroah-Hartman <[email protected]>
brcmfmac: properly check for bus register errors
Greg Kroah-Hartman <[email protected]>
Revert "brcmfmac: add a check for the status of usb_register"
Tom Seewald <[email protected]>
net: liquidio: Add missing null pointer checks
Greg Kroah-Hartman <[email protected]>
Revert "net: liquidio: fix a NULL pointer dereference"
Greg Kroah-Hartman <[email protected]>
media: gspca: properly check for errors in po1030_probe()
Greg Kroah-Hartman <[email protected]>
Revert "media: gspca: Check the return value of write_bridge for timeout"
Alaa Emad <[email protected]>
media: gspca: mt9m111: Check write_bridge for timeout
Greg Kroah-Hartman <[email protected]>
Revert "media: gspca: mt9m111: Check write_bridge for timeout"
Alaa Emad <[email protected]>
media: dvb: Add check on sp8870_readreg return
Greg Kroah-Hartman <[email protected]>
Revert "media: dvb: Add check on sp8870_readreg"
Greg Kroah-Hartman <[email protected]>
ASoC: cs43130: handle errors in cs43130_probe() properly
Greg Kroah-Hartman <[email protected]>
Revert "ASoC: cs43130: fix a NULL pointer dereference"
Greg Kroah-Hartman <[email protected]>
libertas: register sysfs groups properly
Greg Kroah-Hartman <[email protected]>
Revert "libertas: add checks for the return value of sysfs_create_group"
Phillip Potter <[email protected]>
dmaengine: qcom_hidma: comment platform_driver_register call
Greg Kroah-Hartman <[email protected]>
Revert "dmaengine: qcom_hidma: Check for driver register failure"
Phillip Potter <[email protected]>
isdn: mISDN: correctly handle ph_info allocation failure in hfcsusb_ph_info
Greg Kroah-Hartman <[email protected]>
Revert "isdn: mISDN: Fix potential NULL pointer dereference of kzalloc"
Anirudh Rayabharam <[email protected]>
ath6kl: return error code in ath6kl_wmi_set_roam_lrssi_cmd()
Greg Kroah-Hartman <[email protected]>
Revert "ath6kl: return error code in ath6kl_wmi_set_roam_lrssi_cmd()"
Phillip Potter <[email protected]>
isdn: mISDNinfineon: check/cleanup ioremap failure correctly in setup_io
Greg Kroah-Hartman <[email protected]>
Revert "isdn: mISDNinfineon: fix potential NULL pointer dereference"
Greg Kroah-Hartman <[email protected]>
Revert "ALSA: usx2y: Fix potential NULL pointer dereference"
Atul Gopinathan <[email protected]>
ALSA: sb8: Add a comment note regarding an unused pointer
Greg Kroah-Hartman <[email protected]>
Revert "ALSA: gus: add a check of the status of snd_ctl_add"
Tom Seewald <[email protected]>
char: hpet: add checks after calling ioremap
Greg Kroah-Hartman <[email protected]>
Revert "char: hpet: fix a missing check of ioremap"
Du Cheng <[email protected]>
net: caif: remove BUG_ON(dev == NULL) in caif_xmit
Greg Kroah-Hartman <[email protected]>
Revert "net: caif: replace BUG_ON with recovery code"
Anirudh Rayabharam <[email protected]>
net/smc: properly handle workqueue allocation failure
Greg Kroah-Hartman <[email protected]>
Revert "net/smc: fix a NULL pointer dereference"
Anirudh Rayabharam <[email protected]>
net: fujitsu: fix potential null-ptr-deref
Greg Kroah-Hartman <[email protected]>
Revert "net: fujitsu: fix a potential NULL pointer dereference"
Atul Gopinathan <[email protected]>
serial: max310x: unregister uart driver in case of failure and abort
Greg Kroah-Hartman <[email protected]>
Revert "serial: max310x: pass return value of spi_register_driver"
Greg Kroah-Hartman <[email protected]>
Revert "ALSA: sb: fix a missing check of snd_ctl_add"
Greg Kroah-Hartman <[email protected]>
Revert "media: usb: gspca: add a missed check for goto_low_power"
Greg Kroah-Hartman <[email protected]>
Revert "crypto: cavium/nitrox - add an error message to explain the failure of pci_request_mem_regions"
Zou Wei <[email protected]>
gpio: cadence: Add missing MODULE_DEVICE_TABLE
Kai-Heng Feng <[email protected]>
platform/x86: hp_accel: Avoid invoking _INI to speed up resume
Paolo Abeni <[email protected]>
mptcp: fix data stream corruption
Paolo Abeni <[email protected]>
mptcp: drop unconditional pr_warn on bad opt
Paolo Abeni <[email protected]>
mptcp: avoid error message on infinite mapping
Hou Pu <[email protected]>
nvmet-tcp: fix inline data size comparison in nvmet_tcp_queue_response
Felix Fietkau <[email protected]>
perf jevents: Fix getting maximum number of fds
David Howells <[email protected]>
afs: Fix the nlink handling of dir-over-dir rename
Geert Uytterhoeven <[email protected]>
i2c: sh_mobile: Use new clock calculation formulas for RZ/G2E
Jean Delvare <[email protected]>
i2c: i801: Don't generate an interrupt on bus reset
Qii Wang <[email protected]>
i2c: mediatek: Disable i2c start_en and clear intr_stat brfore reset
Krzysztof Kozlowski <[email protected]>
i2c: s3c2410: fix possible NULL pointer deref on read message after write
Vladimir Oltean <[email protected]>
net: dsa: sja1105: fix VL lookup command packing for P/Q/R/S
Vladimir Oltean <[email protected]>
net: dsa: sja1105: call dsa_unregister_switch when allocating memory fails
Vladimir Oltean <[email protected]>
net: dsa: sja1105: add error handling in sja1105_setup()
Vladimir Oltean <[email protected]>
net: dsa: sja1105: error out on unsupported PHY mode
Vladimir Oltean <[email protected]>
net: dsa: sja1105: use 4095 as the private VLAN for untagged traffic
Vladimir Oltean <[email protected]>
net: dsa: sja1105: update existing VLANs from the bridge VLAN list
Dan Carpenter <[email protected]>
net: dsa: fix a crash if ->get_sset_count() fails
DENG Qingfang <[email protected]>
net: dsa: mt7530: fix VLAN traffic leaks
Roi Dayan <[email protected]>
netfilter: flowtable: Remove redundant hw refresh bit
Christophe JAILLET <[email protected]>
spi: spi-fsl-dspi: Fix a resource leak in an error handling path
Xin Long <[email protected]>
tipc: skb_linearize the head skb when reassembling msgs
Xin Long <[email protected]>
tipc: wait and exit until all work queues are done
Hoang Le <[email protected]>
Revert "net:tipc: Fix a double free in tipc_sk_mcast_rcv"
NeilBrown <[email protected]>
SUNRPC in case of backlog, hand free slots directly to waiting task
Ariel Levkovich <[email protected]>
net/mlx5: Set term table as an unmanaged flow table
Vladyslav Tarasiuk <[email protected]>
net/mlx4: Fix EEPROM dump support
Roi Dayan <[email protected]>
net/mlx5e: Fix null deref accessing lag dev
Jianbo Liu <[email protected]>
net/mlx5: Set reformat action when needed for termination rules
Dima Chumak <[email protected]>
net/mlx5e: Fix nullptr in add_vlan_push_action()
Eli Cohen <[email protected]>
{net,vdpa}/mlx5: Configure interface MAC into mpfs L2 table
Aya Levin <[email protected]>
net/mlx5e: Fix error path of updating netdev queues
Dima Chumak <[email protected]>
net/mlx5e: Fix multipath lag activation
Saeed Mahameed <[email protected]>
net/mlx5e: reset XPS on error flow if netdev isn't registered yet
Neil Armstrong <[email protected]>
drm/meson: fix shutdown crash when component not probed
Zhang Xiaoxu <[email protected]>
NFSv4: Fix v4.0/v4.1 SEEK_DATA return -ENOTSUPP when set NFS_V4_2 config
Trond Myklebust <[email protected]>
NFS: Don't corrupt the value of pg_bytes_written in nfs_do_recoalesce()
Trond Myklebust <[email protected]>
NFS: Fix an Oopsable condition in __nfs_pageio_add_request()
Dan Carpenter <[email protected]>
NFS: fix an incorrect limit in filelayout_decode_layout()
zhouchuangao <[email protected]>
fs/nfs: Use fatal_signal_pending instead of signal_pending
Thadeu Lima de Souza Cascardo <[email protected]>
Bluetooth: cmtp: fix file refcount when cmtp_attach_device fails
Pavel Skripkin <[email protected]>
net: usb: fix memory leak in smsc75xx_bind
Bjorn Andersson <[email protected]>
usb: typec: mux: Fix matching with typec_altmode_desc
Yoshihiro Shimoda <[email protected]>
usb: gadget: udc: renesas_usb3: Fix a race in usb3_start_pipen()
Thinh Nguyen <[email protected]>
usb: dwc3: gadget: Properly track pending and queued SG
Srinivas Pandruvada <[email protected]>
thermal/drivers/intel: Initialize RW trip to THERMAL_TEMP_INVALID
Zolton Jheng <[email protected]>
USB: serial: pl2303: add device id for ADLINK ND-6530 GC
Dominik Andreas Schorpp <[email protected]>
USB: serial: ftdi_sio: add IDs for IDS GmbH Products
Daniele Palmas <[email protected]>
USB: serial: option: add Telit LE910-S1 compositions 0x7010, 0x7011
Sean MacLennan <[email protected]>
USB: serial: ti_usb_3410_5052: add startech.com device id
Zheyu Ma <[email protected]>
serial: rp2: use 'request_firmware' instead of 'request_firmware_nowait'
Geert Uytterhoeven <[email protected]>
serial: sh-sci: Fix off-by-one error in FIFO threshold register setting
Colin Ian King <[email protected]>
serial: tegra: Fix a mask operation that is always true
Rafael J. Wysocki <[email protected]>
drivers: base: Fix device link removal
Alan Stern <[email protected]>
USB: usbfs: Don't WARN about excessively large memory allocations
Zhu Lingshan <[email protected]>
Revert "irqbypass: do not start cons/prod when failed connect"
Johan Hovold <[email protected]>
USB: trancevibrator: fix control-request direction
Christian Gmeiner <[email protected]>
serial: 8250_pci: handle FL_NOIRQ board flag
Randy Wright <[email protected]>
serial: 8250_pci: Add support for new HPE serial device
Maximilian Luz <[email protected]>
serial: 8250_dw: Add device HID for new AMD UART controller
Andrew Jeffery <[email protected]>
serial: 8250: Add UART_BUG_TXRACE workaround for Aspeed VUART
Alexandru Ardelean <[email protected]>
iio: adc: ad7192: handle regulator voltage error first
Jonathan Cameron <[email protected]>
iio: adc: ad7192: Avoid disabling a clock that was never enabled.
YueHaibing <[email protected]>
iio: adc: ad7793: Add missing error code in ad7793_setup()
Jonathan Cameron <[email protected]>
iio: adc: ad7923: Fix undersized rx buffer.
Jonathan Cameron <[email protected]>
iio: adc: ad7124: Fix potential overflow due to non sequential channel numbers
Jonathan Cameron <[email protected]>
iio: adc: ad7124: Fix missbalanced regulator enable / disable on error.
Jonathan Cameron <[email protected]>
iio: adc: ad7768-1: Fix too small buffer passed to iio_push_to_buffers_with_timestamp()
Andy Shevchenko <[email protected]>
iio: dac: ad5770r: Put fwnode in error case during ->probe()
Rui Miguel Silva <[email protected]>
iio: gyro: fxas21002c: balance runtime power in error path
Lucas Stankus <[email protected]>
staging: iio: cdc: ad7746: avoid overwrite of num_channels
Alexander Usyskin <[email protected]>
mei: request autosuspend after sending rx flow control
Marc Zyngier <[email protected]>
KVM: arm64: Prevent mixed-width VM creation
Wanpeng Li <[email protected]>
KVM: X86: Fix vCPU preempted state from guest's point of view
Mathias Nyman <[email protected]>
thunderbolt: dma_port: Fix NVM read buffer bounds and offset issue
Mathias Nyman <[email protected]>
thunderbolt: usb4: Fix NVM read buffer bounds and offset issue
Dongliang Mu <[email protected]>
misc/uss720: fix memory leak in uss720_probe
Ondrej Mosnacek <[email protected]>
serial: core: fix suspicious security_locked_down() call
Sargun Dhillon <[email protected]>
seccomp: Refactor notification handler to prepare for new semantics
Sargun Dhillon <[email protected]>
Documentation: seccomp: Fix user notification documentation
Greg Kroah-Hartman <[email protected]>
kgdb: fix gcc-11 warnings harder
Michael Ellerman <[email protected]>
selftests/gpio: Fix build when source tree is read only
Michael Ellerman <[email protected]>
selftests/gpio: Move include of lib.mk up
Michael Ellerman <[email protected]>
selftests/gpio: Use TEST_GEN_PROGS_EXTENDED
James Zhu <[email protected]>
drm/amdgpu/jpeg2.0: add cancel_delayed_work_sync before power gate
James Zhu <[email protected]>
drm/amdgpu/vcn2.5: add cancel_delayed_work_sync before power gate
James Zhu <[email protected]>
drm/amdgpu/vcn2.0: add cancel_delayed_work_sync before power gate
Kevin Wang <[email protected]>
drm/amdkfd: correct sienna_cichlid SDMA RLC register offset error
James Zhu <[email protected]>
drm/amdgpu/vcn1: add cancel_delayed_work_sync before power gate
Evan Quan <[email protected]>
drm/amd/pm: correct MGpuFanBoost setting
Mikulas Patocka <[email protected]>
dm snapshot: properly fix a crash when an origin has no snapshots
Sriram R <[email protected]>
ath11k: Clear the fragment cache during key install
Sriram R <[email protected]>
ath10k: Validate first subframe of A-MSDU before processing the list
Wen Gong <[email protected]>
ath10k: Fix TKIP Michael MIC verification for PCIe
Wen Gong <[email protected]>
ath10k: drop MPDU which has discard flag set by firmware for SDIO
Wen Gong <[email protected]>
ath10k: drop fragments with multicast DA for SDIO
Wen Gong <[email protected]>
ath10k: drop fragments with multicast DA for PCIe
Wen Gong <[email protected]>
ath10k: add CCMP PN replay protection for fragmented frames for PCIe
Wen Gong <[email protected]>
mac80211: extend protection against mixed key and fragment cache attacks
Johannes Berg <[email protected]>
mac80211: do not accept/forward invalid EAPOL frames
Johannes Berg <[email protected]>
mac80211: prevent attacks on TKIP/WEP as well
Johannes Berg <[email protected]>
mac80211: check defrag PN against current frame
Johannes Berg <[email protected]>
mac80211: add fragment cache to sta_info
Johannes Berg <[email protected]>
mac80211: drop A-MSDUs on old ciphers
Mathy Vanhoef <[email protected]>
cfg80211: mitigate A-MSDU aggregation attacks
Mathy Vanhoef <[email protected]>
mac80211: properly handle A-MSDUs that start with an RFC 1042 header
Mathy Vanhoef <[email protected]>
mac80211: prevent mixed key and fragment cache attacks
Mathy Vanhoef <[email protected]>
mac80211: assure all fragments are encrypted
Stefano Brivio <[email protected]>
netfilter: nft_set_pipapo_avx2: Add irq_fpu_usable() check, fallback to non-AVX2 version
Davide Caratti <[email protected]>
net/sched: fq_pie: fix OOB access in the traffic path
Davide Caratti <[email protected]>
net/sched: fq_pie: re-factor fix for fq_pie endless loop
Johan Hovold <[email protected]>
net: hso: fix control-request directions
Kees Cook <[email protected]>
proc: Check /proc/$pid/attr/ writes against file opener
Adrian Hunter <[email protected]>
perf scripts python: exported-sql-viewer.py: Fix warning display
Adrian Hunter <[email protected]>
perf scripts python: exported-sql-viewer.py: Fix Array TypeError
Adrian Hunter <[email protected]>
perf scripts python: exported-sql-viewer.py: Fix copy to clipboard from Top Calls by elapsed Time report
Adrian Hunter <[email protected]>
perf intel-pt: Fix transaction abort handling
Adrian Hunter <[email protected]>
perf intel-pt: Fix sample instruction bytes
Rolf Eike Beer <[email protected]>
iommu/vt-d: Fix sysfs leak in alloc_iommu()
Anna Schumaker <[email protected]>
NFSv4: Fix a NULL pointer dereference in pnfs_mark_matching_lsegs_return()
Aurelien Aptel <[email protected]>
cifs: set server->cipher_type to AES-128-CCM for SMB3.0
Geoffrey D. Bennett <[email protected]>
ALSA: usb-audio: scarlett2: Improve driver startup messages
Geoffrey D. Bennett <[email protected]>
ALSA: usb-audio: scarlett2: Fix device hang with ehci-pci
Jeremy Szu <[email protected]>
ALSA: hda/realtek: fix mute/micmute LEDs and speaker for HP Zbook Fury 17 G8
Jeremy Szu <[email protected]>
ALSA: hda/realtek: fix mute/micmute LEDs and speaker for HP Zbook Fury 15 G8
Jeremy Szu <[email protected]>
ALSA: hda/realtek: fix mute/micmute LEDs and speaker for HP Zbook G8
Jeremy Szu <[email protected]>
ALSA: hda/realtek: fix mute/micmute LEDs for HP 855 G8
Peter Ujfalusi <[email protected]>
ALSA: hda/realtek: Chain in pop reduction fixup for ThinkStation P340
Hui Wang <[email protected]>
ALSA: hda/realtek: Headphone volume is controlled by Front mixer
Hui Wang <[email protected]>
ALSA: hda/realtek: the bass speaker can't output sound on Yoga 9i
-------------
Diffstat:
Documentation/userspace-api/seccomp_filter.rst | 16 +- Makefile | 4 +- arch/arm64/include/asm/kvm_emulate.h | 5 + arch/arm64/kvm/reset.c | 28 ++- arch/mips/alchemy/board-xxs1500.c | 1 + arch/mips/ralink/of.c | 2 + arch/openrisc/include/asm/barrier.h | 9 + arch/x86/kvm/x86.c | 2 + drivers/acpi/acpi_apd.c | 1 + drivers/base/core.c | 37 ++-- drivers/char/hpet.c | 2 + drivers/crypto/cavium/nitrox/nitrox_main.c | 1 - drivers/dma/qcom/hidma_mgmt.c | 17 +- drivers/gpio/gpio-cadence.c | 1 + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 1 + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 2 + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 2 - drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 2 - drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 5 - drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 6 +- drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 2 + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 2 + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 8 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 18 ++ drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 9 + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 10 + drivers/gpu/drm/i915/display/intel_dp.c | 2 +- drivers/gpu/drm/meson/meson_drv.c | 9 +- drivers/i2c/busses/i2c-i801.c | 6 +- drivers/i2c/busses/i2c-mt65xx.c | 5 + drivers/i2c/busses/i2c-s3c2410.c | 3 + drivers/i2c/busses/i2c-sh_mobile.c | 2 +- drivers/iio/adc/ad7124.c | 36 ++-- drivers/iio/adc/ad7192.c | 19 +- drivers/iio/adc/ad7768-1.c | 8 +- drivers/iio/adc/ad7793.c | 1 + drivers/iio/adc/ad7923.c | 4 +- drivers/iio/dac/ad5770r.c | 16 +- drivers/iio/gyro/fxas21002c_core.c | 2 + drivers/interconnect/qcom/bcm-voter.c | 4 +- drivers/iommu/intel/dmar.c | 4 +- drivers/iommu/intel/iommu.c | 7 +- drivers/iommu/intel/pasid.c | 3 +- drivers/iommu/virtio-iommu.c | 1 + drivers/isdn/hardware/mISDN/hfcsusb.c | 17 +- drivers/isdn/hardware/mISDN/mISDNinfineon.c | 21 ++- drivers/md/dm-snap.c | 2 +- drivers/media/dvb-frontends/sp8870.c | 2 +- drivers/media/usb/gspca/cpia1.c | 6 +- drivers/media/usb/gspca/m5602/m5602_mt9m111.c | 16 +- drivers/media/usb/gspca/m5602/m5602_po1030.c | 14 +- drivers/misc/kgdbts.c | 3 +- drivers/misc/lis3lv02d/lis3lv02d.h | 1 + drivers/misc/mei/interrupt.c | 3 + drivers/net/caif/caif_serial.c | 3 - drivers/net/dsa/mt7530.c | 8 - drivers/net/dsa/sja1105/sja1105_dynamic_config.c | 23 ++- drivers/net/dsa/sja1105/sja1105_main.c | 75 +++++--- drivers/net/ethernet/broadcom/bnx2.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 12 +- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 10 + drivers/net/ethernet/cavium/liquidio/lio_main.c | 27 ++- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 27 ++- drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 2 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +- .../chelsio/inline_crypto/ch_ktls/chcr_ktls.c | 80 +++++++- .../chelsio/inline_crypto/ch_ktls/chcr_ktls.h | 2 + .../chelsio/inline_crypto/chtls/chtls_io.c | 6 +- drivers/net/ethernet/freescale/fec_main.c | 11 +- drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 4 +- drivers/net/ethernet/google/gve/gve_main.c | 21 ++- drivers/net/ethernet/google/gve/gve_tx.c | 8 +- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 26 ++- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 4 +- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 16 +- drivers/net/ethernet/lantiq_xrx200.c | 14 +- drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 22 +++ drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 54 +++++- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 67 ++++--- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 24 ++- drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 4 +- drivers/net/ethernet/mellanox/mlx4/port.c | 107 ++++++++++- .../net/ethernet/mellanox/mlx5/core/en/rep/bond.c | 2 + .../net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 9 +- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 10 +- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 1 + .../mellanox/mlx5/core/eswitch_offloads_termtbl.c | 38 ++-- drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c | 6 + drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c | 3 + drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.h | 5 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 9 +- drivers/net/ethernet/ti/netcp_core.c | 4 +- drivers/net/ipa/ipa.h | 2 + drivers/net/ipa/ipa_mem.c | 3 +- drivers/net/mdio/mdio-octeon.c | 2 - drivers/net/mdio/mdio-thunder.c | 1 - drivers/net/usb/hso.c | 45 +++-- drivers/net/usb/smsc75xx.c | 8 +- drivers/net/wireless/ath/ath10k/htt.h | 1 + drivers/net/wireless/ath/ath10k/htt_rx.c | 201 ++++++++++++++++++++- drivers/net/wireless/ath/ath10k/rx_desc.h | 14 +- drivers/net/wireless/ath/ath11k/dp_rx.c | 18 ++ drivers/net/wireless/ath/ath11k/dp_rx.h | 1 + drivers/net/wireless/ath/ath11k/mac.c | 6 + drivers/net/wireless/ath/ath6kl/debug.c | 5 +- .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 8 +- .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 19 +- .../wireless/broadcom/brcm80211/brcmfmac/core.c | 42 ++--- .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 9 +- .../wireless/broadcom/brcm80211/brcmfmac/pcie.h | 5 - .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 8 +- drivers/net/wireless/marvell/libertas/mesh.c | 33 +--- drivers/nvme/target/tcp.c | 2 +- drivers/platform/x86/hp-wireless.c | 2 + drivers/platform/x86/hp_accel.c | 22 ++- drivers/platform/x86/intel_punit_ipc.c | 1 + drivers/platform/x86/touchscreen_dmi.c | 43 +++++ drivers/s390/cio/vfio_ccw_cp.c | 4 + drivers/scsi/BusLogic.c | 6 +- drivers/scsi/BusLogic.h | 2 +- drivers/scsi/libsas/sas_port.c | 4 +- drivers/scsi/pm8001/pm8001_hwi.c | 10 +- drivers/scsi/pm8001/pm8001_init.c | 2 +- drivers/scsi/pm8001/pm8001_sas.c | 7 +- drivers/scsi/pm8001/pm80xx_hwi.c | 12 +- drivers/scsi/ufs/ufs-mediatek.c | 4 + drivers/spi/spi-fsl-dspi.c | 4 +- drivers/spi/spi.c | 23 ++- drivers/staging/emxx_udc/emxx_udc.c | 4 +- drivers/staging/iio/cdc/ad7746.c | 1 - .../intel/int340x_thermal/int340x_thermal_zone.c | 4 + drivers/thermal/intel/x86_pkg_temp_thermal.c | 2 +- drivers/thunderbolt/dma_port.c | 11 +- drivers/thunderbolt/usb4.c | 9 +- drivers/tty/serial/8250/8250.h | 1 + drivers/tty/serial/8250/8250_aspeed_vuart.c | 1 + drivers/tty/serial/8250/8250_dw.c | 1 + drivers/tty/serial/8250/8250_pci.c | 47 +++-- drivers/tty/serial/8250/8250_port.c | 12 ++ drivers/tty/serial/max310x.c | 2 + drivers/tty/serial/rp2.c | 52 ++---- drivers/tty/serial/serial-tegra.c | 2 +- drivers/tty/serial/serial_core.c | 8 +- drivers/tty/serial/sh-sci.c | 4 +- drivers/usb/core/devio.c | 11 +- drivers/usb/core/hub.h | 6 +- drivers/usb/dwc3/gadget.c | 13 +- drivers/usb/gadget/udc/renesas_usb3.c | 5 +- drivers/usb/misc/trancevibrator.c | 4 +- drivers/usb/misc/uss720.c | 1 + drivers/usb/serial/ftdi_sio.c | 3 + drivers/usb/serial/ftdi_sio_ids.h | 7 + drivers/usb/serial/option.c | 4 + drivers/usb/serial/pl2303.c | 1 + drivers/usb/serial/pl2303.h | 1 + drivers/usb/serial/ti_usb_3410_5052.c | 3 + drivers/usb/typec/mux.c | 7 +- drivers/vdpa/mlx5/net/mlx5_vnet.c | 19 +- fs/afs/dir.c | 4 +- fs/block_dev.c | 3 + fs/btrfs/extent_io.c | 7 +- fs/btrfs/reflink.c | 5 + fs/btrfs/tree-log.c | 2 - fs/cifs/smb2pdu.c | 13 +- fs/nfs/filelayout/filelayout.c | 2 +- fs/nfs/nfs4file.c | 2 +- fs/nfs/nfs4proc.c | 4 +- fs/nfs/pagelist.c | 21 +-- fs/nfs/pnfs.c | 15 +- fs/proc/base.c | 4 + include/linux/bits.h | 2 +- include/linux/const.h | 8 + include/linux/device.h | 6 +- include/linux/minmax.h | 10 +- include/linux/mlx5/mpfs.h | 18 ++ include/linux/sunrpc/xprt.h | 2 + include/net/cfg80211.h | 4 +- include/net/netfilter/nf_flow_table.h | 1 - include/net/pkt_cls.h | 11 ++ include/net/pkt_sched.h | 7 +- include/net/sch_generic.h | 35 +++- include/net/sock.h | 4 +- kernel/bpf/verifier.c | 12 +- kernel/seccomp.c | 30 +-- net/bluetooth/cmtp/core.c | 5 + net/core/dev.c | 29 ++- net/core/filter.c | 1 + net/core/neighbour.c | 4 + net/core/sock.c | 8 +- net/dsa/master.c | 5 +- net/dsa/slave.c | 12 +- net/hsr/hsr_device.c | 2 + net/hsr/hsr_forward.c | 30 ++- net/hsr/hsr_forward.h | 8 +- net/hsr/hsr_main.h | 4 +- net/hsr/hsr_slave.c | 11 +- net/ipv6/mcast.c | 3 - net/ipv6/reassembly.c | 4 +- net/mac80211/ieee80211_i.h | 36 ++-- net/mac80211/iface.c | 11 +- net/mac80211/key.c | 7 + net/mac80211/key.h | 2 + net/mac80211/rx.c | 150 +++++++++++---- net/mac80211/sta_info.c | 6 +- net/mac80211/sta_info.h | 33 +++- net/mac80211/wpa.c | 13 +- net/mptcp/options.c | 1 - net/mptcp/protocol.c | 6 + net/mptcp/subflow.c | 1 - net/netfilter/nf_flow_table_core.c | 3 +- net/netfilter/nf_flow_table_offload.c | 7 +- net/netfilter/nft_set_pipapo.c | 4 +- net/netfilter/nft_set_pipapo.h | 2 + net/netfilter/nft_set_pipapo_avx2.c | 3 + net/openvswitch/meter.c | 8 + net/packet/af_packet.c | 10 +- net/sched/cls_api.c | 2 +- net/sched/sch_dsmark.c | 3 +- net/sched/sch_fq_pie.c | 19 +- net/sched/sch_generic.c | 50 ++++- net/smc/smc_ism.c | 26 ++- net/sunrpc/clnt.c | 7 - net/sunrpc/xprt.c | 40 +++- net/sunrpc/xprtrdma/transport.c | 12 +- net/sunrpc/xprtrdma/verbs.c | 18 +- net/sunrpc/xprtrdma/xprt_rdma.h | 1 + net/tipc/core.c | 2 + net/tipc/core.h | 2 + net/tipc/msg.c | 9 +- net/tipc/socket.c | 5 +- net/tipc/udp_media.c | 2 + net/tls/tls_sw.c | 11 +- net/wireless/util.c | 7 +- samples/bpf/xdpsock_user.c | 2 +- scripts/clang-tools/gen_compile_commands.py | 2 +- scripts/clang-tools/run-clang-tools.py | 2 +- sound/isa/gus/gus_main.c | 13 +- sound/isa/sb/sb16_main.c | 10 +- sound/isa/sb/sb8.c | 6 +- sound/pci/hda/patch_realtek.c | 46 ++++- sound/soc/codecs/cs35l33.c | 1 + sound/soc/codecs/cs42l42.c | 3 + sound/soc/codecs/cs43130.c | 28 ++- sound/soc/qcom/lpass-cpu.c | 12 +- sound/usb/mixer_quirks.c | 2 +- sound/usb/mixer_scarlett_gen2.c | 81 ++++++--- sound/usb/mixer_scarlett_gen2.h | 2 +- tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 4 +- tools/bpf/bpftool/Documentation/bpftool-prog.rst | 2 +- tools/bpf/bpftool/bash-completion/bpftool | 6 +- tools/bpf/bpftool/cgroup.c | 3 +- tools/bpf/bpftool/prog.c | 2 +- tools/include/linux/bits.h | 2 +- tools/include/linux/const.h | 8 + tools/perf/pmu-events/jevents.c | 2 +- tools/perf/scripts/python/exported-sql-viewer.py | 12 +- .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 6 +- tools/perf/util/intel-pt.c | 5 +- tools/testing/selftests/gpio/Makefile | 24 +-- .../tc-testing/tc-tests/qdiscs/fq_pie.json | 8 +- virt/lib/irqbypass.c | 16 +- 266 files changed, 2250 insertions(+), 939 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/252 ALSA: hda/realtek: the bass speaker cant output sound on Yoga 9i
From: Hui Wang <[email protected]>
commit 9ebaef0540a981093bce5df15af32354d32391d9 upstream.
The Lenovo Yoga 9i has bass speaker, but the bass speaker can't work, that is because there is an i2s amplifier on that speaker, need to run ideapad_s740_coef() to initialize the amplifier.
And also needs to apply ALC285_FIXUP_THINKPAD_HEADSET_JACK to rename the speaker's mixer control name, otherwise the PA can't handle them.
--- sound/pci/hda/patch_realtek.c | 9 +++++++++ 1 file changed, 9 insertions(+)
sound/pci/hda/patch_realtek.c +9 -0
@@ -6535,6 +6535,7 @@ enum {ALC295_FIXUP_ASUS_DACS ,ALC295_FIXUP_HP_OMEN ,ALC285_FIXUP_HP_SPECTRE_X360 , + ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP, }; static const struct hda_fixup alc269_fixups[] = {
@@ -8095,6 +8096,12 @@ static const struct hda_fixup alc269_fix .chained = true, .chain_id = ALC285_FIXUP_SPEAKER2_TO_DAC1, }, + [ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc285_fixup_ideapad_s740_coef, + .chained = true, + .chain_id = ALC285_FIXUP_THINKPAD_HEADSET_JACK, + }, }; static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -8462,6 +8469,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x17aa ,0x3178 ,"ThinkCentre Station" ,ALC283_FIXUP_HEADSET_MIC ),SND_PCI_QUIRK (0x17aa ,0x3818 ,"Lenovo C940" ,ALC298_FIXUP_LENOVO_SPK_VOLUME ),SND_PCI_QUIRK (0x17aa ,0x3827 ,"Ideapad S740" ,ALC285_FIXUP_IDEAPAD_S740_COEF ), +SND_PCI_QUIRK (0x17aa ,0x3843 ,"Yoga 9i" ,ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP ),SND_PCI_QUIRK (0x17aa ,0x3902 ,"Lenovo E50-80" ,ALC269_FIXUP_DMIC_THINKPAD_ACPI ),SND_PCI_QUIRK (0x17aa ,0x3977 ,"IdeaPad S210" ,ALC283_FIXUP_INT_MIC ), SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo B50-70", ALC269_FIXUP_DMIC_THINKPAD_ACPI),
@@ -8677,6 +8685,7 @@ static const struct hda_model_fixup alc2 {.id = ALC245_FIXUP_HP_X360_AMP, .name = "alc245-hp-x360-amp"}, {.id = ALC295_FIXUP_HP_OMEN, .name = "alc295-hp-omen"}, {.id = ALC285_FIXUP_HP_SPECTRE_X360, .name = "alc285-hp-spectre-x360"}, + {.id = ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP, .name = "alc287-ideapad-bass-spk-amp"}, {} };#define ALC225_STANDARD_PINS \
Greg Kroah-Hartman
maintainerPATCH 2/252 ALSA: hda/realtek: Headphone volume is controlled by Front mixer
In reply to Greg Kroah-HartmanFrom: Hui Wang <[email protected]>
commit 119b75c150773425a89033215eab4d15d4198f8b upstream.
On some ASUS and MSI machines, the audio codec is alc1220 and the Headphone is connected to audio mixer 0xf and DAC 0x5, in theory the Headphone volume is controlled by DAC 0x5 (Heapdhone Playback Volume), but somehow it is controlled by DAC 0x2 (Front Playback Volume), maybe this is a defect on the codec alc1220.
Because of this issue, the PA couldn't switch the headphone and Lineout correctly, If we apply the quirk CLEVO_P950 to those machines, the Lineout and Headphone will share the audio mixer 0xc and DAC 0x2, and generate Headphone+LO mixer, then PA could handle them when switching between them.
--- sound/pci/hda/patch_realtek.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
sound/pci/hda/patch_realtek.c +23 -0
@@ -2603,6 +2603,28 @@ static const struct hda_model_fixup alc8 {} }; +static const struct snd_hda_pin_quirk alc882_pin_fixup_tbl[] = { +SND_HDA_PIN_QUIRK (0x10ec1220 ,0x1043 ,"ASUS" ,ALC1220_FIXUP_CLEVO_P950 , + {0x14, 0x01014010}, + {0x15, 0x01011012}, + {0x16, 0x01016011}, + {0x18, 0x01a19040}, + {0x19, 0x02a19050}, + {0x1a, 0x0181304f}, + {0x1b, 0x0221401f}, + {0x1e, 0x01456130}), +SND_HDA_PIN_QUIRK (0x10ec1220 ,0x1462 ,"MS-7C35" ,ALC1220_FIXUP_CLEVO_P950 , + {0x14, 0x01015010}, + {0x15, 0x01011012}, + {0x16, 0x01011011}, + {0x18, 0x01a11040}, + {0x19, 0x02a19050}, + {0x1a, 0x0181104f}, + {0x1b, 0x0221401f}, + {0x1e, 0x01451130}), + {} +}; +/* * BIOS auto configuration */
@@ -2644,6 +2666,7 @@ static int patch_alc882(struct hda_codecsnd_hda_pick_fixup (codec, alc882_fixup_models, alc882_fixup_tbl, alc882_fixups); +snd_hda_pick_pin_fixup (codec, alc882_pin_fixup_tbl, alc882_fixups, true);snd_hda_apply_fixup (codec,HDA_FIXUP_ACT_PRE_PROBE );alc_auto_parse_customize_define (codec);
Greg Kroah-Hartman
maintainerPATCH 3/252 ALSA: hda/realtek: Chain in pop reduction fixup for ThinkStation P340
In reply to Greg Kroah-HartmanFrom: Peter Ujfalusi <[email protected]>
commit 29c8f40b54a45dd23971e2bc395697731bcffbe1 upstream.
Lenovo ThinkStation P340 uses ALC623 codec (SSID 17aa:1048) and it produces bug plock/pop noise over line out (green jack on the back) which can be fixed by applying ALC269_FIXUP_NO_SHUTUP tot he machine.
Convert the existing entry for the same SSID to chain to apply this fixup as well.
--- sound/pci/hda/patch_realtek.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
sound/pci/hda/patch_realtek.c +9 -1
@@ -6559,6 +6559,7 @@ enum {ALC295_FIXUP_HP_OMEN ,ALC285_FIXUP_HP_SPECTRE_X360 ,ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP , + ALC623_FIXUP_LENOVO_THINKSTATION_P340, }; static const struct hda_fixup alc269_fixups[] = {
@@ -8125,6 +8126,12 @@ static const struct hda_fixup alc269_fix .chained = true, .chain_id = ALC285_FIXUP_THINKPAD_HEADSET_JACK, }, + [ALC623_FIXUP_LENOVO_THINKSTATION_P340] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc_fixup_no_shutup, + .chained = true, + .chain_id = ALC283_FIXUP_HEADSET_MIC, + }, }; static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -8442,7 +8449,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1558 ,0xc019 ,"Clevo NH77D[BE]Q" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0xc022 ,"Clevo NH77[DC][QW]" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x17aa ,0x1036 ,"Lenovo P520" ,ALC233_FIXUP_LENOVO_MULTI_CODECS ), -SND_PCI_QUIRK (0x17aa ,0x1048 ,"ThinkCentre Station" ,ALC283_FIXUP_HEADSET_MIC ), +SND_PCI_QUIRK (0x17aa ,0x1048 ,"ThinkCentre Station" ,ALC623_FIXUP_LENOVO_THINKSTATION_P340 ),SND_PCI_QUIRK (0x17aa ,0x20f2 ,"Thinkpad SL410/510" ,ALC269_FIXUP_SKU_IGNORE ),SND_PCI_QUIRK (0x17aa ,0x215e ,"Thinkpad L512" ,ALC269_FIXUP_SKU_IGNORE ), SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE),
@@ -8709,6 +8716,7 @@ static const struct hda_model_fixup alc2 {.id = ALC295_FIXUP_HP_OMEN, .name = "alc295-hp-omen"}, {.id = ALC285_FIXUP_HP_SPECTRE_X360, .name = "alc285-hp-spectre-x360"}, {.id = ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP, .name = "alc287-ideapad-bass-spk-amp"}, + {.id = ALC623_FIXUP_LENOVO_THINKSTATION_P340, .name = "alc623-lenovo-thinkstation-p340"}, {} };#define ALC225_STANDARD_PINS \
Greg Kroah-Hartman
maintainerPATCH 4/252 ALSA: hda/realtek: fix mute/micmute LEDs for HP 855 G8
In reply to Greg Kroah-HartmanFrom: Jeremy Szu <[email protected]>
commit 0e68c4b11f1e66d211ad242007e9f1076a6b7709 upstream.
The HP EliteBook 855 G8 Notebook PC is using ALC285 codec which needs ALC285_FIXUP_HP_MUTE_LED fixup to make it works. After applying the fixup, the mute/micmute LEDs work good.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -8314,6 +8314,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x103c ,0x87f7 ,"HP Spectre x360 14" ,ALC245_FIXUP_HP_X360_AMP ),SND_PCI_QUIRK (0x103c ,0x8846 ,"HP EliteBook 850 G8 Notebook PC" ,ALC285_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x884c ,"HP EliteBook 840 G8 Notebook PC" ,ALC285_FIXUP_HP_GPIO_LED ), +SND_PCI_QUIRK (0x103c ,0x8896 ,"HP EliteBook 855 G8 Notebook PC" ,ALC285_FIXUP_HP_MUTE_LED ),SND_PCI_QUIRK (0x1043 ,0x103e ,"ASUS X540SA" ,ALC256_FIXUP_ASUS_MIC ),SND_PCI_QUIRK (0x1043 ,0x103f ,"ASUS TX300" ,ALC282_FIXUP_ASUS_TX300 ), SND_PCI_QUIRK(0x1043, 0x106d, "Asus K53BE", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
Greg Kroah-Hartman
maintainerPATCH 5/252 ALSA: hda/realtek: fix mute/micmute LEDs and speaker for HP Zbook G8
In reply to Greg Kroah-HartmanFrom: Jeremy Szu <[email protected]>
commit bbe183e07817a46cf8d3d7fc88093df81d23a957 upstream.
The HP ZBook Studio 15.6 Inch G8 is using ALC285 codec which is using 0x04 to control mute LED and 0x01 to control micmute LED. In the other hand, there is no output from right channel of speaker. Therefore, add a quirk to make it works.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -8314,6 +8314,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x103c ,0x87f7 ,"HP Spectre x360 14" ,ALC245_FIXUP_HP_X360_AMP ),SND_PCI_QUIRK (0x103c ,0x8846 ,"HP EliteBook 850 G8 Notebook PC" ,ALC285_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x884c ,"HP EliteBook 840 G8 Notebook PC" ,ALC285_FIXUP_HP_GPIO_LED ), +SND_PCI_QUIRK (0x103c ,0x8873 ,"HP ZBook Studio 15.6 Inch G8 Mobile Workstation PC" ,ALC285_FIXUP_HP_GPIO_AMP_INIT ),SND_PCI_QUIRK (0x103c ,0x8896 ,"HP EliteBook 855 G8 Notebook PC" ,ALC285_FIXUP_HP_MUTE_LED ),SND_PCI_QUIRK (0x1043 ,0x103e ,"ASUS X540SA" ,ALC256_FIXUP_ASUS_MIC ), SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300),
Greg Kroah-Hartman
maintainerPATCH 6/252 ALSA: hda/realtek: fix mute/micmute LEDs and speaker for HP Zbook Fury 15 G8
In reply to Greg Kroah-HartmanFrom: Jeremy Szu <[email protected]>
commit e650c1a959da49f2b873cb56564b825882c22e7a upstream.
The HP ZBook Fury 15.6 Inch G8 is using ALC285 codec which is using 0x04 to control mute LED and 0x01 to control micmute LED. In the other hand, there is no output from right channel of speaker. Therefore, add a quirk to make it works.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -8314,6 +8314,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x103c ,0x87f7 ,"HP Spectre x360 14" ,ALC245_FIXUP_HP_X360_AMP ),SND_PCI_QUIRK (0x103c ,0x8846 ,"HP EliteBook 850 G8 Notebook PC" ,ALC285_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x884c ,"HP EliteBook 840 G8 Notebook PC" ,ALC285_FIXUP_HP_GPIO_LED ), +SND_PCI_QUIRK (0x103c ,0x8870 ,"HP ZBook Fury 15.6 Inch G8 Mobile Workstation PC" ,ALC285_FIXUP_HP_GPIO_AMP_INIT ),SND_PCI_QUIRK (0x103c ,0x8873 ,"HP ZBook Studio 15.6 Inch G8 Mobile Workstation PC" ,ALC285_FIXUP_HP_GPIO_AMP_INIT ),SND_PCI_QUIRK (0x103c ,0x8896 ,"HP EliteBook 855 G8 Notebook PC" ,ALC285_FIXUP_HP_MUTE_LED ), SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC),
Greg Kroah-Hartman
maintainerPATCH 7/252 ALSA: hda/realtek: fix mute/micmute LEDs and speaker for HP Zbook Fury 17 G8
In reply to Greg Kroah-HartmanFrom: Jeremy Szu <[email protected]>
commit 50dbfae972cbe0e3c631e73c7c58cbc48bfc6a49 upstream.
The HP ZBook Studio 17.3 Inch G8 is using ALC285 codec which is using 0x04 to control mute LED and 0x01 to control micmute LED. In the other hand, there is no output from right channel of speaker. Therefore, add a quirk to make it works.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -8314,6 +8314,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x103c ,0x87f7 ,"HP Spectre x360 14" ,ALC245_FIXUP_HP_X360_AMP ),SND_PCI_QUIRK (0x103c ,0x8846 ,"HP EliteBook 850 G8 Notebook PC" ,ALC285_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x884c ,"HP EliteBook 840 G8 Notebook PC" ,ALC285_FIXUP_HP_GPIO_LED ), +SND_PCI_QUIRK (0x103c ,0x886d ,"HP ZBook Fury 17.3 Inch G8 Mobile Workstation PC" ,ALC285_FIXUP_HP_GPIO_AMP_INIT ),SND_PCI_QUIRK (0x103c ,0x8870 ,"HP ZBook Fury 15.6 Inch G8 Mobile Workstation PC" ,ALC285_FIXUP_HP_GPIO_AMP_INIT ),SND_PCI_QUIRK (0x103c ,0x8873 ,"HP ZBook Studio 15.6 Inch G8 Mobile Workstation PC" ,ALC285_FIXUP_HP_GPIO_AMP_INIT ), SND_PCI_QUIRK(0x103c, 0x8896, "HP EliteBook 855 G8 Notebook PC", ALC285_FIXUP_HP_MUTE_LED),
Greg Kroah-Hartman
maintainerPATCH 8/252 ALSA: usb-audio: scarlett2: Fix device hang with ehci-pci
In reply to Greg Kroah-HartmanFrom: Geoffrey D. Bennett <[email protected]>
commit 764fa6e686e0107c0357a988d193de04cf047583 upstream.
Use usb_rcvctrlpipe() not usb_sndctrlpipe() for USB control input in the Scarlett Gen 2 mixer driver. This fixes the device hang during initialisation when used with the ehci-pci host driver.
--- sound/usb/mixer_scarlett_gen2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/mixer_scarlett_gen2.c +1 -1
@@ -635,7 +635,7 @@ static int scarlett2_usb(/* send a second message to get the response */ err = snd_usb_ctl_msg(mixer->chip->dev, - usb_sndctrlpipe(mixer->chip->dev, 0), + usb_rcvctrlpipe(mixer->chip->dev, 0), SCARLETT2_USB_VENDOR_SPECIFIC_CMD_RESP, USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN, 0,
Greg Kroah-Hartman
maintainerPATCH 9/252 ALSA: usb-audio: scarlett2: Improve driver startup messages
In reply to Greg Kroah-HartmanFrom: Geoffrey D. Bennett <[email protected]>
commit 265d1a90e4fb6d3264d8122fbd10760e5e733be6 upstream.
Add separate init function to call the existing controls_create function so a custom error can be displayed if initialisation fails.
Use info level instead of error for notifications.
Display the VID/PID so device_setup is targeted to the right device.
Display "enabled" message to easily confirm that the driver is loaded.
--- sound/usb/mixer_quirks.c | 2 - sound/usb/mixer_scarlett_gen2.c | 79 +++++++++++++++++++++++++--------------- sound/usb/mixer_scarlett_gen2.h | 2 - 3 files changed, 52 insertions(+), 31 deletions(-)
sound/usb/mixer_quirks.c +1 -1
@@ -3017,7 +3017,7 @@ int snd_usb_mixer_apply_create_quirk(strcase USB_ID (0x1235 ,0x8203 ):/* Focusrite Scarlett 6i6 2nd Gen */ case USB_ID (0x1235 ,0x8204 ):/* Focusrite Scarlett 18i8 2nd Gen */ case USB_ID (0x1235 ,0x8201 ):/* Focusrite Scarlett 18i20 2nd Gen */ - err =snd_scarlett_gen2_controls_create (mixer); + err =snd_scarlett_gen2_init (mixer);break ;case USB_ID (0x041e ,0x323b ):/* Creative Sound Blaster E1 */
sound/usb/mixer_scarlett_gen2.c +50 -29
91 lines not on this page · raw message
sound/usb/mixer_scarlett_gen2.h +1 -1
@@ -2,6 +2,6 @@#ifndef __USB_MIXER_SCARLETT_GEN2_H#define __USB_MIXER_SCARLETT_GEN2_H -int snd_scarlett_gen2_controls_create (struct usb_mixer_interface *mixer); +int snd_scarlett_gen2_init (struct usb_mixer_interface *mixer);#endif /* __USB_MIXER_SCARLETT_GEN2_H */
Greg Kroah-Hartman
maintainerPATCH 10/252 cifs: set server->cipher_type to AES-128-CCM for SMB3.0
In reply to Greg Kroah-HartmanFrom: Aurelien Aptel <[email protected]>
commit 6d2fcfe6b517fe7cbf2687adfb0a16cdcd5d9243 upstream.
SMB3.0 doesn't have encryption negotiate context but simply uses the SMB2_GLOBAL_CAP_ENCRYPTION flag.
When that flag is present in the neg response cifs.ko uses AES-128-CCM which is the only cipher available in this context.
cipher_type was set to the server cipher only when parsing encryption negotiate context (SMB3.1.1).
For SMB3.0 it was set to 0. This means cipher_type value can be 0 or 1 for AES-128-CCM.
Fix this by checking for SMB3.0 and encryption capability and setting cipher_type appropriately.
--- fs/cifs/smb2pdu.c | 7 +++++++ 1 file changed, 7 insertions(+)
fs/cifs/smb2pdu.c +7 -0
@@ -951,6 +951,13 @@ SMB2_negotiate(const unsigned int xid, s/* Internal types */ server->capabilities |=SMB2_NT_FIND |SMB2_LARGE_FILES ; +/* +* SMB3.0 supports only 1 cipher and doesn't have a encryption neg context +* Set the cipher type manually. +*/ +if (server->dialect ==SMB30_PROT_ID && (server->capabilities &SMB2_GLOBAL_CAP_ENCRYPTION )) + server->cipher_type =SMB2_ENCRYPTION_AES128_CCM ; + security_blob =smb2_get_data_area_len (&blob_offset, &blob_length, (struct smb2_sync_hdr *)rsp);/*
Greg Kroah-Hartman
maintainerPATCH 11/252 NFSv4: Fix a NULL pointer dereference in pnfs_mark_matching_lsegs_return()
In reply to Greg Kroah-HartmanFrom: Anna Schumaker <[email protected]>
commit a421d218603ffa822a0b8045055c03eae394a7eb upstream.
Commit de144ff4234f changes _pnfs_return_layout() to call pnfs_mark_matching_lsegs_return() passing NULL as the struct pnfs_layout_range argument. Unfortunately, pnfs_mark_matching_lsegs_return() doesn't check if we have a value here before dereferencing it, causing an oops.
I'm able to hit this crash consistently when running connectathon basic tests on NFS v4.1/v4.2 against Ontap.
--- fs/nfs/pnfs.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
fs/nfs/pnfs.c +7 -8
@@ -1317,6 +1317,11 @@ _pnfs_return_layout(struct inode *ino) {struct pnfs_layout_hdr *lo =NULL ;struct nfs_inode *nfsi =NFS_I (ino); +struct pnfs_layout_range range = { + .iomode =IOMODE_ANY , + .offset =0 , + .length =NFS4_MAX_UINT64 , + };LIST_HEAD (tmp_list);const struct cred *cred;nfs4_stateid stateid;
@@ -1344,16 +1349,10 @@ _pnfs_return_layout(struct inode *ino) } valid_layout =pnfs_layout_is_valid (lo);pnfs_clear_layoutcommit (ino, &tmp_list); -pnfs_mark_matching_lsegs_return (lo, &tmp_list,NULL ,0 ); +pnfs_mark_matching_lsegs_return (lo, &tmp_list, &range,0 ); -if (NFS_SERVER (ino)->pnfs_curr_ld->return_range) { -struct pnfs_layout_range range = { - .iomode =IOMODE_ANY , - .offset =0 , - .length =NFS4_MAX_UINT64 , - }; +if (NFS_SERVER (ino)->pnfs_curr_ld->return_range)NFS_SERVER (ino)->pnfs_curr_ld->return_range (lo, &range); - }/* Don't send a LAYOUTRETURN if list was initially empty */ if (!test_bit(NFS_LAYOUT_RETURN_REQUESTED, &lo->plh_flags) ||
Greg Kroah-Hartman
maintainerPATCH 12/252 iommu/vt-d: Fix sysfs leak in alloc_iommu()
In reply to Greg Kroah-HartmanFrom: Rolf Eike Beer <[email protected]>
commit 0ee74d5a48635c848c20f152d0d488bf84641304 upstream.
iommu_device_sysfs_add() is called before, so is has to be cleaned on subsequent errors.
--- drivers/iommu/intel/dmar.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/iommu/intel/dmar.c +3 -1
@@ -1137,7 +1137,7 @@ static int alloc_iommu(struct dmar_drhd_ err =iommu_device_register (&iommu->iommu);if (err) - goto err_unmap; + goto err_sysfs; } drhd->iommu = iommu;
@@ -1145,6 +1145,8 @@ static int alloc_iommu(struct dmar_drhd_return 0 ; +err_sysfs: +iommu_device_sysfs_remove (&iommu->iommu); err_unmap:unmap_iommu (iommu); error_free_seq_id:
Greg Kroah-Hartman
maintainerPATCH 13/252 perf intel-pt: Fix sample instruction bytes
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
commit c954eb72b31a9dc56c99b450253ec5b121add320 upstream.
The decoder reports the current instruction if it was decoded. In some cases the current instruction is not decoded, in which case the instruction bytes length must be set to zero. Ensure that is always done.
Note perf script can anyway get the instruction bytes for any samples where they are not present.
Also note, that there is a redundant "ptq->insn_len = 0" statement which is not removed until a subsequent patch in order to make this patch apply cleanly to stable branches.
Example:
A machne that supports TSX is required. It will have flag "rtm". Kernel parameter tsx=on may be required.
# for w in `cat /proc/cpuinfo | grep -m1 flags `;do echo $w | grep rtm ; done rtm
Test program:
#include <stdio.h>
#include <immintrin.h>
int main()
{
int x = 0;
if (_xbegin() == _XBEGIN_STARTED) {
x = 1;
_xabort(1);
} else {
printf("x = %d\n", x);
}
return 0;}
Compile with -mrtm i.e.
gcc -Wall -Wextra -mrtm xabort.c -o xabort
Record:
perf record -e intel_pt/cyc/u --filter 'filter main @ ./xabort' ./xabort
Before:
# perf script --itrace=xe -F+flags,+insn,-period --xed --ns
xabort 1478 [007] 92161.431348581: transactions: x 400b81 main+0x14 (/root/xabort) mov $0xffffffff, %eax
xabort 1478 [007] 92161.431348624: transactions: tx abrt 400b93 main+0x26 (/root/xabort) mov $0xffffffff, %eaxAfter:
# perf script --itrace=xe -F+flags,+insn,-period --xed --ns
xabort 1478 [007] 92161.431348581: transactions: x 400b81 main+0x14 (/root/xabort) xbegin 0x6
xabort 1478 [007] 92161.431348624: transactions: tx abrt 400b93 main+0x26 (/root/xabort) xabort $0x1--- tools/perf/util/intel-pt.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/perf/util/intel-pt.c +4 -1
@@ -647,8 +647,10 @@ static int intel_pt_walk_next_insn(struc *ip += intel_pt_insn->length; -if (to_ip && *ip == to_ip) +if (to_ip && *ip == to_ip) { + intel_pt_insn->length =0 ; goto out_no_cache; + }if (*ip >= al.map->end)break ;
@@ -1131,6 +1133,7 @@ static void intel_pt_set_pid_tid_cpu(strstatic void intel_pt_sample_flags (struct intel_pt_queue *ptq) { + ptq->insn_len =0 ;if (ptq->state->flags &INTEL_PT_ABORT_TX ) { ptq->flags =PERF_IP_FLAG_BRANCH |PERF_IP_FLAG_TX_ABORT ; }else if (ptq->state->flags &INTEL_PT_ASYNC ) {
Greg Kroah-Hartman
maintainerPATCH 14/252 perf intel-pt: Fix transaction abort handling
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
commit cb7987837c31b217b28089bbc78922d5c9187869 upstream.
When adding support for power events, some handling of FUP packets was unified. That resulted in breaking reporting of TSX aborts, by not considering the associated TIP packet. Fix that.
Example:
A machine that supports TSX is required. It will have flag "rtm". Kernel parameter tsx=on may be required.
# for w in `cat /proc/cpuinfo | grep -m1 flags `;do echo $w | grep rtm ; done rtm
Test program:
#include <stdio.h>
#include <immintrin.h>
int main()
{
int x = 0;
if (_xbegin() == _XBEGIN_STARTED) {
x = 1;
_xabort(1);
} else {
printf("x = %d\n", x);
}
return 0;}
Compile with -mrtm i.e.
gcc -Wall -Wextra -mrtm xabort.c -o xabort
Record:
perf record -e intel_pt/cyc/u --filter 'filter main @ ./xabort' ./xabort
Before:
# perf script --itrace=be -F+flags,+addr,-period,-event --ns
xabort 1478 [007] 92161.431348552: tr strt 0 [unknown] ([unknown]) => 400b6d main+0x0 (/root/xabort)
xabort 1478 [007] 92161.431348624: jmp 400b96 main+0x29 (/root/xabort) => 400bae main+0x41 (/root/xabort)
xabort 1478 [007] 92161.431348624: return 400bb4 main+0x47 (/root/xabort) => 400b87 main+0x1a (/root/xabort)
xabort 1478 [007] 92161.431348637: jcc 400b8a main+0x1d (/root/xabort) => 400b98 main+0x2b (/root/xabort)
xabort 1478 [007] 92161.431348644: tr end call 400ba9 main+0x3c (/root/xabort) => 40f690 printf+0x0 (/root/xabort)
xabort 1478 [007] 92161.431360859: tr strt 0 [unknown] ([unknown]) => 400bae main+0x41 (/root/xabort)
xabort 1478 [007] 92161.431360882: tr end return 400bb4 main+0x47 (/root/xabort) => 401139 __libc_start_main+0x309 (/root/xabort)After:
# perf script --itrace=be -F+flags,+addr,-period,-event --ns
xabort 1478 [007] 92161.431348552: tr strt 0 [unknown] ([unknown]) => 400b6d main+0x0 (/root/xabort)
xabort 1478 [007] 92161.431348624: tx abrt 400b93 main+0x26 (/root/xabort) => 400b87 main+0x1a (/root/xabort)
xabort 1478 [007] 92161.431348637: jcc 400b8a main+0x1d (/root/xabort) => 400b98 main+0x2b (/root/xabort)
xabort 1478 [007] 92161.431348644: tr end call 400ba9 main+0x3c (/root/xabort) => 40f690 printf+0x0 (/root/xabort)
xabort 1478 [007] 92161.431360859: tr strt 0 [unknown] ([unknown]) => 400bae main+0x41 (/root/xabort)
xabort 1478 [007] 92161.431360882: tr end return 400bb4 main+0x47 (/root/xabort) => 401139 __libc_start_main+0x309 (/root/xabort)--- tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +5 -1
@@ -1120,6 +1120,8 @@ static bool intel_pt_fup_event(struct in decoder->set_fup_tx_flags = false; decoder->tx_flags = decoder->fup_tx_flags; decoder->state.type =INTEL_PT_TRANSACTION ; +if (decoder->fup_tx_flags &INTEL_PT_ABORT_TX ) + decoder->state.type |=INTEL_PT_BRANCH ; decoder->state.from_ip = decoder->ip; decoder->state.to_ip =0 ; decoder->state.flags = decoder->fup_tx_flags;
@@ -1194,8 +1196,10 @@ static int intel_pt_walk_fup(struct intereturn 0 ;if (err == -EAGAIN ||intel_pt_fup_with_nlip (decoder, &intel_pt_insn, ip, err)) { +bool no_tip = decoder->pkt_state !=INTEL_PT_STATE_FUP ; + decoder->pkt_state =INTEL_PT_STATE_IN_SYNC ; -if (intel_pt_fup_event (decoder)) +if (intel_pt_fup_event (decoder) && no_tip)return 0 ;return -EAGAIN ; }
Greg Kroah-Hartman
maintainerPATCH 15/252 perf scripts python: exported-sql-viewer.py: Fix copy to clipboard from Top Calls by elapsed Time report
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
commit a6172059758ba1b496ae024cece7d5bdc8d017db upstream.
Provide missing argument to prevent following error when copying a selection to the clipboard:
Traceback (most recent call last):
File "tools/perf/scripts/python/exported-sql-viewer.py", line 4041, in <lambda>
menu.addAction(CreateAction("&Copy selection", "Copy to clipboard", lambda: CopyCellsToClipboardHdr(self.view), self.view))
File "tools/perf/scripts/python/exported-sql-viewer.py", line 4021, in CopyCellsToClipboardHdr
CopyCellsToClipboard(view, False, True)
File "tools/perf/scripts/python/exported-sql-viewer.py", line 4018, in CopyCellsToClipboard
view.CopyCellsToClipboard(view, as_csv, with_hdr)
File "tools/perf/scripts/python/exported-sql-viewer.py", line 3871, in CopyTableCellsToClipboard
val = model.headerData(col, Qt.Horizontal)
TypeError: headerData() missing 1 required positional argument: 'role'
--- tools/perf/scripts/python/exported-sql-viewer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/scripts/python/exported-sql-viewer.py +1 -1
@@ -3868,7 +3868,7 @@ def CopyTableCellsToClipboard(view, as_c if with_hdr: model = indexes[0].model() for col in range(min_col, max_col + 1): - val = model.headerData(col, Qt.Horizontal) + val = model.headerData(col, Qt.Horizontal, Qt.DisplayRole) if as_csv: text += sep + ToCSValue(val) sep = ","
Greg Kroah-Hartman
maintainerPATCH 16/252 perf scripts python: exported-sql-viewer.py: Fix Array TypeError
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
commit fd931b2e234a7cc451a7bbb1965d6ce623189158 upstream.
The 'Array' class is present in more than one python standard library. In some versions of Python 3, the following error occurs:
Traceback (most recent call last):
File "tools/perf/scripts/python/exported-sql-viewer.py", line 4702, in <lambda>
reports_menu.addAction(CreateAction(label, "Create a new window displaying branch events", lambda a=None,x=dbid: self.NewBranchView(x), self))
File "tools/perf/scripts/python/exported-sql-viewer.py", line 4727, in NewBranchView
BranchWindow(self.glb, event_id, ReportVars(), self)
File "tools/perf/scripts/python/exported-sql-viewer.py", line 3208, in __init__
self.model = LookupCreateModel(model_name, lambda: BranchModel(glb, event_id, report_vars.where_clause))
File "tools/perf/scripts/python/exported-sql-viewer.py", line 343, in LookupCreateModel
model = create_fn()
File "tools/perf/scripts/python/exported-sql-viewer.py", line 3208, in <lambda>
self.model = LookupCreateModel(model_name, lambda: BranchModel(glb, event_id, report_vars.where_clause))
File "tools/perf/scripts/python/exported-sql-viewer.py", line 3124, in __init__
self.fetcher = SQLFetcher(glb, sql, prep, self.AddSample)
File "tools/perf/scripts/python/exported-sql-viewer.py", line 2658, in __init__
self.buffer = Array(c_char, self.buffer_size, lock=False)
TypeError: abstract class
This apparently happens because Python can be inconsistent about which class of the name 'Array' gets imported. Fix by importing explicitly by name so that only the desired 'Array' gets imported.
--- tools/perf/scripts/python/exported-sql-viewer.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tools/perf/scripts/python/exported-sql-viewer.py +3 -2
@@ -125,8 +125,9 @@ if pyside_version_1: from PySide.QtGui import * from PySide.QtSql import * -from decimal import * -from ctypes import * +from decimal import Decimal, ROUND_HALF_UP +from ctypes import CDLL, Structure, create_string_buffer, addressof, sizeof, \ + c_void_p, c_bool, c_byte, c_char, c_int, c_uint, c_longlong, c_ulonglong from multiprocessing import Process, Array, Value, Event # xrange is range in Python3
Greg Kroah-Hartman
maintainerPATCH 17/252 perf scripts python: exported-sql-viewer.py: Fix warning display
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
commit f56299a9c998e0bfbd4ab07cafe9eb8444512448 upstream.
Deprecation warnings are useful only for the developer, not an end user. Display warnings only when requested using the python -W option. This stops the display of warnings like:
tools/perf/scripts/python/exported-sql-viewer.py:5102: DeprecationWarning:
an integer is required (got type PySide2.QtCore.Qt.AlignmentFlag). Implicit conversion to integers using __int__ is deprecated, and may be removed in a future version of Python.
err = app.exec_()
Since the warning can be fixed only in PySide2, we must wait for it to be finally fixed there.
--- tools/perf/scripts/python/exported-sql-viewer.py | 5 +++++ 1 file changed, 5 insertions(+)
tools/perf/scripts/python/exported-sql-viewer.py +5 -0
@@ -91,6 +91,11 @@ from __future__ import print_function import sys +# Only change warnings if the python -W option was not used +if not sys.warnoptions: + import warnings + # PySide2 causes deprecation warnings, ignore them. + warnings.filterwarnings("ignore", category=DeprecationWarning) import argparse import weakref import threading
Greg Kroah-Hartman
maintainerPATCH 18/252 proc: Check /proc/$pid/attr/ writes against file opener
In reply to Greg Kroah-HartmanFrom: Kees Cook <[email protected]>
commit bfb819ea20ce8bbeeba17e1a6418bf8bda91fc28 upstream.
Fix another "confused deputy" weakness[1]. Writes to /proc/$pid/attr/ files need to check the opener credentials, since these fds do not transition state across execve(). Without this, it is possible to trick another process (which may have different credentials) to write to its own /proc/$pid/attr/ files, leading to unexpected and possibly exploitable behaviors.
--- fs/proc/base.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/proc/base.c +4 -0
@@ -2704,6 +2704,10 @@ static ssize_t proc_pid_attr_write(strucvoid *page;int rv; +/* A task may only write when it was the opener. */ +if (file->f_cred !=current_real_cred ()) +return -EPERM ; +rcu_read_lock (); task =pid_task (proc_pid (inode),PIDTYPE_PID );if (!task) {
Greg Kroah-Hartman
maintainerPATCH 19/252 net: hso: fix control-request directions
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 1a6e9a9c68c1f183872e4bcc947382111c2e04eb upstream.
The direction of the pipe argument must match the request-type direction bit or control requests may fail depending on the host-controller-driver implementation.
Fix the tiocmset and rfkill requests which erroneously used usb_rcvctrlpipe().
--- drivers/net/usb/hso.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/usb/hso.c +2 -2
@@ -1689,7 +1689,7 @@ static int hso_serial_tiocmset(struct ttspin_unlock_irqrestore (&serial->serial_lock, flags);return usb_control_msg (serial->parent->usb, -usb_rcvctrlpipe (serial->parent->usb,0 ),0x22 , +usb_sndctrlpipe (serial->parent->usb,0 ),0x22 ,0x21 , val, if_num,NULL ,0 ,USB_CTRL_SET_TIMEOUT ); }
@@ -2436,7 +2436,7 @@ static int hso_rfkill_set_block(void *daif (hso_dev->usb_gone) rv =0 ;else - rv =usb_control_msg (hso_dev->usb,usb_rcvctrlpipe (hso_dev->usb,0 ), + rv =usb_control_msg (hso_dev->usb,usb_sndctrlpipe (hso_dev->usb,0 ), enabled ?0x82 :0x81 ,0x40 ,0 ,0 ,NULL ,0 ,USB_CTRL_SET_TIMEOUT );mutex_unlock (&hso_dev->mutex);
Greg Kroah-Hartman
maintainerPATCH 20/252 net/sched: fq_pie: re-factor fix for fq_pie endless loop
In reply to Greg Kroah-HartmanFrom: Davide Caratti <[email protected]>
commit 3a62fed2fd7b6fea96d720e779cafc30dfb3a22e upstream.
the patch that fixed an endless loop in_fq_pie_init() was not considering that 65535 is a valid class id. The correct bugfix for this infinite loop is to change 'idx' to become an u32, like Colin proposed in the past [1].
Fix this as follows:
- restore 65536 as maximum possible values of 'flows_cnt'
- use u32 'idx' when iterating on 'q->flows'
- fix the TDC selftest
This reverts commit bb2f930d6dd708469a587dc9ed1efe1ef969c0bf.
[1] https://lore.kernel.org/netdev/[email protected]/
--- net/sched/sch_fq_pie.c | 10 +++++----- tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq_pie.json | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-)
net/sched/sch_fq_pie.c +5 -5
@@ -297,9 +297,9 @@ static int fq_pie_change(struct Qdisc *s goto flow_error; } q->flows_cnt =nla_get_u32 (tb[TCA_FQ_PIE_FLOWS ]); -if (!q->flows_cnt || q->flows_cnt >=65536 ) { +if (!q->flows_cnt || q->flows_cnt >65536 ) {NL_SET_ERR_MSG_MOD (extack, -"Number of flows must range in [1..65535]" ); +"Number of flows must range in [1..65536]" ); goto flow_error; } }
@@ -367,7 +367,7 @@ static void fq_pie_timer(struct timer_listruct fq_pie_sched_data *q =from_timer (q, t, adapt_timer);struct Qdisc *sch = q->sch;spinlock_t *root_lock;/* to lock qdisc for probability calculations */ -u16 idx; +u32 idx; root_lock =qdisc_lock (qdisc_root_sleeping (sch));spin_lock (root_lock);
@@ -388,7 +388,7 @@ static int fq_pie_init(struct Qdisc *sch {struct fq_pie_sched_data *q =qdisc_priv (sch);int err; -u16 idx; +u32 idx;pie_params_init (&q->p_params); sch->limit =10 *1024 ;
@@ -500,7 +500,7 @@ static int fq_pie_dump_stats(struct Qdisstatic void fq_pie_reset (struct Qdisc *sch) {struct fq_pie_sched_data *q =qdisc_priv (sch); -u16 idx; +u32 idx;INIT_LIST_HEAD (&q->new_flows);INIT_LIST_HEAD (&q->old_flows);
tools/testing/selftests/tc-testing/tc-tests/qdiscs/fq_pie.json +4 -4
@@ -9,11 +9,11 @@ "setup": [ "$IP link add dev $DUMMY type dummy || /bin/true" ], - "cmdUnderTest": "$TC qdisc add dev $DUMMY root fq_pie flows 65536", - "expExitCode": "2", + "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root fq_pie flows 65536", + "expExitCode": "0", "verifyCmd": "$TC qdisc show dev $DUMMY", - "matchPattern": "qdisc", - "matchCount": "0", + "matchPattern": "qdisc fq_pie 1: root refcnt 2 limit 10240p flows 65536", + "matchCount": "1", "teardown": [ "$IP link del dev $DUMMY" ]
Greg Kroah-Hartman
maintainerPATCH 21/252 net/sched: fq_pie: fix OOB access in the traffic path
In reply to Greg Kroah-HartmanFrom: Davide Caratti <[email protected]>
commit e70f7a11876a1a788ceadf75e9e5f7af2c868680 upstream.
the following script:
# tc qdisc add dev eth0 handle 0x1 root fq_pie flows 2 # tc qdisc add dev eth0 clsact # tc filter add dev eth0 egress matchall action skbedit priority 0x10002 # ping 192.0.2.2 -I eth0 -c2 -w1 -q
produces the following splat:
BUG: KASAN: slab-out-of-bounds in fq_pie_qdisc_enqueue+0x1314/0x19d0 [sch_fq_pie]
Read of size 4 at addr ffff888171306924 by task ping/942
CPU: 3 PID: 942 Comm: ping Not tainted 5.12.0+ #441
Hardware name: Red Hat KVM, BIOS 1.11.1-4.module+el8.1.0+4066+0f1aadab 04/01/2014
Call Trace:
dump_stack+0x92/0xc1
print_address_description.constprop.7+0x1a/0x150
kasan_report.cold.13+0x7f/0x111
fq_pie_qdisc_enqueue+0x1314/0x19d0 [sch_fq_pie]
__dev_queue_xmit+0x1034/0x2b10
ip_finish_output2+0xc62/0x2120
__ip_finish_output+0x553/0xea0
ip_output+0x1ca/0x4d0
ip_send_skb+0x37/0xa0
raw_sendmsg+0x1c4b/0x2d00
sock_sendmsg+0xdb/0x110
__sys_sendto+0x1d7/0x2b0
__x64_sys_sendto+0xdd/0x1b0
do_syscall_64+0x3c/0x80
entry_SYSCALL_64_after_hwframe+0x44/0xae
RIP: 0033:0x7fe69735c3eb
Code: 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 f3 0f 1e fa 48 8d 05 75 42 2c 00 41 89 ca 8b 00 85 c0 75 14 b8 2c 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 75 c3 0f 1f 40 00 41 57 4d 89 c7 41 56 41 89
RSP: 002b:00007fff06d7fb38 EFLAGS: 00000246 ORIG_RAX: 000000000000002c
RAX: ffffffffffffffda RBX: 000055e961413700 RCX: 00007fe69735c3eb
RDX: 0000000000000040 RSI: 000055e961413700 RDI: 0000000000000003
RBP: 0000000000000040 R08: 000055e961410500 R09: 0000000000000010
R10: 0000000000000000 R11: 0000000000000246 R12: 00007fff06d81260
R13: 00007fff06d7fb40 R14: 00007fff06d7fc30 R15: 000055e96140f0a0
Allocated by task 917:
kasan_save_stack+0x19/0x40
__kasan_kmalloc+0x7f/0xa0
__kmalloc_node+0x139/0x280
fq_pie_init+0x555/0x8e8 [sch_fq_pie]
qdisc_create+0x407/0x11b0
tc_modify_qdisc+0x3c2/0x17e0
rtnetlink_rcv_msg+0x346/0x8e0
netlink_rcv_skb+0x120/0x380
netlink_unicast+0x439/0x630
netlink_sendmsg+0x719/0xbf0
sock_sendmsg+0xe2/0x110
____sys_sendmsg+0x5ba/0x890
___sys_sendmsg+0xe9/0x160
__sys_sendmsg+0xd3/0x170
do_syscall_64+0x3c/0x80
entry_SYSCALL_64_after_hwframe+0x44/0xae
The buggy address belongs to the object at ffff888171306800
which belongs to the cache kmalloc-256 of size 256
The buggy address is located 36 bytes to the right of
256-byte region [ffff888171306800, ffff888171306900)
The buggy address belongs to the page:
page:00000000bcfb624e refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x171306
head:00000000bcfb624e order:1 compound_mapcount:0
flags: 0x17ffffc0010200(slab|head|node=0|zone=2|lastcpupid=0x1fffff)
raw: 0017ffffc0010200 dead000000000100 dead000000000122 ffff888100042b40
raw: 0000000000000000 0000000000100010 00000001ffffffff 0000000000000000
page dumped because: kasan: bad access detected
Memory state around the buggy address:
ffff888171306800: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
ffff888171306880: 00 00 00 00 00 00 00 00 00 00 00 00 fc fc fc fc
>ffff888171306900: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
^
ffff888171306980: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
ffff888171306a00: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fbfix fq_pie traffic path to avoid selecting 'q->flows + q->flows_cnt' as a valid flow: it's an address beyond the allocated memory.
--- net/sched/sch_fq_pie.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
net/sched/sch_fq_pie.c +8 -1
@@ -138,8 +138,15 @@ static int fq_pie_qdisc_enqueue(struct s/* Classifies packet into corresponding flow */ idx =fq_pie_classify (skb, sch, &ret); - sel_flow = &q->flows[idx]; +if (idx ==0 ) { +if (ret & __NET_XMIT_BYPASS) +qdisc_qstats_drop (sch); +__qdisc_drop (skb, to_free); +return ret; + } + idx--; + sel_flow = &q->flows[idx];/* Checks whether adding a new packet would exceed memory limit */ get_pie_cb (skb)->mem_usage = skb->truesize; memory_limited = q->memory_usage > q->memory_limit + skb->truesize;
Greg Kroah-Hartman
maintainerPATCH 22/252 netfilter: nft_set_pipapo_avx2: Add irq_fpu_usable() check, fallback to non-AVX2 version
In reply to Greg Kroah-HartmanFrom: Stefano Brivio <[email protected]>
commit f0b3d338064e1fe7531f0d2977e35f3b334abfb4 upstream.
Arturo reported this backtrace:
[709732.358791] WARNING: CPU: 3 PID: 456 at arch/x86/kernel/fpu/core.c:128 kernel_fpu_begin_mask+0xae/0xe0 [709732.358793] Modules linked in: binfmt_misc nft_nat nft_chain_nat nf_nat nft_counter nft_ct nf_tables nf_conntrack_netlink nfnetlink 8021q garp stp mrp llc vrf intel_rapl_msr intel_rapl_common skx_edac nfit libnvdimm ipmi_ssif x86_pkg_temp_thermal intel_powerclamp coretemp crc32_pclmul mgag200 ghash_clmulni_intel drm_kms_helper cec aesni_intel drm libaes crypto_simd cryptd glue_helper mei_me dell_smbios iTCO_wdt evdev intel_pmc_bxt iTCO_vendor_support dcdbas pcspkr rapl dell_wmi_descriptor wmi_bmof sg i2c_algo_bit watchdog mei acpi_ipmi ipmi_si button nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 ipmi_devintf ipmi_msghandler ip_tables x_tables autofs4 ext4 crc16 mbcache jbd2 dm_mod raid10 raid456 async_raid6_recov async_memcpy async_pq async_xor async_tx xor sd_mod t10_pi crc_t10dif crct10dif_generic raid6_pq libcrc32c crc32c_generic raid1 raid0 multipath linear md_mod ahci libahci tg3 libata xhci_pci libphy xhci_hcd ptp usbcore crct10dif_pclmul crct10dif_common bnxt_en crc32c_intel scsi_mod [709732.358941] pps_core i2c_i801 lpc_ich i2c_smbus wmi usb_common [709732.358957] CPU: 3 PID: 456 Comm: jbd2/dm-0-8 Not tainted 5.10.0-0.bpo.5-amd64 #1 Debian 5.10.24-1~bpo10+1 [709732.358959] Hardware name: Dell Inc. PowerEdge R440/04JN2K, BIOS 2.9.3 09/23/2020 [709732.358964] RIP: 0010:kernel_fpu_begin_mask+0xae/0xe0 [709732.358969] Code: ae 54 24 04 83 e3 01 75 38 48 8b 44 24 08 65 48 33 04 25 28 00 00 00 75 33 48 83 c4 10 5b c3 65 8a 05 5e 21 5e 76 84 c0 74 92 <0f> 0b eb 8e f0 80 4f 01 40 48 81 c7 00 14 00 00 e8 dd fb ff ff eb [709732.358972] RSP: 0018:ffffbb9700304740 EFLAGS: 00010202 [709732.358976] RAX: 0000000000000001 RBX: 0000000000000003 RCX: 0000000000000001 [709732.358979] RDX: ffffbb9700304970 RSI: ffff922fe1952e00 RDI: 0000000000000003 [709732.358981] RBP: ffffbb9700304970 R08: ffff922fc868a600 R09: ffff922fc711e462 [709732.358984] R10: 000000000000005f R11: ffff922ff0b27180 R12: ffffbb9700304960 [709732.358987] R13: ffffbb9700304b08 R14: ffff922fc664b6c8 R15: ffff922fc664b660 [709732.358990] FS: 0000000000000000(0000) GS:ffff92371fec0000(0000) knlGS:0000000000000000 [709732.358993] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [709732.358996] CR2: 0000557a6655bdd0 CR3: 000000026020a001 CR4: 00000000007706e0 [709732.358999] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [709732.359001] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [709732.359003] PKRU: 55555554 [709732.359005] Call Trace: [709732.359009] <IRQ> [709732.359035] nft_pipapo_avx2_lookup+0x4c/0x1cba [nf_tables] [709732.359046] ? sched_clock+0x5/0x10 [709732.359054] ? sched_clock_cpu+0xc/0xb0 [709732.359061] ? record_times+0x16/0x80 [709732.359068] ? plist_add+0xc1/0x100 [709732.359073] ? psi_group_change+0x47/0x230 [709732.359079] ? skb_clone+0x4d/0xb0 [709732.359085] ? enqueue_task_rt+0x22b/0x310 [709732.359098] ? bnxt_start_xmit+0x1e8/0xaf0 [bnxt_en] [709732.359102] ? packet_rcv+0x40/0x4a0 [709732.359121] nft_lookup_eval+0x59/0x160 [nf_tables] [709732.359133] nft_do_chain+0x350/0x500 [nf_tables] [709732.359152] ? nft_lookup_eval+0x59/0x160 [nf_tables] [709732.359163] ? nft_do_chain+0x364/0x500 [nf_tables] [709732.359172] ? fib4_rule_action+0x6d/0x80 [709732.359178] ? fib_rules_lookup+0x107/0x250 [709732.359184] nft_nat_do_chain+0x8a/0xf2 [nft_chain_nat] [709732.359193] nf_nat_inet_fn+0xea/0x210 [nf_nat] [709732.359202] nf_nat_ipv4_out+0x14/0xa0 [nf_nat] [709732.359207] nf_hook_slow+0x44/0xc0 [709732.359214] ip_output+0xd2/0x100 [709732.359221] ? __ip_finish_output+0x210/0x210 [709732.359226] ip_forward+0x37d/0x4a0 [709732.359232] ? ip4_key_hashfn+0xb0/0xb0 [709732.359238] ip_sublist_rcv_finish+0x4f/0x60 [709732.359243] ip_sublist_rcv+0x196/0x220 [709732.359250] ? ip_rcv_finish_core.isra.22+0x400/0x400 [709732.359255] ip_list_rcv+0x137/0x160 [709732.359264] __netif_receive_skb_list_core+0x29b/0x2c0 [709732.359272] netif_receive_skb_list_internal+0x1a6/0x2d0 [709732.359280] gro_normal_list.part.156+0x19/0x40 [709732.359286] napi_complete_done+0x67/0x170 [709732.359298] bnxt_poll+0x105/0x190 [bnxt_en] [709732.359304] ? irqentry_exit+0x29/0x30 [709732.359309] ? asm_common_interrupt+0x1e/0x40 [709732.359315] net_rx_action+0x144/0x3c0 [709732.359322] __do_softirq+0xd5/0x29c [709732.359329] asm_call_irq_on_stack+0xf/0x20 [709732.359332] </IRQ> [709732.359339] do_softirq_own_stack+0x37/0x40 [709732.359346] irq_exit_rcu+0x9d/0xa0 [709732.359353] common_interrupt+0x78/0x130 [709732.359358] asm_common_interrupt+0x1e/0x40 [709732.359366] RIP: 0010:crc_41+0x0/0x1e [crc32c_intel] [709732.359370] Code: ff ff f2 4d 0f 38 f1 93 a8 fe ff ff f2 4c 0f 38 f1 81 b0 fe ff ff f2 4c 0f 38 f1 8a b0 fe ff ff f2 4d 0f 38 f1 93 b0 fe ff ff <f2> 4c 0f 38 f1 81 b8 fe ff ff f2 4c 0f 38 f1 8a b8 fe ff ff f2 4d [709732.359373] RSP: 0018:ffffbb97008dfcd0 EFLAGS: 00000246 [709732.359377] RAX: 000000000000002a RBX: 0000000000000400 RCX: ffff922fc591dd50 [709732.359379] RDX: ffff922fc591dea0 RSI: 0000000000000a14 RDI: ffffffffc00dddc0 [709732.359382] RBP: 0000000000001000 R08: 000000000342d8c3 R09: 0000000000000000 [709732.359384] R10: 0000000000000000 R11: ffff922fc591dff0 R12: ffffbb97008dfe58 [709732.359386] R13: 000000000000000a R14: ffff922fd2b91e80 R15: ffff922fef83fe38 [709732.359395] ? crc_43+0x1e/0x1e [crc32c_intel] [709732.359403] ? crc32c_pcl_intel_update+0x97/0xb0 [crc32c_intel] [709732.359419] ? jbd2_journal_commit_transaction+0xaec/0x1a30 [jbd2] [709732.359425] ? irq_exit_rcu+0x3e/0xa0 [709732.359447] ? kjournald2+0xbd/0x270 [jbd2] [709732.359454] ? finish_wait+0x80/0x80 [709732.359470] ? commit_timeout+0x10/0x10 [jbd2] [709732.359476] ? kthread+0x116/0x130 [709732.359481] ? kthread_park+0x80/0x80 [709732.359488] ? ret_from_fork+0x1f/0x30 [709732.359494] ---[ end trace 081a19978e5f09f5 ]---
that is, nft_pipapo_avx2_lookup() uses the FPU running from a softirq that interrupted a kthread, also using the FPU.
That's exactly the reason why irq_fpu_usable() is there: use it, and if we can't use the FPU, fall back to the non-AVX2 version of the lookup operation, i.e. nft_pipapo_lookup().
--- net/netfilter/nft_set_pipapo.c | 4 ++-- net/netfilter/nft_set_pipapo.h | 2 ++ net/netfilter/nft_set_pipapo_avx2.c | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-)
net/netfilter/nft_set_pipapo.c +2 -2
@@ -408,8 +408,8 @@ int pipapo_refill(unsigned long *map, in* * Return: true on match, false otherwise. */ -static bool nft_pipapo_lookup (const struct net *net,const struct nft_set *set, -const u32 *key,const struct nft_set_ext **ext) +bool nft_pipapo_lookup (const struct net *net,const struct nft_set *set, +const u32 *key,const struct nft_set_ext **ext) {struct nft_pipapo *priv =nft_set_priv (set);unsigned long *res_map, *fill_map;
net/netfilter/nft_set_pipapo.h +2 -0
@@ -178,6 +178,8 @@ struct nft_pipapo_elem {int pipapo_refill (unsigned long *map,int len,int rules,unsigned long *dst,union nft_pipapo_map_bucket *mt,bool match_only); +bool nft_pipapo_lookup (const struct net *net,const struct nft_set *set, +const u32 *key,const struct nft_set_ext **ext);/** * pipapo_and_field_buckets_4bit() - Intersect 4-bit buckets
net/netfilter/nft_set_pipapo_avx2.c +3 -0
@@ -1131,6 +1131,9 @@ bool nft_pipapo_avx2_lookup(const structbool map_index;int i, ret =0 ; +if (unlikely (!irq_fpu_usable ())) +return nft_pipapo_lookup (net, set, key, ext); + m =rcu_dereference (priv->match);/* This also protects access to all data related to scratch maps */
Greg Kroah-Hartman
maintainerPATCH 23/252 mac80211: assure all fragments are encrypted
In reply to Greg Kroah-HartmanFrom: Mathy Vanhoef <[email protected]>
commit 965a7d72e798eb7af0aa67210e37cf7ecd1c9cad upstream.
Do not mix plaintext and encrypted fragments in protected Wi-Fi networks. This fixes CVE-2020-26147.
Previously, an attacker was able to first forward a legitimate encrypted fragment towards a victim, followed by a plaintext fragment. The encrypted and plaintext fragment would then be reassembled. For further details see Section 6.3 and Appendix D in the paper "Fragment and Forge:
Breaking Wi-Fi Through Frame Aggregation and Fragmentation".
Because of this change there are now two equivalent conditions in the code to determine if a received fragment requires sequential PNs, so we also move this test to a separate function to make the code easier to maintain.
--- net/mac80211/rx.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)
net/mac80211/rx.c +12 -11
@@ -2204,6 +2204,16 @@ ieee80211_reassemble_find(struct ieee802return NULL ; } +static bool requires_sequential_pn (struct ieee80211_rx_data *rx,__le16 fc) +{ +return rx->key && + (rx->key->conf.cipher ==WLAN_CIPHER_SUITE_CCMP || + rx->key->conf.cipher ==WLAN_CIPHER_SUITE_CCMP_256 || + rx->key->conf.cipher ==WLAN_CIPHER_SUITE_GCMP || + rx->key->conf.cipher ==WLAN_CIPHER_SUITE_GCMP_256 ) && +ieee80211_has_protected (fc); +} + static ieee80211_rx_result debug_noinlineieee80211_rx_h_defragment (struct ieee80211_rx_data *rx) {
@@ -2248,12 +2258,7 @@ ieee80211_rx_h_defragment(struct ieee802/* This is the first fragment of a new frame. */ entry =ieee80211_reassemble_add (rx->sdata, frag, seq, rx->seqno_idx, &(rx->skb)); -if (rx->key && - (rx->key->conf.cipher ==WLAN_CIPHER_SUITE_CCMP || - rx->key->conf.cipher ==WLAN_CIPHER_SUITE_CCMP_256 || - rx->key->conf.cipher ==WLAN_CIPHER_SUITE_GCMP || - rx->key->conf.cipher ==WLAN_CIPHER_SUITE_GCMP_256 ) && -ieee80211_has_protected (fc)) { +if (requires_sequential_pn (rx, fc)) {int queue = rx->security_idx;/* Store CCMP/GCMP PN so that we can verify that the
@@ -2295,11 +2300,7 @@ ieee80211_rx_h_defragment(struct ieee802u8 pn[IEEE80211_CCMP_PN_LEN ], *rpn;int queue; -if (!rx->key || - (rx->key->conf.cipher !=WLAN_CIPHER_SUITE_CCMP && - rx->key->conf.cipher !=WLAN_CIPHER_SUITE_CCMP_256 && - rx->key->conf.cipher !=WLAN_CIPHER_SUITE_GCMP && - rx->key->conf.cipher !=WLAN_CIPHER_SUITE_GCMP_256 )) +if (!requires_sequential_pn (rx, fc))return RX_DROP_UNUSABLE ;memcpy (pn, entry->last_pn,IEEE80211_CCMP_PN_LEN );for (i =IEEE80211_CCMP_PN_LEN -1 ; i >=0 ; i--) {
Greg Kroah-Hartman
maintainerPATCH 24/252 mac80211: prevent mixed key and fragment cache attacks
In reply to Greg Kroah-HartmanFrom: Mathy Vanhoef <[email protected]>
commit 94034c40ab4a3fcf581fbc7f8fdf4e29943c4a24 upstream.
Simultaneously prevent mixed key attacks (CVE-2020-24587) and fragment cache attacks (CVE-2020-24586). This is accomplished by assigning a unique color to every key (per interface) and using this to track which key was used to decrypt a fragment. When reassembling frames, it is now checked whether all fragments were decrypted using the same key.
To assure that fragment cache attacks are also prevented, the ID that is assigned to keys is unique even over (re)associations and (re)connects. This means fragments separated by a (re)association or (re)connect will not be reassembled. Because mac80211 now also prevents the reassembly of mixed encrypted and plaintext fragments, all cache attacks are prevented.
--- net/mac80211/ieee80211_i.h | 1 + net/mac80211/key.c | 7 +++++++ net/mac80211/key.h | 2 ++ net/mac80211/rx.c | 6 ++++++ 4 files changed, 16 insertions(+)
net/mac80211/ieee80211_i.h +1 -0
@@ -97,6 +97,7 @@ struct ieee80211_fragment_entry {u8 rx_queue;bool check_sequential_pn;/* needed for CCMP/GCMP */ u8 last_pn[6 ];/* PN of the last fragment if CCMP was used */ +unsigned int key_color; };
net/mac80211/key.c +7 -0
@@ -799,6 +799,7 @@ int ieee80211_key_link(struct ieee80211_struct ieee80211_sub_if_data *sdata, struct sta_info *sta) { + static atomic_t key_color = ATOMIC_INIT(0);struct ieee80211_key *old_key;int idx = key->conf.keyidx;bool pairwise = key->conf.flags &IEEE80211_KEY_FLAG_PAIRWISE ;
@@ -850,6 +851,12 @@ int ieee80211_key_link(struct ieee80211_ key->sdata = sdata; key->sta = sta; +/* +* Assign a unique ID to every key so we can easily prevent mixed +* key and fragment cache attacks. +*/ + key->color =atomic_inc_return (&key_color); +increment_tailroom_need_count (sdata); ret =ieee80211_key_replace (sdata, sta, pairwise, old_key, key);
net/mac80211/key.h +2 -0
@@ -128,6 +128,8 @@ struct ieee80211_key { } debugfs;#endif +unsigned int color; +/* * key config, must be last because it contains key * material as variable length member
net/mac80211/rx.c +6 -0
@@ -2265,6 +2265,7 @@ ieee80211_rx_h_defragment(struct ieee802* next fragment has a sequential PN value. */ entry->check_sequential_pn = true; + entry->key_color = rx->key->color;memcpy (entry->last_pn, rx->key->u.ccmp.rx_pn[queue],IEEE80211_CCMP_PN_LEN );
@@ -2302,6 +2303,11 @@ ieee80211_rx_h_defragment(struct ieee802if (!requires_sequential_pn (rx, fc))return RX_DROP_UNUSABLE ; + +/* Prevent mixed key and fragment cache attacks */ +if (entry->key_color != rx->key->color) +return RX_DROP_UNUSABLE ; +memcpy (pn, entry->last_pn,IEEE80211_CCMP_PN_LEN );for (i =IEEE80211_CCMP_PN_LEN -1 ; i >=0 ; i--) { pn[i]++;
Re: [PATCH 5.10 024/252] mac80211: prevent mixed key and fragment cache attacks
Hi!
Quoted 20 lines
From: Mathy Vanhoef <[email protected]>
commit
94034c40ab4a3fcf581fbc7f8fdf4e29943c4a24upstream.Simultaneously prevent mixed key attacks (CVE-2020-24587) and fragment cache attacks (CVE-2020-24586). This is accomplished by assigning a unique color to every key (per interface) and using this to track which key was used to decrypt a fragment. When reassembling frames, it is now checked whether all fragments were decrypted using the same key.
To assure that fragment cache attacks are also prevented, the ID that is assigned to keys is unique even over (re)associations and (re)connects. This means fragments separated by a (re)association or (re)connect will not be reassembled. Because mac80211 now also prevents the reassembly of mixed encrypted and plaintext fragments, all cache attacks are prevented.
net/mac80211/key.c int ieee80211_key_link(struct ieee80211_ · line 803
Quoted 5 lines
net/mac80211/key.c +1
-0@@ -799,6 +799,7 @@ int ieee80211_key_link(struct ieee80211_struct ieee80211_sub_if_data *sdata, struct sta_info *sta) { + static atomic_t key_color = ATOMIC_INIT(0);struct ieee80211_key *old_key;
This is nice and simple, but does not include any kind of overflow handling. sparc32 moved away from 24-bit atomics, which is good I guess. OTOH if this is incremented 10 times a second, we'll still overflow in 6 years or so. Can attacker make it overflow?
Should this have a note why overflow is not possible / why it is not a problem?
Best regards,
Pavel
Signature · 1 line
http://www.livejournal.com/~pavelmachek
Re: [PATCH 5.10 024/252] mac80211: prevent mixed key and fragment cache attacks
Hello Pavel,
Good remark. In practice this doesn't look like a problem: the overflow would need to happen in less than two seconds. If it takes longer, the mixed key and cache attack cannot be performed because the previous fragment(s) will be discarded, see
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/net/mac80211/rx.c?h=v5.13-rc4&id=8124c8a6b35386f73523d27eacb71b5364a68c4c#n2202
It may be useful to add this as a comment to the code.
Cheers,
Mathy
Quoted 39 lines · Pavel Machek
Hi!
Quoted 20 lines
From: Mathy Vanhoef <[email protected]>
commit
94034c40ab4a3fcf581fbc7f8fdf4e29943c4a24upstream.Simultaneously prevent mixed key attacks (CVE-2020-24587) and fragment cache attacks (CVE-2020-24586). This is accomplished by assigning a unique color to every key (per interface) and using this to track which key was used to decrypt a fragment. When reassembling frames, it is now checked whether all fragments were decrypted using the same key.
To assure that fragment cache attacks are also prevented, the ID that is assigned to keys is unique even over (re)associations and (re)connects. This means fragments separated by a (re)association or (re)connect will not be reassembled. Because mac80211 now also prevents the reassembly of mixed encrypted and plaintext fragments, all cache attacks are prevented.
net/mac80211/key.c int ieee80211_key_link(struct ieee80211_ · line 803
Quoted 5 lines
net/mac80211/key.c +1
-0@@ -799,6 +799,7 @@ int ieee80211_key_link(struct ieee80211_struct ieee80211_sub_if_data *sdata, struct sta_info *sta) { + static atomic_t key_color = ATOMIC_INIT(0);struct ieee80211_key *old_key;This is nice and simple, but does not include any kind of overflow handling. sparc32 moved away from 24-bit atomics, which is good I guess. OTOH if this is incremented 10 times a second, we'll still overflow in 6 years or so. Can attacker make it overflow?
Should this have a note why overflow is not possible / why it is not a problem?
Best regards,
Pavel
Greg Kroah-Hartman
maintainerPATCH 25/252 mac80211: properly handle A-MSDUs that start with an RFC 1042 header
In reply to Greg Kroah-HartmanFrom: Mathy Vanhoef <[email protected]>
commit a1d5ff5651ea592c67054233b14b30bf4452999c upstream.
Properly parse A-MSDUs whose first 6 bytes happen to equal a rfc1042 header. This can occur in practice when the destination MAC address equals AA:AA:03:00:00:00. More importantly, this simplifies the next patch to mitigate A-MSDU injection attacks.
--- include/net/cfg80211.h | 4 ++-- net/mac80211/rx.c | 2 +- net/wireless/util.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
include/net/cfg80211.h +2 -2
@@ -5624,7 +5624,7 @@ unsigned int ieee80211_get_mesh_hdrlen(s*/ int ieee80211_data_to_8023_exthdr (struct sk_buff *skb,struct ethhdr *ehdr,const u8 *addr,enum nl80211_iftype iftype, -u8 data_offset); +u8 data_offset,bool is_amsdu);/** * ieee80211_data_to_8023 - convert an 802.11 data frame to 802.3
@@ -5636,7 +5636,7 @@ int ieee80211_data_to_8023_exthdr(structstatic inline int ieee80211_data_to_8023 (struct sk_buff *skb,const u8 *addr,enum nl80211_iftype iftype) { -return ieee80211_data_to_8023_exthdr (skb,NULL , addr, iftype,0 ); +return ieee80211_data_to_8023_exthdr (skb,NULL , addr, iftype,0 , false); }/**
net/mac80211/rx.c +1 -1
@@ -2692,7 +2692,7 @@ __ieee80211_rx_h_amsdu(struct ieee80211_if (ieee80211_data_to_8023_exthdr (skb, ðhdr, rx->sdata->vif.addr, rx->sdata->vif.type, - data_offset)) + data_offset, true))return RX_DROP_UNUSABLE ; ieee80211_amsdu_to_8023s(skb, &frame_list, dev->dev_addr,
net/wireless/util.c +2 -2
@@ -541,7 +541,7 @@ EXPORT_SYMBOL(ieee80211_get_mesh_hdrlen)int ieee80211_data_to_8023_exthdr (struct sk_buff *skb,struct ethhdr *ehdr,const u8 *addr,enum nl80211_iftype iftype, -u8 data_offset) +u8 data_offset,bool is_amsdu) {struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;struct {
@@ -629,7 +629,7 @@ int ieee80211_data_to_8023_exthdr(structskb_copy_bits (skb, hdrlen, &payload,sizeof (payload)); tmp.h_proto = payload.proto; -if (likely ((ether_addr_equal (payload.hdr, rfc1042_header) && +if (likely ((!is_amsdu &ðer_addr_equal (payload.hdr, rfc1042_header) && tmp.h_proto !=htons (ETH_P_AARP ) && tmp.h_proto !=htons (ETH_P_IPX )) ||ether_addr_equal (payload.hdr, bridge_tunnel_header)))
Greg Kroah-Hartman
maintainerPATCH 26/252 cfg80211: mitigate A-MSDU aggregation attacks
In reply to Greg Kroah-HartmanFrom: Mathy Vanhoef <[email protected]>
commit 2b8a1fee3488c602aca8bea004a087e60806a5cf upstream.
Mitigate A-MSDU injection attacks (CVE-2020-24588) by detecting if the destination address of a subframe equals an RFC1042 (i.e., LLC/SNAP) header, and if so dropping the complete A-MSDU frame. This mitigates known attacks, although new (unknown) aggregation-based attacks may remain possible.
This defense works because in A-MSDU aggregation injection attacks, a normal encrypted Wi-Fi frame is turned into an A-MSDU frame. This means the first 6 bytes of the first A-MSDU subframe correspond to an RFC1042 header. In other words, the destination MAC address of the first A-MSDU subframe contains the start of an RFC1042 header during an aggregation attack. We can detect this and thereby prevent this specific attack. For details, see Section 7.2 of "Fragment and Forge: Breaking Wi-Fi Through Frame Aggregation and Fragmentation".
Note that for kernel 4.9 and above this patch depends on "mac80211:
properly handle A-MSDUs that start with a rfc1042 header". Otherwise this patch has no impact and attacks will remain possible.
--- net/wireless/util.c | 3 +++ 1 file changed, 3 insertions(+)
net/wireless/util.c +3 -0
@@ -771,6 +771,9 @@ void ieee80211_amsdu_to_8023s(struct sk_ remaining = skb->len - offset;if (subframe_len > remaining) goto purge; +/* mitigate A-MSDU aggregation injection attacks */ +if (ether_addr_equal (eth.h_dest, rfc1042_header)) + goto purge; offset +=sizeof (struct ethhdr ); last = remaining <= subframe_len + padding;
Greg Kroah-Hartman
maintainerPATCH 27/252 mac80211: drop A-MSDUs on old ciphers
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
commit 270032a2a9c4535799736142e1e7c413ca7b836e upstream.
With old ciphers (WEP and TKIP) we shouldn't be using A-MSDUs since A-MSDUs are only supported if we know that they are, and the only practical way for that is HT support which doesn't support old ciphers.
However, we would normally accept them anyway. Since we check the MMIC before deaggregating A-MSDUs, and the A-MSDU bit in the QoS header is not protected in TKIP (or WEP), this enables attacks similar to CVE-2020-24588. To prevent that, drop A-MSDUs completely with old ciphers.
--- net/mac80211/rx.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
net/mac80211/rx.c +18 -1
@@ -6,7 +6,7 @@* Copyright 2007-2010 Johannes Berg <[email protected]> * Copyright 2013-2014 Intel Mobile Communications GmbH * Copyright(c) 2015 - 2017 Intel Deutschland GmbH -* Copyright (C) 2018-2020 Intel Corporation +* Copyright (C) 2018-2021 Intel Corporation */ #include <linux/jiffies.h>
@@ -2749,6 +2749,23 @@ ieee80211_rx_h_amsdu(struct ieee80211_rxif (is_multicast_ether_addr (hdr->addr1))return RX_DROP_UNUSABLE ; +if (rx->key) { +/* +* We should not receive A-MSDUs on pre-HT connections, +* and HT connections cannot use old ciphers. Thus drop +* them, as in those cases we couldn't even have SPP +* A-MSDUs or such. +*/ +switch (rx->key->conf.cipher) { +case WLAN_CIPHER_SUITE_WEP40 : +case WLAN_CIPHER_SUITE_WEP104 : +case WLAN_CIPHER_SUITE_TKIP : +return RX_DROP_UNUSABLE ; +default : +break ; + } + } +return __ieee80211_rx_h_amsdu (rx,0 ); }
Greg Kroah-Hartman
maintainerPATCH 28/252 mac80211: add fragment cache to sta_info
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
commit 3a11ce08c45b50d69c891d71760b7c5b92074709 upstream.
Prior patches protected against fragmentation cache attacks by coloring keys, but this shows that it can lead to issues when multiple stations use the same sequence number. Add a fragment cache to struct sta_info (in addition to the one in the interface) to separate fragments for different stations properly.
This then automatically clear most of the fragment cache when a station disconnects (or reassociates) from an AP, or when client interfaces disconnect from the network, etc.
On the way, also fix the comment there since this brings us in line with the recommendation in 802.11-2016 ("An AP should support ..."). Additionally, remove a useless condition (since there's no problem purging an already empty list).
--- net/mac80211/ieee80211_i.h | 26 ++++---------------------- net/mac80211/iface.c | 11 +++-------- net/mac80211/rx.c | 41 ++++++++++++++++++++++++++++++----------- net/mac80211/sta_info.c | 6 +++++- net/mac80211/sta_info.h | 32 +++++++++++++++++++++++++++++++- 5 files changed, 73 insertions(+), 43 deletions(-)
net/mac80211/ieee80211_i.h +4 -22
@@ -50,12 +50,6 @@ struct ieee80211_local;#define IEEE80211_ENCRYPT_HEADROOM 8#define IEEE80211_ENCRYPT_TAILROOM 18 -/* IEEE 802.11 (Ch. 9.5 Defragmentation) requires support for concurrent -* reception of at least three fragmented frames. This limit can be increased -* by changing this define, at the cost of slower frame reassembly and -* increased memory use (about 2 kB of RAM per entry). */ -#define IEEE80211_FRAGMENT_MAX 4 -/* power level hasn't been configured (or set to automatic) */ #define IEEE80211_UNSET_POWER_LEVEL INT_MIN
@@ -88,19 +82,6 @@ extern const u8 ieee80211_ac_to_qos_mask#define IEEE80211_MAX_NAN_INSTANCE_ID 255 -struct ieee80211_fragment_entry { -struct sk_buff_head skb_list; -unsigned long first_frag_time; -u16 seq; -u16 extra_len; -u16 last_frag; -u8 rx_queue; -bool check_sequential_pn;/* needed for CCMP/GCMP */ -u8 last_pn[6 ];/* PN of the last fragment if CCMP was used */ -unsigned int key_color; -}; - -struct ieee80211_bss {u32 device_ts_beacon, device_ts_presp;
@@ -907,9 +888,7 @@ struct ieee80211_sub_if_data {char name[IFNAMSIZ ]; -/* Fragment table for host-based reassembly */ -struct ieee80211_fragment_entry fragments[IEEE80211_FRAGMENT_MAX ]; -unsigned int fragment_next; +struct ieee80211_fragment_cache frags;/* TID bitmap for NoAck policy */ u16 noack_map;
@@ -2328,4 +2307,7 @@ u32 ieee80211_calc_expected_tx_airtime(s#define debug_noinline#endif +void ieee80211_init_frag_cache (struct ieee80211_fragment_cache *cache); +void ieee80211_destroy_frag_cache (struct ieee80211_fragment_cache *cache); +#endif /* IEEE80211_I_H */
net/mac80211/iface.c +3 -8
@@ -8,7 +8,7 @@* Copyright 2008, Johannes Berg <[email protected]> * Copyright 2013-2014 Intel Mobile Communications GmbH * Copyright (c) 2016 Intel Deutschland GmbH -* Copyright (C) 2018-2020 Intel Corporation +* Copyright (C) 2018-2021 Intel Corporation */ #include <linux/slab.h> #include <linux/kernel.h>
@@ -679,16 +679,12 @@ static void ieee80211_set_multicast_list*/ static void ieee80211_teardown_sdata (struct ieee80211_sub_if_data *sdata) { -int i; -/* free extra data */ ieee80211_free_keys (sdata, false);ieee80211_debugfs_remove_netdev (sdata); -for (i =0 ; i <IEEE80211_FRAGMENT_MAX ; i++) -__skb_queue_purge (&sdata->fragments[i].skb_list); - sdata->fragment_next =0 ; +ieee80211_destroy_frag_cache (&sdata->frags);if (ieee80211_vif_is_mesh (&sdata->vif))ieee80211_mesh_teardown_sdata (sdata);
@@ -1950,8 +1946,7 @@ int ieee80211_if_add(struct ieee80211_lo sdata->wdev.wiphy = local->hw.wiphy; sdata->local = local; -for (i =0 ; i <IEEE80211_FRAGMENT_MAX ; i++) -skb_queue_head_init (&sdata->fragments[i].skb_list); +ieee80211_init_frag_cache (&sdata->frags);INIT_LIST_HEAD (&sdata->key_list);
net/mac80211/rx.c +30 -11
96 lines not on this page · raw message
net/mac80211/sta_info.c +5 -1
@@ -4,7 +4,7 @@* Copyright 2006-2007 Jiri Benc <[email protected]> * Copyright 2013-2014 Intel Mobile Communications GmbH * Copyright (C) 2015 - 2017 Intel Deutschland GmbH -* Copyright (C) 2018-2020 Intel Corporation +* Copyright (C) 2018-2021 Intel Corporation */ #include <linux/module.h>
@@ -392,6 +392,8 @@ struct sta_info *sta_info_alloc(struct iu64_stats_init (&sta->rx_stats.syncp); +ieee80211_init_frag_cache (&sta->frags); + sta->sta_state =IEEE80211_STA_NONE ;/* Mark TID as unreserved */
@@ -1102,6 +1104,8 @@ static void __sta_info_destroy_part2(strieee80211_sta_debugfs_remove (sta); +ieee80211_destroy_frag_cache (&sta->frags); +cleanup_single_sta (sta); }
net/mac80211/sta_info.h +31 -1
@@ -3,7 +3,7 @@* Copyright 2002-2005, Devicescape Software, Inc. * Copyright 2013-2014 Intel Mobile Communications GmbH * Copyright(c) 2015-2017 Intel Deutschland GmbH -* Copyright(c) 2020 Intel Corporation +* Copyright(c) 2020-2021 Intel Corporation */ #ifndef STA_INFO_H
@@ -437,6 +437,33 @@ struct ieee80211_sta_rx_stats { };/* +* IEEE 802.11-2016 (10.6 "Defragmentation") recommends support for "concurrent +* reception of at least one MSDU per access category per associated STA" +* on APs, or "at least one MSDU per access category" on other interface types. +* +* This limit can be increased by changing this define, at the cost of slower +* frame reassembly and increased memory use while fragments are pending. +*/ +#define IEEE80211_FRAGMENT_MAX 4 + +struct ieee80211_fragment_entry { +struct sk_buff_head skb_list; +unsigned long first_frag_time; +u16 seq; +u16 extra_len; +u16 last_frag; +u8 rx_queue; +bool check_sequential_pn;/* needed for CCMP/GCMP */ +u8 last_pn[6 ];/* PN of the last fragment if CCMP was used */ +unsigned int key_color; +}; + +struct ieee80211_fragment_cache { +struct ieee80211_fragment_entry entries[IEEE80211_FRAGMENT_MAX ]; +unsigned int next; +}; + +/* * The bandwidth threshold below which the per-station CoDel parameters will be * scaled to be more lenient (to prevent starvation of slow stations). This * value will be scaled by the number of active stations when it is being
@@ -529,6 +556,7 @@ struct ieee80211_sta_rx_stats {* @status_stats.last_ack_signal: last ACK signal * @status_stats.ack_signal_filled: last ACK signal validity * @status_stats.avg_ack_signal: average ACK signal +* @frags: fragment cache */ struct sta_info {/* General information, mostly static */
@@ -637,6 +665,8 @@ struct sta_info {struct cfg80211_chan_def tdls_chandef; +struct ieee80211_fragment_cache frags; +/* keep last! */ struct ieee80211_sta sta; };
Greg Kroah-Hartman
maintainerPATCH 29/252 mac80211: check defrag PN against current frame
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
commit bf30ca922a0c0176007e074b0acc77ed345e9990 upstream.
As pointed out by Mathy Vanhoef, we implement the RX PN check on fragmented frames incorrectly - we check against the last received PN prior to the new frame, rather than to the one in this frame itself.
Prior patches addressed the security issue here, but in order to be able to reason better about the code, fix it to really compare against the current frame's PN, not the last stored one.
--- net/mac80211/ieee80211_i.h | 11 +++++++++-- net/mac80211/rx.c | 5 ++--- net/mac80211/wpa.c | 13 +++++++++---- 3 files changed, 20 insertions(+), 9 deletions(-)
net/mac80211/ieee80211_i.h +9 -2
@@ -223,8 +223,15 @@ struct ieee80211_rx_data {*/ int security_idx; -u32 tkip_iv32; -u16 tkip_iv16; +union { +struct { +u32 iv32; +u16 iv16; + } tkip; +struct { +u8 pn[IEEE80211_CCMP_PN_LEN ]; + } ccm_gcm; + }; };struct ieee80211_csa_settings {
net/mac80211/rx.c +2 -3
@@ -2318,7 +2318,6 @@ ieee80211_rx_h_defragment(struct ieee802if (entry->check_sequential_pn) {int i;u8 pn[IEEE80211_CCMP_PN_LEN ], *rpn; -int queue;if (!requires_sequential_pn (rx, fc))return RX_DROP_UNUSABLE ;
@@ -2333,8 +2332,8 @@ ieee80211_rx_h_defragment(struct ieee802if (pn[i])break ; } - queue = rx->security_idx; - rpn = rx->key->u.ccmp.rx_pn[queue]; + + rpn = rx->ccm_gcm.pn;if (memcmp (pn, rpn,IEEE80211_CCMP_PN_LEN ))return RX_DROP_UNUSABLE ;memcpy (entry->last_pn, pn,IEEE80211_CCMP_PN_LEN );
net/mac80211/wpa.c +9 -4
@@ -3,6 +3,7 @@* Copyright 2002-2004, Instant802 Networks, Inc. * Copyright 2008, Jouni Malinen <[email protected]> * Copyright (C) 2016-2017 Intel Deutschland GmbH +* Copyright (C) 2020-2021 Intel Corporation */ #include <linux/netdevice.h>
@@ -167,8 +168,8 @@ ieee80211_rx_h_michael_mic_verify(struct update_iv:/* update IV in key information to be able to detect replays */ - rx->key->u.tkip.rx[rx->security_idx].iv32 = rx->tkip_iv32; - rx->key->u.tkip.rx[rx->security_idx].iv16 = rx->tkip_iv16; + rx->key->u.tkip.rx[rx->security_idx].iv32 = rx->tkip.iv32; + rx->key->u.tkip.rx[rx->security_idx].iv16 = rx->tkip.iv16;return RX_CONTINUE ;
@@ -294,8 +295,8 @@ ieee80211_crypto_tkip_decrypt(struct iee key, skb->data + hdrlen, skb->len - hdrlen, rx->sta->sta.addr, hdr->addr1, hwaccel, rx->security_idx, - &rx->tkip_iv32, - &rx->tkip_iv16); + &rx->tkip.iv32, + &rx->tkip.iv16);if (res !=TKIP_DECRYPT_OK )return RX_DROP_UNUSABLE ;
@@ -553,6 +554,8 @@ ieee80211_crypto_ccmp_decrypt(struct iee }memcpy (key->u.ccmp.rx_pn[queue], pn,IEEE80211_CCMP_PN_LEN ); +if (unlikely (ieee80211_is_frag (hdr))) +memcpy (rx->ccm_gcm.pn, pn,IEEE80211_CCMP_PN_LEN ); }/* Remove CCMP header and MIC */
@@ -781,6 +784,8 @@ ieee80211_crypto_gcmp_decrypt(struct iee }memcpy (key->u.gcmp.rx_pn[queue], pn,IEEE80211_GCMP_PN_LEN ); +if (unlikely (ieee80211_is_frag (hdr))) +memcpy (rx->ccm_gcm.pn, pn,IEEE80211_CCMP_PN_LEN ); }/* Remove GCMP header and MIC */
Greg Kroah-Hartman
maintainerPATCH 30/252 mac80211: prevent attacks on TKIP/WEP as well
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
commit 7e44a0b597f04e67eee8cdcbe7ee706c6f5de38b upstream.
Similar to the issues fixed in previous patches, TKIP and WEP should be protected even if for TKIP we have the Michael MIC protecting it, and WEP is broken anyway.
However, this also somewhat protects potential other algorithms that drivers might implement.
--- net/mac80211/rx.c | 12 ++++++++++++ net/mac80211/sta_info.h | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-)
net/mac80211/rx.c +12 -0
@@ -2284,6 +2284,7 @@ ieee80211_rx_h_defragment(struct ieee802* next fragment has a sequential PN value. */ entry->check_sequential_pn = true; + entry->is_protected = true; entry->key_color = rx->key->color; memcpy(entry->last_pn, rx->key->u.ccmp.rx_pn[queue],
@@ -2296,6 +2297,9 @@ ieee80211_rx_h_defragment(struct ieee802 sizeof(rx->key->u.gcmp.rx_pn[queue]));BUILD_BUG_ON (IEEE80211_CCMP_PN_LEN !=IEEE80211_GCMP_PN_LEN ); + }else if (rx->key &&ieee80211_has_protected (fc)) { + entry->is_protected = true; + entry->key_color = rx->key->color; }return RX_QUEUED ; }
@@ -2337,6 +2341,14 @@ ieee80211_rx_h_defragment(struct ieee802if (memcmp (pn, rpn,IEEE80211_CCMP_PN_LEN ))return RX_DROP_UNUSABLE ;memcpy (entry->last_pn, pn,IEEE80211_CCMP_PN_LEN ); + }else if (entry->is_protected && + (!rx->key || !ieee80211_has_protected (fc) || + rx->key->color != entry->key_color)) { +/* Drop this as a mixed key or fragment cache attack, even +* if for TKIP Michael MIC should protect us, and WEP is a +* lost cause anyway. +*/ +return RX_DROP_UNUSABLE ; }skb_pull (rx->skb,ieee80211_hdrlen (fc));
net/mac80211/sta_info.h +2 -1
@@ -453,7 +453,8 @@ struct ieee80211_fragment_entry {u16 extra_len;u16 last_frag;u8 rx_queue; -bool check_sequential_pn;/* needed for CCMP/GCMP */ + u8 check_sequential_pn:1, /* needed for CCMP/GCMP */ + is_protected:1;u8 last_pn[6 ];/* PN of the last fragment if CCMP was used */ unsigned int key_color; };
Re: [PATCH 5.10 030/252] mac80211: prevent attacks on TKIP/WEP as well
Hi!
So this changes bool variables to u8:1, but still assigns true/false there, which looks like "interesting" style. Should we switch to 0/1?
Best regards,
Pavel
Quoted 48 lines
net/mac80211/rx.c +12
-0@@ -2284,6 +2284,7 @@ ieee80211_rx_h_defragment(struct ieee802* next fragment has a sequential PN value. */ entry->check_sequential_pn = true; + entry->is_protected = true; entry->key_color = rx->key->color; memcpy(entry->last_pn, rx->key->u.ccmp.rx_pn[queue],@@ -2296,6 +2297,9 @@ ieee80211_rx_h_defragment(struct ieee802 sizeof(rx->key->u.gcmp.rx_pn[queue]));BUILD_BUG_ON (IEEE80211_CCMP_PN_LEN !=IEEE80211_GCMP_PN_LEN ); + }else if (rx->key &&ieee80211_has_protected (fc)) { + entry->is_protected = true; + entry->key_color = rx->key->color; }return RX_QUEUED ; }@@ -2337,6 +2341,14 @@ ieee80211_rx_h_defragment(struct ieee802if (memcmp (pn, rpn,IEEE80211_CCMP_PN_LEN ))return RX_DROP_UNUSABLE ;memcpy (entry->last_pn, pn,IEEE80211_CCMP_PN_LEN ); + }else if (entry->is_protected && + (!rx->key || !ieee80211_has_protected (fc) || + rx->key->color != entry->key_color)) { +/* Drop this as a mixed key or fragment cache attack, even +* if for TKIP Michael MIC should protect us, and WEP is a +* lost cause anyway. +*/ +return RX_DROP_UNUSABLE ; }skb_pull (rx->skb,ieee80211_hdrlen (fc));net/mac80211/sta_info.h +2
-1@@ -453,7 +453,8 @@ struct ieee80211_fragment_entry {u16 extra_len;u16 last_frag;u8 rx_queue; -bool check_sequential_pn;/* needed for CCMP/GCMP */ + u8 check_sequential_pn:1, /* needed for CCMP/GCMP */ + is_protected:1;u8 last_pn[6 ];/* PN of the last fragment if CCMP was used */ unsigned int key_color; };
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Greg Kroah-Hartman
maintainerPATCH 31/252 mac80211: do not accept/forward invalid EAPOL frames
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
commit a8c4d76a8dd4fb9666fc8919a703d85fb8f44ed8 upstream.
EAPOL frames are used for authentication and key management between the AP and each individual STA associated in the BSS. Those frames are not supposed to be sent by one associated STA to another associated STA (either unicast for broadcast/multicast).
Similarly, in 802.11 they're supposed to be sent to the authenticator (AP) address.
Since it is possible for unexpected EAPOL frames to result in misbehavior in supplicant implementations, it is better for the AP to not allow such cases to be forwarded to other clients either directly, or indirectly if the AP interface is part of a bridge.
Accept EAPOL (control port) frames only if they're transmitted to the own address, or, due to interoperability concerns, to the PAE group address.
Disable forwarding of EAPOL (or well, the configured control port protocol) frames back to wireless medium in all cases. Previously, these frames were accepted from fully authenticated and authorized stations and also from unauthenticated stations for one of the cases.
Additionally, to avoid forwarding by the bridge, rewrite the PAE group address case to the local MAC address.
--- net/mac80211/rx.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-)
net/mac80211/rx.c +27 -6
@@ -2541,13 +2541,13 @@ static bool ieee80211_frame_allowed(strustruct ethhdr *ehdr = (struct ethhdr *) rx->skb->data;/* -* Allow EAPOL frames to us/the PAE group address regardless -* of whether the frame was encrypted or not. +* Allow EAPOL frames to us/the PAE group address regardless of +* whether the frame was encrypted or not, and always disallow +* all other destination addresses for them. */ -if (ehdr->h_proto == rx->sdata->control_port_protocol && - (ether_addr_equal (ehdr->h_dest, rx->sdata->vif.addr) || -ether_addr_equal (ehdr->h_dest, pae_group_addr))) -return true; +if (unlikely (ehdr->h_proto == rx->sdata->control_port_protocol)) +return ether_addr_equal (ehdr->h_dest, rx->sdata->vif.addr) || +ether_addr_equal (ehdr->h_dest, pae_group_addr);if (ieee80211_802_1x_port_control (rx) ||ieee80211_drop_unencrypted (rx, fc))
@@ -2572,8 +2572,28 @@ static void ieee80211_deliver_skb_to_loccfg80211_rx_control_port (dev, skb, noencrypt);dev_kfree_skb (skb); }else { +struct ethhdr *ehdr = (void *)skb_mac_header (skb); +memset (skb->cb,0 ,sizeof (skb->cb)); +/* +* 802.1X over 802.11 requires that the authenticator address +* be used for EAPOL frames. However, 802.1X allows the use of +* the PAE group address instead. If the interface is part of +* a bridge and we pass the frame with the PAE group address, +* then the bridge will forward it to the network (even if the +* client was not associated yet), which isn't supposed to +* happen. +* To avoid that, rewrite the destination address to our own +* address, so that the authenticator (e.g. hostapd) will see +* the frame, but bridge won't forward it anywhere else. Note +* that due to earlier filtering, the only other address can +* be the PAE group address. +*/ +if (unlikely (skb->protocol == sdata->control_port_protocol && + !ether_addr_equal (ehdr->h_dest, sdata->vif.addr))) +ether_addr_copy (ehdr->h_dest, sdata->vif.addr); +/* deliver to local stack */ if (rx->list)list_add_tail (&skb->list, rx->list);
@@ -2613,6 +2633,7 @@ ieee80211_deliver_skb(struct ieee80211_rif ((sdata->vif.type ==NL80211_IFTYPE_AP || sdata->vif.type ==NL80211_IFTYPE_AP_VLAN ) && !(sdata->flags &IEEE80211_SDATA_DONT_BRIDGE_PACKETS ) && + ehdr->h_proto != rx->sdata->control_port_protocol && (sdata->vif.type !=NL80211_IFTYPE_AP_VLAN || !sdata->u.vlan.sta)) {if (is_multicast_ether_addr (ehdr->h_dest) &&ieee80211_vif_get_num_mcast_if (sdata) !=0 ) {
Greg Kroah-Hartman
maintainerPATCH 32/252 mac80211: extend protection against mixed key and fragment cache attacks
In reply to Greg Kroah-HartmanFrom: Wen Gong <[email protected]>
commit 3edc6b0d6c061a70d8ca3c3c72eb1f58ce29bfb1 upstream.
For some chips/drivers, e.g., QCA6174 with ath10k, the decryption is done by the hardware, and the Protected bit in the Frame Control field is cleared in the lower level driver before the frame is passed to mac80211. In such cases, the condition for ieee80211_has_protected() is not met in ieee80211_rx_h_defragment() of mac80211 and the new security validation steps are not executed.
Extend mac80211 to cover the case where the Protected bit has been cleared, but the frame is indicated as having been decrypted by the hardware. This extends protection against mixed key and fragment cache attack for additional drivers/chips. This fixes CVE-2020-24586 and CVE-2020-24587 for such cases.
Tested-on: QCA6174 hw3.2 PCI WLAN.RM.4.4.1-00110-QCARMSWP-1
--- net/mac80211/rx.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
net/mac80211/rx.c +11 -2
@@ -2239,6 +2239,7 @@ ieee80211_rx_h_defragment(struct ieee802unsigned int frag, seq;struct ieee80211_fragment_entry *entry;struct sk_buff *skb; +struct ieee80211_rx_status *status =IEEE80211_SKB_RXCB (rx->skb); hdr = (struct ieee80211_hdr *)rx->skb->data; fc = hdr->frame_control;
@@ -2297,7 +2298,9 @@ ieee80211_rx_h_defragment(struct ieee802 sizeof(rx->key->u.gcmp.rx_pn[queue]));BUILD_BUG_ON (IEEE80211_CCMP_PN_LEN !=IEEE80211_GCMP_PN_LEN ); - }else if (rx->key &&ieee80211_has_protected (fc)) { + }else if (rx->key && + (ieee80211_has_protected (fc) || + (status->flag &RX_FLAG_DECRYPTED ))) { entry->is_protected = true; entry->key_color = rx->key->color; }
@@ -2342,13 +2345,19 @@ ieee80211_rx_h_defragment(struct ieee802return RX_DROP_UNUSABLE ;memcpy (entry->last_pn, pn,IEEE80211_CCMP_PN_LEN ); }else if (entry->is_protected && - (!rx->key || !ieee80211_has_protected (fc) || + (!rx->key || + (!ieee80211_has_protected (fc) && + !(status->flag &RX_FLAG_DECRYPTED )) || rx->key->color != entry->key_color)) {/* Drop this as a mixed key or fragment cache attack, even * if for TKIP Michael MIC should protect us, and WEP is a * lost cause anyway. */ return RX_DROP_UNUSABLE ; + }else if (entry->is_protected && rx->key && + entry->key_color != rx->key->color && + (status->flag &RX_FLAG_DECRYPTED )) { +return RX_DROP_UNUSABLE ; }skb_pull (rx->skb,ieee80211_hdrlen (fc));
Greg Kroah-Hartman
maintainerPATCH 33/252 ath10k: add CCMP PN replay protection for fragmented frames for PCIe
In reply to Greg Kroah-HartmanFrom: Wen Gong <[email protected]>
commit a1166b2653db2f3de7338b9fb8a0f6e924b904ee upstream.
PN replay check for not fragmented frames is finished in the firmware, but this was not done for fragmented frames when ath10k is used with QCA6174/QCA6377 PCIe. mac80211 has the function ieee80211_rx_h_defragment() for PN replay check for fragmented frames, but this does not get checked with QCA6174 due to the ieee80211_has_protected() condition not matching the cleared Protected bit case.
Validate the PN of received fragmented frames within ath10k when CCMP is used and drop the fragment if the PN is not correct (incremented by exactly one from the previous fragment). This applies only for QCA6174/QCA6377 PCIe.
Tested-on: QCA6174 hw3.2 PCI WLAN.RM.4.4.1-00110-QCARMSWP-1
--- drivers/net/wireless/ath/ath10k/htt.h | 1 drivers/net/wireless/ath/ath10k/htt_rx.c | 99 +++++++++++++++++++++++++++++-- 2 files changed, 96 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath10k/htt.h +1 -0
@@ -845,6 +845,7 @@ enum htt_security_types {#define ATH10K_HTT_TXRX_PEER_SECURITY_MAX 2#define ATH10K_TXRX_NUM_EXT_TIDS 19 +#define ATH10K_TXRX_NON_QOS_TID 16enum htt_security_flags {#define HTT_SECURITY_TYPE_MASK 0x7F
drivers/net/wireless/ath/ath10k/htt_rx.c +95 -4
137 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 34/252 ath10k: drop fragments with multicast DA for PCIe
In reply to Greg Kroah-HartmanFrom: Wen Gong <[email protected]>
commit 65c415a144ad8132b6a6d97d4a1919ffc728e2d1 upstream.
Fragmentation is not used with multicast frames. Discard unexpected fragments with multicast DA. This fixes CVE-2020-26145.
Tested-on: QCA6174 hw3.2 PCI WLAN.RM.4.4.1-00110-QCARMSWP-1
--- drivers/net/wireless/ath/ath10k/htt_rx.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath10k/htt_rx.c +20 -3
@@ -1768,6 +1768,16 @@ static u64 ath10k_htt_rx_h_get_pn(structreturn pn; } +static bool ath10k_htt_rx_h_frag_multicast_check (struct ath10k *ar, +struct sk_buff *skb, +u16 offset) +{ +struct ieee80211_hdr *hdr; + + hdr = (struct ieee80211_hdr *)(skb->data + offset); +return !is_multicast_ether_addr (hdr->addr1); +} + static bool ath10k_htt_rx_h_frag_pn_check(struct ath10k *ar, struct sk_buff *skb, u16 peer_id,
@@ -1839,7 +1849,7 @@ static void ath10k_htt_rx_h_mpdu(structbool is_decrypted;bool is_mgmt;u32 attention; -bool frag_pn_check = true; +bool frag_pn_check = true, multicast_check = true;if (skb_queue_empty (amsdu))return ;
@@ -1946,13 +1956,20 @@ static void ath10k_htt_rx_h_mpdu(struct0 , enctype); -if (!frag_pn_check) { -/* Discard the fragment with invalid PN */ +if (frag) + multicast_check =ath10k_htt_rx_h_frag_multicast_check (ar, + msdu, +0 ); + +if (!frag_pn_check || !multicast_check) { +/* Discard the fragment with invalid PN or multicast DA +*/ temp = msdu->prev;__skb_unlink (msdu, amsdu);dev_kfree_skb_any (msdu); msdu = temp; frag_pn_check = true; + multicast_check = true;continue ; }
Greg Kroah-Hartman
maintainerPATCH 35/252 ath10k: drop fragments with multicast DA for SDIO
In reply to Greg Kroah-HartmanFrom: Wen Gong <[email protected]>
commit 40e7462dad6f3d06efdb17d26539e61ab6e34db1 upstream.
Fragmentation is not used with multicast frames. Discard unexpected fragments with multicast DA. This fixes CVE-2020-26145.
Tested-on: QCA6174 hw3.2 SDIO WLAN.RMH.4.4.1-00049
--- drivers/net/wireless/ath/ath10k/htt_rx.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath10k/htt_rx.c +7 -2
@@ -2617,6 +2617,13 @@ static bool ath10k_htt_rx_proc_rx_frag_i rx_desc = (struct htt_hl_rx_desc *)(skb->data + tot_hdr_len); rx_desc_info =__le32_to_cpu (rx_desc->info); + hdr = (struct ieee80211_hdr *)((u8 *)rx_desc + rx_hl->fw_desc.len); + +if (is_multicast_ether_addr (hdr->addr1)) { +/* Discard the fragment with multicast DA */ + goto err; + } +if (!MS (rx_desc_info,HTT_RX_DESC_HL_INFO_ENCRYPTED )) {spin_unlock_bh (&ar->data_lock); return ath10k_htt_rx_proc_rx_ind_hl(htt, &resp->rx_ind_hl, skb,
@@ -2624,8 +2631,6 @@ static bool ath10k_htt_rx_proc_rx_frag_i HTT_RX_NON_TKIP_MIC); } - hdr = (struct ieee80211_hdr *)((u8 *)rx_desc + rx_hl->fw_desc.len); -if (ieee80211_has_retry (hdr->frame_control)) goto err;
Greg Kroah-Hartman
maintainerPATCH 36/252 ath10k: drop MPDU which has discard flag set by firmware for SDIO
In reply to Greg Kroah-HartmanFrom: Wen Gong <[email protected]>
commit 079a108feba474b4b32bd3471db03e11f2f83b81 upstream.
When the discard flag is set by the firmware for an MPDU, it should be dropped. This allows a mitigation for CVE-2020-24588 to be implemented in the firmware.
Tested-on: QCA6174 hw3.2 SDIO WLAN.RMH.4.4.1-00049
--- drivers/net/wireless/ath/ath10k/htt_rx.c | 5 +++++ drivers/net/wireless/ath/ath10k/rx_desc.h | 14 +++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/htt_rx.c +5 -0
@@ -2312,6 +2312,11 @@ static bool ath10k_htt_rx_proc_rx_ind_hl fw_desc = &rx->fw_desc; rx_desc_len = fw_desc->len; +if (fw_desc->u.bits.discard) { +ath10k_dbg (ar,ATH10K_DBG_HTT ,"htt discard mpdu\n" ); + goto err; + } +/* I have not yet seen any case where num_mpdu_ranges > 1. * qcacld does not seem handle that case either, so we introduce the * same limitiation here as well.
drivers/net/wireless/ath/ath10k/rx_desc.h +13 -1
@@ -1282,7 +1282,19 @@ struct fw_rx_desc_base {#define FW_RX_DESC_UDP (1 << 6)struct fw_rx_desc_hl { -u8 info0; +union { +struct { +u8 discard:1 , + forward:1 , + any_err:1 , + dup_err:1 , + reserved:1 , + inspect:1 , + extension:2 ; + } bits; +u8 info0; + } u; +u8 version;u8 len;u8 flags;
Re: [PATCH 5.10 036/252] ath10k: drop MPDU which has discard flag set by firmware for SDIO
Hi!
Quoted 7 lines
commit
079a108feba474b4b32bd3471db03e11f2f83b81upstream.When the discard flag is set by the firmware for an MPDU, it should be dropped. This allows a mitigation for CVE-2020-24588 to be implemented in the firmware.
Tested-on: QCA6174 hw3.2 SDIO WLAN.RMH.4.4.1-00049
This introduces bitfields for communication with firmware.
Quoted 9 lines
+++
b/drivers/net/wireless/ath/ath10k/rx_desc.hdrivers/net/wireless/ath/ath10k/rx_desc.h +3
-1@@ -1282,7 +1282,19 @@ struct fw_rx_desc_base {#define FW_RX_DESC_UDP (1 << 6) struct fw_rx_desc_hl { -u8 info0; + union { + struct { + u8 discard:1,
drivers/net/wireless/ath/ath10k/rx_desc.h struct fw_rx_desc_base { · line 1297
Quoted 10 lines
drivers/net/wireless/ath/ath10k/rx_desc.h +10
-0+ forward:1, + any_err:1, + dup_err:1, + reserved:1, + inspect:1, + extension:2; + } bits; +u8 info0; + } u; +
That is a) quite unusual (see the define just above) and b) very fragile AFAICT. Compilers on LE and BE machines behave differently, for example. Should it use usual bit manipulation functions?
Best regards,
Pavel
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Re: [PATCH 5.10 036/252] ath10k: drop MPDU which has discard flag set by firmware for SDIO
A follow-up patch would, I think, be needed to fix this for big endian architectures.
Greg Kroah-Hartman
maintainerPATCH 37/252 ath10k: Fix TKIP Michael MIC verification for PCIe
In reply to Greg Kroah-HartmanFrom: Wen Gong <[email protected]>
commit 0dc267b13f3a7e8424a898815dd357211b737330 upstream.
TKIP Michael MIC was not verified properly for PCIe cases since the validation steps in ieee80211_rx_h_michael_mic_verify() in mac80211 did not get fully executed due to unexpected flag values in ieee80211_rx_status.
Fix this by setting the flags property to meet mac80211 expectations for performing Michael MIC validation there. This fixes CVE-2020-26141. It does the same as ath10k_htt_rx_proc_rx_ind_hl() for SDIO which passed MIC verification case. This applies only to QCA6174/QCA9377 PCIe.
Tested-on: QCA6174 hw3.2 PCI WLAN.RM.4.4.1-00110-QCARMSWP-1
--- drivers/net/wireless/ath/ath10k/htt_rx.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/net/wireless/ath/ath10k/htt_rx.c +10 -0
@@ -1974,6 +1974,11 @@ static void ath10k_htt_rx_h_mpdu(struct }ath10k_htt_rx_h_csum_offload (msdu); + +if (frag && !fill_crypt_header && + enctype ==HTT_RX_MPDU_ENCRYPT_TKIP_WPA ) + status->flag &= ~RX_FLAG_MMIC_STRIPPED ; +ath10k_htt_rx_h_undecap (ar, msdu, status, first_hdr, enctype, is_decrypted);
@@ -1991,6 +1996,11 @@ static void ath10k_htt_rx_h_mpdu(struct hdr = (void *)msdu->data; hdr->frame_control &= ~__cpu_to_le16 (IEEE80211_FCTL_PROTECTED ); + +if (frag && !fill_crypt_header && + enctype ==HTT_RX_MPDU_ENCRYPT_TKIP_WPA ) + status->flag &= ~RX_FLAG_IV_STRIPPED & + ~RX_FLAG_MMIC_STRIPPED ; } }
Greg Kroah-Hartman
maintainerPATCH 38/252 ath10k: Validate first subframe of A-MSDU before processing the list
In reply to Greg Kroah-HartmanFrom: Sriram R <[email protected]>
commit 62a8ff67eba52dae9b107e1fb8827054ed00a265 upstream.
In certain scenarios a normal MSDU can be received as an A-MSDU when the A-MSDU present bit of a QoS header gets flipped during reception. Since this bit is unauthenticated, the hardware crypto engine can pass the frame to the driver without any error indication.
This could result in processing unintended subframes collected in the A-MSDU list. Hence, validate A-MSDU list by checking if the first frame has a valid subframe header.
Comparing the non-aggregated MSDU and an A-MSDU, the fields of the first subframe DA matches the LLC/SNAP header fields of a normal MSDU. In order to avoid processing such frames, add a validation to filter such A-MSDU frames where the first subframe header DA matches with the LLC/SNAP header pattern.
Tested-on: QCA9984 hw1.0 PCI 10.4-3.10-00047
--- drivers/net/wireless/ath/ath10k/htt_rx.c | 61 ++++++++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath10k/htt_rx.c +57 -4
@@ -2108,14 +2108,62 @@ static void ath10k_htt_rx_h_unchain(struath10k_unchain_msdu (amsdu, unchain_cnt); } +static bool ath10k_htt_rx_validate_amsdu (struct ath10k *ar, +struct sk_buff_head *amsdu) +{ +u8 *subframe_hdr; +struct sk_buff *first; +bool is_first, is_last; +struct htt_rx_desc *rxd; +struct ieee80211_hdr *hdr; +size_t hdr_len, crypto_len; +enum htt_rx_mpdu_encrypt_type enctype; +int bytes_aligned = ar->hw_params.decap_align_bytes; + + first =skb_peek (amsdu); + + rxd = (void *)first->data -sizeof (*rxd); + hdr = (void *)rxd->rx_hdr_status; + + is_first = !!(rxd->msdu_end.common.info0 & +__cpu_to_le32 (RX_MSDU_END_INFO0_FIRST_MSDU )); + is_last = !!(rxd->msdu_end.common.info0 & +__cpu_to_le32 (RX_MSDU_END_INFO0_LAST_MSDU )); + +/* Return in case of non-aggregated msdu */ +if (is_first && is_last) +return true; + +/* First msdu flag is not set for the first msdu of the list */ +if (!is_first) +return false; + + enctype =MS (__le32_to_cpu (rxd->mpdu_start.info0), +RX_MPDU_START_INFO0_ENCRYPT_TYPE ); + + hdr_len =ieee80211_hdrlen (hdr->frame_control); + crypto_len =ath10k_htt_rx_crypto_param_len (ar, enctype); + + subframe_hdr = (u8 *)hdr +round_up (hdr_len, bytes_aligned) + + crypto_len; + +/* Validate if the amsdu has a proper first subframe. +* There are chances a single msdu can be received as amsdu when +* the unauthenticated amsdu flag of a QoS header +* gets flipped in non-SPP AMSDU's, in such cases the first +* subframe has llc/snap header in place of a valid da. +* return false if the da matches rfc1042 pattern +*/ +if (ether_addr_equal (subframe_hdr, rfc1042_header)) +return false; + +return true; +} +static bool ath10k_htt_rx_amsdu_allowed (struct ath10k *ar,struct sk_buff_head *amsdu,struct ieee80211_rx_status *rx_status) { -/* FIXME: It might be a good idea to do some fuzzy-testing to drop -* invalid/dangerous frames. -*/ -if (!rx_status->freq) {ath10k_dbg (ar,ATH10K_DBG_HTT ,"no channel configured; ignoring frame(s)!\n" );return false;
@@ -2126,6 +2174,11 @@ static bool ath10k_htt_rx_amsdu_allowed(return false; } +if (!ath10k_htt_rx_validate_amsdu (ar, amsdu)) { +ath10k_dbg (ar,ATH10K_DBG_HTT ,"invalid amsdu received\n" ); +return false; + } +return true; }
Greg Kroah-Hartman
maintainerPATCH 39/252 ath11k: Clear the fragment cache during key install
In reply to Greg Kroah-HartmanFrom: Sriram R <[email protected]>
commit c3944a5621026c176001493d48ee66ff94e1a39a upstream.
Currently the fragment cache setup during peer assoc is cleared only during peer delete. In case a key reinstallation happens with the same peer, the same fragment cache with old fragments added before key installation could be clubbed with fragments received after. This might be exploited to mix fragments of different data resulting in a proper unintended reassembled packet to be passed up the stack.
Hence flush the fragment cache on every key installation to prevent potential attacks (CVE-2020-24587).
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.4.0.1-01734-QCAHKSWPL_SILICONZ-1 v2
--- drivers/net/wireless/ath/ath11k/dp_rx.c | 18 ++++++++++++++++++ drivers/net/wireless/ath/ath11k/dp_rx.h | 1 + drivers/net/wireless/ath/ath11k/mac.c | 6 ++++++ 3 files changed, 25 insertions(+)
drivers/net/wireless/ath/ath11k/dp_rx.c +18 -0
@@ -832,6 +832,24 @@ static void ath11k_dp_rx_frags_cleanup(s__skb_queue_purge (&rx_tid->rx_frags); } +void ath11k_peer_frags_flush (struct ath11k *ar,struct ath11k_peer *peer) +{ +struct dp_rx_tid *rx_tid; +int i; + +lockdep_assert_held (&ar->ab->base_lock); + +for (i =0 ; i <=IEEE80211_NUM_TIDS ; i++) { + rx_tid = &peer->rx_tid[i]; + +spin_unlock_bh (&ar->ab->base_lock); +del_timer_sync (&rx_tid->frag_timer); +spin_lock_bh (&ar->ab->base_lock); + +ath11k_dp_rx_frags_cleanup (rx_tid, true); + } +} +void ath11k_peer_rx_tid_cleanup (struct ath11k *ar,struct ath11k_peer *peer) {struct dp_rx_tid *rx_tid;
drivers/net/wireless/ath/ath11k/dp_rx.h +1 -0
@@ -49,6 +49,7 @@ int ath11k_dp_peer_rx_pn_replay_config(sconst u8 *peer_addr, enum set_key_cmd key_cmd, struct ieee80211_key_conf *key); +void ath11k_peer_frags_flush (struct ath11k *ar,struct ath11k_peer *peer);void ath11k_peer_rx_tid_cleanup (struct ath11k *ar,struct ath11k_peer *peer);void ath11k_peer_rx_tid_delete (struct ath11k *ar,struct ath11k_peer *peer,u8 tid);
drivers/net/wireless/ath/ath11k/mac.c +6 -0
@@ -2525,6 +2525,12 @@ static int ath11k_mac_op_set_key(struct*/ spin_lock_bh (&ab->base_lock); peer =ath11k_peer_find (ab, arvif->vdev_id, peer_addr); + +/* flush the fragments cache during key (re)install to +* ensure all frags in the new frag list belong to the same key. +*/ +if (peer && cmd ==SET_KEY ) +ath11k_peer_frags_flush (ar, peer);spin_unlock_bh (&ab->base_lock);if (!peer) {
Greg Kroah-Hartman
maintainerPATCH 40/252 dm snapshot: properly fix a crash when an origin has no snapshots
In reply to Greg Kroah-HartmanFrom: Mikulas Patocka <[email protected]>
commit 7e768532b2396bcb7fbf6f82384b85c0f1d2f197 upstream.
If an origin target has no snapshots, o->split_boundary is set to 0. This causes BUG_ON(sectors <= 0) in block/bio.c:bio_split().
Fix this by initializing chunk_size, and in turn split_boundary, to rounddown_pow_of_two(UINT_MAX) -- the largest power of two that fits into "unsigned" type.
--- drivers/md/dm-snap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-snap.c +1 -1
@@ -854,7 +854,7 @@ static int dm_add_exception(void *contexstatic uint32_t __minimum_chunk_size (struct origin *o) {struct dm_snapshot *snap; -unsigned chunk_size =0 ; +unsigned chunk_size =rounddown_pow_of_two (UINT_MAX );if (o)list_for_each_entry (snap, &o->snapshots, list)
Greg Kroah-Hartman
maintainerPATCH 41/252 drm/amd/pm: correct MGpuFanBoost setting
In reply to Greg Kroah-HartmanFrom: Evan Quan <[email protected]>
commit 1a0b713c73688c6bafbe6faf8c90390b11b26fc6 upstream.
No MGpuFanBoost setting for those ASICs which do not support it. Otherwise, it may breaks their fan control feature.
--- drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 9 +++++++++ drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 10 ++++++++++ 2 files changed, 19 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +9 -0
@@ -2606,6 +2606,8 @@ static ssize_t navi10_get_gpu_metrics(ststatic int navi10_enable_mgpu_fan_boost (struct smu_context *smu) { +struct smu_table_context *table_context = &smu->smu_table; +PPTable_t *smc_pptable = table_context->driver_pptable;struct amdgpu_device *adev = smu->adev;uint32_t param =0 ;
@@ -2613,6 +2615,13 @@ static int navi10_enable_mgpu_fan_boost(if (adev->asic_type ==CHIP_NAVI12 )return 0 ; +/* +* Skip the MGpuFanBoost setting for those ASICs +* which do not support it +*/ +if (!smc_pptable->MGpuFanBoostLimitRpm) +return 0 ; +/* Workaround for WS SKU */ if (adev->pdev->device ==0x7312 && adev->pdev->revision ==0 )
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +10 -0
@@ -2715,6 +2715,16 @@ static ssize_t sienna_cichlid_get_gpu_mestatic int sienna_cichlid_enable_mgpu_fan_boost (struct smu_context *smu) { +struct smu_table_context *table_context = &smu->smu_table; +PPTable_t *smc_pptable = table_context->driver_pptable; + +/* +* Skip the MGpuFanBoost setting for those ASICs +* which do not support it +*/ +if (!smc_pptable->MGpuFanBoostLimitRpm) +return 0 ; + return smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_SetMGpuFanBoostLimitRpm, 0,
Greg Kroah-Hartman
maintainerPATCH 42/252 drm/amdgpu/vcn1: add cancel_delayed_work_sync before power gate
In reply to Greg Kroah-HartmanFrom: James Zhu <[email protected]>
commit b95f045ea35673572ef46d6483ad8bd6d353d63c upstream.
Add cancel_delayed_work_sync before set power gating state to avoid race condition issue when power gating.
--- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +5 -1
@@ -232,9 +232,13 @@ static int vcn_v1_0_hw_fini(void *handle {struct amdgpu_device *adev = (struct amdgpu_device *)handle; +cancel_delayed_work_sync (&adev->vcn.idle_work); +if ((adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG ) || -RREG32_SOC15 (VCN ,0 , mmUVD_STATUS)) + (adev->vcn.cur_state !=AMD_PG_STATE_GATE && +RREG32_SOC15 (VCN ,0 , mmUVD_STATUS))) {vcn_v1_0_set_powergating_state (adev,AMD_PG_STATE_GATE ); + }return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 43/252 drm/amdkfd: correct sienna_cichlid SDMA RLC register offset error
In reply to Greg Kroah-HartmanFrom: Kevin Wang <[email protected]>
commit ba515a5821dc0d101ded0379b14b1d1471ebfaba upstream.
1.correct KFD SDMA RLC queue register offset error.
(all sdma rlc register offset is base on SDMA0.RLC0_RLC0_RB_CNTL) 2.HQD_N_REGS (19+6+7+12)
12: the 2 more resgisters than navi1x (SDMAx_RLCy_MIDCMD_DATA{9,10})
the patch also can be fixed NULL pointer issue when read /sys/kernel/debug/kfd/hqds on sienna_cichlid chip.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c +6 -6
@@ -157,16 +157,16 @@ static uint32_t get_sdma_rlc_reg_offset( mmSDMA0_RLC0_RB_CNTL) - mmSDMA0_RLC0_RB_CNTL;break ;case 1 : - sdma_engine_reg_base =SOC15_REG_OFFSET (SDMA1 ,0 , + sdma_engine_reg_base =SOC15_REG_OFFSET (SDMA0 ,0 , mmSDMA1_RLC0_RB_CNTL) - mmSDMA0_RLC0_RB_CNTL;break ;case 2 : - sdma_engine_reg_base =SOC15_REG_OFFSET (SDMA2 ,0 , - mmSDMA2_RLC0_RB_CNTL) - mmSDMA2_RLC0_RB_CNTL; + sdma_engine_reg_base =SOC15_REG_OFFSET (SDMA0 ,0 , + mmSDMA2_RLC0_RB_CNTL) - mmSDMA0_RLC0_RB_CNTL;break ;case 3 : - sdma_engine_reg_base =SOC15_REG_OFFSET (SDMA3 ,0 , - mmSDMA3_RLC0_RB_CNTL) - mmSDMA2_RLC0_RB_CNTL; + sdma_engine_reg_base =SOC15_REG_OFFSET (SDMA0 ,0 , + mmSDMA3_RLC0_RB_CNTL) - mmSDMA0_RLC0_RB_CNTL;break ; }
@@ -451,7 +451,7 @@ static int hqd_sdma_dump_v10_3(struct kg engine_id, queue_id);uint32_t i =0 , reg;#undef HQD_N_REGS -#define HQD_N_REGS (19+6+7+10) +#define HQD_N_REGS (19+6+7+12) *dump =kmalloc (HQD_N_REGS *2 *sizeof (uint32_t ),GFP_KERNEL );if (*dump ==NULL )
Greg Kroah-Hartman
maintainerPATCH 44/252 drm/amdgpu/vcn2.0: add cancel_delayed_work_sync before power gate
In reply to Greg Kroah-HartmanFrom: James Zhu <[email protected]>
commit 0c6013377b4027e69d8f3e63b6bf556b6cb87802 upstream.
Add cancel_delayed_work_sync before set power gating state to avoid race condition issue when power gating.
--- drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +2 -0
@@ -262,6 +262,8 @@ static int vcn_v2_0_hw_fini(void *handle {struct amdgpu_device *adev = (struct amdgpu_device *)handle; +cancel_delayed_work_sync (&adev->vcn.idle_work); +if ((adev->pg_flags &AMD_PG_SUPPORT_VCN_DPG ) || (adev->vcn.cur_state !=AMD_PG_STATE_GATE &&RREG32_SOC15 (VCN ,0 , mmUVD_STATUS)))
Greg Kroah-Hartman
maintainerPATCH 45/252 drm/amdgpu/vcn2.5: add cancel_delayed_work_sync before power gate
In reply to Greg Kroah-HartmanFrom: James Zhu <[email protected]>
commit 2fb536ea42d557f39f70c755f68e1aa1ad466c55 upstream.
Add cancel_delayed_work_sync before set power gating state to avoid race condition issue when power gating.
--- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +2 -0
@@ -321,6 +321,8 @@ static int vcn_v2_5_hw_fini(void *handlestruct amdgpu_device *adev = (struct amdgpu_device *)handle;int i; +cancel_delayed_work_sync (&adev->vcn.idle_work); +for (i =0 ; i < adev->vcn.num_vcn_inst; ++i) {if (adev->vcn.harvest_config & (1 << i))continue ;
Greg Kroah-Hartman
maintainerPATCH 46/252 drm/amdgpu/jpeg2.0: add cancel_delayed_work_sync before power gate
In reply to Greg Kroah-HartmanFrom: James Zhu <[email protected]>
commit ff48f6dbf0ff896c98d167a67a5b975fb034356b upstream.
Add cancel_delayed_work_sync before set power gating state to avoid race condition issue when power gating.
--- drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c +2 -0
@@ -172,6 +172,8 @@ static int jpeg_v2_0_hw_fini(void *handl {struct amdgpu_device *adev = (struct amdgpu_device *)handle; +cancel_delayed_work_sync (&adev->vcn.idle_work); +if (adev->jpeg.cur_state !=AMD_PG_STATE_GATE &&RREG32_SOC15 (JPEG ,0 , mmUVD_JRBC_STATUS))jpeg_v2_0_set_powergating_state (adev,AMD_PG_STATE_GATE );
Greg Kroah-Hartman
maintainerPATCH 47/252 selftests/gpio: Use TEST_GEN_PROGS_EXTENDED
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
[ Upstream commit ff2c395b9257f0e617f9cd212893f3c72c80ee6c ]
Use TEST_GEN_PROGS_EXTENDED rather than TEST_PROGS_EXTENDED.
That tells the lib.mk logic that the files it references are to be generated by the Makefile.
Having done that we don't need to override the all rule.
--- tools/testing/selftests/gpio/Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
tools/testing/selftests/gpio/Makefile +3 -5
@@ -11,22 +11,20 @@ LDLIBS += $(VAR_LDLIBS) TEST_PROGS := gpio-mockup.sh TEST_FILES := gpio-mockup-sysfs.sh -TEST_PROGS_EXTENDED := gpio-mockup-chardev +TEST_GEN_PROGS_EXTENDED := gpio-mockup-chardev GPIODIR := $(realpath ../../../gpio) GPIOOBJ := gpio-utils.o -all: $(TEST_PROGS_EXTENDED) - override define CLEAN - $(RM) $(TEST_PROGS_EXTENDED) + $(RM) $(TEST_GEN_PROGS_EXTENDED) $(MAKE) -C $(GPIODIR) OUTPUT=$(GPIODIR)/ clean endef KSFT_KHDR_INSTALL := 1 include ../lib.mk -$(TEST_PROGS_EXTENDED): $(GPIODIR)/$(GPIOOBJ) +$(TEST_GEN_PROGS_EXTENDED): $(GPIODIR)/$(GPIOOBJ) $(GPIODIR)/$(GPIOOBJ): $(MAKE) OUTPUT=$(GPIODIR)/ -C $(GPIODIR)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 48/252 selftests/gpio: Move include of lib.mk up
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
[ Upstream commit 449539da2e237336bc750b41f1736a77f9aca25c ]
Move the include of lib.mk up so that in a subsequent patch we can use OUTPUT, which is initialised by lib.mk, in the definition of the GPIO variables.
--- tools/testing/selftests/gpio/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/testing/selftests/gpio/Makefile +3 -3
@@ -13,6 +13,9 @@ TEST_PROGS := gpio-mockup.sh TEST_FILES := gpio-mockup-sysfs.sh TEST_GEN_PROGS_EXTENDED := gpio-mockup-chardev +KSFT_KHDR_INSTALL := 1 +include ../lib.mk + GPIODIR := $(realpath ../../../gpio) GPIOOBJ := gpio-utils.o
@@ -21,9 +24,6 @@ override define CLEAN $(MAKE) -C $(GPIODIR) OUTPUT=$(GPIODIR)/ clean endef -KSFT_KHDR_INSTALL := 1 -include ../lib.mk - $(TEST_GEN_PROGS_EXTENDED): $(GPIODIR)/$(GPIOOBJ) $(GPIODIR)/$(GPIOOBJ):
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 49/252 selftests/gpio: Fix build when source tree is read only
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
[ Upstream commit b68c1c65dec5fb5186ebd33ce52059b4c6db8500 ]
Currently the gpio selftests fail to build if the source tree is read only:
make -j 160 -C tools/testing/selftests TARGETS=gpio
make[1]: Entering directory '/linux/tools/testing/selftests/gpio'
make OUTPUT=/linux/tools/gpio/ -C /linux/tools/gpio
make[2]: Entering directory '/linux/tools/gpio'
mkdir -p /linux/tools/gpio/include/linux 2>&1 || true
ln -sf /linux/tools/gpio/../../include/uapi/linux/gpio.h /linux/tools/gpio/include/linux/gpio.h
ln: failed to create symbolic link '/linux/tools/gpio/include/linux/gpio.h': Read-only file system
This happens because we ask make to build ../../../gpio (tools/gpio) without pointing OUTPUT away from the source directory.
To fix it we create a subdirectory of the existing OUTPUT directory, called tools-gpio, and tell tools/gpio to build in there.
--- tools/testing/selftests/gpio/Makefile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
tools/testing/selftests/gpio/Makefile +9 -5
@@ -17,14 +17,18 @@ KSFT_KHDR_INSTALL := 1 include ../lib.mk GPIODIR := $(realpath ../../../gpio) -GPIOOBJ := gpio-utils.o +GPIOOUT := $(OUTPUT)/tools-gpio/ +GPIOOBJ := $(GPIOOUT)/gpio-utils.o override define CLEAN $(RM) $(TEST_GEN_PROGS_EXTENDED) - $(MAKE) -C $(GPIODIR) OUTPUT=$(GPIODIR)/ clean + $(RM) -rf $(GPIOOUT) endef -$(TEST_GEN_PROGS_EXTENDED): $(GPIODIR)/$(GPIOOBJ) +$(TEST_GEN_PROGS_EXTENDED): $(GPIOOBJ) -$(GPIODIR)/$(GPIOOBJ): - $(MAKE) OUTPUT=$(GPIODIR)/ -C $(GPIODIR) +$(GPIOOUT): + mkdir -p $@ + +$(GPIOOBJ): $(GPIOOUT) + $(MAKE) OUTPUT=$(GPIOOUT) -C $(GPIODIR)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 50/252 kgdb: fix gcc-11 warnings harder
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
commit bda7d3ab06f19c02dcef61fefcb9dd954dfd5e4f upstream.
40cc3a80bb42 ("kgdb: fix gcc-11 warning on indentation") tried to fix up the gcc-11 complaints in this file by just reformatting the #defines. That worked for gcc 11.1.0, but in gcc 11.1.1 as shipped by Fedora 34, the warning came back for one of the #defines.
Fix this up again by putting { } around the if statement, now it is quiet again.
--- drivers/misc/kgdbts.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/misc/kgdbts.c +2 -1
@@ -100,8 +100,9 @@ printk(KERN_INFO a); \ }while (0 ) #define v2printk(a...) do { \ -if (verbose >1 ) \ +if (verbose >1 ) { \ printk(KERN_INFO a); \ + } \touch_nmi_watchdog (); \ } while (0) #define eprintk(a...) do { \
Greg Kroah-Hartman
maintainerPATCH 51/252 Documentation: seccomp: Fix user notification documentation
In reply to Greg Kroah-HartmanFrom: Sargun Dhillon <[email protected]>
commit aac902925ea646e461c95edc98a8a57eb0def917 upstream.
The documentation had some previously incorrect information about how userspace notifications (and responses) were handled due to a change from a previously proposed patchset.
--- Documentation/userspace-api/seccomp_filter.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
Documentation/userspace-api/seccomp_filter.rst +8 -8
@@ -250,14 +250,14 @@ Users can read via ``ioctl(SECCOMP_IOCTL seccomp notification fd to receive a ``struct seccomp_notif``, which contains five members: the input length of the structure, a unique-per-filter ``id``, the ``pid`` of the task which triggered this request (which may be 0 if the -task is in a pid ns not visible from the listener's pid namespace), a ``flags`` -member which for now only has ``SECCOMP_NOTIF_FLAG_SIGNALED``, representing -whether or not the notification is a result of a non-fatal signal, and the -``data`` passed to seccomp. Userspace can then make a decision based on this -information about what to do, and ``ioctl(SECCOMP_IOCTL_NOTIF_SEND)`` a -response, indicating what should be returned to userspace. The ``id`` member of -``struct seccomp_notif_resp`` should be the same ``id`` as in ``struct -seccomp_notif``. +task is in a pid ns not visible from the listener's pid namespace). The +notification also contains the ``data`` passed to seccomp, and a filters flag. +The structure should be zeroed out prior to calling the ioctl. + +Userspace can then make a decision based on this information about what to do, +and ``ioctl(SECCOMP_IOCTL_NOTIF_SEND)`` a response, indicating what should be +returned to userspace. The ``id`` member of ``struct seccomp_notif_resp`` should +be the same ``id`` as in ``struct seccomp_notif``. It is worth noting that ``struct seccomp_data`` contains the values of register arguments to the syscall, but does not contain pointers to memory. The task's
Greg Kroah-Hartman
maintainerPATCH 52/252 seccomp: Refactor notification handler to prepare for new semantics
In reply to Greg Kroah-HartmanFrom: Sargun Dhillon <[email protected]>
commit ddc473916955f7710d1eb17c1273d91c8622a9fe upstream.
This refactors the user notification code to have a do / while loop around the completion condition. This has a small change in semantic, in that previously we ignored addfd calls upon wakeup if the notification had been responded to, but instead with the new change we check for an outstanding addfd calls prior to returning to userspace.
Rodrigo Campos also identified a bug that can result in addfd causing an early return, when the supervisor didn't actually handle the syscall [1].
[1]: https://lore.kernel.org/lkml/[email protected]/
--- kernel/seccomp.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-)
kernel/seccomp.c +16 -14
@@ -864,28 +864,30 @@ static int seccomp_do_user_notification(up (&match->notif->request);wake_up_poll (&match->wqh,EPOLLIN |EPOLLRDNORM ); -mutex_unlock (&match->notify_lock);/* * This is where we wait for a reply from userspace. */ -wait: - err =wait_for_completion_interruptible (&n.ready); -mutex_lock (&match->notify_lock); -if (err ==0 ) { -/* Check if we were woken up by a addfd message */ +do { +mutex_unlock (&match->notify_lock); + err =wait_for_completion_interruptible (&n.ready); +mutex_lock (&match->notify_lock); +if (err !=0 ) + goto interrupted; + addfd =list_first_entry_or_null (&n.addfd, struct seccomp_kaddfd, list); -if (addfd && n.state !=SECCOMP_NOTIFY_REPLIED ) { +/* Check if we were woken up by a addfd message */ +if (addfd)seccomp_handle_addfd (addfd); -mutex_unlock (&match->notify_lock); - goto wait; - } - ret = n.val; - err = n.error; - flags = n.flags; - } + }while (n.state !=SECCOMP_NOTIFY_REPLIED ); + + ret = n.val; + err = n.error; + flags = n.flags; + +interrupted:/* If there were any pending addfd calls, clear them out */ list_for_each_entry_safe (addfd, tmp, &n.addfd, list) {/* The process went away before we got a chance to handle it */
Greg Kroah-Hartman
maintainerPATCH 53/252 serial: core: fix suspicious security_locked_down() call
In reply to Greg Kroah-HartmanFrom: Ondrej Mosnacek <[email protected]>
commit 5e722b217ad3cf41f5504db80a68062df82b5242 upstream.
The commit that added this check did so in a very strange way - first security_locked_down() is called, its value stored into retval, and if it's nonzero, then an additional check is made for (change_irq || change_port), and if this is true, the function returns. However, if the goto exit branch is not taken, the code keeps the retval value and continues executing the function. Then, depending on whether uport->ops->verify_port is set, the retval value may or may not be reset to zero and eventually the error value from security_locked_down() may abort the function a few lines below.
I will go out on a limb and assume that this isn't the intended behavior and that an error value from security_locked_down() was supposed to abort the function only in case (change_irq || change_port) is true.
Note that security_locked_down() should be called last in any series of checks, since the SELinux implementation of this hook will do a check against the policy and generate an audit record in case of denial. If the operation was to carry on after calling security_locked_down(), then the SELinux denial record would be bogus.
See commit 59438b46471a ("security,lockdown,selinux: implement SELinux lockdown") for how SELinux implements this hook.
--- drivers/tty/serial/serial_core.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/tty/serial/serial_core.c +5 -3
@@ -865,9 +865,11 @@ static int uart_set_info(struct tty_stru goto check_and_exit; } - retval =security_locked_down (LOCKDOWN_TIOCSSERIAL ); -if (retval && (change_irq || change_port)) - goto exit; +if (change_irq || change_port) { + retval =security_locked_down (LOCKDOWN_TIOCSSERIAL ); +if (retval) + goto exit; + }/* * Ask the low level driver to verify the settings.
Re: [PATCH 5.10 053/252] serial: core: fix suspicious security_locked_down() call
Hi!
Quoted 1 line
From: Ondrej Mosnacek <[email protected]>
...
Quoted 7 lines
Fixes 794edf30ee6c ("lockdown: Lock down TIOCSSERIAL")Acked-by Kees Cook <[email protected]>Signed-off-by Ondrej Mosnacek <[email protected]>Cc stable <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
I'm not sure if it is going to cause any problems, but two signoffs like this look quite unusual.
Best regards,
Pavel
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Greg Kroah-Hartman
maintainerPATCH 54/252 misc/uss720: fix memory leak in uss720_probe
In reply to Greg Kroah-HartmanFrom: Dongliang Mu <[email protected]>
commit dcb4b8ad6a448532d8b681b5d1a7036210b622de upstream.
uss720_probe forgets to decrease the refcount of usbdev in uss720_probe. Fix this by decreasing the refcount of usbdev by usb_put_dev.
BUG: memory leak
unreferenced object 0xffff888101113800 (size 2048):
comm "kworker/0:1", pid 7, jiffies 4294956777 (age 28.870s)
hex dump (first 32 bytes):
ff ff ff ff 31 00 00 00 00 00 00 00 00 00 00 00 ....1...........
00 00 00 00 00 00 00 00 00 00 00 00 03 00 00 00 ................
backtrace:
[<ffffffff82b8e822>] kmalloc include/linux/slab.h:554 [inline]
[<ffffffff82b8e822>] kzalloc include/linux/slab.h:684 [inline]
[<ffffffff82b8e822>] usb_alloc_dev+0x32/0x450 drivers/usb/core/usb.c:582
[<ffffffff82b98441>] hub_port_connect drivers/usb/core/hub.c:5129 [inline]
[<ffffffff82b98441>] hub_port_connect_change drivers/usb/core/hub.c:5363 [inline]
[<ffffffff82b98441>] port_event drivers/usb/core/hub.c:5509 [inline]
[<ffffffff82b98441>] hub_event+0x1171/0x20c0 drivers/usb/core/hub.c:5591
[<ffffffff81259229>] process_one_work+0x2c9/0x600 kernel/workqueue.c:2275
[<ffffffff81259b19>] worker_thread+0x59/0x5d0 kernel/workqueue.c:2421
[<ffffffff81261228>] kthread+0x178/0x1b0 kernel/kthread.c:292
[<ffffffff8100227f>] ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:294--- drivers/usb/misc/uss720.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/misc/uss720.c +1 -0
@@ -736,6 +736,7 @@ static int uss720_probe(struct usb_interparport_announce_port (pp);usb_set_intfdata (intf, pp); +usb_put_dev (usbdev);return 0 ; probe_abort:
Greg Kroah-Hartman
maintainerPATCH 55/252 thunderbolt: usb4: Fix NVM read buffer bounds and offset issue
In reply to Greg Kroah-HartmanFrom: Mathias Nyman <[email protected]>
commit 22c7a18ed5f007faccb7527bc890463763214081 upstream.
Up to 64 bytes of data can be read from NVM in one go. Read address must be dword aligned. Data is read into a local buffer.
If caller asks to read data starting at an unaligned address then full dword is anyway read from NVM into a local buffer. Data is then copied from the local buffer starting at the unaligned offset to the caller buffer.
In cases where asked data length + unaligned offset is over 64 bytes we need to make sure we don't read past the 64 bytes in the local buffer when copying to caller buffer, and make sure that we don't skip copying unaligned offset bytes from local buffer anymore after the first round of 64 byte NVM data read.
--- drivers/thunderbolt/usb4.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/thunderbolt/usb4.c +5 -4
@@ -108,15 +108,15 @@ static int usb4_do_read_data(u16 addressunsigned int retries =USB4_DATA_RETRIES ;unsigned int offset; - offset = address &3 ; - address = address & ~3 ; - do { - size_t nbytes = min_t(size_t, size, USB4_DATA_DWORDS * 4); unsigned int dwaddress, dwords; u8 data[USB4_DATA_DWORDS * 4]; + size_t nbytes; int ret; + offset = address & 3; + nbytes = min_t(size_t, size + offset, USB4_DATA_DWORDS * 4); + dwaddress = address / 4; dwords = ALIGN(nbytes, 4) / 4;
@@ -127,6 +127,7 @@ static int usb4_do_read_data(u16 addressreturn ret; } + nbytes -= offset;memcpy (buf, data + offset, nbytes); size -= nbytes;
Greg Kroah-Hartman
maintainerPATCH 56/252 thunderbolt: dma_port: Fix NVM read buffer bounds and offset issue
In reply to Greg Kroah-HartmanFrom: Mathias Nyman <[email protected]>
commit b106776080a1cf953a1b2fd50cb2a995db4732be upstream.
Up to 64 bytes of data can be read from NVM in one go. Read address must be dword aligned. Data is read into a local buffer.
If caller asks to read data starting at an unaligned address then full dword is anyway read from NVM into a local buffer. Data is then copied from the local buffer starting at the unaligned offset to the caller buffer.
In cases where asked data length + unaligned offset is over 64 bytes we need to make sure we don't read past the 64 bytes in the local buffer when copying to caller buffer, and make sure that we don't skip copying unaligned offset bytes from local buffer anymore after the first round of 64 byte NVM data read.
--- drivers/thunderbolt/dma_port.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/thunderbolt/dma_port.c +6 -5
@@ -364,15 +364,15 @@ int dma_port_flash_read(struct tb_dma_po void *buf, size_t size) {unsigned int retries =DMA_PORT_RETRIES ; -unsigned int offset; - - offset = address &3 ; - address = address & ~3 ; do { - u32 nbytes = min_t(u32, size, MAIL_DATA_DWORDS * 4); + unsigned int offset; + size_t nbytes; int ret; + offset = address & 3; + nbytes = min_t(size_t, size + offset, MAIL_DATA_DWORDS * 4); + ret = dma_port_flash_read_block(dma, address, dma->buf, ALIGN(nbytes, 4)); if (ret) {
@@ -384,6 +384,7 @@ int dma_port_flash_read(struct tb_dma_poreturn ret; } + nbytes -= offset;memcpy (buf, dma->buf + offset, nbytes); size -= nbytes;
Greg Kroah-Hartman
maintainerPATCH 57/252 KVM: X86: Fix vCPU preempted state from guests point of view
In reply to Greg Kroah-HartmanFrom: Wanpeng Li <[email protected]>
commit 1eff0ada88b48e4ac1e3fe26483b3684fedecd27 upstream.
Commit 66570e966dd9 (kvm: x86: only provide PV features if enabled in guest's CPUID) avoids to access pv tlb shootdown host side logic when this pv feature is not exposed to guest, however, kvm_steal_time.preempted not only leveraged by pv tlb shootdown logic but also mitigate the lock holder preemption issue.
Quoted 1 line
From guest's point of view, vCPU is always preempted since we lose the reset
of kvm_steal_time.preempted before vmentry if pv tlb shootdown feature is not exposed. This patch fixes it by clearing kvm_steal_time.preempted before vmentry.
Message-Id: <[email protected]>
--- arch/x86/kvm/x86.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/kvm/x86.c +2 -0
@@ -3006,6 +3006,8 @@ static void record_steal_time(struct kvm st->preempted & KVM_VCPU_FLUSH_TLB);if (xchg (&st->preempted,0 ) &KVM_VCPU_FLUSH_TLB )kvm_vcpu_flush_tlb_guest (vcpu); + }else { + st->preempted =0 ; } vcpu->arch.st.preempted =0 ;
Greg Kroah-Hartman
maintainerPATCH 58/252 KVM: arm64: Prevent mixed-width VM creation
In reply to Greg Kroah-HartmanFrom: Marc Zyngier <[email protected]>
commit 66e94d5cafd4decd4f92d16a022ea587d7f4094f upstream.
It looks like we have tolerated creating mixed-width VMs since... forever. However, that was never the intention, and we'd rather not have to support that pointless complexity.
Forbid such a setup by making sure all the vcpus have the same register width.
--- arch/arm64/include/asm/kvm_emulate.h | 5 +++++ arch/arm64/kvm/reset.c | 28 ++++++++++++++++++++++++---- 2 files changed, 29 insertions(+), 4 deletions(-)
arch/arm64/include/asm/kvm_emulate.h +5 -0
@@ -505,4 +505,9 @@ static __always_inline void __kvm_skip_i write_sysreg_el2(*vcpu_pc(vcpu), SYS_ELR); } +static inline bool vcpu_has_feature (struct kvm_vcpu *vcpu,int feature) +{ +return test_bit (feature, vcpu->arch.features); +} +#endif /* __ARM64_KVM_EMULATE_H__ */
arch/arm64/kvm/reset.c +24 -4
@@ -223,6 +223,25 @@ static int kvm_vcpu_enable_ptrauth(strucreturn 0 ; } +static bool vcpu_allowed_register_width (struct kvm_vcpu *vcpu) +{ +struct kvm_vcpu *tmp; +bool is32bit; +int i; + + is32bit =vcpu_has_feature (vcpu,KVM_ARM_VCPU_EL1_32BIT ); +if (!cpus_have_const_cap (ARM64_HAS_32BIT_EL1 ) && is32bit) +return false; + +/* Check that the vcpus are either all 32bit or all 64bit */ +kvm_for_each_vcpu (i, tmp, vcpu->kvm) { +if (vcpu_has_feature (tmp,KVM_ARM_VCPU_EL1_32BIT ) != is32bit) +return false; + } + +return true; +} +/** * kvm_reset_vcpu - sets core registers and sys_regs to reset value * @vcpu: The VCPU pointer
@@ -274,13 +293,14 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu } } +if (!vcpu_allowed_register_width (vcpu)) { + ret = -EINVAL ; + goto out; + } +switch (vcpu->arch.target) {default :if (test_bit (KVM_ARM_VCPU_EL1_32BIT , vcpu->arch.features)) { -if (!cpus_have_const_cap (ARM64_HAS_32BIT_EL1 )) { - ret = -EINVAL ; - goto out; - } pstate =VCPU_RESET_PSTATE_SVC ; }else { pstate =VCPU_RESET_PSTATE_EL1 ;
Greg Kroah-Hartman
maintainerPATCH 59/252 mei: request autosuspend after sending rx flow control
In reply to Greg Kroah-HartmanFrom: Alexander Usyskin <[email protected]>
commit bbf0a94744edfeee298e4a9ab6fd694d639a5cdf upstream.
A rx flow control waiting in the control queue may block autosuspend. Re-request autosuspend after flow control been sent to unblock the transition to the low power state.
--- drivers/misc/mei/interrupt.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/misc/mei/interrupt.c +3 -0
@@ -277,6 +277,9 @@ static int mei_cl_irq_read(struct mei_clreturn ret; } +pm_runtime_mark_last_busy (dev->dev); +pm_request_autosuspend (dev->dev); +list_move_tail (&cb->list, &cl->rd_pending);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 60/252 staging: iio: cdc: ad7746: avoid overwrite of num_channels
In reply to Greg Kroah-HartmanFrom: Lucas Stankus <[email protected]>
commit 04f5b9f539ce314f758d919a14dc7a669f3b7838 upstream.
AD7745 devices don't have the CIN2 pins and therefore can't handle related channels. Forcing the number of AD7746 channels may lead to enabling more channels than what the hardware actually supports.
Avoid num_channels being overwritten after first assignment.
--- drivers/staging/iio/cdc/ad7746.c | 1 - 1 file changed, 1 deletion(-)
drivers/staging/iio/cdc/ad7746.c +0 -1
@@ -700,7 +700,6 @@ static int ad7746_probe(struct i2c_clien indio_dev->num_channels =ARRAY_SIZE (ad7746_channels); else indio_dev->num_channels = ARRAY_SIZE(ad7746_channels) - 2; - indio_dev->num_channels =ARRAY_SIZE (ad7746_channels); indio_dev->modes =INDIO_DIRECT_MODE ;if (pdata) {
Greg Kroah-Hartman
maintainerPATCH 61/252 iio: gyro: fxas21002c: balance runtime power in error path
In reply to Greg Kroah-HartmanFrom: Rui Miguel Silva <[email protected]>
commit 2a54c8c9ebc2006bf72554afc84ffc67768979a0 upstream.
If we fail to read temperature or axis we need to decrement the runtime pm reference count to trigger autosuspend.
Add the call to pm_put to do that in case of error.
--- drivers/iio/gyro/fxas21002c_core.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/iio/gyro/fxas21002c_core.c +2 -0
@@ -399,6 +399,7 @@ static int fxas21002c_temp_get(struct fx ret =regmap_field_read (data->regmap_fields[F_TEMP ], &temp);if (ret <0 ) {dev_err (dev,"failed to read temp: %d\n" , ret); +fxas21002c_pm_put (data); goto data_unlock; }
@@ -432,6 +433,7 @@ static int fxas21002c_axis_get(struct fx &axis_be, sizeof(axis_be));if (ret <0 ) {dev_err (dev,"failed to read axis: %d: %d\n" , index, ret); +fxas21002c_pm_put (data); goto data_unlock; }
Greg Kroah-Hartman
maintainerPATCH 62/252 iio: dac: ad5770r: Put fwnode in error case during ->probe()
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
commit 98b7b0ca0828907dbb706387c11356a45463e2ea upstream.
device_for_each_child_node() bumps a reference counting of a returned variable. We have to balance it whenever we return to the caller.
--- drivers/iio/dac/ad5770r.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/iio/dac/ad5770r.c +11 -5
@@ -524,23 +524,29 @@ static int ad5770r_channel_config(structdevice_for_each_child_node (&st->spi->dev, child) { ret =fwnode_property_read_u32 (child,"num" , &num);if (ret) -return ret; -if (num >=AD5770R_MAX_CHANNELS ) -return -EINVAL ; + goto err_child_out; +if (num >=AD5770R_MAX_CHANNELS ) { + ret = -EINVAL ; + goto err_child_out; + } ret =fwnode_property_read_u32_array (child,"adi,range-microamp" , tmp,2 );if (ret) -return ret; + goto err_child_out; min = tmp[0 ] /1000 ; max = tmp[1 ] /1000 ; ret =ad5770r_store_output_range (st, min, max, num);if (ret) -return ret; + goto err_child_out; } +return 0 ; + +err_child_out: +fwnode_handle_put (child);return ret; }
Greg Kroah-Hartman
maintainerPATCH 63/252 iio: adc: ad7768-1: Fix too small buffer passed to iio_push_to_buffers_with_timestamp()
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
commit a1caeebab07e9d72eec534489f47964782b93ba9 upstream.
Add space for the timestamp to be inserted. Also ensure correct alignment for passing to iio_push_to_buffers_with_timestamp()
--- drivers/iio/adc/ad7768-1.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/iio/adc/ad7768-1.c +6 -2
@@ -166,6 +166,10 @@ struct ad7768_state {* transfer buffers to live in their own cache lines. */ union { +struct { +__be32 chan; +s64 timestamp; + } scan;__be32 d32;u8 d8[2 ]; } data____cacheline_aligned ;
@@ -459,11 +463,11 @@ static irqreturn_t ad7768_trigger_handlemutex_lock (&st->lock); - ret =spi_read (st->spi, &st->data.d32,3 ); + ret =spi_read (st->spi, &st->data.scan.chan,3 );if (ret <0 ) goto err_unlock; -iio_push_to_buffers_with_timestamp (indio_dev, &st->data.d32, +iio_push_to_buffers_with_timestamp (indio_dev, &st->data.scan,iio_get_time_ns (indio_dev));iio_trigger_notify_done (indio_dev->trig);
Greg Kroah-Hartman
maintainerPATCH 64/252 iio: adc: ad7124: Fix missbalanced regulator enable / disable on error.
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
commit 4573472315f0fa461330545ff2aa2f6da0b1ae76 upstream.
If the devm_regulator_get() call succeeded but not the regulator_enable() then regulator_disable() would be called on a regulator that was not enabled.
Fix this by moving regulator enabling / disabling over to devm_ management via devm_add_action_or_reset.
Alexandru's sign-off here because he pulled Jonathan's patch into a larger set which Jonathan then applied.
--- drivers/iio/adc/ad7124.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-)
drivers/iio/adc/ad7124.c +13 -16
@@ -707,6 +707,11 @@ static int ad7124_setup(struct ad7124_streturn ret; } +static void ad7124_reg_disable (void *r) +{ +regulator_disable (r); +} +static int ad7124_probe (struct spi_device *spi) {const struct ad7124_chip_info *info;
@@ -752,17 +757,20 @@ static int ad7124_probe(struct spi_devic ret =regulator_enable (st->vref[i]);if (ret)return ret; + + ret =devm_add_action_or_reset (&spi->dev, ad7124_reg_disable, + st->vref[i]); +if (ret) +return ret; } st->mclk =devm_clk_get (&spi->dev,"mclk" ); -if (IS_ERR (st->mclk)) { - ret =PTR_ERR (st->mclk); - goto error_regulator_disable; - } +if (IS_ERR (st->mclk)) +return PTR_ERR (st->mclk); ret =clk_prepare_enable (st->mclk);if (ret <0 ) - goto error_regulator_disable; +return ret; ret =ad7124_soft_reset (st);if (ret <0 )
@@ -792,11 +800,6 @@ error_remove_trigger:ad_sd_cleanup_buffer_and_trigger (indio_dev); error_clk_disable_unprepare:clk_disable_unprepare (st->mclk); -error_regulator_disable: -for (i =ARRAY_SIZE (st->vref) -1 ; i >=0 ; i--) { -if (!IS_ERR_OR_NULL (st->vref[i])) -regulator_disable (st->vref[i]); - }return ret; }
@@ -805,17 +808,11 @@ static int ad7124_remove(struct spi_devi {struct iio_dev *indio_dev =spi_get_drvdata (spi);struct ad7124_state *st =iio_priv (indio_dev); -int i;iio_device_unregister (indio_dev);ad_sd_cleanup_buffer_and_trigger (indio_dev);clk_disable_unprepare (st->mclk); -for (i =ARRAY_SIZE (st->vref) -1 ; i >=0 ; i--) { -if (!IS_ERR_OR_NULL (st->vref[i])) -regulator_disable (st->vref[i]); - } -return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 65/252 iio: adc: ad7124: Fix potential overflow due to non sequential channel numbers
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
commit f2a772c51206b0c3f262e4f6a3812c89a650191b upstream.
Channel numbering must start at 0 and then not have any holes, or it is possible to overflow the available storage. Note this bug was introduced as part of a fix to ensure we didn't rely on the ordering of child nodes. So we need to support arbitrary ordering but they all need to be there somewhere.
Note I hit this when using qemu to test the rest of this series. Arguably this isn't the best fix, but it is probably the most minimal option for backporting etc.
Alexandru's sign-off is here because he carried this patch in a larger set that Jonathan then applied.
--- drivers/iio/adc/ad7124.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/iio/adc/ad7124.c +7 -0
@@ -616,6 +616,13 @@ static int ad7124_of_parse_channel_confiif (ret) goto err; +if (channel >= indio_dev->num_channels) { +dev_err (indio_dev->dev.parent, +"Channel index >= number of channels\n" ); + ret = -EINVAL ; + goto err; + } + ret =of_property_read_u32_array (child,"diff-channels" , ain,2 );if (ret)
Greg Kroah-Hartman
maintainerPATCH 66/252 iio: adc: ad7923: Fix undersized rx buffer.
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
commit 01fcf129f61b26d5b3d2d8afb03e770dee271bc8 upstream.
Fixes tag is where the max channels became 8, but timestamp space was missing before that.
--- drivers/iio/adc/ad7923.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/iio/adc/ad7923.c +3 -1
@@ -59,8 +59,10 @@ struct ad7923_state {/* * DMA (thus cache coherency maintenance) requires the * transfer buffers to live in their own cache lines. +* Ensure rx_buf can be directly used in iio_push_to_buffers_with_timetamp +* Length = 8 channels + 4 extra for 8 byte timestamp */ -__be16 rx_buf[4 ]____cacheline_aligned ; +__be16 rx_buf[12 ]____cacheline_aligned ;__be16 tx_buf[4 ]; };
Greg Kroah-Hartman
maintainerPATCH 67/252 iio: adc: ad7793: Add missing error code in ad7793_setup()
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
commit 4ed243b1da169bcbc1ec5507867e56250c5f1ff9 upstream.
Set error code while device ID query failed.
--- drivers/iio/adc/ad7793.c | 1 + 1 file changed, 1 insertion(+)
drivers/iio/adc/ad7793.c +1 -0
@@ -279,6 +279,7 @@ static int ad7793_setup(struct iio_dev * id &=AD7793_ID_MASK ;if (id != st->chip_info->id) { + ret = -ENODEV ;dev_err (&st->sd.spi->dev,"device ID query failed\n" ); goto out; }
Greg Kroah-Hartman
maintainerPATCH 68/252 iio: adc: ad7192: Avoid disabling a clock that was never enabled.
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
commit e32fe6d90f44922ccbb94016cfc3c238359e3e39 upstream.
Found by inspection.
If the internal clock source is being used, the driver doesn't call clk_prepare_enable() and as such we should not call clk_disable_unprepare()
Use the same condition to protect the disable path as is used on the enable one. Note this will all get simplified when the driver moves over to a full devm_ flow, but that would make backporting the fix harder.
Fix obviously predates move out of staging, but backporting will become more complex (and is unlikely to happen), hence that patch is given in the fixes tag.
Alexandru's sign off is here because he added this patch into a larger series that Jonathan then applied.
--- drivers/iio/adc/ad7192.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/iio/adc/ad7192.c +6 -2
@@ -1014,7 +1014,9 @@ static int ad7192_probe(struct spi_devicreturn 0 ; error_disable_clk: -clk_disable_unprepare (st->mclk); +if (st->clock_sel ==AD7192_CLK_EXT_MCLK1_2 || + st->clock_sel ==AD7192_CLK_EXT_MCLK2 ) +clk_disable_unprepare (st->mclk); error_remove_trigger:ad_sd_cleanup_buffer_and_trigger (indio_dev); error_disable_dvdd:
@@ -1031,7 +1033,9 @@ static int ad7192_remove(struct spi_devistruct ad7192_state *st =iio_priv (indio_dev);iio_device_unregister (indio_dev); -clk_disable_unprepare (st->mclk); +if (st->clock_sel ==AD7192_CLK_EXT_MCLK1_2 || + st->clock_sel ==AD7192_CLK_EXT_MCLK2 ) +clk_disable_unprepare (st->mclk);ad_sd_cleanup_buffer_and_trigger (indio_dev);regulator_disable (st->dvdd);
Greg Kroah-Hartman
maintainerPATCH 69/252 iio: adc: ad7192: handle regulator voltage error first
In reply to Greg Kroah-HartmanFrom: Alexandru Ardelean <[email protected]>
commit b0f27fca5a6c7652e265aae6a4452ce2f2ed64da upstream.
This change fixes a corner-case, where for a zero regulator value, the driver would exit early, initializing the driver only partially. The driver would be in an unknown state.
This change reworks the code to check regulator_voltage() return value for negative (error) first, and return early. This is the more common idiom.
Also, this change is removing the 'voltage_uv' variable and using the 'ret' value directly. The only place where 'voltage_uv' is being used is to compute the internal reference voltage, and the type of this variable is 'int' (same are for 'ret'). Using only 'ret' avoids having to assign it on the error path.
--- drivers/iio/adc/ad7192.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/iio/adc/ad7192.c +4 -7
@@ -912,7 +912,7 @@ static int ad7192_probe(struct spi_devic {struct ad7192_state *st;struct iio_dev *indio_dev; -int ret, voltage_uv =0 ; +int ret;if (!spi->irq) {dev_err (&spi->dev,"no IRQ?\n" );
@@ -949,15 +949,12 @@ static int ad7192_probe(struct spi_devic goto error_disable_avdd; } - voltage_uv =regulator_get_voltage (st->avdd); - -if (voltage_uv >0 ) { - st->int_vref_mv = voltage_uv /1000 ; - }else { - ret = voltage_uv; + ret =regulator_get_voltage (st->avdd); +if (ret <0 ) {dev_err (&spi->dev,"Device tree error, reference voltage undefined\n" ); goto error_disable_avdd; } + st->int_vref_mv = ret /1000 ;spi_set_drvdata (spi, indio_dev); st->chip_info =of_device_get_match_data (&spi->dev);
Greg Kroah-Hartman
maintainerPATCH 70/252 serial: 8250: Add UART_BUG_TXRACE workaround for Aspeed VUART
In reply to Greg Kroah-HartmanFrom: Andrew Jeffery <[email protected]>
commit df8f2be2fd0b44b2cb6077068f52e05f0ac40897 upstream.
Aspeed Virtual UARTs directly bridge e.g. the system console UART on the LPC bus to the UART interface on the BMC's internal APB. As such there's no RS-232 signalling involved - the UART interfaces on each bus are directly connected as the producers and consumers of the one set of FIFOs.
The APB in the AST2600 generally runs at 100MHz while the LPC bus peaks at 33MHz. The difference in clock speeds exposes a race in the VUART design where a Tx data burst on the APB interface can result in a byte lost on the LPC interface. The symptom is LSR[DR] remains clear on the LPC interface despite data being present in its Rx FIFO, while LSR[THRE] remains clear on the APB interface as the host has not consumed the data the BMC has transmitted. In this state, the UART has stalled and no further data can be transmitted without manual intervention (e.g. resetting the FIFOs, resulting in loss of data).
The recommended work-around is to insert a read cycle on the APB interface between writes to THR.
--- drivers/tty/serial/8250/8250.h | 1 + drivers/tty/serial/8250/8250_aspeed_vuart.c | 1 + drivers/tty/serial/8250/8250_port.c | 12 ++++++++++++ 3 files changed, 14 insertions(+)
drivers/tty/serial/8250/8250.h +1 -0
@@ -88,6 +88,7 @@ struct serial8250_config {#define UART_BUG_NOMSR (1 << 2)/* UART has buggy MSR status bits (Au1x00) */ #define UART_BUG_THRE (1 << 3)/* UART has buggy THRE reassertion */ #define UART_BUG_PARITY (1 << 4)/* UART mishandles parity if FIFO enabled */ +#define UART_BUG_TXRACE (1 << 5)/* UART Tx fails to set remote DR */ #ifdef CONFIG_SERIAL_8250_SHARE_IRQ
drivers/tty/serial/8250/8250_aspeed_vuart.c +1 -0
@@ -403,6 +403,7 @@ static int aspeed_vuart_probe(struct pla port.port.status =UPSTAT_SYNC_FIFO ; port.port.dev = &pdev->dev; port.port.has_sysrq =IS_ENABLED (CONFIG_SERIAL_8250_CONSOLE ); + port.bugs |=UART_BUG_TXRACE ; rc =sysfs_create_group (&vuart->dev->kobj, &aspeed_vuart_attr_group);if (rc <0 )
drivers/tty/serial/8250/8250_port.c +12 -0
@@ -1815,6 +1815,18 @@ void serial8250_tx_chars(struct uart_825 count = up->tx_loadsz; do { serial_out(up, UART_TX, xmit->buf[xmit->tail]); + if (up->bugs & UART_BUG_TXRACE) { + /* + * The Aspeed BMC virtual UARTs have a bug where data + * may get stuck in the BMC's Tx FIFO from bursts of + * writes on the APB interface. + * + * Delay back-to-back writes by a read cycle to avoid + * stalling the VUART. Read a register that won't have + * side-effects and discard the result. + */ + serial_in(up, UART_SCR); + } xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1); port->icount.tx++; if (uart_circ_empty(xmit))
Greg Kroah-Hartman
maintainerPATCH 71/252 serial: 8250_dw: Add device HID for new AMD UART controller
In reply to Greg Kroah-HartmanFrom: Maximilian Luz <[email protected]>
commit 3c35d2a960c0077a4cb09bf4989f45d289332ea0 upstream.
Add device HID AMDI0022 to the AMD UART controller driver match table and create a platform device for it. This controller can be found on Microsoft Surface Laptop 4 devices and seems similar enough that we can just copy the existing AMDI0020 entries.
--- drivers/acpi/acpi_apd.c | 1 + drivers/tty/serial/8250/8250_dw.c | 1 + 2 files changed, 2 insertions(+)
drivers/acpi/acpi_apd.c +1 -0
@@ -226,6 +226,7 @@ static const struct acpi_device_id acpi_ { "AMDI0010", APD_ADDR(wt_i2c_desc) }, { "AMD0020", APD_ADDR(cz_uart_desc) }, { "AMDI0020", APD_ADDR(cz_uart_desc) }, + { "AMDI0022", APD_ADDR(cz_uart_desc) }, { "AMD0030", }, { "AMD0040", APD_ADDR(fch_misc_desc)}, { "HYGO0010", APD_ADDR(wt_i2c_desc) },
drivers/tty/serial/8250/8250_dw.c +1 -0
@@ -714,6 +714,7 @@ static const struct acpi_device_id dw825 { "APMC0D08", 0}, { "AMD0020", 0 }, { "AMDI0020", 0 }, + { "AMDI0022", 0 }, { "BRCM2032", 0 }, { "HISI0031", 0 }, { },
Greg Kroah-Hartman
maintainerPATCH 72/252 serial: 8250_pci: Add support for new HPE serial device
In reply to Greg Kroah-HartmanFrom: Randy Wright <[email protected]>
commit e0e24208792080135248f23fdf6d51aa2e04df05 upstream.
Add support for new HPE serial device. It is MSI enabled, but otherwise similar to legacy HP server serial devices.
--- drivers/tty/serial/8250/8250_pci.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/tty/serial/8250/8250_pci.c +18 -0
@@ -56,6 +56,8 @@ struct serial_private {int line[]; }; +#define PCI_DEVICE_ID_HPE_PCI_SERIAL 0x37e +static const struct pci_device_id pci_use_msi[] = { {PCI_DEVICE_SUB (PCI_VENDOR_ID_NETMOS ,PCI_DEVICE_ID_NETMOS_9900 ,0xA000 ,0x1000 ) },
@@ -63,6 +65,8 @@ static const struct pci_device_id pci_us 0xA000, 0x1000) }, {PCI_DEVICE_SUB (PCI_VENDOR_ID_NETMOS ,PCI_DEVICE_ID_NETMOS_9922 , 0xA000, 0x1000) }, + { PCI_DEVICE_SUB(PCI_VENDOR_ID_HP_3PAR, PCI_DEVICE_ID_HPE_PCI_SERIAL, + PCI_ANY_ID, PCI_ANY_ID) }, { } };
@@ -1998,6 +2002,16 @@ static struct pci_serial_quirk pci_seria .setup = pci_hp_diva_setup, },/* +* HPE PCI serial device +*/ + { + .vendor = PCI_VENDOR_ID_HP_3PAR, + .device = PCI_DEVICE_ID_HPE_PCI_SERIAL, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .setup = pci_hp_diva_setup, + }, +/* * Intel */ {
@@ -4973,6 +4987,10 @@ static const struct pci_device_id serial {PCI_VENDOR_ID_HP ,PCI_DEVICE_ID_HP_DIVA_AUX ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , pbn_b2_1_115200 }, +/* HPE PCI serial device */ + { PCI_VENDOR_ID_HP_3PAR, PCI_DEVICE_ID_HPE_PCI_SERIAL, +PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 , + pbn_b1_1_115200 }, { PCI_VENDOR_ID_DCI, PCI_DEVICE_ID_DCI_PCCOM2, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
Greg Kroah-Hartman
maintainerPATCH 73/252 serial: 8250_pci: handle FL_NOIRQ board flag
In reply to Greg Kroah-HartmanFrom: Christian Gmeiner <[email protected]>
commit 9808f9be31c68af43f6e531f2c851ebb066513fe upstream.
In commit 8428413b1d14 ("serial: 8250_pci: Implement MSI(-X) support") the way the irq gets allocated was changed. With that change the handling FL_NOIRQ got lost. Restore the old behaviour.
--- drivers/tty/serial/8250/8250_pci.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-)
drivers/tty/serial/8250/8250_pci.c +17 -12
@@ -3958,21 +3958,26 @@ pciserial_init_ports(struct pci_dev *dev uart.port.flags =UPF_SKIP_TEST |UPF_BOOT_AUTOCONF |UPF_SHARE_IRQ ; uart.port.uartclk = board->base_baud *16 ; -if (pci_match_id (pci_use_msi, dev)) { -dev_dbg (&dev->dev,"Using MSI(-X) interrupts\n" ); -pci_set_master (dev); - rc =pci_alloc_irq_vectors (dev,1 ,1 ,PCI_IRQ_ALL_TYPES ); +if (board->flags &FL_NOIRQ ) { + uart.port.irq =0 ; }else { -dev_dbg (&dev->dev,"Using legacy interrupts\n" ); - rc =pci_alloc_irq_vectors (dev,1 ,1 ,PCI_IRQ_LEGACY ); - } -if (rc <0 ) { -kfree (priv); - priv =ERR_PTR (rc); - goto err_deinit; +if (pci_match_id (pci_use_msi, dev)) { +dev_dbg (&dev->dev,"Using MSI(-X) interrupts\n" ); +pci_set_master (dev); + rc =pci_alloc_irq_vectors (dev,1 ,1 ,PCI_IRQ_ALL_TYPES ); + }else { +dev_dbg (&dev->dev,"Using legacy interrupts\n" ); + rc =pci_alloc_irq_vectors (dev,1 ,1 ,PCI_IRQ_LEGACY ); + } +if (rc <0 ) { +kfree (priv); + priv =ERR_PTR (rc); + goto err_deinit; + } + + uart.port.irq =pci_irq_vector (dev,0 ); } - uart.port.irq =pci_irq_vector (dev,0 ); uart.port.dev = &dev->dev;for (i =0 ; i < nr_ports; i++) {
Greg Kroah-Hartman
maintainerPATCH 74/252 USB: trancevibrator: fix control-request direction
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 746e4acf87bcacf1406e05ef24a0b7139147c63e upstream.
The direction of the pipe argument must match the request-type direction bit or control requests may fail depending on the host-controller-driver implementation.
Fix the set-speed request which erroneously used USB_DIR_IN and update the default timeout argument to match (same value).
--- drivers/usb/misc/trancevibrator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/misc/trancevibrator.c +2 -2
@@ -61,9 +61,9 @@ static ssize_t speed_store(struct device/* Set speed */ retval =usb_control_msg (tv->udev,usb_sndctrlpipe (tv->udev,0 ),0x01 ,/* vendor request: set speed */ -USB_DIR_IN |USB_TYPE_VENDOR |USB_RECIP_OTHER , +USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_OTHER , tv->speed,/* speed value */ -0 ,NULL ,0 ,USB_CTRL_GET_TIMEOUT ); +0 ,NULL ,0 ,USB_CTRL_SET_TIMEOUT );if (retval) { tv->speed = old;dev_dbg (&tv->udev->dev,"retval = %d\n" , retval);
Greg Kroah-Hartman
maintainerPATCH 75/252 Revert "irqbypass: do not start cons/prod when failed connect"
In reply to Greg Kroah-HartmanFrom: Zhu Lingshan <[email protected]>
commit e44b49f623c77bee7451f1a82ccfb969c1028ae2 upstream.
This reverts commit a979a6aa009f3c99689432e0cdb5402a4463fb88.
The reverted commit may cause VM freeze on arm64 with GICv4, where stopping a consumer is implemented by suspending the VM. Should the connect fail, the VM will not be resumed, which is a bit of a problem.
It also erroneously calls the producer destructor unconditionally, which is unexpected.
--- virt/lib/irqbypass.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
virt/lib/irqbypass.c +6 -10
@@ -40,21 +40,17 @@ static int __connect(struct irq_bypass_pif (prod->add_consumer) ret = prod->add_consumer (prod, cons); -if (ret) - goto err_add_consumer; - - ret = cons->add_producer (cons, prod); -if (ret) - goto err_add_producer; +if (!ret) { + ret = cons->add_producer (cons, prod); +if (ret && prod->del_consumer) + prod->del_consumer (prod, cons); + }if (cons->start) cons->start (cons);if (prod->start) prod->start (prod); -err_add_producer: -if (prod->del_consumer) - prod->del_consumer (prod, cons); -err_add_consumer: +return ret; }
Greg Kroah-Hartman
maintainerPATCH 76/252 USB: usbfs: Dont WARN about excessively large memory allocations
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
commit 4f2629ea67e7225c3fd292c7fe4f5b3c9d6392de upstream.
Syzbot found that the kernel generates a WARNing if the user tries to submit a bulk transfer through usbfs with a buffer that is way too large. This isn't a bug in the kernel; it's merely an invalid request from the user and the usbfs code does handle it correctly.
In theory the same thing can happen with async transfers, or with the packet descriptor table for isochronous transfers.
To prevent the MM subsystem from complaining about these bad allocation requests, add the __GFP_NOWARN flag to the kmalloc calls for these buffers.
--- drivers/usb/core/devio.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/usb/core/devio.c +8 -3
@@ -1218,7 +1218,12 @@ static int do_proc_bulk(struct usb_dev_s ret =usbfs_increase_memory_usage (len1 +sizeof (struct urb ));if (ret)return ret; - tbuf =kmalloc (len1,GFP_KERNEL ); + +/* +* len1 can be almost arbitrarily large. Don't WARN if it's +* too big, just fail the request. +*/ + tbuf =kmalloc (len1,GFP_KERNEL | __GFP_NOWARN);if (!tbuf) { ret = -ENOMEM ; goto done;
@@ -1696,7 +1701,7 @@ static int proc_do_submiturb(struct usb_if (num_sgs) { as->urb->sg =kmalloc_array (num_sgs,sizeof (struct scatterlist ), -GFP_KERNEL ); +GFP_KERNEL | __GFP_NOWARN);if (!as->urb->sg) { ret = -ENOMEM ; goto error;
@@ -1731,7 +1736,7 @@ static int proc_do_submiturb(struct usb_ (uurb_start - as->usbm->vm_start); }else { as->urb->transfer_buffer =kmalloc (uurb->buffer_length, -GFP_KERNEL ); +GFP_KERNEL | __GFP_NOWARN);if (!as->urb->transfer_buffer) { ret = -ENOMEM ; goto error;
Greg Kroah-Hartman
maintainerPATCH 77/252 drivers: base: Fix device link removal
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
commit 80dd33cf72d1ab4f0af303f1fa242c6d6c8d328f upstream.
When device_link_free() drops references to the supplier and consumer devices of the device link going away and the reference being dropped turns out to be the last one for any of those device objects, its ->release callback will be invoked and it may sleep which goes against the SRCU callback execution requirements.
To address this issue, make the device link removal code carry out the device_link_free() actions preceded by SRCU synchronization from a separate work item (the "long" workqueue is used for that, because it does not matter when the device link memory is released and it may take time to get to that point) instead of using SRCU callbacks.
While at it, make the code work analogously when SRCU is not enabled to reduce the differences between the SRCU and non-SRCU cases.
--- drivers/base/core.c | 37 +++++++++++++++++++++++-------------- include/linux/device.h | 6 ++---- 2 files changed, 25 insertions(+), 18 deletions(-)
drivers/base/core.c +23 -14
@@ -83,6 +83,11 @@ int device_links_read_lock_held(void) {return srcu_read_lock_held (&device_links_srcu); } + +static void device_link_synchronize_removal (void ) +{ +synchronize_srcu (&device_links_srcu); +}#else /* !CONFIG_SRCU */ static DECLARE_RWSEM (device_links_lock);
@@ -113,6 +118,10 @@ int device_links_read_lock_held(void)return lockdep_is_held (&device_links_lock); }#endif + +static inline void device_link_synchronize_removal (void ) +{ +}#endif /* !CONFIG_SRCU */ static bool device_is_ancestor (struct device *dev,struct device *target)
@@ -332,8 +341,13 @@ static struct attribute *devlink_attrs[] };ATTRIBUTE_GROUPS (devlink); -static void device_link_free (struct device_link *link) +static void device_link_release_fn (struct work_struct *work) { + struct device_link *link = container_of(work, struct device_link, rm_work); + +/* Ensure that all references to the link object have been dropped. */ +device_link_synchronize_removal (); +while (refcount_dec_not_one (&link->rpm_active))pm_runtime_put (link->supplier);
@@ -342,24 +356,19 @@ static void device_link_free(struct devikfree (link); } -#ifdef CONFIG_SRCU -static void __device_link_free_srcu (struct rcu_head *rhead) -{ -device_link_free (container_of(rhead ,struct device_link ,rcu_head )); -} -static void devlink_dev_release (struct device *dev) {struct device_link *link =to_devlink (dev); -call_srcu (&device_links_srcu, &link->rcu_head, __device_link_free_srcu); -} -#else -static void devlink_dev_release (struct device *dev) -{ -device_link_free (to_devlink (dev)); +INIT_WORK (&link->rm_work, device_link_release_fn); +/* +* It may take a while to complete this work because of the SRCU +* synchronization in device_link_release_fn() and if the consumer or +* supplier devices get deleted when it runs, so put it into the "long" +* workqueue. +*/ +queue_work (system_long_wq, &link->rm_work); } -#endif static struct class devlink_class = { .name ="devlink" ,
include/linux/device.h +2 -4
@@ -570,7 +570,7 @@ struct device {* @flags: Link flags. * @rpm_active: Whether or not the consumer device is runtime-PM-active. * @kref: Count repeated addition of the same link. -* @rcu_head: An RCU head to use for deferred execution of SRCU callbacks. +* @rm_work: Work structure used for removing the link. * @supplier_preactivated: Supplier has been made active before consumer probe. */ struct device_link {
@@ -583,9 +583,7 @@ struct device_link {u32 flags;refcount_t rpm_active;struct kref kref; -#ifdef CONFIG_SRCU -struct rcu_head rcu_head; -#endif +struct work_struct rm_work;bool supplier_preactivated;/* Owned by consumer probe. */ };
Greg Kroah-Hartman
maintainerPATCH 78/252 serial: tegra: Fix a mask operation that is always true
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
commit 3ddb4ce1e6e3bd112778ab93bbd9092f23a878ec upstream.
Currently the expression lsr | UART_LSR_TEMT is always true and this seems suspect. I believe the intent was to mask lsr with UART_LSR_TEMT to check that bit, so the expression should be using the & operator instead. Fix this.
--- drivers/tty/serial/serial-tegra.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/serial-tegra.c +1 -1
@@ -333,7 +333,7 @@ static void tegra_uart_fifo_reset(structdo { lsr =tegra_uart_read (tup,UART_LSR ); -if ((lsr |UART_LSR_TEMT ) && !(lsr &UART_LSR_DR )) +if ((lsr &UART_LSR_TEMT ) && !(lsr &UART_LSR_DR ))break ;udelay (1 ); }while (--tmout);
Greg Kroah-Hartman
maintainerPATCH 79/252 serial: sh-sci: Fix off-by-one error in FIFO threshold register setting
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
commit 2ea2e019c190ee3973ef7bcaf829d8762e56e635 upstream.
The Receive FIFO Data Count Trigger field (RTRG[6:0]) in the Receive FIFO Data Count Trigger Register (HSRTRGR) of HSCIF can only hold values ranging from 0-127. As the FIFO size is equal to 128 on HSCIF, the user can write an out-of-range value, touching reserved bits.
Fix this by limiting the trigger value to the FIFO size minus one. Reverse the order of the checks, to avoid rx_trig becoming zero if the FIFO size is one.
Note that this change has no impact on other SCIF variants, as their maximum supported trigger value is lower than the FIFO size anyway, and the code below takes care of enforcing these limits.
--- drivers/tty/serial/sh-sci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/tty/serial/sh-sci.c +2 -2
@@ -1023,10 +1023,10 @@ static int scif_set_rtrg(struct uart_por {unsigned int bits; +if (rx_trig >= port->fifosize) + rx_trig = port->fifosize -1 ;if (rx_trig <1 ) rx_trig =1 ; -if (rx_trig >= port->fifosize) - rx_trig = port->fifosize;/* HSCIF can be set to an arbitrary level. */ if (sci_getreg (port,HSRTRGR )->size) {
Greg Kroah-Hartman
maintainerPATCH 80/252 serial: rp2: use request_firmware instead of request_firmware_nowait
In reply to Greg Kroah-HartmanFrom: Zheyu Ma <[email protected]>
commit 016002848c82eeb5d460489ce392d91fe18c475c upstream.
In 'rp2_probe', the driver registers 'rp2_uart_interrupt' then calls 'rp2_fw_cb' through 'request_firmware_nowait'. In 'rp2_fw_cb', if the firmware don't exists, function just return without initializing ports of 'rp2_card'. But now the interrupt handler function has been registered, and when an interrupt comes, 'rp2_uart_interrupt' may access those ports then causing NULL pointer dereference or other bugs.
Because the driver does some initialization work in 'rp2_fw_cb', in order to make the driver ready to handle interrupts, 'request_firmware' should be used instead of asynchronous 'request_firmware_nowait'.
This report reveals it:
INFO: trying to register non-static key.
the code is fine but needs lockdep annotation.
turning off the locking correctness validator.
CPU: 2 PID: 0 Comm: swapper/2 Not tainted 4.19.177-gdba4159c14ef-dirty #45 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.12.0-59- gc9ba5276e321-prebuilt.qemu.org 04/01/2014 Call Trace: <IRQ> __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0xec/0x156 lib/dump_stack.c:118 assign_lock_key kernel/locking/lockdep.c:727 [inline] register_lock_class+0x14e5/0x1ba0 kernel/locking/lockdep.c:753 __lock_acquire+0x187/0x3750 kernel/locking/lockdep.c:3303 lock_acquire+0x124/0x340 kernel/locking/lockdep.c:3907 __raw_spin_lock include/linux/spinlock_api_smp.h:142 [inline] _raw_spin_lock+0x32/0x50 kernel/locking/spinlock.c:144 spin_lock include/linux/spinlock.h:329 [inline] rp2_ch_interrupt drivers/tty/serial/rp2.c:466 [inline] rp2_asic_interrupt.isra.9+0x15d/0x990 drivers/tty/serial/rp2.c:493 rp2_uart_interrupt+0x49/0xe0 drivers/tty/serial/rp2.c:504 __handle_irq_event_percpu+0xfb/0x770 kernel/irq/handle.c:149 handle_irq_event_percpu+0x79/0x150 kernel/irq/handle.c:189 handle_irq_event+0xac/0x140 kernel/irq/handle.c:206 handle_fasteoi_irq+0x232/0x5c0 kernel/irq/chip.c:725 generic_handle_irq_desc include/linux/irqdesc.h:155 [inline] handle_irq+0x230/0x3a0 arch/x86/kernel/irq_64.c:87 do_IRQ+0xa7/0x1e0 arch/x86/kernel/irq.c:247 common_interrupt+0xf/0xf arch/x86/entry/entry_64.S:670 </IRQ> RIP: 0010:native_safe_halt+0x28/0x30 arch/x86/include/asm/irqflags.h:61 Code: 00 00 55 be 04 00 00 00 48 c7 c7 00 c2 2f 8c 48 89 e5 e8 fb 31 e7 f8
8b 05 75 af 8d 03 85 c0 7e 07 0f 00 2d 8a 61 65 00 fb f4 <5d> c3 90 90 90 90 90 90 0f 1f 44 00 00 55 48 89 e5 41 57 41 56 41
RSP: 0018:ffff88806b71fcc8 EFLAGS: 00000246 ORIG_RAX: ffffffffffffffde
RAX: 0000000000000000 RBX: ffffffff8bde7e48 RCX: ffffffff88a21285
RDX: 0000000000000000 RSI: 0000000000000004 RDI: ffffffff8c2fc200
RBP: ffff88806b71fcc8 R08: fffffbfff185f840 R09: fffffbfff185f840
R10: 0000000000000001 R11: fffffbfff185f840 R12: 0000000000000002
R13: ffffffff8bea18a0 R14: 0000000000000000 R15: 0000000000000000
arch_safe_halt arch/x86/include/asm/paravirt.h:94 [inline] default_idle+0x6f/0x360 arch/x86/kernel/process.c:557 arch_cpu_idle+0xf/0x20 arch/x86/kernel/process.c:548 default_idle_call+0x3b/0x60 kernel/sched/idle.c:93 cpuidle_idle_call kernel/sched/idle.c:153 [inline] do_idle+0x2ab/0x3c0 kernel/sched/idle.c:263 cpu_startup_entry+0xcb/0xe0 kernel/sched/idle.c:369 start_secondary+0x3b8/0x4e0 arch/x86/kernel/smpboot.c:271 secondary_startup_64+0xa4/0xb0 arch/x86/kernel/head_64.S:243 BUG: unable to handle kernel NULL pointer dereference at 0000000000000010 PGD 8000000056d27067 P4D 8000000056d27067 PUD 56d28067 PMD 0 Oops: 0000 [#1] PREEMPT SMP KASAN PTI CPU: 2 PID: 0 Comm: swapper/2 Not tainted 4.19.177-gdba4159c14ef-dirty #45 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.12.0-59- gc9ba5276e321-prebuilt.qemu.org 04/01/2014 RIP: 0010:readl arch/x86/include/asm/io.h:59 [inline] RIP: 0010:rp2_ch_interrupt drivers/tty/serial/rp2.c:472 [inline] RIP: 0010:rp2_asic_interrupt.isra.9+0x181/0x990 drivers/tty/serial/rp2.c: 493 Code: df e8 43 5d c2 05 48 8d 83 e8 01 00 00 48 89 85 60 ff ff ff 48 c1 e8 03 42 80 3c 30 00 0f 85 aa 07 00 00 48 8b 83 e8 01 00 00 <8b> 40 10 89 c1 89 85 68 ff ff ff 48 8b 83 e8 01 00 00 89 48 10 83 RSP: 0018:ffff88806c287cd0 EFLAGS: 00010046 RAX: 0000000000000000 RBX: ffff88806ade6820 RCX: ffffffff814300b1 RDX: 1ffff1100d5bcd06 RSI: 0000000000000004 RDI: ffff88806ade6820 RBP: ffff88806c287db8 R08: ffffed100d5bcd05 R09: ffffed100d5bcd05 R10: 0000000000000001 R11: ffffed100d5bcd04 R12: ffffc90001e00000 R13: ffff888069654e10 R14: dffffc0000000000 R15: ffff888069654df0 FS: 0000000000000000(0000) GS:ffff88806c280000(0000) knlGS: 0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000010 CR3: 000000006892c000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <IRQ> rp2_uart_interrupt+0x49/0xe0 drivers/tty/serial/rp2.c:504 __handle_irq_event_percpu+0xfb/0x770 kernel/irq/handle.c:149 handle_irq_event_percpu+0x79/0x150 kernel/irq/handle.c:189 handle_irq_event+0xac/0x140 kernel/irq/handle.c:206 handle_fasteoi_irq+0x232/0x5c0 kernel/irq/chip.c:725 generic_handle_irq_desc include/linux/irqdesc.h:155 [inline] handle_irq+0x230/0x3a0 arch/x86/kernel/irq_64.c:87 do_IRQ+0xa7/0x1e0 arch/x86/kernel/irq.c:247 common_interrupt+0xf/0xf arch/x86/entry/entry_64.S:670 </IRQ> RIP: 0010:native_safe_halt+0x28/0x30 arch/x86/include/asm/irqflags.h:61 Code: 00 00 55 be 04 00 00 00 48 c7 c7 00 c2 2f 8c 48 89 e5 e8 fb 31 e7
f8 8b 05 75 af 8d 03 85 c0 7e 07 0f 00 2d 8a 61 65 00 fb f4 <5d> c3 90 90 90 90 90 90 0f 1f 44 00 00 55 48 89 e5 41 57 41 56 41
RSP: 0018:ffff88806b71fcc8 EFLAGS: 00000246 ORIG_RAX: ffffffffffffffde
RAX: 0000000000000000 RBX: ffffffff8bde7e48 RCX: ffffffff88a21285
RDX: 0000000000000000 RSI: 0000000000000004 RDI: ffffffff8c2fc200
RBP: ffff88806b71fcc8 R08: fffffbfff185f840 R09: fffffbfff185f840
R10: 0000000000000001 R11: fffffbfff185f840 R12: 0000000000000002
R13: ffffffff8bea18a0 R14: 0000000000000000 R15: 0000000000000000
arch_safe_halt arch/x86/include/asm/paravirt.h:94 [inline] default_idle+0x6f/0x360 arch/x86/kernel/process.c:557 arch_cpu_idle+0xf/0x20 arch/x86/kernel/process.c:548 default_idle_call+0x3b/0x60 kernel/sched/idle.c:93 cpuidle_idle_call kernel/sched/idle.c:153 [inline] do_idle+0x2ab/0x3c0 kernel/sched/idle.c:263 cpu_startup_entry+0xcb/0xe0 kernel/sched/idle.c:369 start_secondary+0x3b8/0x4e0 arch/x86/kernel/smpboot.c:271 secondary_startup_64+0xa4/0xb0 arch/x86/kernel/head_64.S:243 Modules linked in: Dumping ftrace buffer: (ftrace buffer empty) CR2: 0000000000000010 ---[ end trace 11804dbb55cb1a64 ]--- RIP: 0010:readl arch/x86/include/asm/io.h:59 [inline] RIP: 0010:rp2_ch_interrupt drivers/tty/serial/rp2.c:472 [inline] RIP: 0010:rp2_asic_interrupt.isra.9+0x181/0x990 drivers/tty/serial/rp2.c: 493 Code: df e8 43 5d c2 05 48 8d 83 e8 01 00 00 48 89 85 60 ff ff ff 48 c1 e8 03 42 80 3c 30 00 0f 85 aa 07 00 00 48 8b 83 e8 01 00 00 <8b> 40 10 89 c1 89 85 68 ff ff ff 48 8b 83 e8 01 00 00 89 48 10 83 RSP: 0018:ffff88806c287cd0 EFLAGS: 00010046 RAX: 0000000000000000 RBX: ffff88806ade6820 RCX: ffffffff814300b1 RDX: 1ffff1100d5bcd06 RSI: 0000000000000004 RDI: ffff88806ade6820 RBP: ffff88806c287db8 R08: ffffed100d5bcd05 R09: ffffed100d5bcd05 R10: 0000000000000001 R11: ffffed100d5bcd04 R12: ffffc90001e00000 R13: ffff888069654e10 R14: dffffc0000000000 R15: ffff888069654df0 FS: 0000000000000000(0000) GS:ffff88806c280000(0000) knlGS: 0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000010 CR3: 000000006892c000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
--- drivers/tty/serial/rp2.c | 52 +++++++++++++++-------------------------------- 1 file changed, 17 insertions(+), 35 deletions(-)
drivers/tty/serial/rp2.c +17 -35
@@ -195,7 +195,6 @@ struct rp2_card {void __iomem *bar0;void __iomem *bar1;spinlock_t card_lock; -struct completion fw_loaded; };#define RP_ID (prod) PCI_VDEVICE(RP, (prod))
@@ -664,17 +663,10 @@ static void rp2_remove_ports(struct rp2_ card->initialized_ports =0 ; } -static void rp2_fw_cb (const struct firmware *fw,void *context) +static int rp2_load_firmware (struct rp2_card *card,const struct firmware *fw) { -struct rp2_card *card = context;resource_size_t phys_base; -int i, rc = -ENOENT ; - -if (!fw) { -dev_err (&card->pdev->dev,"cannot find '%s' firmware image\n" , -RP2_FW_NAME ); - goto no_fw; - } +int i, rc =0 ; phys_base =pci_resource_start (card->pdev,1 );
@@ -720,23 +712,13 @@ static void rp2_fw_cb(const struct firmw card->initialized_ports++; } -release_firmware (fw); -no_fw: -/* -* rp2_fw_cb() is called from a workqueue long after rp2_probe() -* has already returned success. So if something failed here, -* we'll just leave the now-dormant device in place until somebody -* unbinds it. -*/ -if (rc) -dev_warn (&card->pdev->dev,"driver initialization failed\n" ); - -complete (&card->fw_loaded); +return rc; }static int rp2_probe (struct pci_dev *pdev,const struct pci_device_id *id) { +const struct firmware *fw;struct rp2_card *card;struct rp2_uart_port *ports;void __iomem *const *bars;
@@ -747,7 +729,6 @@ static int rp2_probe(struct pci_dev *pdereturn -ENOMEM ;pci_set_drvdata (pdev, card);spin_lock_init (&card->card_lock); -init_completion (&card->fw_loaded); rc =pcim_enable_device (pdev);if (rc)
@@ -780,21 +761,23 @@ static int rp2_probe(struct pci_dev *pdereturn -ENOMEM ; card->ports = ports; - rc =devm_request_irq (&pdev->dev, pdev->irq, rp2_uart_interrupt, -IRQF_SHARED ,DRV_NAME , card); -if (rc) + rc =request_firmware (&fw,RP2_FW_NAME , &pdev->dev); +if (rc <0 ) { +dev_err (&pdev->dev,"cannot find '%s' firmware image\n" , +RP2_FW_NAME );return rc; + } -/* -* Only catastrophic errors (e.g. ENOMEM) are reported here. -* If the FW image is missing, we'll find out in rp2_fw_cb() -* and print an error message. -*/ - rc =request_firmware_nowait (THIS_MODULE ,1 ,RP2_FW_NAME , &pdev->dev, -GFP_KERNEL , card, rp2_fw_cb); + rc =rp2_load_firmware (card, fw); + +release_firmware (fw); +if (rc <0 ) +return rc; + + rc =devm_request_irq (&pdev->dev, pdev->irq, rp2_uart_interrupt, +IRQF_SHARED ,DRV_NAME , card);if (rc)return rc; -dev_dbg (&pdev->dev,"waiting for firmware blob...\n" );return 0 ; }
@@ -803,7 +786,6 @@ static void rp2_remove(struct pci_dev *p {struct rp2_card *card =pci_get_drvdata (pdev); -wait_for_completion (&card->fw_loaded);rp2_remove_ports (card); }
Greg Kroah-Hartman
maintainerPATCH 81/252 USB: serial: ti_usb_3410_5052: add startech.com device id
In reply to Greg Kroah-HartmanFrom: Sean MacLennan <[email protected]>
commit 89b1a3d811e6f8065d6ae8a25e7682329b4a31e2 upstream.
This adds support for the Startech.com generic serial to USB converter. It seems to be a bone stock TI_3410. I have been using this patch for years.
--- drivers/usb/serial/ti_usb_3410_5052.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/serial/ti_usb_3410_5052.c +3 -0
@@ -37,6 +37,7 @@/* Vendor and product ids */ #define TI_VENDOR_ID 0x0451#define IBM_VENDOR_ID 0x04b3 +#define STARTECH_VENDOR_ID 0x14b0#define TI_3410_PRODUCT_ID 0x3410#define IBM_4543_PRODUCT_ID 0x4543#define IBM_454B_PRODUCT_ID 0x454b
@@ -372,6 +373,7 @@ static const struct usb_device_id ti_id_ { USB_DEVICE(MXU1_VENDOR_ID, MXU1_1131_PRODUCT_ID) }, { USB_DEVICE(MXU1_VENDOR_ID, MXU1_1150_PRODUCT_ID) }, { USB_DEVICE(MXU1_VENDOR_ID, MXU1_1151_PRODUCT_ID) }, + { USB_DEVICE(STARTECH_VENDOR_ID, TI_3410_PRODUCT_ID) }, { } /* terminator */ };
@@ -410,6 +412,7 @@ static const struct usb_device_id ti_id_ { USB_DEVICE(MXU1_VENDOR_ID, MXU1_1131_PRODUCT_ID) }, { USB_DEVICE(MXU1_VENDOR_ID, MXU1_1150_PRODUCT_ID) }, { USB_DEVICE(MXU1_VENDOR_ID, MXU1_1151_PRODUCT_ID) }, + { USB_DEVICE(STARTECH_VENDOR_ID, TI_3410_PRODUCT_ID) }, { } /* terminator */ };
Greg Kroah-Hartman
maintainerPATCH 82/252 USB: serial: option: add Telit LE910-S1 compositions 0x7010, 0x7011
In reply to Greg Kroah-HartmanFrom: Daniele Palmas <[email protected]>
commit e467714f822b5d167a7fb03d34af91b5b6af1827 upstream.
Add support for the following Telit LE910-S1 compositions:
0x7010: rndis, tty, tty, tty0x7011: ecm, tty, tty, tty
--- drivers/usb/serial/option.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/serial/option.c +4 -0
@@ -1240,6 +1240,10 @@ static const struct usb_device_id option .driver_info = NCTRL(0) | RSVD(1) }, { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1901, 0xff), /* Telit LN940 (MBIM) */ .driver_info = NCTRL(0) }, + { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x7010, 0xff), /* Telit LE910-S1 (RNDIS) */ + .driver_info = NCTRL(2) }, + { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x7011, 0xff), /* Telit LE910-S1 (ECM) */ + .driver_info = NCTRL(2) }, { USB_DEVICE(TELIT_VENDOR_ID, 0x9010), /* Telit SBL FN980 flashing device */ .driver_info = NCTRL(0) | ZLP }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622, 0xff, 0xff, 0xff) }, /* ZTE WCDMA products */
Greg Kroah-Hartman
maintainerPATCH 83/252 USB: serial: ftdi_sio: add IDs for IDS GmbH Products
In reply to Greg Kroah-HartmanFrom: Dominik Andreas Schorpp <[email protected]>
commit c5a80540e425a5f9a82b0f3163e3b6a4331f33bc upstream.
Add the IDS GmbH Vendor ID and the Product IDs for SI31A (2xRS232) and CM31A (LoRaWAN Modem).
--- drivers/usb/serial/ftdi_sio.c | 3 +++ drivers/usb/serial/ftdi_sio_ids.h | 7 +++++++ 2 files changed, 10 insertions(+)
drivers/usb/serial/ftdi_sio.c +3 -0
@@ -1034,6 +1034,9 @@ static const struct usb_device_id id_tab/* Sienna devices */ { USB_DEVICE(FTDI_VID, FTDI_SIENNA_PID) }, { USB_DEVICE(ECHELON_VID, ECHELON_U20_PID) }, +/* IDS GmbH devices */ + { USB_DEVICE(IDS_VID, IDS_SI31A_PID) }, + { USB_DEVICE(IDS_VID, IDS_CM31A_PID) },/* U-Blox devices */ { USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ZED_PID) }, { USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ODIN_PID) },
drivers/usb/serial/ftdi_sio_ids.h +7 -0
@@ -1568,6 +1568,13 @@#define UNJO_ISODEBUG_V1_PID 0x150D/* +* IDS GmbH +*/ +#define IDS_VID 0x2CAF +#define IDS_SI31A_PID 0x13A2 +#define IDS_CM31A_PID 0x13A3 + +/* * U-Blox products (http://www.u-blox.com). */ #define UBLOX_VID 0x1546
Greg Kroah-Hartman
maintainerPATCH 84/252 USB: serial: pl2303: add device id for ADLINK ND-6530 GC
In reply to Greg Kroah-HartmanFrom: Zolton Jheng <[email protected]>
commit f8e8c1b2f782e7391e8a1c25648ce756e2a7d481 upstream.
This adds the device id for the ADLINK ND-6530 which is a PL2303GC based device.
--- drivers/usb/serial/pl2303.c | 1 + drivers/usb/serial/pl2303.h | 1 + 2 files changed, 2 insertions(+)
drivers/usb/serial/pl2303.c +1 -0
@@ -113,6 +113,7 @@ static const struct usb_device_id id_tab { USB_DEVICE(SONY_VENDOR_ID, SONY_QN3USB_PRODUCT_ID) }, { USB_DEVICE(SANWA_VENDOR_ID, SANWA_PRODUCT_ID) }, { USB_DEVICE(ADLINK_VENDOR_ID, ADLINK_ND6530_PRODUCT_ID) }, + { USB_DEVICE(ADLINK_VENDOR_ID, ADLINK_ND6530GC_PRODUCT_ID) }, { USB_DEVICE(SMART_VENDOR_ID, SMART_PRODUCT_ID) }, { USB_DEVICE(AT_VENDOR_ID, AT_VTKIT3_PRODUCT_ID) }, { } /* Terminating entry */
drivers/usb/serial/pl2303.h +1 -0
@@ -158,6 +158,7 @@/* ADLINK ND-6530 RS232,RS485 and RS422 adapter */ #define ADLINK_VENDOR_ID 0x0b63#define ADLINK_ND6530_PRODUCT_ID 0x6530 +#define ADLINK_ND6530GC_PRODUCT_ID 0x653a/* SMART USB Serial Adapter */ #define SMART_VENDOR_ID 0x0b8c
Greg Kroah-Hartman
maintainerPATCH 85/252 thermal/drivers/intel: Initialize RW trip to THERMAL_TEMP_INVALID
In reply to Greg Kroah-HartmanFrom: Srinivas Pandruvada <[email protected]>
commit eb8500b874cf295971a6a2a04e14eb0854197a3c upstream.
After commit 81ad4276b505 ("Thermal: Ignore invalid trip points") all user_space governor notifications via RW trip point is broken in intel thermal drivers. This commits marks trip_points with value of 0 during call to thermal_zone_device_register() as invalid. RW trip points can be 0 as user space will set the correct trip temperature later.
During driver init, x86_package_temp and all int340x drivers sets RW trip temperature as 0. This results in all these trips marked as invalid by the thermal core.
To fix this initialize RW trips to THERMAL_TEMP_INVALID instead of 0.
--- drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c | 4 ++++ drivers/thermal/intel/x86_pkg_temp_thermal.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c +4 -0
@@ -231,6 +231,8 @@ struct int34x_thermal_zone *int340x_therif (ACPI_FAILURE (status)) trip_cnt =0 ;else { +int i; + int34x_thermal_zone->aux_trips = kcalloc(trip_cnt, sizeof(*int34x_thermal_zone->aux_trips),
@@ -241,6 +243,8 @@ struct int34x_thermal_zone *int340x_ther } trip_mask =BIT (trip_cnt) -1 ; int34x_thermal_zone->aux_trip_nr = trip_cnt; +for (i =0 ; i < trip_cnt; ++i) + int34x_thermal_zone->aux_trips[i] =THERMAL_TEMP_INVALID ; } trip_cnt =int340x_thermal_read_trips (int34x_thermal_zone);
drivers/thermal/intel/x86_pkg_temp_thermal.c +1 -1
@@ -164,7 +164,7 @@ static int sys_get_trip_temp(struct therif (thres_reg_value) *temp = zonedev->tj_max - thres_reg_value *1000 ;else - *temp =0 ; + *temp =THERMAL_TEMP_INVALID ;pr_debug ("sys_get_trip_temp %d\n" , *temp);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 86/252 usb: dwc3: gadget: Properly track pending and queued SG
In reply to Greg Kroah-HartmanFrom: Thinh Nguyen <[email protected]>
commit 25dda9fc56bd90d45f9a4516bcfa5211e61b4290 upstream.
The driver incorrectly uses req->num_pending_sgs to track both the number of pending and queued SG entries. It only prepares the next request if the previous is done, and it doesn't update num_pending_sgs until there is TRB completion interrupt. This may starve the controller of more TRBs until the num_pending_sgs is decremented.
Fix this by decrementing the num_pending_sgs after they are queued and properly track both num_mapped_sgs and num_queued_sgs.
--- drivers/usb/dwc3/gadget.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/usb/dwc3/gadget.c +7 -6
@@ -1236,6 +1236,7 @@ static int dwc3_prepare_trbs_sg(struct d req->start_sg =sg_next (s); req->num_queued_sgs++; + req->num_pending_sgs--;/* * The number of pending SG entries may not correspond to the
@@ -1243,7 +1244,7 @@ static int dwc3_prepare_trbs_sg(struct d* don't include unused SG entries. */ if (length ==0 ) { - req->num_pending_sgs -= req->request.num_mapped_sgs - req->num_queued_sgs; + req->num_pending_sgs =0 ;break ; }
@@ -2784,15 +2785,15 @@ static int dwc3_gadget_ep_reclaim_trb_sgstruct dwc3_trb *trb = &dep->trb_pool[dep->trb_dequeue];struct scatterlist *sg = req->sg;struct scatterlist *s; -unsigned int pending = req->num_pending_sgs; +unsigned int num_queued = req->num_queued_sgs;unsigned int i;int ret =0 ; -for_each_sg (sg, s, pending, i) { +for_each_sg (sg, s, num_queued, i) { trb = &dep->trb_pool[dep->trb_dequeue]; req->sg =sg_next (s); - req->num_pending_sgs--; + req->num_queued_sgs--; ret =dwc3_gadget_ep_reclaim_completed_trb (dep, req, trb, event, status, true);
@@ -2815,7 +2816,7 @@ static int dwc3_gadget_ep_reclaim_trb_listatic bool dwc3_gadget_ep_request_completed (struct dwc3_request *req) { -return req->num_pending_sgs ==0 ; +return req->num_pending_sgs ==0 && req->num_queued_sgs ==0 ; } static int dwc3_gadget_ep_cleanup_completed_request(struct dwc3_ep *dep,
@@ -2824,7 +2825,7 @@ static int dwc3_gadget_ep_cleanup_comple {int ret; -if (req->num_pending_sgs) +if (req->request.num_mapped_sgs) ret =dwc3_gadget_ep_reclaim_trb_sg (dep, req, event, status);else
Greg Kroah-Hartman
maintainerPATCH 87/252 usb: gadget: udc: renesas_usb3: Fix a race in usb3_start_pipen()
In reply to Greg Kroah-HartmanFrom: Yoshihiro Shimoda <[email protected]>
commit e752dbc59e1241b13b8c4f7b6eb582862e7668fe upstream.
The usb3_start_pipen() is called by renesas_usb3_ep_queue() and usb3_request_done_pipen() so that usb3_start_pipen() is possible to cause a race when getting usb3_first_req like below:
renesas_usb3_ep_queue()
spin_lock_irqsave()
list_add_tail()
spin_unlock_irqrestore()
usb3_start_pipen()
usb3_first_req = usb3_get_request() --- [1]
--- interrupt ---
usb3_irq_dma_int()
usb3_request_done_pipen()
usb3_get_request()
usb3_start_pipen()
usb3_first_req = usb3_get_request()
...
(the req is possible to be finished in the interrupt)
The usb3_first_req [1] above may have been finished after the interrupt ended so that this driver caused to start a transfer wrongly. To fix this issue, getting/checking the usb3_first_req are under spin_lock_irqsave() in the same section.
--- drivers/usb/gadget/udc/renesas_usb3.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/usb/gadget/udc/renesas_usb3.c +3 -2
@@ -1488,7 +1488,7 @@ static void usb3_start_pipen(struct rene struct renesas_usb3_request *usb3_req) {struct renesas_usb3 *usb3 =usb3_ep_to_usb3 (usb3_ep); -struct renesas_usb3_request *usb3_req_first =usb3_get_request (usb3_ep); +struct renesas_usb3_request *usb3_req_first;unsigned long flags;int ret = -EAGAIN ;u32 enable_bits =0 ;
@@ -1496,7 +1496,8 @@ static void usb3_start_pipen(struct renespin_lock_irqsave (&usb3->lock, flags);if (usb3_ep->halt || usb3_ep->started) goto out; -if (usb3_req != usb3_req_first) + usb3_req_first =__usb3_get_request (usb3_ep); +if (!usb3_req_first || usb3_req != usb3_req_first) goto out;if (usb3_pn_change (usb3, usb3_ep->num) <0 )
Greg Kroah-Hartman
maintainerPATCH 88/252 usb: typec: mux: Fix matching with typec_altmode_desc
In reply to Greg Kroah-HartmanFrom: Bjorn Andersson <[email protected]>
commit acf5631c239dfc53489f739c4ad47f490c5181ff upstream.
In typec_mux_match() "nval" is assigned the number of elements in the "svid" fwnode property, then the variable is used to store the success of the read and finally attempts to loop between 0 and "success" - i.e. not at all - and the code returns indicating that no match was found.
Fix this by using a separate variable to track the success of the read, to allow the loop to get a change to find a match.
--- drivers/usb/typec/mux.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/usb/typec/mux.c +4 -3
@@ -191,6 +191,7 @@ static void *typec_mux_match(struct fwnobool match;int nval;u16 *val; +int ret;int i;/*
@@ -218,10 +219,10 @@ static void *typec_mux_match(struct fwnoif (!val)return ERR_PTR (-ENOMEM ); - nval =fwnode_property_read_u16_array (fwnode,"svid" , val, nval); -if (nval <0 ) { + ret =fwnode_property_read_u16_array (fwnode,"svid" , val, nval); +if (ret <0 ) {kfree (val); -return ERR_PTR (nval); +return ERR_PTR (ret); }for (i =0 ; i < nval; i++) {
Greg Kroah-Hartman
maintainerPATCH 89/252 net: usb: fix memory leak in smsc75xx_bind
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
commit 46a8b29c6306d8bbfd92b614ef65a47c900d8e70 upstream.
Syzbot reported memory leak in smsc75xx_bind(). The problem was is non-freed memory in case of errors after memory allocation.
backtrace:
[<ffffffff84245b62>] kmalloc include/linux/slab.h:556 [inline] [<ffffffff84245b62>] kzalloc include/linux/slab.h:686 [inline] [<ffffffff84245b62>] smsc75xx_bind+0x7a/0x334 drivers/net/usb/smsc75xx.c:1460 [<ffffffff82b5b2e6>] usbnet_probe+0x3b6/0xc30 drivers/net/usb/usbnet.c:1728
--- drivers/net/usb/smsc75xx.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/usb/smsc75xx.c +6 -2
@@ -1483,7 +1483,7 @@ static int smsc75xx_bind(struct usbnet * ret =smsc75xx_wait_ready (dev,0 );if (ret <0 ) {netdev_warn (dev->net,"device not ready in smsc75xx_bind\n" ); -return ret; + goto err; }smsc75xx_init_mac_address (dev);
@@ -1492,7 +1492,7 @@ static int smsc75xx_bind(struct usbnet * ret =smsc75xx_reset (dev);if (ret <0 ) {netdev_warn (dev->net,"smsc75xx_reset error %d\n" , ret); -return ret; + goto err; } dev->net->netdev_ops = &smsc75xx_netdev_ops;
@@ -1502,6 +1502,10 @@ static int smsc75xx_bind(struct usbnet * dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len; dev->net->max_mtu =MAX_SINGLE_PACKET_SIZE ;return 0 ; + +err: +kfree (pdata); +return ret; }static void smsc75xx_unbind (struct usbnet *dev,struct usb_interface *intf)
Greg Kroah-Hartman
maintainerPATCH 90/252 Bluetooth: cmtp: fix file refcount when cmtp_attach_device fails
In reply to Greg Kroah-HartmanFrom: Thadeu Lima de Souza Cascardo <[email protected]>
commit 8da3a0b87f4f1c3a3bbc4bfb78cf68476e97d183 upstream.
When cmtp_attach_device fails, cmtp_add_connection returns the error value which leads to the caller to doing fput through sockfd_put. But cmtp_session kthread, which is stopped in this path will also call fput, leading to a potential refcount underflow or a use-after-free.
Add a refcount before we signal the kthread to stop. The kthread will try to grab the cmtp_session_sem mutex before doing the fput, which is held when get_file is called, so there should be no races there.
--- net/bluetooth/cmtp/core.c | 5 +++++ 1 file changed, 5 insertions(+)
net/bluetooth/cmtp/core.c +5 -0
@@ -392,6 +392,11 @@ int cmtp_add_connection(struct cmtp_connif (!(session->flags &BIT (CMTP_LOOPBACK ))) { err =cmtp_attach_device (session);if (err <0 ) { +/* Caller will call fput in case of failure, and so +* will cmtp_session kthread. +*/ +get_file (session->sock->file); +atomic_inc (&session->terminate);wake_up_interruptible (sk_sleep (session->sock->sk));up_write (&cmtp_session_sem);
Greg Kroah-Hartman
maintainerPATCH 91/252 fs/nfs: Use fatal_signal_pending instead of signal_pending
In reply to Greg Kroah-HartmanFrom: zhouchuangao <[email protected]>
commit bb002388901151fe35b6697ab116f6ed0721a9ed upstream.
We set the state of the current process to TASK_KILLABLE via prepare_to_wait(). Should we use fatal_signal_pending() to detect the signal here?
--- fs/nfs/nfs4proc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/nfs/nfs4proc.c +2 -2
@@ -1688,7 +1688,7 @@ static void nfs_set_open_stateid_locked(rcu_read_unlock ();trace_nfs4_open_stateid_update_wait (state->inode, stateid,0 ); -if (!signal_pending (current)) { +if (!fatal_signal_pending (current)) {if (schedule_timeout (5 *HZ ) ==0 ) status = -EAGAIN ;else
@@ -3463,7 +3463,7 @@ static bool nfs4_refresh_open_old_stateiwrite_sequnlock (&state->seqlock);trace_nfs4_close_stateid_update_wait (state->inode, dst,0 ); -if (signal_pending (current)) +if (fatal_signal_pending (current)) status = -EINTR ;else if (schedule_timeout (5 *HZ ) !=0 )
Greg Kroah-Hartman
maintainerPATCH 92/252 NFS: fix an incorrect limit in filelayout_decode_layout()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit 769b01ea68b6c49dc3cde6adf7e53927dacbd3a8 upstream.
The "sizeof(struct nfs_fh)" is two bytes too large and could lead to memory corruption. It should be NFS_MAXFHSIZE because that's the size of the ->data[] buffer.
I reversed the size of the arguments to put the variable on the left.
--- fs/nfs/filelayout/filelayout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/filelayout/filelayout.c +1 -1
@@ -718,7 +718,7 @@ filelayout_decode_layout(struct pnfs_layif (unlikely (!p)) goto out_err; fl->fh_array[i]->size =be32_to_cpup (p++); -if (sizeof (struct nfs_fh ) < fl->fh_array[i]->size) { +if (fl->fh_array[i]->size >NFS_MAXFHSIZE ) {printk (KERN_ERR "NFS: Too big fh %d received %d\n" , i, fl->fh_array[i]->size); goto out_err;
Greg Kroah-Hartman
maintainerPATCH 93/252 NFS: Fix an Oopsable condition in __nfs_pageio_add_request()
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
commit 56517ab958b7c11030e626250c00b9b1a24b41eb upstream.
Ensure that nfs_pageio_error_cleanup() resets the mirror array contents, so that the structure reflects the fact that it is now empty. Also change the test in nfs_pageio_do_add_request() to be more robust by checking whether or not the list is empty rather than relying on the value of pg_count.
--- fs/nfs/pagelist.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
fs/nfs/pagelist.c +5 -4
@@ -1094,15 +1094,16 @@ nfs_pageio_do_add_request(struct nfs_pagstruct nfs_page *prev =NULL ;unsigned int size; -if (mirror->pg_count !=0 ) { - prev =nfs_list_entry (mirror->pg_list.prev); - }else { +if (list_empty (&mirror->pg_list)) {if (desc->pg_ops->pg_init) desc->pg_ops->pg_init (desc, req);if (desc->pg_error <0 )return 0 ; mirror->pg_base = req->wb_pgbase; - } + mirror->pg_count =0 ; + mirror->pg_recoalesce =0 ; + }else + prev =nfs_list_entry (mirror->pg_list.prev);if (desc->pg_maxretrans && req->wb_nio > desc->pg_maxretrans) {if (NFS_SERVER (desc->pg_inode)->flags &NFS_MOUNT_SOFTERR )
Greg Kroah-Hartman
maintainerPATCH 94/252 NFS: Dont corrupt the value of pg_bytes_written in nfs_do_recoalesce()
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
commit 0d0ea309357dea0d85a82815f02157eb7fcda39f upstream.
The value of mirror->pg_bytes_written should only be updated after a successful attempt to flush out the requests on the list.
--- fs/nfs/pagelist.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
fs/nfs/pagelist.c +5 -7
@@ -1128,17 +1128,16 @@ static void nfs_pageio_doio(struct nfs_p {struct nfs_pgio_mirror *mirror =nfs_pgio_current_mirror (desc); -if (!list_empty (&mirror->pg_list)) {int error = desc->pg_ops->pg_doio (desc);if (error <0 ) desc->pg_error = error; -else +if (list_empty (&mirror->pg_list)) { mirror->pg_bytes_written += mirror->pg_count; - } -if (list_empty (&mirror->pg_list)) { - mirror->pg_count =0 ; - mirror->pg_base =0 ; + mirror->pg_count =0 ; + mirror->pg_base =0 ; + mirror->pg_recoalesce =0 ; + } } }
@@ -1228,7 +1227,6 @@ static int nfs_do_recoalesce(struct nfs_ do { list_splice_init(&mirror->pg_list, &head); - mirror->pg_bytes_written -= mirror->pg_count; mirror->pg_count = 0; mirror->pg_base = 0; mirror->pg_recoalesce = 0;
Greg Kroah-Hartman
maintainerPATCH 95/252 NFSv4: Fix v4.0/v4.1 SEEK_DATA return -ENOTSUPP when set NFS_V4_2 config
In reply to Greg Kroah-HartmanFrom: Zhang Xiaoxu <[email protected]>
commit e67afa7ee4a59584d7253e45d7f63b9528819a13 upstream.
Since commit bdcc2cd14e4e ("NFSv4.2: handle NFS-specific llseek errors"), nfs42_proc_llseek would return -EOPNOTSUPP rather than -ENOTSUPP when SEEK_DATA on NFSv4.0/v4.1.
This will lead xfstests generic/285 not run on NFSv4.0/v4.1 when set the CONFIG_NFS_V4_2, rather than run failed.
--- fs/nfs/nfs4file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/nfs4file.c +1 -1
@@ -211,7 +211,7 @@ static loff_t nfs4_file_llseek(struct ficase SEEK_HOLE :case SEEK_DATA : ret =nfs42_proc_llseek (filep, offset, whence); -if (ret != -ENOTSUPP ) +if (ret != -EOPNOTSUPP )return ret; fallthrough;default :
Greg Kroah-Hartman
maintainerPATCH 96/252 drm/meson: fix shutdown crash when component not probed
In reply to Greg Kroah-HartmanFrom: Neil Armstrong <[email protected]>
commit 7cfc4ea78fc103ea51ecbacd9236abb5b1c490d2 upstream.
When main component is not probed, by example when the dw-hdmi module is not loaded yet or in probe defer, the following crash appears on shutdown:
Unable to handle kernel NULL pointer dereference at virtual address 0000000000000038 ... pc : meson_drv_shutdown+0x24/0x50 lr : platform_drv_shutdown+0x20/0x30 ... Call trace: meson_drv_shutdown+0x24/0x50 platform_drv_shutdown+0x20/0x30 device_shutdown+0x158/0x360 kernel_restart_prepare+0x38/0x48 kernel_restart+0x18/0x68 __do_sys_reboot+0x224/0x250 __arm64_sys_reboot+0x24/0x30
...
Simply check if the priv struct has been allocated before using it.
--- drivers/gpu/drm/meson/meson_drv.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/meson/meson_drv.c +5 -4
@@ -485,11 +485,12 @@ static int meson_probe_remote(struct plastatic void meson_drv_shutdown (struct platform_device *pdev) {struct meson_drm *priv =dev_get_drvdata (&pdev->dev); -struct drm_device *drm = priv->drm; -DRM_DEBUG_DRIVER ("\n" ); -drm_kms_helper_poll_fini (drm); -drm_atomic_helper_shutdown (drm); +if (!priv) +return ; + +drm_kms_helper_poll_fini (priv->drm); +drm_atomic_helper_shutdown (priv->drm); }static int meson_drv_probe (struct platform_device *pdev)
Greg Kroah-Hartman
maintainerPATCH 97/252 net/mlx5e: reset XPS on error flow if netdev isnt registered yet
In reply to Greg Kroah-HartmanFrom: Saeed Mahameed <[email protected]>
commit 77ecd10d0a8aaa6e4871d8c63626e4c9fc5e47db upstream.
mlx5e_attach_netdev can be called prior to registering the netdevice:
Example stack:
ipoib_new_child_link ->
ipoib_intf_init->
rdma_init_netdev->
mlx5_rdma_setup_rn->
mlx5e_attach_netdev->mlx5e_num_channels_changed ->mlx5e_set_default_xps_cpumasks ->netif_set_xps_queue ->__netif_set_xps_queue -> kmalloc
If any later stage fails at any point after mlx5e_num_channels_changed() returns, XPS allocated maps will never be freed as they
are only freed during netdev unregistration, which will never happen for yet to be registered netdevs.
--- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +7 -0
@@ -5385,6 +5385,11 @@ err_free_netdev:return NULL ; } +static void mlx5e_reset_channels (struct net_device *netdev) +{ +netdev_reset_tc (netdev); +} +int mlx5e_attach_netdev (struct mlx5e_priv *priv) {const bool take_rtnl = priv->netdev->reg_state ==NETREG_REGISTERED ;
@@ -5438,6 +5443,7 @@ err_cleanup_tx: profile->cleanup_tx (priv); out: +mlx5e_reset_channels (priv->netdev);set_bit (MLX5E_STATE_DESTROYING , &priv->state);cancel_work_sync (&priv->update_stats_work);return err;
@@ -5455,6 +5461,7 @@ void mlx5e_detach_netdev(struct mlx5e_pr profile->cleanup_rx (priv); profile->cleanup_tx (priv); +mlx5e_reset_channels (priv->netdev);cancel_work_sync (&priv->update_stats_work); }
Greg Kroah-Hartman
maintainerPATCH 98/252 net/mlx5e: Fix multipath lag activation
In reply to Greg Kroah-HartmanFrom: Dima Chumak <[email protected]>
commit 97817fcc684ed01497bd19d0cd4dea699665b9cf upstream.
When handling FIB_EVENT_ENTRY_REPLACE event for a new multipath route, lag activation can be missed if a stale (struct lag_mp)->mfi pointer exists, which was associated with an older multipath route that had been removed.
Normally, when a route is removed, it triggers mlx5_lag_fib_event(), which handles FIB_EVENT_ENTRY_DEL and clears mfi pointer. But, if mlx5_lag_check_prereq() condition isn't met, for example when eswitch is in legacy mode, the fib event is skipped and mfi pointer becomes stale.
Fix by resetting mfi pointer to NULL every time mlx5_lag_mp_init() is called.
--- drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c +6 -0
@@ -307,6 +307,11 @@ int mlx5_lag_mp_init(struct mlx5_lag *ldstruct lag_mp *mp = &ldev->lag_mp;int err; +/* always clear mfi, as it might become stale when a route delete event +* has been missed +*/ + mp->mfi =NULL ; +if (mp->fib_nb.notifier_call)return 0 ;
@@ -335,4 +340,5 @@ void mlx5_lag_mp_cleanup(struct mlx5_lagunregister_fib_notifier (&init_net, &mp->fib_nb);destroy_workqueue (mp->wq); mp->fib_nb.notifier_call =NULL ; + mp->mfi =NULL ; }
Greg Kroah-Hartman
maintainerPATCH 99/252 net/mlx5e: Fix error path of updating netdev queues
In reply to Greg Kroah-HartmanFrom: Aya Levin <[email protected]>
commit 5e7923acbd86d0ff29269688d8a9c47ad091dd46 upstream.
Avoid division by zero in the error flow. In the driver TC number can be either 1 or 8. When TC count is set to 1, driver zero netdev->num_tc. Hence, need to convert it back from 0 to 1 in the error flow.
--- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +1 -1
@@ -2920,7 +2920,7 @@ static int mlx5e_update_netdev_queues(stint err; old_num_txqs = netdev->real_num_tx_queues; - old_ntc = netdev->num_tc; + old_ntc = netdev->num_tc ? :1 ; nch = priv->channels.params.num_channels; ntc = priv->channels.params.num_tc;
Greg Kroah-Hartman
maintainerPATCH 100/252 {net,vdpa}/mlx5: Configure interface MAC into mpfs L2 table
In reply to Greg Kroah-HartmanFrom: Eli Cohen <[email protected]>
commit 7c9f131f366ab414691907fa0407124ea2b2f3bc upstream.
net/mlx5: Expose MPFS configuration API
MPFS is the multi physical function switch that bridges traffic between the physical port and any physical functions associated with it. The driver is required to add or remove MAC entries to properly forward incoming traffic to the correct physical function.
We export the API to control MPFS so that other drivers, such as mlx5_vdpa are able to add MAC addresses of their network interfaces.
The MAC address of the vdpa interface must be configured into the MPFS L2 address. Failing to do so could cause, in some NIC configurations, failure to forward packets to the vdpa network device instance.
Fix this by adding calls to update the MPFS table.
--- drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c | 3 +++ drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.h | 5 +---- drivers/vdpa/mlx5/net/mlx5_vnet.c | 19 ++++++++++++++++++- include/linux/mlx5/mpfs.h | 18 ++++++++++++++++++ 6 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 include/linux/mlx5/mpfs.h
drivers/net/ethernet/mellanox/mlx5/core/en_fs.c +1 -0
@@ -35,6 +35,7 @@#include <linux/ipv6.h> #include <linux/tcp.h> #include <linux/mlx5/fs.h> +#include <linux/mlx5/mpfs.h> #include "en.h" #include "lib/mpfs.h"
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +1 -0
@@ -35,6 +35,7 @@#include <linux/mlx5/mlx5_ifc.h> #include <linux/mlx5/vport.h> #include <linux/mlx5/fs.h> +#include <linux/mlx5/mpfs.h> #include "esw/acl/lgcy.h" #include "mlx5_core.h" #include "lib/eq.h"
drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c +3 -0
@@ -33,6 +33,7 @@#include <linux/etherdevice.h> #include <linux/mlx5/driver.h> #include <linux/mlx5/mlx5_ifc.h> +#include <linux/mlx5/mpfs.h> #include <linux/mlx5/eswitch.h> #include "mlx5_core.h" #include "lib/mpfs.h"
@@ -175,6 +176,7 @@ out:mutex_unlock (&mpfs->lock);return err; } +EXPORT_SYMBOL (mlx5_mpfs_add_mac);int mlx5_mpfs_del_mac (struct mlx5_core_dev *dev,u8 *mac) {
@@ -206,3 +208,4 @@ unlock:mutex_unlock (&mpfs->lock);return err; } +EXPORT_SYMBOL (mlx5_mpfs_del_mac);
drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.h +1 -4
@@ -84,12 +84,9 @@ struct l2addr_node {#ifdef CONFIG_MLX5_MPFS int mlx5_mpfs_init (struct mlx5_core_dev *dev);void mlx5_mpfs_cleanup (struct mlx5_core_dev *dev); -int mlx5_mpfs_add_mac (struct mlx5_core_dev *dev,u8 *mac); -int mlx5_mpfs_del_mac (struct mlx5_core_dev *dev,u8 *mac);#else /* #ifndef CONFIG_MLX5_MPFS */ static inline int mlx5_mpfs_init (struct mlx5_core_dev *dev) {return 0 ; }static inline void mlx5_mpfs_cleanup (struct mlx5_core_dev *dev) {} -static inline int mlx5_mpfs_add_mac (struct mlx5_core_dev *dev,u8 *mac) {return 0 ; } -static inline int mlx5_mpfs_del_mac (struct mlx5_core_dev *dev,u8 *mac) {return 0 ; }#endif +#endif
drivers/vdpa/mlx5/net/mlx5_vnet.c +18 -1
@@ -9,6 +9,7 @@#include <linux/mlx5/vport.h> #include <linux/mlx5/fs.h> #include <linux/mlx5/device.h> +#include <linux/mlx5/mpfs.h> #include "mlx5_vnet.h" #include "mlx5_vdpa_ifc.h" #include "mlx5_vdpa.h"
@@ -1839,11 +1840,16 @@ static int mlx5_vdpa_set_map(struct vdpastatic void mlx5_vdpa_free (struct vdpa_device *vdev) {struct mlx5_vdpa_dev *mvdev =to_mvdev (vdev); +struct mlx5_core_dev *pfmdev;struct mlx5_vdpa_net *ndev; ndev =to_mlx5_vdpa_ndev (mvdev);free_resources (ndev); +if (!is_zero_ether_addr (ndev->config.mac)) { + pfmdev =pci_get_drvdata (pci_physfn (mvdev->mdev->pdev)); +mlx5_mpfs_del_mac (pfmdev, ndev->config.mac); + }mlx5_vdpa_free_resources (&ndev->mvdev);mutex_destroy (&ndev->reslock); }
@@ -1962,6 +1968,7 @@ static void init_mvqs(struct mlx5_vdpa_nvoid *mlx5_vdpa_add_dev (struct mlx5_core_dev *mdev) {struct virtio_net_config *config; +struct mlx5_core_dev *pfmdev;struct mlx5_vdpa_dev *mvdev;struct mlx5_vdpa_net *ndev;u32 max_vqs;
@@ -1990,10 +1997,17 @@ void *mlx5_vdpa_add_dev(struct mlx5_coreif (err) goto err_mtu; +if (!is_zero_ether_addr (config->mac)) { + pfmdev =pci_get_drvdata (pci_physfn (mdev->pdev)); + err =mlx5_mpfs_add_mac (pfmdev, config->mac); +if (err) + goto err_mtu; + } + mvdev->vdev.dma_dev = mdev->device; err =mlx5_vdpa_alloc_resources (&ndev->mvdev);if (err) - goto err_mtu; + goto err_mpfs; err =alloc_resources (ndev);if (err)
@@ -2009,6 +2023,9 @@ err_reg:free_resources (ndev); err_res:mlx5_vdpa_free_resources (&ndev->mvdev); +err_mpfs: +if (!is_zero_ether_addr (config->mac)) +mlx5_mpfs_del_mac (pfmdev, config->mac); err_mtu:mutex_destroy (&ndev->reslock);put_device (&mvdev->vdev.dev);
include/linux/mlx5/mpfs.h new file +18 -0
@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB +* Copyright (c) 2021 Mellanox Technologies Ltd. +*/ + +#ifndef _MLX5_MPFS_ +#define _MLX5_MPFS_ + +struct mlx5_core_dev ; + +#ifdef CONFIG_MLX5_MPFS +int mlx5_mpfs_add_mac (struct mlx5_core_dev *dev,u8 *mac); +int mlx5_mpfs_del_mac (struct mlx5_core_dev *dev,u8 *mac); +#else /* #ifndef CONFIG_MLX5_MPFS */ +static inline int mlx5_mpfs_add_mac (struct mlx5_core_dev *dev,u8 *mac) {return 0 ; } +static inline int mlx5_mpfs_del_mac (struct mlx5_core_dev *dev,u8 *mac) {return 0 ; } +#endif + +#endif
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Greg Kroah-Hartman
maintainerPATCH 101/252 net/mlx5e: Fix nullptr in add_vlan_push_action()
In reply to Greg Kroah-HartmanFrom: Dima Chumak <[email protected]>
commit dca59f4a791960ec73fa15803faa0abe0f92ece2 upstream.
The result of dev_get_by_index_rcu() is not checked for NULL and then gets dereferenced immediately.
Also, the RCU lock must be held by the caller of dev_get_by_index_rcu(), which isn't satisfied by the call stack.
Fix by handling nullptr return value when iflink device is not found. Add RCU locking around dev_get_by_index_rcu() to avoid possible adverse effects while iterating over the net_device's hlist.
It is safe not to increment reference count of the net_device pointer in case of a successful lookup, because it's already handled by VLAN code during VLAN device registration (see register_vlan_dev and netdev_upper_dev_link).
Addresses-Coverity: ("Dereference null return value")
--- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +6 -2
@@ -4025,8 +4025,12 @@ static int add_vlan_push_action(struct mif (err)return err; - *out_dev =dev_get_by_index_rcu (dev_net (vlan_dev), -dev_get_iflink (vlan_dev)); +rcu_read_lock (); + *out_dev =dev_get_by_index_rcu (dev_net (vlan_dev),dev_get_iflink (vlan_dev)); +rcu_read_unlock (); +if (!*out_dev) +return -ENODEV ; +if (is_vlan_dev (*out_dev)) err =add_vlan_push_action (priv, attr, out_dev, action);
Greg Kroah-Hartman
maintainerPATCH 102/252 net/mlx5: Set reformat action when needed for termination rules
In reply to Greg Kroah-HartmanFrom: Jianbo Liu <[email protected]>
commit 442b3d7b671bcb779ebdad46edd08051eb8b28d9 upstream.
For remote mirroring, after the tunnel packets are received, they are decapsulated and sent to representor, then re-encapsulated and sent out over another tunnel. So reformat action is set only when the destination is required to do encapsulation.
--- drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c | 31 +++------- 1 file changed, 10 insertions(+), 21 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c +10 -21
@@ -171,19 +171,6 @@ mlx5_eswitch_termtbl_put(struct mlx5_esw } } -static bool mlx5_eswitch_termtbl_is_encap_reformat (struct mlx5_pkt_reformat *rt) -{ -switch (rt->reformat_type) { -case MLX5_REFORMAT_TYPE_L2_TO_VXLAN : -case MLX5_REFORMAT_TYPE_L2_TO_NVGRE : -case MLX5_REFORMAT_TYPE_L2_TO_L2_TUNNEL : -case MLX5_REFORMAT_TYPE_L2_TO_L3_TUNNEL : -return true; -default : -return false; - } -} -static void mlx5_eswitch_termtbl_actions_move (struct mlx5_flow_act *src,struct mlx5_flow_act *dst)
@@ -201,14 +188,6 @@ mlx5_eswitch_termtbl_actions_move(structmemset (&src->vlan[1 ],0 ,sizeof (src->vlan[1 ])); } } - -if (src->action &MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT && -mlx5_eswitch_termtbl_is_encap_reformat (src->pkt_reformat)) { - src->action &= ~MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT ; - dst->action |=MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT ; - dst->pkt_reformat = src->pkt_reformat; - src->pkt_reformat =NULL ; - } } static bool mlx5_eswitch_offload_is_uplink_port(const struct mlx5_eswitch *esw,
@@ -278,6 +257,14 @@ mlx5_eswitch_add_termtbl_rule(struct mlxif (dest[i].type !=MLX5_FLOW_DESTINATION_TYPE_VPORT )continue ; +if (attr->dests[num_vport_dests].flags &MLX5_ESW_DEST_ENCAP ) { + term_tbl_act.action |=MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT ; + term_tbl_act.pkt_reformat = attr->dests[num_vport_dests].pkt_reformat; + }else { + term_tbl_act.action &= ~MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT ; + term_tbl_act.pkt_reformat =NULL ; + } +/* get the terminating table for the action list */ tt =mlx5_eswitch_termtbl_get_create (esw, &term_tbl_act, &dest[i], attr);
@@ -299,6 +286,8 @@ mlx5_eswitch_add_termtbl_rule(struct mlx goto revert_changes;/* create the FTE */ + flow_act->action &= ~MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT ; + flow_act->pkt_reformat =NULL ; rule =mlx5_add_flow_rules (fdb, spec, flow_act, dest, num_dest);if (IS_ERR (rule)) goto revert_changes;
Greg Kroah-Hartman
maintainerPATCH 103/252 net/mlx5e: Fix null deref accessing lag dev
In reply to Greg Kroah-HartmanFrom: Roi Dayan <[email protected]>
commit 83026d83186bc48bb41ee4872f339b83f31dfc55 upstream.
It could be the lag dev is null so stop processing the event. In bond_enslave() the active/backup slave being set before setting the upper dev so first event is without an upper dev.
After setting the upper dev with bond_master_upper_dev_link() there is a second event and in that event we have an upper dev.
--- drivers/net/ethernet/mellanox/mlx5/core/en/rep/bond.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/en/rep/bond.c +2 -0
@@ -223,6 +223,8 @@ static void mlx5e_rep_changelowerstate_e rpriv = priv->ppriv; fwd_vport_num = rpriv->rep->vport; lag_dev =netdev_master_upper_dev_get (netdev); +if (!lag_dev) +return ;netdev_dbg (netdev,"lag_dev(%s)'s slave vport(%d) is txable(%d)\n" , lag_dev->name, fwd_vport_num,net_lag_port_dev_txable (netdev));
Greg Kroah-Hartman
maintainerPATCH 104/252 net/mlx4: Fix EEPROM dump support
In reply to Greg Kroah-HartmanFrom: Vladyslav Tarasiuk <[email protected]>
commit db825feefc6868896fed5e361787ba3bee2fd906 upstream.
Fix SFP and QSFP* EEPROM queries by setting i2c_address, offset and page number correctly. For SFP set the following params:
- I2C address for offsets 0-255 is 0x50. For 256-511 - 0x51.
- Page number is zero.
- Offset is 0-255.
At the same time, QSFP* parameters are different:
- I2C address is always 0x50.
- Page number is not limited to zero.
- Offset is 0-255 for page zero and 128-255 for others.
To set parameters accordingly to cable used, implement function to query module ID and implement respective helper functions to set parameters correctly.
--- drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 4 drivers/net/ethernet/mellanox/mlx4/port.c | 107 +++++++++++++++++++++++- 2 files changed, 104 insertions(+), 7 deletions(-)
drivers/net/ethernet/mellanox/mlx4/en_ethtool.c +1 -3
@@ -2027,8 +2027,6 @@ static int mlx4_en_set_tunable(struct nereturn ret; } -#define MLX4_EEPROM_PAGE_LEN 256 -static int mlx4_en_get_module_info (struct net_device *dev,struct ethtool_modinfo *modinfo) {
@@ -2063,7 +2061,7 @@ static int mlx4_en_get_module_info(strucbreak ;case MLX4_MODULE_ID_SFP : modinfo->type =ETH_MODULE_SFF_8472 ; - modinfo->eeprom_len =MLX4_EEPROM_PAGE_LEN ; + modinfo->eeprom_len =ETH_MODULE_SFF_8472_LEN ;break ;default :return -EINVAL ;
drivers/net/ethernet/mellanox/mlx4/port.c +103 -4
138 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 105/252 net/mlx5: Set term table as an unmanaged flow table
In reply to Greg Kroah-HartmanFrom: Ariel Levkovich <[email protected]>
commit 6ff51ab8aa8fcbcddeeefce8ca705b575805d12b upstream.
Termination tables are restricted to have the default miss action and cannot be set to forward to another table in case of a miss. If the fs prio of the termination table is not the last one in the list, fs_core will attempt to attach it to another table.
Set the unmanaged ft flag when creating the termination table ft and select the tc offload prio for it to prevent fs_core from selecting the forwarding to next ft miss action and use the default one.
In addition, set the flow that forwards to the termination table to ignore ft level restrictions since the ft level is not set by fs_core for unamanged fts.
--- drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c +5 -2
@@ -76,10 +76,11 @@ mlx5_eswitch_termtbl_create(struct mlx5_/* As this is the terminating action then the termination table is the * same prio as the slow path */ - ft_attr.flags =MLX5_FLOW_TABLE_TERMINATION | + ft_attr.flags =MLX5_FLOW_TABLE_TERMINATION |MLX5_FLOW_TABLE_UNMANAGED |MLX5_FLOW_TABLE_TUNNEL_EN_REFORMAT ; - ft_attr.prio =FDB_SLOW_PATH ; + ft_attr.prio =FDB_TC_OFFLOAD ; ft_attr.max_fte =1 ; + ft_attr.level =1 ; ft_attr.autogroup.max_num_groups =1 ; tt->termtbl =mlx5_create_auto_grouped_flow_table (root_ns, &ft_attr);if (IS_ERR (tt->termtbl)) {
@@ -216,6 +217,7 @@ mlx5_eswitch_termtbl_required(struct mlxint i;if (!MLX5_CAP_ESW_FLOWTABLE_FDB (esw->dev, termination_table) || + !MLX5_CAP_ESW_FLOWTABLE_FDB (esw->dev, ignore_flow_level) || attr->flags &MLX5_ESW_ATTR_FLAG_SLOW_PATH || !mlx5_eswitch_offload_is_uplink_port (esw, spec))return false;
@@ -288,6 +290,7 @@ mlx5_eswitch_add_termtbl_rule(struct mlx/* create the FTE */ flow_act->action &= ~MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT ; flow_act->pkt_reformat =NULL ; + flow_act->flags |=FLOW_ACT_IGNORE_FLOW_LEVEL ; rule =mlx5_add_flow_rules (fdb, spec, flow_act, dest, num_dest);if (IS_ERR (rule)) goto revert_changes;
Greg Kroah-Hartman
maintainerPATCH 106/252 SUNRPC in case of backlog, hand free slots directly to waiting task
In reply to Greg Kroah-HartmanFrom: NeilBrown <[email protected]>
commit e877a88d1f069edced4160792f42c2a8e2dba942 upstream.
If sunrpc.tcp_max_slot_table_entries is small and there are tasks on the backlog queue, then when a request completes it is freed and the first task on the queue is woken. The expectation is that it will wake and claim that request. However if it was a sync task and the waiting process was killed at just that moment, it will wake and NOT claim the request.
As long as TASK_CONGESTED remains set, requests can only be claimed by tasks woken from the backlog, and they are woken only as requests are freed, so when a task doesn't claim a request, no other task can ever get that request until TASK_CONGESTED is cleared. Each time this happens the number of available requests is decreased by one.
With a sufficiently high workload and sufficiently low setting of max_slot (16 in the case where this was seen), TASK_CONGESTED can remain set for an extended period, and the above scenario (of a process being killed just as its task was woken) can repeat until no requests can be allocated. Then traffic stops.
This patch addresses the problem by introducing a positive handover of a request from a completing task to a backlog task - the request is never freed when there is a backlog.
When a task is woken it might not already have a request attached in which case it is *not* freed (as with current code) but is initialised (if needed) and used. If it isn't used it will eventually be freed by rpc_exit_task(). xprt_release() is enhanced to be able to correctly release an uninitialised request.
--- net/sunrpc/clnt.c | 7 ----- net/sunrpc/xprt.c | 68 +++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 47 insertions(+), 28 deletions(-)
net/sunrpc/clnt.c +0 -7
@@ -1680,13 +1680,6 @@ call_reserveresult(struct rpc_task *taskreturn ; } -/* -* Even though there was an error, we may have acquired -* a request slot somehow. Make sure not to leak it. -*/ -if (task->tk_rqstp) -xprt_release (task); -switch (status) {case -ENOMEM :rpc_delay (task,HZ >>2 );
net/sunrpc/xprt.c +47 -21
111 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 107/252 Revert "net:tipc: Fix a double free in tipc_sk_mcast_rcv"
In reply to Greg Kroah-HartmanFrom: Hoang Le <[email protected]>
commit 75016891357a628d2b8acc09e2b9b2576c18d318 upstream.
This reverts commit 6bf24dc0cc0cc43b29ba344b66d78590e687e046. Above fix is not correct and caused memory leak issue.
--- net/tipc/socket.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
net/tipc/socket.c +4 -1
@@ -1244,7 +1244,10 @@ void tipc_sk_mcast_rcv(struct net *net,spin_lock_bh (&inputq->lock);if (skb_peek (arrvq) == skb) {skb_queue_splice_tail_init (&tmpq, inputq); -__skb_dequeue (arrvq); +/* Decrease the skb's refcnt as increasing in the +* function tipc_skb_peek +*/ +kfree_skb (__skb_dequeue (arrvq)); }spin_unlock_bh (&inputq->lock);__skb_queue_purge (&tmpq);
Greg Kroah-Hartman
maintainerPATCH 108/252 tipc: wait and exit until all work queues are done
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
commit 04c26faa51d1e2fe71cf13c45791f5174c37f986 upstream.
On some host, a crash could be triggered simply by repeating these commands several times:
# modprobe tipc # tipc bearer enable media udp name UDP1 localip 127.0.0.1 # rmmod tipc
[] BUG: unable to handle kernel paging request at ffffffffc096bb00 [] Workqueue: events 0xffffffffc096bb00
[] Call Trace:
[] ? process_one_work+0x1a7/0x360 [] ? worker_thread+0x30/0x390 [] ? create_worker+0x1a0/0x1a0 [] ? kthread+0x116/0x130 [] ? kthread_flush_work_fn+0x10/0x10 [] ? ret_from_fork+0x35/0x40
When removing the TIPC module, the UDP tunnel sock will be delayed to release in a work queue as sock_release() can't be done in rtnl_lock(). If the work queue is schedule to run after the TIPC module is removed, kernel will crash as the work queue function cleanup_beareri() code no longer exists when trying to invoke it.
To fix it, this patch introduce a member wq_count in tipc_net to track the numbers of work queues in schedule, and wait and exit until all work queues are done in tipc_exit_net().
--- net/tipc/core.c | 2 ++ net/tipc/core.h | 2 ++ net/tipc/udp_media.c | 2 ++ 3 files changed, 6 insertions(+)
net/tipc/core.c +2 -0
@@ -121,6 +121,8 @@ static void __net_exit tipc_exit_net(str#ifdef CONFIG_TIPC_CRYPTO tipc_crypto_stop (&tipc_net (net)->crypto_tx);#endif +while (atomic_read (&tn->wq_count)) +cond_resched (); } static void __net_exit tipc_pernet_pre_exit(struct net *net)
net/tipc/core.h +2 -0
@@ -151,6 +151,8 @@ struct tipc_net {#endif /* Work item for net finalize */ struct tipc_net_work final_work; +/* The numbers of work queues in schedule */ +atomic_t wq_count; };static inline struct tipc_net *tipc_net (struct net *net)
net/tipc/udp_media.c +2 -0
@@ -806,6 +806,7 @@ static void cleanup_bearer(struct work_skfree_rcu (rcast, rcu); } +atomic_dec (&tipc_net (sock_net (ub->ubsock->sk))->wq_count);dst_cache_destroy (&ub->rcast.dst_cache);udp_tunnel_sock_release (ub->ubsock);synchronize_net ();
@@ -826,6 +827,7 @@ static void tipc_udp_disable(struct tipcRCU_INIT_POINTER (ub->bearer,NULL );/* sock_release need to be done outside of rtnl lock */ +atomic_inc (&tipc_net (sock_net (ub->ubsock->sk))->wq_count);INIT_WORK (&ub->work, cleanup_bearer);schedule_work (&ub->work); }
Greg Kroah-Hartman
maintainerPATCH 109/252 tipc: skb_linearize the head skb when reassembling msgs
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
commit b7df21cf1b79ab7026f545e7bf837bd5750ac026 upstream.
It's not a good idea to append the frag skb to a skb's frag_list if the frag_list already has skbs from elsewhere, such as this skb was created by pskb_copy() where the frag_list was cloned (all the skbs in it were skb_get'ed) and shared by multiple skbs.
However, the new appended frag skb should have been only seen by the current skb. Otherwise, it will cause use after free crashes as this appended frag skb are seen by multiple skbs but it only got skb_get called once.
The same thing happens with a skb updated by pskb_may_pull() with a skb_cloned skb. Li Shuang has reported quite a few crashes caused by this when doing testing over macvlan devices:
[] kernel BUG at net/core/skbuff.c:1970!
[] Call Trace:
[] skb_clone+0x4d/0xb0 [] macvlan_broadcast+0xd8/0x160 [macvlan] [] macvlan_process_broadcast+0x148/0x150 [macvlan] [] process_one_work+0x1a7/0x360 [] worker_thread+0x30/0x390
[] kernel BUG at mm/usercopy.c:102!
[] Call Trace:
[] __check_heap_object+0xd3/0x100 [] __check_object_size+0xff/0x16b [] simple_copy_to_iter+0x1c/0x30 [] __skb_datagram_iter+0x7d/0x310 [] __skb_datagram_iter+0x2a5/0x310 [] skb_copy_datagram_iter+0x3b/0x90 [] tipc_recvmsg+0x14a/0x3a0 [tipc] [] ____sys_recvmsg+0x91/0x150 [] ___sys_recvmsg+0x7b/0xc0
[] kernel BUG at mm/slub.c:305!
[] Call Trace:
[] <IRQ> [] kmem_cache_free+0x3ff/0x400 [] __netif_receive_skb_core+0x12c/0xc40 [] ? kmem_cache_alloc+0x12e/0x270 [] netif_receive_skb_internal+0x3d/0xb0 [] ? get_rx_page_info+0x8e/0xa0 [be2net] [] be_poll+0x6ef/0xd00 [be2net] [] ? irq_exit+0x4f/0x100 [] net_rx_action+0x149/0x3b0
...
This patch is to fix it by linearizing the head skb if it has frag_list set in tipc_buf_append(). Note that we choose to do this before calling skb_unshare(), as __skb_linearize() will avoid skb_copy(). Also, we can not just drop the frag_list either as the early time.
--- net/tipc/msg.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
net/tipc/msg.c +2 -7
@@ -151,18 +151,13 @@ int tipc_buf_append(struct sk_buff **heaif (unlikely (head)) goto err; *buf =NULL ; +if (skb_has_frag_list (frag) &&__skb_linearize (frag)) + goto err; frag =skb_unshare (frag,GFP_ATOMIC );if (unlikely (!frag)) goto err; head = *headbuf = frag;TIPC_SKB_CB (head)->tail =NULL ; -if (skb_is_nonlinear (head)) { - skb_walk_frags(head, tail) { -TIPC_SKB_CB (head)->tail = tail; - } - }else { -skb_frag_list_init (head); - }return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 110/252 spi: spi-fsl-dspi: Fix a resource leak in an error handling path
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
commit 680ec0549a055eb464dce6ffb4bfb736ef87236e upstream.
'dspi_request_dma()' should be undone by a 'dspi_release_dma()' call in the error handling path of the probe function, as already done in the remove function
--- drivers/spi/spi-fsl-dspi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/spi/spi-fsl-dspi.c +3 -1
@@ -1375,11 +1375,13 @@ poll_mode: ret =spi_register_controller (ctlr);if (ret !=0 ) {dev_err (&pdev->dev,"Problem registering DSPI ctlr\n" ); - goto out_free_irq; + goto out_release_dma; }return ret; +out_release_dma: +dspi_release_dma (dspi); out_free_irq:if (dspi->irq)free_irq (dspi->irq, dspi);
Greg Kroah-Hartman
maintainerPATCH 111/252 netfilter: flowtable: Remove redundant hw refresh bit
In reply to Greg Kroah-HartmanFrom: Roi Dayan <[email protected]>
commit c07531c01d8284aedaf95708ea90e76d11af0e21 upstream.
Offloading conns could fail for multiple reasons and a hw refresh bit is set to try to reoffload it in next sw packet.
But it could be in some cases and future points that the hw refresh bit is not set but a refresh could succeed.
Remove the hw refresh bit and do offload refresh if requested. There won't be a new work entry if a work is already pending anyway as there is the hw pending bit.
--- include/net/netfilter/nf_flow_table.h | 1 - net/netfilter/nf_flow_table_core.c | 3 +-- net/netfilter/nf_flow_table_offload.c | 7 ++++--- 3 files changed, 5 insertions(+), 6 deletions(-)
include/net/netfilter/nf_flow_table.h +0 -1
@@ -126,7 +126,6 @@ enum nf_flow_flags {NF_FLOW_HW ,NF_FLOW_HW_DYING ,NF_FLOW_HW_DEAD , -NF_FLOW_HW_REFRESH , NF_FLOW_HW_PENDING, };
net/netfilter/nf_flow_table_core.c +1 -2
@@ -259,8 +259,7 @@ void flow_offload_refresh(struct nf_flow { flow->timeout = nf_flowtable_time_stamp +NF_FLOW_TIMEOUT ; -if (likely (!nf_flowtable_hw_offload (flow_table) || - !test_and_clear_bit (NF_FLOW_HW_REFRESH , &flow->flags))) +if (likely (!nf_flowtable_hw_offload (flow_table)))return ;nf_flow_offload_add (flow_table, flow);
net/netfilter/nf_flow_table_offload.c +4 -3
@@ -753,10 +753,11 @@ static void flow_offload_work_add(struct err =flow_offload_rule_add (offload, flow_rule);if (err <0 ) -set_bit (NF_FLOW_HW_REFRESH , &offload->flow->flags); -else -set_bit (IPS_HW_OFFLOAD_BIT , &offload->flow->ct->status); + goto out; +set_bit (IPS_HW_OFFLOAD_BIT , &offload->flow->ct->status); + +out:nf_flow_offload_destroy (flow_rule); }
Greg Kroah-Hartman
maintainerPATCH 112/252 net: dsa: mt7530: fix VLAN traffic leaks
In reply to Greg Kroah-HartmanFrom: DENG Qingfang <[email protected]>
commit 474a2ddaa192777522a7499784f1d60691cd831a upstream.
PCR_MATRIX field was set to all 1's when VLAN filtering is enabled, but was not reset when it is disabled, which may cause traffic leaks:
ip link add br0 type bridge vlan_filtering 1
ip link add br1 type bridge vlan_filtering 1
ip link set swp0 master br0
ip link set swp1 master br1
ip link set br0 type bridge vlan_filtering 0
ip link set br1 type bridge vlan_filtering 0
# traffic in br0 and br1 will start leaking to each other
As port_bridge_{add,del} have set up PCR_MATRIX properly, remove the PCR_MATRIX write from mt7530_port_set_vlan_aware.
--- drivers/net/dsa/mt7530.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/net/dsa/mt7530.c +0 -8
@@ -1128,14 +1128,6 @@ mt7530_port_set_vlan_aware(struct dsa_sw {struct mt7530_priv *priv = ds->priv; -/* The real fabric path would be decided on the membership in the -* entry of VLAN table. PCR_MATRIX set up here with ALL_MEMBERS -* means potential VLAN can be consisting of certain subset of all -* ports. -*/ -mt7530_rmw (priv,MT7530_PCR_P (port), -PCR_MATRIX_MASK ,PCR_MATRIX (MT7530_ALL_MEMBERS )); -/* Trapped into security mode allows packet forwarding through VLAN * table lookup. CPU port is set to fallback mode to let untagged * frames pass through.
Greg Kroah-Hartman
maintainerPATCH 113/252 net: dsa: fix a crash if ->get_sset_count() fails
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit a269333fa5c0c8e53c92b5a28a6076a28cde3e83 upstream.
If ds->ops->get_sset_count() fails then it "count" is a negative error code such as -EOPNOTSUPP. Because "i" is an unsigned int, the negative error code is type promoted to a very high value and the loop will corrupt memory until the system crashes.
Fix this by checking for error codes and changing the type of "i" to just int.
--- net/dsa/master.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/dsa/master.c +3 -2
@@ -147,8 +147,7 @@ static void dsa_master_get_strings(strucstruct dsa_switch *ds = cpu_dp->ds;int port = cpu_dp->index;int len =ETH_GSTRING_LEN ; -int mcount =0 , count; -unsigned int i; +int mcount =0 , count, i;uint8_t pfx[4 ];uint8_t *ndata;
@@ -178,6 +177,8 @@ static void dsa_master_get_strings(struc*/ ds->ops->get_strings (ds, port, stringset, ndata); count = ds->ops->get_sset_count (ds, port, stringset); +if (count <0 ) +return ;for (i =0 ; i < count; i++) {memmove (ndata + (i * len +sizeof (pfx)), ndata + i * len, len -sizeof (pfx));
Greg Kroah-Hartman
maintainerPATCH 114/252 net: dsa: sja1105: update existing VLANs from the bridge VLAN list
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
commit b38e659de966a122fe2cb178c1e39c9bea06bc62 upstream.
When running this sequence of operations:
ip link add br0 type bridge vlan_filtering 1
ip link set swp4 master br0
bridge vlan add dev swp4 vid 1
We observe the traffic sent on swp4 is still untagged, even though the bridge has overwritten the existing VLAN entry:
port vlan ids
swp4 1 PVID
br0 1 PVID Egress Untagged
This happens because we didn't consider that the 'bridge vlan add' command just overwrites VLANs like it's nothing. We treat the 'vid 1 pvid untagged' and the 'vid 1' as two separate VLANs, and the first still has precedence when calling sja1105_build_vlan_table. Obviously there is a disagreement regarding semantics, and we end up doing something unexpected from the PoV of the bridge.
Let's actually consider an "existing VLAN" to be one which is on the same port, and has the same VLAN ID, as one we already have, and update it if it has different flags than we do.
The first blamed commit is the one introducing the bug, the second one is the latest on top of which the bugfix still applies.
--- drivers/net/dsa/sja1105/sja1105_main.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/net/dsa/sja1105/sja1105_main.c +15 -4
@@ -2756,11 +2756,22 @@ static int sja1105_vlan_add_one(struct dbool pvid = flags &BRIDGE_VLAN_INFO_PVID ;struct sja1105_bridge_vlan *v; -list_for_each_entry (v, vlan_list, list) -if (v->port == port && v->vid == vid && - v->untagged == untagged && v->pvid == pvid) +list_for_each_entry (v, vlan_list, list) { +if (v->port == port && v->vid == vid) {/* Already added */ -return 0 ; +if (v->untagged == untagged && v->pvid == pvid) +/* Nothing changed */ +return 0 ; + +/* It's the same VLAN, but some of the flags changed +* and the user did not bother to delete it first. +* Update it and trigger sja1105_build_vlan_table. +*/ + v->untagged = untagged; + v->pvid = pvid; +return 1 ; + } + } v =kzalloc (sizeof (*v),GFP_KERNEL );if (!v) {
Greg Kroah-Hartman
maintainerPATCH 115/252 net: dsa: sja1105: use 4095 as the private VLAN for untagged traffic
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
commit ed040abca4c1db72dfd3b8483b6ed6bfb7c2571e upstream.
One thing became visible when writing the blamed commit, and that was that STP and PTP frames injected by net/dsa/tag_sja1105.c using the deferred xmit mechanism are always classified to the pvid of the CPU port, regardless of whatever VLAN there might be in these packets.
So a decision needed to be taken regarding the mechanism through which we should ensure that delivery of STP and PTP traffic is possible when we are in a VLAN awareness mode that involves tag_8021q. This is because tag_8021q is not concerned with managing the pvid of the CPU port, since as far as tag_8021q is concerned, no traffic should be sent as untagged from the CPU port. So we end up not actually having a pvid on the CPU port if we only listen to tag_8021q, and unless we do something about it.
The decision taken at the time was to keep VLAN 1 in the list of priv->dsa_8021q_vlans, and make it a pvid of the CPU port. This ensures that STP and PTP frames can always be sent to the outside world.
However there is a problem. If we do the following while we are in the best_effort_vlan_filtering=true mode:
ip link add br0 type bridge vlan_filtering 1
ip link set swp2 master br0
bridge vlan del dev swp2 vid 1
Then untagged and pvid-tagged frames should be dropped. But we observe that they aren't, and this is because of the precaution we took that VID 1 is always installed on all ports.
So clearly VLAN 1 is not good for this purpose. What about VLAN 0? Well, VLAN 0 is managed by the 8021q module, and that module wants to ensure that 802.1p tagged frames are always received by a port, and are always transmitted as VLAN-tagged (with VLAN ID 0). Whereas we want our STP and PTP frames to be untagged if the stack sent them as untagged - we don't want the driver to just decide out of the blue that it adds VID 0 to some packets.
So what to do?
Well, there is one other VLAN that is reserved, and that is 4095:
$ ip link add link swp2 name swp2.4095 type vlan id 4095 Error: 8021q: Invalid VLAN id. $ bridge vlan add dev swp2 vid 4095 Error: bridge: Vlan id is invalid.
After we made this change, VLAN 1 is indeed forwarded and/or dropped according to the bridge VLAN table, there are no further alterations done by the sja1105 driver.
--- drivers/net/dsa/sja1105/sja1105_main.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
drivers/net/dsa/sja1105/sja1105_main.c +11 -12
@@ -25,6 +25,8 @@#include "sja1105_sgmii.h" #include "sja1105_tas.h" +#define SJA1105_DEFAULT_VLAN (VLAN_N_VID - 1) +static const struct dsa_switch_ops sja1105_switch_ops; static void sja1105_hw_reset(struct gpio_desc *gpio, unsigned int pulse_len,
@@ -292,6 +294,13 @@ static int sja1105_init_l2_lookup_paramsreturn 0 ; } +/* Set up a default VLAN for untagged traffic injected from the CPU +* using management routes (e.g. STP, PTP) as opposed to tag_8021q. +* All DT-defined ports are members of this VLAN, and there are no +* restrictions on forwarding (since the CPU selects the destination). +* Frames from this VLAN will always be transmitted as untagged, and +* neither the bridge nor the 8021q module cannot create this VLAN ID. +*/ static int sja1105_init_static_vlan (struct sja1105_private *priv) {struct sja1105_table *table;
@@ -301,17 +310,13 @@ static int sja1105_init_static_vlan(stru .vmemb_port = 0, .vlan_bc = 0, .tag_port = 0, - .vlanid = 1, + .vlanid = SJA1105_DEFAULT_VLAN, };struct dsa_switch *ds = priv->ds;int port; table = &priv->static_config.tables[BLK_IDX_VLAN_LOOKUP ]; -/* The static VLAN table will only contain the initial pvid of 1. -* All other VLANs are to be configured through dynamic entries, -* and kept in the static configuration table as backing memory. -*/ if (table->entry_count) {kfree (table->entries); table->entry_count =0 ;
@@ -324,9 +329,6 @@ static int sja1105_init_static_vlan(stru table->entry_count =1 ; -/* VLAN 1: all DT-defined ports are members; no restrictions on -* forwarding; always transmit as untagged. -*/ for (port =0 ; port < ds->num_ports; port++) {struct sja1105_bridge_vlan *v;
@@ -337,15 +339,12 @@ static int sja1105_init_static_vlan(stru pvid.vlan_bc |=BIT (port); pvid.tag_port &= ~BIT (port); -/* Let traffic that don't need dsa_8021q (e.g. STP, PTP) be -* transmitted as untagged. -*/ v =kzalloc (sizeof (*v),GFP_KERNEL );if (!v)return -ENOMEM ; v->port = port; - v->vid =1 ; + v->vid =SJA1105_DEFAULT_VLAN ; v->untagged = true;if (dsa_is_cpu_port (ds, port)) v->pvid = true;
Greg Kroah-Hartman
maintainerPATCH 116/252 net: dsa: sja1105: error out on unsupported PHY mode
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
commit 6729188d2646709941903052e4b78e1d82c239b9 upstream.
The driver continues probing when a port is configured for an unsupported PHY interface type, instead it should stop.
--- drivers/net/dsa/sja1105/sja1105_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/dsa/sja1105/sja1105_main.c +1 -0
@@ -206,6 +206,7 @@ static int sja1105_init_mii_settings(strdefault :dev_err (dev,"Unsupported PHY mode %s!\n" ,phy_modes (ports[i].phy_mode)); +return -EINVAL ; }/* Even though the SerDes port is able to drive SGMII autoneg
Greg Kroah-Hartman
maintainerPATCH 117/252 net: dsa: sja1105: add error handling in sja1105_setup()
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
commit cec279a898a3b004411682f212215ccaea1cd0fb upstream.
If any of sja1105_static_config_load(), sja1105_clocking_setup() or sja1105_devlink_setup() fails, we can't just return in the middle of sja1105_setup() or memory will leak. Add a cleanup path.
--- drivers/net/dsa/sja1105/sja1105_main.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
drivers/net/dsa/sja1105/sja1105_main.c +14 -3
@@ -2922,13 +2922,13 @@ static int sja1105_setup(struct dsa_swit rc =sja1105_static_config_load (priv, ports);if (rc <0 ) {dev_err (ds->dev,"Failed to load static config: %d\n" , rc); -return rc; + goto out_ptp_clock_unregister; }/* Configure the CGU (PHY link modes and speeds) */ rc =sja1105_clocking_setup (priv);if (rc <0 ) {dev_err (ds->dev,"Failed to configure MII clocking: %d\n" , rc); -return rc; + goto out_static_config_free; }/* On SJA1105, VLAN filtering per se is always enabled in hardware. * The only thing we can do to disable it is lie about what the 802.1Q
@@ -2949,7 +2949,7 @@ static int sja1105_setup(struct dsa_swit rc =sja1105_devlink_setup (ds);if (rc <0 ) -return rc; + goto out_static_config_free;/* The DSA/switchdev model brings up switch ports in standalone mode by * default, and that means vlan_filtering is 0 since they're not under
@@ -2958,6 +2958,17 @@ static int sja1105_setup(struct dsa_switrtnl_lock (); rc =sja1105_setup_8021q_tagging (ds, true);rtnl_unlock (); +if (rc) + goto out_devlink_teardown; + +return 0 ; + +out_devlink_teardown: +sja1105_devlink_teardown (ds); +out_ptp_clock_unregister: +sja1105_ptp_clock_unregister (ds); +out_static_config_free: +sja1105_static_config_free (&priv->static_config);return rc; }
Greg Kroah-Hartman
maintainerPATCH 118/252 net: dsa: sja1105: call dsa_unregister_switch when allocating memory fails
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
commit dc596e3fe63f88e3d1e509f64e7f761cd4135538 upstream.
Unlike other drivers which pretty much end their .probe() execution with dsa_register_switch(), the sja1105 does some extra stuff. When that fails with -ENOMEM, the driver is quick to return that, forgetting to call dsa_unregister_switch(). Not critical, but a bug nonetheless.
--- drivers/net/dsa/sja1105/sja1105_main.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/net/dsa/sja1105/sja1105_main.c +11 -4
@@ -3483,8 +3483,10 @@ static int sja1105_probe(struct spi_devi priv->cbs =devm_kcalloc (dev, priv->info->num_cbs_shapers,sizeof (struct sja1105_cbs_entry ),GFP_KERNEL ); -if (!priv->cbs) -return -ENOMEM ; +if (!priv->cbs) { + rc = -ENOMEM ; + goto out_unregister_switch; + } }/* Connections between dsa_port and sja1105_port */
@@ -3509,7 +3511,7 @@ static int sja1105_probe(struct spi_devidev_err (ds->dev,"failed to create deferred xmit thread: %d\n" , rc); - goto out; + goto out_destroy_workers; }skb_queue_head_init (&sp->xmit_queue); sp->xmit_tpid =ETH_P_SJA1105 ;
@@ -3519,7 +3521,8 @@ static int sja1105_probe(struct spi_devi }return 0 ; -out: + +out_destroy_workers:while (port-- >0 ) {struct sja1105_port *sp = &priv->ports[port];
@@ -3528,6 +3531,10 @@ out:kthread_destroy_worker (sp->xmit_worker); } + +out_unregister_switch: +dsa_unregister_switch (ds); +return rc; }
Greg Kroah-Hartman
maintainerPATCH 119/252 net: dsa: sja1105: fix VL lookup command packing for P/Q/R/S
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
commit ba61cf167cb77e54c1ec5adb7aa49a22ab3c9b28 upstream.
At the beginning of the sja1105_dynamic_config.c file there is a diagram of the dynamic config interface layout:
packed_buf
|
V
+-----------------------------------------+------------------+ | ENTRY BUFFER | COMMAND BUFFER | +-----------------------------------------+------------------+
<----------------------- packed_size ------------------------>
So in order to pack/unpack the command bits into the buffer, sja1105_vl_lookup_cmd_packing must first advance the buffer pointer by the length of the entry. This is similar to what the other *cmd_packing functions do.
This bug exists because the command packing function for P/Q/R/S was copied from the E/T generation, and on E/T, the command was actually embedded within the entry buffer itself.
--- drivers/net/dsa/sja1105/sja1105_dynamic_config.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-)
drivers/net/dsa/sja1105/sja1105_dynamic_config.c +19 -4
@@ -167,9 +167,10 @@ enum sja1105_hostcmd { SJA1105_HOSTCMD_INVALIDATE = 4, }; +/* Command and entry overlap */ static void -sja1105_vl_lookup_cmd_packing (void *buf,struct sja1105_dyn_cmd *cmd, -enum packing_op op) +sja1105et_vl_lookup_cmd_packing (void *buf,struct sja1105_dyn_cmd *cmd, +enum packing_op op) {const int size =SJA1105_SIZE_DYN_CMD ;
@@ -179,6 +180,20 @@ sja1105_vl_lookup_cmd_packing(void *buf,sja1105_packing (buf, &cmd->index,9 ,0 , size, op); } +/* Command and entry are separate */ +static void +sja1105pqrs_vl_lookup_cmd_packing (void *buf,struct sja1105_dyn_cmd *cmd, +enum packing_op op) +{ +u8 *p = buf +SJA1105_SIZE_VL_LOOKUP_ENTRY ; +const int size =SJA1105_SIZE_DYN_CMD ; + +sja1105_packing (p, &cmd->valid,31 ,31 , size, op); +sja1105_packing (p, &cmd->errors,30 ,30 , size, op); +sja1105_packing (p, &cmd->rdwrset,29 ,29 , size, op); +sja1105_packing (p, &cmd->index,9 ,0 , size, op); +} +static size_t sja1105et_vl_lookup_entry_packing (void *buf,void *entry_ptr,enum packing_op op) {
@@ -641,7 +656,7 @@ static size_t sja1105pqrs_cbs_entry_packconst struct sja1105_dynamic_table_ops sja1105et_dyn_ops[BLK_IDX_MAX_DYN ] = { [BLK_IDX_VL_LOOKUP ] = { .entry_packing = sja1105et_vl_lookup_entry_packing, - .cmd_packing = sja1105_vl_lookup_cmd_packing, + .cmd_packing = sja1105et_vl_lookup_cmd_packing, .access =OP_WRITE , .max_entry_count =SJA1105_MAX_VL_LOOKUP_COUNT , .packed_size =SJA1105ET_SIZE_VL_LOOKUP_DYN_CMD ,
@@ -725,7 +740,7 @@ const struct sja1105_dynamic_table_ops sconst struct sja1105_dynamic_table_ops sja1105pqrs_dyn_ops[BLK_IDX_MAX_DYN ] = { [BLK_IDX_VL_LOOKUP ] = { .entry_packing = sja1105_vl_lookup_entry_packing, - .cmd_packing = sja1105_vl_lookup_cmd_packing, + .cmd_packing = sja1105pqrs_vl_lookup_cmd_packing, .access = (OP_READ |OP_WRITE ), .max_entry_count =SJA1105_MAX_VL_LOOKUP_COUNT , .packed_size =SJA1105PQRS_SIZE_VL_LOOKUP_DYN_CMD ,
Greg Kroah-Hartman
maintainerPATCH 120/252 i2c: s3c2410: fix possible NULL pointer deref on read message after write
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
commit 24990423267ec283b9d86f07f362b753eb9b0ed5 upstream.
Interrupt handler processes multiple message write requests one after another, till the driver message queue is drained. However if driver encounters a read message without preceding START, it stops the I2C transfer as it is an invalid condition for the controller. At least the comment describes a requirement "the controller forces us to send a new START when we change direction". This stop results in clearing the message queue (i2c->msg = NULL).
The code however immediately jumped back to label "retry_write" which dereferenced the "i2c->msg" making it a possible NULL pointer dereference.
The Coverity analysis:
1. Condition !is_msgend(i2c), taking false branch. if (!is_msgend(i2c)) {
2. Condition !is_lastmsg(i2c), taking true branch. } else if (!is_lastmsg(i2c)) {
3. Condition i2c->msg->flags & 1, taking true branch. if (i2c->msg->flags & I2C_M_RD) {
4. write_zero_model: Passing i2c to s3c24xx_i2c_stop, which sets i2c->msg to NULL. s3c24xx_i2c_stop(i2c, -EINVAL);
5. Jumping to label retry_write.
goto retry_write;
6. var_deref_model: Passing i2c to is_msgend, which dereferences null i2c->msg. if (!is_msgend(i2c)) {"
All previous calls to s3c24xx_i2c_stop() in this interrupt service routine are followed by jumping to end of function (acknowledging the interrupt and returning). This seems a reasonable choice also here since message buffer was entirely emptied.
Addresses-Coverity: Explicit null dereferenced
--- drivers/i2c/busses/i2c-s3c2410.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/i2c/busses/i2c-s3c2410.c +3 -0
@@ -483,7 +483,10 @@ static int i2c_s3c_irq_nextbyte(struct s* forces us to send a new START * when we change direction */ +dev_dbg (i2c->dev, +"missing START before write->read\n" );s3c24xx_i2c_stop (i2c, -EINVAL ); +break ; } goto retry_write;
Greg Kroah-Hartman
maintainerPATCH 121/252 i2c: mediatek: Disable i2c start_en and clear intr_stat brfore reset
In reply to Greg Kroah-HartmanFrom: Qii Wang <[email protected]>
commit fed1bd51a504eb96caa38b4f13ab138fc169ea75 upstream.
The i2c controller driver do dma reset after transfer timeout, but sometimes dma reset will trigger an unexpected DMA_ERR irq. It will cause the i2c controller to continuously send interrupts to the system and cause soft lock-up. So we need to disable i2c start_en and clear intr_stat to stop i2c controller before dma reset when transfer timeout.
--- drivers/i2c/busses/i2c-mt65xx.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/i2c/busses/i2c-mt65xx.c +5 -0
@@ -478,6 +478,11 @@ static void mtk_i2c_clock_disable(structstatic void mtk_i2c_init_hw (struct mtk_i2c *i2c) {u16 control_reg; +u16 intr_stat_reg; + +mtk_i2c_writew (i2c,I2C_CHN_CLR_FLAG ,OFFSET_START ); + intr_stat_reg =mtk_i2c_readw (i2c,OFFSET_INTR_STAT ); +mtk_i2c_writew (i2c, intr_stat_reg,OFFSET_INTR_STAT );if (i2c->dev_comp->apdma_sync) {writel (I2C_DMA_WARM_RST , i2c->pdmabase +OFFSET_RST );
Greg Kroah-Hartman
maintainerPATCH 122/252 i2c: i801: Dont generate an interrupt on bus reset
In reply to Greg Kroah-HartmanFrom: Jean Delvare <[email protected]>
commit e4d8716c3dcec47f1557024add24e1f3c09eb24b upstream.
Now that the i2c-i801 driver supports interrupts, setting the KILL bit in a attempt to recover from a timed out transaction triggers an interrupt. Unfortunately, the interrupt handler (i801_isr) is not prepared for this situation and will try to process the interrupt as if it was signaling the end of a successful transaction. In the case of a block transaction, this can result in an out-of-range memory access.
This condition was reproduced several times by syzbot:
https://syzkaller.appspot.com/bug?extid=ed71512d469895b5b34e
https://syzkaller.appspot.com/bug?extid=8c8dedc0ba9e03f6c79e
https://syzkaller.appspot.com/bug?extid=c8ff0b6d6c73d81b610e
https://syzkaller.appspot.com/bug?extid=33f6c360821c399d69eb
https://syzkaller.appspot.com/bug?extid=be15dc0b1933f04b043a
https://syzkaller.appspot.com/bug?extid=b4d3fd1dfd53e90afd79
So disable interrupts while trying to reset the bus. Interrupts will be enabled again for the following transaction.
--- drivers/i2c/busses/i2c-i801.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/i2c/busses/i2c-i801.c +2 -4
@@ -391,11 +391,9 @@ static int i801_check_post(struct i801_pdev_err (&priv->pci_dev->dev,"Transaction timeout\n" );/* try to stop the current command */ dev_dbg (&priv->pci_dev->dev,"Terminating the current operation\n" ); -outb_p (inb_p (SMBHSTCNT (priv)) |SMBHSTCNT_KILL , -SMBHSTCNT (priv)); +outb_p (SMBHSTCNT_KILL ,SMBHSTCNT (priv));usleep_range (1000 ,2000 ); -outb_p (inb_p (SMBHSTCNT (priv)) & (~SMBHSTCNT_KILL ), -SMBHSTCNT (priv)); +outb_p (0 ,SMBHSTCNT (priv));/* Check if it worked */ status =inb_p (SMBHSTSTS (priv));
Greg Kroah-Hartman
maintainerPATCH 123/252 i2c: sh_mobile: Use new clock calculation formulas for RZ/G2E
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
commit c4740e293c93c747e65d53d9aacc2ba8521d1489 upstream.
When switching the Gen3 SoCs to the new clock calculation formulas, the match entry for RZ/G2E added in commit 51243b73455f2d12 ("i2c:sh_mobile: Add support for r8a774c0 (RZ/G2E)") was forgotten.
--- drivers/i2c/busses/i2c-sh_mobile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/busses/i2c-sh_mobile.c +1 -1
@@ -807,7 +807,7 @@ static const struct sh_mobile_dt_configstatic const struct of_device_id sh_mobile_i2c_dt_ids[] = { { .compatible ="renesas,iic-r8a73a4" , .data = &fast_clock_dt_config }, { .compatible ="renesas,iic-r8a7740" , .data = &r8a7740_dt_config }, - { .compatible ="renesas,iic-r8a774c0" , .data = &fast_clock_dt_config }, + { .compatible ="renesas,iic-r8a774c0" , .data = &v2_freq_calc_dt_config }, { .compatible ="renesas,iic-r8a7790" , .data = &v2_freq_calc_dt_config }, { .compatible ="renesas,iic-r8a7791" , .data = &v2_freq_calc_dt_config }, { .compatible ="renesas,iic-r8a7792" , .data = &v2_freq_calc_dt_config },
Greg Kroah-Hartman
maintainerPATCH 124/252 afs: Fix the nlink handling of dir-over-dir rename
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
commit f610a5a29c3cfb7d37bdfa4ef52f72ea51f24a76 upstream.
Fix rename of one directory over another such that the nlink on the deleted directory is cleared to 0 rather than being decremented to 1.
This was causing the generic/035 xfstest to fail.
--- fs/afs/dir.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/afs/dir.c +3 -1
@@ -1837,7 +1837,9 @@ static void afs_rename_edit_dir(struct a new_inode =d_inode (new_dentry);if (new_inode) {spin_lock (&new_inode->i_lock); -if (new_inode->i_nlink >0 ) +if (S_ISDIR (new_inode->i_mode)) +clear_nlink (new_inode); +else if (new_inode->i_nlink >0 )drop_nlink (new_inode);spin_unlock (&new_inode->i_lock); }
Greg Kroah-Hartman
maintainerPATCH 125/252 perf jevents: Fix getting maximum number of fds
In reply to Greg Kroah-HartmanFrom: Felix Fietkau <[email protected]>
commit 75ea44e356b5de8c817f821c9dd68ae329e82add upstream.
On some hosts, rlim.rlim_max can be returned as RLIM_INFINITY. By casting it to int, it is interpreted as -1, which will cause get_maxfds to return 0, causing "Invalid argument" errors in nftw() calls. Fix this by casting the second argument of min() to rlim_t instead.
--- tools/perf/pmu-events/jevents.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/pmu-events/jevents.c +1 -1
@@ -894,7 +894,7 @@ static int get_maxfds(void)struct rlimit rlim;if (getrlimit (RLIMIT_NOFILE , &rlim) ==0 ) -return min ((int )rlim.rlim_max /2 ,512 ); +return min (rlim.rlim_max /2 , (rlim_t )512 );return 512 ; }
Greg Kroah-Hartman
maintainerPATCH 126/252 nvmet-tcp: fix inline data size comparison in nvmet_tcp_queue_response
In reply to Greg Kroah-HartmanFrom: Hou Pu <[email protected]>
commit 25df1acd2d36eb72b14c3d00f6b861b1e00b3aab upstream.
Using "<=" instead "<" to compare inline data size.
--- drivers/nvme/target/tcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/target/tcp.c +1 -1
@@ -538,7 +538,7 @@ static void nvmet_tcp_queue_response(str* nvmet_req_init is completed. */ if (queue->rcv_state ==NVMET_TCP_RECV_PDU && - len && len < cmd->req.port->inline_data_size && + len && len <= cmd->req.port->inline_data_size &&nvme_is_write (cmd->req.cmd))return ; }
Greg Kroah-Hartman
maintainerPATCH 127/252 mptcp: avoid error message on infinite mapping
In reply to Greg Kroah-HartmanFrom: Paolo Abeni <[email protected]>
commit 3ed0a585bfadb6bd7080f11184adbc9edcce7dbc upstream.
Another left-over. Avoid flooding dmesg with useless text, we already have a MIB for that event.
--- net/mptcp/subflow.c | 1 - 1 file changed, 1 deletion(-)
net/mptcp/subflow.c +0 -1
@@ -740,7 +740,6 @@ static enum mapping_status get_mapping_s data_len = mpext->data_len;if (data_len ==0 ) { -pr_err ("Infinite mapping not handled" );MPTCP_INC_STATS (sock_net (ssk),MPTCP_MIB_INFINITEMAPRX );return MAPPING_INVALID ; }
Greg Kroah-Hartman
maintainerPATCH 128/252 mptcp: drop unconditional pr_warn on bad opt
In reply to Greg Kroah-HartmanFrom: Paolo Abeni <[email protected]>
commit 3812ce895047afdb78dc750a236515416e0ccded upstream.
This is a left-over of early day. A malicious peer can flood the kernel logs with useless messages, just drop it.
--- net/mptcp/options.c | 1 - 1 file changed, 1 deletion(-)
net/mptcp/options.c +0 -1
@@ -127,7 +127,6 @@ static void mptcp_parse_option(const strmemcpy (mp_opt->hmac, ptr,MPTCPOPT_HMAC_LEN );pr_debug ("MP_JOIN hmac" ); }else { -pr_warn ("MP_JOIN bad option size" ); mp_opt->mp_join =0 ; }break ;
Greg Kroah-Hartman
maintainerPATCH 129/252 mptcp: fix data stream corruption
In reply to Greg Kroah-HartmanFrom: Paolo Abeni <[email protected]>
commit 29249eac5225429b898f278230a6ca2baa1ae154 upstream.
Maxim reported several issues when forcing a TCP transparent proxy to use the MPTCP protocol for the inbound connections. He also provided a clean reproducer.
The problem boils down to 'mptcp_frag_can_collapse_to()' assuming that only MPTCP will use the given page_frag.
If others - e.g. the plain TCP protocol - allocate page fragments, we can end-up re-using already allocated memory for mptcp_data_frag.
Fix the issue ensuring that the to-be-expanded data fragment is located at the current page frag end.
v1 -> v2:
- added missing fixes tag (Mat)
--- net/mptcp/protocol.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/mptcp/protocol.c +6 -0
@@ -758,11 +758,17 @@ static bool mptcp_skb_can_collapse_to(u6return mpext && mpext->data_seq + mpext->data_len == write_seq; } +/* we can append data to the given data frag if: +* - there is space available in the backing page_frag +* - the data frag tail matches the current page_frag free offset +* - the data frag end sequence number matches the current write seq +*/ static bool mptcp_frag_can_collapse_to (const struct mptcp_sock *msk,const struct page_frag *pfrag,const struct mptcp_data_frag *df) {return df && pfrag->page == df->page && + pfrag->offset == (df->offset + df->data_len) && df->data_seq + df->data_len == msk->write_seq; }
Greg Kroah-Hartman
maintainerPATCH 130/252 platform/x86: hp_accel: Avoid invoking _INI to speed up resume
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
[ Upstream commit 79d341e26ebcdbc622348aaaab6f8f89b6fdb25f ]
hp_accel can take almost two seconds to resume on some HP laptops.
The bottleneck is on evaluating _INI, which is only needed to run once.
Resolve the issue by only invoking _INI when it's necessary. Namely, on probe and on hibernation restore.
--- drivers/misc/lis3lv02d/lis3lv02d.h | 1 + drivers/platform/x86/hp_accel.c | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-)
drivers/misc/lis3lv02d/lis3lv02d.h +1 -0
@@ -271,6 +271,7 @@ struct lis3lv02d {int regs_size;u8 *reg_cache;bool regs_stored; +bool init_required;u8 odr_mask;/* ODR bit mask */ u8 whoami;/* indicates measurement precision */ s16 (*read_data) (struct lis3lv02d *lis3,int reg);
drivers/platform/x86/hp_accel.c +21 -1
@@ -88,6 +88,9 @@ MODULE_DEVICE_TABLE(acpi, lis3lv02d_device_ids);static int lis3lv02d_acpi_init (struct lis3lv02d *lis3) {struct acpi_device *dev = lis3->bus_priv; +if (!lis3->init_required) +return 0 ; +if (acpi_evaluate_object (dev->handle,METHOD_NAME__INI ,NULL ,NULL ) !=AE_OK )return -EINVAL ;
@@ -356,6 +359,7 @@ static int lis3lv02d_add(struct acpi_device *device) }/* call the core layer do its init */ + lis3_dev.init_required = true; ret =lis3lv02d_init_device (&lis3_dev);if (ret)return ret;
@@ -403,11 +407,27 @@ static int lis3lv02d_suspend(struct device *dev)static int lis3lv02d_resume (struct device *dev) { + lis3_dev.init_required = false; +lis3lv02d_poweron (&lis3_dev); +return 0 ; +} + +static int lis3lv02d_restore (struct device *dev) +{ + lis3_dev.init_required = true;lis3lv02d_poweron (&lis3_dev);return 0 ; } -static SIMPLE_DEV_PM_OPS(hp_accel_pm, lis3lv02d_suspend, lis3lv02d_resume); +static const struct dev_pm_ops hp_accel_pm = { + .suspend = lis3lv02d_suspend, + .resume = lis3lv02d_resume, + .freeze = lis3lv02d_suspend, + .thaw = lis3lv02d_resume, + .poweroff = lis3lv02d_suspend, + .restore = lis3lv02d_restore, +}; +#define HP_ACCEL_PM (&hp_accel_pm)#else #define HP_ACCEL_PM NULL
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 131/252 gpio: cadence: Add missing MODULE_DEVICE_TABLE
In reply to Greg Kroah-HartmanFrom: Zou Wei <[email protected]>
[ Upstream commit 1e948b1752b58c9c570989ab29ceef5b38fdccda ]
This patch adds missing MODULE_DEVICE_TABLE definition which generates correct modalias for automatic loading of this driver when it is built as an external module.
--- drivers/gpio/gpio-cadence.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpio/gpio-cadence.c +1 -0
@@ -278,6 +278,7 @@ static const struct of_device_id cdns_of_ids[] = { { .compatible = "cdns,gpio-r1p02" }, { /* sentinel */ }, }; +MODULE_DEVICE_TABLE (of, cdns_of_ids);static struct platform_driver cdns_gpio_driver = { .driver = {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 132/252 Revert "crypto: cavium/nitrox - add an error message to explain the failure of pci_request_mem_regions"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
[ Upstream commit 6a3239a738d86c5e9b5aad17fefe2c2bfd6ced83 ]
This reverts commit 9fcddaf2e28d779cb946d23838ba6d50f299aa80 as it was submitted under a fake name and we can not knowingly accept anonymous contributions to the repository.
This commit was part of a submission "test" to the Linux kernel community by some "researchers" at umn.edu. As outlined at:
https://www-users.cs.umn.edu/%7Ekjlu/papers/full-disclosure.pdf
it was done so as an attempt to submit a known-buggy patch to see if it could get by our review. However, the submission turned out to actually be correct, and not have a bug in it as the author did not understand how the PCI driver model works at all, and so the submission was accepted.
As this change is of useless consequence, there is no loss of functionality in reverting it.
Email: Herbert Xu <[email protected]>
--- drivers/crypto/cavium/nitrox/nitrox_main.c | 1 - 1 file changed, 1 deletion(-)
drivers/crypto/cavium/nitrox/nitrox_main.c +0 -1
@@ -451,7 +451,6 @@ static int nitrox_probe(struct pci_dev *pdev, err =pci_request_mem_regions (pdev, nitrox_driver_name);if (err) {pci_disable_device (pdev); -dev_err (&pdev->dev,"Failed to request mem regions!\n" );return err; }pci_set_master (pdev);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 133/252 Revert "media: usb: gspca: add a missed check for goto_low_power"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
[ Upstream commit fd013265e5b5576a74a033920d6c571e08d7c423 ]
This reverts commit 5b711870bec4dc9a6d705d41e127e73944fa3650.
Because of recent interactions with developers from @umn.edu, all commits from them have been recently re-reviewed to ensure if they were correct or not.
Upon review, this commit was found to do does nothing useful as a user can do nothing with this information and if an error did happen, the code would continue on as before. Because of this, just revert it.
--- drivers/media/usb/gspca/cpia1.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/media/usb/gspca/cpia1.c +1 -5
@@ -1424,7 +1424,6 @@ static int sd_config(struct gspca_dev *gspca_dev, {struct sd *sd = (struct sd *) gspca_dev;struct cam *cam; -int ret; sd->mainsFreq =FREQ_DEF ==V4L2_CID_POWER_LINE_FREQUENCY_60HZ ;reset_camera_params (gspca_dev);
@@ -1436,10 +1435,7 @@ static int sd_config(struct gspca_dev *gspca_dev, cam->cam_mode = mode; cam->nmodes =ARRAY_SIZE (mode); - ret =goto_low_power (gspca_dev); -if (ret) -gspca_err (gspca_dev,"Cannot go to low power mode: %d\n" , - ret); +goto_low_power (gspca_dev);/* Check the firmware version. */ sd->params.version.firmwareVersion =0 ;get_version_information (gspca_dev);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 134/252 Revert "ALSA: sb: fix a missing check of snd_ctl_add"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
[ Upstream commit 4b059ce1f4b368208c2310925f49be77f15e527b ]
This reverts commit beae77170c60aa786f3e4599c18ead2854d8694d.
Because of recent interactions with developers from @umn.edu, all commits from them have been recently re-reviewed to ensure if they were correct or not.
Upon review, this commit was found to be incorrect for the reasons below, so it must be reverted. It is safe to ignore this error as the mixer element is optional, and the driver is very legacy.
--- sound/isa/sb/sb16_main.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
sound/isa/sb/sb16_main.c +3 -7
@@ -846,14 +846,10 @@ int snd_sb16dsp_pcm(struct snd_sb *chip, int device)snd_pcm_set_ops (pcm,SNDRV_PCM_STREAM_PLAYBACK , &snd_sb16_playback_ops);snd_pcm_set_ops (pcm,SNDRV_PCM_STREAM_CAPTURE , &snd_sb16_capture_ops); -if (chip->dma16 >=0 && chip->dma8 != chip->dma16) { - err =snd_ctl_add (card,snd_ctl_new1 ( - &snd_sb16_dma_control, chip)); -if (err) -return err; - }else { +if (chip->dma16 >=0 && chip->dma8 != chip->dma16) +snd_ctl_add (card,snd_ctl_new1 (&snd_sb16_dma_control, chip)); +else pcm->info_flags =SNDRV_PCM_INFO_HALF_DUPLEX ; - }snd_pcm_set_managed_buffer_all (pcm,SNDRV_DMA_TYPE_DEV , card->dev,64 *1024 ,128 *1024 );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 135/252 Revert "serial: max310x: pass return value of spi_register_driver"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
[ Upstream commit b0a85abbe92e1a6f3e8580a4590fa7245de7090b ]
This reverts commit 51f689cc11333944c7a457f25ec75fcb41e99410.
Because of recent interactions with developers from @umn.edu, all commits from them have been recently re-reviewed to ensure if they were correct or not.
Upon review, this commit was found to be incorrect for the reasons below, so it must be reverted. It will be fixed up "correctly" in a later kernel change.
This change did not properly unwind from the error condition, so it was not correct.
--- drivers/tty/serial/max310x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/tty/serial/max310x.c +2 -2
@@ -1527,10 +1527,10 @@ static int __init max310x_uart_init(void)return ret;#ifdef CONFIG_SPI_MASTER - ret =spi_register_driver (&max310x_spi_driver); +spi_register_driver (&max310x_spi_driver);#endif -return ret; +return 0 ; }module_init (max310x_uart_init);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 136/252 serial: max310x: unregister uart driver in case of failure and abort
In reply to Greg Kroah-HartmanFrom: Atul Gopinathan <[email protected]>
[ Upstream commit 3890e3dea315f1a257d1b940a2a4e2fa16a7b095 ]
The macro "spi_register_driver" invokes the function "__spi_register_driver()" which has a return type of int and can fail, returning a negative value in such a case. This is currently ignored and the init() function yields success even if the spi driver failed to register.
Fix this by collecting the return value of "__spi_register_driver()" and also unregister the uart driver in case of failure.
--- drivers/tty/serial/max310x.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/tty/serial/max310x.c +4 -2
@@ -1527,10 +1527,12 @@ static int __init max310x_uart_init(void)return ret;#ifdef CONFIG_SPI_MASTER -spi_register_driver (&max310x_spi_driver); + ret =spi_register_driver (&max310x_spi_driver); +if (ret) +uart_unregister_driver (&max310x_uart);#endif -return 0 ; +return ret; }module_init (max310x_uart_init);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 137/252 Revert "net: fujitsu: fix a potential NULL pointer dereference"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
[ Upstream commit 5f94eaa4ee23e80841fa359a372f84cfe25daee1 ]
This reverts commit 9f4d6358e11bbc7b839f9419636188e4151fb6e4.
Because of recent interactions with developers from @umn.edu, all commits from them have been recently re-reviewed to ensure if they were correct or not.
Upon review, this commit was found to be incorrect for the reasons below, so it must be reverted. It will be fixed up "correctly" in a later kernel change.
The original change does not change any behavior as the caller of this function onlyu checks for "== -1" as an error condition so this error is not handled properly. Remove this change and it will be fixed up properly in a later commit.
--- drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/net/ethernet/fujitsu/fmvj18x_cs.c +0 -5
@@ -547,11 +547,6 @@ static int fmvj18x_get_hwinfo(struct pcmcia_device *link, u_char *node_id)return -1 ; base =ioremap (link->resource[2 ]->start,resource_size (link->resource[2 ])); -if (!base) { -pcmcia_release_window (link, link->resource[2 ]); -return -ENOMEM ; - } -pcmcia_map_mem_page (link, link->resource[2 ],0 );/*
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 138/252 net: fujitsu: fix potential null-ptr-deref
In reply to Greg Kroah-HartmanFrom: Anirudh Rayabharam <[email protected]>
[ Upstream commit 52202be1cd996cde6e8969a128dc27ee45a7cb5e ]
In fmvj18x_get_hwinfo(), if ioremap fails there will be NULL pointer deref. To fix this, check the return value of ioremap and return -1 to the caller in case of failure.
--- drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/ethernet/fujitsu/fmvj18x_cs.c +5 -0
@@ -547,6 +547,11 @@ static int fmvj18x_get_hwinfo(struct pcmcia_device *link, u_char *node_id)return -1 ; base =ioremap (link->resource[2 ]->start,resource_size (link->resource[2 ])); +if (!base) { +pcmcia_release_window (link, link->resource[2 ]); +return -1 ; + } +pcmcia_map_mem_page (link, link->resource[2 ],0 );/*
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 139/252 Revert "net/smc: fix a NULL pointer dereference"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
[ Upstream commit 5369ead83f5aff223b6418c99cb1fe9a8f007363 ]
This reverts commit e183d4e414b64711baf7a04e214b61969ca08dfa.
Because of recent interactions with developers from @umn.edu, all commits from them have been recently re-reviewed to ensure if they were correct or not.
Upon review, this commit was found to be incorrect for the reasons below, so it must be reverted. It will be fixed up "correctly" in a later kernel change.
The original commit causes a memory leak and does not properly fix the issue it claims to fix. I will send a follow-on patch to resolve this properly.
--- net/smc/smc_ism.c | 5 ----- 1 file changed, 5 deletions(-)
net/smc/smc_ism.c +0 -5
@@ -319,11 +319,6 @@ struct smcd_dev *smcd_alloc_dev(struct device *parent, const char *name,init_waitqueue_head (&smcd->lgrs_deleted); smcd->event_wq =alloc_ordered_workqueue ("ism_evt_wq-%s)" ,WQ_MEM_RECLAIM , name); -if (!smcd->event_wq) { -kfree (smcd->conn); -kfree (smcd); -return NULL ; - }return smcd; }EXPORT_SYMBOL_GPL (smcd_alloc_dev);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 140/252 net/smc: properly handle workqueue allocation failure
In reply to Greg Kroah-HartmanFrom: Anirudh Rayabharam <[email protected]>
[ Upstream commit bbeb18f27a44ce6adb00d2316968bc59dc640b9b ]
In smcd_alloc_dev(), if alloc_ordered_workqueue() fails, properly catch it, clean up and return NULL to let the caller know there was a failure. Move the call to alloc_ordered_workqueue higher in the function in order to abort earlier without needing to unwind the call to device_initialize().
--- net/smc/smc_ism.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
net/smc/smc_ism.c +8 -2
@@ -304,6 +304,14 @@ struct smcd_dev *smcd_alloc_dev(struct device *parent, const char *name,return NULL ; } + smcd->event_wq =alloc_ordered_workqueue ("ism_evt_wq-%s)" , +WQ_MEM_RECLAIM , name); +if (!smcd->event_wq) { +kfree (smcd->conn); +kfree (smcd); +return NULL ; + } + smcd->dev.parent = parent; smcd->dev.release = smcd_release;device_initialize (&smcd->dev);
@@ -317,8 +325,6 @@ struct smcd_dev *smcd_alloc_dev(struct device *parent, const char *name,INIT_LIST_HEAD (&smcd->vlan);INIT_LIST_HEAD (&smcd->lgr_list);init_waitqueue_head (&smcd->lgrs_deleted); - smcd->event_wq =alloc_ordered_workqueue ("ism_evt_wq-%s)" , -WQ_MEM_RECLAIM , name);return smcd; }EXPORT_SYMBOL_GPL (smcd_alloc_dev);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 141/252 Revert "net: caif: replace BUG_ON with recovery code"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
[ Upstream commit 4df07045fcfd684379a394d0f2aa0cc4067bda2a ]
This reverts commit c5dea815834c7d2e9fc633785455bc428b7a1956.
Because of recent interactions with developers from @umn.edu, all commits from them have been recently re-reviewed to ensure if they were correct or not.
Upon review, this commit was found to be incorrect for the reasons below, so it must be reverted. It will be fixed up "correctly" in a later kernel change.
The original change here was pointless as dev can never be NULL in this function so the claim in the changelog that this "fixes" anything is incorrect (also the developer forgot about panic_on_warn). A follow-up change will resolve this issue properly.
--- drivers/net/caif/caif_serial.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/caif/caif_serial.c +1 -3
@@ -270,9 +270,7 @@ static netdev_tx_t caif_xmit(struct sk_buff *skb, struct net_device *dev) {struct ser_device *ser; -if (WARN_ON (!dev)) -return -EINVAL ; - +BUG_ON (dev ==NULL ); ser =netdev_priv (dev);/* Send flow off once, on high water mark */
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 142/252 net: caif: remove BUG_ON(dev == NULL) in caif_xmit
In reply to Greg Kroah-HartmanFrom: Du Cheng <[email protected]>
[ Upstream commit 65a67792e3416f7c5d7daa47d99334cbb19a7449 ]
The condition of dev == NULL is impossible in caif_xmit(), hence it is for the removal.
Explanation:
The static caif_xmit() is only called upon via a function pointer ndo_start_xmit defined in include/linux/netdevice.h:
```
struct net_device_ops {
...
netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev);
...
}
```The exhausive list of call points are:
```
drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c
dev->netdev_ops->ndo_start_xmit(skb, dev);
^ ^
drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c
struct opa_vnic_adapter *adapter = opa_vnic_priv(netdev);
^ ^
return adapter->rn_ops->ndo_start_xmit(skb, netdev); // adapter would crash first
^ ^
drivers/usb/gadget/function/f_ncm.c
ncm->netdev->netdev_ops->ndo_start_xmit(NULL, ncm->netdev);
^ ^
include/linux/netdevice.h
static inline netdev_tx_t __netdev_start_xmit(...
{
return ops->ndo_start_xmit(skb, dev);
^
}
const struct net_device_ops *ops = dev->netdev_ops;
^
rc = __netdev_start_xmit(ops, skb, dev, more);
^
```In each of the enumerated scenarios, it is impossible for the NULL-valued dev to reach the caif_xmit() without crashing the kernel earlier, therefore BUG_ON(dev == NULL) is rather useless, hence the removal.
--- drivers/net/caif/caif_serial.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/caif/caif_serial.c +0 -1
@@ -270,7 +270,6 @@ static netdev_tx_t caif_xmit(struct sk_buff *skb, struct net_device *dev) {struct ser_device *ser; -BUG_ON (dev ==NULL ); ser =netdev_priv (dev);/* Send flow off once, on high water mark */
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 143/252 Revert "char: hpet: fix a missing check of ioremap"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
[ Upstream commit 566f53238da74801b48e985788e5f7c9159e5940 ]
This reverts commit 13bd14a41ce3105d5b1f3cd8b4d1e249d17b6d9b.
Because of recent interactions with developers from @umn.edu, all commits from them have been recently re-reviewed to ensure if they were correct or not.
Upon review, this commit was found to be incorrect for the reasons below, so it must be reverted. It will be fixed up "correctly" in a later kernel change.
While this is technically correct, it is only fixing ONE of these errors in this function, so the patch is not fully correct. I'll leave this revert and provide a fix for this later that resolves this same "problem" everywhere in this function.
--- drivers/char/hpet.c | 2 -- 1 file changed, 2 deletions(-)
drivers/char/hpet.c +0 -2
@@ -969,8 +969,6 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)if (ACPI_SUCCESS (status)) { hdp->hd_phys_address = addr.address.minimum; hdp->hd_address =ioremap (addr.address.minimum, addr.address.address_length); -if (!hdp->hd_address) -return AE_ERROR ;if (hpet_is_known (hdp)) {iounmap (hdp->hd_address);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 144/252 char: hpet: add checks after calling ioremap
In reply to Greg Kroah-HartmanFrom: Tom Seewald <[email protected]>
[ Upstream commit b11701c933112d49b808dee01cb7ff854ba6a77a ]
The function hpet_resources() calls ioremap() two times, but in both cases it does not check if ioremap() returned a null pointer. Fix this by adding null pointer checks and returning an appropriate error.
--- drivers/char/hpet.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/char/hpet.c +4 -0
@@ -969,6 +969,8 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)if (ACPI_SUCCESS (status)) { hdp->hd_phys_address = addr.address.minimum; hdp->hd_address =ioremap (addr.address.minimum, addr.address.address_length); +if (!hdp->hd_address) +return AE_ERROR ;if (hpet_is_known (hdp)) {iounmap (hdp->hd_address);
@@ -982,6 +984,8 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data) hdp->hd_phys_address = fixmem32->address; hdp->hd_address =ioremap (fixmem32->address,HPET_RANGE_SIZE ); +if (!hdp->hd_address) +return AE_ERROR ;if (hpet_is_known (hdp)) {iounmap (hdp->hd_address);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 145/252 Revert "ALSA: gus: add a check of the status of snd_ctl_add"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
[ Upstream commit 1dacca7fa1ebea47d38d20cd2df37094805d2649 ]
This reverts commit 0f25e000cb4398081748e54f62a902098aa79ec1.
Because of recent interactions with developers from @umn.edu, all commits from them have been recently re-reviewed to ensure if they were correct or not.
Upon review, this commit was found to be incorrect for the reasons below, so it must be reverted. It will be fixed up "correctly" in a later kernel change.
The original commit did nothing if there was an error, except to print out a message, which is pointless. So remove the commit as it gives a "false sense of doing something".
--- sound/isa/gus/gus_main.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
sound/isa/gus/gus_main.c +2 -11
@@ -77,17 +77,8 @@ static const struct snd_kcontrol_new snd_gus_joystick_control = {static void snd_gus_init_control (struct snd_gus_card *gus) { -int ret; - -if (!gus->ace_flag) { - ret = -snd_ctl_add (gus->card, -snd_ctl_new1 (&snd_gus_joystick_control, - gus)); -if (ret) -snd_printk (KERN_ERR "gus: snd_ctl_add failed: %d\n" , - ret); - } +if (!gus->ace_flag) +snd_ctl_add (gus->card,snd_ctl_new1 (&snd_gus_joystick_control, gus)); }/*
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 146/252 ALSA: sb8: Add a comment note regarding an unused pointer
In reply to Greg Kroah-HartmanFrom: Atul Gopinathan <[email protected]>
[ Upstream commit a28591f61b60fac820c6de59826ffa710e5e314e ]
The field "fm_res" of "struct snd_sb8" is never used/dereferenced throughout the sb8.c code. Therefore there is no need for any null value check after the "request_region()".
Add a comment note to make developers know about this and prevent any "NULL check" patches on this part of code.
--- sound/isa/sb/sb8.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
sound/isa/sb/sb8.c +5 -1
@@ -94,7 +94,11 @@ static int snd_sb8_probe(struct device *pdev, unsigned int dev) acard = card->private_data; card->private_free = snd_sb8_free; -/* block the 0x388 port to avoid PnP conflicts */ +/* +* Block the 0x388 port to avoid PnP conflicts. +* No need to check this value after request_region, +* as we never do anything with it. +*/ acard->fm_res =request_region (0x388 ,4 ,"SoundBlaster FM" );if (port[dev] !=SNDRV_AUTO_PORT ) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 147/252 Revert "ALSA: usx2y: Fix potential NULL pointer dereference"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
[ Upstream commit 4667a6fc1777ce071504bab570d3599107f4790f ]
This reverts commit a2c6433ee5a35a8de6d563f6512a26f87835ea0f.
Because of recent interactions with developers from @umn.edu, all commits from them have been recently re-reviewed to ensure if they were correct or not.
Upon review, this commit was found to be incorrect for the reasons below, so it must be reverted. It will be fixed up "correctly" in a later kernel change.
The original patch was incorrect, and would leak memory if the error path the patch added was hit.
--- sound/usb/usx2y/usb_stream.c | 5 ----- 1 file changed, 5 deletions(-)
sound/usb/usx2y/usb_stream.c +0 -5
@@ -91,12 +91,7 @@ static int init_urbs(struct usb_stream_kernel *sk, unsigned use_packsize,for (u =0 ; u <USB_STREAM_NURBS ; ++u) { sk->inurb[u] =usb_alloc_urb (sk->n_o_ps,GFP_KERNEL ); -if (!sk->inurb[u]) -return -ENOMEM ; - sk->outurb[u] =usb_alloc_urb (sk->n_o_ps,GFP_KERNEL ); -if (!sk->outurb[u]) -return -ENOMEM ; } if (init_pipe_urbs(sk, use_packsize, sk->inurb, indata, dev, in_pipe) ||
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 148/252 Revert "isdn: mISDNinfineon: fix potential NULL pointer dereference"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
[ Upstream commit abd7bca23bd4247124265152d00ffd4b2b0d6877 ]
This reverts commit d721fe99f6ada070ae8fc0ec3e01ce5a42def0d9.
Because of recent interactions with developers from @umn.edu, all commits from them have been recently re-reviewed to ensure if they were correct or not.
Upon review, this commit was found to be incorrect for the reasons below, so it must be reverted. It will be fixed up "correctly" in a later kernel change.
The original commit was incorrect, it should have never have used "unlikely()" and if it ever does trigger, resources are left grabbed.
Given there are no users for this code around, I'll just revert this and leave it "as is" as the odds that ioremap() will ever fail here is horrendiously low.
--- drivers/isdn/hardware/mISDN/mISDNinfineon.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/isdn/hardware/mISDN/mISDNinfineon.c +1 -4
@@ -697,11 +697,8 @@ setup_io(struct inf_hw *hw) (ulong)hw->addr.start, (ulong)hw->addr.size);return err; } -if (hw->ci->addr_mode ==AM_MEMIO ) { +if (hw->ci->addr_mode ==AM_MEMIO ) hw->addr.p =ioremap (hw->addr.start, hw->addr.size); -if (unlikely (!hw->addr.p)) -return -ENOMEM ; - } hw->addr.mode = hw->ci->addr_mode;if (debug &DEBUG_HW ) pr_notice("%s: IO addr %lx (%lu bytes) mode%d\n",
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 149/252 isdn: mISDNinfineon: check/cleanup ioremap failure correctly in setup_io
In reply to Greg Kroah-HartmanFrom: Phillip Potter <[email protected]>
[ Upstream commit c446f0d4702d316e1c6bf621f70e79678d28830a ]
Move hw->cfg.mode and hw->addr.mode assignments from hw->ci->cfg_mode and hw->ci->addr_mode respectively, to be before the subsequent checks for memory IO mode (and possible ioremap calls in this case).
Also introduce ioremap error checks at both locations. This allows resources to be properly freed on ioremap failure, as when the caller of setup_io then subsequently calls release_io via its error path, release_io can now correctly determine the mode as it has been set before the ioremap call.
Finally, refactor release_io function so that it will call release_mem_region in the memory IO case, regardless of whether or not hw->cfg.p/hw->addr.p are NULL. This means resources are then properly released on failure.
This properly implements the original reverted commit (d721fe99f6ad) from the University of Minnesota, whilst also implementing the ioremap check for the hw->ci->cfg_mode if block as well.
--- drivers/isdn/hardware/mISDN/mISDNinfineon.c | 24 ++++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-)
drivers/isdn/hardware/mISDN/mISDNinfineon.c +16 -8
@@ -630,17 +630,19 @@ static void release_io(struct inf_hw *hw) {if (hw->cfg.mode) { -if (hw->cfg.p) { +if (hw->cfg.mode ==AM_MEMIO ) {release_mem_region (hw->cfg.start, hw->cfg.size); -iounmap (hw->cfg.p); +if (hw->cfg.p) +iounmap (hw->cfg.p); }else release_region (hw->cfg.start, hw->cfg.size); hw->cfg.mode =AM_NONE ; }if (hw->addr.mode) { -if (hw->addr.p) { +if (hw->addr.mode ==AM_MEMIO ) {release_mem_region (hw->addr.start, hw->addr.size); -iounmap (hw->addr.p); +if (hw->addr.p) +iounmap (hw->addr.p); }else release_region (hw->addr.start, hw->addr.size); hw->addr.mode =AM_NONE ;
@@ -670,9 +672,12 @@ setup_io(struct inf_hw *hw) (ulong)hw->cfg.start, (ulong)hw->cfg.size);return err; } -if (hw->ci->cfg_mode ==AM_MEMIO ) - hw->cfg.p =ioremap (hw->cfg.start, hw->cfg.size); hw->cfg.mode = hw->ci->cfg_mode; +if (hw->ci->cfg_mode ==AM_MEMIO ) { + hw->cfg.p =ioremap (hw->cfg.start, hw->cfg.size); +if (!hw->cfg.p) +return -ENOMEM ; + }if (debug &DEBUG_HW ) pr_notice("%s: IO cfg %lx (%lu bytes) mode%d\n", hw->name, (ulong)hw->cfg.start,
@@ -697,9 +702,12 @@ setup_io(struct inf_hw *hw) (ulong)hw->addr.start, (ulong)hw->addr.size);return err; } -if (hw->ci->addr_mode ==AM_MEMIO ) - hw->addr.p =ioremap (hw->addr.start, hw->addr.size); hw->addr.mode = hw->ci->addr_mode; +if (hw->ci->addr_mode ==AM_MEMIO ) { + hw->addr.p =ioremap (hw->addr.start, hw->addr.size); +if (!hw->addr.p) +return -ENOMEM ; + }if (debug &DEBUG_HW ) pr_notice("%s: IO addr %lx (%lu bytes) mode%d\n", hw->name, (ulong)hw->addr.start,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 150/252 Revert "ath6kl: return error code in ath6kl_wmi_set_roam_lrssi_cmd()"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
[ Upstream commit efba106f89fc6848726716c101f4c84e88720a9c ]
This reverts commit fc6a6521556c8250e356ddc6a3f2391aa62dc976.
Because of recent interactions with developers from @umn.edu, all commits from them have been recently re-reviewed to ensure if they were correct or not.
Upon review, this commit was found to be incorrect for the reasons below, so it must be reverted. It will be fixed up "correctly" in a later kernel change.
The change being reverted does NOTHING as the caller to this function does not even look at the return value of the call. So the "claim" that this fixed an an issue is not true. It will be fixed up properly in a future patch by propagating the error up the stack correctly.
--- drivers/net/wireless/ath/ath6kl/wmi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath6kl/wmi.c +3 -1
@@ -776,8 +776,10 @@ int ath6kl_wmi_set_roam_lrssi_cmd(struct wmi *wmi, u8 lrssi) cmd->info.params.roam_rssi_floor =DEF_LRSSI_ROAM_FLOOR ; cmd->roam_ctrl =WMI_SET_LRSSI_SCAN_PARAMS ; -return ath6kl_wmi_cmd_send (wmi,0 , skb,WMI_SET_ROAM_CTRL_CMDID , +ath6kl_wmi_cmd_send (wmi,0 , skb,WMI_SET_ROAM_CTRL_CMDID ,NO_SYNC_WMIFLAG ); + +return 0 ; }int ath6kl_wmi_force_roam_cmd (struct wmi *wmi,const u8 *bssid)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 151/252 ath6kl: return error code in ath6kl_wmi_set_roam_lrssi_cmd()
In reply to Greg Kroah-HartmanFrom: Anirudh Rayabharam <[email protected]>
[ Upstream commit 54433367840b46a1555c8ed36c4c0cfc5dbf1358 ]
Propagate error code from failure of ath6kl_wmi_cmd_send() to the caller.
--- drivers/net/wireless/ath/ath6kl/debug.c | 5 ++++- drivers/net/wireless/ath/ath6kl/wmi.c | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath6kl/debug.c +4 -1
@@ -1027,14 +1027,17 @@ static ssize_t ath6kl_lrssi_roam_write(struct file *file, {struct ath6kl *ar = file->private_data;unsigned long lrssi_roam_threshold; +int ret;if (kstrtoul_from_user (user_buf, count,0 , &lrssi_roam_threshold))return -EINVAL ; ar->lrssi_roam_threshold = lrssi_roam_threshold; -ath6kl_wmi_set_roam_lrssi_cmd (ar->wmi, ar->lrssi_roam_threshold); + ret =ath6kl_wmi_set_roam_lrssi_cmd (ar->wmi, ar->lrssi_roam_threshold); +if (ret) +return ret;return count; }
drivers/net/wireless/ath/ath6kl/wmi.c +1 -3
@@ -776,10 +776,8 @@ int ath6kl_wmi_set_roam_lrssi_cmd(struct wmi *wmi, u8 lrssi) cmd->info.params.roam_rssi_floor =DEF_LRSSI_ROAM_FLOOR ; cmd->roam_ctrl =WMI_SET_LRSSI_SCAN_PARAMS ; -ath6kl_wmi_cmd_send (wmi,0 , skb,WMI_SET_ROAM_CTRL_CMDID , +return ath6kl_wmi_cmd_send (wmi,0 , skb,WMI_SET_ROAM_CTRL_CMDID ,NO_SYNC_WMIFLAG ); - -return 0 ; }int ath6kl_wmi_force_roam_cmd (struct wmi *wmi,const u8 *bssid)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 152/252 Revert "isdn: mISDN: Fix potential NULL pointer dereference of kzalloc"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
[ Upstream commit 36a2c87f7ed9e305d05b9a5c044cc6c494771504 ]
This reverts commit 38d22659803a033b1b66cd2624c33570c0dde77d.
Because of recent interactions with developers from @umn.edu, all commits from them have been recently re-reviewed to ensure if they were correct or not.
Upon review, this commit was found to be incorrect for the reasons below, so it must be reverted. It will be fixed up "correctly" in a later kernel change.
While it looks like the original change is correct, it is not, as none of the setup actually happens, and the error value is not propagated upwards.
--- drivers/isdn/hardware/mISDN/hfcsusb.c | 3 --- 1 file changed, 3 deletions(-)
drivers/isdn/hardware/mISDN/hfcsusb.c +0 -3
@@ -249,9 +249,6 @@ hfcsusb_ph_info(struct hfcsusb *hw)int i; phi =kzalloc (struct_size (phi, bch, dch->dev.nrbchan),GFP_ATOMIC ); -if (!phi) -return ; - phi->dch.ch.protocol = hw->protocol; phi->dch.ch.Flags = dch->Flags; phi->dch.state = dch->state;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 153/252 isdn: mISDN: correctly handle ph_info allocation failure in hfcsusb_ph_info
In reply to Greg Kroah-HartmanFrom: Phillip Potter <[email protected]>
[ Upstream commit 5265db2ccc735e2783b790d6c19fb5cee8c025ed ]
Modify return type of hfcusb_ph_info to int, so that we can pass error value up the call stack when allocation of ph_info fails. Also change three of four call sites to actually account for the memory failure. The fourth, in ph_state_nt, is infeasible to change as it is in turn called by ph_state which is used as a function pointer argument to mISDN_initdchannel, which would necessitate changing its signature and updating all the places where it is used (too many).
Fixes original flawed commit (38d22659803a) from the University of Minnesota.
--- drivers/isdn/hardware/mISDN/hfcsusb.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
drivers/isdn/hardware/mISDN/hfcsusb.c +10 -8
@@ -46,7 +46,7 @@ static void hfcsusb_start_endpoint(struct hfcsusb *hw, int channel);static void hfcsusb_stop_endpoint (struct hfcsusb *hw,int channel);static int hfcsusb_setup_bch (struct bchannel *bch,int protocol);static void deactivate_bchannel (struct bchannel *bch); -static void hfcsusb_ph_info (struct hfcsusb *hw); +static int hfcsusb_ph_info (struct hfcsusb *hw);/* start next background transfer for control channel */ static void
@@ -241,7 +241,7 @@ hfcusb_l2l1B(struct mISDNchannel *ch, struct sk_buff *skb)* send full D/B channel status information * as MPH_INFORMATION_IND */ -static void +static int hfcsusb_ph_info (struct hfcsusb *hw) {struct ph_info *phi;
@@ -249,6 +249,9 @@ hfcsusb_ph_info(struct hfcsusb *hw)int i; phi =kzalloc (struct_size (phi, bch, dch->dev.nrbchan),GFP_ATOMIC ); +if (!phi) +return -ENOMEM ; + phi->dch.ch.protocol = hw->protocol; phi->dch.ch.Flags = dch->Flags; phi->dch.state = dch->state;
@@ -260,6 +263,8 @@ hfcsusb_ph_info(struct hfcsusb *hw)_queue_data (&dch->dev.D,MPH_INFORMATION_IND ,MISDN_ID_ANY ,struct_size (phi, bch, dch->dev.nrbchan), phi,GFP_ATOMIC );kfree (phi); + +return 0 ; }/*
@@ -344,8 +349,7 @@ hfcusb_l2l1D(struct mISDNchannel *ch, struct sk_buff *skb) ret =l1_event (dch->l1, hh->prim);break ;case MPH_INFORMATION_REQ : -hfcsusb_ph_info (hw); - ret =0 ; + ret =hfcsusb_ph_info (hw);break ; }
@@ -400,8 +404,7 @@ hfc_l1callback(struct dchannel *dch, u_int cmd) hw->name, __func__, cmd);return -1 ; } -hfcsusb_ph_info (hw); -return 0 ; +return hfcsusb_ph_info (hw); } static int
@@ -743,8 +746,7 @@ hfcsusb_setup_bch(struct bchannel *bch, int protocol)handle_led (hw, (bch->nr ==1 ) ?LED_B1_OFF :LED_B2_OFF ); } -hfcsusb_ph_info (hw); -return 0 ; +return hfcsusb_ph_info (hw); } static void
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 154/252 Revert "dmaengine: qcom_hidma: Check for driver register failure"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
[ Upstream commit 43ed0fcf613a87dd0221ec72d1ade4d6544f2ffc ]
This reverts commit a474b3f0428d6b02a538aa10b3c3b722751cb382.
Because of recent interactions with developers from @umn.edu, all commits from them have been recently re-reviewed to ensure if they were correct or not.
Upon review, this commit was found to be incorrect for the reasons below, so it must be reverted. It will be fixed up "correctly" in a later kernel change.
The original change is NOT correct, as it does not correctly unwind from the resources that was allocated before the call to platform_driver_register().
--- drivers/dma/qcom/hidma_mgmt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/dma/qcom/hidma_mgmt.c +2 -1
@@ -418,8 +418,9 @@ static int __init hidma_mgmt_init(void) hidma_mgmt_of_populate_channels(child); }#endif -return platform_driver_register (&hidma_mgmt_driver); +platform_driver_register (&hidma_mgmt_driver); +return 0 ; }module_init (hidma_mgmt_init);MODULE_LICENSE ("GPL v2" );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 155/252 dmaengine: qcom_hidma: comment platform_driver_register call
In reply to Greg Kroah-HartmanFrom: Phillip Potter <[email protected]>
[ Upstream commit 4df2a8b0ad634d98a67e540a4e18a60f943e7d9f ]
Place a comment in hidma_mgmt_init explaining why success must currently be assumed, due to the cleanup issue that would need to be considered were this module ever to be unloadable or were this platform_driver_register call ever to fail.
--- drivers/dma/qcom/hidma_mgmt.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/dma/qcom/hidma_mgmt.c +14 -0
@@ -418,6 +418,20 @@ static int __init hidma_mgmt_init(void) hidma_mgmt_of_populate_channels(child); }#endif +/* +* We do not check for return value here, as it is assumed that +* platform_driver_register must not fail. The reason for this is that +* the (potential) hidma_mgmt_of_populate_channels calls above are not +* cleaned up if it does fail, and to do this work is quite +* complicated. In particular, various calls of of_address_to_resource, +* of_irq_to_resource, platform_device_register_full, of_dma_configure, +* and of_msi_configure which then call other functions and so on, must +* be cleaned up - this is not a trivial exercise. +* +* Currently, this module is not intended to be unloaded, and there is +* no module_exit function defined which does the needed cleanup. For +* this reason, we have to assume success here. +*/ platform_driver_register (&hidma_mgmt_driver);return 0 ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 156/252 Revert "libertas: add checks for the return value of sysfs_create_group"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
[ Upstream commit 46651077765c80a0d6f87f3469129a72e49ce91b ]
This reverts commit 434256833d8eb988cb7f3b8a41699e2fe48d9332.
Because of recent interactions with developers from @umn.edu, all commits from them have been recently re-reviewed to ensure if they were correct or not.
Upon review, this commit was found to be incorrect for the reasons below, so it must be reverted. It will be fixed up "correctly" in a later kernel change.
The original commit was incorrect, the error needs to be propagated back to the caller AND if the second group call fails, the first needs to be removed. There are much better ways to solve this, the driver should NOT be calling sysfs_create_group() on its own as it is racing userspace and loosing.
--- drivers/net/wireless/marvell/libertas/mesh.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/net/wireless/marvell/libertas/mesh.c +0 -5
@@ -805,12 +805,7 @@ static void lbs_persist_config_init(struct net_device *dev) {int ret; ret =sysfs_create_group (&(dev->dev.kobj), &boot_opts_group); -if (ret) -pr_err ("failed to create boot_opts_group.\n" ); - ret =sysfs_create_group (&(dev->dev.kobj), &mesh_ie_group); -if (ret) -pr_err ("failed to create mesh_ie_group.\n" ); }static void lbs_persist_config_remove (struct net_device *dev)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 157/252 libertas: register sysfs groups properly
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
[ Upstream commit 7e79b38fe9a403b065ac5915465f620a8fb3de84 ]
The libertas driver was trying to register sysfs groups "by hand" which causes them to be created _after_ the device is initialized and announced to userspace, which causes races and can prevent userspace tools from seeing the sysfs files correctly.
Fix this up by using the built-in sysfs_groups pointers in struct net_device which were created for this very reason, fixing the race condition, and properly allowing for any error that might have occured to be handled properly.
--- drivers/net/wireless/marvell/libertas/mesh.c | 28 +++----------------- 1 file changed, 4 insertions(+), 24 deletions(-)
drivers/net/wireless/marvell/libertas/mesh.c +4 -24
@@ -801,19 +801,6 @@ static const struct attribute_group mesh_ie_group = { .attrs = mesh_ie_attrs, }; -static void lbs_persist_config_init (struct net_device *dev) -{ -int ret; - ret =sysfs_create_group (&(dev->dev.kobj), &boot_opts_group); - ret =sysfs_create_group (&(dev->dev.kobj), &mesh_ie_group); -} - -static void lbs_persist_config_remove (struct net_device *dev) -{ -sysfs_remove_group (&(dev->dev.kobj), &boot_opts_group); -sysfs_remove_group (&(dev->dev.kobj), &mesh_ie_group); -} -/*************************************************************************** * Initializing and starting, stopping mesh
@@ -1009,6 +996,10 @@ static int lbs_add_mesh(struct lbs_private *priv)SET_NETDEV_DEV (priv->mesh_dev, priv->dev->dev.parent); mesh_dev->flags |=IFF_BROADCAST |IFF_MULTICAST ; + mesh_dev->sysfs_groups[0 ] = &lbs_mesh_attr_group; + mesh_dev->sysfs_groups[1 ] = &boot_opts_group; + mesh_dev->sysfs_groups[2 ] = &mesh_ie_group; +/* Register virtual mesh interface */ ret =register_netdev (mesh_dev);if (ret) {
@@ -1016,19 +1007,10 @@ static int lbs_add_mesh(struct lbs_private *priv) goto err_free_netdev; } - ret =sysfs_create_group (&(mesh_dev->dev.kobj), &lbs_mesh_attr_group); -if (ret) - goto err_unregister; - -lbs_persist_config_init (mesh_dev); -/* Everything successful */ ret =0 ; goto done; -err_unregister: -unregister_netdev (mesh_dev); - err_free_netdev:free_netdev (mesh_dev);
@@ -1049,8 +1031,6 @@ void lbs_remove_mesh(struct lbs_private *priv)netif_stop_queue (mesh_dev);netif_carrier_off (mesh_dev); -sysfs_remove_group (&(mesh_dev->dev.kobj), &lbs_mesh_attr_group); -lbs_persist_config_remove (mesh_dev);unregister_netdev (mesh_dev); priv->mesh_dev =NULL ;kfree (mesh_dev->ieee80211_ptr);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 158/252 Revert "ASoC: cs43130: fix a NULL pointer dereference"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
[ Upstream commit fdda0dd2686ecd1f2e616c9e0366ea71b40c485d ]
This reverts commit a2be42f18d409213bb7e7a736e3ef6ba005115bb.
Because of recent interactions with developers from @umn.edu, all commits from them have been recently re-reviewed to ensure if they were correct or not.
Upon review, this commit was found to be incorrect for the reasons below, so it must be reverted. It will be fixed up "correctly" in a later kernel change.
The original patch here is not correct, sysfs files that were created are not unwound.
--- sound/soc/codecs/cs43130.c | 2 -- 1 file changed, 2 deletions(-)
sound/soc/codecs/cs43130.c +0 -2
@@ -2319,8 +2319,6 @@ static int cs43130_probe(struct snd_soc_component *component)return ret; cs43130->wq =create_singlethread_workqueue ("cs43130_hp" ); -if (!cs43130->wq) -return -ENOMEM ;INIT_WORK (&cs43130->work, cs43130_imp_meas); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 159/252 ASoC: cs43130: handle errors in cs43130_probe() properly
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
[ Upstream commit 2da441a6491d93eff8ffff523837fd621dc80389 ]
cs43130_probe() does not do any valid error checking of things it initializes, OR what it does, it does not unwind properly if there are errors.
Fix this up by moving the sysfs files to an attribute group so the driver core will correctly add/remove them all at once and handle errors with them, and correctly check for creating a new workqueue and unwinding if that fails.
--- sound/soc/codecs/cs43130.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
sound/soc/codecs/cs43130.c +14 -14
@@ -1735,6 +1735,14 @@ static DEVICE_ATTR(hpload_dc_r, 0444, cs43130_show_dc_r, NULL); static DEVICE_ATTR(hpload_ac_l, 0444, cs43130_show_ac_l, NULL); static DEVICE_ATTR(hpload_ac_r, 0444, cs43130_show_ac_r, NULL); +static struct attribute *hpload_attrs[] = { + &dev_attr_hpload_dc_l.attr, + &dev_attr_hpload_dc_r.attr, + &dev_attr_hpload_ac_l.attr, + &dev_attr_hpload_ac_r.attr, +}; +ATTRIBUTE_GROUPS (hpload); +static struct reg_sequence hp_en_cal_seq[] = { {CS43130_INT_MASK_4 ,CS43130_INT_MASK_ALL }, {CS43130_HP_MEAS_LOAD_1 ,0 },
@@ -2302,23 +2310,15 @@ static int cs43130_probe(struct snd_soc_component *component) cs43130->hpload_done = false;if (cs43130->dc_meas) { - ret =device_create_file (component->dev, &dev_attr_hpload_dc_l); -if (ret <0 ) -return ret; - - ret =device_create_file (component->dev, &dev_attr_hpload_dc_r); -if (ret <0 ) -return ret; - - ret =device_create_file (component->dev, &dev_attr_hpload_ac_l); -if (ret <0 ) -return ret; - - ret =device_create_file (component->dev, &dev_attr_hpload_ac_r); -if (ret <0 ) + ret =sysfs_create_groups (&component->dev->kobj, hpload_groups); +if (ret)return ret; cs43130->wq =create_singlethread_workqueue ("cs43130_hp" ); +if (!cs43130->wq) { +sysfs_remove_groups (&component->dev->kobj, hpload_groups); +return -ENOMEM ; + }INIT_WORK (&cs43130->work, cs43130_imp_meas); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 160/252 Revert "media: dvb: Add check on sp8870_readreg"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
[ Upstream commit 47e4ff06fa7f5ba4860543a2913bbd0c164640aa ]
This reverts commit 467a37fba93f2b4fe3ab597ff6a517b22b566882.
Because of recent interactions with developers from @umn.edu, all commits from them have been recently re-reviewed to ensure if they were correct or not.
Upon review, this commit was found to be incorrect for the reasons below, so it must be reverted. It will be fixed up "correctly" in a later kernel change.
This commit is not properly checking for an error at all, so if a read succeeds from this device, it will error out.
--- drivers/media/dvb-frontends/sp8870.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/media/dvb-frontends/sp8870.c +1 -3
@@ -280,9 +280,7 @@ static int sp8870_set_frontend_parameters(struct dvb_frontend *fe)sp8870_writereg (state,0xc05 , reg0xc05);// read status reg in order to clear pending irqs - err =sp8870_readreg (state,0x200 ); -if (err) -return err; +sp8870_readreg (state,0x200 );// system controller start sp8870_microcontroller_start (state);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 161/252 media: dvb: Add check on sp8870_readreg return
In reply to Greg Kroah-HartmanFrom: Alaa Emad <[email protected]>
[ Upstream commit c6d822c56e7fd29e6fa1b1bb91b98f6a1e942b3c ]
The function sp8870_readreg returns a negative value when i2c_transfer fails so properly check for this and return the error if it happens.
--- drivers/media/dvb-frontends/sp8870.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/dvb-frontends/sp8870.c +3 -1
@@ -280,7 +280,9 @@ static int sp8870_set_frontend_parameters(struct dvb_frontend *fe)sp8870_writereg (state,0xc05 , reg0xc05);// read status reg in order to clear pending irqs -sp8870_readreg (state,0x200 ); + err =sp8870_readreg (state,0x200 ); +if (err <0 ) +return err;// system controller start sp8870_microcontroller_start (state);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 162/252 Revert "media: gspca: mt9m111: Check write_bridge for timeout"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
[ Upstream commit d8c3be2fb2079d0cb4cd29d6aba58dbe54771e42 ]
This reverts commit 656025850074f5c1ba2e05be37bda57ba2b8d491.
Because of recent interactions with developers from @umn.edu, all commits from them have been recently re-reviewed to ensure if they were correct or not.
Upon review, this commit was found to be incorrect for the reasons below, so it must be reverted. It will be fixed up "correctly" in a later kernel change.
Different error values should never be "OR" together and expect anything sane to come out of the result.
--- drivers/media/usb/gspca/m5602/m5602_mt9m111.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/media/usb/gspca/m5602/m5602_mt9m111.c +3 -5
@@ -195,7 +195,7 @@ static const struct v4l2_ctrl_config mt9m111_greenbal_cfg = {int mt9m111_probe (struct sd *sd) {u8 data[2 ] = {0x00 ,0x00 }; -int i, rc =0 ; +int i;struct gspca_dev *gspca_dev = (struct gspca_dev *)sd;if (force_sensor) {
@@ -213,18 +213,16 @@ int mt9m111_probe(struct sd *sd)/* Do the preinit */ for (i =0 ; i <ARRAY_SIZE (preinit_mt9m111); i++) {if (preinit_mt9m111[i][0 ] ==BRIDGE ) { - rc |=m5602_write_bridge (sd, +m5602_write_bridge (sd, preinit_mt9m111[i][1 ], preinit_mt9m111[i][2 ]); }else { data[0 ] = preinit_mt9m111[i][2 ]; data[1 ] = preinit_mt9m111[i][3 ]; - rc |=m5602_write_sensor (sd, +m5602_write_sensor (sd, preinit_mt9m111[i][1 ], data,2 ); } } -if (rc <0 ) -return rc;if (m5602_read_sensor (sd,MT9M111_SC_CHIPVER , data,2 ))return -ENODEV ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 163/252 media: gspca: mt9m111: Check write_bridge for timeout
In reply to Greg Kroah-HartmanFrom: Alaa Emad <[email protected]>
[ Upstream commit e932f5b458eee63d013578ea128b9ff8ef5f5496 ]
If m5602_write_bridge times out, it will return a negative error value. So properly check for this and handle the error correctly instead of just ignoring it.
--- drivers/media/usb/gspca/m5602/m5602_mt9m111.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/media/usb/gspca/m5602/m5602_mt9m111.c +8 -6
@@ -195,7 +195,7 @@ static const struct v4l2_ctrl_config mt9m111_greenbal_cfg = {int mt9m111_probe (struct sd *sd) {u8 data[2 ] = {0x00 ,0x00 }; -int i; +int i, err;struct gspca_dev *gspca_dev = (struct gspca_dev *)sd;if (force_sensor) {
@@ -213,15 +213,17 @@ int mt9m111_probe(struct sd *sd)/* Do the preinit */ for (i =0 ; i <ARRAY_SIZE (preinit_mt9m111); i++) {if (preinit_mt9m111[i][0 ] ==BRIDGE ) { -m5602_write_bridge (sd, - preinit_mt9m111[i][1 ], - preinit_mt9m111[i][2 ]); + err =m5602_write_bridge (sd, + preinit_mt9m111[i][1 ], + preinit_mt9m111[i][2 ]); }else { data[0 ] = preinit_mt9m111[i][2 ]; data[1 ] = preinit_mt9m111[i][3 ]; -m5602_write_sensor (sd, - preinit_mt9m111[i][1 ], data,2 ); + err =m5602_write_sensor (sd, + preinit_mt9m111[i][1 ], data,2 ); } +if (err <0 ) +return err; }if (m5602_read_sensor (sd,MT9M111_SC_CHIPVER , data,2 ))
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 164/252 Revert "media: gspca: Check the return value of write_bridge for timeout"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
[ Upstream commit 8e23e83c752b54e98102627a1cc09281ad71a299 ]
This reverts commit a21a0eb56b4e8fe4a330243af8030f890cde2283.
Because of recent interactions with developers from @umn.edu, all commits from them have been recently re-reviewed to ensure if they were correct or not.
Upon review, this commit was found to be incorrect for the reasons below, so it must be reverted. It will be fixed up "correctly" in a later kernel change.
Different error values should never be "OR" together and expect anything sane to come out of the result.
--- drivers/media/usb/gspca/m5602/m5602_po1030.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/media/usb/gspca/m5602/m5602_po1030.c +2 -6
@@ -154,7 +154,6 @@ static const struct v4l2_ctrl_config po1030_greenbal_cfg = {int po1030_probe (struct sd *sd) { -int rc =0 ;u8 dev_id_h =0 , i;struct gspca_dev *gspca_dev = (struct gspca_dev *)sd;
@@ -174,14 +173,11 @@ int po1030_probe(struct sd *sd)for (i =0 ; i <ARRAY_SIZE (preinit_po1030); i++) {u8 data = preinit_po1030[i][2 ];if (preinit_po1030[i][0 ] ==SENSOR ) - rc |=m5602_write_sensor (sd, +m5602_write_sensor (sd, preinit_po1030[i][1 ], &data,1 );else - rc |=m5602_write_bridge (sd, preinit_po1030[i][1 ], - data); +m5602_write_bridge (sd, preinit_po1030[i][1 ], data); } -if (rc <0 ) -return rc;if (m5602_read_sensor (sd,PO1030_DEVID_H , &dev_id_h,1 ))return -ENODEV ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 165/252 media: gspca: properly check for errors in po1030_probe()
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
[ Upstream commit dacb408ca6f0e34df22b40d8dd5fae7f8e777d84 ]
If m5602_write_sensor() or m5602_write_bridge() fail, do not continue to initialize the device but return the error to the calling funtion.
--- drivers/media/usb/gspca/m5602/m5602_po1030.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/media/usb/gspca/m5602/m5602_po1030.c +7 -3
@@ -155,6 +155,7 @@ static const struct v4l2_ctrl_config po1030_greenbal_cfg = {int po1030_probe (struct sd *sd) {u8 dev_id_h =0 , i; +int err;struct gspca_dev *gspca_dev = (struct gspca_dev *)sd;if (force_sensor) {
@@ -173,10 +174,13 @@ int po1030_probe(struct sd *sd)for (i =0 ; i <ARRAY_SIZE (preinit_po1030); i++) {u8 data = preinit_po1030[i][2 ];if (preinit_po1030[i][0 ] ==SENSOR ) -m5602_write_sensor (sd, - preinit_po1030[i][1 ], &data,1 ); + err =m5602_write_sensor (sd, preinit_po1030[i][1 ], + &data,1 );else -m5602_write_bridge (sd, preinit_po1030[i][1 ], data); + err =m5602_write_bridge (sd, preinit_po1030[i][1 ], + data); +if (err <0 ) +return err; }if (m5602_read_sensor (sd,PO1030_DEVID_H , &dev_id_h,1 ))
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 166/252 Revert "net: liquidio: fix a NULL pointer dereference"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
[ Upstream commit 4fd798a5a89114c1892574c50f2aebd49bc5b4f5 ]
This reverts commit fe543b2f174f34a7a751aa08b334fe6b105c4569.
Because of recent interactions with developers from @umn.edu, all commits from them have been recently re-reviewed to ensure if they were correct or not.
Upon review, this commit was found to be incorrect for the reasons below, so it must be reverted. It will be fixed up "correctly" in a later kernel change.
While the original commit does keep the immediate "NULL dereference" from happening, it does not properly propagate the error back to the callers, AND it does not fix this same identical issue in the drivers/net/ethernet/cavium/liquidio/lio_vf_main.c for some reason.
--- drivers/net/ethernet/cavium/liquidio/lio_main.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/net/ethernet/cavium/liquidio/lio_main.c +0 -5
@@ -1166,11 +1166,6 @@ static void send_rx_ctrl_cmd(struct lio *lio, int start_stop) sc = (struct octeon_soft_command *)octeon_alloc_soft_command (oct,OCTNET_CMD_SIZE ,16 ,0 ); -if (!sc) { -netif_info (lio, rx_err, lio->netdev, -"Failed to allocate octeon_soft_command\n" ); -return ; - } ncmd = (union octnet_cmd *)sc->virtdptr;
Signature · 1 line
2.30.2