4.19.238-rc1 review
Subsystems (12)
Greg Kroah-Hartman
maintainercover 4.19.238-rc1 review
This is the start of the stable review cycle for the 4.19.238 release. There are 338 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/v4.x/stable-review/patch-4.19.238-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.19.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.19.238-rc1
Felix Kuehling <[email protected]>
drm/amdkfd: Use drm_priv to pass VM from KFD to amdgpu
Bas Nieuwenhuizen <[email protected]>
drm/amdgpu: Check if fd really is an amdgpu fd.
Xin Long <[email protected]>
xfrm: policy: match with both mark and mask on user interfaces
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
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
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)
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"
Lv Yunlong <[email protected]>
drbd: Fix five use after free bugs in get_initial_state
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.
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
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
Willem de Bruijn <[email protected]>
net: add missing SOF_TIMESTAMPING_OPT_ID support
Helge Deller <[email protected]>
parisc: Fix CPU affinity for Lasi, WAX and Dino chips
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
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
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
Sven Eckelmann <[email protected]>
macvtap: advertise link netns via netlink
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
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
Sourabh Jain <[email protected]>
powerpc: Set crashkernel offset to mid of RMA region
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()
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
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()
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
Rafael J. Wysocki <[email protected]>
ACPI: CPPC: Avoid out of bounds access when parsing _CPC data
Baokun Li <[email protected]>
ubi: Fix race condition between ctrl_cdev_ioctl and ubi_cdev_ioctl
Chen-Yu Tsai <[email protected]>
pinctrl: pinconf-generic: Print arguments for bias-pull-*
Andrew Price <[email protected]>
gfs2: Make sure FITRIM minlen is rounded up to fs block size
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
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
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 hang due to session stuck
Quinn Tran <[email protected]>
scsi: qla2xxx: Fix incorrect reporting of task management failure
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
Nilesh Javali <[email protected]>
scsi: qla2xxx: Fix warning for missing error code
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
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
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
Dan Carpenter <[email protected]>
lib/test: use after free in register_test_dev_kmod()
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
Florian Fainelli <[email protected]>
net: phy: broadcom: Fix brcm_fet_config_init()
Juergen Gross <[email protected]>
xen: fix is_xen_pmu()
Konrad Dybcio <[email protected]>
clk: qcom: gcc-msm8994: Fix gpll4 width
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]>
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
Miaoqian Lin <[email protected]>
pinctrl: mediatek: Fix missing of_node_put() in mtk_pctrl_init
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
Taniya Das <[email protected]>
clk: qcom: clk-rcg2: Update the frac table for pixel clock
Randy Dunlap <[email protected]>
dma-debug: fix return value of __setup handlers
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
Dirk Buchwalder <[email protected]>
clk: qcom: ipq8074: Use floor ops for SDCC1 clock
Jonathan Cameron <[email protected]>
staging:iio:adc:ad7280a: Fix handing of device address bit reversing.
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
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
Dan Carpenter <[email protected]>
USB: storage: ums-realtek: fix error code in rts51x_read_mem()
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
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
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
Nishanth Menon <[email protected]>
drm/bridge: cdns-dsi: Make sure to to create proper aliases for dt
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
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
Colin Ian King <[email protected]>
iwlwifi: Fix -EIO error code that is never returned
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
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
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
Jiasheng Jiang <[email protected]>
mtd: onenand: Check for error irq
Pavel Skripkin <[email protected]>
Bluetooth: hci_serdev: call init_rwsem() before p->open()
Wen Gong <[email protected]>
ath10k: fix memory overwrite of the WoWLAN wakeup packet pattern
Miaoqian Lin <[email protected]>
drm/bridge: Fix free wrong object in sii8620_init_rcp_input_dev
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
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
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: 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()
Dan Carpenter <[email protected]>
media: usb: go7007: s2250-board: fix leak in probe()
Dongliang Mu <[email protected]>
media: em28xx: initialize refcount before kref_get
Miaoqian Lin <[email protected]>
soc: ti: wkup_m3_ipc: Fix IRQ check in wkup_m3_ipc_probe
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()
Wang Hai <[email protected]>
video: fbdev: smscufx: Fix null-ptr-deref in ufx_usb_probe()
Miaoqian Lin <[email protected]>
media: coda: Fix missing put_device() call in coda_get_vdoa_data
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
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: Replace brcmf_pcie_copy_mem_todev with memcpy_toio
Hector Martin <[email protected]>
brcmfmac: firmware: Allocate space for default boardrev in nvram
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
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
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
Andreas Gruenbacher <[email protected]>
powerpc/kvm: Fix kvm_use_magic_page
Lars Ellenberg <[email protected]>
drbd: fix potential silent data corruption
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"
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
Krzysztof Kozlowski <[email protected]>
pinctrl: samsung: drop pin banks references on error paths
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()
Bagas Sanjaya <[email protected]>
Documentation: update stable tree link
Bagas Sanjaya <[email protected]>
Documentation: add link to stable release candidate tree
Jann Horn <[email protected]>
ptrace: Check PTRACE_O_SUSPEND_SECCOMP permission on PTRACE_SEIZE
Kunihiko Hayashi <[email protected]>
clk: uniphier: Fix fixed-rate initialization
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
Mathias Nyman <[email protected]>
xhci: make xhci_handshake timeout for xhci_reset() adjustable
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
Miklos Szeredi <[email protected]>
fuse: fix pipe buffer lifetime for direct_io
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
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
-------------
Diffstat:
Documentation/process/stable-kernel-rules.rst | 11 +- 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/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-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/include/asm/kvm_mmu.h | 3 +- arch/arm64/kernel/insn.c | 4 +- arch/arm64/kernel/module.lds | 6 +- arch/mips/dec/prom/Makefile | 2 +- arch/mips/include/asm/dec/prom.h | 15 +- arch/mips/include/asm/setup.h | 2 +- arch/mips/kernel/traps.c | 22 +-- arch/mips/rb532/devices.c | 6 +- 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/platforms/powernv/rng.c | 6 +- arch/powerpc/sysdev/fsl_gtm.c | 4 +- arch/riscv/kernel/module.lds | 6 +- 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 | 17 ++- arch/x86/kvm/lapic.c | 5 +- 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 +- block/bfq-iosched.c | 31 ++-- block/blk-merge.c | 12 ++ block/blk-sysfs.c | 8 +- crypto/authenc.c | 2 +- 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/property.c | 2 +- drivers/ata/sata_dwc_460ex.c | 6 +- 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/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.c | 24 +++ drivers/clk/loongson1/clk-loongson1c.c | 1 + drivers/clk/qcom/clk-rcg2.c | 1 + 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/mxs-dcp.c | 2 +- drivers/crypto/vmx/Kconfig | 4 + drivers/dma/sh/shdma-base.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 16 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 10 +- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 2 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 + drivers/gpu/drm/bridge/cdns-dsi.c | 1 + drivers/gpu/drm/bridge/sil-sii8620.c | 2 +- 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/hid/i2c-hid/i2c-hid-core.c | 32 +++- 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/input/input.c | 6 - drivers/iommu/arm-smmu-v3.c | 1 + drivers/irqchip/irq-gic-v3.c | 8 +- drivers/irqchip/irq-nvic.c | 2 + drivers/irqchip/qcom-pdc.c | 5 +- drivers/md/dm-crypt.c | 2 +- drivers/md/dm-ioctl.c | 2 + drivers/media/pci/cx88/cx88-mpeg.c | 3 + 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/kgdbts.c | 4 +- drivers/mmc/core/host.c | 15 +- drivers/mmc/host/davinci_mmc.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/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/ethernet/8390/mcf8390.c | 10 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 4 +- drivers/net/ethernet/broadcom/genet/bcmgenet.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/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 | 48 +----- drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 2 +- 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 | 16 +- drivers/pci/hotplug/pciehp_hpc.c | 4 + drivers/perf/qcom_l2_pmu.c | 6 +- drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 2 + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 4 +- drivers/pinctrl/pinconf-generic.c | 6 +- drivers/pinctrl/pinctrl-rockchip.c | 2 + drivers/pinctrl/samsung/pinctrl-samsung.c | 30 +++- drivers/power/reset/gemini-poweroff.c | 4 +- drivers/power/supply/ab8500_fg.c | 4 +- drivers/power/supply/axp20x_battery.c | 13 +- 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_wcnss.c | 1 + drivers/rtc/rtc-wm8350.c | 11 +- drivers/scsi/aha152x.c | 6 +- drivers/scsi/bfa/bfad_attr.c | 26 ++-- 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_def.h | 4 + drivers/scsi/qla2xxx/qla_gs.c | 5 +- drivers/scsi/qla2xxx/qla_init.c | 40 ++++- drivers/scsi/qla2xxx/qla_isr.c | 1 + drivers/scsi/qla2xxx/qla_target.c | 1 + drivers/scsi/zorro7xx.c | 2 + drivers/soc/ti/wkup_m3_ipc.c | 4 +- drivers/spi/spi-bcm-qspi.c | 4 +- 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/thermal/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 | 2 +- drivers/usb/host/xhci-mem.c | 2 +- drivers/usb/host/xhci.c | 20 ++- drivers/usb/host/xhci.h | 7 +- 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/video/fbdev/atafb.c | 12 +- 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/gc.c | 4 +- fs/fuse/dev.c | 12 +- fs/fuse/file.c | 1 + fs/fuse/fuse_i.h | 2 + fs/gfs2/rgrp.c | 3 +- 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/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/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/sock.h | 25 ++- include/net/xfrm.h | 11 +- include/uapi/linux/bpf.h | 4 +- init/main.c | 6 +- kernel/cgroup/cgroup-internal.h | 19 +++ kernel/cgroup/cgroup-v1.c | 33 ++-- kernel/cgroup/cgroup.c | 81 +++++++--- kernel/dma/debug.c | 4 +- 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/raid6/test/Makefile | 4 +- lib/raid6/test/test.c | 1 - lib/test_kmod.c | 1 + 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/bluetooth/hci_event.c | 3 +- net/can/raw.c | 2 +- net/ipv4/arp.c | 9 +- net/ipv4/fib_frontend.c | 5 +- net/ipv4/raw.c | 2 +- net/ipv4/tcp_output.c | 5 +- net/ipv6/raw.c | 2 +- net/ipv6/xfrm6_output.c | 16 ++ net/key/af_key.c | 6 +- net/netfilter/nf_conntrack_proto_tcp.c | 17 ++- net/netlink/af_netlink.c | 2 + net/openvswitch/actions.c | 2 +- net/openvswitch/flow_netlink.c | 8 +- net/packet/af_packet.c | 6 +- net/rxrpc/net_ns.c | 2 +- net/smc/smc_core.c | 2 +- net/sunrpc/sched.c | 4 +- net/sunrpc/xprt.c | 7 + net/sunrpc/xprtrdma/transport.c | 4 +- net/x25/af_x25.c | 11 +- net/xfrm/xfrm_interface.c | 5 +- net/xfrm/xfrm_policy.c | 32 ++-- net/xfrm/xfrm_user.c | 18 ++- 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 | 4 +- sound/soc/atmel/atmel_ssc_dai.c | 5 +- sound/soc/atmel/sam9g20_wm8731.c | 1 + sound/soc/codecs/msm8916-wcd-digital.c | 5 +- sound/soc/codecs/rt5663.c | 2 + sound/soc/codecs/wm8350.c | 28 +++- sound/soc/davinci/davinci-i2s.c | 5 +- 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-core.c | 2 +- sound/soc/soc-generic-dmaengine-pcm.c | 6 +- sound/soc/soc-topology.c | 3 +- sound/spi/at73c213.c | 27 +++- tools/build/feature/Makefile | 9 +- tools/include/uapi/linux/bpf.h | 4 +- tools/perf/Makefile.config | 3 + tools/testing/selftests/bpf/test_lirc_mode2.sh | 5 +- tools/testing/selftests/cgroup/cgroup_util.c | 2 +- tools/testing/selftests/cgroup/test_core.c | 167 +++++++++++++++++++++ tools/testing/selftests/x86/check_cc.sh | 2 +- virt/kvm/kvm_main.c | 13 ++ 360 files changed, 2494 insertions(+), 1147 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/338 USB: serial: pl2303: add IBM device IDs
From: 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 2/338 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
@@ -65,6 +65,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 3/338 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
@@ -16,6 +16,7 @@ config HYPERV_TSCPAGE 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 4.19 003/338] 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_TSCPAGE · line 21
Quoted 6 lines
drivers/hv/Kconfig +1
-0@@ -16,6 +16,7 @@ config HYPERV_TSCPAGE 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.
Please drop this one also. PTP_1588_CLOCK_OPTIONAL is not present in 4.x kernels.
Sorry for the problem.
Signature · 1 line
~Randy
Greg Kroah-Hartman
maintainerPATCH 4/338 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
@@ -3674,7 +3674,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); }/**
@@ -3685,7 +3686,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 5/338 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
@@ -142,6 +142,19 @@ static int __xfrm6_output_finish(struct net *net, struct sock *sk, struct sk_bufreturn x->outer_mode->afinfo->output_finish (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);
@@ -170,6 +183,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 6/338 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
@@ -1985,6 +1985,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 7/338 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 8/338 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
@@ -779,10 +779,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 9/338 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 10/338 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
@@ -779,10 +779,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 11/338 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
@@ -1709,7 +1709,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 12/338 fuse: fix pipe buffer lifetime for direct_io
In reply to Greg Kroah-HartmanFrom: Miklos Szeredi <[email protected]>
commit 0c4bcfdecb1ac0967619ee7ff44871d93c08c909 upstream.
In FOPEN_DIRECT_IO mode, fuse_file_write_iter() calls fuse_direct_write_iter(), which normally calls fuse_direct_io(), which then imports the write buffer with fuse_get_user_pages(), which uses iov_iter_get_pages() to grab references to userspace pages instead of actually copying memory.
On the filesystem device side, these pages can then either be read to userspace (via fuse_dev_read()), or splice()d over into a pipe using fuse_dev_splice_read() as pipe buffers with &nosteal_pipe_buf_ops.
This is wrong because after fuse_dev_do_read() unlocks the FUSE request, the userspace filesystem can mark the request as completed, causing write() to return. At that point, the userspace filesystem should no longer have access to the pipe buffer.
Fix by copying pages coming from the user address space to new pipe buffers.
--- fs/fuse/dev.c | 12 +++++++++++- fs/fuse/file.c | 1 + fs/fuse/fuse_i.h | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-)
fs/fuse/dev.c +11 -1
@@ -999,7 +999,17 @@ static int fuse_copy_page(struct fuse_cowhile (count) {if (cs->write && cs->pipebufs && page) { -return fuse_ref_page (cs, page, offset, count); +/* +* Can't control lifetime of pipe buffers, so always +* copy user pages. +*/ +if (cs->req->user_pages) { + err =fuse_copy_fill (cs); +if (err) +return err; + }else { +return fuse_ref_page (cs, page, offset, count); + } }else if (!cs->len) {if (cs->move_pages && page && offset ==0 && count ==PAGE_SIZE ) {
fs/fuse/file.c +1 -0
@@ -1329,6 +1329,7 @@ static int fuse_get_user_pages(struct fu (PAGE_SIZE - ret) & (PAGE_SIZE -1 ); } + req->user_pages = true;if (write) req->in.argpages =1 ;else
fs/fuse/fuse_i.h +2 -0
@@ -313,6 +313,8 @@ struct fuse_req {/** refcount */ refcount_t count; +bool user_pages; +/** Unique ID for the interrupt request */ u64 intr_unique;
Greg Kroah-Hartman
maintainerPATCH 13/338 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
@@ -163,14 +163,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.
@@ -234,7 +226,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;
@@ -242,39 +233,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) {
@@ -286,7 +258,6 @@ struct tpm_chip *tpm_chip_alloc(struct dreturn chip; out: -put_device (&chip->devs);put_device (&chip->dev);return ERR_PTR (rc); }
@@ -335,14 +306,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. */
@@ -350,6 +316,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; }
@@ -508,7 +478,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
@@ -605,6 +605,8 @@ int tpm2_prepare_space(struct tpm_chip * u8 *cmd);int tpm2_commit_space (struct tpm_chip *chip,struct tpm_space *space,u32 cc,u8 *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 14/338 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
@@ -56,6 +56,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 );#define BLK_RL_SYNCFULL (1U << 0)
Greg Kroah-Hartman
maintainerPATCH 15/338 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
@@ -849,9 +849,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 16/338 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
@@ -236,36 +236,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 */
@@ -436,9 +433,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; */
@@ -601,7 +598,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);
@@ -621,7 +618,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);
@@ -640,9 +637,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 ;
@@ -692,7 +689,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 */
@@ -732,7 +729,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 */
@@ -1454,7 +1451,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);
@@ -1474,7 +1471,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);
@@ -1493,7 +1490,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 ;
@@ -1648,7 +1645,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" );
@@ -1749,7 +1746,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" );
@@ -1857,12 +1854,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 ) {
@@ -2074,6 +2071,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" );
@@ -2098,15 +2096,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;
@@ -2167,17 +2166,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 ;
@@ -2199,14 +2198,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 ;
@@ -2305,14 +2304,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;
@@ -2376,7 +2375,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);
@@ -2388,17 +2386,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);
@@ -2410,10 +2407,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 17/338 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
@@ -670,7 +670,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
@@ -2595,7 +2595,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);for (i =0 ; i <2 ; i++) { xhci->bus_state[i].port_c_suspend =0 ;
@@ -731,7 +729,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);
@@ -784,7 +782,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);
@@ -1162,7 +1160,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;
@@ -5190,7 +5188,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
@@ -226,6 +226,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)
@@ -2057,11 +2060,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 18/338 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
@@ -367,8 +367,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 19/338 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 20/338 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
@@ -612,7 +612,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 21/338 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
@@ -603,10 +603,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 22/338 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
@@ -591,13 +591,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 23/338 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
@@ -33,6 +33,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 24/338 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
@@ -364,6 +364,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)
@@ -375,8 +395,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 ;
@@ -649,22 +677,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 25/338 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 26/338 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 27/338 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
@@ -1545,7 +1545,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 28/338 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
@@ -228,7 +228,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 29/338 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
@@ -509,6 +509,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 30/338 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
@@ -589,8 +589,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 31/338 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 32/338 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
@@ -835,7 +835,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 33/338 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
@@ -597,8 +597,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 34/338 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 35/338 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 36/338 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
@@ -6855,10 +6855,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 37/338 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
@@ -3416,11 +3416,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 38/338 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
@@ -732,7 +732,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 ;
@@ -748,8 +747,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);
@@ -763,10 +761,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 39/338 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
@@ -216,7 +216,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 40/338 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
@@ -4709,6 +4709,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 41/338 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
@@ -3002,12 +3002,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);
@@ -3024,6 +3028,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 ; }
@@ -5140,6 +5151,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 ;
@@ -5155,13 +5172,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 42/338 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
@@ -2118,12 +2118,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 43/338 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
@@ -559,7 +559,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))
@@ -575,9 +575,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 44/338 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
@@ -3400,8 +3400,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 45/338 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
@@ -3416,14 +3416,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 46/338 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
@@ -207,7 +207,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 47/338 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
@@ -680,7 +680,7 @@ static void kvm_use_magic_page(void)on_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 48/338 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
@@ -618,7 +618,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 49/338 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 50/338 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 | 12 ++++++++++++ include/linux/blk-cgroup.h | 17 +++++++++++++++++ 2 files changed, 29 insertions(+)
block/blk-merge.c +12 -0
@@ -7,6 +7,8 @@#include <linux/bio.h> #include <linux/blkdev.h> #include <linux/scatterlist.h> +#include <linux/blkdev.h> +#include <linux/blk-cgroup.h> #include <trace/events/block.h>
@@ -486,6 +488,9 @@ static inline int ll_new_hw_segment(struif (req->nr_phys_segments + nr_phys_segs >queue_max_segments (q)) goto no_merge; +if (!blk_cgroup_mergeable (req, bio)) + goto no_merge; +if (blk_integrity_merge_bio (q, req, bio) == false) goto no_merge;
@@ -609,6 +614,9 @@ static int ll_merge_requests_fn(struct rif (total_phys_segments >queue_max_segments (q))return 0 ; +if (!blk_cgroup_mergeable (req, next->bio)) +return 0 ; +if (blk_integrity_merge_rq (q, req, next) == false)return 0 ;
@@ -843,6 +851,10 @@ bool blk_rq_merge_ok(struct request *rq,if (rq->rq_disk != bio->bi_disk ||req_no_special_merge (rq))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
@@ -21,6 +21,7 @@#include <linux/blkdev.h> #include <linux/atomic.h> #include <linux/kthread.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)
@@ -844,6 +845,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);
@@ -947,6 +963,7 @@ static inline struct request_list *blk_rstatic 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 51/338 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
@@ -4323,7 +4323,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 52/338 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 53/338 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
@@ -1713,9 +1713,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 ));
@@ -2001,9 +2001,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 54/338 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
@@ -1125,7 +1125,7 @@ pmecc: ecc-engine@f8014070 { compatible = "atmel,sama5d2-pmecc"; reg = <0xf8014070 0x490>, - <0xf8014500 0x100>; + <0xf8014500 0x200>; }; };
Greg Kroah-Hartman
maintainerPATCH 55/338 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 56/338 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
@@ -116,6 +116,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 57/338 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
@@ -131,6 +131,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 58/338 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
@@ -1922,7 +1922,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 59/338 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/int340x_thermal/int3400_thermal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/int340x_thermal/int3400_thermal.c +1 -1
@@ -53,7 +53,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 60/338 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
@@ -22,7 +22,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 61/338 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
@@ -5,4 +5,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
@@ -47,16 +47,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 62/338 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 63/338 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
@@ -217,6 +217,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 64/338 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
@@ -22,6 +22,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>
@@ -442,47 +443,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) {
@@ -1503,8 +1463,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);
@@ -1518,7 +1478,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 65/338 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
@@ -80,6 +80,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 66/338 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
@@ -751,8 +751,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 67/338 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
@@ -268,7 +268,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 68/338 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
@@ -328,7 +328,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 69/338 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
@@ -1136,6 +1136,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 70/338 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 71/338 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
@@ -72,14 +72,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;
@@ -103,8 +112,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 :
@@ -129,6 +139,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 72/338 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
@@ -2074,10 +2074,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;
@@ -2088,11 +2092,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 73/338 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
@@ -437,7 +437,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 74/338 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
@@ -1002,9 +1002,6 @@ void blk_unregister_queue(struct gendisk *disk)*/ if (q->mq_ops)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);
@@ -1015,6 +1012,11 @@ void blk_unregister_queue(struct gendisk *disk)if (q->request_fn || 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 75/338 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
@@ -1219,7 +1219,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 76/338 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
@@ -158,22 +158,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 77/338 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 78/338 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
@@ -1,7 +1,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 79/338 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
@@ -164,9 +164,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 80/338 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
@@ -82,7 +82,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
@@ -899,7 +899,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
@@ -215,7 +215,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 81/338 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
@@ -631,6 +631,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;
@@ -732,6 +746,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:
@@ -745,6 +760,7 @@ void ccp_dmaengine_unregister(struct ccp_device *ccp)struct dma_device *dma_dev = &ccp->dma_dev;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 82/338 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
@@ -291,6 +291,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
@@ -1337,7 +1337,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 83/338 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
@@ -230,8 +230,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 84/338 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
@@ -871,25 +871,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 85/338 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
@@ -9137,8 +9137,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 86/338 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 87/338 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
@@ -376,6 +376,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:if (vdoa_node)of_node_put (vdoa_node);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 88/338 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
@@ -1662,6 +1662,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 ) {
@@ -1672,8 +1673,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 89/338 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 90/338 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
@@ -135,7 +135,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 91/338 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
@@ -454,9 +454,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 92/338 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
@@ -3822,6 +3822,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 ;
@@ -3922,6 +3924,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 &&
@@ -3976,12 +3980,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 93/338 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
@@ -512,6 +512,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 (adapter,TLV320_ADDRESS >>1 );if (audio ==NULL )
@@ -540,11 +541,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 ;
@@ -608,7 +606,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 94/338 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
@@ -3463,6 +3463,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 95/338 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/davinci/davinci-i2s.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/davinci/davinci-i2s.c +4 -1
@@ -721,7 +721,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);
@@ -743,6 +745,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 96/338 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
@@ -221,7 +221,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 ; }
@@ -787,7 +789,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 );
@@ -900,7 +904,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) {
@@ -1019,7 +1025,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);
@@ -1099,9 +1107,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 97/338 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 98/338 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 99/338 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
@@ -127,8 +127,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:
@@ -147,7 +149,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 100/338 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
@@ -467,7 +467,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 101/338 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
@@ -296,7 +296,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 102/338 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
@@ -1517,7 +1517,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);
@@ -1551,7 +1551,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 103/338 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
@@ -1425,7 +1425,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 104/338 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 105/338 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
@@ -413,7 +413,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
@@ -269,7 +269,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);
@@ -317,7 +317,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" );
@@ -762,7 +762,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;
@@ -773,7 +773,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); }
@@ -783,7 +783,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
@@ -177,7 +177,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 106/338 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
@@ -225,6 +225,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.cpu_of_node = cpu_np;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 107/338 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
@@ -1538,18 +1538,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 108/338 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 109/338 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
@@ -254,6 +254,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 110/338 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 111/338 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
@@ -120,6 +120,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 112/338 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
@@ -93,6 +93,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 113/338 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
@@ -918,7 +918,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);
@@ -926,6 +926,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 114/338 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
@@ -1389,8 +1389,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 115/338 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
@@ -2122,7 +2122,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 116/338 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
@@ -235,14 +235,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
Greg Kroah-Hartman
maintainerPATCH 117/338 Bluetooth: hci_serdev: call init_rwsem() before p->open()
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
[ Upstream commit 9d7cbe2b9cf5f650067df4f402fdd799d4bbb4e1 ]
kvartet reported, that hci_uart_tx_wakeup() uses uninitialized rwsem. The problem was in wrong place for percpu_init_rwsem() call.
hci_uart_proto::open() may register a timer whose callback may call hci_uart_tx_wakeup(). There is a chance, that hci_uart_register_device() thread won't be fast enough to call percpu_init_rwsem().
Fix it my moving percpu_init_rwsem() call before p->open().
INFO: trying to register non-static key.
The code is fine but needs lockdep annotation, or maybe you didn't initialize this object before use? turning off the locking correctness validator.
CPU: 2 PID: 18524 Comm: syz-executor.5 Not tainted 5.16.0-rc6 #9 ... Call Trace: <IRQ> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0xcd/0x134 lib/dump_stack.c:106 assign_lock_key kernel/locking/lockdep.c:951 [inline] register_lock_class+0x148d/0x1950 kernel/locking/lockdep.c:1263 __lock_acquire+0x106/0x57e0 kernel/locking/lockdep.c:4906 lock_acquire kernel/locking/lockdep.c:5637 [inline] lock_acquire+0x1ab/0x520 kernel/locking/lockdep.c:5602 percpu_down_read_trylock include/linux/percpu-rwsem.h:92 [inline] hci_uart_tx_wakeup+0x12e/0x490 drivers/bluetooth/hci_ldisc.c:124 h5_timed_event+0x32f/0x6a0 drivers/bluetooth/hci_h5.c:188 call_timer_fn+0x1a5/0x6b0 kernel/time/timer.c:1421
--- drivers/bluetooth/hci_serdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/bluetooth/hci_serdev.c +2 -1
@@ -288,6 +288,8 @@ int hci_uart_register_device(struct hci_uart *hu,if (err)return err; +percpu_init_rwsem (&hu->proto_lock); + err = p->open (hu);if (err) goto err_open;
@@ -310,7 +312,6 @@ int hci_uart_register_device(struct hci_uart *hu,INIT_WORK (&hu->init_ready, hci_uart_init_work);INIT_WORK (&hu->write_work, hci_uart_write_work); -percpu_init_rwsem (&hu->proto_lock);/* Only when vendor specific setup callback is provided, consider * the manufacturer information valid. This avoids filling in the
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 118/338 mtd: onenand: Check for error irq
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 3e68f331c8c759c0daa31cc92c3449b23119a215 ]
For the possible failure of the platform_get_irq(), the returned irq could be error number and will finally cause the failure of the request_irq().
Consider that platform_get_irq() can now in certain cases return -EPROBE_DEFER, and the consequences of letting request_irq() effectively convert that into -EINVAL, even at probe time rather than later on. So it might be better to check just now.
--- drivers/mtd/nand/onenand/generic.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/mtd/nand/onenand/generic.c +6 -1
@@ -56,7 +56,12 @@ static int generic_onenand_probe(struct platform_device *pdev) } info->onenand.mmcontrol = pdata ? pdata->mmcontrol :NULL ; - info->onenand.irq =platform_get_irq (pdev,0 ); + + err =platform_get_irq (pdev,0 ); +if (err <0 ) + goto out_iounmap; + + info->onenand.irq = err; info->mtd.dev.parent = &pdev->dev; info->mtd.priv = &info->onenand;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 119/338 drm/edid: Dont clear formats if using deep color
In reply to Greg Kroah-HartmanFrom: Maxime Ripard <[email protected]>
[ Upstream commit 75478b3b393bcbdca4e6da76fe3a9f1a4133ec5d ]
The current code, when parsing the EDID Deep Color depths, that the YUV422 cannot be used, referring to the HDMI 1.3 Specification.
This specification, in its section 6.2.4, indeed states:
For each supported Deep Color mode, RGB 4:4:4 shall be supported and optionally YCBCR 4:4:4 may be supported.
YCBCR 4:2:2 is not permitted for any Deep Color mode.
This indeed can be interpreted like the code does, but the HDMI 1.4 specification further clarifies that statement in its section 6.2.4:
For each supported Deep Color mode, RGB 4:4:4 shall be supported and optionally YCBCR 4:4:4 may be supported.
YCBCR 4:2:2 is also 36-bit mode but does not require the further use of the Deep Color modes described in section 6.5.2 and 6.5.3.
This means that, even though YUV422 can be used with 12 bit per color, it shouldn't be treated as a deep color mode.
This is also broken with YUV444 if it's supported by the display, but DRM_EDID_HDMI_DC_Y444 isn't set. In such a case, the code will clear color_formats of the YUV444 support set previously in drm_parse_cea_ext(), but will not set it back.
Since the formats supported are already setup properly in drm_parse_cea_ext(), let's just remove the code modifying the formats in drm_parse_hdmi_deep_color_info()
--- drivers/gpu/drm/drm_edid.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/gpu/drm/drm_edid.c +0 -8
@@ -4502,16 +4502,8 @@ static void drm_parse_hdmi_deep_color_in connector->name, dc_bpc); info->bpc = dc_bpc; -/* -* Deep color support mandates RGB444 support for all video -* modes and forbids YCRCB422 support for all video modes per -* HDMI 1.3 spec. -*/ - info->color_formats =DRM_COLOR_FORMAT_RGB444 ; -/* YCRCB444 is optional according to spec. */ if (hdmi[6 ] &DRM_EDID_HDMI_DC_Y444 ) { - info->color_formats |=DRM_COLOR_FORMAT_YCRCB444 ;DRM_DEBUG ("%s: HDMI sink does YCRCB444 in deep color.\n" , connector->name); }
Greg Kroah-Hartman
maintainerPATCH 120/338 drm/amd/display: Fix a NULL pointer dereference in amdgpu_dm_connector_add_common_modes()
In reply to Greg Kroah-HartmanFrom: Zhou Qingyang <[email protected]>
[ Upstream commit 588a70177df3b1777484267584ef38ab2ca899a2 ]
In amdgpu_dm_connector_add_common_modes(), amdgpu_dm_create_common_mode() is assigned to mode and is passed to drm_mode_probed_add() directly after that. drm_mode_probed_add() passes &mode->head to list_add_tail(), and there is a dereference of it in list_add_tail() without recoveries, which could lead to NULL pointer dereference on failure of amdgpu_dm_create_common_mode().
Fix this by adding a NULL check of mode.
This bug was found by a static analyzer.
Builds with 'make allyesconfig' show no new warnings, and our static analyzer no longer warns about this code.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3 -0
@@ -3593,6 +3593,9 @@ static void amdgpu_dm_connector_add_common_modes(struct drm_encoder *encoder, mode =amdgpu_dm_create_common_mode (encoder, common_modes[i].name, common_modes[i].w, common_modes[i].h); +if (!mode) +continue ; +drm_mode_probed_add (connector, mode); amdgpu_dm_connector->num_modes++; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 121/338 ath9k_htc: fix uninit value bugs
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
[ Upstream commit d1e0df1c57bd30871dd1c855742a7c346dbca853 ]
Syzbot reported 2 KMSAN bugs in ath9k. All of them are caused by missing field initialization.
In htc_connect_service() svc_meta_len and pad are not initialized. Based on code it looks like in current skb there is no service data, so simply initialize svc_meta_len to 0.
htc_issue_send() does not initialize htc_frame_hdr::control array. Based on firmware code, it will initialize it by itself, so simply zero whole array to make KMSAN happy
Fail logs:
BUG: KMSAN: kernel-usb-infoleak in usb_submit_urb+0x6c1/0x2aa0 drivers/usb/core/urb.c:430 usb_submit_urb+0x6c1/0x2aa0 drivers/usb/core/urb.c:430 hif_usb_send_regout drivers/net/wireless/ath/ath9k/hif_usb.c:127 [inline] hif_usb_send+0x5f0/0x16f0 drivers/net/wireless/ath/ath9k/hif_usb.c:479 htc_issue_send drivers/net/wireless/ath/ath9k/htc_hst.c:34 [inline] htc_connect_service+0x143e/0x1960 drivers/net/wireless/ath/ath9k/htc_hst.c:275
...
Uninit was created at:
slab_post_alloc_hook mm/slab.h:524 [inline] slab_alloc_node mm/slub.c:3251 [inline] __kmalloc_node_track_caller+0xe0c/0x1510 mm/slub.c:4974 kmalloc_reserve net/core/skbuff.c:354 [inline] __alloc_skb+0x545/0xf90 net/core/skbuff.c:426 alloc_skb include/linux/skbuff.h:1126 [inline] htc_connect_service+0x1029/0x1960 drivers/net/wireless/ath/ath9k/htc_hst.c:258
...
Bytes 4-7 of 18 are uninitialized
Memory access of size 18 starts at ffff888027377e00
BUG: KMSAN: kernel-usb-infoleak in usb_submit_urb+0x6c1/0x2aa0 drivers/usb/core/urb.c:430 usb_submit_urb+0x6c1/0x2aa0 drivers/usb/core/urb.c:430 hif_usb_send_regout drivers/net/wireless/ath/ath9k/hif_usb.c:127 [inline] hif_usb_send+0x5f0/0x16f0 drivers/net/wireless/ath/ath9k/hif_usb.c:479 htc_issue_send drivers/net/wireless/ath/ath9k/htc_hst.c:34 [inline] htc_connect_service+0x143e/0x1960 drivers/net/wireless/ath/ath9k/htc_hst.c:275
...
Uninit was created at:
slab_post_alloc_hook mm/slab.h:524 [inline] slab_alloc_node mm/slub.c:3251 [inline] __kmalloc_node_track_caller+0xe0c/0x1510 mm/slub.c:4974 kmalloc_reserve net/core/skbuff.c:354 [inline] __alloc_skb+0x545/0xf90 net/core/skbuff.c:426 alloc_skb include/linux/skbuff.h:1126 [inline] htc_connect_service+0x1029/0x1960 drivers/net/wireless/ath/ath9k/htc_hst.c:258
...
Bytes 16-17 of 18 are uninitialized
Memory access of size 18 starts at ffff888027377e00
--- drivers/net/wireless/ath/ath9k/htc_hst.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wireless/ath/ath9k/htc_hst.c +5 -0
@@ -30,6 +30,7 @@ static int htc_issue_send(struct htc_target *target, struct sk_buff* skb, hdr->endpoint_id = epid; hdr->flags = flags; hdr->payload_len =cpu_to_be16 (len); +memset (hdr->control,0 ,sizeof (hdr->control)); status = target->hif->send (target->hif_dev, endpoint->ul_pipeid, skb);
@@ -274,6 +275,10 @@ int htc_connect_service(struct htc_target *target, conn_msg->dl_pipeid = endpoint->dl_pipeid; conn_msg->ul_pipeid = endpoint->ul_pipeid; +/* To prevent infoleak */ + conn_msg->svc_meta_len =0 ; + conn_msg->pad =0 ; + ret =htc_issue_send (target, skb, skb->len,0 ,ENDPOINT0 );if (ret) goto err;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 122/338 KVM: PPC: Fix vmx/vsx mixup in mmio emulation
In reply to Greg Kroah-HartmanFrom: Fabiano Rosas <[email protected]>
[ Upstream commit b99234b918c6e36b9aa0a5b2981e86b6bd11f8e2 ]
The MMIO emulation code for vector instructions is duplicated between VSX and VMX. When emulating VMX we should check the VMX copy size instead of the VSX one.
--- arch/powerpc/kvm/powerpc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/kvm/powerpc.c +2 -2
@@ -1479,7 +1479,7 @@ int kvmppc_handle_vmx_load(struct kvm_run *run, struct kvm_vcpu *vcpu, {enum emulation_result emulated =EMULATE_DONE ; -if (vcpu->arch.mmio_vsx_copy_nums >2 ) +if (vcpu->arch.mmio_vmx_copy_nums >2 )return EMULATE_FAIL ;while (vcpu->arch.mmio_vmx_copy_nums) {
@@ -1576,7 +1576,7 @@ int kvmppc_handle_vmx_store(struct kvm_run *run, struct kvm_vcpu *vcpu,unsigned int index = rs &KVM_MMIO_REG_MASK ;enum emulation_result emulated =EMULATE_DONE ; -if (vcpu->arch.mmio_vsx_copy_nums >2 ) +if (vcpu->arch.mmio_vmx_copy_nums >2 )return EMULATE_FAIL ; vcpu->arch.io_gpr = rs;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 123/338 power: reset: gemini-poweroff: Fix IRQ check in gemini_poweroff_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit ba18dad0fb880cd29aa97b6b75560ef14d1061ba ]
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/power/reset/gemini-poweroff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/power/reset/gemini-poweroff.c +2 -2
@@ -107,8 +107,8 @@ static int gemini_poweroff_probe(struct platform_device *pdev)return PTR_ERR (gpw->base); irq =platform_get_irq (pdev,0 ); -if (!irq) -return -EINVAL ; +if (irq <0 ) +return irq; gpw->dev = dev;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 124/338 ray_cs: Check ioremap return value
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 7e4760713391ee46dc913194b33ae234389a174e ]
As the possible failure of the ioremap(), the 'local->sram' and other two could be NULL.
Therefore it should be better to check it in order to avoid the later dev_dbg.
--- drivers/net/wireless/ray_cs.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/wireless/ray_cs.c +6 -0
@@ -394,6 +394,8 @@ static int ray_config(struct pcmcia_device *link) goto failed; local->sram =ioremap (link->resource[2 ]->start,resource_size (link->resource[2 ])); +if (!local->sram) + goto failed;/*** Set up 16k window for shared memory (receive buffer) ***************/ link->resource[3]->flags |=
@@ -408,6 +410,8 @@ static int ray_config(struct pcmcia_device *link) goto failed; local->rmem =ioremap (link->resource[3 ]->start,resource_size (link->resource[3 ])); +if (!local->rmem) + goto failed;/*** Set up window for attribute memory ***********************************/ link->resource[4]->flags |=
@@ -422,6 +426,8 @@ static int ray_config(struct pcmcia_device *link) goto failed; local->amem =ioremap (link->resource[4 ]->start,resource_size (link->resource[4 ])); +if (!local->amem) + goto failed;dev_dbg (&link->dev,"ray_config sram=%p\n" , local->sram);dev_dbg (&link->dev,"ray_config rmem=%p\n" , local->rmem);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 125/338 power: supply: ab8500: Fix memory leak in ab8500_fg_sysfs_init
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 6a4760463dbc6b603690938c468839985189ce0a ]
kobject_init_and_add() takes reference even when it fails. According to the doc of kobject_init_and_add():
If this function returns an error, kobject_put() must be called to properly clean up the memory associated with the object.
Fix memory leak by calling kobject_put().
--- drivers/power/supply/ab8500_fg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/power/supply/ab8500_fg.c +3 -1
@@ -2541,8 +2541,10 @@ static int ab8500_fg_sysfs_init(struct ab8500_fg *di) ret =kobject_init_and_add (&di->fg_kobject, &ab8500_fg_ktype,NULL ,"battery" ); -if (ret <0 ) +if (ret <0 ) { +kobject_put (&di->fg_kobject);dev_err (di->dev,"failed to create sysfs entry\n" ); + }return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 126/338 HID: i2c-hid: fix GET/SET_REPORT for unnumbered reports
In reply to Greg Kroah-HartmanFrom: Dmitry Torokhov <[email protected]>
[ Upstream commit a5e5e03e94764148a01757b2fa4737d3445c13a6 ]
Internally kernel prepends all report buffers, for both numbered and unnumbered reports, with report ID, therefore to properly handle unnumbered reports we should prepend it ourselves.
For the same reason we should skip the first byte of the buffer when calling i2c_hid_set_or_send_report() which then will take care of properly formatting the transfer buffer based on its separate report ID argument along with report payload.
--- drivers/hid/i2c-hid/i2c-hid-core.c | 32 ++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-)
drivers/hid/i2c-hid/i2c-hid-core.c +24 -8
@@ -632,6 +632,17 @@ static int i2c_hid_get_raw_report(struct hid_device *hid,if (report_type ==HID_OUTPUT_REPORT )return -EINVAL ; +/* +* In case of unnumbered reports the response from the device will +* not have the report ID that the upper layers expect, so we need +* to stash it the buffer ourselves and adjust the data size. +*/ +if (!report_number) { + buf[0 ] =0 ; + buf++; + count--; + } +/* +2 bytes to include the size of the reply in the query buffer */ ask_count =min (count +2 , (size_t )ihid->bufsize);
@@ -653,6 +664,9 @@ static int i2c_hid_get_raw_report(struct hid_device *hid, count =min (count, ret_count -2 );memcpy (buf, ihid->rawbuf +2 , count); +if (!report_number) + count++; +return count; }
@@ -669,17 +683,19 @@ static int i2c_hid_output_raw_report(struct hid_device *hid, __u8 *buf,mutex_lock (&ihid->reset_lock); -if (report_id) { - buf++; - count--; - } - +/* +* Note that both numbered and unnumbered reports passed here +* are supposed to have report ID stored in the 1st byte of the +* buffer, so we strip it off unconditionally before passing payload +* to i2c_hid_set_or_send_report which takes care of encoding +* everything properly. +*/ ret =i2c_hid_set_or_send_report (client, report_type ==HID_FEATURE_REPORT ?0x03 :0x02 , - report_id, buf, count, use_data); + report_id, buf +1 , count -1 , use_data); -if (report_id && ret >=0 ) - ret++;/* add report_id to the number of transfered bytes */ +if (ret >=0 ) + ret++;/* add report_id to the number of transferred bytes */ mutex_unlock (&ihid->reset_lock);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 127/338 iwlwifi: Fix -EIO error code that is never returned
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit c305c94bdc18e45b5ad1db54da4269f8cbfdff6b ]
Currently the error -EIO is being assinged to variable ret when the READY_BIT is not set but the function iwlagn_mac_start returns 0 rather than ret. Fix this by returning ret instead of 0.
Addresses-Coverity: ("Unused value")
--- drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c +1 -1
@@ -317,7 +317,7 @@ static int iwlagn_mac_start(struct ieee80211_hw *hw) priv->is_open =1 ;IWL_DEBUG_MAC80211 (priv,"leave\n" ); -return 0 ; +return ret; }static void iwlagn_mac_stop (struct ieee80211_hw *hw)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 128/338 dm crypt: fix get_key_size compiler warning if !CONFIG_KEYS
In reply to Greg Kroah-HartmanFrom: Aashish Sharma <[email protected]>
[ Upstream commit 6fc51504388c1a1a53db8faafe9fff78fccc7c87 ]
Explicitly convert unsigned int in the right of the conditional expression to int to match the left side operand and the return type, fixing the following compiler warning:
drivers/md/dm-crypt.c:2593:43: warning: signed and unsigned type in conditional expression [-Wsign-compare]
--- drivers/md/dm-crypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-crypt.c +1 -1
@@ -2107,7 +2107,7 @@ static int crypt_set_keyring_key(struct crypt_config *cc, const char *key_stringstatic int get_key_size (char **key_string) { -return (*key_string[0 ] ==':' ) ? -EINVAL :strlen (*key_string) >>1 ; +return (*key_string[0 ] ==':' ) ? -EINVAL : (int )(strlen (*key_string) >>1 ); }#endif
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 129/338 scsi: pm8001: Fix command initialization in pm80XX_send_read_log()
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
[ Upstream commit 1a37b6738b58d86f6b144b3fc754ace0f2e0166d ]
Since the sata_cmd struct is zeroed out before its fields are initialized, there is no need for using "|=" to initialize the ncqtag_atap_dir_m field. Using a standard assignment removes the sparse warning:
warning: invalid assignment: |=
Also, since the ncqtag_atap_dir_m field has type __le32, use cpu_to_le32() to generate the assigned value.
--- drivers/scsi/pm8001/pm8001_hwi.c | 2 +- drivers/scsi/pm8001/pm80xx_hwi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/pm8001/pm8001_hwi.c +1 -1
@@ -1826,7 +1826,7 @@ static void pm8001_send_read_log(struct pm8001_hba_info *pm8001_ha, sata_cmd.tag =cpu_to_le32 (ccb_tag); sata_cmd.device_id =cpu_to_le32 (pm8001_ha_dev->device_id); - sata_cmd.ncqtag_atap_dir_m |= ((0x1 <<7 ) | (0x5 <<9 )); + sata_cmd.ncqtag_atap_dir_m =cpu_to_le32 ((0x1 <<7 ) | (0x5 <<9 ));memcpy (&sata_cmd.sata_fis, &fis,sizeof (struct host_to_dev_fis )); res =pm8001_mpi_build_cmd (pm8001_ha, circularQ, opc, &sata_cmd,0 );
drivers/scsi/pm8001/pm80xx_hwi.c +1 -1
@@ -1516,7 +1516,7 @@ static void pm80xx_send_read_log(struct pm8001_hba_info *pm8001_ha, sata_cmd.tag =cpu_to_le32 (ccb_tag); sata_cmd.device_id =cpu_to_le32 (pm8001_ha_dev->device_id); - sata_cmd.ncqtag_atap_dir_m_dad |= ((0x1 <<7 ) | (0x5 <<9 )); + sata_cmd.ncqtag_atap_dir_m_dad =cpu_to_le32 (((0x1 <<7 ) | (0x5 <<9 )));memcpy (&sata_cmd.sata_fis, &fis,sizeof (struct host_to_dev_fis )); res =pm8001_mpi_build_cmd (pm8001_ha, circularQ, opc, &sata_cmd,0 );
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 130/338 scsi: pm8001: Fix command initialization in pm8001_chip_ssp_tm_req()
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
[ Upstream commit cd2268a180117aa8ebb23e090ba204324b2d0e93 ]
The ds_ads_m field of struct ssp_ini_tm_start_req has the type __le32. Assigning a value to it should thus use cpu_to_le32(). This fixes the sparse warning:
warning: incorrect type in assignment (different base types)
expected restricted __le32 [addressable] [assigned] [usertype] ds_ads_m got int
--- drivers/scsi/pm8001/pm8001_hwi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/pm8001/pm8001_hwi.c +1 -1
@@ -4727,7 +4727,7 @@ int pm8001_chip_ssp_tm_req(struct pm8001_hba_info *pm8001_ha,memcpy (sspTMCmd.lun, task->ssp_task.LUN,8 ); sspTMCmd.tag =cpu_to_le32 (ccb->ccb_tag);if (pm8001_ha->chip_id != chip_8001) - sspTMCmd.ds_ads_m =0x08 ; + sspTMCmd.ds_ads_m =cpu_to_le32 (0x08 ); circularQ = &pm8001_ha->inbnd_q_tbl[0 ]; ret =pm8001_mpi_build_cmd (pm8001_ha, circularQ, opc, &sspTMCmd,0 );return ret;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 131/338 scsi: pm8001: Fix payload initialization in pm80xx_set_thermal_config()
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
[ Upstream commit bb225b12dbcc82d53d637d10b8d70b64494f8c16 ]
The fields of the set_ctrl_cfg_req structure have the __le32 type, so use cpu_to_le32() to assign them. This removes the sparse warnings:
warning: incorrect type in assignment (different base types)
expected restricted __le32
got unsigned int
--- drivers/scsi/pm8001/pm80xx_hwi.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/scsi/pm8001/pm80xx_hwi.c +5 -3
@@ -881,9 +881,11 @@ pm80xx_set_thermal_config(struct pm8001_hba_info *pm8001_ha)else page_code =THERMAL_PAGE_CODE_8H ; - payload.cfg_pg[0 ] = (THERMAL_LOG_ENABLE <<9 ) | - (THERMAL_ENABLE <<8 ) | page_code; - payload.cfg_pg[1 ] = (LTEMPHIL <<24 ) | (RTEMPHIL <<8 ); + payload.cfg_pg[0 ] = +cpu_to_le32 ((THERMAL_LOG_ENABLE <<9 ) | + (THERMAL_ENABLE <<8 ) | page_code); + payload.cfg_pg[1 ] = +cpu_to_le32 ((LTEMPHIL <<24 ) | (RTEMPHIL <<8 )); rc =pm8001_mpi_build_cmd (pm8001_ha, circularQ, opc, &payload,0 );if (rc)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 132/338 scsi: pm8001: Fix abort all task initialization
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
[ Upstream commit 7f12845c8389855dbcc67baa068b6832dc4a396e ]
In pm80xx_send_abort_all(), the n_elem field of the ccb used is not initialized to 0. This missing initialization sometimes lead to the task completion path seeing the ccb with a non-zero n_elem resulting in the execution of invalid dma_unmap_sg() calls in pm8001_ccb_task_free(), causing a crash such as:
[ 197.676341] RIP: 0010:iommu_dma_unmap_sg+0x6d/0x280 [ 197.700204] RSP: 0018:ffff889bbcf89c88 EFLAGS: 00010012 [ 197.705485] RAX: dffffc0000000000 RBX: 0000000000000000 RCX: ffffffff83d0bda0 [ 197.712687] RDX: 0000000000000002 RSI: 0000000000000000 RDI: ffff88810dffc0d0 [ 197.719887] RBP: 0000000000000000 R08: 0000000000000000 R09: ffff8881c790098b [ 197.727089] R10: ffffed1038f20131 R11: 0000000000000001 R12: 0000000000000000 [ 197.734296] R13: ffff88810dffc0d0 R14: 0000000000000010 R15: 0000000000000000 [ 197.741493] FS: 0000000000000000(0000) GS:ffff889bbcf80000(0000) knlGS:0000000000000000 [ 197.749659] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 197.755459] CR2: 00007f16c1b42734 CR3: 0000000004814000 CR4: 0000000000350ee0 [ 197.762656] Call Trace: [ 197.765127] <IRQ> [ 197.767162] pm8001_ccb_task_free+0x5f1/0x820 [pm80xx] [ 197.772364] ? do_raw_spin_unlock+0x54/0x220 [ 197.776680] pm8001_mpi_task_abort_resp+0x2ce/0x4f0 [pm80xx] [ 197.782406] process_oq+0xe85/0x7890 [pm80xx] [ 197.786817] ? lock_acquire+0x194/0x490 [ 197.790697] ? handle_irq_event+0x10e/0x1b0 [ 197.794920] ? mpi_sata_completion+0x2d70/0x2d70 [pm80xx] [ 197.800378] ? __wake_up_bit+0x100/0x100 [ 197.804340] ? lock_is_held_type+0x98/0x110 [ 197.808565] pm80xx_chip_isr+0x94/0x130 [pm80xx] [ 197.813243] tasklet_action_common.constprop.0+0x24b/0x2f0 [ 197.818785] __do_softirq+0x1b5/0x82d [ 197.822485] ? do_raw_spin_unlock+0x54/0x220 [ 197.826799] __irq_exit_rcu+0x17e/0x1e0 [ 197.830678] irq_exit_rcu+0xa/0x20 [ 197.834114] common_interrupt+0x78/0x90 [ 197.840051] </IRQ> [ 197.844236] <TASK> [ 197.848397] asm_common_interrupt+0x1e/0x40
Avoid this issue by always initializing the ccb n_elem field to 0 in pm8001_send_abort_all(), pm8001_send_read_log() and pm80xx_send_abort_all().
--- drivers/scsi/pm8001/pm8001_hwi.c | 2 ++ drivers/scsi/pm8001/pm80xx_hwi.c | 1 + 2 files changed, 3 insertions(+)
drivers/scsi/pm8001/pm8001_hwi.c +2 -0
@@ -1748,6 +1748,7 @@ static void pm8001_send_abort_all(struct pm8001_hba_info *pm8001_ha, ccb->device = pm8001_ha_dev; ccb->ccb_tag = ccb_tag; ccb->task = task; + ccb->n_elem =0 ; circularQ = &pm8001_ha->inbnd_q_tbl[0 ];
@@ -1810,6 +1811,7 @@ static void pm8001_send_read_log(struct pm8001_hba_info *pm8001_ha, ccb->device = pm8001_ha_dev; ccb->ccb_tag = ccb_tag; ccb->task = task; + ccb->n_elem =0 ; pm8001_ha_dev->id |=NCQ_READ_LOG_FLAG ; pm8001_ha_dev->id |=NCQ_2ND_RLE_FLAG ;
drivers/scsi/pm8001/pm80xx_hwi.c +1 -0
@@ -1437,6 +1437,7 @@ static void pm80xx_send_abort_all(struct pm8001_hba_info *pm8001_ha, ccb->device = pm8001_ha_dev; ccb->ccb_tag = ccb_tag; ccb->task = task; + ccb->n_elem =0 ; circularQ = &pm8001_ha->inbnd_q_tbl[0 ];
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 133/338 TOMOYO: fix __setup handlers return values
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 39844b7e3084baecef52d1498b5fa81afa2cefa9 ]
__setup() handlers should return 1 if the parameter is handled. Returning 0 causes the entire string to be added to init's environment strings (limited to 32 strings), unnecessarily polluting it.
Using the documented strings "TOMOYO_loader=string1" and "TOMOYO_trigger=string2" causes an Unknown parameter message:
Unknown kernel command line parameters
"BOOT_IMAGE=/boot/bzImage-517rc5 TOMOYO_loader=string1 \
TOMOYO_trigger=string2", will be passed to user space.
and these strings are added to init's environment string space:
Run /sbin/init as init process
with arguments:
/sbin/init
with environment:
HOME=/
TERM=linux
BOOT_IMAGE=/boot/bzImage-517rc5
TOMOYO_loader=string1
TOMOYO_trigger=string2With this change, these __setup handlers act as expected, and init's environment is not polluted with these strings.
--- security/tomoyo/load_policy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
security/tomoyo/load_policy.c +2 -2
@@ -24,7 +24,7 @@ static const char *tomoyo_loader;static int __init tomoyo_loader_setup (char *str) { tomoyo_loader = str; -return 0 ; +return 1 ; }__setup ("TOMOYO_loader=" , tomoyo_loader_setup);
@@ -63,7 +63,7 @@ static const char *tomoyo_trigger;static int __init tomoyo_trigger_setup (char *str) { tomoyo_trigger = str; -return 0 ; +return 1 ; }__setup ("TOMOYO_trigger=" , tomoyo_trigger_setup);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 134/338 ext2: correct max file size computing
In reply to Greg Kroah-HartmanFrom: Zhang Yi <[email protected]>
[ Upstream commit 50b3a818991074177a56c87124c7a7bdf5fa4f67 ]
We need to calculate the max file size accurately if the total blocks that can address by block tree exceed the upper_limit. But this check is not correct now, it only compute the total data blocks but missing metadata blocks are needed. So in the case of "data blocks < upper_limit && total blocks > upper_limit", we will get wrong result. Fortunately, this case could not happen in reality, but it's confused and better to correct the computing.
bits data blocks metadatablocks upper_limit
10 16843020 66051 2147483647
11 134480396 263171 1073741823
12 1074791436 1050627 536870911 (*) 13 8594130956 4198403 268435455 (*) 14 68736258060 16785411 134217727 (*)
15 549822930956 67125251 67108863 (*)
16 4398314962956 268468227 33554431 (*)
[*] Need to calculate in depth.
--- fs/ext2/super.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/ext2/super.c +5 -1
@@ -780,8 +780,12 @@ static loff_t ext2_max_size(int bits) res +=1LL << (bits-2 ); res +=1LL << (2 *(bits-2 )); res +=1LL << (3 *(bits-2 )); +/* Compute how many metadata blocks are needed */ + meta_blocks =1 ; + meta_blocks +=1 + ppb; + meta_blocks +=1 + ppb + ppb * ppb;/* Does block tree limit file size? */ -if (res < upper_limit) +if (res + meta_blocks <= upper_limit) goto check_lfs; res = upper_limit;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 135/338 drm/tegra: Fix reference leak in tegra_dsi_ganged_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 221e3638feb8bc42143833c9a704fa89b6c366bb ]
The reference taken by 'of_find_device_by_node()' must be released when not needed anymore. Add put_device() call to fix this.
--- drivers/gpu/drm/tegra/dsi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/tegra/dsi.c +3 -1
@@ -1456,8 +1456,10 @@ static int tegra_dsi_ganged_probe(struct tegra_dsi *dsi) dsi->slave =platform_get_drvdata (gangster);of_node_put (np); -if (!dsi->slave) +if (!dsi->slave) { +put_device (&gangster->dev);return -EPROBE_DEFER ; + } dsi->slave->master = dsi; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 136/338 power: supply: bq24190_charger: Fix bq24190_vbus_is_enabled() wrong false return
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit f7731754fdce33dad19be746f647d6ac47c5d695 ]
The datasheet says that the BQ24190_REG_POC_CHG_CONFIG bits can have a value of either 10(0x2) or 11(0x3) for OTG (5V boost regulator) mode.
Sofar bq24190_vbus_is_enabled() was only checking for 10 but some BIOS-es uses 11 when enabling the regulator at boot.
Make bq24190_vbus_is_enabled() also check for 11 so that it does not wrongly returns false when the bits are set to 11.
--- drivers/power/supply/bq24190_charger.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/power/supply/bq24190_charger.c +6 -1
@@ -43,6 +43,7 @@#define BQ24190_REG_POC_CHG_CONFIG_DISABLE 0x0#define BQ24190_REG_POC_CHG_CONFIG_CHARGE 0x1#define BQ24190_REG_POC_CHG_CONFIG_OTG 0x2 +#define BQ24190_REG_POC_CHG_CONFIG_OTG_ALT 0x3#define BQ24190_REG_POC_SYS_MIN_MASK (BIT(3) | BIT(2) | BIT(1))#define BQ24190_REG_POC_SYS_MIN_SHIFT 1#define BQ24190_REG_POC_SYS_MIN_MIN 3000
@@ -568,7 +569,11 @@ static int bq24190_vbus_is_enabled(struct regulator_dev *dev)pm_runtime_mark_last_busy (bdi->dev);pm_runtime_put_autosuspend (bdi->dev); -return ret ? ret : val ==BQ24190_REG_POC_CHG_CONFIG_OTG ; +if (ret) +return ret; + +return (val ==BQ24190_REG_POC_CHG_CONFIG_OTG || + val ==BQ24190_REG_POC_CHG_CONFIG_OTG_ALT ); }static const struct regulator_ops bq24190_vbus_ops = {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 137/338 drm/bridge: cdns-dsi: Make sure to to create proper aliases for dt
In reply to Greg Kroah-HartmanFrom: Nishanth Menon <[email protected]>
[ Upstream commit ffb5c099aaa13ab7f73c29ea6ae26bce8d7575ae ]
Add MODULE_DEVICE_TABLE to the device tree table to create required aliases needed for module to be loaded with device tree based platform.
--- drivers/gpu/drm/bridge/cdns-dsi.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/bridge/cdns-dsi.c +1 -0
@@ -1604,6 +1604,7 @@ static const struct of_device_id cdns_dsi_of_match[] = { { .compatible = "cdns,dsi" }, { }, }; +MODULE_DEVICE_TABLE (of, cdns_dsi_of_match);static struct platform_driver cdns_dsi_platform_driver = { .probe = cdns_dsi_drm_probe,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 138/338 powerpc/Makefile: Dont pass -mcpu=powerpc64 when building 32-bit
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
[ Upstream commit 2863dd2db23e0407f6c50b8ba5c0e55abef894f1 ]
When CONFIG_GENERIC_CPU=y (true for all our defconfigs) we pass -mcpu=powerpc64 to the compiler, even when we're building a 32-bit kernel.
This happens because we have an ifdef CONFIG_PPC_BOOK3S_64/else block in the Makefile that was written before 32-bit supported GENERIC_CPU. Prior to that the else block only applied to 64-bit Book3E.
The GCC man page says -mcpu=powerpc64 "[specifies] a pure ... 64-bit big endian PowerPC ... architecture machine [type], with an appropriate, generic processor model assumed for scheduling purposes."
It's unclear how that interacts with -m32, which we are also passing, although obviously -m32 is taking precedence in some sense, as the 32-bit kernel only contains 32-bit instructions.
This was noticed by inspection, not via any bug reports, but it does affect code generation. Comparing before/after code generation, there are some changes to instruction scheduling, and the after case (with -mcpu=powerpc64 removed) the compiler seems more keen to use r8.
Fix it by making the else case only apply to Book3E 64, which excludes 32-bit.
--- arch/powerpc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/Makefile +1 -1
@@ -167,7 +167,7 @@ else CFLAGS-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=power7,$(call cc-option,-mtune=power5)) CFLAGS-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mcpu=power5,-mcpu=power4) endif -else +else ifdef CONFIG_PPC_BOOK3E_64 CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=powerpc64 endif
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 139/338 KVM: x86: Fix emulation in writing cr8
In reply to Greg Kroah-HartmanFrom: Zhenzhong Duan <[email protected]>
[ Upstream commit f66af9f222f08d5b11ea41c1bd6c07a0f12daa07 ]
In emulation of writing to cr8, one of the lowest four bits in TPR[3:0] is kept.
According to Intel SDM 10.8.6.1(baremetal scenario):
"APIC.TPR[bits 7:4] = CR8[bits 3:0], APIC.TPR[bits 3:0] = 0";
and SDM 28.3(use TPR shadow):
"MOV to CR8. The instruction stores bits 3:0 of its source operand into bits 7:4 of VTPR; the remainder of VTPR (bits 3:0 and bits 31:8) are cleared.";
and AMD's APM 16.6.4:
"Task Priority Sub-class (TPS)-Bits 3 : 0. The TPS field indicates the current sub-priority to be used when arbitrating lowest-priority messages. This field is written with zero when TPR is written using the architectural CR8 register.";
so in KVM emulated scenario, clear TPR[3:0] to make a consistent behavior as in other scenarios.
This doesn't impact evaluation and delivery of pending virtual interrupts because processor does not use the processor-priority sub-class to determine which interrupts to delivery and which to inhibit.
Sub-class is used by hardware to arbitrate lowest priority interrupts, but KVM just does a round-robin style delivery.
Message-Id: <[email protected]>
--- arch/x86/kvm/lapic.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
arch/x86/kvm/lapic.c +1 -4
@@ -2045,10 +2045,7 @@ void kvm_set_lapic_tscdeadline_msr(struct kvm_vcpu *vcpu, u64 data)void kvm_lapic_set_tpr (struct kvm_vcpu *vcpu,unsigned long cr8) { -struct kvm_lapic *apic = vcpu->arch.apic; - -apic_set_tpr (apic, ((cr8 &0x0f ) <<4 ) - | (kvm_lapic_get_reg (apic,APIC_TASKPRI ) &4 )); +apic_set_tpr (vcpu->arch.apic, (cr8 &0x0f ) <<4 ); }u64 kvm_lapic_get_cr8 (struct kvm_vcpu *vcpu)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 140/338 KVM: x86/emulator: Defer not-present segment check in __load_segment_descriptor()
In reply to Greg Kroah-HartmanFrom: Hou Wenlong <[email protected]>
[ Upstream commit ca85f002258fdac3762c57d12d5e6e401b6a41af ]
Per Intel's SDM on the "Instruction Set Reference", when loading segment descriptor, not-present segment check should be after all type and privilege checks. But the emulator checks it first, then #NP is triggered instead of #GP if privilege fails and segment is not present. Put not-present segment check after type and privilege checks in __load_segment_descriptor().
Message-Id: <52573c01d369f506cadcf7233812427cf7db81a7.1644292363.git.houwenlong.hwl@antgroup.com>
--- arch/x86/kvm/emulate.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
arch/x86/kvm/emulate.c +9 -5
@@ -1669,11 +1669,6 @@ static int __load_segment_descriptor(struct x86_emulate_ctxt *ctxt, goto exception; } -if (!seg_desc.p) { - err_vec = (seg ==VCPU_SREG_SS ) ?SS_VECTOR :NP_VECTOR ; - goto exception; - } - dpl = seg_desc.dpl;switch (seg) {
@@ -1713,6 +1708,10 @@ static int __load_segment_descriptor(struct x86_emulate_ctxt *ctxt,case VCPU_SREG_TR :if (seg_desc.s || (seg_desc.type !=1 && seg_desc.type !=9 )) goto exception; +if (!seg_desc.p) { + err_vec =NP_VECTOR ; + goto exception; + } old_desc = seg_desc; seg_desc.type |=2 ;/* busy */ ret = ctxt->ops->cmpxchg_emulated(ctxt, desc_addr, &old_desc, &seg_desc,
@@ -1737,6 +1736,11 @@ static int __load_segment_descriptor(struct x86_emulate_ctxt *ctxt,break ; } +if (!seg_desc.p) { + err_vec = (seg ==VCPU_SREG_SS ) ?SS_VECTOR :NP_VECTOR ; + goto exception; + } +if (seg_desc.s) {/* mark segment as accessed */ if (!(seg_desc.type &1 )) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 141/338 hv_balloon: rate-limit "Unhandled message" warning
In reply to Greg Kroah-HartmanFrom: Anssi Hannula <[email protected]>
[ Upstream commit 1d7286729aa616772be334eb908e11f527e1e291 ]
For a couple of times I have encountered a situation where
hv_balloon: Unhandled message: type: 12447
is being flooded over 1 million times per second with various values, filling the log and consuming cycles, making debugging difficult.
Add rate limiting to the message.
Most other Hyper-V drivers already have similar rate limiting in their message callbacks.
The cause of the floods in my case was probably fixed by 96d9d1fa5cd5 ("Drivers: hv: balloon: account for vmbus packet header in max_pkt_size").
--- drivers/hv/hv_balloon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hv/hv_balloon.c +1 -1
@@ -1548,7 +1548,7 @@ static void balloon_onchannelcallback(void *context)break ;default : -pr_warn ("Unhandled message: type: %d\n" , dm_hdr->type); +pr_warn_ratelimited ("Unhandled message: type: %d\n" , dm_hdr->type); } }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 142/338 i2c: xiic: Make bus names unique
In reply to Greg Kroah-HartmanFrom: Robert Hancock <[email protected]>
[ Upstream commit 1d366c2f9df8279df2adbb60471f86fc40a1c39e ]
This driver is for an FPGA logic core, so there can be arbitrarily many instances of the bus on a given system. Previously all of the I2C bus names were "xiic-i2c" which caused issues with lm_sensors when trying to map human-readable names to sensor inputs because it could not properly distinguish the busses, for example. Append the platform device name to the I2C bus name so it is unique between different instances.
--- drivers/i2c/busses/i2c-xiic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/i2c/busses/i2c-xiic.c +2 -1
@@ -724,7 +724,6 @@ static const struct i2c_adapter_quirks xiic_quirks = {static const struct i2c_adapter xiic_adapter = { .owner =THIS_MODULE , - .name =DRIVER_NAME , .class =I2C_CLASS_DEPRECATED , .algo = &xiic_algorithm, .quirks = &xiic_quirks,
@@ -761,6 +760,8 @@ static int xiic_i2c_probe(struct platform_device *pdev)i2c_set_adapdata (&i2c->adap, i2c); i2c->adap.dev.parent = &pdev->dev; i2c->adap.dev.of_node = pdev->dev.of_node; +snprintf (i2c->adap.name,sizeof (i2c->adap.name), +DRIVER_NAME " %s" , pdev->name);mutex_init (&i2c->lock);init_waitqueue_head (&i2c->wait);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 143/338 power: supply: wm8350-power: Handle error for wm8350_register_irq
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit b0b14b5ba11bec56fad344a4a0b2e16449cc8b94 ]
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 same code.
--- drivers/power/supply/wm8350_power.c | 96 ++++++++++++++++++++++++----- 1 file changed, 82 insertions(+), 14 deletions(-)
drivers/power/supply/wm8350_power.c +82 -14
@@ -411,44 +411,112 @@ static const struct power_supply_desc wm8350_usb_desc = {* Initialisation *********************************************************************/ -static void wm8350_init_charger (struct wm8350 *wm8350) +static int wm8350_init_charger (struct wm8350 *wm8350) { +int ret; +/* register our interest in charger events */ -wm8350_register_irq (wm8350,WM8350_IRQ_CHG_BAT_HOT , + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CHG_BAT_HOT , wm8350_charger_handler,0 ,"Battery hot" , wm8350); -wm8350_register_irq (wm8350,WM8350_IRQ_CHG_BAT_COLD , +if (ret) + goto err; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CHG_BAT_COLD , wm8350_charger_handler,0 ,"Battery cold" , wm8350); -wm8350_register_irq (wm8350,WM8350_IRQ_CHG_BAT_FAIL , +if (ret) + goto free_chg_bat_hot; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CHG_BAT_FAIL , wm8350_charger_handler,0 ,"Battery fail" , wm8350); -wm8350_register_irq (wm8350,WM8350_IRQ_CHG_TO , +if (ret) + goto free_chg_bat_cold; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CHG_TO , wm8350_charger_handler,0 ,"Charger timeout" , wm8350); -wm8350_register_irq (wm8350,WM8350_IRQ_CHG_END , +if (ret) + goto free_chg_bat_fail; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CHG_END , wm8350_charger_handler,0 ,"Charge end" , wm8350); -wm8350_register_irq (wm8350,WM8350_IRQ_CHG_START , +if (ret) + goto free_chg_to; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CHG_START , wm8350_charger_handler,0 ,"Charge start" , wm8350); -wm8350_register_irq (wm8350,WM8350_IRQ_CHG_FAST_RDY , +if (ret) + goto free_chg_end; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CHG_FAST_RDY , wm8350_charger_handler,0 ,"Fast charge ready" , wm8350); -wm8350_register_irq (wm8350,WM8350_IRQ_CHG_VBATT_LT_3P9 , +if (ret) + goto free_chg_start; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CHG_VBATT_LT_3P9 , wm8350_charger_handler,0 ,"Battery <3.9V" , wm8350); -wm8350_register_irq (wm8350,WM8350_IRQ_CHG_VBATT_LT_3P1 , +if (ret) + goto free_chg_fast_rdy; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CHG_VBATT_LT_3P1 , wm8350_charger_handler,0 ,"Battery <3.1V" , wm8350); -wm8350_register_irq (wm8350,WM8350_IRQ_CHG_VBATT_LT_2P85 , +if (ret) + goto free_chg_vbatt_lt_3p9; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_CHG_VBATT_LT_2P85 , wm8350_charger_handler,0 ,"Battery <2.85V" , wm8350); +if (ret) + goto free_chg_vbatt_lt_3p1;/* and supply change events */ -wm8350_register_irq (wm8350,WM8350_IRQ_EXT_USB_FB , + ret =wm8350_register_irq (wm8350,WM8350_IRQ_EXT_USB_FB , wm8350_charger_handler,0 ,"USB" , wm8350); -wm8350_register_irq (wm8350,WM8350_IRQ_EXT_WALL_FB , +if (ret) + goto free_chg_vbatt_lt_2p85; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_EXT_WALL_FB , wm8350_charger_handler,0 ,"Wall" , wm8350); -wm8350_register_irq (wm8350,WM8350_IRQ_EXT_BAT_FB , +if (ret) + goto free_ext_usb_fb; + + ret =wm8350_register_irq (wm8350,WM8350_IRQ_EXT_BAT_FB , wm8350_charger_handler,0 ,"Battery" , wm8350); +if (ret) + goto free_ext_wall_fb; + +return 0 ; + +free_ext_wall_fb: +wm8350_free_irq (wm8350,WM8350_IRQ_EXT_WALL_FB , wm8350); +free_ext_usb_fb: +wm8350_free_irq (wm8350,WM8350_IRQ_EXT_USB_FB , wm8350); +free_chg_vbatt_lt_2p85: +wm8350_free_irq (wm8350,WM8350_IRQ_CHG_VBATT_LT_2P85 , wm8350); +free_chg_vbatt_lt_3p1: +wm8350_free_irq (wm8350,WM8350_IRQ_CHG_VBATT_LT_3P1 , wm8350); +free_chg_vbatt_lt_3p9: +wm8350_free_irq (wm8350,WM8350_IRQ_CHG_VBATT_LT_3P9 , wm8350); +free_chg_fast_rdy: +wm8350_free_irq (wm8350,WM8350_IRQ_CHG_FAST_RDY , wm8350); +free_chg_start: +wm8350_free_irq (wm8350,WM8350_IRQ_CHG_START , wm8350); +free_chg_end: +wm8350_free_irq (wm8350,WM8350_IRQ_CHG_END , wm8350); +free_chg_to: +wm8350_free_irq (wm8350,WM8350_IRQ_CHG_TO , wm8350); +free_chg_bat_fail: +wm8350_free_irq (wm8350,WM8350_IRQ_CHG_BAT_FAIL , wm8350); +free_chg_bat_cold: +wm8350_free_irq (wm8350,WM8350_IRQ_CHG_BAT_COLD , wm8350); +free_chg_bat_hot: +wm8350_free_irq (wm8350,WM8350_IRQ_CHG_BAT_HOT , wm8350); +err: +return ret; }static void free_charger_irq (struct wm8350 *wm8350)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 144/338 power: supply: wm8350-power: Add missing free in free_charger_irq
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 6dee930f6f6776d1e5a7edf542c6863b47d9f078 ]
In free_charger_irq(), there is no free for 'WM8350_IRQ_CHG_FAST_RDY'. Therefore, it should be better to add it in order to avoid the memory leak.
--- drivers/power/supply/wm8350_power.c | 1 + 1 file changed, 1 insertion(+)
drivers/power/supply/wm8350_power.c +1 -0
@@ -527,6 +527,7 @@ static void free_charger_irq(struct wm8350 *wm8350)wm8350_free_irq (wm8350,WM8350_IRQ_CHG_TO , wm8350);wm8350_free_irq (wm8350,WM8350_IRQ_CHG_END , wm8350);wm8350_free_irq (wm8350,WM8350_IRQ_CHG_START , wm8350); +wm8350_free_irq (wm8350,WM8350_IRQ_CHG_FAST_RDY , wm8350);wm8350_free_irq (wm8350,WM8350_IRQ_CHG_VBATT_LT_3P9 , wm8350);wm8350_free_irq (wm8350,WM8350_IRQ_CHG_VBATT_LT_3P1 , wm8350);wm8350_free_irq (wm8350,WM8350_IRQ_CHG_VBATT_LT_2P85 , wm8350);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 145/338 PCI: Reduce warnings on possible RW1C corruption
In reply to Greg Kroah-HartmanFrom: Mark Tomlinson <[email protected]>
[ Upstream commit 92c45b63ce22c8898aa41806e8d6692bcd577510 ]
For hardware that only supports 32-bit writes to PCI there is the possibility of clearing RW1C (write-one-to-clear) bits. A rate-limited messages was introduced by fb2659230120, but rate-limiting is not the best choice here. Some devices may not show the warnings they should if another device has just produced a bunch of warnings. Also, the number of messages can be a nuisance on devices which are otherwise working fine.
Change the ratelimit to a single warning per bus. This ensures no bus is 'starved' of emitting a warning and also that there isn't a continuous stream of warnings. It would be preferable to have a warning per device, but the pci_dev structure is not available here, and a lookup from devfn would be far too slow.
--- drivers/pci/access.c | 9 ++++++--- include/linux/pci.h | 1 + 2 files changed, 7 insertions(+), 3 deletions(-)
drivers/pci/access.c +6 -3
@@ -160,9 +160,12 @@ int pci_generic_config_write32(struct pci_bus *bus, unsigned int devfn,* write happen to have any RW1C (write-one-to-clear) bits set, we * just inadvertently cleared something we shouldn't have. */ -dev_warn_ratelimited (&bus->dev,"%d-byte config write to %04x:%02x:%02x.%d offset %#x may corrupt adjacent RW1C bits\n" , - size,pci_domain_nr (bus), bus->number, -PCI_SLOT (devfn),PCI_FUNC (devfn), where); +if (!bus->unsafe_warn) { +dev_warn (&bus->dev,"%d-byte config write to %04x:%02x:%02x.%d offset %#x may corrupt adjacent RW1C bits\n" , + size,pci_domain_nr (bus), bus->number, +PCI_SLOT (devfn),PCI_FUNC (devfn), where); + bus->unsafe_warn =1 ; + } mask = ~(((1 << (size *8 )) -1 ) << ((where &0x3 ) *8 )); tmp =readl (addr) & mask;
include/linux/pci.h +1 -0
@@ -581,6 +581,7 @@ struct pci_bus {struct bin_attribute *legacy_io;/* Legacy I/O for this bus */ struct bin_attribute *legacy_mem;/* Legacy mem */ unsigned int is_added:1; + unsigned int unsafe_warn:1; /* warned about RW1C config write */ };#define to_pci_bus (n) container_of(n, struct pci_bus, dev)
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 146/338 powerpc/sysdev: fix incorrect use to determine if list is empty
In reply to Greg Kroah-HartmanFrom: Jakob Koschel <[email protected]>
[ Upstream commit fa1321b11bd01752f5be2415e74a0e1a7c378262 ]
'gtm' will *always* be set by list_for_each_entry().
It is incorrect to assume that the iterator value will be NULL if the list is empty.
Instead of checking the pointer it should be checked if the list is empty.
--- arch/powerpc/sysdev/fsl_gtm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/sysdev/fsl_gtm.c +2 -2
@@ -90,7 +90,7 @@ static LIST_HEAD(gtms);*/ struct gtm_timer *gtm_get_timer16 (void ) { -struct gtm *gtm =NULL ; +struct gtm *gtm;int i;list_for_each_entry (gtm, >ms, list_node) {
@@ -107,7 +107,7 @@ struct gtm_timer *gtm_get_timer16(void)spin_unlock_irq (>m->lock); } -if (gtm) +if (!list_empty (>ms))return ERR_PTR (-EBUSY );return ERR_PTR (-ENODEV ); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 147/338 mfd: mc13xxx: Add check for mc13xxx_irq_request
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit e477e51a41cb5d6034f3c5ea85a71ad4613996b9 ]
As the potential failure of the devm_request_threaded_irq(), it should be better to check the return value of the mc13xxx_irq_request() and return error if fails.
--- drivers/mfd/mc13xxx-core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mfd/mc13xxx-core.c +3 -1
@@ -326,8 +326,10 @@ int mc13xxx_adc_do_conversion(struct mc13xxx *mc13xxx, unsigned int mode, adc1 |=MC13783_ADC1_ATOX ;dev_dbg (mc13xxx->dev,"%s: request irq\n" , __func__); -mc13xxx_irq_request (mc13xxx,MC13XXX_IRQ_ADCDONE , + ret =mc13xxx_irq_request (mc13xxx,MC13XXX_IRQ_ADCDONE , mc13xxx_handler_adcdone, __func__, &adcdone_data); +if (ret) + goto out;mc13xxx_reg_write (mc13xxx,MC13XXX_ADC0 , adc0);mc13xxx_reg_write (mc13xxx,MC13XXX_ADC1 , adc1);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 148/338 vxcan: enable local echo for sent CAN frames
In reply to Greg Kroah-HartmanFrom: Oliver Hartkopp <[email protected]>
[ Upstream commit 259bdba27e32368b4404f69d613b1c1014c07cbf ]
The vxcan driver provides a pair of virtual CAN interfaces to exchange CAN traffic between different namespaces - analogue to veth.
In opposite to the vcan driver the local sent CAN traffic on this interface is not echo'ed back but only sent to the remote peer. This is unusual and can be easily fixed by removing IFF_ECHO from the netdevice flags that are set for vxcan interfaces by default at startup.
Without IFF_ECHO set on driver level, the local sent CAN frames are echo'ed in af_can.c in can_send(). This patch makes vxcan interfaces adopt the same local echo behavior and procedures as known from the vcan interfaces.
--- drivers/net/can/vxcan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/can/vxcan.c +1 -1
@@ -156,7 +156,7 @@ static void vxcan_setup(struct net_device *dev) dev->hard_header_len =0 ; dev->addr_len =0 ; dev->tx_queue_len =0 ; - dev->flags = (IFF_NOARP |IFF_ECHO ); + dev->flags =IFF_NOARP ; dev->netdev_ops = &vxcan_netdev_ops; dev->needs_free_netdev = true; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 149/338 MIPS: RB532: fix return value of __setup handler
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 8755d57ba1ff910666572fab9e32890e8cc6ed3b ]
__setup() handlers should return 1 to obsolete_checksetup() in init/main.c to indicate that the boot option has been handled. A return of 0 causes the boot option/value to be listed as an Unknown kernel parameter and added to init's (limited) argument or environment strings. Also, error return codes don't mean anything to obsolete_checksetup() -- only non-zero (usually 1) or zero. So return 1 from setup_kmac().
From: Igor Zhbanov <[email protected]>
--- arch/mips/rb532/devices.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
arch/mips/rb532/devices.c +2 -4
@@ -315,11 +315,9 @@ static int __init plat_setup_devices(void)static int __init setup_kmac (char *s) {printk (KERN_INFO "korina mac = %s\n" , s); -if (!mac_pton (s, korina_dev0_data.mac)) { +if (!mac_pton (s, korina_dev0_data.mac))printk (KERN_ERR "Invalid mac\n" ); -return -EINVAL ; - } -return 0 ; +return 1 ; }__setup ("kmac=" , setup_kmac);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 150/338 mtd: rawnand: atmel: fix refcount issue in atmel_nand_controller_init
In reply to Greg Kroah-HartmanFrom: Xin Xiong <[email protected]>
[ Upstream commit fecbd4a317c95d73c849648c406bcf1b6a0ec1cf ]
The reference counting issue happens in several error handling paths on a refcounted object "nc->dmac". In these paths, the function simply returns the error code, forgetting to balance the reference count of "nc->dmac", increased earlier by dma_request_channel(), which may cause refcount leaks.
Fix it by decrementing the refcount of specific object in those error paths.
--- drivers/mtd/nand/raw/atmel/nand-controller.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/mtd/nand/raw/atmel/nand-controller.c +11 -3
@@ -1984,13 +1984,15 @@ static int atmel_nand_controller_init(struct atmel_nand_controller *nc, nc->mck =of_clk_get (dev->parent->of_node,0 );if (IS_ERR (nc->mck)) {dev_err (dev,"Failed to retrieve MCK clk\n" ); -return PTR_ERR (nc->mck); + ret =PTR_ERR (nc->mck); + goto out_release_dma; } np =of_parse_phandle (dev->parent->of_node,"atmel,smc" ,0 );if (!np) {dev_err (dev,"Missing or invalid atmel,smc property\n" ); -return -EINVAL ; + ret = -EINVAL ; + goto out_release_dma; } nc->smc =syscon_node_to_regmap (np);
@@ -1998,10 +2000,16 @@ static int atmel_nand_controller_init(struct atmel_nand_controller *nc,if (IS_ERR (nc->smc)) { ret =PTR_ERR (nc->smc);dev_err (dev,"Could not get SMC regmap (err = %d)\n" , ret); -return ret; + goto out_release_dma; }return 0 ; + +out_release_dma: +if (nc->dmac) +dma_release_channel (nc->dmac); + +return ret; } static int
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 151/338 USB: storage: ums-realtek: fix error code in rts51x_read_mem()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit b07cabb8361dc692522538205552b1b9dab134be ]
The rts51x_read_mem() function should return negative error codes. Currently if the kmalloc() fails it returns USB_STOR_TRANSPORT_ERROR (3) which is treated as success by the callers.
--- drivers/usb/storage/realtek_cr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/storage/realtek_cr.c +1 -1
@@ -364,7 +364,7 @@ static int rts51x_read_mem(struct us_data *us, u16 addr, u8 *data, u16 len) buf =kmalloc (len,GFP_NOIO );if (buf ==NULL ) -return USB_STOR_TRANSPORT_ERROR ; +return -ENOMEM ;usb_stor_dbg (us,"addr = 0x%x, len = %d\n" , addr, len);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 152/338 af_netlink: Fix shift out of bounds in group mask calculation
In reply to Greg Kroah-HartmanFrom: Petr Machata <[email protected]>
[ Upstream commit 0caf6d9922192dd1afa8dc2131abfb4df1443b9f ]
When a netlink message is received, netlink_recvmsg() fills in the address of the sender. One of the fields is the 32-bit bitfield nl_groups, which carries the multicast group on which the message was received. The least significant bit corresponds to group 1, and therefore the highest group that the field can represent is 32. Above that, the UB sanitizer flags the out-of-bounds shift attempts.
Which bits end up being set in such case is implementation defined, but it's either going to be a wrong non-zero value, or zero, which is at least not misleading. Make the latter choice deterministic by always setting to 0 for higher-numbered multicast groups.
To get information about membership in groups >= 32, userspace is expected to use nl_pktinfo control messages[0], which are enabled by NETLINK_PKTINFO socket option.
[0] https://lwn.net/Articles/147608/
The way to trigger this issue is e.g. through monitoring the BRVLAN group:
# bridge monitor vlan & # ip link add name br type bridge
Which produces the following citation:
UBSAN: shift-out-of-bounds in net/netlink/af_netlink.c:162:19 shift exponent 32 is too large for 32-bit type 'int'
--- net/netlink/af_netlink.c | 2 ++ 1 file changed, 2 insertions(+)
net/netlink/af_netlink.c +2 -0
@@ -152,6 +152,8 @@ static const struct rhashtable_params netlink_rhashtable_params;static inline u32 netlink_group_mask (u32 group) { +if (group >32 ) +return 0 ;return group ?1 << (group -1 ) :0 ; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 153/338 i2c: mux: demux-pinctrl: do not deactivate a master that is not active
In reply to Greg Kroah-HartmanFrom: Peter Rosin <[email protected]>
[ Upstream commit 1a22aabf20adf89cb216f566913196128766f25b ]
Attempting to rollback the activation of the current master when the current master has not been activated is bad. priv->cur_chan and priv->cur_adap are both still zeroed out and the rollback may result in attempts to revert an of changeset that has not been applied and do result in calls to both del and put the zeroed out i2c_adapter. Maybe it crashes, or whatever, but it's bad in any case.
--- drivers/i2c/muxes/i2c-demux-pinctrl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/i2c/muxes/i2c-demux-pinctrl.c +3 -2
@@ -262,7 +262,7 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev) err =device_create_file (&pdev->dev, &dev_attr_available_masters);if (err) - goto err_rollback; + goto err_rollback_activation; err =device_create_file (&pdev->dev, &dev_attr_current_master);if (err)
@@ -272,8 +272,9 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev) err_rollback_available:device_remove_file (&pdev->dev, &dev_attr_available_masters); -err_rollback: +err_rollback_activation:i2c_demux_deactivate_master (priv); +err_rollback:for (j =0 ; j < i; j++) {of_node_put (priv->chan[j].parent_np);of_changeset_destroy (&priv->chan[j].chgset);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 154/338 selftests/bpf/test_lirc_mode2.sh: Exit with proper code
In reply to Greg Kroah-HartmanFrom: Hangbin Liu <[email protected]>
[ Upstream commit ec80906b0fbd7be11e3e960813b977b1ffe5f8fe ]
When test_lirc_mode2_user exec failed, the test report failed but still exit with 0. Fix it by exiting with an error code.
Another issue is for the LIRCDEV checking. With bash -n, we need to quote the variable, or it will always be true. So if test_lirc_mode2_user was not run, just exit with skip code.
--- tools/testing/selftests/bpf/test_lirc_mode2.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/testing/selftests/bpf/test_lirc_mode2.sh +4 -1
@@ -3,6 +3,7 @@ # Kselftest framework requirement - SKIP code is 4. ksft_skip=4 +ret=$ksft_skip msg="skip all tests:" if [ $UID != 0 ]; then
@@ -24,7 +25,7 @@ do fi done -if [ -n $LIRCDEV ]; +if [ -n "$LIRCDEV" ]; then TYPE=lirc_mode2 ./test_lirc_mode2_user $LIRCDEV
@@ -35,3 +36,5 @@ then echo -e ${GREEN}"PASS: $TYPE"${NC} fi fi + +exit $ret
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 155/338 net: bcmgenet: Use stronger register read/writes to assure ordering
In reply to Greg Kroah-HartmanFrom: Jeremy Linton <[email protected]>
[ Upstream commit 8d3ea3d402db94b61075617e71b67459a714a502 ]
GCC12 appears to be much smarter about its dependency tracking and is aware that the relaxed variants are just normal loads and stores and this is causing problems like:
[ 210.074549] ------------[ cut here ]------------ [ 210.079223] NETDEV WATCHDOG: enabcm6e4ei0 (bcmgenet): transmit queue 1 timed out [ 210.086717] WARNING: CPU: 1 PID: 0 at net/sched/sch_generic.c:529 dev_watchdog+0x234/0x240 [ 210.095044] Modules linked in: genet(E) nft_fib_inet nft_fib_ipv4 nft_fib_ipv6 nft_fib nft_reject_inet nf_reject_ipv4 nf_reject_ipv6 nft_reject nft_ct nft_chain_nat] [ 210.146561] ACPI CPPC: PCC check channel failed for ss: 0. ret=-110 [ 210.146927] CPU: 1 PID: 0 Comm: swapper/1 Tainted: G E 5.17.0-rc7G12+ #58 [ 210.153226] CPPC Cpufreq:cppc_scale_freq_workfn: failed to read perf counters [ 210.161349] Hardware name: Raspberry Pi Foundation Raspberry Pi 4 Model B/Raspberry Pi 4 Model B, BIOS EDK2-DEV 02/08/2022 [ 210.161353] pstate: 80400005 (Nzcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 210.161358] pc : dev_watchdog+0x234/0x240 [ 210.161364] lr : dev_watchdog+0x234/0x240 [ 210.161368] sp : ffff8000080a3a40 [ 210.161370] x29: ffff8000080a3a40 x28: ffffcd425af87000 x27: ffff8000080a3b20 [ 210.205150] x26: ffffcd425aa00000 x25: 0000000000000001 x24: ffffcd425af8ec08 [ 210.212321] x23: 0000000000000100 x22: ffffcd425af87000 x21: ffff55b142688000 [ 210.219491] x20: 0000000000000001 x19: ffff55b1426884c8 x18: ffffffffffffffff [ 210.226661] x17: 64656d6974203120 x16: 0000000000000001 x15: 6d736e617274203a [ 210.233831] x14: 2974656e65676d63 x13: ffffcd4259c300d8 x12: ffffcd425b07d5f0 [ 210.241001] x11: 00000000ffffffff x10: ffffcd425b07d5f0 x9 : ffffcd4258bdad9c [ 210.248171] x8 : 00000000ffffdfff x7 : 000000000000003f x6 : 0000000000000000 [ 210.255341] x5 : 0000000000000000 x4 : 0000000000000000 x3 : 0000000000001000 [ 210.262511] x2 : 0000000000001000 x1 : 0000000000000005 x0 : 0000000000000044 [ 210.269682] Call trace: [ 210.272133] dev_watchdog+0x234/0x240 [ 210.275811] call_timer_fn+0x3c/0x15c [ 210.279489] __run_timers.part.0+0x288/0x310 [ 210.283777] run_timer_softirq+0x48/0x80 [ 210.287716] __do_softirq+0x128/0x360 [ 210.291392] __irq_exit_rcu+0x138/0x140 [ 210.295243] irq_exit_rcu+0x1c/0x30 [ 210.298745] el1_interrupt+0x38/0x54 [ 210.302334] el1h_64_irq_handler+0x18/0x24 [ 210.306445] el1h_64_irq+0x7c/0x80 [ 210.309857] arch_cpu_idle+0x18/0x2c [ 210.313445] default_idle_call+0x4c/0x140 [ 210.317470] cpuidle_idle_call+0x14c/0x1a0 [ 210.321584] do_idle+0xb0/0x100 [ 210.324737] cpu_startup_entry+0x30/0x8c [ 210.328675] secondary_start_kernel+0xe4/0x110 [ 210.333138] __secondary_switched+0x94/0x98
The assumption when these were relaxed seems to be that device memory would be mapped non reordering, and that other constructs (spinlocks/etc) would provide the barriers to assure that packet data and in memory rings/queues were ordered with respect to device register reads/writes. This itself seems a bit sketchy, but the real problem with GCC12 is that it is moving the actual reads/writes around at will as though they were independent operations when in truth they are not, but the compiler can't know that. When looking at the assembly dumps for many of these routines its possible to see very clean, but not strictly in program order operations occurring as the compiler would be free to do if these weren't actually register reads/write operations.
Its possible to suppress the timeout with a liberal bit of dma_mb()'s sprinkled around but the device still seems unable to reliably send/receive data. A better plan is to use the safer readl/writel everywhere.
Since this partially reverts an older commit, which notes the use of the relaxed variants for performance reasons. I would suggest that any performance problems with this commit are targeted at relaxing only the performance critical code paths after assuring proper barriers.
--- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/broadcom/genet/bcmgenet.c +2 -2
@@ -83,7 +83,7 @@ static inline void bcmgenet_writel(u32 value, void __iomem *offset)if (IS_ENABLED (CONFIG_MIPS ) &&IS_ENABLED (CONFIG_CPU_BIG_ENDIAN ))__raw_writel (value, offset);else -writel_relaxed (value, offset); +writel (value, offset); }static inline u32 bcmgenet_readl (void __iomem *offset)
@@ -91,7 +91,7 @@ static inline u32 bcmgenet_readl(void __iomem *offset)if (IS_ENABLED (CONFIG_MIPS ) &&IS_ENABLED (CONFIG_CPU_BIG_ENDIAN ))return __raw_readl (offset);else -return readl_relaxed (offset); +return readl (offset); } static inline void dmadesc_set_length_status(struct bcmgenet_priv *priv,
Signature · 1 line
2.34.1
Re: [PATCH 4.19 155/338] net: bcmgenet: Use stronger register read/writes to assure ordering
Hi,
I would kill this commit too, since the final conclusion was that underlying problem was a compiler bug (which has now been fixed).
Thanks,
Quoted 107 lines · Greg Kroah-Hartman
From: Jeremy Linton <[email protected]>
[ Upstream commit
8d3ea3d402db94b61075617e71b67459a714a502]GCC12 appears to be much smarter about its dependency tracking and is aware that the relaxed variants are just normal loads and stores and this is causing problems like:
[ 210.074549] ------------[ cut here ]------------ [ 210.079223] NETDEV WATCHDOG: enabcm6e4ei0 (bcmgenet): transmit queue 1 timed out [ 210.086717] WARNING: CPU: 1 PID: 0 at net/sched/sch_generic.c:529 dev_watchdog+0x234/0x240 [ 210.095044] Modules linked in: genet(E) nft_fib_inet nft_fib_ipv4 nft_fib_ipv6 nft_fib nft_reject_inet nf_reject_ipv4 nf_reject_ipv6 nft_reject nft_ct nft_chain_nat] [ 210.146561] ACPI CPPC: PCC check channel failed for ss: 0. ret=-110 [ 210.146927] CPU: 1 PID: 0 Comm: swapper/1 Tainted: G E 5.17.0-rc7G12+ #58 [ 210.153226] CPPC Cpufreq:cppc_scale_freq_workfn: failed to read perf counters [ 210.161349] Hardware name: Raspberry Pi Foundation Raspberry Pi 4 Model B/Raspberry Pi 4 Model B, BIOS EDK2-DEV 02/08/2022 [ 210.161353] pstate: 80400005 (Nzcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 210.161358] pc : dev_watchdog+0x234/0x240 [ 210.161364] lr : dev_watchdog+0x234/0x240 [ 210.161368] sp : ffff8000080a3a40 [ 210.161370] x29: ffff8000080a3a40 x28: ffffcd425af87000 x27: ffff8000080a3b20 [ 210.205150] x26: ffffcd425aa00000 x25: 0000000000000001 x24: ffffcd425af8ec08 [ 210.212321] x23: 0000000000000100 x22: ffffcd425af87000 x21: ffff55b142688000 [ 210.219491] x20: 0000000000000001 x19: ffff55b1426884c8 x18: ffffffffffffffff [ 210.226661] x17: 64656d6974203120 x16: 0000000000000001 x15: 6d736e617274203a [ 210.233831] x14: 2974656e65676d63 x13: ffffcd4259c300d8 x12: ffffcd425b07d5f0 [ 210.241001] x11: 00000000ffffffff x10: ffffcd425b07d5f0 x9 : ffffcd4258bdad9c [ 210.248171] x8 : 00000000ffffdfff x7 : 000000000000003f x6 : 0000000000000000 [ 210.255341] x5 : 0000000000000000 x4 : 0000000000000000 x3 : 0000000000001000 [ 210.262511] x2 : 0000000000001000 x1 : 0000000000000005 x0 : 0000000000000044 [ 210.269682] Call trace: [ 210.272133] dev_watchdog+0x234/0x240 [ 210.275811] call_timer_fn+0x3c/0x15c [ 210.279489] __run_timers.part.0+0x288/0x310 [ 210.283777] run_timer_softirq+0x48/0x80 [ 210.287716] __do_softirq+0x128/0x360 [ 210.291392] __irq_exit_rcu+0x138/0x140 [ 210.295243] irq_exit_rcu+0x1c/0x30 [ 210.298745] el1_interrupt+0x38/0x54 [ 210.302334] el1h_64_irq_handler+0x18/0x24 [ 210.306445] el1h_64_irq+0x7c/0x80 [ 210.309857] arch_cpu_idle+0x18/0x2c [ 210.313445] default_idle_call+0x4c/0x140 [ 210.317470] cpuidle_idle_call+0x14c/0x1a0 [ 210.321584] do_idle+0xb0/0x100 [ 210.324737] cpu_startup_entry+0x30/0x8c [ 210.328675] secondary_start_kernel+0xe4/0x110 [ 210.333138] __secondary_switched+0x94/0x98The assumption when these were relaxed seems to be that device memory would be mapped non reordering, and that other constructs (spinlocks/etc) would provide the barriers to assure that packet data and in memory rings/queues were ordered with respect to device register reads/writes. This itself seems a bit sketchy, but the real problem with GCC12 is that it is moving the actual reads/writes around at will as though they were independent operations when in truth they are not, but the compiler can't know that. When looking at the assembly dumps for many of these routines its possible to see very clean, but not strictly in program order operations occurring as the compiler would be free to do if these weren't actually register reads/write operations.
Its possible to suppress the timeout with a liberal bit of dma_mb()'s sprinkled around but the device still seems unable to reliably send/receive data. A better plan is to use the safer readl/writel everywhere.
Since this partially reverts an older commit, which notes the use of the relaxed variants for performance reasons. I would suggest that any performance problems with this commit are targeted at relaxing only the performance critical code paths after assuring proper barriers.
Fixes 69d2ea9c79898 ("net: bcmgenet: Use correct I/O accessors")Reported-by Peter Robinson <[email protected]>Signed-off-by Jeremy Linton <[email protected]>Acked-by Peter Robinson <[email protected]>Tested-by Peter Robinson <[email protected]>Acked-by Florian Fainelli <[email protected]>Signed-off-by Jakub Kicinski <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/net/ethernet/broadcom/genet/bcmgenet.c +2
-2@@ -83,7 +83,7 @@ static inline void bcmgenet_writel(u32 value, void __iomem *offset)if (IS_ENABLED (CONFIG_MIPS ) &&IS_ENABLED (CONFIG_CPU_BIG_ENDIAN ))__raw_writel (value, offset);else -writel_relaxed (value, offset); +writel (value, offset); }static inline u32 bcmgenet_readl (void __iomem *offset)@@ -91,7 +91,7 @@ static inline u32 bcmgenet_readl(void __iomem *offset)if (IS_ENABLED (CONFIG_MIPS ) &&IS_ENABLED (CONFIG_CPU_BIG_ENDIAN ))return __raw_readl (offset);else -return readl_relaxed (offset); +return readl (offset); } static inline void dmadesc_set_length_status(struct bcmgenet_priv *priv,
Greg Kroah-Hartman
maintainerPATCH 156/338 tcp: ensure PMTU updates are processed during fastopen
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit ed0c99dc0f499ff8b6e75b5ae6092ab42be1ad39 ]
tp->rx_opt.mss_clamp is not populated, yet, during TFO send so we rise it to the local MSS. tp->mss_cache is not updated, however:
tcp_v6_connect():
tp->rx_opt.mss_clamp = IPV6_MIN_MTU - headers;
tcp_connect():
tcp_connect_init():
tp->mss_cache = min(mtu, tp->rx_opt.mss_clamp)
tcp_send_syn_data():
tp->rx_opt.mss_clamp = tp->advmssAfter recent fixes to ICMPv6 PTB handling we started dropping PMTU updates higher than tp->mss_cache. Because of the stale tp->mss_cache value PMTU updates during TFO are always dropped.
Thanks to Wei for helping zero in on the problem and the fix!
--- net/ipv4/tcp_output.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
net/ipv4/tcp_output.c +4 -1
@@ -3425,6 +3425,7 @@ static void tcp_connect_queue_skb(struct sock *sk, struct sk_buff *skb)*/ static int tcp_send_syn_data (struct sock *sk,struct sk_buff *syn) { +struct inet_connection_sock *icsk =inet_csk (sk);struct tcp_sock *tp =tcp_sk (sk);struct tcp_fastopen_request *fo = tp->fastopen_req;int space, err =0 ;
@@ -3439,8 +3440,10 @@ static int tcp_send_syn_data(struct sock *sk, struct sk_buff *syn)* private TCP options. The cost is reduced data space in SYN :( */ tp->rx_opt.mss_clamp =tcp_mss_clamp (tp, tp->rx_opt.mss_clamp); +/* Sync mss_cache after updating the mss_clamp */ +tcp_sync_mss (sk, icsk->icsk_pmtu_cookie); - space =__tcp_mtu_to_mss (sk,inet_csk (sk)->icsk_pmtu_cookie) - + space =__tcp_mtu_to_mss (sk, icsk->icsk_pmtu_cookie) -MAX_TCP_OPTION_SPACE ; space =min_t (size_t, space, fo->size);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 157/338 mfd: asic3: Add missing iounmap() on error asic3_mfd_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit e84ee1a75f944a0fe3c277aaa10c426603d2b0bc ]
Add the missing iounmap() before return from asic3_mfd_probe in the error handling case.
--- drivers/mfd/asic3.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/mfd/asic3.c +7 -3
@@ -918,14 +918,14 @@ static int __init asic3_mfd_probe(struct platform_device *pdev, ret =mfd_add_devices (&pdev->dev, pdev->id, &asic3_cell_ds1wm,1 , mem, asic->irq_base,NULL );if (ret <0 ) - goto out; + goto out_unmap; }if (mem_sdio && (irq >=0 )) { ret =mfd_add_devices (&pdev->dev, pdev->id, &asic3_cell_mmc,1 , mem_sdio, irq,NULL );if (ret <0 ) - goto out; + goto out_unmap; } ret =0 ;
@@ -939,8 +939,12 @@ static int __init asic3_mfd_probe(struct platform_device *pdev, ret =mfd_add_devices (&pdev->dev,0 , asic3_cell_leds,ASIC3_NUM_LEDS ,NULL ,0 ,NULL ); } +return ret; - out: +out_unmap: +if (asic->tmio_cnf) +iounmap (asic->tmio_cnf); +out:return ret; }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 158/338 mxser: fix xmit_buf leak in activate when LSR == 0xff
In reply to Greg Kroah-HartmanFrom: Jiri Slaby <[email protected]>
[ Upstream commit cd3a4907ee334b40d7aa880c7ab310b154fd5cd4 ]
When LSR is 0xff in ->activate() (rather unlike), we return an error. Provided ->shutdown() is not called when ->activate() fails, nothing actually frees the buffer in this case.
Fix this by properly freeing the buffer in a designated label. We jump there also from the "!info->type" if now too.
--- drivers/tty/mxser.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/tty/mxser.c +11 -4
@@ -861,6 +861,7 @@ static int mxser_activate(struct tty_port *port, struct tty_struct *tty) struct mxser_port *info = container_of(port, struct mxser_port, port);unsigned long page;unsigned long flags; +int ret; page =__get_free_page (GFP_KERNEL );if (!page)
@@ -870,9 +871,9 @@ static int mxser_activate(struct tty_port *port, struct tty_struct *tty)if (!info->ioaddr || !info->type) {set_bit (TTY_IO_ERROR , &tty->flags); -free_page (page);spin_unlock_irqrestore (&info->slock, flags); -return 0 ; + ret =0 ; + goto err_free_xmit; } info->port.xmit_buf = (unsigned char *) page;
@@ -898,8 +899,10 @@ static int mxser_activate(struct tty_port *port, struct tty_struct *tty)if (capable (CAP_SYS_ADMIN )) {set_bit (TTY_IO_ERROR , &tty->flags);return 0 ; - }else -return -ENODEV ; + } + + ret = -ENODEV ; + goto err_free_xmit; }/*
@@ -944,6 +947,10 @@ static int mxser_activate(struct tty_port *port, struct tty_struct *tty)spin_unlock_irqrestore (&info->slock, flags);return 0 ; +err_free_xmit: +free_page (page); + info->port.xmit_buf =NULL ; +return ret; }/*
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 159/338 pwm: lpc18xx-sct: Initialize driver data and hardware before pwmchip_add()
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 0401f24cd238ae200a23a13925f98de3d2c883b8 ]
When a driver calls pwmchip_add() it has to be prepared to immediately get its callbacks called. So move allocation of driver data and hardware initialization before the call to pwmchip_add().
This fixes a potential NULL pointer exception and a race condition on register writes.
--- drivers/pwm/pwm-lpc18xx-sct.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)
drivers/pwm/pwm-lpc18xx-sct.c +9 -11
@@ -406,12 +406,6 @@ static int lpc18xx_pwm_probe(struct platform_device *pdev)lpc18xx_pwm_writel (lpc18xx_pwm,LPC18XX_PWM_LIMIT ,BIT (lpc18xx_pwm->period_event)); - ret =pwmchip_add (&lpc18xx_pwm->chip); -if (ret <0 ) { -dev_err (&pdev->dev,"pwmchip_add failed: %d\n" , ret); - goto disable_pwmclk; - } -for (i =0 ; i < lpc18xx_pwm->chip.npwm; i++) {struct lpc18xx_pwm_data *data;
@@ -421,14 +415,12 @@ static int lpc18xx_pwm_probe(struct platform_device *pdev) GFP_KERNEL);if (!data) { ret = -ENOMEM ; - goto remove_pwmchip; + goto disable_pwmclk; }pwm_set_chip_data (pwm, data); } -platform_set_drvdata (pdev, lpc18xx_pwm); - val =lpc18xx_pwm_readl (lpc18xx_pwm,LPC18XX_PWM_CTRL ); val &= ~LPC18XX_PWM_BIDIR ; val &= ~LPC18XX_PWM_CTRL_HALT ;
@@ -436,10 +428,16 @@ static int lpc18xx_pwm_probe(struct platform_device *pdev) val |=LPC18XX_PWM_PRE (0 );lpc18xx_pwm_writel (lpc18xx_pwm,LPC18XX_PWM_CTRL , val); + ret =pwmchip_add (&lpc18xx_pwm->chip); +if (ret <0 ) { +dev_err (&pdev->dev,"pwmchip_add failed: %d\n" , ret); + goto disable_pwmclk; + } + +platform_set_drvdata (pdev, lpc18xx_pwm); +return 0 ; -remove_pwmchip: -pwmchip_remove (&lpc18xx_pwm->chip); disable_pwmclk:clk_disable_unprepare (lpc18xx_pwm->pwm_clk);return ret;
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 160/338 staging:iio:adc:ad7280a: Fix handing of device address bit reversing.
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit f281e4ddbbc0b60f061bc18a2834e9363ba85f9f ]
The bit reversal was wrong for bits 1 and 3 of the 5 bits. Result is driver failure to probe if you have more than 2 daisy-chained devices. Discovered via QEMU based device emulation.
Fixes tag is for when this moved from a macro to a function, but it was broken before that.
--- drivers/staging/iio/adc/ad7280a.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/iio/adc/ad7280a.c +2 -2
@@ -102,9 +102,9 @@static unsigned int ad7280a_devaddr (unsigned int addr) {return ((addr &0x1 ) <<4 ) | - ((addr &0x2 ) <<3 ) | + ((addr &0x2 ) <<2 ) | (addr &0x4 ) | - ((addr &0x8 ) >>3 ) | + ((addr &0x8 ) >>2 ) | ((addr &0x10 ) >>4 ); }
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 161/338 clk: qcom: ipq8074: Use floor ops for SDCC1 clock
In reply to Greg Kroah-HartmanFrom: Dirk Buchwalder <[email protected]>
[ Upstream commit b77d8306d84f83d1da68028a68c91da9c867b6f6 ]
Use floor ops on SDCC1 APPS clock in order to round down selected clock frequency and avoid overclocking SD/eMMC cards.
For example, currently HS200 cards were failling tuning as they were actually being clocked at 384MHz instead of 192MHz.
This caused some boards to disable 1.8V I/O and force the eMMC into the standard HS mode (50MHz) and that appeared to work despite the eMMC being overclocked to 96Mhz in that case.
There was a previous commit to use floor ops on SDCC clocks, but it looks to have only covered SDCC2 clock.
--- drivers/clk/qcom/gcc-ipq8074.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/qcom/gcc-ipq8074.c +1 -1
@@ -1082,7 +1082,7 @@ static struct clk_rcg2 sdcc1_apps_clk_src = { .name = "sdcc1_apps_clk_src", .parent_names = gcc_xo_gpll0_gpll2_gpll0_out_main_div2, .num_parents = 4, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_floor_ops, }, };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 162/338 serial: 8250_mid: Balance reference count for PCI DMA device
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 67ec6dd0b257bd81b4e9fcac89b29da72f6265e5 ]
The pci_get_slot() increases its reference count, the caller must decrement the reference count by calling pci_dev_put().
Depends-on: d9eda9bab237 ("serial: 8250_pci: Intel MID UART support to its own driver")
--- drivers/tty/serial/8250/8250_mid.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/tty/serial/8250/8250_mid.c +15 -4
@@ -73,6 +73,11 @@ static int pnw_setup(struct mid8250 *mid, struct uart_port *p)return 0 ; } +static void pnw_exit (struct mid8250 *mid) +{ +pci_dev_put (mid->dma_dev); +} +static int tng_handle_irq (struct uart_port *p) {struct mid8250 *mid = p->private_data;
@@ -124,6 +129,11 @@ static int tng_setup(struct mid8250 *mid, struct uart_port *p)return 0 ; } +static void tng_exit (struct mid8250 *mid) +{ +pci_dev_put (mid->dma_dev); +} +static int dnv_handle_irq (struct uart_port *p) {struct mid8250 *mid = p->private_data;
@@ -330,9 +340,9 @@ static int mid8250_probe(struct pci_dev *pdev, const struct pci_device_id *id)pci_set_drvdata (pdev, mid);return 0 ; + err: -if (mid->board->exit) - mid->board->exit (mid); + mid->board->exit (mid);return ret; }
@@ -342,8 +352,7 @@ static void mid8250_remove(struct pci_dev *pdev)serial8250_unregister_port (mid->line); -if (mid->board->exit) - mid->board->exit (mid); + mid->board->exit (mid); }static const struct mid8250_board pnw_board = {
@@ -351,6 +360,7 @@ static const struct mid8250_board pnw_board = { .freq = 50000000, .base_baud = 115200, .setup = pnw_setup, + .exit = pnw_exit, };static const struct mid8250_board tng_board = {
@@ -358,6 +368,7 @@ static const struct mid8250_board tng_board = { .freq = 38400000, .base_baud = 1843200, .setup = tng_setup, + .exit = tng_exit, };static const struct mid8250_board dnv_board = {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 163/338 serial: 8250: Fix race condition in RTS-after-send handling
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit dedab69fd650ea74710b2e626e63fd35584ef773 ]
Set em485->active_timer = NULL isn't always enough to take out the stop timer. While there is a check that it acts in the right state (i.e. waiting for RTS-after-send to pass after sending some chars) but the following might happen:
- CPU1: some chars send, shifter becomes empty, stop tx timer armed
- CPU0: more chars send before RTS-after-send expired
- CPU0: shifter empty irq, port lock taken
- CPU1: tx timer triggers, waits for port lock
- CPU0: em485->active_timer = &em485->stop_tx_timer, hrtimer_start(), releases lock()
- CPU1: get lock, see em485->active_timer == &em485->stop_tx_timer, tear down RTS too early
This fix bases on research done by Steffen Trumtrar.
--- drivers/tty/serial/8250/8250_port.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/tty/serial/8250/8250_port.c +12 -0
@@ -1594,6 +1594,18 @@ static inline void start_tx_rs485(struct uart_port *port)if (!(up->port.rs485.flags &SER_RS485_RX_DURING_TX ))serial8250_stop_rx (&up->port); +/* +* While serial8250_em485_handle_stop_tx() is a noop if +* em485->active_timer != &em485->stop_tx_timer, it might happen that +* the timer is still armed and triggers only after the current bunch of +* chars is send and em485->active_timer == &em485->stop_tx_timer again. +* So cancel the timer. There is still a theoretical race condition if +* the timer is already running and only comes around to check for +* em485->active_timer when &em485->stop_tx_timer is armed again. +*/ +if (em485->active_timer == &em485->stop_tx_timer) +hrtimer_try_to_cancel (&em485->stop_tx_timer); + em485->active_timer =NULL ; mcr =serial8250_in_MCR (up);
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 164/338 iio: adc: Add check for devm_request_threaded_irq
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit b30537a4cedcacf0ade2f33ebb7610178ed1e7d7 ]
As the potential failure of the devm_request_threaded_irq(), it should be better to check the return value and return error if fails.
--- drivers/iio/adc/twl6030-gpadc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/iio/adc/twl6030-gpadc.c +2 -0
@@ -927,6 +927,8 @@ static int twl6030_gpadc_probe(struct platform_device *pdev) ret =devm_request_threaded_irq (dev, irq,NULL , twl6030_gpadc_irq_handler,IRQF_ONESHOT ,"twl6030_gpadc" , indio_dev); +if (ret) +return ret; ret =twl6030_gpadc_enable_irq (TWL6030_GPADC_RT_SW1_EOC_MASK );if (ret <0 ) {
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 165/338 dma-debug: fix return value of __setup handlers
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 80e4390981618e290616dbd06ea190d4576f219d ]
When valid kernel command line parameters
dma_debug=off dma_debug_entries=100
are used, they are reported as Unknown parameters and added to init's environment strings, polluting it.
Unknown kernel command line parameters "BOOT_IMAGE=/boot/bzImage-517rc5
dma_debug=off dma_debug_entries=100", will be passed to user space.
and
Run /sbin/init as init process
with arguments:
/sbin/init
with environment:
HOME=/
TERM=linux
BOOT_IMAGE=/boot/bzImage-517rc5
dma_debug=off
dma_debug_entries=100Return 1 from these __setup handlers to indicate that the command line option has been handled.
--- kernel/dma/debug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/dma/debug.c +2 -2
@@ -1056,7 +1056,7 @@ static __init int dma_debug_cmdline(char *str) global_disable = true; } -return 0 ; +return 1 ; }static __init int dma_debug_entries_cmdline (char *str)
@@ -1065,7 +1065,7 @@ static __init int dma_debug_entries_cmdline(char *str)return -EINVAL ;if (!get_option (&str, &nr_prealloc_entries)) nr_prealloc_entries =PREALLOC_DMA_DEBUG_ENTRIES ; -return 0 ; +return 1 ; }__setup ("dma_debug=" , dma_debug_cmdline);
Signature · 8 lines
2.34.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Greg Kroah-Hartman
maintainerPATCH 166/338 clk: qcom: clk-rcg2: Update the frac table for pixel clock
In reply to Greg Kroah-HartmanFrom: Taniya Das <[email protected]>
[ Upstream commit b527358cb4cd58a8279c9062b0786f1fab628fdc ]
Support the new numerator and denominator for pixel clock on SM8350 and support rgb101010, RGB888 use cases on SM8450.
--- drivers/clk/qcom/clk-rcg2.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/qcom/clk-rcg2.c +1 -0
@@ -625,6 +625,7 @@ static const struct frac_entry frac_table_pixel[] = { { 2, 9 }, { 4, 9 }, { 1, 1 }, + { 2, 3 }, { } };
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerPATCH 167/338 remoteproc: qcom_wcnss: Add missing of_node_put() in wcnss_alloc_memory_region
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 8f90161a66bc3d6b9fe8dde4d9028d20eae1b62a ]
The device_node pointer is returned by of_parse_phandle() with refcount incremented. We should use of_node_put() on it when done.
--- drivers/remoteproc/qcom_wcnss.c | 1 + 1 file changed, 1 insertion(+)
drivers/remoteproc/qcom_wcnss.c +1 -0
@@ -448,6 +448,7 @@ static int wcnss_alloc_memory_region(struct qcom_wcnss *wcnss) } ret =of_address_to_resource (node,0 , &r); +of_node_put (node);if (ret)return ret;
Signature · 1 line
2.34.1