5.4.189-rc1 review
Subsystems (8)
Greg Kroah-Hartman
maintainercover 5.4.189-rc1 review
This is the start of the stable review cycle for the 5.4.189 release. There are 475 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 16 Apr 2022 11:07:54 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.189-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.4.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.4.189-rc1
Mario Limonciello <[email protected]>
ACPI: processor idle: Check for architectural support for LPI
Mario Limonciello <[email protected]>
cpuidle: PSCI: Move the has_lpi check to the beginning of the function
Tejun Heo <[email protected]>
selftests: cgroup: Test open-time cgroup namespace usage for migration checks
Tejun Heo <[email protected]>
selftests: cgroup: Test open-time credential usage for migration checks
Tejun Heo <[email protected]>
selftests: cgroup: Make cg_create() use 0755 for permission instead of 0644
Tejun Heo <[email protected]>
cgroup: Use open-time cgroup namespace for process migration perm checks
Tejun Heo <[email protected]>
cgroup: Allocate cgroup_file_ctx for kernfs_open_file->priv
Tejun Heo <[email protected]>
cgroup: Use open-time credentials for process migraton perm checks
Pavel Begunkov <[email protected]>
io_uring: fix fs->users overflow
Nathan Chancellor <[email protected]>
drm/amdkfd: Fix -Wstrict-prototypes from amdgpu_amdkfd_gfx_10_0_get_functions()
Nathan Chancellor <[email protected]>
drm/amdkfd: add missing void argument to function kgd2kfd_init
Waiman Long <[email protected]>
mm/sparsemem: fix 'mem_section' will never be NULL gcc 12 warning
Fangrui Song <[email protected]>
arm64: module: remove (NOLOAD) from linker script
Peter Xu <[email protected]>
mm: don't skip swap entry even if zap_details specified
Yann Gautier <[email protected]>
mmc: mmci: stm32: correctly check all elements of sg list
Ludovic Barre <[email protected]>
mmc: mmci_sdmmc: Replace sg_dma_xxx macros
Vinod Koul <[email protected]>
dmaengine: Revert "dmaengine: shdma: Fix runtime PM imbalance on error"
Arnaldo Carvalho de Melo <[email protected]>
tools build: Use $(shell ) instead of `` to get embedded libperl's ccopts
Arnaldo Carvalho de Melo <[email protected]>
tools build: Filter out options and warnings not supported by clang
Marc Zyngier <[email protected]>
irqchip/gic-v3: Fix GICR_CTLR.RWP polling
Xiaomeng Tong <[email protected]>
perf: qcom_l2_pmu: fix an incorrect NULL check on list iterator
Christian Lamparter <[email protected]>
ata: sata_dwc_460ex: Fix crash due to OOB write
Guo Ren <[email protected]>
arm64: patch_text: Fixup last cpu should be master
Ethan Lien <[email protected]>
btrfs: fix qgroup reserve overflow the qgroup limit
Pawan Gupta <[email protected]>
x86/speculation: Restore speculation related MSRs during S3 resume
Pawan Gupta <[email protected]>
x86/pm: Save the MSR validity status at context setup
Miaohe Lin <[email protected]>
mm/mempolicy: fix mpol_new leak in shared_policy_replace
Paolo Bonzini <[email protected]>
mmmremap.c: avoid pointless invalidate_range_start/end on mremap(old_size=0)
Guo Xuenan <[email protected]>
lz4: fix LZ4_decompress_safe_partial read out of bound
Wolfram Sang <[email protected]>
mmc: renesas_sdhi: don't overwrite TAP settings when HS400 tuning is complete
Pali Rohár <[email protected]>
Revert "mmc: sdhci-xenon: fix annoying 1.8V regulator warning"
Denis Nikitin <[email protected]>
perf session: Remap buf if there is no space for event
Adrian Hunter <[email protected]>
perf tools: Fix perf's libperf_print callback
Trond Myklebust <[email protected]>
SUNRPC: Handle low memory situations in call_status()
Trond Myklebust <[email protected]>
SUNRPC: Handle ENOMEM in call_transmit_status()
Lv Yunlong <[email protected]>
drbd: Fix five use after free bugs in get_initial_state
Maxim Mikityanskiy <[email protected]>
bpf: Support dual-stack sockets in bpf_tcp_check_syncookie
Kamal Dasu <[email protected]>
spi: bcm-qspi: fix MSPI only access with bcm_qspi_exec_mem_op()
Jamie Bainbridge <[email protected]>
qede: confirm skb is allocated before using
Eric Dumazet <[email protected]>
rxrpc: fix a race in rxrpc_exit_net()
Ilya Maximets <[email protected]>
net: openvswitch: don't send internal clone attribute to the userspace.
David Ahern <[email protected]>
ipv6: Fix stats accounting in ip6_pkt_drop
Miaoqian Lin <[email protected]>
dpaa2-ptp: Fix refcount leak in dpaa2_ptp_probe
Niels Dossche <[email protected]>
IB/rdmavt: add lock to call to rvt_error_qp to prevent a race condition
Andy Gospodarek <[email protected]>
bnxt_en: reserve space inside receive page for skb_shared_info
José Expósito <[email protected]>
drm/imx: Fix memory leak in imx_pd_connector_get_modes
Chen-Yu Tsai <[email protected]>
net: stmmac: Fix unset max_speed difference between DT and non-DT platforms
Nikolay Aleksandrov <[email protected]>
net: ipv4: fix route with nexthop object delete warning
Ziyang Xuan <[email protected]>
net/tls: fix slab-out-of-bounds bug in decrypt_internal
Christophe JAILLET <[email protected]>
scsi: zorro7xx: Fix a resource leak in zorro7xx_remove_one()
Guilherme G. Piccoli <[email protected]>
Drivers: hv: vmbus: Fix potential crash on module unload
Dan Carpenter <[email protected]>
drm/amdgpu: fix off by one in amdgpu_gfx_kiq_acquire()
James Morse <[email protected]>
KVM: arm64: Check arm64_get_bp_hardening_data() didn't return NULL
Mauricio Faria de Oliveira <[email protected]>
mm: fix race between MADV_FREE reclaim and blkdev direct IO read
John David Anglin <[email protected]>
parisc: Fix patch code locking and flushing
Helge Deller <[email protected]>
parisc: Fix CPU affinity for Lasi, WAX and Dino chips
Trond Myklebust <[email protected]>
SUNRPC: Fix socket waits for write buffer space
Haimin Zhang <[email protected]>
jfs: prevent NULL deref in diFree
Randy Dunlap <[email protected]>
virtio_console: eliminate anonymous module_init & module_exit
Jiri Slaby <[email protected]>
serial: samsung_tty: do not unlock port->lock for uart_write_wakeup()
NeilBrown <[email protected]>
NFS: swap-out must always use STABLE writes.
NeilBrown <[email protected]>
NFS: swap IO handling is slightly different for O_DIRECT IO
NeilBrown <[email protected]>
SUNRPC/call_alloc: async tasks mustn't block waiting for memory
Maxime Ripard <[email protected]>
clk: Enforce that disjoints limits are invalid
Dongli Zhang <[email protected]>
xen: delay xen_hvm_init_time_ops() if kdump is boot on vcpu>=32
Trond Myklebust <[email protected]>
NFSv4: Protect the state recovery thread against direct reclaim
Lucas Denefle <[email protected]>
w1: w1_therm: fixes w1_seq for ds28ea00 sensors
Adam Wujek <[email protected]>
clk: si5341: fix reported clk_rate when output divider is 2
Qinghua Jin <[email protected]>
minix: fix bug when opening a file with O_DIRECT
Randy Dunlap <[email protected]>
init/main.c: return 1 from handled __setup() functions
Wang Yufen <[email protected]>
netlabel: fix out-of-bounds memory accesses
Luiz Augusto von Dentz <[email protected]>
Bluetooth: Fix use after free in hci_send_acl
Max Filippov <[email protected]>
xtensa: fix DTC warning unit_address_format
H. Nikolaus Schaller <[email protected]>
usb: dwc3: omap: fix "unbalanced disables for smps10_out1" on omap5evm
Jianglei Nie <[email protected]>
scsi: libfc: Fix use after free in fc_exch_abts_resp()
Alexander Lobakin <[email protected]>
MIPS: fix fortify panic when copying asm exception handlers
Michael Chan <[email protected]>
bnxt_en: Eliminate unintended link toggle during FW reset
Harold Huang <[email protected]>
tuntap: add sanity checks about msg_controllen in sendmsg
Sven Eckelmann <[email protected]>
macvtap: advertise link netns via netlink
Hangyu Hua <[email protected]>
mips: ralink: fix a refcount leak in ill_acc_of_setup()
Dust Li <[email protected]>
net/smc: correct settings of RMB window update limit
Randy Dunlap <[email protected]>
scsi: aha152x: Fix aha152x_setup() __setup handler return value
Damien Le Moal <[email protected]>
scsi: pm8001: Fix pm8001_mpi_task_abort_resp()
Alex Deucher <[email protected]>
drm/amdkfd: make CRAT table missing message informational only
Jordy Zomer <[email protected]>
dm ioctl: prevent potential spectre v1 gadget
Ido Schimmel <[email protected]>
ipv4: Invalidate neighbour for broadcast address upon address addition
Hans de Goede <[email protected]>
power: supply: axp288-charger: Set Vhold to 4.4V
Manivannan Sadhasivam <[email protected]>
PCI: pciehp: Add Qualcomm quirk for Command Completed erratum
Neal Liu <[email protected]>
usb: ehci: add pci device support for Aspeed platforms
Zhou Guanghui <[email protected]>
iommu/arm-smmu-v3: fix event handling soft lockup
Pali Rohár <[email protected]>
PCI: aardvark: Fix support for MSI interrupts
Rajneesh Bhardwaj <[email protected]>
drm/amdgpu: Fix recursive locking warning
Sourabh Jain <[email protected]>
powerpc: Set crashkernel offset to mid of RMA region
Eric Dumazet <[email protected]>
ipv6: make mc_forwarding atomic
Evgeny Boger <[email protected]>
power: supply: axp20x_battery: properly report current when discharging
Yang Guang <[email protected]>
scsi: bfa: Replace snprintf() with sysfs_emit()
Yang Guang <[email protected]>
scsi: mvsas: Replace snprintf() with sysfs_emit()
Jakub Sitnicki <[email protected]>
bpf: Make dst_port field in struct bpf_sock 16-bit wide
Maxim Kiselev <[email protected]>
powerpc: dts: t104xrdb: fix phy type for FMAN 4/5
Yang Guang <[email protected]>
ptp: replace snprintf with sysfs_emit
Xin Xiong <[email protected]>
drm/amd/amdgpu/amdgpu_cs: fix refcount leak of a dma_fence obj
Zekun Shen <[email protected]>
ath5k: fix OOB in ath5k_eeprom_read_pcal_info_5111
Anisse Astier <[email protected]>
drm: Add orientation quirk for GPD Win Max
Jim Mattson <[email protected]>
KVM: x86/svm: Clear reserved bits written to PerfEvtSeln MSRs
Randy Dunlap <[email protected]>
ARM: 9187/1: JIVE: fix return value of __setup handler
Fangrui Song <[email protected]>
riscv module: remove (NOLOAD)
Jiasheng Jiang <[email protected]>
rtc: wm8350: Handle error for wm8350_register_irq
Zhihao Cheng <[email protected]>
ubifs: Rectify space amount budget for mkdir/tmpfile operations
Vitaly Kuznetsov <[email protected]>
KVM: x86: Forbid VMM to set SYNIC/STIMER MSRs when SynIC wasn't activated
Paolo Bonzini <[email protected]>
KVM: x86/mmu: do compare-and-exchange of gPTE via the user address
Martin Varghese <[email protected]>
openvswitch: Fixed nd target mask field in the flow dump.
Anton Ivanov <[email protected]>
um: Fix uml_mconsole stop/go
Kuldeep Singh <[email protected]>
ARM: dts: spear13xx: Update SPI dma properties
Kuldeep Singh <[email protected]>
ARM: dts: spear1340: Update serial node properties
Amadeusz Sławiński <[email protected]>
ASoC: topology: Allow TLV control to be either read or write
Zhihao Cheng <[email protected]>
ubi: fastmap: Return error code if memory allocation fails in add_aeb()
Miquel Raynal <[email protected]>
dt-bindings: spi: mxic: The interrupt property is not mandatory
Miquel Raynal <[email protected]>
dt-bindings: mtd: nand-controller: Fix a comment in the examples
Miquel Raynal <[email protected]>
dt-bindings: mtd: nand-controller: Fix the reg property description
Hengqi Chen <[email protected]>
bpf: Fix comment for helper bpf_current_task_under_cgroup()
Randy Dunlap <[email protected]>
mm/usercopy: return 1 from hardened_usercopy __setup() handler
Randy Dunlap <[email protected]>
mm/memcontrol: return 1 from cgroup.memory __setup() handler
Randy Dunlap <[email protected]>
mm/mmap: return 1 from stack_guard_gap __setup() handler
Jiasheng Jiang <[email protected]>
ASoC: soc-compress: Change the check for codec_dai
Chen Jingwen <[email protected]>
powerpc/kasan: Fix early region not updated correctly
Rafael J. Wysocki <[email protected]>
ACPI: CPPC: Avoid out of bounds access when parsing _CPC data
Arnd Bergmann <[email protected]>
ARM: iop32x: offset IRQ numbers by 1
Baokun Li <[email protected]>
ubi: Fix race condition between ctrl_cdev_ioctl and ubi_cdev_ioctl
Jiaxin Yu <[email protected]>
ASoC: mediatek: mt6358: add missing EXPORT_SYMBOLs
Jonathan Neuschäfer <[email protected]>
pinctrl: nuvoton: npcm7xx: Use %zu printk format for ARRAY_SIZE()
Jonathan Neuschäfer <[email protected]>
pinctrl: nuvoton: npcm7xx: Rename DS() macro to DSTR()
Chen-Yu Tsai <[email protected]>
pinctrl: pinconf-generic: Print arguments for bias-pull-*
Guangbin Huang <[email protected]>
net: hns3: fix software vlan talbe of vlan 0 inconsistent with hardware
Andrew Price <[email protected]>
gfs2: Make sure FITRIM minlen is rounded up to fs block size
Tom Rix <[email protected]>
rtc: check if __rtc_read_time was successful
Matthew Wilcox (Oracle) <[email protected]>
XArray: Update the LRU list in xas_split()
Pavel Skripkin <[email protected]>
can: mcba_usb: properly check endpoint type
Hangyu Hua <[email protected]>
can: mcba_usb: mcba_usb_start_xmit(): fix double dev_kfree_skb in error path
Matthew Wilcox (Oracle) <[email protected]>
XArray: Fix xas_create_range() when multi-order entry present
Baokun Li <[email protected]>
ubifs: rename_whiteout: correct old_dir size computing
Zhihao Cheng <[email protected]>
ubifs: Fix read out-of-bounds in ubifs_wbuf_write_nolock()
Zhihao Cheng <[email protected]>
ubifs: setflags: Make dirtied_ino_d 8 bytes aligned
Zhihao Cheng <[email protected]>
ubifs: Add missing iput if do_tmpfile() failed in rename whiteout
Zhihao Cheng <[email protected]>
ubifs: Fix deadlock in concurrent rename whiteout and inode writeback
Zhihao Cheng <[email protected]>
ubifs: rename_whiteout: Fix double free for whiteout_ui->data
Ammar Faizi <[email protected]>
ASoC: SOF: Intel: Fix NULL ptr dereference when ENOMEM
Li RongQing <[email protected]>
KVM: x86: fix sending PV IPI
David Matlack <[email protected]>
KVM: Prevent module exit until all VMs are freed
Manish Rangankar <[email protected]>
scsi: qla2xxx: Use correct feature type field during RFF_ID processing
Quinn Tran <[email protected]>
scsi: qla2xxx: Reduce false trigger to login
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix N2N inconsistent PLOGI
Arun Easi <[email protected]>
scsi: qla2xxx: Fix missed DMA unmap for NVMe ls requests
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix hang due to session stuck
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix incorrect reporting of task management failure
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix disk failure to rediscover
Saurav Kashyap <[email protected]>
scsi: qla2xxx: Suppress a kernel complaint in qla_create_qpair()
Joe Carnuccio <[email protected]>
scsi: qla2xxx: Check for firmware dump already collected
Joe Carnuccio <[email protected]>
scsi: qla2xxx: Add devids and conditionals for 28xx
Arun Easi <[email protected]>
scsi: qla2xxx: Fix device reconnect in loop topology
Nilesh Javali <[email protected]>
scsi: qla2xxx: Fix warning for missing error code
Bikash Hazarika <[email protected]>
scsi: qla2xxx: Fix wrong FDMI data for 64G adapter
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix stuck session in gpdb
Anders Roxell <[email protected]>
powerpc: Fix build errors with newer binutils
Anders Roxell <[email protected]>
powerpc/lib/sstep: Fix build errors with newer binutils
Anders Roxell <[email protected]>
powerpc/lib/sstep: Fix 'sthcx' instruction
Matt Kramer <[email protected]>
ALSA: hda/realtek: Add alc256-samsung-headphone fixup
Ulf Hansson <[email protected]>
mmc: host: Return an error when ->enable_sdio_irq() ops is missing
Dongliang Mu <[email protected]>
media: hdpvr: initialize dev->worker at hdpvr_register_videodev
Pavel Skripkin <[email protected]>
media: Revert "media: em28xx: add missing em28xx_close_extension"
Zheyu Ma <[email protected]>
video: fbdev: sm712fb: Fix crash in smtcfb_write()
Uwe Kleine-König <[email protected]>
ARM: mmp: Fix failure to remove sram device
Richard Leitner <[email protected]>
ARM: tegra: tamonten: Fix I2C3 pad setting
Daniel González Cabanelas <[email protected]>
media: cx88-mpeg: clear interrupt status register before streaming video
Shengjiu Wang <[email protected]>
ASoC: soc-core: skip zero num_dai component in searching dai name
Jing Yao <[email protected]>
video: fbdev: udlfb: replace snprintf in show functions with sysfs_emit
Jing Yao <[email protected]>
video: fbdev: omapfb: panel-tpo-td043mtea1: Use sysfs_emit() instead of snprintf()
Jing Yao <[email protected]>
video: fbdev: omapfb: panel-dsi-cm: Use sysfs_emit() instead of snprintf()
Ard Biesheuvel <[email protected]>
ARM: ftrace: avoid redundant loads or clobbering IP
Charles Keepax <[email protected]>
ASoC: madera: Add dependencies on MFD
Richard Schleich <[email protected]>
ARM: dts: bcm2837: Add the missing L1/L2 cache information
David Heidelberg <[email protected]>
ARM: dts: qcom: fix gic_irq_domain_translate warnings for msm8960
Yang Guang <[email protected]>
video: fbdev: omapfb: acx565akm: replace snprintf with sysfs_emit
George Kennedy <[email protected]>
video: fbdev: cirrusfb: check pixclock to avoid divide by zero
Evgeny Novikov <[email protected]>
video: fbdev: w100fb: Reset global state
Tim Gardner <[email protected]>
video: fbdev: nvidiafb: Use strscpy() to prevent buffer overflow
Dongliang Mu <[email protected]>
ntfs: add sanity check on allocation size
Theodore Ts'o <[email protected]>
ext4: don't BUG if someone dirty pages without asking ext4 first
Minghao Chi <[email protected]>
spi: tegra20: Use of_device_get_match_data()
Dmitry Baryshkov <[email protected]>
PM: core: keep irq flags in device_pm_check_callbacks()
Darren Hart <[email protected]>
ACPI/APEI: Limit printable size of BERT table data
Paolo Valente <[email protected]>
Revert "Revert "block, bfq: honor already-setup queue merges""
Paul Menzel <[email protected]>
lib/raid6/test/Makefile: Use $(pound) instead of \# for Make 4.3
Rafael J. Wysocki <[email protected]>
ACPICA: Avoid walking the ACPI Namespace if it is not there
Zhang Wensheng <[email protected]>
bfq: fix use-after-free in bfq_dispatch_request
Souptick Joarder (HPE) <[email protected]>
irqchip/nvic: Release nvic_base upon failure
Marc Zyngier <[email protected]>
irqchip/qcom-pdc: Fix broken locking
Casey Schaufler <[email protected]>
Fix incorrect type in assignment of ipv6 port for audit
Chaitanya Kulkarni <[email protected]>
loop: use sysfs_emit() in the sysfs xxx show()
Christian Göttsche <[email protected]>
selinux: use correct type for context length
Yu Kuai <[email protected]>
block, bfq: don't move oom_bfqq
Marc Zyngier <[email protected]>
pinctrl: npcm: Fix broken references to chip->parent_device
Kees Cook <[email protected]>
gcc-plugins/stackleak: Exactly match strings instead of prefixes
Casey Schaufler <[email protected]>
LSM: general protection fault in legacy_parse_param
Dan Carpenter <[email protected]>
lib/test: use after free in register_test_dev_kmod()
Xiaomeng Tong <[email protected]>
net: dsa: bcm_sf2_cfp: fix an incorrect NULL check on list iterator
Trond Myklebust <[email protected]>
NFSv4/pNFS: Fix another issue with a list iterator pointing to the head
Duoming Zhou <[email protected]>
net/x25: Fix null-ptr-deref caused by x25_disconnect
Tom Rix <[email protected]>
qlcnic: dcb: default to returning -EOPNOTSUPP
Ido Schimmel <[email protected]>
selftests: test_vxlan_under_vrf: Fix broken test case
Florian Fainelli <[email protected]>
net: phy: broadcom: Fix brcm_fet_config_init()
Juergen Gross <[email protected]>
xen: fix is_xen_pmu()
Maxime Ripard <[email protected]>
clk: Initialize orphan req_rate
Konrad Dybcio <[email protected]>
clk: qcom: gcc-msm8994: Fix gpll4 width
Olga Kornievskaia <[email protected]>
NFSv4.1: don't retry BIND_CONN_TO_SESSION on session error
Pablo Neira Ayuso <[email protected]>
netfilter: nf_conntrack_tcp: preserve liberal flag in tcp options
Pavel Skripkin <[email protected]>
jfs: fix divide error in dbNextAG
Randy Dunlap <[email protected]>
driver core: dd: fix return value of __setup handler
David Gow <[email protected]>
firmware: google: Properly state IOMEM dependency
Randy Dunlap <[email protected]>
kgdbts: fix return value of __setup handler
Randy Dunlap <[email protected]>
kgdboc: fix return value of __setup handler
Randy Dunlap <[email protected]>
tty: hvc: fix return value of __setup handler
Miaoqian Lin <[email protected]>
pinctrl/rockchip: Add missing of_node_put() in rockchip_pinctrl_probe
Miaoqian Lin <[email protected]>
pinctrl: nomadik: Add missing of_node_put() in nmk_pinctrl_probe
Chen-Yu Tsai <[email protected]>
pinctrl: mediatek: paris: Fix pingroup pin config state readback
Chen-Yu Tsai <[email protected]>
pinctrl: mediatek: paris: Fix "argument" argument type for mtk_pinconf_get()
Miaoqian Lin <[email protected]>
pinctrl: mediatek: Fix missing of_node_put() in mtk_pctrl_init
Arınç ÜNAL <[email protected]>
staging: mt7621-dts: fix LEDs and pinctrl on GB-PC1 devicetree
Alexey Khoroshilov <[email protected]>
NFS: remove unneeded check in decode_devicenotify_args()
Miaoqian Lin <[email protected]>
clk: tegra: tegra124-emc: Fix missing put_device() call in emc_ensure_emc_driver
Jonathan Neuschäfer <[email protected]>
clk: clps711x: Terminate clk_div_table with sentinel element
Jonathan Neuschäfer <[email protected]>
clk: loongson1: Terminate clk_div_table with sentinel element
Jonathan Neuschäfer <[email protected]>
clk: actions: Terminate clk_div_table with sentinel element
Miaoqian Lin <[email protected]>
remoteproc: qcom_wcnss: Add missing of_node_put() in wcnss_alloc_memory_region
Miaoqian Lin <[email protected]>
remoteproc: qcom: Fix missing of_node_put in adsp_alloc_memory_region
Taniya Das <[email protected]>
clk: qcom: clk-rcg2: Update the frac table for pixel clock
Taniya Das <[email protected]>
clk: qcom: clk-rcg2: Update logic to calculate D value for RCG
Abel Vesa <[email protected]>
clk: imx7d: Remove audio_mclk_root_clk
Randy Dunlap <[email protected]>
dma-debug: fix return value of __setup handlers
Trond Myklebust <[email protected]>
NFS: Return valid errors from nfs2/3_decode_dirent()
Jiasheng Jiang <[email protected]>
iio: adc: Add check for devm_request_threaded_irq
Uwe Kleine-König <[email protected]>
serial: 8250: Fix race condition in RTS-after-send handling
Andy Shevchenko <[email protected]>
serial: 8250_mid: Balance reference count for PCI DMA device
Liu Ying <[email protected]>
phy: dphy: Correct lpx parameter and its derivatives(ta_{get,go,sure})
Dirk Buchwalder <[email protected]>
clk: qcom: ipq8074: Use floor ops for SDCC1 clock
Geert Uytterhoeven <[email protected]>
pinctrl: renesas: r8a77470: Reduce size for narrow VIN1 channel
Jonathan Cameron <[email protected]>
staging:iio:adc:ad7280a: Fix handing of device address bit reversing.
Christophe JAILLET <[email protected]>
misc: alcor_pci: Fix an error handling path
Uwe Kleine-König <[email protected]>
pwm: lpc18xx-sct: Initialize driver data and hardware before pwmchip_add()
Jiri Slaby <[email protected]>
mxser: fix xmit_buf leak in activate when LSR == 0xff
Miaoqian Lin <[email protected]>
mfd: asic3: Add missing iounmap() on error asic3_mfd_probe
Hoang Le <[email protected]>
tipc: fix the timer expires after interval 100ms
Aaron Conole <[email protected]>
openvswitch: always update flow key after nat
Jakub Kicinski <[email protected]>
tcp: ensure PMTU updates are processed during fastopen
Jeremy Linton <[email protected]>
net: bcmgenet: Use stronger register read/writes to assure ordering
Hangbin Liu <[email protected]>
selftests/bpf/test_lirc_mode2.sh: Exit with proper code
Peter Rosin <[email protected]>
i2c: mux: demux-pinctrl: do not deactivate a master that is not active
Petr Machata <[email protected]>
af_netlink: Fix shift out of bounds in group mask calculation
Yake Yang <[email protected]>
Bluetooth: btmtksdio: Fix kernel oops in btmtksdio_interrupt
Dan Carpenter <[email protected]>
USB: storage: ums-realtek: fix error code in rts51x_read_mem()
Wang Yufen <[email protected]>
bpf, sockmap: Fix double uncharge the mem of sk_msg
Wang Yufen <[email protected]>
bpf, sockmap: Fix more uncharged while msg has more_data
Wang Yufen <[email protected]>
bpf, sockmap: Fix memleak in tcp_bpf_sendmsg while sk msg is full
Yongzhi Liu <[email protected]>
RDMA/mlx5: Fix memory leak in error flow for subscribe event routine
Xin Xiong <[email protected]>
mtd: rawnand: atmel: fix refcount issue in atmel_nand_controller_init
Randy Dunlap <[email protected]>
MIPS: RB532: fix return value of __setup handler
Oliver Hartkopp <[email protected]>
vxcan: enable local echo for sent CAN frames
Hangyu Hua <[email protected]>
powerpc: 8xx: fix a return value error in mpc8xx_pic_init
Felix Maurer <[email protected]>
selftests/bpf: Make test_lwt_ip_encap more stable and faster
Jiasheng Jiang <[email protected]>
mfd: mc13xxx: Add check for mc13xxx_irq_request
Jakob Koschel <[email protected]>
powerpc/sysdev: fix incorrect use to determine if list is empty
Randy Dunlap <[email protected]>
mips: DEC: honor CONFIG_MIPS_FP_SUPPORT=n
Mark Tomlinson <[email protected]>
PCI: Reduce warnings on possible RW1C corruption
Jiasheng Jiang <[email protected]>
power: supply: wm8350-power: Add missing free in free_charger_irq
Jiasheng Jiang <[email protected]>
power: supply: wm8350-power: Handle error for wm8350_register_irq
Robert Hancock <[email protected]>
i2c: xiic: Make bus names unique
Anssi Hannula <[email protected]>
hv_balloon: rate-limit "Unhandled message" warning
Hou Wenlong <[email protected]>
KVM: x86/emulator: Defer not-present segment check in __load_segment_descriptor()
Zhenzhong Duan <[email protected]>
KVM: x86: Fix emulation in writing cr8
Michael Ellerman <[email protected]>
powerpc/Makefile: Don't pass -mcpu=powerpc64 when building 32-bit
Xu Kuohai <[email protected]>
libbpf: Skip forward declaration when counting duplicated type names
Hou Tao <[email protected]>
bpf, arm64: Feed byte-offset into bpf line info
Hou Tao <[email protected]>
bpf, arm64: Call build_prologue() first in first JIT pass
Nishanth Menon <[email protected]>
drm/bridge: cdns-dsi: Make sure to to create proper aliases for dt
Xiang Chen <[email protected]>
scsi: hisi_sas: Change permission of parameter prot_mask
Hans de Goede <[email protected]>
power: supply: bq24190_charger: Fix bq24190_vbus_is_enabled() wrong false return
Miaoqian Lin <[email protected]>
drm/tegra: Fix reference leak in tegra_dsi_ganged_probe
Zhang Yi <[email protected]>
ext2: correct max file size computing
Randy Dunlap <[email protected]>
TOMOYO: fix __setup handlers return values
Maíra Canal <[email protected]>
drm/amd/display: Remove vupdate_int_entry definition
Damien Le Moal <[email protected]>
scsi: pm8001: Fix abort all task initialization
Damien Le Moal <[email protected]>
scsi: pm8001: Fix payload initialization in pm80xx_set_thermal_config()
Damien Le Moal <[email protected]>
scsi: pm8001: Fix command initialization in pm8001_chip_ssp_tm_req()
Damien Le Moal <[email protected]>
scsi: pm8001: Fix command initialization in pm80XX_send_read_log()
Aashish Sharma <[email protected]>
dm crypt: fix get_key_size compiler warning if !CONFIG_KEYS
Dan Carpenter <[email protected]>
iwlwifi: mvm: Fix an error code in iwl_mvm_up()
Colin Ian King <[email protected]>
iwlwifi: Fix -EIO error code that is never returned
Tong Zhang <[email protected]>
dax: make sure inodes are flushed before destroy cache
Håkon Bugge <[email protected]>
IB/cma: Allow XRC INI QPs to set their local ACK timeout
Roman Li <[email protected]>
drm/amd/display: Add affected crtcs to atomic state for dsc mst unplug
Jiasheng Jiang <[email protected]>
iommu/ipmmu-vmsa: Check for error num after setting mask
Dmitry Torokhov <[email protected]>
HID: i2c-hid: fix GET/SET_REPORT for unnumbered reports
Miaoqian Lin <[email protected]>
power: supply: ab8500: Fix memory leak in ab8500_fg_sysfs_init
Pali Rohár <[email protected]>
PCI: aardvark: Fix reading PCI_EXP_RTSTA_PME bit on emulated bridge
Tobias Waldekranz <[email protected]>
net: dsa: mv88e6xxx: Enable port policy support on 6097
Lorenzo Bianconi <[email protected]>
mt76: mt7615: check sta_rates pointer in mt7615_sta_rate_tbl_update
Lorenzo Bianconi <[email protected]>
mt76: mt7603: check sta_rates pointer in mt7603_sta_rate_tbl_update
Athira Rajeev <[email protected]>
powerpc/perf: Don't use perf_hw_context for trace IMC PMU
Jiasheng Jiang <[email protected]>
ray_cs: Check ioremap return value
Miaoqian Lin <[email protected]>
power: reset: gemini-poweroff: Fix IRQ check in gemini_poweroff_probe
Alexander Lobakin <[email protected]>
i40e: don't reserve excessive XDP_PACKET_HEADROOM on XSK Rx to skb
Fabiano Rosas <[email protected]>
KVM: PPC: Fix vmx/vsx mixup in mmio emulation
Pavel Skripkin <[email protected]>
ath9k_htc: fix uninit value bugs
Zhou Qingyang <[email protected]>
drm/amd/display: Fix a NULL pointer dereference in amdgpu_dm_connector_add_common_modes()
Maxime Ripard <[email protected]>
drm/edid: Don't clear formats if using deep color
Dario Binacchi <[email protected]>
mtd: rawnand: gpmi: fix controller timings setting
Jiasheng Jiang <[email protected]>
mtd: onenand: Check for error irq
Pavel Skripkin <[email protected]>
Bluetooth: hci_serdev: call init_rwsem() before p->open()
Pavel Skripkin <[email protected]>
udmabuf: validate ubuf->pagecount
Wen Gong <[email protected]>
ath10k: fix memory overwrite of the WoWLAN wakeup packet pattern
Miaoqian Lin <[email protected]>
drm/bridge: Add missing pm_runtime_disable() in __dw_mipi_dsi_probe
Miaoqian Lin <[email protected]>
drm/bridge: Fix free wrong object in sii8620_init_rcp_input_dev
Miaoqian Lin <[email protected]>
ASoC: msm8916-wcd-analog: Fix error handling in pm8916_wcd_analog_spmi_probe
Jiasheng Jiang <[email protected]>
mmc: davinci_mmc: Handle error for clk_enable
Miaoqian Lin <[email protected]>
ASoC: msm8916-wcd-digital: Fix missing clk_disable_unprepare() in msm8916_wcd_digital_probe
Wang Wensheng <[email protected]>
ASoC: imx-es8328: Fix error return code in imx_es8328_probe()
Miaoqian Lin <[email protected]>
ASoC: mxs: Fix error handling in mxs_sgtl5000_probe
Codrin Ciubotariu <[email protected]>
ASoC: dmaengine: do not use a NULL prepare_slave_config() callback
Hans Verkuil <[email protected]>
ivtv: fix incorrect device_caps for ivtvfb
Miaoqian Lin <[email protected]>
video: fbdev: omapfb: Add missing of_node_put() in dvic_probe_of
Jiasheng Jiang <[email protected]>
ASoC: fsi: Add check for clk_enable
Jiasheng Jiang <[email protected]>
ASoC: wm8350: Handle error for wm8350_register_irq
Miaoqian Lin <[email protected]>
ASoC: atmel: Add missing of_node_put() in at91sam9g20ek_audio_probe
Dafna Hirschfeld <[email protected]>
media: stk1160: If start stream fails, return buffers with VB2_BUF_STATE_QUEUED
Rob Herring <[email protected]>
arm64: dts: rockchip: Fix SDIO regulator supply properties on rk3399-firefly
Takashi Sakamoto <[email protected]>
ALSA: firewire-lib: fix uninitialized flag for AV/C deferred transaction
Jia-Ju Bai <[email protected]>
memory: emif: check the pointer temp in get_device_details()
Jiasheng Jiang <[email protected]>
memory: emif: Add check for setup_interrupts
Jiasheng Jiang <[email protected]>
ASoC: soc-compress: prevent the potentially use of null pointer
Jiasheng Jiang <[email protected]>
ASoC: atmel_ssc_dai: Handle errors for clk_enable
Jiasheng Jiang <[email protected]>
ASoC: mxs-saif: Handle errors for clk_enable
Randy Dunlap <[email protected]>
printk: fix return value of printk.devkmsg __setup handler
Frank Wunderlich <[email protected]>
arm64: dts: broadcom: Fix sata nodename
Kuldeep Singh <[email protected]>
arm64: dts: ns2: Fix spi-cpol and spi-cpha property
Jiasheng Jiang <[email protected]>
ALSA: spi: Add check for clk_enable()
Jiasheng Jiang <[email protected]>
ASoC: ti: davinci-i2s: Add check for clk_enable()
Jia-Ju Bai <[email protected]>
ASoC: rt5663: check the return value of devm_kzalloc() in rt5663_parse_dp()
Arnd Bergmann <[email protected]>
uaccess: fix nios2 and microblaze get_user_8()
Dan Carpenter <[email protected]>
media: usb: go7007: s2250-board: fix leak in probe()
Dongliang Mu <[email protected]>
media: em28xx: initialize refcount before kref_get
Tom Rix <[email protected]>
media: video/hdmi: handle short reads of hdmi info frame.
Marek Vasut <[email protected]>
ARM: dts: imx: Add missing LVDS decoder on M53Menlo
Miaoqian Lin <[email protected]>
soc: ti: wkup_m3_ipc: Fix IRQ check in wkup_m3_ipc_probe
Maulik Shah <[email protected]>
arm64: dts: qcom: sm8150: Correct TCS configuration for apps rsc
Daniel Thompson <[email protected]>
soc: qcom: aoss: remove spurious IRQF_ONESHOT flags
Jiasheng Jiang <[email protected]>
soc: qcom: rpmpd: Check for null return of devm_kcalloc
Pavel Kubelun <[email protected]>
ARM: dts: qcom: ipq4019: fix sleep clock
Dan Carpenter <[email protected]>
video: fbdev: fbcvt.c: fix printing in fb_cvt_print_name()
Dan Carpenter <[email protected]>
video: fbdev: atmel_lcdfb: fix an error code in atmel_lcdfb_probe()
Wang Hai <[email protected]>
video: fbdev: smscufx: Fix null-ptr-deref in ufx_usb_probe()
Jammy Huang <[email protected]>
media: aspeed: Correct value for h-total-pixels
Chen-Yu Tsai <[email protected]>
media: hantro: Fix overfill bottom register field name
Miaoqian Lin <[email protected]>
media: coda: Fix missing put_device() call in coda_get_vdoa_data
Ondrej Zary <[email protected]>
media: bttv: fix WARNING regression on tunerless devices
Chao Yu <[email protected]>
f2fs: fix to avoid potential deadlock
Jaegeuk Kim <[email protected]>
f2fs: fix missing free nid in f2fs_handle_failed_inode
Adrian Hunter <[email protected]>
perf/x86/intel/pt: Fix address filter config for 32-bit kernel
Adrian Hunter <[email protected]>
perf/core: Fix address filter parser for multiple filters
Bharata B Rao <[email protected]>
sched/debug: Remove mpol_get/put and task_lock/unlock from sched_show_numa
Randy Dunlap <[email protected]>
clocksource: acpi_pm: fix return value of __setup handler
Brandon Wyman <[email protected]>
hwmon: (pmbus) Add Vin unit off handling
Dāvis Mosāns <[email protected]>
crypto: ccp - ccp_dmaengine_unregister release dma channels
Randy Dunlap <[email protected]>
ACPI: APEI: fix return value of __setup handlers
Guillaume Ranquet <[email protected]>
clocksource/drivers/timer-of: Check return value of of_iomap in timer_of_base_init()
Petr Vorel <[email protected]>
crypto: vmx - add missing dependencies
Claudiu Beznea <[email protected]>
hwrng: atmel - disable trng on failure path
Randy Dunlap <[email protected]>
PM: suspend: fix return value of __setup handler
Randy Dunlap <[email protected]>
PM: hibernate: fix __setup handler error handling
Eric Biggers <[email protected]>
block: don't delete queue kobject before its children
Armin Wolf <[email protected]>
hwmon: (sch56xx-common) Replace WDOG_ACTIVE with WDOG_HW_RUNNING
Patrick Rudolph <[email protected]>
hwmon: (pmbus) Add mutex to regulator ops
Andy Shevchenko <[email protected]>
spi: pxa2xx-pci: Balance reference count for PCI DMA device
Gilad Ben-Yossef <[email protected]>
crypto: ccree - don't attempt 0 len DMA mappings
Richard Guy Briggs <[email protected]>
audit: log AUDIT_TIME_* records only from rules
Muhammad Usama Anjum <[email protected]>
selftests/x86: Add validity check and allow field splitting
Miaoqian Lin <[email protected]>
spi: tegra114: Add missing IRQ check in tegra_spi_probe
Tomas Paukrt <[email protected]>
crypto: mxs-dcp - Fix scatterlist processing
Herbert Xu <[email protected]>
crypto: authenc - Fix sleep in atomic context in decrypt_tail
kernel test robot <[email protected]>
regulator: qcom_smd: fix for_each_child.cocci warnings
Liguang Zhang <[email protected]>
PCI: pciehp: Clear cmd_busy bit in polling mode
Hector Martin <[email protected]>
brcmfmac: pcie: Fix crashes due to early IRQs
Hector Martin <[email protected]>
brcmfmac: pcie: Replace brcmf_pcie_copy_mem_todev with memcpy_toio
Hector Martin <[email protected]>
brcmfmac: pcie: Release firmwares in the brcmf_pcie_setup error path
Hector Martin <[email protected]>
brcmfmac: firmware: Allocate space for default boardrev in nvram
Max Filippov <[email protected]>
xtensa: fix xtensa_wsr always writing 0
Max Filippov <[email protected]>
xtensa: fix stop_machine_cpuslocked call in patch_text
Johan Hovold <[email protected]>
media: davinci: vpif: fix unbalanced runtime PM get
Maciej W. Rozycki <[email protected]>
DEC: Limit PMAX memory probing to R3k systems
Eric Biggers <[email protected]>
crypto: rsa-pkcs1pad - fix buffer overread in pkcs1pad_verify_complete()
Eric Biggers <[email protected]>
crypto: rsa-pkcs1pad - restore signature length check
Eric Biggers <[email protected]>
crypto: rsa-pkcs1pad - correctly get hash from source scatterlist
Dirk Müller <[email protected]>
lib/raid6/test: fix multiple definition linking error
Srinivas Pandruvada <[email protected]>
thermal: int340x: Increase bitmap size
Colin Ian King <[email protected]>
carl9170: fix missing bit-wise or operator for tx_params
Krzysztof Kozlowski <[email protected]>
ARM: dts: exynos: add missing HDMI supplies on SMDK5420
Krzysztof Kozlowski <[email protected]>
ARM: dts: exynos: add missing HDMI supplies on SMDK5250
Krzysztof Kozlowski <[email protected]>
ARM: dts: exynos: fix UART3 pins configuration in Exynos5250
Tudor Ambarus <[email protected]>
ARM: dts: at91: sama5d2: Fix PMERRLOC resource size
Michael Schmitz <[email protected]>
video: fbdev: atari: Atari 2 bpp (STe) palette bugfix
Helge Deller <[email protected]>
video: fbdev: sm712fb: Fix crash in smtcfb_read()
Cooper Chiou <[email protected]>
drm/edid: check basic audio support on CEA extension block
Tejun Heo <[email protected]>
block: don't merge across cgroup boundaries if blkcg is enabled
Pekka Pessi <[email protected]>
mailbox: tegra-hsp: Flush whole channel
Duoming Zhou <[email protected]>
drivers: hamradio: 6pack: fix UAF bug caused by mod_timer()
Sakari Ailus <[email protected]>
ACPI: properties: Consistently return -ENOENT if there are no more references
Xin Long <[email protected]>
udp: call udp_encap_enable for v6 sockets when enabling encap
Andreas Gruenbacher <[email protected]>
powerpc/kvm: Fix kvm_use_magic_page
Lars Ellenberg <[email protected]>
drbd: fix potential silent data corruption
Kuan-Ying Lee <[email protected]>
mm/kmemleak: reset tag when compare object pointer
Rik van Riel <[email protected]>
mm,hwpoison: unmap poisoned page before invalidation
Kai-Heng Feng <[email protected]>
ALSA: hda/realtek: Fix audio regression on Mi Notebook Pro 2020
Xiaomeng Tong <[email protected]>
ALSA: cs4236: fix an incorrect NULL check on list iterator
José Expósito <[email protected]>
Revert "Input: clear BTN_RIGHT/MIDDLE on buttonpads"
Nikita Shubin <[email protected]>
riscv: Fix fill_callchain return value
Manish Chopra <[email protected]>
qed: validate and restrict untrusted VFs vlan promisc mode
Manish Chopra <[email protected]>
qed: display VF trust config
Damien Le Moal <[email protected]>
scsi: libsas: Fix sas_ata_qc_issue() handling of NCQ NON DATA commands
Hugh Dickins <[email protected]>
mempolicy: mbind_range() set_policy() after vma_merge()
Rik van Riel <[email protected]>
mm: invalidate hwpoison page cache page in fault path
Alistair Popple <[email protected]>
mm/pages_alloc.c: don't create ZONE_MOVABLE beyond the end of a node
Baokun Li <[email protected]>
jffs2: fix memory leak in jffs2_scan_medium
Baokun Li <[email protected]>
jffs2: fix memory leak in jffs2_do_mount_fs
Baokun Li <[email protected]>
jffs2: fix use-after-free in jffs2_clear_xattr_subsystem
Hangyu Hua <[email protected]>
can: ems_usb: ems_usb_start_xmit(): fix double dev_kfree_skb() in error path
Miquel Raynal <[email protected]>
spi: mxic: Fix the transmit path
Krzysztof Kozlowski <[email protected]>
pinctrl: samsung: drop pin banks references on error paths
Chao Yu <[email protected]>
f2fs: fix to do sanity check on .cp_pack_total_block_count
Juhyung Park <[email protected]>
f2fs: quota: fix loop condition at f2fs_quota_sync()
Chao Yu <[email protected]>
f2fs: fix to unlock page correctly in error path of is_alive()
Dan Carpenter <[email protected]>
NFSD: prevent integer overflow on 32 bit systems
Dan Carpenter <[email protected]>
NFSD: prevent underflow in nfssvc_decode_writeargs()
NeilBrown <[email protected]>
SUNRPC: avoid race between mod_timer() and del_timer_sync()
Gwendal Grignou <[email protected]>
HID: intel-ish-hid: Use dma_alloc_coherent for firmware update
Bagas Sanjaya <[email protected]>
Documentation: update stable tree link
Bagas Sanjaya <[email protected]>
Documentation: add link to stable release candidate tree
Eric Biggers <[email protected]>
KEYS: fix length validation in keyctl_pkey_params_get_2()
Jann Horn <[email protected]>
ptrace: Check PTRACE_O_SUSPEND_SECCOMP permission on PTRACE_SEIZE
Kunihiko Hayashi <[email protected]>
clk: uniphier: Fix fixed-rate initialization
Dan Carpenter <[email protected]>
greybus: svc: fix an error handling bug in gb_svc_hello()
Liam Beguin <[email protected]>
iio: inkern: make a best effort on offset calculation
Liam Beguin <[email protected]>
iio: inkern: apply consumer scale when no channel scale is available
Liam Beguin <[email protected]>
iio: inkern: apply consumer scale on IIO_VAL_INT cases
Liam Beguin <[email protected]>
iio: afe: rescale: use s64 for temporary scale calculations
James Clark <[email protected]>
coresight: Fix TRCCONFIGR.QE sysfs interface
Anssi Hannula <[email protected]>
xhci: fix uninitialized string returned by xhci_decode_ctrl_ctx()
Mathias Nyman <[email protected]>
xhci: make xhci_handshake timeout for xhci_reset() adjustable
Henry Lin <[email protected]>
xhci: fix runtime PM imbalance in USB2 resume
Alan Stern <[email protected]>
USB: usb-storage: Fix use of bitfields for hardware data in ene_ub6250.c
Xie Yongji <[email protected]>
virtio-blk: Use blk_validate_block_size() to validate block size
Xie Yongji <[email protected]>
block: Add a helper to validate the block size
Lino Sanfilippo <[email protected]>
tpm: fix reference counting for struct tpm_chip
Robin Murphy <[email protected]>
iommu/iova: Improve 32-bit free space estimate
Claudiu Beznea <[email protected]>
net: dsa: microchip: add spi_device_id tables
Haimin Zhang <[email protected]>
af_key: add __GFP_ZERO flag for compose_sadb_supported in function pfkey_register
Biju Das <[email protected]>
spi: Fix erroneous sgs value with min_t()
Minghao Chi (CGEL ZTE) <[email protected]>
net:mcf8390: Use platform_get_irq() to get the interrupt
Biju Das <[email protected]>
spi: Fix invalid sgs value
Zheyu Ma <[email protected]>
ethernet: sun: Free the coherent when failing in probing
Michael S. Tsirkin <[email protected]>
virtio_console: break out of buf poll on remove
Lina Wang <[email protected]>
xfrm: fix tunnel model fragmentation behavior
Lucas Zampieri <[email protected]>
HID: logitech-dj: add new lightspeed receiver id
Yajun Deng <[email protected]>
netdevice: add the case if dev is NULL
Randy Dunlap <[email protected]>
hv: utils: add PTP_1588_CLOCK to Kconfig to fix build
Johan Hovold <[email protected]>
USB: serial: simple: add Nokia phone driver
Eddie James <[email protected]>
USB: serial: pl2303: add IBM device IDs
Halil Pasic <[email protected]>
swiotlb: fix info leak with DMA_FROM_DEVICE
-------------
Diffstat:
Documentation/DMA-attributes.txt | 10 ++ .../devicetree/bindings/mtd/nand-controller.yaml | 4 +- Documentation/devicetree/bindings/spi/spi-mxic.txt | 4 +- Documentation/process/stable-kernel-rules.rst | 11 +- Documentation/sound/hd-audio/models.rst | 4 + Makefile | 4 +- arch/arm/boot/dts/bcm2837.dtsi | 49 ++++++ arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 2 +- arch/arm/boot/dts/exynos5250-smdk5250.dts | 3 + arch/arm/boot/dts/exynos5420-smdk5420.dts | 3 + arch/arm/boot/dts/imx53-m53menlo.dts | 29 +++- arch/arm/boot/dts/qcom-ipq4019.dtsi | 3 +- arch/arm/boot/dts/qcom-msm8960.dtsi | 8 +- arch/arm/boot/dts/sama5d2.dtsi | 2 +- arch/arm/boot/dts/spear1340.dtsi | 6 +- arch/arm/boot/dts/spear13xx.dtsi | 6 +- arch/arm/boot/dts/tegra20-tamonten.dtsi | 6 +- arch/arm/kernel/entry-ftrace.S | 51 +++--- arch/arm/mach-iop32x/include/mach/entry-macro.S | 2 +- arch/arm/mach-iop32x/include/mach/irqs.h | 2 +- arch/arm/mach-iop32x/irq.c | 6 +- arch/arm/mach-iop32x/irqs.h | 60 +++---- arch/arm/mach-mmp/sram.c | 22 +-- arch/arm/mach-s3c24xx/mach-jive.c | 6 +- .../arm64/boot/dts/broadcom/northstar2/ns2-svk.dts | 8 +- arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 2 +- arch/arm64/boot/dts/qcom/sm8150.dtsi | 6 +- arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 4 +- arch/arm64/include/asm/kvm_mmu.h | 3 +- arch/arm64/kernel/cpuidle.c | 6 +- arch/arm64/kernel/insn.c | 4 +- arch/arm64/kernel/module.lds | 6 +- arch/arm64/net/bpf_jit_comp.c | 18 +- arch/microblaze/include/asm/uaccess.h | 18 +- arch/mips/dec/int-handler.S | 6 +- arch/mips/dec/prom/Makefile | 2 +- arch/mips/dec/setup.c | 3 +- arch/mips/include/asm/dec/prom.h | 15 +- arch/mips/include/asm/setup.h | 2 +- arch/mips/kernel/traps.c | 22 +-- arch/mips/ralink/ill_acc.c | 1 + arch/mips/rb532/devices.c | 6 +- arch/nios2/include/asm/uaccess.h | 26 +-- arch/parisc/kernel/patch.c | 25 ++- arch/powerpc/Makefile | 2 +- arch/powerpc/boot/dts/fsl/t104xrdb.dtsi | 4 +- arch/powerpc/include/asm/io.h | 40 ++++- arch/powerpc/include/asm/uaccess.h | 3 + arch/powerpc/kernel/kvm.c | 2 +- arch/powerpc/kernel/machine_kexec.c | 15 +- arch/powerpc/kernel/rtas.c | 6 + arch/powerpc/kvm/powerpc.c | 4 +- arch/powerpc/lib/sstep.c | 8 +- arch/powerpc/mm/kasan/kasan_init_32.c | 2 +- arch/powerpc/perf/imc-pmu.c | 6 +- arch/powerpc/platforms/8xx/pic.c | 1 + arch/powerpc/platforms/powernv/rng.c | 6 +- arch/powerpc/sysdev/fsl_gtm.c | 4 +- arch/riscv/kernel/module.lds | 6 +- arch/riscv/kernel/perf_callchain.c | 2 +- arch/um/drivers/mconsole_kern.c | 3 +- arch/x86/events/intel/pt.c | 2 +- arch/x86/kernel/kvm.c | 2 +- arch/x86/kvm/emulate.c | 14 +- arch/x86/kvm/hyperv.c | 16 +- arch/x86/kvm/lapic.c | 5 +- arch/x86/kvm/paging_tmpl.h | 77 +++++---- arch/x86/kvm/pmu_amd.c | 8 +- arch/x86/power/cpu.c | 21 ++- arch/x86/xen/pmu.c | 10 +- arch/x86/xen/pmu.h | 3 +- arch/x86/xen/smp_hvm.c | 6 + arch/x86/xen/smp_pv.c | 2 +- arch/x86/xen/time.c | 24 ++- arch/xtensa/boot/dts/xtfpga-flash-128m.dtsi | 8 +- arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi | 8 +- arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi | 4 +- arch/xtensa/include/asm/processor.h | 4 +- arch/xtensa/kernel/jump_label.c | 2 +- block/bfq-cgroup.c | 6 + block/bfq-iosched.c | 31 ++-- block/blk-merge.c | 11 ++ block/blk-sysfs.c | 8 +- crypto/authenc.c | 2 +- crypto/rsa-pkcs1pad.c | 6 +- drivers/acpi/acpica/nswalk.c | 3 + drivers/acpi/apei/bert.c | 10 +- drivers/acpi/apei/erst.c | 2 +- drivers/acpi/apei/hest.c | 2 +- drivers/acpi/cppc_acpi.c | 5 + drivers/acpi/processor_idle.c | 15 +- drivers/acpi/property.c | 2 +- drivers/ata/sata_dwc_460ex.c | 6 +- drivers/base/dd.c | 2 +- drivers/base/power/main.c | 6 +- drivers/block/drbd/drbd_int.h | 8 +- drivers/block/drbd/drbd_nl.c | 41 +++-- drivers/block/drbd/drbd_req.c | 3 +- drivers/block/drbd/drbd_state.c | 18 +- drivers/block/drbd/drbd_state_change.h | 8 +- drivers/block/loop.c | 10 +- drivers/block/virtio_blk.c | 12 +- drivers/bluetooth/btmtksdio.c | 4 +- drivers/bluetooth/hci_serdev.c | 3 +- drivers/char/hw_random/atmel-rng.c | 1 + drivers/char/tpm/tpm-chip.c | 46 +---- drivers/char/tpm/tpm.h | 2 + drivers/char/tpm/tpm2-space.c | 65 ++++++++ drivers/char/virtio_console.c | 15 +- drivers/clk/actions/owl-s700.c | 1 + drivers/clk/actions/owl-s900.c | 2 +- drivers/clk/clk-clps711x.c | 2 + drivers/clk/clk-si5341.c | 16 +- drivers/clk/clk.c | 37 +++++ drivers/clk/imx/clk-imx7d.c | 1 - drivers/clk/loongson1/clk-loongson1c.c | 1 + drivers/clk/qcom/clk-rcg2.c | 14 +- drivers/clk/qcom/gcc-ipq8074.c | 2 +- drivers/clk/qcom/gcc-msm8994.c | 1 + drivers/clk/tegra/clk-emc.c | 1 + drivers/clk/uniphier/clk-uniphier-fixed-rate.c | 1 + drivers/clocksource/acpi_pm.c | 6 +- drivers/clocksource/timer-of.c | 6 +- drivers/crypto/ccp/ccp-dmaengine.c | 16 ++ drivers/crypto/ccree/cc_buffer_mgr.c | 7 + drivers/crypto/mxs-dcp.c | 2 +- drivers/crypto/vmx/Kconfig | 4 + drivers/dax/super.c | 1 + drivers/dma-buf/udmabuf.c | 4 + drivers/dma/sh/shdma-base.c | 4 +- drivers/firmware/google/Kconfig | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_module.c | 2 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 +- .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 14 -- drivers/gpu/drm/bridge/cdns-dsi.c | 1 + drivers/gpu/drm/bridge/sil-sii8620.c | 2 +- drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 1 + drivers/gpu/drm/drm_edid.c | 11 +- drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 + drivers/gpu/drm/imx/parallel-display.c | 4 +- drivers/gpu/drm/tegra/dsi.c | 4 +- drivers/greybus/svc.c | 8 +- drivers/hid/hid-logitech-dj.c | 1 + drivers/hid/i2c-hid/i2c-hid-core.c | 32 +++- drivers/hid/intel-ish-hid/ishtp-fw-loader.c | 29 +--- drivers/hv/Kconfig | 1 + drivers/hv/hv_balloon.c | 2 +- drivers/hv/vmbus_drv.c | 9 +- drivers/hwmon/pmbus/pmbus.h | 1 + drivers/hwmon/pmbus/pmbus_core.c | 18 +- drivers/hwmon/sch56xx-common.c | 2 +- .../hwtracing/coresight/coresight-etm4x-sysfs.c | 8 +- drivers/i2c/busses/i2c-xiic.c | 3 +- drivers/i2c/muxes/i2c-demux-pinctrl.c | 5 +- drivers/iio/adc/twl6030-gpadc.c | 2 + drivers/iio/afe/iio-rescale.c | 8 +- drivers/iio/inkern.c | 40 ++++- drivers/infiniband/core/cma.c | 2 +- drivers/infiniband/hw/mlx5/devx.c | 4 +- drivers/infiniband/sw/rdmavt/qp.c | 6 +- drivers/input/input.c | 6 - drivers/iommu/arm-smmu-v3.c | 1 + drivers/iommu/iova.c | 5 +- drivers/iommu/ipmmu-vmsa.c | 4 +- drivers/irqchip/irq-gic-v3.c | 8 +- drivers/irqchip/irq-nvic.c | 2 + drivers/irqchip/qcom-pdc.c | 5 +- drivers/mailbox/tegra-hsp.c | 5 + drivers/md/dm-crypt.c | 2 +- drivers/md/dm-ioctl.c | 2 + drivers/media/i2c/adv7511-v4l2.c | 2 +- drivers/media/i2c/adv7604.c | 2 +- drivers/media/i2c/adv7842.c | 2 +- drivers/media/pci/bt8xx/bttv-driver.c | 4 +- drivers/media/pci/cx88/cx88-mpeg.c | 3 + drivers/media/pci/ivtv/ivtv-driver.h | 1 - drivers/media/pci/ivtv/ivtv-ioctl.c | 10 +- drivers/media/pci/ivtv/ivtv-streams.c | 11 +- drivers/media/platform/aspeed-video.c | 9 +- drivers/media/platform/coda/coda-common.c | 1 + drivers/media/platform/davinci/vpif.c | 1 + drivers/media/usb/em28xx/em28xx-cards.c | 13 +- drivers/media/usb/go7007/s2250-board.c | 10 +- drivers/media/usb/hdpvr/hdpvr-video.c | 4 +- drivers/media/usb/stk1160/stk1160-core.c | 2 +- drivers/media/usb/stk1160/stk1160-v4l.c | 10 +- drivers/media/usb/stk1160/stk1160.h | 2 +- drivers/memory/emif.c | 8 +- drivers/mfd/asic3.c | 10 +- drivers/mfd/mc13xxx-core.c | 4 +- drivers/misc/cardreader/alcor_pci.c | 9 +- drivers/misc/kgdbts.c | 4 +- drivers/mmc/core/host.c | 15 +- drivers/mmc/host/davinci_mmc.c | 6 +- drivers/mmc/host/mmci_stm32_sdmmc.c | 6 +- drivers/mmc/host/renesas_sdhi_core.c | 4 +- drivers/mmc/host/sdhci-xenon.c | 10 -- drivers/mtd/nand/onenand/generic.c | 7 +- drivers/mtd/nand/raw/atmel/nand-controller.c | 14 +- drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 3 + drivers/mtd/ubi/build.c | 9 +- drivers/mtd/ubi/fastmap.c | 28 +++- drivers/mtd/ubi/vmt.c | 8 +- drivers/net/can/usb/ems_usb.c | 1 - drivers/net/can/usb/mcba_usb.c | 27 +-- drivers/net/can/vxcan.c | 2 +- drivers/net/dsa/bcm_sf2_cfp.c | 6 +- drivers/net/dsa/microchip/ksz8795_spi.c | 11 ++ drivers/net/dsa/microchip/ksz9477_spi.c | 12 ++ drivers/net/dsa/mv88e6xxx/chip.c | 1 + drivers/net/ethernet/8390/mcf8390.c | 10 +- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 3 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 4 +- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 +- drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c | 4 +- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 6 +- drivers/net/ethernet/intel/i40e/i40e_xsk.c | 4 +- drivers/net/ethernet/qlogic/qed/qed_sriov.c | 29 +++- drivers/net/ethernet/qlogic/qed/qed_sriov.h | 1 + drivers/net/ethernet/qlogic/qede/qede_fp.c | 3 + drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h | 10 +- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 3 +- drivers/net/ethernet/sun/sunhme.c | 6 +- drivers/net/hamradio/6pack.c | 4 +- drivers/net/macvtap.c | 6 + drivers/net/phy/broadcom.c | 21 +++ drivers/net/tap.c | 3 +- drivers/net/tun.c | 3 +- drivers/net/wireless/ath/ath10k/wow.c | 7 +- drivers/net/wireless/ath/ath5k/eeprom.c | 3 + drivers/net/wireless/ath/ath9k/htc_hst.c | 5 + drivers/net/wireless/ath/carl9170/main.c | 2 +- .../broadcom/brcm80211/brcmfmac/firmware.c | 2 + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 66 +++----- drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 4 +- drivers/net/wireless/mediatek/mt76/mt7603/main.c | 3 + drivers/net/wireless/mediatek/mt76/mt7615/main.c | 3 + drivers/net/wireless/ray_cs.c | 6 + drivers/parisc/dino.c | 41 ++++- drivers/parisc/gsc.c | 31 ++++ drivers/parisc/gsc.h | 1 + drivers/parisc/lasi.c | 7 +- drivers/parisc/wax.c | 7 +- drivers/pci/access.c | 9 +- drivers/pci/controller/pci-aardvark.c | 20 +-- drivers/pci/hotplug/pciehp_hpc.c | 4 + drivers/perf/qcom_l2_pmu.c | 6 +- drivers/phy/phy-core-mipi-dphy.c | 4 +- drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 2 + drivers/pinctrl/mediatek/pinctrl-paris.c | 11 +- drivers/pinctrl/nomadik/pinctrl-nomadik.c | 4 +- drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 185 ++++++++++----------- drivers/pinctrl/pinconf-generic.c | 6 +- drivers/pinctrl/pinctrl-rockchip.c | 2 + drivers/pinctrl/samsung/pinctrl-samsung.c | 30 +++- drivers/pinctrl/sh-pfc/pfc-r8a77470.c | 4 +- drivers/power/reset/gemini-poweroff.c | 4 +- drivers/power/supply/ab8500_fg.c | 4 +- drivers/power/supply/axp20x_battery.c | 13 +- drivers/power/supply/axp288_charger.c | 14 +- drivers/power/supply/bq24190_charger.c | 7 +- drivers/power/supply/wm8350_power.c | 97 +++++++++-- drivers/ptp/ptp_sysfs.c | 4 +- drivers/pwm/pwm-lpc18xx-sct.c | 20 +-- drivers/regulator/qcom_smd-regulator.c | 4 +- drivers/remoteproc/qcom_q6v5_adsp.c | 1 + drivers/remoteproc/qcom_wcnss.c | 1 + drivers/rtc/interface.c | 7 +- drivers/rtc/rtc-wm8350.c | 11 +- drivers/scsi/aha152x.c | 6 +- drivers/scsi/bfa/bfad_attr.c | 26 +-- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 2 +- drivers/scsi/libfc/fc_exch.c | 1 + drivers/scsi/libsas/sas_ata.c | 2 +- drivers/scsi/mvsas/mv_init.c | 4 +- drivers/scsi/pm8001/pm8001_hwi.c | 13 +- drivers/scsi/pm8001/pm80xx_hwi.c | 11 +- drivers/scsi/qla2xxx/qla_attr.c | 7 +- drivers/scsi/qla2xxx/qla_def.h | 10 +- drivers/scsi/qla2xxx/qla_gs.c | 5 +- drivers/scsi/qla2xxx/qla_init.c | 66 ++++++-- drivers/scsi/qla2xxx/qla_iocb.c | 8 +- drivers/scsi/qla2xxx/qla_isr.c | 1 + drivers/scsi/qla2xxx/qla_mbx.c | 14 +- drivers/scsi/qla2xxx/qla_nvme.c | 22 +++ drivers/scsi/qla2xxx/qla_os.c | 8 +- drivers/scsi/qla2xxx/qla_sup.c | 4 +- drivers/scsi/qla2xxx/qla_target.c | 4 +- drivers/scsi/zorro7xx.c | 2 + drivers/soc/qcom/qcom_aoss.c | 2 +- drivers/soc/qcom/rpmpd.c | 3 + drivers/soc/ti/wkup_m3_ipc.c | 4 +- drivers/spi/spi-bcm-qspi.c | 4 +- drivers/spi/spi-mxic.c | 28 ++-- drivers/spi/spi-pxa2xx-pci.c | 17 +- drivers/spi/spi-tegra114.c | 4 + drivers/spi/spi-tegra20-slink.c | 8 +- drivers/spi/spi.c | 4 +- drivers/staging/iio/adc/ad7280a.c | 4 +- drivers/staging/media/hantro/hantro_h1_jpeg_enc.c | 2 +- drivers/staging/media/hantro/hantro_h1_regs.h | 2 +- drivers/staging/mt7621-dts/gbpc1.dts | 40 ++--- .../intel/int340x_thermal/int3400_thermal.c | 2 +- drivers/tty/hvc/hvc_iucv.c | 4 +- drivers/tty/mxser.c | 15 +- drivers/tty/serial/8250/8250_mid.c | 19 ++- drivers/tty/serial/8250/8250_port.c | 12 ++ drivers/tty/serial/kgdboc.c | 6 +- drivers/tty/serial/samsung.c | 5 +- drivers/usb/dwc3/dwc3-omap.c | 2 +- drivers/usb/host/ehci-pci.c | 9 + drivers/usb/host/xhci-hub.c | 5 +- drivers/usb/host/xhci-mem.c | 2 +- drivers/usb/host/xhci.c | 20 +-- drivers/usb/host/xhci.h | 9 +- drivers/usb/serial/Kconfig | 1 + drivers/usb/serial/pl2303.c | 1 + drivers/usb/serial/pl2303.h | 3 + drivers/usb/serial/usb-serial-simple.c | 7 + drivers/usb/storage/ene_ub6250.c | 155 +++++++++-------- drivers/usb/storage/realtek_cr.c | 2 +- drivers/vhost/net.c | 1 + drivers/video/fbdev/atafb.c | 12 +- drivers/video/fbdev/atmel_lcdfb.c | 11 +- drivers/video/fbdev/cirrusfb.c | 16 +- drivers/video/fbdev/core/fbcvt.c | 53 +++--- drivers/video/fbdev/nvidia/nv_i2c.c | 2 +- .../fbdev/omap2/omapfb/displays/connector-dvi.c | 1 + .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 8 +- .../omap2/omapfb/displays/panel-sony-acx565akm.c | 2 +- .../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 4 +- drivers/video/fbdev/sm712fb.c | 46 ++--- drivers/video/fbdev/smscufx.c | 3 +- drivers/video/fbdev/udlfb.c | 8 +- drivers/video/fbdev/w100fb.c | 15 +- drivers/w1/slaves/w1_therm.c | 8 +- fs/btrfs/extent_io.h | 2 +- fs/ext2/super.c | 6 +- fs/ext4/inode.c | 25 +++ fs/f2fs/checkpoint.c | 8 +- fs/f2fs/data.c | 6 +- fs/f2fs/gc.c | 4 +- fs/f2fs/inode.c | 1 + fs/f2fs/node.c | 6 +- fs/f2fs/super.c | 6 +- fs/gfs2/rgrp.c | 3 +- fs/io_uring.c | 28 ++-- fs/jffs2/build.c | 4 +- fs/jffs2/fs.c | 2 +- fs/jffs2/scan.c | 6 +- fs/jfs/inode.c | 3 +- fs/jfs/jfs_dmap.c | 7 + fs/minix/inode.c | 3 +- fs/nfs/callback_proc.c | 27 +-- fs/nfs/callback_xdr.c | 4 - fs/nfs/direct.c | 48 ++++-- fs/nfs/file.c | 4 +- fs/nfs/nfs2xdr.c | 2 +- fs/nfs/nfs3xdr.c | 21 +-- fs/nfs/nfs4proc.c | 1 + fs/nfs/nfs4state.c | 12 ++ fs/nfs/pnfs.c | 11 ++ fs/nfs/pnfs.h | 2 + fs/nfsd/nfsproc.c | 2 +- fs/nfsd/xdr.h | 2 +- fs/ntfs/inode.c | 4 + fs/ubifs/dir.c | 44 +++-- fs/ubifs/io.c | 34 +++- fs/ubifs/ioctl.c | 2 +- include/linux/blk-cgroup.h | 17 ++ include/linux/blkdev.h | 8 + include/linux/dma-mapping.h | 8 + include/linux/ipv6.h | 2 +- include/linux/mmzone.h | 11 +- include/linux/netdevice.h | 6 +- include/linux/nfs_fs.h | 8 +- include/linux/pci.h | 1 + include/linux/sunrpc/xdr.h | 2 + include/net/arp.h | 1 + include/net/udp.h | 1 + include/net/udp_tunnel.h | 3 +- include/uapi/linux/bpf.h | 7 +- init/main.c | 6 +- kernel/audit.h | 4 + kernel/auditsc.c | 87 +++++++--- kernel/cgroup/cgroup-internal.h | 19 +++ kernel/cgroup/cgroup-v1.c | 33 ++-- kernel/cgroup/cgroup.c | 93 ++++++++--- kernel/dma/debug.c | 4 +- kernel/dma/swiotlb.c | 3 +- kernel/events/core.c | 3 + kernel/power/hibernate.c | 2 +- kernel/power/suspend_test.c | 8 +- kernel/printk/printk.c | 6 +- kernel/ptrace.c | 47 ++++-- kernel/sched/debug.c | 10 -- lib/lz4/lz4_decompress.c | 8 +- lib/raid6/test/Makefile | 4 +- lib/raid6/test/test.c | 1 - lib/test_kmod.c | 1 + lib/test_xarray.c | 22 +++ lib/xarray.c | 4 + mm/kmemleak.c | 9 +- mm/memcontrol.c | 2 +- mm/memory.c | 42 +++-- mm/mempolicy.c | 9 +- mm/mmap.c | 2 +- mm/mremap.c | 3 + mm/page_alloc.c | 9 +- mm/rmap.c | 25 ++- mm/usercopy.c | 5 +- net/batman-adv/multicast.c | 2 +- net/bluetooth/hci_event.c | 3 +- net/core/filter.c | 27 ++- net/core/skmsg.c | 17 +- net/ipv4/arp.c | 9 +- net/ipv4/fib_frontend.c | 5 +- net/ipv4/fib_semantics.c | 7 +- net/ipv4/tcp_bpf.c | 14 +- net/ipv4/tcp_output.c | 5 +- net/ipv4/udp.c | 6 + net/ipv6/addrconf.c | 4 +- net/ipv6/ip6_input.c | 2 +- net/ipv6/ip6mr.c | 8 +- net/ipv6/route.c | 2 +- net/ipv6/udp.c | 4 +- net/ipv6/xfrm6_output.c | 16 ++ net/key/af_key.c | 2 +- net/netfilter/nf_conntrack_proto_tcp.c | 17 +- net/netlabel/netlabel_kapi.c | 2 + net/netlink/af_netlink.c | 2 + net/openvswitch/actions.c | 2 +- net/openvswitch/conntrack.c | 118 ++++++------- net/openvswitch/flow_netlink.c | 8 +- net/rxrpc/net_ns.c | 2 +- net/smc/smc_core.c | 2 +- net/sunrpc/clnt.c | 7 + net/sunrpc/sched.c | 4 +- net/sunrpc/xprt.c | 7 + net/sunrpc/xprtrdma/transport.c | 4 +- net/sunrpc/xprtsock.c | 54 ++++-- net/tipc/socket.c | 3 +- net/tls/tls_sw.c | 2 +- net/x25/af_x25.c | 11 +- net/xfrm/xfrm_interface.c | 5 +- scripts/gcc-plugins/stackleak_plugin.c | 25 ++- security/keys/keyctl_pkey.c | 14 +- security/security.c | 17 +- security/selinux/hooks.c | 5 +- security/selinux/xfrm.c | 2 +- security/smack/smack_lsm.c | 2 +- security/tomoyo/load_policy.c | 4 +- sound/firewire/fcp.c | 4 +- sound/isa/cs423x/cs4236.c | 8 +- sound/pci/hda/patch_realtek.c | 15 +- sound/soc/atmel/atmel_ssc_dai.c | 5 +- sound/soc/atmel/sam9g20_wm8731.c | 1 + sound/soc/codecs/Kconfig | 5 + sound/soc/codecs/msm8916-wcd-analog.c | 22 ++- sound/soc/codecs/msm8916-wcd-digital.c | 5 +- sound/soc/codecs/mt6358.c | 4 + sound/soc/codecs/rt5663.c | 2 + sound/soc/codecs/wm8350.c | 28 +++- sound/soc/fsl/imx-es8328.c | 1 + sound/soc/mxs/mxs-saif.c | 5 +- sound/soc/mxs/mxs-sgtl5000.c | 3 + sound/soc/sh/fsi.c | 19 ++- sound/soc/soc-compress.c | 5 + sound/soc/soc-core.c | 2 +- sound/soc/soc-generic-dmaengine-pcm.c | 6 +- sound/soc/soc-topology.c | 3 +- sound/soc/sof/intel/hda-loader.c | 9 +- sound/soc/ti/davinci-i2s.c | 5 +- sound/spi/at73c213.c | 27 ++- tools/build/feature/Makefile | 9 +- tools/include/uapi/linux/bpf.h | 4 +- tools/lib/bpf/btf_dump.c | 5 + tools/perf/Makefile.config | 3 + tools/perf/perf.c | 2 +- tools/perf/util/session.c | 15 +- tools/testing/selftests/bpf/test_lirc_mode2.sh | 5 +- tools/testing/selftests/bpf/test_lwt_ip_encap.sh | 10 +- tools/testing/selftests/cgroup/cgroup_util.c | 2 +- tools/testing/selftests/cgroup/test_core.c | 167 +++++++++++++++++++ .../testing/selftests/net/test_vxlan_under_vrf.sh | 8 +- tools/testing/selftests/x86/check_cc.sh | 2 +- virt/kvm/kvm_main.c | 13 ++ 493 files changed, 3509 insertions(+), 1731 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/475 swiotlb: fix info leak with DMA_FROM_DEVICE
From: Halil Pasic <[email protected]>
commit ddbd89deb7d32b1fbb879f48d68fda1a8ac58e8e upstream.
The problem I'm addressing was discovered by the LTP test covering cve-2018-1000204.
A short description of what happens follows:
1) The test case issues a command code 00 (TEST UNIT READY) via the SG_IO interface with: dxfer_len == 524288, dxdfer_dir == SG_DXFER_FROM_DEV and a corresponding dxferp. The peculiar thing about this is that TUR is not reading from the device.
2) In sg_start_req() the invocation of blk_rq_map_user() effectively bounces the user-space buffer. As if the device was to transfer into it. Since commit a45b599ad808 ("scsi: sg: allocate with __GFP_ZERO in sg_build_indirect()") we make sure this first bounce buffer is allocated with GFP_ZERO.
3) For the rest of the story we keep ignoring that we have a TUR, so the device won't touch the buffer we prepare as if the we had a DMA_FROM_DEVICE type of situation. My setup uses a virtio-scsi device and the buffer allocated by SG is mapped by the function virtqueue_add_split() which uses DMA_FROM_DEVICE for the "in" sgs (here scatter-gather and not scsi generics). This mapping involves bouncing via the swiotlb (we need swiotlb to do virtio in protected guest like s390 Secure Execution, or AMD SEV).
4) When the SCSI TUR is done, we first copy back the content of the second (that is swiotlb) bounce buffer (which most likely contains some previous IO data), to the first bounce buffer, which contains all zeros. Then we copy back the content of the first bounce buffer to the user-space buffer.
5) The test case detects that the buffer, which it zero-initialized, ain't all zeros and fails.
One can argue that this is an swiotlb problem, because without swiotlb we leak all zeros, and the swiotlb should be transparent in a sense that it does not affect the outcome (if all other participants are well behaved).
Copying the content of the original buffer into the swiotlb buffer is the only way I can think of to make swiotlb transparent in such scenarios. So let's do just that if in doubt, but allow the driver to tell us that the whole mapped buffer is going to be overwritten, in which case we can preserve the old behavior and avoid the performance impact of the extra bounce.
--- Documentation/DMA-attributes.txt | 10 ++++++++++ include/linux/dma-mapping.h | 8 ++++++++ kernel/dma/swiotlb.c | 3 ++- 3 files changed, 20 insertions(+), 1 deletion(-)
Documentation/DMA-attributes.txt +10 -0
@@ -156,3 +156,13 @@ accesses to DMA buffers in both privileg subsystem that the buffer is fully accessible at the elevated privilege level (and ideally inaccessible or at least read-only at the lesser-privileged levels). + +DMA_ATTR_PRIVILEGED +------------------- + +Some advanced peripherals such as remote processors and GPUs perform +accesses to DMA buffers in both privileged "supervisor" and unprivileged +"user" modes. This attribute is used to indicate to the DMA-mapping +subsystem that the buffer is fully accessible at the elevated privilege +level (and ideally inaccessible or at least read-only at the +lesser-privileged levels).
include/linux/dma-mapping.h +8 -0
@@ -71,6 +71,14 @@#define DMA_ATTR_PRIVILEGED (1UL << 9)/* +* This is a hint to the DMA-mapping subsystem that the device is expected +* to overwrite the entire mapped size, thus the caller does not require any +* of the previous buffer contents to be preserved. This allows +* bounce-buffering implementations to optimise DMA_FROM_DEVICE transfers. +*/ +#define DMA_ATTR_OVERWRITE (1UL << 10) + +/* * A dma_addr_t can hold any valid DMA or bus address for the platform. * It can be given to a device to use as a DMA source or target. A CPU cannot * reference a dma_addr_t directly because there may be translation between
kernel/dma/swiotlb.c +2 -1
@@ -572,7 +572,8 @@ found:for (i =0 ; i < nslots; i++) io_tlb_orig_addr[index+i] = orig_addr + (i <<IO_TLB_SHIFT );if (!(attrs &DMA_ATTR_SKIP_CPU_SYNC ) && - (dir ==DMA_TO_DEVICE || dir ==DMA_BIDIRECTIONAL )) + (!(attrs &DMA_ATTR_OVERWRITE ) || dir ==DMA_TO_DEVICE || + dir ==DMA_BIDIRECTIONAL ))swiotlb_bounce (orig_addr, tlb_addr, mapping_size,DMA_TO_DEVICE );return tlb_addr;
Greg Kroah-Hartman
maintainerPATCH 2/475 USB: serial: pl2303: add IBM device IDs
In reply to Greg Kroah-HartmanFrom: Eddie James <[email protected]>
commit e1d15646565b284e9ef2433234d6cfdaf66695f1 upstream.
IBM manufactures a PL2303 device for UPS communications. Add the vendor and product IDs so that the PL2303 driver binds to the device.
--- drivers/usb/serial/pl2303.c | 1 + drivers/usb/serial/pl2303.h | 3 +++ 2 files changed, 4 insertions(+)
drivers/usb/serial/pl2303.c +1 -0
@@ -110,6 +110,7 @@ static const struct usb_device_id id_tab { 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) }, + { USB_DEVICE(IBM_VENDOR_ID, IBM_PRODUCT_ID) }, { } /* Terminating entry */ };
drivers/usb/serial/pl2303.h +3 -0
@@ -29,6 +29,9 @@#define ATEN_PRODUCT_UC232B 0x2022#define ATEN_PRODUCT_ID2 0x2118 +#define IBM_VENDOR_ID 0x04b3 +#define IBM_PRODUCT_ID 0x4016 +#define IODATA_VENDOR_ID 0x04bb#define IODATA_PRODUCT_ID 0x0a03#define IODATA_PRODUCT_ID_RSAQ5 0x0a0e
Greg Kroah-Hartman
maintainerPATCH 3/475 USB: serial: simple: add Nokia phone driver
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit c4b9c570965f75d0d55e639747f1e5ccdad2fae0 upstream.
Add a new "simple" driver for certain Nokia phones, including Nokia 130 (RM-1035) which exposes two serial ports in "charging only" mode:
Bus 001 Device 009: ID 0421:069a Nokia Mobile Phones 130 [RM-1035] (Charging only) Device Descriptor:
bLength 18
bDescriptorType 1
bcdUSB 2.00
bDeviceClass 0 bDeviceSubClass 0 bDeviceProtocol 0 bMaxPacketSize0 8 idVendor 0x0421 Nokia Mobile Phones idProduct 0x069a 130 [RM-1035] (Charging only) bcdDevice 1.00 iManufacturer 1 Nokia iProduct 2 Nokia 130 (RM-1035) iSerial 0 bNumConfigurations 1
Configuration Descriptor:
bLength 9
bDescriptorType 2
wTotalLength 0x0037
bNumInterfaces 2
bConfigurationValue 1
iConfiguration 0
bmAttributes 0x80
(Bus Powered)
MaxPower 500mA
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 0
bAlternateSetting 0
bNumEndpoints 2
bInterfaceClass 255 Vendor Specific Class
bInterfaceSubClass 255 Vendor Specific Subclass
bInterfaceProtocol 255 Vendor Specific Protocol
iInterface 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x81 EP 1 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x01 EP 1 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 0
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 1
bAlternateSetting 0
bNumEndpoints 2
bInterfaceClass 255 Vendor Specific Class
bInterfaceSubClass 255 Vendor Specific Subclass
bInterfaceProtocol 255 Vendor Specific Protocol
iInterface 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x82 EP 2 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x02 EP 2 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 0
Device Status: 0x0000
(Bus Powered)
--- drivers/usb/serial/Kconfig | 1 + drivers/usb/serial/usb-serial-simple.c | 7 +++++++ 2 files changed, 8 insertions(+)
drivers/usb/serial/Kconfig +1 -0
@@ -66,6 +66,7 @@ config USB_SERIAL_SIMPLE - Libtransistor USB console - a number of Motorola phones - Motorola Tetra devices + - Nokia mobile phones - Novatel Wireless GPS receivers - Siemens USB/MPI adapter. - ViVOtech ViVOpay USB device.
drivers/usb/serial/usb-serial-simple.c +7 -0
@@ -91,6 +91,11 @@ DEVICE(moto_modem, MOTO_IDS); { USB_DEVICE(0x0cad, 0x9016) } /* TPG2200 */DEVICE (motorola_tetra,MOTOROLA_TETRA_IDS ); +/* Nokia mobile phone driver */ +#define NOKIA_IDS () \ + { USB_DEVICE(0x0421, 0x069a) }/* Nokia 130 (RM-1035) */ +DEVICE (nokia,NOKIA_IDS ); +/* Novatel Wireless GPS driver */ #define NOVATEL_IDS () \ { USB_DEVICE(0x09d7, 0x0100) }/* NovAtel FlexPack GPS */
@@ -123,6 +128,7 @@ static struct usb_serial_driver * const &vivopay_device, &moto_modem_device, &motorola_tetra_device, + &nokia_device, &novatel_gps_device, &hp4x_device, &suunto_device,
@@ -140,6 +146,7 @@ static const struct usb_device_id id_tabVIVOPAY_IDS (),MOTO_IDS (),MOTOROLA_TETRA_IDS (), +NOKIA_IDS (),NOVATEL_IDS (),HP4X_IDS (), SUUNTO_IDS(),
Greg Kroah-Hartman
maintainerPATCH 4/475 hv: utils: add PTP_1588_CLOCK to Kconfig to fix build
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
commit 1dc2f2b81a6a9895da59f3915760f6c0c3074492 upstream.
The hyperv utilities use PTP clock interfaces and should depend a a kconfig symbol such that they will be built as a loadable module or builtin so that linker errors do not happen.
Prevents these build errors:
ld: drivers/hv/hv_util.o: in function `hv_timesync_deinit':
hv_util.c:(.text+0x37d): undefined reference to `ptp_clock_unregister'
ld: drivers/hv/hv_util.o: in function `hv_timesync_init':
hv_util.c:(.text+0x738): undefined reference to `ptp_clock_register'
--- drivers/hv/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/hv/Kconfig +1 -0
@@ -17,6 +17,7 @@ config HYPERV_TIMER config HYPERV_UTILS tristate "Microsoft Hyper-V Utilities driver" depends on HYPERV && CONNECTOR && NLS + depends on PTP_1588_CLOCK_OPTIONAL help Select this option to enable the Hyper-V Utilities.
Re: [PATCH 5.4 004/475] hv: utils: add PTP_1588_CLOCK to Kconfig to fix build
Quoted 38 lines · Greg Kroah-Hartman
From: Randy Dunlap <[email protected]>
commit
1dc2f2b81a6a9895da59f3915760f6c0c3074492upstream.The hyperv utilities use PTP clock interfaces and should depend a a kconfig symbol such that they will be built as a loadable module or builtin so that linker errors do not happen.
Prevents these build errors:
ld:
drivers/hv/hv_util.o: in function `hv_timesync_deinit':
hv_util.c:(.text+0x37d): undefined reference to `ptp_clock_unregister'
ld:drivers/hv/hv_util.o: in function `hv_timesync_init':
hv_util.c:(.text+0x738): undefined reference to `ptp_clock_register'Fixes 3716a49a81ba ("hv_utils: implement Hyper-V PTP source")Signed-off-by Randy Dunlap <[email protected]>Reported-by kernel test robot <[email protected]>Cc Arnd Bergmann <[email protected]>Cc "K. Y. Srinivasan" <[email protected]>Cc Haiyang Zhang <[email protected]>Cc Stephen Hemminger <[email protected]>Cc Wei Liu <[email protected]>Cc Dexuan Cui <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Reviewed-by Michael Kelley <[email protected]>Signed-off-by Wei Liu <[email protected]>Cc Petr Štetiar <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/hv/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/hv/Kconfig config HYPERV_TIMER · line 20
Quoted 4 lines
drivers/hv/Kconfig +1
-0@@ -17,6 +17,7 @@ config HYPERV_TIMER config HYPERV_UTILS tristate "Microsoft Hyper-V Utilities driver" depends on HYPERV && CONNECTOR && NLS + depends on PTP_1588_CLOCK_OPTIONAL
AFAICT PTP_1588_CLOCK_OPTIONAL does not exist in 5.4 kernels, so this should not be used there.
Quoted 5 lines
drivers/hv/Kconfig +0
-0help Select this option to enable the Hyper-V Utilities.
Signature · 1 line
~Randy
Greg Kroah-Hartman
maintainerRe: [PATCH 5.4 004/475] hv: utils: add PTP_1588_CLOCK to Kconfig to fix build
Quoted 38 lines · Randy Dunlap
Quoted 35 lines · Greg Kroah-Hartman
From: Randy Dunlap <[email protected]>
commit
1dc2f2b81a6a9895da59f3915760f6c0c3074492upstream.The hyperv utilities use PTP clock interfaces and should depend a a kconfig symbol such that they will be built as a loadable module or builtin so that linker errors do not happen.
Prevents these build errors:
ld:
drivers/hv/hv_util.o: in function `hv_timesync_deinit':
hv_util.c:(.text+0x37d): undefined reference to `ptp_clock_unregister'
ld:drivers/hv/hv_util.o: in function `hv_timesync_init':
hv_util.c:(.text+0x738): undefined reference to `ptp_clock_register'Fixes 3716a49a81ba ("hv_utils: implement Hyper-V PTP source")Signed-off-by Randy Dunlap <[email protected]>Reported-by kernel test robot <[email protected]>Cc Arnd Bergmann <[email protected]>Cc "K. Y. Srinivasan" <[email protected]>Cc Haiyang Zhang <[email protected]>Cc Stephen Hemminger <[email protected]>Cc Wei Liu <[email protected]>Cc Dexuan Cui <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Reviewed-by Michael Kelley <[email protected]>Signed-off-by Wei Liu <[email protected]>Cc Petr Štetiar <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/hv/Kconfig | 1 + 1 file changed, 1 insertion(+)
Quoted 10 lines
drivers/hv/Kconfig config HYPERV_TIMER · line 20
Quoted 7 lines
drivers/hv/Kconfig +1
-0@@ -17,6 +17,7 @@ config HYPERV_TIMER config HYPERV_UTILS tristate "Microsoft Hyper-V Utilities driver" depends on HYPERV && CONNECTOR && NLS + depends on PTP_1588_CLOCK_OPTIONALAFAICT
PTP_1588_CLOCK_OPTIONALdoes not exist in 5.4 kernels, so this should not be used there.
Gotta love it when people lie in Fixes: tags :(
I'll go drop this, thanks!
greg k-h
Greg Kroah-Hartman
maintainerPATCH 5/475 netdevice: add the case if dev is NULL
In reply to Greg Kroah-HartmanFrom: Yajun Deng <[email protected]>
commit b37a466837393af72fe8bcb8f1436410f3f173f3 upstream.
Add the case if dev is NULL in dev_{put, hold}, so the caller doesn't need to care whether dev is NULL or not.
--- include/linux/netdevice.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
include/linux/netdevice.h +4 -2
@@ -3777,7 +3777,8 @@ void netdev_run_todo(void);*/ static inline void dev_put (struct net_device *dev) { -this_cpu_dec (*dev->pcpu_refcnt); +if (dev) +this_cpu_dec (*dev->pcpu_refcnt); }/**
@@ -3788,7 +3789,8 @@ static inline void dev_put(struct net_de*/ static inline void dev_hold (struct net_device *dev) { -this_cpu_inc (*dev->pcpu_refcnt); +if (dev) +this_cpu_inc (*dev->pcpu_refcnt); }/* Carrier loss detection, dial on demand. The functions netif_carrier_on
Greg Kroah-Hartman
maintainerPATCH 6/475 HID: logitech-dj: add new lightspeed receiver id
In reply to Greg Kroah-HartmanFrom: Lucas Zampieri <[email protected]>
[ Upstream commit 25666e8ccd952627899b09b68f7c9b68cfeaf028 ]
As of logitech lightspeed receiver fw version 04.02.B0009, HIDPP_PARAM_DEVICE_INFO is being reported as 0x11.
With patch "HID: logitech-dj: add support for the new lightspeed receiver iteration", the mouse starts to error out with:
logitech-djreceiver: unusable device of type UNKNOWN (0x011) connected on slot 1
and becomes unusable.
This has been noticed on a Logitech G Pro X Superlight fw MPM 25.01.B0018.
--- drivers/hid/hid-logitech-dj.c | 1 + 1 file changed, 1 insertion(+)
drivers/hid/hid-logitech-dj.c +1 -0
@@ -1000,6 +1000,7 @@ static void logi_hidpp_recv_queue_notif(struct hid_device *hdev, workitem.reports_supported |=STD_KEYBOARD ;break ;case 0x0f : +case 0x11 : device_type ="eQUAD Lightspeed 1.2" ;logi_hidpp_dev_conn_notif_equad (hdev, hidpp_report, &workitem); workitem.reports_supported |=STD_KEYBOARD ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 7/475 xfrm: fix tunnel model fragmentation behavior
In reply to Greg Kroah-HartmanFrom: Lina Wang <[email protected]>
[ Upstream commit 4ff2980b6bd2aa6b4ded3ce3b7c0ccfab29980af ]
in tunnel mode, if outer interface(ipv4) is less, it is easily to let inner IPV6 mtu be less than 1280. If so, a Packet Too Big ICMPV6 message is received. When send again, packets are fragmentized with 1280, they are still rejected with ICMPV6(Packet Too Big) by xfrmi_xmit2().
According to RFC4213 Section3.2.2:
if (IPv4 path MTU - 20) is less than 1280
if packet is larger than 1280 bytes
Send ICMPv6 "packet too big" with MTU=1280 Drop packet
else
Encapsulate but do not set the Don't Fragment flag in the IPv4 header. The resulting IPv4 packet might be fragmented by the IPv4 layer on the encapsulator or by some router along the IPv4 path.
endif
else
if packet is larger than (IPv4 path MTU - 20)
Send ICMPv6 "packet too big" with
MTU = (IPv4 path MTU - 20).
Drop packet.
else
Encapsulate and set the Don't Fragment flag in the IPv4 header.
endif
endif
Packets should be fragmentized with ipv4 outer interface, so change it.
After it is fragemtized with ipv4, there will be double fragmenation. No.48 & No.51 are ipv6 fragment packets, No.48 is double fragmentized, then tunneled with IPv4(No.49& No.50), which obey spec. And received peer cannot decrypt it rightly.
48 2002::10 2002::11 1296(length) IPv6 fragment (off=0 more=y ident=0xa20da5bc nxt=50) 49 0x0000 (0) 2002::10 2002::11 1304 IPv6 fragment (off=0 more=y ident=0x7448042c nxt=44) 50 0x0000 (0) 2002::10 2002::11 200 ESP (SPI=0x00035000) 51 2002::10 2002::11 180 Echo (ping) request 52 0x56dc 2002::10 2002::11 248 IPv6 fragment (off=1232 more=n ident=0xa20da5bc nxt=50)
xfrm6_noneed_fragment has fixed above issues. Finally, it acted like below:
1 0x6206 192.168.1.138 192.168.1.1 1316 Fragmented IP protocol (proto=Encap Security Payload 50, off=0, ID=6206) [Reassembled in #2] 2 0x6206 2002::10 2002::11 88 IPv6 fragment (off=0 more=y ident=0x1f440778 nxt=50) 3 0x0000 2002::10 2002::11 248 ICMPv6 Echo (ping) request
--- net/ipv6/xfrm6_output.c | 16 ++++++++++++++++ net/xfrm/xfrm_interface.c | 5 ++++- 2 files changed, 20 insertions(+), 1 deletion(-)
net/ipv6/xfrm6_output.c +16 -0
@@ -140,6 +140,19 @@ static int __xfrm6_output_finish(struct net *net, struct sock *sk, struct sk_bufreturn __xfrm6_output_state_finish (x, sk, skb); } +static int xfrm6_noneed_fragment (struct sk_buff *skb) +{ +struct frag_hdr *fh; +u8 prevhdr =ipv6_hdr (skb)->nexthdr; + +if (prevhdr !=NEXTHDR_FRAGMENT ) +return 0 ; + fh = (struct frag_hdr *)(skb->data +sizeof (struct ipv6hdr )); +if (fh->nexthdr ==NEXTHDR_ESP || fh->nexthdr ==NEXTHDR_AUTH ) +return 1 ; +return 0 ; +} +static int __xfrm6_output (struct net *net,struct sock *sk,struct sk_buff *skb) {struct dst_entry *dst =skb_dst (skb);
@@ -168,6 +181,9 @@ static int __xfrm6_output(struct net *net, struct sock *sk, struct sk_buff *skb)xfrm6_local_rxpmtu (skb, mtu);kfree_skb (skb);return -EMSGSIZE ; + }else if (toobig &&xfrm6_noneed_fragment (skb)) { + skb->ignore_df =1 ; + goto skip_frag; }else if (!skb->ignore_df && toobig && skb->sk) {xfrm_local_error (skb, mtu);kfree_skb (skb);
net/xfrm/xfrm_interface.c +4 -1
@@ -300,7 +300,10 @@ xfrmi_xmit2(struct sk_buff *skb, struct net_device *dev, struct flowi *fl)if (mtu <IPV6_MIN_MTU ) mtu =IPV6_MIN_MTU ; -icmpv6_ndo_send (skb,ICMPV6_PKT_TOOBIG ,0 , mtu); +if (skb->len >1280 ) +icmpv6_ndo_send (skb,ICMPV6_PKT_TOOBIG ,0 , mtu); +else + goto xmit; }else {if (!(ip_hdr (skb)->frag_off &htons (IP_DF ))) goto xmit;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 8/475 virtio_console: break out of buf poll on remove
In reply to Greg Kroah-HartmanFrom: Michael S. Tsirkin <[email protected]>
[ Upstream commit 0e7174b9d5877130fec41fb4a16e0c2ee4958d44 ]
A common pattern for device reset is currently:vdev->config->reset(vdev);
.. cleanup ..
reset prevents new interrupts from arriving and waits for interrupt handlers to finish.
However if - as is common - the handler queues a work request which is flushed during the cleanup stage, we have code adding buffers / trying to get buffers while device is reset. Not good.
This was reproduced by running
modprobe virtio_console
modprobe -r virtio_console
in a loop.
Fix this up by calling virtio_break_device + flush before reset.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1786239
--- drivers/char/virtio_console.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/char/virtio_console.c +7 -0
@@ -1961,6 +1961,13 @@ static void virtcons_remove(struct virtio_device *vdev)list_del (&portdev->list);spin_unlock_irq (&pdrvdata_lock); +/* Device is going away, exit any polling for buffers */ +virtio_break_device (vdev); +if (use_multiport (portdev)) +flush_work (&portdev->control_work); +else +flush_work (&portdev->config_work); +/* Disable interrupts for vqs */ vdev->config->reset (vdev);/* Finish up work that's lined up */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 9/475 ethernet: sun: Free the coherent when failing in probing
In reply to Greg Kroah-HartmanFrom: Zheyu Ma <[email protected]>
[ Upstream commit bb77bd31c281f70ec77c9c4f584950a779e05cf8 ]
When the driver fails to register net device, it should free the DMA region first, and then do other cleanup.
--- drivers/net/ethernet/sun/sunhme.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/ethernet/sun/sunhme.c +5 -1
@@ -3164,7 +3164,7 @@ static int happy_meal_pci_probe(struct pci_dev *pdev,if (err) {printk (KERN_ERR "happymeal(PCI): Cannot register net device, " "aborting.\n" ); - goto err_out_iounmap; + goto err_out_free_coherent; }pci_set_drvdata (pdev, hp);
@@ -3197,6 +3197,10 @@ static int happy_meal_pci_probe(struct pci_dev *pdev,return 0 ; +err_out_free_coherent: +dma_free_coherent (hp->dma_dev,PAGE_SIZE , + hp->happy_block, hp->hblock_dvma); + err_out_iounmap:iounmap (hp->gregs);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 10/475 spi: Fix invalid sgs value
In reply to Greg Kroah-HartmanFrom: Biju Das <[email protected]>
[ Upstream commit 1a4e53d2fc4f68aa654ad96d13ad042e1a8e8a7d ]
max_seg_size is unsigned int and it can have a value up to 2^32 (for eg:-RZ_DMAC driver sets dma_set_max_seg_size as U32_MAX) When this value is used in min_t() as an integer type, it becomes -1 and the value of sgs becomes 0.
Fix this issue by replacing the 'int' data type with 'unsigned int' in min_t().
--- drivers/spi/spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/spi/spi.c +2 -2
@@ -844,10 +844,10 @@ int spi_map_buf(struct spi_controller *ctlr, struct device *dev,int i, ret;if (vmalloced_buf || kmap_buf) { - desc_len =min_t (int, max_seg_size,PAGE_SIZE ); + desc_len = min_t(unsigned int, max_seg_size, PAGE_SIZE); sgs =DIV_ROUND_UP (len +offset_in_page (buf), desc_len); }else if (virt_addr_valid (buf)) { - desc_len =min_t (int, max_seg_size, ctlr->max_dma_len); + desc_len = min_t(unsigned int, max_seg_size, ctlr->max_dma_len); sgs =DIV_ROUND_UP (len, desc_len); }else {return -EINVAL ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 11/475 net:mcf8390: Use platform_get_irq() to get the interrupt
In reply to Greg Kroah-HartmanFrom: Minghao Chi (CGEL ZTE) <[email protected]>
[ Upstream commit 2a760554dcba450d3ad61b32375b50ed6d59a87c ]
It is not recommened to use platform_get_resource(pdev, IORESOURCE_IRQ) for requesting IRQ's resources any more, as they can be not ready yet in case of DT-booting.
platform_get_irq() instead is a recommended way for getting IRQ even if it was not retrieved earlier.
It also makes code simpler because we're getting "int" value right away and no conversion from resource to int is required.
--- drivers/net/ethernet/8390/mcf8390.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/ethernet/8390/mcf8390.c +5 -5
@@ -406,12 +406,12 @@ static int mcf8390_init(struct net_device *dev)static int mcf8390_probe (struct platform_device *pdev) {struct net_device *dev; -struct resource *mem, *irq; +struct resource *mem;resource_size_t msize; -int ret; +int ret, irq; - irq =platform_get_resource (pdev,IORESOURCE_IRQ ,0 ); -if (irq ==NULL ) { + irq =platform_get_irq (pdev,0 ); +if (irq <0 ) {dev_err (&pdev->dev,"no IRQ specified?\n" );return -ENXIO ; }
@@ -434,7 +434,7 @@ static int mcf8390_probe(struct platform_device *pdev)SET_NETDEV_DEV (dev, &pdev->dev);platform_set_drvdata (pdev, dev); - dev->irq = irq->start; + dev->irq = irq; dev->base_addr = mem->start; ret =mcf8390_init (dev);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 12/475 spi: Fix erroneous sgs value with min_t()
In reply to Greg Kroah-HartmanFrom: Biju Das <[email protected]>
[ Upstream commit ebc4cb43ea5ada3db46c80156fca58a54b9bbca8 ]
While computing sgs in spi_map_buf(), the data type used in min_t() for max_seg_size is 'unsigned int' where as that of ctlr->max_dma_len is 'size_t'.
min_t(unsigned int,x,y) gives wrong results if one of x/y is 'size_t'
Consider the below examples on a 64-bit machine (ie size_t is 64-bits, and unsigned int is 32-bit).
case 1) min_t(unsigned int, 5, 0x100000001);
case 2) min_t(size_t, 5, 0x100000001);Case 1 returns '1', where as case 2 returns '5'. As you can see the result from case 1 is wrong.
This patch fixes the above issue by using the data type of the parameters that are used in min_t with maximum data length.
--- drivers/spi/spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/spi/spi.c +2 -2
@@ -844,10 +844,10 @@ int spi_map_buf(struct spi_controller *ctlr, struct device *dev,int i, ret;if (vmalloced_buf || kmap_buf) { - desc_len = min_t(unsigned int, max_seg_size, PAGE_SIZE); + desc_len = min_t(unsigned long, max_seg_size, PAGE_SIZE); sgs =DIV_ROUND_UP (len +offset_in_page (buf), desc_len); }else if (virt_addr_valid (buf)) { - desc_len = min_t(unsigned int, max_seg_size, ctlr->max_dma_len); + desc_len =min_t (size_t, max_seg_size, ctlr->max_dma_len); sgs =DIV_ROUND_UP (len, desc_len); }else {return -EINVAL ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 13/475 af_key: add __GFP_ZERO flag for compose_sadb_supported in function pfkey_register
In reply to Greg Kroah-HartmanFrom: Haimin Zhang <[email protected]>
[ Upstream commit 9a564bccb78a76740ea9d75a259942df8143d02c ]
Add __GFP_ZERO flag for compose_sadb_supported in function pfkey_register to initialize the buffer of supp_skb to fix a kernel-info-leak issue.
1) Function pfkey_register calls compose_sadb_supported to request a sk_buff. 2) compose_sadb_supported calls alloc_sbk to allocate a sk_buff, but it doesn't zero it. 3) If auth_len is greater 0, then compose_sadb_supported treats the memory as a struct sadb_supported and begins to initialize. But it just initializes the field sadb_supported_len and field sadb_supported_exttype without field sadb_supported_reserved.
--- net/key/af_key.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/key/af_key.c +1 -1
@@ -1703,7 +1703,7 @@ static int pfkey_register(struct sock *sk, struct sk_buff *skb, const struct sadxfrm_probe_algs (); - supp_skb =compose_sadb_supported (hdr,GFP_KERNEL ); + supp_skb =compose_sadb_supported (hdr,GFP_KERNEL | __GFP_ZERO);if (!supp_skb) {if (hdr->sadb_msg_satype !=SADB_SATYPE_UNSPEC ) pfk->registered &= ~(1 <<hdr->sadb_msg_satype);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 14/475 net: dsa: microchip: add spi_device_id tables
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit e981bc74aefc6a177b50c16cfa7023599799cf74 ]
Add spi_device_id tables to avoid logs like "SPI driver ksz9477-switch has no spi_device_id".
--- drivers/net/dsa/microchip/ksz8795_spi.c | 11 +++++++++++ drivers/net/dsa/microchip/ksz9477_spi.c | 12 ++++++++++++ 2 files changed, 23 insertions(+)
drivers/net/dsa/microchip/ksz8795_spi.c +11 -0
@@ -86,12 +86,23 @@ static const struct of_device_id ksz8795_dt_ids[] = { };MODULE_DEVICE_TABLE (of, ksz8795_dt_ids); +static const struct spi_device_id ksz8795_spi_ids[] = { + {"ksz8765" }, + {"ksz8794" }, + {"ksz8795" }, + {"ksz8863" }, + {"ksz8873" }, + { }, +}; +MODULE_DEVICE_TABLE (spi, ksz8795_spi_ids); +static struct spi_driver ksz8795_spi_driver = { .driver = { .name ="ksz8795-switch" , .owner =THIS_MODULE , .of_match_table =of_match_ptr (ksz8795_dt_ids), }, + .id_table = ksz8795_spi_ids, .probe = ksz8795_spi_probe, .remove = ksz8795_spi_remove, .shutdown = ksz8795_spi_shutdown,
drivers/net/dsa/microchip/ksz9477_spi.c +12 -0
@@ -88,12 +88,24 @@ static const struct of_device_id ksz9477_dt_ids[] = { };MODULE_DEVICE_TABLE (of, ksz9477_dt_ids); +static const struct spi_device_id ksz9477_spi_ids[] = { + {"ksz9477" }, + {"ksz9897" }, + {"ksz9893" }, + {"ksz9563" }, + {"ksz8563" }, + {"ksz9567" }, + { }, +}; +MODULE_DEVICE_TABLE (spi, ksz9477_spi_ids); +static struct spi_driver ksz9477_spi_driver = { .driver = { .name ="ksz9477-switch" , .owner =THIS_MODULE , .of_match_table =of_match_ptr (ksz9477_dt_ids), }, + .id_table = ksz9477_spi_ids, .probe = ksz9477_spi_probe, .remove = ksz9477_spi_remove, .shutdown = ksz9477_spi_shutdown,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 15/475 iommu/iova: Improve 32-bit free space estimate
In reply to Greg Kroah-HartmanFrom: Robin Murphy <[email protected]>
commit 5b61343b50590fb04a3f6be2cdc4868091757262 upstream.
For various reasons based on the allocator behaviour and typical use-cases at the time, when the max32_alloc_size optimisation was introduced it seemed reasonable to couple the reset of the tracked size to the update of cached32_node upon freeing a relevant IOVA. However, since subsequent optimisations focused on helping genuine 32-bit devices make best use of even more limited address spaces, it is now a lot more likely for cached32_node to be anywhere in a "full" 32-bit address space, and as such more likely for space to become available from IOVAs below that node being freed.
At this point, the short-cut in __cached_rbnode_delete_update() really doesn't hold up any more, and we need to fix the logic to reliably provide the expected behaviour. We still want cached32_node to only move upwards, but we should reset the allocation size if *any* 32-bit space has become available.
--- drivers/iommu/iova.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/iommu/iova.c +3 -2
@@ -138,10 +138,11 @@ __cached_rbnode_delete_update(struct iov cached_iova = rb_entry(iovad->cached32_node, struct iova, node);if (free == cached_iova || (free->pfn_hi < iovad->dma_32bit_pfn && - free->pfn_lo >= cached_iova->pfn_lo)) { + free->pfn_lo >= cached_iova->pfn_lo)) iovad->cached32_node =rb_next (&free->node); + +if (free->pfn_lo < iovad->dma_32bit_pfn) iovad->max32_alloc_size = iovad->dma_32bit_pfn; - } cached_iova = rb_entry(iovad->cached_node, struct iova, node);if (free->pfn_lo >= cached_iova->pfn_lo)
Greg Kroah-Hartman
maintainerPATCH 16/475 tpm: fix reference counting for struct tpm_chip
In reply to Greg Kroah-HartmanFrom: Lino Sanfilippo <[email protected]>
commit 7e0438f83dc769465ee663bb5dcf8cc154940712 upstream.
The following sequence of operations results in a refcount warning:
1. Open device /dev/tpmrm.
2. Remove module tpm_tis_spi.
3. Write a TPM command to the file descriptor opened at step 1.
------------[ cut here ]------------ WARNING: CPU: 3 PID: 1161 at lib/refcount.c:25 kobject_get+0xa0/0xa4 refcount_t: addition on 0; use-after-free. Modules linked in: tpm_tis_spi tpm_tis_core tpm mdio_bcm_unimac brcmfmac
sha256_generic libsha256 sha256_arm hci_uart btbcm bluetooth cfg80211 vc4 brcmutil ecdh_generic ecc snd_soc_core crc32_arm_ce libaes raspberrypi_hwmon ac97_bus snd_pcm_dmaengine bcm2711_thermal snd_pcm snd_timer genet snd phy_generic soundcore [last unloaded: spi_bcm2835]
CPU: 3 PID: 1161 Comm: hold_open Not tainted 5.10.0ls-main-dirty #2 Hardware name: BCM2711 [<c0410c3c>] (unwind_backtrace) from [<c040b580>] (show_stack+0x10/0x14) [<c040b580>] (show_stack) from [<c1092174>] (dump_stack+0xc4/0xd8) [<c1092174>] (dump_stack) from [<c0445a30>] (__warn+0x104/0x108) [<c0445a30>] (__warn) from [<c0445aa8>] (warn_slowpath_fmt+0x74/0xb8) [<c0445aa8>] (warn_slowpath_fmt) from [<c08435d0>] (kobject_get+0xa0/0xa4) [<c08435d0>] (kobject_get) from [<bf0a715c>] (tpm_try_get_ops+0x14/0x54 [tpm]) [<bf0a715c>] (tpm_try_get_ops [tpm]) from [<bf0a7d6c>] (tpm_common_write+0x38/0x60 [tpm]) [<bf0a7d6c>] (tpm_common_write [tpm]) from [<c05a7ac0>] (vfs_write+0xc4/0x3c0) [<c05a7ac0>] (vfs_write) from [<c05a7ee4>] (ksys_write+0x58/0xcc) [<c05a7ee4>] (ksys_write) from [<c04001a0>] (ret_fast_syscall+0x0/0x4c) Exception stack(0xc226bfa8 to 0xc226bff0) bfa0: 00000000 000105b4 00000003 beafe664 00000014 00000000 bfc0: 00000000 000105b4 000103f8 00000004 00000000 00000000 b6f9c000 beafe684 bfe0: 0000006c beafe648 0001056c b6eb6944 ---[ end trace d4b8409def9b8b1f ]---
The reason for this warning is the attempt to get the chip->dev reference in tpm_common_write() although the reference counter is already zero.
Since commit 8979b02aaf1d ("tpm: Fix reference count to main device") the extra reference used to prevent a premature zero counter is never taken, because the required TPM_CHIP_FLAG_TPM2 flag is never set.
Fix this by moving the TPM 2 character device handling from tpm_chip_alloc() to tpm_add_char_device() which is called at a later point in time when the flag has been set in case of TPM2.
Commit fdc915f7f719 ("tpm: expose spaces via a device link /dev/tpmrm<n>") already introduced function tpm_devs_release() to release the extra reference but did not implement the required put on chip->devs that results in the call of this function.
Fix this by putting chip->devs in tpm_chip_unregister().
Finally move the new implementation for the TPM 2 handling into a new function to avoid multiple checks for the TPM_CHIP_FLAG_TPM2 flag in the good case and error cases.
--- drivers/char/tpm/tpm-chip.c | 46 +++++------------------------ drivers/char/tpm/tpm.h | 2 + drivers/char/tpm/tpm2-space.c | 65 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 38 deletions(-)
drivers/char/tpm/tpm-chip.c +8 -38
@@ -274,14 +274,6 @@ static void tpm_dev_release(struct devickfree (chip); } -static void tpm_devs_release (struct device *dev) -{ - struct tpm_chip *chip = container_of(dev, struct tpm_chip, devs); - -/* release the master device reference */ -put_device (&chip->dev); -} -/** * tpm_class_shutdown() - prepare the TPM device for loss of power. * @dev: device to which the chip is associated.
@@ -344,7 +336,6 @@ struct tpm_chip *tpm_chip_alloc(struct d chip->dev_num = rc;device_initialize (&chip->dev); -device_initialize (&chip->devs); chip->dev.class = tpm_class; chip->dev.class->shutdown_pre = tpm_class_shutdown;
@@ -352,39 +343,20 @@ struct tpm_chip *tpm_chip_alloc(struct d chip->dev.parent = pdev; chip->dev.groups = chip->groups; - chip->devs.parent = pdev; - chip->devs.class = tpmrm_class; - chip->devs.release = tpm_devs_release; -/* get extra reference on main device to hold on -* behalf of devs. This holds the chip structure -* while cdevs is in use. The corresponding put -* is in the tpm_devs_release (TPM2 only) -*/ -if (chip->flags &TPM_CHIP_FLAG_TPM2 ) -get_device (&chip->dev); -if (chip->dev_num ==0 ) chip->dev.devt =MKDEV (MISC_MAJOR ,TPM_MINOR );else chip->dev.devt =MKDEV (MAJOR (tpm_devt), chip->dev_num); - chip->devs.devt = -MKDEV (MAJOR (tpm_devt), chip->dev_num +TPM_NUM_DEVICES ); - rc =dev_set_name (&chip->dev,"tpm%d" , chip->dev_num);if (rc) goto out; - rc =dev_set_name (&chip->devs,"tpmrm%d" , chip->dev_num); -if (rc) - goto out;if (!pdev) chip->flags |=TPM_CHIP_FLAG_VIRTUAL ;cdev_init (&chip->cdev, &tpm_fops); -cdev_init (&chip->cdevs, &tpmrm_fops); chip->cdev.owner =THIS_MODULE ; - chip->cdevs.owner =THIS_MODULE ; rc =tpm2_init_space (&chip->work_space,TPM2_SPACE_BUFFER_SIZE );if (rc) {
@@ -396,7 +368,6 @@ struct tpm_chip *tpm_chip_alloc(struct dreturn chip; out: -put_device (&chip->devs);put_device (&chip->dev);return ERR_PTR (rc); }
@@ -445,14 +416,9 @@ static int tpm_add_char_device(struct tp }if (chip->flags &TPM_CHIP_FLAG_TPM2 ) { - rc =cdev_device_add (&chip->cdevs, &chip->devs); -if (rc) { -dev_err (&chip->devs, -"unable to cdev_device_add() %s, major %d, minor %d, err=%d\n" , -dev_name (&chip->devs),MAJOR (chip->devs.devt), -MINOR (chip->devs.devt), rc); -return rc; - } + rc =tpm_devs_add (chip); +if (rc) + goto err_del_cdev; }/* Make the chip available. */
@@ -460,6 +426,10 @@ static int tpm_add_char_device(struct tpidr_replace (&dev_nums_idr, chip, chip->dev_num);mutex_unlock (&idr_lock); +return 0 ; + +err_del_cdev: +cdev_device_del (&chip->cdev, &chip->dev);return rc; }
@@ -641,7 +611,7 @@ void tpm_chip_unregister(struct tpm_chiphwrng_unregister (&chip->hwrng);tpm_bios_log_teardown (chip);if (chip->flags &TPM_CHIP_FLAG_TPM2 ) -cdev_device_del (&chip->cdevs, &chip->devs); +tpm_devs_remove (chip);tpm_del_char_device (chip); }EXPORT_SYMBOL_GPL (tpm_chip_unregister);
drivers/char/tpm/tpm.h +2 -0
@@ -466,6 +466,8 @@ int tpm2_prepare_space(struct tpm_chip * size_t cmdsiz);int tpm2_commit_space (struct tpm_chip *chip,struct tpm_space *space,void *buf,size_t *bufsiz); +int tpm_devs_add (struct tpm_chip *chip); +void tpm_devs_remove (struct tpm_chip *chip);void tpm_bios_log_setup (struct tpm_chip *chip);void tpm_bios_log_teardown (struct tpm_chip *chip);
drivers/char/tpm/tpm2-space.c +65 -0
68 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 17/475 block: Add a helper to validate the block size
In reply to Greg Kroah-HartmanFrom: Xie Yongji <[email protected]>
commit 570b1cac477643cbf01a45fa5d018430a1fddbce upstream.
There are some duplicated codes to validate the block size in block drivers. This limitation actually comes from block layer, so this patch tries to add a new block layer helper for that.
--- include/linux/blkdev.h | 8 ++++++++ 1 file changed, 8 insertions(+)
include/linux/blkdev.h +8 -0
@@ -59,6 +59,14 @@ struct blk_stat_callback;*/ #define BLKCG_MAX_POLS 5 +static inline int blk_validate_block_size (unsigned int bsize) +{ +if (bsize <512 || bsize >PAGE_SIZE || !is_power_of_2 (bsize)) +return -EINVAL ; + +return 0 ; +} +typedef void (rq_end_io_fn )(struct request *,blk_status_t );/*
Greg Kroah-Hartman
maintainerPATCH 18/475 virtio-blk: Use blk_validate_block_size() to validate block size
In reply to Greg Kroah-HartmanFrom: Xie Yongji <[email protected]>
commit 57a13a5b8157d9a8606490aaa1b805bafe6c37e1 upstream.
The block layer can't support a block size larger than page size yet. And a block size that's too small or not a power of two won't work either. If a misconfigured device presents an invalid block size in configuration space, it will result in the kernel crash something like below:
[ 506.154324] BUG: kernel NULL pointer dereference, address: 0000000000000008 [ 506.160416] RIP: 0010:create_empty_buffers+0x24/0x100 [ 506.174302] Call Trace: [ 506.174651] create_page_buffers+0x4d/0x60 [ 506.175207] block_read_full_page+0x50/0x380 [ 506.175798] ? __mod_lruvec_page_state+0x60/0xa0 [ 506.176412] ? __add_to_page_cache_locked+0x1b2/0x390 [ 506.177085] ? blkdev_direct_IO+0x4a0/0x4a0 [ 506.177644] ? scan_shadow_nodes+0x30/0x30 [ 506.178206] ? lru_cache_add+0x42/0x60 [ 506.178716] do_read_cache_page+0x695/0x740 [ 506.179278] ? read_part_sector+0xe0/0xe0 [ 506.179821] read_part_sector+0x36/0xe0 [ 506.180337] adfspart_check_ICS+0x32/0x320 [ 506.180890] ? snprintf+0x45/0x70 [ 506.181350] ? read_part_sector+0xe0/0xe0 [ 506.181906] bdev_disk_changed+0x229/0x5c0 [ 506.182483] blkdev_get_whole+0x6d/0x90 [ 506.183013] blkdev_get_by_dev+0x122/0x2d0 [ 506.183562] device_add_disk+0x39e/0x3c0 [ 506.184472] virtblk_probe+0x3f8/0x79b [virtio_blk] [ 506.185461] virtio_dev_probe+0x15e/0x1d0 [virtio]
So let's use a block layer helper to validate the block size.
--- drivers/block/virtio_blk.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/block/virtio_blk.c +10 -2
@@ -936,9 +936,17 @@ static int virtblk_probe(struct virtio_d err =virtio_cread_feature (vdev,VIRTIO_BLK_F_BLK_SIZE , struct virtio_blk_config, blk_size, &blk_size); -if (!err) +if (!err) { + err =blk_validate_block_size (blk_size); +if (err) { +dev_err (&vdev->dev, +"virtio_blk: invalid block size: 0x%x\n" , + blk_size); + goto out_free_tags; + } +blk_queue_logical_block_size (q, blk_size); -else + }else blk_size =queue_logical_block_size (q);/* Use topology information if available */
Greg Kroah-Hartman
maintainerPATCH 19/475 USB: usb-storage: Fix use of bitfields for hardware data in ene_ub6250.c
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
commit 1892bf90677abcad7f06e897e308f5c3e3618dd4 upstream.
The kernel test robot found a problem with the ene_ub6250 subdriver in
usb-storage: It uses structures containing bitfields to represent hardware bits in its SD_STATUS, MS_STATUS, and SM_STATUS bytes. This is not safe; it presumes a particular bit ordering and it assumes the compiler will not insert padding, neither of which is guaranteed.
This patch fixes the problem by changing the structures to simple u8 values, with the bitfields replaced by bitmask constants.
--- drivers/usb/storage/ene_ub6250.c | 153 +++++++++++++++++++-------------------- 1 file changed, 75 insertions(+), 78 deletions(-)
drivers/usb/storage/ene_ub6250.c +75 -78
@@ -237,36 +237,33 @@ static struct us_unusual_dev ene_ub6250_#define memstick_logaddr (logadr1, logadr0) ((((u16)(logadr1)) << 8) | (logadr0)) -struct SD_STATUS { -u8 Insert:1 ; -u8 Ready:1 ; -u8 MediaChange:1 ; -u8 IsMMC:1 ; -u8 HiCapacity:1 ; -u8 HiSpeed:1 ; -u8 WtP:1 ; -u8 Reserved:1 ; -}; - -struct MS_STATUS { -u8 Insert:1 ; -u8 Ready:1 ; -u8 MediaChange:1 ; -u8 IsMSPro:1 ; -u8 IsMSPHG:1 ; -u8 Reserved1:1 ; -u8 WtP:1 ; -u8 Reserved2:1 ; -}; - -struct SM_STATUS { -u8 Insert:1 ; -u8 Ready:1 ; -u8 MediaChange:1 ; -u8 Reserved:3 ; -u8 WtP:1 ; -u8 IsMS:1 ; -}; +/* SD_STATUS bits */ +#define SD_Insert BIT(0) +#define SD_Ready BIT(1) +#define SD_MediaChange BIT(2) +#define SD_IsMMC BIT(3) +#define SD_HiCapacity BIT(4) +#define SD_HiSpeed BIT(5) +#define SD_WtP BIT(6) +/* Bit 7 reserved */ + +/* MS_STATUS bits */ +#define MS_Insert BIT(0) +#define MS_Ready BIT(1) +#define MS_MediaChange BIT(2) +#define MS_IsMSPro BIT(3) +#define MS_IsMSPHG BIT(4) +/* Bit 5 reserved */ +#define MS_WtP BIT(6) +/* Bit 7 reserved */ + +/* SM_STATUS bits */ +#define SM_Insert BIT(0) +#define SM_Ready BIT(1) +#define SM_MediaChange BIT(2) +/* Bits 3-5 reserved */ +#define SM_WtP BIT(6) +#define SM_IsMS BIT(7)struct ms_bootblock_cis {u8 bCistplDEVICE[6 ];/* 0 */
@@ -437,9 +434,9 @@ struct ene_ub6250_info {u8 *bbuf;/* for 6250 code */ -struct SD_STATUS SD_Status; -struct MS_STATUS MS_Status; -struct SM_STATUS SM_Status; +u8 SD_Status; +u8 MS_Status; +u8 SM_Status;/* ----- SD Control Data ---------------- */ /*SD_REGISTER SD_Regs; */
@@ -602,7 +599,7 @@ static int sd_scsi_test_unit_ready(struc {struct ene_ub6250_info *info = (struct ene_ub6250_info *) us->extra; -if (info->SD_Status.Insert && info->SD_Status.Ready) +if ((info->SD_Status & SD_Insert) && (info->SD_Status & SD_Ready))return USB_STOR_TRANSPORT_GOOD ;else {ene_sd_init (us);
@@ -622,7 +619,7 @@ static int sd_scsi_mode_sense(struct us_0x0b ,0x00 ,0x80 ,0x08 ,0x00 ,0x00 , 0x71, 0xc0, 0x00, 0x00, 0x02, 0x00 }; -if (info->SD_Status.WtP) +if (info->SD_Status & SD_WtP)usb_stor_set_xfer_buf (mediaWP,12 , srb);else usb_stor_set_xfer_buf (mediaNoWP,12 , srb);
@@ -641,9 +638,9 @@ static int sd_scsi_read_capacity(structstruct ene_ub6250_info *info = (struct ene_ub6250_info *) us->extra;usb_stor_dbg (us,"sd_scsi_read_capacity\n" ); -if (info->SD_Status.HiCapacity) { +if (info->SD_Status & SD_HiCapacity) { bl_len =0x200 ; -if (info->SD_Status.IsMMC) +if (info->SD_Status & SD_IsMMC) bl_num = info->HC_C_SIZE-1 ;else bl_num = (info->HC_C_SIZE +1 ) *1024 -1 ;
@@ -693,7 +690,7 @@ static int sd_scsi_read(struct us_data *return USB_STOR_TRANSPORT_ERROR ; } -if (info->SD_Status.HiCapacity) +if (info->SD_Status & SD_HiCapacity) bnByte = bn;/* set up the command wrapper */
@@ -733,7 +730,7 @@ static int sd_scsi_write(struct us_datareturn USB_STOR_TRANSPORT_ERROR ; } -if (info->SD_Status.HiCapacity) +if (info->SD_Status & SD_HiCapacity) bnByte = bn;/* set up the command wrapper */
@@ -1455,7 +1452,7 @@ static int ms_scsi_test_unit_ready(strucstruct ene_ub6250_info *info = (struct ene_ub6250_info *)(us->extra);/* pr_info("MS_SCSI_Test_Unit_Ready\n"); */ -if (info->MS_Status.Insert && info->MS_Status.Ready) { +if ((info->MS_Status & MS_Insert) && (info->MS_Status & MS_Ready)) {return USB_STOR_TRANSPORT_GOOD ; }else {ene_ms_init (us);
@@ -1475,7 +1472,7 @@ static int ms_scsi_mode_sense(struct us_0x0b ,0x00 ,0x80 ,0x08 ,0x00 ,0x00 , 0x71, 0xc0, 0x00, 0x00, 0x02, 0x00 }; -if (info->MS_Status.WtP) +if (info->MS_Status & MS_WtP)usb_stor_set_xfer_buf (mediaWP,12 , srb);else usb_stor_set_xfer_buf (mediaNoWP,12 , srb);
@@ -1494,7 +1491,7 @@ static int ms_scsi_read_capacity(structusb_stor_dbg (us,"ms_scsi_read_capacity\n" ); bl_len =0x200 ; -if (info->MS_Status.IsMSPro) +if (info->MS_Status & MS_IsMSPro) bl_num = info->MSP_TotalBlock -1 ;else bl_num = info->MS_Lib.NumberOfLogBlock * info->MS_Lib.blockSize *2 -1 ;
@@ -1649,7 +1646,7 @@ static int ms_scsi_read(struct us_data *if (bn > info->bl_num)return USB_STOR_TRANSPORT_ERROR ; -if (info->MS_Status.IsMSPro) { +if (info->MS_Status & MS_IsMSPro) { result =ene_load_bincode (us,MSP_RW_PATTERN );if (result !=USB_STOR_XFER_GOOD ) {usb_stor_dbg (us,"Load MPS RW pattern Fail !!\n" );
@@ -1750,7 +1747,7 @@ static int ms_scsi_write(struct us_dataif (bn > info->bl_num)return USB_STOR_TRANSPORT_ERROR ; -if (info->MS_Status.IsMSPro) { +if (info->MS_Status & MS_IsMSPro) { result =ene_load_bincode (us,MSP_RW_PATTERN );if (result !=USB_STOR_XFER_GOOD ) {pr_info ("Load MSP RW pattern Fail !!\n" );
@@ -1858,12 +1855,12 @@ static int ene_get_card_status(struct us tmpreg = (u16 ) reg4b; reg4b = *(u32 *)(&buf[0x14 ]); -if (info->SD_Status.HiCapacity && !info->SD_Status.IsMMC) +if ((info->SD_Status & SD_HiCapacity) && !(info->SD_Status & SD_IsMMC)) info->HC_C_SIZE = (reg4b >>8 ) &0x3fffff ; info->SD_C_SIZE = ((tmpreg &0x03 ) <<10 ) | (u16)(reg4b >>22 ); info->SD_C_SIZE_MULT = (u8)(reg4b >>7 ) &0x07 ; -if (info->SD_Status.HiCapacity && info->SD_Status.IsMMC) +if ((info->SD_Status & SD_HiCapacity) && (info->SD_Status & SD_IsMMC)) info->HC_C_SIZE = *(u32 *)(&buf[0x100 ]);if (info->SD_READ_BL_LEN >SD_BLOCK_LEN ) {
@@ -2075,6 +2072,7 @@ static int ene_ms_init(struct us_data *uu16 MSP_BlockSize, MSP_UserAreaBlocks;struct ene_ub6250_info *info = (struct ene_ub6250_info *) us->extra;u8 *bbuf = info->bbuf; +unsigned int s;printk (KERN_INFO "transport --- ENE_MSInit\n" );
@@ -2099,15 +2097,16 @@ static int ene_ms_init(struct us_data *ureturn USB_STOR_TRANSPORT_ERROR ; }/* the same part to test ENE */ - info->MS_Status = *(struct MS_STATUS *) bbuf; + info->MS_Status = bbuf[0 ]; -if (info->MS_Status.Insert && info->MS_Status.Ready) { -printk (KERN_INFO "Insert = %x\n" , info->MS_Status.Insert); -printk (KERN_INFO "Ready = %x\n" , info->MS_Status.Ready); -printk (KERN_INFO "IsMSPro = %x\n" , info->MS_Status.IsMSPro); -printk (KERN_INFO "IsMSPHG = %x\n" , info->MS_Status.IsMSPHG); -printk (KERN_INFO "WtP= %x\n" , info->MS_Status.WtP); -if (info->MS_Status.IsMSPro) { + s = info->MS_Status; +if ((s & MS_Insert) && (s & MS_Ready)) { +printk (KERN_INFO "Insert = %x\n" , !!(s & MS_Insert)); +printk (KERN_INFO "Ready = %x\n" , !!(s & MS_Ready)); +printk (KERN_INFO "IsMSPro = %x\n" , !!(s & MS_IsMSPro)); +printk (KERN_INFO "IsMSPHG = %x\n" , !!(s & MS_IsMSPHG)); +printk (KERN_INFO "WtP= %x\n" , !!(s & MS_WtP)); +if (s & MS_IsMSPro) { MSP_BlockSize = (bbuf[6 ] <<8 ) | bbuf[7 ]; MSP_UserAreaBlocks = (bbuf[10 ] <<8 ) | bbuf[11 ]; info->MSP_TotalBlock = MSP_BlockSize * MSP_UserAreaBlocks;
@@ -2168,17 +2167,17 @@ static int ene_sd_init(struct us_data *ureturn USB_STOR_TRANSPORT_ERROR ; } - info->SD_Status = *(struct SD_STATUS *) bbuf; -if (info->SD_Status.Insert && info->SD_Status.Ready) { -struct SD_STATUS *s = &info->SD_Status; + info->SD_Status = bbuf[0 ]; +if ((info->SD_Status & SD_Insert) && (info->SD_Status & SD_Ready)) { +unsigned int s = info->SD_Status;ene_get_card_status (us, bbuf); -usb_stor_dbg (us,"Insert = %x\n" , s->Insert); -usb_stor_dbg (us,"Ready = %x\n" , s->Ready); -usb_stor_dbg (us,"IsMMC = %x\n" , s->IsMMC); -usb_stor_dbg (us,"HiCapacity = %x\n" , s->HiCapacity); -usb_stor_dbg (us,"HiSpeed = %x\n" , s->HiSpeed); -usb_stor_dbg (us,"WtP = %x\n" , s->WtP); +usb_stor_dbg (us,"Insert = %x\n" , !!(s & SD_Insert)); +usb_stor_dbg (us,"Ready = %x\n" , !!(s & SD_Ready)); +usb_stor_dbg (us,"IsMMC = %x\n" , !!(s & SD_IsMMC)); +usb_stor_dbg (us,"HiCapacity = %x\n" , !!(s & SD_HiCapacity)); +usb_stor_dbg (us,"HiSpeed = %x\n" , !!(s & SD_HiSpeed)); +usb_stor_dbg (us,"WtP = %x\n" , !!(s & SD_WtP)); }else {usb_stor_dbg (us,"SD Card Not Ready --- %x\n" , bbuf[0 ]);return USB_STOR_TRANSPORT_ERROR ;
@@ -2200,14 +2199,14 @@ static int ene_init(struct us_data *us) misc_reg03 = bbuf[0 ];if (misc_reg03 &0x01 ) { -if (!info->SD_Status.Ready) { +if (!(info->SD_Status & SD_Ready)) { result =ene_sd_init (us);if (result !=USB_STOR_XFER_GOOD )return USB_STOR_TRANSPORT_ERROR ; } }if (misc_reg03 &0x02 ) { -if (!info->MS_Status.Ready) { +if (!(info->MS_Status & MS_Ready)) { result =ene_ms_init (us);if (result !=USB_STOR_XFER_GOOD )return USB_STOR_TRANSPORT_ERROR ;
@@ -2306,14 +2305,14 @@ static int ene_transport(struct scsi_cmn/*US_DEBUG(usb_stor_show_command(us, srb)); */ scsi_set_resid (srb,0 ); -if (unlikely (!(info->SD_Status.Ready || info->MS_Status.Ready))) +if (unlikely (!(info->SD_Status & SD_Ready) || (info->MS_Status & MS_Ready))) result =ene_init (us);if (result ==USB_STOR_XFER_GOOD ) { result =USB_STOR_TRANSPORT_ERROR ; -if (info->SD_Status.Ready) +if (info->SD_Status & SD_Ready) result =sd_scsi_irp (us, srb); -if (info->MS_Status.Ready) +if (info->MS_Status & MS_Ready) result =ms_scsi_irp (us, srb); }return result;
@@ -2377,7 +2376,6 @@ static int ene_ub6250_probe(struct usb_istatic int ene_ub6250_resume (struct usb_interface *iface) { -u8 tmp =0 ;struct us_data *us =usb_get_intfdata (iface);struct ene_ub6250_info *info = (struct ene_ub6250_info *)(us->extra);
@@ -2389,17 +2387,16 @@ static int ene_ub6250_resume(struct usb_mutex_unlock (&us->dev_mutex); info->Power_IsResum = true; -/*info->SD_Status.Ready = 0; */ - info->SD_Status = *(struct SD_STATUS *)&tmp; - info->MS_Status = *(struct MS_STATUS *)&tmp; - info->SM_Status = *(struct SM_STATUS *)&tmp; +/* info->SD_Status &= ~SD_Ready; */ + info->SD_Status =0 ; + info->MS_Status =0 ; + info->SM_Status =0 ;return 0 ; }static int ene_ub6250_reset_resume (struct usb_interface *iface) { -u8 tmp =0 ;struct us_data *us =usb_get_intfdata (iface);struct ene_ub6250_info *info = (struct ene_ub6250_info *)(us->extra);
@@ -2411,10 +2408,10 @@ static int ene_ub6250_reset_resume(struc* the device */ info->Power_IsResum = true; -/*info->SD_Status.Ready = 0; */ - info->SD_Status = *(struct SD_STATUS *)&tmp; - info->MS_Status = *(struct MS_STATUS *)&tmp; - info->SM_Status = *(struct SM_STATUS *)&tmp; +/* info->SD_Status &= ~SD_Ready; */ + info->SD_Status =0 ; + info->MS_Status =0 ; + info->SM_Status =0 ;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 20/475 xhci: fix runtime PM imbalance in USB2 resume
In reply to Greg Kroah-HartmanFrom: Henry Lin <[email protected]>
commit 70c05e4cf63054cd755ca66c1819327b22cb085f upstream.
A race between system resume and device-initiated resume may result in runtime PM imbalance on USB2 root hub. If a device-initiated resume starts and system resume xhci_bus_resume() directs U0 before hub driver sees the resuming device in RESUME state, device-initiated resume will not be finished in xhci_handle_usb2_port_link_resume(). In this case, usb_hcd_end_port_resume() call is missing.
This changes calls usb_hcd_end_port_resume() if resuming device reaches U0 to keep runtime PM balance.
--- drivers/usb/host/xhci-hub.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/host/xhci-hub.c +3 -0
@@ -1000,6 +1000,9 @@ static void xhci_get_usb2_port_status(stif (link_state ==XDEV_U2 ) *status |=USB_PORT_STAT_L1 ;if (link_state ==XDEV_U0 ) { +if (bus_state->resume_done[portnum]) +usb_hcd_end_port_resume (&port->rhub->hcd->self, + portnum); bus_state->resume_done[portnum] =0 ;clear_bit (portnum, &bus_state->resuming_ports);if (bus_state->suspended_ports & (1 << portnum)) {
Greg Kroah-Hartman
maintainerPATCH 21/475 xhci: make xhci_handshake timeout for xhci_reset() adjustable
In reply to Greg Kroah-HartmanFrom: Mathias Nyman <[email protected]>
commit 14073ce951b5919da450022c050772902f24f054 upstream.
xhci_reset() timeout was increased from 250ms to 10 seconds in order to give Renesas 720201 xHC enough time to get ready in probe.
xhci_reset() is called with interrupts disabled in other places, and waiting for 10 seconds there is not acceptable.
Add a timeout parameter to xhci_reset(), and adjust it back to 250ms when called from xhci_stop() or xhci_shutdown() where interrupts are disabled, and successful reset isn't that critical.
This solves issues when deactivating host mode on platforms like SM8450.
For now don't change the timeout if xHC is reset in xhci_resume(). No issues are reported for it, and we need the reset to succeed. Locking around that reset needs to be revisited later.
Additionally change the signed integer timeout parameter in xhci_handshake() to a u64 to match the timeout value we pass to readl_poll_timeout_atomic()
--- drivers/usb/host/xhci-hub.c | 2 +- drivers/usb/host/xhci-mem.c | 2 +- drivers/usb/host/xhci.c | 20 +++++++++----------- drivers/usb/host/xhci.h | 7 +++++-- 4 files changed, 16 insertions(+), 15 deletions(-)
drivers/usb/host/xhci-hub.c +1 -1
@@ -674,7 +674,7 @@ static int xhci_exit_test_mode(struct xh }pm_runtime_allow (xhci_to_hcd (xhci)->self.controller); xhci->test_mode =0 ; -return xhci_reset (xhci); +return xhci_reset (xhci,XHCI_RESET_SHORT_USEC ); } void xhci_set_link_state(struct xhci_hcd *xhci, struct xhci_port *port,
drivers/usb/host/xhci-mem.c +1 -1
@@ -2583,7 +2583,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, fail:xhci_halt (xhci); -xhci_reset (xhci); +xhci_reset (xhci,XHCI_RESET_SHORT_USEC );xhci_mem_cleanup (xhci);return -ENOMEM ; }
drivers/usb/host/xhci.c +9 -11
@@ -66,7 +66,7 @@ static bool td_on_ring(struct xhci_td *t* handshake done). There are two failure modes: "usec" have passed (major * hardware flakeout), or the register reads as all-ones (hardware removed). */ -int xhci_handshake (void __iomem *ptr,u32 mask,u32 done,int usec) +int xhci_handshake (void __iomem *ptr,u32 mask,u32 done,u64 timeout_us) {u32 result;int ret;
@@ -74,7 +74,7 @@ int xhci_handshake(void __iomem *ptr, u3 ret =readl_poll_timeout_atomic (ptr, result, (result & mask) == done || result ==U32_MAX , -1 , usec); +1 , timeout_us);if (result ==U32_MAX )/* card removed */ return -ENODEV ;
@@ -163,7 +163,7 @@ int xhci_start(struct xhci_hcd *xhci)* Transactions will be terminated immediately, and operational registers * will be set to their defaults. */ -int xhci_reset (struct xhci_hcd *xhci) +int xhci_reset (struct xhci_hcd *xhci,u64 timeout_us) {u32 command;u32 state;
@@ -196,8 +196,7 @@ int xhci_reset(struct xhci_hcd *xhci)if (xhci->quirks &XHCI_INTEL_HOST )udelay (1000 ); - ret =xhci_handshake (&xhci->op_regs->command, -CMD_RESET ,0 ,10 *1000 *1000 ); + ret =xhci_handshake (&xhci->op_regs->command,CMD_RESET ,0 , timeout_us);if (ret)return ret;
@@ -210,8 +209,7 @@ int xhci_reset(struct xhci_hcd *xhci)* xHCI cannot write to any doorbells or operational registers other * than status until the "Controller Not Ready" flag is cleared. */ - ret =xhci_handshake (&xhci->op_regs->status, -STS_CNR ,0 ,10 *1000 *1000 ); + ret =xhci_handshake (&xhci->op_regs->status,STS_CNR ,0 , timeout_us); xhci->usb2_rhub.bus_state.port_c_suspend =0 ; xhci->usb2_rhub.bus_state.suspended_ports =0 ;
@@ -732,7 +730,7 @@ static void xhci_stop(struct usb_hcd *hc xhci->xhc_state |=XHCI_STATE_HALTED ; xhci->cmd_ring_state =CMD_RING_STATE_STOPPED ;xhci_halt (xhci); -xhci_reset (xhci); +xhci_reset (xhci,XHCI_RESET_SHORT_USEC );spin_unlock_irq (&xhci->lock);xhci_cleanup_msix (xhci);
@@ -785,7 +783,7 @@ void xhci_shutdown(struct usb_hcd *hcd)xhci_halt (xhci);/* Workaround for spurious wakeups at shutdown with HSW */ if (xhci->quirks &XHCI_SPURIOUS_WAKEUP ) -xhci_reset (xhci); +xhci_reset (xhci,XHCI_RESET_SHORT_USEC );spin_unlock_irq (&xhci->lock);xhci_cleanup_msix (xhci);
@@ -1170,7 +1168,7 @@ int xhci_resume(struct xhci_hcd *xhci, bxhci_dbg (xhci,"Stop HCD\n" );xhci_halt (xhci);xhci_zero_64b_regs (xhci); - retval =xhci_reset (xhci); + retval =xhci_reset (xhci,XHCI_RESET_LONG_USEC );spin_unlock_irq (&xhci->lock);if (retval)return retval;
@@ -5272,7 +5270,7 @@ int xhci_gen_setup(struct usb_hcd *hcd,xhci_dbg (xhci,"Resetting HCD\n" );/* Reset the internal HC memory state and registers. */ - retval =xhci_reset (xhci); + retval =xhci_reset (xhci,XHCI_RESET_LONG_USEC );if (retval)return retval;xhci_dbg (xhci,"Reset complete\n" );
drivers/usb/host/xhci.h +5 -2
@@ -229,6 +229,9 @@ struct xhci_op_regs {#define CMD_ETE (1 << 14)/* bits 15:31 are reserved (and should be preserved on writes). */ +#define XHCI_RESET_LONG_USEC (10 * 1000 * 1000) +#define XHCI_RESET_SHORT_USEC (250 * 1000) +/* IMAN - Interrupt Management Register */ #define IMAN_IE (1 << 1)#define IMAN_IP (1 << 0)
@@ -2061,11 +2064,11 @@ void xhci_free_container_ctx(struct xhci/* xHCI host controller glue */ typedef void (*xhci_get_quirks_t )(struct device *,struct xhci_hcd *); -int xhci_handshake (void __iomem *ptr,u32 mask,u32 done,int usec); +int xhci_handshake (void __iomem *ptr,u32 mask,u32 done,u64 timeout_us);void xhci_quiesce (struct xhci_hcd *xhci);int xhci_halt (struct xhci_hcd *xhci);int xhci_start (struct xhci_hcd *xhci); -int xhci_reset (struct xhci_hcd *xhci); +int xhci_reset (struct xhci_hcd *xhci,u64 timeout_us);int xhci_run (struct usb_hcd *hcd);int xhci_gen_setup (struct usb_hcd *hcd,xhci_get_quirks_t get_quirks);void xhci_shutdown (struct usb_hcd *hcd);
Greg Kroah-Hartman
maintainerPATCH 22/475 xhci: fix uninitialized string returned by xhci_decode_ctrl_ctx()
In reply to Greg Kroah-HartmanFrom: Anssi Hannula <[email protected]>
commit 05519b8589a679edb8fa781259893d20bece04ad upstream.
xhci_decode_ctrl_ctx() returns the untouched buffer as-is if both "drop" and "add" parameters are zero.
Fix the function to return an empty string in that case.
It was not immediately clear from the possible call chains whether this issue is currently actually triggerable or not.
Note that before commit 4843b4b5ec64 ("xhci: fix even more unsafe memory usage in xhci tracing") the result effect in the failure case was different as a static buffer was used here, but the code still worked incorrectly.
commit 4843b4b5ec64 ("xhci: fix even more unsafe memory usage in xhci tracing")
--- drivers/usb/host/xhci.h | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/host/xhci.h +2 -0
@@ -2452,6 +2452,8 @@ static inline const char *xhci_decode_ctunsigned int bit;int ret =0 ; + str[0 ] ='\0' ; +if (drop) { ret =sprintf (str,"Drop:" );for_each_set_bit (bit, &drop,32 )
Greg Kroah-Hartman
maintainerPATCH 23/475 coresight: Fix TRCCONFIGR.QE sysfs interface
In reply to Greg Kroah-HartmanFrom: James Clark <[email protected]>
commit ea75a342aed5ed72c87f38fbe0df2f5df7eae374 upstream.
It's impossible to program a valid value for TRCCONFIGR.QE when TRCIDR0.QSUPP==0b10. In that case the following is true:
Q element support is implemented, and only supports Q elements without instruction counts. TRCCONFIGR.QE can only take the values 0b00 or 0b11.
Currently the low bit of QSUPP is checked to see if the low bit of QE can be written to, but as you can see when QSUPP==0b10 the low bit is cleared making it impossible to ever write the only valid value of 0b11 to QE. 0b10 would be written instead, which is a reserved QE value even for all values of QSUPP.
The fix is to allow writing the low bit of QE for any non zero value of QSUPP.
This change also ensures that the low bit is always set, even when the user attempts to only set the high bit.
--- drivers/hwtracing/coresight/coresight-etm4x-sysfs.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/hwtracing/coresight/coresight-etm4x-sysfs.c +6 -2
@@ -364,8 +364,12 @@ static ssize_t mode_store(struct device mode =ETM_MODE_QELEM (config->mode);/* start by clearing QE bits */ config->cfg &= ~(BIT (13 ) |BIT (14 )); -/* if supported, Q elements with instruction counts are enabled */ -if ((mode &BIT (0 )) && (drvdata->q_support &BIT (0 ))) +/* +* if supported, Q elements with instruction counts are enabled. +* Always set the low bit for any requested mode. Valid combos are +* 0b00, 0b01 and 0b11. +*/ +if (mode && drvdata->q_support) config->cfg |=BIT (13 );/* * if supported, Q elements with and without instruction
Greg Kroah-Hartman
maintainerPATCH 24/475 iio: afe: rescale: use s64 for temporary scale calculations
In reply to Greg Kroah-HartmanFrom: Liam Beguin <[email protected]>
commit 51593106b608ae4247cc8da928813347da16d025 upstream.
All four scaling coefficients can take signed values. Make tmp a signed 64-bit integer and switch to div_s64() to preserve signs during 64-bit divisions.
--- drivers/iio/afe/iio-rescale.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/iio/afe/iio-rescale.c +4 -4
@@ -38,7 +38,7 @@ static int rescale_read_raw(struct iio_d int *val, int *val2, long mask) { struct rescale *rescale = iio_priv(indio_dev); -unsigned long long tmp; +s64 tmp;int ret;switch (mask) {
@@ -59,10 +59,10 @@ static int rescale_read_raw(struct iio_d *val2 = rescale->denominator;return IIO_VAL_FRACTIONAL ;case IIO_VAL_FRACTIONAL_LOG2 : - tmp = *val *1000000000LL ; -do_div (tmp, rescale->denominator); + tmp = (s64)*val *1000000000LL ; + tmp =div_s64 (tmp, rescale->denominator); tmp *= rescale->numerator; -do_div (tmp,1000000000LL ); + tmp =div_s64 (tmp,1000000000LL ); *val = tmp;return ret;default :
Greg Kroah-Hartman
maintainerPATCH 25/475 iio: inkern: apply consumer scale on IIO_VAL_INT cases
In reply to Greg Kroah-HartmanFrom: Liam Beguin <[email protected]>
commit 1bca97ff95c732a516ebb68da72814194980e0a5 upstream.
When a consumer calls iio_read_channel_processed() and the channel has an integer scale, the scale channel scale is applied and the processed value is returned as expected.
On the other hand, if the consumer calls iio_convert_raw_to_processed() the scaling factor requested by the consumer is not applied.
This for example causes the consumer to process mV when expecting uV. Make sure to always apply the scaling factor requested by the consumer.
--- drivers/iio/inkern.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/inkern.c +1 -1
@@ -609,7 +609,7 @@ static int iio_convert_raw_to_processed_switch (scale_type) {case IIO_VAL_INT : - *processed = raw64 * scale_val; + *processed = raw64 * scale_val * scale;break ;case IIO_VAL_INT_PLUS_MICRO :if (scale_val2 <0 )
Greg Kroah-Hartman
maintainerPATCH 26/475 iio: inkern: apply consumer scale when no channel scale is available
In reply to Greg Kroah-HartmanFrom: Liam Beguin <[email protected]>
commit 14b457fdde38de594a4bc4bd9075019319d978da upstream.
When a consumer calls iio_read_channel_processed() and no channel scale is available, it's assumed that the scale is one and the raw value is returned as expected.
On the other hand, if the consumer calls iio_convert_raw_to_processed() the scaling factor requested by the consumer is not applied.
This for example causes the consumer to process mV when expecting uV. Make sure to always apply the scaling factor requested by the consumer.
--- drivers/iio/inkern.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/iio/inkern.c +3 -3
@@ -600,10 +600,10 @@ static int iio_convert_raw_to_processed_ IIO_CHAN_INFO_SCALE);if (scale_type <0 ) {/* -* Just pass raw values as processed if no scaling is -* available. +* If no channel scaling is available apply consumer scale to +* raw value and return. */ - *processed = raw; + *processed = raw * scale;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 27/475 iio: inkern: make a best effort on offset calculation
In reply to Greg Kroah-HartmanFrom: Liam Beguin <[email protected]>
commit ca85123354e1a65a22170286387b4791997fe864 upstream.
iio_convert_raw_to_processed_unlocked() assumes the offset is an integer. Make a best effort to get a valid offset value for fractional cases without breaking implicit truncations.
--- drivers/iio/inkern.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-)
drivers/iio/inkern.c +27 -5
@@ -588,13 +588,35 @@ EXPORT_SYMBOL_GPL(iio_read_channel_averastatic int iio_convert_raw_to_processed_unlocked (struct iio_channel *chan,int raw,int *processed,unsigned int scale) { -int scale_type, scale_val, scale_val2, offset; +int scale_type, scale_val, scale_val2; +int offset_type, offset_val, offset_val2;s64 raw64 = raw; -int ret; - ret =iio_channel_read (chan, &offset,NULL ,IIO_CHAN_INFO_OFFSET ); -if (ret >=0 ) - raw64 += offset; + offset_type =iio_channel_read (chan, &offset_val, &offset_val2, +IIO_CHAN_INFO_OFFSET ); +if (offset_type >=0 ) { +switch (offset_type) { +case IIO_VAL_INT : +break ; +case IIO_VAL_INT_PLUS_MICRO : +case IIO_VAL_INT_PLUS_NANO : +/* +* Both IIO_VAL_INT_PLUS_MICRO and IIO_VAL_INT_PLUS_NANO +* implicitely truncate the offset to it's integer form. +*/ +break ; +case IIO_VAL_FRACTIONAL : + offset_val /= offset_val2; +break ; +case IIO_VAL_FRACTIONAL_LOG2 : + offset_val >>= offset_val2; +break ; +default : +return -EINVAL ; + } + + raw64 += offset_val; + } scale_type =iio_channel_read (chan, &scale_val, &scale_val2,IIO_CHAN_INFO_SCALE );
Greg Kroah-Hartman
maintainerPATCH 28/475 greybus: svc: fix an error handling bug in gb_svc_hello()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit 5f8583a3b7552092582a92e7bbd2153319929ad7 upstream.
Cleanup if gb_svc_queue_deferred_request() fails.
--- drivers/greybus/svc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/greybus/svc.c +7 -1
@@ -866,8 +866,14 @@ static int gb_svc_hello(struct gb_operatgb_svc_debugfs_init (svc); -return gb_svc_queue_deferred_request (op); + ret =gb_svc_queue_deferred_request (op); +if (ret) + goto err_remove_debugfs; +return 0 ; + +err_remove_debugfs: +gb_svc_debugfs_exit (svc); err_unregister_device:gb_svc_watchdog_destroy (svc);device_del (&svc->dev);
Greg Kroah-Hartman
maintainerPATCH 29/475 clk: uniphier: Fix fixed-rate initialization
In reply to Greg Kroah-HartmanFrom: Kunihiko Hayashi <[email protected]>
commit ca85a66710a8a1f6b0719397225c3e9ee0abb692 upstream.
Fixed-rate clocks in UniPhier don't have any parent clocks, however, initial data "init.flags" isn't initialized, so it might be determined that there is a parent clock for fixed-rate clock.
This sets init.flags to zero as initialization.
--- drivers/clk/uniphier/clk-uniphier-fixed-rate.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/uniphier/clk-uniphier-fixed-rate.c +1 -0
@@ -24,6 +24,7 @@ struct clk_hw *uniphier_clk_register_fix init.name = name; init.ops = &clk_fixed_rate_ops; + init.flags =0 ; init.parent_names =NULL ; init.num_parents =0 ;
Greg Kroah-Hartman
maintainerPATCH 30/475 ptrace: Check PTRACE_O_SUSPEND_SECCOMP permission on PTRACE_SEIZE
In reply to Greg Kroah-HartmanFrom: Jann Horn <[email protected]>
commit ee1fee900537b5d9560e9f937402de5ddc8412f3 upstream.
Setting PTRACE_O_SUSPEND_SECCOMP is supposed to be a highly privileged operation because it allows the tracee to completely bypass all seccomp filters on kernels with CONFIG_CHECKPOINT_RESTORE=y. It is only supposed to be settable by a process with global CAP_SYS_ADMIN, and only if that process is not subject to any seccomp filters at all.
However, while these permission checks were done on the PTRACE_SETOPTIONS path, they were missing on the PTRACE_SEIZE path, which also sets user-specified ptrace flags.
Move the permissions checks out into a helper function and let both ptrace_attach() and ptrace_setoptions() call it.
--- kernel/ptrace.c | 47 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 15 deletions(-)
kernel/ptrace.c +32 -15
@@ -370,6 +370,26 @@ bool ptrace_may_access(struct task_strucreturn !err; } +static int check_ptrace_options (unsigned long data) +{ +if (data & ~(unsigned long )PTRACE_O_MASK ) +return -EINVAL ; + +if (unlikely (data &PTRACE_O_SUSPEND_SECCOMP )) { +if (!IS_ENABLED (CONFIG_CHECKPOINT_RESTORE ) || + !IS_ENABLED (CONFIG_SECCOMP )) +return -EINVAL ; + +if (!capable (CAP_SYS_ADMIN )) +return -EPERM ; + +if (seccomp_mode (¤t->seccomp) !=SECCOMP_MODE_DISABLED || + current->ptrace &PT_SUSPEND_SECCOMP ) +return -EPERM ; + } +return 0 ; +} +static int ptrace_attach (struct task_struct *task,long request,unsigned long addr,unsigned long flags)
@@ -381,8 +401,16 @@ static int ptrace_attach(struct task_strif (seize) {if (addr !=0 ) goto out; +/* +* This duplicates the check in check_ptrace_options() because +* ptrace_attach() and ptrace_setoptions() have historically +* used different error codes for unknown ptrace options. +*/ if (flags & ~(unsigned long )PTRACE_O_MASK ) goto out; + retval =check_ptrace_options (flags); +if (retval) +return retval; flags =PT_PTRACED |PT_SEIZED | (flags <<PT_OPT_FLAG_SHIFT ); }else { flags =PT_PTRACED ;
@@ -655,22 +683,11 @@ int ptrace_writedata(struct task_structstatic int ptrace_setoptions (struct task_struct *child,unsigned long data) {unsigned flags; +int ret; -if (data & ~(unsigned long )PTRACE_O_MASK ) -return -EINVAL ; - -if (unlikely (data &PTRACE_O_SUSPEND_SECCOMP )) { -if (!IS_ENABLED (CONFIG_CHECKPOINT_RESTORE ) || - !IS_ENABLED (CONFIG_SECCOMP )) -return -EINVAL ; - -if (!capable (CAP_SYS_ADMIN )) -return -EPERM ; - -if (seccomp_mode (¤t->seccomp) !=SECCOMP_MODE_DISABLED || - current->ptrace &PT_SUSPEND_SECCOMP ) -return -EPERM ; - } + ret =check_ptrace_options (data); +if (ret) +return ret;/* Avoid intermediate state when all opts are cleared */ flags = child->ptrace;
Greg Kroah-Hartman
maintainerPATCH 31/475 KEYS: fix length validation in keyctl_pkey_params_get_2()
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
commit c51abd96837f600d8fd940b6ab8e2da578575504 upstream.
In many cases, keyctl_pkey_params_get_2() is validating the user buffer lengths against the wrong algorithm properties. Fix it to check against the correct properties.
Probably this wasn't noticed before because for all asymmetric keys of the "public_key" subtype, max_data_size == max_sig_size == max_enc_size == max_dec_size. However, this isn't necessarily true for the "asym_tpm" subtype (it should be, but it's not strictly validated). Of course, future key types could have different values as well.
--- security/keys/keyctl_pkey.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
security/keys/keyctl_pkey.c +11 -3
@@ -135,15 +135,23 @@ static int keyctl_pkey_params_get_2(consswitch (op) {case KEYCTL_PKEY_ENCRYPT : +if (uparams.in_len > info.max_dec_size || + uparams.out_len > info.max_enc_size) +return -EINVAL ; +break ;case KEYCTL_PKEY_DECRYPT :if (uparams.in_len > info.max_enc_size || uparams.out_len > info.max_dec_size)return -EINVAL ;break ;case KEYCTL_PKEY_SIGN : +if (uparams.in_len > info.max_data_size || + uparams.out_len > info.max_sig_size) +return -EINVAL ; +break ;case KEYCTL_PKEY_VERIFY : -if (uparams.in_len > info.max_sig_size || - uparams.out_len > info.max_data_size) +if (uparams.in_len > info.max_data_size || + uparams.in2_len > info.max_sig_size)return -EINVAL ;break ;default :
@@ -151,7 +159,7 @@ static int keyctl_pkey_params_get_2(cons } params->in_len = uparams.in_len; - params->out_len = uparams.out_len; + params->out_len = uparams.out_len;/* Note: same as in2_len */ return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 32/475 Documentation: add link to stable release candidate tree
In reply to Greg Kroah-HartmanFrom: Bagas Sanjaya <[email protected]>
commit 587d39b260c4d090166314d64be70b1f6a26b0b5 upstream.
There is also stable release candidate tree. Mention it, however with a warning that the tree is for testing purposes.
--- Documentation/process/stable-kernel-rules.rst | 9 +++++++++ 1 file changed, 9 insertions(+)
Documentation/process/stable-kernel-rules.rst +9 -0
@@ -176,6 +176,15 @@ Trees https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git + - The release candidate of all stable kernel versions can be found at: + + https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/ + + .. warning:: + The -stable-rc tree is a snapshot in time of the stable-queue tree and + will change frequently, hence will be rebased often. It should only be + used for testing purposes (e.g. to be consumed by CI systems). + Review committee ----------------
Greg Kroah-Hartman
maintainerPATCH 33/475 Documentation: update stable tree link
In reply to Greg Kroah-HartmanFrom: Bagas Sanjaya <[email protected]>
commit 555d44932c67e617d89bc13c81c7efac5b51fcfa upstream.
The link to stable tree is redirected to
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git. Update accordingly.
--- Documentation/process/stable-kernel-rules.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/process/stable-kernel-rules.rst +1 -1
@@ -174,7 +174,7 @@ Trees - The finalized and tagged releases of all stable kernels can be found in separate branches per version at: - https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git + https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git - The release candidate of all stable kernel versions can be found at:
Greg Kroah-Hartman
maintainerPATCH 34/475 HID: intel-ish-hid: Use dma_alloc_coherent for firmware update
In reply to Greg Kroah-HartmanFrom: Gwendal Grignou <[email protected]>
commit f97ec5d75e9261a5da78dc28a8955b7cc0c4468b upstream.
Allocating memory with kmalloc and GPF_DMA32 is not allowed, the allocator will ignore the attribute.
Instead, use dma_alloc_coherent() API as we allocate a small amount of memory to transfer firmware fragment to the ISH.
On Arcada chromebook, after the patch the warning:
"Unexpected gfp: 0x4 (GFP_DMA32). Fixing up to gfp: 0xcc0 (GFP_KERNEL). Fix your code!" is gone. The ISH firmware is loaded properly and we can interact with
the ISH:
Quoted 1 line
ectool --name
cros_ishversion
...
Build info: arcada_ish_v2.0.3661+3c1a1c1ae0 2022-02-08 05:37:47 @localhost Tool version: v2.0.12300-900b03ec7f 2022-02-08 10:01:48 @localhost
--- drivers/hid/intel-ish-hid/ishtp-fw-loader.c | 29 ++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-)
drivers/hid/intel-ish-hid/ishtp-fw-loader.c +3 -26
@@ -656,21 +656,12 @@ static int ish_fw_xfer_direct_dma(struct*/ payload_max_size &= ~(L1_CACHE_BYTES -1 ); - dma_buf =kmalloc (payload_max_size,GFP_KERNEL |GFP_DMA32 ); + dma_buf =dma_alloc_coherent (devc, payload_max_size, &dma_buf_phy,GFP_KERNEL );if (!dma_buf) { client_data->flag_retry = true;return -ENOMEM ; } - dma_buf_phy =dma_map_single (devc, dma_buf, payload_max_size, -DMA_TO_DEVICE ); -if (dma_mapping_error (devc, dma_buf_phy)) { -dev_err (cl_data_to_dev (client_data),"DMA map failed\n" ); - client_data->flag_retry = true; - rv = -ENOMEM ; - goto end_err_dma_buf_release; - } - ldr_xfer_dma_frag.fragment.hdr.command =LOADER_CMD_XFER_FRAGMENT ; ldr_xfer_dma_frag.fragment.xfer_mode =LOADER_XFER_MODE_DIRECT_DMA ; ldr_xfer_dma_frag.ddr_phys_addr = (u64 )dma_buf_phy;
@@ -690,14 +681,7 @@ static int ish_fw_xfer_direct_dma(struct ldr_xfer_dma_frag.fragment.size = fragment_size;memcpy (dma_buf, &fw->data[fragment_offset], fragment_size); -dma_sync_single_for_device (devc, dma_buf_phy, - payload_max_size, -DMA_TO_DEVICE ); - -/* -* Flush cache here because the dma_sync_single_for_device() -* does not do for x86. -*/ +/* Flush cache to be sure the data is in main memory. */ clflush_cache_range (dma_buf, payload_max_size); dev_dbg(cl_data_to_dev(client_data),
@@ -720,15 +704,8 @@ static int ish_fw_xfer_direct_dma(struct fragment_offset += fragment_size; } -dma_unmap_single (devc, dma_buf_phy, payload_max_size,DMA_TO_DEVICE ); -kfree (dma_buf); -return 0 ; - end_err_resp_buf_release: -/* Free ISH buffer if not done already, in error case */ -dma_unmap_single (devc, dma_buf_phy, payload_max_size,DMA_TO_DEVICE ); -end_err_dma_buf_release: -kfree (dma_buf); +dma_free_coherent (devc, payload_max_size, dma_buf, dma_buf_phy);return rv; }
Greg Kroah-Hartman
maintainerPATCH 35/475 SUNRPC: avoid race between mod_timer() and del_timer_sync()
In reply to Greg Kroah-HartmanFrom: NeilBrown <[email protected]>
commit 3848e96edf4788f772d83990022fa7023a233d83 upstream.
xprt_destory() claims XPRT_LOCKED and then calls del_timer_sync(). Both xprt_unlock_connect() and xprt_release() call
->release_xprt()
which drops XPRT_LOCKED and *then* xprt_schedule_autodisconnect() which calls mod_timer().
This may result in mod_timer() being called *after* del_timer_sync(). When this happens, the timer may fire long after the xprt has been freed, and run_timer_softirq() will probably crash.
The pairing of ->release_xprt() and xprt_schedule_autodisconnect() is always called under ->transport_lock. So if we take ->transport_lock to call del_timer_sync(), we can be sure that mod_timer() will run first (if it runs at all).
--- net/sunrpc/xprt.c | 7 +++++++ 1 file changed, 7 insertions(+)
net/sunrpc/xprt.c +7 -0
@@ -2006,7 +2006,14 @@ static void xprt_destroy(struct rpc_xprt*/ wait_on_bit_lock (&xprt->state,XPRT_LOCKED ,TASK_UNINTERRUPTIBLE ); +/* +* xprt_schedule_autodisconnect() can run after XPRT_LOCKED +* is cleared. We use ->transport_lock to ensure the mod_timer() +* can only run *before* del_time_sync(), never after. +*/ +spin_lock (&xprt->transport_lock);del_timer_sync (&xprt->timer); +spin_unlock (&xprt->transport_lock);/* * Destroy sockets etc from the system workqueue so they can
Greg Kroah-Hartman
maintainerPATCH 36/475 NFSD: prevent underflow in nfssvc_decode_writeargs()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit 184416d4b98509fb4c3d8fc3d6dc1437896cc159 upstream.
Smatch complains:
fs/nfsd/nfsxdr.c:341 nfssvc_decode_writeargs() warn: no lower bound on 'args->len'
Change the type to unsigned to prevent this issue.
--- fs/nfsd/nfsproc.c | 2 +- fs/nfsd/xdr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
fs/nfsd/nfsproc.c +1 -1
@@ -230,7 +230,7 @@ nfsd_proc_write(struct svc_rqst *rqstp)unsigned long cnt = argp->len;unsigned int nvecs; -dprintk ("nfsd: WRITE %s %d bytes at %d\n" , +dprintk ("nfsd: WRITE %s %u bytes at %d\n" ,SVCFH_fmt (&argp->fh), argp->len, argp->offset);
fs/nfsd/xdr.h +1 -1
@@ -33,7 +33,7 @@ struct nfsd_readargs {struct nfsd_writeargs {svc_fh fh;__u32 offset; -int len; +__u32 len;struct kvec first; };
Greg Kroah-Hartman
maintainerPATCH 37/475 NFSD: prevent integer overflow on 32 bit systems
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit 23a9dbbe0faf124fc4c139615633b9d12a3a89ef upstream.
On a 32 bit system, the "len * sizeof(*p)" operation can have an integer overflow.
--- include/linux/sunrpc/xdr.h | 2 ++ 1 file changed, 2 insertions(+)
include/linux/sunrpc/xdr.h +2 -0
@@ -536,6 +536,8 @@ xdr_stream_decode_uint32_array(struct xdif (unlikely (xdr_stream_decode_u32 (xdr, &len) <0 ))return -EBADMSG ; +if (len >SIZE_MAX /sizeof (*p)) +return -EBADMSG ; p =xdr_inline_decode (xdr, len *sizeof (*p));if (unlikely (!p))return -EBADMSG ;
Greg Kroah-Hartman
maintainerPATCH 38/475 f2fs: fix to unlock page correctly in error path of is_alive()
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
commit 6d18762ed5cd549fde74fd0e05d4d87bac5a3beb upstream.
As Pavel Machek reported in below link [1]:
After commit 77900c45ee5c ("f2fs: fix to do sanity check in is_alive()"), node page should be unlock via calling f2fs_put_page() in the error path of is_alive(), otherwise, f2fs may hang when it tries to lock the node page, fix it.
[1] https://lore.kernel.org/stable/[email protected]/
--- fs/f2fs/gc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/f2fs/gc.c +3 -1
@@ -633,8 +633,10 @@ static bool is_alive(struct f2fs_sb_infoset_sbi_flag (sbi,SBI_NEED_FSCK ); } -if (f2fs_check_nid_range (sbi, dni->ino)) +if (f2fs_check_nid_range (sbi, dni->ino)) { +f2fs_put_page (node_page,1 );return false; + } *nofs =ofs_of_node (node_page); source_blkaddr =datablock_addr (NULL , node_page, ofs_in_node);
Greg Kroah-Hartman
maintainerPATCH 39/475 f2fs: quota: fix loop condition at f2fs_quota_sync()
In reply to Greg Kroah-HartmanFrom: Juhyung Park <[email protected]>
commit 680af5b824a52faa819167628665804a14f0e0df upstream.
cnt should be passed to sb_has_quota_active() instead of type to check active quota properly.
Moreover, when the type is -1, the compiler with enough inline knowledge can discard sb_has_quota_active() check altogether, causing a NULL pointer dereference at the following inode_lock(dqopt->files[cnt]):
[ 2.796010] Unable to handle kernel NULL pointer dereference at virtual address 00000000000000a0 [ 2.796024] Mem abort info: [ 2.796025] ESR = 0x96000005 [ 2.796028] EC = 0x25: DABT (current EL), IL = 32 bits [ 2.796029] SET = 0, FnV = 0 [ 2.796031] EA = 0, S1PTW = 0 [ 2.796032] Data abort info: [ 2.796034] ISV = 0, ISS = 0x00000005 [ 2.796035] CM = 0, WnR = 0 [ 2.796046] user pgtable: 4k pages, 39-bit VAs, pgdp=00000003370d1000 [ 2.796048] [00000000000000a0] pgd=0000000000000000, pud=0000000000000000 [ 2.796051] Internal error: Oops: 96000005 [#1] PREEMPT SMP [ 2.796056] CPU: 7 PID: 640 Comm: f2fs_ckpt-259:7 Tainted: G S 5.4.179-arter97-r8-64666-g2f16e087f9d8 #1 [ 2.796057] Hardware name: Qualcomm Technologies, Inc. Lahaina MTP lemonadep (DT) [ 2.796059] pstate: 80c00005 (Nzcv daif +PAN +UAO) [ 2.796065] pc : down_write+0x28/0x70 [ 2.796070] lr : f2fs_quota_sync+0x100/0x294 [ 2.796071] sp : ffffffa3f48ffc30 [ 2.796073] x29: ffffffa3f48ffc30 x28: 0000000000000000 [ 2.796075] x27: ffffffa3f6d718b8 x26: ffffffa415fe9d80 [ 2.796077] x25: ffffffa3f7290048 x24: 0000000000000001 [ 2.796078] x23: 0000000000000000 x22: ffffffa3f7290000 [ 2.796080] x21: ffffffa3f72904a0 x20: ffffffa3f7290110 [ 2.796081] x19: ffffffa3f77a9800 x18: ffffffc020aae038 [ 2.796083] x17: ffffffa40e38e040 x16: ffffffa40e38e6d0 [ 2.796085] x15: ffffffa40e38e6cc x14: ffffffa40e38e6d0 [ 2.796086] x13: 00000000000004f6 x12: 00162c44ff493000 [ 2.796088] x11: 0000000000000400 x10: ffffffa40e38c948 [ 2.796090] x9 : 0000000000000000 x8 : 00000000000000a0 [ 2.796091] x7 : 0000000000000000 x6 : 0000d1060f00002a [ 2.796093] x5 : ffffffa3f48ff718 x4 : 000000000000000d [ 2.796094] x3 : 00000000060c0000 x2 : 0000000000000001 [ 2.796096] x1 : 0000000000000000 x0 : 00000000000000a0 [ 2.796098] Call trace: [ 2.796100] down_write+0x28/0x70 [ 2.796102] f2fs_quota_sync+0x100/0x294 [ 2.796104] block_operations+0x120/0x204 [ 2.796106] f2fs_write_checkpoint+0x11c/0x520 [ 2.796107] __checkpoint_and_complete_reqs+0x7c/0xd34 [ 2.796109] issue_checkpoint_thread+0x6c/0xb8 [ 2.796112] kthread+0x138/0x414 [ 2.796114] ret_from_fork+0x10/0x18 [ 2.796117] Code: aa0803e0 aa1f03e1 52800022 aa0103e9 (c8e97d02) [ 2.796120] ---[ end trace 96e942e8eb6a0b53 ]--- [ 2.800116] Kernel panic - not syncing: Fatal exception [ 2.800120] SMP: stopping secondary CPUs
--- fs/f2fs/super.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/f2fs/super.c +3 -3
@@ -2066,7 +2066,7 @@ int f2fs_quota_sync(struct super_block *struct f2fs_sb_info *sbi =F2FS_SB (sb);struct quota_info *dqopt =sb_dqopt (sb);int cnt; -int ret; +int ret =0 ;/* * Now when everything is written we can discard the pagecache so
@@ -2077,8 +2077,8 @@ int f2fs_quota_sync(struct super_block *if (type !=-1 && cnt != type)continue ; -if (!sb_has_quota_active (sb, type)) -return 0 ; +if (!sb_has_quota_active (sb, cnt)) +continue ;inode_lock (dqopt->files[cnt]);
Greg Kroah-Hartman
maintainerPATCH 40/475 f2fs: fix to do sanity check on .cp_pack_total_block_count
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
commit 5b5b4f85b01604389f7a0f11ef180a725bf0e2d4 upstream.
As bughunter reported in bugzilla:
https://bugzilla.kernel.org/show_bug.cgi?id=215709
f2fs may hang when mounting a fuzzed image, the dmesg shows as below:
__filemap_get_folio+0x3a9/0x590 pagecache_get_page+0x18/0x60 __get_meta_page+0x95/0x460 [f2fs] get_checkpoint_version+0x2a/0x1e0 [f2fs] validate_checkpoint+0x8e/0x2a0 [f2fs] f2fs_get_valid_checkpoint+0xd0/0x620 [f2fs] f2fs_fill_super+0xc01/0x1d40 [f2fs] mount_bdev+0x18a/0x1c0 f2fs_mount+0x15/0x20 [f2fs] legacy_get_tree+0x28/0x50 vfs_get_tree+0x27/0xc0 path_mount+0x480/0xaa0 do_mount+0x7c/0xa0 __x64_sys_mount+0x8b/0xe0 do_syscall_64+0x38/0xc0 entry_SYSCALL_64_after_hwframe+0x44/0xae
The root cause is cp_pack_total_block_count field in checkpoint was fuzzed to one, as calcuated, two cp pack block locates in the same block address, so then read latter cp pack block, it will block on the page lock due to the lock has already held when reading previous cp pack block, fix it by adding sanity check for cp_pack_total_block_count.
--- fs/f2fs/checkpoint.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
fs/f2fs/checkpoint.c +5 -3
@@ -848,6 +848,7 @@ static struct page *validate_checkpoint(struct page *cp_page_1 =NULL , *cp_page_2 =NULL ;struct f2fs_checkpoint *cp_block =NULL ;unsigned long long cur_version =0 , pre_version =0 ; +unsigned int cp_blocks;int err; err = get_checkpoint_version(sbi, cp_addr, &cp_block,
@@ -855,15 +856,16 @@ static struct page *validate_checkpoint(if (err)return NULL ; -if (le32_to_cpu (cp_block->cp_pack_total_block_count) > - sbi->blocks_per_seg) { + cp_blocks =le32_to_cpu (cp_block->cp_pack_total_block_count); + +if (cp_blocks > sbi->blocks_per_seg || cp_blocks <=F2FS_CP_PACKS ) {f2fs_warn (sbi,"invalid cp_pack_total_block_count:%u" ,le32_to_cpu (cp_block->cp_pack_total_block_count)); goto invalid_cp; } pre_version = *version; - cp_addr +=le32_to_cpu (cp_block->cp_pack_total_block_count) -1 ; + cp_addr += cp_blocks -1 ; err =get_checkpoint_version (sbi, cp_addr, &cp_block, &cp_page_2, version);if (err)
Greg Kroah-Hartman
maintainerPATCH 41/475 pinctrl: samsung: drop pin banks references on error paths
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
commit 50ebd19e3585b9792e994cfa8cbee8947fe06371 upstream.
The driver iterates over its devicetree children with for_each_child_of_node() and stores for later found node pointer. This has to be put in error paths to avoid leak during re-probing.
--- drivers/pinctrl/samsung/pinctrl-samsung.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-)
drivers/pinctrl/samsung/pinctrl-samsung.c +23 -7
@@ -1002,6 +1002,16 @@ samsung_pinctrl_get_soc_data_for_of_aliareturn &(of_data->ctrl[id]); } +static void samsung_banks_of_node_put (struct samsung_pinctrl_drv_data *d) +{ +struct samsung_pin_bank *bank; +unsigned int i; + + bank = d->pin_banks; +for (i =0 ; i < d->nr_banks; ++i, ++bank) +of_node_put (bank->of_node); +} +/* retrieve the soc specific data */ static const struct samsung_pin_ctrl * samsung_pinctrl_get_soc_data(struct samsung_pinctrl_drv_data *d,
@@ -1116,19 +1126,19 @@ static int samsung_pinctrl_probe(structif (ctrl->retention_data) { drvdata->retention_ctrl = ctrl->retention_data->init (drvdata, ctrl->retention_data); -if (IS_ERR (drvdata->retention_ctrl)) -return PTR_ERR (drvdata->retention_ctrl); +if (IS_ERR (drvdata->retention_ctrl)) { + ret =PTR_ERR (drvdata->retention_ctrl); + goto err_put_banks; + } } ret =samsung_pinctrl_register (pdev, drvdata);if (ret) -return ret; + goto err_put_banks; ret =samsung_gpiolib_register (pdev, drvdata); -if (ret) { -samsung_pinctrl_unregister (pdev, drvdata); -return ret; - } +if (ret) + goto err_unregister;if (ctrl->eint_gpio_init) ctrl->eint_gpio_init (drvdata);
@@ -1138,6 +1148,12 @@ static int samsung_pinctrl_probe(structplatform_set_drvdata (pdev, drvdata);return 0 ; + +err_unregister: +samsung_pinctrl_unregister (pdev, drvdata); +err_put_banks: +samsung_banks_of_node_put (drvdata); +return ret; }/**
Greg Kroah-Hartman
maintainerPATCH 42/475 spi: mxic: Fix the transmit path
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
commit 5fd6739e0df7e320bcac103dfb95fe75941fea17 upstream.
By working with external hardware ECC engines, we figured out that Under certain circumstances, it is needed for the SPI controller to check INT_TX_EMPTY and INT_RX_NOT_EMPTY in both receive and transmit path (not only in the receive path). The delay penalty being negligible, move this code in the common path.
--- drivers/spi/spi-mxic.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-)
drivers/spi/spi-mxic.c +11 -15
@@ -304,25 +304,21 @@ static int mxic_spi_data_xfer(struct mxiwritel (data, mxic->regs +TXD (nbytes %4 )); -if (rxbuf) { - ret =readl_poll_timeout (mxic->regs +INT_STS , sts, - sts &INT_TX_EMPTY ,0 , -USEC_PER_SEC ); -if (ret) -return ret; + ret =readl_poll_timeout (mxic->regs +INT_STS , sts, + sts &INT_TX_EMPTY ,0 ,USEC_PER_SEC ); +if (ret) +return ret; - ret =readl_poll_timeout (mxic->regs +INT_STS , sts, - sts &INT_RX_NOT_EMPTY ,0 , -USEC_PER_SEC ); -if (ret) -return ret; + ret =readl_poll_timeout (mxic->regs +INT_STS , sts, + sts &INT_RX_NOT_EMPTY ,0 , +USEC_PER_SEC ); +if (ret) +return ret; - data =readl (mxic->regs +RXD ); + data =readl (mxic->regs +RXD ); +if (rxbuf) { data >>= (8 * (4 - nbytes));memcpy (rxbuf + pos, &data, nbytes); -WARN_ON (readl (mxic->regs +INT_STS ) &INT_RX_NOT_EMPTY ); - }else { -readl (mxic->regs +RXD ); }WARN_ON (readl (mxic->regs +INT_STS ) &INT_RX_NOT_EMPTY );
Greg Kroah-Hartman
maintainerPATCH 43/475 can: ems_usb: ems_usb_start_xmit(): fix double dev_kfree_skb() in error path
In reply to Greg Kroah-HartmanFrom: Hangyu Hua <[email protected]>
commit c70222752228a62135cee3409dccefd494a24646 upstream.
There is no need to call dev_kfree_skb() when usb_submit_urb() fails beacause can_put_echo_skb() deletes the original skb and can_free_echo_skb() deletes the cloned skb.
--- drivers/net/can/usb/ems_usb.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/can/usb/ems_usb.c +0 -1
@@ -823,7 +823,6 @@ static netdev_tx_t ems_usb_start_xmit(stusb_unanchor_urb (urb);usb_free_coherent (dev->udev, size, buf, urb->transfer_dma); -dev_kfree_skb (skb);atomic_dec (&dev->active_tx_urbs);
Greg Kroah-Hartman
maintainerPATCH 44/475 jffs2: fix use-after-free in jffs2_clear_xattr_subsystem
In reply to Greg Kroah-HartmanFrom: Baokun Li <[email protected]>
commit 4c7c44ee1650677fbe89d86edbad9497b7679b5c upstream.
When we mount a jffs2 image, assume that the first few blocks of the image are normal and contain at least one xattr-related inode, but the next block is abnormal. As a result, an error is returned in jffs2_scan_eraseblock(). jffs2_clear_xattr_subsystem() is then called in jffs2_build_filesystem() and then again in jffs2_do_fill_super().
Finally we can observe the following report:
==================================================================
BUG: KASAN: use-after-free in jffs2_clear_xattr_subsystem+0x95/0x6ac Read of size 8 at addr ffff8881243384e0 by task mount/719 Call Trace: dump_stack+0x115/0x16b jffs2_clear_xattr_subsystem+0x95/0x6ac jffs2_do_fill_super+0x84f/0xc30 jffs2_fill_super+0x2ea/0x4c0 mtd_get_sb+0x254/0x400 mtd_get_sb_by_nr+0x4f/0xd0 get_tree_mtd+0x498/0x840 jffs2_get_tree+0x25/0x30 vfs_get_tree+0x8d/0x2e0 path_mount+0x50f/0x1e50 do_mount+0x107/0x130 __se_sys_mount+0x1c5/0x2f0 __x64_sys_mount+0xc7/0x160 do_syscall_64+0x45/0x70 entry_SYSCALL_64_after_hwframe+0x44/0xa9 Allocated by task 719: kasan_save_stack+0x23/0x60 __kasan_kmalloc.constprop.0+0x10b/0x120 kasan_slab_alloc+0x12/0x20 kmem_cache_alloc+0x1c0/0x870 jffs2_alloc_xattr_ref+0x2f/0xa0 jffs2_scan_medium.cold+0x3713/0x4794 jffs2_do_mount_fs.cold+0xa7/0x2253 jffs2_do_fill_super+0x383/0xc30 jffs2_fill_super+0x2ea/0x4c0 [...] Freed by task 719: kmem_cache_free+0xcc/0x7b0 jffs2_free_xattr_ref+0x78/0x98 jffs2_clear_xattr_subsystem+0xa1/0x6ac jffs2_do_mount_fs.cold+0x5e6/0x2253 jffs2_do_fill_super+0x383/0xc30 jffs2_fill_super+0x2ea/0x4c0 [...] The buggy address belongs to the object at ffff8881243384b8 which belongs to the cache jffs2_xattr_ref of size 48 The buggy address is located 40 bytes inside of 48-byte region [ffff8881243384b8, ffff8881243384e8) [...] ==================================================================
The triggering of the BUG is shown in the following stack:
-----------------------------------------------------------jffs2_fill_super
jffs2_do_fill_super
jffs2_do_mount_fs
jffs2_build_filesystem
jffs2_scan_medium
jffs2_scan_eraseblock <--- ERROR
jffs2_clear_xattr_subsystem <--- free
jffs2_clear_xattr_subsystem <--- free again
-----------------------------------------------------------
An error is returned in jffs2_do_mount_fs(). If the error is returned by jffs2_sum_init(), the jffs2_clear_xattr_subsystem() does not need to be executed. If the error is returned by jffs2_build_filesystem(), the jffs2_clear_xattr_subsystem() also does not need to be executed again. So move jffs2_clear_xattr_subsystem() from 'out_inohash' to 'out_root' to fix this UAF problem.
--- fs/jffs2/fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/jffs2/fs.c +1 -1
@@ -602,8 +602,8 @@ out_root:jffs2_free_ino_caches (c);jffs2_free_raw_node_refs (c);kvfree (c->blocks); - out_inohash:jffs2_clear_xattr_subsystem (c); + out_inohash:kfree (c->inocache_list); out_wbuf:jffs2_flash_cleanup (c);
Greg Kroah-Hartman
maintainerPATCH 45/475 jffs2: fix memory leak in jffs2_do_mount_fs
In reply to Greg Kroah-HartmanFrom: Baokun Li <[email protected]>
commit d051cef784de4d54835f6b6836d98a8f6935772c upstream.
If jffs2_build_filesystem() in jffs2_do_mount_fs() returns an error, we can observe the following kmemleak report:
--------------------------------------------
unreferenced object 0xffff88811b25a640 (size 64):
comm "mount", pid 691, jiffies 4294957728 (age 71.952s) hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<ffffffffa493be24>] kmem_cache_alloc_trace+0x584/0x880
[<ffffffffa5423a06>] jffs2_sum_init+0x86/0x130
[<ffffffffa5400e58>] jffs2_do_mount_fs+0x798/0xac0
[<ffffffffa540acf3>] jffs2_do_fill_super+0x383/0xc30
[<ffffffffa540c00a>] jffs2_fill_super+0x2ea/0x4c0
[...]unreferenced object 0xffff88812c760000 (size 65536):
comm "mount", pid 691, jiffies 4294957728 (age 71.952s) hex dump (first 32 bytes):
bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb ................ bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb bb ................
backtrace:
[<ffffffffa493a449>] __kmalloc+0x6b9/0x910
[<ffffffffa5423a57>] jffs2_sum_init+0xd7/0x130
[<ffffffffa5400e58>] jffs2_do_mount_fs+0x798/0xac0
[<ffffffffa540acf3>] jffs2_do_fill_super+0x383/0xc30
[<ffffffffa540c00a>] jffs2_fill_super+0x2ea/0x4c0
[...]
--------------------------------------------This is because the resources allocated in jffs2_sum_init() are not released. Call jffs2_sum_exit() to release these resources to solve the problem.
--- fs/jffs2/build.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/jffs2/build.c +3 -1
@@ -415,13 +415,15 @@ int jffs2_do_mount_fs(struct jffs2_sb_injffs2_free_ino_caches (c);jffs2_free_raw_node_refs (c); ret = -EIO ; - goto out_free; + goto out_sum_exit; }jffs2_calc_trigger_levels (c);return 0 ; + out_sum_exit: +jffs2_sum_exit (c); out_free:kvfree (c->blocks);
Greg Kroah-Hartman
maintainerPATCH 46/475 jffs2: fix memory leak in jffs2_scan_medium
In reply to Greg Kroah-HartmanFrom: Baokun Li <[email protected]>
commit 9cdd3128874f5fe759e2c4e1360ab7fb96a8d1df upstream.
If an error is returned in jffs2_scan_eraseblock() and some memory has been added to the jffs2_summary *s, we can observe the following kmemleak report:
--------------------------------------------
unreferenced object 0xffff88812b889c40 (size 64):
comm "mount", pid 692, jiffies 4294838325 (age 34.288s) hex dump (first 32 bytes):
40 48 b5 14 81 88 ff ff 01 e0 31 00 00 00 50 00 @H........1...P.
00 00 01 00 00 00 01 00 00 00 02 00 00 00 09 08 ................
backtrace:
[<ffffffffae93a3a3>] __kmalloc+0x613/0x910
[<ffffffffaf423b9c>] jffs2_sum_add_dirent_mem+0x5c/0xa0
[<ffffffffb0f3afa8>] jffs2_scan_medium.cold+0x36e5/0x4794
[<ffffffffb0f3dbe1>] jffs2_do_mount_fs.cold+0xa7/0x2267
[<ffffffffaf40acf3>] jffs2_do_fill_super+0x383/0xc30
[<ffffffffaf40c00a>] jffs2_fill_super+0x2ea/0x4c0
[<ffffffffb0315d64>] mtd_get_sb+0x254/0x400
[<ffffffffb0315f5f>] mtd_get_sb_by_nr+0x4f/0xd0
[<ffffffffb0316478>] get_tree_mtd+0x498/0x840
[<ffffffffaf40bd15>] jffs2_get_tree+0x25/0x30
[<ffffffffae9f358d>] vfs_get_tree+0x8d/0x2e0
[<ffffffffaea7a98f>] path_mount+0x50f/0x1e50
[<ffffffffaea7c3d7>] do_mount+0x107/0x130
[<ffffffffaea7c5c5>] __se_sys_mount+0x1c5/0x2f0
[<ffffffffaea7c917>] __x64_sys_mount+0xc7/0x160
[<ffffffffb10142f5>] do_syscall_64+0x45/0x70
unreferenced object 0xffff888114b54840 (size 32):
comm "mount", pid 692, jiffies 4294838325 (age 34.288s)
hex dump (first 32 bytes):
c0 75 b5 14 81 88 ff ff 02 e0 02 00 00 00 02 00 .u..............
00 00 84 00 00 00 44 00 00 00 6b 6b 6b 6b 6b a5 ......D...kkkkk.
backtrace:
[<ffffffffae93be24>] kmem_cache_alloc_trace+0x584/0x880
[<ffffffffaf423b04>] jffs2_sum_add_inode_mem+0x54/0x90
[<ffffffffb0f3bd44>] jffs2_scan_medium.cold+0x4481/0x4794
[...]
unreferenced object 0xffff888114b57280 (size 32):
comm "mount", pid 692, jiffies 4294838393 (age 34.357s)
hex dump (first 32 bytes):
10 d5 6c 11 81 88 ff ff 08 e0 05 00 00 00 01 00 ..l.............
00 00 38 02 00 00 28 00 00 00 6b 6b 6b 6b 6b a5 ..8...(...kkkkk.
backtrace:
[<ffffffffae93be24>] kmem_cache_alloc_trace+0x584/0x880
[<ffffffffaf423c34>] jffs2_sum_add_xattr_mem+0x54/0x90
[<ffffffffb0f3a24f>] jffs2_scan_medium.cold+0x298c/0x4794
[...]
unreferenced object 0xffff8881116cd510 (size 16):
comm "mount", pid 692, jiffies 4294838395 (age 34.355s)
hex dump (first 16 bytes):
00 00 00 00 00 00 00 00 09 e0 60 02 00 00 6b a5 ..........`...k.
backtrace:
[<ffffffffae93be24>] kmem_cache_alloc_trace+0x584/0x880
[<ffffffffaf423cc4>] jffs2_sum_add_xref_mem+0x54/0x90
[<ffffffffb0f3b2e3>] jffs2_scan_medium.cold+0x3a20/0x4794
[...]
--------------------------------------------Therefore, we should call jffs2_sum_reset_collected(s) on exit to release the memory added in s. In addition, a new tag "out_buf" is added to prevent the NULL pointer reference caused by s being NULL. (thanks to Zhang Yi for this analysis)
Co-developed-with: Zhihao Cheng <[email protected]>
--- fs/jffs2/scan.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/jffs2/scan.c +4 -2
@@ -136,7 +136,7 @@ int jffs2_scan_medium(struct jffs2_sb_inif (!s) {JFFS2_WARNING ("Can't allocate memory for summary\n" ); ret = -ENOMEM ; - goto out; + goto out_buf; } }
@@ -274,13 +274,15 @@ int jffs2_scan_medium(struct jffs2_sb_in } ret =0 ; out: +jffs2_sum_reset_collected (s); +kfree (s); + out_buf:if (buf_size)kfree (flashbuf);#ifndef __ECOS else mtd_unpoint(c->mtd, 0, c->mtd->size);#endif -kfree (s);return ret; }
Greg Kroah-Hartman
maintainerPATCH 47/475 mm/pages_alloc.c: dont create ZONE_MOVABLE beyond the end of a node
In reply to Greg Kroah-HartmanFrom: Alistair Popple <[email protected]>
commit ddbc84f3f595cf1fc8234a191193b5d20ad43938 upstream.
ZONE_MOVABLE uses the remaining memory in each node. Its starting pfn is also aligned to MAX_ORDER_NR_PAGES. It is possible for the remaining memory in a node to be less than MAX_ORDER_NR_PAGES, meaning there is not enough room for ZONE_MOVABLE on that node.
Unfortunately this condition is not checked for. This leads to zone_movable_pfn[] getting set to a pfn greater than the last pfn in a node.
calculate_node_totalpages() then sets zone->present_pages to be greater than zone->spanned_pages which is invalid, as spanned_pages represents the maximum number of pages in a zone assuming no holes.
Subsequently it is possible free_area_init_core() will observe a zone of size zero with present pages. In this case it will skip setting up the zone, including the initialisation of free_lists[].
However populated_zone() checks zone->present_pages to see if a zone has memory available. This is used by iterators such as walk_zones_in_node(). pagetypeinfo_showfree() uses this to walk the free_list of each zone in each node, which are assumed to be initialised due to the zone not being empty.
As free_area_init_core() never initialised the free_lists[] this results in the following kernel crash when trying to read /proc/pagetypeinfo:
BUG: kernel NULL pointer dereference, address: 0000000000000000 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 0 P4D 0 Oops: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC NOPTI CPU: 0 PID: 456 Comm: cat Not tainted 5.16.0 #461 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.14.0-2 04/01/2014 RIP: 0010:pagetypeinfo_show+0x163/0x460 Code: 9e 82 e8 80 57 0e 00 49 8b 06 b9 01 00 00 00 4c 39 f0 75 16 e9 65 02 00 00 48 83 c1 01 48 81 f9 a0 86 01 00 0f 84 48 02 00 00 <48> 8b 00 4c 39 f0 75 e7 48 c7 c2 80 a2 e2 82 48 c7 c6 79 ef e3 82 RSP: 0018:ffffc90001c4bd10 EFLAGS: 00010003 RAX: 0000000000000000 RBX: ffff88801105f638 RCX: 0000000000000001 RDX: 0000000000000001 RSI: 000000000000068b RDI: ffff8880163dc68b RBP: ffffc90001c4bd90 R08: 0000000000000001 R09: ffff8880163dc67e R10: 656c6261766f6d6e R11: 6c6261766f6d6e55 R12: ffff88807ffb4a00 R13: ffff88807ffb49f8 R14: ffff88807ffb4580 R15: ffff88807ffb3000 FS: 00007f9c83eff5c0(0000) GS:ffff88807dc00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000000 CR3: 0000000013c8e000 CR4: 0000000000350ef0 Call Trace: seq_read_iter+0x128/0x460 proc_reg_read_iter+0x51/0x80 new_sync_read+0x113/0x1a0 vfs_read+0x136/0x1d0 ksys_read+0x70/0xf0 __x64_sys_read+0x1a/0x20 do_syscall_64+0x3b/0xc0 entry_SYSCALL_64_after_hwframe+0x44/0xae
Fix this by checking that the aligned zone_movable_pfn[] does not exceed the end of the node, and if it does skip creating a movable zone on this node.
--- mm/page_alloc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
mm/page_alloc.c +8 -1
@@ -7326,10 +7326,17 @@ restart: out2:/* Align start of ZONE_MOVABLE on all nids to MAX_ORDER_NR_PAGES */ -for (nid =0 ; nid <MAX_NUMNODES ; nid++) +for (nid =0 ; nid <MAX_NUMNODES ; nid++) { +unsigned long start_pfn, end_pfn; + zone_movable_pfn[nid] =roundup (zone_movable_pfn[nid],MAX_ORDER_NR_PAGES ); +get_pfn_range_for_nid (nid, &start_pfn, &end_pfn); +if (zone_movable_pfn[nid] >= end_pfn) + zone_movable_pfn[nid] =0 ; + } + out:/* restore the node_state */ node_states[N_MEMORY ] = saved_node_state;
Greg Kroah-Hartman
maintainerPATCH 48/475 mm: invalidate hwpoison page cache page in fault path
In reply to Greg Kroah-HartmanFrom: Rik van Riel <[email protected]>
commit e53ac7374e64dede04d745ff0e70ff5048378d1f upstream.
Sometimes the page offlining code can leave behind a hwpoisoned clean page cache page. This can lead to programs being killed over and over and over again as they fault in the hwpoisoned page, get killed, and then get re-spawned by whatever wanted to run them.
This is particularly embarrassing when the page was offlined due to having too many corrected memory errors. Now we are killing tasks due to them trying to access memory that probably isn't even corrupted.
This problem can be avoided by invalidating the page from the page fault handler, which already has a branch for dealing with these kinds of pages. With this patch we simply pretend the page fault was successful if the page was invalidated, return to userspace, incur another page fault, read in the file from disk (to a new memory page), and then everything works again.
--- mm/memory.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
mm/memory.c +7 -2
@@ -3245,11 +3245,16 @@ static vm_fault_t __do_fault(struct vm_freturn ret;if (unlikely (PageHWPoison (vmf->page))) { -if (ret &VM_FAULT_LOCKED ) +vm_fault_t poisonret =VM_FAULT_HWPOISON ; +if (ret &VM_FAULT_LOCKED ) { +/* Retry if a clean page was removed from the cache. */ +if (invalidate_inode_page (vmf->page)) + poisonret =0 ;unlock_page (vmf->page); + }put_page (vmf->page); vmf->page =NULL ; -return VM_FAULT_HWPOISON ; +return poisonret; }if (unlikely (!(ret &VM_FAULT_LOCKED )))
Greg Kroah-Hartman
maintainerPATCH 49/475 mempolicy: mbind_range() set_policy() after vma_merge()
In reply to Greg Kroah-HartmanFrom: Hugh Dickins <[email protected]>
commit 4e0906008cdb56381638aa17d9c32734eae6d37a upstream.
v2.6.34 commit 9d8cebd4bcd7 ("mm: fix mbind vma merge problem") introduced vma_merge() to mbind_range(); but unlike madvise, mlock and mprotect, it put a "continue" to next vma where its precedents go to update flags on current vma before advancing: that left vma with the wrong setting in the infamous vma_merge() case 8.
v3.10 commit 1444f92c8498 ("mm: merging memory blocks resets mempolicy") tried to fix that in vma_adjust(), without fully understanding the issue.
v3.11 commit 3964acd0dbec ("mm: mempolicy: fix mbind_range() && vma_adjust() interaction") reverted that, and went about the fix in the right way, but chose to optimize out an unnecessary mpol_dup() with a prior mpol_equal() test. But on tmpfs, that also pessimized out the vital call to its ->set_policy(), leaving the new mbind unenforced.
The user visible effect was that the pages got allocated on the local node (happened to be 0), after the mbind() caller had specifically asked for them to be allocated on node 1. There was not any page migration involved in the case reported: the pages simply got allocated on the wrong node.
Just delete that optimization now (though it could be made conditional on vma not having a set_policy). Also remove the "next" variable: it turned out to be blameless, but also pointless.
--- mm/mempolicy.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
mm/mempolicy.c +1 -7
@@ -731,7 +731,6 @@ static int vma_replace_policy(struct vm_static int mbind_range (struct mm_struct *mm,unsigned long start,unsigned long end,struct mempolicy *new_pol) { -struct vm_area_struct *next;struct vm_area_struct *prev;struct vm_area_struct *vma;int err =0 ;
@@ -747,8 +746,7 @@ static int mbind_range(struct mm_structif (start > vma->vm_start) prev = vma; -for (; vma && vma->vm_start < end; prev = vma, vma = next) { - next = vma->vm_next; +for (; vma && vma->vm_start < end; prev = vma, vma = vma->vm_next) { vmstart =max (start, vma->vm_start); vmend =min (end, vma->vm_end);
@@ -762,10 +760,6 @@ static int mbind_range(struct mm_struct new_pol, vma->vm_userfaultfd_ctx);if (prev) { vma = prev; - next = vma->vm_next; -if (mpol_equal (vma_policy (vma), new_pol)) -continue ; -/* vma_merge() joined vma && vma->next, case 8 */ goto replace; }if (vma->vm_start != vmstart) {
Greg Kroah-Hartman
maintainerPATCH 50/475 scsi: libsas: Fix sas_ata_qc_issue() handling of NCQ NON DATA commands
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
commit 8454563e4c2aafbfb81a383ab423ea8b9b430a25 upstream.
To detect for the DMA_NONE (no data transfer) DMA direction, sas_ata_qc_issue() tests if the command protocol is ATA_PROT_NODATA. This test does not include the ATA_CMD_NCQ_NON_DATA command as this command protocol is defined as ATA_PROT_NCQ_NODATA (equal to ATA_PROT_FLAG_NCQ) and not as ATA_PROT_NODATA.
To include both NCQ and non-NCQ commands when testing for the DMA_NONE DMA direction, use "!ata_is_data()".
--- drivers/scsi/libsas/sas_ata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/libsas/sas_ata.c +1 -1
@@ -201,7 +201,7 @@ static unsigned int sas_ata_qc_issue(str task->total_xfer_len = qc->nbytes; task->num_scatter = qc->n_elem; task->data_dir = qc->dma_dir; - }else if (qc->tf.protocol ==ATA_PROT_NODATA ) { + }else if (!ata_is_data (qc->tf.protocol)) { task->data_dir =DMA_NONE ; }else {for_each_sg (qc->sg, sg, qc->n_elem, si)
Greg Kroah-Hartman
maintainerPATCH 51/475 qed: display VF trust config
In reply to Greg Kroah-HartmanFrom: Manish Chopra <[email protected]>
commit 4e6e6bec7440b9b76f312f28b1f4e944eebb3abc upstream.
Driver does support SR-IOV VFs trust configuration but it does not display it when queried via ip link utility.
--- drivers/net/ethernet/qlogic/qed/qed_sriov.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/qlogic/qed/qed_sriov.c +1 -0
@@ -4717,6 +4717,7 @@ static int qed_get_vf_config(struct qed_ tx_rate = vf_info->tx_rate; ivi->max_tx_rate = tx_rate ? tx_rate : link.speed; ivi->min_tx_rate =qed_iov_get_vf_min_rate (hwfn, vf_id); + ivi->trusted = vf_info->is_trusted_request;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 52/475 qed: validate and restrict untrusted VFs vlan promisc mode
In reply to Greg Kroah-HartmanFrom: Manish Chopra <[email protected]>
commit cbcc44db2cf7b836896733acc0e5ea966136ed22 upstream.
Today when VFs are put in promiscuous mode, they can request PF to configure device for them to receive all VLANs traffic regardless of what vlan is configured by the PF (via ip link) and PF allows this config request regardless of whether VF is trusted or not.
Quoted 1 line
From security POV, when VLAN is configured for VF through PF (via ip link),
honour such config requests from VF only when they are configured to be trusted, otherwise restrict such VFs vlan promisc mode config.
--- drivers/net/ethernet/qlogic/qed/qed_sriov.c | 28 ++++++++++++++++++++++++++-- drivers/net/ethernet/qlogic/qed/qed_sriov.h | 1 + 2 files changed, 27 insertions(+), 2 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_sriov.c +26 -2
@@ -3003,12 +3003,16 @@ static int qed_iov_pre_update_vport(struu8 mask =QED_ACCEPT_UCAST_UNMATCHED |QED_ACCEPT_MCAST_UNMATCHED ;struct qed_filter_accept_flags *flags = ¶ms->accept_flags;struct qed_public_vf_info *vf_info; +u16 tlv_mask; + + tlv_mask =BIT (QED_IOV_VP_UPDATE_ACCEPT_PARAM ) | +BIT (QED_IOV_VP_UPDATE_ACCEPT_ANY_VLAN );/* Untrusted VFs can't even be trusted to know that fact. * Simply indicate everything is configured fine, and trace * configuration 'behind their back'. */ -if (!(*tlvs &BIT (QED_IOV_VP_UPDATE_ACCEPT_PARAM ))) +if (!(*tlvs & tlv_mask))return 0 ; vf_info =qed_iov_get_public_vf_info (hwfn, vfid, true);
@@ -3025,6 +3029,13 @@ static int qed_iov_pre_update_vport(stru flags->tx_accept_filter &= ~mask; } +if (params->update_accept_any_vlan_flg) { + vf_info->accept_any_vlan = params->accept_any_vlan; + +if (vf_info->forced_vlan && !vf_info->is_trusted_configured) + params->accept_any_vlan = false; + } +return 0 ; }
@@ -5148,6 +5159,12 @@ static void qed_iov_handle_trust_change( params.update_ctl_frame_check =1 ; params.mac_chk_en = !vf_info->is_trusted_configured; + params.update_accept_any_vlan_flg =0 ; + +if (vf_info->accept_any_vlan && vf_info->forced_vlan) { + params.update_accept_any_vlan_flg =1 ; + params.accept_any_vlan = vf_info->accept_any_vlan; + }if (vf_info->rx_accept_mode & mask) { flags->update_rx_mode_config =1 ;
@@ -5163,13 +5180,20 @@ static void qed_iov_handle_trust_change(if (!vf_info->is_trusted_configured) { flags->rx_accept_filter &= ~mask; flags->tx_accept_filter &= ~mask; + params.accept_any_vlan = false; }if (flags->update_rx_mode_config || flags->update_tx_mode_config || - params.update_ctl_frame_check) + params.update_ctl_frame_check || + params.update_accept_any_vlan_flg) { +DP_VERBOSE (hwfn,QED_MSG_IOV , +"vport update config for %s VF[abs 0x%x rel 0x%x]\n" , + vf_info->is_trusted_configured ?"trusted" :"untrusted" , + vf->abs_vf_id, vf->relative_vf_id);qed_sp_vport_update (hwfn, ¶ms,QED_SPQ_MODE_EBLOCK ,NULL ); + } } }
drivers/net/ethernet/qlogic/qed/qed_sriov.h +1 -0
@@ -88,6 +88,7 @@ struct qed_public_vf_info {bool is_trusted_request;u8 rx_accept_mode;u8 tx_accept_mode; +bool accept_any_vlan; };struct qed_iov_vf_init_params {
Greg Kroah-Hartman
maintainerPATCH 53/475 riscv: Fix fill_callchain return value
In reply to Greg Kroah-HartmanFrom: Nikita Shubin <[email protected]>
commit 2b2b574ac587ec5bd7716a356492a85ab8b0ce9f upstream.
perf_callchain_store return 0 on success, -1 otherwise, fix fill_callchain to return correct bool value.
--- arch/riscv/kernel/perf_callchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/kernel/perf_callchain.c +1 -1
@@ -77,7 +77,7 @@ void perf_callchain_user(struct perf_calbool fill_callchain (unsigned long pc,void *entry) { -return perf_callchain_store (entry, pc); +return perf_callchain_store (entry, pc) ==0 ; } void notrace walk_stackframe(struct task_struct *task,
Greg Kroah-Hartman
maintainerPATCH 54/475 Revert "Input: clear BTN_RIGHT/MIDDLE on buttonpads"
In reply to Greg Kroah-HartmanFrom: José Expósito <[email protected]>
commit 8b188fba75195745026e11d408e4a7e94e01d701 upstream.
This reverts commit 37ef4c19b4c659926ce65a7ac709ceaefb211c40.
The touchpad present in the Dell Precision 7550 and 7750 laptops reports a HID_DG_BUTTONTYPE of type MT_BUTTONTYPE_CLICKPAD. However, the device is not a clickpad, it is a touchpad with physical buttons.
In order to fix this issue, a quirk for the device was introduced in libinput [1] [2] to disable the INPUT_PROP_BUTTONPAD property:
[Precision 7x50 Touchpad]
MatchBus=i2c
MatchUdevType=touchpad MatchDMIModalias=dmi:*svnDellInc.:pnPrecision7?50* AttrInputPropDisable=INPUT_PROP_BUTTONPAD
However, because of the change introduced in 37ef4c19b4 ("Input: clear BTN_RIGHT/MIDDLE on buttonpads") the BTN_RIGHT key bit is not mapped anymore breaking the device right click button and making impossible to workaround it in user space.
In order to avoid breakage on other present or future devices, revert the patch causing the issue.
--- drivers/input/input.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/input/input.c +0 -6
@@ -2181,12 +2181,6 @@ int input_register_device(struct input_d/* KEY_RESERVED is not supposed to be transmitted to userspace. */ __clear_bit (KEY_RESERVED , dev->keybit); -/* Buttonpads should not map BTN_RIGHT and/or BTN_MIDDLE. */ -if (test_bit (INPUT_PROP_BUTTONPAD , dev->propbit)) { -__clear_bit (BTN_RIGHT , dev->keybit); -__clear_bit (BTN_MIDDLE , dev->keybit); - } -/* Make sure that bitmasks not mentioned in dev->evbit are clean. */ input_cleanse_bitmasks (dev);
Greg Kroah-Hartman
maintainerPATCH 55/475 ALSA: cs4236: fix an incorrect NULL check on list iterator
In reply to Greg Kroah-HartmanFrom: Xiaomeng Tong <[email protected]>
commit 0112f822f8a6d8039c94e0bc9b264d7ffc5d4704 upstream.
The bug is here:
err = snd_card_cs423x_pnp(dev, card->private_data, pdev, cdev);
The list iterator value 'cdev' will *always* be set and non-NULL by list_for_each_entry(), so it is incorrect to assume that the iterator value will be NULL if the list is empty or no element is found.
To fix the bug, use a new variable 'iter' as the list iterator, while use the original variable 'cdev' as a dedicated pointer to point to the found element. And snd_card_cs423x_pnp() itself has NULL check for cdev.
--- sound/isa/cs423x/cs4236.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
sound/isa/cs423x/cs4236.c +5 -3
@@ -544,7 +544,7 @@ static int snd_cs423x_pnpbios_detect(strstatic int dev;int err;struct snd_card *card; -struct pnp_dev *cdev; +struct pnp_dev *cdev, *iter;char cid[PNP_ID_LEN ];if (pnp_device_is_isapnp (pdev))
@@ -560,9 +560,11 @@ static int snd_cs423x_pnpbios_detect(strstrcpy (cid, pdev->id[0 ].id); cid[5 ] ='1' ; cdev =NULL ; -list_for_each_entry (cdev, &(pdev->protocol->devices), protocol_list) { -if (!strcmp (cdev->id[0 ].id, cid)) +list_for_each_entry (iter, &(pdev->protocol->devices), protocol_list) { +if (!strcmp (iter->id[0 ].id, cid)) { + cdev = iter;break ; + } } err =snd_cs423x_card_new (&pdev->dev, dev, &card);if (err <0 )
Greg Kroah-Hartman
maintainerPATCH 56/475 ALSA: hda/realtek: Fix audio regression on Mi Notebook Pro 2020
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
commit f30741cded62f87bb4b1cc58bc627f076abcaba8 upstream.
Commit 5aec98913095 ("ALSA: hda/realtek - ALC236 headset MIC recording issue") is to solve recording issue met on AL236, by matching codec variant ALC269_TYPE_ALC257 and ALC269_TYPE_ALC256.
This match can be too broad and Mi Notebook Pro 2020 is broken by the patch.
Instead, use codec ID to be narrow down the scope, in order to make ALC256 unaffected.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=215484
--- sound/pci/hda/patch_realtek.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/pci/hda/patch_realtek.c +2 -2
@@ -3557,8 +3557,8 @@ static void alc256_shutup(struct hda_cod/* If disable 3k pulldown control for alc257, the Mic detection will not work correctly * when booting with headset plugged. So skip setting it for the codec alc257 */ -if (spec->codec_variant !=ALC269_TYPE_ALC257 && - spec->codec_variant !=ALC269_TYPE_ALC256 ) +if (codec->core.vendor_id !=0x10ec0236 && + codec->core.vendor_id !=0x10ec0257 )alc_update_coef_idx (codec,0x46 ,0 ,3 <<12 );if (!spec->no_shutup_pins)
Greg Kroah-Hartman
maintainerPATCH 57/475 mm,hwpoison: unmap poisoned page before invalidation
In reply to Greg Kroah-HartmanFrom: Rik van Riel <[email protected]>
commit 3149c79f3cb0e2e3bafb7cfadacec090cbd250d3 upstream.
In some cases it appears the invalidation of a hwpoisoned page fails because the page is still mapped in another process. This can cause a program to be continuously restarted and die when it page faults on the page that was not invalidated. Avoid that problem by unmapping the hwpoisoned page when we find it.
Another issue is that sometimes we end up oopsing in finish_fault, if the code tries to do something with the now-NULL vmf->page. I did not hit this error when submitting the previous patch because there are several opportunities for alloc_set_pte to bail out before accessing vmf->page, and that apparently happened on those systems, and most of the time on other systems, too.
However, across several million systems that error does occur a handful of times a day. It can be avoided by returning VM_FAULT_NOPAGE which will cause do_read_fault to return before calling finish_fault.
--- mm/memory.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
mm/memory.c +8 -4
@@ -3245,14 +3245,18 @@ static vm_fault_t __do_fault(struct vm_freturn ret;if (unlikely (PageHWPoison (vmf->page))) { +struct page *page = vmf->page;vm_fault_t poisonret =VM_FAULT_HWPOISON ;if (ret &VM_FAULT_LOCKED ) { +if (page_mapped (page)) +unmap_mapping_pages (page_mapping (page), + page->index,1 , false);/* Retry if a clean page was removed from the cache. */ -if (invalidate_inode_page (vmf->page)) - poisonret =0 ; -unlock_page (vmf->page); +if (invalidate_inode_page (page)) + poisonret =VM_FAULT_NOPAGE ; +unlock_page (page); } -put_page (vmf->page); +put_page (page); vmf->page =NULL ;return poisonret; }
Greg Kroah-Hartman
maintainerPATCH 58/475 mm/kmemleak: reset tag when compare object pointer
In reply to Greg Kroah-HartmanFrom: Kuan-Ying Lee <[email protected]>
commit bfc8089f00fa526dea983844c880fa8106c33ac4 upstream.
When we use HW-tag based kasan and enable vmalloc support, we hit the following bug. It is due to comparison between tagged object and non-tagged pointer.
We need to reset the kasan tag when we need to compare tagged object and non-tagged pointer.
kmemleak: [name:kmemleak&]Scan area larger than object 0xffffffe77076f440
CPU: 4 PID: 1 Comm: init Tainted: G S W 5.15.25-android13-0-g5cacf919c2bc #1
Hardware name: MT6983(ENG) (DT)
Call trace:
add_scan_area+0xc4/0x244
kmemleak_scan_area+0x40/0x9c
layout_and_allocate+0x1e8/0x288
load_module+0x2c8/0xf00
__se_sys_finit_module+0x190/0x1d0
__arm64_sys_finit_module+0x20/0x30
invoke_syscall+0x60/0x170
el0_svc_common+0xc8/0x114
do_el0_svc+0x28/0xa0
el0_svc+0x60/0xf8
el0t_64_sync_handler+0x88/0xec
el0t_64_sync+0x1b4/0x1b8
kmemleak: [name:kmemleak&]Object 0xf5ffffe77076b000 (size 32768):
kmemleak: [name:kmemleak&] comm "init", pid 1, jiffies 4294894197
kmemleak: [name:kmemleak&] min_count = 0
kmemleak: [name:kmemleak&] count = 0
kmemleak: [name:kmemleak&] flags = 0x1
kmemleak: [name:kmemleak&] checksum = 0
kmemleak: [name:kmemleak&] backtrace:
module_alloc+0x9c/0x120
move_module+0x34/0x19c
layout_and_allocate+0x1c4/0x288
load_module+0x2c8/0xf00
__se_sys_finit_module+0x190/0x1d0
__arm64_sys_finit_module+0x20/0x30
invoke_syscall+0x60/0x170
el0_svc_common+0xc8/0x114
do_el0_svc+0x28/0xa0
el0_svc+0x60/0xf8
el0t_64_sync_handler+0x88/0xec
el0t_64_sync+0x1b4/0x1b8--- mm/kmemleak.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
mm/kmemleak.c +7 -2
@@ -787,6 +787,8 @@ static void add_scan_area(unsigned longunsigned long flags;struct kmemleak_object *object;struct kmemleak_scan_area *area =NULL ; +unsigned long untagged_ptr; +unsigned long untagged_objp; object =find_and_get_object (ptr,1 );if (!object) {
@@ -795,6 +797,9 @@ static void add_scan_area(unsigned longreturn ; } + untagged_ptr = (unsigned long )kasan_reset_tag ((void *)ptr); + untagged_objp = (unsigned long )kasan_reset_tag ((void *)object->pointer); +if (scan_area_cache) area =kmem_cache_alloc (scan_area_cache,gfp_kmemleak_mask (gfp));
@@ -806,8 +811,8 @@ static void add_scan_area(unsigned long goto out_unlock; }if (size ==SIZE_MAX ) { - size = object->pointer + object->size - ptr; - }else if (ptr + size > object->pointer + object->size) { + size = untagged_objp + object->size - untagged_ptr; + }else if (untagged_ptr + size > untagged_objp + object->size) {kmemleak_warn ("Scan area larger than object 0x%08lx\n" , ptr);dump_object_info (object);kmem_cache_free (scan_area_cache, area);
Greg Kroah-Hartman
maintainerPATCH 59/475 drbd: fix potential silent data corruption
In reply to Greg Kroah-HartmanFrom: Lars Ellenberg <[email protected]>
commit f4329d1f848ac35757d9cc5487669d19dfc5979c upstream.
Scenario:
---------
bio chain generated by blk_queue_split().
Some split bio fails and propagates its error status to the "parent" bio. But then the (last part of the) parent bio itself completes without error.
We would clobber the already recorded error status with BLK_STS_OK, causing silent data corruption.
Reproducer:
-----------
How to trigger this in the real world within seconds:
DRBD on top of degraded parity raid,
small stripe_cache_size, large read_ahead setting. Drop page cache (sysctl vm.drop_caches=1, fadvise "DONTNEED", umount and mount again, "reboot").
Cause significant read ahead.
Large read ahead request is split by blk_queue_split(). Parts of the read ahead that are already in the stripe cache, or find an available stripe cache to use, can be serviced. Parts of the read ahead that would need "too much work", would need to wait for a "stripe_head" to become available, are rejected immediately.
For larger read ahead requests that are split in many pieces, it is very likely that some "splits" will be serviced, but then the stripe cache is exhausted/busy, and the remaining ones will be rejected.
--- drivers/block/drbd/drbd_req.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/block/drbd/drbd_req.c +2 -1
@@ -195,7 +195,8 @@ void start_new_tl_epoch(struct drbd_connvoid complete_master_bio (struct drbd_device *device,struct bio_and_error *m) { - m->bio->bi_status =errno_to_blk_status (m->error); +if (unlikely (m->error)) + m->bio->bi_status =errno_to_blk_status (m->error);bio_endio (m->bio);dec_ap_bio (device); }
Greg Kroah-Hartman
maintainerPATCH 60/475 powerpc/kvm: Fix kvm_use_magic_page
In reply to Greg Kroah-HartmanFrom: Andreas Gruenbacher <[email protected]>
commit 0c8eb2884a42d992c7726539328b7d3568f22143 upstream.
When switching from __get_user to fault_in_pages_readable, commit 9f9eae5ce717 broke kvm_use_magic_page: like __get_user, fault_in_pages_readable returns 0 on success.
--- arch/powerpc/kernel/kvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/kvm.c +1 -1
@@ -669,7 +669,7 @@ static void __init kvm_use_magic_page(voon_each_cpu (kvm_map_magic_page, &features,1 );/* Quick self-test to see if the mapping works */ -if (!fault_in_pages_readable ((const char *)KVM_MAGIC_PAGE ,sizeof (u32))) { +if (fault_in_pages_readable ((const char *)KVM_MAGIC_PAGE ,sizeof (u32))) { kvm_patching_worked = false;return ; }
Greg Kroah-Hartman
maintainerPATCH 61/475 udp: call udp_encap_enable for v6 sockets when enabling encap
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
commit a4a600dd301ccde6ea239804ec1f19364a39d643 upstream.
When enabling encap for a ipv6 socket without udp_encap_needed_key increased, UDP GRO won't work for v4 mapped v6 address packets as sk will be NULL in udp4_gro_receive().
This patch is to enable it by increasing udp_encap_needed_key for v6 sockets in udp_tunnel_encap_enable(), and correspondingly decrease udp_encap_needed_key in udpv6_destroy_sock().
v1->v2:
- add udp_encap_disable() and export it.v2->v3:
- add the change for rxrpc and bareudp into one patch, as Alex suggested.v3->v4:
- move rxrpc part to another patch.
--- include/net/udp.h | 1 + include/net/udp_tunnel.h | 3 +-- net/ipv4/udp.c | 6 ++++++ net/ipv6/udp.c | 4 +++- 4 files changed, 11 insertions(+), 3 deletions(-)
include/net/udp.h +1 -0
@@ -459,6 +459,7 @@ void udp_init(void);DECLARE_STATIC_KEY_FALSE (udp_encap_needed_key);void udp_encap_enable (void ); +void udp_encap_disable (void );#if IS_ENABLED (CONFIG_IPV6 )DECLARE_STATIC_KEY_FALSE (udpv6_encap_needed_key);void udpv6_encap_enable (void );
include/net/udp_tunnel.h +1 -2
@@ -178,9 +178,8 @@ static inline void udp_tunnel_encap_enab#if IS_ENABLED (CONFIG_IPV6 )if (sock->sk->sk_family ==PF_INET6 ) ipv6_stub->udpv6_encap_enable (); - else#endif - udp_encap_enable(); + udp_encap_enable(); }#endif
net/ipv4/udp.c +6 -0
@@ -544,6 +544,12 @@ void udp_encap_enable(void) }EXPORT_SYMBOL (udp_encap_enable); +void udp_encap_disable (void ) +{ +static_branch_dec (&udp_encap_needed_key); +} +EXPORT_SYMBOL (udp_encap_disable); +/* Handler for tunnels with arbitrary destination ports: no socket lookup, go * through error handlers in encapsulations looking for a match. */
net/ipv6/udp.c +3 -1
@@ -1553,8 +1553,10 @@ void udpv6_destroy_sock(struct sock *sk)if (encap_destroy)encap_destroy (sk); } -if (up->encap_enabled) +if (up->encap_enabled) {static_branch_dec (&udpv6_encap_needed_key); +udp_encap_disable (); + } }inet6_destroy_sock (sk);
Greg Kroah-Hartman
maintainerPATCH 62/475 ACPI: properties: Consistently return -ENOENT if there are no more references
In reply to Greg Kroah-HartmanFrom: Sakari Ailus <[email protected]>
commit babc92da5928f81af951663fc436997352e02d3a upstream.
__acpi_node_get_property_reference() is documented to return -ENOENT if the caller requests a property reference at an index that does not exist, not -EINVAL which it actually does.
Fix this by returning -ENOENT consistenly, independently of whether the property value is a plain reference or a package.
--- drivers/acpi/property.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/property.c +1 -1
@@ -692,7 +692,7 @@ int __acpi_node_get_property_reference(c*/ if (obj->type ==ACPI_TYPE_LOCAL_REFERENCE ) {if (index) -return -EINVAL ; +return -ENOENT ; ret =acpi_bus_get_device (obj->reference.handle, &device);if (ret)
Greg Kroah-Hartman
maintainerPATCH 63/475 drivers: hamradio: 6pack: fix UAF bug caused by mod_timer()
In reply to Greg Kroah-HartmanFrom: Duoming Zhou <[email protected]>
commit efe4186e6a1b54bf38b9e05450d43b0da1fd7739 upstream.
When a 6pack device is detaching, the sixpack_close() will act to cleanup necessary resources. Although del_timer_sync() in sixpack_close() won't return if there is an active timer, one could use mod_timer() in sp_xmit_on_air() to wake up timer again by calling userspace syscall such as ax25_sendmsg(), ax25_connect() and ax25_ioctl().
This unexpected waked handler, sp_xmit_on_air(), realizes nothing about the undergoing cleanup and may still call pty_write() to use driver layer resources that have already been released.
One of the possible race conditions is shown below:
(USE) | (FREE)
ax25_sendmsg() |
ax25_queue_xmit() |
... |
sp_xmit() |
sp_encaps() | sixpack_close()
sp_xmit_on_air() | del_timer_sync(&sp->tx_t)
mod_timer(&sp->tx_t,...) | ...
| unregister_netdev()
| ...
(wait a while) | tty_release()
| tty_release_struct()
| release_tty()
sp_xmit_on_air() | tty_kref_put(tty_struct) //FREE
pty_write(tty_struct) //USE | ...The corresponding fail log is shown below:
===============================================================
BUG: KASAN: use-after-free in __run_timers.part.0+0x170/0x470 Write of size 8 at addr ffff88800a652ab8 by task swapper/2/0 ... Call Trace: ... queue_work_on+0x3f/0x50 pty_write+0xcd/0xe0pty_write+0xcd/0xe0 sp_xmit_on_air+0xb2/0x1f0 call_timer_fn+0x28/0x150 __run_timers.part.0+0x3c2/0x470 run_timer_softirq+0x3b/0x80 __do_softirq+0xf1/0x380 ...
This patch reorders the del_timer_sync() after the unregister_netdev() to avoid UAF bugs. Because the unregister_netdev() is well synchronized, it flushs out any pending queues, waits the refcount of net_device decreases to zero and removes net_device from kernel. There is not any running routines after executing unregister_netdev(). Therefore, we could not arouse timer from userspace again.
--- drivers/net/hamradio/6pack.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/hamradio/6pack.c +2 -2
@@ -674,14 +674,14 @@ static void sixpack_close(struct tty_str*/ netif_stop_queue (sp->dev); +unregister_netdev (sp->dev); +del_timer_sync (&sp->tx_t);del_timer_sync (&sp->resync_t);/* Free all 6pack frame buffers. */ kfree (sp->rbuff);kfree (sp->xbuff); - -unregister_netdev (sp->dev); }/* Perform I/O control on an active 6pack channel. */
Greg Kroah-Hartman
maintainerPATCH 64/475 mailbox: tegra-hsp: Flush whole channel
In reply to Greg Kroah-HartmanFrom: Pekka Pessi <[email protected]>
commit 60de2d2dc284e0dd1c2c897d08625bde24ef3454 upstream.
The txdone can re-fill the mailbox. Keep polling the mailbox during the flush until all the messages have been delivered.
This fixes an issue with the Tegra Combined UART (TCU) where output can get truncated under high traffic load.
--- drivers/mailbox/tegra-hsp.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/mailbox/tegra-hsp.c +5 -0
@@ -403,6 +403,11 @@ static int tegra_hsp_mailbox_flush(struc value =tegra_hsp_channel_readl (ch,HSP_SM_SHRD_MBOX );if ((value &HSP_SM_SHRD_MBOX_FULL ) ==0 ) {mbox_chan_txdone (chan,0 ); + +/* Wait until channel is empty */ +if (chan->active_req !=NULL ) +continue ; +return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 65/475 block: dont merge across cgroup boundaries if blkcg is enabled
In reply to Greg Kroah-HartmanFrom: Tejun Heo <[email protected]>
commit 6b2b04590b51aa4cf395fcd185ce439cab5961dc upstream.
blk-iocost and iolatency are cgroup aware rq-qos policies but they didn't disable merges across different cgroups. This obviously can lead to accounting and control errors but more importantly to priority inversions - e.g. an IO which belongs to a higher priority cgroup or IO class may end up getting throttled incorrectly because it gets merged to an IO issued from a low priority cgroup.
Fix it by adding blk_cgroup_mergeable() which is called from merge paths and rejects cross-cgroup and cross-issue_as_root merges.
--- block/blk-merge.c | 11 +++++++++++ include/linux/blk-cgroup.h | 17 +++++++++++++++++ 2 files changed, 28 insertions(+)
block/blk-merge.c +11 -0
@@ -7,6 +7,7 @@#include <linux/bio.h> #include <linux/blkdev.h> #include <linux/scatterlist.h> +#include <linux/blk-cgroup.h> #include <trace/events/block.h>
@@ -571,6 +572,9 @@ static inline unsigned int blk_rq_get_mastatic inline int ll_new_hw_segment (struct request *req,struct bio *bio,unsigned int nr_phys_segs) { +if (!blk_cgroup_mergeable (req, bio)) + goto no_merge; +if (blk_integrity_merge_bio (req->q, req, bio) == false) goto no_merge;
@@ -662,6 +666,9 @@ static int ll_merge_requests_fn(struct rif (total_phys_segments >blk_rq_get_max_segments (req))return 0 ; +if (!blk_cgroup_mergeable (req, next->bio)) +return 0 ; +if (blk_integrity_merge_rq (q, req, next) == false)return 0 ;
@@ -885,6 +892,10 @@ bool blk_rq_merge_ok(struct request *rq,if (rq->rq_disk != bio->bi_disk)return false; +/* don't merge across cgroup boundaries */ +if (!blk_cgroup_mergeable (rq, bio)) +return false; +/* only merge integrity protected bio into ditto rq */ if (blk_integrity_merge_bio (rq->q, rq, bio) == false)return false;
include/linux/blk-cgroup.h +17 -0
@@ -22,6 +22,7 @@#include <linux/atomic.h> #include <linux/kthread.h> #include <linux/fs.h> +#include <linux/blkdev.h> /* percpu_counter batch for blkg_[rw]stats, per-cpu drift doesn't matter */ #define BLKG_STAT_CPU_BATCH (INT_MAX / 2)
@@ -768,6 +769,21 @@ static inline void blkcg_use_delay(strucatomic_inc (&blkg->blkcg->css.cgroup->congestion_count); } +/** +* blk_cgroup_mergeable - Determine whether to allow or disallow merges +* @rq: request to merge into +* @bio: bio to merge +* +* @bio and @rq should belong to the same cgroup and their issue_as_root should +* match. The latter is necessary as we don't want to throttle e.g. a metadata +* update because it happens to be next to a regular IO. +*/ +static inline bool blk_cgroup_mergeable (struct request *rq,struct bio *bio) +{ +return rq->bio->bi_blkg == bio->bi_blkg && +bio_issue_as_root_blkg (rq->bio) ==bio_issue_as_root_blkg (bio); +} +static inline int blkcg_unuse_delay (struct blkcg_gq *blkg) {int old =atomic_read (&blkg->use_delay);
@@ -868,6 +884,7 @@ static inline bool blkcg_punt_bio_submitstatic inline void blkcg_bio_issue_init (struct bio *bio) { }static inline bool blkcg_bio_issue_check (struct request_queue *q,struct bio *bio) {return true; } +static inline bool blk_cgroup_mergeable (struct request *rq,struct bio *bio) {return true; }#define blk_queue_for_each_rl (rl, q) \ for ((rl) = &(q)->root_rl; (rl); (rl) = NULL)
Greg Kroah-Hartman
maintainerPATCH 66/475 drm/edid: check basic audio support on CEA extension block
In reply to Greg Kroah-HartmanFrom: Cooper Chiou <[email protected]>
commit 5662abf6e21338be6d085d6375d3732ac6147fd2 upstream.
Tag code stored in bit7:5 for CTA block byte[3] is not the same as CEA extension block definition. Only check CEA block has basic audio support.
v3: update commit message.
--- drivers/gpu/drm/drm_edid.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_edid.c +2 -1
@@ -4380,7 +4380,8 @@ bool drm_detect_monitor_audio(struct ediif (!edid_ext) goto end; - has_audio = ((edid_ext[3 ] &EDID_BASIC_AUDIO ) !=0 ); + has_audio = (edid_ext[0 ] ==CEA_EXT && + (edid_ext[3 ] &EDID_BASIC_AUDIO ) !=0 );if (has_audio) {DRM_DEBUG_KMS ("Monitor has basic audio support\n" );
Greg Kroah-Hartman
maintainerPATCH 67/475 video: fbdev: sm712fb: Fix crash in smtcfb_read()
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
commit bd771cf5c4254511cc4abb88f3dab3bd58bdf8e8 upstream.
Zheyu Ma reported this crash in the sm712fb driver when reading three bytes from the framebuffer:
BUG: unable to handle page fault for address: ffffc90001ffffff RIP: 0010:smtcfb_read+0x230/0x3e0 Call Trace: vfs_read+0x198/0xa00 ? do_sys_openat2+0x27d/0x350 ? __fget_light+0x54/0x340 ksys_read+0xce/0x190 do_syscall_64+0x43/0x90
Fix it by removing the open-coded endianess fixup-code and by moving the pointer post decrement out the fb_readl() function.
--- drivers/video/fbdev/sm712fb.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-)
drivers/video/fbdev/sm712fb.c +7 -18
@@ -1047,7 +1047,7 @@ static ssize_t smtcfb_read(struct fb_infif (count + p > total_size) count = total_size - p; - buffer =kmalloc ((count >PAGE_SIZE ) ?PAGE_SIZE : count,GFP_KERNEL ); + buffer =kmalloc (PAGE_SIZE ,GFP_KERNEL );if (!buffer)return -ENOMEM ;
@@ -1059,25 +1059,14 @@ static ssize_t smtcfb_read(struct fb_infwhile (count) { c = (count >PAGE_SIZE ) ?PAGE_SIZE : count; dst = buffer; -for (i = c >>2 ; i--;) { - *dst =fb_readl (src++); - *dst =big_swap (*dst); +for (i = (c +3 ) >>2 ; i--;) { +u32 val; + + val =fb_readl (src); + *dst =big_swap (val); + src++; dst++; } -if (c &3 ) { -u8 *dst8 = (u8 *)dst; -u8 __iomem *src8 = (u8 __iomem *)src; - -for (i = c &3 ; i--;) { -if (i &1 ) { - *dst8++ =fb_readb (++src8); - }else { - *dst8++ =fb_readb (--src8); - src8 +=2 ; - } - } - src = (u32 __iomem *)src8; - }if (copy_to_user (buf, buffer, c)) { err = -EFAULT ;
Greg Kroah-Hartman
maintainerPATCH 68/475 video: fbdev: atari: Atari 2 bpp (STe) palette bugfix
In reply to Greg Kroah-HartmanFrom: Michael Schmitz <[email protected]>
commit c8be5edbd36ceed2ff3d6b8f8e40643c3f396ea3 upstream.
The code to set the shifter STe palette registers has a long standing operator precedence bug, manifesting as colors set on a 2 bits per pixel frame buffer coming up with a distinctive blue tint.
Add parentheses around the calculation of the per-color palette data before shifting those into their respective bit field position.
This bug goes back a long way (2.4 days at the very least) so there won't be a Fixes: tag.
Tested on ARAnyM as well on Falcon030 hardware.
--- drivers/video/fbdev/atafb.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/video/fbdev/atafb.c +6 -6
@@ -1692,9 +1692,9 @@ static int falcon_setcolreg(unsigned int ((blue & 0xfc00) >> 8));if (regno <16 ) { shifter_tt.color_reg[regno] = - (((red &0xe000 ) >>13 ) | ((red &0x1000 ) >>12 ) <<8 ) | - (((green &0xe000 ) >>13 ) | ((green &0x1000 ) >>12 ) <<4 ) | - ((blue &0xe000 ) >>13 ) | ((blue &0x1000 ) >>12 ); + ((((red &0xe000 ) >>13 ) | ((red &0x1000 ) >>12 )) <<8 ) | + ((((green &0xe000 ) >>13 ) | ((green &0x1000 ) >>12 )) <<4 ) | + ((blue &0xe000 ) >>13 ) | ((blue &0x1000 ) >>12 ); ((u32 *)info->pseudo_palette)[regno] = ((red &0xf800 ) | ((green &0xfc00 ) >>5 ) | ((blue &0xf800 ) >>11 ));
@@ -1980,9 +1980,9 @@ static int stste_setcolreg(unsigned int green >>=12 ;if (ATARIHW_PRESENT (EXTD_SHIFTER )) shifter_tt.color_reg[regno] = - (((red &0xe ) >>1 ) | ((red &1 ) <<3 ) <<8 ) | - (((green &0xe ) >>1 ) | ((green &1 ) <<3 ) <<4 ) | - ((blue &0xe ) >>1 ) | ((blue &1 ) <<3 ); + ((((red &0xe ) >>1 ) | ((red &1 ) <<3 )) <<8 ) | + ((((green &0xe ) >>1 ) | ((green &1 ) <<3 )) <<4 ) | + ((blue &0xe ) >>1 ) | ((blue &1 ) <<3 );else shifter_tt.color_reg[regno] = ((red & 0xe) << 7) |
Greg Kroah-Hartman
maintainerPATCH 69/475 ARM: dts: at91: sama5d2: Fix PMERRLOC resource size
In reply to Greg Kroah-HartmanFrom: Tudor Ambarus <[email protected]>
commit 0fb578a529ac7aca326a9fa475b4a6f58a756fda upstream.
PMERRLOC resource size was set to 0x100, which resulted in HSMC_ERRLOCx register being truncated to offset x = 21, causing error correction to fail if more than 22 bit errors and if 24 or 32 bit error correction was supported.
--- arch/arm/boot/dts/sama5d2.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/sama5d2.dtsi +1 -1
@@ -526,7 +526,7 @@ pmecc: ecc-engine@f8014070 { compatible = "atmel,sama5d2-pmecc"; reg = <0xf8014070 0x490>, - <0xf8014500 0x100>; + <0xf8014500 0x200>; }; };
Greg Kroah-Hartman
maintainerPATCH 70/475 ARM: dts: exynos: fix UART3 pins configuration in Exynos5250
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
commit 372d7027fed43c8570018e124cf78b89523a1f8e upstream.
The gpa1-4 pin was put twice in UART3 pin configuration of Exynos5250, instead of proper pin gpa1-5.
--- arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/exynos5250-pinctrl.dtsi +1 -1
@@ -260,7 +260,7 @@ }; uart3_data: uart3-data { - samsung,pins = "gpa1-4", "gpa1-4"; + samsung,pins = "gpa1-4", "gpa1-5"; samsung,pin-function = <EXYNOS_PIN_FUNC_2>; samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
Greg Kroah-Hartman
maintainerPATCH 71/475 ARM: dts: exynos: add missing HDMI supplies on SMDK5250
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
commit 60a9914cb2061ba612a3f14f6ad329912b486360 upstream.
Add required VDD supplies to HDMI block on SMDK5250. Without them, the HDMI driver won't probe. Because of lack of schematics, use same supplies as on Arndale 5250 board (voltage matches).
--- arch/arm/boot/dts/exynos5250-smdk5250.dts | 3 +++ 1 file changed, 3 insertions(+)
arch/arm/boot/dts/exynos5250-smdk5250.dts +3 -0
@@ -117,6 +117,9 @@ status = "okay"; ddc = <&i2c_2>; hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>; + vdd-supply = <&ldo8_reg>; + vdd_osc-supply = <&ldo10_reg>; + vdd_pll-supply = <&ldo8_reg>; }; &i2c_0 {
Greg Kroah-Hartman
maintainerPATCH 72/475 ARM: dts: exynos: add missing HDMI supplies on SMDK5420
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
commit 453a24ded415f7fce0499c6b0a2c7b28f84911f2 upstream.
Add required VDD supplies to HDMI block on SMDK5420. Without them, the HDMI driver won't probe. Because of lack of schematics, use same supplies as on Arndale Octa and Odroid XU3 boards (voltage matches).
--- arch/arm/boot/dts/exynos5420-smdk5420.dts | 3 +++ 1 file changed, 3 insertions(+)
arch/arm/boot/dts/exynos5420-smdk5420.dts +3 -0
@@ -132,6 +132,9 @@ hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&hdmi_hpd_irq>; + vdd-supply = <&ldo6_reg>; + vdd_osc-supply = <&ldo7_reg>; + vdd_pll-supply = <&ldo6_reg>; }; &hsi2c_4 {
Greg Kroah-Hartman
maintainerPATCH 73/475 carl9170: fix missing bit-wise or operator for tx_params
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
commit 02a95374b5eebdbd3b6413fd7ddec151d2ea75a1 upstream.
Currently tx_params is being re-assigned with a new value and the previous setting IEEE80211_HT_MCS_TX_RX_DIFF is being overwritten. The assignment operator is incorrect, the original intent was to bit-wise or the value in. Fix this by replacing the = operator with |= instead.
Kudos to Christian Lamparter for suggesting the correct fix.
--- drivers/net/wireless/ath/carl9170/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/carl9170/main.c +1 -1
@@ -1917,7 +1917,7 @@ static int carl9170_parse_eeprom(structWARN_ON (!(tx_streams >=1 && tx_streams <=IEEE80211_HT_MCS_TX_MAX_STREAMS )); - tx_params = (tx_streams -1 ) << + tx_params |= (tx_streams -1 ) <<IEEE80211_HT_MCS_TX_MAX_STREAMS_SHIFT ; carl9170_band_2GHz.ht_cap.mcs.tx_params |= tx_params;
Greg Kroah-Hartman
maintainerPATCH 74/475 thermal: int340x: Increase bitmap size
In reply to Greg Kroah-HartmanFrom: Srinivas Pandruvada <[email protected]>
commit 668f69a5f863b877bc3ae129efe9a80b6f055141 upstream.
The number of policies are 10, so can't be supported by the bitmap size of u8.
Even though there are no platfoms with these many policies, but for correctness increase to u32.
--- drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/intel/int340x_thermal/int3400_thermal.c +1 -1
@@ -49,7 +49,7 @@ struct int3400_thermal_priv {struct art *arts;int trt_count;struct trt *trts; -u8 uuid_bitmap; +u32 uuid_bitmap;int rel_misc_dev_res;int current_uuid_index; };
Greg Kroah-Hartman
maintainerPATCH 75/475 lib/raid6/test: fix multiple definition linking error
In reply to Greg Kroah-HartmanFrom: Dirk Müller <[email protected]>
commit a5359ddd052860bacf957e65fe819c63e974b3a6 upstream.
GCC 10+ defaults to -fno-common, which enforces proper declaration of external references using "extern". without this change a link would fail with:
lib/raid6/test/algos.c:28: multiple definition of `raid6_call'; lib/raid6/test/test.c:22: first defined here
the pq.h header that is included already includes an extern declaration so we can just remove the redundant one here.
--- lib/raid6/test/test.c | 1 - 1 file changed, 1 deletion(-)
lib/raid6/test/test.c +0 -1
@@ -19,7 +19,6 @@#define NDISKS 16/* Including P and Q */ const char raid6_empty_zero_page[PAGE_SIZE] __attribute__((aligned(PAGE_SIZE))); -struct raid6_calls raid6_call;char *dataptrs[NDISKS ]; char data[NDISKS][PAGE_SIZE] __attribute__((aligned(PAGE_SIZE)));
Greg Kroah-Hartman
maintainerPATCH 76/475 crypto: rsa-pkcs1pad - correctly get hash from source scatterlist
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
commit e316f7179be22912281ce6331d96d7c121fb2b17 upstream.
Commit c7381b012872 ("crypto: akcipher - new verify API for public key algorithms") changed akcipher_alg::verify to take in both the signature and the actual hash and do the signature verification, rather than just return the hash expected by the signature as was the case before. To do this, it implemented a hack where the signature and hash are concatenated with each other in one scatterlist.
Obviously, for this to work correctly, akcipher_alg::verify needs to correctly extract the two items from the scatterlist it is given. Unfortunately, it doesn't correctly extract the hash in the case where the signature is longer than the RSA key size, as it assumes that the signature's length is equal to the RSA key size. This causes a prefix of the hash, or even the entire hash, to be taken from the *signature*.
(Note, the case of a signature longer than the RSA key size should not be allowed in the first place; a separate patch will fix that.)
It is unclear whether the resulting scheme has any useful security properties.
Fix this by correctly extracting the hash from the scatterlist.
--- crypto/rsa-pkcs1pad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
crypto/rsa-pkcs1pad.c +1 -1
@@ -494,7 +494,7 @@ static int pkcs1pad_verify_complete(strusg_nents_for_len (req->src, req->src_len + req->dst_len), req_ctx->out_buf + ctx->key_size, - req->dst_len, ctx->key_size); + req->dst_len, req->src_len);/* Do the actual verification step. */ if (memcmp (req_ctx->out_buf + ctx->key_size, out_buf + pos, req->dst_len) !=0 )
Greg Kroah-Hartman
maintainerPATCH 77/475 crypto: rsa-pkcs1pad - restore signature length check
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
commit d3481accd974541e6a5d6a1fb588924a3519c36e upstream.
RSA PKCS#1 v1.5 signatures are required to be the same length as the RSA key size. RFC8017 specifically requires the verifier to check this
(https://datatracker.ietf.org/doc/html/rfc8017#section-8.2.2).
Commit a49de377e051 ("crypto: Add hash param to pkcs1pad") changed the kernel to allow longer signatures, but didn't explain this part of the change; it seems to be unrelated to the rest of the commit.
Revert this change, since it doesn't appear to be correct.
We can be pretty sure that no one is relying on overly-long signatures (which would have to be front-padded with zeroes) being supported, given that they would have been broken since commit c7381b012872 ("crypto: akcipher - new verify API for public key algorithms").
--- crypto/rsa-pkcs1pad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
crypto/rsa-pkcs1pad.c +1 -1
@@ -537,7 +537,7 @@ static int pkcs1pad_verify(struct akciphif (WARN_ON (req->dst) ||WARN_ON (!req->dst_len) || - !ctx->key_size || req->src_len < ctx->key_size) + !ctx->key_size || req->src_len != ctx->key_size)return -EINVAL ; req_ctx->out_buf =kmalloc (ctx->key_size + req->dst_len,GFP_KERNEL );
Greg Kroah-Hartman
maintainerPATCH 78/475 crypto: rsa-pkcs1pad - fix buffer overread in pkcs1pad_verify_complete()
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
commit a24611ea356c7f3f0ec926da11b9482ac1f414fd upstream.
Before checking whether the expected digest_info is present, we need to check that there are enough bytes remaining.
--- crypto/rsa-pkcs1pad.c | 2 ++ 1 file changed, 2 insertions(+)
crypto/rsa-pkcs1pad.c +2 -0
@@ -475,6 +475,8 @@ static int pkcs1pad_verify_complete(stru pos++;if (digest_info) { +if (digest_info->size > dst_len - pos) + goto done;if (crypto_memneq (out_buf + pos, digest_info->data, digest_info->size)) goto done;
Greg Kroah-Hartman
maintainerPATCH 79/475 DEC: Limit PMAX memory probing to R3k systems
In reply to Greg Kroah-HartmanFrom: Maciej W. Rozycki <[email protected]>
commit 244eae91a94c6dab82b3232967d10eeb9dfa21c6 upstream.
Recent tightening of the opcode table in binutils so as to consistently disallow the assembly or disassembly of CP0 instructions not supported by the processor architecture chosen has caused a regression like below:
arch/mips/dec/prom/locore.S: Assembler messages:arch/mips/dec/prom/locore.S:29: Error: opcode not supported on this processor: r4600 (mips3) `rfe'
in a piece of code used to probe for memory with PMAX DECstation models, which have non-REX firmware. Those computers always have an R2000 CPU and consequently the exception handler used in memory probing uses the RFE instruction, which those processors use.
While adding 64-bit support this code was correctly excluded for 64-bit configurations, however it should have also been excluded for irrelevant 32-bit configurations. Do this now then, and only enable PMAX memory probing for R3k systems.
--- arch/mips/dec/prom/Makefile | 2 +- arch/mips/include/asm/dec/prom.h | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-)
arch/mips/dec/prom/Makefile +1 -1
@@ -6,4 +6,4 @@ lib-y += init.o memory.o cmdline.o identify.o console.o -lib-$(CONFIG_32BIT) += locore.o +lib-$(CONFIG_CPU_R3000) += locore.o
arch/mips/include/asm/dec/prom.h +5 -10
@@ -43,16 +43,11 @@*/ #define REX_PROM_MAGIC 0x30464354 -#ifdef CONFIG_64BIT - -#define prom_is_rex (magic) 1/* KN04 and KN05 are REX PROMs. */ - -#else /* !CONFIG_64BIT */ - -#define prom_is_rex (magic) ((magic) == REX_PROM_MAGIC) - -#endif /* !CONFIG_64BIT */ - +/* KN04 and KN05 are REX PROMs, so only do the check for R3k systems. */ +static inline bool prom_is_rex (u32 magic) +{ +return !IS_ENABLED (CONFIG_CPU_R3000 ) || magic ==REX_PROM_MAGIC ; +}/* * 3MIN/MAXINE PROM entry points for DS5000/1xx's, DS5000/xx's and
Greg Kroah-Hartman
maintainerPATCH 80/475 media: davinci: vpif: fix unbalanced runtime PM get
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 4a321de239213300a714fa0353a5f1272d381a44 upstream.
Make sure to balance the runtime PM usage counter on driver unbind.
--- drivers/media/platform/davinci/vpif.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/platform/davinci/vpif.c +1 -0
@@ -496,6 +496,7 @@ static int vpif_probe(struct platform_destatic int vpif_remove (struct platform_device *pdev) { +pm_runtime_put (&pdev->dev);pm_runtime_disable (&pdev->dev);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 81/475 xtensa: fix stop_machine_cpuslocked call in patch_text
In reply to Greg Kroah-HartmanFrom: Max Filippov <[email protected]>
commit f406f2d03e07afc199dd8cf501f361dde6be8a69 upstream.
patch_text must invoke patch_text_stop_machine on all online CPUs, but it calls stop_machine_cpuslocked with NULL cpumask. As a result only one CPU runs patch_text_stop_machine potentially leaving stale icache entries on other CPUs. Fix that by calling stop_machine_cpuslocked with cpu_online_mask as the last argument.
--- arch/xtensa/kernel/jump_label.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/xtensa/kernel/jump_label.c +1 -1
@@ -61,7 +61,7 @@ static void patch_text(unsigned long add .data = data, };stop_machine_cpuslocked (patch_text_stop_machine, - &patch,NULL ); + &patch, cpu_online_mask); }else {unsigned long flags;
Greg Kroah-Hartman
maintainerPATCH 82/475 xtensa: fix xtensa_wsr always writing 0
In reply to Greg Kroah-HartmanFrom: Max Filippov <[email protected]>
commit a3d0245c58f962ee99d4440ea0eaf45fb7f5a5cc upstream.
The commit cad6fade6e78 ("xtensa: clean up WSR*/RSR*/get_sr/set_sr") replaced 'WSR' macro in the function xtensa_wsr with 'xtensa_set_sr', but variable 'v' in the xtensa_set_sr body shadowed the argument 'v' passed to it, resulting in wrong value written to debug registers.
Fix that by removing intermediate variable from the xtensa_set_sr macro body.
--- arch/xtensa/include/asm/processor.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/xtensa/include/asm/processor.h +2 -2
@@ -225,8 +225,8 @@ extern unsigned long get_wchan(struct ta#define xtensa_set_sr (x, sr) \ ({ \ - unsigned int v = (unsigned int)(x); \ - __asm__ __volatile__ ("wsr %0, "__stringify(sr) :: "a"(v)); \ + __asm__ __volatile__ ("wsr %0, "__stringify(sr) :: \ + "a"((unsigned int)(x))); \ })#define xtensa_get_sr (sr) \
Greg Kroah-Hartman
maintainerPATCH 83/475 brcmfmac: firmware: Allocate space for default boardrev in nvram
In reply to Greg Kroah-HartmanFrom: Hector Martin <[email protected]>
commit d19d8e3ba256f81ea4a27209dbbd1f0a00ef1903 upstream.
If boardrev is missing from the NVRAM we add a default one, but this might need more space in the output buffer than was allocated. Ensure we have enough padding for this in the buffer.
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c +2 -0
@@ -207,6 +207,8 @@ static int brcmf_init_nvram_parser(struc size =BRCMF_FW_MAX_NVRAM_SIZE ; else size = data_len; +/* Add space for properties we may add */ + size +=strlen (BRCMF_FW_DEFAULT_BOARDREV ) +1 ;/* Alloc for extra 0 byte + roundup by 4 + length field */ size +=1 +3 +sizeof (u32); nvp->nvram =kzalloc (size,GFP_KERNEL );
Greg Kroah-Hartman
maintainerPATCH 84/475 brcmfmac: pcie: Release firmwares in the brcmf_pcie_setup error path
In reply to Greg Kroah-HartmanFrom: Hector Martin <[email protected]>
commit 5e90f0f3ead014867dade7a22f93958119f5efab upstream.
This avoids leaking memory if brcmf_chip_get_raminfo fails. Note that the CLM blob is released in the device remove path.
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +2 -0
@@ -1775,6 +1775,8 @@ static void brcmf_pcie_setup(struct devi ret =brcmf_chip_get_raminfo (devinfo->ci);if (ret) {brcmf_err (bus,"Failed to get RAM info\n" ); +release_firmware (fw); +brcmf_fw_nvram_free (nvram); goto fail; }
Greg Kroah-Hartman
maintainerPATCH 85/475 brcmfmac: pcie: Replace brcmf_pcie_copy_mem_todev with memcpy_toio
In reply to Greg Kroah-HartmanFrom: Hector Martin <[email protected]>
commit 9466987f246758eb7e9071ae58005253f631271e upstream.
The alignment check was wrong (e.g. & 4 instead of & 3), and the logic was also inefficient if the length was not a multiple of 4, since it would needlessly fall back to copying the entire buffer bytewise.
We already have a perfectly good memcpy_toio function, so just call that instead of rolling our own copy logic here. brcmf_pcie_init_ringbuffers was already using it anyway.
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 48 +--------------- 1 file changed, 4 insertions(+), 44 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +4 -44
@@ -12,6 +12,7 @@#include <linux/interrupt.h> #include <linux/bcma/bcma.h> #include <linux/sched.h> +#include <linux/io.h> #include <asm/unaligned.h> #include <soc.h>
@@ -445,47 +446,6 @@ brcmf_pcie_write_ram32(struct brcmf_pciestatic void -brcmf_pcie_copy_mem_todev (struct brcmf_pciedev_info *devinfo,u32 mem_offset, -void *srcaddr,u32 len) -{ -void __iomem *address = devinfo->tcm + mem_offset; -__le32 *src32; -__le16 *src16; -u8 *src8; - -if (((ulong )address &4 ) || ((ulong )srcaddr &4 ) || (len &4 )) { -if (((ulong )address &2 ) || ((ulong )srcaddr &2 ) || (len &2 )) { - src8 = (u8 *)srcaddr; -while (len) { -iowrite8 (*src8, address); - address++; - src8++; - len--; - } - }else { - len = len /2 ; - src16 = (__le16 *)srcaddr; -while (len) { -iowrite16 (le16_to_cpu (*src16), address); - address +=2 ; - src16++; - len--; - } - } - }else { - len = len /4 ; - src32 = (__le32 *)srcaddr; -while (len) { -iowrite32 (le32_to_cpu (*src32), address); - address +=4 ; - src32++; - len--; - } - } -} - - -static void brcmf_pcie_copy_dev_tomem (struct brcmf_pciedev_info *devinfo,u32 mem_offset,void *dstaddr,u32 len) {
@@ -1561,8 +1521,8 @@ static int brcmf_pcie_download_fw_nvram(return err;brcmf_dbg (PCIE ,"Download FW %s\n" , devinfo->fw_name); -brcmf_pcie_copy_mem_todev (devinfo, devinfo->ci->rambase, - (void *)fw->data, fw->size); +memcpy_toio (devinfo->tcm + devinfo->ci->rambase, + (void *)fw->data, fw->size); resetintr =get_unaligned_le32 (fw->data);release_firmware (fw);
@@ -1576,7 +1536,7 @@ static int brcmf_pcie_download_fw_nvram(brcmf_dbg (PCIE ,"Download NVRAM %s\n" , devinfo->nvram_name); address = devinfo->ci->rambase + devinfo->ci->ramsize - nvram_len; -brcmf_pcie_copy_mem_todev (devinfo, address, nvram, nvram_len); +memcpy_toio (devinfo->tcm + address, nvram, nvram_len);brcmf_fw_nvram_free (nvram); }else { brcmf_dbg(PCIE, "No matching NVRAM file found %s\n",
Greg Kroah-Hartman
maintainerPATCH 86/475 brcmfmac: pcie: Fix crashes due to early IRQs
In reply to Greg Kroah-HartmanFrom: Hector Martin <[email protected]>
commit b50255c83b914defd61a57fbc81d452334b63f4c upstream.
The driver was enabling IRQs before the message processing was initialized. This could cause IRQs to come in too early and crash the driver. Instead, move the IRQ enable and hostready to a bus preinit function, at which point everything is properly initialized.
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +13 -3
@@ -1306,6 +1306,18 @@ static void brcmf_pcie_down(struct devic { } +static int brcmf_pcie_preinit (struct device *dev) +{ +struct brcmf_bus *bus_if =dev_get_drvdata (dev); +struct brcmf_pciedev *buspub = bus_if->bus_priv.pcie; + +brcmf_dbg (PCIE ,"Enter\n" ); + +brcmf_pcie_intr_enable (buspub->devinfo); +brcmf_pcie_hostready (buspub->devinfo); + +return 0 ; +}static int brcmf_pcie_tx (struct device *dev,struct sk_buff *skb) {
@@ -1414,6 +1426,7 @@ static int brcmf_pcie_reset(struct devic }static const struct brcmf_bus_ops brcmf_pcie_bus_ops = { + .preinit = brcmf_pcie_preinit, .txdata = brcmf_pcie_tx, .stop = brcmf_pcie_down, .txctl = brcmf_pcie_tx_ctlpkt,
@@ -1786,9 +1799,6 @@ static void brcmf_pcie_setup(struct deviinit_waitqueue_head (&devinfo->mbdata_resp_wait); -brcmf_pcie_intr_enable (devinfo); -brcmf_pcie_hostready (devinfo); - ret =brcmf_attach (&devinfo->pdev->dev);if (ret) goto fail;
Greg Kroah-Hartman
maintainerPATCH 87/475 PCI: pciehp: Clear cmd_busy bit in polling mode
In reply to Greg Kroah-HartmanFrom: Liguang Zhang <[email protected]>
commit 92912b175178c7e895f5e5e9f1e30ac30319162b upstream.
Writes to a Downstream Port's Slot Control register are PCIe hotplug "commands." If the Port supports Command Completed events, software must wait for a command to complete before writing to Slot Control again.
pcie_do_write_cmd() sets ctrl->cmd_busy when it writes to Slot Control. If software notification is enabled, i.e., PCI_EXP_SLTCTL_HPIE and PCI_EXP_SLTCTL_CCIE are set, ctrl->cmd_busy is cleared by pciehp_isr().
But when software notification is disabled, as it is when pcie_init() powers off an empty slot, pcie_wait_cmd() uses pcie_poll_cmd() to poll for command completion, and it neglects to clear ctrl->cmd_busy, which leads to spurious timeouts:
pcieport 0000:00:03.0: pciehp: Timeout on hotplug command 0x01c0 (issued 2264 msec ago) pcieport 0000:00:03.0: pciehp: Timeout on hotplug command 0x05c0 (issued 2288 msec ago)
Clear ctrl->cmd_busy in pcie_poll_cmd() when it detects a Command Completed event (PCI_EXP_SLTSTA_CC).
--- drivers/pci/hotplug/pciehp_hpc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pci/hotplug/pciehp_hpc.c +2 -0
@@ -79,6 +79,8 @@ static int pcie_poll_cmd(struct controllif (slot_status &PCI_EXP_SLTSTA_CC ) {pcie_capability_write_word (pdev,PCI_EXP_SLTSTA ,PCI_EXP_SLTSTA_CC ); + ctrl->cmd_busy =0 ; +smp_mb ();return 1 ; }if (timeout <0 )
Greg Kroah-Hartman
maintainerPATCH 88/475 regulator: qcom_smd: fix for_each_child.cocci warnings
In reply to Greg Kroah-HartmanFrom: kernel test robot <[email protected]>
[ Upstream commit 6390d42c21efff0b4c10956a38e341f4e84ecd3d ]
drivers/regulator/qcom_smd-regulator.c:1318:1-33: WARNING: Function "for_each_available_child_of_node" should have of_node_put() before return around line 1321.
Semantic patch information:
False positives can be due to function calls within the for_each loop that may encapsulate an of_node_put.
Generated by: scripts/coccinelle/iterators/for_each_child.cocci
--- drivers/regulator/qcom_smd-regulator.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/regulator/qcom_smd-regulator.c +3 -1
@@ -854,8 +854,10 @@ static int rpm_reg_probe(struct platform_device *pdev)for_each_available_child_of_node (dev->of_node, node) { vreg =devm_kzalloc (&pdev->dev,sizeof (*vreg),GFP_KERNEL ); -if (!vreg) +if (!vreg) { +of_node_put (node);return -ENOMEM ; + } ret =rpm_regulator_init_vreg (vreg, dev, node, rpm, vreg_data);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 89/475 crypto: authenc - Fix sleep in atomic context in decrypt_tail
In reply to Greg Kroah-HartmanFrom: Herbert Xu <[email protected]>
[ Upstream commit 66eae850333d639fc278d6f915c6fc01499ea893 ]
The function crypto_authenc_decrypt_tail discards its flags argument and always relies on the flags from the original request when starting its sub-request.
This is clearly wrong as it may cause the SLEEPABLE flag to be set when it shouldn't.
--- crypto/authenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
crypto/authenc.c +1 -1
@@ -263,7 +263,7 @@ static int crypto_authenc_decrypt_tail(struct aead_request *req, dst =scatterwalk_ffwd (areq_ctx->dst, req->dst, req->assoclen);skcipher_request_set_tfm (skreq, ctx->enc); -skcipher_request_set_callback (skreq,aead_request_flags (req), +skcipher_request_set_callback (skreq, flags, req->base.complete, req->base.data);skcipher_request_set_crypt (skreq, src, dst, req->cryptlen - authsize, req->iv);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 90/475 crypto: mxs-dcp - Fix scatterlist processing
In reply to Greg Kroah-HartmanFrom: Tomas Paukrt <[email protected]>
[ Upstream commit 28e9b6d8199a3f124682b143800c2dacdc3d70dd ]
This patch fixes a bug in scatterlist processing that may cause incorrect AES block encryption/decryption.
--- drivers/crypto/mxs-dcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/mxs-dcp.c +1 -1
@@ -329,7 +329,7 @@ static int mxs_dcp_aes_block_crypt(struct crypto_async_request *arq)memset (key +AES_KEYSIZE_128 ,0 ,AES_KEYSIZE_128 ); } -for_each_sg (req->src, src,sg_nents (src), i) { +for_each_sg (req->src, src,sg_nents (req->src), i) { src_buf =sg_virt (src); len =sg_dma_len (src); tlen += len;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 91/475 spi: tegra114: Add missing IRQ check in tegra_spi_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 4f92724d4b92c024e721063f520d66e11ca4b54b ]
This func misses checking for platform_get_irq()'s call and may passes the negative error codes to request_threaded_irq(), which takes unsigned IRQ #, causing it to fail with -EINVAL, overriding an original error code. Stop calling request_threaded_irq() with invalid IRQ #s.
--- drivers/spi/spi-tegra114.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/spi/spi-tegra114.c +4 -0
@@ -1352,6 +1352,10 @@ static int tegra_spi_probe(struct platform_device *pdev) tspi->phys = r->start; spi_irq =platform_get_irq (pdev,0 ); +if (spi_irq <0 ) { + ret = spi_irq; + goto exit_free_master; + } tspi->irq = spi_irq; tspi->clk =devm_clk_get (&pdev->dev,"spi" );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 92/475 selftests/x86: Add validity check and allow field splitting
In reply to Greg Kroah-HartmanFrom: Muhammad Usama Anjum <[email protected]>
[ Upstream commit b06e15ebd5bfb670f93c7f11a29b8299c1178bc6 ]
Add check to test if CC has a string. CC can have multiple sub-strings like "ccache gcc". Erorr pops up if it is treated as single string and double quotes are used around it. This can be fixed by removing the quotes and not treating CC as a single string.
--- tools/testing/selftests/x86/check_cc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/x86/check_cc.sh +1 -1
@@ -7,7 +7,7 @@ CC="$1" TESTPROG="$2" shift 2 -if "$CC" -o /dev/null "$TESTPROG" -O0 "$@" 2>/dev/null; then +if [ -n "$CC" ] && $CC -o /dev/null "$TESTPROG" -O0 "$@" 2>/dev/null; then echo 1 else echo 0
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 93/475 audit: log AUDIT_TIME_* records only from rules
In reply to Greg Kroah-HartmanFrom: Richard Guy Briggs <[email protected]>
[ Upstream commit 272ceeaea355214b301530e262a0df8600bfca95 ]
AUDIT_TIME_* events are generated when there are syscall rules present that are not related to time keeping. This will produce noisy log entries that could flood the logs and hide events we really care about.
Rather than immediately produce the AUDIT_TIME_* records, store the data in the context and log it at syscall exit time respecting the filter rules.
Note: This eats the audit_buffer, unlike any others in show_special().
Please see https://bugzilla.redhat.com/show_bug.cgi?id=1991919
--- kernel/audit.h | 4 +++ kernel/auditsc.c | 87 +++++++++++++++++++++++++++++++++++++----------- 2 files changed, 71 insertions(+), 20 deletions(-)
kernel/audit.h +4 -0
@@ -191,6 +191,10 @@ struct audit_context {struct {char *name; } module; +struct { +struct audit_ntp_data ntp_data; +struct timespec64 tk_injoffset; + } time; };int fds[2 ];struct audit_proctitle proctitle;
kernel/auditsc.c +67 -20
110 lines not on this page · raw message
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 94/475 crypto: ccree - dont attempt 0 len DMA mappings
In reply to Greg Kroah-HartmanFrom: Gilad Ben-Yossef <[email protected]>
[ Upstream commit 1fb37b5692c915edcc2448a6b37255738c7c77e0 ]
Refuse to try mapping zero bytes as this may cause a fault on some configurations / platforms and it seems the prev. attempt is not enough and we need to be more explicit.
scatterlists")
--- drivers/crypto/ccree/cc_buffer_mgr.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/crypto/ccree/cc_buffer_mgr.c +7 -0
@@ -295,6 +295,13 @@ static int cc_map_sg(struct device *dev, struct scatterlist *sg, {int ret =0 ; +if (!nbytes) { + *mapped_nents =0 ; + *lbytes =0 ; + *nents =0 ; +return 0 ; + } + *nents =cc_get_sgl_nents (dev, sg, nbytes, lbytes);if (*nents > max_sg_nents) { *nents =0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 95/475 spi: pxa2xx-pci: Balance reference count for PCI DMA device
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 609d7ffdc42199a0ec949db057e3b4be6745d6c5 ]
The pci_get_slot() increases its reference count, the caller must decrement the reference count by calling pci_dev_put().
--- drivers/spi/spi-pxa2xx-pci.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
drivers/spi/spi-pxa2xx-pci.c +16 -1
@@ -74,14 +74,23 @@ static bool lpss_dma_filter(struct dma_chan *chan, void *param)return true; } +static void lpss_dma_put_device (void *dma_dev) +{ +pci_dev_put (dma_dev); +} +static int lpss_spi_setup (struct pci_dev *dev,struct pxa_spi_info *c) {struct pci_dev *dma_dev; +int ret; c->num_chipselect =1 ; c->max_clk_rate =50000000 ; dma_dev =pci_get_slot (dev->bus,PCI_DEVFN (PCI_SLOT (dev->devfn),0 )); + ret =devm_add_action_or_reset (&dev->dev, lpss_dma_put_device, dma_dev); +if (ret) +return ret;if (c->tx_param) {struct dw_dma_slave *slave = c->tx_param;
@@ -105,8 +114,9 @@ static int lpss_spi_setup(struct pci_dev *dev, struct pxa_spi_info *c)static int mrfld_spi_setup (struct pci_dev *dev,struct pxa_spi_info *c) { -struct pci_dev *dma_dev =pci_get_slot (dev->bus,PCI_DEVFN (21 ,0 ));struct dw_dma_slave *tx, *rx; +struct pci_dev *dma_dev; +int ret;switch (PCI_FUNC (dev->devfn)) {case 0 :
@@ -131,6 +141,11 @@ static int mrfld_spi_setup(struct pci_dev *dev, struct pxa_spi_info *c)return -ENODEV ; } + dma_dev =pci_get_slot (dev->bus,PCI_DEVFN (21 ,0 )); + ret =devm_add_action_or_reset (&dev->dev, lpss_dma_put_device, dma_dev); +if (ret) +return ret; + tx = c->tx_param; tx->dma_dev = &dma_dev->dev;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 96/475 hwmon: (pmbus) Add mutex to regulator ops
In reply to Greg Kroah-HartmanFrom: Patrick Rudolph <[email protected]>
[ Upstream commit 686d303ee6301261b422ea51e64833d7909a2c36 ]
On PMBUS devices with multiple pages, the regulator ops need to be protected with the update mutex. This prevents accidentally changing the page in a separate thread while operating on the PMBUS_OPERATION register.
Tested on Infineon xdpe11280 while a separate thread polls for sensor data.
--- drivers/hwmon/pmbus/pmbus_core.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
drivers/hwmon/pmbus/pmbus_core.c +13 -3
@@ -2174,10 +2174,14 @@ static int pmbus_regulator_is_enabled(struct regulator_dev *rdev) {struct device *dev =rdev_get_dev (rdev);struct i2c_client *client =to_i2c_client (dev->parent); +struct pmbus_data *data =i2c_get_clientdata (client);u8 page =rdev_get_id (rdev);int ret; +mutex_lock (&data->update_lock); ret =pmbus_read_byte_data (client, page,PMBUS_OPERATION ); +mutex_unlock (&data->update_lock); +if (ret <0 )return ret;
@@ -2188,11 +2192,17 @@ static int _pmbus_regulator_on_off(struct regulator_dev *rdev, bool enable) {struct device *dev =rdev_get_dev (rdev);struct i2c_client *client =to_i2c_client (dev->parent); +struct pmbus_data *data =i2c_get_clientdata (client);u8 page =rdev_get_id (rdev); +int ret; -return pmbus_update_byte_data (client, page,PMBUS_OPERATION , -PB_OPERATION_CONTROL_ON , - enable ?PB_OPERATION_CONTROL_ON :0 ); +mutex_lock (&data->update_lock); + ret =pmbus_update_byte_data (client, page,PMBUS_OPERATION , +PB_OPERATION_CONTROL_ON , + enable ?PB_OPERATION_CONTROL_ON :0 ); +mutex_unlock (&data->update_lock); + +return ret; }static int pmbus_regulator_enable (struct regulator_dev *rdev)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 97/475 hwmon: (sch56xx-common) Replace WDOG_ACTIVE with WDOG_HW_RUNNING
In reply to Greg Kroah-HartmanFrom: Armin Wolf <[email protected]>
[ Upstream commit 647d6f09bea7dacf4cdb6d4ea7e3051883955297 ]
If the watchdog was already enabled by the BIOS after booting, the watchdog infrastructure needs to regularly send keepalives to prevent a unexpected reset.WDOG_ACTIVE only serves as an status indicator for userspace, we want to use WDOG_HW_RUNNING instead.
Since my Fujitsu Esprimo P720 does not support the watchdog, this change is compile-tested only.
--- drivers/hwmon/sch56xx-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/sch56xx-common.c +1 -1
@@ -424,7 +424,7 @@ struct sch56xx_watchdog_data *sch56xx_watchdog_register(struct device *parent,if (nowayout)set_bit (WDOG_NO_WAY_OUT , &data->wddev.status);if (output_enable &SCH56XX_WDOG_OUTPUT_ENABLE ) -set_bit (WDOG_ACTIVE , &data->wddev.status); +set_bit (WDOG_HW_RUNNING , &data->wddev.status);/* Since the watchdog uses a downcounter there is no register to read the BIOS set timeout from (if any was set at all) ->
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 98/475 block: dont delete queue kobject before its children
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
[ Upstream commit 0f69288253e9fc7c495047720e523b9f1aba5712 ]
kobjects aren't supposed to be deleted before their child kobjects are deleted. Apparently this is usually benign; however, a WARN will be triggered if one of the child kobjects has a named attribute group:
sysfs group 'modes' not found for kobject 'crypto'
WARNING: CPU: 0 PID: 1 at fs/sysfs/group.c:278 sysfs_remove_group+0x72/0x80
...
Call Trace:
sysfs_remove_groups+0x29/0x40 fs/sysfs/group.c:312
__kobject_del+0x20/0x80 lib/kobject.c:611
kobject_cleanup+0xa4/0x140 lib/kobject.c:696
kobject_release lib/kobject.c:736 [inline]
kref_put include/linux/kref.h:65 [inline]
kobject_put+0x53/0x70 lib/kobject.c:753
blk_crypto_sysfs_unregister+0x10/0x20 block/blk-crypto-sysfs.c:159
blk_unregister_queue+0xb0/0x110 block/blk-sysfs.c:962
del_gendisk+0x117/0x250 block/genhd.c:610Fix this by moving the kobject_del() and the corresponding kobject_uevent() to the correct place.
--- block/blk-sysfs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
block/blk-sysfs.c +5 -3
@@ -1060,15 +1060,17 @@ void blk_unregister_queue(struct gendisk *disk)*/ if (queue_is_mq (q))blk_mq_unregister_dev (disk_to_dev (disk), q); - -kobject_uevent (&q->kobj,KOBJ_REMOVE ); -kobject_del (&q->kobj);blk_trace_remove_sysfs (disk_to_dev (disk));mutex_lock (&q->sysfs_lock);if (q->elevator)elv_unregister_queue (q);mutex_unlock (&q->sysfs_lock); + +/* Now that we've deleted all child objects, we can delete the queue. */ +kobject_uevent (&q->kobj,KOBJ_REMOVE ); +kobject_del (&q->kobj); +mutex_unlock (&q->sysfs_dir_lock);kobject_put (&disk_to_dev (disk)->kobj);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 99/475 PM: hibernate: fix __setup handler error handling
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit ba7ffcd4c4da374b0f64666354eeeda7d3827131 ]
If an invalid value is used in "resumedelay=<seconds>", it is silently ignored. Add a warning message and then let the __setup handler return 1 to indicate that the kernel command line option has been handled.
--- kernel/power/hibernate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/power/hibernate.c +1 -1
@@ -1216,7 +1216,7 @@ static int __init resumedelay_setup(char *str)int rc =kstrtouint (str,0 , &resume_delay);if (rc) -return rc; +pr_warn ("resumedelay: bad option string '%s'\n" , str);return 1 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 100/475 PM: suspend: fix return value of __setup handler
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 7a64ca17e4dd50d5f910769167f3553902777844 ]
If an invalid option is given for "test_suspend=<option>", the entire string is added to init's environment, so return 1 instead of 0 from the __setup handler.
Unknown kernel command line parameters "BOOT_IMAGE=/boot/bzImage-517rc5
test_suspend=invalid"
and
Run /sbin/init as init process
with arguments:
/sbin/init
with environment:
HOME=/
TERM=linux
BOOT_IMAGE=/boot/bzImage-517rc5
test_suspend=invalid--- kernel/power/suspend_test.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/power/suspend_test.c +4 -4
@@ -157,22 +157,22 @@ static int __init setup_test_suspend(char *value) value++; suspend_type =strsep (&value,"," );if (!suspend_type) -return 0 ; +return 1 ; repeat =strsep (&value,"," );if (repeat) {if (kstrtou32 (repeat,0 , &test_repeat_count_max)) -return 0 ; +return 1 ; }for (i =PM_SUSPEND_MIN ; i <PM_SUSPEND_MAX ; i++)if (!strcmp (pm_labels[i], suspend_type)) { test_state_label = pm_labels[i]; -return 0 ; +return 1 ; }printk (warn_bad_state, suspend_type); -return 0 ; +return 1 ; }__setup ("test_suspend" , setup_test_suspend);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 101/475 hwrng: atmel - disable trng on failure path
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit a223ea9f89ab960eb254ba78429efd42eaf845eb ]
Call atmel_trng_disable() on failure path of probe.
--- drivers/char/hw_random/atmel-rng.c | 1 + 1 file changed, 1 insertion(+)
drivers/char/hw_random/atmel-rng.c +1 -0
@@ -96,6 +96,7 @@ static int atmel_trng_probe(struct platform_device *pdev) err_register:clk_disable_unprepare (trng->clk); +atmel_trng_disable (trng);return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 102/475 crypto: vmx - add missing dependencies
In reply to Greg Kroah-HartmanFrom: Petr Vorel <[email protected]>
[ Upstream commit 647d41d3952d726d4ae49e853a9eff68ebad3b3f ]
vmx-crypto module depends on CRYPTO_AES, CRYPTO_CBC, CRYPTO_CTR or CRYPTO_XTS, thus add them.
These dependencies are likely to be enabled, but if CRYPTO_DEV_VMX=y && !CRYPTO_MANAGER_DISABLE_TESTS
and either of CRYPTO_AES, CRYPTO_CBC, CRYPTO_CTR or CRYPTO_XTS is built as module or disabled, alg_test() from crypto/testmgr.c complains during boot about failing to allocate the generic fallback implementations (2 == ENOENT):
[ 0.540953] Failed to allocate xts(aes) fallback: -2 [ 0.541014] alg: skcipher: failed to allocate transform for p8_aes_xts: -2 [ 0.541120] alg: self-tests for p8_aes_xts (xts(aes)) failed (rc=-2) [ 0.544440] Failed to allocate ctr(aes) fallback: -2 [ 0.544497] alg: skcipher: failed to allocate transform for p8_aes_ctr: -2 [ 0.544603] alg: self-tests for p8_aes_ctr (ctr(aes)) failed (rc=-2) [ 0.547992] Failed to allocate cbc(aes) fallback: -2 [ 0.548052] alg: skcipher: failed to allocate transform for p8_aes_cbc: -2 [ 0.548156] alg: self-tests for p8_aes_cbc (cbc(aes)) failed (rc=-2) [ 0.550745] Failed to allocate transformation for 'aes': -2 [ 0.550801] alg: cipher: Failed to load transform for p8_aes: -2 [ 0.550892] alg: self-tests for p8_aes (aes) failed (rc=-2)
--- drivers/crypto/vmx/Kconfig | 4 ++++ 1 file changed, 4 insertions(+)
drivers/crypto/vmx/Kconfig +4 -0
@@ -2,7 +2,11 @@ config CRYPTO_DEV_VMX_ENCRYPT tristate "Encryption acceleration support on P8 CPU" depends on CRYPTO_DEV_VMX + select CRYPTO_AES + select CRYPTO_CBC + select CRYPTO_CTR select CRYPTO_GHASH + select CRYPTO_XTS default m help Support for VMX cryptographic acceleration instructions on Power8 CPU.
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 103/475 clocksource/drivers/timer-of: Check return value of of_iomap in timer_of_base_init()
In reply to Greg Kroah-HartmanFrom: Guillaume Ranquet <[email protected]>
[ Upstream commit 4467b8bad2401794fb89a0268c8c8257180bf60f ]
of_base->base can either be iomapped using of_io_request_and_map() or of_iomap() depending whether or not an of_base->name has been set.
Thus check of_base->base against NULL as of_iomap() does not return a PTR_ERR() in case of error.
--- drivers/clocksource/timer-of.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/clocksource/timer-of.c +3 -3
@@ -157,9 +157,9 @@ static __init int timer_of_base_init(struct device_node *np, of_base->base = of_base->name ?of_io_request_and_map (np, of_base->index, of_base->name) :of_iomap (np, of_base->index); -if (IS_ERR (of_base->base)) { -pr_err ("Failed to iomap (%s)\n" , of_base->name); -return PTR_ERR (of_base->base); +if (IS_ERR_OR_NULL (of_base->base)) { +pr_err ("Failed to iomap (%s:%s)\n" , np->name, of_base->name); +return of_base->base ?PTR_ERR (of_base->base) : -ENOMEM ; }return 0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 104/475 ACPI: APEI: fix return value of __setup handlers
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit f3303ff649dbf7dcdc6a6e1a922235b12b3028f4 ]
__setup() handlers should return 1 to indicate that the boot option has been handled. Returning 0 causes a boot option to be listed in the Unknown kernel command line parameters and also added to init's arg list (if no '=' sign) or environment list (if of the form 'a=b').
Unknown kernel command line parameters "erst_disable
bert_disable hest_disable BOOT_IMAGE=/boot/bzImage-517rc6", will be passed to user space.
Run /sbin/init as init process
with arguments:
/sbin/init
erst_disable
bert_disable
hest_disable
with environment:
HOME=/
TERM=linux
BOOT_IMAGE=/boot/bzImage-517rc6--- drivers/acpi/apei/bert.c | 2 +- drivers/acpi/apei/erst.c | 2 +- drivers/acpi/apei/hest.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/acpi/apei/bert.c +1 -1
@@ -77,7 +77,7 @@ static int __init setup_bert_disable(char *str) { bert_disable =1 ; -return 0 ; +return 1 ; }__setup ("bert_disable" , setup_bert_disable);
drivers/acpi/apei/erst.c +1 -1
@@ -891,7 +891,7 @@ EXPORT_SYMBOL_GPL(erst_clear);static int __init setup_erst_disable (char *str) { erst_disable =1 ; -return 0 ; +return 1 ; }__setup ("erst_disable" , setup_erst_disable);
drivers/acpi/apei/hest.c +1 -1
@@ -219,7 +219,7 @@ static int __init hest_ghes_dev_register(unsigned int ghes_count)static int __init setup_hest_disable (char *str) { hest_disable =HEST_DISABLED ; -return 0 ; +return 1 ; }__setup ("hest_disable" , setup_hest_disable);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 105/475 crypto: ccp - ccp_dmaengine_unregister release dma channels
In reply to Greg Kroah-HartmanFrom: Dāvis Mosāns <[email protected]>
[ Upstream commit 54cce8ecb9254f971b40a72911c6da403720a2d2 ]
ccp_dmaengine_register adds dma_chan->device_node to dma_dev->channels list but ccp_dmaengine_unregister didn't remove them.
That can cause crashes in various dmaengine methods that tries to use dma_dev->channels
--- drivers/crypto/ccp/ccp-dmaengine.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/crypto/ccp/ccp-dmaengine.c +16 -0
@@ -633,6 +633,20 @@ static int ccp_terminate_all(struct dma_chan *dma_chan)return 0 ; } +static void ccp_dma_release (struct ccp_device *ccp) +{ +struct ccp_dma_chan *chan; +struct dma_chan *dma_chan; +unsigned int i; + +for (i =0 ; i < ccp->cmd_q_count; i++) { + chan = ccp->ccp_dma_chan + i; + dma_chan = &chan->dma_chan; +tasklet_kill (&chan->cleanup_tasklet); +list_del_rcu (&dma_chan->device_node); + } +} +int ccp_dmaengine_register (struct ccp_device *ccp) {struct ccp_dma_chan *chan;
@@ -737,6 +751,7 @@ int ccp_dmaengine_register(struct ccp_device *ccp)return 0 ; err_reg: +ccp_dma_release (ccp);kmem_cache_destroy (ccp->dma_desc_cache); err_cache:
@@ -753,6 +768,7 @@ void ccp_dmaengine_unregister(struct ccp_device *ccp)return ;dma_async_device_unregister (dma_dev); +ccp_dma_release (ccp);kmem_cache_destroy (ccp->dma_desc_cache);kmem_cache_destroy (ccp->dma_cmd_cache);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 106/475 hwmon: (pmbus) Add Vin unit off handling
In reply to Greg Kroah-HartmanFrom: Brandon Wyman <[email protected]>
[ Upstream commit a5436af598779219b375c1977555c82def1c35d0 ]
If there is an input undervoltage fault, reported in STATUS_INPUT command response, there is quite likely a "Unit Off For Insufficient Input Voltage" condition as well.
Add a constant for bit 3 of STATUS_INPUT. Update the Vin limit attributes to include both bits in the mask for clearing faults.
If an input undervoltage fault occurs, causing a unit off for insufficient input voltage, but the unit is off bit is not cleared, the STATUS_WORD will not be updated to clear the input fault condition. Including the unit is off bit (bit 3) allows for the input fault condition to completely clear.
--- drivers/hwmon/pmbus/pmbus.h | 1 + drivers/hwmon/pmbus/pmbus_core.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/hwmon/pmbus/pmbus.h +1 -0
@@ -292,6 +292,7 @@ enum pmbus_fan_mode { percent = 0, rpm };/* * STATUS_VOUT, STATUS_INPUT */ +#define PB_VOLTAGE_VIN_OFF BIT(3)#define PB_VOLTAGE_UV_FAULT BIT(4)#define PB_VOLTAGE_UV_WARNING BIT(5)#define PB_VOLTAGE_OV_WARNING BIT(6)
drivers/hwmon/pmbus/pmbus_core.c +1 -1
@@ -1324,7 +1324,7 @@ static const struct pmbus_limit_attr vin_limit_attrs[] = { .reg = PMBUS_VIN_UV_FAULT_LIMIT, .attr = "lcrit", .alarm = "lcrit_alarm", - .sbit = PB_VOLTAGE_UV_FAULT, + .sbit = PB_VOLTAGE_UV_FAULT | PB_VOLTAGE_VIN_OFF, }, { .reg = PMBUS_VIN_OV_WARN_LIMIT, .attr = "max",
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 107/475 clocksource: acpi_pm: fix return value of __setup handler
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 6a861abceecb68497dd82a324fee45a5332dcece ]
__setup() handlers should return 1 to obsolete_checksetup() in init/main.c to indicate that the boot option has been handled. A return of 0 causes the boot option/value to be listed as an Unknown kernel parameter and added to init's (limited) environment strings.
The __setup() handler interface isn't meant to handle negative return values -- they are non-zero, so they mean "handled" (like a return value of 1 does), but that's just a quirk. So return 1 from parse_pmtmr(). Also print a warning message if kstrtouint() returns an error.
--- drivers/clocksource/acpi_pm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/clocksource/acpi_pm.c +4 -2
@@ -229,8 +229,10 @@ static int __init parse_pmtmr(char *arg)int ret; ret =kstrtouint (arg,16 , &base); -if (ret) -return ret; +if (ret) { +pr_warn ("PMTMR: invalid 'pmtmr=' value: '%s'\n" , arg); +return 1 ; + }pr_info ("PMTMR IOPort override: 0x%04x -> 0x%04x\n" , pmtmr_ioport, base);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 108/475 sched/debug: Remove mpol_get/put and task_lock/unlock from sched_show_numa
In reply to Greg Kroah-HartmanFrom: Bharata B Rao <[email protected]>
[ Upstream commit 28c988c3ec29db74a1dda631b18785958d57df4f ]
The older format of /proc/pid/sched printed home node info which required the mempolicy and task lock around mpol_get(). However the format has changed since then and there is no need for sched_show_numa() any more to have mempolicy argument, asssociated mpol_get/put and task_lock/unlock. Remove them.
--- kernel/sched/debug.c | 10 ---------- 1 file changed, 10 deletions(-)
kernel/sched/debug.c +0 -10
@@ -847,25 +847,15 @@ void print_numa_stats(struct seq_file *m, int node, unsigned long tsf,static void sched_show_numa (struct task_struct *p,struct seq_file *m) {#ifdef CONFIG_NUMA_BALANCING -struct mempolicy *pol; -if (p->mm)P (mm->numa_scan_seq); -task_lock (p); - pol = p->mempolicy; -if (pol && !(pol->flags &MPOL_F_MORON )) - pol =NULL ; -mpol_get (pol); -task_unlock (p); -P (numa_pages_migrated);P (numa_preferred_nid);P (total_numa_faults);SEQ_printf (m,"current_node=%d, numa_group_id=%d\n" ,task_node (p),task_numa_group_id (p));show_numa_stats (p, m); -mpol_put (pol);#endif }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 109/475 perf/core: Fix address filter parser for multiple filters
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
[ Upstream commit d680ff24e9e14444c63945b43a37ede7cd6958f9 ]
Reset appropriate variables in the parser loop between parsing separate filters, so that they do not interfere with parsing the next filter.
--- kernel/events/core.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/events/core.c +3 -0
@@ -9490,8 +9490,11 @@ perf_event_parse_addr_filter(struct perf_event *event, char *fstr, }/* ready to consume more filters */ +kfree (filename); + filename =NULL ; state =IF_STATE_ACTION ; filter =NULL ; + kernel =0 ; } }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 110/475 perf/x86/intel/pt: Fix address filter config for 32-bit kernel
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
[ Upstream commit e5524bf1047eb3b3f3f33b5f59897ba67b3ade87 ]
Change from shifting 'unsigned long' to 'u64' to prevent the config bits being lost on a 32-bit kernel.
--- arch/x86/events/intel/pt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/pt.c +1 -1
@@ -460,7 +460,7 @@ static u64 pt_config_filters(struct perf_event *event) pt->filters.filter[range].msr_b = filter->msr_b; } - rtit_ctl |= filter->config << pt_address_ranges[range].reg_off; + rtit_ctl |= (u64 )filter->config << pt_address_ranges[range].reg_off; }return rtit_ctl;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 111/475 f2fs: fix missing free nid in f2fs_handle_failed_inode
In reply to Greg Kroah-HartmanFrom: Jaegeuk Kim <[email protected]>
[ Upstream commit 2fef99b8372c1ae3d8445ab570e888b5a358dbe9 ]
This patch fixes xfstests/generic/475 failure.
[ 293.680694] F2FS-fs (dm-1): May loss orphan inode, run fsck to fix. [ 293.685358] Buffer I/O error on dev dm-1, logical block 8388592, async page read [ 293.691527] Buffer I/O error on dev dm-1, logical block 8388592, async page read [ 293.691764] sh (7615): drop_caches: 3 [ 293.691819] sh (7616): drop_caches: 3 [ 293.694017] Buffer I/O error on dev dm-1, logical block 1, async page read [ 293.695659] sh (7618): drop_caches: 3 [ 293.696979] sh (7617): drop_caches: 3 [ 293.700290] sh (7623): drop_caches: 3 [ 293.708621] sh (7626): drop_caches: 3 [ 293.711386] sh (7628): drop_caches: 3 [ 293.711825] sh (7627): drop_caches: 3 [ 293.716738] sh (7630): drop_caches: 3 [ 293.719613] sh (7632): drop_caches: 3 [ 293.720971] sh (7633): drop_caches: 3 [ 293.727741] sh (7634): drop_caches: 3 [ 293.730783] sh (7636): drop_caches: 3 [ 293.732681] sh (7635): drop_caches: 3 [ 293.732988] sh (7637): drop_caches: 3 [ 293.738836] sh (7639): drop_caches: 3 [ 293.740568] sh (7641): drop_caches: 3 [ 293.743053] sh (7640): drop_caches: 3 [ 293.821889] ------------[ cut here ]------------ [ 293.824654] kernel BUG at fs/f2fs/node.c:3334! [ 293.826226] invalid opcode: 0000 [#1] PREEMPT SMP PTI [ 293.828713] CPU: 0 PID: 7653 Comm: umount Tainted: G OE 5.17.0-rc1-custom #1 [ 293.830946] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.15.0-1 04/01/2014 [ 293.832526] RIP: 0010:f2fs_destroy_node_manager+0x33f/0x350 [f2fs] [ 293.833905] Code: e8 d6 3d f9 f9 48 8b 45 d0 65 48 2b 04 25 28 00 00 00 75 1a 48 81 c4 28 03 00 00 5b 41 5c 41 5d 41 5e 41 5f 5d c3 0f 0b [ 293.837783] RSP: 0018:ffffb04ec31e7a20 EFLAGS: 00010202 [ 293.839062] RAX: 0000000000000001 RBX: ffff9df947db2eb8 RCX: 0000000080aa0072 [ 293.840666] RDX: 0000000000000000 RSI: ffffe86c0432a140 RDI: ffffffffc0b72a21 [ 293.842261] RBP: ffffb04ec31e7d70 R08: ffff9df94ca85780 R09: 0000000080aa0072 [ 293.843909] R10: ffff9df94ca85700 R11: ffff9df94e1ccf58 R12: ffff9df947db2e00 [ 293.845594] R13: ffff9df947db2ed0 R14: ffff9df947db2eb8 R15: ffff9df947db2eb8 [ 293.847855] FS: 00007f5a97379800(0000) GS:ffff9dfa77c00000(0000) knlGS:0000000000000000 [ 293.850647] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 293.852940] CR2: 00007f5a97528730 CR3: 000000010bc76005 CR4: 0000000000370ef0 [ 293.854680] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 293.856423] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 293.858380] Call Trace: [ 293.859302] <TASK> [ 293.860311] ? ttwu_do_wakeup+0x1c/0x170 [ 293.861800] ? ttwu_do_activate+0x6d/0xb0 [ 293.863057] ? _raw_spin_unlock_irqrestore+0x29/0x40 [ 293.864411] ? try_to_wake_up+0x9d/0x5e0 [ 293.865618] ? debug_smp_processor_id+0x17/0x20 [ 293.866934] ? debug_smp_processor_id+0x17/0x20 [ 293.868223] ? free_unref_page+0xbf/0x120 [ 293.869470] ? __free_slab+0xcb/0x1c0 [ 293.870614] ? preempt_count_add+0x7a/0xc0 [ 293.871811] ? __slab_free+0xa0/0x2d0 [ 293.872918] ? __wake_up_common_lock+0x8a/0xc0 [ 293.874186] ? __slab_free+0xa0/0x2d0 [ 293.875305] ? free_inode_nonrcu+0x20/0x20 [ 293.876466] ? free_inode_nonrcu+0x20/0x20 [ 293.877650] ? debug_smp_processor_id+0x17/0x20 [ 293.878949] ? call_rcu+0x11a/0x240 [ 293.880060] ? f2fs_destroy_stats+0x59/0x60 [f2fs] [ 293.881437] ? kfree+0x1fe/0x230 [ 293.882674] f2fs_put_super+0x160/0x390 [f2fs] [ 293.883978] generic_shutdown_super+0x7a/0x120 [ 293.885274] kill_block_super+0x27/0x50 [ 293.886496] kill_f2fs_super+0x7f/0x100 [f2fs] [ 293.887806] deactivate_locked_super+0x35/0xa0 [ 293.889271] deactivate_super+0x40/0x50 [ 293.890513] cleanup_mnt+0x139/0x190 [ 293.891689] __cleanup_mnt+0x12/0x20 [ 293.892850] task_work_run+0x64/0xa0 [ 293.894035] exit_to_user_mode_prepare+0x1b7/0x1c0 [ 293.895409] syscall_exit_to_user_mode+0x27/0x50 [ 293.896872] do_syscall_64+0x48/0xc0 [ 293.898090] entry_SYSCALL_64_after_hwframe+0x44/0xae [ 293.899517] RIP: 0033:0x7f5a975cd25b
--- fs/f2fs/inode.c | 1 + 1 file changed, 1 insertion(+)
fs/f2fs/inode.c +1 -0
@@ -777,6 +777,7 @@ void f2fs_handle_failed_inode(struct inode *inode) err =f2fs_get_node_info (sbi, inode->i_ino, &ni);if (err) {set_sbi_flag (sbi,SBI_NEED_FSCK ); +set_inode_flag (inode,FI_FREE_NID );f2fs_warn (sbi,"May loss orphan inode, run fsck to fix." ); goto out; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 112/475 f2fs: fix to avoid potential deadlock
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit df77fbd8c5b222c680444801ffd20e8bbc90a56e ]
Using f2fs_trylock_op() in f2fs_write_compressed_pages() to avoid potential deadlock like we did in f2fs_write_single_data_page().
--- fs/f2fs/data.c | 6 +++++- fs/f2fs/node.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-)
fs/f2fs/data.c +5 -1
@@ -2467,8 +2467,12 @@ static int __f2fs_write_data_pages(struct address_space *mapping,/* to avoid spliting IOs due to mixed WB_SYNC_ALL and WB_SYNC_NONE */ if (wbc->sync_mode ==WB_SYNC_ALL )atomic_inc (&sbi->wb_sync_req[DATA ]); -else if (atomic_read (&sbi->wb_sync_req[DATA ])) +else if (atomic_read (&sbi->wb_sync_req[DATA ])) { +/* to avoid potential deadlock */ +if (current->plug) +blk_finish_plug (current->plug); goto skip_write; + }if (__should_serialize_io (inode, wbc)) {mutex_lock (&sbi->writepages);
fs/f2fs/node.c +5 -1
@@ -1995,8 +1995,12 @@ static int f2fs_write_node_pages(struct address_space *mapping,if (wbc->sync_mode ==WB_SYNC_ALL )atomic_inc (&sbi->wb_sync_req[NODE ]); -else if (atomic_read (&sbi->wb_sync_req[NODE ])) +else if (atomic_read (&sbi->wb_sync_req[NODE ])) { +/* to avoid potential deadlock */ +if (current->plug) +blk_finish_plug (current->plug); goto skip_write; + }trace_f2fs_writepages (mapping->host, wbc,NODE );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 113/475 media: bttv: fix WARNING regression on tunerless devices
In reply to Greg Kroah-HartmanFrom: Ondrej Zary <[email protected]>
[ Upstream commit ef058cc8b7193d15a771272359c7454839ae74ee ]
Commit 2161536516ed ("media: media/pci: set device_caps in struct video_device") introduced a regression: V4L2_CAP_TUNER is always present in device_caps, even when the device has no tuner.
This causes a warning:
WARNING: CPU: 0 PID: 249 at drivers/media/v4l2-core/v4l2-ioctl.c:1102 v4l_querycap+0xa0/0xb0 [videodev]
--- drivers/media/pci/bt8xx/bttv-driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/pci/bt8xx/bttv-driver.c +2 -2
@@ -3898,7 +3898,7 @@ static int bttv_register_video(struct bttv *btv)/* video */ vdev_init (btv, &btv->video_dev, &bttv_video_template,"video" ); - btv->video_dev.device_caps =V4L2_CAP_VIDEO_CAPTURE |V4L2_CAP_TUNER | + btv->video_dev.device_caps =V4L2_CAP_VIDEO_CAPTURE |V4L2_CAP_READWRITE |V4L2_CAP_STREAMING ;if (btv->tuner_type !=TUNER_ABSENT ) btv->video_dev.device_caps |=V4L2_CAP_TUNER ;
@@ -3919,7 +3919,7 @@ static int bttv_register_video(struct bttv *btv)/* vbi */ vdev_init (btv, &btv->vbi_dev, &bttv_video_template,"vbi" ); btv->vbi_dev.device_caps =V4L2_CAP_VBI_CAPTURE |V4L2_CAP_READWRITE | -V4L2_CAP_STREAMING |V4L2_CAP_TUNER ; +V4L2_CAP_STREAMING ;if (btv->tuner_type !=TUNER_ABSENT ) btv->vbi_dev.device_caps |=V4L2_CAP_TUNER ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 114/475 media: coda: Fix missing put_device() call in coda_get_vdoa_data
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit ca85d271531a1e1c86f24b892f57b7d0a3ddb5a6 ]
The reference taken by 'of_find_device_by_node()' must be released when not needed anymore.
Add the corresponding 'put_device()' in the error handling path.
--- drivers/media/platform/coda/coda-common.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/platform/coda/coda-common.c +1 -0
@@ -372,6 +372,7 @@ static struct vdoa_data *coda_get_vdoa_data(void)if (!vdoa_data) vdoa_data =ERR_PTR (-EPROBE_DEFER ); +put_device (&vdoa_pdev->dev); out:of_node_put (vdoa_node);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 115/475 media: hantro: Fix overfill bottom register field name
In reply to Greg Kroah-HartmanFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit 89d78e0133e71ba324fb67ca776223fba4353418 ]
The Hantro H1 hardware can crop off pixels from the right and bottom of the source frame. These are controlled with the H1_REG_IN_IMG_CTRL_OVRFLB and H1_REG_IN_IMG_CTRL_OVRFLR in the H1_REG_IN_IMG_CTRL register.
The ChromeOS kernel driver that this was based on incorrectly added the _D4 suffix H1_REG_IN_IMG_CTRL_OVRFLB. This field crops the bottom of the input frame, and the number is _not_ divided by 4. [1]
Correct the name to avoid confusion when crop support with the selection API is added.
[1] https://chromium.googlesource.com/chromiumos/third_party/kernel/+/refs/ \ heads/chromeos-4.19/drivers/staging/media/hantro/hantro_h1_vp8_enc.c#377
--- drivers/staging/media/hantro/hantro_h1_jpeg_enc.c | 2 +- drivers/staging/media/hantro/hantro_h1_regs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/media/hantro/hantro_h1_jpeg_enc.c +1 -1
@@ -23,7 +23,7 @@ static void hantro_h1_set_src_img_ctrl(struct hantro_dev *vpu, reg =H1_REG_IN_IMG_CTRL_ROW_LEN (pix_fmt->width) |H1_REG_IN_IMG_CTRL_OVRFLR_D4 (0 ) - |H1_REG_IN_IMG_CTRL_OVRFLB_D4 (0 ) + |H1_REG_IN_IMG_CTRL_OVRFLB (0 ) |H1_REG_IN_IMG_CTRL_FMT (ctx->vpu_src_fmt->enc_fmt);vepu_write_relaxed (vpu, reg,H1_REG_IN_IMG_CTRL ); }
drivers/staging/media/hantro/hantro_h1_regs.h +1 -1
@@ -47,7 +47,7 @@#define H1_REG_IN_IMG_CTRL 0x03c#define H1_REG_IN_IMG_CTRL_ROW_LEN (x) ((x) << 12)#define H1_REG_IN_IMG_CTRL_OVRFLR_D4 (x) ((x) << 10) -#define H1_REG_IN_IMG_CTRL_OVRFLB_D4 (x) ((x) << 6) +#define H1_REG_IN_IMG_CTRL_OVRFLB (x) ((x) << 6)#define H1_REG_IN_IMG_CTRL_FMT (x) ((x) << 2)#define H1_REG_ENC_CTRL0 0x040#define H1_REG_ENC_CTRL0_INIT_QP (x) ((x) << 26)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 116/475 media: aspeed: Correct value for h-total-pixels
In reply to Greg Kroah-HartmanFrom: Jammy Huang <[email protected]>
[ Upstream commit 4b732a0016853eaff35944f900b0db66f3914374 ]
Previous reg-field, 0x98[11:0], stands for the period of the detected hsync signal.
Use the correct reg, 0xa0, to get h-total in pixels.
--- drivers/media/platform/aspeed-video.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/media/platform/aspeed-video.c +6 -3
@@ -151,7 +151,7 @@#define VE_SRC_TB_EDGE_DET_BOT GENMASK(28, VE_SRC_TB_EDGE_DET_BOT_SHF)#define VE_MODE_DETECT_STATUS 0x098 -#define VE_MODE_DETECT_H_PIXELS GENMASK(11, 0) +#define VE_MODE_DETECT_H_PERIOD GENMASK(11, 0)#define VE_MODE_DETECT_V_LINES_SHF 16#define VE_MODE_DETECT_V_LINES GENMASK(27, VE_MODE_DETECT_V_LINES_SHF)#define VE_MODE_DETECT_STATUS_VSYNC BIT(28)
@@ -162,6 +162,8 @@#define VE_SYNC_STATUS_VSYNC_SHF 16#define VE_SYNC_STATUS_VSYNC GENMASK(27, VE_SYNC_STATUS_VSYNC_SHF) +#define VE_H_TOTAL_PIXELS 0x0A0 +#define VE_INTERRUPT_CTRL 0x304#define VE_INTERRUPT_STATUS 0x308#define VE_INTERRUPT_MODE_DETECT_WD BIT(0)
@@ -743,6 +745,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video)u32 src_lr_edge;u32 src_tb_edge;u32 sync; +u32 htotal;struct v4l2_bt_timings *det = &video->detected_timings; det->width =MIN_WIDTH ;
@@ -787,6 +790,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video) src_tb_edge =aspeed_video_read (video,VE_SRC_TB_EDGE_DET ); mds =aspeed_video_read (video,VE_MODE_DETECT_STATUS ); sync =aspeed_video_read (video,VE_SYNC_STATUS ); + htotal =aspeed_video_read (video,VE_H_TOTAL_PIXELS ); video->frame_bottom = (src_tb_edge &VE_SRC_TB_EDGE_DET_BOT ) >>VE_SRC_TB_EDGE_DET_BOT_SHF ;
@@ -803,8 +807,7 @@ static void aspeed_video_get_resolution(struct aspeed_video *video)VE_SRC_LR_EDGE_DET_RT_SHF ; video->frame_left = src_lr_edge &VE_SRC_LR_EDGE_DET_LEFT ; det->hfrontporch = video->frame_left; - det->hbackporch = (mds &VE_MODE_DETECT_H_PIXELS ) - - video->frame_right; + det->hbackporch = htotal - video->frame_right; det->hsync = sync &VE_SYNC_STATUS_HSYNC ;if (video->frame_left > video->frame_right)continue ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 117/475 video: fbdev: smscufx: Fix null-ptr-deref in ufx_usb_probe()
In reply to Greg Kroah-HartmanFrom: Wang Hai <[email protected]>
[ Upstream commit 1791f487f877a9e83d81c8677bd3e7b259e7cb27 ]
I got a null-ptr-deref report:
BUG: kernel NULL pointer dereference, address: 0000000000000000 ... RIP: 0010:fb_destroy_modelist+0x38/0x100 ... Call Trace: ufx_usb_probe.cold+0x2b5/0xac1 [smscufx] usb_probe_interface+0x1aa/0x3c0 [usbcore] really_probe+0x167/0x460
...
ret_from_fork+0x1f/0x30
If fb_alloc_cmap() fails in ufx_usb_probe(), fb_destroy_modelist() will be called to destroy modelist in the error handling path. But modelist has not been initialized yet, so it will result in null-ptr-deref.
Initialize modelist before calling fb_alloc_cmap() to fix this bug.
--- drivers/video/fbdev/smscufx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/video/fbdev/smscufx.c +1 -2
@@ -1657,6 +1657,7 @@ static int ufx_usb_probe(struct usb_interface *interface, info->par = dev; info->pseudo_palette = dev->pseudo_palette; info->fbops = &ufx_ops; +INIT_LIST_HEAD (&info->modelist); retval =fb_alloc_cmap (&info->cmap,256 ,0 );if (retval <0 ) {
@@ -1667,8 +1668,6 @@ static int ufx_usb_probe(struct usb_interface *interface,INIT_DELAYED_WORK (&dev->free_framebuffer_work, ufx_free_framebuffer_work); -INIT_LIST_HEAD (&info->modelist); - retval =ufx_reg_read (dev,0x3000 , &id_rev);check_warn_goto_error (retval,"error %d reading 0x3000 register from device" , retval);dev_dbg (dev->gdev,"ID_REV register value 0x%08x" , id_rev);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 118/475 video: fbdev: atmel_lcdfb: fix an error code in atmel_lcdfb_probe()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit fee5c1e4b789e41719af9fee0e2dd397cd31988f ]
If "sinfo->config" is not found, then return -ENODEV. Don't return success.
--- drivers/video/fbdev/atmel_lcdfb.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/video/fbdev/atmel_lcdfb.c +6 -5
@@ -1062,15 +1062,16 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)INIT_LIST_HEAD (&info->modelist); -if (pdev->dev.of_node) { - ret =atmel_lcdfb_of_init (sinfo); -if (ret) - goto free_info; - }else { +if (!pdev->dev.of_node) {dev_err (dev,"cannot get default configuration\n" ); goto free_info; } + ret =atmel_lcdfb_of_init (sinfo); +if (ret) + goto free_info; + + ret = -ENODEV ;if (!sinfo->config) goto free_info;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 119/475 video: fbdev: fbcvt.c: fix printing in fb_cvt_print_name()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 78482af095abd9f4f29f1aa3fe575d25c6ae3028 ]
This code has two bugs:
1) "cnt" is 255 but the size of the buffer is 256 so the last byte is not used.
2) If we try to print more than 255 characters then "cnt" will be negative and that will trigger a WARN() in snprintf(). The fix for this is to use scnprintf() instead of snprintf().
We can re-write this code to be cleaner:
1) Rename "offset" to "off" because that's shorter.
2) Get rid of the "cnt" variable and just use "size - off" directly.
3) Get rid of the "read" variable and just increment "off" directly.
--- drivers/video/fbdev/core/fbcvt.c | 53 +++++++++++++------------------- 1 file changed, 21 insertions(+), 32 deletions(-)
drivers/video/fbdev/core/fbcvt.c +21 -32
@@ -214,9 +214,11 @@ static u32 fb_cvt_aspect_ratio(struct fb_cvt_data *cvt)static void fb_cvt_print_name (struct fb_cvt_data *cvt) {u32 pixcount, pixcount_mod; -int cnt =255 , offset =0 , read =0 ; -u8 *buf =kzalloc (256 ,GFP_KERNEL ); +int size =256 ; +int off =0 ; +u8 *buf; + buf =kzalloc (size,GFP_KERNEL );if (!buf)return ;
@@ -224,43 +226,30 @@ static void fb_cvt_print_name(struct fb_cvt_data *cvt) pixcount_mod = (cvt->xres * (cvt->yres/cvt->interlace)) %1000000 ; pixcount_mod /=1000 ; - read =snprintf (buf+offset, cnt,"fbcvt: %dx%d@%d: CVT Name - " , - cvt->xres, cvt->yres, cvt->refresh); - offset += read; - cnt -= read; + off +=scnprintf (buf + off, size - off,"fbcvt: %dx%d@%d: CVT Name - " , + cvt->xres, cvt->yres, cvt->refresh); -if (cvt->status) -snprintf (buf+offset, cnt,"Not a CVT standard - %d.%03d Mega " -"Pixel Image\n" , pixcount, pixcount_mod); -else { -if (pixcount) { - read =snprintf (buf+offset, cnt,"%d" , pixcount); - cnt -= read; - offset += read; - } +if (cvt->status) { + off +=scnprintf (buf + off, size - off, +"Not a CVT standard - %d.%03d Mega Pixel Image\n" , + pixcount, pixcount_mod); + }else { +if (pixcount) + off +=scnprintf (buf + off, size - off,"%d" , pixcount); - read =snprintf (buf+offset, cnt,".%03dM" , pixcount_mod); - cnt -= read; - offset += read; + off +=scnprintf (buf + off, size - off,".%03dM" , pixcount_mod);if (cvt->aspect_ratio ==0 ) - read =snprintf (buf+offset, cnt,"3" ); + off +=scnprintf (buf + off, size - off,"3" );else if (cvt->aspect_ratio ==3 ) - read =snprintf (buf+offset, cnt,"4" ); + off +=scnprintf (buf + off, size - off,"4" );else if (cvt->aspect_ratio ==1 || cvt->aspect_ratio ==4 ) - read =snprintf (buf+offset, cnt,"9" ); + off +=scnprintf (buf + off, size - off,"9" );else if (cvt->aspect_ratio ==2 ) - read =snprintf (buf+offset, cnt,"A" ); -else - read =0 ; - cnt -= read; - offset += read; - -if (cvt->flags &FB_CVT_FLAG_REDUCED_BLANK ) { - read =snprintf (buf+offset, cnt,"-R" ); - cnt -= read; - offset += read; - } + off +=scnprintf (buf + off, size - off,"A" ); + +if (cvt->flags &FB_CVT_FLAG_REDUCED_BLANK ) + off +=scnprintf (buf + off, size - off,"-R" ); }printk (KERN_INFO "%s\n" , buf);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 120/475 ARM: dts: qcom: ipq4019: fix sleep clock
In reply to Greg Kroah-HartmanFrom: Pavel Kubelun <[email protected]>
[ Upstream commit 3d7e7980993d2c1ae42d3d314040fc2de6a9c45f ]
It seems like sleep_clk was copied from ipq806x.
Fix ipq40xx sleep_clk to the value QSDK defines.
--- arch/arm/boot/dts/qcom-ipq4019.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/boot/dts/qcom-ipq4019.dtsi +2 -1
@@ -141,7 +141,8 @@ clocks { sleep_clk: sleep_clk { compatible = "fixed-clock"; - clock-frequency = <32768>; + clock-frequency = <32000>; + clock-output-names = "gcc_sleep_clk_src"; #clock-cells = <0>; };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 121/475 soc: qcom: rpmpd: Check for null return of devm_kcalloc
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 5a811126d38f9767a20cc271b34db7c8efc5a46c ]
Because of the possible failure of the allocation, data->domains might be NULL pointer and will cause the dereference of the NULL pointer later.
Therefore, it might be better to check it and directly return -ENOMEM without releasing data manually if fails, because the comment of the devm_kmalloc() says "Memory allocated with this function is automatically freed on driver detach.".
--- drivers/soc/qcom/rpmpd.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/soc/qcom/rpmpd.c +3 -0
@@ -362,6 +362,9 @@ static int rpmpd_probe(struct platform_device *pdev) data->domains =devm_kcalloc (&pdev->dev, num,sizeof (*data->domains),GFP_KERNEL ); +if (!data->domains) +return -ENOMEM ; + data->num_domains = num;for (i =0 ; i < num; i++) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 122/475 soc: qcom: aoss: remove spurious IRQF_ONESHOT flags
In reply to Greg Kroah-HartmanFrom: Daniel Thompson <[email protected]>
[ Upstream commit 8030cb9a55688c1339edd284d9d6ce5f9fc75160 ]
Quoting the header comments, IRQF_ONESHOT is "Used by threaded interrupts which need to keep the irq line disabled until the threaded handler has been run.". When applied to an interrupt that doesn't request a threaded irq then IRQF_ONESHOT has a lesser known (undocumented?) side effect, which it to disable the forced threading of the irq. For "normal" kernels (without forced threading) then, if there is no thread_fn, then IRQF_ONESHOT is a nop.
In this case disabling forced threading is not appropriate for this driver because it calls wake_up_all() and this API cannot be called from no-thread interrupt handlers on PREEMPT_RT systems (deadlock risk, triggers sleeping-while-atomic warnings).
Fix this by removing IRQF_ONESHOT.
--- drivers/soc/qcom/qcom_aoss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/qcom/qcom_aoss.c +1 -1
@@ -544,7 +544,7 @@ static int qmp_probe(struct platform_device *pdev) } irq =platform_get_irq (pdev,0 ); - ret =devm_request_irq (&pdev->dev, irq, qmp_intr,IRQF_ONESHOT , + ret =devm_request_irq (&pdev->dev, irq, qmp_intr,0 ,"aoss-qmp" , qmp);if (ret <0 ) {dev_err (&pdev->dev,"failed to request interrupt\n" );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 123/475 arm64: dts: qcom: sm8150: Correct TCS configuration for apps rsc
In reply to Greg Kroah-HartmanFrom: Maulik Shah <[email protected]>
[ Upstream commit 17ac8af678b6da6a8f1df7da8ebf2c5198741827 ]
Correct the TCS config by updating the number of TCSes for each type.
--- arch/arm64/boot/dts/qcom/sm8150.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/qcom/sm8150.dtsi +3 -3
@@ -459,9 +459,9 @@ qcom,tcs-offset = <0xd00>; qcom,drv-id = <2>; qcom,tcs-config = <ACTIVE_TCS 2>, - <SLEEP_TCS 1>, - <WAKE_TCS 1>, - <CONTROL_TCS 0>; + <SLEEP_TCS 3>, + <WAKE_TCS 3>, + <CONTROL_TCS 1>; rpmhcc: clock-controller { compatible = "qcom,sm8150-rpmh-clk";
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 124/475 soc: ti: wkup_m3_ipc: Fix IRQ check in wkup_m3_ipc_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit c3d66a164c726cc3b072232d3b6d87575d194084 ]
platform_get_irq() returns negative error number instead 0 on failure. And the doc of platform_get_irq() provides a usage example:
int irq = platform_get_irq(pdev, 0);
if (irq < 0)
return irq;Fix the check of return value to catch errors correctly.
--- drivers/soc/ti/wkup_m3_ipc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/soc/ti/wkup_m3_ipc.c +2 -2
@@ -447,9 +447,9 @@ static int wkup_m3_ipc_probe(struct platform_device *pdev) } irq =platform_get_irq (pdev,0 ); -if (!irq) { +if (irq <0 ) {dev_err (&pdev->dev,"no irq resource\n" ); -return -ENXIO ; +return irq; } ret = devm_request_irq(dev, irq, wkup_m3_txev_handler,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 125/475 ARM: dts: imx: Add missing LVDS decoder on M53Menlo
In reply to Greg Kroah-HartmanFrom: Marek Vasut <[email protected]>
[ Upstream commit 0c6f71176ea43d6f4003a4d57f7bb518c5ad6145 ]
The M53Menlo display unit uses an LVDS-to-DPI bridge, TI DS90CF364A. Describe this bridge in DT, otherwise the DT incorrectly describes DPI panel attached directly to LVDS source.
--- arch/arm/boot/dts/imx53-m53menlo.dts | 29 ++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx53-m53menlo.dts +27 -2
@@ -53,6 +53,31 @@ }; }; + lvds-decoder { + compatible = "ti,ds90cf364a", "lvds-decoder"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + lvds_decoder_in: endpoint { + remote-endpoint = <&lvds0_out>; + }; + }; + + port@1 { + reg = <1>; + + lvds_decoder_out: endpoint { + remote-endpoint = <&panel_in>; + }; + }; + }; + }; + panel { compatible = "edt,etm0700g0dh6"; pinctrl-0 = <&pinctrl_display_gpio>;
@@ -61,7 +86,7 @@ port { panel_in: endpoint { - remote-endpoint = <&lvds0_out>; + remote-endpoint = <&lvds_decoder_out>; }; }; };
@@ -450,7 +475,7 @@ reg = <2>; lvds0_out: endpoint { - remote-endpoint = <&panel_in>; + remote-endpoint = <&lvds_decoder_in>; }; }; };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 126/475 media: video/hdmi: handle short reads of hdmi info frame.
In reply to Greg Kroah-HartmanFrom: Tom Rix <[email protected]>
[ Upstream commit 4a92fc6e55da5b87cecb572275deaff6ac9dd27e ]
Calling hdmi_infoframe_unpack() with static sizeof(buffer) skips all the size checking done later in hdmi_infoframe_unpack(). A better value is the amount of data read into buffer.
--- drivers/media/i2c/adv7511-v4l2.c | 2 +- drivers/media/i2c/adv7604.c | 2 +- drivers/media/i2c/adv7842.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/media/i2c/adv7511-v4l2.c +1 -1
@@ -555,7 +555,7 @@ static void log_infoframe(struct v4l2_subdev *sd, const struct adv7511_cfg_read_ buffer[3 ] =0 ; buffer[3 ] =hdmi_infoframe_checksum (buffer, len +4 ); -if (hdmi_infoframe_unpack (&frame, buffer,sizeof (buffer)) <0 ) { +if (hdmi_infoframe_unpack (&frame, buffer, len +4 ) <0 ) {v4l2_err (sd,"%s: unpack of %s infoframe failed\n" , __func__, cri->desc);return ; }
drivers/media/i2c/adv7604.c +1 -1
@@ -2444,7 +2444,7 @@ static int adv76xx_read_infoframe(struct v4l2_subdev *sd, int index, buffer[i +3 ] =infoframe_read (sd, adv76xx_cri[index].payload_addr + i); -if (hdmi_infoframe_unpack (frame, buffer,sizeof (buffer)) <0 ) { +if (hdmi_infoframe_unpack (frame, buffer, len +3 ) <0 ) {v4l2_err (sd,"%s: unpack of %s infoframe failed\n" , __func__, adv76xx_cri[index].desc);return -ENOENT ;
drivers/media/i2c/adv7842.c +1 -1
@@ -2574,7 +2574,7 @@ static void log_infoframe(struct v4l2_subdev *sd, struct adv7842_cfg_read_infofrfor (i =0 ; i < len; i++) buffer[i +3 ] =infoframe_read (sd, cri->payload_addr + i); -if (hdmi_infoframe_unpack (&frame, buffer,sizeof (buffer)) <0 ) { +if (hdmi_infoframe_unpack (&frame, buffer, len +3 ) <0 ) {v4l2_err (sd,"%s: unpack of %s infoframe failed\n" , __func__, cri->desc);return ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 127/475 media: em28xx: initialize refcount before kref_get
In reply to Greg Kroah-HartmanFrom: Dongliang Mu <[email protected]>
[ Upstream commit c08eadca1bdfa099e20a32f8fa4b52b2f672236d ]
The commit 47677e51e2a4("[media] em28xx: Only deallocate struct em28xx after finishing all extensions") adds kref_get to many init functions (e.g., em28xx_audio_init). However, kref_init is called too late in em28xx_usb_probe, since em28xx_init_dev before will invoke those init functions and call kref_get function. Then refcount bug occurs in my local syzkaller instance.
Fix it by moving kref_init before em28xx_init_dev. This issue occurs not only in dev but also dev->dev_next.
--- drivers/media/usb/em28xx/em28xx-cards.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/media/usb/em28xx/em28xx-cards.c +4 -4
@@ -3821,6 +3821,8 @@ static int em28xx_usb_probe(struct usb_interface *intf, goto err_free; } +kref_init (&dev->ref); + dev->devno = nr; dev->model = id->driver_info; dev->alt =-1 ;
@@ -3921,6 +3923,8 @@ static int em28xx_usb_probe(struct usb_interface *intf, }if (dev->board.has_dual_ts &&em28xx_duplicate_dev (dev) ==0 ) { +kref_init (&dev->dev_next->ref); + dev->dev_next->ts =SECONDARY_TS ; dev->dev_next->alt =-1 ; dev->dev_next->is_audio_only = has_vendor_audio &&
@@ -3975,12 +3979,8 @@ static int em28xx_usb_probe(struct usb_interface *intf,em28xx_write_reg (dev,0x0b ,0x82 );mdelay (100 ); } - -kref_init (&dev->dev_next->ref); } -kref_init (&dev->ref); -request_modules (dev);/*
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 128/475 media: usb: go7007: s2250-board: fix leak in probe()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 67e4550ecd6164bfbdff54c169e5bbf9ccfaf14d ]
Call i2c_unregister_device(audio) on this error path.
--- drivers/media/usb/go7007/s2250-board.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/media/usb/go7007/s2250-board.c +4 -6
@@ -504,6 +504,7 @@ static int s2250_probe(struct i2c_client *client,u8 *data;struct go7007 *go =i2c_get_adapdata (adapter);struct go7007_usb *usb = go->hpi_context; +int err = -EIO ; audio =i2c_new_dummy_device (adapter,TLV320_ADDRESS >>1 );if (IS_ERR (audio))
@@ -532,11 +533,8 @@ static int s2250_probe(struct i2c_client *client, V4L2_CID_HUE, -512, 511, 1, 0); sd->ctrl_handler = &state->hdl;if (state->hdl.error) { -int err = state->hdl.error; - -v4l2_ctrl_handler_free (&state->hdl); -kfree (state); -return err; + err = state->hdl.error; + goto fail; } state->std =V4L2_STD_NTSC ;
@@ -600,7 +598,7 @@ static int s2250_probe(struct i2c_client *client,i2c_unregister_device (audio);v4l2_ctrl_handler_free (&state->hdl);kfree (state); -return -EIO ; +return err; }static int s2250_remove (struct i2c_client *client)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 129/475 uaccess: fix nios2 and microblaze get_user_8()
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit a97b693c3712f040c5802f32b2d685352e08cefa ]
These two architectures implement 8-byte get_user() through a memcpy() into a four-byte variable, which won't fit.
Use a temporary 64-bit variable instead here, and use a double cast the way that risc-v and openrisc do to avoid compile-time warnings.
--- arch/microblaze/include/asm/uaccess.h | 18 +++++++++--------- arch/nios2/include/asm/uaccess.h | 26 ++++++++++++++++---------- 2 files changed, 25 insertions(+), 19 deletions(-)
arch/microblaze/include/asm/uaccess.h +9 -9
@@ -171,27 +171,27 @@ extern long __user_bad(void);#define __get_user (x, ptr) \ ({ \ - unsigned long __gu_val = 0; \ long __gu_err; \ switch (sizeof(*(ptr))) { \ case 1: \ - __get_user_asm("lbu", (ptr), __gu_val, __gu_err); \ + __get_user_asm("lbu", (ptr), x, __gu_err); \ break; \ case 2: \ - __get_user_asm("lhu", (ptr), __gu_val, __gu_err); \ + __get_user_asm("lhu", (ptr), x, __gu_err); \ break; \ case 4: \ - __get_user_asm("lw", (ptr), __gu_val, __gu_err); \ + __get_user_asm("lw", (ptr), x, __gu_err); \ break; \ - case 8: \ - __gu_err = __copy_from_user(&__gu_val, ptr, 8); \ - if (__gu_err) \ - __gu_err = -EFAULT; \ + case 8: { \ + __u64 __x = 0; \ + __gu_err = raw_copy_from_user(&__x, ptr, 8) ? \ + -EFAULT : 0; \ + (x) = (typeof(x))(typeof((x) - (x)))__x; \ break; \ + } \ default: \/* __gu_val = 0; __gu_err = -EINVAL;*/ __gu_err =__user_bad ();\ } \ - x = (__force __typeof__(*(ptr))) __gu_val; \ __gu_err; \ })
arch/nios2/include/asm/uaccess.h +16 -10
@@ -89,6 +89,7 @@ extern __must_check long strnlen_user(const char __user *s, long n);/* Optimized macros */ #define __get_user_asm (val, insn, addr, err) \ { \ + unsigned long __gu_val; \ __asm__ __volatile__( \ " movi %0, %3\n" \ "1: " insn " %1, 0(%2)\n" \
@@ -97,14 +98,20 @@ extern __must_check long strnlen_user(const char __user *s, long n);" .section __ex_table,\"a\"\n" \" .word 1b, 2b\n" \" .previous" \ - : "=&r" (err), "=r" (val) \ + : "=&r" (err), "=r" (__gu_val) \: " r" (addr), " i" (-EFAULT)); \ +val = (__force __typeof__(*(addr)))__gu_val; \ } -#define __get_user_unknown (val, size, ptr, err) do { \ +extern void __get_user_unknown(void); + +#define __get_user_8 (val, ptr, err) do { \ + u64 __val = 0; \ err = 0; \ - if (__copy_from_user(&(val), ptr, size)) { \ + if (raw_copy_from_user(&(__val), ptr, sizeof(val))) { \ err = -EFAULT; \ + } else { \ + val = (typeof(val))(typeof((val) - (val)))__val; \ } \ } while (0)
@@ -120,8 +127,11 @@ do { \case 4 : \__get_user_asm (val,"ldw" , ptr, err); \break ; \ +case 8 : \ +__get_user_8 (val, ptr, err); \ +break ; \default : \ -__get_user_unknown (val, size, ptr, err); \ +__get_user_unknown (); \break ; \ } \ }while (0 )
@@ -130,9 +140,7 @@ do { \ ({ \long __gu_err = -EFAULT ; \ const __typeof__(*(ptr)) __user *__gu_ptr = (ptr); \ -unsigned long __gu_val =0 ; \ -__get_user_common (__gu_val,sizeof (*(ptr)), __gu_ptr, __gu_err);\ - (x) = (__force __typeof__(x))__gu_val; \ +__get_user_common (x,sizeof (*(ptr)), __gu_ptr, __gu_err); \ __gu_err; \ })
@@ -140,11 +148,9 @@ do { \ ({ \long __gu_err = -EFAULT ; \ const __typeof__(*(ptr)) __user *__gu_ptr = (ptr); \ -unsigned long __gu_val =0 ; \if (access_ok ( __gu_ptr,sizeof (*__gu_ptr))) \ -__get_user_common (__gu_val,sizeof (*__gu_ptr), \ +__get_user_common (x,sizeof (*__gu_ptr), \ __gu_ptr, __gu_err); \ - (x) = (__force __typeof__(x))__gu_val; \ __gu_err; \ })
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 130/475 ASoC: rt5663: check the return value of devm_kzalloc() in rt5663_parse_dp()
In reply to Greg Kroah-HartmanFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit 4d06f92f38b799295ae22c98be7a20cac3e2a1a7 ]
The function devm_kzalloc() in rt5663_parse_dp() can fail, so its return value should be checked.
--- sound/soc/codecs/rt5663.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/codecs/rt5663.c +2 -0
@@ -3478,6 +3478,8 @@ static int rt5663_parse_dp(struct rt5663_priv *rt5663, struct device *dev) table_size =sizeof (struct impedance_mapping_table ) * rt5663->pdata.impedance_sensing_num; rt5663->imp_table =devm_kzalloc (dev, table_size,GFP_KERNEL ); +if (!rt5663->imp_table) +return -ENOMEM ; ret =device_property_read_u32_array (dev,"realtek,impedance_sensing_table" , (u32 *)rt5663->imp_table, table_size);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 131/475 ASoC: ti: davinci-i2s: Add check for clk_enable()
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit ed7c9fef11931fc5d32a83d68017ff390bf5c280 ]
As the potential failure of the clk_enable(),
it should be better to check it and return error
if fails.
--- sound/soc/ti/davinci-i2s.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/ti/davinci-i2s.c +4 -1
@@ -708,7 +708,9 @@ static int davinci_i2s_probe(struct platform_device *pdev) dev->clk =clk_get (&pdev->dev,NULL );if (IS_ERR (dev->clk))return -ENODEV ; -clk_enable (dev->clk); + ret =clk_enable (dev->clk); +if (ret) + goto err_put_clk; dev->dev = &pdev->dev;dev_set_drvdata (&pdev->dev, dev);
@@ -730,6 +732,7 @@ static int davinci_i2s_probe(struct platform_device *pdev)snd_soc_unregister_component (&pdev->dev); err_release_clk:clk_disable (dev->clk); +err_put_clk:clk_put (dev->clk);return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 132/475 ALSA: spi: Add check for clk_enable()
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit ca1697eb09208f0168d94b88b72f57505339cbe5 ]
As the potential failure of the clk_enable(), it should be better to check it and return error if fails.
--- sound/spi/at73c213.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-)
sound/spi/at73c213.c +21 -6
@@ -218,7 +218,9 @@ static int snd_at73c213_pcm_open(struct snd_pcm_substream *substream) runtime->hw = snd_at73c213_playback_hw; chip->substream = substream; -clk_enable (chip->ssc->clk); + err =clk_enable (chip->ssc->clk); +if (err) +return err;return 0 ; }
@@ -784,7 +786,9 @@ static int snd_at73c213_chip_init(struct snd_at73c213 *chip) goto out;/* Enable DAC master clock. */ -clk_enable (chip->board->dac_clk); + retval =clk_enable (chip->board->dac_clk); +if (retval) + goto out;/* Initialize at73c213 on SPI bus. */ retval =snd_at73c213_write_reg (chip,DAC_RST ,0x04 );
@@ -897,7 +901,9 @@ static int snd_at73c213_dev_init(struct snd_card *card, chip->card = card; chip->irq =-1 ; -clk_enable (chip->ssc->clk); + retval =clk_enable (chip->ssc->clk); +if (retval) +return retval; retval =request_irq (irq, snd_at73c213_interrupt,0 ,"at73c213" , chip);if (retval) {
@@ -1016,7 +1022,9 @@ static int snd_at73c213_remove(struct spi_device *spi)int retval;/* Stop playback. */ -clk_enable (chip->ssc->clk); + retval =clk_enable (chip->ssc->clk); +if (retval) + goto out;ssc_writel (chip->ssc->regs,CR ,SSC_BIT (CR_TXDIS ));clk_disable (chip->ssc->clk);
@@ -1096,9 +1104,16 @@ static int snd_at73c213_resume(struct device *dev) {struct snd_card *card =dev_get_drvdata (dev);struct snd_at73c213 *chip = card->private_data; +int retval; -clk_enable (chip->board->dac_clk); -clk_enable (chip->ssc->clk); + retval =clk_enable (chip->board->dac_clk); +if (retval) +return retval; + retval =clk_enable (chip->ssc->clk); +if (retval) { +clk_disable (chip->board->dac_clk); +return retval; + }ssc_writel (chip->ssc->regs,CR ,SSC_BIT (CR_TXEN ));return 0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 133/475 arm64: dts: ns2: Fix spi-cpol and spi-cpha property
In reply to Greg Kroah-HartmanFrom: Kuldeep Singh <[email protected]>
[ Upstream commit c953c764e505428f59ffe6afb1c73b89b5b1ac35 ]
Broadcom ns2 platform has spi-cpol and spi-cpho properties set incorrectly. As per spi-slave-peripheral-prop.yaml, these properties are of flag or boolean type and not integer type. Fix the values.
--- arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts +4 -4
@@ -111,8 +111,8 @@ compatible = "silabs,si3226x"; reg = <0>; spi-max-frequency = <5000000>; - spi-cpha = <1>; - spi-cpol = <1>; + spi-cpha; + spi-cpol; pl022,hierarchy = <0>; pl022,interface = <0>; pl022,slave-tx-disable = <0>;
@@ -135,8 +135,8 @@ at25,byte-len = <0x8000>; at25,addr-mode = <2>; at25,page-size = <64>; - spi-cpha = <1>; - spi-cpol = <1>; + spi-cpha; + spi-cpol; pl022,hierarchy = <0>; pl022,interface = <0>; pl022,slave-tx-disable = <0>;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 134/475 arm64: dts: broadcom: Fix sata nodename
In reply to Greg Kroah-HartmanFrom: Frank Wunderlich <[email protected]>
[ Upstream commit 55927cb44db43a57699fa652e2437a91620385dc ]
After converting ahci-platform txt binding to yaml nodename is reported as not matching the standard:
arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dt.yaml:
ahci@663f2000: $nodename:0: 'ahci@663f2000' does not match '^sata(@.*)?$'
Fix it to match binding.
--- arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi +1 -1
@@ -687,7 +687,7 @@ }; }; - sata: ahci@663f2000 { + sata: sata@663f2000 { compatible = "brcm,iproc-ahci", "generic-ahci"; reg = <0x663f2000 0x1000>; dma-coherent;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 135/475 printk: fix return value of printk.devkmsg __setup handler
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit b665eae7a788c5e2bc10f9ac3c0137aa0ad1fc97 ]
If an invalid option value is used with "printk.devkmsg=<value>", it is silently ignored.
If a valid option value is used, it is honored but the wrong return value (0) is used, indicating that the command line option had an error and was not handled. This string is not added to init's environment strings due to init/main.c::unknown_bootoption() checking for a '.' in the boot option string and then considering that string to be an "Unused module parameter".
Print a warning message if a bad option string is used. Always return 1 from the __setup handler to indicate that the command line option has been handled.
--- kernel/printk/printk.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
kernel/printk/printk.c +4 -2
@@ -146,8 +146,10 @@ static int __control_devkmsg(char *str)static int __init control_devkmsg (char *str) { -if (__control_devkmsg (str) <0 ) +if (__control_devkmsg (str) <0 ) { +pr_warn ("printk.devkmsg: bad option string '%s'\n" , str);return 1 ; + }/* * Set sysctl string accordingly:
@@ -166,7 +168,7 @@ static int __init control_devkmsg(char *str)*/ devkmsg_log |=DEVKMSG_LOG_MASK_LOCK ; -return 0 ; +return 1 ; }__setup ("printk.devkmsg=" , control_devkmsg);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 136/475 ASoC: mxs-saif: Handle errors for clk_enable
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 2ecf362d220317debf5da376e0390e9f7a3f7b29 ]
As the potential failure of the clk_enable(),
it should be better to check it, like mxs_saif_trigger().
--- sound/soc/mxs/mxs-saif.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/mxs/mxs-saif.c +4 -1
@@ -455,7 +455,10 @@ static int mxs_saif_hw_params(struct snd_pcm_substream *substream,* basic clock which should be fast enough for the internal * logic. */ -clk_enable (saif->clk); + ret =clk_enable (saif->clk); +if (ret) +return ret; + ret =clk_set_rate (saif->clk,24000000 );clk_disable (saif->clk);if (ret)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 137/475 ASoC: atmel_ssc_dai: Handle errors for clk_enable
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit f9e2ca0640e59d19af0ff285ee5591ed39069b09 ]
As the potential failure of the clk_enable(),
it should be better to check it and return error if fals.
--- sound/soc/atmel/atmel_ssc_dai.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/atmel/atmel_ssc_dai.c +4 -1
@@ -280,7 +280,10 @@ static int atmel_ssc_startup(struct snd_pcm_substream *substream,/* Enable PMC peripheral clock for this SSC */ pr_debug ("atmel_ssc_dai: Starting clock\n" ); -clk_enable (ssc_p->ssc->clk); + ret =clk_enable (ssc_p->ssc->clk); +if (ret) +return ret; + ssc_p->mck_rate =clk_get_rate (ssc_p->ssc->clk);/* Reset the SSC unless initialized to keep it in a clean state */
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 138/475 ASoC: soc-compress: prevent the potentially use of null pointer
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit de2c6f98817fa5decb9b7d3b3a8a3ab864c10588 ]
There is one call trace that snd_soc_register_card() ->snd_soc_bind_card()->soc_init_pcm_runtime() ->snd_soc_dai_compress_new()->snd_soc_new_compress().
In the trace the 'codec_dai' transfers from card->dai_link, and we can see from the snd_soc_add_pcm_runtime() in snd_soc_bind_card() that, if value of card->dai_link->num_codecs is 0, then 'codec_dai' could be null pointer caused
by index out of bound in 'asoc_rtd_to_codec(rtd, 0)'.
And snd_soc_register_card() is called by various platforms. Therefore, it is better to add the check in the case of misusing. And because 'cpu_dai' has already checked in soc_init_pcm_runtime(), there is no need to check again.
Adding the check as follow, then if 'codec_dai' is null, snd_soc_new_compress() will not pass through the check 'if (playback + capture != 1)', avoiding the leftover use of 'codec_dai'.
--- sound/soc/soc-compress.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
sound/soc/soc-compress.c +8 -6
@@ -872,12 +872,14 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) }/* check client and interface hw capabilities */ -if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_PLAYBACK ) && -snd_soc_dai_stream_valid (cpu_dai,SNDRV_PCM_STREAM_PLAYBACK )) - playback =1 ; -if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_CAPTURE ) && -snd_soc_dai_stream_valid (cpu_dai,SNDRV_PCM_STREAM_CAPTURE )) - capture =1 ; +if (codec_dai) { +if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_PLAYBACK ) && +snd_soc_dai_stream_valid (cpu_dai,SNDRV_PCM_STREAM_PLAYBACK )) + playback =1 ; +if (snd_soc_dai_stream_valid (codec_dai,SNDRV_PCM_STREAM_CAPTURE ) && +snd_soc_dai_stream_valid (cpu_dai,SNDRV_PCM_STREAM_CAPTURE )) + capture =1 ; + }/* * Compress devices are unidirectional so only one of the directions
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 139/475 memory: emif: Add check for setup_interrupts
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit fd7bd80b46373887b390852f490f21b07e209498 ]
As the potential failure of the devm_request_threaded_irq(), it should be better to check the return value of the setup_interrupts() and return error if fails.
--- drivers/memory/emif.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/memory/emif.c +4 -2
@@ -1515,7 +1515,7 @@ static int __init_or_module emif_probe(struct platform_device *pdev) {struct emif_data *emif;struct resource *res; -int irq; +int irq, ret;if (pdev->dev.of_node) emif =of_get_memory_device_details (pdev->dev.of_node, &pdev->dev);
@@ -1549,7 +1549,9 @@ static int __init_or_module emif_probe(struct platform_device *pdev)emif_onetime_settings (emif);emif_debugfs_init (emif);disable_and_clear_all_interrupts (emif); -setup_interrupts (emif, irq); + ret =setup_interrupts (emif, irq); +if (ret) + goto error;/* One-time actions taken on probing the first device */ if (!emif1) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 140/475 memory: emif: check the pointer temp in get_device_details()
In reply to Greg Kroah-HartmanFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit 5b5ab1bfa1898c6d52936a57c25c5ceba2cb2f87 ]
The pointer temp is allocated by devm_kzalloc(), so it should be checked for error handling.
--- drivers/memory/emif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/memory/emif.c +1 -1
@@ -1423,7 +1423,7 @@ static struct emif_data *__init_or_module get_device_details( temp =devm_kzalloc (dev,sizeof (*pd),GFP_KERNEL ); dev_info =devm_kzalloc (dev,sizeof (*dev_info),GFP_KERNEL ); -if (!emif || !pd || !dev_info) { +if (!emif || !temp || !dev_info) {dev_err (dev,"%s:%d: allocation error\n" , __func__, __LINE__); goto error; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 141/475 ALSA: firewire-lib: fix uninitialized flag for AV/C deferred transaction
In reply to Greg Kroah-HartmanFrom: Takashi Sakamoto <[email protected]>
[ Upstream commit bf0cd60b7e33cf221fbe1114e4acb2c828b0af0d ]
AV/C deferred transaction was supported at a commit 00a7bb81c20f ("ALSA:
firewire-lib: Add support for deferred transaction") while 'deferrable' flag can be uninitialized for non-control/notify AV/C transactions. UBSAN reports it:
kernel: ================================================================================ kernel: UBSAN: invalid-load in /build/linux-aa0B4d/linux-5.15.0/sound/firewire/fcp.c:363:9 kernel: load of value 158 is not a valid value for type '_Bool' kernel: CPU: 3 PID: 182227 Comm: irq/35-firewire Tainted: P OE 5.15.0-18-generic #18-Ubuntu kernel: Hardware name: Gigabyte Technology Co., Ltd. AX370-Gaming 5/AX370-Gaming 5, BIOS F42b 08/01/2019 kernel: Call Trace: kernel: <IRQ> kernel: show_stack+0x52/0x58 kernel: dump_stack_lvl+0x4a/0x5f kernel: dump_stack+0x10/0x12 kernel: ubsan_epilogue+0x9/0x45 kernel: __ubsan_handle_load_invalid_value.cold+0x44/0x49 kernel: fcp_response.part.0.cold+0x1a/0x2b [snd_firewire_lib] kernel: fcp_response+0x28/0x30 [snd_firewire_lib] kernel: fw_core_handle_request+0x230/0x3d0 [firewire_core] kernel: handle_ar_packet+0x1d9/0x200 [firewire_ohci] kernel: ? handle_ar_packet+0x1d9/0x200 [firewire_ohci] kernel: ? transmit_complete_callback+0x9f/0x120 [firewire_core] kernel: ar_context_tasklet+0xa8/0x2e0 [firewire_ohci] kernel: tasklet_action_common.constprop.0+0xea/0xf0 kernel: tasklet_action+0x22/0x30 kernel: __do_softirq+0xd9/0x2e3 kernel: ? irq_finalize_oneshot.part.0+0xf0/0xf0 kernel: do_softirq+0x75/0xa0 kernel: </IRQ> kernel: <TASK> kernel: __local_bh_enable_ip+0x50/0x60 kernel: irq_forced_thread_fn+0x7e/0x90 kernel: irq_thread+0xba/0x190 kernel: ? irq_thread_fn+0x60/0x60 kernel: kthread+0x11e/0x140 kernel: ? irq_thread_check_affinity+0xf0/0xf0 kernel: ? set_kthread_struct+0x50/0x50 kernel: ret_from_fork+0x22/0x30 kernel: </TASK> kernel: ================================================================================
This commit fixes the bug. The bug has no disadvantage for the non- control/notify AV/C transactions since the flag has an effect for AV/C response with INTERIM (0x0f) status which is not used for the transactions in AV/C general specification.
--- sound/firewire/fcp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
sound/firewire/fcp.c +1 -3
@@ -240,9 +240,7 @@ int fcp_avc_transaction(struct fw_unit *unit, t.response_match_bytes = response_match_bytes; t.state =STATE_PENDING ;init_waitqueue_head (&t.wait); - -if (*(const u8 *)command ==0x00 || *(const u8 *)command ==0x03 ) - t.deferrable = true; + t.deferrable = (*(const u8 *)command ==0x00 || *(const u8 *)command ==0x03 );spin_lock_irq (&transactions_lock);list_add_tail (&t.list, &transactions);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 142/475 arm64: dts: rockchip: Fix SDIO regulator supply properties on rk3399-firefly
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit 37cbd3c522869247ed4525b5042ff4c6a276c813 ]
A label reference without brackets is a path string, not a phandle as intended. Add the missing brackets.
--- arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399-firefly.dts +2 -2
@@ -666,8 +666,8 @@ sd-uhs-sdr104; /* Power supply */ - vqmmc-supply = &vcc1v8_s3; /* IO line */ - vmmc-supply = &vcc_sdio; /* card's power */ + vqmmc-supply = <&vcc1v8_s3>; /* IO line */ + vmmc-supply = <&vcc_sdio>; /* card's power */ #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 143/475 media: stk1160: If start stream fails, return buffers with VB2_BUF_STATE_QUEUED
In reply to Greg Kroah-HartmanFrom: Dafna Hirschfeld <[email protected]>
[ Upstream commit fbe04b49a54e31f4321d632270207f0e6304cd16 ]
If the callback 'start_streaming' fails, then all queued buffers in the driver should be returned with state 'VB2_BUF_STATE_QUEUED'. Currently, they are returned with 'VB2_BUF_STATE_ERROR' which is wrong. Fix this. This also fixes the warning:
[ 65.583633] WARNING: CPU: 5 PID: 593 at drivers/media/common/videobuf2/videobuf2-core.c:1612 vb2_start_streaming+0xd4/0x160 [videobuf2_common] [ 65.585027] Modules linked in: snd_usb_audio snd_hwdep snd_usbmidi_lib snd_rawmidi snd_soc_hdmi_codec dw_hdmi_i2s_audio saa7115 stk1160 videobuf2_vmalloc videobuf2_memops videobuf2_v4l2 videobuf2_common videodev mc crct10dif_ce panfrost snd_soc_simple_card snd_soc_audio_graph_card snd_soc_spdif_tx snd_soc_simple_card_utils gpu_sched phy_rockchip_pcie snd_soc_rockchip_i2s rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi cec drm_kms_helper drm rtc_rk808 rockchip_saradc industrialio_triggered_buffer kfifo_buf rockchip_thermal pcie_rockchip_host ip_tables x_tables ipv6 [ 65.589383] CPU: 5 PID: 593 Comm: v4l2src0:src Tainted: G W 5.16.0-rc4-62408-g32447129cb30-dirty #14 [ 65.590293] Hardware name: Radxa ROCK Pi 4B (DT) [ 65.590696] pstate: 80000005 (Nzcv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 65.591304] pc : vb2_start_streaming+0xd4/0x160 [videobuf2_common] [ 65.591850] lr : vb2_start_streaming+0x6c/0x160 [videobuf2_common] [ 65.592395] sp : ffff800012bc3ad0 [ 65.592685] x29: ffff800012bc3ad0 x28: 0000000000000000 x27: ffff800012bc3cd8 [ 65.593312] x26: 0000000000000000 x25: ffff00000d8a7800 x24: 0000000040045612 [ 65.593938] x23: ffff800011323000 x22: ffff800012bc3cd8 x21: ffff00000908a8b0 [ 65.594562] x20: ffff00000908a8c8 x19: 00000000fffffff4 x18: ffffffffffffffff [ 65.595188] x17: 000000040044ffff x16: 00400034b5503510 x15: ffff800011323f78 [ 65.595813] x14: ffff000013163886 x13: ffff000013163885 x12: 00000000000002ce [ 65.596439] x11: 0000000000000028 x10: 0000000000000001 x9 : 0000000000000228 [ 65.597064] x8 : 0101010101010101 x7 : 7f7f7f7f7f7f7f7f x6 : fefefeff726c5e78 [ 65.597690] x5 : ffff800012bc3990 x4 : 0000000000000000 x3 : ffff000009a34880 [ 65.598315] x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffff000007cd99f0 [ 65.598940] Call trace: [ 65.599155] vb2_start_streaming+0xd4/0x160 [videobuf2_common] [ 65.599672] vb2_core_streamon+0x17c/0x1a8 [videobuf2_common] [ 65.600179] vb2_streamon+0x54/0x88 [videobuf2_v4l2] [ 65.600619] vb2_ioctl_streamon+0x54/0x60 [videobuf2_v4l2] [ 65.601103] v4l_streamon+0x3c/0x50 [videodev] [ 65.601521] __video_do_ioctl+0x1a4/0x428 [videodev] [ 65.601977] video_usercopy+0x320/0x828 [videodev] [ 65.602419] video_ioctl2+0x3c/0x58 [videodev] [ 65.602830] v4l2_ioctl+0x60/0x90 [videodev] [ 65.603227] __arm64_sys_ioctl+0xa8/0xe0 [ 65.603576] invoke_syscall+0x54/0x118 [ 65.603911] el0_svc_common.constprop.3+0x84/0x100 [ 65.604332] do_el0_svc+0x34/0xa0 [ 65.604625] el0_svc+0x1c/0x50 [ 65.604897] el0t_64_sync_handler+0x88/0xb0 [ 65.605264] el0t_64_sync+0x16c/0x170 [ 65.605587] ---[ end trace 578e0ba07742170d ]---
--- drivers/media/usb/stk1160/stk1160-core.c | 2 +- drivers/media/usb/stk1160/stk1160-v4l.c | 10 +++++----- drivers/media/usb/stk1160/stk1160.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)
drivers/media/usb/stk1160/stk1160-core.c +1 -1
@@ -403,7 +403,7 @@ static void stk1160_disconnect(struct usb_interface *interface)/* Here is the only place where isoc get released */ stk1160_uninit_isoc (dev); -stk1160_clear_queue (dev); +stk1160_clear_queue (dev,VB2_BUF_STATE_ERROR );video_unregister_device (&dev->vdev);v4l2_device_disconnect (&dev->v4l2_dev);
drivers/media/usb/stk1160/stk1160-v4l.c +5 -5
@@ -258,7 +258,7 @@ static int stk1160_start_streaming(struct stk1160 *dev)stk1160_uninit_isoc (dev); out_stop_hw:usb_set_interface (dev->udev,0 ,0 ); -stk1160_clear_queue (dev); +stk1160_clear_queue (dev,VB2_BUF_STATE_QUEUED );mutex_unlock (&dev->v4l_lock);
@@ -306,7 +306,7 @@ static int stk1160_stop_streaming(struct stk1160 *dev)stk1160_stop_hw (dev); -stk1160_clear_queue (dev); +stk1160_clear_queue (dev,VB2_BUF_STATE_ERROR );stk1160_dbg ("streaming stopped\n" );
@@ -745,7 +745,7 @@ static const struct video_device v4l_template = {/********************************************************************/ /* Must be called with both v4l_lock and vb_queue_lock hold */ -void stk1160_clear_queue (struct stk1160 *dev) +void stk1160_clear_queue (struct stk1160 *dev,enum vb2_buffer_state vb2_state) {struct stk1160_buffer *buf;unsigned long flags;
@@ -756,7 +756,7 @@ void stk1160_clear_queue(struct stk1160 *dev) buf =list_first_entry (&dev->avail_bufs, struct stk1160_buffer, list);list_del (&buf->list); -vb2_buffer_done (&buf->vb.vb2_buf,VB2_BUF_STATE_ERROR ); +vb2_buffer_done (&buf->vb.vb2_buf, vb2_state);stk1160_dbg ("buffer [%p/%d] aborted\n" , buf, buf->vb.vb2_buf.index); }
@@ -766,7 +766,7 @@ void stk1160_clear_queue(struct stk1160 *dev) buf = dev->isoc_ctl.buf; dev->isoc_ctl.buf =NULL ; -vb2_buffer_done (&buf->vb.vb2_buf,VB2_BUF_STATE_ERROR ); +vb2_buffer_done (&buf->vb.vb2_buf, vb2_state);stk1160_dbg ("buffer [%p/%d] aborted\n" , buf, buf->vb.vb2_buf.index); }
drivers/media/usb/stk1160/stk1160.h +1 -1
@@ -166,7 +166,7 @@ struct regval {int stk1160_vb2_setup (struct stk1160 *dev);int stk1160_video_register (struct stk1160 *dev);void stk1160_video_unregister (struct stk1160 *dev); -void stk1160_clear_queue (struct stk1160 *dev); +void stk1160_clear_queue (struct stk1160 *dev,enum vb2_buffer_state vb2_state);/* Provided by stk1160-video.c */ int stk1160_alloc_isoc (struct stk1160 *dev);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 144/475 ASoC: atmel: Add missing of_node_put() in at91sam9g20ek_audio_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit f590797fa3c1bccdd19e55441592a23b46aef449 ]
This node pointer is returned by of_parse_phandle() with refcount incremented in this function.
Calling of_node_put() to avoid the refcount leak.
--- sound/soc/atmel/sam9g20_wm8731.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/atmel/sam9g20_wm8731.c +1 -0
@@ -214,6 +214,7 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev) cpu_np =of_parse_phandle (np,"atmel,ssc-controller" ,0 );if (!cpu_np) {dev_err (&pdev->dev,"dai and pcm info missing\n" ); +of_node_put (codec_np);return -EINVAL ; } at91sam9g20ek_dai.cpus->of_node = cpu_np;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 145/475 ASoC: wm8350: Handle error for wm8350_register_irq
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit db0350da8084ad549bca16cc0486c11cc70a1f9b ]
As the potential failure of the wm8350_register_irq(), it should be better to check it and return error if fails. Also, use 'free_' in order to avoid the same code.
--- sound/soc/codecs/wm8350.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-)
sound/soc/codecs/wm8350.c +24 -4
@@ -1535,18 +1535,38 @@ static int wm8350_component_probe(struct snd_soc_component *component)wm8350_clear_bits (wm8350,WM8350_JACK_DETECT ,WM8350_JDL_ENA |WM8350_JDR_ENA ); -wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_JCK_DET_L , + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_JCK_DET_L , wm8350_hpl_jack_handler,0 ,"Left jack detect" , priv); -wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_JCK_DET_R , +if (ret !=0 ) + goto err; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_JCK_DET_R , wm8350_hpr_jack_handler,0 ,"Right jack detect" , priv); -wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_MICSCD , +if (ret !=0 ) + goto free_jck_det_l; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_MICSCD , wm8350_mic_handler,0 ,"Microphone short" , priv); -wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_MICD , +if (ret !=0 ) + goto free_jck_det_r; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CODEC_MICD , wm8350_mic_handler,0 ,"Microphone detect" , priv); +if (ret !=0 ) + goto free_micscd;return 0 ; + +free_micscd: +wm8350_free_irq (wm8350,WM8350_IRQ_CODEC_MICSCD , priv); +free_jck_det_r: +wm8350_free_irq (wm8350,WM8350_IRQ_CODEC_JCK_DET_R , priv); +free_jck_det_l: +wm8350_free_irq (wm8350,WM8350_IRQ_CODEC_JCK_DET_L , priv); +err: +return ret; }static void wm8350_component_remove (struct snd_soc_component *component)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 146/475 ASoC: fsi: Add check for clk_enable
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 405afed8a728f23cfaa02f75bbc8bdd6b7322123 ]
As the potential failure of the clk_enable(),
it should be better to check it and return error
if fails.
--- sound/soc/sh/fsi.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
sound/soc/sh/fsi.c +16 -3
@@ -816,14 +816,27 @@ static int fsi_clk_enable(struct device *dev,return ret; } -clk_enable (clock->xck); -clk_enable (clock->ick); -clk_enable (clock->div); + ret =clk_enable (clock->xck); +if (ret) + goto err; + ret =clk_enable (clock->ick); +if (ret) + goto disable_xck; + ret =clk_enable (clock->div); +if (ret) + goto disable_ick; clock->count++; }return ret; + +disable_ick: +clk_disable (clock->ick); +disable_xck: +clk_disable (clock->xck); +err: +return ret; } static int fsi_clk_disable(struct device *dev,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 147/475 video: fbdev: omapfb: Add missing of_node_put() in dvic_probe_of
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit a58c22cfbbf62fefca090334bbd35fd132e92a23 ]
The device_node pointer is returned by of_parse_phandle() with refcount incremented. We should use of_node_put() on it when done.
--- drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c | 1 + 1 file changed, 1 insertion(+)
drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c +1 -0
@@ -251,6 +251,7 @@ static int dvic_probe_of(struct platform_device *pdev) adapter_node =of_parse_phandle (node,"ddc-i2c-bus" ,0 );if (adapter_node) { adapter =of_get_i2c_adapter_by_node (adapter_node); +of_node_put (adapter_node);if (adapter ==NULL ) {dev_err (&pdev->dev,"failed to parse ddc-i2c-bus\n" );omap_dss_put_device (ddata->in);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 148/475 ivtv: fix incorrect device_caps for ivtvfb
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit 25e94139218c0293b4375233c14f2256d7dcfaa8 ]
The VIDIOC_G_FBUF and related overlay ioctls no longer worked (-ENOTTY was returned).
The root cause was the introduction of the caps field in ivtv-driver.h. While loading the ivtvfb module would update the video_device device_caps field with V4L2_CAP_VIDEO_OUTPUT_OVERLAY it would not update that caps field, and that's what the overlay ioctls would look at.
It's a bad idea to keep information in two places, so drop the caps field and only use vdev.device_caps.
--- drivers/media/pci/ivtv/ivtv-driver.h | 1 - drivers/media/pci/ivtv/ivtv-ioctl.c | 10 +++++----- drivers/media/pci/ivtv/ivtv-streams.c | 11 ++++------- 3 files changed, 9 insertions(+), 13 deletions(-)
drivers/media/pci/ivtv/ivtv-driver.h +0 -1
@@ -333,7 +333,6 @@ struct ivtv_stream {struct ivtv *itv;/* for ease of use */ const char *name;/* name of the stream */ int type;/* stream type */ -u32 caps;/* V4L2 capabilities */ struct v4l2_fh *fh;/* pointer to the streaming filehandle */ spinlock_t qlock;/* locks access to the queues */
drivers/media/pci/ivtv/ivtv-ioctl.c +5 -5
@@ -443,7 +443,7 @@ static int ivtv_g_fmt_vid_out_overlay(struct file *file, void *fh, struct v4l2_fstruct ivtv_stream *s = &itv->streams[fh2id (fh)->type];struct v4l2_window *winfmt = &fmt->fmt.win; -if (!(s->caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY )) +if (!(s->vdev.device_caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY ))return -EINVAL ;if (!itv->osd_video_pbase)return -EINVAL ;
@@ -554,7 +554,7 @@ static int ivtv_try_fmt_vid_out_overlay(struct file *file, void *fh, struct v4l2u32 chromakey = fmt->fmt.win.chromakey;u8 global_alpha = fmt->fmt.win.global_alpha; -if (!(s->caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY )) +if (!(s->vdev.device_caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY ))return -EINVAL ;if (!itv->osd_video_pbase)return -EINVAL ;
@@ -1386,7 +1386,7 @@ static int ivtv_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb) 0, }; -if (!(s->caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY )) +if (!(s->vdev.device_caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY ))return -ENOTTY ;if (!itv->osd_video_pbase)return -ENOTTY ;
@@ -1453,7 +1453,7 @@ static int ivtv_s_fbuf(struct file *file, void *fh, const struct v4l2_framebuffestruct ivtv_stream *s = &itv->streams[fh2id (fh)->type];struct yuv_playback_info *yi = &itv->yuv_info; -if (!(s->caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY )) +if (!(s->vdev.device_caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY ))return -ENOTTY ;if (!itv->osd_video_pbase)return -ENOTTY ;
@@ -1473,7 +1473,7 @@ static int ivtv_overlay(struct file *file, void *fh, unsigned int on)struct ivtv *itv = id->itv;struct ivtv_stream *s = &itv->streams[fh2id (fh)->type]; -if (!(s->caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY )) +if (!(s->vdev.device_caps &V4L2_CAP_VIDEO_OUTPUT_OVERLAY ))return -ENOTTY ;if (!itv->osd_video_pbase)return -ENOTTY ;
drivers/media/pci/ivtv/ivtv-streams.c +4 -7
@@ -176,7 +176,7 @@ static void ivtv_stream_init(struct ivtv *itv, int type) s->itv = itv; s->type = type; s->name = ivtv_stream_info[type].name; - s->caps = ivtv_stream_info[type].v4l2_caps; + s->vdev.device_caps = ivtv_stream_info[type].v4l2_caps;if (ivtv_stream_info[type].pio) s->dma =PCI_DMA_NONE ;
@@ -299,12 +299,9 @@ static int ivtv_reg_dev(struct ivtv *itv, int type)if (s_mpg->vdev.v4l2_dev) num = s_mpg->vdev.num + ivtv_stream_info[type].num_offset; } - s->vdev.device_caps = s->caps; -if (itv->osd_video_pbase) { - itv->streams[IVTV_DEC_STREAM_TYPE_YUV ].vdev.device_caps |= -V4L2_CAP_VIDEO_OUTPUT_OVERLAY ; - itv->streams[IVTV_DEC_STREAM_TYPE_MPG ].vdev.device_caps |= -V4L2_CAP_VIDEO_OUTPUT_OVERLAY ; +if (itv->osd_video_pbase && (type ==IVTV_DEC_STREAM_TYPE_YUV || + type ==IVTV_DEC_STREAM_TYPE_MPG )) { + s->vdev.device_caps |=V4L2_CAP_VIDEO_OUTPUT_OVERLAY ; itv->v4l2_cap |=V4L2_CAP_VIDEO_OUTPUT_OVERLAY ; }video_set_drvdata (&s->vdev, s);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 149/475 ASoC: dmaengine: do not use a NULL prepare_slave_config() callback
In reply to Greg Kroah-HartmanFrom: Codrin Ciubotariu <[email protected]>
[ Upstream commit 9a1e13440a4f2e7566fd4c5eae6a53e6400e08a4 ]
Even if struct snd_dmaengine_pcm_config is used, prepare_slave_config() callback might not be set. Check if this callback is set before using it.
--- sound/soc/soc-generic-dmaengine-pcm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/soc-generic-dmaengine-pcm.c +3 -3
@@ -91,10 +91,10 @@ static int dmaengine_pcm_hw_params(struct snd_pcm_substream *substream,memset (&slave_config,0 ,sizeof (slave_config)); -if (!pcm->config) - prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config; -else +if (pcm->config && pcm->config->prepare_slave_config) prepare_slave_config = pcm->config->prepare_slave_config; +else + prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config;if (prepare_slave_config) { ret =prepare_slave_config (substream, params, &slave_config);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 150/475 ASoC: mxs: Fix error handling in mxs_sgtl5000_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 6ae0a4d8fec551ec581d620f0eb1fe31f755551c ]
This function only calls of_node_put() in the regular path. And it will cause refcount leak in error paths.
For example, when codec_np is NULL, saif_np[0] and saif_np[1] are not NULL, it will cause leaks.
of_node_put() will check if the node pointer is NULL, so we can call it directly to release the refcount of regular pointers.
--- sound/soc/mxs/mxs-sgtl5000.c | 3 +++ 1 file changed, 3 insertions(+)
sound/soc/mxs/mxs-sgtl5000.c +3 -0
@@ -118,6 +118,9 @@ static int mxs_sgtl5000_probe(struct platform_device *pdev) codec_np =of_parse_phandle (np,"audio-codec" ,0 );if (!saif_np[0 ] || !saif_np[1 ] || !codec_np) {dev_err (&pdev->dev,"phandle missing or invalid\n" ); +of_node_put (codec_np); +of_node_put (saif_np[0 ]); +of_node_put (saif_np[1 ]);return -EINVAL ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 151/475 ASoC: imx-es8328: Fix error return code in imx_es8328_probe()
In reply to Greg Kroah-HartmanFrom: Wang Wensheng <[email protected]>
[ Upstream commit 3b891513f95cba3944e72c1139ea706d04f3781b ]
Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function.
--- sound/soc/fsl/imx-es8328.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/fsl/imx-es8328.c +1 -0
@@ -87,6 +87,7 @@ static int imx_es8328_probe(struct platform_device *pdev)if (int_port >MUX_PORT_MAX || int_port ==0 ) {dev_err (dev,"mux-int-port: hardware only has %d mux ports\n" ,MUX_PORT_MAX ); + ret = -EINVAL ; goto fail; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 152/475 ASoC: msm8916-wcd-digital: Fix missing clk_disable_unprepare() in msm8916_wcd_digital_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 375a347da4889f64d86e1ab7f4e6702b6e9bf299 ]
Fix the missing clk_disable_unprepare() before return from msm8916_wcd_digital_probe in the error handling case.
--- sound/soc/codecs/msm8916-wcd-digital.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/codecs/msm8916-wcd-digital.c +4 -1
@@ -1201,7 +1201,7 @@ static int msm8916_wcd_digital_probe(struct platform_device *pdev) ret =clk_prepare_enable (priv->mclk);if (ret <0 ) {dev_err (dev,"failed to enable mclk %d\n" , ret); -return ret; + goto err_clk; }dev_set_drvdata (dev, priv);
@@ -1209,6 +1209,9 @@ static int msm8916_wcd_digital_probe(struct platform_device *pdev)return devm_snd_soc_register_component (dev, &msm8916_wcd_digital, msm8916_wcd_digital_dai,ARRAY_SIZE (msm8916_wcd_digital_dai)); +err_clk: +clk_disable_unprepare (priv->ahbclk); +return ret; }static int msm8916_wcd_digital_remove (struct platform_device *pdev)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 153/475 mmc: davinci_mmc: Handle error for clk_enable
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 09e7af76db02c74f2a339b3cb2d95460fa2ddbe4 ]
As the potential failure of the clk_enable(),
it should be better to check it and return error
if fails.
--- drivers/mmc/host/davinci_mmc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/mmc/host/davinci_mmc.c +5 -1
@@ -1376,8 +1376,12 @@ static int davinci_mmcsd_suspend(struct device *dev)static int davinci_mmcsd_resume (struct device *dev) {struct mmc_davinci_host *host =dev_get_drvdata (dev); +int ret; + + ret =clk_enable (host->clk); +if (ret) +return ret; -clk_enable (host->clk);mmc_davinci_reset_ctrl (host,0 );return 0 ;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 154/475 ASoC: msm8916-wcd-analog: Fix error handling in pm8916_wcd_analog_spmi_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 9ebd62d60edcd4d9c75485e5ccd0b79581ad3c49 ]
In the error handling path, the clk_prepare_enable() function call should be balanced by a corresponding 'clk_disable_unprepare()' call , as already done in the remove function.
--- sound/soc/codecs/msm8916-wcd-analog.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
sound/soc/codecs/msm8916-wcd-analog.c +16 -6
@@ -1195,8 +1195,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev) } irq =platform_get_irq_byname (pdev,"mbhc_switch_int" ); -if (irq <0 ) -return irq; +if (irq <0 ) { + ret = irq; + goto err_disable_clk; + } ret = devm_request_threaded_irq(dev, irq, NULL, pm8916_mbhc_switch_irq_handler,
@@ -1208,8 +1210,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev)if (priv->mbhc_btn_enabled) { irq =platform_get_irq_byname (pdev,"mbhc_but_press_det" ); -if (irq <0 ) -return irq; +if (irq <0 ) { + ret = irq; + goto err_disable_clk; + } ret = devm_request_threaded_irq(dev, irq, NULL, mbhc_btn_press_irq_handler,
@@ -1220,8 +1224,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev)dev_err (dev,"cannot request mbhc button press irq\n" ); irq =platform_get_irq_byname (pdev,"mbhc_but_rel_det" ); -if (irq <0 ) -return irq; +if (irq <0 ) { + ret = irq; + goto err_disable_clk; + } ret = devm_request_threaded_irq(dev, irq, NULL, mbhc_btn_release_irq_handler,
@@ -1238,6 +1244,10 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev)return devm_snd_soc_register_component (dev, &pm8916_wcd_analog, pm8916_wcd_analog_dai,ARRAY_SIZE (pm8916_wcd_analog_dai)); + +err_disable_clk: +clk_disable_unprepare (priv->mclk); +return ret; }static int pm8916_wcd_analog_spmi_remove (struct platform_device *pdev)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 155/475 drm/bridge: Fix free wrong object in sii8620_init_rcp_input_dev
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 7c442e76c06cb1bef16a6c523487438175584eea ]
rc_dev is allocated by rc_allocate_device(), and doesn't assigned to ctx->rc_dev before calling rc_free_device(ctx->rc_dev). So it should call rc_free_device(rc_dev);
--- drivers/gpu/drm/bridge/sil-sii8620.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/sil-sii8620.c +1 -1
@@ -2118,7 +2118,7 @@ static void sii8620_init_rcp_input_dev(struct sii8620 *ctx)if (ret) {dev_err (ctx->dev,"Failed to register RC device\n" ); ctx->error = ret; -rc_free_device (ctx->rc_dev); +rc_free_device (rc_dev);return ; } ctx->rc_dev = rc_dev;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 156/475 drm/bridge: Add missing pm_runtime_disable() in __dw_mipi_dsi_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 96211b7c56b109a52768e6cc5e23a1f79316eca0 ]
If the probe fails, we should use pm_runtime_disable() to balance pm_runtime_enable().
Add missing pm_runtime_disable() for __dw_mipi_dsi_probe.
--- drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +1 -0
@@ -1057,6 +1057,7 @@ __dw_mipi_dsi_probe(struct platform_device *pdev, ret =mipi_dsi_host_register (&dsi->dsi_host);if (ret) {dev_err (dev,"Failed to register MIPI host: %d\n" , ret); +pm_runtime_disable (dev);dw_mipi_dsi_debugfs_remove (dsi);return ERR_PTR (ret); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 157/475 ath10k: fix memory overwrite of the WoWLAN wakeup packet pattern
In reply to Greg Kroah-HartmanFrom: Wen Gong <[email protected]>
[ Upstream commit e3fb3d4418fce5484dfe7995fcd94c18b10a431a ]
In function ath10k_wow_convert_8023_to_80211(), it will do memcpy for the new->pattern, and currently the new->pattern and new->mask is same with the old, then the memcpy of new->pattern will also overwrite the old->pattern, because the header format of new->pattern is 802.11, its length is larger than the old->pattern which is 802.3. Then the operation of "Copy frame body" will copy a mistake value because the body memory has been overwrite when memcpy the new->pattern.
Assign another empty value to new_pattern to avoid the overwrite issue.
Tested-on: QCA6174 hw3.2 SDIO WLAN.RMH.4.4.1-00049
--- drivers/net/wireless/ath/ath10k/wow.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath10k/wow.c +4 -3
@@ -337,14 +337,15 @@ static int ath10k_vif_wow_set_wakeups(struct ath10k_vif *arvif,if (patterns[i].mask[j /8 ] &BIT (j %8 )) bitmask[j] =0xff ; old_pattern.mask = bitmask; - new_pattern = old_pattern;if (ar->wmi.rx_decap_mode ==ATH10K_HW_TXRX_NATIVE_WIFI ) { -if (patterns[i].pkt_offset <ETH_HLEN ) +if (patterns[i].pkt_offset <ETH_HLEN ) {ath10k_wow_convert_8023_to_80211 (&new_pattern, &old_pattern); -else + }else { + new_pattern = old_pattern; new_pattern.pkt_offset +=WOW_HDR_LEN -ETH_HLEN ; + } }if (WARN_ON (new_pattern.pattern_len >WOW_MAX_PATTERN_SIZE ))
Signature · 1 line
2.34.1