4.14.123-stable review
Subsystems (7)
Greg Kroah-Hartman
maintainercover 4.14.123-stable review
This is the start of the stable review cycle for the 4.14.123 release. There are 193 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 01 Jun 2019 03:02:04 AM UTC. 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.14.123-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.14.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.14.123-rc1
Benjamin Coddington <[email protected]>
NFS: Fix a double unlock from nfs_match,get_client
Farhan Ali <[email protected]>
vfio-ccw: Prevent quiesce function going into an infinite loop
Chris Wilson <[email protected]>
drm: Wake up next in drm_read() chain if we are forced to putback the event
Noralf Trønnes <[email protected]>
drm/drv: Hold ref on parent device during drm_device lifetime
Arnd Bergmann <[email protected]>
ASoC: davinci-mcasp: Fix clang warning without CONFIG_PM
Chris Lesiak <[email protected]>
spi: Fix zero length xfer bug
Geert Uytterhoeven <[email protected]>
spi: rspi: Fix sequencer reset during initialization
Aditya Pakki <[email protected]>
spi : spi-topcliff-pch: Fix to handle empty DMA buffers
James Smart <[email protected]>
scsi: lpfc: Fix SLI3 commands being issued on SLI4 devices
Arnd Bergmann <[email protected]>
media: saa7146: avoid high stack usage with clang
James Smart <[email protected]>
scsi: lpfc: Fix fc4type information for FDMI
James Smart <[email protected]>
scsi: lpfc: Fix FDMI manufacturer attribute value
Hans Verkuil <[email protected]>
media: vimc: zero the media_device on probe
Arnd Bergmann <[email protected]>
media: go7007: avoid clang frame overflow warning with KASAN
Helen Fornazier <[email protected]>
media: vimc: stream: fix thread state before sleep
James Hutchinson <[email protected]>
media: m88ds3103: serialize reset messages in m88ds3103_set_frontend
Aditya Pakki <[email protected]>
thunderbolt: Fix to check for kmemdup failure
Rouven Czerwinski <[email protected]>
hwrng: omap - Set default quality
Sameer Pujar <[email protected]>
dmaengine: tegra210-adma: use devm_clk_*() helpers
Linus Lüssing <[email protected]>
batman-adv: allow updating DAT entry timeouts on incoming ARP Replies
Arnd Bergmann <[email protected]>
scsi: qla4xxx: avoid freeing unallocated dma memory
Tony Lindgren <[email protected]>
usb: core: Add PM runtime calls to usb_hcd_platform_shutdown
Paul E. McKenney <[email protected]>
rcuperf: Fix cleanup path for invalid perf_type strings
Paul E. McKenney <[email protected]>
rcutorture: Fix cleanup path for invalid torture_type strings
Tony Luck <[email protected]>
x86/mce: Fix machine_check_poll() tests for error types
Kangjie Lu <[email protected]>
tty: ipwireless: fix missing checks for ioremap
Pankaj Gupta <[email protected]>
virtio_console: initialize vtermno value for ports
Chad Dupuis <[email protected]>
scsi: qedf: Add missing return in qedf_post_io_req() in the fcport offload check
Dan Carpenter <[email protected]>
media: wl128x: prevent two potential buffer overflows
Kangjie Lu <[email protected]>
media: video-mux: fix null pointer dereferences
Tetsuo Handa <[email protected]>
kobject: Don't trigger kobject_uevent(KOBJ_REMOVE) twice.
Sowjanya Komatineni <[email protected]>
spi: tegra114: reset controller on probe
Hans de Goede <[email protected]>
HID: logitech-hidpp: change low battery level threshold from 31 to 30 percent
Gustavo A. R. Silva <[email protected]>
cxgb3/l2t: Fix undefined behaviour
Wen Yang <[email protected]>
ASoC: fsl_utils: fix a leaked reference by adding missing of_node_put
Wen Yang <[email protected]>
ASoC: eukrea-tlv320: fix a leaked reference by adding missing of_node_put
Nicolas Saenz Julienne <[email protected]>
HID: core: move Usage Page concatenation to Main item
Leon Romanovsky <[email protected]>
RDMA/hns: Fix bad endianess of port_pd variable
Chengguang Xu <[email protected]>
chardev: add additional check for minor range overlap
Peter Zijlstra <[email protected]>
x86/ia32: Fix ia32_restore_sigcontext() AC leak
Peter Zijlstra <[email protected]>
x86/uaccess, signal: Fix AC=1 bloat
Peter Zijlstra <[email protected]>
x86/uaccess, ftrace: Fix ftrace_likely_update() vs. SMAP
Wen Yang <[email protected]>
arm64: cpu_ops: fix a leaked reference by adding missing of_node_put
Stanley Chu <[email protected]>
scsi: ufs: Avoid configuring regulator with undefined voltage range
Stanley Chu <[email protected]>
scsi: ufs: Fix regulator load and icc-level configuration
Ping-Ke Shih <[email protected]>
rtlwifi: fix potential NULL pointer dereference
Alexandre Belloni <[email protected]>
rtc: xgene: fix possible race condition
Piotr Figiel <[email protected]>
brcmfmac: fix Oops when bringing up interface during USB disconnect
Piotr Figiel <[email protected]>
brcmfmac: fix race during disconnect when USB completion is in progress
Piotr Figiel <[email protected]>
brcmfmac: fix WARNING during USB disconnect in case of unempty psq
Piotr Figiel <[email protected]>
brcmfmac: convert dev_init_lock mutex to completion
Arnd Bergmann <[email protected]>
b43: shut up clang -Wuninitialized variable warning
Kangjie Lu <[email protected]>
brcmfmac: fix missing checks for kmemdup
YueHaibing <[email protected]>
mwifiex: Fix mem leak in mwifiex_tm_cmd
Kangjie Lu <[email protected]>
rtlwifi: fix a potential NULL pointer dereference
Nathan Chancellor <[email protected]>
iio: common: ssp_sensors: Initialize calculated_time in ssp_common_process_data
Kangjie Lu <[email protected]>
iio: hmc5843: fix potential NULL pointer dereferences
Lars-Peter Clausen <[email protected]>
iio: ad_sigma_delta: Properly handle SPI bus locking vs CS assertion
Kees Cook <[email protected]>
x86/build: Keep local relocations with ld.lld
David Kozub <[email protected]>
block: sed-opal: fix IOC_OPAL_ENABLE_DISABLE_MBR
Wen Yang <[email protected]>
cpufreq: kirkwood: fix possible object reference leak
Wen Yang <[email protected]>
cpufreq: pmac32: fix possible object reference leak
Wen Yang <[email protected]>
cpufreq/pasemi: fix possible object reference leak
Wen Yang <[email protected]>
cpufreq: ppc_cbe: fix possible object reference leak
Arnd Bergmann <[email protected]>
s390: cio: fix cio_irb declaration
Borislav Petkov <[email protected]>
x86/microcode: Fix the ancient deprecated microcode loading method
Arnd Bergmann <[email protected]>
s390: zcrypt: initialize variables before_use
Douglas Anderson <[email protected]>
clk: rockchip: Make rkpwm a critical clock on rk3288
Charles Keepax <[email protected]>
extcon: arizona: Disable mic detect if running when driver is removed
Douglas Anderson <[email protected]>
clk: rockchip: Fix video codec clocks on rk3288
Ulf Hansson <[email protected]>
PM / core: Propagate dev->power.wakeup_path when no callbacks
Christian König <[email protected]>
drm/amdgpu: fix old fence check in amdgpu_fence_emit
Yinbo Zhu <[email protected]>
mmc: sdhci-of-esdhc: add erratum eSDHC-A001 and A-008358 support
Yinbo Zhu <[email protected]>
mmc: sdhci-of-esdhc: add erratum A-009204 support
Yinbo Zhu <[email protected]>
mmc: sdhci-of-esdhc: add erratum eSDHC5 support
Kangjie Lu <[email protected]>
mmc_spi: add a status check for spi_sync_locked
Andrea Merello <[email protected]>
mmc: core: make pwrseq_emmc (partially) support sleepy GPIO controllers
John Garry <[email protected]>
scsi: libsas: Do discovery on empty PHY to update PHY info
Guenter Roeck <[email protected]>
hwmon: (f71805f) Use request_muxed_region for Super-IO accesses
Guenter Roeck <[email protected]>
hwmon: (pc87427) Use request_muxed_region for Super-IO accesses
Guenter Roeck <[email protected]>
hwmon: (smsc47b397) Use request_muxed_region for Super-IO accesses
Guenter Roeck <[email protected]>
hwmon: (smsc47m1) Use request_muxed_region for Super-IO accesses
Guenter Roeck <[email protected]>
hwmon: (vt1211) Use request_muxed_region for Super-IO accesses
Colin Ian King <[email protected]>
RDMA/cxgb4: Fix null pointer dereference on alloc_skb failure
Vincenzo Frascino <[email protected]>
arm64: vdso: Fix clock_getres() for CLOCK_REALTIME
Nicholas Nunley <[email protected]>
i40e: don't allow changes to HW VLAN stripping on active port VLANs
Adam Ludkiewicz <[email protected]>
i40e: Able to add up to 16 MAC filters on an untrusted VF
Paul Kocialkowski <[email protected]>
phy: sun4i-usb: Make sure to disable PHY0 passby for peripheral mode
Thomas Gleixner <[email protected]>
x86/irq/64: Limit IST stack overflow check to #DB stack
Alan Stern <[email protected]>
USB: core: Don't unbind interfaces following device reset failure
Wen Yang <[email protected]>
drm/msm: a5xx: fix possible object reference leak
Konstantin Khlebnikov <[email protected]>
sched/core: Handle overflow in cpu_shares_write_u64
Konstantin Khlebnikov <[email protected]>
sched/rt: Check integer overflow at usec to nsec conversion
Konstantin Khlebnikov <[email protected]>
sched/core: Check quota and period overflow at usec to nsec conversion
Roman Gushchin <[email protected]>
cgroup: protect cgroup->nr_(dying_)descendants by css_set_lock
Sebastian Andrzej Siewior <[email protected]>
random: add a spinlock_t to struct batched_entropy
Russell Currey <[email protected]>
powerpc/64: Fix booting large kernels with STRICT_KERNEL_RWX
Nathan Lynch <[email protected]>
powerpc/numa: improve control of topology updates
Dan Carpenter <[email protected]>
media: pvrusb2: Prevent a buffer overflow
Shuah Khan <[email protected]>
media: au0828: Fix NULL pointer dereference in au0828_analog_stream_enable()
Hugues Fruchet <[email protected]>
media: stm32-dcmi: fix crash when subdev do not expose any formats
Wenwen Wang <[email protected]>
audit: fix a memory leak bug
Akinobu Mita <[email protected]>
media: ov2659: make S_FMT succeed even if requested format doesn't match
Hans Verkuil <[email protected]>
media: au0828: stop video streaming only when last user stops
Janusz Krzysztofik <[email protected]>
media: ov6650: Move v4l2_clk_get() to ov6650_video_probe() helper
Philipp Zabel <[email protected]>
media: coda: clear error return value before picture run
Nicolas Ferre <[email protected]>
dmaengine: at_xdmac: remove BUG_ON macro in tasklet
Douglas Anderson <[email protected]>
clk: rockchip: undo several noc and special clocks as critical on rk3288
Wen Yang <[email protected]>
pinctrl: samsung: fix leaked of_node references
Wen Yang <[email protected]>
pinctrl: pistachio: fix leaked of_node references
Hans de Goede <[email protected]>
HID: logitech-hidpp: use RAP instead of FAP to get the protocol version
Peter Zijlstra <[email protected]>
mm/uaccess: Use 'unsigned long' to placate UBSAN warnings on older GCC versions
Jiri Kosina <[email protected]>
x86/mm: Remove in_nmi() warning from 64-bit implementation of vmalloc_fault()
Sebastian Andrzej Siewior <[email protected]>
smpboot: Place the __percpu annotation correctly
Kees Cook <[email protected]>
x86/build: Move _etext to actual end of .text
Farhan Ali <[email protected]>
vfio-ccw: Release any channel program when releasing/removing vfio-ccw mdev
Farhan Ali <[email protected]>
vfio-ccw: Do not call flush_workqueue while holding the spinlock
Arnd Bergmann <[email protected]>
bcache: avoid clang -Wunintialized warning
Coly Li <[email protected]>
bcache: add failure check to run_cache_set() for journal replay
Tang Junhui <[email protected]>
bcache: fix failure in journal relplay
Coly Li <[email protected]>
bcache: return error immediately in bch_journal_replay()
Corentin Labbe <[email protected]>
crypto: sun4i-ss - Fix invalid calculation of hash end
Kangjie Lu <[email protected]>
net: cw1200: fix a NULL pointer dereference
Dan Carpenter <[email protected]>
mwifiex: prevent an array overflow
Daniel Baluta <[email protected]>
ASoC: fsl_sai: Update is_slave_mode with correct value
Daniel T. Lee <[email protected]>
libbpf: fix samples/bpf build failure due to undefined UINT32_MAX
Sergey Matyukevich <[email protected]>
mac80211/cfg80211: update bss channel on channel switch
Sugar Zhang <[email protected]>
dmaengine: pl330: _stop: clear interrupt status
Mariusz Bialonczyk <[email protected]>
w1: fix the resume command API
Manish Rangankar <[email protected]>
scsi: qedi: Abort ep termination if offload not scheduled
Sven Van Asbroeck <[email protected]>
rtc: 88pm860x: prevent use-after-free on device remove
Johannes Berg <[email protected]>
iwlwifi: pcie: don't crash on invalid RX interrupt
Qu Wenruo <[email protected]>
btrfs: Don't panic when we can't find a root key
Josef Bacik <[email protected]>
btrfs: fix panic during relocation after ENOSPC before writeback happens
Robbie Ko <[email protected]>
Btrfs: fix data bytes_may_use underflow with fallocate due to failed quota reserve
Bart Van Assche <[email protected]>
scsi: qla2xxx: Avoid that lockdep complains about unsafe locking in tcm_qla2xxx_close_session()
Bart Van Assche <[email protected]>
scsi: qla2xxx: Fix abort handling in tcm_qla2xxx_write_pending()
Bart Van Assche <[email protected]>
scsi: qla2xxx: Fix a qla24xx_enable_msix() error path
Viresh Kumar <[email protected]>
sched/cpufreq: Fix kobject memleak
Qian Cai <[email protected]>
arm64: Fix compiler warning from pte_unmap() with -Wunused-but-set-variable
Marc Zyngier <[email protected]>
ARM: vdso: Remove dependency with the arch_timer driver internals
Pierre-Louis Bossart <[email protected]>
ACPI / property: fix handling of data_nodes in acpi_get_next_subnode()
Dan Carpenter <[email protected]>
brcm80211: potential NULL dereference in brcmf_cfg80211_vndr_cmds_dcmd_handler()
Flavio Suligoi <[email protected]>
spi: pxa2xx: fix SCR (divisor) calculation
Arnd Bergmann <[email protected]>
ASoC: imx: fix fiq dependencies
Bo YU <[email protected]>
powerpc/boot: Fix missing check of lseek() return value
Anju T Sudhakar <[email protected]>
powerpc/perf: Return accordingly on invalid chip-id in
Jerome Brunet <[email protected]>
ASoC: hdmi-codec: unlock the device on startup errors
Wen Yang <[email protected]>
pinctrl: zte: fix leaked of_node references
Sameeh Jubran <[email protected]>
net: ena: gcc 8: fix compilation warning
Sameer Pujar <[email protected]>
dmaengine: tegra210-dma: free dma controller in remove()
Vineet Gupta <[email protected]>
tools/bpf: fix perf build error with uClibc (seen on ARC)
Raul E Rangel <[email protected]>
mmc: core: Verify SD bus width
Andreas Gruenbacher <[email protected]>
gfs2: Fix occasional glock use-after-free
Mike Marciniszyn <[email protected]>
IB/hfi1: Fix WQ_MEM_RECLAIM warning
Roberto Bergantinos Corpas <[email protected]>
NFS: make nfs_match_client killable
YueHaibing <[email protected]>
cxgb4: Fix error path in cxgb4_init_module
Ross Lagerwall <[email protected]>
gfs2: Fix lru_count going negative
David Sterba <[email protected]>
Revert "btrfs: Honour FITRIM range constraints during free space trim"
William Tu <[email protected]>
net: erspan: fix use-after-free
YueHaibing <[email protected]>
at76c50x-usb: Don't register led_trigger if usb_register_driver failed
Linus Lüssing <[email protected]>
batman-adv: mcast: fix multicast tt/tvlv worker locking
Eric Dumazet <[email protected]>
bpf: devmap: fix use-after-free Read in __dev_map_entry_free
YueHaibing <[email protected]>
ssb: Fix possible NULL pointer dereference in ssb_host_pcmcia_exit
Alexander Potapenko <[email protected]>
media: vivid: use vfree() instead of kfree() for dev->bitmap_cap
YueHaibing <[email protected]>
media: serial_ir: Fix use-after-free in serial_ir_init_module
YueHaibing <[email protected]>
media: cpia2: Fix use-after-free in cpia2_exit
Jiufei Xue <[email protected]>
fbdev: fix WARNING in __alloc_pages_nodemask bug
Josef Bacik <[email protected]>
btrfs: honor path->skip_locking in backref code
Arend van Spriel <[email protected]>
brcmfmac: add subtype check for event handling in data path
Arend van Spriel <[email protected]>
brcmfmac: assure SSID length from firmware is limited
Mike Kravetz <[email protected]>
hugetlb: use same fault hash key for shared and private mappings
Shile Zhang <[email protected]>
fbdev: fix divide error in fb_var_to_videomode
Tobin C. Harding <[email protected]>
btrfs: sysfs: don't leak memory when failing add fsid
Tobin C. Harding <[email protected]>
btrfs: sysfs: Fix error path kobject memory leak
Filipe Manana <[email protected]>
Btrfs: fix race between ranged fsync and writeback of adjacent ranges
Filipe Manana <[email protected]>
Btrfs: avoid fallback to transaction commit during fsync of files with holes
Filipe Manana <[email protected]>
Btrfs: do not abort transaction at btrfs_update_root() after failure to COW path
Andreas Gruenbacher <[email protected]>
gfs2: Fix sign extension bug in gfs2_update_stats
Christoph Hellwig <[email protected]>
arm64/iommu: handle non-remapped addresses in ->mmap and ->get_sgtable
Dan Williams <[email protected]>
libnvdimm/namespace: Fix label tracking error
Dan Williams <[email protected]>
libnvdimm/pmem: Bypass CONFIG_HARDENED_USERCOPY overhead
Suthikulpanit, Suravee <[email protected]>
kvm: svm/avic: fix off-by-one in checking host APIC ID
Trac Hoang <[email protected]>
mmc: sdhci-iproc: Set NO_HISPD bit to fix HS50 data hold time problem
Trac Hoang <[email protected]>
mmc: sdhci-iproc: cygnus: Set NO_HISPD bit to fix HS50 data hold time problem
Daniel Axtens <[email protected]>
crypto: vmx - CTR: always increment IV as quadword
Martin K. Petersen <[email protected]>
Revert "scsi: sd: Keep disk read-only when re-reading partition"
Andrea Parri <[email protected]>
sbitmap: fix improper use of smp_mb__before_atomic()
Andrea Parri <[email protected]>
bio: fix improper use of smp_mb__before_atomic()
Paolo Bonzini <[email protected]>
KVM: x86: fix return value for reserved EFER
Damien Le Moal <[email protected]>
f2fs: Fix use of number of devices
Jan Kara <[email protected]>
ext4: do not delete unlinked inode from orphan list on failed truncate
Steven Rostedt (VMware) <[email protected]>
x86: Hide the int3_emulate_call/jmp functions from UML
-------------
Diffstat:
Makefile | 4 +- arch/arm/include/asm/cp15.h | 2 + arch/arm/vdso/vgettimeofday.c | 5 ++- arch/arm64/include/asm/pgtable.h | 3 +- arch/arm64/include/asm/vdso_datapage.h | 1 + arch/arm64/kernel/asm-offsets.c | 2 +- arch/arm64/kernel/cpu_ops.c | 1 + arch/arm64/kernel/vdso.c | 3 ++ arch/arm64/kernel/vdso/gettimeofday.S | 7 ++- arch/arm64/mm/dma-mapping.c | 10 +++++ arch/powerpc/boot/addnote.c | 6 ++- arch/powerpc/kernel/head_64.S | 4 +- arch/powerpc/mm/numa.c | 18 +++++--- arch/powerpc/perf/imc-pmu.c | 5 +++ arch/x86/Makefile | 2 +- arch/x86/ia32/ia32_signal.c | 29 +++++++----- arch/x86/include/asm/text-patching.h | 4 +- arch/x86/kernel/cpu/mcheck/mce.c | 44 +++++++++++++++--- arch/x86/kernel/cpu/microcode/core.c | 3 +- arch/x86/kernel/irq_64.c | 19 +++++--- arch/x86/kernel/signal.c | 29 +++++++----- arch/x86/kernel/vmlinux.lds.S | 6 +-- arch/x86/kvm/svm.c | 6 ++- arch/x86/kvm/x86.c | 2 +- arch/x86/mm/fault.c | 2 - block/sed-opal.c | 9 ++-- drivers/acpi/property.c | 8 ++++ drivers/base/power/main.c | 4 ++ drivers/char/hw_random/omap-rng.c | 1 + drivers/char/random.c | 52 +++++++++++----------- drivers/char/virtio_console.c | 3 +- drivers/clk/rockchip/clk-rk3288.c | 21 ++++----- drivers/cpufreq/cpufreq.c | 1 + drivers/cpufreq/cpufreq_governor.c | 2 + drivers/cpufreq/kirkwood-cpufreq.c | 19 ++++---- drivers/cpufreq/pasemi-cpufreq.c | 1 + drivers/cpufreq/pmac32-cpufreq.c | 2 + drivers/cpufreq/ppc_cbe_cpufreq.c | 1 + drivers/crypto/sunxi-ss/sun4i-ss-hash.c | 5 ++- drivers/crypto/vmx/aesp8-ppc.pl | 2 +- drivers/dma/at_xdmac.c | 6 ++- drivers/dma/pl330.c | 10 +++-- drivers/dma/tegra210-adma.c | 28 ++++++------ drivers/extcon/extcon-arizona.c | 10 +++++ drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 24 +++++++--- drivers/gpu/drm/drm_drv.c | 5 ++- drivers/gpu/drm/drm_file.c | 1 + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 10 +++-- drivers/hid/hid-core.c | 36 ++++++++++----- drivers/hid/hid-logitech-hidpp.c | 23 +++++++--- drivers/hwmon/f71805f.c | 15 +++++-- drivers/hwmon/pc87427.c | 14 +++++- drivers/hwmon/smsc47b397.c | 13 +++++- drivers/hwmon/smsc47m1.c | 28 ++++++++---- drivers/hwmon/vt1211.c | 15 +++++-- drivers/iio/adc/ad_sigma_delta.c | 16 ++++--- drivers/iio/common/ssp_sensors/ssp_iio.c | 2 +- drivers/iio/magnetometer/hmc5843_i2c.c | 7 ++- drivers/iio/magnetometer/hmc5843_spi.c | 7 ++- drivers/infiniband/hw/cxgb4/cm.c | 2 + drivers/infiniband/hw/hfi1/init.c | 3 +- drivers/infiniband/hw/hns/hns_roce_ah.c | 2 +- drivers/md/bcache/alloc.c | 5 ++- drivers/md/bcache/journal.c | 26 +++++++++-- drivers/md/bcache/super.c | 17 ++++--- drivers/media/dvb-frontends/m88ds3103.c | 9 ++-- drivers/media/i2c/ov2659.c | 6 ++- drivers/media/i2c/ov6650.c | 25 ++++++----- drivers/media/pci/saa7146/hexium_gemini.c | 5 +-- drivers/media/pci/saa7146/hexium_orion.c | 5 +-- drivers/media/platform/coda/coda-bit.c | 3 ++ drivers/media/platform/stm32/stm32-dcmi.c | 6 +++ drivers/media/platform/video-mux.c | 5 +++ drivers/media/platform/vimc/vimc-core.c | 2 + drivers/media/platform/vimc/vimc-streamer.c | 2 +- drivers/media/platform/vivid/vivid-vid-cap.c | 2 +- drivers/media/radio/wl128x/fmdrv_common.c | 7 ++- drivers/media/rc/serial_ir.c | 9 +--- drivers/media/usb/au0828/au0828-video.c | 16 ++++--- drivers/media/usb/cpia2/cpia2_v4l.c | 3 +- drivers/media/usb/go7007/go7007-fw.c | 4 +- drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 2 + drivers/media/usb/pvrusb2/pvrusb2-hdw.h | 1 + drivers/mmc/core/pwrseq_emmc.c | 38 ++++++++-------- drivers/mmc/core/sd.c | 8 ++++ drivers/mmc/host/mmc_spi.c | 4 ++ drivers/mmc/host/sdhci-iproc.c | 6 ++- drivers/mmc/host/sdhci-of-esdhc.c | 8 ++++ drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +- drivers/net/ethernet/chelsio/cxgb3/l2t.h | 2 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 15 +++++-- drivers/net/ethernet/intel/i40e/i40e_main.c | 8 ++++ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 6 ++- drivers/net/wireless/atmel/at76c50x-usb.c | 4 +- drivers/net/wireless/broadcom/b43/phy_lp.c | 6 +-- .../broadcom/brcm80211/brcmfmac/cfg80211.c | 6 +++ .../wireless/broadcom/brcm80211/brcmfmac/core.c | 15 ++++--- .../wireless/broadcom/brcm80211/brcmfmac/fweh.h | 16 +++++-- .../broadcom/brcm80211/brcmfmac/fwsignal.c | 42 +++++++++-------- .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 2 +- .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 27 ++++++----- .../wireless/broadcom/brcm80211/brcmfmac/vendor.c | 5 ++- drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 7 ++- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 6 ++- drivers/net/wireless/marvell/mwifiex/cfp.c | 3 ++ drivers/net/wireless/realtek/rtlwifi/base.c | 5 +++ .../net/wireless/realtek/rtlwifi/rtl8188ee/fw.c | 2 + .../wireless/realtek/rtlwifi/rtl8192c/fw_common.c | 2 + .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.c | 2 + .../net/wireless/realtek/rtlwifi/rtl8723ae/fw.c | 2 + .../net/wireless/realtek/rtlwifi/rtl8723be/fw.c | 2 + .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.c | 4 ++ drivers/net/wireless/st/cw1200/main.c | 5 +++ drivers/nvdimm/label.c | 29 ++++++------ drivers/nvdimm/namespace_devs.c | 15 +++++++ drivers/nvdimm/nd.h | 4 ++ drivers/nvdimm/pmem.c | 8 +++- drivers/phy/allwinner/phy-sun4i-usb.c | 4 ++ drivers/pinctrl/pinctrl-pistachio.c | 2 + drivers/pinctrl/samsung/pinctrl-exynos-arm.c | 1 + drivers/pinctrl/zte/pinctrl-zx.c | 1 + drivers/rtc/rtc-88pm860x.c | 2 +- drivers/rtc/rtc-xgene.c | 18 +++++--- drivers/s390/cio/cio.h | 2 +- drivers/s390/cio/vfio_ccw_drv.c | 32 +++++++------ drivers/s390/cio/vfio_ccw_ops.c | 11 ++++- drivers/s390/crypto/zcrypt_api.c | 4 ++ drivers/scsi/libsas/sas_expander.c | 5 +++ drivers/scsi/lpfc/lpfc_ct.c | 20 ++++++--- drivers/scsi/lpfc/lpfc_hbadisc.c | 11 ++++- drivers/scsi/qedf/qedf_io.c | 1 + drivers/scsi/qedi/qedi_iscsi.c | 3 ++ drivers/scsi/qla2xxx/qla_isr.c | 6 ++- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 5 ++- drivers/scsi/qla4xxx/ql4_os.c | 2 +- drivers/scsi/sd.c | 3 +- drivers/scsi/ufs/ufshcd.c | 28 ++++++++---- drivers/spi/spi-pxa2xx.c | 8 +++- drivers/spi/spi-rspi.c | 9 ++-- drivers/spi/spi-tegra114.c | 32 +++++++------ drivers/spi/spi-topcliff-pch.c | 15 ++++++- drivers/spi/spi.c | 2 + drivers/ssb/bridge_pcmcia_80211.c | 9 +++- drivers/thunderbolt/switch.c | 22 ++++++--- drivers/tty/ipwireless/main.c | 8 ++++ drivers/usb/core/hcd.c | 3 ++ drivers/usb/core/hub.c | 5 ++- drivers/video/fbdev/core/fbcmap.c | 2 + drivers/video/fbdev/core/modedb.c | 3 ++ drivers/w1/w1_io.c | 3 +- fs/btrfs/backref.c | 17 ++++--- fs/btrfs/extent-tree.c | 28 +++--------- fs/btrfs/file.c | 15 ++++++- fs/btrfs/relocation.c | 31 ++++++++----- fs/btrfs/root-tree.c | 17 +++---- fs/btrfs/sysfs.c | 7 ++- fs/btrfs/tree-log.c | 1 + fs/char_dev.c | 6 +++ fs/ext4/inode.c | 2 +- fs/f2fs/data.c | 17 ++++--- fs/f2fs/f2fs.h | 11 +++++ fs/f2fs/file.c | 2 +- fs/f2fs/gc.c | 2 +- fs/f2fs/segment.c | 6 +-- fs/gfs2/glock.c | 23 ++++++---- fs/gfs2/lock_dlm.c | 9 ++-- fs/gfs2/log.c | 3 +- fs/gfs2/lops.c | 6 ++- fs/hugetlbfs/inode.c | 8 +--- fs/nfs/client.c | 7 ++- include/linux/bio.h | 2 +- include/linux/cgroup-defs.h | 5 +++ include/linux/hid.h | 1 + include/linux/hugetlb.h | 4 +- include/linux/iio/adc/ad_sigma_delta.h | 1 + include/linux/smpboot.h | 2 +- kernel/auditfilter.c | 12 ++--- kernel/bpf/devmap.c | 3 ++ kernel/cgroup/cgroup.c | 6 +++ kernel/rcu/rcuperf.c | 5 +++ kernel/rcu/rcutorture.c | 5 +++ kernel/sched/core.c | 9 +++- kernel/sched/rt.c | 5 +++ kernel/trace/trace_branch.c | 4 ++ lib/kobject_uevent.c | 11 +++-- lib/sbitmap.c | 2 +- lib/strncpy_from_user.c | 5 ++- lib/strnlen_user.c | 4 +- mm/hugetlb.c | 23 +++------- mm/userfaultfd.c | 3 +- net/batman-adv/distributed-arp-table.c | 4 +- net/batman-adv/main.c | 1 + net/batman-adv/multicast.c | 11 ++--- net/batman-adv/types.h | 2 + net/ipv4/ip_gre.c | 2 +- net/mac80211/mlme.c | 3 -- net/wireless/nl80211.c | 5 +++ sound/soc/codecs/hdmi-codec.c | 6 ++- sound/soc/davinci/davinci-mcasp.c | 2 + sound/soc/fsl/Kconfig | 9 ++-- sound/soc/fsl/eukrea-tlv320.c | 4 +- sound/soc/fsl/fsl_sai.c | 2 + sound/soc/fsl/fsl_utils.c | 1 + tools/lib/bpf/bpf.c | 2 + tools/lib/bpf/bpf.h | 1 + 205 files changed, 1216 insertions(+), 552 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/193 x86: Hide the int3_emulate_call/jmp functions from UML
From: Steven Rostedt (VMware) <[email protected]>
commit 693713cbdb3a4bda5a8a678c31f06560bbb14657 upstream.
User Mode Linux does not have access to the ip or sp fields of the pt_regs, and accessing them causes UML to fail to build. Hide the int3_emulate_jmp() and int3_emulate_call() instructions from UML, as it doesn't need them anyway.
--- arch/x86/include/asm/text-patching.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/include/asm/text-patching.h +3 -1
@@ -38,6 +38,7 @@ extern void *text_poke(void *addr, constextern int poke_int3_handler (struct pt_regs *regs);extern void *text_poke_bp (void *addr,const void *opcode,size_t len,void *handler); +#ifndef CONFIG_UML_X86 static inline void int3_emulate_jmp (struct pt_regs *regs,unsigned long ip) { regs->ip = ip;
@@ -64,6 +65,7 @@ static inline void int3_emulate_call(strint3_emulate_push (regs, regs->ip -INT3_INSN_SIZE +CALL_INSN_SIZE );int3_emulate_jmp (regs, func); } -#endif +#endif /* CONFIG_X86_64 */ +#endif /* !CONFIG_UML_X86 */ #endif /* _ASM_X86_TEXT_PATCHING_H */
Greg Kroah-Hartman
maintainerPATCH 2/193 ext4: do not delete unlinked inode from orphan list on failed truncate
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
commit ee0ed02ca93ef1ecf8963ad96638795d55af2c14 upstream.
It is possible that unlinked inode enters ext4_setattr() (e.g. if somebody calls ftruncate(2) on unlinked but still open file). In such case we should not delete the inode from the orphan list if truncate fails. Note that this is mostly a theoretical concern as filesystem is corrupted if we reach this path anyway but let's be consistent in our orphan handling.
--- fs/ext4/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ext4/inode.c +1 -1
@@ -5450,7 +5450,7 @@ int ext4_setattr(struct dentry *dentry,up_write (&EXT4_I (inode)->i_data_sem);ext4_journal_stop (handle);if (error) { -if (orphan) +if (orphan && inode->i_nlink)ext4_orphan_del (NULL , inode); goto err_out; }
Greg Kroah-Hartman
maintainerPATCH 3/193 f2fs: Fix use of number of devices
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
commit 0916878da355650d7e77104a7ac0fa1784eca852 upstream.
For a single device mount using a zoned block device, the zone information for the device is stored in the sbi->devs single entry array and sbi->s_ndevs is set to 1. This differs from a single device mount using a regular block device which does not allocate sbi->devs and sets sbi->s_ndevs to 0.
However, sbi->s_devs == 0 condition is used throughout the code to differentiate a single device mount from a multi-device mount where sbi->s_ndevs is always larger than 1. This results in problems with single zoned block device volumes as these are treated as multi-device mounts but do not have the start_blk and end_blk information set. One of the problem observed is skipping of zone discard issuing resulting in write commands being issued to full zones or unaligned to a zone write pointer.
Fix this problem by simply treating the cases sbi->s_ndevs == 0 (single regular block device mount) and sbi->s_ndevs == 1 (single zoned block device mount) in the same manner. This is done by introducing the helper function f2fs_is_multi_device() and using this helper in place of direct tests of sbi->s_ndevs value, improving code readability.
--- fs/f2fs/data.c | 17 +++++++++++------ fs/f2fs/f2fs.h | 11 +++++++++++ fs/f2fs/file.c | 2 +- fs/f2fs/gc.c | 2 +- fs/f2fs/segment.c | 6 +++--- 5 files changed, 27 insertions(+), 11 deletions(-)
fs/f2fs/data.c +11 -6
@@ -133,12 +133,14 @@ struct block_device *f2fs_target_device(struct block_device *bdev = sbi->sb->s_bdev;int i; -for (i =0 ; i < sbi->s_ndevs; i++) { -if (FDEV (i).start_blk <= blk_addr && -FDEV (i).end_blk >= blk_addr) { - blk_addr -=FDEV (i).start_blk; - bdev =FDEV (i).bdev; -break ; +if (f2fs_is_multi_device (sbi)) { +for (i =0 ; i < sbi->s_ndevs; i++) { +if (FDEV (i).start_blk <= blk_addr && +FDEV (i).end_blk >= blk_addr) { + blk_addr -=FDEV (i).start_blk; + bdev =FDEV (i).bdev; +break ; + } } }if (bio) {
@@ -152,6 +154,9 @@ int f2fs_target_device_index(struct f2fs {int i; +if (!f2fs_is_multi_device (sbi)) +return 0 ; +for (i =0 ; i < sbi->s_ndevs; i++)if (FDEV (i).start_blk <= blkaddr &&FDEV (i).end_blk >= blkaddr)return i;
fs/f2fs/f2fs.h +11 -0
@@ -1167,6 +1167,17 @@ static inline bool time_to_inject(struct }#endif +/* +* Test if the mounted volume is a multi-device volume. +* - For a single regular disk volume, sbi->s_ndevs is 0. +* - For a single zoned disk volume, sbi->s_ndevs is 1. +* - For a multi-device volume, sbi->s_ndevs is always 2 or more. +*/ +static inline bool f2fs_is_multi_device (struct f2fs_sb_info *sbi) +{ +return sbi->s_ndevs >1 ; +} +/* For write statistics. Suppose sector size is 512 bytes, * and the return value is in kbytes. s is of struct f2fs_sb_info. */
fs/f2fs/file.c +1 -1
@@ -2407,7 +2407,7 @@ static int f2fs_ioc_flush_device(struct sizeof(range)))return -EFAULT ; -if (sbi->s_ndevs <=1 || sbi->s_ndevs -1 <= range.dev_num || +if (!f2fs_is_multi_device (sbi) || sbi->s_ndevs -1 <= range.dev_num || sbi->segs_per_sec !=1 ) { f2fs_msg(sbi->sb, KERN_WARNING, "Can't flush %u in %d for segs_per_sec %u != 1\n",
fs/f2fs/gc.c +1 -1
@@ -1111,7 +1111,7 @@ void build_gc_manager(struct f2fs_sb_inf BLKS_PER_SEC(sbi), (main_count - resv_count));/* give warm/cold data area from slower device */ -if (sbi->s_ndevs && sbi->segs_per_sec ==1 ) +if (f2fs_is_multi_device (sbi) && sbi->segs_per_sec ==1 )SIT_I (sbi)->last_victim[ALLOC_NEXT ] =GET_SEGNO (sbi,FDEV (0 ).end_blk) +1 ; }
fs/f2fs/segment.c +3 -3
@@ -495,7 +495,7 @@ static int submit_flush_wait(struct f2fsint ret =__submit_flush_wait (sbi, sbi->sb->s_bdev);int i; -if (!sbi->s_ndevs || ret) +if (!f2fs_is_multi_device (sbi) || ret)return ret;for (i =1 ; i < sbi->s_ndevs; i++) {
@@ -1050,7 +1050,7 @@ static int __queue_discard_cmd(struct f2trace_f2fs_queue_discard (bdev, blkstart, blklen); -if (sbi->s_ndevs) { +if (f2fs_is_multi_device (sbi)) {int devi =f2fs_target_device_index (sbi, blkstart); blkstart -=FDEV (devi).start_blk;
@@ -1283,7 +1283,7 @@ static int __f2fs_issue_discard_zone(strblock_t lblkstart = blkstart;int devi =0 ; -if (sbi->s_ndevs) { +if (f2fs_is_multi_device (sbi)) { devi =f2fs_target_device_index (sbi, blkstart); blkstart -=FDEV (devi).start_blk; }
Greg Kroah-Hartman
maintainerPATCH 4/193 KVM: x86: fix return value for reserved EFER
In reply to Greg Kroah-HartmanFrom: Paolo Bonzini <[email protected]>
commit 66f61c92889ff3ca365161fb29dd36d6354682ba upstream.
Commit 11988499e62b ("KVM: x86: Skip EFER vs. guest CPUID checks for host-initiated writes", 2019-04-02) introduced a "return false" in a function returning int, and anyway set_efer has a "nonzero on error" conventon so it should be returning 1.
--- arch/x86/kvm/x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/x86.c +1 -1
@@ -1133,7 +1133,7 @@ static int set_efer(struct kvm_vcpu *vcpu64 efer = msr_info->data;if (efer & efer_reserved_bits) -return false; +return 1 ;if (!msr_info->host_initiated) {if (!__kvm_valid_efer (vcpu, efer))
Greg Kroah-Hartman
maintainerPATCH 5/193 bio: fix improper use of smp_mb__before_atomic()
In reply to Greg Kroah-HartmanFrom: Andrea Parri <[email protected]>
commit f381c6a4bd0ae0fde2d6340f1b9bb0f58d915de6 upstream.
This barrier only applies to the read-modify-write operations; in particular, it does not apply to the atomic_set() primitive.
Replace the barrier with an smp_mb().
--- include/linux/bio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/bio.h +1 -1
@@ -260,7 +260,7 @@ static inline void bio_cnt_set(struct bi {if (count !=1 ) { bio->bi_flags |= (1 <<BIO_REFFED ); -smp_mb__before_atomic (); +smp_mb (); }atomic_set (&bio->__bi_cnt, count); }
Greg Kroah-Hartman
maintainerPATCH 6/193 sbitmap: fix improper use of smp_mb__before_atomic()
In reply to Greg Kroah-HartmanFrom: Andrea Parri <[email protected]>
commit a0934fd2b1208458e55fc4b48f55889809fce666 upstream.
This barrier only applies to the read-modify-write operations; in particular, it does not apply to the atomic_set() primitive.
Replace the barrier with an smp_mb().
--- lib/sbitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/sbitmap.c +1 -1
@@ -338,7 +338,7 @@ void sbitmap_queue_resize(struct sbitmap* Pairs with the memory barrier in sbq_wake_up() to ensure that * the batch size is updated before the wait counts. */ -smp_mb__before_atomic (); +smp_mb ();for (i =0 ; i <SBQ_WAIT_QUEUES ; i++)atomic_set (&sbq->ws[i].wait_cnt,1 ); }
Greg Kroah-Hartman
maintainerPATCH 7/193 Revert "scsi: sd: Keep disk read-only when re-reading partition"
In reply to Greg Kroah-HartmanFrom: Martin K. Petersen <[email protected]>
commit 8acf608e602f6ec38b7cc37b04c80f1ce9a1a6cc upstream.
This reverts commit 20bd1d026aacc5399464f8328f305985c493cde3.
This patch introduced regressions for devices that come online in read-only state and subsequently switch to read-write.
Given how the partition code is currently implemented it is not possible to persist the read-only flag across a device revalidate call. This may need to get addressed in the future since it is common for user applications to proactively call BLKRRPART.
Reverting this commit will re-introduce a regression where a device-initiated revalidate event will cause the admin state to be forgotten. A separate patch will address this issue.
--- drivers/scsi/sd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/sd.c +1 -2
@@ -2616,7 +2616,6 @@ sd_read_write_protect_flag(struct scsi_dint res;struct scsi_device *sdp = sdkp->device;struct scsi_mode_data data; -int disk_ro =get_disk_ro (sdkp->disk);int old_wp = sdkp->write_prot;set_disk_ro (sdkp->disk,0 );
@@ -2657,7 +2656,7 @@ sd_read_write_protect_flag(struct scsi_d "Test WP failed, assume Write Enabled\n"); }else { sdkp->write_prot = ((data.device_specific &0x80 ) !=0 ); -set_disk_ro (sdkp->disk, sdkp->write_prot || disk_ro); +set_disk_ro (sdkp->disk, sdkp->write_prot);if (sdkp->first_scan || old_wp != sdkp->write_prot) {sd_printk (KERN_NOTICE , sdkp,"Write Protect is %s\n" , sdkp->write_prot ?"on" :"off" );
Greg Kroah-Hartman
maintainerPATCH 8/193 crypto: vmx - CTR: always increment IV as quadword
In reply to Greg Kroah-HartmanFrom: Daniel Axtens <[email protected]>
commit 009b30ac7444c17fae34c4f435ebce8e8e2b3250 upstream.
The kernel self-tests picked up an issue with CTR mode:
alg: skcipher: p8_aes_ctr encryption test failed (wrong result) on test vector 3, cfg="uneven misaligned splits, may sleep"
Test vector 3 has an IV of FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD, so after 3 increments it should wrap around to 0.
In the aesp8-ppc code from OpenSSL, there are two paths that increment IVs: the bulk (8 at a time) path, and the individual path which is used when there are fewer than 8 AES blocks to process.
In the bulk path, the IV is incremented with vadduqm: "Vector Add Unsigned Quadword Modulo", which does 128-bit addition.
In the individual path, however, the IV is incremented with
vadduwm: "Vector Add Unsigned Word Modulo", which instead does 4 32-bit additions. Thus the IV would instead become FFFFFFFFFFFFFFFFFFFFFFFF00000000, throwing off the result.
Use vadduqm.
This was probably a typo originally, what with q and w being adjacent. It is a pretty narrow edge case: I am really impressed by the quality of the kernel self-tests!
--- drivers/crypto/vmx/aesp8-ppc.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/vmx/aesp8-ppc.pl +1 -1
@@ -1318,7 +1318,7 @@ Loop_ctr32_enc: addi $idx,$idx,16 bdnz Loop_ctr32_enc - vadduwm $ivec,$ivec,$one + vadduqm $ivec,$ivec,$one vmr $dat,$inptail lvx $inptail,0,$inp addi $inp,$inp,16
Greg Kroah-Hartman
maintainerPATCH 9/193 mmc: sdhci-iproc: cygnus: Set NO_HISPD bit to fix HS50 data hold time problem
In reply to Greg Kroah-HartmanFrom: Trac Hoang <[email protected]>
commit b7dfa695afc40d5396ed84b9f25aa3754de23e39 upstream.
The iproc host eMMC/SD controller hold time does not meet the specification in the HS50 mode. This problem can be mitigated by disabling the HISPD bit; thus forcing the controller output data to be driven on the falling clock edges rather than the rising clock edges.
This change applies only to the Cygnus platform.
Stable tag (v4.12+) chosen to assist stable kernel maintainers so that the change does not produce merge conflicts backporting to older kernel versions. In reality, the timing bug existed since the driver was first introduced but there is no need for this driver to be supported in kernel versions that old.
--- drivers/mmc/host/sdhci-iproc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-iproc.c +2 -1
@@ -185,7 +185,8 @@ static const struct sdhci_ops sdhci_ipro };static const struct sdhci_pltfm_data sdhci_iproc_cygnus_pltfm_data = { - .quirks =SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK , + .quirks =SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK | +SDHCI_QUIRK_NO_HISPD_BIT , .quirks2 =SDHCI_QUIRK2_ACMD23_BROKEN |SDHCI_QUIRK2_HOST_OFF_CARD_ON , .ops = &sdhci_iproc_32only_ops, };
Greg Kroah-Hartman
maintainerPATCH 10/193 mmc: sdhci-iproc: Set NO_HISPD bit to fix HS50 data hold time problem
In reply to Greg Kroah-HartmanFrom: Trac Hoang <[email protected]>
commit ec0970e0a1b2c807c908d459641a9f9a1be3e130 upstream.
The iproc host eMMC/SD controller hold time does not meet the specification in the HS50 mode. This problem can be mitigated by disabling the HISPD bit; thus forcing the controller output data to be driven on the falling clock edges rather than the rising clock edges.
Stable tag (v4.12+) chosen to assist stable kernel maintainers so that the change does not produce merge conflicts backporting to older kernel versions. In reality, the timing bug existed since the driver was first introduced but there is no need for this driver to be supported in kernel versions that old.
--- drivers/mmc/host/sdhci-iproc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-iproc.c +2 -1
@@ -209,7 +209,8 @@ static const struct sdhci_iproc_data iprstatic const struct sdhci_pltfm_data sdhci_iproc_pltfm_data = { .quirks =SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK | -SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12 , +SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12 | +SDHCI_QUIRK_NO_HISPD_BIT , .quirks2 =SDHCI_QUIRK2_ACMD23_BROKEN , .ops = &sdhci_iproc_ops, };
Greg Kroah-Hartman
maintainerPATCH 11/193 kvm: svm/avic: fix off-by-one in checking host APIC ID
In reply to Greg Kroah-HartmanFrom: Suthikulpanit, Suravee <[email protected]>
commit c9bcd3e3335d0a29d89fabd2c385e1b989e6f1b0 upstream.
Current logic does not allow VCPU to be loaded onto CPU with APIC ID 255. This should be allowed since the host physical APIC ID field in the AVIC Physical APIC table entry is an 8-bit value, and APIC ID 255 is valid in system with x2APIC enabled. Instead, do not allow VCPU load if the host APIC ID cannot be represented by an 8-bit value.
Also, use the more appropriate AVIC_PHYSICAL_ID_ENTRY_HOST_PHYSICAL_ID_MASK instead of AVIC_MAX_PHYSICAL_ID_COUNT.
--- arch/x86/kvm/svm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/x86/kvm/svm.c +5 -1
@@ -1567,7 +1567,11 @@ static void avic_vcpu_load(struct kvm_vcif (!kvm_vcpu_apicv_active (vcpu))return ; -if (WARN_ON (h_physical_id >=AVIC_MAX_PHYSICAL_ID_COUNT )) +/* +* Since the host physical APIC id is 8 bits, +* we can support host APIC ID upto 255. +*/ +if (WARN_ON (h_physical_id >AVIC_PHYSICAL_ID_ENTRY_HOST_PHYSICAL_ID_MASK ))return ; entry =READ_ONCE (*(svm->avic_physical_id_cache));
Greg Kroah-Hartman
maintainerPATCH 12/193 libnvdimm/pmem: Bypass CONFIG_HARDENED_USERCOPY overhead
In reply to Greg Kroah-HartmanFrom: Dan Williams <[email protected]>
commit 52f476a323f9efc959be1c890d0cdcf12e1582e0 upstream.
Jeff discovered that performance improves from ~375K iops to ~519K iops on a simple psync-write fio workload when moving the location of 'struct page' from the default PMEM location to DRAM. This result is surprising because the expectation is that 'struct page' for dax is only needed for third party references to dax mappings. For example, a dax-mapped buffer passed to another system call for direct-I/O requires 'struct page' for sending the request down the driver stack and pinning the page. There is no usage of 'struct page' for first party access to a file via read(2)/write(2) and friends.
However, this "no page needed" expectation is violated by CONFIG_HARDENED_USERCOPY and the check_copy_size() performed in copy_from_iter_full_nocache() and copy_to_iter_mcsafe(). The check_heap_object() helper routine assumes the buffer is backed by a slab allocator (DRAM) page and applies some checks. Those checks are invalid, dax pages do not originate from the slab, and redundant, dax_iomap_actor() has already validated that the I/O is within bounds. Specifically that routine validates that the logical file offset is within bounds of the file, then it does a sector-to-pfn translation which validates that the physical mapping is within bounds of the block device.
Bypass additional hardened usercopy overhead and call the 'no check' versions of the copy_{to,from}_iter operations directly.
--- drivers/nvdimm/pmem.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/nvdimm/pmem.c +7 -1
@@ -256,10 +256,16 @@ static long pmem_dax_direct_access(strucreturn __pmem_direct_access (pmem, pgoff, nr_pages, kaddr, pfn); } +/* +* Use the 'no check' versions of copy_from_iter_flushcache() and +* copy_to_iter_mcsafe() to bypass HARDENED_USERCOPY overhead. Bounds +* checking, both file offset and device offset, is handled by +* dax_iomap_actor() +*/ static size_t pmem_copy_from_iter (struct dax_device *dax_dev,pgoff_t pgoff,void *addr,size_t bytes,struct iov_iter *i) { -return copy_from_iter_flushcache (addr, bytes, i); +return _copy_from_iter_flushcache (addr, bytes, i); }static const struct dax_operations pmem_dax_ops = {
Greg Kroah-Hartman
maintainerPATCH 13/193 libnvdimm/namespace: Fix label tracking error
In reply to Greg Kroah-HartmanFrom: Dan Williams <[email protected]>
commit c4703ce11c23423d4b46e3d59aef7979814fd608 upstream.
Users have reported intermittent occurrences of DIMM initialization failures due to duplicate allocations of address capacity detected in the labels, or errors of the form below, both have the same root cause.
nd namespace1.4: failed to track label: 0
WARNING: CPU: 17 PID: 1381 at drivers/nvdimm/label.c:863
RIP: 0010:__pmem_label_update+0x56c/0x590 [libnvdimm]
Call Trace:
? nd_pmem_namespace_label_update+0xd6/0x160 [libnvdimm]
nd_pmem_namespace_label_update+0xd6/0x160 [libnvdimm]
uuid_store+0x17e/0x190 [libnvdimm]
kernfs_fop_write+0xf0/0x1a0
vfs_write+0xb7/0x1b0
ksys_write+0x57/0xd0
do_syscall_64+0x60/0x210Unfortunately those reports were typically with a busy parallel namespace creation / destruction loop making it difficult to see the components of the bug. However, Jane provided a simple reproducer using the work-in-progress sub-section implementation.
When ndctl is reconfiguring a namespace it may take an existing defunct / disabled namespace and reconfigure it with a new uuid and other parameters. Critically namespace_update_uuid() takes existing address resources and renames them for the new namespace to use / reconfigure as it sees fit. The bug is that this rename only happens in the resource tracking tree. Existing labels with the old uuid are not reaped leading to a scenario where multiple active labels reference the same span of address range.
Teach namespace_update_uuid() to flag any references to the old uuid for reaping at the next label update attempt.
--- drivers/nvdimm/label.c | 29 ++++++++++++++++------------- drivers/nvdimm/namespace_devs.c | 15 +++++++++++++++ drivers/nvdimm/nd.h | 4 ++++ 3 files changed, 35 insertions(+), 13 deletions(-)
drivers/nvdimm/label.c +16 -13
@@ -614,6 +614,17 @@ static const guid_t *to_abstraction_guidreturn &guid_null; } +static void reap_victim (struct nd_mapping *nd_mapping, +struct nd_label_ent *victim) +{ +struct nvdimm_drvdata *ndd =to_ndd (nd_mapping); +u32 slot =to_slot (ndd, victim->label); + +dev_dbg (ndd->dev,"free: %d\n" , slot); +nd_label_free_slot (ndd, slot); + victim->label =NULL ; +} +static int __pmem_label_update (struct nd_region *nd_region,struct nd_mapping *nd_mapping,struct nd_namespace_pmem *nspm,int pos,unsigned long flags)
@@ -621,9 +632,9 @@ static int __pmem_label_update(struct ndstruct nd_namespace_common *ndns = &nspm->nsio.common;struct nd_interleave_set *nd_set = nd_region->nd_set;struct nvdimm_drvdata *ndd =to_ndd (nd_mapping); -struct nd_label_ent *label_ent, *victim =NULL ;struct nd_namespace_label *nd_label;struct nd_namespace_index *nsindex; +struct nd_label_ent *label_ent;struct nd_label_id label_id;struct resource *res;unsigned long *free;
@@ -692,18 +703,10 @@ static int __pmem_label_update(struct ndlist_for_each_entry (label_ent, &nd_mapping->labels, list) {if (!label_ent->label)continue ; -if (memcmp (nspm->uuid, label_ent->label->uuid, -NSLABEL_UUID_LEN ) !=0 ) -continue ; - victim = label_ent; -list_move_tail (&victim->list, &nd_mapping->labels); -break ; - } -if (victim) { -dev_dbg (ndd->dev,"%s: free: %d\n" , __func__, slot); - slot =to_slot (ndd, victim->label); -nd_label_free_slot (ndd, slot); - victim->label =NULL ; +if (test_and_clear_bit (ND_LABEL_REAP , &label_ent->flags) + ||memcmp (nspm->uuid, label_ent->label->uuid, +NSLABEL_UUID_LEN ) ==0 ) +reap_victim (nd_mapping, label_ent); }/* update index */
drivers/nvdimm/namespace_devs.c +15 -0
@@ -1229,12 +1229,27 @@ static int namespace_update_uuid(structfor (i =0 ; i < nd_region->ndr_mappings; i++) {struct nd_mapping *nd_mapping = &nd_region->mapping[i];struct nvdimm_drvdata *ndd =to_ndd (nd_mapping); +struct nd_label_ent *label_ent;struct resource *res;for_each_dpa_resource (ndd, res)if (strcmp (res->name, old_label_id.id) ==0 )sprintf ((void *) res->name,"%s" , new_label_id.id); + +mutex_lock (&nd_mapping->lock); +list_for_each_entry (label_ent, &nd_mapping->labels, list) { +struct nd_namespace_label *nd_label = label_ent->label; +struct nd_label_id label_id; + +if (!nd_label) +continue ; +nd_label_gen_id (&label_id, nd_label->uuid, +__le32_to_cpu (nd_label->flags)); +if (strcmp (old_label_id.id, label_id.id) ==0 ) +set_bit (ND_LABEL_REAP , &label_ent->flags); + } +mutex_unlock (&nd_mapping->lock); }kfree (*old_uuid); out:
drivers/nvdimm/nd.h +4 -0
@@ -120,8 +120,12 @@ struct nd_percpu_lane {spinlock_t lock; }; +enum nd_label_flags { +ND_LABEL_REAP , +};struct nd_label_ent {struct list_head list; +unsigned long flags;struct nd_namespace_label *label; };
Greg Kroah-Hartman
maintainerPATCH 14/193 arm64/iommu: handle non-remapped addresses in ->mmap and ->get_sgtable
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
commit a98d9ae937d256ed679a935fc82d9deaa710d98e upstream.
DMA allocations that can't sleep may return non-remapped addresses, but we do not properly handle them in the mmap and get_sgtable methods. Resolve non-vmalloc addresses using virt_to_page to handle this corner case.
--- arch/arm64/mm/dma-mapping.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/arm64/mm/dma-mapping.c +10 -0
@@ -710,6 +710,11 @@ static int __iommu_mmap_attrs(struct devif (dma_mmap_from_dev_coherent (dev, vma, cpu_addr, size, &ret))return ret; +if (!is_vmalloc_addr (cpu_addr)) { +unsigned long pfn =page_to_pfn (virt_to_page (cpu_addr)); +return __swiotlb_mmap_pfn (vma, pfn, size); + } +if (attrs &DMA_ATTR_FORCE_CONTIGUOUS ) {/* * DMA_ATTR_FORCE_CONTIGUOUS allocations are always remapped,
@@ -733,6 +738,11 @@ static int __iommu_get_sgtable(struct deunsigned int count =PAGE_ALIGN (size) >>PAGE_SHIFT ;struct vm_struct *area =find_vm_area (cpu_addr); +if (!is_vmalloc_addr (cpu_addr)) { +struct page *page =virt_to_page (cpu_addr); +return __swiotlb_get_sgtable_page (sgt, page, size); + } +if (attrs &DMA_ATTR_FORCE_CONTIGUOUS ) {/* * DMA_ATTR_FORCE_CONTIGUOUS allocations are always remapped,
Greg Kroah-Hartman
maintainerPATCH 15/193 gfs2: Fix sign extension bug in gfs2_update_stats
In reply to Greg Kroah-HartmanFrom: Andreas Gruenbacher <[email protected]>
commit 5a5ec83d6ac974b12085cd99b196795f14079037 upstream.
Commit 4d207133e9c3 changed the types of the statistic values in struct gfs2_lkstats from s64 to u64. Because of that, what should be a signed value in gfs2_update_stats turned into an unsigned value. When shifted right, we end up with a large positive value instead of a small negative value, which results in an incorrect variance estimate.
--- fs/gfs2/lock_dlm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
fs/gfs2/lock_dlm.c +5 -4
@@ -31,9 +31,10 @@* @delta is the difference between the current rtt sample and the * running average srtt. We add 1/8 of that to the srtt in order to * update the current srtt estimate. The variance estimate is a bit -* more complicated. We subtract the abs value of the @delta from -* the current variance estimate and add 1/4 of that to the running -* total. +* more complicated. We subtract the current variance estimate from +* the abs value of the @delta and add 1/4 of that to the running +* total. That's equivalent to 3/4 of the current variance +* estimate plus 1/4 of the abs of @delta. * * Note that the index points at the array entry containing the smoothed * mean value, and the variance is always in the following entry
@@ -49,7 +50,7 @@ static inline void gfs2_update_stats(strs64 delta = sample - s->stats[index]; s->stats[index] += (delta >>3 ); index++; - s->stats[index] += ((abs (delta) - s->stats[index]) >>2 ); + s->stats[index] += (s64)(abs (delta) - s->stats[index]) >>2 ; }/**
Greg Kroah-Hartman
maintainerPATCH 16/193 Btrfs: do not abort transaction at btrfs_update_root() after failure to COW path
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit 72bd2323ec87722c115a5906bc6a1b31d11e8f54 upstream.
Currently when we fail to COW a path at btrfs_update_root() we end up always aborting the transaction. However all the current callers of btrfs_update_root() are able to deal with errors returned from it, many do end up aborting the transaction themselves (directly or not, such as the transaction commit path), other BUG_ON() or just gracefully cancel whatever they were doing.
When syncing the fsync log, we call btrfs_update_root() through tree-log.c:update_log_root(), and if it returns an -ENOSPC error, the log sync code does not abort the transaction, instead it gracefully handles the error and returns -EAGAIN to the fsync handler, so that it falls back to a transaction commit. Any other error different from -ENOSPC, makes the log sync code abort the transaction.
So remove the transaction abort from btrfs_update_log() when we fail to COW a path to update the root item, so that if an -ENOSPC failure happens we avoid aborting the current transaction and have a chance of the fsync succeeding after falling back to a transaction commit.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=203413
--- fs/btrfs/root-tree.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
fs/btrfs/root-tree.c +1 -3
@@ -145,10 +145,8 @@ int btrfs_update_root(struct btrfs_transreturn -ENOMEM ; ret =btrfs_search_slot (trans, root, key, path,0 ,1 ); -if (ret <0 ) { -btrfs_abort_transaction (trans, ret); +if (ret <0 ) goto out; - }if (ret !=0 ) {btrfs_print_leaf (path->nodes[0 ]);
Greg Kroah-Hartman
maintainerPATCH 17/193 Btrfs: avoid fallback to transaction commit during fsync of files with holes
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit ebb929060aeb162417b4c1307e63daee47b208d9 upstream.
When we are doing a full fsync (bit BTRFS_INODE_NEEDS_FULL_SYNC set) of a file that has holes and has file extent items spanning two or more leafs, we can end up falling to back to a full transaction commit due to a logic bug that leads to failure to insert a duplicate file extent item that is meant to represent a hole between the last file extent item of a leaf and the first file extent item in the next leaf. The failure (EEXIST error) leads to a transaction commit (as most errors when logging an inode do).
For example, we have the two following leafs:
Leaf N:
-----------------------------------------------
| ..., ..., ..., (257, FILE_EXTENT_ITEM, 64K) |
-----------------------------------------------
The file extent item at the end of leaf N has a length of 4Kb, representing the file range from 64K to 68K - 1.
Leaf N + 1:
-----------------------------------------------
| (257, FILE_EXTENT_ITEM, 72K), ..., ..., ... |
-----------------------------------------------
The file extent item at the first slot of leaf N + 1 has a length of 4Kb too, representing the file range from 72K to 76K - 1.
During the full fsync path, when we are at tree-log.c:copy_items() with leaf N as a parameter, after processing the last file extent item, that represents the extent at offset 64K, we take a look at the first file extent item at the next leaf (leaf N + 1), and notice there's a 4K hole between the two extents, and therefore we insert a file extent item representing that hole, starting at file offset 68K and ending at offset 72K - 1. However we don't update the value of *last_extent, which is used to represent the end offset (plus 1, non-inclusive end) of the last file extent item inserted in the log, so it stays with a value of 68K and not with a value of 72K.
Then, when copy_items() is called for leaf N + 1, because the value of *last_extent is smaller then the offset of the first extent item in the leaf (68K < 72K), we look at the last file extent item in the previous leaf (leaf N) and see it there's a 4K gap between it and our first file extent item (again, 68K < 72K), so we decide to insert a file extent item representing the hole, starting at file offset 68K and ending at offset 72K - 1, this insertion will fail with -EEXIST being returned from btrfs_insert_file_extent() because we already inserted a file extent item representing a hole for this offset (68K) in the previous call to copy_items(), when processing leaf N.
The -EEXIST error gets propagated to the fsync callback, btrfs_sync_file(), which falls back to a full transaction commit.
Fix this by adjusting *last_extent after inserting a hole when we had to look at the next leaf.
--- fs/btrfs/tree-log.c | 1 + 1 file changed, 1 insertion(+)
fs/btrfs/tree-log.c +1 -0
@@ -4012,6 +4012,7 @@ fill_holes: *last_extent,0 ,0 , len,0 , len, 0, 0, 0); + *last_extent += len; } } }
Greg Kroah-Hartman
maintainerPATCH 18/193 Btrfs: fix race between ranged fsync and writeback of adjacent ranges
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit 0c713cbab6200b0ab6473b50435e450a6e1de85d upstream.
When we do a full fsync (the bit BTRFS_INODE_NEEDS_FULL_SYNC is set in the inode) that happens to be ranged, which happens during a msync() or writes for files opened with O_SYNC for example, we can end up with a corrupt log, due to different file extent items representing ranges that overlap with each other, or hit some assertion failures.
When doing a ranged fsync we only flush delalloc and wait for ordered exents within that range. If while we are logging items from our inode ordered extents for adjacent ranges complete, we end up in a race that can make us insert the file extent items that overlap with others we logged previously and the assertion failures.
For example, if tree-log.c:copy_items() receives a leaf that has the following file extents items, all with a length of 4K and therefore there is an implicit hole in the range 68K to 72K - 1:
(257 EXTENT_ITEM 64K), (257 EXTENT_ITEM 72K), (257 EXTENT_ITEM 76K), ...
It copies them to the log tree. However due to the need to detect implicit holes, it may release the path, in order to look at the previous leaf to detect an implicit hole, and then later it will search again in the tree for the first file extent item key, with the goal of locking again the leaf (which might have changed due to concurrent changes to other inodes).
However when it locks again the leaf containing the first key, the key corresponding to the extent at offset 72K may not be there anymore since there is an ordered extent for that range that is finishing (that is, somewhere in the middle of btrfs_finish_ordered_io()), and it just removed the file extent item but has not yet replaced it with a new file extent item, so the part of copy_items() that does hole detection will decide that there is a hole in the range starting from 68K to 76K - 1, and therefore insert a file extent item to represent that hole, having a key offset of 68K. After that we now have a log tree with 2 different extent items that have overlapping ranges:
1) The file extent item copied before copy_items() released the path, which has a key offset of 72K and a length of 4K, representing the file range 72K to 76K - 1.
2) And a file extent item representing a hole that has a key offset of 68K and a length of 8K, representing the range 68K to 76K - 1. This item was inserted after releasing the path, and overlaps with the extent item inserted before.
The overlapping extent items can cause all sorts of unpredictable and incorrect behaviour, either when replayed or if a fast (non full) fsync happens later, which can trigger a BUG_ON() when calling btrfs_set_item_key_safe() through __btrfs_drop_extents(), producing a trace like the following:
[61666.783269] ------------[ cut here ]------------ [61666.783943] kernel BUG at fs/btrfs/ctree.c:3182! [61666.784644] invalid opcode: 0000 [#1] PREEMPT SMP (...) [61666.786253] task: ffff880117b88c40 task.stack: ffffc90008168000 [61666.786253] RIP: 0010:btrfs_set_item_key_safe+0x7c/0xd2 [btrfs] [61666.786253] RSP: 0018:ffffc9000816b958 EFLAGS: 00010246 [61666.786253] RAX: 0000000000000000 RBX: 000000000000000f RCX: 0000000000030000 [61666.786253] RDX: 0000000000000000 RSI: ffffc9000816ba4f RDI: ffffc9000816b937 [61666.786253] RBP: ffffc9000816b998 R08: ffff88011dae2428 R09: 0000000000001000 [61666.786253] R10: 0000160000000000 R11: 6db6db6db6db6db7 R12: ffff88011dae2418 [61666.786253] R13: ffffc9000816ba4f R14: ffff8801e10c4118 R15: ffff8801e715c000 [61666.786253] FS: 00007f6060a18700(0000) GS:ffff88023f5c0000(0000) knlGS:0000000000000000 [61666.786253] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [61666.786253] CR2: 00007f6060a28000 CR3: 0000000213e69000 CR4: 00000000000006e0 [61666.786253] Call Trace: [61666.786253] __btrfs_drop_extents+0x5e3/0xaad [btrfs] [61666.786253] ? time_hardirqs_on+0x9/0x14 [61666.786253] btrfs_log_changed_extents+0x294/0x4e0 [btrfs] [61666.786253] ? release_extent_buffer+0x38/0xb4 [btrfs] [61666.786253] btrfs_log_inode+0xb6e/0xcdc [btrfs] [61666.786253] ? lock_acquire+0x131/0x1c5 [61666.786253] ? btrfs_log_inode_parent+0xee/0x659 [btrfs] [61666.786253] ? arch_local_irq_save+0x9/0xc [61666.786253] ? btrfs_log_inode_parent+0x1f5/0x659 [btrfs] [61666.786253] btrfs_log_inode_parent+0x223/0x659 [btrfs] [61666.786253] ? arch_local_irq_save+0x9/0xc [61666.786253] ? lockref_get_not_zero+0x2c/0x34 [61666.786253] ? rcu_read_unlock+0x3e/0x5d [61666.786253] btrfs_log_dentry_safe+0x60/0x7b [btrfs] [61666.786253] btrfs_sync_file+0x317/0x42c [btrfs] [61666.786253] vfs_fsync_range+0x8c/0x9e [61666.786253] SyS_msync+0x13c/0x1c9 [61666.786253] entry_SYSCALL_64_fastpath+0x18/0xad
A sample of a corrupt log tree leaf with overlapping extents I got from running btrfs/072:
item 14 key (295 108 200704) itemoff 2599 itemsize 53
extent data disk bytenr 0 nr 0
extent data offset 0 nr 458752 ram 458752
item 15 key (295 108 659456) itemoff 2546 itemsize 53
extent data disk bytenr 4343541760 nr 770048
extent data offset 606208 nr 163840 ram 770048
item 16 key (295 108 663552) itemoff 2493 itemsize 53
extent data disk bytenr 4343541760 nr 770048
extent data offset 610304 nr 155648 ram 770048
item 17 key (295 108 819200) itemoff 2440 itemsize 53
extent data disk bytenr 4334788608 nr 4096
extent data offset 0 nr 4096 ram 4096The file extent item at offset 659456 (item 15) ends at offset 823296 (659456 + 163840) while the next file extent item (item 16) starts at offset 663552.
Another different problem that the race can trigger is a failure in the assertions at tree-log.c:copy_items(), which expect that the first file extent item key we found before releasing the path exists after we have released path and that the last key we found before releasing the path also exists after releasing the path:
$ cat -n fs/btrfs/tree-log.c
4080 if (need_find_last_extent) {
4081 /* btrfs_prev_leaf could return 1 without releasing the path */
4082 btrfs_release_path(src_path);
4083 ret = btrfs_search_slot(NULL, inode->root, &first_key,
4084 src_path, 0, 0);
4085 if (ret < 0)
4086 return ret;
4087 ASSERT(ret == 0);
(...)
4103 if (i >= btrfs_header_nritems(src_path->nodes[0])) {
4104 ret = btrfs_next_leaf(inode->root, src_path);
4105 if (ret < 0)
4106 return ret;
4107 ASSERT(ret == 0);
4108 src = src_path->nodes[0];
4109 i = 0;
4110 need_find_last_extent = true;
4111 }
(...)The second assertion implicitly expects that the last key before the path release still exists, because the surrounding while loop only stops after we have found that key. When this assertion fails it produces a stack like this:
[139590.037075] assertion failed: ret == 0, file: fs/btrfs/tree-log.c, line: 4107 [139590.037406] ------------[ cut here ]------------ [139590.037707] kernel BUG at fs/btrfs/ctree.h:3546! [139590.038034] invalid opcode: 0000 [#1] SMP DEBUG_PAGEALLOC PTI [139590.038340] CPU: 1 PID: 31841 Comm: fsstress Tainted: G W 5.0.0-btrfs-next-46 #1 (...) [139590.039354] RIP: 0010:assfail.constprop.24+0x18/0x1a [btrfs] (...) [139590.040397] RSP: 0018:ffffa27f48f2b9b0 EFLAGS: 00010282 [139590.040730] RAX: 0000000000000041 RBX: ffff897c635d92c8 RCX: 0000000000000000 [139590.041105] RDX: 0000000000000000 RSI: ffff897d36a96868 RDI: ffff897d36a96868 [139590.041470] RBP: ffff897d1b9a0708 R08: 0000000000000000 R09: 0000000000000000 [139590.041815] R10: 0000000000000008 R11: 0000000000000000 R12: 0000000000000013 [139590.042159] R13: 0000000000000227 R14: ffff897cffcbba88 R15: 0000000000000001 [139590.042501] FS: 00007f2efc8dee80(0000) GS:ffff897d36a80000(0000) knlGS:0000000000000000 [139590.042847] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [139590.043199] CR2: 00007f8c064935e0 CR3: 0000000232252002 CR4: 00000000003606e0 [139590.043547] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [139590.043899] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [139590.044250] Call Trace: [139590.044631] copy_items+0xa3f/0x1000 [btrfs] [139590.045009] ? generic_bin_search.constprop.32+0x61/0x200 [btrfs] [139590.045396] btrfs_log_inode+0x7b3/0xd70 [btrfs] [139590.045773] btrfs_log_inode_parent+0x2b3/0xce0 [btrfs] [139590.046143] ? do_raw_spin_unlock+0x49/0xc0 [139590.046510] btrfs_log_dentry_safe+0x4a/0x70 [btrfs] [139590.046872] btrfs_sync_file+0x3b6/0x440 [btrfs] [139590.047243] btrfs_file_write_iter+0x45b/0x5c0 [btrfs] [139590.047592] __vfs_write+0x129/0x1c0 [139590.047932] vfs_write+0xc2/0x1b0 [139590.048270] ksys_write+0x55/0xc0 [139590.048608] do_syscall_64+0x60/0x1b0 [139590.048946] entry_SYSCALL_64_after_hwframe+0x49/0xbe [139590.049287] RIP: 0033:0x7f2efc4be190 (...) [139590.050342] RSP: 002b:00007ffe743243a8 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 [139590.050701] RAX: ffffffffffffffda RBX: 0000000000008d58 RCX: 00007f2efc4be190 [139590.051067] RDX: 0000000000008d58 RSI: 00005567eca0f370 RDI: 0000000000000003 [139590.051459] RBP: 0000000000000024 R08: 0000000000000003 R09: 0000000000008d60 [139590.051863] R10: 0000000000000078 R11: 0000000000000246 R12: 0000000000000003 [139590.052252] R13: 00000000003d3507 R14: 00005567eca0f370 R15: 0000000000000000 (...) [139590.055128] ---[ end trace 193f35d0215cdeeb ]---
So fix this race between a full ranged fsync and writeback of adjacent ranges by flushing all delalloc and waiting for all ordered extents to complete before logging the inode. This is the simplest way to solve the problem because currently the full fsync path does not deal with ranges at all (it assumes a full range from 0 to LLONG_MAX) and it always needs to look at adjacent ranges for hole detection. For use cases of ranged fsyncs this can make a few fsyncs slower but on the other hand it can make some following fsyncs to other ranges do less work or no need to do anything at all. A full fsync is rare anyway and happens only once after loading/creating an inode and once after less common operations such as a shrinking truncate.
This is an issue that exists for a long time, and was often triggered by generic/127, because it does mmap'ed writes and msync (which triggers a ranged fsync). Adding support for the tree checker to detect overlapping extents (next patch in the series) and trigger a WARN() when such cases are found, and then calling btrfs_check_leaf_full() at the end of btrfs_insert_file_extent() made the issue much easier to detect. Running btrfs/072 with that change to the tree checker and making fsstress open files always with O_SYNC made it much easier to trigger the issue (as triggering it with generic/127 is very rare).
--- fs/btrfs/file.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
fs/btrfs/file.c +12 -0
@@ -2059,6 +2059,18 @@ int btrfs_sync_file(struct file *file, lu64 len;/* +* If the inode needs a full sync, make sure we use a full range to +* avoid log tree corruption, due to hole detection racing with ordered +* extent completion for adjacent ranges, and assertion failures during +* hole detection. +*/ +if (test_bit (BTRFS_INODE_NEEDS_FULL_SYNC , + &BTRFS_I (inode)->runtime_flags)) { + start =0 ; + end =LLONG_MAX ; + } + +/* * The range length can be represented by u64, we have to do the typecasts * to avoid signed overflow if it's [0, LLONG_MAX] eg. from fsync() */
Greg Kroah-Hartman
maintainerPATCH 19/193 btrfs: sysfs: Fix error path kobject memory leak
In reply to Greg Kroah-HartmanFrom: Tobin C. Harding <[email protected]>
commit 450ff8348808a89cc27436771aa05c2b90c0eef1 upstream.
If a call to kobject_init_and_add() fails we must call kobject_put() otherwise we leak memory.
Calling kobject_put() when kobject_init_and_add() fails drops the refcount back to 0 and calls the ktype release method (which in turn calls the percpu destroy and kfree).
Add call to kobject_put() in the error path of call to kobject_init_and_add().
--- fs/btrfs/extent-tree.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/btrfs/extent-tree.c +1 -2
@@ -4087,8 +4087,7 @@ static int create_space_info(struct btrf info->space_info_kobj,"%s" , alloc_name(space_info->flags));if (ret) { -percpu_counter_destroy (&space_info->total_bytes_pinned); -kfree (space_info); +kobject_put (&space_info->kobj);return ret; }
Greg Kroah-Hartman
maintainerPATCH 20/193 btrfs: sysfs: dont leak memory when failing add fsid
In reply to Greg Kroah-HartmanFrom: Tobin C. Harding <[email protected]>
commit e32773357d5cc271b1d23550b3ed026eb5c2a468 upstream.
A failed call to kobject_init_and_add() must be followed by a call to kobject_put(). Currently in the error path when adding fs_devices we are missing this call. This could be fixed by calling btrfs_sysfs_remove_fsid() if btrfs_sysfs_add_fsid() returns an error or by adding a call to kobject_put() directly in btrfs_sysfs_add_fsid(). Here we choose the second option because it prevents the slightly unusual error path handling requirements of kobject from leaking out into btrfs functions.
Add a call to kobject_put() in the error path of kobject_add_and_init(). This causes the release method to be called if kobject_init_and_add() fails. open_tree() is the function that calls btrfs_sysfs_add_fsid() and the error code in this function is already written with the assumption that the release method is called during the error path of open_tree() (as seen by the call to btrfs_sysfs_remove_fsid() under the fail_fsdev_sysfs label).
--- fs/btrfs/sysfs.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
fs/btrfs/sysfs.c +6 -1
@@ -794,7 +794,12 @@ int btrfs_sysfs_add_fsid(struct btrfs_fs fs_devs->fsid_kobj.kset = btrfs_kset; error =kobject_init_and_add (&fs_devs->fsid_kobj, &btrfs_ktype, parent,"%pU" , fs_devs->fsid); -return error; +if (error) { +kobject_put (&fs_devs->fsid_kobj); +return error; + } + +return 0 ; }int btrfs_sysfs_add_mounted (struct btrfs_fs_info *fs_info)
Greg Kroah-Hartman
maintainerPATCH 21/193 fbdev: fix divide error in fb_var_to_videomode
In reply to Greg Kroah-HartmanFrom: Shile Zhang <[email protected]>
commit cf84807f6dd0be5214378e66460cfc9187f532f9 upstream.
To fix following divide-by-zero error found by Syzkaller:
divide error: 0000 [#1] SMP PTI
CPU: 7 PID: 8447 Comm: test Kdump: loaded Not tainted 4.19.24-8.al7.x86_64 #1 Hardware name: Alibaba Cloud Alibaba Cloud ECS, BIOS rel-1.12.0-0-ga698c8995f-prebuilt.qemu.org 04/01/2014 RIP: 0010:fb_var_to_videomode+0xae/0xc0 Code: 04 44 03 46 78 03 4e 7c 44 03 46 68 03 4e 70 89 ce d1 ee 69 c0 e8 03 00 00 f6 c2 01 0f 45 ce 83 e2 02 8d 34 09 0f 45 ce 31 d2 <41> f7 f0 31 d2 f7 f1 89 47 08 f3 c3 66 0f 1f 44 00 00 0f 1f 44 00 RSP: 0018:ffffb7e189347bf0 EFLAGS: 00010246 RAX: 00000000e1692410 RBX: ffffb7e189347d60 RCX: 0000000000000000 RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffffb7e189347c10 RBP: ffff99972a091c00 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000100 R13: 0000000000010000 R14: 00007ffd66baf6d0 R15: 0000000000000000 FS: 00007f2054d11740(0000) GS:ffff99972fbc0000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f205481fd20 CR3: 00000004288a0001 CR4: 00000000001606a0 Call Trace: fb_set_var+0x257/0x390 ? lookup_fast+0xbb/0x2b0 ? fb_open+0xc0/0x140 ? chrdev_open+0xa6/0x1a0 do_fb_ioctl+0x445/0x5a0 do_vfs_ioctl+0x92/0x5f0 ? __alloc_fd+0x3d/0x160 ksys_ioctl+0x60/0x90 __x64_sys_ioctl+0x16/0x20 do_syscall_64+0x5b/0x190 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x7f20548258d7 Code: 44 00 00 48 8b 05 b9 15 2d 00 64 c7 00 26 00 00 00 48 c7 c0 ff ff ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 b8 10 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 89 15 2d 00 f7 d8 64 89 01 48
It can be triggered easily with following test code:
#include <linux/fb.h>
#include <fcntl.h>
#include <sys/ioctl.h>
int main(void)
{
struct fb_var_screeninfo var = {.activate = 0x100, .pixclock = 60};
int fd = open("/dev/fb0", O_RDWR);
if (fd < 0)
return 1; if (ioctl(fd, FBIOPUT_VSCREENINFO, &var))
return 1;
return 0;}
--- drivers/video/fbdev/core/modedb.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/video/fbdev/core/modedb.c +3 -0
@@ -933,6 +933,9 @@ void fb_var_to_videomode(struct fb_videoif (var->vmode &FB_VMODE_DOUBLE ) vtotal *=2 ; +if (!htotal || !vtotal) +return ; + hfreq = pixclock/htotal; mode->refresh = hfreq/vtotal; }
Greg Kroah-Hartman
maintainerPATCH 22/193 hugetlb: use same fault hash key for shared and private mappings
In reply to Greg Kroah-HartmanFrom: Mike Kravetz <[email protected]>
commit 1b426bac66e6cc83c9f2d92b96e4e72acf43419a upstream.
hugetlb uses a fault mutex hash table to prevent page faults of the same pages concurrently. The key for shared and private mappings is different. Shared keys off address_space and file index. Private keys off mm and virtual address. Consider a private mappings of a populated hugetlbfs file. A fault will map the page from the file and if needed do a COW to map a writable page.
Hugetlbfs hole punch uses the fault mutex to prevent mappings of file pages. It uses the address_space file index key. However, private mappings will use a different key and could race with this code to map the file page. This causes problems (BUG) for the page cache remove code as it expects the page to be unmapped. A sample stack is:
page dumped because: VM_BUG_ON_PAGE(page_mapped(page)) kernel BUG at mm/filemap.c:169! ... RIP: 0010:unaccount_page_cache_page+0x1b8/0x200 ... Call Trace: __delete_from_page_cache+0x39/0x220 delete_from_page_cache+0x45/0x70 remove_inode_hugepages+0x13c/0x380 ? __add_to_page_cache_locked+0x162/0x380 hugetlbfs_fallocate+0x403/0x540 ? _cond_resched+0x15/0x30 ? __inode_security_revalidate+0x5d/0x70 ? selinux_file_permission+0x100/0x130 vfs_fallocate+0x13f/0x270 ksys_fallocate+0x3c/0x80 __x64_sys_fallocate+0x1a/0x20 do_syscall_64+0x5b/0x180 entry_SYSCALL_64_after_hwframe+0x44/0xa9
There seems to be another potential COW issue/race with this approach of different private and shared keys as noted in commit 8382d914ebf7 ("mm, hugetlb: improve page-fault scalability").
Since every hugetlb mapping (even anon and private) is actually a file mapping, just use the address_space index key for all mappings. This results in potentially more hash collisions. However, this should not be the common case.
--- fs/hugetlbfs/inode.c | 8 ++------ include/linux/hugetlb.h | 4 +--- mm/hugetlb.c | 23 +++++++---------------- mm/userfaultfd.c | 3 +-- 4 files changed, 11 insertions(+), 27 deletions(-)
fs/hugetlbfs/inode.c +2 -6
@@ -436,9 +436,7 @@ static void remove_inode_hugepages(strucu32 hash; index = page->index; - hash =hugetlb_fault_mutex_hash (h, current->mm, - &pseudo_vma, - mapping, index,0 ); + hash =hugetlb_fault_mutex_hash (h, mapping, index,0 );mutex_lock (&hugetlb_fault_mutex_table[hash]);/*
@@ -557,7 +555,6 @@ static long hugetlbfs_fallocate(struct fstruct address_space *mapping = inode->i_mapping;struct hstate *h =hstate_inode (inode);struct vm_area_struct pseudo_vma; -struct mm_struct *mm = current->mm;loff_t hpage_size =huge_page_size (h);unsigned long hpage_shift =huge_page_shift (h);pgoff_t start, index, end;
@@ -621,8 +618,7 @@ static long hugetlbfs_fallocate(struct f addr = index * hpage_size;/* mutex taken here, fault path and hole punch */ - hash =hugetlb_fault_mutex_hash (h, mm, &pseudo_vma, mapping, - index, addr); + hash =hugetlb_fault_mutex_hash (h, mapping, index, addr);mutex_lock (&hugetlb_fault_mutex_table[hash]);/* See if already present in mapping to avoid alloc/free */
include/linux/hugetlb.h +1 -3
@@ -122,9 +122,7 @@ void putback_active_hugepage(struct pagevoid free_huge_page (struct page *page);void hugetlb_fix_reserve_counts (struct inode *inode);extern struct mutex *hugetlb_fault_mutex_table; -u32 hugetlb_fault_mutex_hash (struct hstate *h,struct mm_struct *mm, -struct vm_area_struct *vma, -struct address_space *mapping, +u32 hugetlb_fault_mutex_hash (struct hstate *h,struct address_space *mapping,pgoff_t idx,unsigned long address);pte_t *huge_pmd_share (struct mm_struct *mm,unsigned long addr,pud_t *pud);
mm/hugetlb.c +7 -16
@@ -3729,8 +3729,8 @@ retry:* handling userfault. Reacquire after handling * fault to make calling code simpler. */ - hash =hugetlb_fault_mutex_hash (h, mm, vma, mapping, - idx, address); + hash =hugetlb_fault_mutex_hash (h, mapping, idx, + address);mutex_unlock (&hugetlb_fault_mutex_table[hash]); ret =handle_userfault (&vmf,VM_UFFD_MISSING );mutex_lock (&hugetlb_fault_mutex_table[hash]);
@@ -3842,21 +3842,14 @@ backout_unlocked: }#ifdef CONFIG_SMP -u32 hugetlb_fault_mutex_hash (struct hstate *h,struct mm_struct *mm, -struct vm_area_struct *vma, -struct address_space *mapping, +u32 hugetlb_fault_mutex_hash (struct hstate *h,struct address_space *mapping,pgoff_t idx,unsigned long address) {unsigned long key[2 ];u32 hash; -if (vma->vm_flags &VM_SHARED ) { - key[0 ] = (unsigned long ) mapping; - key[1 ] = idx; - }else { - key[0 ] = (unsigned long ) mm; - key[1 ] = address >>huge_page_shift (h); - } + key[0 ] = (unsigned long ) mapping; + key[1 ] = idx; hash =jhash2 ((u32 *)&key,sizeof (key)/sizeof (u32),0 );
@@ -3867,9 +3860,7 @@ u32 hugetlb_fault_mutex_hash(struct hsta* For uniprocesor systems we always use a single mutex, so just * return 0 and avoid the hashing overhead. */ -u32 hugetlb_fault_mutex_hash (struct hstate *h,struct mm_struct *mm, -struct vm_area_struct *vma, -struct address_space *mapping, +u32 hugetlb_fault_mutex_hash (struct hstate *h,struct address_space *mapping,pgoff_t idx,unsigned long address) {return 0 ;
@@ -3915,7 +3906,7 @@ int hugetlb_fault(struct mm_struct *mm,* get spurious allocation failures if two CPUs race to instantiate * the same page in the page cache. */ - hash =hugetlb_fault_mutex_hash (h, mm, vma, mapping, idx, address); + hash =hugetlb_fault_mutex_hash (h, mapping, idx, address);mutex_lock (&hugetlb_fault_mutex_table[hash]); entry =huge_ptep_get (ptep);
mm/userfaultfd.c +1 -2
@@ -272,8 +272,7 @@ retry:*/ idx =linear_page_index (dst_vma, dst_addr); mapping = dst_vma->vm_file->f_mapping; - hash =hugetlb_fault_mutex_hash (h, dst_mm, dst_vma, mapping, - idx, dst_addr); + hash =hugetlb_fault_mutex_hash (h, mapping, idx, dst_addr);mutex_lock (&hugetlb_fault_mutex_table[hash]); err = -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 23/193 brcmfmac: assure SSID length from firmware is limited
In reply to Greg Kroah-HartmanFrom: Arend van Spriel <[email protected]>
commit 1b5e2423164b3670e8bc9174e4762d297990deff upstream.
The SSID length as received from firmware should not exceed IEEE80211_MAX_SSID_LEN as that would result in heap overflow.
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +2 -0
@@ -3581,6 +3581,8 @@ brcmf_wowl_nd_results(struct brcmf_if *i } netinfo =brcmf_get_netinfo_array (pfn_result); +if (netinfo->SSID_len >IEEE80211_MAX_SSID_LEN ) + netinfo->SSID_len =IEEE80211_MAX_SSID_LEN ;memcpy (cfg->wowl.nd->ssid.ssid, netinfo->SSID, netinfo->SSID_len); cfg->wowl.nd->ssid.ssid_len = netinfo->SSID_len; cfg->wowl.nd->n_channels =1 ;
Greg Kroah-Hartman
maintainerPATCH 24/193 brcmfmac: add subtype check for event handling in data path
In reply to Greg Kroah-HartmanFrom: Arend van Spriel <[email protected]>
commit a4176ec356c73a46c07c181c6d04039fafa34a9f upstream.
For USB there is no separate channel being used to pass events from firmware to the host driver and as such are passed over the data path. In order to detect mock event messages an additional check is needed on event subtype. This check is added conditionally using unlikely() keyword.
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 5 ++-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h | 16 ++++++++++---- drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 2 - 3 files changed, 16 insertions(+), 7 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +3 -2
@@ -344,7 +344,8 @@ void brcmf_rx_frame(struct device *dev, }else {/* Process special event packets */ if (handle_event) -brcmf_fweh_process_skb (ifp->drvr, skb); +brcmf_fweh_process_skb (ifp->drvr, skb, +BCMILCP_SUBTYPE_VENDOR_LONG );brcmf_netif_rx (ifp, skb); }
@@ -361,7 +362,7 @@ void brcmf_rx_event(struct device *dev,if (brcmf_rx_hdrpull (drvr, skb, &ifp))return ; -brcmf_fweh_process_skb (ifp->drvr, skb); +brcmf_fweh_process_skb (ifp->drvr, skb,0 );brcmu_pkt_buf_free_skb (skb); }
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h +12 -4
@@ -211,7 +211,7 @@ enum brcmf_fweh_event_code {*/ #define BRCM_OUI "\x00\x10\x18"#define BCMILCP_BCM_SUBTYPE_EVENT 1 - +#define BCMILCP_SUBTYPE_VENDOR_LONG 32769/** * struct brcm_ethhdr - broadcom specific ether header.
@@ -334,10 +334,10 @@ void brcmf_fweh_process_event(struct brcvoid brcmf_fweh_p2pdev_setup (struct brcmf_if *ifp,bool ongoing);static inline void brcmf_fweh_process_skb (struct brcmf_pub *drvr, -struct sk_buff *skb) +struct sk_buff *skb,u16 stype) {struct brcmf_event *event_packet; -u16 usr_stype; +u16 subtype, usr_stype;/* only process events when protocol matches */ if (skb->protocol !=cpu_to_be16 (ETH_P_LINK_CTL ))
@@ -346,8 +346,16 @@ static inline void brcmf_fweh_process_skif ((skb->len +ETH_HLEN ) <sizeof (*event_packet))return ; -/* check for BRCM oui match */ event_packet = (struct brcmf_event *)skb_mac_header (skb); + +/* check subtype if needed */ +if (unlikely (stype)) { + subtype =get_unaligned_be16 (&event_packet->hdr.subtype); +if (subtype != stype) +return ; + } + +/* check for BRCM oui match */ if (memcmp (BRCM_OUI , &event_packet->hdr.oui[0 ],sizeof (event_packet->hdr.oui)))return ;
drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c +1 -1
@@ -1112,7 +1112,7 @@ static void brcmf_msgbuf_process_event(s skb->protocol =eth_type_trans (skb, ifp->ndev); -brcmf_fweh_process_skb (ifp->drvr, skb); +brcmf_fweh_process_skb (ifp->drvr, skb,0 ); exit:brcmu_pkt_buf_free_skb (skb);
Greg Kroah-Hartman
maintainerPATCH 25/193 btrfs: honor path->skip_locking in backref code
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
commit 38e3eebff643db725633657d1d87a3be019d1018 upstream.
Qgroups will do the old roots lookup at delayed ref time, which could be while walking down the extent root while running a delayed ref. This should be fine, except we specifically lock eb's in the backref walking code irrespective of path->skip_locking, which deadlocks the system. Fix up the backref code to honor path->skip_locking, nobody will be modifying the commit_root when we're searching so it's completely safe to do.
This happens since fb235dc06fac ("btrfs: qgroup: Move half of the qgroup accounting time out of commit trans"), kernel may lockup with quota enabled.
There is one backref trace triggered by snapshot dropping along with write operation in the source subvolume. The example can be reliably reproduced:
btrfs-cleaner D 0 4062 2 0x80000000
Call Trace: schedule+0x32/0x90 btrfs_tree_read_lock+0x93/0x130 [btrfs] find_parent_nodes+0x29b/0x1170 [btrfs] btrfs_find_all_roots_safe+0xa8/0x120 [btrfs] btrfs_find_all_roots+0x57/0x70 [btrfs] btrfs_qgroup_trace_extent_post+0x37/0x70 [btrfs] btrfs_qgroup_trace_leaf_items+0x10b/0x140 [btrfs] btrfs_qgroup_trace_subtree+0xc8/0xe0 [btrfs] do_walk_down+0x541/0x5e3 [btrfs] walk_down_tree+0xab/0xe7 [btrfs] btrfs_drop_snapshot+0x356/0x71a [btrfs] btrfs_clean_one_deleted_snapshot+0xb8/0xf0 [btrfs] cleaner_kthread+0x12b/0x160 [btrfs] kthread+0x112/0x130 ret_from_fork+0x27/0x50
When dropping snapshots with qgroup enabled, we will trigger backref walk.
However such backref walk at that timing is pretty dangerous, as if one of the parent nodes get WRITE locked by other thread, we could cause a dead lock.
For example:
FS 260 FS 261 (Dropped)
node A node B
/ \ / \
node C node D node E
/ \ / \ / \leaf F|leaf G|leaf H|leaf I|leaf J|leaf K
The lock sequence would be:
Thread A (cleaner) | Thread B (other writer)
-----------------------------------------------------------------------
write_lock(B) |
write_lock(D) |
^^^ called by walk_down_tree() |
| write_lock(A)
| write_lock(D) << Stall
read_lock(H) << for backref walk |
read_lock(D) << lock owner is |
the same thread A |
so read lock is OK |
read_lock(A) << Stall |So thread A hold write lock D, and needs read lock A to unlock. While thread B holds write lock A, while needs lock D to unlock.
This will cause a deadlock.
This is not only limited to snapshot dropping case. As the backref walk, even only happens on commit trees, is breaking the normal top-down locking order, makes it deadlock prone.
--- fs/btrfs/backref.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
fs/btrfs/backref.c +12 -5
@@ -718,7 +718,7 @@ out:* read tree blocks and add keys where required. */ static int add_missing_keys (struct btrfs_fs_info *fs_info, -struct preftrees *preftrees) +struct preftrees *preftrees,bool lock) {struct prelim_ref *ref;struct extent_buffer *eb;
@@ -742,12 +742,14 @@ static int add_missing_keys(struct btrfsfree_extent_buffer (eb);return -EIO ; } -btrfs_tree_read_lock (eb); +if (lock) +btrfs_tree_read_lock (eb);if (btrfs_header_level (eb) ==0 )btrfs_item_key_to_cpu (eb, &ref->key_for_search,0 );else btrfs_node_key_to_cpu (eb, &ref->key_for_search,0 ); -btrfs_tree_read_unlock (eb); +if (lock) +btrfs_tree_read_unlock (eb);free_extent_buffer (eb);prelim_ref_insert (fs_info, &preftrees->indirect, ref,NULL );cond_resched ();
@@ -1228,7 +1230,7 @@ again:btrfs_release_path (path); - ret =add_missing_keys (fs_info, &preftrees); + ret =add_missing_keys (fs_info, &preftrees, path->skip_locking ==0 );if (ret) goto out;
@@ -1290,9 +1292,14 @@ again: }btrfs_tree_read_lock (eb);btrfs_set_lock_blocking_rw (eb,BTRFS_READ_LOCK ); +if (!path->skip_locking) { +btrfs_tree_read_lock (eb); +btrfs_set_lock_blocking_rw (eb,BTRFS_READ_LOCK ); + } ret =find_extent_in_eb (eb, bytenr, *extent_item_pos, &eie); -btrfs_tree_read_unlock_blocking (eb); +if (!path->skip_locking) +btrfs_tree_read_unlock_blocking (eb);free_extent_buffer (eb);if (ret <0 ) goto out;
Greg Kroah-Hartman
maintainerPATCH 26/193 fbdev: fix WARNING in __alloc_pages_nodemask bug
In reply to Greg Kroah-HartmanFrom: Jiufei Xue <[email protected]>
commit 8c40292be9169a9cbe19aadd1a6fc60cbd1af82f upstream.
Syzkaller hit 'WARNING in __alloc_pages_nodemask' bug.
WARNING: CPU: 1 PID: 1473 at mm/page_alloc.c:4377 __alloc_pages_nodemask+0x4da/0x2130 Kernel panic - not syncing: panic_on_warn set ... Call Trace: alloc_pages_current+0xb1/0x1e0 kmalloc_order+0x1f/0x60 kmalloc_order_trace+0x1d/0x120 fb_alloc_cmap_gfp+0x85/0x2b0 fb_set_user_cmap+0xff/0x370 do_fb_ioctl+0x949/0xa20 fb_ioctl+0xdd/0x120 do_vfs_ioctl+0x186/0x1070 ksys_ioctl+0x89/0xa0 __x64_sys_ioctl+0x74/0xb0 do_syscall_64+0xc8/0x550 entry_SYSCALL_64_after_hwframe+0x49/0xbe
This is a warning about order >= MAX_ORDER and the order is from userspace ioctl. Add flag __NOWARN to silence this warning.
--- drivers/video/fbdev/core/fbcmap.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/video/fbdev/core/fbcmap.c +2 -0
@@ -94,6 +94,8 @@ int fb_alloc_cmap_gfp(struct fb_cmap *cmint size = len *sizeof (u16);int ret = -ENOMEM ; + flags |= __GFP_NOWARN; +if (cmap->len != len) {fb_dealloc_cmap (cmap);if (!len)
Greg Kroah-Hartman
maintainerPATCH 27/193 media: cpia2: Fix use-after-free in cpia2_exit
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
commit dea37a97265588da604c6ba80160a287b72c7bfd upstream.
Syzkaller report this:
BUG: KASAN: use-after-free in sysfs_remove_file_ns+0x5f/0x70 fs/sysfs/file.c:468
Read of size 8 at addr ffff8881f59a6b70 by task syz-executor.0/8363
CPU: 0 PID: 8363 Comm: syz-executor.0 Not tainted 5.0.0-rc8+ #3
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1ubuntu1 04/01/2014
Call Trace:
__dump_stack lib/dump_stack.c:77 [inline]
dump_stack+0xfa/0x1ce lib/dump_stack.c:113
print_address_description+0x65/0x270 mm/kasan/report.c:187
kasan_report+0x149/0x18d mm/kasan/report.c:317
sysfs_remove_file_ns+0x5f/0x70 fs/sysfs/file.c:468
sysfs_remove_file include/linux/sysfs.h:519 [inline]
driver_remove_file+0x40/0x50 drivers/base/driver.c:122
usb_remove_newid_files drivers/usb/core/driver.c:212 [inline]
usb_deregister+0x12a/0x3b0 drivers/usb/core/driver.c:1005
cpia2_exit+0xa/0x16 [cpia2]
__do_sys_delete_module kernel/module.c:1018 [inline]
__se_sys_delete_module kernel/module.c:961 [inline]
__x64_sys_delete_module+0x3dc/0x5e0 kernel/module.c:961
do_syscall_64+0x147/0x600 arch/x86/entry/common.c:290
entry_SYSCALL_64_after_hwframe+0x49/0xbe
RIP: 0033:0x462e99
Code: f7 d8 64 89 02 b8 ff ff ff ff c3 66 0f 1f 44 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 bc ff ff ff f7 d8 64 89 01 48
RSP: 002b:00007f86f3754c58 EFLAGS: 00000246 ORIG_RAX: 00000000000000b0
RAX: ffffffffffffffda RBX: 000000000073bf00 RCX: 0000000000462e99
RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000020000300
RBP: 0000000000000002 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000246 R12: 00007f86f37556bc
R13: 00000000004bcca9 R14: 00000000006f6b48 R15: 00000000ffffffff
Allocated by task 8363:
set_track mm/kasan/common.c:85 [inline]
__kasan_kmalloc.constprop.3+0xa0/0xd0 mm/kasan/common.c:495
kmalloc include/linux/slab.h:545 [inline]
kzalloc include/linux/slab.h:740 [inline]
bus_add_driver+0xc0/0x610 drivers/base/bus.c:651
driver_register+0x1bb/0x3f0 drivers/base/driver.c:170
usb_register_driver+0x267/0x520 drivers/usb/core/driver.c:965
0xffffffffc1b4817c
do_one_initcall+0xfa/0x5ca init/main.c:887
do_init_module+0x204/0x5f6 kernel/module.c:3460
load_module+0x66b2/0x8570 kernel/module.c:3808
__do_sys_finit_module+0x238/0x2a0 kernel/module.c:3902
do_syscall_64+0x147/0x600 arch/x86/entry/common.c:290
entry_SYSCALL_64_after_hwframe+0x49/0xbe
Freed by task 8363:
set_track mm/kasan/common.c:85 [inline]
__kasan_slab_free+0x130/0x180 mm/kasan/common.c:457
slab_free_hook mm/slub.c:1430 [inline]
slab_free_freelist_hook mm/slub.c:1457 [inline]
slab_free mm/slub.c:3005 [inline]
kfree+0xe1/0x270 mm/slub.c:3957
kobject_cleanup lib/kobject.c:662 [inline]
kobject_release lib/kobject.c:691 [inline]
kref_put include/linux/kref.h:67 [inline]
kobject_put+0x146/0x240 lib/kobject.c:708
bus_remove_driver+0x10e/0x220 drivers/base/bus.c:732
driver_unregister+0x6c/0xa0 drivers/base/driver.c:197
usb_register_driver+0x341/0x520 drivers/usb/core/driver.c:980
0xffffffffc1b4817c
do_one_initcall+0xfa/0x5ca init/main.c:887
do_init_module+0x204/0x5f6 kernel/module.c:3460
load_module+0x66b2/0x8570 kernel/module.c:3808
__do_sys_finit_module+0x238/0x2a0 kernel/module.c:3902
do_syscall_64+0x147/0x600 arch/x86/entry/common.c:290
entry_SYSCALL_64_after_hwframe+0x49/0xbe
The buggy address belongs to the object at ffff8881f59a6b40
which belongs to the cache kmalloc-256 of size 256
The buggy address is located 48 bytes inside of
256-byte region [ffff8881f59a6b40, ffff8881f59a6c40)
The buggy address belongs to the page:
page:ffffea0007d66980 count:1 mapcount:0 mapping:ffff8881f6c02e00 index:0x0
flags: 0x2fffc0000000200(slab)
raw: 02fffc0000000200 dead000000000100 dead000000000200 ffff8881f6c02e00
raw: 0000000000000000 00000000800c000c 00000001ffffffff 0000000000000000
page dumped because: kasan: bad access detected
Memory state around the buggy address:
ffff8881f59a6a00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
ffff8881f59a6a80: 00 00 00 00 00 00 00 00 00 00 fc fc fc fc fc fc
>ffff8881f59a6b00: fc fc fc fc fc fc fc fc fb fb fb fb fb fb fb fb
^
ffff8881f59a6b80: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff8881f59a6c00: fb fb fb fb fb fb fb fb fc fc fc fc fc fc fc fccpia2_init does not check return value of cpia2_init, if it failed in usb_register_driver, there is already cleanup using driver_unregister. No need call cpia2_usb_cleanup on module exit.
--- drivers/media/usb/cpia2/cpia2_v4l.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/media/usb/cpia2/cpia2_v4l.c +1 -2
@@ -1244,8 +1244,7 @@ static int __init cpia2_init(void)LOG ("%s v%s\n" ,ABOUT ,CPIA_VERSION );check_parameters (); -cpia2_usb_init (); -return 0 ; +return cpia2_usb_init (); }
Greg Kroah-Hartman
maintainerPATCH 28/193 media: serial_ir: Fix use-after-free in serial_ir_init_module
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
commit 56cd26b618855c9af48c8301aa6754ced8dd0beb upstream.
Syzkaller report this:
BUG: KASAN: use-after-free in sysfs_remove_file_ns+0x5f/0x70 fs/sysfs/file.c:468
Read of size 8 at addr ffff8881dc7ae030 by task syz-executor.0/6249
CPU: 1 PID: 6249 Comm: syz-executor.0 Not tainted 5.0.0-rc8+ #3
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1ubuntu1 04/01/2014
Call Trace:
__dump_stack lib/dump_stack.c:77 [inline]
dump_stack+0xfa/0x1ce lib/dump_stack.c:113
print_address_description+0x65/0x270 mm/kasan/report.c:187
kasan_report+0x149/0x18d mm/kasan/report.c:317
? 0xffffffffc1728000
sysfs_remove_file_ns+0x5f/0x70 fs/sysfs/file.c:468
sysfs_remove_file include/linux/sysfs.h:519 [inline]
driver_remove_file+0x40/0x50 drivers/base/driver.c:122
remove_bind_files drivers/base/bus.c:585 [inline]
bus_remove_driver+0x186/0x220 drivers/base/bus.c:725
driver_unregister+0x6c/0xa0 drivers/base/driver.c:197
serial_ir_init_module+0x169/0x1000 [serial_ir]
do_one_initcall+0xfa/0x5ca init/main.c:887
do_init_module+0x204/0x5f6 kernel/module.c:3460
load_module+0x66b2/0x8570 kernel/module.c:3808
__do_sys_finit_module+0x238/0x2a0 kernel/module.c:3902
do_syscall_64+0x147/0x600 arch/x86/entry/common.c:290
entry_SYSCALL_64_after_hwframe+0x49/0xbe
RIP: 0033:0x462e99
Code: f7 d8 64 89 02 b8 ff ff ff ff c3 66 0f 1f 44 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 bc ff ff ff f7 d8 64 89 01 48
RSP: 002b:00007f9450132c58 EFLAGS: 00000246 ORIG_RAX: 0000000000000139
RAX: ffffffffffffffda RBX: 000000000073bf00 RCX: 0000000000462e99
RDX: 0000000000000000 RSI: 0000000020000100 RDI: 0000000000000003
RBP: 00007f9450132c70 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000246 R12: 00007f94501336bc
R13: 00000000004bcefa R14: 00000000006f6fb0 R15: 0000000000000004
Allocated by task 6249:
set_track mm/kasan/common.c:85 [inline]
__kasan_kmalloc.constprop.3+0xa0/0xd0 mm/kasan/common.c:495
kmalloc include/linux/slab.h:545 [inline]
kzalloc include/linux/slab.h:740 [inline]
bus_add_driver+0xc0/0x610 drivers/base/bus.c:651
driver_register+0x1bb/0x3f0 drivers/base/driver.c:170
serial_ir_init_module+0xe8/0x1000 [serial_ir]
do_one_initcall+0xfa/0x5ca init/main.c:887
do_init_module+0x204/0x5f6 kernel/module.c:3460
load_module+0x66b2/0x8570 kernel/module.c:3808
__do_sys_finit_module+0x238/0x2a0 kernel/module.c:3902
do_syscall_64+0x147/0x600 arch/x86/entry/common.c:290
entry_SYSCALL_64_after_hwframe+0x49/0xbe
Freed by task 6249:
set_track mm/kasan/common.c:85 [inline]
__kasan_slab_free+0x130/0x180 mm/kasan/common.c:457
slab_free_hook mm/slub.c:1430 [inline]
slab_free_freelist_hook mm/slub.c:1457 [inline]
slab_free mm/slub.c:3005 [inline]
kfree+0xe1/0x270 mm/slub.c:3957
kobject_cleanup lib/kobject.c:662 [inline]
kobject_release lib/kobject.c:691 [inline]
kref_put include/linux/kref.h:67 [inline]
kobject_put+0x146/0x240 lib/kobject.c:708
bus_remove_driver+0x10e/0x220 drivers/base/bus.c:732
driver_unregister+0x6c/0xa0 drivers/base/driver.c:197
serial_ir_init_module+0x14c/0x1000 [serial_ir]
do_one_initcall+0xfa/0x5ca init/main.c:887
do_init_module+0x204/0x5f6 kernel/module.c:3460
load_module+0x66b2/0x8570 kernel/module.c:3808
__do_sys_finit_module+0x238/0x2a0 kernel/module.c:3902
do_syscall_64+0x147/0x600 arch/x86/entry/common.c:290
entry_SYSCALL_64_after_hwframe+0x49/0xbe
The buggy address belongs to the object at ffff8881dc7ae000
which belongs to the cache kmalloc-256 of size 256
The buggy address is located 48 bytes inside of
256-byte region [ffff8881dc7ae000, ffff8881dc7ae100)
The buggy address belongs to the page:
page:ffffea000771eb80 count:1 mapcount:0 mapping:ffff8881f6c02e00 index:0x0
flags: 0x2fffc0000000200(slab)
raw: 02fffc0000000200 ffffea0007d14800 0000000400000002 ffff8881f6c02e00
raw: 0000000000000000 00000000800c000c 00000001ffffffff 0000000000000000
page dumped because: kasan: bad access detected
Memory state around the buggy address:
ffff8881dc7adf00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
ffff8881dc7adf80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
>ffff8881dc7ae000: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
^
ffff8881dc7ae080: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff8881dc7ae100: fc fc fc fc fc fc fc fc 00 00 00 00 00 00 00 00There are already cleanup handlings in serial_ir_init error path, no need to call serial_ir_exit do it again in serial_ir_init_module, otherwise will trigger a use-after-free issue.
--- drivers/media/rc/serial_ir.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/media/rc/serial_ir.c +1 -8
@@ -774,8 +774,6 @@ static void serial_ir_exit(void)static int __init serial_ir_init_module (void ) { -int result; -switch (type) {case IR_HOMEBREW :case IR_IRDEO :
@@ -803,12 +801,7 @@ static int __init serial_ir_init_module(if (sense !=-1 ) sense = !!sense; - result =serial_ir_init (); -if (!result) -return 0 ; - -serial_ir_exit (); -return result; +return serial_ir_init (); } static void __exit serial_ir_exit_module(void)
Greg Kroah-Hartman
maintainerPATCH 29/193 media: vivid: use vfree() instead of kfree() for dev->bitmap_cap
In reply to Greg Kroah-HartmanFrom: Alexander Potapenko <[email protected]>
commit dad7e270ba712ba1c99cd2d91018af6044447a06 upstream.
syzkaller reported crashes on kfree() called from vivid_vid_cap_s_selection(). This looks like a simple typo, as dev->bitmap_cap is allocated with vzalloc() throughout the file.
parts")
--- drivers/media/platform/vivid/vivid-vid-cap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/vivid/vivid-vid-cap.c +1 -1
@@ -1007,7 +1007,7 @@ int vivid_vid_cap_s_selection(struct filv4l2_rect_map_inside (&s->r, &dev->fmt_cap_rect);if (dev->bitmap_cap && (compose->width != s->r.width || compose->height != s->r.height)) { -kfree (dev->bitmap_cap); +vfree (dev->bitmap_cap); dev->bitmap_cap =NULL ; } *compose = s->r;
Greg Kroah-Hartman
maintainerPATCH 30/193 ssb: Fix possible NULL pointer dereference in ssb_host_pcmcia_exit
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
commit b2c01aab9646ed8ffb7c549afe55d5349c482425 upstream.
Syzkaller report this:
kasan: GPF could be caused by NULL-ptr deref or user memory access
general protection fault: 0000 [#1] SMP KASAN PTI CPU: 0 PID: 4492 Comm: syz-executor.0 Not tainted 5.0.0-rc7+ #45 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1ubuntu1 04/01/2014 RIP: 0010:sysfs_remove_file_ns+0x27/0x70 fs/sysfs/file.c:468 Code: 00 00 00 41 54 55 48 89 fd 53 49 89 d4 48 89 f3 e8 ee 76 9c ff 48 8d 7d 30 48 b8 00 00 00 00 00 fc ff df 48 89 fa 48 c1 ea 03 <80> 3c 02 00 75 2d 48 89 da 48 b8 00 00 00 00 00 fc ff df 48 8b 6d RSP: 0018:ffff8881e9d9fc00 EFLAGS: 00010206 RAX: dffffc0000000000 RBX: ffffffff900367e0 RCX: ffffffff81a95952 RDX: 0000000000000006 RSI: ffffc90001405000 RDI: 0000000000000030 RBP: 0000000000000000 R08: fffffbfff1fa22ed R09: fffffbfff1fa22ed R10: 0000000000000001 R11: fffffbfff1fa22ec R12: 0000000000000000 R13: ffffffffc1abdac0 R14: 1ffff1103d3b3f8b R15: 0000000000000000 FS: 00007fe409dc1700(0000) GS:ffff8881f1200000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000001b2d721000 CR3: 00000001e98b6005 CR4: 00000000007606f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 PKRU: 55555554 Call Trace: sysfs_remove_file include/linux/sysfs.h:519 [inline] driver_remove_file+0x40/0x50 drivers/base/driver.c:122 pcmcia_remove_newid_file drivers/pcmcia/ds.c:163 [inline] pcmcia_unregister_driver+0x7d/0x2b0 drivers/pcmcia/ds.c:209 ssb_modexit+0xa/0x1b [ssb] __do_sys_delete_module kernel/module.c:1018 [inline] __se_sys_delete_module kernel/module.c:961 [inline] __x64_sys_delete_module+0x3dc/0x5e0 kernel/module.c:961 do_syscall_64+0x147/0x600 arch/x86/entry/common.c:290 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x462e99 Code: f7 d8 64 89 02 b8 ff ff ff ff c3 66 0f 1f 44 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 bc ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007fe409dc0c58 EFLAGS: 00000246 ORIG_RAX: 00000000000000b0 RAX: ffffffffffffffda RBX: 000000000073bf00 RCX: 0000000000462e99 RDX: 0000000000000000 RSI: 0000000000000000 RDI: 00000000200000c0 RBP: 0000000000000002 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00007fe409dc16bc R13: 00000000004bccaa R14: 00000000006f6bc8 R15: 00000000ffffffff Modules linked in: ssb(-) 3c59x nvme_core macvlan tap pata_hpt3x3 rt2x00pci null_blk tsc40 pm_notifier_error_inject notifier_error_inject mdio cdc_wdm nf_reject_ipv4 ath9k_common ath9k_hw ath pppox ppp_generic slhc ehci_platform wl12xx wlcore tps6507x_ts ioc4 nf_synproxy_core ide_gd_mod ax25 can_dev iwlwifi can_raw atm tm2_touchkey can_gw can sundance adp5588_keys rt2800mmio rt2800lib rt2x00mmio rt2x00lib eeprom_93cx6 pn533 lru_cache elants_i2c ip_set nfnetlink gameport tipc hampshire nhc_ipv6 nhc_hop nhc_udp nhc_fragment nhc_routing nhc_mobility nhc_dest 6lowpan silead brcmutil nfc mt76_usb mt76 mac80211 iptable_security iptable_raw iptable_mangle iptable_nat nf_nat_ipv4 nf_nat nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 iptable_filter bpfilter ip6_vti ip_gre sit hsr veth vxcan batman_adv cfg80211 rfkill chnl_net caif nlmon vcan bridge stp llc ip6_gre ip6_tunnel tunnel6 tun joydev mousedev serio_raw ide_pci_generic piix floppy ide_core sch_fq_codel ip_tables x_tables ipv6 [last unloaded: 3c59x] Dumping ftrace buffer: (ftrace buffer empty) ---[ end trace 3913cbf8011e1c05 ]---
In ssb_modinit, it does not fail SSB init when ssb_host_pcmcia_init failed, however in ssb_modexit, ssb_host_pcmcia_exit calls pcmcia_unregister_driver unconditionally, which may tigger a NULL pointer dereference issue as above.
--- drivers/ssb/bridge_pcmcia_80211.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/ssb/bridge_pcmcia_80211.c +7 -2
@@ -113,16 +113,21 @@ static struct pcmcia_driver ssb_host_pcm .resume = ssb_host_pcmcia_resume, }; +static int pcmcia_init_failed; +/* * These are not module init/exit functions! * The module_pcmcia_driver() helper cannot be used here. */ int ssb_host_pcmcia_init (void ) { -return pcmcia_register_driver (&ssb_host_pcmcia_driver); + pcmcia_init_failed =pcmcia_register_driver (&ssb_host_pcmcia_driver); + +return pcmcia_init_failed; }void ssb_host_pcmcia_exit (void ) { -pcmcia_unregister_driver (&ssb_host_pcmcia_driver); +if (!pcmcia_init_failed) +pcmcia_unregister_driver (&ssb_host_pcmcia_driver); }
Greg Kroah-Hartman
maintainerPATCH 31/193 bpf: devmap: fix use-after-free Read in __dev_map_entry_free
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
commit 2baae3545327632167c0180e9ca1d467416f1919 upstream.
synchronize_rcu() is fine when the rcu callbacks only need to free memory (kfree_rcu() or direct kfree() call rcu call backs)
__dev_map_entry_free() is a bit more complex, so we need to make sure that call queued __dev_map_entry_free() callbacks have completed.
sysbot report:
BUG: KASAN: use-after-free in dev_map_flush_old kernel/bpf/devmap.c:365 [inline] BUG: KASAN: use-after-free in __dev_map_entry_free+0x2a8/0x300 kernel/bpf/devmap.c:379 Read of size 8 at addr ffff8801b8da38c8 by task ksoftirqd/1/18 CPU: 1 PID: 18 Comm: ksoftirqd/1 Not tainted 4.17.0+ #39 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x1b9/0x294 lib/dump_stack.c:113 print_address_description+0x6c/0x20b mm/kasan/report.c:256 kasan_report_error mm/kasan/report.c:354 [inline] kasan_report.cold.7+0x242/0x2fe mm/kasan/report.c:412 __asan_report_load8_noabort+0x14/0x20 mm/kasan/report.c:433 dev_map_flush_old kernel/bpf/devmap.c:365 [inline] __dev_map_entry_free+0x2a8/0x300 kernel/bpf/devmap.c:379 __rcu_reclaim kernel/rcu/rcu.h:178 [inline] rcu_do_batch kernel/rcu/tree.c:2558 [inline] invoke_rcu_callbacks kernel/rcu/tree.c:2818 [inline] __rcu_process_callbacks kernel/rcu/tree.c:2785 [inline] rcu_process_callbacks+0xe9d/0x1760 kernel/rcu/tree.c:2802 __do_softirq+0x2e0/0xaf5 kernel/softirq.c:284 run_ksoftirqd+0x86/0x100 kernel/softirq.c:645 smpboot_thread_fn+0x417/0x870 kernel/smpboot.c:164 kthread+0x345/0x410 kernel/kthread.c:240 ret_from_fork+0x3a/0x50 arch/x86/entry/entry_64.S:412 Allocated by task 6675: save_stack+0x43/0xd0 mm/kasan/kasan.c:448 set_track mm/kasan/kasan.c:460 [inline] kasan_kmalloc+0xc4/0xe0 mm/kasan/kasan.c:553 kmem_cache_alloc_trace+0x152/0x780 mm/slab.c:3620 kmalloc include/linux/slab.h:513 [inline] kzalloc include/linux/slab.h:706 [inline] dev_map_alloc+0x208/0x7f0 kernel/bpf/devmap.c:102 find_and_alloc_map kernel/bpf/syscall.c:129 [inline] map_create+0x393/0x1010 kernel/bpf/syscall.c:453 __do_sys_bpf kernel/bpf/syscall.c:2351 [inline] __se_sys_bpf kernel/bpf/syscall.c:2328 [inline] __x64_sys_bpf+0x303/0x510 kernel/bpf/syscall.c:2328 do_syscall_64+0x1b1/0x800 arch/x86/entry/common.c:290 entry_SYSCALL_64_after_hwframe+0x49/0xbe Freed by task 26: save_stack+0x43/0xd0 mm/kasan/kasan.c:448 set_track mm/kasan/kasan.c:460 [inline] __kasan_slab_free+0x11a/0x170 mm/kasan/kasan.c:521 kasan_slab_free+0xe/0x10 mm/kasan/kasan.c:528 __cache_free mm/slab.c:3498 [inline] kfree+0xd9/0x260 mm/slab.c:3813 dev_map_free+0x4fa/0x670 kernel/bpf/devmap.c:191 bpf_map_free_deferred+0xba/0xf0 kernel/bpf/syscall.c:262 process_one_work+0xc64/0x1b70 kernel/workqueue.c:2153 worker_thread+0x181/0x13a0 kernel/workqueue.c:2296 kthread+0x345/0x410 kernel/kthread.c:240 ret_from_fork+0x3a/0x50 arch/x86/entry/entry_64.S:412 The buggy address belongs to the object at ffff8801b8da37c0 which belongs to the cache kmalloc-512 of size 512 The buggy address is located 264 bytes inside of 512-byte region [ffff8801b8da37c0, ffff8801b8da39c0) The buggy address belongs to the page: page:ffffea0006e368c0 count:1 mapcount:0 mapping:ffff8801da800940 index:0xffff8801b8da3540 flags: 0x2fffc0000000100(slab) raw: 02fffc0000000100 ffffea0007217b88 ffffea0006e30cc8 ffff8801da800940 raw: ffff8801b8da3540 ffff8801b8da3040 0000000100000004 0000000000000000 page dumped because: kasan: bad access detected Memory state around the buggy address: ffff8801b8da3780: fc fc fc fc fc fc fc fc fb fb fb fb fb fb fb fb ffff8801b8da3800: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
Quoted 1 line
ffff8801b8da3880: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
^
ffff8801b8da3900: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff8801b8da3980: fb fb fb fb fb fb fb fb fc fc fc fc fc fc fc fc
--- kernel/bpf/devmap.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/bpf/devmap.c +3 -0
@@ -156,6 +156,9 @@ static void dev_map_free(struct bpf_mapsynchronize_rcu (); +/* Make sure prior __dev_map_entry_free() have completed. */ +rcu_barrier (); +/* To ensure all pending flush operations have completed wait for flush * bitmap to indicate all flush_needed bits to be zero on _all_ cpus. * Because the above synchronize_rcu() ensures the map is disconnected
Greg Kroah-Hartman
maintainerPATCH 32/193 batman-adv: mcast: fix multicast tt/tvlv worker locking
In reply to Greg Kroah-HartmanFrom: Linus Lüssing <[email protected]>
commit a3c7cd0cdf1107f891aff847ad481e34df727055 upstream.
Syzbot has reported some issues with the locking assumptions made for the multicast tt/tvlv worker: It was able to trigger the WARN_ON() in batadv_mcast_mla_tt_retract() and batadv_mcast_mla_tt_add(). While hard/not reproduceable for us so far it seems that the delayed_work_pending() we use might not be quite safe from reordering.
Therefore this patch adds an explicit, new spinlock to protect the update of the mla_list and flags in bat_priv and then removes the WARN_ON(delayed_work_pending()).
--- net/batman-adv/main.c | 1 + net/batman-adv/multicast.c | 11 +++-------- net/batman-adv/types.h | 2 ++ 3 files changed, 6 insertions(+), 8 deletions(-)
net/batman-adv/main.c +1 -0
@@ -153,6 +153,7 @@ int batadv_mesh_init(struct net_device *spin_lock_init (&bat_priv->tt.commit_lock);spin_lock_init (&bat_priv->gw.list_lock);#ifdef CONFIG_BATMAN_ADV_MCAST +spin_lock_init (&bat_priv->mcast.mla_lock);spin_lock_init (&bat_priv->mcast.want_lists_lock);#endif spin_lock_init (&bat_priv->tvlv.container_list_lock);
net/batman-adv/multicast.c +3 -8
@@ -269,8 +269,6 @@ static void batadv_mcast_mla_list_free(s* translation table except the ones listed in the given mcast_list. * * If mcast_list is NULL then all are retracted. -* -* Do not call outside of the mcast worker! (or cancel mcast worker first) */ static void batadv_mcast_mla_tt_retract (struct batadv_priv *bat_priv,struct hlist_head *mcast_list)
@@ -278,8 +276,6 @@ static void batadv_mcast_mla_tt_retract(struct batadv_hw_addr *mcast_entry;struct hlist_node *tmp; -WARN_ON (delayed_work_pending (&bat_priv->mcast.work)); -hlist_for_each_entry_safe (mcast_entry, tmp, &bat_priv->mcast.mla_list, list) { if (mcast_list &&
@@ -303,8 +299,6 @@ static void batadv_mcast_mla_tt_retract(* * Adds multicast listener announcements from the given mcast_list to the * translation table if they have not been added yet. -* -* Do not call outside of the mcast worker! (or cancel mcast worker first) */ static void batadv_mcast_mla_tt_add (struct batadv_priv *bat_priv,struct hlist_head *mcast_list)
@@ -312,8 +306,6 @@ static void batadv_mcast_mla_tt_add(strustruct batadv_hw_addr *mcast_entry;struct hlist_node *tmp; -WARN_ON (delayed_work_pending (&bat_priv->mcast.work)); -if (!mcast_list)return ;
@@ -600,7 +592,10 @@ static void batadv_mcast_mla_update(stru priv_mcast = container_of(delayed_work, struct batadv_priv_mcast, work); bat_priv = container_of(priv_mcast, struct batadv_priv, mcast); +spin_lock (&bat_priv->mcast.mla_lock);__batadv_mcast_mla_update (bat_priv); +spin_unlock (&bat_priv->mcast.mla_lock); +batadv_mcast_start_timer (bat_priv); }
net/batman-adv/types.h +2 -0
@@ -798,6 +798,7 @@ struct batadv_mcast_querier_state {* @flags: the flags we have last sent in our mcast tvlv * @enabled: whether the multicast tvlv is currently enabled * @bridged: whether the soft interface has a bridge on top +* @mla_lock: a lock protecting mla_list and mla_flags * @num_disabled: number of nodes that have no mcast tvlv * @num_want_all_unsnoopables: number of nodes wanting unsnoopable IP traffic * @num_want_all_ipv4: counter for items in want_all_ipv4_list
@@ -816,6 +817,7 @@ struct batadv_priv_mcast {u8 flags;bool enabled;bool bridged; +spinlock_t mla_lock;atomic_t num_disabled;atomic_t num_want_all_unsnoopables;atomic_t num_want_all_ipv4;
Greg Kroah-Hartman
maintainerPATCH 33/193 at76c50x-usb: Dont register led_trigger if usb_register_driver failed
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
commit 09ac2694b0475f96be895848687ebcbba97eeecf upstream.
Syzkaller report this:
[ 1213.468581] BUG: unable to handle kernel paging request at fffffbfff83bf338 [ 1213.469530] #PF error: [normal kernel read fault] [ 1213.469530] PGD 237fe4067 P4D 237fe4067 PUD 237e60067 PMD 1c868b067 PTE 0 [ 1213.473514] Oops: 0000 [#1] SMP KASAN PTI [ 1213.473514] CPU: 0 PID: 6321 Comm: syz-executor.0 Tainted: G C 5.1.0-rc3+ #8 [ 1213.473514] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1ubuntu1 04/01/2014 [ 1213.473514] RIP: 0010:strcmp+0x31/0xa0 [ 1213.473514] Code: 00 00 00 00 fc ff df 55 53 48 83 ec 08 eb 0a 84 db 48 89 ef 74 5a 4c 89 e6 48 89 f8 48 89 fa 48 8d 6f 01 48 c1 e8 03 83 e2 07 <42> 0f b6 04 28 38 d0 7f 04 84 c0 75 50 48 89 f0 48 89 f2 0f b6 5d [ 1213.473514] RSP: 0018:ffff8881f2b7f950 EFLAGS: 00010246 [ 1213.473514] RAX: 1ffffffff83bf338 RBX: ffff8881ea6f7240 RCX: ffffffff825350c6 [ 1213.473514] RDX: 0000000000000000 RSI: ffffffffc1ee19c0 RDI: ffffffffc1df99c0 [ 1213.473514] RBP: ffffffffc1df99c1 R08: 0000000000000001 R09: 0000000000000004 [ 1213.473514] R10: 0000000000000000 R11: ffff8881de353f00 R12: ffff8881ee727900 [ 1213.473514] R13: dffffc0000000000 R14: 0000000000000001 R15: ffffffffc1eeaaf0 [ 1213.473514] FS: 00007fa66fa01700(0000) GS:ffff8881f7200000(0000) knlGS:0000000000000000 [ 1213.473514] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 1213.473514] CR2: fffffbfff83bf338 CR3: 00000001ebb9e005 CR4: 00000000007606f0 [ 1213.473514] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 1213.473514] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 1213.473514] PKRU: 55555554 [ 1213.473514] Call Trace: [ 1213.473514] led_trigger_register+0x112/0x3f0 [ 1213.473514] led_trigger_register_simple+0x7a/0x110 [ 1213.473514] ? 0xffffffffc1c10000 [ 1213.473514] at76_mod_init+0x77/0x1000 [at76c50x_usb] [ 1213.473514] do_one_initcall+0xbc/0x47d [ 1213.473514] ? perf_trace_initcall_level+0x3a0/0x3a0 [ 1213.473514] ? kasan_unpoison_shadow+0x30/0x40 [ 1213.473514] ? kasan_unpoison_shadow+0x30/0x40 [ 1213.473514] do_init_module+0x1b5/0x547 [ 1213.473514] load_module+0x6405/0x8c10 [ 1213.473514] ? module_frob_arch_sections+0x20/0x20 [ 1213.473514] ? kernel_read_file+0x1e6/0x5d0 [ 1213.473514] ? find_held_lock+0x32/0x1c0 [ 1213.473514] ? cap_capable+0x1ae/0x210 [ 1213.473514] ? __do_sys_finit_module+0x162/0x190 [ 1213.473514] __do_sys_finit_module+0x162/0x190 [ 1213.473514] ? __ia32_sys_init_module+0xa0/0xa0 [ 1213.473514] ? __mutex_unlock_slowpath+0xdc/0x690 [ 1213.473514] ? wait_for_completion+0x370/0x370 [ 1213.473514] ? vfs_write+0x204/0x4a0 [ 1213.473514] ? do_syscall_64+0x18/0x450 [ 1213.473514] do_syscall_64+0x9f/0x450 [ 1213.473514] entry_SYSCALL_64_after_hwframe+0x49/0xbe [ 1213.473514] RIP: 0033:0x462e99 [ 1213.473514] Code: f7 d8 64 89 02 b8 ff ff ff ff c3 66 0f 1f 44 00 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 bc ff ff ff f7 d8 64 89 01 48 [ 1213.473514] RSP: 002b:00007fa66fa00c58 EFLAGS: 00000246 ORIG_RAX: 0000000000000139 [ 1213.473514] RAX: ffffffffffffffda RBX: 000000000073bf00 RCX: 0000000000462e99 [ 1213.473514] RDX: 0000000000000000 RSI: 0000000020000300 RDI: 0000000000000003 [ 1213.473514] RBP: 00007fa66fa00c70 R08: 0000000000000000 R09: 0000000000000000 [ 1213.473514] R10: 0000000000000000 R11: 0000000000000246 R12: 00007fa66fa016bc [ 1213.473514] R13: 00000000004bcefa R14: 00000000006f6fb0 R15: 0000000000000004
If usb_register failed, no need to call led_trigger_register_simple.
--- drivers/net/wireless/atmel/at76c50x-usb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/atmel/at76c50x-usb.c +2 -2
@@ -2585,8 +2585,8 @@ static int __init at76_mod_init(void)if (result <0 ) printk(KERN_ERR DRIVER_NAME": usb_register failed (status %d)\n" , result); - -led_trigger_register_simple ("at76_usb-tx" , &ledtrig_tx); +else +led_trigger_register_simple ("at76_usb-tx" , &ledtrig_tx);return result; }
Greg Kroah-Hartman
maintainerPATCH 34/193 net: erspan: fix use-after-free
In reply to Greg Kroah-HartmanFrom: William Tu <[email protected]>
commit b423d13c08a656c719fa56324a8f4279c835d90c upstream.
When building the erspan header for either v1 or v2, the eth_hdr() does not point to the right inner packet's eth_hdr, causing kasan report use-after-free and slab-out-of-bouds read.
The patch fixes the following syzkaller issues:
[1] BUG: KASAN: slab-out-of-bounds in erspan_xmit+0x22d4/0x2430 net/ipv4/ip_gre.c:735
[2] BUG: KASAN: slab-out-of-bounds in erspan_build_header+0x3bf/0x3d0 net/ipv4/ip_gre.c:698
[3] BUG: KASAN: use-after-free in erspan_xmit+0x22d4/0x2430 net/ipv4/ip_gre.c:735
[4] BUG: KASAN: use-after-free in erspan_build_header+0x3bf/0x3d0 net/ipv4/ip_gre.c:698
[2] CPU: 0 PID: 3654 Comm: syzkaller377964 Not tainted 4.15.0-rc9+ #185
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:17 [inline] dump_stack+0x194/0x257 lib/dump_stack.c:53 print_address_description+0x73/0x250 mm/kasan/report.c:252 kasan_report_error mm/kasan/report.c:351 [inline] kasan_report+0x25b/0x340 mm/kasan/report.c:409 __asan_report_load_n_noabort+0xf/0x20 mm/kasan/report.c:440 erspan_build_header+0x3bf/0x3d0 net/ipv4/ip_gre.c:698 erspan_xmit+0x3b8/0x13b0 net/ipv4/ip_gre.c:740 __netdev_start_xmit include/linux/netdevice.h:4042 [inline] netdev_start_xmit include/linux/netdevice.h:4051 [inline] packet_direct_xmit+0x315/0x6b0 net/packet/af_packet.c:266 packet_snd net/packet/af_packet.c:2943 [inline] packet_sendmsg+0x3aed/0x60b0 net/packet/af_packet.c:2968 sock_sendmsg_nosec net/socket.c:638 [inline] sock_sendmsg+0xca/0x110 net/socket.c:648 SYSC_sendto+0x361/0x5c0 net/socket.c:1729 SyS_sendto+0x40/0x50 net/socket.c:1697 do_syscall_32_irqs_on arch/x86/entry/common.c:327 [inline] do_fast_syscall_32+0x3ee/0xf9d arch/x86/entry/common.c:389 entry_SYSENTER_compat+0x54/0x63 arch/x86/entry/entry_64_compat.S:129 RIP: 0023:0xf7fcfc79 RSP: 002b:00000000ffc6976c EFLAGS: 00000286 ORIG_RAX: 0000000000000171 RAX: ffffffffffffffda RBX: 0000000000000004 RCX: 0000000020011000 RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000020008000 RBP: 000000000000001c R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000000 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000
--- net/ipv4/ip_gre.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/ip_gre.c +1 -1
@@ -689,7 +689,7 @@ static void erspan_build_header(struct s __be32 id, u32 index, bool truncate) { struct iphdr *iphdr = ip_hdr(skb); -struct ethhdr *eth =eth_hdr (skb); +struct ethhdr *eth = (struct ethhdr *)skb->data;enum erspan_encap_type enc_type;struct erspanhdr *ershdr; struct qtag_prefix {
Greg Kroah-Hartman
maintainerPATCH 35/193 Revert "btrfs: Honour FITRIM range constraints during free space trim"
In reply to Greg Kroah-HartmanFrom: David Sterba <[email protected]>
This reverts commit b327ff8a9b5767ce39db650d468fb124b48974a5.
There is currently no corresponding patch in master due to additional changes that would be significantly different from plain revert in the respective stable branch.
The range argument was not handled correctly and could cause trim to overlap allocated areas or reach beyond the end of the device. The address space that fitrim normally operates on is in logical coordinates, while the discards are done on the physical device extents. This distinction cannot be made with the current ioctl interface and caused the confusion.
The bug depends on the layout of block groups and does not always happen. The whole-fs trim (run by default by the fstrim tool) is not affected.
--- fs/btrfs/extent-tree.c | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-)
fs/btrfs/extent-tree.c +6 -19
@@ -11057,9 +11057,9 @@ int btrfs_error_unpin_extent_range(struc* transaction. */ static int btrfs_trim_free_extents (struct btrfs_device *device, -struct fstrim_range *range,u64 *trimmed) +u64 minlen,u64 *trimmed) { -u64 start = range->start, len =0 ; +u64 start =0 , len =0 ;int ret; *trimmed =0 ;
@@ -11095,8 +11095,8 @@ static int btrfs_trim_free_extents(strucrefcount_inc (&trans->use_count);spin_unlock (&fs_info->trans_lock); - ret =find_free_dev_extent_start (trans, device, range->minlen, - start, &start, &len); + ret =find_free_dev_extent_start (trans, device, minlen, start, + &start, &len);if (trans)btrfs_put_transaction (trans);
@@ -11108,16 +11108,6 @@ static int btrfs_trim_free_extents(strucbreak ; } -/* If we are out of the passed range break */ -if (start > range->start + range->len -1 ) { -mutex_unlock (&fs_info->chunk_mutex); - ret =0 ; -break ; - } - - start =max (range->start, start); - len =min (range->len, len); - ret =btrfs_issue_discard (device->bdev, start, len, &bytes);up_read (&fs_info->commit_root_sem);mutex_unlock (&fs_info->chunk_mutex);
@@ -11128,10 +11118,6 @@ static int btrfs_trim_free_extents(struc start += len; *trimmed += bytes; -/* We've trimmed enough */ -if (*trimmed >= range->len) -break ; -if (fatal_signal_pending (current)) { ret = -ERESTARTSYS ;break ;
@@ -11215,7 +11201,8 @@ int btrfs_trim_fs(struct btrfs_fs_info *mutex_lock (&fs_info->fs_devices->device_list_mutex); devices = &fs_info->fs_devices->devices;list_for_each_entry (device, devices, dev_list) { - ret =btrfs_trim_free_extents (device, range, &group_trimmed); + ret =btrfs_trim_free_extents (device, range->minlen, + &group_trimmed);if (ret) { dev_failed++; dev_ret = ret;
Greg Kroah-Hartman
maintainerPATCH 36/193 gfs2: Fix lru_count going negative
In reply to Greg Kroah-Hartman[ Upstream commit 7881ef3f33bb80f459ea6020d1e021fc524a6348 ]
Under certain conditions, lru_count may drop below zero resulting in a large amount of log spam like this:
vmscan: shrink_slab: gfs2_dump_glock+0x3b0/0x630 [gfs2] \
negative objects to delete nr=-1
This happens as follows:
1) A glock is moved from lru_list to the dispose list and lru_count is decremented.
2) The dispose function calls cond_resched() and drops the lru lock.
3) Another thread takes the lru lock and tries to add the same glock to lru_list, checking if the glock is on an lru list.
4) It is on a list (actually the dispose list) and so it avoids incrementing lru_count.
5) The glock is moved to lru_list.
5) The original thread doesn't dispose it because it has been re-added to the lru list but the lru_count has still decreased by one.
Fix by checking if the LRU flag is set on the glock rather than checking if the glock is on some list and rearrange the code so that the LRU flag is added/removed precisely when the glock is added/removed from lru_list.
--- fs/gfs2/glock.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
fs/gfs2/glock.c +13 -9
@@ -183,15 +183,19 @@ static int demote_ok(const struct gfs2_glock *gl)void gfs2_glock_add_to_lru (struct gfs2_glock *gl) { +if (!(gl->gl_ops->go_flags &GLOF_LRU )) +return ; +spin_lock (&lru_lock); -if (!list_empty (&gl->gl_lru)) -list_del_init (&gl->gl_lru); -else +list_del (&gl->gl_lru); +list_add_tail (&gl->gl_lru, &lru_list); + +if (!test_bit (GLF_LRU , &gl->gl_flags)) { +set_bit (GLF_LRU , &gl->gl_flags);atomic_inc (&lru_count); + } -list_add_tail (&gl->gl_lru, &lru_list); -set_bit (GLF_LRU , &gl->gl_flags);spin_unlock (&lru_lock); }
@@ -201,7 +205,7 @@ static void gfs2_glock_remove_from_lru(struct gfs2_glock *gl)return ;spin_lock (&lru_lock); -if (!list_empty (&gl->gl_lru)) { +if (test_bit (GLF_LRU , &gl->gl_flags)) {list_del_init (&gl->gl_lru);atomic_dec (&lru_count);clear_bit (GLF_LRU , &gl->gl_flags);
@@ -1158,8 +1162,7 @@ void gfs2_glock_dq(struct gfs2_holder *gh) !test_bit(GLF_DEMOTE, &gl->gl_flags)) fast_path =1 ; } -if (!test_bit (GLF_LFLUSH , &gl->gl_flags) &&demote_ok (gl) && - (glops->go_flags &GLOF_LRU )) +if (!test_bit (GLF_LFLUSH , &gl->gl_flags) &&demote_ok (gl))gfs2_glock_add_to_lru (gl);trace_gfs2_glock_queue (gh,0 );
@@ -1454,6 +1457,7 @@ __acquires(&lru_lock)if (!spin_trylock (&gl->gl_lockref.lock)) { add_back_to_lru:list_add (&gl->gl_lru, &lru_list); +set_bit (GLF_LRU , &gl->gl_flags);atomic_inc (&lru_count);continue ; }
@@ -1461,7 +1465,6 @@ __acquires(&lru_lock)spin_unlock (&gl->gl_lockref.lock); goto add_back_to_lru; } -clear_bit (GLF_LRU , &gl->gl_flags); gl->gl_lockref.count++;if (demote_ok (gl))handle_callback (gl,LM_ST_UNLOCKED ,0 , false);
@@ -1496,6 +1499,7 @@ static long gfs2_scan_glock_lru(int nr)if (!test_bit (GLF_LOCK , &gl->gl_flags)) {list_move (&gl->gl_lru, &dispose);atomic_dec (&lru_count); +clear_bit (GLF_LRU , &gl->gl_flags); freed++;continue ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 37/193 cxgb4: Fix error path in cxgb4_init_module
In reply to Greg Kroah-Hartman[ Upstream commit a3147770bea76c8dbad73eca3a24c2118da5e719 ]
BUG: unable to handle kernel paging request at ffffffffa016a270 PGD 3270067 P4D 3270067 PUD 3271063 PMD 230bbd067 PTE 0 Oops: 0000 [#1 CPU: 0 PID: 6134 Comm: modprobe Not tainted 5.1.0+ #33 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.9.3-0-ge2fc41e-prebuilt.qemu-project.org 04/01/2014 RIP: 0010:atomic_notifier_chain_register+0x24/0x60 Code: 1f 80 00 00 00 00 55 48 89 e5 41 54 49 89 f4 53 48 89 fb e8 ae b4 38 01 48 8b 53 38 48 8d 4b 38 48 85 d2 74 20 45 8b 44 24 10 <44> 3b 42 10 7e 08 eb 13 44 39 42 10 7c 0d 48 8d 4a 08 48 8b 52 08 RSP: 0018:ffffc90000e2bc60 EFLAGS: 00010086 RAX: 0000000000000292 RBX: ffffffff83467240 RCX: ffffffff83467278 RDX: ffffffffa016a260 RSI: ffffffff83752140 RDI: ffffffff83467240 RBP: ffffc90000e2bc70 R08: 0000000000000000 R09: 0000000000000001 R10: 0000000000000000 R11: 00000000014fa61f R12: ffffffffa01c8260 R13: ffff888231091e00 R14: 0000000000000000 R15: ffffc90000e2be78 FS: 00007fbd8d7cd540(0000) GS:ffff888237a00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffffffffa016a270 CR3: 000000022c7e3000 CR4: 00000000000006f0 Call Trace: register_inet6addr_notifier+0x13/0x20 cxgb4_init_module+0x6c/0x1000 [cxgb4 ? 0xffffffffa01d7000 do_one_initcall+0x6c/0x3cc ? do_init_module+0x22/0x1f1 ? rcu_read_lock_sched_held+0x97/0xb0 ? kmem_cache_alloc_trace+0x325/0x3b0 do_init_module+0x5b/0x1f1 load_module+0x1db1/0x2690 ? m_show+0x1d0/0x1d0 __do_sys_finit_module+0xc5/0xd0 __x64_sys_finit_module+0x15/0x20 do_syscall_64+0x6b/0x1d0 entry_SYSCALL_64_after_hwframe+0x49/0xbe
If pci_register_driver fails, register inet6addr_notifier is pointless. This patch fix the error path in cxgb4_init_module.
--- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +12 -3
@@ -5399,15 +5399,24 @@ static int __init cxgb4_init_module(void) ret =pci_register_driver (&cxgb4_driver);if (ret <0 ) -debugfs_remove (cxgb4_debugfs_root); + goto err_pci;#if IS_ENABLED (CONFIG_IPV6 )if (!inet6addr_registered) { -register_inet6addr_notifier (&cxgb4_inet6addr_notifier); - inet6addr_registered = true; + ret =register_inet6addr_notifier (&cxgb4_inet6addr_notifier); +if (ret) +pci_unregister_driver (&cxgb4_driver); +else + inet6addr_registered = true; }#endif +if (ret ==0 ) +return ret; + +err_pci: +debugfs_remove (cxgb4_debugfs_root); +return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 38/193 NFS: make nfs_match_client killable
In reply to Greg Kroah-Hartman[ Upstream commit 950a578c6128c2886e295b9c7ecb0b6b22fcc92b ]
Actually we don't do anything with return value from nfs_wait_client_init_complete in nfs_match_client, as a consequence if we get a fatal signal and client is not fully initialised, we'll loop to "again" label
This has been proven to cause soft lockups on some scenarios (no-carrier but configured network interfaces)
--- fs/nfs/client.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
fs/nfs/client.c +6 -1
@@ -290,6 +290,7 @@ static struct nfs_client *nfs_match_client(const struct nfs_client_initdata *datstruct nfs_client *clp;const struct sockaddr *sap = data->addr;struct nfs_net *nn =net_generic (data->net, nfs_net_id); +int error; again:list_for_each_entry (clp, &nn->nfs_client_list, cl_share_link) {
@@ -302,8 +303,10 @@ static struct nfs_client *nfs_match_client(const struct nfs_client_initdata *datif (clp->cl_cons_state >NFS_CS_READY ) {atomic_inc (&clp->cl_count);spin_unlock (&nn->nfs_client_lock); -nfs_wait_client_init_complete (clp); + error =nfs_wait_client_init_complete (clp);nfs_put_client (clp); +if (error <0 ) +return ERR_PTR (error);spin_lock (&nn->nfs_client_lock); goto again; }
@@ -413,6 +416,8 @@ struct nfs_client *nfs_get_client(const struct nfs_client_initdata *cl_init) clp =nfs_match_client (cl_init);if (clp) {spin_unlock (&nn->nfs_client_lock); +if (IS_ERR (clp)) +return clp;if (new) new->rpc_ops->free_client (new);return nfs_found_client (cl_init, clp);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 39/193 IB/hfi1: Fix WQ_MEM_RECLAIM warning
In reply to Greg Kroah-Hartman[ Upstream commit 4c4b1996b5db688e2dcb8242b0a3bf7b1e845e42 ]
The work_item cancels that occur when a QP is destroyed can elicit the following trace:
workqueue: WQ_MEM_RECLAIM ipoib_wq:ipoib_cm_tx_reap [ib_ipoib] is flushing !WQ_MEM_RECLAIM hfi0_0:_hfi1_do_send [hfi1]
WARNING: CPU: 7 PID: 1403 at kernel/workqueue.c:2486 check_flush_dependency+0xb1/0x100 Call Trace: __flush_work.isra.29+0x8c/0x1a0 ? __switch_to_asm+0x40/0x70 __cancel_work_timer+0x103/0x190 ? schedule+0x32/0x80 iowait_cancel_work+0x15/0x30 [hfi1] rvt_reset_qp+0x1f8/0x3e0 [rdmavt] rvt_destroy_qp+0x65/0x1f0 [rdmavt] ? _cond_resched+0x15/0x30 ib_destroy_qp+0xe9/0x230 [ib_core] ipoib_cm_tx_reap+0x21c/0x560 [ib_ipoib] process_one_work+0x171/0x370 worker_thread+0x49/0x3f0 kthread+0xf8/0x130 ? max_active_store+0x80/0x80 ? kthread_bind+0x10/0x10 ret_from_fork+0x35/0x40
Since QP destruction frees memory, hfi1_wq should have the WQ_MEM_RECLAIM.
The hfi1_wq does not allocate memory with GFP_KERNEL or otherwise become entangled with memory reclaim, so this flag is appropriate.
--- drivers/infiniband/hw/hfi1/init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/infiniband/hw/hfi1/init.c +2 -1
@@ -769,7 +769,8 @@ static int create_workqueues(struct hfi1_devdata *dd) ppd->hfi1_wq =alloc_workqueue ("hfi%d_%d" , -WQ_SYSFS |WQ_HIGHPRI |WQ_CPU_INTENSIVE , +WQ_SYSFS |WQ_HIGHPRI |WQ_CPU_INTENSIVE | +WQ_MEM_RECLAIM ,HFI1_MAX_ACTIVE_WORKQUEUE_ENTRIES , dd->unit, pidx);if (!ppd->hfi1_wq)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 40/193 gfs2: Fix occasional glock use-after-free
In reply to Greg Kroah-Hartman[ Upstream commit 9287c6452d2b1f24ea8e84bd3cf6f3c6f267f712 ]
This patch has to do with the life cycle of glocks and buffers. When gfs2 metadata or journaled data is queued to be written, a gfs2_bufdata object is assigned to track the buffer, and that is queued to various lists, including the glock's gl_ail_list to indicate it's on the active items list. Once the page associated with the buffer has been written, it is removed from the ail list, but its life isn't over until a revoke has been successfully written.
So after the block is written, its bufdata object is moved from the glock's gl_ail_list to a file-system-wide list of pending revokes, sd_log_le_revoke. At that point the glock still needs to track how many revokes it contributed to that list (in gl_revokes) so that things like glock go_sync can ensure all the metadata has been not only written, but also revoked before the glock is granted to a different node. This is to guarantee journal replay doesn't replay the block once the glock has been granted to another node.
Ross Lagerwall recently discovered a race in which an inode could be evicted, and its glock freed after its ail list had been synced, but while it still had unwritten revokes on the sd_log_le_revoke list. The evict decremented the glock reference count to zero, which allowed the glock to be freed. After the revoke was written, function revoke_lo_after_commit tried to adjust the glock's gl_revokes counter and clear its GLF_LFLUSH flag, at which time it referenced the freed glock.
This patch fixes the problem by incrementing the glock reference count in gfs2_add_revoke when the glock's first bufdata object is moved from the glock to the global revokes list. Later, when the glock's last such bufdata object is freed, the reference count is decremented. This guarantees that whichever process finishes last (the revoke writing or the evict) will properly free the glock, and neither will reference the glock after it has been freed.
--- fs/gfs2/glock.c | 1 + fs/gfs2/log.c | 3 ++- fs/gfs2/lops.c | 6 ++++-- 3 files changed, 7 insertions(+), 3 deletions(-)
fs/gfs2/glock.c +1 -0
@@ -140,6 +140,7 @@ void gfs2_glock_free(struct gfs2_glock *gl) {struct gfs2_sbd *sdp = gl->gl_name.ln_sbd; +BUG_ON (atomic_read (&gl->gl_revokes));rhashtable_remove_fast (&gl_hash_table, &gl->gl_node, ht_parms);smp_mb ();wake_up_glock (gl);
fs/gfs2/log.c +2 -1
@@ -588,7 +588,8 @@ void gfs2_add_revoke(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd) bd->bd_bh =NULL ; bd->bd_ops = &gfs2_revoke_lops; sdp->sd_log_num_revoke++; -atomic_inc (&gl->gl_revokes); +if (atomic_inc_return (&gl->gl_revokes) ==1 ) +gfs2_glock_hold (gl);set_bit (GLF_LFLUSH , &gl->gl_flags);list_add (&bd->bd_list, &sdp->sd_log_le_revoke); }
fs/gfs2/lops.c +4 -2
@@ -660,8 +660,10 @@ static void revoke_lo_after_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr) bd = list_entry(head->next, struct gfs2_bufdata, bd_list);list_del_init (&bd->bd_list); gl = bd->bd_gl; -atomic_dec (&gl->gl_revokes); -clear_bit (GLF_LFLUSH , &gl->gl_flags); +if (atomic_dec_return (&gl->gl_revokes) ==0 ) { +clear_bit (GLF_LFLUSH , &gl->gl_flags); +gfs2_glock_queue_put (gl); + }kmem_cache_free (gfs2_bufdata_cachep, bd); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 41/193 mmc: core: Verify SD bus width
In reply to Greg Kroah-Hartman[ Upstream commit 9e4be8d03f50d1b25c38e2b59e73b194c130df7d ]
The SD Physical Layer Spec says the following: Since the SD Memory Card shall support at least the two bus modes 1-bit or 4-bit width, then any SD Card shall set at least bits 0 and 2 (SD_BUS_WIDTH="0101").
This change verifies the card has specified a bus width.
AMD SDHC Device 7806 can get into a bad state after a card disconnect where anything transferred via the DATA lines will always result in a zero filled buffer. Currently the driver will continue without error if the HC is in this condition. A block device will be created, but reading from it will result in a zero buffer. This makes it seem like the SD device has been erased, when in actuality the data is never getting copied from the DATA lines to the data buffer.
SCR is the first command in the SD initialization sequence that uses the DATA lines. By checking that the response was invalid, we can abort mounting the card.
--- drivers/mmc/core/sd.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/mmc/core/sd.c +8 -0
@@ -216,6 +216,14 @@ static int mmc_decode_scr(struct mmc_card *card)if (scr->sda_spec3) scr->cmds =UNSTUFF_BITS (resp,32 ,2 ); + +/* SD Spec says: any SD Card shall set at least bits 0 and 2 */ +if (!(scr->bus_widths &SD_SCR_BUS_WIDTH_1 ) || + !(scr->bus_widths &SD_SCR_BUS_WIDTH_4 )) { +pr_err ("%s: invalid bus width\n" ,mmc_hostname (card->host)); +return -EINVAL ; + } +return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 42/193 tools/bpf: fix perf build error with uClibc (seen on ARC)
In reply to Greg Kroah-Hartman[ Upstream commit ca31ca8247e2d3807ff5fa1d1760616a2292001c ]
When build perf for ARC recently, there was a build failure due to lack of __NR_bpf.
| Auto-detecting system features:
|
| ... get_cpuid: [ OFF ]
| ... bpf: [ on ]
|
| # error __NR_bpf not defined. libbpf does not support your arch.
^~~~~
| bpf.c: In function 'sys_bpf':
| bpf.c:66:17: error: '__NR_bpf' undeclared (first use in this function)
| return syscall(__NR_bpf, cmd, attr, size);
| ^~~~~~~~
| sys_bpf--- tools/lib/bpf/bpf.c | 2 ++ 1 file changed, 2 insertions(+)
tools/lib/bpf/bpf.c +2 -0
@@ -41,6 +41,8 @@# define __NR_bpf 349# elif defined(__s390__)# define __NR_bpf 351 +# elif defined(__arc__) +# define __NR_bpf 280# else # error __NR_bpf not defined. libbpf does not support your arch.# endif
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 43/193 dmaengine: tegra210-dma: free dma controller in remove()
In reply to Greg Kroah-Hartman[ Upstream commit f030e419501cb95e961e9ed35c493b5d46a04eca ]
Following kernel panic is seen during DMA driver unload->load sequence
==========================================================================
Unable to handle kernel paging request at virtual address ffffff8001198880 Internal error: Oops: 86000007 [#1] PREEMPT SMP CPU: 0 PID: 5907 Comm: HwBinder:4123_1 Tainted: G C 4.9.128-tegra-g065839f Hardware name: galen (DT) task: ffffffc3590d1a80 task.stack: ffffffc3d0678000 PC is at 0xffffff8001198880 LR is at of_dma_request_slave_channel+0xd8/0x1f8 pc : [<ffffff8001198880>] lr : [<ffffff8008746f30>] pstate: 60400045
sp : ffffffc3d067b710
x29: ffffffc3d067b710 x28: 000000000000002f
x27: ffffff800949e000 x26: ffffff800949e750
x25: ffffff800949e000 x24: ffffffbefe817d84
x23: ffffff8009f77cb0 x22: 0000000000000028
x21: ffffffc3ffda49c8 x20: 0000000000000029
x19: 0000000000000001 x18: ffffffffffffffff
x17: 0000000000000000 x16: ffffff80082b66a0
x15: ffffff8009e78250 x14: 000000000000000a
x13: 0000000000000038 x12: 0101010101010101
x11: 0000000000000030 x10: 0101010101010101
x9 : fffffffffffffffc x8 : 7f7f7f7f7f7f7f7f
x7 : 62ff726b6b64622c x6 : 0000000000008064
x5 : 6400000000000000 x4 : ffffffbefe817c44
x3 : ffffffc3ffda3e08 x2 : ffffff8001198880
x1 : ffffffc3d48323c0 x0 : ffffffc3d067b788
Process HwBinder:4123_1 (pid: 5907, stack limit = 0xffffffc3d0678028)
Call trace: [<ffffff8001198880>] 0xffffff8001198880 [<ffffff80087459f8>] dma_request_chan+0x50/0x1f0 [<ffffff8008745bc0>] dma_request_slave_channel+0x28/0x40 [<ffffff8001552c44>] tegra_alt_pcm_open+0x114/0x170 [<ffffff8008d65fa4>] soc_pcm_open+0x10c/0x878 [<ffffff8008d18618>] snd_pcm_open_substream+0xc0/0x170 [<ffffff8008d1878c>] snd_pcm_open+0xc4/0x240 [<ffffff8008d189e0>] snd_pcm_playback_open+0x58/0x80 [<ffffff8008cfc6d4>] snd_open+0xb4/0x178 [<ffffff8008250628>] chrdev_open+0xb8/0x1d0 [<ffffff8008246fdc>] do_dentry_open+0x214/0x318 [<ffffff80082485d0>] vfs_open+0x58/0x88 [<ffffff800825bce0>] do_last+0x450/0xde0 [<ffffff800825c718>] path_openat+0xa8/0x368 [<ffffff800825dd84>] do_filp_open+0x8c/0x110 [<ffffff8008248a74>] do_sys_open+0x164/0x220 [<ffffff80082b66dc>] compat_SyS_openat+0x3c/0x50 [<ffffff8008083040>] el0_svc_naked+0x34/0x38 ---[ end trace 67e6d544e65b5145 ]--- Kernel panic - not syncing: Fatal exception ==========================================================================
In device probe(), of_dma_controller_register() registers DMA controller. But when driver is removed, this is not freed. During driver reload this results in data abort and kernel panic. Add of_dma_controller_free() in driver remove path to fix the issue.
--- drivers/dma/tegra210-adma.c | 1 + 1 file changed, 1 insertion(+)
drivers/dma/tegra210-adma.c +1 -0
@@ -786,6 +786,7 @@ static int tegra_adma_remove(struct platform_device *pdev)struct tegra_adma *tdma =platform_get_drvdata (pdev);int i; +of_dma_controller_free (pdev->dev.of_node);dma_async_device_unregister (&tdma->dma_dev);for (i =0 ; i < tdma->nr_channels; ++i)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 44/193 net: ena: gcc 8: fix compilation warning
In reply to Greg Kroah-Hartman[ Upstream commit f913308879bc6ae437ce64d878c7b05643ddea44 ]
GCC 8 contains a number of new warnings as well as enhancements to existing checkers. The warning - Wstringop-truncation - warns for calls to bounded string manipulation functions such as strncat, strncpy, and stpncpy that may either truncate the copied string or leave the destination unchanged.
In our case the destination string length (32 bytes) is much shorter than the source string (64 bytes) which causes this warning to show up. In general the destination has to be at least a byte larger than the length of the source string with strncpy for this warning not to showup.
This can be easily fixed by using strlcpy instead which already does the truncation to the string. Documentation for this function can be found here:
https://elixir.bootlin.com/linux/latest/source/lib/string.c#L141
--- drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/amazon/ena/ena_netdev.c +1 -1
@@ -2229,7 +2229,7 @@ static void ena_config_host_info(struct ena_com_dev *ena_dev) host_info->os_type =ENA_ADMIN_OS_LINUX ; host_info->kernel_ver =LINUX_VERSION_CODE ; -strncpy (host_info->kernel_ver_str,utsname ()->version, +strlcpy (host_info->kernel_ver_str,utsname ()->version,sizeof (host_info->kernel_ver_str) -1 ); host_info->os_dist =0 ; strncpy(host_info->os_dist_str, utsname()->release,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 45/193 pinctrl: zte: fix leaked of_node references
In reply to Greg Kroah-Hartman[ Upstream commit 02d15f0d80720545f1f4922a1550ea4aaad4e152 ]
The call to of_parse_phandle returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
./drivers/pinctrl/zte/pinctrl-zx.c:415:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 407, but without a corresponding object release within this function. ./drivers/pinctrl/zte/pinctrl-zx.c:422:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 407, but without a corresponding object release within this function. ./drivers/pinctrl/zte/pinctrl-zx.c:436:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 407, but without a corresponding object release within this function. ./drivers/pinctrl/zte/pinctrl-zx.c:444:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 407, but without a corresponding object release within this function. ./drivers/pinctrl/zte/pinctrl-zx.c:448:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 407, but without a corresponding object release within this function.
--- drivers/pinctrl/zte/pinctrl-zx.c | 1 + 1 file changed, 1 insertion(+)
drivers/pinctrl/zte/pinctrl-zx.c +1 -0
@@ -411,6 +411,7 @@ int zx_pinctrl_init(struct platform_device *pdev, } zpctl->aux_base =of_iomap (np,0 ); +of_node_put (np);if (!zpctl->aux_base)return -ENOMEM ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 46/193 ASoC: hdmi-codec: unlock the device on startup errors
In reply to Greg Kroah-Hartman[ Upstream commit 30180e8436046344b12813dc954b2e01dfdcd22d ]
If the hdmi codec startup fails, it should clear the current_substream pointer to free the device. This is properly done for the audio_startup() callback but for snd_pcm_hw_constraint_eld().
Make sure the pointer cleared if an error is reported.
--- sound/soc/codecs/hdmi-codec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
sound/soc/codecs/hdmi-codec.c +5 -1
@@ -446,8 +446,12 @@ static int hdmi_codec_startup(struct snd_pcm_substream *substream,if (!ret) { ret =snd_pcm_hw_constraint_eld (substream->runtime, hcp->eld); -if (ret) +if (ret) { +mutex_lock (&hcp->current_stream_lock); + hcp->current_stream =NULL ; +mutex_unlock (&hcp->current_stream_lock);return ret; + } }/* Select chmap supported */ hdmi_codec_eld_chmap (hcp);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 47/193 powerpc/perf: Return accordingly on invalid chip-id in
In reply to Greg Kroah-Hartman[ Upstream commit a913e5e8b43be1d3897a141ce61c1ec071cad89c ]
Nest hardware counter memory resides in a per-chip reserve-memory. During nest_imc_event_init(), chip-id of the event-cpu is considered to calculate the base memory addresss for that cpu. Return, proper error condition if the chip_id calculated is invalid.
--- arch/powerpc/perf/imc-pmu.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/powerpc/perf/imc-pmu.c +5 -0
@@ -481,6 +481,11 @@ static int nest_imc_event_init(struct perf_event *event)* Get the base memory addresss for this cpu. */ chip_id =cpu_to_chip_id (event->cpu); + +/* Return, if chip_id is not valid */ +if (chip_id <0 ) +return -ENODEV ; + pcni = pmu->mem_info; do { if (pcni->id == chip_id) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 48/193 powerpc/boot: Fix missing check of lseek() return value
In reply to Greg Kroah-Hartman[ Upstream commit 5d085ec04a000fefb5182d3b03ee46ca96d8389b ]
This is detected by Coverity scan: CID: 1440481
--- arch/powerpc/boot/addnote.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/powerpc/boot/addnote.c +5 -1
@@ -223,7 +223,11 @@ main(int ac, char **av)PUT_16 (E_PHNUM , np +2 );/* write back */ -lseek (fd, (long )0 ,SEEK_SET ); + i =lseek (fd, (long )0 ,SEEK_SET ); +if (i <0 ) { +perror ("lseek" ); +exit (1 ); + } i =write (fd, buf, n);if (i <0 ) {perror ("write" );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 49/193 ASoC: imx: fix fiq dependencies
In reply to Greg Kroah-Hartman[ Upstream commit ea751227c813ab833609afecfeedaf0aa26f327e ]
During randconfig builds, I occasionally run into an invalid configuration of the freescale FIQ sound support:
WARNING: unmet direct dependencies detected for SND_SOC_IMX_PCM_FIQ
Depends on [m]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_IMX_SOC [=m]
Selected by [y]:
- SND_SOC_FSL_SPDIF [=y] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_IMX_SOC [=m]!=n && (MXC_TZIC [=n] || MXC_AVIC [=y])
sound/soc/fsl/imx-ssi.o: In function `imx_ssi_remove':
imx-ssi.c:(.text+0x28): undefined reference to imx_pcm_fiq_exit' sound/soc/fsl/imx-ssi.o: In function imx_ssi_probe':
imx-ssi.c:(.text+0xa64): undefined reference to `imx_pcm_fiq_init'
The Kconfig warning is a result of the symbol being defined inside of the "if SND_IMX_SOC" block, and is otherwise harmless. The link error is more tricky and happens with SND_SOC_IMX_SSI=y, which may or may not imply FIQ support. However, if SND_SOC_FSL_SSI is set to =m at the same time, that selects SND_SOC_IMX_PCM_FIQ as a loadable module dependency, which then causes a link failure from imx-ssi.
The solution here is to make SND_SOC_IMX_PCM_FIQ built-in whenever one of its potential users is built-in.
--- sound/soc/fsl/Kconfig | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
sound/soc/fsl/Kconfig +5 -4
@@ -173,16 +173,17 @@ config SND_MPC52xx_SOC_EFIKA endif # SND_POWERPC_SOC +config SND_SOC_IMX_PCM_FIQ + tristate + default y if SND_SOC_IMX_SSI=y && (SND_SOC_FSL_SSI=m || SND_SOC_FSL_SPDIF=m) && (MXC_TZIC || MXC_AVIC) + select FIQ + if SND_IMX_SOC config SND_SOC_IMX_SSI tristate select SND_SOC_FSL_UTILS -config SND_SOC_IMX_PCM_FIQ - tristate - select FIQ - comment "SoC Audio support for Freescale i.MX boards:" config SND_MXC_SOC_WM1133_EV1
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 50/193 spi: pxa2xx: fix SCR (divisor) calculation
In reply to Greg Kroah-Hartman[ Upstream commit 29f2133717c527f492933b0622a4aafe0b3cbe9e ]
Calculate the divisor for the SCR (Serial Clock Rate), avoiding that the SSP transmission rate can be greater than the device rate.
When the division between the SSP clock and the device rate generates a reminder, we have to increment by one the divisor.
In this way the resulting SSP clock will never be greater than the device SPI max frequency.
For example, with:
- ssp_clk = 50 MHz
- dev freq = 15 MHz
without this patch the SSP clock will be greater than 15 MHz:
- 25 MHz for PXA25x_SSP and CE4100_SSP
- 16,56 MHz for the others
Instead, with this patch, we have in both case an SSP clock of 12.5MHz, so the max rate of the SPI device clock is respected.
--- drivers/spi/spi-pxa2xx.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/spi/spi-pxa2xx.c +6 -2
@@ -938,10 +938,14 @@ static unsigned int ssp_get_clk_div(struct driver_data *drv_data, int rate) rate =min_t (int, ssp_clk, rate); +/* +* Calculate the divisor for the SCR (Serial Clock Rate), avoiding +* that the SSP transmission rate can be greater than the device rate +*/ if (ssp->type == PXA25x_SSP || ssp->type ==CE4100_SSP ) -return (ssp_clk / (2 * rate) -1 ) &0xff ; +return (DIV_ROUND_UP (ssp_clk,2 * rate) -1 ) &0xff ;else -return (ssp_clk / rate -1 ) &0xfff ; +return (DIV_ROUND_UP (ssp_clk, rate) -1 ) &0xfff ; } static unsigned int pxa2xx_ssp_get_clk_div(struct driver_data *drv_data,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 51/193 brcm80211: potential NULL dereference in brcmf_cfg80211_vndr_cmds_dcmd_handler()
In reply to Greg Kroah-Hartman[ Upstream commit e025da3d7aa4770bb1d1b3b0aa7cc4da1744852d ]
If "ret_len" is negative then it could lead to a NULL dereference.
The "ret_len" value comes from nl80211_vendor_cmd(), if it's negative then we don't allocate the "dcmd_buf" buffer. Then we pass "ret_len" to brcmf_fil_cmd_data_set() where it is cast to a very high u32 value. Most of the functions in that call tree check whether the buffer we pass is NULL but there are at least a couple places which don't such as brcmf_dbg_hex_dump() and brcmf_msgbuf_query_dcmd(). We memcpy() to and from the buffer so it would result in a NULL dereference.
The fix is to change the types so that "ret_len" can't be negative. (If we memcpy() zero bytes to NULL, that's a no-op and doesn't cause an issue).
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c +3 -2
@@ -35,9 +35,10 @@ static int brcmf_cfg80211_vndr_cmds_dcmd_handler(struct wiphy *wiphy,struct brcmf_if *ifp;const struct brcmf_vndr_dcmd_hdr *cmdhdr = data;struct sk_buff *reply; -int ret, payload, ret_len; +unsigned int payload, ret_len;void *dcmd_buf =NULL , *wr_pointer;u16 msglen, maxmsglen =PAGE_SIZE -0x100 ; +int ret;if (len <sizeof (*cmdhdr)) {brcmf_err ("vendor command too short: %d\n" , len);
@@ -65,7 +66,7 @@ static int brcmf_cfg80211_vndr_cmds_dcmd_handler(struct wiphy *wiphy,brcmf_err ("oversize return buffer %d\n" , ret_len); ret_len =BRCMF_DCMD_MAXLEN ; } - payload =max (ret_len, len) +1 ; + payload = max_t(unsigned int, ret_len, len) + 1; dcmd_buf =vzalloc (payload);if (NULL == dcmd_buf)return -ENOMEM ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 52/193 ACPI / property: fix handling of data_nodes in acpi_get_next_subnode()
In reply to Greg Kroah-Hartman[ Upstream commit 23583f7795025e3c783b680d906509366b0906ad ]
When the DSDT tables expose devices with subdevices and a set of hierarchical _DSD properties, the data returned by acpi_get_next_subnode() is incorrect, with the results suggesting a bad pointer assignment. The parser works fine with device_nodes or data_nodes, but not with a combination of the two.
The problem is traced to an invalid pointer used when jumping from handling device_nodes to data nodes. The existing code looks for data nodes below the last subdevice found instead of the common root. Fix by forcing the acpi_device pointer to be derived from the same fwnode for the two types of subnodes.
This same problem of handling device and data nodes was already fixed in a similar way by 'commit bf4703fdd166 ("ACPI / property: fix data node parsing in acpi_get_next_subnode()")' but broken later by 'commit 34055190b19 ("ACPI / property: Add fwnode_get_next_child_node()")', so this should probably go to linux-stable all the way to 4.12
--- drivers/acpi/property.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/acpi/property.c +8 -0
@@ -943,6 +943,14 @@ struct fwnode_handle *acpi_get_next_subnode(const struct fwnode_handle *fwnode,const struct acpi_data_node *data =to_acpi_data_node (fwnode);struct acpi_data_node *dn; +/* +* We can have a combination of device and data nodes, e.g. with +* hierarchical _DSD properties. Make sure the adev pointer is +* restored before going through data nodes, otherwise we will +* be looking for data_nodes below the last device found instead +* of the common fwnode shared by device_nodes and data_nodes. +*/ + adev =to_acpi_device_node (fwnode);if (adev) head = &adev->data.subnodes;else if (data)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 53/193 ARM: vdso: Remove dependency with the arch_timer driver internals
In reply to Greg Kroah-Hartman[ Upstream commit 1f5b62f09f6b314c8d70b9de5182dae4de1f94da ]
The VDSO code uses the kernel helper that was originally designed to abstract the access between 32 and 64bit systems. It worked so far because this function is declared as 'inline'.
As we're about to revamp that part of the code, the VDSO would break. Let's fix it by doing what should have been done from the start, a proper system register access.
--- arch/arm/include/asm/cp15.h | 2 ++ arch/arm/vdso/vgettimeofday.c | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-)
arch/arm/include/asm/cp15.h +2 -0
@@ -68,6 +68,8 @@#define BPIALL __ACCESS_CP15(c7, 0, c5, 6)#define ICIALLU __ACCESS_CP15(c7, 0, c5, 0) +#define CNTVCT __ACCESS_CP15_64(1, c14) +extern unsigned long cr_alignment;/* defined in entry-armv.S */ static inline unsigned long get_cr (void )
arch/arm/vdso/vgettimeofday.c +3 -2
@@ -18,9 +18,9 @@#include <linux/compiler.h> #include <linux/hrtimer.h> #include <linux/time.h> -#include <asm/arch_timer.h> #include <asm/barrier.h> #include <asm/bug.h> +#include <asm/cp15.h> #include <asm/page.h> #include <asm/unistd.h> #include <asm/vdso_datapage.h>
@@ -123,7 +123,8 @@ static notrace u64 get_ns(struct vdso_data *vdata)u64 cycle_now;u64 nsec; - cycle_now =arch_counter_get_cntvct (); +isb (); + cycle_now =read_sysreg (CNTVCT ); cycle_delta = (cycle_now - vdata->cs_cycle_last) & vdata->cs_mask;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 54/193 arm64: Fix compiler warning from pte_unmap() with -Wunused-but-set-variable
In reply to Greg Kroah-Hartman[ Upstream commit 74dd022f9e6260c3b5b8d15901d27ebcc5f21eda ]
When building with -Wunused-but-set-variable, the compiler shouts about a number of pte_unmap() users, since this expands to an empty macro on arm64:
| mm/gup.c: In function 'gup_pte_range': | mm/gup.c:1727:16: warning: variable 'ptem' set but not used | [-Wunused-but-set-variable] | mm/gup.c: At top level: | mm/memory.c: In function 'copy_pte_range': | mm/memory.c:821:24: warning: variable 'orig_dst_pte' set but not used | [-Wunused-but-set-variable] | mm/memory.c:821:9: warning: variable 'orig_src_pte' set but not used | [-Wunused-but-set-variable] | mm/swap_state.c: In function 'swap_ra_info': | mm/swap_state.c:641:15: warning: variable 'orig_pte' set but not used | [-Wunused-but-set-variable] | mm/madvise.c: In function 'madvise_free_pte_range': | mm/madvise.c:318:9: warning: variable 'orig_pte' set but not used | [-Wunused-but-set-variable]
Rewrite pte_unmap() as a static inline function, which silences the warnings.
--- arch/arm64/include/asm/pgtable.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/include/asm/pgtable.h +2 -1
@@ -420,6 +420,8 @@ static inline phys_addr_t pmd_page_paddr(pmd_t pmd)return pmd_val (pmd) &PHYS_MASK & (s32 )PAGE_MASK ; } +static inline void pte_unmap (pte_t *pte) { } +/* Find an entry in the third-level page table. */ #define pte_index (addr) (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
@@ -428,7 +430,6 @@ static inline phys_addr_t pmd_page_paddr(pmd_t pmd)#define pte_offset_map (dir,addr) pte_offset_kernel((dir), (addr))#define pte_offset_map_nested (dir,addr) pte_offset_kernel((dir), (addr)) -#define pte_unmap (pte) do { } while (0)#define pte_unmap_nested (pte) do { } while (0)#define pte_set_fixmap (addr) ((pte_t *)set_fixmap_offset(FIX_PTE, addr))
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 55/193 sched/cpufreq: Fix kobject memleak
In reply to Greg Kroah-Hartman[ Upstream commit 9a4f26cc98d81b67ecc23b890c28e2df324e29f3 ]
Currently the error return path from kobject_init_and_add() is not followed by a call to kobject_put() - which means we are leaking the kobject.
Fix it by adding a call to kobject_put() in the error path of kobject_init_and_add().
--- drivers/cpufreq/cpufreq.c | 1 + drivers/cpufreq/cpufreq_governor.c | 2 ++ 2 files changed, 3 insertions(+)
drivers/cpufreq/cpufreq.c +1 -0
@@ -1101,6 +1101,7 @@ static struct cpufreq_policy *cpufreq_policy_alloc(unsigned int cpu) cpufreq_global_kobject, "policy%u", cpu);if (ret) {pr_err ("%s: failed to init policy->kobj: %d\n" , __func__, ret); +kobject_put (&policy->kobj); goto err_free_real_cpus; }
drivers/cpufreq/cpufreq_governor.c +2 -0
@@ -459,6 +459,8 @@ int cpufreq_dbs_governor_init(struct cpufreq_policy *policy)/* Failure, so roll back. */ pr_err ("initialization failed (dbs_data kobject init error %d)\n" , ret); +kobject_put (&dbs_data->attr_set.kobj); + policy->governor_data =NULL ;if (!have_governor_per_policy ())
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 56/193 scsi: qla2xxx: Fix a qla24xx_enable_msix() error path
In reply to Greg Kroah-Hartman[ Upstream commit 24afabdbd0b3553963a2bbf465895492b14d1107 ]
Make sure that the allocated interrupts are freed if allocating memory for the msix_entries array fails.
--- drivers/scsi/qla2xxx/qla_isr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_isr.c +5 -1
@@ -3395,7 +3395,7 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp)ql_log (ql_log_fatal, vha,0x00c8 ,"Failed to allocate memory for ha->msix_entries.\n" ); ret = -ENOMEM ; - goto msix_out; + goto free_irqs; } ha->flags.msix_enabled =1 ;
@@ -3477,6 +3477,10 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp) msix_out:return ret; + +free_irqs: +pci_free_irq_vectors (ha->pdev); + goto msix_out; }int
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 57/193 scsi: qla2xxx: Fix abort handling in tcm_qla2xxx_write_pending()
In reply to Greg Kroah-Hartman[ Upstream commit e209783d66bca04b5fce4429e59338517ffc1a0b ]
Implementations of the .write_pending() callback functions must guarantee that an appropriate LIO core callback function will be called immediately or at a later time. Make sure that this guarantee is met for aborted SCSI commands.
[mkp: typo]
--- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/scsi/qla2xxx/tcm_qla2xxx.c +2 -0
@@ -391,6 +391,8 @@ static int tcm_qla2xxx_write_pending(struct se_cmd *se_cmd) cmd->se_cmd.transport_state, cmd->se_cmd.t_state, cmd->se_cmd.se_cmd_flags); +transport_generic_request_failure (&cmd->se_cmd, +TCM_CHECK_CONDITION_ABORT_CMD );return 0 ; } cmd->trc_flags |=TRC_XFR_RDY ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 58/193 scsi: qla2xxx: Avoid that lockdep complains about unsafe locking in tcm_qla2xxx_close_session()
In reply to Greg Kroah-Hartman[ Upstream commit d4023db71108375e4194e92730ba0d32d7f07813 ]
This patch avoids that lockdep reports the following warning:
=====================================================
WARNING: HARDIRQ-safe -> HARDIRQ-unsafe lock order detected
5.1.0-rc1-dbg+ #11 Tainted: G W
-----------------------------------------------------
rmdir/1478 [HC0[0]:SC0[0]:HE0:SE1] is trying to acquire:00000000e7ac4607 (&(&k->k_lock)->rlock){+.+.}, at: klist_next+0x43/0x1d0
and this task is already holding:00000000cf0baf5e (&(&ha->tgt.sess_lock)->rlock){-...}, at: tcm_qla2xxx_close_session+0x57/0xb0 [tcm_qla2xxx] which would create a new lock dependency:
(&(&ha->tgt.sess_lock)->rlock){-...} -> (&(&k->k_lock)->rlock){+.+.}
but this new dependency connects a HARDIRQ-irq-safe lock:
(&(&ha->tgt.sess_lock)->rlock){-...}
... which became HARDIRQ-irq-safe at:
lock_acquire+0xe3/0x200 _raw_spin_lock_irqsave+0x3d/0x60 qla2x00_fcport_event_handler+0x1f3d/0x22b0 [qla2xxx] qla2x00_async_login_sp_done+0x1dc/0x1f0 [qla2xxx] qla24xx_process_response_queue+0xa37/0x10e0 [qla2xxx] qla24xx_msix_rsp_q+0x79/0xf0 [qla2xxx] __handle_irq_event_percpu+0x79/0x3c0 handle_irq_event_percpu+0x70/0xf0 handle_irq_event+0x5a/0x8b handle_edge_irq+0x12c/0x310 handle_irq+0x192/0x20a do_IRQ+0x73/0x160 ret_from_intr+0x0/0x1d default_idle+0x23/0x1f0 arch_cpu_idle+0x15/0x20 default_idle_call+0x35/0x40 do_idle+0x2bb/0x2e0 cpu_startup_entry+0x1d/0x20 start_secondary+0x24d/0x2d0 secondary_startup_64+0xa4/0xb0
to a HARDIRQ-irq-unsafe lock:
(&(&k->k_lock)->rlock){+.+.}
... which became HARDIRQ-irq-unsafe at:
...
lock_acquire+0xe3/0x200 _raw_spin_lock+0x32/0x50 klist_add_tail+0x33/0xb0 device_add+0x7f4/0xb60 device_create_groups_vargs+0x11c/0x150 device_create_with_groups+0x89/0xb0 vtconsole_class_init+0xb2/0x124 do_one_initcall+0xc5/0x3ce kernel_init_freeable+0x295/0x32e kernel_init+0x11/0x11b ret_from_fork+0x3a/0x50
other info that might help us debug this:
Possible interrupt unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&(&k->k_lock)->rlock);
local_irq_disable();
lock(&(&ha->tgt.sess_lock)->rlock);
lock(&(&k->k_lock)->rlock);
<Interrupt>
lock(&(&ha->tgt.sess_lock)->rlock);*** DEADLOCK ***
4 locks held by rmdir/1478:
#0: 000000002c7f1ba4 (sb_writers#10){.+.+}, at: mnt_want_write+0x32/0x70
#1: 00000000c85eb147 (&default_group_class[depth - 1]#2/1){+.+.}, at: do_rmdir+0x217/0x2d0
#2: 000000002b164d6f (&sb->s_type->i_mutex_key#13){++++}, at: vfs_rmdir+0x7e/0x1d0
#3: 00000000cf0baf5e (&(&ha->tgt.sess_lock)->rlock){-...}, at: tcm_qla2xxx_close_session+0x57/0xb0 [tcm_qla2xxx]
the dependencies between HARDIRQ-irq-safe lock and the holding lock:
-> (&(&ha->tgt.sess_lock)->rlock){-...} ops: 127 {
IN-HARDIRQ-W at:
lock_acquire+0xe3/0x200
_raw_spin_lock_irqsave+0x3d/0x60
qla2x00_fcport_event_handler+0x1f3d/0x22b0 [qla2xxx]
qla2x00_async_login_sp_done+0x1dc/0x1f0 [qla2xxx]
qla24xx_process_response_queue+0xa37/0x10e0 [qla2xxx]
qla24xx_msix_rsp_q+0x79/0xf0 [qla2xxx]
__handle_irq_event_percpu+0x79/0x3c0
handle_irq_event_percpu+0x70/0xf0
handle_irq_event+0x5a/0x8b
handle_edge_irq+0x12c/0x310
handle_irq+0x192/0x20a
do_IRQ+0x73/0x160
ret_from_intr+0x0/0x1d
default_idle+0x23/0x1f0
arch_cpu_idle+0x15/0x20
default_idle_call+0x35/0x40
do_idle+0x2bb/0x2e0
cpu_startup_entry+0x1d/0x20
start_secondary+0x24d/0x2d0
secondary_startup_64+0xa4/0xb0
INITIAL USE at:
lock_acquire+0xe3/0x200
_raw_spin_lock_irqsave+0x3d/0x60
qla2x00_loop_resync+0xb3d/0x2690 [qla2xxx]
qla2x00_do_dpc+0xcee/0xf30 [qla2xxx]
kthread+0x1d2/0x1f0
ret_from_fork+0x3a/0x50
}
... key at: [<ffffffffa125f700>] __key.62804+0x0/0xfffffffffff7e900 [qla2xxx]
... acquired at:
__lock_acquire+0x11ed/0x1b60
lock_acquire+0xe3/0x200
_raw_spin_lock_irqsave+0x3d/0x60
klist_next+0x43/0x1d0
device_for_each_child+0x96/0x110
scsi_target_block+0x3c/0x40 [scsi_mod]
fc_remote_port_delete+0xe7/0x1c0 [scsi_transport_fc]
qla2x00_mark_device_lost+0x4d3/0x500 [qla2xxx]
qlt_unreg_sess+0x104/0x2c0 [qla2xxx]
tcm_qla2xxx_close_session+0xa2/0xb0 [tcm_qla2xxx]
target_shutdown_sessions+0x17b/0x190 [target_core_mod]
core_tpg_del_initiator_node_acl+0xf3/0x1f0 [target_core_mod]
target_fabric_nacl_base_release+0x25/0x30 [target_core_mod]
config_item_release+0x9f/0x120 [configfs]
config_item_put+0x29/0x2b [configfs]
configfs_rmdir+0x3d2/0x520 [configfs]
vfs_rmdir+0xb3/0x1d0
do_rmdir+0x25c/0x2d0
__x64_sys_rmdir+0x24/0x30
do_syscall_64+0x77/0x220
entry_SYSCALL_64_after_hwframe+0x49/0xbethe dependencies between the lock to be acquired
and HARDIRQ-irq-unsafe lock:
-> (&(&k->k_lock)->rlock){+.+.} ops: 14568 {
HARDIRQ-ON-W at:
lock_acquire+0xe3/0x200
_raw_spin_lock+0x32/0x50
klist_add_tail+0x33/0xb0
device_add+0x7f4/0xb60
device_create_groups_vargs+0x11c/0x150
device_create_with_groups+0x89/0xb0
vtconsole_class_init+0xb2/0x124
do_one_initcall+0xc5/0x3ce
kernel_init_freeable+0x295/0x32e
kernel_init+0x11/0x11b
ret_from_fork+0x3a/0x50
SOFTIRQ-ON-W at:
lock_acquire+0xe3/0x200
_raw_spin_lock+0x32/0x50
klist_add_tail+0x33/0xb0
device_add+0x7f4/0xb60
device_create_groups_vargs+0x11c/0x150
device_create_with_groups+0x89/0xb0
vtconsole_class_init+0xb2/0x124
do_one_initcall+0xc5/0x3ce
kernel_init_freeable+0x295/0x32e
kernel_init+0x11/0x11b
ret_from_fork+0x3a/0x50
INITIAL USE at:
lock_acquire+0xe3/0x200
_raw_spin_lock+0x32/0x50
klist_add_tail+0x33/0xb0
device_add+0x7f4/0xb60
device_create_groups_vargs+0x11c/0x150
device_create_with_groups+0x89/0xb0
vtconsole_class_init+0xb2/0x124
do_one_initcall+0xc5/0x3ce
kernel_init_freeable+0x295/0x32e
kernel_init+0x11/0x11b
ret_from_fork+0x3a/0x50
}
... key at: [<ffffffff83f3d900>] __key.15805+0x0/0x40
... acquired at:
__lock_acquire+0x11ed/0x1b60
lock_acquire+0xe3/0x200
_raw_spin_lock_irqsave+0x3d/0x60
klist_next+0x43/0x1d0
device_for_each_child+0x96/0x110
scsi_target_block+0x3c/0x40 [scsi_mod]
fc_remote_port_delete+0xe7/0x1c0 [scsi_transport_fc]
qla2x00_mark_device_lost+0x4d3/0x500 [qla2xxx]
qlt_unreg_sess+0x104/0x2c0 [qla2xxx]
tcm_qla2xxx_close_session+0xa2/0xb0 [tcm_qla2xxx]
target_shutdown_sessions+0x17b/0x190 [target_core_mod]
core_tpg_del_initiator_node_acl+0xf3/0x1f0 [target_core_mod]
target_fabric_nacl_base_release+0x25/0x30 [target_core_mod]
config_item_release+0x9f/0x120 [configfs]
config_item_put+0x29/0x2b [configfs]
configfs_rmdir+0x3d2/0x520 [configfs]
vfs_rmdir+0xb3/0x1d0
do_rmdir+0x25c/0x2d0
__x64_sys_rmdir+0x24/0x30
do_syscall_64+0x77/0x220
entry_SYSCALL_64_after_hwframe+0x49/0xbe
stack backtrace:
CPU: 7 PID: 1478 Comm: rmdir Tainted: G W 5.1.0-rc1-dbg+ #11
Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011
Call Trace:
dump_stack+0x86/0xca
check_usage.cold.59+0x473/0x563
check_prev_add.constprop.43+0x1f1/0x1170
__lock_acquire+0x11ed/0x1b60
lock_acquire+0xe3/0x200
_raw_spin_lock_irqsave+0x3d/0x60
klist_next+0x43/0x1d0
device_for_each_child+0x96/0x110
scsi_target_block+0x3c/0x40 [scsi_mod]
fc_remote_port_delete+0xe7/0x1c0 [scsi_transport_fc]
qla2x00_mark_device_lost+0x4d3/0x500 [qla2xxx]
qlt_unreg_sess+0x104/0x2c0 [qla2xxx]
tcm_qla2xxx_close_session+0xa2/0xb0 [tcm_qla2xxx]
target_shutdown_sessions+0x17b/0x190 [target_core_mod]
core_tpg_del_initiator_node_acl+0xf3/0x1f0 [target_core_mod]
target_fabric_nacl_base_release+0x25/0x30 [target_core_mod]
config_item_release+0x9f/0x120 [configfs]
config_item_put+0x29/0x2b [configfs]
configfs_rmdir+0x3d2/0x520 [configfs]
vfs_rmdir+0xb3/0x1d0
do_rmdir+0x25c/0x2d0
__x64_sys_rmdir+0x24/0x30
do_syscall_64+0x77/0x220
entry_SYSCALL_64_after_hwframe+0x49/0xbe--- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/qla2xxx/tcm_qla2xxx.c +2 -1
@@ -366,8 +366,9 @@ static void tcm_qla2xxx_close_session(struct se_session *se_sess)spin_lock_irqsave (&vha->hw->tgt.sess_lock, flags);target_sess_cmd_list_set_waiting (se_sess); -tcm_qla2xxx_put_sess (sess);spin_unlock_irqrestore (&vha->hw->tgt.sess_lock, flags); + +tcm_qla2xxx_put_sess (sess); }static u32 tcm_qla2xxx_sess_get_index (struct se_session *se_sess)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 59/193 Btrfs: fix data bytes_may_use underflow with fallocate due to failed quota reserve
In reply to Greg Kroah-Hartman[ Upstream commit 39ad317315887c2cb9a4347a93a8859326ddf136 ]
When doing fallocate, we first add the range to the reserve_list and then reserve the quota. If quota reservation fails, we'll release all reserved parts of reserve_list.
However, cur_offset is not updated to indicate that this range is already been inserted into the list. Therefore, the same range is freed twice. Once at list_for_each_entry loop, and once at the end of the function. This will result in WARN_ON on bytes_may_use when we free the remaining space.
At the end, under the 'out' label we have a call to:
btrfs_free_reserved_data_space(inode, data_reserved, alloc_start, alloc_end - cur_offset);
The start offset, third argument, should be cur_offset.
Everything from alloc_start to cur_offset was freed by the list_for_each_entry_safe_loop.
--- fs/btrfs/file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/btrfs/file.c +2 -1
@@ -2976,6 +2976,7 @@ static long btrfs_fallocate(struct file *file, int mode, ret =btrfs_qgroup_reserve_data (inode, &data_reserved, cur_offset, last_byte - cur_offset);if (ret <0 ) { + cur_offset = last_byte;free_extent_map (em);break ; }
@@ -3046,7 +3047,7 @@ static long btrfs_fallocate(struct file *file, int mode,/* Let go of our reservation. */ if (ret !=0 )btrfs_free_reserved_data_space (inode, data_reserved, - alloc_start, alloc_end - cur_offset); + cur_offset, alloc_end - cur_offset);extent_changeset_free (data_reserved);return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 60/193 btrfs: fix panic during relocation after ENOSPC before writeback happens
In reply to Greg Kroah-Hartman[ Upstream commit ff612ba7849964b1898fd3ccd1f56941129c6aab ]
We've been seeing the following sporadically throughout our fleet
panic: kernel BUG at fs/btrfs/relocation.c:4584!
netversion: 5.0-0
Backtrace:
#0 [ffffc90003adb880] machine_kexec at ffffffff81041da8
#1 [ffffc90003adb8c8] __crash_kexec at ffffffff8110396c
#2 [ffffc90003adb988] crash_kexec at ffffffff811048ad
#3 [ffffc90003adb9a0] oops_end at ffffffff8101c19a
#4 [ffffc90003adb9c0] do_trap at ffffffff81019114
#5 [ffffc90003adba00] do_error_trap at ffffffff810195d0
#6 [ffffc90003adbab0] invalid_op at ffffffff81a00a9b
[exception RIP: btrfs_reloc_cow_block+692]
RIP: ffffffff8143b614 RSP: ffffc90003adbb68 RFLAGS: 00010246
RAX: fffffffffffffff7 RBX: ffff8806b9c32000 RCX: ffff8806aad00690
RDX: ffff880850b295e0 RSI: ffff8806b9c32000 RDI: ffff88084f205bd0
RBP: ffff880849415000 R8: ffffc90003adbbe0 R9: ffff88085ac90000
R10: ffff8805f7369140 R11: 0000000000000000 R12: ffff880850b295e0
R13: ffff88084f205bd0 R14: 0000000000000000 R15: 0000000000000000
ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018
#7 [ffffc90003adbbb0] __btrfs_cow_block at ffffffff813bf1cd
#8 [ffffc90003adbc28] btrfs_cow_block at ffffffff813bf4b3
#9 [ffffc90003adbc78] btrfs_search_slot at ffffffff813c2e6cThe way relocation moves data extents is by creating a reloc inode and preallocating extents in this inode and then copying the data into these preallocated extents. Once we've done this for all of our extents, we'll write out these dirty pages, which marks the extent written, and goes into btrfs_reloc_cow_block(). From here we get our current reloc_control, which _should_ match the reloc_control for the current block group we're relocating.
However if we get an ENOSPC in this path at some point we'll bail out, never initiating writeback on this inode. Not a huge deal, unless we happen to be doing relocation on a different block group, and this block group is now rc->stage == UPDATE_DATA_PTRS. This trips the BUG_ON() in btrfs_reloc_cow_block(), because we expect to be done modifying the data inode. We are in fact done modifying the metadata for the data inode we're currently using, but not the one from the failed block group, and thus we BUG_ON().
(This happens when writeback finishes for extents from the previous group, when we are at btrfs_finish_ordered_io() which updates the data reloc tree (inode item, drops/adds extent items, etc).)
Fix this by writing out the reloc data inode always, and then breaking out of the loop after that point to keep from tripping this BUG_ON() later.
--- fs/btrfs/relocation.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-)
fs/btrfs/relocation.c +20 -11
@@ -4403,27 +4403,36 @@ int btrfs_relocate_block_group(struct btrfs_fs_info *fs_info, u64 group_start)mutex_lock (&fs_info->cleaner_mutex); ret =relocate_block_group (rc);mutex_unlock (&fs_info->cleaner_mutex); -if (ret <0 ) { +if (ret <0 ) err = ret; - goto out; - } - -if (rc->extents_found ==0 ) -break ; - -btrfs_info (fs_info,"found %llu extents" , rc->extents_found); +/* +* We may have gotten ENOSPC after we already dirtied some +* extents. If writeout happens while we're relocating a +* different block group we could end up hitting the +* BUG_ON(rc->stage == UPDATE_DATA_PTRS) in +* btrfs_reloc_cow_block. Make sure we write everything out +* properly so we don't trip over this problem, and then break +* out of the loop if we hit an error. +*/ if (rc->stage ==MOVE_DATA_EXTENTS && rc->found_file_extent) { ret =btrfs_wait_ordered_range (rc->data_inode,0 , (u64)-1 ); -if (ret) { +if (ret) err = ret; - goto out; - }invalidate_mapping_pages (rc->data_inode->i_mapping,0 ,-1 ); rc->stage =UPDATE_DATA_PTRS ; } + +if (err <0 ) + goto out; + +if (rc->extents_found ==0 ) +break ; + +btrfs_info (fs_info,"found %llu extents" , rc->extents_found); + }WARN_ON (rc->block_group->pinned >0 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 61/193 btrfs: Dont panic when we cant find a root key
In reply to Greg Kroah-Hartman[ Upstream commit 7ac1e464c4d473b517bb784f30d40da1f842482e ]
When we failed to find a root key in btrfs_update_root(), we just panic.
That's definitely not cool, fix it by outputting an unique error message, aborting current transaction and return -EUCLEAN. This should not normally happen as the root has been used by the callers in some way.
--- fs/btrfs/root-tree.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
fs/btrfs/root-tree.c +8 -5
@@ -148,11 +148,14 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_rootif (ret <0 ) goto out; -if (ret !=0 ) { -btrfs_print_leaf (path->nodes[0 ]); -btrfs_crit (fs_info,"unable to update root key %llu %u %llu" , - key->objectid, key->type, key->offset); -BUG_ON (1 ); +if (ret >0 ) { +btrfs_crit (fs_info, +"unable to find root key (%llu %u %llu) in tree %llu" , + key->objectid, key->type, key->offset, + root->root_key.objectid); + ret = -EUCLEAN ; +btrfs_abort_transaction (trans, ret); + goto out; } l = path->nodes[0 ];
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 62/193 iwlwifi: pcie: dont crash on invalid RX interrupt
In reply to Greg Kroah-Hartman[ Upstream commit 30f24eabab8cd801064c5c37589d803cb4341929 ]
If for some reason the device gives us an RX interrupt before we're ready for it, perhaps during device power-on with misconfigured IRQ causes mapping or so, we can crash trying to access the queues.
Prevent that by checking that we actually have RXQs and that they were properly allocated.
--- drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/pcie/rx.c +6 -1
@@ -1252,10 +1252,15 @@ static void iwl_pcie_rx_handle_rb(struct iwl_trans *trans,static void iwl_pcie_rx_handle (struct iwl_trans *trans,int queue) {struct iwl_trans_pcie *trans_pcie =IWL_TRANS_GET_PCIE_TRANS (trans); -struct iwl_rxq *rxq = &trans_pcie->rxq[queue]; +struct iwl_rxq *rxq;u32 r, i, count =0 ;bool emergency = false; +if (WARN_ON_ONCE (!trans_pcie->rxq || !trans_pcie->rxq[queue].bd)) +return ; + + rxq = &trans_pcie->rxq[queue]; + restart:spin_lock (&rxq->lock);/* uCode's read index (stored in shared DRAM) indicates the last Rx
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 63/193 rtc: 88pm860x: prevent use-after-free on device remove
In reply to Greg Kroah-Hartman[ Upstream commit f22b1ba15ee5785aa028384ebf77dd39e8e47b70 ]
The device's remove() attempts to shut down the delayed_work scheduled on the kernel-global workqueue by calling flush_scheduled_work().
Unfortunately, flush_scheduled_work() does not prevent the delayed_work from re-scheduling itself. The delayed_work might run after the device has been removed, and touch the already de-allocated info structure. This is a potential use-after-free.
Fix by calling cancel_delayed_work_sync() during remove(): this ensures that the delayed work is properly cancelled, is no longer running, and is not able to re-schedule itself.
This issue was detected with the help of Coccinelle.
--- drivers/rtc/rtc-88pm860x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/rtc-88pm860x.c +1 -1
@@ -414,7 +414,7 @@ static int pm860x_rtc_remove(struct platform_device *pdev)struct pm860x_rtc_info *info =platform_get_drvdata (pdev);#ifdef VRTC_CALIBRATION -flush_scheduled_work (); +cancel_delayed_work_sync (&info->calib_work);/* disable measurement */ pm860x_set_bits (info->i2c,PM8607_MEAS_EN2 ,MEAS2_VRTC ,0 );#endif /* VRTC_CALIBRATION */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 64/193 scsi: qedi: Abort ep termination if offload not scheduled
In reply to Greg Kroah-Hartman[ Upstream commit f848bfd8e167210a29374e8a678892bed591684f ]
Sometimes during connection recovery when there is a failure to resolve ARP, and offload connection was not issued, driver tries to flush pending offload connection work which was not queued up.
kernel: WARNING: CPU: 19 PID: 10110 at kernel/workqueue.c:3030 __flush_work.isra.34+0x19c/0x1b0
kernel: CPU: 19 PID: 10110 Comm: iscsid Tainted: G W 5.1.0-rc4 #11
kernel: Hardware name: Dell Inc. PowerEdge R730/0599V5, BIOS 2.9.1 12/04/2018
kernel: RIP: 0010:__flush_work.isra.34+0x19c/0x1b0
kernel: Code: 8b fb 66 0f 1f 44 00 00 31 c0 eb ab 48 89 ef c6 07 00 0f 1f 40 00 fb 66 0f 1f 44 00 00 31 c0 eb 96 e8 08 16 fe ff 0f 0b eb 8d <0f> 0b 31 c0 eb 87 0f 1f 40 00 66 2e 0f 1 f 84 00 00 00 00 00 0f 1f
kernel: RSP: 0018:ffffa6b4054dba68 EFLAGS: 00010246
kernel: RAX: 0000000000000000 RBX: ffff91df21c36fc0 RCX: 0000000000000000
kernel: RDX: 0000000000000001 RSI: 0000000000000000 RDI: ffff91df21c36fc0
kernel: RBP: ffff91df21c36ef0 R08: 0000000000000000 R09: 0000000000000000
kernel: R10: 0000000000000038 R11: ffffa6b4054dbd60 R12: ffffffffc05e72c0
kernel: R13: ffff91db10280820 R14: 0000000000000048 R15: 0000000000000000
kernel: FS: 00007f5d83cc1740(0000) GS:ffff91df2f840000(0000) knlGS:0000000000000000
kernel: CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
kernel: CR2: 0000000001cc5000 CR3: 0000000465450002 CR4: 00000000001606e0
kernel: Call Trace:
kernel: ? try_to_del_timer_sync+0x4d/0x80
kernel: qedi_ep_disconnect+0x3b/0x410 [qedi]
kernel: ? 0xffffffffc083c000
kernel: ? klist_iter_exit+0x14/0x20
kernel: ? class_find_device+0x93/0xf0
kernel: iscsi_if_ep_disconnect.isra.18+0x58/0x70 [scsi_transport_iscsi]
kernel: iscsi_if_recv_msg+0x10e2/0x1510 [scsi_transport_iscsi]
kernel: ? copyout+0x22/0x30
kernel: ? _copy_to_iter+0xa0/0x430
kernel: ? _cond_resched+0x15/0x30
kernel: ? __kmalloc_node_track_caller+0x1f9/0x270
kernel: iscsi_if_rx+0xa5/0x1e0 [scsi_transport_iscsi]
kernel: netlink_unicast+0x17f/0x230
kernel: netlink_sendmsg+0x2d2/0x3d0
kernel: sock_sendmsg+0x36/0x50
kernel: ___sys_sendmsg+0x280/0x2a0
kernel: ? timerqueue_add+0x54/0x80
kernel: ? enqueue_hrtimer+0x38/0x90
kernel: ? hrtimer_start_range_ns+0x19f/0x2c0
kernel: __sys_sendmsg+0x58/0xa0
kernel: do_syscall_64+0x5b/0x180
kernel: entry_SYSCALL_64_after_hwframe+0x44/0xa9
--- drivers/scsi/qedi/qedi_iscsi.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/qedi/qedi_iscsi.c +3 -0
@@ -1008,6 +1008,9 @@ static void qedi_ep_disconnect(struct iscsi_endpoint *ep) qedi_ep = ep->dd_data; qedi = qedi_ep->qedi; +if (qedi_ep->state ==EP_STATE_OFLDCONN_START ) + goto ep_exit_recover; +flush_work (&qedi_ep->offload_work);if (qedi_ep->conn) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 65/193 w1: fix the resume command API
In reply to Greg Kroah-Hartman[ Upstream commit 62909da8aca048ecf9fbd7e484e5100608f40a63 ]
Quoted 1 line
From the DS2408 datasheet [1]:
"Resume Command function checks the status of the RC flag and, if it is set,
directly transfers control to the control functions, similar to a Skip ROM command. The only way to set the RC flag is through successfully executing the Match ROM, Search ROM, Conditional Search ROM, or Overdrive-Match ROM command"
The function currently works perfectly fine in a multidrop bus, but when we have only a single slave connected, then only a Skip ROM is used and Match ROM is not called at all. This is leading to problems e.g. with single one DS2408 connected, as the Resume Command is not working properly and the device is responding with failing results after the Resume Command.
This commit is fixing this by using a Skip ROM instead in those cases. The bandwidth / performance advantage is exactly the same.
Refs:
[1] https://datasheets.maximintegrated.com/en/ds/DS2408.pdf
--- drivers/w1/w1_io.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/w1/w1_io.c +1 -2
@@ -430,8 +430,7 @@ int w1_reset_resume_command(struct w1_master *dev)if (w1_reset_bus (dev))return -1 ; -/* This will make only the last matched slave perform a skip ROM. */ -w1_write_8 (dev,W1_RESUME_CMD ); +w1_write_8 (dev, dev->slave_count >1 ?W1_RESUME_CMD :W1_SKIP_ROM );return 0 ; }EXPORT_SYMBOL_GPL (w1_reset_resume_command);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 66/193 dmaengine: pl330: _stop: clear interrupt status
In reply to Greg Kroah-Hartman[ Upstream commit 2da254cc7908105a60a6bb219d18e8dced03dcb9 ]
This patch kill instructs the DMAC to immediately terminate execution of a thread. and then clear the interrupt status, at last, stop generating interrupts for DMA_SEV. to guarantee the next dma start is clean. otherwise, one interrupt maybe leave to next start and make some mistake.
we can reporduce the problem as follows:
DMASEV: modify the event-interrupt resource, and if the INTEN sets function as interrupt, the DMAC will set irq<event_num> HIGH to generate interrupt. write INTCLR to clear interrupt.
DMA EXECUTING INSTRUCTS DMA TERMINATE | | | | ... _stop | | | spin_lock_irqsave DMASEV | | | | mask INTEN | | | DMAKILL | | | spin_unlock_irqrestore
in above case, a interrupt was left, and if we unmask INTEN, the DMAC will set irq<event_num> HIGH to generate interrupt.
to fix this, do as follows:
DMA EXECUTING INSTRUCTS DMA TERMINATE | | | | ... _stop | | | spin_lock_irqsave DMASEV | | | | DMAKILL | | | clear INTCLR | mask INTEN | | | spin_unlock_irqrestore
--- drivers/dma/pl330.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/dma/pl330.c +7 -3
@@ -960,6 +960,7 @@ static void _stop(struct pl330_thread *thrd) {void __iomem *regs = thrd->dmac->base;u8 insn[6 ] = {0 ,0 ,0 ,0 ,0 ,0 }; +u32 inten =readl (regs +INTEN );if (_state (thrd) ==PL330_STATE_FAULT_COMPLETING )UNTIL (thrd,PL330_STATE_FAULTING |PL330_STATE_KILLING );
@@ -972,10 +973,13 @@ static void _stop(struct pl330_thread *thrd)_emit_KILL (0 , insn); -/* Stop generating interrupts for SEV */ -writel (readl (regs +INTEN ) & ~(1 << thrd->ev), regs +INTEN ); -_execute_DBGINSN (thrd, insn,is_manager (thrd)); + +/* clear the event */ +if (inten & (1 << thrd->ev)) +writel (1 << thrd->ev, regs +INTCLR ); +/* Stop generating interrupts for SEV */ +writel (inten & ~(1 << thrd->ev), regs +INTEN ); }/* Start doing req 'idx' of thread 'thrd' */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 67/193 mac80211/cfg80211: update bss channel on channel switch
In reply to Greg Kroah-Hartman[ Upstream commit 5dc8cdce1d722c733f8c7af14c5fb595cfedbfa8 ]
FullMAC STAs have no way to update bss channel after CSA channel switch completion. As a result, user-space tools may provide inconsistent channel info. For instance, consider the following two commands:
$ sudo iw dev wlan0 link $ sudo iw dev wlan0 info The latter command gets channel info from the hardware, so most probably its output will be correct. However the former command gets channel info from scan cache, so its output will contain outdated channel info. In fact, current bss channel info will not be updated until the next [re-]connect.
Note that mac80211 STAs have a workaround for this, but it requires access to internal cfg80211 data, see ieee80211_chswitch_work:
/* XXX: shouldn't really modify cfg80211-owned data! */ ifmgd->associated->channel = sdata->csa_chandef.chan;
This patch suggests to convert mac80211 workaround into cfg80211 behavior and to update current bss channel in cfg80211_ch_switch_notify.
--- net/mac80211/mlme.c | 3 --- net/wireless/nl80211.c | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-)
net/mac80211/mlme.c +0 -3
@@ -1071,9 +1071,6 @@ static void ieee80211_chswitch_work(struct work_struct *work) goto out; } -/* XXX: shouldn't really modify cfg80211-owned data! */ - ifmgd->associated->channel = sdata->csa_chandef.chan; - ifmgd->csa_waiting_bcn = true;ieee80211_sta_reset_beacon_monitor (sdata);
net/wireless/nl80211.c +5 -0
@@ -14706,6 +14706,11 @@ void cfg80211_ch_switch_notify(struct net_device *dev, wdev->chandef = *chandef; wdev->preset_chandef = *chandef; + +if (wdev->iftype ==NL80211_IFTYPE_STATION && + !WARN_ON (!wdev->current_bss)) + wdev->current_bss->pub.channel = chandef->chan; +nl80211_ch_switch_notify (rdev, dev, chandef,GFP_KERNEL ,NL80211_CMD_CH_SWITCH_NOTIFY ,0 ); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 68/193 libbpf: fix samples/bpf build failure due to undefined UINT32_MAX
In reply to Greg Kroah-Hartman[ Upstream commit 32e621e55496a0009f44fe4914cd4a23cade4984 ]
Currently, building bpf samples will cause the following error.
./tools/lib/bpf/bpf.h:132:27: error: 'UINT32_MAX' undeclared here (not in a function) ..
#define BPF_LOG_BUF_SIZE (UINT32_MAX >> 8) /* verifier maximum in kernels <= 5.1 */
^
./samples/bpf/bpf_load.h:31:25: note: in expansion of macro 'BPF_LOG_BUF_SIZE'
extern char bpf_log_buf[BPF_LOG_BUF_SIZE];
^~~~~~~~~~~~~~~~Due to commit 4519efa6f8ea ("libbpf: fix BPF_LOG_BUF_SIZE off-by-one error") hard-coded size of BPF_LOG_BUF_SIZE has been replaced with UINT32_MAX which is defined in <stdint.h> header.
Even with this change, bpf selftests are running fine since these are built with clang and it includes header(-idirafter) from clang/6.0.0/include. (it has <stdint.h>)
clang -I. -I./include/uapi -I../../../include/uapi -idirafter /usr/local/include -idirafter /usr/include \
-idirafter /usr/lib/llvm-6.0/lib/clang/6.0.0/include -idirafter /usr/include/x86_64-linux-gnu \
-Wno-compare-distinct-pointer-types -O2 -target bpf -emit-llvm -c progs/test_sysctl_prog.c -o - | \
llc -march=bpf -mcpu=generic -filetype=obj -o /linux/tools/testing/selftests/bpf/test_sysctl_prog.oBut bpf samples are compiled with GCC, and it only searches and includes headers declared at the target file. As '#include <stdint.h>' hasn't been declared in tools/lib/bpf/bpf.h, it causes build failure of bpf samples.
gcc -Wp,-MD,./samples/bpf/.sockex3_user.o.d -Wall -Wmissing-prototypes -Wstrict-prototypes \
-O2 -fomit-frame-pointer -std=gnu89 -I./usr/include -I./tools/lib/ -I./tools/testing/selftests/bpf/ \
-I./tools/ lib/ -I./tools/include -I./tools/perf -c -o ./samples/bpf/sockex3_user.o ./samples/bpf/sockex3_user.c;This commit add declaration of '#include <stdint.h>' to tools/lib/bpf/bpf.h to fix this problem.
--- tools/lib/bpf/bpf.h | 1 + 1 file changed, 1 insertion(+)
tools/lib/bpf/bpf.h +1 -0
@@ -23,6 +23,7 @@#include <linux/bpf.h> #include <stddef.h> +#include <stdint.h> int bpf_create_map_node(enum bpf_map_type map_type, int key_size, int value_size, int max_entries, __u32 map_flags,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 69/193 ASoC: fsl_sai: Update is_slave_mode with correct value
In reply to Greg Kroah-Hartman[ Upstream commit ddb351145a967ee791a0fb0156852ec2fcb746ba ]
is_slave_mode defaults to false because sai structure that contains it is kzalloc'ed.
Anyhow, if we decide to set the following configuration SAI slave -> SAI master, is_slave_mode will remain set on true although SAI being master it should be set to false.
Fix this by updating is_slave_mode for each call of fsl_sai_set_dai_fmt.
--- sound/soc/fsl/fsl_sai.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/fsl/fsl_sai.c +2 -0
@@ -274,12 +274,14 @@ static int fsl_sai_set_dai_fmt_tr(struct snd_soc_dai *cpu_dai,case SND_SOC_DAIFMT_CBS_CFS : val_cr2 |=FSL_SAI_CR2_BCD_MSTR ; val_cr4 |=FSL_SAI_CR4_FSD_MSTR ; + sai->is_slave_mode = false;break ;case SND_SOC_DAIFMT_CBM_CFM : sai->is_slave_mode = true;break ;case SND_SOC_DAIFMT_CBS_CFM : val_cr2 |=FSL_SAI_CR2_BCD_MSTR ; + sai->is_slave_mode = false;break ;case SND_SOC_DAIFMT_CBM_CFS : val_cr4 |=FSL_SAI_CR4_FSD_MSTR ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 70/193 mwifiex: prevent an array overflow
In reply to Greg Kroah-Hartman[ Upstream commit b4c35c17227fe437ded17ce683a6927845f8c4a4 ]
The "rate_index" is only used as an index into the phist_data->rx_rate[] array in the mwifiex_hist_data_set() function. That array has MWIFIEX_MAX_AC_RX_RATES (74) elements and it's used to generate some debugfs information. The "rate_index" variable comes from the network skb->data[] and it is a u8 so it's in the 0-255 range. We need to cap it to prevent an array overflow.
--- drivers/net/wireless/marvell/mwifiex/cfp.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/marvell/mwifiex/cfp.c +3 -0
@@ -531,5 +531,8 @@ u8 mwifiex_adjust_data_rate(struct mwifiex_private *priv, rate_index = (rx_rate >MWIFIEX_RATE_INDEX_OFDM0 ) ? rx_rate -1 : rx_rate; +if (rate_index >=MWIFIEX_MAX_AC_RX_RATES ) + rate_index =MWIFIEX_MAX_AC_RX_RATES -1 ; +return rate_index; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 71/193 net: cw1200: fix a NULL pointer dereference
In reply to Greg Kroah-Hartman[ Upstream commit 0ed2a005347400500a39ea7c7318f1fea57fb3ca ]
In case create_singlethread_workqueue fails, the fix free the hardware and returns NULL to avoid NULL pointer dereference.
--- drivers/net/wireless/st/cw1200/main.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wireless/st/cw1200/main.c +5 -0
@@ -345,6 +345,11 @@ static struct ieee80211_hw *cw1200_init_common(const u8 *macaddr,mutex_init (&priv->wsm_cmd_mux);mutex_init (&priv->conf_mutex); priv->workqueue =create_singlethread_workqueue ("cw1200_wq" ); +if (!priv->workqueue) { +ieee80211_free_hw (hw); +return NULL ; + } +sema_init (&priv->scan.lock,1 );INIT_WORK (&priv->scan.work, cw1200_scan_work);INIT_DELAYED_WORK (&priv->scan.probe_work, cw1200_probe_work);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 72/193 crypto: sun4i-ss - Fix invalid calculation of hash end
In reply to Greg Kroah-Hartman[ Upstream commit f87391558acf816b48f325a493d81d45dec40da0 ]
When nbytes < 4, end is wronlgy set to a negative value which, due to uint, is then interpreted to a large value leading to a deadlock in the following code.
This patch fix this problem.
--- drivers/crypto/sunxi-ss/sun4i-ss-hash.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/crypto/sunxi-ss/sun4i-ss-hash.c +4 -1
@@ -240,7 +240,10 @@ static int sun4i_hash(struct ahash_request *areq) } }else {/* Since we have the flag final, we can go up to modulo 4 */ - end = ((areq->nbytes + op->len) /4 ) *4 - op->len; +if (areq->nbytes <4 ) + end =0 ; +else + end = ((areq->nbytes + op->len) /4 ) *4 - op->len; }/* TODO if SGlen % 4 and !op->len then DMA */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 73/193 bcache: return error immediately in bch_journal_replay()
In reply to Greg Kroah-Hartman[ Upstream commit 68d10e6979a3b59e3cd2e90bfcafed79c4cf180a ]
When failure happens inside bch_journal_replay(), calling cache_set_err_on() and handling the failure in async way is not a good idea. Because after bch_journal_replay() returns, registering code will continue to execute following steps, and unregistering code triggered by cache_set_err_on() is running in same time. First it is unnecessary to handle failure and unregister cache set in an async way, second there might be potential race condition to run register and unregister code for same cache set.
So in this patch, if failure happens in bch_journal_replay(), we don't call cache_set_err_on(), and just print out the same error message to kernel message buffer, then return -EIO immediately caller. Then caller can detect such failure and handle it in synchrnozied way.
--- drivers/md/bcache/journal.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/md/bcache/journal.c +6 -3
@@ -323,9 +323,12 @@ int bch_journal_replay(struct cache_set *s, struct list_head *list)list_for_each_entry (i, list, list) {BUG_ON (i->pin &&atomic_read (i->pin) !=1 ); -cache_set_err_on (n != i->j.seq, s, -"bcache: journal entries %llu-%llu missing! (replaying %llu-%llu)" , - n, i->j.seq -1 , start, end); +if (n != i->j.seq) { +pr_err ("bcache: journal entries %llu-%llu missing! (replaying %llu-%llu)" , + n, i->j.seq -1 , start, end); + ret = -EIO ; + goto err; + } for (k = i->j.start; k < bset_bkey_last(&i->j);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 74/193 bcache: fix failure in journal relplay
In reply to Greg Kroah-Hartman[ Upstream commit 631207314d88e9091be02fbdd1fdadb1ae2ed79a ]
journal replay failed with messages:
Sep 10 19:10:43 ceph kernel: bcache: error on
bb379a64-e44e-4812-b91d-a5599871a3b1: bcache: journal entries 2057493-2057567 missing! (replaying 2057493-2076601), disabling caching
The reason is in journal_reclaim(), when discard is enabled, we send discard command and reclaim those journal buckets whose seq is old than the last_seq_now, but before we write a journal with last_seq_now, the machine is restarted, so the journal with the last_seq_now is not written to the journal bucket, and the last_seq_wrote in the newest journal is old than last_seq_now which we expect to be, so when we doing replay, journals from last_seq_wrote to last_seq_now are missing.
It's hard to write a journal immediately after journal_reclaim(), and it harmless if those missed journal are caused by discarding since those journals are already wrote to btree node. So, if miss seqs are started from the beginning journal, we treat it as normal, and only print a message to show the miss journal, and point out it maybe caused by discarding.
Patch v2 add a judgement condition to ignore the missed journal only when discard enabled as Coly suggested.
(Coly Li: rebase the patch with other changes in bch_journal_replay())
--- drivers/md/bcache/journal.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-)
drivers/md/bcache/journal.c +21 -4
@@ -310,6 +310,18 @@ void bch_journal_mark(struct cache_set *c, struct list_head *list) } } +bool is_discard_enabled (struct cache_set *s) +{ +struct cache *ca; +unsigned int i; + +for_each_cache (ca, s, i) +if (ca->discard) +return true; + +return false; +} +int bch_journal_replay (struct cache_set *s,struct list_head *list) {int ret =0 , keys =0 , entries =0 ;
@@ -324,10 +336,15 @@ int bch_journal_replay(struct cache_set *s, struct list_head *list)BUG_ON (i->pin &&atomic_read (i->pin) !=1 );if (n != i->j.seq) { -pr_err ("bcache: journal entries %llu-%llu missing! (replaying %llu-%llu)" , - n, i->j.seq -1 , start, end); - ret = -EIO ; - goto err; +if (n == start &&is_discard_enabled (s)) +pr_info ("bcache: journal entries %llu-%llu may be discarded! (replaying %llu-%llu)" , + n, i->j.seq -1 , start, end); +else { +pr_err ("bcache: journal entries %llu-%llu missing! (replaying %llu-%llu)" , + n, i->j.seq -1 , start, end); + ret = -EIO ; + goto err; + } } for (k = i->j.start;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 75/193 bcache: add failure check to run_cache_set() for journal replay
In reply to Greg Kroah-Hartman[ Upstream commit ce3e4cfb59cb382f8e5ce359238aa580d4ae7778 ]
Currently run_cache_set() has no return value, if there is failure in bch_journal_replay(), the caller of run_cache_set() has no idea about such failure and just continue to execute following code after run_cache_set(). The internal failure is triggered inside bch_journal_replay() and being handled in async way. This behavior is inefficient, while failure handling inside bch_journal_replay(), cache register code is still running to start the cache set. Registering and unregistering code running as same time may introduce some rare race condition, and make the code to be more hard to be understood.
This patch adds return value to run_cache_set(), and returns -EIO if bch_journal_rreplay() fails. Then caller of run_cache_set() may detect such failure and stop registering code flow immedidately inside register_cache_set().
If journal replay fails, run_cache_set() can report error immediately to register_cache_set(). This patch makes the failure handling for bch_journal_replay() be in synchronized way, easier to understand and debug, and avoid poetential race condition for register-and-unregister in same time.
--- drivers/md/bcache/super.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/md/bcache/super.c +12 -5
@@ -1560,7 +1560,7 @@ struct cache_set *bch_cache_set_alloc(struct cache_sb *sb)return NULL ; } -static void run_cache_set (struct cache_set *c) +static int run_cache_set (struct cache_set *c) {const char *err ="cannot allocate memory" ;struct cached_dev *dc, *t;
@@ -1652,7 +1652,9 @@ static void run_cache_set(struct cache_set *c)if (j->version <BCACHE_JSET_VERSION_UUID )__uuid_write (c); -bch_journal_replay (c, &journal); + err ="bcache: replay journal failed" ; +if (bch_journal_replay (c, &journal)) + goto err; }else {pr_notice ("invalidating existing data" );
@@ -1720,11 +1722,13 @@ static void run_cache_set(struct cache_set *c)flash_devs_run (c);set_bit (CACHE_SET_RUNNING , &c->flags); -return ; +return 0 ; err:closure_sync (&cl);/* XXX: test this, it's broken */ bch_cache_set_error (c,"%s" , err); + +return -EIO ; }static bool can_attach_cache (struct cache *ca,struct cache_set *c)
@@ -1788,8 +1792,11 @@ static const char *register_cache_set(struct cache *ca) ca->set->cache[ca->sb.nr_this_dev] = ca; c->cache_by_alloc[c->caches_loaded++] = ca; -if (c->caches_loaded == c->sb.nr_in_set) -run_cache_set (c); +if (c->caches_loaded == c->sb.nr_in_set) { + err ="failed to run cache set" ; +if (run_cache_set (c) <0 ) + goto err; + }return NULL ; err:
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 76/193 bcache: avoid clang -Wunintialized warning
In reply to Greg Kroah-Hartman[ Upstream commit 78d4eb8ad9e1d413449d1b7a060f50b6efa81ebd ]
clang has identified a code path in which it thinks a variable may be unused:
drivers/md/bcache/alloc.c:333:4: error: variable 'bucket' is used uninitialized whenever 'if' condition is false
[-Werror,-Wsometimes-uninitialized]
fifo_pop(&ca->free_inc, bucket);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/md/bcache/util.h:219:27: note: expanded from macro 'fifo_pop'
#define fifo_pop(fifo, i) fifo_pop_front(fifo, (i))
^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/md/bcache/util.h:189:6: note: expanded from macro 'fifo_pop_front'
if (_r) { \
^~
drivers/md/bcache/alloc.c:343:46: note: uninitialized use occurs here
allocator_wait(ca, bch_allocator_push(ca, bucket));
^~~~~~
drivers/md/bcache/alloc.c:287:7: note: expanded from macro 'allocator_wait'
if (cond) \
^~~~
drivers/md/bcache/alloc.c:333:4: note: remove the 'if' if its condition is always true
fifo_pop(&ca->free_inc, bucket);
^
drivers/md/bcache/util.h:219:27: note: expanded from macro 'fifo_pop'
#define fifo_pop(fifo, i) fifo_pop_front(fifo, (i))
^
drivers/md/bcache/util.h:189:2: note: expanded from macro 'fifo_pop_front'
if (_r) { \
^
drivers/md/bcache/alloc.c:331:15: note: initialize the variable 'bucket' to silence this warning
long bucket;
^This cannot happen in practice because we only enter the loop if there is at least one element in the list.
Slightly rearranging the code makes this clearer to both the reader and the compiler, which avoids the warning.
--- drivers/md/bcache/alloc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/md/bcache/alloc.c +3 -2
@@ -325,10 +325,11 @@ static int bch_allocator_thread(void *arg)* possibly issue discards to them, then we add the bucket to * the free list: */ -while (!fifo_empty (&ca->free_inc)) { +while (1 ) {long bucket; -fifo_pop (&ca->free_inc, bucket); +if (!fifo_pop (&ca->free_inc, bucket)) +break ;if (ca->discard) {mutex_unlock (&ca->set->bucket_lock);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 77/193 vfio-ccw: Do not call flush_workqueue while holding the spinlock
In reply to Greg Kroah-Hartman[ Upstream commit cea5dde42a83b5f0a039da672f8686455936b8d8 ]
Currently we call flush_workqueue while holding the subchannel spinlock. But flush_workqueue function can go to sleep, so do not call the function while holding the spinlock.
Fixes the following bug:
[ 285.203430] BUG: scheduling while atomic: bash/14193/0x00000002 [ 285.203434] INFO: lockdep is turned off. .... [ 285.203485] Preemption disabled at: [ 285.203488] [<000003ff80243e5c>] vfio_ccw_sch_quiesce+0xbc/0x120 [vfio_ccw] [ 285.203496] CPU: 7 PID: 14193 Comm: bash Tainted: G W .... [ 285.203504] Call Trace: [ 285.203510] ([<0000000000113772>] show_stack+0x82/0xd0) [ 285.203514] [<0000000000b7a102>] dump_stack+0x92/0xd0 [ 285.203518] [<000000000017b8be>] __schedule_bug+0xde/0xf8 [ 285.203524] [<0000000000b95b5a>] __schedule+0x7a/0xc38 [ 285.203528] [<0000000000b9678a>] schedule+0x72/0xb0 [ 285.203533] [<0000000000b9bfbc>] schedule_timeout+0x34/0x528 [ 285.203538] [<0000000000b97608>] wait_for_common+0x118/0x1b0 [ 285.203544] [<0000000000166d6a>] flush_workqueue+0x182/0x548 [ 285.203550] [<000003ff80243e6e>] vfio_ccw_sch_quiesce+0xce/0x120 [vfio_ccw] [ 285.203556] [<000003ff80245278>] vfio_ccw_mdev_reset+0x38/0x70 [vfio_ccw] [ 285.203562] [<000003ff802458b0>] vfio_ccw_mdev_remove+0x40/0x78 [vfio_ccw] [ 285.203567] [<000003ff801a499c>] mdev_device_remove_ops+0x3c/0x80 [mdev] [ 285.203573] [<000003ff801a4d5c>] mdev_device_remove+0xc4/0x130 [mdev] [ 285.203578] [<000003ff801a5074>] remove_store+0x6c/0xa8 [mdev] [ 285.203582] [<000000000046f494>] kernfs_fop_write+0x14c/0x1f8 [ 285.203588] [<00000000003c1530>] __vfs_write+0x38/0x1a8 [ 285.203593] [<00000000003c187c>] vfs_write+0xb4/0x198 [ 285.203597] [<00000000003c1af2>] ksys_write+0x5a/0xb0 [ 285.203601] [<0000000000b9e270>] system_call+0xdc/0x2d8
Message-Id: <626bab8bb2958ae132452e1ddaf1b20882ad5a9d.1554756534.git.alifm@linux.ibm.com>
--- drivers/s390/cio/vfio_ccw_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/cio/vfio_ccw_drv.c +1 -1
@@ -52,9 +52,9 @@ int vfio_ccw_sch_quiesce(struct subchannel *sch)wait_for_completion_timeout (&completion,3 *HZ ); -spin_lock_irq (sch->lock); private->completion =NULL ;flush_workqueue (vfio_ccw_work_q); +spin_lock_irq (sch->lock); ret =cio_cancel_halt_clear (sch, &iretry); };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 78/193 vfio-ccw: Release any channel program when releasing/removing vfio-ccw mdev
In reply to Greg Kroah-Hartman[ Upstream commit b49bdc8602b7c9c7a977758bee4125683f73e59f ]
When releasing the vfio-ccw mdev, we currently do not release any existing channel program and its pinned pages. This can lead to the following warning:
[1038876.561565] WARNING: CPU: 2 PID: 144727 at drivers/vfio/vfio_iommu_type1.c:1494 vfio_sanity_check_pfn_list+0x40/0x70 [vfio_iommu_type1]
....
1038876.561921] Call Trace:
[1038876.561935] ([<00000009897fb870>] 0x9897fb870)
[1038876.561949] [<000003ff8013bf62>] vfio_iommu_type1_detach_group+0xda/0x2f0 [vfio_iommu_type1]
[1038876.561965] [<000003ff8007b634>] __vfio_group_unset_container+0x64/0x190 [vfio]
[1038876.561978] [<000003ff8007b87e>] vfio_group_put_external_user+0x26/0x38 [vfio]
[1038876.562024] [<000003ff806fc608>] kvm_vfio_group_put_external_user+0x40/0x60 [kvm]
[1038876.562045] [<000003ff806fcb9e>] kvm_vfio_destroy+0x5e/0xd0 [kvm]
[1038876.562065] [<000003ff806f63fc>] kvm_put_kvm+0x2a4/0x3d0 [kvm]
[1038876.562083] [<000003ff806f655e>] kvm_vm_release+0x36/0x48 [kvm]
[1038876.562098] [<00000000003c2dc4>] __fput+0x144/0x228
[1038876.562113] [<000000000016ee82>] task_work_run+0x8a/0xd8
[1038876.562125] [<000000000014c7a8>] do_exit+0x5d8/0xd90
[1038876.562140] [<000000000014d084>] do_group_exit+0xc4/0xc8
[1038876.562155] [<000000000015c046>] get_signal+0x9ae/0xa68
[1038876.562169] [<0000000000108d66>] do_signal+0x66/0x768
[1038876.562185] [<0000000000b9e37e>] system_call+0x1ea/0x2d8
[1038876.562195] 2 locks held by qemu-system-s39/144727:
[1038876.562205] #0: 00000000537abaf9 (&container->group_lock){++++}, at: __vfio_group_unset_container+0x3c/0x190 [vfio]
[1038876.562230] #1: 00000000670008b5 (&iommu->lock){+.+.}, at: vfio_iommu_type1_detach_group+0x36/0x2f0 [vfio_iommu_type1]
[1038876.562250] Last Breaking-Event-Address:
[1038876.562262] [<000003ff8013aa24>] vfio_sanity_check_pfn_list+0x3c/0x70 [vfio_iommu_type1]
[1038876.562272] irq event stamp: 4236481
[1038876.562287] hardirqs last enabled at (4236489): [<00000000001cee7a>] console_unlock+0x6d2/0x740
[1038876.562299] hardirqs last disabled at (4236496): [<00000000001ce87e>] console_unlock+0xd6/0x740
[1038876.562311] softirqs last enabled at (4234162): [<0000000000b9fa1e>] __do_softirq+0x556/0x598
[1038876.562325] softirqs last disabled at (4234153): [<000000000014e4cc>] irq_exit+0xac/0x108
[1038876.562337] ---[ end trace 6c96d467b1c3ca06 ]---Similarly we do not free the channel program when we are removing the vfio-ccw device. Let's fix this by resetting the device and freeing the channel program and pinned pages in the release path. For the remove path we can just quiesce the device, since in the remove path the mediated device is going away for good and so we don't need to do a full reset.
Message-Id: <ae9f20dc8873f2027f7b3c5d2aaa0bdfe06850b8.1554756534.git.alifm@linux.ibm.com>
--- drivers/s390/cio/vfio_ccw_ops.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/s390/cio/vfio_ccw_ops.c +10 -1
@@ -130,11 +130,12 @@ static int vfio_ccw_mdev_remove(struct mdev_device *mdev)if ((private->state !=VFIO_CCW_STATE_NOT_OPER ) && (private->state !=VFIO_CCW_STATE_STANDBY )) { -if (!vfio_ccw_mdev_reset (mdev)) +if (!vfio_ccw_sch_quiesce (private->sch)) private->state =VFIO_CCW_STATE_STANDBY ;/* The state will be NOT_OPER on error. */ } +cp_free (&private->cp); private->mdev =NULL ;atomic_inc (&private->avail);
@@ -158,6 +159,14 @@ static void vfio_ccw_mdev_release(struct mdev_device *mdev)struct vfio_ccw_private *private =dev_get_drvdata (mdev_parent_dev (mdev)); +if ((private->state !=VFIO_CCW_STATE_NOT_OPER ) && + (private->state !=VFIO_CCW_STATE_STANDBY )) { +if (!vfio_ccw_mdev_reset (mdev)) + private->state =VFIO_CCW_STATE_STANDBY ; +/* The state will be NOT_OPER on error. */ + } + +cp_free (&private->cp);vfio_unregister_notifier (mdev_dev (mdev),VFIO_IOMMU_NOTIFY , &private->nb); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 79/193 x86/build: Move _etext to actual end of .text
In reply to Greg Kroah-Hartman[ Upstream commit 392bef709659abea614abfe53cf228e7a59876a4 ]
When building x86 with Clang LTO and CFI, CFI jump regions are automatically added to the end of the .text section late in linking. As a result, the _etext position was being labelled before the appended jump regions, causing confusion about where the boundaries of the executable region actually are in the running kernel, and broke at least the fault injection code. This moves the _etext mark to outside (and immediately after) the .text area, as it already the case on other architectures (e.g. arm64, arm).
--- arch/x86/kernel/vmlinux.lds.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/kernel/vmlinux.lds.S +3 -3
@@ -131,11 +131,11 @@ SECTIONS *(.text.__x86.indirect_thunk) __indirect_thunk_end = .; #endif - - /* End of text section */ - _etext = .; } :text = 0x9090 + /* End of text section */ + _etext = .; + NOTES :text :note EXCEPTION_TABLE(16) :text = 0x9090
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 80/193 smpboot: Place the __percpu annotation correctly
In reply to Greg Kroah-Hartman[ Upstream commit d4645d30b50d1691c26ff0f8fa4e718b08f8d3bb ]
The test robot reported a wrong assignment of a per-CPU variable which it detected by using sparse and sent a report. The assignment itself is correct. The annotation for sparse was wrong and hence the report. The first pointer is a "normal" pointer and points to the per-CPU memory area. That means that the __percpu annotation has to be moved.
Move the __percpu annotation to pointer which points to the per-CPU area. This change affects only the sparse tool (and is ignored by the compiler).
--- include/linux/smpboot.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/smpboot.h +1 -1
@@ -31,7 +31,7 @@ struct smpboot_thread_data;* @thread_comm: The base name of the thread */ struct smp_hotplug_thread { -struct task_struct __percpu **store; +struct task_struct *__percpu *store;struct list_head list;int (*thread_should_run)(unsigned int cpu);void (*thread_fn)(unsigned int cpu);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 81/193 x86/mm: Remove in_nmi() warning from 64-bit implementation of vmalloc_fault()
In reply to Greg Kroah-Hartman[ Upstream commit a65c88e16f32aa9ef2e8caa68ea5c29bd5eb0ff0 ]
In-NMI warnings have been added to vmalloc_fault() via:
ebc8827f75 ("x86: Barf when vmalloc and kmemcheck faults happen in NMI")
back in the time when our NMI entry code could not cope with nested NMIs.
These days, it's perfectly fine to take a fault in NMI context and we don't have to care about the fact that IRET from the fault handler might cause NMI nesting.
This warning has already been removed from 32-bit implementation of vmalloc_fault() in:
6863ea0cda8 ("x86/mm: Remove in_nmi() warning from vmalloc_fault()")
but the 64-bit version was omitted.
Remove the bogus warning also from 64-bit implementation of vmalloc_fault().
--- arch/x86/mm/fault.c | 2 -- 1 file changed, 2 deletions(-)
arch/x86/mm/fault.c +0 -2
@@ -426,8 +426,6 @@ static noinline int vmalloc_fault(unsigned long address)if (!(address >=VMALLOC_START && address <VMALLOC_END ))return -1 ; -WARN_ON_ONCE (in_nmi ()); -/* * Copy kernel mappings over when needed. This can also * happen within a race in page table update. In the later
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 82/193 mm/uaccess: Use unsigned long to placate UBSAN warnings on older GCC versions
In reply to Greg Kroah-Hartman[ Upstream commit 29da93fea3ea39ab9b12270cc6be1b70ef201c9e ]
Randy reported objtool triggered on his (GCC-7.4) build:
lib/strncpy_from_user.o: warning: objtool: strncpy_from_user()+0x315: call to __ubsan_handle_add_overflow() with UACCESS enabled lib/strnlen_user.o: warning: objtool: strnlen_user()+0x337: call to __ubsan_handle_sub_overflow() with UACCESS enabled
This is due to UBSAN generating signed-overflow-UB warnings where it should not. Prior to GCC-8 UBSAN ignored -fwrapv (which the kernel uses through -fno-strict-overflow).
Make the functions use 'unsigned long' throughout.
--- lib/strncpy_from_user.c | 5 +++-- lib/strnlen_user.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-)
lib/strncpy_from_user.c +3 -2
@@ -23,10 +23,11 @@* hit it), 'max' is the address space maximum (and we return * -EFAULT if we hit it). */ -static inline long do_strncpy_from_user (char *dst,const char __user *src,long count,unsigned long max) +static inline long do_strncpy_from_user (char *dst,const char __user *src, +unsigned long count,unsigned long max) {const struct word_at_a_time constants =WORD_AT_A_TIME_CONSTANTS ; -long res =0 ; +unsigned long res =0 ;/* * Truncate 'max' to the user-specified limit, so that
lib/strnlen_user.c +2 -2
@@ -28,7 +28,7 @@static inline long do_strnlen_user (const char __user *src,unsigned long count,unsigned long max) {const struct word_at_a_time constants =WORD_AT_A_TIME_CONSTANTS ; -long align, res =0 ; +unsigned long align, res =0 ;unsigned long c;/*
@@ -42,7 +42,7 @@ static inline long do_strnlen_user(const char __user *src, unsigned long count,* Do everything aligned. But that means that we * need to also expand the maximum.. */ - align = (sizeof (long ) -1 ) & (unsigned long )src; + align = (sizeof (unsigned long ) -1 ) & (unsigned long )src; src -= align; max += align;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 83/193 HID: logitech-hidpp: use RAP instead of FAP to get the protocol version
In reply to Greg Kroah-Hartman[ Upstream commit 096377525cdb8251e4656085efc988bdf733fb4c ]
According to the logitech_hidpp_2.0_specification_draft_2012-06-04.pdf doc:
https://lekensteyn.nl/files/logitech/logitech_hidpp_2.0_specification_draft_2012-06-04.pdf
We should use a register-access-protocol request using the short input / output report ids. This is necessary because 27MHz HID++ receivers have a max-packetsize on their HIP++ endpoint of 8, so they cannot support long reports. Using a feature-access-protocol request (which is always long or very-long) with these will cause a timeout error, followed by the hidpp driver treating the device as not being HID++ capable.
This commit fixes this by switching to using a rap request to get the protocol version.
Besides being tested with a (046d:c517) 27MHz receiver with various 27MHz keyboards and mice, this has also been tested to not cause regressions on a non-unifying dual-HID++ nano receiver (046d:c534) with k270 and m185 HID++-2.0 devices connected and on a unifying/dj receiver (046d:c52b) with a HID++-2.0 Logitech Rechargeable Touchpad T650.
--- drivers/hid/hid-logitech-hidpp.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
drivers/hid/hid-logitech-hidpp.c +13 -4
@@ -725,13 +725,16 @@ static int hidpp_root_get_feature(struct hidpp_device *hidpp, u16 feature,static int hidpp_root_get_protocol_version (struct hidpp_device *hidpp) { +const u8 ping_byte =0x5a ; +u8 ping_data[3 ] = {0 ,0 , ping_byte };struct hidpp_report response;int ret; - ret =hidpp_send_fap_command_sync (hidpp, + ret =hidpp_send_rap_command_sync (hidpp, +REPORT_ID_HIDPP_SHORT ,HIDPP_PAGE_ROOT_IDX ,CMD_ROOT_GET_PROTOCOL_VERSION , -NULL ,0 , &response); + ping_data,sizeof (ping_data), &response);if (ret ==HIDPP_ERROR_INVALID_SUBID ) { hidpp->protocol_major =1 ;
@@ -751,8 +754,14 @@ static int hidpp_root_get_protocol_version(struct hidpp_device *hidpp)if (ret)return ret; - hidpp->protocol_major = response.fap.params[0 ]; - hidpp->protocol_minor = response.fap.params[1 ]; +if (response.rap.params[2 ] != ping_byte) { +hid_err (hidpp->hid_dev,"%s: ping mismatch 0x%02x != 0x%02x\n" , + __func__, response.rap.params[2 ], ping_byte); +return -EPROTO ; + } + + hidpp->protocol_major = response.rap.params[0 ]; + hidpp->protocol_minor = response.rap.params[1 ];return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 84/193 pinctrl: pistachio: fix leaked of_node references
In reply to Greg Kroah-Hartman[ Upstream commit 44a4455ac2c6b0981eace683a2b6eccf47689022 ]
The call to of_get_child_by_name returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
./drivers/pinctrl/pinctrl-pistachio.c:1422:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 1360, but without a corresponding object release within this function.
--- drivers/pinctrl/pinctrl-pistachio.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pinctrl/pinctrl-pistachio.c +2 -0
@@ -1368,6 +1368,7 @@ static int pistachio_gpio_register(struct pistachio_pinctrl *pctl)if (!of_find_property (child,"gpio-controller" ,NULL )) {dev_err (pctl->dev,"No gpio-controller property for bank %u\n" , i); +of_node_put (child); ret = -ENODEV ; goto err; }
@@ -1375,6 +1376,7 @@ static int pistachio_gpio_register(struct pistachio_pinctrl *pctl) irq =irq_of_parse_and_map (child,0 );if (irq <0 ) {dev_err (pctl->dev,"No IRQ for bank %u: %d\n" , i, irq); +of_node_put (child); ret = irq; goto err; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 85/193 pinctrl: samsung: fix leaked of_node references
In reply to Greg Kroah-Hartman[ Upstream commit 44b9f86cd41db6c522effa5aec251d664a52fbc0 ]
The call to of_find_compatible_node returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
./drivers/pinctrl/samsung/pinctrl-exynos-arm.c:76:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 66, but without a corresponding object release within this function. ./drivers/pinctrl/samsung/pinctrl-exynos-arm.c:82:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 66, but without a corresponding object release within this function.
--- drivers/pinctrl/samsung/pinctrl-exynos-arm.c | 1 + 1 file changed, 1 insertion(+)
drivers/pinctrl/samsung/pinctrl-exynos-arm.c +1 -0
@@ -76,6 +76,7 @@ s5pv210_retention_init(struct samsung_pinctrl_drv_data *drvdata, } clk_base =of_iomap (np,0 ); +of_node_put (np);if (!clk_base) {pr_err ("%s: failed to map clock registers\n" , __func__);return ERR_PTR (-EINVAL );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 86/193 clk: rockchip: undo several noc and special clocks as critical on rk3288
In reply to Greg Kroah-Hartman[ Upstream commit f4033db5b84ebe4b32c25ba2ed65ab20b628996a ]
This is mostly a revert of commit 55bb6a633c33 ("clk: rockchip: mark noc and some special clk as critical on rk3288") except that we're keeping "pmu_hclk_otg0" as critical still.
NOTE: turning these clocks off doesn't seem to do a whole lot in terms of power savings (checking the power on the logic rail). It appears to save maybe 1-2mW. ...but still it seems like we should turn the clocks off if they aren't needed.
About "pmu_hclk_otg0" (the one clock from the original commit we're still keeping critical) from an email thread:
Quoted 12 lines
pmu ahb clock
Function: Clock to pmu module when hibernation and/or ADP is enabled. Must be greater than or equal to 30 MHz.
If the SOC design does not support hibernation/ADP function, only have
hclk_otg, this clk can be switched according to the usage of otg. If the SOC design support hibernation/ADP, has two clocks,hclk_otgandpmu_hclk_otg0.Hclk_otgbelongs to the closed part of otg logic, which can be switched according to the use of otg.
Quoted 4 lines
pmu_hclk_otg0belongs to the always on part.As for whether
pmu_hclk_otg0can be turned off when otg is not in use, we have not tested. IC suggest makepmu_hclk_otg0always on.
For the rest of the clocks:
atclk: No documentation about this clock other than that it goes to the CPU. CPU functions fine without it on. Maybe needed for JTAG?
jtag: Presumably this clock is only needed if you're debugging with JTAG. It doesn't seem like it makes sense to waste power for every rk3288 user. In any case to do JTAG you'd need private patches to adjust the pinctrl the mux the JTAG out anyway.
pclk_dbg, pclk_core_niu: On veyron Chromebooks we turn these two clocks on only during kernel panics in order to access some coresight registers. Since nothing in the upstream kernel does this we should be able to leave them off safely. Maybe also needed for JTAG?
hsicphy12m_xin12m: There is no indication of why this clock would need to be turned on for boards that don't use HSIC.
pclk_ddrupctl[0-1], pclk_publ0[0-1]: On veyron Chromebooks we turn these 4 clocks on only when doing DDR transitions and they are off otherwise. I see no reason why they'd need to be on in the upstream kernel which doesn't support DDRFreq.
--- drivers/clk/rockchip/clk-rk3288.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
drivers/clk/rockchip/clk-rk3288.c +4 -9
@@ -292,13 +292,13 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {COMPOSITE_NOMUX (0 ,"aclk_core_mp" ,"armclk" ,CLK_IGNORE_UNUSED ,RK3288_CLKSEL_CON (0 ),4 ,4 ,DFLAGS |CLK_DIVIDER_READ_ONLY ,RK3288_CLKGATE_CON (12 ),6 ,GFLAGS ), -COMPOSITE_NOMUX (0 ,"atclk" ,"armclk" ,CLK_IGNORE_UNUSED , +COMPOSITE_NOMUX (0 ,"atclk" ,"armclk" ,0 ,RK3288_CLKSEL_CON (37 ),4 ,5 ,DFLAGS |CLK_DIVIDER_READ_ONLY ,RK3288_CLKGATE_CON (12 ),7 ,GFLAGS ),COMPOSITE_NOMUX (0 ,"pclk_dbg_pre" ,"armclk" ,CLK_IGNORE_UNUSED ,RK3288_CLKSEL_CON (37 ),9 ,5 ,DFLAGS |CLK_DIVIDER_READ_ONLY ,RK3288_CLKGATE_CON (12 ),8 ,GFLAGS ), -GATE (0 ,"pclk_dbg" ,"pclk_dbg_pre" ,CLK_IGNORE_UNUSED , +GATE (0 ,"pclk_dbg" ,"pclk_dbg_pre" ,0 ,RK3288_CLKGATE_CON (12 ),9 ,GFLAGS ),GATE (0 ,"cs_dbg" ,"pclk_dbg_pre" ,CLK_IGNORE_UNUSED , RK3288_CLKGATE_CON(12), 10, GFLAGS),
@@ -626,7 +626,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {INVERTER (SCLK_HSADC ,"sclk_hsadc" ,"sclk_hsadc_out" ,RK3288_CLKSEL_CON (22 ),7 ,IFLAGS ), -GATE (0 ,"jtag" ,"ext_jtag" ,CLK_IGNORE_UNUSED , +GATE (0 ,"jtag" ,"ext_jtag" ,0 ,RK3288_CLKGATE_CON (4 ),14 ,GFLAGS ), COMPOSITE_NODIV(SCLK_USBPHY480M_SRC, "usbphy480m_src", mux_usbphy480m_p, 0,
@@ -635,7 +635,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {COMPOSITE_NODIV (SCLK_HSICPHY480M ,"sclk_hsicphy480m" , mux_hsicphy480m_p,0 ,RK3288_CLKSEL_CON (29 ),0 ,2 ,MFLAGS ,RK3288_CLKGATE_CON (3 ),6 ,GFLAGS ), -GATE (0 ,"hsicphy12m_xin12m" ,"xin12m" ,CLK_IGNORE_UNUSED , +GATE (0 ,"hsicphy12m_xin12m" ,"xin12m" ,0 ,RK3288_CLKGATE_CON (13 ),9 ,GFLAGS ),DIV (0 ,"hsicphy12m_usbphy" ,"sclk_hsicphy480m" ,0 , RK3288_CLKSEL_CON(11), 8, 6, DFLAGS),
@@ -816,11 +816,6 @@ static const char *const rk3288_critical_clocks[] __initconst = {"pclk_alive_niu" ,"pclk_pd_pmu" ,"pclk_pmu_niu" , -"pclk_core_niu" , -"pclk_ddrupctl0" , -"pclk_publ0" , -"pclk_ddrupctl1" , -"pclk_publ1" , "pmu_hclk_otg0", };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 87/193 dmaengine: at_xdmac: remove BUG_ON macro in tasklet
In reply to Greg Kroah-Hartman[ Upstream commit e2c114c06da2d9ffad5b16690abf008d6696f689 ]
Even if this case shouldn't happen when controller is properly programmed, it's still better to avoid dumping a kernel Oops for this.
As the sequence may happen only for debugging purposes, log the error and just finish the tasklet call.
--- drivers/dma/at_xdmac.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/dma/at_xdmac.c +5 -1
@@ -1606,7 +1606,11 @@ static void at_xdmac_tasklet(unsigned long data) struct at_xdmac_desc, xfer_node);dev_vdbg (chan2dev (&atchan->chan),"%s: desc 0x%p\n" , __func__, desc); -BUG_ON (!desc->active_xfer); +if (!desc->active_xfer) { +dev_err (chan2dev (&atchan->chan),"Xfer not active: exiting" ); +spin_unlock_bh (&atchan->lock); +return ; + } txd = &desc->tx_dma_desc;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 88/193 media: coda: clear error return value before picture run
In reply to Greg Kroah-Hartman[ Upstream commit bbeefa7357a648afe70e7183914c87c3878d528d ]
The error return value is not written by some firmware codecs, such as MPEG-2 decode on CodaHx4. Clear the error return value before starting the picture run to avoid misinterpreting unrelated values returned by sequence initialization as error return value.
--- drivers/media/platform/coda/coda-bit.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/platform/coda/coda-bit.c +3 -0
@@ -1948,6 +1948,9 @@ static int coda_prepare_decode(struct coda_ctx *ctx)/* Clear decode success flag */ coda_write (dev,0 ,CODA_RET_DEC_PIC_SUCCESS ); +/* Clear error return value */ +coda_write (dev,0 ,CODA_RET_DEC_PIC_ERR_MB ); +trace_coda_dec_pic_run (ctx, meta);coda_command_async (ctx,CODA_COMMAND_PIC_RUN );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 89/193 media: ov6650: Move v4l2_clk_get() to ov6650_video_probe() helper
In reply to Greg Kroah-Hartman[ Upstream commit ccdd85d518d8b9320ace1d87271f0ba2175f21fa ]
In preparation for adding asynchronous subdevice support to the driver, don't acquire v4l2_clk from the driver .probe() callback as that may fail if the clock is provided by a bridge driver which may be not yet initialized. Move the v4l2_clk_get() to ov6650_video_probe() helper which is going to be converted to v4l2_subdev_internal_ops.registered() callback, executed only when the bridge driver is ready.
--- drivers/media/i2c/ov6650.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-)
drivers/media/i2c/ov6650.c +14 -11
@@ -822,9 +822,16 @@ static int ov6650_video_probe(struct i2c_client *client)u8 pidh, pidl, midh, midl;int ret; + priv->clk =v4l2_clk_get (&client->dev,NULL ); +if (IS_ERR (priv->clk)) { + ret =PTR_ERR (priv->clk); +dev_err (&client->dev,"v4l2_clk request err: %d\n" , ret); +return ret; + } + ret =ov6650_s_power (&priv->subdev,1 );if (ret <0 ) -return ret; + goto eclkput;msleep (20 );
@@ -861,6 +868,11 @@ static int ov6650_video_probe(struct i2c_client *client) done:ov6650_s_power (&priv->subdev,0 ); +if (!ret) +return 0 ; +eclkput: +v4l2_clk_put (priv->clk); +return ret; }
@@ -1006,18 +1018,9 @@ static int ov6650_probe(struct i2c_client *client, priv->code =MEDIA_BUS_FMT_YUYV8_2X8 ; priv->colorspace =V4L2_COLORSPACE_JPEG ; - priv->clk =v4l2_clk_get (&client->dev,NULL ); -if (IS_ERR (priv->clk)) { - ret =PTR_ERR (priv->clk); - goto eclkget; - } - ret =ov6650_video_probe (client); -if (ret) { -v4l2_clk_put (priv->clk); -eclkget: +if (ret)v4l2_ctrl_handler_free (&priv->hdl); - }return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 90/193 media: au0828: stop video streaming only when last user stops
In reply to Greg Kroah-Hartman[ Upstream commit f604f0f5afb88045944567f604409951b5eb6af8 ]
If the application was streaming from both videoX and vbiX, and streaming from videoX was stopped, then the vbi streaming also stopped.
The cause being that stop_streaming for video stopped the subdevs as well, instead of only doing that if dev->streaming_users reached 0.
au0828_stop_vbi_streaming was also wrong since it didn't stop the subdevs at all when dev->streaming_users reached 0.
--- drivers/media/usb/au0828/au0828-video.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/media/usb/au0828/au0828-video.c +8 -5
@@ -839,9 +839,9 @@ int au0828_start_analog_streaming(struct vb2_queue *vq, unsigned int count)return rc; } +v4l2_device_call_all (&dev->v4l2_dev,0 , video, s_stream,1 ); +if (vq->type ==V4L2_BUF_TYPE_VIDEO_CAPTURE ) { -v4l2_device_call_all (&dev->v4l2_dev,0 , video, - s_stream,1 ); dev->vid_timeout_running =1 ;mod_timer (&dev->vid_timeout, jiffies + (HZ /10 )); }else if (vq->type ==V4L2_BUF_TYPE_VBI_CAPTURE ) {
@@ -861,10 +861,11 @@ static void au0828_stop_streaming(struct vb2_queue *vq)dprintk (1 ,"au0828_stop_streaming called %d\n" , dev->streaming_users); -if (dev->streaming_users-- ==1 ) +if (dev->streaming_users-- ==1 ) {au0828_uninit_isoc (dev); +v4l2_device_call_all (&dev->v4l2_dev,0 , video, s_stream,0 ); + } -v4l2_device_call_all (&dev->v4l2_dev,0 , video, s_stream,0 ); dev->vid_timeout_running =0 ;del_timer_sync (&dev->vid_timeout);
@@ -893,8 +894,10 @@ void au0828_stop_vbi_streaming(struct vb2_queue *vq)dprintk (1 ,"au0828_stop_vbi_streaming called %d\n" , dev->streaming_users); -if (dev->streaming_users-- ==1 ) +if (dev->streaming_users-- ==1 ) {au0828_uninit_isoc (dev); +v4l2_device_call_all (&dev->v4l2_dev,0 , video, s_stream,0 ); + }spin_lock_irqsave (&dev->slock, flags);if (dev->isoc_ctl.vbi_buf !=NULL ) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 91/193 media: ov2659: make S_FMT succeed even if requested format doesnt match
In reply to Greg Kroah-Hartman[ Upstream commit bccb89cf9cd07a0690d519696a00c00a973b3fe4 ]
This driver returns an error if unsupported media bus pixel code is requested by VIDIOC_SUBDEV_S_FMT.
But according to Documentation/media/uapi/v4l/vidioc-subdev-g-fmt.rst,
Drivers must not return an error solely because the requested format doesn't match the device capabilities. They must instead modify the format to match what the hardware can provide.
So select default format code and return success in that case.
This is detected by v4l2-compliance.
--- drivers/media/i2c/ov2659.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/media/i2c/ov2659.c +4 -2
@@ -1117,8 +1117,10 @@ static int ov2659_set_fmt(struct v4l2_subdev *sd,if (ov2659_formats[index].code == mf->code)break ; -if (index <0 ) -return -EINVAL ; +if (index <0 ) { + index =0 ; + mf->code = ov2659_formats[index].code; + } mf->colorspace =V4L2_COLORSPACE_SRGB ; mf->field =V4L2_FIELD_NONE ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 92/193 audit: fix a memory leak bug
In reply to Greg Kroah-Hartman[ Upstream commit 70c4cf17e445264453bc5323db3e50aa0ac9e81f ]
In audit_rule_change(), audit_data_to_entry() is firstly invoked to translate the payload data to the kernel's rule representation. In audit_data_to_entry(), depending on the audit field type, an audit tree may be created in audit_make_tree(), which eventually invokes kmalloc() to allocate the tree. Since this tree is a temporary tree, it will be then freed in the following execution, e.g., audit_add_rule() if the message type is AUDIT_ADD_RULE or audit_del_rule() if the message type is AUDIT_DEL_RULE. However, if the message type is neither AUDIT_ADD_RULE nor AUDIT_DEL_RULE, i.e., the default case of the switch statement, this temporary tree is not freed.
To fix this issue, only allocate the tree when the type is AUDIT_ADD_RULE or AUDIT_DEL_RULE.
--- kernel/auditfilter.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
kernel/auditfilter.c +7 -5
@@ -1094,22 +1094,24 @@ int audit_rule_change(int type, int seq, void *data, size_t datasz)int err =0 ;struct audit_entry *entry; - entry =audit_data_to_entry (data, datasz); -if (IS_ERR (entry)) -return PTR_ERR (entry); -switch (type) {case AUDIT_ADD_RULE : + entry =audit_data_to_entry (data, datasz); +if (IS_ERR (entry)) +return PTR_ERR (entry); err =audit_add_rule (entry);audit_log_rule_change ("add_rule" , &entry->rule, !err);break ;case AUDIT_DEL_RULE : + entry =audit_data_to_entry (data, datasz); +if (IS_ERR (entry)) +return PTR_ERR (entry); err =audit_del_rule (entry);audit_log_rule_change ("remove_rule" , &entry->rule, !err);break ;default : - err = -EINVAL ;WARN_ON (1 ); +return -EINVAL ; }if (err || type ==AUDIT_DEL_RULE ) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 93/193 media: stm32-dcmi: fix crash when subdev do not expose any formats
In reply to Greg Kroah-Hartman[ Upstream commit 33dfeb62e23c31619d2197850f7e8b50e8cc5466 ]
Do not access sd_formats[] if num_of_sd_formats is zero, ie subdev sensor didn't expose any formats.
--- drivers/media/platform/stm32/stm32-dcmi.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/media/platform/stm32/stm32-dcmi.c +6 -0
@@ -775,6 +775,9 @@ static int dcmi_try_fmt(struct stm32_dcmi *dcmi, struct v4l2_format *f, sd_fmt =find_format_by_fourcc (dcmi, pix->pixelformat);if (!sd_fmt) { +if (!dcmi->num_of_sd_formats) +return -ENODATA ; + sd_fmt = dcmi->sd_formats[dcmi->num_of_sd_formats -1 ]; pix->pixelformat = sd_fmt->fourcc; }
@@ -946,6 +949,9 @@ static int dcmi_set_sensor_format(struct stm32_dcmi *dcmi, sd_fmt =find_format_by_fourcc (dcmi, pix->pixelformat);if (!sd_fmt) { +if (!dcmi->num_of_sd_formats) +return -ENODATA ; + sd_fmt = dcmi->sd_formats[dcmi->num_of_sd_formats -1 ]; pix->pixelformat = sd_fmt->fourcc; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 94/193 media: au0828: Fix NULL pointer dereference in au0828_analog_stream_enable()
In reply to Greg Kroah-Hartman[ Upstream commit 898bc40bfcc26abb6e06e960d6d4754c36c58b50 ]
Fix au0828_analog_stream_enable() to check if device is in the right state first. When unbind happens while bind is in progress, usbdev pointer could be invalid in au0828_analog_stream_enable() and a call to usb_ifnum_to_if() will result in the null pointer dereference.
This problem is found with the new media_dev_allocator.sh test.
kernel: [ 590.359623] BUG: unable to handle kernel NULL pointer dereference at 00000000000004e8
kernel: [ 590.359627] #PF error: [normal kernel read fault]
kernel: [ 590.359629] PGD 0 P4D 0
kernel: [ 590.359632] Oops: 0000 [#1] SMP PTI
kernel: [ 590.359634] CPU: 3 PID: 1458 Comm: v4l_id Not tainted 5.1.0-rc2+ #30
kernel: [ 590.359636] Hardware name: Dell Inc. OptiPlex 7 90/0HY9JP, BIOS A18 09/24/2013
kernel: [ 590.359641] RIP: 0010:usb_ifnum_to_if+0x6/0x60
kernel: [ 590.359643] Code: 5d 41 5e 41 5f 5d c3 48 83 c4
10 b8 fa ff ff ff 5b 41 5c 41 5d 41 5e 41 5f 5d c3 b8 fa ff ff ff c3 0f 1f 00 6
6 66 66 66 90 55 <48> 8b 97 e8 04 00 00 48 89 e5 48 85 d2 74 41 0f b6 4a 04 84 c
9 74
kernel: [ 590.359645] RSP: 0018:ffffad3cc3c1fc00 EFLAGS: 00010246
kernel: [ 590.359646] RAX: 0000000000000000 RBX: ffff8ded b1f3c000 RCX: 1f377e4500000000
kernel: [ 590.359648] RDX: ffff8dedfa3a6b50 RSI: 00000000 00000000 RDI: 0000000000000000
kernel: [ 590.359649] RBP: ffffad3cc3c1fc28 R08: 00000000 8574acc2 R09: ffff8dedfa3a6b50
kernel: [ 590.359650] R10: 0000000000000001 R11: 00000000 00000000 R12: 0000000000000000
kernel: [ 590.359652] R13: ffff8dedb1f3f0f0 R14: ffffffff adcf7ec0 R15: 0000000000000000
kernel: [ 590.359654] FS: 00007f7917198540(0000) GS:ffff 8dee258c0000(0000) knlGS:0000000000000000
kernel: [ 590.359655] CS: 0010 DS: 0000 ES: 0000 CR0: 00 00000080050033
kernel: [ 590.359657] CR2: 00000000000004e8 CR3: 00000001 a388e002 CR4: 00000000000606e0
kernel: [ 590.359658] Call Trace:
kernel: [ 590.359664] ? au0828_analog_stream_enable+0x2c/0x180
kernel: [ 590.359666] au0828_v4l2_open+0xa4/0x110
kernel: [ 590.359670] v4l2_open+0x8b/0x120
kernel: [ 590.359674] chrdev_open+0xa6/0x1c0
kernel: [ 590.359676] ? cdev_put.part.3+0x20/0x20
kernel: [ 590.359678] do_dentry_open+0x1f6/0x360
kernel: [ 590.359681] vfs_open+0x2f/0x40
kernel: [ 590.359684] path_openat+0x299/0xc20
kernel: [ 590.359688] do_filp_open+0x9b/0x110
kernel: [ 590.359695] ? _raw_spin_unlock+0x27/0x40
kernel: [ 590.359697] ? __alloc_fd+0xb2/0x160
kernel: [ 590.359700] do_sys_open+0x1ba/0x260
kernel: [ 590.359702] ? do_sys_open+0x1ba/0x260
kernel: [ 590.359712] __x64_sys_openat+0x20/0x30
kernel: [ 590.359715] do_syscall_64+0x5a/0x120
kernel: [ 590.359718] entry_SYSCALL_64_after_hwframe+0x44/0xa9
--- drivers/media/usb/au0828/au0828-video.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/usb/au0828/au0828-video.c +3 -0
@@ -758,6 +758,9 @@ static int au0828_analog_stream_enable(struct au0828_dev *d)dprintk (1 ,"au0828_analog_stream_enable called\n" ); +if (test_bit (DEV_DISCONNECTED , &d->dev_state)) +return -ENODEV ; + iface =usb_ifnum_to_if (d->usbdev,0 );if (iface && iface->cur_altsetting->desc.bAlternateSetting !=5 ) {dprintk (1 ,"Changing intf#0 to alt 5\n" );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 95/193 media: pvrusb2: Prevent a buffer overflow
In reply to Greg Kroah-Hartman[ Upstream commit c1ced46c7b49ad7bc064e68d966e0ad303f917fb ]
The ctrl_check_input() function is called from pvr2_ctrl_range_check(). It's supposed to validate user supplied input and return true or false depending on whether the input is valid or not. The problem is that negative shifts or shifts greater than 31 are undefined in C. In practice with GCC they result in shift wrapping so this function returns true for some inputs which are not valid and this could result in a buffer overflow:
drivers/media/usb/pvrusb2/pvrusb2-ctrl.c:205 pvr2_ctrl_get_valname()
warn: uncapped user index 'names[val]'
The cptr->hdw->input_allowed_mask mask is configured in pvr2_hdw_create() and the highest valid bit is BIT(4).
--- drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 2 ++ drivers/media/usb/pvrusb2/pvrusb2-hdw.h | 1 + 2 files changed, 3 insertions(+)
drivers/media/usb/pvrusb2/pvrusb2-hdw.c +2 -0
@@ -666,6 +666,8 @@ static int ctrl_get_input(struct pvr2_ctrl *cptr,int *vp)static int ctrl_check_input (struct pvr2_ctrl *cptr,int v) { +if (v <0 || v >PVR2_CVAL_INPUT_MAX ) +return 0 ;return ((1 << v) & cptr->hdw->input_allowed_mask) !=0 ; }
drivers/media/usb/pvrusb2/pvrusb2-hdw.h +1 -0
@@ -50,6 +50,7 @@#define PVR2_CVAL_INPUT_COMPOSITE 2#define PVR2_CVAL_INPUT_SVIDEO 3#define PVR2_CVAL_INPUT_RADIO 4 +#define PVR2_CVAL_INPUT_MAX PVR2_CVAL_INPUT_RADIOenum pvr2_config { pvr2_config_empty,/* No configuration */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 96/193 powerpc/numa: improve control of topology updates
In reply to Greg Kroah-Hartman[ Upstream commit 2d4d9b308f8f8dec68f6dbbff18c68ec7c6bd26f ]
When booted with "topology_updates=no", or when "off" is written to /proc/powerpc/topology_updates, NUMA reassignments are inhibited for PRRN and VPHN events. However, migration and suspend unconditionally re-enable reassignments via start_topology_update(). This is incoherent.
Check the topology_updates_enabled flag in start/stop_topology_update() so that callers of those APIs need not be aware of whether reassignments are enabled. This allows the administrative decision on reassignments to remain in force across migrations and suspensions.
--- arch/powerpc/mm/numa.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
arch/powerpc/mm/numa.c +12 -6
@@ -1561,6 +1561,9 @@ int start_topology_update(void) {int rc =0 ; +if (!topology_updates_enabled) +return 0 ; +if (firmware_has_feature (FW_FEATURE_PRRN )) {if (!prrn_enabled) { prrn_enabled =1 ;
@@ -1590,6 +1593,9 @@ int stop_topology_update(void) {int rc =0 ; +if (!topology_updates_enabled) +return 0 ; +if (prrn_enabled) { prrn_enabled =0 ;#ifdef CONFIG_SMP
@@ -1635,11 +1641,13 @@ static ssize_t topology_write(struct file *file, const char __user *buf, kbuf[read_len] ='\0' ; -if (!strncmp (kbuf,"on" ,2 )) +if (!strncmp (kbuf,"on" ,2 )) { + topology_updates_enabled = true;start_topology_update (); -else if (!strncmp (kbuf,"off" ,3 )) + }else if (!strncmp (kbuf,"off" ,3 )) {stop_topology_update (); -else + topology_updates_enabled = false; + }else return -EINVAL ;return count;
@@ -1654,9 +1662,7 @@ static const struct file_operations topology_ops = {static int topology_update_init (void ) { -/* Do not poll for changes if disabled at boot */ -if (topology_updates_enabled) -start_topology_update (); +start_topology_update ();if (!proc_create ("powerpc/topology_updates" ,0644 ,NULL , &topology_ops))return -ENOMEM ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 97/193 powerpc/64: Fix booting large kernels with STRICT_KERNEL_RWX
In reply to Greg Kroah-Hartman[ Upstream commit 56c46bba9bbfe229b4472a5be313c44c5b714a39 ]
With STRICT_KERNEL_RWX enabled anything marked __init is placed at a 16M boundary. This is necessary so that it can be repurposed later with different permissions. However, in kernels with text larger than 16M, this pushes early_setup past 32M, incapable of being reached by the branch instruction.
Fix this by setting the CTR and branching there instead.
--- arch/powerpc/kernel/head_64.S | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/powerpc/kernel/head_64.S +3 -1
@@ -961,7 +961,9 @@ start_here_multiplatform: /* Restore parameters passed from prom_init/kexec */ mr r3,r31 - bl early_setup /* also sets r13 and SPRG_PACA */ + LOAD_REG_ADDR(r12, DOTSYM(early_setup)) + mtctr r12 + bctrl /* also sets r13 and SPRG_PACA */ LOAD_REG_ADDR(r3, start_here_common) ld r4,PACAKMSR(r13)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 98/193 random: add a spinlock_t to struct batched_entropy
In reply to Greg Kroah-Hartman[ Upstream commit b7d5dc21072cda7124d13eae2aefb7343ef94197 ]
The per-CPU variable batched_entropy_uXX is protected by get_cpu_var(). This is just a preempt_disable() which ensures that the variable is only from the local CPU. It does not protect against users on the same CPU from another context. It is possible that a preemptible context reads slot 0 and then an interrupt occurs and the same value is read again.
The above scenario is confirmed by lockdep if we add a spinlock:
| ================================
| WARNING: inconsistent lock state
| 5.1.0-rc3+ #42 Not tainted
| --------------------------------
| inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage.
| ksoftirqd/9/56 [HC0[0]:SC1[1]:HE0:SE0] takes:
| (____ptrval____) (batched_entropy_u32.lock){+.?.}, at: get_random_u32+0x3e/0xe0
| {SOFTIRQ-ON-W} state was registered at:
| _raw_spin_lock+0x2a/0x40
| get_random_u32+0x3e/0xe0
| new_slab+0x15c/0x7b0
| ___slab_alloc+0x492/0x620
| __slab_alloc.isra.73+0x53/0xa0
| kmem_cache_alloc_node+0xaf/0x2a0
| copy_process.part.41+0x1e1/0x2370
| _do_fork+0xdb/0x6d0
| kernel_thread+0x20/0x30
| kthreadd+0x1ba/0x220
| ret_from_fork+0x3a/0x50
…
| other info that might help us debug this:
| Possible unsafe locking scenario:
|
| CPU0
| ----
| lock(batched_entropy_u32.lock);
| <Interrupt>
| lock(batched_entropy_u32.lock);
|
| *** DEADLOCK ***
|
| stack backtrace:
| Call Trace:
…
| kmem_cache_alloc_trace+0x20e/0x270
| ipmi_alloc_recv_msg+0x16/0x40
…
| __do_softirq+0xec/0x48d
| run_ksoftirqd+0x37/0x60
| smpboot_thread_fn+0x191/0x290
| kthread+0xfe/0x130
| ret_from_fork+0x3a/0x50Add a spinlock_t to the batched_entropy data structure and acquire the lock while accessing it. Acquire the lock with disabled interrupts because this function may be used from interrupt context.
Remove the batched_entropy_reset_lock lock. Now that we have a lock for the data scructure, we can access it from a remote CPU.
--- drivers/char/random.c | 52 ++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 25 deletions(-)
drivers/char/random.c +27 -25
@@ -2188,8 +2188,8 @@ struct batched_entropy {u32 entropy_u32[CHACHA20_BLOCK_SIZE /sizeof (u32)]; };unsigned int position; +spinlock_t batch_lock; }; -static rwlock_t batched_entropy_reset_lock =__RW_LOCK_UNLOCKED (batched_entropy_reset_lock);/* * Get a random word for internal kernel use only. The quality of the random
@@ -2199,12 +2199,14 @@ static rwlock_t batched_entropy_reset_lock = __RW_LOCK_UNLOCKED(batched_entropy_* wait_for_random_bytes() should be called and return 0 at least once * at any point prior. */ -static DEFINE_PER_CPU(struct batched_entropy, batched_entropy_u64); +static DEFINE_PER_CPU(struct batched_entropy, batched_entropy_u64) = { + .batch_lock =__SPIN_LOCK_UNLOCKED (batched_entropy_u64.lock), +}; +u64 get_random_u64 (void ) {u64 ret; -bool use_lock; -unsigned long flags =0 ; +unsigned long flags;struct batched_entropy *batch;static void *previous;
@@ -2219,28 +2221,25 @@ u64 get_random_u64(void)warn_unseeded_randomness (&previous); - use_lock =READ_ONCE (crng_init) <2 ; - batch = &get_cpu_var (batched_entropy_u64); -if (use_lock) -read_lock_irqsave (&batched_entropy_reset_lock, flags); + batch =raw_cpu_ptr (&batched_entropy_u64); +spin_lock_irqsave (&batch->batch_lock, flags);if (batch->position %ARRAY_SIZE (batch->entropy_u64) ==0 ) {extract_crng ((u8 *)batch->entropy_u64); batch->position =0 ; } ret = batch->entropy_u64[batch->position++]; -if (use_lock) -read_unlock_irqrestore (&batched_entropy_reset_lock, flags); -put_cpu_var (batched_entropy_u64); +spin_unlock_irqrestore (&batch->batch_lock, flags);return ret; }EXPORT_SYMBOL (get_random_u64); -static DEFINE_PER_CPU(struct batched_entropy, batched_entropy_u32); +static DEFINE_PER_CPU(struct batched_entropy, batched_entropy_u32) = { + .batch_lock =__SPIN_LOCK_UNLOCKED (batched_entropy_u32.lock), +};u32 get_random_u32 (void ) {u32 ret; -bool use_lock; -unsigned long flags =0 ; +unsigned long flags;struct batched_entropy *batch;static void *previous;
@@ -2249,18 +2248,14 @@ u32 get_random_u32(void)warn_unseeded_randomness (&previous); - use_lock =READ_ONCE (crng_init) <2 ; - batch = &get_cpu_var (batched_entropy_u32); -if (use_lock) -read_lock_irqsave (&batched_entropy_reset_lock, flags); + batch =raw_cpu_ptr (&batched_entropy_u32); +spin_lock_irqsave (&batch->batch_lock, flags);if (batch->position %ARRAY_SIZE (batch->entropy_u32) ==0 ) {extract_crng ((u8 *)batch->entropy_u32); batch->position =0 ; } ret = batch->entropy_u32[batch->position++]; -if (use_lock) -read_unlock_irqrestore (&batched_entropy_reset_lock, flags); -put_cpu_var (batched_entropy_u32); +spin_unlock_irqrestore (&batch->batch_lock, flags);return ret; }EXPORT_SYMBOL (get_random_u32);
@@ -2274,12 +2269,19 @@ static void invalidate_batched_entropy(void)int cpu;unsigned long flags; -write_lock_irqsave (&batched_entropy_reset_lock, flags);for_each_possible_cpu (cpu) { -per_cpu_ptr (&batched_entropy_u32, cpu)->position =0 ; -per_cpu_ptr (&batched_entropy_u64, cpu)->position =0 ; +struct batched_entropy *batched_entropy; + + batched_entropy =per_cpu_ptr (&batched_entropy_u32, cpu); +spin_lock_irqsave (&batched_entropy->batch_lock, flags); + batched_entropy->position =0 ; +spin_unlock (&batched_entropy->batch_lock); + + batched_entropy =per_cpu_ptr (&batched_entropy_u64, cpu); +spin_lock (&batched_entropy->batch_lock); + batched_entropy->position =0 ; +spin_unlock_irqrestore (&batched_entropy->batch_lock, flags); } -write_unlock_irqrestore (&batched_entropy_reset_lock, flags); }/**
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 99/193 cgroup: protect cgroup->nr_(dying_)descendants by css_set_lock
In reply to Greg Kroah-Hartman[ Upstream commit 4dcabece4c3a9f9522127be12cc12cc120399b2f ]
The number of descendant cgroups and the number of dying descendant cgroups are currently synchronized using the cgroup_mutex.
The number of descendant cgroups will be required by the cgroup v2 freezer, which will use it to determine if a cgroup is frozen (depending on total number of descendants and number of frozen descendants). It's not always acceptable to grab the cgroup_mutex, especially from quite hot paths (e.g. exit()).
To avoid this, let's additionally synchronize these counters using the css_set_lock.
So, it's safe to read these counters with either cgroup_mutex or css_set_lock locked, and for changing both locks should be acquired.
--- include/linux/cgroup-defs.h | 5 +++++ kernel/cgroup/cgroup.c | 6 ++++++ 2 files changed, 11 insertions(+)
include/linux/cgroup-defs.h +5 -0
@@ -287,6 +287,11 @@ struct cgroup {* Dying cgroups are cgroups which were deleted by a user, * but are still existing because someone else is holding a reference. * max_descendants is a maximum allowed number of descent cgroups. +* +* nr_descendants and nr_dying_descendants are protected +* by cgroup_mutex and css_set_lock. It's fine to read them holding +* any of cgroup_mutex and css_set_lock; for writing both locks +* should be held. */ int nr_descendants;int nr_dying_descendants;
kernel/cgroup/cgroup.c +6 -0
@@ -4546,9 +4546,11 @@ static void css_release_work_fn(struct work_struct *work)/* cgroup release path */ trace_cgroup_release (cgrp); +spin_lock_irq (&css_set_lock);for (tcgrp =cgroup_parent (cgrp); tcgrp; tcgrp =cgroup_parent (tcgrp)) tcgrp->nr_dying_descendants--; +spin_unlock_irq (&css_set_lock);cgroup_idr_remove (&cgrp->root->cgroup_idr, cgrp->id); cgrp->id =-1 ;
@@ -4745,12 +4747,14 @@ static struct cgroup *cgroup_create(struct cgroup *parent) cgrp->root = root; cgrp->level = level; +spin_lock_irq (&css_set_lock);for (tcgrp = cgrp; tcgrp; tcgrp =cgroup_parent (tcgrp)) { cgrp->ancestor_ids[tcgrp->level] = tcgrp->id;if (tcgrp != cgrp) tcgrp->nr_descendants++; } +spin_unlock_irq (&css_set_lock);if (notify_on_release (parent))set_bit (CGRP_NOTIFY_ON_RELEASE , &cgrp->flags);
@@ -5033,10 +5037,12 @@ static int cgroup_destroy_locked(struct cgroup *cgrp)if (parent &&cgroup_is_threaded (cgrp)) parent->nr_threaded_children--; +spin_lock_irq (&css_set_lock);for (tcgrp =cgroup_parent (cgrp); tcgrp; tcgrp =cgroup_parent (tcgrp)) { tcgrp->nr_descendants--; tcgrp->nr_dying_descendants++; } +spin_unlock_irq (&css_set_lock);cgroup1_check_for_release (parent);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 100/193 sched/core: Check quota and period overflow at usec to nsec conversion
In reply to Greg Kroah-Hartman[ Upstream commit 1a8b4540db732ca16c9e43ac7c08b1b8f0b252d8 ]
Large values could overflow u64 and pass following sanity checks.
# echo 18446744073750000 > cpu.cfs_period_us # cat cpu.cfs_period_us 40448
# echo 18446744073750000 > cpu.cfs_quota_us # cat cpu.cfs_quota_us 40448
After this patch they will fail with -EINVAL.
--- kernel/sched/core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
kernel/sched/core.c +6 -1
@@ -6482,8 +6482,10 @@ int tg_set_cfs_quota(struct task_group *tg, long cfs_quota_us) period =ktime_to_ns (tg->cfs_bandwidth.period);if (cfs_quota_us <0 ) quota =RUNTIME_INF ; -else +else if ((u64 )cfs_quota_us <=U64_MAX /NSEC_PER_USEC ) quota = (u64 )cfs_quota_us *NSEC_PER_USEC ; +else +return -EINVAL ;return tg_set_cfs_bandwidth (tg, period, quota); }
@@ -6505,6 +6507,9 @@ int tg_set_cfs_period(struct task_group *tg, long cfs_period_us) {u64 quota, period; +if ((u64 )cfs_period_us >U64_MAX /NSEC_PER_USEC ) +return -EINVAL ; + period = (u64 )cfs_period_us *NSEC_PER_USEC ; quota = tg->cfs_bandwidth.quota;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 101/193 sched/rt: Check integer overflow at usec to nsec conversion
In reply to Greg Kroah-Hartman[ Upstream commit 1a010e29cfa00fee2888fd2fd4983f848cbafb58 ]
Example of unhandled overflows:
# echo 18446744073709651 > cpu.rt_runtime_us # cat cpu.rt_runtime_us 99
# echo 18446744073709900 > cpu.rt_period_us # cat cpu.rt_period_us 348
After this patch they will fail with -EINVAL.
--- kernel/sched/rt.c | 5 +++++ 1 file changed, 5 insertions(+)
kernel/sched/rt.c +5 -0
@@ -2533,6 +2533,8 @@ int sched_group_set_rt_runtime(struct task_group *tg, long rt_runtime_us) rt_runtime = (u64 )rt_runtime_us *NSEC_PER_USEC ;if (rt_runtime_us <0 ) rt_runtime =RUNTIME_INF ; +else if ((u64 )rt_runtime_us >U64_MAX /NSEC_PER_USEC ) +return -EINVAL ;return tg_set_rt_bandwidth (tg, rt_period, rt_runtime); }
@@ -2553,6 +2555,9 @@ int sched_group_set_rt_period(struct task_group *tg, u64 rt_period_us) {u64 rt_runtime, rt_period; +if (rt_period_us >U64_MAX /NSEC_PER_USEC ) +return -EINVAL ; + rt_period = rt_period_us *NSEC_PER_USEC ; rt_runtime = tg->rt_bandwidth.rt_runtime;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 102/193 sched/core: Handle overflow in cpu_shares_write_u64
In reply to Greg Kroah-Hartman[ Upstream commit 5b61d50ab4ef590f5e1d4df15cd2cea5f5715308 ]
Bit shift in scale_load() could overflow shares. This patch saturates it to MAX_SHARES like following sched_group_set_shares().
Example:
# echo 9223372036854776832 > cpu.shares # cat cpu.shares
Before patch: 1024
After pattch: 262144
--- kernel/sched/core.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/sched/core.c +2 -0
@@ -6380,6 +6380,8 @@ static void cpu_cgroup_attach(struct cgroup_taskset *tset)static int cpu_shares_write_u64 (struct cgroup_subsys_state *css,struct cftype *cftype,u64 shareval) { +if (shareval >scale_load_down (ULONG_MAX )) + shareval =MAX_SHARES ;return sched_group_set_shares (css_tg (css),scale_load (shareval)); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 103/193 drm/msm: a5xx: fix possible object reference leak
In reply to Greg Kroah-Hartman[ Upstream commit 6cd5235c3135ea84b32469ea51b2aae384eda8af ]
The call to of_get_child_by_name returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
drivers/gpu/drm/msm/adreno/a5xx_gpu.c:57:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 47, but without a corresponding object release within this function. drivers/gpu/drm/msm/adreno/a5xx_gpu.c:66:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 47, but without a corresponding object release within this function. drivers/gpu/drm/msm/adreno/a5xx_gpu.c:118:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 47, but without a corresponding object release within this function. drivers/gpu/drm/msm/adreno/a5xx_gpu.c:57:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 51, but without a corresponding object release within this function. drivers/gpu/drm/msm/adreno/a5xx_gpu.c:66:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 51, but without a corresponding object release within this function. drivers/gpu/drm/msm/adreno/a5xx_gpu.c:118:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 51, but without a corresponding object release within this function.
--- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +6 -4
@@ -29,7 +29,7 @@ static void a5xx_dump(struct msm_gpu *gpu);static int zap_shader_load_mdt (struct device *dev,const char *fwname) {const struct firmware *fw; -struct device_node *np; +struct device_node *np, *mem_np;struct resource r;phys_addr_t mem_phys;ssize_t mem_size;
@@ -43,11 +43,13 @@ static int zap_shader_load_mdt(struct device *dev, const char *fwname)if (!np)return -ENODEV ; - np =of_parse_phandle (np,"memory-region" ,0 ); -if (!np) + mem_np =of_parse_phandle (np,"memory-region" ,0 ); +of_node_put (np); +if (!mem_np)return -EINVAL ; - ret =of_address_to_resource (np,0 , &r); + ret =of_address_to_resource (mem_np,0 , &r); +of_node_put (mem_np);if (ret)return ret;
Signature · 8 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Greg Kroah-Hartman
maintainerPATCH 104/193 USB: core: Dont unbind interfaces following device reset failure
In reply to Greg Kroah-Hartman[ Upstream commit 381419fa720060ba48b7bbc483be787d5b1dca6f ]
The SCSI core does not like to have devices or hosts unregistered while error recovery is in progress. Trying to do so can lead to
self-deadlock: Part of the removal code tries to obtain a lock already held by the error handler.
This can cause problems for the usb-storage and uas drivers, because their error handler routines perform a USB reset, and if the reset fails then the USB core automatically goes on to unbind all drivers from the device's interfaces -- all while still in the context of the SCSI error handler.
As it turns out, practically all the scenarios leading to a USB reset failure end up causing a device disconnect (the main error pathway in usb_reset_and_verify_device(), at the end of the routine, calls hub_port_logical_disconnect() before returning). As a result, the hub_wq thread will soon become aware of the problem and will unbind all the device's drivers in its own context, not in the error-handler's context.
This means that usb_reset_device() does not need to call usb_unbind_and_rebind_marked_interfaces() in cases where usb_reset_and_verify_device() has returned an error, because hub_wq will take care of everything anyway.
This particular problem was observed in somewhat artificial circumstances, by using usbfs to tell a hub to power-down a port connected to a USB-3 mass storage device using the UAS protocol. With the port turned off, the currently executing command timed out and the error handler started running. The USB reset naturally failed, because the hub port was off, and the error handler deadlocked as described above. Not carrying out the call to usb_unbind_and_rebind_marked_interfaces() fixes this issue.
--- drivers/usb/core/hub.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/usb/core/hub.c +4 -1
@@ -5713,7 +5713,10 @@ int usb_reset_device(struct usb_device *udev) cintf->needs_binding =1 ; } } -usb_unbind_and_rebind_marked_interfaces (udev); + +/* If the reset failed, hub_wq will unbind drivers later */ +if (ret ==0 ) +usb_unbind_and_rebind_marked_interfaces (udev); }usb_autosuspend_device (udev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 105/193 x86/irq/64: Limit IST stack overflow check to #DB stack
In reply to Greg Kroah-Hartman[ Upstream commit 7dbcf2b0b770eeb803a416ee8dcbef78e6389d40 ]
Commit
37fe6a42b343 ("x86: Check stack overflow in detail")
added a broad check for the full exception stack area, i.e. it considers the full exception stack area as valid.
That's wrong in two aspects:
1) It does not check the individual areas one by one
2) #DF, NMI and #MCE are not enabling interrupts which means that a regular device interrupt cannot happen in their context. In fact if a device interrupt hits one of those IST stacks that's a bug because some code path enabled interrupts while handling the exception.
Limit the check to the #DB stack and consider all other IST stacks as 'overflow' or invalid.
--- arch/x86/kernel/irq_64.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
arch/x86/kernel/irq_64.c +14 -5
@@ -26,9 +26,18 @@ int sysctl_panic_on_stackoverflow;/* * Probabilistic stack overflow check: * -* Only check the stack in process context, because everything else -* runs on the big interrupt stacks. Checking reliably is too expensive, -* so we just check from interrupts. +* Regular device interrupts can enter on the following stacks: +* +* - User stack +* +* - Kernel task stack +* +* - Interrupt stack if a device driver reenables interrupts +* which should only happen in really old drivers. +* +* - Debug IST stack +* +* All other contexts are invalid. */ static inline void stack_overflow_check (struct pt_regs *regs) {
@@ -53,8 +62,8 @@ static inline void stack_overflow_check(struct pt_regs *regs)return ; oist =this_cpu_ptr (&orig_ist); - estack_top = (u64 )oist->ist[0 ] -EXCEPTION_STKSZ +STACK_TOP_MARGIN ; - estack_bottom = (u64 )oist->ist[N_EXCEPTION_STACKS -1 ]; + estack_bottom = (u64 )oist->ist[DEBUG_STACK ]; + estack_top = estack_bottom -DEBUG_STKSZ +STACK_TOP_MARGIN ;if (regs->sp >= estack_top && regs->sp <= estack_bottom)return ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 106/193 phy: sun4i-usb: Make sure to disable PHY0 passby for peripheral mode
In reply to Greg Kroah-Hartman[ Upstream commit e6f32efb1b128344a2c7df9875bc1a1abaa1d395 ]
On platforms where the MUSB and HCI controllers share PHY0, PHY passby is required when using the HCI controller with the PHY, but it must be disabled when the MUSB controller is used instead.
Without this, PHY0 passby is always enabled, which results in broken peripheral mode on such platforms (e.g. H3/H5).
--- drivers/phy/allwinner/phy-sun4i-usb.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/phy/allwinner/phy-sun4i-usb.c +4 -0
@@ -549,6 +549,7 @@ static void sun4i_usb_phy0_id_vbus_det_scan(struct work_struct *work)struct sun4i_usb_phy_data *data = container_of(work, struct sun4i_usb_phy_data, detect.work);struct phy *phy0 = data->phys[0 ].phy; +struct sun4i_usb_phy *phy =phy_get_drvdata (phy0);bool force_session_end, id_notify = false, vbus_notify = false;int id_det, vbus_det;
@@ -605,6 +606,9 @@ static void sun4i_usb_phy0_id_vbus_det_scan(struct work_struct *work)mutex_unlock (&phy0->mutex); } +/* Enable PHY0 passby for host mode only. */ +sun4i_usb_phy_passby (phy, !id_det); +/* Re-route PHY0 if necessary */ if (data->cfg->phy0_dual_route)sun4i_usb_phy0_reroute (data, id_det);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 107/193 i40e: Able to add up to 16 MAC filters on an untrusted VF
In reply to Greg Kroah-Hartman[ Upstream commit 06b6e2a2333eb3581567a7ac43ca465ef45f4daa ]
This patch fixes the problem with the driver being able to add only 7 multicast MAC address filters instead of 16. The problem is fixed by changing the maximum number of MAC address filters to 16+1+1 (two extra are needed because the driver uses 1 for unicast MAC address and 1 for broadcast).
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +4 -2
@@ -2029,8 +2029,10 @@ static int i40e_vc_get_stats_msg(struct i40e_vf *vf, u8 *msg, u16 msglen) (u8 *)&stats, sizeof(stats)); } -/* If the VF is not trusted restrict the number of MAC/VLAN it can program */ -#define I40E_VC_MAX_MAC_ADDR_PER_VF 12 +/* If the VF is not trusted restrict the number of MAC/VLAN it can program +* MAC filters: 16 for multicast, 1 for MAC, 1 for broadcast +*/ +#define I40E_VC_MAX_MAC_ADDR_PER_VF (16 + 1 + 1)#define I40E_VC_MAX_VLAN_PER_VF 8/**
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 108/193 i40e: dont allow changes to HW VLAN stripping on active port VLANs
In reply to Greg Kroah-Hartman[ Upstream commit bfb0ebed53857cfc57f11c63fa3689940d71c1c8 ]
Modifying the VLAN stripping options when a port VLAN is configured will break traffic for the VSI, and conceptually doesn't make sense, so don't allow this.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_main.c +8 -0
@@ -2499,6 +2499,10 @@ void i40e_vlan_stripping_enable(struct i40e_vsi *vsi)struct i40e_vsi_context ctxt;i40e_status ret; +/* Don't modify stripping options if a port VLAN is active */ +if (vsi->info.pvid) +return ; +if ((vsi->info.valid_sections &cpu_to_le16 (I40E_AQ_VSI_PROP_VLAN_VALID )) && ((vsi->info.port_vlan_flags &I40E_AQ_VSI_PVLAN_MODE_MASK ) ==0 ))
@@ -2529,6 +2533,10 @@ void i40e_vlan_stripping_disable(struct i40e_vsi *vsi)struct i40e_vsi_context ctxt;i40e_status ret; +/* Don't modify stripping options if a port VLAN is active */ +if (vsi->info.pvid) +return ; + if ((vsi->info.valid_sections & cpu_to_le16(I40E_AQ_VSI_PROP_VLAN_VALID)) && ((vsi->info.port_vlan_flags & I40E_AQ_VSI_PVLAN_EMOD_MASK) ==
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 109/193 arm64: vdso: Fix clock_getres() for CLOCK_REALTIME
In reply to Greg Kroah-Hartman[ Upstream commit 81fb8736dd81da3fe94f28968dac60f392ec6746 ]
clock_getres() in the vDSO library has to preserve the same behaviour of posix_get_hrtimer_res().
In particular, posix_get_hrtimer_res() does:
sec = 0;
ns = hrtimer_resolution;where 'hrtimer_resolution' depends on whether or not high resolution timers are enabled, which is a runtime decision.
The vDSO incorrectly returns the constant CLOCK_REALTIME_RES. Fix this by exposing 'hrtimer_resolution' in the vDSO datapage and returning that instead.
--- arch/arm64/include/asm/vdso_datapage.h | 1 + arch/arm64/kernel/asm-offsets.c | 2 +- arch/arm64/kernel/vdso.c | 3 +++ arch/arm64/kernel/vdso/gettimeofday.S | 7 +++---- 4 files changed, 8 insertions(+), 5 deletions(-)
arch/arm64/include/asm/vdso_datapage.h +1 -0
@@ -38,6 +38,7 @@ struct vdso_data {__u32 tz_minuteswest;/* Whacky timezone stuff */ __u32 tz_dsttime;__u32 use_syscall; + __u32 hrtimer_res; };#endif /* !__ASSEMBLY__ */
arch/arm64/kernel/asm-offsets.c +1 -1
@@ -95,7 +95,7 @@ int main(void)DEFINE (CLOCK_REALTIME ,CLOCK_REALTIME );DEFINE (CLOCK_MONOTONIC ,CLOCK_MONOTONIC );DEFINE (CLOCK_MONOTONIC_RAW ,CLOCK_MONOTONIC_RAW ); -DEFINE (CLOCK_REALTIME_RES ,MONOTONIC_RES_NSEC ); +DEFINE (CLOCK_REALTIME_RES , offsetof(struct vdso_data , hrtimer_res));DEFINE (CLOCK_REALTIME_COARSE ,CLOCK_REALTIME_COARSE );DEFINE (CLOCK_MONOTONIC_COARSE ,CLOCK_MONOTONIC_COARSE );DEFINE (CLOCK_COARSE_RES ,LOW_RES_NSEC );
arch/arm64/kernel/vdso.c +3 -0
@@ -232,6 +232,9 @@ void update_vsyscall(struct timekeeper *tk) vdso_data->wtm_clock_sec = tk->wall_to_monotonic.tv_sec; vdso_data->wtm_clock_nsec = tk->wall_to_monotonic.tv_nsec; +/* Read without the seqlock held by clock_getres() */ +WRITE_ONCE (vdso_data->hrtimer_res, hrtimer_resolution); +if (!use_syscall) {/* tkr_mono.cycle_last == tkr_raw.cycle_last */ vdso_data->cs_cycle_last = tk->tkr_mono.cycle_last;
arch/arm64/kernel/vdso/gettimeofday.S +3 -4
@@ -301,13 +301,14 @@ ENTRY(__kernel_clock_getres) ccmp w0, #CLOCK_MONOTONIC_RAW, #0x4, ne b.ne 1f - ldr x2, 5f + adr vdso_data, _vdso_data + ldr w2, [vdso_data, #CLOCK_REALTIME_RES] b 2f 1: cmp w0, #CLOCK_REALTIME_COARSE ccmp w0, #CLOCK_MONOTONIC_COARSE, #0x4, ne b.ne 4f - ldr x2, 6f + ldr x2, 5f 2: cbz w1, 3f stp xzr, x2, [x1]
@@ -321,8 +322,6 @@ ENTRY(__kernel_clock_getres) svc #0 ret 5: - .quad CLOCK_REALTIME_RES -6: .quad CLOCK_COARSE_RES .cfi_endproc ENDPROC(__kernel_clock_getres)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 110/193 RDMA/cxgb4: Fix null pointer dereference on alloc_skb failure
In reply to Greg Kroah-Hartman[ Upstream commit a6d2a5a92e67d151c98886babdc86d530d27111c ]
Currently if alloc_skb fails to allocate the skb a null skb is passed to t4_set_arp_err_handler and this ends up dereferencing the null skb. Avoid the NULL pointer dereference by checking for a NULL skb and returning early.
Addresses-Coverity: ("Dereference null return")
--- drivers/infiniband/hw/cxgb4/cm.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/infiniband/hw/cxgb4/cm.c +2 -0
@@ -456,6 +456,8 @@ static struct sk_buff *get_skb(struct sk_buff *skb, int len, gfp_t gfp)skb_reset_transport_header (skb); }else { skb =alloc_skb (len, gfp); +if (!skb) +return NULL ; }t4_set_arp_err_handler (skb,NULL ,NULL );return skb;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 111/193 hwmon: (vt1211) Use request_muxed_region for Super-IO accesses
In reply to Greg Kroah-Hartman[ Upstream commit 14b97ba5c20056102b3dd22696bf17b057e60976 ]
Super-IO accesses may fail on a system with no or unmapped LPC bus.
Also, other drivers may attempt to access the LPC bus at the same time, resulting in undefined behavior.
Use request_muxed_region() to ensure that IO access on the requested address space is supported, and to ensure that access by multiple drivers is synchronized.
--- drivers/hwmon/vt1211.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/hwmon/vt1211.c +12 -3
@@ -226,15 +226,21 @@ static inline void superio_select(int sio_cip, int ldn)outb (ldn, sio_cip +1 ); } -static inline void superio_enter (int sio_cip) +static inline int superio_enter (int sio_cip) { +if (!request_muxed_region (sio_cip,2 ,DRVNAME )) +return -EBUSY ; +outb (0x87 , sio_cip);outb (0x87 , sio_cip); + +return 0 ; }static inline void superio_exit (int sio_cip) {outb (0xaa , sio_cip); +release_region (sio_cip,2 ); }/* ---------------------------------------------------------------------
@@ -1282,11 +1288,14 @@ static int __init vt1211_device_add(unsigned short address)static int __init vt1211_find (int sio_cip,unsigned short *address) { -int err = -ENODEV ; +int err;int devid; -superio_enter (sio_cip); + err =superio_enter (sio_cip); +if (err) +return err; + err = -ENODEV ; devid = force_id ? force_id :superio_inb (sio_cip,SIO_VT1211_DEVID );if (devid !=SIO_VT1211_ID ) goto EXIT;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 112/193 hwmon: (smsc47m1) Use request_muxed_region for Super-IO accesses
In reply to Greg Kroah-Hartman[ Upstream commit d6410408ad2a798c4cc685252c1baa713be0ad69 ]
Super-IO accesses may fail on a system with no or unmapped LPC bus.
Also, other drivers may attempt to access the LPC bus at the same time, resulting in undefined behavior.
Use request_muxed_region() to ensure that IO access on the requested address space is supported, and to ensure that access by multiple drivers is synchronized.
--- drivers/hwmon/smsc47m1.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-)
drivers/hwmon/smsc47m1.c +19 -9
@@ -73,16 +73,21 @@ superio_inb(int reg)/* logical device for fans is 0x0A */ #define superio_select () superio_outb(0x07, 0x0A) -static inline void +static inline int superio_enter (void ) { +if (!request_muxed_region (REG ,2 ,DRVNAME )) +return -EBUSY ; +outb (0x55 ,REG ); +return 0 ; }static inline void superio_exit (void ) {outb (0xAA ,REG ); +release_region (REG ,2 ); }#define SUPERIO_REG_ACT 0x30
@@ -531,8 +536,12 @@ static int __init smsc47m1_find(struct smsc47m1_sio_data *sio_data) {u8 val;unsigned short addr; +int err; + + err =superio_enter (); +if (err) +return err; -superio_enter (); val = force_id ? force_id :superio_inb (SUPERIO_REG_DEVID );/*
@@ -608,13 +617,14 @@ static int __init smsc47m1_find(struct smsc47m1_sio_data *sio_data)static void smsc47m1_restore (const struct smsc47m1_sio_data *sio_data) {if ((sio_data->activate &0x01 ) ==0 ) { -superio_enter (); -superio_select (); - -pr_info ("Disabling device\n" ); -superio_outb (SUPERIO_REG_ACT , sio_data->activate); - -superio_exit (); +if (!superio_enter ()) { +superio_select (); +pr_info ("Disabling device\n" ); +superio_outb (SUPERIO_REG_ACT , sio_data->activate); +superio_exit (); + }else { +pr_warn ("Failed to disable device\n" ); + } } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 113/193 hwmon: (smsc47b397) Use request_muxed_region for Super-IO accesses
In reply to Greg Kroah-Hartman[ Upstream commit 8c0826756744c0ac1df600a5e4cca1a341b13101 ]
Super-IO accesses may fail on a system with no or unmapped LPC bus.
Also, other drivers may attempt to access the LPC bus at the same time, resulting in undefined behavior.
Use request_muxed_region() to ensure that IO access on the requested address space is supported, and to ensure that access by multiple drivers is synchronized.
--- drivers/hwmon/smsc47b397.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/hwmon/smsc47b397.c +11 -2
@@ -72,14 +72,19 @@ static inline void superio_select(int ld)superio_outb (0x07 , ld); } -static inline void superio_enter (void ) +static inline int superio_enter (void ) { +if (!request_muxed_region (REG ,2 ,DRVNAME )) +return -EBUSY ; +outb (0x55 ,REG ); +return 0 ; }static inline void superio_exit (void ) {outb (0xAA ,REG ); +release_region (REG ,2 ); }#define SUPERIO_REG_DEVID 0x20
@@ -300,8 +305,12 @@ static int __init smsc47b397_find(void)u8 id, rev;char *name;unsigned short addr; +int err; + + err =superio_enter (); +if (err) +return err; -superio_enter (); id = force_id ? force_id :superio_inb (SUPERIO_REG_DEVID );switch (id) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 114/193 hwmon: (pc87427) Use request_muxed_region for Super-IO accesses
In reply to Greg Kroah-Hartman[ Upstream commit 755a9b0f8aaa5639ba5671ca50080852babb89ce ]
Super-IO accesses may fail on a system with no or unmapped LPC bus.
Also, other drivers may attempt to access the LPC bus at the same time, resulting in undefined behavior.
Use request_muxed_region() to ensure that IO access on the requested address space is supported, and to ensure that access by multiple drivers is synchronized.
--- drivers/hwmon/pc87427.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/hwmon/pc87427.c +13 -1
@@ -106,6 +106,13 @@ static const char *logdev_str[2] = { DRVNAME " FMC", DRVNAME " HMC" };#define LD_IN 1#define LD_TEMP 1 +static inline int superio_enter (int sioaddr) +{ +if (!request_muxed_region (sioaddr,2 ,DRVNAME )) +return -EBUSY ; +return 0 ; +} +static inline void superio_outb (int sioaddr,int reg,int val) {outb (reg, sioaddr);
@@ -122,6 +129,7 @@ static inline void superio_exit(int sioaddr) {outb (0x02 , sioaddr);outb (0x02 , sioaddr +1 ); +release_region (sioaddr,2 ); }/*
@@ -1220,7 +1228,11 @@ static int __init pc87427_find(int sioaddr, struct pc87427_sio_data *sio_data) {u16 val;u8 cfg, cfg_b; -int i, err =0 ; +int i, err; + + err =superio_enter (sioaddr); +if (err) +return err;/* Identify device */ val = force_id ? force_id :superio_inb (sioaddr,SIOREG_DEVID );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 115/193 hwmon: (f71805f) Use request_muxed_region for Super-IO accesses
In reply to Greg Kroah-Hartman[ Upstream commit 73e6ff71a7ea924fb7121d576a2d41e3be3fc6b5 ]
Super-IO accesses may fail on a system with no or unmapped LPC bus.
Unable to handle kernel paging request at virtual address ffffffbffee0002e pgd = ffffffc1d68d4000 [ffffffbffee0002e] *pgd=0000000000000000, *pud=0000000000000000 Internal error: Oops: 94000046 [#1] PREEMPT SMP Modules linked in: f71805f(+) hwmon CPU: 3 PID: 1659 Comm: insmod Not tainted 4.5.0+ #88 Hardware name: linux,dummy-virt (DT) task: ffffffc1f6665400 ti: ffffffc1d6418000 task.ti: ffffffc1d6418000 PC is at f71805f_find+0x6c/0x358 [f71805f]
Also, other drivers may attempt to access the LPC bus at the same time, resulting in undefined behavior.
Use request_muxed_region() to ensure that IO access on the requested address space is supported, and to ensure that access by multiple drivers is synchronized.
--- drivers/hwmon/f71805f.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/hwmon/f71805f.c +12 -3
@@ -96,17 +96,23 @@ superio_select(int base, int ld)outb (ld, base +1 ); } -static inline void +static inline int superio_enter (int base) { +if (!request_muxed_region (base,2 ,DRVNAME )) +return -EBUSY ; +outb (0x87 , base);outb (0x87 , base); + +return 0 ; }static inline void superio_exit (int base) {outb (0xaa , base); +release_region (base,2 ); }/*
@@ -1561,7 +1567,7 @@ static int __init f71805f_device_add(unsigned short address,static int __init f71805f_find (int sioaddr,unsigned short *address,struct f71805f_sio_data *sio_data) { -int err = -ENODEV ; +int err;u16 devid;static const char *const names[] = {
@@ -1569,8 +1575,11 @@ static int __init f71805f_find(int sioaddr, unsigned short *address, "F71872F/FG or F71806F/FG", }; -superio_enter (sioaddr); + err =superio_enter (sioaddr); +if (err) +return err; + err = -ENODEV ; devid =superio_inw (sioaddr,SIO_REG_MANID );if (devid !=SIO_FINTEK_ID ) goto exit;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 116/193 scsi: libsas: Do discovery on empty PHY to update PHY info
In reply to Greg Kroah-Hartman[ Upstream commit d8649fc1c5e40e691d589ed825998c36a947491c ]
When we discover the PHY is empty in sas_rediscover_dev(), the PHY information (like negotiated linkrate) is not updated.
As such, for a user examining sysfs for that PHY, they would see incorrect values:
root@(none)$ cd /sys/class/sas_phy/phy-0:0:20 root@(none)$ more negotiated_linkrate 3.0 Gbit root@(none)$ echo 0 > enable root@(none)$ more negotiated_linkrate 3.0 Gbit
So fix this, simply discover the PHY again, even though we know it's empty; in the above example, this gives us:
root@(none)$ more negotiated_linkrate Phy disabled
We must do this after unregistering the device associated with the PHY (in sas_unregister_devs_sas_addr()).
--- drivers/scsi/libsas/sas_expander.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/scsi/libsas/sas_expander.c +5 -0
@@ -2038,6 +2038,11 @@ static int sas_rediscover_dev(struct domain_device *dev, int phy_id, bool last)if ((SAS_ADDR (sas_addr) ==0 ) || (res == -ECOMM )) { phy->phy_state =PHY_EMPTY ;sas_unregister_devs_sas_addr (dev, phy_id, last); +/* +* Even though the PHY is empty, for convenience we discover +* the PHY to update the PHY info, like negotiated linkrate. +*/ +sas_ex_phy_discover (dev, phy_id);return res; }else if (SAS_ADDR (sas_addr) ==SAS_ADDR (phy->attached_sas_addr) &&dev_type_flutter (type, phy->attached_dev_type)) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 117/193 mmc: core: make pwrseq_emmc (partially) support sleepy GPIO controllers
In reply to Greg Kroah-Hartman[ Upstream commit 002ee28e8b322d4d4b7b83234b5d0f4ebd428eda ]
pwrseq_emmc.c implements a HW reset procedure for eMMC chip by driving a GPIO line.
It registers the .reset() cb on mmc_pwrseq_ops and it registers a system restart notification handler; both of them perform reset by unconditionally calling gpiod_set_value().
If the eMMC reset line is tied to a GPIO controller whose driver can sleep (i.e. I2C GPIO controller), then the kernel would spit warnings when trying to reset the eMMC chip by means of .reset() mmc_pwrseq_ops cb (that is exactly what I'm seeing during boot).
Furthermore, on system reset we would gets to the system restart notification handler with disabled interrupts - local_irq_disable() is called in machine_restart() at least on ARM/ARM64 - and we would be in trouble when the GPIO driver tries to sleep (which indeed doesn't happen here, likely because in my case the machine specific code doesn't call do_kernel_restart(), I guess..).
This patch fixes the .reset() cb to make use of gpiod_set_value_cansleep(), so that the eMMC gets reset on boot without complaints, while, since there isn't that much we can do, we avoid register the restart handler if the GPIO controller has a sleepy driver (and we spit a dev_notice() message to let people know)..
This had been tested on a downstream 4.9 kernel with backported commit 83f37ee7ba33 ("mmc: pwrseq: Add reset callback to the struct mmc_pwrseq_ops") and commit ae60fb031cf2 ("mmc: core: Don't do eMMC HW reset when resuming the eMMC card"), because I couldn't boot my board otherwise. Maybe worth to RFT.
--- drivers/mmc/core/pwrseq_emmc.c | 38 ++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 18 deletions(-)
drivers/mmc/core/pwrseq_emmc.c +20 -18
@@ -30,19 +30,14 @@ struct mmc_pwrseq_emmc {#define to_pwrseq_emmc (p) container_of(p, struct mmc_pwrseq_emmc, pwrseq) -static void __mmc_pwrseq_emmc_reset (struct mmc_pwrseq_emmc *pwrseq) -{ -gpiod_set_value (pwrseq->reset_gpio,1 ); -udelay (1 ); -gpiod_set_value (pwrseq->reset_gpio,0 ); -udelay (200 ); -} -static void mmc_pwrseq_emmc_reset (struct mmc_host *host) {struct mmc_pwrseq_emmc *pwrseq =to_pwrseq_emmc (host->pwrseq); -__mmc_pwrseq_emmc_reset (pwrseq); +gpiod_set_value_cansleep (pwrseq->reset_gpio,1 ); +udelay (1 ); +gpiod_set_value_cansleep (pwrseq->reset_gpio,0 ); +udelay (200 ); } static int mmc_pwrseq_emmc_reset_nb(struct notifier_block *this,
@@ -50,8 +45,11 @@ static int mmc_pwrseq_emmc_reset_nb(struct notifier_block *this, {struct mmc_pwrseq_emmc *pwrseq =container_of (this, struct mmc_pwrseq_emmc, reset_nb); +gpiod_set_value (pwrseq->reset_gpio,1 ); +udelay (1 ); +gpiod_set_value (pwrseq->reset_gpio,0 ); +udelay (200 ); -__mmc_pwrseq_emmc_reset (pwrseq);return NOTIFY_DONE ; }
@@ -72,14 +70,18 @@ static int mmc_pwrseq_emmc_probe(struct platform_device *pdev)if (IS_ERR (pwrseq->reset_gpio))return PTR_ERR (pwrseq->reset_gpio); -/* -* register reset handler to ensure emmc reset also from -* emergency_reboot(), priority 255 is the highest priority -* so it will be executed before any system reboot handler. -*/ - pwrseq->reset_nb.notifier_call = mmc_pwrseq_emmc_reset_nb; - pwrseq->reset_nb.priority =255 ; -register_restart_handler (&pwrseq->reset_nb); +if (!gpiod_cansleep (pwrseq->reset_gpio)) { +/* +* register reset handler to ensure emmc reset also from +* emergency_reboot(), priority 255 is the highest priority +* so it will be executed before any system reboot handler. +*/ + pwrseq->reset_nb.notifier_call = mmc_pwrseq_emmc_reset_nb; + pwrseq->reset_nb.priority =255 ; +register_restart_handler (&pwrseq->reset_nb); + }else { +dev_notice (dev,"EMMC reset pin tied to a sleepy GPIO driver; reset on emergency-reboot disabled\n" ); + } pwrseq->pwrseq.ops = &mmc_pwrseq_emmc_ops; pwrseq->pwrseq.dev = dev;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 118/193 mmc_spi: add a status check for spi_sync_locked
In reply to Greg Kroah-Hartman[ Upstream commit 611025983b7976df0183390a63a2166411d177f1 ]
In case spi_sync_locked fails, the fix reports the error and returns the error code upstream.
--- drivers/mmc/host/mmc_spi.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/mmc/host/mmc_spi.c +4 -0
@@ -819,6 +819,10 @@ mmc_spi_readblock(struct mmc_spi_host *host, struct spi_transfer *t, } status =spi_sync_locked (spi, &host->m); +if (status <0 ) { +dev_dbg (&spi->dev,"read error %d\n" , status); +return status; + }if (host->dma_dev) { dma_sync_single_for_cpu(host->dma_dev,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 119/193 mmc: sdhci-of-esdhc: add erratum eSDHC5 support
In reply to Greg Kroah-Hartman[ Upstream commit a46e42712596b51874f04c73f1cdf1017f88df52 ]
Software writing to the Transfer Type configuration register (system clock domain) can cause a setup/hold violation in the CRC flops (card clock domain), which can cause write accesses to be sent with corrupt CRC values. This issue occurs only for write preceded by read. this erratum is to fix this issue.
--- drivers/mmc/host/sdhci-of-esdhc.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/mmc/host/sdhci-of-esdhc.c +3 -0
@@ -880,6 +880,9 @@ static int sdhci_esdhc_probe(struct platform_device *pdev)if (esdhc->vendor_ver >VENDOR_V_22 ) host->quirks &= ~SDHCI_QUIRK_NO_BUSY_IRQ ; +if (of_find_compatible_node (NULL ,NULL ,"fsl,p2020-esdhc" )) + host->quirks2 |=SDHCI_QUIRK_RESET_AFTER_REQUEST ; + if (of_device_is_compatible(np, "fsl,p5040-esdhc") || of_device_is_compatible(np, "fsl,p5020-esdhc") || of_device_is_compatible(np, "fsl,p4080-esdhc") ||
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 120/193 mmc: sdhci-of-esdhc: add erratum A-009204 support
In reply to Greg Kroah-Hartman[ Upstream commit 5dd195522562542bc6ebe6e7bd47890d8b7ca93c ]
In the event of that any data error (like, IRQSTAT[DCE]) occurs during an eSDHC data transaction where DMA is used for data transfer to/from the system memory, setting the SYSCTL[RSTD] register may cause a system hang. If software sets the register SYSCTL[RSTD] to 1 for error recovery while DMA transferring is not complete, eSDHC may hang the system bus. This happens because the software register SYSCTL[RSTD] resets the DMA engine without waiting for the completion of pending system transactions. This erratum is to fix this issue.
--- drivers/mmc/host/sdhci-of-esdhc.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/mmc/host/sdhci-of-esdhc.c +3 -0
@@ -610,6 +610,9 @@ static void esdhc_reset(struct sdhci_host *host, u8 mask)sdhci_writel (host, host->ier,SDHCI_INT_ENABLE );sdhci_writel (host, host->ier,SDHCI_SIGNAL_ENABLE ); +if (of_find_compatible_node (NULL ,NULL ,"fsl,p2020-esdhc" )) +mdelay (5 ); +if (mask &SDHCI_RESET_ALL ) { val =sdhci_readl (host,ESDHC_TBCTL ); val &= ~ESDHC_TB_EN ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 121/193 mmc: sdhci-of-esdhc: add erratum eSDHC-A001 and A-008358 support
In reply to Greg Kroah-Hartman[ Upstream commit 05cb6b2a66fa7837211a060878e91be5eb10cb07 ]
eSDHC-A001: The data timeout counter (SYSCTL[DTOCV]) is not reliable for DTOCV values 0x4(2^17 SD clock), 0x8(2^21 SD clock), and 0xC(2^25 SD clock). The data timeout counter can count from 2^13–2^27, but for values 2^17, 2^21, and 2^25, the timeout counter counts for only 2^13 SD clocks.
A-008358: The data timeout counter value loaded into the timeout counter is less than expected and can result into early timeout error in case of eSDHC data transactions. The table below shows the expected vs actual timeout period for different values of SYSCTL[DTOCV]:
these two erratum has the same quirk to control it, and set SDHCI_QUIRK_RESET_AFTER_REQUEST to fix above issue.
--- drivers/mmc/host/sdhci-of-esdhc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-of-esdhc.c +3 -1
@@ -883,8 +883,10 @@ static int sdhci_esdhc_probe(struct platform_device *pdev)if (esdhc->vendor_ver >VENDOR_V_22 ) host->quirks &= ~SDHCI_QUIRK_NO_BUSY_IRQ ; -if (of_find_compatible_node (NULL ,NULL ,"fsl,p2020-esdhc" )) +if (of_find_compatible_node (NULL ,NULL ,"fsl,p2020-esdhc" )) { host->quirks2 |=SDHCI_QUIRK_RESET_AFTER_REQUEST ; + host->quirks2 |=SDHCI_QUIRK_BROKEN_TIMEOUT_VAL ; + } if (of_device_is_compatible(np, "fsl,p5040-esdhc") || of_device_is_compatible(np, "fsl,p5020-esdhc") ||
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 122/193 drm/amdgpu: fix old fence check in amdgpu_fence_emit
In reply to Greg Kroah-Hartman[ Upstream commit 3d2aca8c8620346abdba96c6300d2c0b90a1d0cc ]
We don't hold a reference to the old fence, so it can go away any time we are waiting for it to signal.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 24 ++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +17 -7
@@ -135,8 +135,9 @@ int amdgpu_fence_emit(struct amdgpu_ring *ring, struct dma_fence **f) {struct amdgpu_device *adev = ring->adev;struct amdgpu_fence *fence; -struct dma_fence *old, **ptr; +struct dma_fence __rcu **ptr;uint32_t seq; +int r; fence =kmem_cache_alloc (amdgpu_fence_slab,GFP_KERNEL );if (fence ==NULL )
@@ -152,15 +153,24 @@ int amdgpu_fence_emit(struct amdgpu_ring *ring, struct dma_fence **f) seq, AMDGPU_FENCE_FLAG_INT); ptr = &ring->fence_drv.fences[seq & ring->fence_drv.num_fences_mask]; +if (unlikely (rcu_dereference_protected (*ptr,1 ))) { +struct dma_fence *old; + +rcu_read_lock (); + old =dma_fence_get_rcu_safe (ptr); +rcu_read_unlock (); + +if (old) { + r =dma_fence_wait (old, false); +dma_fence_put (old); +if (r) +return r; + } + } +/* This function can't be called concurrently anyway, otherwise * emitting the fence would mess up the hardware ring buffer. */ - old =rcu_dereference_protected (*ptr,1 ); -if (old && !dma_fence_is_signaled (old)) { -DRM_INFO ("rcu slot is busy\n" ); -dma_fence_wait (old, false); - } -rcu_assign_pointer (*ptr,dma_fence_get (&fence->base)); *f = &fence->base;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 123/193 PM / core: Propagate dev->power.wakeup_path when no callbacks
In reply to Greg Kroah-Hartman[ Upstream commit dc351d4c5f4fe4d0f274d6d660227be0c3a03317 ]
The dev->power.direct_complete flag may become set in device_prepare() in case the device don't have any PM callbacks (dev->power.no_pm_callbacks is set). This leads to a broken behaviour, when there is child having wakeup enabled and relies on its parent to be used in the wakeup path.
More precisely, when the direct complete path becomes selected for the child in __device_suspend(), the propagation of the dev->power.wakeup_path becomes skipped as well.
Let's address this problem, by checking if the device is a part the wakeup path or has wakeup enabled, then prevent the direct complete path from being used.
--- drivers/base/power/main.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/base/power/main.c +4 -0
@@ -1485,6 +1485,10 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)if (dev->power.syscore) goto Complete; +/* Avoid direct_complete to let wakeup_path propagate. */ +if (device_may_wakeup (dev) || dev->power.wakeup_path) + dev->power.direct_complete = false; +if (dev->power.direct_complete) {if (pm_runtime_status_suspended (dev)) {pm_runtime_disable (dev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 124/193 clk: rockchip: Fix video codec clocks on rk3288
In reply to Greg Kroah-Hartman[ Upstream commit 00c0cd9e59d265b393553e9afa54fee8b10e8158 ]
It appears that there is a typo in the rk3288 TRM. For GRF_SOC_CON0[7] it says that 0 means "vepu" and 1 means "vdpu". It's the other way around.
How do I know? Here's my evidence:
1. Prior to commit 4d3e84f99628 ("clk: rockchip: describe aclk_vcodec using the new muxgrf type on rk3288") we always pretended that we were using "aclk_vdpu" and the comment in the code said that this matched the default setting in the system. In fact the default setting is 0 according to the TRM and according to reading memory at bootup. In addition rk3288-based Chromebooks ran like this and the video codecs worked.
2. With the existing clock code if you boot up and try to enable the new VIDEO_ROCKCHIP_VPU as a module (and without "clk_ignore_unused" on the command line), you get errors like "failed to get ack on domain 'pd_video', val=0x80208". After flipping vepu/vdpu things init OK.
3. If I export and add both the vepu and vdpu to the list of clocks for RK3288_PD_VIDEO I can get past the power domain errors, but now I freeze when the vpu_mmu gets initted.
4. If I just mark the "vdpu" as IGNORE_UNUSED then everything boots up and probes OK showing that somehow the "vdpu" was important to keep enabled. This is because we were actually using it as a parent.
5. After this change I can hack "aclk_vcodec_pre" to parent from "aclk_vepu" using assigned-clocks and the video codec still probes OK.
6. Rockchip has said so on the mailing list [1].
...so let's fix it.
Let's also add CLK_SET_RATE_PARENT to "aclk_vcodec_pre" as suggested by Jonas Karlman. Prior to the same commit you could do clk_set_rate() on "aclk_vcodec" and it would change "aclk_vdpu". That's because "aclk_vcodec" was a simple gate clock (always gets CLK_SET_RATE_PARENT) and its direct parent was "aclk_vdpu". After that commit "aclk_vcodec_pre" gets in the way so we need to add CLK_SET_RATE_PARENT to it too.
[1] https://lkml.kernel.org/r/[email protected]
--- drivers/clk/rockchip/clk-rk3288.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/rockchip/clk-rk3288.c +2 -2
@@ -198,7 +198,7 @@ PNAME(mux_hsadcout_p) = { "hsadc_src", "ext_hsadc" };PNAME (mux_edp_24m_p) = {"ext_edp_24m" ,"xin24m" };PNAME (mux_tspout_p) = {"cpll" ,"gpll" ,"npll" ,"xin27m" }; -PNAME (mux_aclk_vcodec_pre_p) = {"aclk_vepu" ,"aclk_vdpu" }; +PNAME (mux_aclk_vcodec_pre_p) = {"aclk_vdpu" ,"aclk_vepu" };PNAME (mux_usbphy480m_p) = {"sclk_otgphy1_480m" ,"sclk_otgphy2_480m" ,"sclk_otgphy0_480m" };PNAME (mux_hsicphy480m_p) = {"cpll" ,"gpll" ,"usbphy480m_src" };
@@ -399,7 +399,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {COMPOSITE (0 ,"aclk_vdpu" , mux_pll_src_cpll_gpll_usb480m_p,0 ,RK3288_CLKSEL_CON (32 ),14 ,2 ,MFLAGS ,8 ,5 ,DFLAGS ,RK3288_CLKGATE_CON (3 ),11 ,GFLAGS ), -MUXGRF (0 ,"aclk_vcodec_pre" , mux_aclk_vcodec_pre_p,0 , +MUXGRF (0 ,"aclk_vcodec_pre" , mux_aclk_vcodec_pre_p,CLK_SET_RATE_PARENT ,RK3288_GRF_SOC_CON (0 ),7 ,1 ,MFLAGS ),GATE (ACLK_VCODEC ,"aclk_vcodec" ,"aclk_vcodec_pre" ,0 , RK3288_CLKGATE_CON(9), 0, GFLAGS),
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 125/193 extcon: arizona: Disable mic detect if running when driver is removed
In reply to Greg Kroah-Hartman[ Upstream commit 00053de52231117ddc154042549f2256183ffb86 ]
Microphone detection provides the button detection features on the Arizona CODECs as such it will be running if the jack is currently inserted. If the driver is unbound whilst the jack is still inserted this will cause warnings from the regulator framework as the MICVDD regulator is put but was never disabled.
Correct this by disabling microphone detection on driver removal and if the microphone detection was running disable the regulator and put the runtime reference that was currently held.
--- drivers/extcon/extcon-arizona.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/extcon/extcon-arizona.c +10 -0
@@ -1726,6 +1726,16 @@ static int arizona_extcon_remove(struct platform_device *pdev)struct arizona_extcon_info *info =platform_get_drvdata (pdev);struct arizona *arizona = info->arizona;int jack_irq_rise, jack_irq_fall; +bool change; + +regmap_update_bits_check (arizona->regmap,ARIZONA_MIC_DETECT_1 , +ARIZONA_MICD_ENA ,0 , + &change); + +if (change) { +regulator_disable (info->micvdd); +pm_runtime_put (info->dev); + }gpiod_put (info->micd_pol_gpio);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 126/193 clk: rockchip: Make rkpwm a critical clock on rk3288
In reply to Greg Kroah-Hartman[ Upstream commit dfe7fb21cd9e730230d55a79bc72cf2ece67cdd5 ]
Most rk3288-based boards are derived from the EVB and thus use a PWM regulator for the logic rail. However, most rk3288-based boards don't specify the PWM regulator in their device tree. We'll deal with that by making it critical.
NOTE: it's important to make it critical and not just IGNORE_UNUSED because all PWMs in the system share the same clock. We don't want another PWM user to turn the clock on and off and kill the logic rail.
This change is in preparation for actually having the PWMs in the rk3288 device tree actually point to the proper PWM clock. Up until now they've all pointed to the clock for the old IP block and they've all worked due to the fact that rkpwm was IGNORE_UNUSED and that the clock rates for both clocks were the same.
--- drivers/clk/rockchip/clk-rk3288.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/clk/rockchip/clk-rk3288.c +3 -1
@@ -676,7 +676,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {GATE (PCLK_TZPC ,"pclk_tzpc" ,"pclk_cpu" ,0 ,RK3288_CLKGATE_CON (11 ),3 ,GFLAGS ),GATE (PCLK_UART2 ,"pclk_uart2" ,"pclk_cpu" ,0 ,RK3288_CLKGATE_CON (11 ),9 ,GFLAGS ),GATE (PCLK_EFUSE256 ,"pclk_efuse_256" ,"pclk_cpu" ,0 ,RK3288_CLKGATE_CON (11 ),10 ,GFLAGS ), -GATE (PCLK_RKPWM ,"pclk_rkpwm" ,"pclk_cpu" ,CLK_IGNORE_UNUSED ,RK3288_CLKGATE_CON (11 ),11 ,GFLAGS ), +GATE (PCLK_RKPWM ,"pclk_rkpwm" ,"pclk_cpu" ,0 ,RK3288_CLKGATE_CON (11 ),11 ,GFLAGS ),/* ddrctrl [DDR Controller PHY clock] gates */ GATE(0, "nclk_ddrupctl0", "ddrphy", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(11), 4, GFLAGS),
@@ -817,6 +817,8 @@ static const char *const rk3288_critical_clocks[] __initconst = {"pclk_pd_pmu" ,"pclk_pmu_niu" ,"pmu_hclk_otg0" , +/* pwm-regulators on some boards, so handoff-critical later */ + "pclk_rkpwm", };static void __iomem *rk3288_cru_base;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 127/193 s390: zcrypt: initialize variables before_use
In reply to Greg Kroah-Hartman[ Upstream commit 913140e221567b3ecd21b4242257a7e3fa279026 ]
The 'func_code' variable gets printed in debug statements without a prior initialization in multiple functions, as reported when building with clang:
drivers/s390/crypto/zcrypt_api.c:659:6: warning: variable 'func_code' is used uninitialized whenever 'if' condition is true
[-Wsometimes-uninitialized]
if (mex->outputdatalength < mex->inputdatalength) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/s390/crypto/zcrypt_api.c:725:29: note: uninitialized use occurs here
trace_s390_zcrypt_rep(mex, func_code, rc,
^~~~~~~~~
drivers/s390/crypto/zcrypt_api.c:659:2: note: remove the 'if' if its condition is always false
if (mex->outputdatalength < mex->inputdatalength) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/s390/crypto/zcrypt_api.c:654:24: note: initialize the variable 'func_code' to silence this warning
unsigned int func_code;
^Add initializations to all affected code paths to shut up the warning and make the warning output consistent.
--- drivers/s390/crypto/zcrypt_api.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/s390/crypto/zcrypt_api.c +4 -0
@@ -237,6 +237,7 @@ static long zcrypt_rsa_modexpo(struct ica_rsa_modexpo *mex)trace_s390_zcrypt_req (mex,TP_ICARSAMODEXPO );if (mex->outputdatalength < mex->inputdatalength) { + func_code =0 ; rc = -EINVAL ; goto out; }
@@ -311,6 +312,7 @@ static long zcrypt_rsa_crt(struct ica_rsa_modexpo_crt *crt)trace_s390_zcrypt_req (crt,TP_ICARSACRT );if (crt->outputdatalength < crt->inputdatalength) { + func_code =0 ; rc = -EINVAL ; goto out; }
@@ -492,6 +494,7 @@ static long zcrypt_send_ep11_cprb(struct ep11_urb *xcrb) targets =kcalloc (target_num,sizeof (*targets),GFP_KERNEL );if (!targets) { + func_code =0 ; rc = -ENOMEM ; goto out; }
@@ -499,6 +502,7 @@ static long zcrypt_send_ep11_cprb(struct ep11_urb *xcrb) uptr = (struct ep11_target_dev __force __user *) xcrb->targets;if (copy_from_user (targets, uptr, target_num *sizeof (*targets))) { + func_code =0 ; rc = -EFAULT ; goto out; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 128/193 x86/microcode: Fix the ancient deprecated microcode loading method
In reply to Greg Kroah-Hartman[ Upstream commit 24613a04ad1c0588c10f4b5403ca60a73d164051 ]
Commit
2613f36ed965 ("x86/microcode: Attempt late loading only when new microcode is present")
added the new define UCODE_NEW to denote that an update should happen only when newer microcode (than installed on the system) has been found.
But it missed adjusting that for the old /dev/cpu/microcode loading interface. Fix it.
--- arch/x86/kernel/cpu/microcode/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/kernel/cpu/microcode/core.c +2 -1
@@ -418,8 +418,9 @@ static int do_microcode_update(const void __user *buf, size_t size)if (ustate ==UCODE_ERROR ) { error =-1 ;break ; - }else if (ustate ==UCODE_OK ) + }else if (ustate ==UCODE_NEW ) {apply_microcode_on_target (cpu); + } }return error;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 129/193 s390: cio: fix cio_irb declaration
In reply to Greg Kroah-Hartman[ Upstream commit e91012ee855ad9f5ef2ab106a3de51db93fe4d0c ]
clang points out that the declaration of cio_irb does not match the definition exactly, it is missing the alignment attribute:
../drivers/s390/cio/cio.c:50:1: warning: section does not match previous declaration [-Wsection] DEFINE_PER_CPU_ALIGNED(struct irb, cio_irb);
^../include/linux/percpu-defs.h:150:2: note: expanded from macro 'DEFINE_PER_CPU_ALIGNED'
DEFINE_PER_CPU_SECTION(type, name, PER_CPU_ALIGNED_SECTION) \
^
../include/linux/percpu-defs.h:93:9: note: expanded from macro 'DEFINE_PER_CPU_SECTION'
extern __PCPU_ATTRS(sec) __typeof__(type) name; \
^
../include/linux/percpu-defs.h:49:26: note: expanded from macro '__PCPU_ATTRS'
__percpu __attribute__((section(PER_CPU_BASE_SECTION sec))) \
^../drivers/s390/cio/cio.h:118:1: note: previous attribute is here DECLARE_PER_CPU(struct irb, cio_irb);
^../include/linux/percpu-defs.h:111:2: note: expanded from macro 'DECLARE_PER_CPU'
DECLARE_PER_CPU_SECTION(type, name, "")
^../include/linux/percpu-defs.h:87:9: note: expanded from macro 'DECLARE_PER_CPU_SECTION'
extern __PCPU_ATTRS(sec) __typeof__(type) name
^../include/linux/percpu-defs.h:49:26: note: expanded from macro '__PCPU_ATTRS'
__percpu __attribute__((section(PER_CPU_BASE_SECTION sec))) \
^Use DECLARE_PER_CPU_ALIGNED() here, to make the two match.
--- drivers/s390/cio/cio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/cio/cio.h +1 -1
@@ -115,7 +115,7 @@ struct subchannel {struct schib_config config; } __attribute__ ((aligned(8))); -DECLARE_PER_CPU(struct irb, cio_irb); +DECLARE_PER_CPU_ALIGNED(struct irb, cio_irb);#define to_subchannel (n) container_of(n, struct subchannel, dev)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 130/193 cpufreq: ppc_cbe: fix possible object reference leak
In reply to Greg Kroah-Hartman[ Upstream commit 233298032803f2802fe99892d0de4ab653bfece4 ]
The call to of_get_cpu_node returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
./drivers/cpufreq/ppc_cbe_cpufreq.c:89:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 76, but without a corresponding object release within this function. ./drivers/cpufreq/ppc_cbe_cpufreq.c:89:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 76, but without a corresponding object release within this function.
--- drivers/cpufreq/ppc_cbe_cpufreq.c | 1 + 1 file changed, 1 insertion(+)
drivers/cpufreq/ppc_cbe_cpufreq.c +1 -0
@@ -86,6 +86,7 @@ static int cbe_cpufreq_cpu_init(struct cpufreq_policy *policy)if (!cbe_get_cpu_pmd_regs (policy->cpu) || !cbe_get_cpu_mic_tm_regs (policy->cpu)) {pr_info ("invalid CBE regs pointers for cpufreq\n" ); +of_node_put (cpu);return -EINVAL ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 131/193 cpufreq/pasemi: fix possible object reference leak
In reply to Greg Kroah-Hartman[ Upstream commit a9acc26b75f652f697e02a9febe2ab0da648a571 ]
The call to of_get_cpu_node returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
./drivers/cpufreq/pasemi-cpufreq.c:212:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 147, but without a corresponding object release within this function. ./drivers/cpufreq/pasemi-cpufreq.c:220:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 147, but without a corresponding object release within this function.
--- drivers/cpufreq/pasemi-cpufreq.c | 1 + 1 file changed, 1 insertion(+)
drivers/cpufreq/pasemi-cpufreq.c +1 -0
@@ -146,6 +146,7 @@ static int pas_cpufreq_cpu_init(struct cpufreq_policy *policy) cpu =of_get_cpu_node (policy->cpu,NULL ); +of_node_put (cpu);if (!cpu) goto out;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 132/193 cpufreq: pmac32: fix possible object reference leak
In reply to Greg Kroah-Hartman[ Upstream commit 8d10dc28a9ea6e8c02e825dab28699f3c72b02d9 ]
The call to of_find_node_by_name returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
./drivers/cpufreq/pmac32-cpufreq.c:557:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 552, but without a corresponding object release within this function. ./drivers/cpufreq/pmac32-cpufreq.c:569:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 552, but without a corresponding object release within this function. ./drivers/cpufreq/pmac32-cpufreq.c:598:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 587, but without a corresponding object release within this function.
--- drivers/cpufreq/pmac32-cpufreq.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/cpufreq/pmac32-cpufreq.c +2 -0
@@ -552,6 +552,7 @@ static int pmac_cpufreq_init_7447A(struct device_node *cpunode) volt_gpio_np =of_find_node_by_name (NULL ,"cpu-vcore-select" );if (volt_gpio_np) voltage_gpio =read_gpio (volt_gpio_np); +of_node_put (volt_gpio_np);if (!voltage_gpio){pr_err ("missing cpu-vcore-select gpio\n" );return 1 ;
@@ -588,6 +589,7 @@ static int pmac_cpufreq_init_750FX(struct device_node *cpunode)if (volt_gpio_np) voltage_gpio =read_gpio (volt_gpio_np); +of_node_put (volt_gpio_np); pvr =mfspr (SPRN_PVR ); has_cpu_l2lve = !((pvr &0xf00 ) ==0x100 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 133/193 cpufreq: kirkwood: fix possible object reference leak
In reply to Greg Kroah-Hartman[ Upstream commit 7c468966f05ac9c17bb5948275283d34e6fe0660 ]
The call to of_get_child_by_name returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
./drivers/cpufreq/kirkwood-cpufreq.c:127:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 118, but without a corresponding object release within this function. ./drivers/cpufreq/kirkwood-cpufreq.c:133:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 118, but without a corresponding object release within this function.
and also do some cleanup:
- of_node_put(np);
- np = NULL;
...of_node_put(np);
--- drivers/cpufreq/kirkwood-cpufreq.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
drivers/cpufreq/kirkwood-cpufreq.c +11 -8
@@ -124,13 +124,14 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev) priv.cpu_clk =of_clk_get_by_name (np,"cpu_clk" );if (IS_ERR (priv.cpu_clk)) {dev_err (priv.dev,"Unable to get cpuclk\n" ); -return PTR_ERR (priv.cpu_clk); + err =PTR_ERR (priv.cpu_clk); + goto out_node; } err =clk_prepare_enable (priv.cpu_clk);if (err) {dev_err (priv.dev,"Unable to prepare cpuclk\n" ); -return err; + goto out_node; } kirkwood_freq_table[0 ].frequency =clk_get_rate (priv.cpu_clk) /1000 ;
@@ -161,20 +162,22 @@ static int kirkwood_cpufreq_probe(struct platform_device *pdev) goto out_ddr; } -of_node_put (np); - np =NULL ; - err =cpufreq_register_driver (&kirkwood_cpufreq_driver); -if (!err) -return 0 ; +if (err) { +dev_err (priv.dev,"Failed to register cpufreq driver\n" ); + goto out_powersave; + } -dev_err (priv.dev,"Failed to register cpufreq driver\n" ); +of_node_put (np); +return 0 ; +out_powersave:clk_disable_unprepare (priv.powersave_clk); out_ddr:clk_disable_unprepare (priv.ddr_clk); out_cpu:clk_disable_unprepare (priv.cpu_clk); +out_node:of_node_put (np);return err;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 134/193 block: sed-opal: fix IOC_OPAL_ENABLE_DISABLE_MBR
In reply to Greg Kroah-Hartman[ Upstream commit 78bf47353b0041865564deeed257a54f047c2fdc ]
The implementation of IOC_OPAL_ENABLE_DISABLE_MBR handled the value opal_mbr_data.enable_disable incorrectly: enable_disable is expected to be one of OPAL_MBR_ENABLE(0) or OPAL_MBR_DISABLE(1). enable_disable was passed directly to set_mbr_done and set_mbr_enable_disable where is was interpreted as either OPAL_TRUE(1) or OPAL_FALSE(0). The end result was that calling IOC_OPAL_ENABLE_DISABLE_MBR with OPAL_MBR_ENABLE actually disabled the shadow MBR and vice versa.
This patch adds correct conversion from OPAL_MBR_DISABLE/ENABLE to OPAL_FALSE/TRUE. The change affects existing programs using IOC_OPAL_ENABLE_DISABLE_MBR but this is typically used only once when setting up an Opal drive.
--- block/sed-opal.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
block/sed-opal.c +6 -3
@@ -2078,13 +2078,16 @@ static int opal_erase_locking_range(struct opal_dev *dev,static int opal_enable_disable_shadow_mbr (struct opal_dev *dev,struct opal_mbr_data *opal_mbr) { +u8 enable_disable = opal_mbr->enable_disable ==OPAL_MBR_ENABLE ? +OPAL_TRUE :OPAL_FALSE ; +const struct opal_step mbr_steps[] = { { opal_discovery0, }, { start_admin1LSP_opal_session, &opal_mbr->key }, - { set_mbr_done, &opal_mbr->enable_disable }, + { set_mbr_done, &enable_disable }, { end_opal_session, }, { start_admin1LSP_opal_session, &opal_mbr->key }, - { set_mbr_enable_disable, &opal_mbr->enable_disable }, + { set_mbr_enable_disable, &enable_disable }, { end_opal_session, }, {NULL , } };
@@ -2204,7 +2207,7 @@ static int __opal_lock_unlock(struct opal_dev *dev,static int __opal_set_mbr_done (struct opal_dev *dev,struct opal_key *key) { -u8 mbr_done_tf =1 ; +u8 mbr_done_tf =OPAL_TRUE ;const struct opal_step mbrdone_step [] = { { opal_discovery0, }, { start_admin1LSP_opal_session, key },
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 135/193 x86/build: Keep local relocations with ld.lld
In reply to Greg Kroah-Hartman[ Upstream commit 7c21383f3429dd70da39c0c7f1efa12377a47ab6 ]
The LLVM linker (ld.lld) defaults to removing local relocations, which causes KASLR boot failures. ld.bfd and ld.gold already handle this correctly. This adds the explicit instruction "--discard-none" during the link phase. There is no change in output for ld.bfd and ld.gold, but ld.lld now produces an image with all the needed relocations.
--- arch/x86/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/Makefile +1 -1
@@ -48,7 +48,7 @@ export REALMODE_CFLAGS export BITS ifdef CONFIG_X86_NEED_RELOCS - LDFLAGS_vmlinux := --emit-relocs + LDFLAGS_vmlinux := --emit-relocs --discard-none endif #
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 136/193 iio: ad_sigma_delta: Properly handle SPI bus locking vs CS assertion
In reply to Greg Kroah-Hartman[ Upstream commit df1d80aee963480c5c2938c64ec0ac3e4a0df2e0 ]
For devices from the SigmaDelta family we need to keep CS low when doing a conversion, since the device will use the MISO line as a interrupt to indicate that the conversion is complete.
This is why the driver locks the SPI bus and when the SPI bus is locked keeps as long as a conversion is going on. The current implementation gets one small detail wrong though. CS is only de-asserted after the SPI bus is unlocked. This means it is possible for a different SPI device on the same bus to send a message which would be wrongfully be addressed to the SigmaDelta device as well. Make sure that the last SPI transfer that is done while holding the SPI bus lock de-asserts the CS signal.
--- drivers/iio/adc/ad_sigma_delta.c | 16 +++++++++++----- include/linux/iio/adc/ad_sigma_delta.h | 1 + 2 files changed, 12 insertions(+), 5 deletions(-)
drivers/iio/adc/ad_sigma_delta.c +11 -5
@@ -62,7 +62,7 @@ int ad_sd_write_reg(struct ad_sigma_delta *sigma_delta, unsigned int reg,struct spi_transfer t = { .tx_buf = data, .len = size +1 , - .cs_change = sigma_delta->bus_locked, + .cs_change = sigma_delta->keep_cs_asserted, };struct spi_message m;int ret;
@@ -217,6 +217,7 @@ static int ad_sd_calibrate(struct ad_sigma_delta *sigma_delta,spi_bus_lock (sigma_delta->spi->master); sigma_delta->bus_locked = true; + sigma_delta->keep_cs_asserted = true;reinit_completion (&sigma_delta->completion); ret =ad_sigma_delta_set_mode (sigma_delta, mode);
@@ -234,9 +235,10 @@ static int ad_sd_calibrate(struct ad_sigma_delta *sigma_delta, ret =0 ; } out: + sigma_delta->keep_cs_asserted = false; +ad_sigma_delta_set_mode (sigma_delta,AD_SD_MODE_IDLE ); sigma_delta->bus_locked = false;spi_bus_unlock (sigma_delta->spi->master); -ad_sigma_delta_set_mode (sigma_delta,AD_SD_MODE_IDLE );return ret; }
@@ -288,6 +290,7 @@ int ad_sigma_delta_single_conversion(struct iio_dev *indio_dev,spi_bus_lock (sigma_delta->spi->master); sigma_delta->bus_locked = true; + sigma_delta->keep_cs_asserted = true;reinit_completion (&sigma_delta->completion);ad_sigma_delta_set_mode (sigma_delta,AD_SD_MODE_SINGLE );
@@ -297,9 +300,6 @@ int ad_sigma_delta_single_conversion(struct iio_dev *indio_dev, ret =wait_for_completion_interruptible_timeout ( &sigma_delta->completion,HZ ); - sigma_delta->bus_locked = false; -spi_bus_unlock (sigma_delta->spi->master); -if (ret ==0 ) ret = -EIO ;if (ret <0 )
@@ -315,7 +315,10 @@ int ad_sigma_delta_single_conversion(struct iio_dev *indio_dev, sigma_delta->irq_dis = true; } + sigma_delta->keep_cs_asserted = false;ad_sigma_delta_set_mode (sigma_delta,AD_SD_MODE_IDLE ); + sigma_delta->bus_locked = false; +spi_bus_unlock (sigma_delta->spi->master);mutex_unlock (&indio_dev->mlock);if (ret)
@@ -352,6 +355,8 @@ static int ad_sd_buffer_postenable(struct iio_dev *indio_dev)spi_bus_lock (sigma_delta->spi->master); sigma_delta->bus_locked = true; + sigma_delta->keep_cs_asserted = true; + ret =ad_sigma_delta_set_mode (sigma_delta,AD_SD_MODE_CONTINUOUS );if (ret) goto err_unlock;
@@ -380,6 +385,7 @@ static int ad_sd_buffer_postdisable(struct iio_dev *indio_dev) sigma_delta->irq_dis = true; } + sigma_delta->keep_cs_asserted = false;ad_sigma_delta_set_mode (sigma_delta,AD_SD_MODE_IDLE ); sigma_delta->bus_locked = false;
include/linux/iio/adc/ad_sigma_delta.h +1 -0
@@ -66,6 +66,7 @@ struct ad_sigma_delta {bool irq_dis;bool bus_locked; +bool keep_cs_asserted;uint8_t comm;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 137/193 iio: hmc5843: fix potential NULL pointer dereferences
In reply to Greg Kroah-Hartman[ Upstream commit 536cc27deade8f1ec3c1beefa60d5fbe0f6fcb28 ]
devm_regmap_init_i2c may fail and return NULL. The fix returns the error when it fails.
--- drivers/iio/magnetometer/hmc5843_i2c.c | 7 ++++++- drivers/iio/magnetometer/hmc5843_spi.c | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-)
drivers/iio/magnetometer/hmc5843_i2c.c +6 -1
@@ -58,8 +58,13 @@ static const struct regmap_config hmc5843_i2c_regmap_config = {static int hmc5843_i2c_probe (struct i2c_client *cli,const struct i2c_device_id *id) { +struct regmap *regmap =devm_regmap_init_i2c (cli, + &hmc5843_i2c_regmap_config); +if (IS_ERR (regmap)) +return PTR_ERR (regmap); +return hmc5843_common_probe (&cli->dev, -devm_regmap_init_i2c (cli, &hmc5843_i2c_regmap_config), + regmap, id->driver_data, id->name); }
drivers/iio/magnetometer/hmc5843_spi.c +6 -1
@@ -58,6 +58,7 @@ static const struct regmap_config hmc5843_spi_regmap_config = {static int hmc5843_spi_probe (struct spi_device *spi) {int ret; +struct regmap *regmap;const struct spi_device_id *id =spi_get_device_id (spi); spi->mode =SPI_MODE_3 ;
@@ -67,8 +68,12 @@ static int hmc5843_spi_probe(struct spi_device *spi)if (ret)return ret; + regmap =devm_regmap_init_spi (spi, &hmc5843_spi_regmap_config); +if (IS_ERR (regmap)) +return PTR_ERR (regmap); +return hmc5843_common_probe (&spi->dev, -devm_regmap_init_spi (spi, &hmc5843_spi_regmap_config), + regmap, id->driver_data, id->name); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 138/193 iio: common: ssp_sensors: Initialize calculated_time in ssp_common_process_data
In reply to Greg Kroah-Hartman[ Upstream commit 6f9ca1d3eb74b81f811a87002de2d51640d135b1 ]
When building with -Wsometimes-uninitialized, Clang warns:
drivers/iio/common/ssp_sensors/ssp_iio.c:95:6: warning: variable 'calculated_time' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]
While it isn't wrong, this will never be a problem because iio_push_to_buffers_with_timestamp only uses calculated_time on the same condition that it is assigned (when scan_timestamp is not zero). While iio_push_to_buffers_with_timestamp is marked as inline, Clang does inlining in the optimization stage, which happens after the semantic analysis phase (plus inline is merely a hint to the compiler).
Fix this by just zero initializing calculated_time.
--- drivers/iio/common/ssp_sensors/ssp_iio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/common/ssp_sensors/ssp_iio.c +1 -1
@@ -81,7 +81,7 @@ int ssp_common_process_data(struct iio_dev *indio_dev, void *buf, unsigned int len, int64_t timestamp) {__le32 time; -int64_t calculated_time; +int64_t calculated_time =0 ;struct ssp_sensor_data *spd =iio_priv (indio_dev);if (indio_dev->scan_bytes ==0 )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 139/193 rtlwifi: fix a potential NULL pointer dereference
In reply to Greg Kroah-Hartman[ Upstream commit 765976285a8c8db3f0eb7f033829a899d0c2786e ]
In case alloc_workqueue fails, the fix reports the error and returns to avoid NULL pointer dereference.
--- drivers/net/wireless/realtek/rtlwifi/base.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wireless/realtek/rtlwifi/base.c +5 -0
@@ -468,6 +468,11 @@ static void _rtl_init_deferred_work(struct ieee80211_hw *hw)/* <2> work queue */ rtlpriv->works.hw = hw; rtlpriv->works.rtl_wq =alloc_workqueue ("%s" ,0 ,0 , rtlpriv->cfg->name); +if (unlikely (!rtlpriv->works.rtl_wq)) { +pr_err ("Failed to allocate work queue\n" ); +return ; + } +INIT_DELAYED_WORK (&rtlpriv->works.watchdog_wq, (void *)rtl_watchdog_wq_callback); INIT_DELAYED_WORK(&rtlpriv->works.ips_nic_off_wq,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 140/193 mwifiex: Fix mem leak in mwifiex_tm_cmd
In reply to Greg Kroah-Hartman[ Upstream commit 003b686ace820ce2d635a83f10f2d7f9c147dabc ]
'hostcmd' is alloced by kzalloc, should be freed before leaving from the error handling cases, otherwise it will cause mem leak.
--- drivers/net/wireless/marvell/mwifiex/cfg80211.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/wireless/marvell/mwifiex/cfg80211.c +5 -1
@@ -4024,16 +4024,20 @@ static int mwifiex_tm_cmd(struct wiphy *wiphy, struct wireless_dev *wdev,if (mwifiex_send_cmd (priv,0 ,0 ,0 , hostcmd, true)) {dev_err (priv->adapter->dev,"Failed to process hostcmd\n" ); +kfree (hostcmd);return -EFAULT ; }/* process hostcmd response*/ skb =cfg80211_testmode_alloc_reply_skb (wiphy, hostcmd->len); -if (!skb) +if (!skb) { +kfree (hostcmd);return -ENOMEM ; + } err =nla_put (skb,MWIFIEX_TM_ATTR_DATA , hostcmd->len, hostcmd->cmd);if (err) { +kfree (hostcmd);kfree_skb (skb);return -EMSGSIZE ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 141/193 brcmfmac: fix missing checks for kmemdup
In reply to Greg Kroah-Hartman[ Upstream commit 46953f97224d56a12ccbe9c6acaa84ca0dab2780 ]
In case kmemdup fails, the fix sets conn_info->req_ie_len and conn_info->resp_ie_len to zero to avoid buffer overflows.
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +4 -0
@@ -5467,6 +5467,8 @@ static s32 brcmf_get_assoc_ies(struct brcmf_cfg80211_info *cfg, conn_info->req_ie =kmemdup (cfg->extra_buf, conn_info->req_ie_len,GFP_KERNEL ); +if (!conn_info->req_ie) + conn_info->req_ie_len =0 ; }else { conn_info->req_ie_len =0 ; conn_info->req_ie =NULL ;
@@ -5483,6 +5485,8 @@ static s32 brcmf_get_assoc_ies(struct brcmf_cfg80211_info *cfg, conn_info->resp_ie =kmemdup (cfg->extra_buf, conn_info->resp_ie_len,GFP_KERNEL ); +if (!conn_info->resp_ie) + conn_info->resp_ie_len =0 ; }else { conn_info->resp_ie_len =0 ; conn_info->resp_ie =NULL ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 142/193 b43: shut up clang -Wuninitialized variable warning
In reply to Greg Kroah-Hartman[ Upstream commit d825db346270dbceef83b7b750dbc29f1d7dcc0e ]
Clang warns about what is clearly a case of passing an uninitalized variable into a static function:
drivers/net/wireless/broadcom/b43/phy_lp.c:1852:23: error: variable 'gains' is uninitialized when used here
[-Werror,-Wuninitialized]
lpphy_papd_cal(dev, gains, 0, 1, 30);
^~~~~
drivers/net/wireless/broadcom/b43/phy_lp.c:1838:2: note: variable 'gains' is declared here
struct lpphy_tx_gains gains, oldgains;
^1 error generated.
However, this function is empty, and its arguments are never evaluated, so gcc in contrast does not warn here. Both compilers behave in a reasonable way as far as I can tell, so we should change the code to avoid the warning everywhere.
We could just eliminate the lpphy_papd_cal() function entirely, given that it has had the TODO comment in it for 10 years now and is rather unlikely to ever get done. I'm doing a simpler change here, and just pass the 'oldgains' variable in that has been initialized, based on the guess that this is what was originally meant.
--- drivers/net/wireless/broadcom/b43/phy_lp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/broadcom/b43/phy_lp.c +3 -3
@@ -1834,7 +1834,7 @@ static void lpphy_papd_cal(struct b43_wldev *dev, struct lpphy_tx_gains gains,static void lpphy_papd_cal_txpwr (struct b43_wldev *dev) {struct b43_phy_lp *lpphy = dev->phy.lp; -struct lpphy_tx_gains gains, oldgains; +struct lpphy_tx_gains oldgains;int old_txpctl, old_afe_ovr, old_rf, old_bbmult;lpphy_read_tx_pctl_mode_from_hardware (dev);
@@ -1848,9 +1848,9 @@ static void lpphy_papd_cal_txpwr(struct b43_wldev *dev)lpphy_set_tx_power_control (dev,B43_LPPHY_TXPCTL_OFF );if (dev->dev->chip_id ==0x4325 && dev->dev->chip_rev ==0 ) -lpphy_papd_cal (dev, gains,0 ,1 ,30 ); +lpphy_papd_cal (dev, oldgains,0 ,1 ,30 );else -lpphy_papd_cal (dev, gains,0 ,1 ,65 ); +lpphy_papd_cal (dev, oldgains,0 ,1 ,65 );if (old_afe_ovr)lpphy_set_tx_gains (dev, oldgains);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 143/193 brcmfmac: convert dev_init_lock mutex to completion
In reply to Greg Kroah-Hartman[ Upstream commit a9fd0953fa4a62887306be28641b4b0809f3b2fd ]
Leaving dev_init_lock mutex locked in probe causes BUG and a WARNING when kernel is compiled with CONFIG_PROVE_LOCKING. Convert mutex to completion which silences those warnings and improves code readability.
Fix below errors when connecting the USB WiFi dongle:
brcmfmac: brcmf_fw_alloc_request: using brcm/brcmfmac43143 for chip BCM43143/2
BUG: workqueue leaked lock or atomic: kworker/0:2/0x00000000/434
last function: hub_event
1 lock held by kworker/0:2/434:
#0: 18d5dcdf (&devinfo->dev_init_lock){+.+.}, at: brcmf_usb_probe+0x78/0x550 [brcmfmac]
CPU: 0 PID: 434 Comm: kworker/0:2 Not tainted 4.19.23-00084-g454a789-dirty #123
Hardware name: Freescale i.MX6 Quad/DualLite (Device Tree)
Workqueue: usb_hub_wq hub_event
[<8011237c>] (unwind_backtrace) from [<8010d74c>] (show_stack+0x10/0x14)
[<8010d74c>] (show_stack) from [<809c4324>] (dump_stack+0xa8/0xd4)
[<809c4324>] (dump_stack) from [<8014195c>] (process_one_work+0x710/0x808)
[<8014195c>] (process_one_work) from [<80141a80>] (worker_thread+0x2c/0x564)
[<80141a80>] (worker_thread) from [<80147bcc>] (kthread+0x13c/0x16c)
[<80147bcc>] (kthread) from [<801010b4>] (ret_from_fork+0x14/0x20)
Exception stack(0xed1d9fb0 to 0xed1d9ff8)9fa0: 00000000 00000000 00000000 00000000
9fc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 9fe0: 00000000 00000000 00000000 00000000 00000013 00000000
======================================================
WARNING: possible circular locking dependency detected 4.19.23-00084-g454a789-dirty #123 Not tainted
------------------------------------------------------
kworker/0:2/434 is trying to acquire lock:e29cf799 ((wq_completion)"events"){+.+.}, at: process_one_work+0x174/0x808
but task is already holding lock:18d5dcdf (&devinfo->dev_init_lock){+.+.}, at: brcmf_usb_probe+0x78/0x550 [brcmfmac]
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #2 (&devinfo->dev_init_lock){+.+.}:
mutex_lock_nested+0x1c/0x24
brcmf_usb_probe+0x78/0x550 [brcmfmac]
usb_probe_interface+0xc0/0x1bc
really_probe+0x228/0x2c0
__driver_attach+0xe4/0xe8
bus_for_each_dev+0x68/0xb4
bus_add_driver+0x19c/0x214
driver_register+0x78/0x110
usb_register_driver+0x84/0x148
process_one_work+0x228/0x808
worker_thread+0x2c/0x564
kthread+0x13c/0x16c
ret_from_fork+0x14/0x20
(null)-> #1 (brcmf_driver_work){+.+.}:
worker_thread+0x2c/0x564
kthread+0x13c/0x16c
ret_from_fork+0x14/0x20
(null)-> #0 ((wq_completion)"events"){+.+.}:
process_one_work+0x1b8/0x808
worker_thread+0x2c/0x564
kthread+0x13c/0x16c
ret_from_fork+0x14/0x20
(null)other info that might help us debug this:
Chain exists of: (wq_completion)"events" --> brcmf_driver_work --> &devinfo->dev_init_lock Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&devinfo->dev_init_lock);
lock(brcmf_driver_work);
lock(&devinfo->dev_init_lock);lock((wq_completion)"events");
*** DEADLOCK ***
1 lock held by kworker/0:2/434:
#0: 18d5dcdf (&devinfo->dev_init_lock){+.+.}, at: brcmf_usb_probe+0x78/0x550 [brcmfmac]
stack backtrace: CPU: 0 PID: 434 Comm: kworker/0:2 Not tainted 4.19.23-00084-g454a789-dirty #123 Hardware name: Freescale i.MX6 Quad/DualLite (Device Tree) Workqueue: events request_firmware_work_func [<8011237c>] (unwind_backtrace) from [<8010d74c>] (show_stack+0x10/0x14) [<8010d74c>] (show_stack) from [<809c4324>] (dump_stack+0xa8/0xd4) [<809c4324>] (dump_stack) from [<80172838>] (print_circular_bug+0x210/0x330) [<80172838>] (print_circular_bug) from [<80175940>] (__lock_acquire+0x160c/0x1a30) [<80175940>] (__lock_acquire) from [<8017671c>] (lock_acquire+0xe0/0x268) [<8017671c>] (lock_acquire) from [<80141404>] (process_one_work+0x1b8/0x808) [<80141404>] (process_one_work) from [<80141a80>] (worker_thread+0x2c/0x564) [<80141a80>] (worker_thread) from [<80147bcc>] (kthread+0x13c/0x16c) [<80147bcc>] (kthread) from [<801010b4>] (ret_from_fork+0x14/0x20) Exception stack(0xed1d9fb0 to 0xed1d9ff8)
9fa0: 00000000 00000000 00000000 00000000
9fc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 9fe0: 00000000 00000000 00000000 00000000 00000013 00000000
--- .../wireless/broadcom/brcm80211/brcmfmac/usb.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c +8 -9
@@ -160,7 +160,7 @@ struct brcmf_usbdev_info {struct usb_device *usbdev;struct device *dev; -struct mutex dev_init_lock; +struct completion dev_init_done;int ctl_in_pipe, ctl_out_pipe;struct urb *ctl_urb;/* URB for control endpoint */
@@ -1192,11 +1192,11 @@ static void brcmf_usb_probe_phase2(struct device *dev, int ret,if (ret) goto error; -mutex_unlock (&devinfo->dev_init_lock); +complete (&devinfo->dev_init_done);return ; error:brcmf_dbg (TRACE ,"failed: dev=%s, err=%d\n" ,dev_name (dev), ret); -mutex_unlock (&devinfo->dev_init_lock); +complete (&devinfo->dev_init_done);device_release_driver (dev); }
@@ -1242,7 +1242,7 @@ static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo)if (ret) goto fail;/* we are done */ -mutex_unlock (&devinfo->dev_init_lock); +complete (&devinfo->dev_init_done);return 0 ; } bus->chip = bus_pub->devid;
@@ -1303,11 +1303,10 @@ brcmf_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) devinfo->usbdev = usb; devinfo->dev = &usb->dev; -/* Take an init lock, to protect for disconnect while still loading. +/* Init completion, to protect for disconnect while still loading. * Necessary because of the asynchronous firmware load construction */ -mutex_init (&devinfo->dev_init_lock); -mutex_lock (&devinfo->dev_init_lock); +init_completion (&devinfo->dev_init_done);usb_set_intfdata (intf, devinfo);
@@ -1385,7 +1384,7 @@ brcmf_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)return 0 ; fail: -mutex_unlock (&devinfo->dev_init_lock); +complete (&devinfo->dev_init_done);kfree (devinfo);usb_set_intfdata (intf,NULL );return ret;
@@ -1400,7 +1399,7 @@ brcmf_usb_disconnect(struct usb_interface *intf) devinfo = (struct brcmf_usbdev_info *)usb_get_intfdata (intf);if (devinfo) { -mutex_lock (&devinfo->dev_init_lock); +wait_for_completion (&devinfo->dev_init_done);/* Make sure that devinfo still exists. Firmware probe routines * may have released the device and cleared the intfdata. */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 144/193 brcmfmac: fix WARNING during USB disconnect in case of unempty psq
In reply to Greg Kroah-Hartman[ Upstream commit c80d26e81ef1802f30364b4ad1955c1443a592b9 ]
brcmu_pkt_buf_free_skb emits WARNING when attempting to free a sk_buff which is part of any queue. After USB disconnect this may have happened when brcmf_fws_hanger_cleanup() is called as per-interface psq was never cleaned when removing the interface.
Change brcmf_fws_macdesc_cleanup() in a way that it removes the corresponding packets from hanger table (to avoid double-free when brcmf_fws_hanger_cleanup() is called) and add a call to clean-up the interface specific packet queue.
Below is a WARNING during USB disconnect with Raspberry Pi WiFi dongle running in AP mode. This was reproducible when the interface was transmitting during the disconnect and is fixed with this commit.
------------[ cut here ]------------ WARNING: CPU: 0 PID: 1171 at drivers/net/wireless/broadcom/brcm80211/brcmutil/utils.c:49 brcmu_pkt_buf_free_skb+0x3c/0x40 Modules linked in: nf_log_ipv4 nf_log_common xt_LOG xt_limit iptable_mangle xt_connmark xt_tcpudp xt_conntrack nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 iptable_filter ip_tables x_tables usb_f_mass_storage usb_f_rndis u_ether cdc_acm smsc95xx usbnet ci_hdrc_imx ci_hdrc ulpi usbmisc_imx 8250_exar 8250_pci 8250 8250_base libcomposite configfs udc_core CPU: 0 PID: 1171 Comm: kworker/0:0 Not tainted 4.19.23-00075-gde33ed8 #99 Hardware name: Freescale i.MX6 Quad/DualLite (Device Tree) Workqueue: usb_hub_wq hub_event [<8010ff84>] (unwind_backtrace) from [<8010bb64>] (show_stack+0x10/0x14) [<8010bb64>] (show_stack) from [<80840278>] (dump_stack+0x88/0x9c) [<80840278>] (dump_stack) from [<8011f5ec>] (__warn+0xfc/0x114) [<8011f5ec>] (__warn) from [<8011f71c>] (warn_slowpath_null+0x40/0x48) [<8011f71c>] (warn_slowpath_null) from [<805a476c>] (brcmu_pkt_buf_free_skb+0x3c/0x40) [<805a476c>] (brcmu_pkt_buf_free_skb) from [<805bb6c4>] (brcmf_fws_cleanup+0x1e4/0x22c) [<805bb6c4>] (brcmf_fws_cleanup) from [<805bc854>] (brcmf_fws_del_interface+0x58/0x68) [<805bc854>] (brcmf_fws_del_interface) from [<805b66ac>] (brcmf_remove_interface+0x40/0x150) [<805b66ac>] (brcmf_remove_interface) from [<805b6870>] (brcmf_detach+0x6c/0xb0) [<805b6870>] (brcmf_detach) from [<805bdbb8>] (brcmf_usb_disconnect+0x30/0x4c) [<805bdbb8>] (brcmf_usb_disconnect) from [<805e5d64>] (usb_unbind_interface+0x5c/0x1e0) [<805e5d64>] (usb_unbind_interface) from [<804aab10>] (device_release_driver_internal+0x154/0x1ec) [<804aab10>] (device_release_driver_internal) from [<804a97f4>] (bus_remove_device+0xcc/0xf8) [<804a97f4>] (bus_remove_device) from [<804a6fc0>] (device_del+0x118/0x308) [<804a6fc0>] (device_del) from [<805e488c>] (usb_disable_device+0xa0/0x1c8) [<805e488c>] (usb_disable_device) from [<805dcf98>] (usb_disconnect+0x70/0x1d8) [<805dcf98>] (usb_disconnect) from [<805ddd84>] (hub_event+0x464/0xf50) [<805ddd84>] (hub_event) from [<80135a70>] (process_one_work+0x138/0x3f8) [<80135a70>] (process_one_work) from [<80135d5c>] (worker_thread+0x2c/0x554) [<80135d5c>] (worker_thread) from [<8013b1a0>] (kthread+0x124/0x154) [<8013b1a0>] (kthread) from [<801010e8>] (ret_from_fork+0x14/0x2c) Exception stack(0xecf8dfb0 to 0xecf8dff8) dfa0: 00000000 00000000 00000000 00000000 dfc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 dfe0: 00000000 00000000 00000000 00000000 00000013 00000000 ---[ end trace 38d234018e9e2a90 ]--- ------------[ cut here ]------------
--- .../broadcom/brcm80211/brcmfmac/fwsignal.c | 42 +++++++++++-------- 1 file changed, 24 insertions(+), 18 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c +24 -18
@@ -579,24 +579,6 @@ static bool brcmf_fws_ifidx_match(struct sk_buff *skb, void *arg)return ifidx == *(int *)arg; } -static void brcmf_fws_psq_flush (struct brcmf_fws_info *fws,struct pktq *q, -int ifidx) -{ -bool (*matchfn)(struct sk_buff *,void *) =NULL ; -struct sk_buff *skb; -int prec; - -if (ifidx !=-1 ) - matchfn = brcmf_fws_ifidx_match; -for (prec =0 ; prec < q->num_prec; prec++) { - skb =brcmu_pktq_pdeq_match (q, prec, matchfn, &ifidx); -while (skb) { -brcmu_pkt_buf_free_skb (skb); - skb =brcmu_pktq_pdeq_match (q, prec, matchfn, &ifidx); - } - } -} -static void brcmf_fws_hanger_init (struct brcmf_fws_hanger *hanger) {int i;
@@ -668,6 +650,28 @@ static inline int brcmf_fws_hanger_poppkt(struct brcmf_fws_hanger *h,return 0 ; } +static void brcmf_fws_psq_flush (struct brcmf_fws_info *fws,struct pktq *q, +int ifidx) +{ +bool (*matchfn)(struct sk_buff *,void *) =NULL ; +struct sk_buff *skb; +int prec; +u32 hslot; + +if (ifidx !=-1 ) + matchfn = brcmf_fws_ifidx_match; +for (prec =0 ; prec < q->num_prec; prec++) { + skb =brcmu_pktq_pdeq_match (q, prec, matchfn, &ifidx); +while (skb) { + hslot =brcmf_skb_htod_tag_get_field (skb,HSLOT ); +brcmf_fws_hanger_poppkt (&fws->hanger, hslot, &skb, + true); +brcmu_pkt_buf_free_skb (skb); + skb =brcmu_pktq_pdeq_match (q, prec, matchfn, &ifidx); + } + } +} +static int brcmf_fws_hanger_mark_suppressed (struct brcmf_fws_hanger *h,u32 slot_id) {
@@ -2168,6 +2172,8 @@ void brcmf_fws_del_interface(struct brcmf_if *ifp)brcmf_fws_lock (fws); ifp->fws_desc =NULL ;brcmf_dbg (TRACE ,"deleting %s\n" , entry->name); +brcmf_fws_macdesc_cleanup (fws, &fws->desc.iface[ifp->ifidx], + ifp->ifidx);brcmf_fws_macdesc_deinit (entry);brcmf_fws_cleanup (fws, ifp->ifidx);brcmf_fws_unlock (fws);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 145/193 brcmfmac: fix race during disconnect when USB completion is in progress
In reply to Greg Kroah-Hartman[ Upstream commit db3b9e2e1d58080d0754bdf9293dabf8c6491b67 ]
It was observed that rarely during USB disconnect happening shortly after connect (before full initialization completes) usb_hub_wq would wait forever for the dev_init_lock to be unlocked. dev_init_lock would remain locked though because of infinite wait during usb_kill_urb:
[ 2730.656472] kworker/0:2 D 0 260 2 0x00000000 [ 2730.660700] Workqueue: events request_firmware_work_func [ 2730.664807] [<809dca20>] (__schedule) from [<809dd164>] (schedule+0x4c/0xac) [ 2730.670587] [<809dd164>] (schedule) from [<8069af44>] (usb_kill_urb+0xdc/0x114) [ 2730.676815] [<8069af44>] (usb_kill_urb) from [<7f258b50>] (brcmf_usb_free_q+0x34/0xa8 [brcmfmac]) [ 2730.684833] [<7f258b50>] (brcmf_usb_free_q [brcmfmac]) from [<7f2517d4>] (brcmf_detach+0xa0/0xb8 [brcmfmac]) [ 2730.693557] [<7f2517d4>] (brcmf_detach [brcmfmac]) from [<7f251a34>] (brcmf_attach+0xac/0x3d8 [brcmfmac]) [ 2730.702094] [<7f251a34>] (brcmf_attach [brcmfmac]) from [<7f2587ac>] (brcmf_usb_probe_phase2+0x468/0x4a0 [brcmfmac]) [ 2730.711601] [<7f2587ac>] (brcmf_usb_probe_phase2 [brcmfmac]) from [<7f252888>] (brcmf_fw_request_done+0x194/0x220 [brcmfmac]) [ 2730.721795] [<7f252888>] (brcmf_fw_request_done [brcmfmac]) from [<805748e4>] (request_firmware_work_func+0x4c/0x88) [ 2730.731125] [<805748e4>] (request_firmware_work_func) from [<80141474>] (process_one_work+0x228/0x808) [ 2730.739223] [<80141474>] (process_one_work) from [<80141a80>] (worker_thread+0x2c/0x564) [ 2730.746105] [<80141a80>] (worker_thread) from [<80147bcc>] (kthread+0x13c/0x16c) [ 2730.752227] [<80147bcc>] (kthread) from [<801010b4>] (ret_from_fork+0x14/0x20)
[ 2733.099695] kworker/0:3 D 0 1065 2 0x00000000 [ 2733.103926] Workqueue: usb_hub_wq hub_event [ 2733.106914] [<809dca20>] (__schedule) from [<809dd164>] (schedule+0x4c/0xac) [ 2733.112693] [<809dd164>] (schedule) from [<809e2a8c>] (schedule_timeout+0x214/0x3e4) [ 2733.119621] [<809e2a8c>] (schedule_timeout) from [<809dde2c>] (wait_for_common+0xc4/0x1c0) [ 2733.126810] [<809dde2c>] (wait_for_common) from [<7f258d00>] (brcmf_usb_disconnect+0x1c/0x4c [brcmfmac]) [ 2733.135206] [<7f258d00>] (brcmf_usb_disconnect [brcmfmac]) from [<8069e0c8>] (usb_unbind_interface+0x5c/0x1e4) [ 2733.143943] [<8069e0c8>] (usb_unbind_interface) from [<8056d3e8>] (device_release_driver_internal+0x164/0x1fc) [ 2733.152769] [<8056d3e8>] (device_release_driver_internal) from [<8056c078>] (bus_remove_device+0xd0/0xfc) [ 2733.161138] [<8056c078>] (bus_remove_device) from [<8056977c>] (device_del+0x11c/0x310) [ 2733.167939] [<8056977c>] (device_del) from [<8069cba8>] (usb_disable_device+0xa0/0x1cc) [ 2733.174743] [<8069cba8>] (usb_disable_device) from [<8069507c>] (usb_disconnect+0x74/0x1dc) [ 2733.181823] [<8069507c>] (usb_disconnect) from [<80695e88>] (hub_event+0x478/0xf88) [ 2733.188278] [<80695e88>] (hub_event) from [<80141474>] (process_one_work+0x228/0x808) [ 2733.194905] [<80141474>] (process_one_work) from [<80141a80>] (worker_thread+0x2c/0x564) [ 2733.201724] [<80141a80>] (worker_thread) from [<80147bcc>] (kthread+0x13c/0x16c) [ 2733.207913] [<80147bcc>] (kthread) from [<801010b4>] (ret_from_fork+0x14/0x20)
It was traced down to a case where usb_kill_urb would be called on an URB structure containing more or less random data, including large number in its use_count. During the debugging it appeared that in brcmf_usb_free_q() the traversal over URBs' lists is not synchronized with operations on those lists in brcmf_usb_rx_complete() leading to handling brcmf_usbdev_info structure (holding lists' head) as lists' element and in result causing above problem.
Fix it by walking through all URBs during brcmf_cancel_all_urbs using the arrays of requests instead of linked lists.
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c +8 -2
@@ -684,12 +684,18 @@ static int brcmf_usb_up(struct device *dev)static void brcmf_cancel_all_urbs (struct brcmf_usbdev_info *devinfo) { +int i; +if (devinfo->ctl_urb)usb_kill_urb (devinfo->ctl_urb);if (devinfo->bulk_urb)usb_kill_urb (devinfo->bulk_urb); -brcmf_usb_free_q (&devinfo->tx_postq, true); -brcmf_usb_free_q (&devinfo->rx_postq, true); +if (devinfo->tx_reqs) +for (i =0 ; i < devinfo->bus_pub.ntxq; i++) +usb_kill_urb (devinfo->tx_reqs[i].urb); +if (devinfo->rx_reqs) +for (i =0 ; i < devinfo->bus_pub.nrxq; i++) +usb_kill_urb (devinfo->rx_reqs[i].urb); }static void brcmf_usb_down (struct device *dev)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 146/193 brcmfmac: fix Oops when bringing up interface during USB disconnect
In reply to Greg Kroah-Hartman[ Upstream commit 24d413a31afaee9bbbf79226052c386b01780ce2 ]
Fix a race which leads to an Oops with NULL pointer dereference. The dereference is in brcmf_config_dongle() when cfg_to_ndev() attempts to get net_device structure of interface with index 0 via if2bss mapping. This shouldn't fail because of check for bus being ready in brcmf_netdev_open(), but it's not synchronised with USB disconnect and there is a race: after the check the bus can be marked down and the mapping for interface 0 may be gone.
Solve this by modifying disconnect handling so that the removal of mapping of ifidx to brcmf_if structure happens after netdev removal (which is synchronous with brcmf_netdev_open() thanks to rtln being locked in devinet_ioctl()). This assures brcmf_netdev_open() returns before the mapping is removed during disconnect.
Unable to handle kernel NULL pointer dereference at virtual address 00000008 pgd = bcae2612 [00000008] *pgd=8be73831 Internal error: Oops: 17 [#1] PREEMPT SMP ARM Modules linked in: brcmfmac brcmutil nf_log_ipv4 nf_log_common xt_LOG xt_limit
iptable_mangle xt_connmark xt_tcpudp xt_conntrack nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 iptable_filter ip_tables x_tables usb_f_mass_storage usb_f_rndis u_ether usb_serial_simple usbserial cdc_acm smsc95xx usbnet ci_hdrc_imx ci_hdrc usbmisc_imx ulpi 8250_exar 8250_pci 8250 8250_base libcomposite configfs udc_core [last unloaded: brcmutil]
CPU: 2 PID: 24478 Comm: ifconfig Not tainted 4.19.23-00078-ga62866d-dirty #115 Hardware name: Freescale i.MX6 Quad/DualLite (Device Tree) PC is at brcmf_cfg80211_up+0x94/0x29c [brcmfmac] LR is at brcmf_cfg80211_up+0x8c/0x29c [brcmfmac] pc : [<7f26a91c>] lr : [<7f26a914>] psr: a0070013
sp : eca99d28 ip : 00000000 fp : ee9c6c00
r10: 00000036 r9 : 00000000 r8 : ece4002c
r7 : edb5b800 r6 : 00000000 r5 : 80f08448 r4 : edb5b968 r3 : ffffffff r2 : 00000000 r1 : 00000002 r0 : 00000000
Flags: NzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none
Control: 10c5387d Table: 7ca0c04a DAC: 00000051 Process ifconfig (pid: 24478, stack limit = 0xd9e85a0e)
Stack: (0xeca99d28 to 0xeca9a000)
9d20: 00000000 80f873b0 0000000d 80f08448 eca99d68 50d45f32
9d40: 7f27de94 ece40000 80f08448 80f08448 7f27de94 ece4002c 00000000 00000036
9d60: ee9c6c00 7f27262c 00001002 50d45f32 ece40000 00000000 80f08448 80772008
9d80: 00000001 00001043 00001002 ece40000 00000000 50d45f32 ece40000 00000001
9da0: 80f08448 00001043 00001002 807723d0 00000000 50d45f32 80f08448 eca99e58
9dc0: 80f87113 50d45f32 80f08448 ece40000 ece40138 00001002 80f08448 00000000
9de0: 00000000 80772434 edbd5380 eca99e58 edbd5380 80f08448 ee9c6c0c 80805f70
9e00: 00000000 ede08e00 00008914 ece40000 00000014 ee9c6c0c 600c0013 00001043
9e20: 0208a8c0 ffffffff 00000000 50d45f32 eca98000 80f08448 7ee9fc38 00008914
9e40: 80f68e40 00000051 eca98000 00000036 00000003 80808b9c 6e616c77 00000030
9e60: 00000000 00000000 00001043 0208a8c0 ffffffff 00000000 80f08448 00000000
9e80: 00000000 816d8b20 600c0013 00000001 ede09320 801763d4 00000000 50d45f32
9ea0: eca98000 80f08448 7ee9fc38 50d45f32 00008914 80f08448 7ee9fc38 80f68e40
9ec0: ed531540 8074721c 00000800 00000001 00000000 6e616c77 00000030 00000000
9ee0: 00000000 00001002 0208a8c0 ffffffff 00000000 50d45f32 80f08448 7ee9fc38
9f00: ed531560 ec8fc900 80285a6c 80285138 edb910c0 00000000 ecd91008 ede08e00
9f20: 80f08448 00000000 00000000 816d8b20 600c0013 00000001 ede09320 801763d4
9f40: 00000000 50d45f32 00021000 edb91118 edb910c0 80f08448 01b29000 edb91118
9f60: eca99f7c 50d45f32 00021000 ec8fc900 00000003 ec8fc900 00008914 7ee9fc38
9f80: eca98000 00000036 00000003 80285a6c 00086364 7ee9fe1c 000000c3 00000036
9fa0: 801011c4 80101000 00086364 7ee9fe1c 00000003 00008914 7ee9fc38 00086364
9fc0: 00086364 7ee9fe1c 000000c3 00000036 0008630c 7ee9fe1c 7ee9fc38 00000003
9fe0: 000a42b8 7ee9fbd4 00019914 76e09acc 600c0010 00000003 00000000 00000000 [<7f26a91c>] (brcmf_cfg80211_up [brcmfmac]) from [<7f27262c>] (brcmf_netdev_open+0x74/0xe8 [brcmfmac]) [<7f27262c>] (brcmf_netdev_open [brcmfmac]) from [<80772008>] (__dev_open+0xcc/0x150) [<80772008>] (__dev_open) from [<807723d0>] (__dev_change_flags+0x168/0x1b4) [<807723d0>] (__dev_change_flags) from [<80772434>] (dev_change_flags+0x18/0x48) [<80772434>] (dev_change_flags) from [<80805f70>] (devinet_ioctl+0x67c/0x79c) [<80805f70>] (devinet_ioctl) from [<80808b9c>] (inet_ioctl+0x210/0x3d4)
[<80808b9c>] (inet_ioctl) from [<8074721c>] (sock_ioctl+0x350/0x524)
[<8074721c>] (sock_ioctl) from [<80285138>] (do_vfs_ioctl+0xb0/0x9b0)
[<80285138>] (do_vfs_ioctl) from [<80285a6c>] (ksys_ioctl+0x34/0x5c)
[<80285a6c>] (ksys_ioctl) from [<80101000>] (ret_fast_syscall+0x0/0x28)
Exception stack(0xeca99fa8 to 0xeca99ff0) 9fa0: 00086364 7ee9fe1c 00000003 00008914 7ee9fc38 00086364 9fc0: 00086364 7ee9fe1c 000000c3 00000036 0008630c 7ee9fe1c 7ee9fc38 00000003 9fe0: 000a42b8 7ee9fbd4 00019914 76e09acc Code: e5970328 eb002021 e1a02006 e3a01002 (e5909008) ---[ end trace 5cbac2333f3ac5df ]---
--- .../net/wireless/broadcom/brcm80211/brcmfmac/core.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +7 -3
@@ -664,17 +664,17 @@ static void brcmf_del_if(struct brcmf_pub *drvr, s32 bsscfgidx, bool rtnl_locked) {struct brcmf_if *ifp; +int ifidx; ifp = drvr->iflist[bsscfgidx]; - drvr->iflist[bsscfgidx] =NULL ;if (!ifp) {brcmf_err ("Null interface, bsscfgidx=%d\n" , bsscfgidx);return ; }brcmf_dbg (TRACE ,"Enter, bsscfgidx=%d, ifidx=%d\n" , bsscfgidx, ifp->ifidx); -if (drvr->if2bss[ifp->ifidx] == bsscfgidx) - drvr->if2bss[ifp->ifidx] =BRCMF_BSSIDX_INVALID ; + ifidx = ifp->ifidx; +if (ifp->ndev) {if (bsscfgidx ==0 ) {if (ifp->ndev->netdev_ops == &brcmf_netdev_ops_pri) {
@@ -702,6 +702,10 @@ static void brcmf_del_if(struct brcmf_pub *drvr, s32 bsscfgidx,brcmf_p2p_ifp_removed (ifp, rtnl_locked);kfree (ifp); } + + drvr->iflist[bsscfgidx] =NULL ; +if (drvr->if2bss[ifidx] == bsscfgidx) + drvr->if2bss[ifidx] =BRCMF_BSSIDX_INVALID ; }void brcmf_remove_interface (struct brcmf_if *ifp,bool rtnl_locked)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 147/193 rtc: xgene: fix possible race condition
In reply to Greg Kroah-Hartman[ Upstream commit a652e00ee1233e251a337c28e18a1da59224e5ce ]
The IRQ is requested before the struct rtc is allocated and registered, but this struct is used in the IRQ handler. This may lead to a NULL pointer dereference.
Switch to devm_rtc_allocate_device/rtc_register_device to allocate the rtc struct before requesting the IRQ.
--- drivers/rtc/rtc-xgene.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
drivers/rtc/rtc-xgene.c +11 -7
@@ -163,6 +163,10 @@ static int xgene_rtc_probe(struct platform_device *pdev)if (IS_ERR (pdata->csr_base))return PTR_ERR (pdata->csr_base); + pdata->rtc =devm_rtc_allocate_device (&pdev->dev); +if (IS_ERR (pdata->rtc)) +return PTR_ERR (pdata->rtc); + irq =platform_get_irq (pdev,0 );if (irq <0 ) {dev_err (&pdev->dev,"No IRQ resource\n" );
@@ -187,15 +191,15 @@ static int xgene_rtc_probe(struct platform_device *pdev)device_init_wakeup (&pdev->dev,1 ); - pdata->rtc =devm_rtc_device_register (&pdev->dev, pdev->name, - &xgene_rtc_ops,THIS_MODULE ); -if (IS_ERR (pdata->rtc)) { -clk_disable_unprepare (pdata->clk); -return PTR_ERR (pdata->rtc); - } -/* HW does not support update faster than 1 seconds */ pdata->rtc->uie_unsupported =1 ; + pdata->rtc->ops = &xgene_rtc_ops; + + ret =rtc_register_device (pdata->rtc); +if (ret) { +clk_disable_unprepare (pdata->clk); +return ret; + }return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 148/193 rtlwifi: fix potential NULL pointer dereference
In reply to Greg Kroah-Hartman[ Upstream commit 60209d482b97743915883d293c8b85226d230c19 ]
In case dev_alloc_skb fails, the fix safely returns to avoid potential NULL pointer dereference.
--- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c | 2 ++ drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c | 2 ++ drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c | 2 ++ drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c | 2 ++ drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c | 2 ++ drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c | 4 ++++ 6 files changed, 14 insertions(+)
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c +2 -0
@@ -620,6 +620,8 @@ void rtl88e_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished) u1rsvdpageloc, 3); skb =dev_alloc_skb (totalpacketlen); +if (!skb) +return ;skb_put_data (skb, &reserved_page_packet, totalpacketlen); rtstatus =rtl_cmd_send_packet (hw, skb);
drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c +2 -0
@@ -647,6 +647,8 @@ void rtl92c_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, skb =dev_alloc_skb (totalpacketlen); +if (!skb) +return ;skb_put_data (skb, &reserved_page_packet, totalpacketlen);if (cmd_send_packet)
drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c +2 -0
@@ -766,6 +766,8 @@ void rtl92ee_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished) u1rsvdpageloc, 3); skb =dev_alloc_skb (totalpacketlen); +if (!skb) +return ;skb_put_data (skb, &reserved_page_packet, totalpacketlen); rtstatus =rtl_cmd_send_packet (hw, skb);
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c +2 -0
@@ -470,6 +470,8 @@ void rtl8723e_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished) u1rsvdpageloc, 3); skb =dev_alloc_skb (totalpacketlen); +if (!skb) +return ;skb_put_data (skb, &reserved_page_packet, totalpacketlen); rtstatus =rtl_cmd_send_packet (hw, skb);
drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c +2 -0
@@ -584,6 +584,8 @@ void rtl8723be_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, u1rsvdpageloc, sizeof(u1rsvdpageloc)); skb =dev_alloc_skb (totalpacketlen); +if (!skb) +return ;skb_put_data (skb, &reserved_page_packet, totalpacketlen); rtstatus =rtl_cmd_send_packet (hw, skb);
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c +4 -0
@@ -1645,6 +1645,8 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, &reserved_page_packet_8812[0], totalpacketlen); skb =dev_alloc_skb (totalpacketlen); +if (!skb) +return ;skb_put_data (skb, &reserved_page_packet_8812, totalpacketlen); rtstatus =rtl_cmd_send_packet (hw, skb);
@@ -1781,6 +1783,8 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, &reserved_page_packet_8821[0], totalpacketlen); skb =dev_alloc_skb (totalpacketlen); +if (!skb) +return ;skb_put_data (skb, &reserved_page_packet_8821, totalpacketlen); rtstatus =rtl_cmd_send_packet (hw, skb);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 149/193 scsi: ufs: Fix regulator load and icc-level configuration
In reply to Greg Kroah-Hartman[ Upstream commit 0487fff76632ec023d394a05b82e87a971db8c03 ]
Currently if a regulator has "<name>-fixed-regulator" property in device tree, it will skip current limit initialization. This lead to a zero "max_uA" value in struct ufs_vreg.
However, "regulator_set_load" operation shall be required on regulators which have valid current limits, otherwise a zero "max_uA" set by "regulator_set_load" may cause unexpected behavior when this regulator is enabled or set as high power mode.
Similarly, in device's icc_level configuration flow, the target icc_level shall be updated if regulator also has valid current limit, otherwise a wrong icc_level will be calculated by zero "max_uA" and thus causes unexpected results after it is written to device.
--- drivers/scsi/ufs/ufshcd.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/scsi/ufs/ufshcd.c +12 -3
@@ -5911,19 +5911,19 @@ static u32 ufshcd_find_max_sup_active_icc_level(struct ufs_hba *hba, goto out; } -if (hba->vreg_info.vcc) +if (hba->vreg_info.vcc && hba->vreg_info.vcc->max_uA) icc_level =ufshcd_get_max_icc_level ( hba->vreg_info.vcc->max_uA,POWER_DESC_MAX_ACTV_ICC_LVLS -1 , &desc_buf[PWR_DESC_ACTIVE_LVLS_VCC_0 ]); -if (hba->vreg_info.vccq) +if (hba->vreg_info.vccq && hba->vreg_info.vccq->max_uA) icc_level =ufshcd_get_max_icc_level ( hba->vreg_info.vccq->max_uA, icc_level, &desc_buf[PWR_DESC_ACTIVE_LVLS_VCCQ_0 ]); -if (hba->vreg_info.vccq2) +if (hba->vreg_info.vccq2 && hba->vreg_info.vccq2->max_uA) icc_level = ufshcd_get_max_icc_level( hba->vreg_info.vccq2->max_uA, icc_level,
@@ -6525,6 +6525,15 @@ static int ufshcd_config_vreg_load(struct device *dev, struct ufs_vreg *vreg,if (!vreg)return 0 ; +/* +* "set_load" operation shall be required on those regulators +* which specifically configured current limitation. Otherwise +* zero max_uA may cause unexpected behavior when regulator is +* enabled or set as high power mode. +*/ +if (!vreg->max_uA) +return 0 ; + ret =regulator_set_load (vreg->reg, ua);if (ret <0 ) { dev_err(dev, "%s: %s set load (ua=%d) failed, err=%d\n",
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 150/193 scsi: ufs: Avoid configuring regulator with undefined voltage range
In reply to Greg Kroah-Hartman[ Upstream commit 3b141e8cfd54ba3e5c610717295b2a02aab26a05 ]
For regulators used by UFS, vcc, vccq and vccq2 will have voltage range initialized by ufshcd_populate_vreg(), however other regulators may have undefined voltage range if dt-bindings have no such definition.
In above undefined case, both "min_uV" and "max_uV" fields in ufs_vreg struct will be zero values and these values will be configured on regulators in different power modes.
Currently this may have no harm if both "min_uV" and "max_uV" always keep "zero values" because regulator_set_voltage() will always bypass such invalid values and return "good" results.
However improper values shall be fixed to avoid potential bugs. Simply bypass voltage configuration if voltage range is not defined.
--- drivers/scsi/ufs/ufshcd.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/scsi/ufs/ufshcd.c +8 -5
@@ -6580,12 +6580,15 @@ static int ufshcd_config_vreg(struct device *dev, name = vreg->name;if (regulator_count_voltages (reg) >0 ) { - min_uV = on ? vreg->min_uV :0 ; - ret =regulator_set_voltage (reg, min_uV, vreg->max_uV); -if (ret) { -dev_err (dev,"%s: %s set voltage failed, err=%d\n" , +if (vreg->min_uV && vreg->max_uV) { + min_uV = on ? vreg->min_uV :0 ; + ret =regulator_set_voltage (reg, min_uV, vreg->max_uV); +if (ret) { +dev_err (dev, +"%s: %s set voltage failed, err=%d\n" , __func__, name, ret); - goto out; + goto out; + } } uA_load = on ? vreg->max_uA :0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 151/193 arm64: cpu_ops: fix a leaked reference by adding missing of_node_put
In reply to Greg Kroah-Hartman[ Upstream commit 92606ec9285fb84cd9b5943df23f07d741384bfc ]
The call to of_get_next_child returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
./arch/arm64/kernel/cpu_ops.c:102:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 69, but without a corresponding object release within this function.
--- arch/arm64/kernel/cpu_ops.c | 1 + 1 file changed, 1 insertion(+)
arch/arm64/kernel/cpu_ops.c +1 -0
@@ -85,6 +85,7 @@ static const char *__init cpu_read_enable_method(int cpu)pr_err ("%pOF: missing enable-method property\n" , dn); } +of_node_put (dn); }else { enable_method =acpi_get_enable_method (cpu);if (!enable_method) {
Signature · 9 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Greg Kroah-Hartman
maintainerPATCH 152/193 x86/uaccess, ftrace: Fix ftrace_likely_update() vs. SMAP
In reply to Greg Kroah-Hartman[ Upstream commit 4a6c91fbdef846ec7250b82f2eeeb87ac5f18cf9 ]
For CONFIG_TRACE_BRANCH_PROFILING=y the likely/unlikely things get overloaded and generate callouts to this code, and thus also when AC=1.
Make it safe.
--- kernel/trace/trace_branch.c | 4 ++++ 1 file changed, 4 insertions(+)
kernel/trace/trace_branch.c +4 -0
@@ -205,6 +205,8 @@ void trace_likely_condition(struct ftrace_likely_data *f, int val, int expect)void ftrace_likely_update (struct ftrace_likely_data *f,int val,int expect,int is_constant) { +unsigned long flags =user_access_save (); +/* A constant is always correct */ if (is_constant) { f->constant++;
@@ -223,6 +225,8 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val, f->data.correct++; else f->data.incorrect++; + +user_access_restore (flags); }EXPORT_SYMBOL (ftrace_likely_update);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 153/193 x86/uaccess, signal: Fix AC=1 bloat
In reply to Greg Kroah-Hartman[ Upstream commit 88e4718275c1bddca6f61f300688b4553dc8584b ]
Occasionally GCC is less agressive with inlining and the following is observed:
arch/x86/kernel/signal.o: warning: objtool: restore_sigcontext()+0x3cc: call to force_valid_ss.isra.5() with UACCESS enabled arch/x86/kernel/signal.o: warning: objtool: do_signal()+0x384: call to frame_uc_flags.isra.0() with UACCESS enabled
Cure this by moving this code out of the AC=1 region, since it really isn't needed for the user access.
--- arch/x86/kernel/signal.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-)
arch/x86/kernel/signal.c +17 -12
@@ -131,16 +131,6 @@ static int restore_sigcontext(struct pt_regs *regs,COPY_SEG_CPL3 (cs);COPY_SEG_CPL3 (ss); -#ifdef CONFIG_X86_64 -/* -* Fix up SS if needed for the benefit of old DOSEMU and -* CRIU. -*/ -if (unlikely (!(uc_flags &UC_STRICT_RESTORE_SS ) && -user_64bit_mode (regs))) -force_valid_ss (regs); -#endif -get_user_ex (tmpflags, &sc->flags); regs->flags = (regs->flags & ~FIX_EFLAGS ) | (tmpflags &FIX_EFLAGS ); regs->orig_ax =-1 ;/* disable syscall checks */
@@ -149,6 +139,15 @@ static int restore_sigcontext(struct pt_regs *regs, buf = (void __user *)buf_val; }get_user_catch (err); +#ifdef CONFIG_X86_64 +/* +* Fix up SS if needed for the benefit of old DOSEMU and +* CRIU. +*/ +if (unlikely (!(uc_flags &UC_STRICT_RESTORE_SS ) &&user_64bit_mode (regs))) +force_valid_ss (regs); +#endif + err |=fpu__restore_sig (buf,IS_ENABLED (CONFIG_X86_32 ));force_iret ();
@@ -460,6 +459,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig, {struct rt_sigframe __user *frame;void __user *fp =NULL ; +unsigned long uc_flags;int err =0 ; frame =get_sigframe (&ksig->ka, regs,sizeof (struct rt_sigframe ), &fp);
@@ -472,9 +472,11 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,return -EFAULT ; } + uc_flags =frame_uc_flags (regs); + put_user_try {/* Create the ucontext. */ -put_user_ex (frame_uc_flags (regs), &frame->uc.uc_flags); +put_user_ex (uc_flags, &frame->uc.uc_flags);put_user_ex (0 , &frame->uc.uc_link);save_altstack_ex (&frame->uc.uc_stack, regs->sp);
@@ -540,6 +542,7 @@ static int x32_setup_rt_frame(struct ksignal *ksig, {#ifdef CONFIG_X86_X32_ABI struct rt_sigframe_x32 __user *frame; +unsigned long uc_flags;void __user *restorer;int err =0 ;void __user *fpstate =NULL ;
@@ -554,9 +557,11 @@ static int x32_setup_rt_frame(struct ksignal *ksig,return -EFAULT ; } + uc_flags =frame_uc_flags (regs); + put_user_try {/* Create the ucontext. */ -put_user_ex (frame_uc_flags (regs), &frame->uc.uc_flags); +put_user_ex (uc_flags, &frame->uc.uc_flags);put_user_ex (0 , &frame->uc.uc_link);compat_save_altstack_ex (&frame->uc.uc_stack, regs->sp);put_user_ex (0 , &frame->uc.uc__pad0);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 154/193 x86/ia32: Fix ia32_restore_sigcontext() AC leak
In reply to Greg Kroah-Hartman[ Upstream commit 67a0514afdbb8b2fc70b771b8c77661a9cb9d3a9 ]
Objtool spotted that we call native_load_gs_index() with AC set. Re-arrange the code to avoid that.
--- arch/x86/ia32/ia32_signal.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-)
arch/x86/ia32/ia32_signal.c +17 -12
@@ -62,9 +62,8 @@ } while (0)#define RELOAD_SEG (seg) { \ - unsigned int pre = GET_SEG(seg); \ + unsigned int pre = (seg) | 3; \ unsigned int cur = get_user_seg(seg); \ - pre |= 3; \ if (pre != cur) \ set_user_seg(seg, pre); \ }
@@ -73,6 +72,7 @@ static int ia32_restore_sigcontext(struct pt_regs *regs, struct sigcontext_32 __user *sc) {unsigned int tmpflags, err =0 ; +u16 gs, fs, es, ds;void __user *buf;u32 tmp;
@@ -80,16 +80,10 @@ static int ia32_restore_sigcontext(struct pt_regs *regs, current->restart_block.fn = do_no_restart_syscall; get_user_try { -/* -* Reload fs and gs if they have changed in the signal -* handler. This does not handle long fs/gs base changes in -* the handler, but does not clobber them at least in the -* normal case. -*/ -RELOAD_SEG (gs); -RELOAD_SEG (fs); -RELOAD_SEG (ds); -RELOAD_SEG (es); + gs =GET_SEG (gs); + fs =GET_SEG (fs); + ds =GET_SEG (ds); + es =GET_SEG (es);COPY (di);COPY (si);COPY (bp);COPY (sp);COPY (bx);COPY (dx);COPY (cx);COPY (ip);COPY (ax);
@@ -107,6 +101,17 @@ static int ia32_restore_sigcontext(struct pt_regs *regs, buf =compat_ptr (tmp); }get_user_catch (err); +/* +* Reload fs and gs if they have changed in the signal +* handler. This does not handle long fs/gs base changes in +* the handler, but does not clobber them at least in the +* normal case. +*/ +RELOAD_SEG (gs); +RELOAD_SEG (fs); +RELOAD_SEG (ds); +RELOAD_SEG (es); + err |=fpu__restore_sig (buf,1 );force_iret ();
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 155/193 chardev: add additional check for minor range overlap
In reply to Greg Kroah-Hartman[ Upstream commit de36e16d1557a0b6eb328bc3516359a12ba5c25c ]
Current overlap checking cannot correctly handle a case which is baseminor < existing baseminor && baseminor + minorct > existing baseminor + minorct.
--- fs/char_dev.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/char_dev.c +6 -0
@@ -159,6 +159,12 @@ __register_chrdev_region(unsigned int major, unsigned int baseminor, ret = -EBUSY ; goto out; } + +if (new_min < old_min && new_max > old_max) { + ret = -EBUSY ; + goto out; + } + } cd->next = *cp;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 156/193 RDMA/hns: Fix bad endianess of port_pd variable
In reply to Greg Kroah-Hartman[ Upstream commit 6734b2973565e36659e97e12ab0d0faf1d9f3fbe ]
port_pd is treated as le32 in declaration and read, fix assignment to be in le32 too. This change fixes the following compilation warnings.
drivers/infiniband/hw/hns/hns_roce_ah.c:67:24: warning: incorrect type
in assignment (different base types) drivers/infiniband/hw/hns/hns_roce_ah.c:67:24: expected restricted __le32 [usertype] port_pd drivers/infiniband/hw/hns/hns_roce_ah.c:67:24: got restricted __be32 [usertype]
--- drivers/infiniband/hw/hns/hns_roce_ah.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/hns/hns_roce_ah.c +1 -1
@@ -91,7 +91,7 @@ struct ib_ah *hns_roce_create_ah(struct ib_pd *ibpd, HNS_ROCE_VLAN_SL_BIT_MASK) <<HNS_ROCE_VLAN_SL_SHIFT ; - ah->av.port_pd =cpu_to_be32 (to_hr_pd (ibpd)->pdn | + ah->av.port_pd =cpu_to_le32 (to_hr_pd (ibpd)->pdn | (rdma_ah_get_port_num (ah_attr) <<HNS_ROCE_PORT_NUM_SHIFT )); ah->av.gid_index = grh->sgid_index;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 157/193 HID: core: move Usage Page concatenation to Main item
In reply to Greg Kroah-Hartman[ Upstream commit 58e75155009cc800005629955d3482f36a1e0eec ]
As seen on some USB wireless keyboards manufactured by Primax, the HID parser was using some assumptions that are not always true. In this case it's s the fact that, inside the scope of a main item, an Usage Page will always precede an Usage.
The spec is not pretty clear as 6.2.2.7 states "Any usage that follows is interpreted as a Usage ID and concatenated with the Usage Page". While 6.2.2.8 states "When the parser encounters a main item it concatenates the last declared Usage Page with a Usage to form a complete usage value." Being somewhat contradictory it was decided to match Window's implementation, which follows 6.2.2.8.
In summary, the patch moves the Usage Page concatenation from the local item parsing function to the main item parsing function.
--- drivers/hid/hid-core.c | 36 ++++++++++++++++++++++++------------ include/linux/hid.h | 1 + 2 files changed, 25 insertions(+), 12 deletions(-)
drivers/hid/hid-core.c +24 -12
@@ -199,13 +199,14 @@ static unsigned hid_lookup_collection(struct hid_parser *parser, unsigned type)* Add a usage to the temporary parser table. */ -static int hid_add_usage (struct hid_parser *parser,unsigned usage) +static int hid_add_usage (struct hid_parser *parser,unsigned usage,u8 size) {if (parser->local.usage_index >=HID_MAX_USAGES ) {hid_err (parser->device,"usage index exceeded\n" );return -1 ; } parser->local.usage[parser->local.usage_index] = usage; + parser->local.usage_size[parser->local.usage_index] = size; parser->local.collection_index[parser->local.usage_index] = parser->collection_stack_ptr ? parser->collection_stack[parser->collection_stack_ptr -1 ] :0 ;
@@ -462,10 +463,7 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)return 0 ; } -if (item->size <=2 ) - data = (parser->global.usage_page <<16 ) + data; - -return hid_add_usage (parser, data); +return hid_add_usage (parser, data, item->size);case HID_LOCAL_ITEM_TAG_USAGE_MINIMUM :
@@ -474,9 +472,6 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)return 0 ; } -if (item->size <=2 ) - data = (parser->global.usage_page <<16 ) + data; - parser->local.usage_minimum = data;return 0 ;
@@ -487,9 +482,6 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)return 0 ; } -if (item->size <=2 ) - data = (parser->global.usage_page <<16 ) + data; - count = data - parser->local.usage_minimum;if (count + parser->local.usage_index >=HID_MAX_USAGES ) {/*
@@ -509,7 +501,7 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item) }for (n = parser->local.usage_minimum; n <= data; n++) -if (hid_add_usage (parser, n)) { +if (hid_add_usage (parser, n, item->size)) {dbg_hid ("hid_add_usage failed\n" );return -1 ; }
@@ -523,6 +515,22 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)return 0 ; } +/* +* Concatenate Usage Pages into Usages where relevant: +* As per specification, 6.2.2.8: "When the parser encounters a main item it +* concatenates the last declared Usage Page with a Usage to form a complete +* usage value." +*/ + +static void hid_concatenate_usage_page (struct hid_parser *parser) +{ +int i; + +for (i =0 ; i < parser->local.usage_index; i++) +if (parser->local.usage_size[i] <=2 ) + parser->local.usage[i] += parser->global.usage_page <<16 ; +} +/* * Process a main item. */
@@ -532,6 +540,8 @@ static int hid_parser_main(struct hid_parser *parser, struct hid_item *item)__u32 data;int ret; +hid_concatenate_usage_page (parser); + data =item_udata (item);switch (item->tag) {
@@ -741,6 +751,8 @@ static int hid_scan_main(struct hid_parser *parser, struct hid_item *item)__u32 data;int i; +hid_concatenate_usage_page (parser); + data =item_udata (item);switch (item->tag) {
include/linux/hid.h +1 -0
@@ -398,6 +398,7 @@ struct hid_global {struct hid_local {unsigned usage[HID_MAX_USAGES ];/* usage array */ +u8 usage_size[HID_MAX_USAGES ];/* usage size array */ unsigned collection_index[HID_MAX_USAGES ];/* collection index array */ unsigned usage_index;unsigned usage_minimum;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 158/193 ASoC: eukrea-tlv320: fix a leaked reference by adding missing of_node_put
In reply to Greg Kroah-Hartman[ Upstream commit b820d52e7eed7b30b2dfef5f4213a2bc3cbea6f3 ]
The call to of_parse_phandle returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
./sound/soc/fsl/eukrea-tlv320.c:121:3-9: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 102, but without a correspo nding object release within this function.
./sound/soc/fsl/eukrea-tlv320.c:127:3-9: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 102, but without a correspo nding object release within this function.
--- sound/soc/fsl/eukrea-tlv320.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/fsl/eukrea-tlv320.c +2 -2
@@ -119,13 +119,13 @@ static int eukrea_tlv320_probe(struct platform_device *pdev)if (ret) {dev_err (&pdev->dev,"fsl,mux-int-port node missing or invalid.\n" ); -return ret; + goto err; } ret =of_property_read_u32 (np,"fsl,mux-ext-port" , &ext_port);if (ret) {dev_err (&pdev->dev,"fsl,mux-ext-port node missing or invalid.\n" ); -return ret; + goto err; }/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 159/193 ASoC: fsl_utils: fix a leaked reference by adding missing of_node_put
In reply to Greg Kroah-Hartman[ Upstream commit c705247136a523488eac806bd357c3e5d79a7acd ]
The call to of_parse_phandle returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage.
Detected by coccinelle with the following warnings:
./sound/soc/fsl/fsl_utils.c:74:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 38, but without a corresponding object release within this function.
--- sound/soc/fsl/fsl_utils.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/fsl/fsl_utils.c +1 -0
@@ -75,6 +75,7 @@ int fsl_asoc_get_dma_channel(struct device_node *ssi_np, iprop =of_get_property (dma_np,"cell-index" ,NULL );if (!iprop) {of_node_put (dma_np); +of_node_put (dma_channel_np);return -EINVAL ; } *dma_id =be32_to_cpup (iprop);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 160/193 cxgb3/l2t: Fix undefined behaviour
In reply to Greg Kroah-Hartman[ Upstream commit 76497732932f15e7323dc805e8ea8dc11bb587cf ]
The use of zero-sized array causes undefined behaviour when it is not the last member in a structure. As it happens to be in this case.
Also, the current code makes use of a language extension to the C90 standard, but the preferred mechanism to declare variable-length types such as this one is a flexible array member, introduced in C99:
struct foo {
int stuff;
struct boo array[];
};By making use of the mechanism above, we will get a compiler warning in case the flexible array does not occur last. Which is beneficial to cultivate a high-quality code.
--- drivers/net/ethernet/chelsio/cxgb3/l2t.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/chelsio/cxgb3/l2t.h +1 -1
@@ -75,8 +75,8 @@ struct l2t_data {struct l2t_entry *rover;/* starting point for next allocation */ atomic_t nfree;/* number of free entries */ rwlock_t lock; -struct l2t_entry l2tab[0 ];struct rcu_head rcu_head;/* to handle rcu cleanup */ +struct l2t_entry l2tab[]; }; typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 161/193 HID: logitech-hidpp: change low battery level threshold from 31 to 30 percent
In reply to Greg Kroah-Hartman[ Upstream commit 1f87b0cd32b3456d7efdfb017fcf74d0bfe3ec29 ]
According to hidpp20_batterylevel_get_battery_info my Logitech K270 keyboard reports only 2 battery levels. This matches with what I've seen after testing with batteries at varying level of fullness, it always reports either 5% or 30%.
Windows reports "battery good" for the 30% level. I've captured an USB trace of Windows reading the battery and it is getting the same info as the Linux hidpp code gets.
Now that Linux handles these devices as hidpp devices, it reports the battery as being low as it treats anything under 31% as low, this leads to the user constantly getting a "Keyboard battery is low" warning from GNOME3, which is very annoying.
This commit fixes this by changing the low threshold to anything under 30%, which I assume is what Windows does.
--- drivers/hid/hid-logitech-hidpp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/hid/hid-logitech-hidpp.c +5 -1
@@ -910,7 +910,11 @@ static int hidpp_map_battery_level(int capacity) {if (capacity <11 )return POWER_SUPPLY_CAPACITY_LEVEL_CRITICAL ; -else if (capacity <31 ) +/* +* The spec says this should be < 31 but some devices report 30 +* with brand new batteries and Windows reports 30 as "Good". +*/ +else if (capacity <30 )return POWER_SUPPLY_CAPACITY_LEVEL_LOW ;else if (capacity <81 )return POWER_SUPPLY_CAPACITY_LEVEL_NORMAL ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 162/193 spi: tegra114: reset controller on probe
In reply to Greg Kroah-Hartman[ Upstream commit 019194933339b3e9b486639c8cb3692020844d65 ]
Fixes: SPI driver can be built as module so perform SPI controller reset on probe to make sure it is in valid state before initiating transfer.
--- drivers/spi/spi-tegra114.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-)
drivers/spi/spi-tegra114.c +18 -14
@@ -1067,27 +1067,19 @@ static int tegra_spi_probe(struct platform_device *pdev) spi_irq =platform_get_irq (pdev,0 ); tspi->irq = spi_irq; - ret =request_threaded_irq (tspi->irq, tegra_spi_isr, - tegra_spi_isr_thread,IRQF_ONESHOT , -dev_name (&pdev->dev), tspi); -if (ret <0 ) { -dev_err (&pdev->dev,"Failed to register ISR for IRQ %d\n" , - tspi->irq); - goto exit_free_master; - } tspi->clk =devm_clk_get (&pdev->dev,"spi" );if (IS_ERR (tspi->clk)) {dev_err (&pdev->dev,"can not get clock\n" ); ret =PTR_ERR (tspi->clk); - goto exit_free_irq; + goto exit_free_master; } tspi->rst =devm_reset_control_get_exclusive (&pdev->dev,"spi" );if (IS_ERR (tspi->rst)) {dev_err (&pdev->dev,"can not get reset\n" ); ret =PTR_ERR (tspi->rst); - goto exit_free_irq; + goto exit_free_master; } tspi->max_buf_size =SPI_FIFO_DEPTH <<2 ;
@@ -1095,7 +1087,7 @@ static int tegra_spi_probe(struct platform_device *pdev) ret =tegra_spi_init_dma_param (tspi, true);if (ret <0 ) - goto exit_free_irq; + goto exit_free_master; ret =tegra_spi_init_dma_param (tspi, false);if (ret <0 ) goto exit_rx_dma_free;
@@ -1117,18 +1109,32 @@ static int tegra_spi_probe(struct platform_device *pdev)dev_err (&pdev->dev,"pm runtime get failed, e = %d\n" , ret); goto exit_pm_disable; } + +reset_control_assert (tspi->rst); +udelay (2 ); +reset_control_deassert (tspi->rst); tspi->def_command1_reg =SPI_M_S ;tegra_spi_writel (tspi, tspi->def_command1_reg,SPI_COMMAND1 );pm_runtime_put (&pdev->dev); + ret =request_threaded_irq (tspi->irq, tegra_spi_isr, + tegra_spi_isr_thread,IRQF_ONESHOT , +dev_name (&pdev->dev), tspi); +if (ret <0 ) { +dev_err (&pdev->dev,"Failed to register ISR for IRQ %d\n" , + tspi->irq); + goto exit_pm_disable; + } master->dev.of_node = pdev->dev.of_node; ret =devm_spi_register_master (&pdev->dev, master);if (ret <0 ) {dev_err (&pdev->dev,"can not register to master err %d\n" , ret); - goto exit_pm_disable; + goto exit_free_irq; }return ret; +exit_free_irq: +free_irq (spi_irq, tspi); exit_pm_disable:pm_runtime_disable (&pdev->dev);if (!pm_runtime_status_suspended (&pdev->dev))
@@ -1136,8 +1142,6 @@ static int tegra_spi_probe(struct platform_device *pdev)tegra_spi_deinit_dma_param (tspi, false); exit_rx_dma_free:tegra_spi_deinit_dma_param (tspi, true); -exit_free_irq: -free_irq (spi_irq, tspi); exit_free_master:spi_master_put (master);return ret;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 163/193 kobject: Dont trigger kobject_uevent(KOBJ_REMOVE) twice.
In reply to Greg Kroah-Hartman[ Upstream commit c03a0fd0b609e2f5c669c2b7f27c8e1928e9196e ]
syzbot is hitting use-after-free bug in uinput module [1]. This is because kobject_uevent(KOBJ_REMOVE) is called again due to commit 0f4dafc0563c6c49 ("Kobject: auto-cleanup on final unref") after memory allocation fault injection made kobject_uevent(KOBJ_REMOVE) from device_del() from input_unregister_device() fail, while uinput_destroy_device() is expecting that kobject_uevent(KOBJ_REMOVE) is not called after device_del() from input_unregister_device() completed.
That commit intended to catch cases where nobody even attempted to send "remove" uevents. But there is no guarantee that an event will ultimately be sent. We are at the point of no return as far as the rest of the kernel is concerned; there are no repeats or do-overs.
Also, it is not clear whether some subsystem depends on that commit. If no subsystem depends on that commit, it will be better to remove the state_{add,remove}_uevent_sent logic. But we don't want to risk a regression (in a patch which will be backported) by trying to remove that logic. Therefore, as a first step, let's avoid the use-after-free bug by making sure that kobject_uevent(KOBJ_REMOVE) won't be triggered twice.
[1] https://syzkaller.appspot.com/bug?id=8b17c134fe938bbddd75a45afaa9e68af43a362d
--- lib/kobject_uevent.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
lib/kobject_uevent.c +7 -4
@@ -340,6 +340,13 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,struct uevent_sock *ue_sk;#endif +/* +* Mark "remove" event done regardless of result, for some subsystems +* do not want to re-trigger "remove" event via automatic cleanup. +*/ +if (action ==KOBJ_REMOVE ) + kobj->state_remove_uevent_sent =1 ; +pr_debug ("kobject: '%s' (%p): %s\n" ,kobject_name (kobj), kobj, __func__);
@@ -441,10 +448,6 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action, kobj->state_add_uevent_sent =1 ;break ; -case KOBJ_REMOVE : - kobj->state_remove_uevent_sent =1 ; -break ; -case KOBJ_UNBIND :zap_modalias_env (env);break ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 164/193 media: video-mux: fix null pointer dereferences
In reply to Greg Kroah-Hartman[ Upstream commit aeb0d0f581e2079868e64a2e5ee346d340376eae ]
devm_kcalloc may fail and return a null pointer. The fix returns -ENOMEM upon failures to avoid null pointer dereferences.
--- drivers/media/platform/video-mux.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/media/platform/video-mux.c +5 -0
@@ -242,9 +242,14 @@ static int video_mux_probe(struct platform_device *pdev) vmux->active =-1 ; vmux->pads =devm_kcalloc (dev, num_pads,sizeof (*vmux->pads),GFP_KERNEL ); +if (!vmux->pads) +return -ENOMEM ; + vmux->format_mbus =devm_kcalloc (dev, num_pads,sizeof (*vmux->format_mbus),GFP_KERNEL ); +if (!vmux->format_mbus) +return -ENOMEM ;for (i =0 ; i < num_pads -1 ; i++) vmux->pads[i].flags =MEDIA_PAD_FL_SINK ;
Signature · 1 line
2.20.1