4.14.147-stable review
Subsystems (7)
Greg Kroah-Hartman
maintainercover 4.14.147-stable review
This is the start of the stable review cycle for the 4.14.147 release. There are 185 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 05 Oct 2019 03:37:47 PM 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.147-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.147-rc1
Filipe Manana <[email protected]>
Btrfs: fix race setting up and completing qgroup rescan workers
Lu Fengqi <[email protected]>
btrfs: qgroup: Drop quota_root and fs_info parameters from update_qgroup_status_item
Yafang Shao <[email protected]>
mm/compaction.c: clear total_{migrate,free}_scanned before scanning a new zone
NeilBrown <[email protected]>
md/raid0: avoid RAID0 data corruption due to layout confusion.
Pavel Shilovsky <[email protected]>
CIFS: Fix oplock handling for SMB 2.1+ protocols
Murphy Zhou <[email protected]>
CIFS: fix max ea value size
Chris Brandt <[email protected]>
i2c: riic: Clear NACK in tend isr
Laurent Vivier <[email protected]>
hwrng: core - don't wait on add_early_randomness()
Chao Yu <[email protected]>
quota: fix wrong condition in is_quota_modification()
Theodore Ts'o <[email protected]>
ext4: fix punch hole for inline_data file systems
Rakesh Pandit <[email protected]>
ext4: fix warning inside ext4_convert_unwritten_extents_endio
Tetsuo Handa <[email protected]>
/dev/mem: Bail out upon SIGKILL.
Denis Kenzior <[email protected]>
cfg80211: Purge frame registrations on iftype change
NeilBrown <[email protected]>
md: only call set_in_sync() when it is expected to succeed.
NeilBrown <[email protected]>
md: don't report active array_state until after revalidate_disk() completes.
Xiao Ni <[email protected]>
md/raid6: Set R5_ReadError when there is read failure on parity disk
Qu Wenruo <[email protected]>
btrfs: qgroup: Fix the wrong target io_tree when freeing reserved data space
Nikolay Borisov <[email protected]>
btrfs: Relinquish CPUs in btrfs_compare_trees
Filipe Manana <[email protected]>
Btrfs: fix use-after-free when using the tree modification log
Mark Salyzyn <[email protected]>
ovl: filter of trusted xattr results in audit
Michal Hocko <[email protected]>
memcg, kmem: do not fail __GFP_NOFAIL charges
Tetsuo Handa <[email protected]>
memcg, oom: don't require __GFP_FS when invoking memcg OOM killer
Bob Peterson <[email protected]>
gfs2: clear buf_in_tr when ending a transaction in sweep_bh_for_rgrps
Mark Brown <[email protected]>
regulator: Defer init completion for a while after late_initcall
Thadeu Lima de Souza Cascardo <[email protected]>
alarmtimer: Use EOPNOTSUPP instead of ENOTSUPP
Shawn Lin <[email protected]>
arm64: dts: rockchip: limit clock rate of MMC controllers for RK3328
Luis Araneda <[email protected]>
ARM: zynq: Use memcpy_toio instead of memcpy on smp bring-up
Lihua Yao <[email protected]>
ARM: samsung: Fix system restart on S3C6410
Amadeusz Sławiński <[email protected]>
ASoC: Intel: Fix use of potentially uninitialized variable
Amadeusz Sławiński <[email protected]>
ASoC: Intel: Skylake: Use correct function to access iomem space
Amadeusz Sławiński <[email protected]>
ASoC: Intel: NHLT: Fix debug print format
Kees Cook <[email protected]>
binfmt_elf: Do not move brk for INTERP-less ET_EXEC
Hans de Goede <[email protected]>
media: sn9c20x: Add MSI MS-1039 laptop to flip_dmi_table
Sean Christopherson <[email protected]>
KVM: x86: Manually calculate reserved bits when loading PDPTRS
Jan Dakinevich <[email protected]>
KVM: x86: set ctxt->have_exception in x86_decode_insn()
Jan Dakinevich <[email protected]>
KVM: x86: always stop emulation on page fault
Nathan Chancellor <[email protected]>
x86/retpolines: Fix up backport of a9d57ef15cbe
Helge Deller <[email protected]>
parisc: Disable HP HSC-PCI Cards to prevent kernel crash
Vasily Averin <[email protected]>
fuse: fix missing unlock_page in fuse_writepage()
Tom Briden <[email protected]>
ALSA: hda/realtek - Fixup mute led on HP Spectre x360
Joonwon Kang <[email protected]>
randstruct: Check member structs in is_pure_ops_struct()
Ira Weiny <[email protected]>
IB/hfi1: Define variables as unsigned long to fix KASAN warning
Vincent Whitchurch <[email protected]>
printk: Do not lose last line in kmsg buffer dump
Martin Wilck <[email protected]>
scsi: scsi_dh_rdac: zero cdb in send_mode_select()
Takashi Sakamoto <[email protected]>
ALSA: firewire-tascam: check intermediate state of clock status and retry
Takashi Sakamoto <[email protected]>
ALSA: firewire-tascam: handle error code when getting current source of clock
MyungJoo Ham <[email protected]>
PM / devfreq: passive: fix compiler warning
Sakari Ailus <[email protected]>
media: omap3isp: Set device on omap3isp subdevs
Qu Wenruo <[email protected]>
btrfs: extent-tree: Make sure we only allocate extents from block groups with the same type
Takashi Iwai <[email protected]>
ALSA: hda/realtek - Blacklist PC beep for Lenovo ThinkCentre M73/93
Tomas Bortoli <[email protected]>
media: ttusb-dec: Fix info-leak in ttusb_dec_send_command()
Ahzo <[email protected]>
drm/amd/powerplay/smu7: enforce minimal VBITimeout (v2)
Takashi Iwai <[email protected]>
ALSA: hda - Drop unsol event handler for Intel HDMI codecs
Kai-Heng Feng <[email protected]>
e1000e: add workaround for possible stalled packet
Kevin Easton <[email protected]>
libertas: Add missing sentinel at end of if_usb.c fw_table
Nigel Croxon <[email protected]>
raid5: don't increment read_errors on EILSEQ return
Al Cooper <[email protected]>
mmc: sdhci: Fix incorrect switch to HS mode
Ulf Hansson <[email protected]>
mmc: core: Clarify sdio_irq_pending flag for MMC_CAP2_SDIO_IRQ_NOTHREAD
Guoqing Jiang <[email protected]>
raid5: don't set STRIPE_HANDLE to stripe which is in batch list
Peter Ujfalusi <[email protected]>
ASoC: dmaengine: Make the pcm->name equal to pcm->id if the name is not set
Harald Freudenberger <[email protected]>
s390/crypto: xts-aes-s390 fix extra run-time crypto self tests finding
Masami Hiramatsu <[email protected]>
kprobes: Prohibit probing on BUG() and WARN() address
Peter Ujfalusi <[email protected]>
dmaengine: ti: edma: Do not reset reserved paRAM slots
Yufen Yu <[email protected]>
md/raid1: fail run raid1 array when active disk less than one
Wang Shenran <[email protected]>
hwmon: (acpi_power_meter) Change log level for 'unsafe software power cap'
Wenwen Wang <[email protected]>
ACPI / PCI: fix acpi_pci_irq_enable() memory leak
Wenwen Wang <[email protected]>
ACPI: custom_method: fix memory leaks
Marek Szyprowski <[email protected]>
ARM: dts: exynos: Mark LDO10 as always-on on Peach Pit/Pi Chromebooks
Tzvetomir Stoyanov <[email protected]>
libtraceevent: Change users plugin directory
Eric Dumazet <[email protected]>
iommu/iova: Avoid false sharing on fq_timer_on
Qian Cai <[email protected]>
iommu/amd: Silence warnings under memory pressure
Tom Wu <[email protected]>
nvmet: fix data units read and written counters in SMART log
Mark Rutland <[email protected]>
arm64: kpti: ensure patched kernel text is fetched from PoU
Al Stone <[email protected]>
ACPI / CPPC: do not require the _PSD method
Katsuhiro Suzuki <[email protected]>
ASoC: es8316: fix headphone mixer volume table
Mauro Carvalho Chehab <[email protected]>
media: ov9650: add a sanity check
Benjamin Peterson <[email protected]>
perf trace beauty ioctl: Fix off-by-one error in cmd->string table
Maciej S. Szmigiero <[email protected]>
media: saa7134: fix terminology around saa7134_i2c_eeprom_md7134_gate()
Wenwen Wang <[email protected]>
media: cpia2_usb: fix memory leaks
Wenwen Wang <[email protected]>
media: saa7146: add cleanup in hexium_attach()
Hans Verkuil <[email protected]>
media: cec-notifier: clear cec_adap in cec_notifier_unregister
Kamil Konieczny <[email protected]>
PM / devfreq: exynos-bus: Correct clock enable sequence
Leonard Crestez <[email protected]>
PM / devfreq: passive: Use non-devm notifiers
Yazen Ghannam <[email protected]>
EDAC/amd64: Decode syndrome before translating address
Yazen Ghannam <[email protected]>
EDAC/amd64: Recognize DRAM device type ECC capability
Gerald BAEZA <[email protected]>
libperf: Fix alignment trap with xyarray contents in 'perf stat'
Wenwen Wang <[email protected]>
media: dvb-core: fix a memory leak bug
Mike Christie <[email protected]>
nbd: add missing config put
Hans Verkuil <[email protected]>
media: hdpvr: add terminating 0 at end of string
Hans Verkuil <[email protected]>
media: radio/si470x: kill urb on error
André Draszik <[email protected]>
ARM: dts: imx7d: cl-som-imx7: make ethernet work again
Arnd Bergmann <[email protected]>
net: lpc-enet: fix printk format strings
Ezequiel Garcia <[email protected]>
media: imx: mipi csi-2: Don't fail if initial state times-out
Sakari Ailus <[email protected]>
media: omap3isp: Don't set streaming state on random subdevs
Ezequiel Garcia <[email protected]>
media: i2c: ov5645: Fix power sequence
Tan Xiaojun <[email protected]>
perf record: Support aarch64 random socket_id assignment
Arnd Bergmann <[email protected]>
dmaengine: iop-adma: use correct printk format strings
Darius Rad <[email protected]>
media: rc: imon: Allow iMON RC protocol for ffdc 7e device
Geert Uytterhoeven <[email protected]>
media: fdp1: Reduce FCP not found message level to debug
Matthias Brugger <[email protected]>
media: mtk-mdp: fix reference count on old device tree
Arnaldo Carvalho de Melo <[email protected]>
perf test vfs_getname: Disable ~/.perfconfig to get default output
Hans Verkuil <[email protected]>
media: gspca: zero usb_buf on error
Phil Auld <[email protected]>
sched/fair: Use rq_lock/unlock in online_fair_sched_group
Xiaofei Tan <[email protected]>
efi: cper: print AER info of PCIe fatal error
Stephen Douthit <[email protected]>
EDAC, pnd2: Fix ioremap() size in dnv_rd_reg()
Jiri Slaby <[email protected]>
ACPI / processor: don't print errors for processorIDs == 0xff
Valdis Kletnieks <[email protected]>
RAS: Fix prototype warnings
Guoqing Jiang <[email protected]>
md: don't set In_sync if array is frozen
Guoqing Jiang <[email protected]>
md: don't call spare_active in md_reap_sync_thread if all member devices can't work
Yufen Yu <[email protected]>
md/raid1: end bio when the device faulty
Kuninori Morimoto <[email protected]>
ASoC: rsnd: don't call clk_get_rate() under atomic context
Dan Carpenter <[email protected]>
EDAC/altera: Use the proper type for the IRQ status bits
chenzefeng <[email protected]>
ia64:unwind: fix double free for mod->arch.init_unw_table
Ard van Breemen <[email protected]>
ALSA: usb-audio: Skip bSynchAddress endpoint check if it is invalid
Vinod Koul <[email protected]>
base: soc: Export soc_device_register/unregister APIs
Oliver Neukum <[email protected]>
media: iguanair: add sanity checks
Robert Richter <[email protected]>
EDAC/mc: Fix grain_bits calculation
Jia-Ju Bai <[email protected]>
ALSA: i2c: ak4xxx-adda: Fix a possible null pointer dereference in build_adc_controls()
Takashi Iwai <[email protected]>
ALSA: hda - Show the fatal CORB/RIRB error more clearly
Thomas Gleixner <[email protected]>
x86/apic: Soft disable APIC before initializing it
Grzegorz Halat <[email protected]>
x86/reboot: Always use NMI fallback when shutdown via reboot vector IPI fails
Juri Lelli <[email protected]>
sched/core: Fix CPU controller for !RT_GROUP_SCHED
Vincent Guittot <[email protected]>
sched/fair: Fix imbalance due to CPU affinity
Fabio Estevam <[email protected]>
media: i2c: ov5640: Check for devm_gpiod_get_optional() error
Luke Nowakowski-Krijger <[email protected]>
media: hdpvr: Add device num check and handling
Wen Yang <[email protected]>
media: exynos4-is: fix leaked of_node references
Sean Young <[email protected]>
media: mtk-cir: lower de-glitch counter for rc-mm protocol
Arnd Bergmann <[email protected]>
media: dib0700: fix link error for dibx000_i2c_set_speed
Nick Stoughton <[email protected]>
leds: leds-lp5562 allow firmware files up to the maximum length
Stefan Wahren <[email protected]>
dmaengine: bcm2835: Print error in case setting DMA mask fails
Oleksandr Suvorov <[email protected]>
ASoC: sgtl5000: Fix charge pump source assignment
Axel Lin <[email protected]>
regulator: lm363x: Fix off-by-one n_voltages for lm3632 ldo_vpos/ldo_vneg
Chris Wilson <[email protected]>
ALSA: hda: Flush interrupts on disabling
Ori Nimron <[email protected]>
nfc: enforce CAP_NET_RAW for raw sockets
Ori Nimron <[email protected]>
ieee802154: enforce CAP_NET_RAW for raw sockets
Ori Nimron <[email protected]>
ax25: enforce CAP_NET_RAW for raw sockets
Ori Nimron <[email protected]>
appletalk: enforce CAP_NET_RAW for raw sockets
Ori Nimron <[email protected]>
mISDN: enforce CAP_NET_RAW for raw sockets
Bodong Wang <[email protected]>
net/mlx5: Add device ID of upcoming BlueField-2
Oliver Neukum <[email protected]>
usbnet: sanity checking of packet sizes and device mtu
Bjørn Mork <[email protected]>
usbnet: ignore endpoints with invalid wMaxPacketSize
Stephen Hemminger <[email protected]>
skge: fix checksum byte order
Eric Dumazet <[email protected]>
sch_netem: fix a divide by zero in tabledist()
Takeshi Misawa <[email protected]>
ppp: Fix memory leak in ppp_write
Li RongQing <[email protected]>
openvswitch: change type of UPCALL_PID attribute to NLA_UNSPEC
Cong Wang <[email protected]>
net_sched: add max len check for TCA_KIND
Davide Caratti <[email protected]>
net/sched: act_sample: don't push mac header on ip6gre ingress
Bjorn Andersson <[email protected]>
net: qrtr: Stop rx_worker before freeing node
Peter Mamonov <[email protected]>
net/phy: fix DP83865 10 Mbps HDX loopback disable function
Xin Long <[email protected]>
macsec: drop skb sk before calling gro_cells_receive
Bjørn Mork <[email protected]>
cdc_ncm: fix divide-by-zero caused by invalid wMaxPacketSize
Uwe Kleine-König <[email protected]>
arcnet: provide a buffer big enough to actually receive packets
Chao Yu <[email protected]>
f2fs: use generic EFSBADCRC/EFSCORRUPTED
Jian-Hong Pan <[email protected]>
Bluetooth: btrtl: Additional Realtek 8822CE Bluetooth devices
Darrick J. Wong <[email protected]>
xfs: don't crash on null attr fork xfs_bmapi_read
Hans de Goede <[email protected]>
ACPI: video: Add new hw_changes_brightness quirk, set it on PB Easynote MZ35
Stephen Hemminger <[email protected]>
net: don't warn in inet diag when IPV6 is disabled
Chris Wilson <[email protected]>
drm: Flush output polling on shutdown
Chao Yu <[email protected]>
f2fs: fix to do sanity check on segment bitmap of LFS curseg
Mikulas Patocka <[email protected]>
dm zoned: fix invalid memory access
Chao Yu <[email protected]>
Revert "f2fs: avoid out-of-range memory access"
zhengbin <[email protected]>
blk-mq: move cancel of requeue_work to the front of blk_exit_queue
Dexuan Cui <[email protected]>
PCI: hv: Avoid use of hv_pci_dev->pci_slot after freeing it
Surbhi Palande <[email protected]>
f2fs: check all the data segments against all node ones
Marc Zyngier <[email protected]>
irqchip/gic-v3-its: Fix LPI release for Multi-MSI devices
Waiman Long <[email protected]>
locking/lockdep: Add debug_locks check in __lock_downgrade()
David Lechner <[email protected]>
power: supply: sysfs: ratelimit property read error message
Nathan Chancellor <[email protected]>
pinctrl: sprd: Use define directive for sprd_pinconf_params values
Josh Poimboeuf <[email protected]>
objtool: Clobber user CFLAGS variable
Takashi Iwai <[email protected]>
ALSA: hda - Apply AMD controller workaround for Raven platform
Shih-Yuan Lee (FourDollars) <[email protected]>
ALSA: hda - Add laptop imic fixup for ASUS M9V laptop
Will Deacon <[email protected]>
arm64: kpti: Whitelist Cortex-A CPUs that don't implement the CSV3 field
Takashi Iwai <[email protected]>
ASoC: fsl: Fix of-node refcount unbalance in fsl_ssi_probe_from_dt()
Marco Felsch <[email protected]>
media: tvp5150: fix switch exit in set control handler
Emmanuel Grumbach <[email protected]>
iwlwifi: mvm: send BCAST management frames to the right station
Gustavo A. R. Silva <[email protected]>
crypto: talitos - fix missing break in switch statement
Tokunori Ikegami <[email protected]>
mtd: cfi_cmdset_0002: Use chip_good() to retry in do_write_oneword()
Alan Stern <[email protected]>
HID: hidraw: Fix invalid read in hidraw_ioctl
Alan Stern <[email protected]>
HID: logitech: Fix general protection fault caused by Logitech driver
Roderick Colenbrander <[email protected]>
HID: sony: Fix memory corruption issue on cleanup.
Alan Stern <[email protected]>
HID: prodikeys: Fix general protection fault during probe
Jack Morgenstein <[email protected]>
IB/core: Add an unbound WQ type to the new CQ API
Rolf Eike Beer <[email protected]>
objtool: Query pkg-config for libelf location
Greg Kurz <[email protected]>
powerpc/xive: Fix bogus error code returned by OPAL
Marcel Holtmann <[email protected]>
Revert "Bluetooth: validate BLE connection interval updates"
-------------
Diffstat:
Makefile | 8 ++-- arch/arm/boot/dts/exynos5420-peach-pit.dts | 1 + arch/arm/boot/dts/exynos5800-peach-pi.dts | 1 + arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 4 +- arch/arm/mach-zynq/platsmp.c | 2 +- arch/arm/plat-samsung/watchdog-reset.c | 1 + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 3 ++ arch/arm64/kernel/cpufeature.c | 5 +++ arch/arm64/mm/proc.S | 9 +++++ arch/ia64/kernel/module.c | 8 +++- arch/powerpc/include/asm/opal.h | 2 +- arch/powerpc/platforms/powernv/opal-wrappers.S | 2 +- arch/powerpc/sysdev/xive/native.c | 11 +++++ arch/s390/crypto/aes_s390.c | 6 +++ arch/x86/Makefile | 2 +- arch/x86/kernel/apic/apic.c | 8 ++++ arch/x86/kernel/smp.c | 46 ++++++++++++--------- arch/x86/kvm/emulate.c | 2 + arch/x86/kvm/x86.c | 21 ++++++++-- block/blk-mq.c | 2 - block/blk-sysfs.c | 3 ++ drivers/acpi/acpi_processor.c | 10 +++-- drivers/acpi/acpi_video.c | 37 +++++++++++++++++ drivers/acpi/cppc_acpi.c | 6 ++- drivers/acpi/custom_method.c | 5 ++- drivers/acpi/pci_irq.c | 4 +- drivers/base/soc.c | 2 + drivers/block/nbd.c | 4 +- drivers/bluetooth/btusb.c | 3 ++ drivers/char/hw_random/core.c | 2 +- drivers/char/mem.c | 21 ++++++++++ drivers/crypto/talitos.c | 1 + drivers/devfreq/exynos-bus.c | 31 +++++++------- drivers/devfreq/governor_passive.c | 7 ++-- drivers/dma/bcm2835-dma.c | 4 +- drivers/dma/edma.c | 9 +++-- drivers/dma/iop-adma.c | 18 ++++----- drivers/edac/altera_edac.c | 4 +- drivers/edac/amd64_edac.c | 28 ++++++++----- drivers/edac/edac_mc.c | 8 +++- drivers/edac/pnd2_edac.c | 7 +++- drivers/firmware/efi/cper.c | 15 +++++++ drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 5 +++ drivers/gpu/drm/drm_probe_helper.c | 9 ++++- drivers/hid/hid-lg.c | 10 +++-- drivers/hid/hid-lg4ff.c | 1 - drivers/hid/hid-prodikeys.c | 12 +++++- drivers/hid/hid-sony.c | 2 +- drivers/hid/hidraw.c | 2 +- drivers/hwmon/acpi_power_meter.c | 4 +- drivers/i2c/busses/i2c-riic.c | 1 + drivers/infiniband/core/cq.c | 8 +++- drivers/infiniband/core/device.c | 15 ++++++- drivers/infiniband/core/mad.c | 2 +- drivers/infiniband/hw/hfi1/mad.c | 45 +++++++++------------ drivers/iommu/amd_iommu.c | 4 +- drivers/iommu/iova.c | 4 +- drivers/irqchip/irq-gic-v3-its.c | 9 ++--- drivers/isdn/mISDN/socket.c | 2 + drivers/leds/leds-lp5562.c | 6 ++- drivers/md/dm-zoned-target.c | 2 - drivers/md/md.c | 28 +++++++++---- drivers/md/md.h | 3 ++ drivers/md/raid0.c | 33 ++++++++++++++- drivers/md/raid0.h | 14 +++++++ drivers/md/raid1.c | 39 ++++++++++++------ drivers/md/raid5.c | 10 +++-- drivers/media/cec/cec-notifier.c | 2 + drivers/media/dvb-core/dvbdev.c | 4 +- drivers/media/i2c/ov5640.c | 5 +++ drivers/media/i2c/ov5645.c | 26 ++++++++---- drivers/media/i2c/ov9650.c | 5 +++ drivers/media/i2c/tvp5150.c | 2 +- drivers/media/pci/saa7134/saa7134-i2c.c | 12 ++++-- drivers/media/pci/saa7146/hexium_gemini.c | 3 ++ drivers/media/platform/exynos4-is/fimc-is.c | 1 + drivers/media/platform/exynos4-is/media-dev.c | 2 + drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 4 +- drivers/media/platform/omap3isp/isp.c | 8 ++++ drivers/media/platform/omap3isp/ispccdc.c | 1 + drivers/media/platform/omap3isp/ispccp2.c | 1 + drivers/media/platform/omap3isp/ispcsi2.c | 1 + drivers/media/platform/omap3isp/isppreview.c | 1 + drivers/media/platform/omap3isp/ispresizer.c | 1 + drivers/media/platform/omap3isp/ispstat.c | 2 + drivers/media/platform/rcar_fdp1.c | 2 +- drivers/media/radio/si470x/radio-si470x-usb.c | 5 ++- drivers/media/rc/iguanair.c | 15 ++++--- drivers/media/rc/imon.c | 7 +++- drivers/media/rc/mtk-cir.c | 8 ++++ drivers/media/usb/cpia2/cpia2_usb.c | 4 ++ drivers/media/usb/dvb-usb/dib0700_devices.c | 8 ++++ drivers/media/usb/gspca/konica.c | 5 +++ drivers/media/usb/gspca/nw80x.c | 5 +++ drivers/media/usb/gspca/ov519.c | 10 +++++ drivers/media/usb/gspca/ov534.c | 5 +++ drivers/media/usb/gspca/ov534_9.c | 1 + drivers/media/usb/gspca/se401.c | 5 +++ drivers/media/usb/gspca/sn9c20x.c | 12 ++++++ drivers/media/usb/gspca/sonixb.c | 5 +++ drivers/media/usb/gspca/sonixj.c | 5 +++ drivers/media/usb/gspca/spca1528.c | 5 +++ drivers/media/usb/gspca/sq930x.c | 5 +++ drivers/media/usb/gspca/sunplus.c | 5 +++ drivers/media/usb/gspca/vc032x.c | 5 +++ drivers/media/usb/gspca/w996Xcf.c | 5 +++ drivers/media/usb/hdpvr/hdpvr-core.c | 13 +++++- drivers/media/usb/ttusb-dec/ttusb_dec.c | 2 +- drivers/mmc/core/sdio_irq.c | 9 +++-- drivers/mmc/host/sdhci.c | 4 +- drivers/mtd/chips/cfi_cmdset_0002.c | 18 ++++++--- drivers/net/arcnet/arcnet.c | 31 +++++++------- drivers/net/ethernet/intel/e1000e/ich8lan.c | 10 +++++ drivers/net/ethernet/intel/e1000e/ich8lan.h | 2 +- drivers/net/ethernet/marvell/skge.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 1 + drivers/net/ethernet/nxp/lpc_eth.c | 13 +++--- drivers/net/macsec.c | 1 + drivers/net/phy/national.c | 9 +++-- drivers/net/ppp/ppp_generic.c | 2 + drivers/net/usb/cdc_ncm.c | 6 ++- drivers/net/usb/usbnet.c | 8 ++++ drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 2 +- drivers/net/wireless/marvell/libertas/if_usb.c | 3 +- drivers/nvme/target/admin-cmd.c | 14 ++++--- drivers/parisc/dino.c | 24 +++++++++++ drivers/pci/host/pci-hyperv.c | 2 +- drivers/pinctrl/sprd/pinctrl-sprd.c | 6 +-- drivers/power/supply/power_supply_sysfs.c | 3 +- drivers/ras/cec.c | 1 + drivers/ras/debugfs.c | 2 + drivers/regulator/core.c | 42 ++++++++++++++----- drivers/regulator/lm363x-regulator.c | 2 +- drivers/scsi/device_handler/scsi_dh_rdac.c | 2 + drivers/staging/media/imx/imx6-mipi-csi2.c | 12 ++---- fs/binfmt_elf.c | 3 +- fs/btrfs/ctree.c | 5 ++- fs/btrfs/extent-tree.c | 8 ++++ fs/btrfs/qgroup.c | 45 ++++++++++++--------- fs/cifs/smb2ops.c | 5 +++ fs/cifs/xattr.c | 2 +- fs/ext4/extents.c | 4 +- fs/ext4/inode.c | 9 +++++ fs/f2fs/checkpoint.c | 8 +++- fs/f2fs/data.c | 8 ++-- fs/f2fs/f2fs.h | 4 ++ fs/f2fs/inline.c | 4 +- fs/f2fs/inode.c | 4 +- fs/f2fs/node.c | 4 +- fs/f2fs/recovery.c | 2 +- fs/f2fs/segment.c | 49 +++++++++++++++++++---- fs/f2fs/segment.h | 4 +- fs/f2fs/super.c | 6 +-- fs/fuse/file.c | 1 + fs/gfs2/bmap.c | 1 + fs/overlayfs/inode.c | 3 +- fs/xfs/libxfs/xfs_bmap.c | 29 ++++++++++---- include/linux/bug.h | 5 +++ include/linux/quotaops.h | 2 +- include/rdma/ib_verbs.h | 9 +++-- kernel/kprobes.c | 3 +- kernel/locking/lockdep.c | 3 ++ kernel/printk/printk.c | 2 +- kernel/sched/core.c | 4 -- kernel/sched/fair.c | 11 ++--- kernel/time/alarmtimer.c | 4 +- mm/compaction.c | 35 ++++++---------- mm/memcontrol.c | 10 +++++ mm/oom_kill.c | 5 ++- net/appletalk/ddp.c | 5 +++ net/ax25/af_ax25.c | 2 + net/bluetooth/hci_event.c | 5 --- net/bluetooth/l2cap_core.c | 9 +---- net/ieee802154/socket.c | 3 ++ net/ipv4/raw_diag.c | 3 -- net/nfc/llcp_sock.c | 7 +++- net/openvswitch/datapath.c | 2 +- net/qrtr/qrtr.c | 1 + net/sched/act_sample.c | 1 + net/sched/sch_api.c | 3 +- net/sched/sch_netem.c | 2 +- net/wireless/util.c | 1 + scripts/gcc-plugins/randomize_layout_plugin.c | 10 ++--- sound/firewire/tascam/tascam-pcm.c | 3 ++ sound/firewire/tascam/tascam-stream.c | 42 ++++++++++++------- sound/hda/hdac_controller.c | 2 + sound/i2c/other/ak4xxx-adda.c | 7 ++-- sound/pci/hda/hda_controller.c | 5 ++- sound/pci/hda/hda_intel.c | 5 +-- sound/pci/hda/patch_analog.c | 1 + sound/pci/hda/patch_hdmi.c | 9 ++++- sound/pci/hda/patch_realtek.c | 22 ++++++++++ sound/soc/codecs/es8316.c | 7 +++- sound/soc/codecs/sgtl5000.c | 15 ++++--- sound/soc/fsl/fsl_ssi.c | 5 ++- sound/soc/intel/common/sst-ipc.c | 2 + sound/soc/intel/skylake/skl-debug.c | 2 +- sound/soc/intel/skylake/skl-nhlt.c | 2 +- sound/soc/sh/rcar/adg.c | 21 +++++++--- sound/soc/soc-generic-dmaengine-pcm.c | 6 +++ sound/usb/pcm.c | 1 + tools/lib/traceevent/Makefile | 6 +-- tools/lib/traceevent/event-plugin.c | 2 +- tools/objtool/Makefile | 7 +++- tools/perf/tests/shell/trace+probe_vfs_getname.sh | 4 ++ tools/perf/trace/beauty/ioctl.c | 2 +- tools/perf/util/header.c | 4 +- tools/perf/util/xyarray.h | 3 +- 208 files changed, 1200 insertions(+), 437 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/185 Revert "Bluetooth: validate BLE connection interval updates"
From: Marcel Holtmann <[email protected]>
[ Upstream commit 68d19d7d995759b96169da5aac313363f92a9075 ]
This reverts commit c49a8682fc5d298d44e8d911f4fa14690ea9485e.
There are devices which require low connection intervals for usable operation including keyboards and mice. Forcing a static connection interval for these types of devices has an impact in latency and causes a regression.
--- net/bluetooth/hci_event.c | 5 ----- net/bluetooth/l2cap_core.c | 9 +-------- 2 files changed, 1 insertion(+), 13 deletions(-)
net/bluetooth/hci_event.c +0 -5
@@ -5089,11 +5089,6 @@ static void hci_le_remote_conn_param_req_evt(struct hci_dev *hdev,return send_conn_param_neg_reply (hdev, handle,HCI_ERROR_UNKNOWN_CONN_ID ); -if (min < hcon->le_conn_min_interval || - max > hcon->le_conn_max_interval) -return send_conn_param_neg_reply (hdev, handle, -HCI_ERROR_INVALID_LL_PARAMS ); -if (hci_check_conn_params (min, max, latency, timeout))return send_conn_param_neg_reply (hdev, handle,HCI_ERROR_INVALID_LL_PARAMS );
net/bluetooth/l2cap_core.c +1 -8
@@ -5287,14 +5287,7 @@ static inline int l2cap_conn_param_update_req(struct l2cap_conn *conn,memset (&rsp,0 ,sizeof (rsp)); -if (min < hcon->le_conn_min_interval || - max > hcon->le_conn_max_interval) { -BT_DBG ("requested connection interval exceeds current bounds." ); - err = -EINVAL ; - }else { - err =hci_check_conn_params (min, max, latency, to_multiplier); - } - + err =hci_check_conn_params (min, max, latency, to_multiplier);if (err) rsp.result =cpu_to_le16 (L2CAP_CONN_PARAM_REJECTED );else
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 2/185 powerpc/xive: Fix bogus error code returned by OPAL
In reply to Greg Kroah-HartmanFrom: Greg Kurz <[email protected]>
commit 6ccb4ac2bf8a35c694ead92f8ac5530a16e8f2c8 upstream.
There's a bug in skiboot that causes the OPAL_XIVE_ALLOCATE_IRQ call to return the 32-bit value 0xffffffff when OPAL has run out of IRQs. Unfortunatelty, OPAL return values are signed 64-bit entities and errors are supposed to be negative. If that happens, the linux code confusingly treats 0xffffffff as a valid IRQ number and panics at some point.
A fix was recently merged in skiboot:
e97391ae2bb5 ("xive: fix return value of opal_xive_allocate_irq()")
but we need a workaround anyway to support older skiboots already in the field.
Internally convert 0xffffffff to OPAL_RESOURCE which is the usual error returned upon resource exhaustion.
(groug: fix arch/powerpc/platforms/powernv/opal-wrappers.S instead of
non-existing arch/powerpc/platforms/powernv/opal-call.c)
--- arch/powerpc/include/asm/opal.h | 2 +- arch/powerpc/platforms/powernv/opal-wrappers.S | 2 +- arch/powerpc/sysdev/xive/native.c | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-)
arch/powerpc/include/asm/opal.h +1 -1
@@ -266,7 +266,7 @@ int64_t opal_xive_get_vp_info(uint64_t vint64_t opal_xive_set_vp_info (uint64_t vp,uint64_t flags,uint64_t report_cl_pair); -int64_t opal_xive_allocate_irq (uint32_t chip_id); +int64_t opal_xive_allocate_irq_raw (uint32_t chip_id);int64_t opal_xive_free_irq (uint32_t girq);int64_t opal_xive_sync (uint32_t type,uint32_t id);int64_t opal_xive_dump (uint32_t type,uint32_t id);
arch/powerpc/platforms/powernv/opal-wrappers.S +1 -1
@@ -301,7 +301,7 @@ OPAL_CALL(opal_xive_set_queue_info, OPA OPAL_CALL(opal_xive_donate_page, OPAL_XIVE_DONATE_PAGE); OPAL_CALL(opal_xive_alloc_vp_block, OPAL_XIVE_ALLOCATE_VP_BLOCK); OPAL_CALL(opal_xive_free_vp_block, OPAL_XIVE_FREE_VP_BLOCK); -OPAL_CALL(opal_xive_allocate_irq, OPAL_XIVE_ALLOCATE_IRQ); +OPAL_CALL(opal_xive_allocate_irq_raw, OPAL_XIVE_ALLOCATE_IRQ); OPAL_CALL(opal_xive_free_irq, OPAL_XIVE_FREE_IRQ); OPAL_CALL(opal_xive_get_vp_info, OPAL_XIVE_GET_VP_INFO); OPAL_CALL(opal_xive_set_vp_info, OPAL_XIVE_SET_VP_INFO);
arch/powerpc/sysdev/xive/native.c +11 -0
@@ -234,6 +234,17 @@ static bool xive_native_match(struct devreturn of_device_is_compatible (node,"ibm,opal-xive-vc" ); } +static s64 opal_xive_allocate_irq (u32 chip_id) +{ +s64 irq =opal_xive_allocate_irq_raw (chip_id); + +/* +* Old versions of skiboot can incorrectly return 0xffffffff to +* indicate no space, fix it up here. +*/ +return irq ==0xffffffff ?OPAL_RESOURCE : irq; +} +#ifdef CONFIG_SMP static int xive_native_get_ipi (unsigned int cpu,struct xive_cpu *xc) {
Greg Kroah-Hartman
maintainerPATCH 3/185 objtool: Query pkg-config for libelf location
In reply to Greg Kroah-HartmanFrom: Rolf Eike Beer <[email protected]>
commit 056d28d135bca0b1d0908990338e00e9dadaf057 upstream.
If it is not in the default location, compilation fails at several points.
--- Makefile | 4 +++- tools/objtool/Makefile | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-)
Makefile +3 -1
@@ -949,9 +949,11 @@ mod_sign_cmd = true endif export mod_sign_cmd +HOST_LIBELF_LIBS = $(shell pkg-config libelf --libs 2>/dev/null || echo -lelf) + ifdef CONFIG_STACK_VALIDATION has_libelf := $(call try-run,\ - echo "int main() {}" | $(HOSTCC) -xc -o /dev/null -lelf -,1,0) + echo "int main() {}" | $(HOSTCC) -xc -o /dev/null $(HOST_LIBELF_LIBS) -,1,0) ifeq ($(has_libelf),1) objtool_target := tools/objtool FORCE else
tools/objtool/Makefile +5 -2
@@ -26,14 +26,17 @@ LIBSUBCMD = $(LIBSUBCMD_OUTPUT)libsubcm OBJTOOL := $(OUTPUT)objtool OBJTOOL_IN := $(OBJTOOL)-in.o +LIBELF_FLAGS := $(shell pkg-config libelf --cflags 2>/dev/null) +LIBELF_LIBS := $(shell pkg-config libelf --libs 2>/dev/null || echo -lelf) + all: $(OBJTOOL) INCLUDES := -I$(srctree)/tools/include \ -I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi \ -I$(srctree)/tools/objtool/arch/$(ARCH)/include WARNINGS := $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-packed -CFLAGS += -Wall -Werror $(WARNINGS) -fomit-frame-pointer -O2 -g $(INCLUDES) -LDFLAGS += -lelf $(LIBSUBCMD) +CFLAGS += -Wall -Werror $(WARNINGS) -fomit-frame-pointer -O2 -g $(INCLUDES) $(LIBELF_FLAGS) +LDFLAGS += $(LIBELF_LIBS) $(LIBSUBCMD) # Allow old libelf to be used: elfshdr := $(shell echo '$(pound)include <libelf.h>' | $(CC) $(CFLAGS) -x c -E - | grep elf_getshdr)
Greg Kroah-Hartman
maintainerPATCH 4/185 IB/core: Add an unbound WQ type to the new CQ API
In reply to Greg Kroah-HartmanFrom: Jack Morgenstein <[email protected]>
commit f794809a7259dfaa3d47d90ef5a86007cf48b1ce upstream.
The upstream kernel commit cited below modified the workqueue in the new CQ API to be bound to a specific CPU (instead of being unbound). This caused ALL users of the new CQ API to use the same bound WQ.
Specifically, MAD handling was severely delayed when the CPU bound to the WQ was busy handling (higher priority) interrupts.
This caused a delay in the MAD "heartbeat" response handling, which resulted in ports being incorrectly classified as "down".
To fix this, add a new "unbound" WQ type to the new CQ API, so that users have the option to choose either a bound WQ or an unbound WQ.
For MADs, choose the new "unbound" WQ.
--- drivers/infiniband/core/cq.c | 8 ++++++-- drivers/infiniband/core/device.c | 15 ++++++++++++++- drivers/infiniband/core/mad.c | 2 +- include/rdma/ib_verbs.h | 9 ++++++--- 4 files changed, 27 insertions(+), 7 deletions(-)
drivers/infiniband/core/cq.c +6 -2
@@ -112,12 +112,12 @@ static void ib_cq_poll_work(struct work_ IB_POLL_BATCH);if (completed >=IB_POLL_BUDGET_WORKQUEUE ||ib_req_notify_cq (cq,IB_POLL_FLAGS ) >0 ) -queue_work (ib_comp_wq, &cq->work); +queue_work (cq->comp_wq, &cq->work); }static void ib_cq_completion_workqueue (struct ib_cq *cq,void *private) { -queue_work (ib_comp_wq, &cq->work); +queue_work (cq->comp_wq, &cq->work); }/**
@@ -169,9 +169,12 @@ struct ib_cq *ib_alloc_cq(struct ib_deviib_req_notify_cq (cq,IB_CQ_NEXT_COMP );break ;case IB_POLL_WORKQUEUE : +case IB_POLL_UNBOUND_WORKQUEUE : cq->comp_handler = ib_cq_completion_workqueue;INIT_WORK (&cq->work, ib_cq_poll_work);ib_req_notify_cq (cq,IB_CQ_NEXT_COMP ); + cq->comp_wq = (cq->poll_ctx ==IB_POLL_WORKQUEUE ) ? + ib_comp_wq : ib_comp_unbound_wq;break ;default : ret = -EINVAL ;
@@ -206,6 +209,7 @@ void ib_free_cq(struct ib_cq *cq)irq_poll_disable (&cq->iop);break ;case IB_POLL_WORKQUEUE : +case IB_POLL_UNBOUND_WORKQUEUE :cancel_work_sync (&cq->work);break ;default :
drivers/infiniband/core/device.c +14 -1
@@ -61,6 +61,7 @@ struct ib_client_data { };struct workqueue_struct *ib_comp_wq; +struct workqueue_struct *ib_comp_unbound_wq;struct workqueue_struct *ib_wq;EXPORT_SYMBOL_GPL (ib_wq);
@@ -1202,10 +1203,19 @@ static int __init ib_core_init(void) goto err; } + ib_comp_unbound_wq = +alloc_workqueue ("ib-comp-unb-wq" , +WQ_UNBOUND |WQ_HIGHPRI |WQ_MEM_RECLAIM | +WQ_SYSFS ,WQ_UNBOUND_MAX_ACTIVE ); +if (!ib_comp_unbound_wq) { + ret = -ENOMEM ; + goto err_comp; + } + ret =class_register (&ib_class);if (ret) {pr_warn ("Couldn't create InfiniBand device class\n" ); - goto err_comp; + goto err_comp_unbound; } ret =rdma_nl_init ();
@@ -1254,6 +1264,8 @@ err_ibnl:rdma_nl_exit (); err_sysfs:class_unregister (&ib_class); +err_comp_unbound: +destroy_workqueue (ib_comp_unbound_wq); err_comp:destroy_workqueue (ib_comp_wq); err:
@@ -1272,6 +1284,7 @@ static void __exit ib_core_cleanup(void)addr_cleanup ();rdma_nl_exit ();class_unregister (&ib_class); +destroy_workqueue (ib_comp_unbound_wq);destroy_workqueue (ib_comp_wq);/* Make sure that any pending umem accounting work is done. */ destroy_workqueue (ib_wq);
drivers/infiniband/core/mad.c +1 -1
@@ -3178,7 +3178,7 @@ static int ib_mad_port_open(struct ib_de } port_priv->cq =ib_alloc_cq (port_priv->device, port_priv, cq_size,0 , -IB_POLL_WORKQUEUE ); +IB_POLL_UNBOUND_WORKQUEUE );if (IS_ERR (port_priv->cq)) {dev_err (&device->dev,"Couldn't create ib_mad CQ\n" ); ret =PTR_ERR (port_priv->cq);
include/rdma/ib_verbs.h +6 -3
@@ -68,6 +68,7 @@extern struct workqueue_struct *ib_wq;extern struct workqueue_struct *ib_comp_wq; +extern struct workqueue_struct *ib_comp_unbound_wq;union ib_gid {u8 raw[16 ];
@@ -1544,9 +1545,10 @@ struct ib_ah {typedef void (*ib_comp_handler )(struct ib_cq *cq,void *cq_context);enum ib_poll_context { -IB_POLL_DIRECT ,/* caller context, no hw completions */ -IB_POLL_SOFTIRQ ,/* poll from softirq context */ -IB_POLL_WORKQUEUE ,/* poll from workqueue */ +IB_POLL_DIRECT ,/* caller context, no hw completions */ +IB_POLL_SOFTIRQ ,/* poll from softirq context */ +IB_POLL_WORKQUEUE ,/* poll from workqueue */ +IB_POLL_UNBOUND_WORKQUEUE ,/* poll from unbound workqueue */ };struct ib_cq {
@@ -1563,6 +1565,7 @@ struct ib_cq {struct irq_poll iop;struct work_struct work; }; +struct workqueue_struct *comp_wq; };struct ib_srq {
Greg Kroah-Hartman
maintainerPATCH 5/185 HID: prodikeys: Fix general protection fault during probe
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
commit 98375b86c79137416e9fd354177b85e768c16e56 upstream.
The syzbot fuzzer provoked a general protection fault in the hid-prodikeys driver:
kasan: CONFIG_KASAN_INLINE enabled
kasan: GPF could be caused by NULL-ptr deref or user memory access
general protection fault: 0000 [#1] SMP KASAN CPU: 0 PID: 12 Comm: kworker/0:1 Not tainted 5.3.0-rc5+ #28 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Workqueue: usb_hub_wq hub_event RIP: 0010:pcmidi_submit_output_report drivers/hid/hid-prodikeys.c:300 [inline] RIP: 0010:pcmidi_set_operational drivers/hid/hid-prodikeys.c:558 [inline] RIP: 0010:pcmidi_snd_initialise drivers/hid/hid-prodikeys.c:686 [inline] RIP: 0010:pk_probe+0xb51/0xfd0 drivers/hid/hid-prodikeys.c:836 Code: 0f 85 50 04 00 00 48 8b 04 24 4c 89 7d 10 48 8b 58 08 e8 b2 53 e4 fc
48 8b 54 24 20 48 b8 00 00 00 00 00 fc ff df 48 c1 ea 03 <80> 3c 02 00 0f 85 13 04 00 00 48 ba 00 00 00 00 00 fc ff df 49 8b
The problem is caused by the fact that pcmidi_get_output_report() will return an error if the HID device doesn't provide the right sort of output report, but pcmidi_set_operational() doesn't bother to check the return code and assumes the function call always succeeds.
This patch adds the missing check and aborts the probe operation if necessary.
--- drivers/hid/hid-prodikeys.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/hid/hid-prodikeys.c +10 -2
@@ -556,10 +556,14 @@ static void pcmidi_setup_extra_keys(static int pcmidi_set_operational (struct pcmidi_snd *pm) { +int rc; +if (pm->ifnum !=1 )return 0 ;/* only set up ONCE for interace 1 */ -pcmidi_get_output_report (pm); + rc =pcmidi_get_output_report (pm); +if (rc <0 ) +return rc;pcmidi_submit_output_report (pm,0xc1 );return 0 ; }
@@ -688,7 +692,11 @@ static int pcmidi_snd_initialise(structspin_lock_init (&pm->rawmidi_in_lock);init_sustain_timers (pm); -pcmidi_set_operational (pm); + err =pcmidi_set_operational (pm); +if (err <0 ) { +pk_error ("failed to find output report\n" ); + goto fail_register; + }/* register it */ err =snd_card_register (card);
Greg Kroah-Hartman
maintainerPATCH 6/185 HID: sony: Fix memory corruption issue on cleanup.
In reply to Greg Kroah-HartmanFrom: Roderick Colenbrander <[email protected]>
commit 2bcdacb70327013ca2066bfcf2af1009eff01f1d upstream.
The sony driver is not properly cleaning up from potential failures in sony_input_configured. Currently it calls hid_hw_stop, while hid_connect is still running. This is not a good idea, instead hid_hw_stop should be moved to sony_probe. Similar changes were recently made to Logitech drivers, which were also doing improper cleanup.
--- drivers/hid/hid-sony.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hid/hid-sony.c +1 -1
@@ -2710,7 +2710,6 @@ err_stop:kfree (sc->output_report_dmabuf);sony_remove_dev_list (sc);sony_release_device_id (sc); -hid_hw_stop (hdev);return ret; }
@@ -2772,6 +2771,7 @@ static int sony_probe(struct hid_device*/ if (!(hdev->claimed &HID_CLAIMED_INPUT )) {hid_err (hdev,"failed to claim input\n" ); +hid_hw_stop (hdev);return -ENODEV ; }
Greg Kroah-Hartman
maintainerPATCH 7/185 HID: logitech: Fix general protection fault caused by Logitech driver
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
commit 5f9242775bb61f390f0885f23fc16397262c7538 upstream.
The syzbot fuzzer found a general protection fault in the HID subsystem:
kasan: CONFIG_KASAN_INLINE enabled
kasan: GPF could be caused by NULL-ptr deref or user memory access
general protection fault: 0000 [#1] SMP KASAN CPU: 0 PID: 3715 Comm: syz-executor.3 Not tainted 5.2.0-rc6+ #15 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:__pm_runtime_resume+0x49/0x180 drivers/base/power/runtime.c:1069 Code: ed 74 d5 fe 45 85 ed 0f 85 9a 00 00 00 e8 6f 73 d5 fe 48 8d bd c1 02 00 00 48 b8 00 00 00 00 00 fc ff df 48 89 fa 48 c1 ea 03 <0f> b6 04 02 48 89 fa 83 e2 07 38 d0 7f 08 84 c0 0f 85 fe 00 00 00 RSP: 0018:ffff8881d99d78e0 EFLAGS: 00010202 RAX: dffffc0000000000 RBX: 0000000000000020 RCX: ffffc90003f3f000 RDX: 0000000416d8686d RSI: ffffffff82676841 RDI: 00000020b6c3436a RBP: 00000020b6c340a9 R08: ffff8881c6d64800 R09: fffffbfff0e84c25 R10: ffff8881d99d7940 R11: ffffffff87426127 R12: 0000000000000004 R13: 0000000000000000 R14: ffff8881d9b94000 R15: ffffffff897f9048 FS: 00007f047f542700(0000) GS:ffff8881db200000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000001b30f21000 CR3: 00000001ca032000 CR4: 00000000001406f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: pm_runtime_get_sync include/linux/pm_runtime.h:226 [inline] usb_autopm_get_interface+0x1b/0x50 drivers/usb/core/driver.c:1707 usbhid_power+0x7c/0xe0 drivers/hid/usbhid/hid-core.c:1234 hid_hw_power include/linux/hid.h:1038 [inline] hidraw_open+0x20d/0x740 drivers/hid/hidraw.c:282 chrdev_open+0x219/0x5c0 fs/char_dev.c:413 do_dentry_open+0x497/0x1040 fs/open.c:778 do_last fs/namei.c:3416 [inline] path_openat+0x1430/0x3ff0 fs/namei.c:3533 do_filp_open+0x1a1/0x280 fs/namei.c:3563 do_sys_open+0x3c0/0x580 fs/open.c:1070 do_syscall_64+0xb7/0x560 arch/x86/entry/common.c:301 entry_SYSCALL_64_after_hwframe+0x49/0xbe
It turns out the fault was caused by a bug in the HID Logitech driver, which violates the requirement that every pathway calling hid_hw_start() must also call hid_hw_stop(). This patch fixes the bug by making sure the requirement is met.
--- drivers/hid/hid-lg.c | 10 ++++++---- drivers/hid/hid-lg4ff.c | 1 - 2 files changed, 6 insertions(+), 5 deletions(-)
drivers/hid/hid-lg.c +6 -4
@@ -761,7 +761,7 @@ static int lg_probe(struct hid_device *hif (!buf) { ret = -ENOMEM ; - goto err_free; + goto err_stop; } ret = hid_hw_raw_request(hdev, buf[0], buf, sizeof(cbuf),
@@ -793,9 +793,12 @@ static int lg_probe(struct hid_device *h ret =lg4ff_init (hdev);if (ret) - goto err_free; + goto err_stop;return 0 ; + +err_stop: +hid_hw_stop (hdev); err_free:kfree (drv_data);return ret;
@@ -806,8 +809,7 @@ static void lg_remove(struct hid_devicestruct lg_drv_data *drv_data =hid_get_drvdata (hdev);if (drv_data->quirks &LG_FF4 )lg4ff_deinit (hdev); -else -hid_hw_stop (hdev); +hid_hw_stop (hdev);kfree (drv_data); }
drivers/hid/hid-lg4ff.c +0 -1
@@ -1485,7 +1485,6 @@ int lg4ff_deinit(struct hid_device *hid) } }#endif -hid_hw_stop (hid); drv_data->device_props =NULL ;kfree (entry);
Greg Kroah-Hartman
maintainerPATCH 8/185 HID: hidraw: Fix invalid read in hidraw_ioctl
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
commit 416dacb819f59180e4d86a5550052033ebb6d72c upstream.
The syzbot fuzzer has reported a pair of problems in the hidraw_ioctl() function: slab-out-of-bounds read and use-after-free read. An example of the first:
BUG: KASAN: slab-out-of-bounds in strlen+0x79/0x90 lib/string.c:525 Read of size 1 at addr ffff8881c8035f38 by task syz-executor.4/2833 CPU: 1 PID: 2833 Comm: syz-executor.4 Not tainted 5.3.0-rc2+ #1 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+0xca/0x13e lib/dump_stack.c:113 print_address_description+0x6a/0x32c mm/kasan/report.c:351 __kasan_report.cold+0x1a/0x33 mm/kasan/report.c:482 kasan_report+0xe/0x12 mm/kasan/common.c:612 strlen+0x79/0x90 lib/string.c:525 strlen include/linux/string.h:281 [inline] hidraw_ioctl+0x245/0xae0 drivers/hid/hidraw.c:446 vfs_ioctl fs/ioctl.c:46 [inline] file_ioctl fs/ioctl.c:509 [inline] do_vfs_ioctl+0xd2d/0x1330 fs/ioctl.c:696 ksys_ioctl+0x9b/0xc0 fs/ioctl.c:713 __do_sys_ioctl fs/ioctl.c:720 [inline] __se_sys_ioctl fs/ioctl.c:718 [inline] __x64_sys_ioctl+0x6f/0xb0 fs/ioctl.c:718 do_syscall_64+0xb7/0x580 arch/x86/entry/common.c:296 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x459829 Code: fd b7 fb ff c3 66 2e 0f 1f 84 00 00 00 00 00 66 90 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 0f 83 cb b7 fb ff c3 66 2e 0f 1f 84 00 00 00 00
RSP: 002b:00007f7a68f6dc78 EFLAGS: 00000246 ORIG_RAX: 0000000000000010
RAX: ffffffffffffffda RBX: 0000000000000003 RCX: 0000000000459829
RDX: 0000000000000000 RSI: 0000000080404805 RDI: 0000000000000004
RBP: 000000000075bf20 R08: 0000000000000000 R09: 0000000000000000
R10: 0000000000000000 R11: 0000000000000246 R12: 00007f7a68f6e6d4
R13: 00000000004c21de R14: 00000000004d5620 R15: 00000000ffffffff
The two problems have the same cause: hidraw_ioctl() fails to test whether the device has been removed. This patch adds the missing test.
--- drivers/hid/hidraw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hid/hidraw.c +1 -1
@@ -378,7 +378,7 @@ static long hidraw_ioctl(struct file *fimutex_lock (&minors_lock); dev = hidraw_table[minor]; -if (!dev) { +if (!dev || !dev->exist) { ret = -ENODEV ; goto out; }
Greg Kroah-Hartman
maintainerPATCH 9/185 mtd: cfi_cmdset_0002: Use chip_good() to retry in do_write_oneword()
In reply to Greg Kroah-HartmanFrom: Tokunori Ikegami <[email protected]>
commit 37c673ade35c707d50583b5b25091ff8ebdeafd7 upstream.
As reported by the OpenWRT team, write requests sometimes fail on some platforms.
Currently to check the state chip_ready() is used correctly as described by the flash memory S29GL256P11TFI01 datasheet.
Also chip_good() is used to check if the write is succeeded and it was implemented by the commit fb4a90bfcd6d8 ("[MTD] CFI-0002 - Improve error checking").
But actually the write failure is caused on some platforms and also it can be fixed by using chip_good() to check the state and retry instead. Also it seems that it is caused after repeated about 1,000 times to retry the write one word with the reset command.
By using chip_good() to check the state to be done it can be reduced the retry with reset.
It is depended on the actual flash chip behavior so the root cause is unknown.
--- drivers/mtd/chips/cfi_cmdset_0002.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/mtd/chips/cfi_cmdset_0002.c +12 -6
@@ -1628,29 +1628,35 @@ static int __xipram do_write_oneword(strcontinue ; } -if (time_after (jiffies, timeo) && !chip_ready (map, adr)){ +/* +* We check "time_after" and "!chip_good" before checking +* "chip_good" to avoid the failure due to scheduling. +*/ +if (time_after (jiffies, timeo) && !chip_good (map, adr, datum)) {xip_enable (map, chip, adr);printk (KERN_WARNING "MTD %s(): software timeout\n" , __func__);xip_disable (map, chip, adr); + ret = -EIO ;break ; } -if (chip_ready (map, adr)) +if (chip_good (map, adr, datum))break ;/* Latency issues. Drop the lock, wait a while and retry */ UDELAY (map, chip, adr,1 ); } +/* Did we succeed? */ -if (!chip_good (map, adr, datum)) { +if (ret) {/* reset on all failures. */ map_write ( map,CMD (0xF0 ), chip->start );/* FIXME - should have reset delay before continuing */ -if (++retry_cnt <=MAX_RETRIES ) +if (++retry_cnt <=MAX_RETRIES ) { + ret =0 ; goto retry; - - ret = -EIO ; + } }xip_enable (map, chip, adr); op_done:
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
Greg Kroah-Hartman
maintainerPATCH 10/185 crypto: talitos - fix missing break in switch statement
In reply to Greg Kroah-HartmanFrom: Gustavo A. R. Silva <[email protected]>
commit 5fc194ea6d34dfad9833d3043ce41d6c52aff39a upstream.
Add missing break statement in order to prevent the code from falling through to case CRYPTO_ALG_TYPE_AHASH.
--- drivers/crypto/talitos.c | 1 + 1 file changed, 1 insertion(+)
drivers/crypto/talitos.c +1 -0
@@ -3043,6 +3043,7 @@ static int talitos_remove(struct platforbreak ;case CRYPTO_ALG_TYPE_AEAD :crypto_unregister_aead (&t_alg->algt.alg.aead); +break ;case CRYPTO_ALG_TYPE_AHASH :crypto_unregister_ahash (&t_alg->algt.alg.hash);break ;
Greg Kroah-Hartman
maintainerPATCH 11/185 iwlwifi: mvm: send BCAST management frames to the right station
In reply to Greg Kroah-HartmanFrom: Emmanuel Grumbach <[email protected]>
commit 65c3b582ecab7a403efdf08babbf87fdbe27369c upstream.
Probe responses were sent to the multicast station while they should be routed to the broadcast station. This has no negative effect since the frame was still routed to the right queue, but it looked very fishy to send a frame to a (queue, station) tuple where 'queue' is not mapped to 'station'.
--- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/tx.c +1 -1
@@ -651,7 +651,7 @@ int iwl_mvm_tx_skb_non_sta(struct iwl_mvif (info.control.vif->type ==NL80211_IFTYPE_P2P_DEVICE || info.control.vif->type ==NL80211_IFTYPE_AP || info.control.vif->type ==NL80211_IFTYPE_ADHOC ) { -if (info.control.vif->type ==NL80211_IFTYPE_P2P_DEVICE ) +if (!ieee80211_is_data (hdr->frame_control)) sta_id = mvmvif->bcast_sta.sta_id;else sta_id = mvmvif->mcast_sta.sta_id;
Greg Kroah-Hartman
maintainerPATCH 12/185 media: tvp5150: fix switch exit in set control handler
In reply to Greg Kroah-HartmanFrom: Marco Felsch <[email protected]>
commit 2d29bcc8c237874795175b2930fa9a45a115175a upstream.
The function only consists of a single switch case block without a default case. Unsupported control requests are indicated by the -EINVAL return code trough the last return statement at the end of the function. So exiting just the switch case block returns the -EINVAL error code but the hue control is supported and a zero should be returned instead.
Replace the break by a 'return 0' to fix this behaviour.
control handler")
--- drivers/media/i2c/tvp5150.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/tvp5150.c +1 -1
@@ -827,7 +827,7 @@ static int tvp5150_s_ctrl(struct v4l2_ctreturn 0 ;case V4L2_CID_HUE :tvp5150_write (sd,TVP5150_HUE_CTL , ctrl->val); -break ; +return 0 ;case V4L2_CID_TEST_PATTERN : decoder->enable = ctrl->val ? false : true;tvp5150_selmux (sd);
Greg Kroah-Hartman
maintainerPATCH 13/185 ASoC: fsl: Fix of-node refcount unbalance in fsl_ssi_probe_from_dt()
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 2757970f6d0d0a112247600b23d38c0c728ceeb3 upstream.
The node obtained from of_find_node_by_path() has to be unreferenced after the use, but we forgot it for the root node.
--- sound/soc/fsl/fsl_ssi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/soc/fsl/fsl_ssi.c +4 -1
@@ -1418,6 +1418,7 @@ static int fsl_ssi_probe(struct platformstruct fsl_ssi_private *ssi_private;int ret =0 ;struct device_node *np = pdev->dev.of_node; +struct device_node *root;const struct of_device_id *of_id;const char *p, *sprop;const uint32_t *iprop;
@@ -1605,7 +1606,9 @@ static int fsl_ssi_probe(struct platform* device tree. We also pass the address of the CPU DAI driver * structure. */ - sprop =of_get_property (of_find_node_by_path ("/" ),"compatible" ,NULL ); + root =of_find_node_by_path ("/" ); + sprop =of_get_property (root,"compatible" ,NULL ); +of_node_put (root);/* Sometimes the compatible name has a "fsl," prefix, so we strip it. */ p =strrchr (sprop,',' );if (p)
Greg Kroah-Hartman
maintainerPATCH 14/185 arm64: kpti: Whitelist Cortex-A CPUs that dont implement the CSV3 field
In reply to Greg Kroah-HartmanFrom: Will Deacon <[email protected]>
commit 2a355ec25729053bb9a1a89b6c1d1cdd6c3b3fb1 upstream.
While the CSV3 field of the ID_AA64_PFR0 CPU ID register can be checked to see if a CPU is susceptible to Meltdown and therefore requires kpti to be enabled, existing CPUs do not implement this field.
We therefore whitelist all unaffected Cortex-A CPUs that do not implement the CSV3 field.
--- arch/arm64/kernel/cpufeature.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm64/kernel/cpufeature.c +5 -0
@@ -838,6 +838,11 @@ static bool unmap_kernel_at_el0(const stswitch (read_cpuid_id () &MIDR_CPU_MODEL_MASK ) {case MIDR_CAVIUM_THUNDERX2 :case MIDR_BRCM_VULCAN : +case MIDR_CORTEX_A53 : +case MIDR_CORTEX_A55 : +case MIDR_CORTEX_A57 : +case MIDR_CORTEX_A72 : +case MIDR_CORTEX_A73 :return false; }
Greg Kroah-Hartman
maintainerPATCH 15/185 ALSA: hda - Add laptop imic fixup for ASUS M9V laptop
In reply to Greg Kroah-HartmanFrom: Shih-Yuan Lee (FourDollars) <[email protected]>
commit 7b485d175631be676424aedb8cd2f66d0c93da78 upstream.
The same fixup to enable laptop imic is needed for ASUS M9V with AD1986A codec like another HP machine.
--- sound/pci/hda/patch_analog.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_analog.c +1 -0
@@ -370,6 +370,7 @@ static const struct hda_fixup ad1986a_fistatic const struct snd_pci_quirk ad1986a_fixup_tbl[] = {SND_PCI_QUIRK (0x103c ,0x30af ,"HP B2800" ,AD1986A_FIXUP_LAPTOP_IMIC ), +SND_PCI_QUIRK (0x1043 ,0x1153 ,"ASUS M9V" ,AD1986A_FIXUP_LAPTOP_IMIC ),SND_PCI_QUIRK (0x1043 ,0x1443 ,"ASUS Z99He" ,AD1986A_FIXUP_EAPD ),SND_PCI_QUIRK (0x1043 ,0x1447 ,"ASUS A8JN" ,AD1986A_FIXUP_EAPD ),SND_PCI_QUIRK_MASK (0x1043 ,0xff00 ,0x8100 ,"ASUS P5" ,AD1986A_FIXUP_3STACK ),
Greg Kroah-Hartman
maintainerPATCH 16/185 ALSA: hda - Apply AMD controller workaround for Raven platform
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit d2c63b7dfd06788a466d5ec8a850491f084c5fc2 upstream.
It's reported that the garbled sound on HP Envy x360 13z-ag000 (Ryzen Laptop) is fixed by the same workaround applied to other AMD chips. Update the driver_data entry for Raven (1022:15e3) to use the newly introduced preset, AZX_DCAPS_PRESET_AMD_SB. Since it already contains AZX_DCAPS_PM_RUNTIME, we can drop that bit, too.
--- sound/pci/hda/hda_intel.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
sound/pci/hda/hda_intel.c +1 -2
@@ -2586,8 +2586,7 @@ static const struct pci_device_id azx_id AZX_DCAPS_PM_RUNTIME },/* AMD Raven */ { PCI_DEVICE(0x1022, 0x15e3), - .driver_data =AZX_DRIVER_GENERIC |AZX_DCAPS_PRESET_ATI_SB | - AZX_DCAPS_PM_RUNTIME }, + .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_AMD_SB }, /* ATI HDMI */ { PCI_DEVICE(0x1002, 0x0002), .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS },
Greg Kroah-Hartman
maintainerPATCH 17/185 objtool: Clobber user CFLAGS variable
In reply to Greg Kroah-HartmanFrom: Josh Poimboeuf <[email protected]>
commit f73b3cc39c84220e6dccd463b5c8279b03514646 upstream.
If the build user has the CFLAGS variable set in their environment, objtool blindly appends to it, which can cause unexpected behavior.
Clobber CFLAGS to ensure consistent objtool compilation behavior.
--- tools/objtool/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/objtool/Makefile +1 -1
@@ -35,7 +35,7 @@ INCLUDES := -I$(srctree)/tools/include \ -I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi \ -I$(srctree)/tools/objtool/arch/$(ARCH)/include WARNINGS := $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-packed -CFLAGS += -Wall -Werror $(WARNINGS) -fomit-frame-pointer -O2 -g $(INCLUDES) $(LIBELF_FLAGS) +CFLAGS := -Wall -Werror $(WARNINGS) -fomit-frame-pointer -O2 -g $(INCLUDES) $(LIBELF_FLAGS) LDFLAGS += $(LIBELF_LIBS) $(LIBSUBCMD) # Allow old libelf to be used:
Greg Kroah-Hartman
maintainerPATCH 18/185 pinctrl: sprd: Use define directive for sprd_pinconf_params values
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 957063c924736d4341e5d588757b9f31e8f6fa24 ]
Clang warns when one enumerated type is implicitly converted to another:
drivers/pinctrl/sprd/pinctrl-sprd.c:845:19: warning: implicit conversion from enumeration type 'enum sprd_pinconf_params' to different enumeration type 'enum pin_config_param' [-Wenum-conversion]
{"sprd,control", SPRD_PIN_CONFIG_CONTROL, 0},
~ ^~~~~~~~~~~~~~~~~~~~~~~
drivers/pinctrl/sprd/pinctrl-sprd.c:846:22: warning: implicit conversion
from enumeration type 'enum sprd_pinconf_params' to different
enumeration type 'enum pin_config_param' [-Wenum-conversion]
{"sprd,sleep-mode", SPRD_PIN_CONFIG_SLEEP_MODE, 0},
~ ^~~~~~~~~~~~~~~~~~~~~~~~~~It is expected that pinctrl drivers can extend pin_config_param because of the gap between PIN_CONFIG_END and PIN_CONFIG_MAX so this conversion isn't an issue. Most drivers that take advantage of this define the PIN_CONFIG variables as constants, rather than enumerated values. Do the same thing here so that Clang no longer warns.
--- drivers/pinctrl/sprd/pinctrl-sprd.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/pinctrl/sprd/pinctrl-sprd.c +2 -4
@@ -159,10 +159,8 @@ struct sprd_pinctrl {struct sprd_pinctrl_soc_info *info; }; -enum sprd_pinconf_params { -SPRD_PIN_CONFIG_CONTROL =PIN_CONFIG_END +1 , -SPRD_PIN_CONFIG_SLEEP_MODE =PIN_CONFIG_END +2 , -}; +#define SPRD_PIN_CONFIG_CONTROL (PIN_CONFIG_END + 1) +#define SPRD_PIN_CONFIG_SLEEP_MODE (PIN_CONFIG_END + 2)static int sprd_pinctrl_get_id_by_name (struct sprd_pinctrl *sprd_pctl,const char *name)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 19/185 power: supply: sysfs: ratelimit property read error message
In reply to Greg Kroah-HartmanFrom: David Lechner <[email protected]>
[ Upstream commit 87a2b65fc855e6be50f791c2ebbb492541896827 ]
This adds rate limiting to the message that is printed when reading a power supply property via sysfs returns an error. This will prevent userspace applications from unintentionally dDOSing the system by continuously reading a property that returns an error.
--- drivers/power/supply/power_supply_sysfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/power/supply/power_supply_sysfs.c +2 -1
@@ -91,7 +91,8 @@ static ssize_t power_supply_show_property(struct device *dev,dev_dbg (dev,"driver has no data for `%s' property\n" , attr->attr.name); else if (ret != -ENODEV && ret != -EAGAIN) -dev_err (dev,"driver failed to report `%s' property: %zd\n" , +dev_err_ratelimited (dev, +"driver failed to report `%s' property: %zd\n" , attr->attr.name, ret);return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 20/185 locking/lockdep: Add debug_locks check in __lock_downgrade()
In reply to Greg Kroah-HartmanFrom: Waiman Long <[email protected]>
[ Upstream commit 71492580571467fb7177aade19c18ce7486267f5 ]
Tetsuo Handa had reported he saw an incorrect "downgrading a read lock" warning right after a previous lockdep warning. It is likely that the previous warning turned off lock debugging causing the lockdep to have inconsistency states leading to the lock downgrade warning.
Fix that by add a check for debug_locks at the beginning of __lock_downgrade().
--- kernel/locking/lockdep.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/locking/lockdep.c +3 -0
@@ -3688,6 +3688,9 @@ static int __lock_downgrade(struct lockdunsigned int depth;int i; +if (unlikely (!debug_locks)) +return 0 ; + depth = curr->lockdep_depth;/* * This function is about (re)setting the class of a held lock,
Greg Kroah-Hartman
maintainerPATCH 21/185 irqchip/gic-v3-its: Fix LPI release for Multi-MSI devices
In reply to Greg Kroah-HartmanFrom: Marc Zyngier <[email protected]>
[ Upstream commit c9c96e30ecaa0aafa225aa1a5392cb7db17c7a82 ]
When allocating a range of LPIs for a Multi-MSI capable device, this allocation extended to the closest power of 2.
But on the release path, the interrupts are released one by one. This results in not releasing the "extra" range, leaking the its_device. Trying to reprobe the device will then fail.
Fix it by releasing the LPIs the same way we allocate them.
--- drivers/irqchip/irq-gic-v3-its.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/irqchip/irq-gic-v3-its.c +4 -5
@@ -2269,14 +2269,13 @@ static void its_irq_domain_free(struct irq_domain *domain, unsigned int virq,struct its_node *its = its_dev->its;int i; +bitmap_release_region (its_dev->event_map.lpi_map, +its_get_event_id (irq_domain_get_irq_data (domain, virq)), +get_count_order (nr_irqs)); +for (i =0 ; i < nr_irqs; i++) {struct irq_data *data =irq_domain_get_irq_data (domain, virq + i); -u32 event =its_get_event_id (data); - -/* Mark interrupt index as unused */ -clear_bit (event, its_dev->event_map.lpi_map); -/* Nuke the entry in the domain */ irq_domain_reset_irq_data (data); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 22/185 f2fs: check all the data segments against all node ones
In reply to Greg Kroah-HartmanFrom: Surbhi Palande <[email protected]>
[ Upstream commit 1166c1f2f69117ad254189ca781287afa6e550b6 ]
As a part of the sanity checking while mounting, distinct segment number assignment to data and node segments is verified. Fixing a small bug in this verification between node and data segments. We need to check all the data segments with all the node segments.
--- fs/f2fs/super.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/f2fs/super.c +2 -2
@@ -2027,11 +2027,11 @@ int sanity_check_ckpt(struct f2fs_sb_info *sbi) } }for (i =0 ; i <NR_CURSEG_NODE_TYPE ; i++) { -for (j = i; j <NR_CURSEG_DATA_TYPE ; j++) { +for (j =0 ; j <NR_CURSEG_DATA_TYPE ; j++) {if (le32_to_cpu (ckpt->cur_node_segno[i]) ==le32_to_cpu (ckpt->cur_data_segno[j])) {f2fs_msg (sbi->sb,KERN_ERR , -"Data segment (%u) and Data segment (%u)" +"Node segment (%u) and Data segment (%u)" " has the same segno: %u" , i, j,le32_to_cpu (ckpt->cur_node_segno[i]));return 1 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 23/185 PCI: hv: Avoid use of hv_pci_dev->pci_slot after freeing it
In reply to Greg Kroah-HartmanFrom: Dexuan Cui <[email protected]>
[ Upstream commit 533ca1feed98b0bf024779a14760694c7cb4d431 ]
The slot must be removed before the pci_dev is removed, otherwise a panic can happen due to use-after-free.
--- drivers/pci/host/pci-hyperv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/host/pci-hyperv.c +1 -1
@@ -2740,8 +2740,8 @@ static int hv_pci_remove(struct hv_device *hdev)/* Remove the bus from PCI's point of view. */ pci_lock_rescan_remove ();pci_stop_root_bus (hbus->pci_bus); -pci_remove_root_bus (hbus->pci_bus);hv_pci_remove_slots (hbus); +pci_remove_root_bus (hbus->pci_bus);pci_unlock_rescan_remove (); hbus->state = hv_pcibus_removed; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 24/185 blk-mq: move cancel of requeue_work to the front of blk_exit_queue
In reply to Greg Kroah-HartmanFrom: zhengbin <[email protected]>
[ Upstream commit e26cc08265dda37d2acc8394604f220ef412299d ]
blk_exit_queue will free elevator_data, while blk_mq_requeue_work will access it. Move cancel of requeue_work to the front of blk_exit_queue to avoid use-after-free.
blk_exit_queue blk_mq_requeue_work
__elevator_exit blk_mq_run_hw_queues
blk_mq_exit_sched blk_mq_run_hw_queue
dd_exit_queue blk_mq_hctx_has_pending
kfree(elevator_data) blk_mq_sched_has_work
dd_has_work
--- block/blk-mq.c | 2 -- block/blk-sysfs.c | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-)
block/blk-mq.c +0 -2
@@ -2294,8 +2294,6 @@ void blk_mq_release(struct request_queue *q)struct blk_mq_hw_ctx *hctx;unsigned int i; -cancel_delayed_work_sync (&q->requeue_work); -/* hctx kobj stays in hctx */ queue_for_each_hw_ctx (q, hctx, i) {if (!hctx)
block/blk-sysfs.c +3 -0
@@ -811,6 +811,9 @@ static void __blk_release_queue(struct work_struct *work)blk_free_queue_stats (q->stats); +if (q->mq_ops) +cancel_delayed_work_sync (&q->requeue_work); +blk_exit_rl (q, &q->root_rl);if (q->queue_tags)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 25/185 Revert "f2fs: avoid out-of-range memory access"
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit a37d0862d17411edb67677a580a6f505ec2225f6 ]
As Pavel Machek reported:
"We normally use -EUCLEAN to signal filesystem corruption. Plus, it is good idea to report it to the syslog and mark filesystem as "needing fsck" if filesystem can do that."
Still we need improve the original patch with:
- use unlikely keyword
- add message print
- return EUCLEAN
However, after rethink this patch, I don't think we should add such condition check here as below reasons:
- We have already checked the field in f2fs_sanity_check_ckpt(),
- If there is fs corrupt or security vulnerability, there is nothing to guarantee the field is integrated after the check, unless we do the check before each of its use, however no filesystem does that.
- We only have similar check for bitmap, which was added due to there is bitmap corruption happened on f2fs' runtime in product.
- There are so many key fields in SB/CP/NAT did have such check after f2fs_sanity_check_{sb,cp,..}.
So I propose to revert this unneeded check.
This reverts commit 56f3ce675103e3fb9e631cfb4131fc768bc23e9a.
--- fs/f2fs/segment.c | 5 ----- 1 file changed, 5 deletions(-)
fs/f2fs/segment.c +0 -5
@@ -2612,11 +2612,6 @@ static int read_compacted_summaries(struct f2fs_sb_info *sbi) seg_i =CURSEG_I (sbi, i); segno =le32_to_cpu (ckpt->cur_data_segno[i]); blk_off =le16_to_cpu (ckpt->cur_data_blkoff[i]); -if (blk_off >ENTRIES_IN_SUM ) { -f2fs_bug_on (sbi,1 ); -f2fs_put_page (page,1 ); -return -EFAULT ; - } seg_i->next_segno = segno;reset_curseg (sbi, i,0 ); seg_i->alloc_type = ckpt->alloc_type[i];
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 26/185 dm zoned: fix invalid memory access
In reply to Greg Kroah-HartmanFrom: Mikulas Patocka <[email protected]>
[ Upstream commit 0c8e9c2d668278652af028c3cc068c65f66342f4 ]
Commit 75d66ffb48efb30f2dd42f041ba8b39c5b2bd115 ("dm zoned: properly handle backing device failure") triggers a coverity warning:
*** CID 1452808: Memory - illegal accesses (USE_AFTER_FREE) /drivers/md/dm-zoned-target.c: 137 in dmz_submit_bio()
131 clone->bi_private = bioctx;
132
133 bio_advance(bio, clone->bi_iter.bi_size);
134
135 refcount_inc(&bioctx->ref);
136 generic_make_request(clone);
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
CID 1452808: Memory - illegal accesses (
USE_AFTER_FREE) Dereferencing freed pointer "clone".
137 if (clone->bi_status == BLK_STS_IOERR)
138 return -EIO;
139
140 if (bio_op(bio) == REQ_OP_WRITE && dmz_is_seq(zone))
141 zone->wp_block += nr_blocks;
142
The "clone" bio may be processed and freed before the check "clone->bi_status == BLK_STS_IOERR" - so this check can access invalid memory.
--- drivers/md/dm-zoned-target.c | 2 -- 1 file changed, 2 deletions(-)
drivers/md/dm-zoned-target.c +0 -2
@@ -133,8 +133,6 @@ static int dmz_submit_bio(struct dmz_target *dmz, struct dm_zone *zone,atomic_inc (&bioctx->ref);generic_make_request (clone); -if (clone->bi_status ==BLK_STS_IOERR ) -return -EIO ;if (bio_op (bio) ==REQ_OP_WRITE &&dmz_is_seq (zone)) zone->wp_block += nr_blocks;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 27/185 f2fs: fix to do sanity check on segment bitmap of LFS curseg
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit c854f4d681365498f53ba07843a16423625aa7e9 ]
As Jungyeon Reported in bugzilla:
https://bugzilla.kernel.org/show_bug.cgi?id=203233
- Reproduces
gcc poc_13.c
./run.sh f2fs
- Kernel messages
F2FS-fs (sdb): Bitmap was wrongly set, blk:4608
kernel BUG at fs/f2fs/segment.c:2133!
RIP: 0010:update_sit_entry+0x35d/0x3e0 Call Trace: f2fs_allocate_data_block+0x16c/0x5a0 do_write_page+0x57/0x100 f2fs_do_write_node_page+0x33/0xa0 __write_node_page+0x270/0x4e0 f2fs_sync_node_pages+0x5df/0x670 f2fs_write_checkpoint+0x364/0x13a0 f2fs_sync_fs+0xa3/0x130 f2fs_do_sync_file+0x1a6/0x810 do_fsync+0x33/0x60 __x64_sys_fsync+0xb/0x10 do_syscall_64+0x43/0x110 entry_SYSCALL_64_after_hwframe+0x44/0xa9
The testcase fails because that, in fuzzed image, current segment was allocated with LFS type, its .next_blkoff should point to an unused block address, but actually, its bitmap shows it's not. So during allocation, f2fs crash when setting bitmap.
Introducing sanity_check_curseg() to check such inconsistence of current in-used segment.
--- fs/f2fs/segment.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+)
fs/f2fs/segment.c +39 -0
@@ -3439,6 +3439,41 @@ static int build_dirty_segmap(struct f2fs_sb_info *sbi)return init_victim_secmap (sbi); } +static int sanity_check_curseg (struct f2fs_sb_info *sbi) +{ +int i; + +/* +* In LFS/SSR curseg, .next_blkoff should point to an unused blkaddr; +* In LFS curseg, all blkaddr after .next_blkoff should be unused. +*/ +for (i =0 ; i <NO_CHECK_TYPE ; i++) { +struct curseg_info *curseg =CURSEG_I (sbi, i); +struct seg_entry *se =get_seg_entry (sbi, curseg->segno); +unsigned int blkofs = curseg->next_blkoff; + +if (f2fs_test_bit (blkofs, se->cur_valid_map)) + goto out; + +if (curseg->alloc_type ==SSR ) +continue ; + +for (blkofs +=1 ; blkofs < sbi->blocks_per_seg; blkofs++) { +if (!f2fs_test_bit (blkofs, se->cur_valid_map)) +continue ; +out: +f2fs_msg (sbi->sb,KERN_ERR , +"Current segment's next free block offset is " +"inconsistent with bitmap, logtype:%u, " +"segno:%u, type:%u, next_blkoff:%u, blkofs:%u" , + i, curseg->segno, curseg->alloc_type, + curseg->next_blkoff, blkofs); +return -EINVAL ; + } + } +return 0 ; +} +/* * Update min, max modified time for cost-benefit GC algorithm */
@@ -3532,6 +3567,10 @@ int build_segment_manager(struct f2fs_sb_info *sbi)if (err)return err; + err =sanity_check_curseg (sbi); +if (err) +return err; +init_min_max_mtime (sbi);return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 28/185 drm: Flush output polling on shutdown
In reply to Greg Kroah-HartmanFrom: Chris Wilson <[email protected]>
[ Upstream commit 3b295cb1a411d9c82bbfaa66bc17a8508716ed07 ]
We need to mark the output polling as disabled to prevent concurrent irqs from queuing new work as shutdown the probe -- causing that work to execute after we have freed the structs:
<4> [341.846490] DEBUG_LOCKS_WARN_ON(mutex_is_locked(lock))
<4> [341.846497] WARNING: CPU: 3 PID: 3300 at kernel/locking/mutex-debug.c:103 mutex_destroy+0x49/0x50
<4> [341.846508] Modules linked in: i915(-) vgem thunderbolt snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic mei_hdcp x86_pkg_temp_thermal coretemp crct10dif_pclmul crc32_pclmul ghash_clmulni_intel snd_hda_codec snd_hwdep snd_hda_core snd_pcm mcs7830 btusb usbnet btrtl mii btbcm btintel bluetooth ecdh_generic ecc mei_me mei prime_numbers i2c_hid pinctrl_sunrisepoint pinctrl_intel [last unloaded: i915]
<4> [341.846546] CPU: 3 PID: 3300 Comm: i915_module_loa Tainted: G U 5.2.0-rc2-CI-CI_DRM_6175+ #1
<4> [341.846553] Hardware name: Dell Inc. XPS 13 9360/0823VW, BIOS 2.9.0 07/09/2018
<4> [341.846560] RIP: 0010:mutex_destroy+0x49/0x50
<4> [341.846565] Code: 00 00 5b c3 e8 a8 9f 3b 00 85 c0 74 ed 8b 05 3e 55 23 01 85 c0 75 e3 48 c7 c6 00 d0 08 82 48 c7 c7 a8 aa 07 82 e8 e7 08 fa ff <0f> 0b eb cc 0f 1f 00 48 b8 11 11 11 11 11 11 11 11 48 89 76 20 48
<4> [341.846578] RSP: 0018:ffffc900006cfdb0 EFLAGS: 00010286
<4> [341.846583] RAX: 0000000000000000 RBX: ffff88826759a168 RCX: 0000000000000000
<4> [341.846589] RDX: 0000000000000002 RSI: 0000000000000000 RDI: ffffffff8112844c
<4> [341.846595] RBP: ffff8882708fa548 R08: 0000000000000000 R09: 0000000000039600
<4> [341.846601] R10: 0000000000000000 R11: 0000000000000ce4 R12: ffffffffa07de1e0
<4> [341.846607] R13: 0000000000000000 R14: 0000000000000000 R15: ffffffffa07de2d0
<4> [341.846613] FS: 00007f62b5ae0e40(0000) GS:ffff888276380000(0000) knlGS:0000000000000000
<4> [341.846620] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
<4> [341.846626] CR2: 000055a4e064f4a0 CR3: 0000000266b16006 CR4: 00000000003606e0
<4> [341.846632] Call Trace:
<4> [341.846639] drm_fb_helper_fini.part.17+0xb3/0x100 <4> [341.846682] intel_fbdev_fini+0x20/0x80 [i915] <4> [341.846722] intel_modeset_cleanup+0x9a/0x140 [i915] <4> [341.846750] i915_driver_unload+0xa3/0x100 [i915] <4> [341.846778] i915_pci_remove+0x19/0x30 [i915] <4> [341.846784] pci_device_remove+0x36/0xb0 <4> [341.846790] device_release_driver_internal+0xd3/0x1b0 <4> [341.846795] driver_detach+0x3f/0x80 <4> [341.846800] bus_remove_driver+0x53/0xd0 <4> [341.846805] pci_unregister_driver+0x25/0xa0 <4> [341.846843] i915_exit+0x16/0x1c [i915] <4> [341.846849] __se_sys_delete_module+0x162/0x210 <4> [341.846855] ? trace_hardirqs_off_thunk+0x1a/0x1c <4> [341.846859] ? do_syscall_64+0xd/0x1c0 <4> [341.846864] do_syscall_64+0x55/0x1c0 <4> [341.846869] entry_SYSCALL_64_after_hwframe+0x49/0xbe
<4> [341.846875] RIP: 0033:0x7f62b51871b7
<4> [341.846881] Code: 73 01 c3 48 8b 0d d1 8c 2c 00 f7 d8 64 89 01 48 83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 b8 b0 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d a1 8c 2c 00 f7 d8 64 89 01 48 <4> [341.846897] RSP: 002b:00007ffe7a227138 EFLAGS: 00000206 ORIG_RAX: 00000000000000b0
<4> [341.846904] RAX: ffffffffffffffda RBX: 00007ffe7a2272b0 RCX: 00007f62b51871b7
<4> [341.846910] RDX: 0000000000000001 RSI: 0000000000000800 RDI: 0000557cd6b55948
<4> [341.846916] RBP: 0000557cd6b558e0 R08: 0000557cd6b5594c R09: 00007ffe7a227160
<4> [341.846922] R10: 00007ffe7a226134 R11: 0000000000000206 R12: 0000000000000000
<4> [341.846927] R13: 00007ffe7a227820 R14: 0000000000000000 R15: 0000000000000000
<4> [341.846936] irq event stamp: 3547847
<4> [341.846940] hardirqs last enabled at (3547847): [<ffffffff819aad2c>] _raw_spin_unlock_irqrestore+0x4c/0x60
<4> [341.846949] hardirqs last disabled at (3547846): [<ffffffff819aab9d>] _raw_spin_lock_irqsave+0xd/0x50
<4> [341.846957] softirqs last enabled at (3547376): [<ffffffff81c0033a>] __do_softirq+0x33a/0x4b9
<4> [341.846966] softirqs last disabled at (3547367): [<ffffffff810b6379>] irq_exit+0xa9/0xc0
<4> [341.846973] WARNING: CPU: 3 PID: 3300 at kernel/locking/mutex-debug.c:103 mutex_destroy+0x49/0x50
<4> [341.846980] ---[ end trace ba94ca8952ba970e ]---
<7> [341.866547] [drm:intel_dp_detect [i915]] MST support? port A: no, sink: no, modparam: yes
<7> [341.890480] [drm:drm_add_display_info] non_desktop set to 0
<7> [341.890530] [drm:drm_add_edid_modes] ELD: no CEA Extension found
<7> [341.890537] [drm:drm_add_display_info] non_desktop set to 0
<7> [341.890578] [drm:drm_helper_probe_single_connector_modes] [CONNECTOR:86:eDP-1] probed modes :
<7> [341.890589] [drm:drm_mode_debug_printmodeline] Modeline "3200x1800": 60 373250 3200 3248 3280 3360 1800 1803 1808 1852 0x48 0xa
<7> [341.890602] [drm:drm_mode_debug_printmodeline] Modeline "3200x1800": 48 298600 3200 3248 3280 3360 1800 1803 1808 1852 0x40 0xa
<4> [341.890628] general protection fault: 0000 [#1] PREEMPT SMP PTI
<4> [341.890636] CPU: 0 PID: 508 Comm: kworker/0:4 Tainted: G U W 5.2.0-rc2-CI-CI_DRM_6175+ #1
<4> [341.890646] Hardware name: Dell Inc. XPS 13 9360/0823VW, BIOS 2.9.0 07/09/2018
<4> [341.890655] Workqueue: events output_poll_execute
<4> [341.890663] RIP: 0010:drm_setup_crtcs+0x13e/0xbe0
<4> [341.890669] Code: 00 41 8b 44 24 58 85 c0 0f 8e f9 01 00 00 44 8b 6c 24 20 44 8b 74 24 28 31 db 31 ed 49 8b 44 24 60 48 63 d5 44 89 ee 83 c5 01 <48> 8b 04 d0 44 89 f2 48 8b 38 48 8b 87 88 01 00 00 48 8b 40 20 e8 <4> [341.890686] RSP: 0018:ffffc9000033fd40 EFLAGS: 00010202
<4> [341.890692] RAX: 6b6b6b6b6b6b6b6b RBX: 0000000000000002 RCX: 0000000000000000
<4> [341.890700] RDX: 0000000000000001 RSI: 0000000000000c80 RDI: 00000000ffffffff
<4> [341.890707] RBP: 0000000000000002 R08: 0000000000000000 R09: 0000000000000000
<4> [341.890715] R10: 0000000000000c80 R11: 0000000000000000 R12: ffff888267599fe8
<4> [341.890722] R13: 0000000000000c80 R14: 0000000000000708 R15: 0000000000000007
<4> [341.890730] FS: 0000000000000000(0000) GS:ffff888276200000(0000) knlGS:0000000000000000
<4> [341.890739] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
<4> [341.890745] CR2: 000055a4e064f4a0 CR3: 000000026d234003 CR4: 00000000003606f0
<4> [341.890752] Call Trace:
<4> [341.890760] drm_fb_helper_hotplug_event.part.24+0x89/0xb0 <4> [341.890768] drm_kms_helper_hotplug_event+0x21/0x30 <4> [341.890774] output_poll_execute+0x9d/0x1a0 <4> [341.890782] process_one_work+0x245/0x610 <4> [341.890790] worker_thread+0x37/0x380 <4> [341.890796] ? process_one_work+0x610/0x610 <4> [341.890802] kthread+0x119/0x130 <4> [341.890808] ? kthread_park+0x80/0x80 <4> [341.890815] ret_from_fork+0x3a/0x50
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109964
--- drivers/gpu/drm/drm_probe_helper.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_probe_helper.c +8 -1
@@ -593,6 +593,9 @@ static void output_poll_execute(struct work_struct *work)enum drm_connector_status old_status;bool repoll = false, changed; +if (!dev->mode_config.poll_enabled) +return ; +/* Pick up any changes detected by the probe functions. */ changed = dev->mode_config.delayed_event; dev->mode_config.delayed_event = false;
@@ -747,7 +750,11 @@ EXPORT_SYMBOL(drm_kms_helper_poll_init);*/ void drm_kms_helper_poll_fini (struct drm_device *dev) { -drm_kms_helper_poll_disable (dev); +if (!dev->mode_config.poll_enabled) +return ; + + dev->mode_config.poll_enabled = false; +cancel_delayed_work_sync (&dev->mode_config.output_poll_work); }EXPORT_SYMBOL (drm_kms_helper_poll_fini);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 29/185 net: dont warn in inet diag when IPV6 is disabled
In reply to Greg Kroah-HartmanFrom: Stephen Hemminger <[email protected]>
[ Upstream commit 1e64d7cbfdce4887008314d5b367209582223f27 ]
If IPV6 was disabled, then ss command would cause a kernel warning because the command was attempting to dump IPV6 socket information. The fix is to just remove the warning.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=202249
--- net/ipv4/raw_diag.c | 3 --- 1 file changed, 3 deletions(-)
net/ipv4/raw_diag.c +0 -3
@@ -23,9 +23,6 @@ raw_get_hashinfo(const struct inet_diag_req_v2 *r)return &raw_v6_hashinfo;#endif }else { -pr_warn_once ("Unexpected inet family %d\n" , - r->sdiag_family); -WARN_ON_ONCE (1 );return ERR_PTR (-EINVAL ); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 30/185 ACPI: video: Add new hw_changes_brightness quirk, set it on PB Easynote MZ35
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 4f7f96453b462b3de0fa18d18fe983960bb5ee7f ]
Some machines change the brightness themselves when a brightness hotkey gets pressed, despite us telling them not to. This causes the brightness to go two steps up / down when the hotkey is pressed. This is esp. a problem on older machines with only a few brightness levels.
This commit adds a new hw_changes_brightness quirk which makes acpi_video_device_notify() only call backlight_force_update(..., BACKLIGHT_UPDATE_HOTKEY) and not do anything else, notifying userspace that the brightness was changed and leaving it at that fixing the dual step problem.
--- drivers/acpi/acpi_video.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)
drivers/acpi/acpi_video.c +37 -0
@@ -73,6 +73,12 @@ module_param(report_key_events, int, 0644);MODULE_PARM_DESC (report_key_events,"0: none, 1: output changes, 2: brightness changes, 3: all" ); +static int hw_changes_brightness =-1 ; +module_param (hw_changes_brightness, int,0644 ); +MODULE_PARM_DESC (hw_changes_brightness, +"Set this to 1 on buggy hw which changes the brightness itself when " +"a hotkey is pressed: -1: auto, 0: normal 1: hw-changes-brightness" ); +/* * Whether the struct acpi_video_device_attrib::device_id_scheme bit should be * assumed even if not actually set.
@@ -418,6 +424,14 @@ static int video_set_report_key_events(const struct dmi_system_id *id)return 0 ; } +static int video_hw_changes_brightness ( +const struct dmi_system_id *d) +{ +if (hw_changes_brightness ==-1 ) + hw_changes_brightness =1 ; +return 0 ; +} +static const struct dmi_system_id video_dmi_table[] = {/* * Broken _BQC workaround http://bugzilla.kernel.org/show_bug.cgi?id=13121
@@ -542,6 +556,21 @@ static const struct dmi_system_id video_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V131"), }, }, +/* +* Some machines change the brightness themselves when a brightness +* hotkey gets pressed, despite us telling them not to. In this case +* acpi_video_device_notify() should only call backlight_force_update( +* BACKLIGHT_UPDATE_HOTKEY) and not do anything else. +*/ + { + /* https://bugzilla.kernel.org/show_bug.cgi?id=204077 */ + .callback = video_hw_changes_brightness, + .ident = "Packard Bell EasyNote MZ35", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Packard Bell"), + DMI_MATCH(DMI_PRODUCT_NAME, "EasyNote MZ35"), + }, + }, {} };
@@ -1624,6 +1653,14 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data) bus = video_device->video; input = bus->input; +if (hw_changes_brightness >0 ) { +if (video_device->backlight) +backlight_force_update (video_device->backlight, +BACKLIGHT_UPDATE_HOTKEY ); +acpi_notifier_call_chain (device, event,0 ); +return ; + } +switch (event) {case ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS :/* Cycle brightness */ brightness_switch_event (video_device, event);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 31/185 xfs: dont crash on null attr fork xfs_bmapi_read
In reply to Greg Kroah-HartmanFrom: Darrick J. Wong <[email protected]>
[ Upstream commit 8612de3f7ba6e900465e340516b8313806d27b2d ]
Zorro Lang reported a crash in generic/475 if we try to inactivate a corrupt inode with a NULL attr fork (stack trace shortened somewhat):
RIP: 0010:xfs_bmapi_read+0x311/0xb00 [xfs] RSP: 0018:ffff888047f9ed68 EFLAGS: 00010202 RAX: dffffc0000000000 RBX: ffff888047f9f038 RCX: 1ffffffff5f99f51 RDX: 0000000000000002 RSI: 0000000000000008 RDI: 0000000000000012 RBP: ffff888002a41f00 R08: ffffed10005483f0 R09: ffffed10005483ef R10: ffffed10005483ef R11: ffff888002a41f7f R12: 0000000000000004 R13: ffffe8fff53b5768 R14: 0000000000000005 R15: 0000000000000001 FS: 00007f11d44b5b80(0000) GS:ffff888114200000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000ef6000 CR3: 000000002e176003 CR4: 00000000001606e0 Call Trace: xfs_dabuf_map.constprop.18+0x696/0xe50 [xfs] xfs_da_read_buf+0xf5/0x2c0 [xfs] xfs_da3_node_read+0x1d/0x230 [xfs] xfs_attr_inactive+0x3cc/0x5e0 [xfs] xfs_inactive+0x4c8/0x5b0 [xfs] xfs_fs_destroy_inode+0x31b/0x8e0 [xfs] destroy_inode+0xbc/0x190 xfs_bulkstat_one_int+0xa8c/0x1200 [xfs] xfs_bulkstat_one+0x16/0x20 [xfs] xfs_bulkstat+0x6fa/0xf20 [xfs] xfs_ioc_bulkstat+0x182/0x2b0 [xfs] xfs_file_ioctl+0xee0/0x12a0 [xfs] do_vfs_ioctl+0x193/0x1000 ksys_ioctl+0x60/0x90 __x64_sys_ioctl+0x6f/0xb0 do_syscall_64+0x9f/0x4d0 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x7f11d39a3e5b
The "obvious" cause is that the attr ifork is null despite the inode claiming an attr fork having at least one extent, but it's not so obvious why we ended up with an inode in that state.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=204031
--- fs/xfs/libxfs/xfs_bmap.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)
fs/xfs/libxfs/xfs_bmap.c +21 -8
@@ -4006,15 +4006,28 @@ xfs_bmapi_read(XFS_STATS_INC (mp, xs_blk_mapr); ifp =XFS_IFORK_PTR (ip, whichfork); +if (!ifp) { +/* No CoW fork? Return a hole. */ +if (whichfork ==XFS_COW_FORK ) { + mval->br_startoff = bno; + mval->br_startblock =HOLESTARTBLOCK ; + mval->br_blockcount = len; + mval->br_state =XFS_EXT_NORM ; + *nmap =1 ; +return 0 ; + } -/* No CoW fork? Return a hole. */ -if (whichfork ==XFS_COW_FORK && !ifp) { - mval->br_startoff = bno; - mval->br_startblock =HOLESTARTBLOCK ; - mval->br_blockcount = len; - mval->br_state =XFS_EXT_NORM ; - *nmap =1 ; -return 0 ; +/* +* A missing attr ifork implies that the inode says we're in +* extents or btree format but failed to pass the inode fork +* verifier while trying to load it. Treat that as a file +* corruption too. +*/ +#ifdef DEBUG +xfs_alert (mp,"%s: inode %llu missing fork %d" , + __func__, ip->i_ino, whichfork); +#endif /* DEBUG */ +return -EFSCORRUPTED ; }if (!(ifp->if_flags &XFS_IFEXTENTS )) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 32/185 Bluetooth: btrtl: Additional Realtek 8822CE Bluetooth devices
In reply to Greg Kroah-HartmanFrom: Jian-Hong Pan <[email protected]>
[ Upstream commit 6d0762b19c5963ff9e178e8af3626532ee04d93d ]
The ASUS X412FA laptop contains a Realtek RTL8822CE device with an associated BT chip using a USB ID of 04ca:4005. This ID is added to the driver.
The /sys/kernel/debug/usb/devices portion for this device is:
T: Bus=01 Lev=01 Prnt=01 Port=09 Cnt=04 Dev#= 4 Spd=12 MxCh= 0 D: Ver= 1.00 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=04ca ProdID=4005 Rev= 0.00 S: Manufacturer=Realtek S: Product=Bluetooth Radio S: SerialNumber=00e04c000001 C:* #Ifs= 2 Cfg#= 1 Atr=a0 MxPwr=500mA I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=1ms E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms
--- drivers/bluetooth/btusb.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/bluetooth/btusb.c +3 -0
@@ -388,6 +388,9 @@ static const struct usb_device_id blacklist_table[] = {/* Additional Realtek 8822BE Bluetooth devices */ { USB_DEVICE(0x0b05, 0x185c), .driver_info = BTUSB_REALTEK }, + /* Additional Realtek 8822CE Bluetooth devices */ + { USB_DEVICE(0x04ca, 0x4005), .driver_info = BTUSB_REALTEK }, + /* Silicon Wave based devices */ { USB_DEVICE(0x0c10, 0x0000), .driver_info = BTUSB_SWAVE },
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 33/185 f2fs: use generic EFSBADCRC/EFSCORRUPTED
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit 10f966bbf521bb9b2e497bbca496a5141f4071d0 ]
f2fs uses EFAULT as error number to indicate filesystem is corrupted all the time, but generic filesystems use EUCLEAN for such condition, we need to change to follow others.
This patch adds two new macros as below to wrap more generic error code macros, and spread them in code.
EFSBADCRC EBADMSG /* Bad CRC detected */
EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */
--- fs/f2fs/checkpoint.c | 8 ++++++-- fs/f2fs/data.c | 8 ++++---- fs/f2fs/f2fs.h | 4 ++++ fs/f2fs/inline.c | 4 ++-- fs/f2fs/inode.c | 4 ++-- fs/f2fs/node.c | 4 ++-- fs/f2fs/recovery.c | 2 +- fs/f2fs/segment.c | 7 ++++--- fs/f2fs/segment.h | 4 ++-- fs/f2fs/super.c | 2 +- 10 files changed, 28 insertions(+), 19 deletions(-)
fs/f2fs/checkpoint.c +6 -2
@@ -793,6 +793,7 @@ int get_valid_checkpoint(struct f2fs_sb_info *sbi)unsigned int cp_blks =1 +__cp_payload (sbi);block_t cp_blk_no;int i; +int err; sbi->ckpt =kzalloc (cp_blks * blk_size,GFP_KERNEL );if (!sbi->ckpt)
@@ -819,6 +820,7 @@ int get_valid_checkpoint(struct f2fs_sb_info *sbi) }else if (cp2) { cur_page = cp2; }else { + err = -EFSCORRUPTED ; goto fail_no_cp; }
@@ -831,8 +833,10 @@ int get_valid_checkpoint(struct f2fs_sb_info *sbi) sbi->cur_cp_pack =2 ;/* Sanity checking of checkpoint */ -if (sanity_check_ckpt (sbi)) +if (sanity_check_ckpt (sbi)) { + err = -EFSCORRUPTED ; goto free_fail_no_cp; + }if (cp_blks <=1 ) goto done;
@@ -860,7 +864,7 @@ int get_valid_checkpoint(struct f2fs_sb_info *sbi)f2fs_put_page (cp2,1 ); fail_no_cp:kfree (sbi->ckpt); -return -EINVAL ; +return err; }static void __add_dirty_inode (struct inode *inode,enum inode_type type)
fs/f2fs/data.c +4 -4
@@ -376,7 +376,7 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio)if (!f2fs_is_valid_blkaddr (fio->sbi, fio->new_blkaddr,__is_meta_io (fio) ?META_GENERIC :DATA_GENERIC )) -return -EFAULT ; +return -EFSCORRUPTED ;trace_f2fs_submit_page_bio (page, fio);f2fs_trace_ios (fio,0 );
@@ -959,7 +959,7 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map,if (__is_valid_data_blkaddr (blkaddr) && !f2fs_is_valid_blkaddr (sbi, blkaddr,DATA_GENERIC )) { - err = -EFAULT ; + err = -EFSCORRUPTED ; goto sync_out; }
@@ -1425,7 +1425,7 @@ int do_write_data_page(struct f2fs_io_info *fio)if (!f2fs_is_valid_blkaddr (fio->sbi, fio->old_blkaddr,DATA_GENERIC )) -return -EFAULT ; +return -EFSCORRUPTED ; ipu_force = true; fio->need_lock =LOCK_DONE ;
@@ -1451,7 +1451,7 @@ int do_write_data_page(struct f2fs_io_info *fio)if (__is_valid_data_blkaddr (fio->old_blkaddr) && !f2fs_is_valid_blkaddr (fio->sbi, fio->old_blkaddr,DATA_GENERIC )) { - err = -EFAULT ; + err = -EFSCORRUPTED ; goto out_writepage; }/*
fs/f2fs/f2fs.h +4 -0
@@ -3089,3 +3089,7 @@ static inline bool f2fs_may_encrypt(struct inode *inode) }#endif + +#define EFSBADCRC EBADMSG/* Bad CRC detected */ +#define EFSCORRUPTED EUCLEAN/* Filesystem is corrupted */ +
fs/f2fs/inline.c +2 -2
@@ -135,7 +135,7 @@ int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page)"%s: corrupted inline inode ino=%lx, i_addr[0]:0x%x, " "run fsck to fix." , __func__, dn->inode->i_ino, dn->data_blkaddr); -return -EINVAL ; +return -EFSCORRUPTED ; }f2fs_bug_on (F2FS_P_SB (page),PageWriteback (page));
@@ -382,7 +382,7 @@ static int f2fs_move_inline_dirents(struct inode *dir, struct page *ipage,"%s: corrupted inline inode ino=%lx, i_addr[0]:0x%x, " "run fsck to fix." , __func__, dir->i_ino, dn.data_blkaddr); - err = -EINVAL ; + err = -EFSCORRUPTED ; goto out; }
fs/f2fs/inode.c +2 -2
@@ -70,7 +70,7 @@ static int __written_first_block(struct f2fs_sb_info *sbi,if (!__is_valid_data_blkaddr (addr))return 1 ;if (!f2fs_is_valid_blkaddr (sbi, addr,DATA_GENERIC )) -return -EFAULT ; +return -EFSCORRUPTED ;return 0 ; }
@@ -300,7 +300,7 @@ static int do_read_inode(struct inode *inode)if (!sanity_check_inode (inode, node_page)) {f2fs_put_page (node_page,1 ); -return -EINVAL ; +return -EFSCORRUPTED ; }/* check data exist */
fs/f2fs/node.c +2 -2
@@ -39,7 +39,7 @@ int check_nid_range(struct f2fs_sb_info *sbi, nid_t nid)f2fs_msg (sbi->sb,KERN_WARNING ,"%s: out-of-range nid=%x, run fsck to fix." , __func__, nid); -return -EINVAL ; +return -EFSCORRUPTED ; }return 0 ; }
@@ -1195,7 +1195,7 @@ static struct page *__get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid, }if (!f2fs_inode_chksum_verify (sbi, page)) { - err = -EBADMSG ; + err = -EFSBADCRC ; goto out_err; } page_hit:
fs/f2fs/recovery.c +1 -1
@@ -451,7 +451,7 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode,"Inconsistent ofs_of_node, ino:%lu, ofs:%u, %u" , inode->i_ino,ofs_of_node (dn.node_page), ofs_of_node(page)); - err = -EFAULT ; + err = -EFSCORRUPTED ; goto err; }
fs/f2fs/segment.c +4 -3
@@ -2216,6 +2216,7 @@ int f2fs_trim_fs(struct f2fs_sb_info *sbi, struct fstrim_range *range)if (is_sbi_flag_set (sbi,SBI_NEED_FSCK )) {f2fs_msg (sbi->sb,KERN_WARNING ,"Found FS corruption, run fsck to fix." ); + err = -EFSCORRUPTED ; goto out; }
@@ -3309,7 +3310,7 @@ static int build_sit_entries(struct f2fs_sb_info *sbi)"Wrong journal entry on segno %u" , start);set_sbi_flag (sbi,SBI_NEED_FSCK ); - err = -EINVAL ; + err = -EFSCORRUPTED ;break ; }
@@ -3350,7 +3351,7 @@ static int build_sit_entries(struct f2fs_sb_info *sbi)"SIT is corrupted node# %u vs %u" , total_node_blocks, valid_node_count(sbi));set_sbi_flag (sbi,SBI_NEED_FSCK ); - err = -EINVAL ; + err = -EFSCORRUPTED ; }return err;
@@ -3468,7 +3469,7 @@ static int sanity_check_curseg(struct f2fs_sb_info *sbi)"segno:%u, type:%u, next_blkoff:%u, blkofs:%u" , i, curseg->segno, curseg->alloc_type, curseg->next_blkoff, blkofs); -return -EINVAL ; +return -EFSCORRUPTED ; } }return 0 ;
fs/f2fs/segment.h +2 -2
@@ -665,7 +665,7 @@ static inline int check_block_count(struct f2fs_sb_info *sbi,"Mismatch valid blocks %d vs. %d" , GET_SIT_VBLOCKS(raw_sit), valid_blocks);set_sbi_flag (sbi,SBI_NEED_FSCK ); -return -EINVAL ; +return -EFSCORRUPTED ; }/* check segment usage, and check boundary of a given segment number */
@@ -675,7 +675,7 @@ static inline int check_block_count(struct f2fs_sb_info *sbi,"Wrong valid blocks %d or segno %u" , GET_SIT_VBLOCKS(raw_sit), segno);set_sbi_flag (sbi,SBI_NEED_FSCK ); -return -EINVAL ; +return -EFSCORRUPTED ; }return 0 ; }
fs/f2fs/super.c +1 -1
@@ -2220,7 +2220,7 @@ static int read_raw_super_block(struct f2fs_sb_info *sbi,f2fs_msg (sb,KERN_ERR ,"Can't find valid F2FS filesystem in %dth superblock" , block +1 ); - err = -EINVAL ; + err = -EFSCORRUPTED ;brelse (bh);continue ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 34/185 arcnet: provide a buffer big enough to actually receive packets
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 108639aac35eb57f1d0e8333f5fc8c7ff68df938 ]
struct archdr is only big enough to hold the header of various types of arcnet packets. So to provide enough space to hold the data read from hardware provide a buffer large enough to hold a packet with maximal size.
The problem was noticed by the stack protector which makes the kernel oops.
--- drivers/net/arcnet/arcnet.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-)
drivers/net/arcnet/arcnet.c +17 -14
@@ -1064,31 +1064,34 @@ EXPORT_SYMBOL(arcnet_interrupt);static void arcnet_rx (struct net_device *dev,int bufnum) {struct arcnet_local *lp =netdev_priv (dev); -struct archdr pkt; +union { +struct archdr pkt; +char buf[512 ]; + } rxdata;struct arc_rfc1201 *soft;int length, ofs; - soft = &pkt.soft.rfc1201; + soft = &rxdata.pkt.soft.rfc1201; - lp->hw.copy_from_card (dev, bufnum,0 , &pkt,ARC_HDR_SIZE ); -if (pkt.hard.offset[0 ]) { - ofs = pkt.hard.offset[0 ]; + lp->hw.copy_from_card (dev, bufnum,0 , &rxdata.pkt,ARC_HDR_SIZE ); +if (rxdata.pkt.hard.offset[0 ]) { + ofs = rxdata.pkt.hard.offset[0 ]; length =256 - ofs; }else { - ofs = pkt.hard.offset[1 ]; + ofs = rxdata.pkt.hard.offset[1 ]; length =512 - ofs; }/* get the full header, if possible */ -if (sizeof (pkt.soft) <= length) { - lp->hw.copy_from_card (dev, bufnum, ofs, soft,sizeof (pkt.soft)); +if (sizeof (rxdata.pkt.soft) <= length) { + lp->hw.copy_from_card (dev, bufnum, ofs, soft,sizeof (rxdata.pkt.soft)); }else { -memset (&pkt.soft,0 ,sizeof (pkt.soft)); +memset (&rxdata.pkt.soft,0 ,sizeof (rxdata.pkt.soft)); lp->hw.copy_from_card (dev, bufnum, ofs, soft, length); }arc_printk (D_DURING , dev,"Buffer #%d: received packet from %02Xh to %02Xh (%d+4 bytes)\n" , - bufnum, pkt.hard.source, pkt.hard.dest, length); + bufnum, rxdata.pkt.hard.source, rxdata.pkt.hard.dest, length); dev->stats.rx_packets++; dev->stats.rx_bytes += length +ARC_HDR_SIZE ;
@@ -1097,13 +1100,13 @@ static void arcnet_rx(struct net_deviceif (arc_proto_map[soft->proto]->is_ip) {if (BUGLVL (D_PROTO )) {struct ArcProto - *oldp = arc_proto_map[lp->default_proto[pkt.hard.source]], + *oldp = arc_proto_map[lp->default_proto[rxdata.pkt.hard.source]], *newp = arc_proto_map[soft->proto];if (oldp != newp) {arc_printk (D_PROTO , dev,"got protocol %02Xh; encap for host %02Xh is now '%c' (was '%c')\n" , - soft->proto, pkt.hard.source, + soft->proto, rxdata.pkt.hard.source, newp->suffix, oldp->suffix); } }
@@ -1112,10 +1115,10 @@ static void arcnet_rx(struct net_device lp->default_proto[0 ] = soft->proto;/* in striking contrast, the following isn't a hack. */ - lp->default_proto[pkt.hard.source] = soft->proto; + lp->default_proto[rxdata.pkt.hard.source] = soft->proto; }/* call the protocol-specific receiver. */ - arc_proto_map[soft->proto]->rx (dev, bufnum, &pkt, length); + arc_proto_map[soft->proto]->rx (dev, bufnum, &rxdata.pkt, length); } static void null_rx(struct net_device *dev, int bufnum,
Greg Kroah-Hartman
maintainerPATCH 35/185 cdc_ncm: fix divide-by-zero caused by invalid wMaxPacketSize
In reply to Greg Kroah-HartmanFrom: Bjørn Mork <[email protected]>
[ Upstream commit 3fe4b3351301660653a2bc73f2226da0ebd2b95e ]
Endpoints with zero wMaxPacketSize are not usable for transferring data. Ignore such endpoints when looking for valid in, out and status pipes, to make the driver more robust against invalid and meaningless descriptors.
The wMaxPacketSize of the out pipe is used as divisor. So this change fixes a divide-by-zero bug.
--- drivers/net/usb/cdc_ncm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/usb/cdc_ncm.c +5 -1
@@ -681,8 +681,12 @@ cdc_ncm_find_endpoints(struct usbnet *deu8 ep;for (ep =0 ; ep < intf->cur_altsetting->desc.bNumEndpoints; ep++) { - e = intf->cur_altsetting->endpoint + ep; + +/* ignore endpoints which cannot transfer data */ +if (!usb_endpoint_maxp (&e->desc)) +continue ; +switch (e->desc.bmAttributes &USB_ENDPOINT_XFERTYPE_MASK ) {case USB_ENDPOINT_XFER_INT :if (usb_endpoint_dir_in (&e->desc)) {
Greg Kroah-Hartman
maintainerPATCH 36/185 macsec: drop skb sk before calling gro_cells_receive
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
[ Upstream commit ba56d8ce38c8252fff5b745db3899cf092578ede ]
Fei Liu reported a crash when doing netperf on a topo of macsec dev over veth:
[ 448.919128] refcount_t: underflow; use-after-free. [ 449.090460] Call trace: [ 449.092895] refcount_sub_and_test+0xb4/0xc0 [ 449.097155] tcp_wfree+0x2c/0x150 [ 449.100460] ip_rcv+0x1d4/0x3a8 [ 449.103591] __netif_receive_skb_core+0x554/0xae0 [ 449.108282] __netif_receive_skb+0x28/0x78 [ 449.112366] netif_receive_skb_internal+0x54/0x100 [ 449.117144] napi_gro_complete+0x70/0xc0 [ 449.121054] napi_gro_flush+0x6c/0x90 [ 449.124703] napi_complete_done+0x50/0x130 [ 449.128788] gro_cell_poll+0x8c/0xa8 [ 449.132351] net_rx_action+0x16c/0x3f8 [ 449.136088] __do_softirq+0x128/0x320
The issue was caused by skb's true_size changed without its sk's sk_wmem_alloc increased in tcp/skb_gro_receive(). Later when the skb is being freed and the skb's truesize is subtracted from its sk's sk_wmem_alloc in tcp_wfree(), underflow occurs.
macsec is calling gro_cells_receive() to receive a packet, which actually requires skb->sk to be NULL. However when macsec dev is over veth, it's possible the skb->sk is still set if the skb was not unshared or expanded from the peer veth.
ip_rcv() is calling skb_orphan() to drop the skb's sk for tproxy, but it is too late for macsec's calling gro_cells_receive(). So fix it by dropping the skb's sk earlier on rx path of macsec.
--- drivers/net/macsec.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/macsec.c +1 -0
@@ -1234,6 +1234,7 @@ deliver:macsec_rxsa_put (rx_sa);macsec_rxsc_put (rx_sc); +skb_orphan (skb); ret =gro_cells_receive (&macsec->gro_cells, skb);if (ret ==NET_RX_SUCCESS )count_rx (dev, skb->len);
Greg Kroah-Hartman
maintainerPATCH 37/185 net/phy: fix DP83865 10 Mbps HDX loopback disable function
In reply to Greg Kroah-HartmanFrom: Peter Mamonov <[email protected]>
[ Upstream commit e47488b2df7f9cb405789c7f5d4c27909fc597ae ]
According to the DP83865 datasheet "the 10 Mbps HDX loopback can be disabled in the expanded memory register 0x1C0.1". The driver erroneously used bit 0 instead of bit 1.
--- drivers/net/phy/national.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/phy/national.c +6 -3
@@ -110,14 +110,17 @@ static void ns_giga_speed_fallback(strucstatic void ns_10_base_t_hdx_loopack (struct phy_device *phydev,int disable) { +u16 lb_dis =BIT (1 ); +if (disable) -ns_exp_write (phydev,0x1c0 ,ns_exp_read (phydev,0x1c0 ) |1 ); +ns_exp_write (phydev,0x1c0 , +ns_exp_read (phydev,0x1c0 ) | lb_dis);else ns_exp_write (phydev,0x1c0 , -ns_exp_read (phydev,0x1c0 ) &0xfffe ); +ns_exp_read (phydev,0x1c0 ) & ~lb_dis);pr_debug ("10BASE-T HDX loopback %s\n" , - (ns_exp_read (phydev,0x1c0 ) &0x0001 ) ?"off" :"on" ); + (ns_exp_read (phydev,0x1c0 ) & lb_dis) ?"off" :"on" ); }static int ns_config_init (struct phy_device *phydev)
Greg Kroah-Hartman
maintainerPATCH 38/185 net: qrtr: Stop rx_worker before freeing node
In reply to Greg Kroah-HartmanFrom: Bjorn Andersson <[email protected]>
[ Upstream commit 73f0c11d11329a0d6d205d4312b6e5d2512af7c5 ]
As the endpoint is unregistered there might still be work pending to handle incoming messages, which will result in a use after free scenario. The plan is to remove the rx_worker, but until then (and for stable@) ensure that the work is stopped before the node is freed.
--- net/qrtr/qrtr.c | 1 + 1 file changed, 1 insertion(+)
net/qrtr/qrtr.c +1 -0
@@ -129,6 +129,7 @@ static void __qrtr_node_release(struct klist_del (&node->item);mutex_unlock (&qrtr_node_lock); +cancel_work_sync (&node->work);skb_queue_purge (&node->rx_queue);kfree (node); }
Greg Kroah-Hartman
maintainerPATCH 39/185 net/sched: act_sample: dont push mac header on ip6gre ingress
In reply to Greg Kroah-HartmanFrom: Davide Caratti <[email protected]>
[ Upstream commit 92974a1d006ad8b30d53047c70974c9e065eb7df ]
current 'sample' action doesn't push the mac header of ingress packets if they are received by a layer 3 tunnel (like gre or sit); but it forgot to check for gre over ipv6, so the following script:
# tc q a dev $d clsact # tc f a dev $d ingress protocol ip flower ip_proto icmp action sample \
Quoted 1 line
group 100 rate 1
# psample -v -g 100
dumps everything, including outer header and mac, when $d is a gre tunnel over ipv6. Fix this adding a missing label for ARPHRD_IP6GRE devices.
--- net/sched/act_sample.c | 1 + 1 file changed, 1 insertion(+)
net/sched/act_sample.c +1 -0
@@ -132,6 +132,7 @@ static bool tcf_sample_dev_ok_push(struccase ARPHRD_TUNNEL6 :case ARPHRD_SIT :case ARPHRD_IPGRE : +case ARPHRD_IP6GRE :case ARPHRD_VOID :case ARPHRD_NONE :return false;
Greg Kroah-Hartman
maintainerPATCH 40/185 net_sched: add max len check for TCA_KIND
In reply to Greg Kroah-HartmanFrom: Cong Wang <[email protected]>
[ Upstream commit 62794fc4fbf52f2209dc094ea255eaef760e7d01 ]
The TCA_KIND attribute is of NLA_STRING which does not check the NUL char. KMSAN reported an uninit-value of TCA_KIND which is likely caused by the lack of NUL.
Change it to NLA_NUL_STRING and add a max len too.
--- net/sched/sch_api.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/sched/sch_api.c +2 -1
@@ -1217,7 +1217,8 @@ check_loop_fn(struct Qdisc *q, unsigned*/ const struct nla_policy rtm_tca_policy[TCA_MAX +1 ] = { - [TCA_KIND ] = { .type =NLA_STRING }, + [TCA_KIND ] = { .type =NLA_NUL_STRING , + .len =IFNAMSIZ -1 }, [TCA_RATE ] = { .type =NLA_BINARY , .len =sizeof (struct tc_estimator ) }, [TCA_STAB ] = { .type =NLA_NESTED },
Greg Kroah-Hartman
maintainerPATCH 41/185 openvswitch: change type of UPCALL_PID attribute to NLA_UNSPEC
In reply to Greg Kroah-HartmanFrom: Li RongQing <[email protected]>
[ Upstream commit ea8564c865299815095bebeb4b25bef474218e4c ]
userspace openvswitch patch "(dpif-linux: Implement the API functions to allow multiple handler threads read upcall)" changes its type from U32 to UNSPEC, but leave the kernel unchanged
and after kernel 6e237d099fac "(netlink: Relax attr validation for fixed length types)", this bug is exposed by the below warning
[ 57.215841] netlink: 'ovs-vswitchd': attribute type 5 has an invalid length.
--- net/openvswitch/datapath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/openvswitch/datapath.c +1 -1
@@ -2240,7 +2240,7 @@ static const struct nla_policy vport_pol [OVS_VPORT_ATTR_STATS] = { .len = sizeof(struct ovs_vport_stats) }, [OVS_VPORT_ATTR_PORT_NO] = { .type = NLA_U32 }, [OVS_VPORT_ATTR_TYPE] = { .type = NLA_U32 }, - [OVS_VPORT_ATTR_UPCALL_PID] = { .type = NLA_U32 }, + [OVS_VPORT_ATTR_UPCALL_PID] = { .type = NLA_UNSPEC }, [OVS_VPORT_ATTR_OPTIONS] = { .type = NLA_NESTED }, };
Greg Kroah-Hartman
maintainerPATCH 42/185 ppp: Fix memory leak in ppp_write
In reply to Greg Kroah-HartmanFrom: Takeshi Misawa <[email protected]>
[ Upstream commit 4c247de564f1ff614d11b3bb5313fb70d7b9598b ]
When ppp is closing, __ppp_xmit_process() failed to enqueue skb and skb allocated in ppp_write() is leaked.
syzbot reported :
BUG: memory leak
unreferenced object 0xffff88812a17bc00 (size 224):
comm "syz-executor673", pid 6952, jiffies 4294942888 (age 13.040s)
hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<00000000d110fff9>] kmemleak_alloc_recursive include/linux/kmemleak.h:43 [inline]
[<00000000d110fff9>] slab_post_alloc_hook mm/slab.h:522 [inline]
[<00000000d110fff9>] slab_alloc_node mm/slab.c:3262 [inline]
[<00000000d110fff9>] kmem_cache_alloc_node+0x163/0x2f0 mm/slab.c:3574
[<000000002d616113>] __alloc_skb+0x6e/0x210 net/core/skbuff.c:197
[<000000000167fc45>] alloc_skb include/linux/skbuff.h:1055 [inline]
[<000000000167fc45>] ppp_write+0x48/0x120 drivers/net/ppp/ppp_generic.c:502
[<000000009ab42c0b>] __vfs_write+0x43/0xa0 fs/read_write.c:494
[<00000000086b2e22>] vfs_write fs/read_write.c:558 [inline]
[<00000000086b2e22>] vfs_write+0xee/0x210 fs/read_write.c:542
[<00000000a2b70ef9>] ksys_write+0x7c/0x130 fs/read_write.c:611
[<00000000ce5e0fdd>] __do_sys_write fs/read_write.c:623 [inline]
[<00000000ce5e0fdd>] __se_sys_write fs/read_write.c:620 [inline]
[<00000000ce5e0fdd>] __x64_sys_write+0x1e/0x30 fs/read_write.c:620
[<00000000d9d7b370>] do_syscall_64+0x76/0x1a0 arch/x86/entry/common.c:296
[<0000000006e6d506>] entry_SYSCALL_64_after_hwframe+0x44/0xa9Fix this by freeing skb, if ppp is closing.
--- drivers/net/ppp/ppp_generic.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ppp/ppp_generic.c +2 -0
@@ -1433,6 +1433,8 @@ static void __ppp_xmit_process(struct ppnetif_wake_queue (ppp->dev); else netif_stop_queue(ppp->dev); + }else { +kfree_skb (skb); }ppp_xmit_unlock (ppp); }
Greg Kroah-Hartman
maintainerPATCH 43/185 sch_netem: fix a divide by zero in tabledist()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit b41d936b5ecfdb3a4abc525ce6402a6c49cffddc ]
syzbot managed to crash the kernel in tabledist() loading an empty distribution table.
t = dist->table[rnd % dist->size];
Simply return an error when such load is attempted.
--- net/sched/sch_netem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sched/sch_netem.c +1 -1
@@ -708,7 +708,7 @@ static int get_dist_table(struct Qdisc *struct disttable *d;int i; -if (n >NETEM_DIST_MAX ) +if (!n || n >NETEM_DIST_MAX )return -EINVAL ; d =kvmalloc (sizeof (struct disttable ) + n *sizeof (s16),GFP_KERNEL );
Greg Kroah-Hartman
maintainerPATCH 44/185 skge: fix checksum byte order
In reply to Greg Kroah-HartmanFrom: Stephen Hemminger <[email protected]>
[ Upstream commit 5aafeb74b5bb65b34cc87c7623f9fa163a34fa3b ]
Running old skge driver on PowerPC causes checksum errors because hardware reported 1's complement checksum is in little-endian byte order.
--- drivers/net/ethernet/marvell/skge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/marvell/skge.c +1 -1
@@ -3122,7 +3122,7 @@ static struct sk_buff *skge_rx_get(strucskb_put (skb, len);if (dev->features &NETIF_F_RXCSUM ) { - skb->csum = csum; + skb->csum =le16_to_cpu (csum); skb->ip_summed =CHECKSUM_COMPLETE ; }
Greg Kroah-Hartman
maintainerPATCH 45/185 usbnet: ignore endpoints with invalid wMaxPacketSize
In reply to Greg Kroah-HartmanFrom: Bjørn Mork <[email protected]>
[ Upstream commit 8d3d7c2029c1b360f1a6b0a2fca470b57eb575c0 ]
Endpoints with zero wMaxPacketSize are not usable for transferring data. Ignore such endpoints when looking for valid in, out and status pipes, to make the drivers more robust against invalid and meaningless descriptors.
The wMaxPacketSize of these endpoints are used for memory allocations and as divisors in many usbnet minidrivers. Avoiding zero is therefore critical.
--- drivers/net/usb/usbnet.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/usb/usbnet.c +5 -0
@@ -112,6 +112,11 @@ int usbnet_get_endpoints(struct usbnet *int intr =0 ; e = alt->endpoint + ep; + +/* ignore endpoints which cannot transfer data */ +if (!usb_endpoint_maxp (&e->desc)) +continue ; +switch (e->desc.bmAttributes) {case USB_ENDPOINT_XFER_INT :if (!usb_endpoint_dir_in (&e->desc))
Greg Kroah-Hartman
maintainerPATCH 46/185 usbnet: sanity checking of packet sizes and device mtu
In reply to Greg Kroah-HartmanFrom: Oliver Neukum <[email protected]>
[ Upstream commit 280ceaed79f18db930c0cc8bb21f6493490bf29c ]
After a reset packet sizes and device mtu can change and need to be reevaluated to calculate queue sizes. Malicious devices can set this to zero and we divide by it. Introduce sanity checking.
--- drivers/net/usb/usbnet.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/usb/usbnet.c +3 -0
@@ -356,6 +356,8 @@ void usbnet_update_max_qlen(struct usbne {enum usb_device_speed speed = dev->udev->speed; +if (!dev->rx_urb_size || !dev->hard_mtu) + goto insanity;switch (speed) {case USB_SPEED_HIGH : dev->rx_qlen =MAX_QUEUE_MEMORY / dev->rx_urb_size;
@@ -372,6 +374,7 @@ void usbnet_update_max_qlen(struct usbne dev->tx_qlen =5 *MAX_QUEUE_MEMORY / dev->hard_mtu;break ;default : +insanity: dev->rx_qlen = dev->tx_qlen =4 ; } }
Greg Kroah-Hartman
maintainerPATCH 47/185 net/mlx5: Add device ID of upcoming BlueField-2
In reply to Greg Kroah-HartmanFrom: Bodong Wang <[email protected]>
[ Upstream commit d19a79ee38c8fda6d297e4227e80db8bf51c71a6 ]
Add the device ID of upcoming BlueField-2 integrated ConnectX-6 Dx network controller. Its VFs will be using the generic VF device ID:0x101e "ConnectX Family mlx5Gen Virtual Function".
--- drivers/net/ethernet/mellanox/mlx5/core/main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/mellanox/mlx5/core/main.c +1 -0
@@ -1574,6 +1574,7 @@ static const struct pci_device_id mlx5_c { PCI_VDEVICE(MELLANOX, 0x101c), MLX5_PCI_DEV_IS_VF}, /* ConnectX-6 VF */ { PCI_VDEVICE(MELLANOX, 0xa2d2) }, /* BlueField integrated ConnectX-5 network controller */ { PCI_VDEVICE(MELLANOX, 0xa2d3), MLX5_PCI_DEV_IS_VF}, /* BlueField integrated ConnectX-5 network controller VF */ + { PCI_VDEVICE(MELLANOX, 0xa2d6) }, /* BlueField-2 integrated ConnectX-6 Dx network controller */ { 0, } };
Greg Kroah-Hartman
maintainerPATCH 48/185 mISDN: enforce CAP_NET_RAW for raw sockets
In reply to Greg Kroah-HartmanFrom: Ori Nimron <[email protected]>
[ Upstream commit b91ee4aa2a2199ba4d4650706c272985a5a32d80 ]
When creating a raw AF_ISDN socket, CAP_NET_RAW needs to be checked first.
--- drivers/isdn/mISDN/socket.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/isdn/mISDN/socket.c +2 -0
@@ -766,6 +766,8 @@ base_sock_create(struct net *net, structif (sock->type !=SOCK_RAW )return -ESOCKTNOSUPPORT ; +if (!capable (CAP_NET_RAW )) +return -EPERM ; sk =sk_alloc (net,PF_ISDN ,GFP_KERNEL , &mISDN_proto, kern);if (!sk)
Greg Kroah-Hartman
maintainerPATCH 49/185 appletalk: enforce CAP_NET_RAW for raw sockets
In reply to Greg Kroah-HartmanFrom: Ori Nimron <[email protected]>
[ Upstream commit 6cc03e8aa36c51f3b26a0d21a3c4ce2809c842ac ]
When creating a raw AF_APPLETALK socket, CAP_NET_RAW needs to be checked first.
--- net/appletalk/ddp.c | 5 +++++ 1 file changed, 5 insertions(+)
net/appletalk/ddp.c +5 -0
@@ -1029,6 +1029,11 @@ static int atalk_create(struct net *net,*/ if (sock->type !=SOCK_RAW && sock->type !=SOCK_DGRAM ) goto out; + + rc = -EPERM ; +if (sock->type ==SOCK_RAW && !kern && !capable (CAP_NET_RAW )) + goto out; + rc = -ENOMEM ; sk =sk_alloc (net,PF_APPLETALK ,GFP_KERNEL , &ddp_proto, kern);if (!sk)
Greg Kroah-Hartman
maintainerPATCH 50/185 ax25: enforce CAP_NET_RAW for raw sockets
In reply to Greg Kroah-HartmanFrom: Ori Nimron <[email protected]>
[ Upstream commit 0614e2b73768b502fc32a75349823356d98aae2c ]
When creating a raw AF_AX25 socket, CAP_NET_RAW needs to be checked first.
--- net/ax25/af_ax25.c | 2 ++ 1 file changed, 2 insertions(+)
net/ax25/af_ax25.c +2 -0
@@ -859,6 +859,8 @@ static int ax25_create(struct net *net,break ;case SOCK_RAW : +if (!capable (CAP_NET_RAW )) +return -EPERM ;break ;default :return -ESOCKTNOSUPPORT ;
Greg Kroah-Hartman
maintainerPATCH 51/185 ieee802154: enforce CAP_NET_RAW for raw sockets
In reply to Greg Kroah-HartmanFrom: Ori Nimron <[email protected]>
[ Upstream commit e69dbd4619e7674c1679cba49afd9dd9ac347eef ]
When creating a raw AF_IEEE802154 socket, CAP_NET_RAW needs to be checked first.
--- net/ieee802154/socket.c | 3 +++ 1 file changed, 3 insertions(+)
net/ieee802154/socket.c +3 -0
@@ -1001,6 +1001,9 @@ static int ieee802154_create(struct netswitch (sock->type) {case SOCK_RAW : + rc = -EPERM ; +if (!capable (CAP_NET_RAW )) + goto out; proto = &ieee802154_raw_prot; ops = &ieee802154_raw_ops;break ;
Greg Kroah-Hartman
maintainerPATCH 52/185 nfc: enforce CAP_NET_RAW for raw sockets
In reply to Greg Kroah-HartmanFrom: Ori Nimron <[email protected]>
[ Upstream commit 3a359798b176183ef09efb7a3dc59abad1cc7104 ]
When creating a raw AF_NFC socket, CAP_NET_RAW needs to be checked first.
--- net/nfc/llcp_sock.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
net/nfc/llcp_sock.c +5 -2
@@ -1012,10 +1012,13 @@ static int llcp_sock_create(struct net * sock->type != SOCK_RAW)return -ESOCKTNOSUPPORT ; -if (sock->type ==SOCK_RAW ) +if (sock->type ==SOCK_RAW ) { +if (!capable (CAP_NET_RAW )) +return -EPERM ; sock->ops = &llcp_rawsock_ops; -else + }else { sock->ops = &llcp_sock_ops; + } sk =nfc_llcp_sock_alloc (sock, sock->type,GFP_ATOMIC , kern);if (sk ==NULL )
Greg Kroah-Hartman
maintainerPATCH 53/185 ALSA: hda: Flush interrupts on disabling
In reply to Greg Kroah-HartmanFrom: Chris Wilson <[email protected]>
[ Upstream commit caa8422d01e983782548648e125fd617cadcec3f ]
I was looking at
<4> [241.835158] general protection fault: 0000 [#1] PREEMPT SMP PTI
<4> [241.835181] CPU: 1 PID: 214 Comm: kworker/1:3 Tainted: G U 5.2.0-CI-CI_DRM_6509+ #1
<4> [241.835199] Hardware name: Dell Inc. OptiPlex 745 /0GW726, BIOS 2.3.1 05/21/2007
<4> [241.835234] Workqueue: events snd_hdac_bus_process_unsol_events [snd_hda_core]
<4> [241.835256] RIP: 0010:input_handle_event+0x16d/0x5e0
<4> [241.835270] Code: 48 8b 93 58 01 00 00 8b 52 08 89 50 04 8b 83 f8 06 00 00 48 8b 93 00 07 00 00 8d 70 01 48 8d 04 c2 83 e1 08 89 b3 f8 06 00 00 <66> 89 28 66 44 89 60 02 44 89 68 04 8b 93 f8 06 00 00 0f 84 fd fe <4> [241.835304] RSP: 0018:ffffc9000019fda0 EFLAGS: 00010046
<4> [241.835317] RAX: 6b6b6b6ec6c6c6c3 RBX: ffff8880290fefc8 RCX: 0000000000000000
<4> [241.835332] RDX: 000000006b6b6b6b RSI: 000000006b6b6b6c RDI: 0000000000000046
<4> [241.835347] RBP: 0000000000000005 R08: 0000000000000000 R09: 0000000000000001
<4> [241.835362] R10: ffffc9000019faa0 R11: 0000000000000000 R12: 0000000000000004
<4> [241.835377] R13: 0000000000000000 R14: ffff8880290ff1d0 R15: 0000000000000293
<4> [241.835392] FS: 0000000000000000(0000) GS:ffff88803de80000(0000) knlGS:0000000000000000
<4> [241.835409] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
<4> [241.835422] CR2: 00007ffe9a99e9b7 CR3: 000000002f588000 CR4: 00000000000006e0
<4> [241.835436] Call Trace:
<4> [241.835449] input_event+0x45/0x70 <4> [241.835464] snd_jack_report+0xdc/0x100 <4> [241.835490] snd_hda_jack_report_sync+0x83/0xc0 [snd_hda_codec] <4> [241.835512] snd_hdac_bus_process_unsol_events+0x5a/0x70 [snd_hda_core] <4> [241.835530] process_one_work+0x245/0x610
which has the hallmarks of a worker queued from interrupt after it was supposedly cancelled (note the POISON_FREE), and I could not see where the interrupt would be flushed on shutdown so added the likely suspects.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111174
--- sound/hda/hdac_controller.c | 2 ++ sound/pci/hda/hda_intel.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
sound/hda/hdac_controller.c +2 -0
@@ -442,6 +442,8 @@ static void azx_int_disable(struct hdac_bus *bus)list_for_each_entry (azx_dev, &bus->stream_list, list)snd_hdac_stream_updateb (azx_dev,SD_CTL ,SD_INT_MASK ,0 ); +synchronize_irq (bus->irq); +/* disable SIE for all streams */ snd_hdac_chip_writeb (bus,INTCTL ,0 );
sound/pci/hda/hda_intel.c +1 -1
@@ -1413,9 +1413,9 @@ static int azx_free(struct azx *chip) }if (bus->chip_init) { +azx_stop_chip (chip);azx_clear_irq_pending (chip);azx_stop_all_streams (chip); -azx_stop_chip (chip); }if (bus->irq >=0 )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 54/185 regulator: lm363x: Fix off-by-one n_voltages for lm3632 ldo_vpos/ldo_vneg
In reply to Greg Kroah-HartmanFrom: Axel Lin <[email protected]>
[ Upstream commit 1e2cc8c5e0745b545d4974788dc606d678b6e564 ]
According to the datasheet https://www.ti.com/lit/ds/symlink/lm3632a.pdf
Table 20. VPOS Bias Register Field Descriptions VPOS[5:0] Sets the Positive Display Bias (LDO) Voltage (50 mV per step) 000000: 4 V
000001: 4.05 V
000010: 4.1 V
....................
011101: 5.45 V
011110: 5.5 V (Default)
011111: 5.55 V
....................
100111: 5.95 V
101000: 6 V
Note: Codes 101001 to 111111 map to 6 V
The LM3632_LDO_VSEL_MAX should be 0b101000 (0x28), so the maximum voltage can match the datasheet.
--- drivers/regulator/lm363x-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/lm363x-regulator.c +1 -1
@@ -33,7 +33,7 @@/* LM3632 */ #define LM3632_BOOST_VSEL_MAX 0x26 -#define LM3632_LDO_VSEL_MAX 0x29 +#define LM3632_LDO_VSEL_MAX 0x28#define LM3632_VBOOST_MIN 4500000#define LM3632_VLDO_MIN 4000000
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 55/185 ASoC: sgtl5000: Fix charge pump source assignment
In reply to Greg Kroah-HartmanFrom: Oleksandr Suvorov <[email protected]>
[ Upstream commit b6319b061ba279577fd7030a9848fbd6a17151e3 ]
If VDDA != VDDIO and any of them is greater than 3.1V, charge pump source can be assigned automatically [1].
[1] https://www.nxp.com/docs/en/data-sheet/SGTL5000.pdf
--- sound/soc/codecs/sgtl5000.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
sound/soc/codecs/sgtl5000.c +10 -5
@@ -1084,12 +1084,17 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec) SGTL5000_INT_OSC_EN);/* Enable VDDC charge pump */ ana_pwr |=SGTL5000_VDDC_CHRGPMP_POWERUP ; - }else if (vddio >=3100 && vdda >=3100 ) { + }else { ana_pwr &= ~SGTL5000_VDDC_CHRGPMP_POWERUP ; -/* VDDC use VDDIO rail */ - lreg_ctrl |=SGTL5000_VDDC_ASSN_OVRD ; - lreg_ctrl |=SGTL5000_VDDC_MAN_ASSN_VDDIO << -SGTL5000_VDDC_MAN_ASSN_SHIFT ; +/* +* if vddio == vdda the source of charge pump should be +* assigned manually to VDDIO +*/ +if (vddio == vdda) { + lreg_ctrl |=SGTL5000_VDDC_ASSN_OVRD ; + lreg_ctrl |=SGTL5000_VDDC_MAN_ASSN_VDDIO << +SGTL5000_VDDC_MAN_ASSN_SHIFT ; + } }snd_soc_write (codec,SGTL5000_CHIP_LINREG_CTRL , lreg_ctrl);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 56/185 dmaengine: bcm2835: Print error in case setting DMA mask fails
In reply to Greg Kroah-HartmanFrom: Stefan Wahren <[email protected]>
[ Upstream commit 72503b25ee363827aafffc3e8d872e6a92a7e422 ]
During enabling of the RPi 4, we found out that the driver doesn't provide a helpful error message in case setting DMA mask fails. So add one.
--- drivers/dma/bcm2835-dma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/dma/bcm2835-dma.c +3 -1
@@ -891,8 +891,10 @@ static int bcm2835_dma_probe(struct platform_device *pdev) pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask; rc =dma_set_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (32 )); -if (rc) +if (rc) { +dev_err (&pdev->dev,"Unable to set DMA mask\n" );return rc; + } od =devm_kzalloc (&pdev->dev,sizeof (*od),GFP_KERNEL );if (!od)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 57/185 leds: leds-lp5562 allow firmware files up to the maximum length
In reply to Greg Kroah-HartmanFrom: Nick Stoughton <[email protected]>
[ Upstream commit ed2abfebb041473092b41527903f93390d38afa7 ]
Firmware files are in ASCII, using 2 hex characters per byte. The maximum length of a firmware string is therefore
16 (commands) * 2 (bytes per command) * 2 (characters per byte) = 64
--- drivers/leds/leds-lp5562.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/leds/leds-lp5562.c +5 -1
@@ -263,7 +263,11 @@ static void lp5562_firmware_loaded(struct lp55xx_chip *chip) {const struct firmware *fw = chip->fw; -if (fw->size >LP5562_PROGRAM_LENGTH ) { +/* +* the firmware is encoded in ascii hex character, with 2 chars +* per byte +*/ +if (fw->size > (LP5562_PROGRAM_LENGTH *2 )) {dev_err (&chip->cl->dev,"firmware data size overflow: %zu\n" , fw->size);return ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 58/185 media: dib0700: fix link error for dibx000_i2c_set_speed
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 765bb8610d305ee488b35d07e2a04ae52fb2df9c ]
When CONFIG_DVB_DIB9000 is disabled, we can still compile code that now fails to link against dibx000_i2c_set_speed:
drivers/media/usb/dvb-usb/dib0700_devices.o: In function `dib01x0_pmu_update.constprop.7':
dib0700_devices.c:(.text.unlikely+0x1c9c): undefined reference to `dibx000_i2c_set_speed'
The call sites are both through dib01x0_pmu_update(), which gets passed an 'i2c' pointer from dib9000_get_i2c_master(), which has returned NULL. Checking this pointer seems to be a good idea anyway, and it avoids the link failure in most cases.
Sean Young found another case that is not fixed by that, where certain gcc versions leave an unused function in place that causes the link error, but adding an explict IS_ENABLED() check also solves this.
--- drivers/media/usb/dvb-usb/dib0700_devices.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/media/usb/dvb-usb/dib0700_devices.c +8 -0
@@ -2438,9 +2438,13 @@ static int dib9090_tuner_attach(struct dvb_usb_adapter *adap) 8, 0x0486, }; +if (!IS_ENABLED (CONFIG_DVB_DIB9000 )) +return -ENODEV ;if (dvb_attach (dib0090_fw_register, adap->fe_adap[0 ].fe, i2c, &dib9090_dib0090_config) ==NULL )return -ENODEV ; i2c =dib9000_get_i2c_master (adap->fe_adap[0 ].fe,DIBX000_I2C_INTERFACE_GPIO_1_2 ,0 ); +if (!i2c) +return -ENODEV ;if (dib01x0_pmu_update (i2c, data_dib190,10 ) !=0 )return -ENODEV ;dib0700_set_i2c_speed (adap->dev,1500 );
@@ -2516,10 +2520,14 @@ static int nim9090md_tuner_attach(struct dvb_usb_adapter *adap)0 ,0x00ef , 8, 0x0406, }; +if (!IS_ENABLED (CONFIG_DVB_DIB9000 )) +return -ENODEV ; i2c =dib9000_get_tuner_interface (adap->fe_adap[0 ].fe);if (dvb_attach (dib0090_fw_register, adap->fe_adap[0 ].fe, i2c, &nim9090md_dib0090_config[0 ]) ==NULL )return -ENODEV ; i2c =dib9000_get_i2c_master (adap->fe_adap[0 ].fe,DIBX000_I2C_INTERFACE_GPIO_1_2 ,0 ); +if (!i2c) +return -ENODEV ;if (dib01x0_pmu_update (i2c, data_dib190,10 ) <0 )return -ENODEV ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 59/185 media: mtk-cir: lower de-glitch counter for rc-mm protocol
In reply to Greg Kroah-HartmanFrom: Sean Young <[email protected]>
[ Upstream commit 5dd4b89dc098bf22cd13e82a308f42a02c102b2b ]
The rc-mm protocol can't be decoded by the mtk-cir since the de-glitch filter removes pulses/spaces shorter than 294 microseconds.
Tested on a BananaPi R2.
--- drivers/media/rc/mtk-cir.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/media/rc/mtk-cir.c +8 -0
@@ -44,6 +44,11 @@/* Fields containing pulse width data */ #define MTK_WIDTH_MASK (GENMASK(7, 0)) +/* IR threshold */ +#define MTK_IRTHD 0x14 +#define MTK_DG_CNT_MASK (GENMASK(12, 8)) +#define MTK_DG_CNT (x) ((x) << 8) +/* Bit to enable interrupt */ #define MTK_IRINT_EN BIT(0)
@@ -411,6 +416,9 @@ static int mtk_ir_probe(struct platform_device *pdev)mtk_w32_mask (ir, val, ir->data->fields[MTK_HW_PERIOD ].mask, ir->data->fields[MTK_HW_PERIOD ].reg); +/* Set de-glitch counter */ +mtk_w32_mask (ir,MTK_DG_CNT (1 ),MTK_DG_CNT_MASK ,MTK_IRTHD ); +/* Enable IR and PWM */ val =mtk_r32 (ir,MTK_CONFIG_HIGH_REG ); val |=MTK_OK_COUNT (ir->data->ok_count) |MTK_PWM_EN |MTK_IR_EN ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 60/185 media: exynos4-is: fix leaked of_node references
In reply to Greg Kroah-HartmanFrom: Wen Yang <[email protected]>
[ Upstream commit da79bf41a4d170ca93cc8f3881a70d734a071c37 ]
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/media/platform/exynos4-is/fimc-is.c:813:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 807, but without a corresponding object release within this function. drivers/media/platform/exynos4-is/fimc-is.c:870:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 807, but without a corresponding object release within this function. drivers/media/platform/exynos4-is/fimc-is.c:885:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 807, but without a corresponding object release within this function. drivers/media/platform/exynos4-is/media-dev.c:545:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 541, but without a corresponding object release within this function. drivers/media/platform/exynos4-is/media-dev.c:528:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 499, but without a corresponding object release within this function. drivers/media/platform/exynos4-is/media-dev.c:534:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 499, but without a corresponding object release within this function.
--- drivers/media/platform/exynos4-is/fimc-is.c | 1 + drivers/media/platform/exynos4-is/media-dev.c | 2 ++ 2 files changed, 3 insertions(+)
drivers/media/platform/exynos4-is/fimc-is.c +1 -0
@@ -819,6 +819,7 @@ static int fimc_is_probe(struct platform_device *pdev)return -ENODEV ; is->pmu_regs =of_iomap (node,0 ); +of_node_put (node);if (!is->pmu_regs)return -ENOMEM ;
drivers/media/platform/exynos4-is/media-dev.c +2 -0
@@ -496,6 +496,7 @@ static int fimc_md_register_sensor_entities(struct fimc_md *fmd)continue ; ret =fimc_md_parse_port_node (fmd, port, index); +of_node_put (port);if (ret <0 ) {of_node_put (node); goto rpm_put;
@@ -529,6 +530,7 @@ static int __of_get_csis_id(struct device_node *np)if (!np)return -EINVAL ;of_property_read_u32 (np,"reg" , ®); +of_node_put (np);return reg -FIMC_INPUT_MIPI_CSI2_0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 61/185 media: hdpvr: Add device num check and handling
In reply to Greg Kroah-HartmanFrom: Luke Nowakowski-Krijger <[email protected]>
[ Upstream commit d4a6a9537bc32811486282206ecfb7c53754b74d ]
Add hdpvr device num check and error handling
We need to increment the device count atomically before we checkout a device to make sure that we do not reach the max count, otherwise we get out-of-bounds errors as reported by syzbot.
--- drivers/media/usb/hdpvr/hdpvr-core.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/media/usb/hdpvr/hdpvr-core.c +11 -1
@@ -275,6 +275,7 @@ static int hdpvr_probe(struct usb_interface *interface,#endif size_t buffer_size;int i; +int dev_num;int retval = -ENOMEM ;/* allocate memory for our device state and initialize it */
@@ -379,8 +380,17 @@ static int hdpvr_probe(struct usb_interface *interface, }#endif + dev_num =atomic_inc_return (&dev_nr); +if (dev_num >=HDPVR_MAX ) { +v4l2_err (&dev->v4l2_dev, +"max device number reached, device register failed\n" ); +atomic_dec (&dev_nr); + retval = -ENODEV ; + goto reg_fail; + } + retval =hdpvr_register_videodev (dev, &interface->dev, - video_nr[atomic_inc_return (&dev_nr)]); + video_nr[dev_num]);if (retval <0 ) {v4l2_err (&dev->v4l2_dev,"registering videodev failed\n" ); goto reg_fail;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 62/185 media: i2c: ov5640: Check for devm_gpiod_get_optional() error
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit 8791a102ce579346cea9d2f911afef1c1985213c ]
The power down and reset GPIO are optional, but the return value from devm_gpiod_get_optional() needs to be checked and propagated in the case of error, so that probe deferral can work.
--- drivers/media/i2c/ov5640.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/media/i2c/ov5640.c +5 -0
@@ -2261,9 +2261,14 @@ static int ov5640_probe(struct i2c_client *client,/* request optional power down pin */ sensor->pwdn_gpio =devm_gpiod_get_optional (dev,"powerdown" ,GPIOD_OUT_HIGH ); +if (IS_ERR (sensor->pwdn_gpio)) +return PTR_ERR (sensor->pwdn_gpio); +/* request optional reset pin */ sensor->reset_gpio =devm_gpiod_get_optional (dev,"reset" ,GPIOD_OUT_HIGH ); +if (IS_ERR (sensor->reset_gpio)) +return PTR_ERR (sensor->reset_gpio);v4l2_i2c_subdev_init (&sensor->sd, client, &ov5640_subdev_ops);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 63/185 sched/fair: Fix imbalance due to CPU affinity
In reply to Greg Kroah-HartmanFrom: Vincent Guittot <[email protected]>
[ Upstream commit f6cad8df6b30a5d2bbbd2e698f74b4cafb9fb82b ]
The load_balance() has a dedicated mecanism to detect when an imbalance is due to CPU affinity and must be handled at parent level. In this case, the imbalance field of the parent's sched_group is set.
The description of sg_imbalanced() gives a typical example of two groups of 4 CPUs each and 4 tasks each with a cpumask covering 1 CPU of the first group and 3 CPUs of the second group. Something like:
{ 0 1 2 3 } { 4 5 6 7 }
* * * *But the load_balance fails to fix this UC on my octo cores system made of 2 clusters of quad cores.
Whereas the load_balance is able to detect that the imbalanced is due to CPU affinity, it fails to fix it because the imbalance field is cleared before letting parent level a chance to run. In fact, when the imbalance is detected, the load_balance reruns without the CPU with pinned tasks. But there is no other running tasks in the situation described above and everything looks balanced this time so the imbalance field is immediately cleared.
The imbalance field should not be cleared if there is no other task to move when the imbalance is detected.
--- kernel/sched/fair.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/sched/fair.c +3 -2
@@ -8359,9 +8359,10 @@ static int load_balance(int this_cpu, struct rq *this_rq, out_balanced:/* * We reach balance although we may have faced some affinity -* constraints. Clear the imbalance flag if it was set. +* constraints. Clear the imbalance flag only if other tasks got +* a chance to move and fix the imbalance. */ -if (sd_parent) { +if (sd_parent && !(env.flags &LBF_ALL_PINNED )) {int *group_imbalance = &sd_parent->groups->sgc->imbalance;if (*group_imbalance)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 64/185 sched/core: Fix CPU controller for !RT_GROUP_SCHED
In reply to Greg Kroah-HartmanFrom: Juri Lelli <[email protected]>
[ Upstream commit a07db5c0865799ebed1f88be0df50c581fb65029 ]
On !CONFIG_RT_GROUP_SCHED configurations it is currently not possible to move RT tasks between cgroups to which CPU controller has been attached; but it is oddly possible to first move tasks around and then make them RT (setschedule to FIFO/RR).
E.g.:
# mkdir /sys/fs/cgroup/cpu,cpuacct/group1 # chrt -fp 10 $$ # echo $$ > /sys/fs/cgroup/cpu,cpuacct/group1/tasks bash: echo: write error: Invalid argument # chrt -op 0 $$ # echo $$ > /sys/fs/cgroup/cpu,cpuacct/group1/tasks # chrt -fp 10 $$ # cat /sys/fs/cgroup/cpu,cpuacct/group1/tasks 2345 2598 # chrt -p 2345 pid 2345's current scheduling policy: SCHED_FIFO pid 2345's current scheduling priority: 10
Also, as Michal noted, it is currently not possible to enable CPU controller on unified hierarchy with !CONFIG_RT_GROUP_SCHED (if there are any kernel RT threads in root cgroup, they can't be migrated to the newly created CPU controller's root in cgroup_update_dfl_csses()).
Existing code comes with a comment saying the "we don't support RT-tasks being in separate groups". Such comment is however stale and belongs to pre-RT_GROUP_SCHED times. Also, it doesn't make much sense for !RT_GROUP_ SCHED configurations, since checks related to RT bandwidth are not performed at all in these cases.
Make moving RT tasks between CPU controller groups viable by removing special case check for RT (and DEADLINE) tasks.
--- kernel/sched/core.c | 4 ---- 1 file changed, 4 deletions(-)
kernel/sched/core.c +0 -4
@@ -6342,10 +6342,6 @@ static int cpu_cgroup_can_attach(struct cgroup_taskset *tset)#ifdef CONFIG_RT_GROUP_SCHED if (!sched_rt_can_attach (css_tg (css), task))return -EINVAL ; -#else -/* We don't support RT-tasks being in separate groups */ -if (task->sched_class != &fair_sched_class) -return -EINVAL ;#endif /* * Serialize against wake_up_new_task() such that if its
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 65/185 x86/reboot: Always use NMI fallback when shutdown via reboot vector IPI fails
In reply to Greg Kroah-HartmanFrom: Grzegorz Halat <[email protected]>
[ Upstream commit 747d5a1bf293dcb33af755a6d285d41b8c1ea010 ]
A reboot request sends an IPI via the reboot vector and waits for all other CPUs to stop. If one or more CPUs are in critical regions with interrupts disabled then the IPI is not handled on those CPUs and the shutdown hangs if native_stop_other_cpus() is called with the wait argument set.
Such a situation can happen when one CPU was stopped within a lock held section and another CPU is trying to acquire that lock with interrupts disabled. There are other scenarios which can cause such a lockup as well.
In theory the shutdown should be attempted by an NMI IPI after the timeout period elapsed. Though the wait loop after sending the reboot vector IPI prevents this. It checks the wait request argument and the timeout. If wait is set, which is true for sys_reboot() then it won't fall through to the NMI shutdown method after the timeout period has finished.
This was an oversight when the NMI shutdown mechanism was added to handle the 'reboot IPI is not working' situation. The mechanism was added to deal with stuck panic shutdowns, which do not have the wait request set, so the 'wait request' case was probably not considered.
Remove the wait check from the post reboot vector IPI wait loop and enforce that the wait loop in the NMI fallback path is invoked even if NMI IPIs are disabled or the registration of the NMI handler fails. That second wait loop will then hang if not all CPUs shutdown and the wait argument is set.
[ tglx: Avoid the hard to parse line break in the NMI fallback path,
add comments and massage the changelog ]
--- arch/x86/kernel/smp.c | 46 +++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 19 deletions(-)
arch/x86/kernel/smp.c +27 -19
@@ -181,6 +181,12 @@ asmlinkage __visible void smp_reboot_interrupt(void)irq_exit (); } +static int register_stop_handler (void ) +{ +return register_nmi_handler (NMI_LOCAL , smp_stop_nmi_callback, +NMI_FLAG_FIRST ,"smp_stop" ); +} +static void native_stop_other_cpus (int wait) {unsigned long flags;
@@ -214,39 +220,41 @@ static void native_stop_other_cpus(int wait) apic->send_IPI_allbutself (REBOOT_VECTOR );/* -* Don't wait longer than a second if the caller -* didn't ask us to wait. +* Don't wait longer than a second for IPI completion. The +* wait request is not checked here because that would +* prevent an NMI shutdown attempt in case that not all +* CPUs reach shutdown state. */ timeout =USEC_PER_SEC ; -while (num_online_cpus () >1 && (wait || timeout--)) +while (num_online_cpus () >1 && timeout--)udelay (1 ); } - -/* if the REBOOT_VECTOR didn't work, try with the NMI */ -if ((num_online_cpus () >1 ) && (!smp_no_nmi_ipi)) { -if (register_nmi_handler (NMI_LOCAL , smp_stop_nmi_callback, -NMI_FLAG_FIRST ,"smp_stop" )) -/* Note: we ignore failures here */ -/* Hope the REBOOT_IRQ is good enough */ - goto finish; - -/* sync above data before sending IRQ */ -wmb (); -pr_emerg ("Shutting down cpus with NMI\n" ); +/* if the REBOOT_VECTOR didn't work, try with the NMI */ +if (num_online_cpus () >1 ) { +/* +* If NMI IPI is enabled, try to register the stop handler +* and send the IPI. In any case try to wait for the other +* CPUs to stop. +*/ +if (!smp_no_nmi_ipi && !register_stop_handler ()) { +/* Sync above data before sending IRQ */ +wmb (); - apic->send_IPI_allbutself (NMI_VECTOR ); +pr_emerg ("Shutting down cpus with NMI\n" ); + apic->send_IPI_allbutself (NMI_VECTOR ); + }/* -* Don't wait longer than a 10 ms if the caller -* didn't ask us to wait. +* Don't wait longer than 10 ms if the caller didn't +* reqeust it. If wait is true, the machine hangs here if +* one or more CPUs do not reach shutdown state. */ timeout =USEC_PER_MSEC *10 ;while (num_online_cpus () >1 && (wait || timeout--))udelay (1 ); } -finish:local_irq_save (flags);disable_local_APIC ();mcheck_cpu_clear (this_cpu_ptr (&cpu_info));
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 66/185 x86/apic: Soft disable APIC before initializing it
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
[ Upstream commit 2640da4cccf5cc613bf26f0998b9e340f4b5f69c ]
If the APIC was already enabled on entry of setup_local_APIC() then disabling it soft via the SPIV register makes a lot of sense.
That masks all LVT entries and brings it into a well defined state.
Otherwise previously enabled LVTs which are not touched in the setup function stay unmasked and might surprise the just booting kernel.
--- arch/x86/kernel/apic/apic.c | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/x86/kernel/apic/apic.c +8 -0
@@ -1384,6 +1384,14 @@ void setup_local_APIC(void)return ; } +/* +* If this comes from kexec/kcrash the APIC might be enabled in +* SPIV. Soft disable it before doing further initialization. +*/ + value =apic_read (APIC_SPIV ); + value &= ~APIC_SPIV_APIC_ENABLED ; +apic_write (APIC_SPIV , value); +#ifdef CONFIG_X86_32 /* Pound the ESR really hard over the head with a big hammer - mbligh */ if (lapic_is_integrated () && apic->disable_esr) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 67/185 ALSA: hda - Show the fatal CORB/RIRB error more clearly
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit dd65f7e19c6961ba6a69f7c925021b7a270cb950 ]
The last fallback of CORB/RIRB communication error recovery is to turn on the single command mode, and this last resort usually means that something is really screwed up. Instead of a normal dev_err(), show the error more clearly with dev_WARN() with the caller stack trace.
Also, show the bus-reset fallback also as an error, too.
--- sound/pci/hda/hda_controller.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/pci/hda/hda_controller.c +4 -1
@@ -877,10 +877,13 @@ static int azx_rirb_get_response(struct hdac_bus *bus, unsigned int addr,*/ if (hbus->allow_bus_reset && !hbus->response_reset && !hbus->in_reset) { hbus->response_reset =1 ; +dev_err (chip->card->dev, +"No response from codec, resetting bus: last cmd=0x%08x\n" , + bus->last_cmd[addr]);return -EAGAIN ;/* give a chance to retry */ } -dev_err (chip->card->dev, +dev_WARN (chip->card->dev,"azx_get_response timeout, switching to single_cmd mode: last cmd=0x%08x\n" , bus->last_cmd[addr]); chip->single_cmd =1 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 68/185 ALSA: i2c: ak4xxx-adda: Fix a possible null pointer dereference in build_adc_controls()
In reply to Greg Kroah-HartmanFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit 2127c01b7f63b06a21559f56a8c81a3c6535bd1a ]
In build_adc_controls(), there is an if statement on line 773 to check whether ak->adc_info is NULL:
if (! ak->adc_info ||
! ak->adc_info[mixer_ch].switch_name)When ak->adc_info is NULL, it is used on line 792:
knew.name = ak->adc_info[mixer_ch].selector_name;
Thus, a possible null-pointer dereference may occur.
To fix this bug, referring to lines 773 and 774, ak->adc_info and ak->adc_info[mixer_ch].selector_name are checked before being used.
This bug is found by a static analysis tool STCheck written by us.
--- sound/i2c/other/ak4xxx-adda.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
sound/i2c/other/ak4xxx-adda.c +4 -3
@@ -789,11 +789,12 @@ static int build_adc_controls(struct snd_akm4xxx *ak)return err;memset (&knew,0 ,sizeof (knew)); - knew.name = ak->adc_info[mixer_ch].selector_name; -if (!knew.name) { +if (!ak->adc_info || + !ak->adc_info[mixer_ch].selector_name) { knew.name ="Capture Channel" ; knew.index = mixer_ch + ak->idx_offset *2 ; - } + }else + knew.name = ak->adc_info[mixer_ch].selector_name; knew.iface =SNDRV_CTL_ELEM_IFACE_MIXER ; knew.info = ak4xxx_capture_source_info;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 69/185 EDAC/mc: Fix grain_bits calculation
In reply to Greg Kroah-HartmanFrom: Robert Richter <[email protected]>
[ Upstream commit 3724ace582d9f675134985727fd5e9811f23c059 ]
The grain in EDAC is defined as "minimum granularity for an error report, in bytes". The following calculation of the grain_bits in edac_mc is wrong:
grain_bits = fls_long(e->grain) + 1;
Where grain_bits is defined as:
grain = 1 << grain_bits
Example:
grain = 8 # 64 bit (8 bytes) grain_bits = fls_long(8) + 1 grain_bits = 4 + 1 = 5 grain = 1 << grain_bits grain = 1 << 5 = 32
Replace it with the correct calculation:
grain_bits = fls_long(e->grain - 1);
The example gives now:
grain_bits = fls_long(8 - 1) grain_bits = fls_long(7) grain_bits = 3 grain = 1 << 3 = 8
Also, check if the hardware reports a reasonable grain != 0 and fallback with a warning to 1 byte granularity otherwise.
[ bp: massage a bit. ]
--- drivers/edac/edac_mc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/edac/edac_mc.c +6 -2
@@ -1240,9 +1240,13 @@ void edac_mc_handle_error(const enum hw_event_mc_err_type type,if (p > e->location) *(p -1 ) ='\0' ; -/* Report the error via the trace interface */ - grain_bits =fls_long (e->grain) +1 ; +/* Sanity-check driver-supplied grain value. */ +if (WARN_ON_ONCE (!e->grain)) + e->grain =1 ; + + grain_bits =fls_long (e->grain -1 ); +/* Report the error via the trace interface */ if (IS_ENABLED (CONFIG_RAS )) trace_mc_event(type, e->msg, e->label, e->error_count, mci->mc_idx, e->top_layer, e->mid_layer,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 70/185 media: iguanair: add sanity checks
In reply to Greg Kroah-HartmanFrom: Oliver Neukum <[email protected]>
[ Upstream commit ab1cbdf159beba7395a13ab70bc71180929ca064 ]
The driver needs to check the endpoint types, too, as opposed to the number of endpoints. This also requires moving the check earlier.
--- drivers/media/rc/iguanair.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/media/rc/iguanair.c +7 -8
@@ -427,6 +427,10 @@ static int iguanair_probe(struct usb_interface *intf,int ret, pipein, pipeout;struct usb_host_interface *idesc; + idesc = intf->altsetting; +if (idesc->desc.bNumEndpoints <2 ) +return -ENODEV ; + ir =kzalloc (sizeof (*ir),GFP_KERNEL ); rc =rc_allocate_device (RC_DRIVER_IR_RAW );if (!ir || !rc) {
@@ -441,18 +445,13 @@ static int iguanair_probe(struct usb_interface *intf, ir->urb_in =usb_alloc_urb (0 ,GFP_KERNEL ); ir->urb_out =usb_alloc_urb (0 ,GFP_KERNEL ); -if (!ir->buf_in || !ir->packet || !ir->urb_in || !ir->urb_out) { +if (!ir->buf_in || !ir->packet || !ir->urb_in || !ir->urb_out || + !usb_endpoint_is_int_in (&idesc->endpoint[0 ].desc) || + !usb_endpoint_is_int_out (&idesc->endpoint[1 ].desc)) { ret = -ENOMEM ; goto out; } - idesc = intf->altsetting; - -if (idesc->desc.bNumEndpoints <2 ) { - ret = -ENODEV ; - goto out; - } - ir->rc = rc; ir->dev = &intf->dev; ir->udev = udev;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 71/185 base: soc: Export soc_device_register/unregister APIs
In reply to Greg Kroah-HartmanFrom: Vinod Koul <[email protected]>
[ Upstream commit f7ccc7a397cf2ef64aebb2f726970b93203858d2 ]
Qcom Socinfo driver can be built as a module, so
export these two APIs.
--- drivers/base/soc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/base/soc.c +2 -0
@@ -155,6 +155,7 @@ struct soc_device *soc_device_register(struct soc_device_attribute *soc_dev_attr out1:return ERR_PTR (ret); } +EXPORT_SYMBOL_GPL (soc_device_register);/* Ensure soc_dev->attr is freed prior to calling soc_device_unregister. */ void soc_device_unregister (struct soc_device *soc_dev)
@@ -164,6 +165,7 @@ void soc_device_unregister(struct soc_device *soc_dev)device_unregister (&soc_dev->dev); early_soc_dev_attr =NULL ; } +EXPORT_SYMBOL_GPL (soc_device_unregister);static int __init soc_bus_register (void ) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 72/185 ALSA: usb-audio: Skip bSynchAddress endpoint check if it is invalid
In reply to Greg Kroah-HartmanFrom: Ard van Breemen <[email protected]>
[ Upstream commit 1b34121d9f26d272b0b2334209af6b6fc82d4bf1 ]
The Linux kernel assumes that get_endpoint(alts,0) and get_endpoint(alts,1) are eachothers feedback endpoints.
To reassure that validity it will test bsynchaddress to comply with that assumption. But if the bsyncaddress is 0 (invalid), it will flag that as a wrong assumption and return an error.
Fix: Skip the test if bSynchAddress is 0.
Note: those with a valid bSynchAddress should have a code quirck added.
--- sound/usb/pcm.c | 1 + 1 file changed, 1 insertion(+)
sound/usb/pcm.c +1 -0
@@ -470,6 +470,7 @@ static int set_sync_endpoint(struct snd_usb_substream *subs, } ep =get_endpoint (alts,1 )->bEndpointAddress;if (get_endpoint (alts,0 )->bLength >=USB_DT_ENDPOINT_AUDIO_SIZE && +get_endpoint (alts,0 )->bSynchAddress !=0 && ((is_playback && ep != (unsigned int )(get_endpoint (alts,0 )->bSynchAddress |USB_DIR_IN )) || (!is_playback && ep != (unsigned int )(get_endpoint (alts,0 )->bSynchAddress & ~USB_DIR_IN )))) { dev_err(&dev->dev,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 73/185 ia64:unwind: fix double free for mod->arch.init_unw_table
In reply to Greg Kroah-HartmanFrom: chenzefeng <[email protected]>
[ Upstream commit c5e5c48c16422521d363c33cfb0dcf58f88c119b ]
The function free_module in file kernel/module.c as follow:
void free_module(struct module *mod) {
......
module_arch_cleanup(mod);
......
module_arch_freeing_init(mod);
......
}Both module_arch_cleanup and module_arch_freeing_init function would free the mod->arch.init_unw_table, which cause double free.
Here, set mod->arch.init_unw_table = NULL after remove the unwind table to avoid double free.
--- arch/ia64/kernel/module.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/ia64/kernel/module.c +6 -2
@@ -913,8 +913,12 @@ module_finalize (const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, struct module *movoid module_arch_cleanup (struct module *mod) { -if (mod->arch.init_unw_table) +if (mod->arch.init_unw_table) {unw_remove_unwind_table (mod->arch.init_unw_table); -if (mod->arch.core_unw_table) + mod->arch.init_unw_table =NULL ; + } +if (mod->arch.core_unw_table) {unw_remove_unwind_table (mod->arch.core_unw_table); + mod->arch.core_unw_table =NULL ; + } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 74/185 EDAC/altera: Use the proper type for the IRQ status bits
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 8faa1cf6ed82f33009f63986c3776cc48af1b7b2 ]
Smatch complains about the cast of a u32 pointer to unsigned long:
drivers/edac/altera_edac.c:1878 altr_edac_a10_irq_handler()
warn: passing casted pointer '&irq_status' to 'find_first_bit()'
This code wouldn't work on a 64 bit big endian system because it would read past the end of &irq_status.
[ bp: massage. ]
--- drivers/edac/altera_edac.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/edac/altera_edac.c +3 -1
@@ -1646,6 +1646,7 @@ static void altr_edac_a10_irq_handler(struct irq_desc *desc)struct altr_arria10_edac *edac =irq_desc_get_handler_data (desc);struct irq_chip *chip =irq_desc_get_chip (desc);int irq =irq_desc_get_irq (desc); +unsigned long bits; dberr = (irq = edac->db_irq) ?1 :0 ; sm_offset = dberr ? A10_SYSMGR_ECC_INTSTAT_DERR_OFST :
@@ -1655,7 +1656,8 @@ static void altr_edac_a10_irq_handler(struct irq_desc *desc)regmap_read (edac->ecc_mgr_map, sm_offset, &irq_status); -for_each_set_bit (bit, (unsigned long *)&irq_status,32 ) { + bits = irq_status; +for_each_set_bit (bit, &bits,32 ) { irq =irq_linear_revmap (edac->domain, dberr *32 + bit);if (irq)generic_handle_irq (irq);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 75/185 ASoC: rsnd: dont call clk_get_rate() under atomic context
In reply to Greg Kroah-HartmanFrom: Kuninori Morimoto <[email protected]>
[ Upstream commit 06e8f5c842f2dbb232897ba967ea7b422745c271 ]
ADG is using clk_get_rate() under atomic context, thus, we might have scheduling issue.
To avoid this issue, we need to get/keep clk rate under non atomic context.
We need to handle ADG as special device at Renesas Sound driver.
Quoted 1 line
From SW point of view, we want to impletent it as
rsnd_mod_ops :: prepare, but it makes code just complicate.
To avoid complicated code/patch, this patch adds new clk_rate[] array, and keep clk IN rate when rsnd_adg_clk_enable() was called.
--- sound/soc/sh/rcar/adg.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
sound/soc/sh/rcar/adg.c +15 -6
@@ -33,6 +33,7 @@ struct rsnd_adg {struct clk *clkout[CLKOUTMAX ];struct clk_onecell_data onecell;struct rsnd_mod mod; +int clk_rate[CLKMAX ];u32 flags;u32 ckr;u32 rbga;
@@ -110,9 +111,9 @@ static void __rsnd_adg_get_timesel_ratio(struct rsnd_priv *priv,unsigned int val, en;unsigned int min, diff;unsigned int sel_rate[] = { -clk_get_rate (adg->clk[CLKA ]),/* 0000: CLKA */ -clk_get_rate (adg->clk[CLKB ]),/* 0001: CLKB */ -clk_get_rate (adg->clk[CLKC ]),/* 0010: CLKC */ + adg->clk_rate[CLKA ],/* 0000: CLKA */ + adg->clk_rate[CLKB ],/* 0001: CLKB */ + adg->clk_rate[CLKC ],/* 0010: CLKC */ adg->rbga_rate_for_441khz,/* 0011: RBGA */ adg->rbgb_rate_for_48khz,/* 0100: RBGB */ };
@@ -328,7 +329,7 @@ int rsnd_adg_clk_query(struct rsnd_priv *priv, unsigned int rate)* AUDIO_CLKA/AUDIO_CLKB/AUDIO_CLKC/AUDIO_CLKI. */ for_each_rsnd_clk (clk, adg, i) { -if (rate ==clk_get_rate (clk)) +if (rate == adg->clk_rate[i])return sel_table[i]; }
@@ -394,10 +395,18 @@ void rsnd_adg_clk_control(struct rsnd_priv *priv, int enable)for_each_rsnd_clk (clk, adg, i) { ret =0 ; -if (enable) +if (enable) { ret =clk_prepare_enable (clk); -else + +/* +* We shouldn't use clk_get_rate() under +* atomic context. Let's keep it when +* rsnd_adg_clk_enable() was called +*/ + adg->clk_rate[i] =clk_get_rate (adg->clk[i]); + }else {clk_disable_unprepare (clk); + }if (ret <0 )dev_warn (dev,"can't use clk %d\n" , i);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 76/185 md/raid1: end bio when the device faulty
In reply to Greg Kroah-HartmanFrom: Yufen Yu <[email protected]>
[ Upstream commit eeba6809d8d58908b5ed1b5ceb5fcb09a98a7cad ]
When write bio return error, it would be added to conf->retry_list and wait for raid1d thread to retry write and acknowledge badblocks.
In narrow_write_error(), the error bio will be split in the unit of badblock shift (such as one sector) and raid1d thread issues them one by one. Until all of the splited bio has finished, raid1d thread can go on processing other things, which is time consuming.
But, there is a scene for error handling that is not necessary. When the device has been set faulty, flush_bio_list() may end bios in pending_bio_list with error status. Since these bios has not been issued to the device actually, error handlding to retry write and acknowledge badblocks make no sense.
Even without that scene, when the device is faulty, badblocks info can not be written out to the device. Thus, we also no need to handle the error IO.
--- drivers/md/raid1.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)
drivers/md/raid1.c +14 -12
@@ -435,19 +435,21 @@ static void raid1_end_write_request(struct bio *bio)/* We never try FailFast to WriteMostly devices */ !test_bit(WriteMostly, &rdev->flags)) {md_error (r1_bio->mddev, rdev); -if (!test_bit (Faulty, &rdev->flags)) -/* This is the only remaining device, -* We need to retry the write without -* FailFast -*/ -set_bit (R1BIO_WriteError, &r1_bio->state); -else { -/* Finished with this branch */ - r1_bio->bios[mirror] =NULL ; - to_put = bio; - } - } else + } + +/* +* When the device is faulty, it is not necessary to +* handle write error. +* For failfast, this is the only remaining device, +* We need to retry the write without FailFast. +*/ +if (!test_bit (Faulty, &rdev->flags))set_bit (R1BIO_WriteError, &r1_bio->state); +else { +/* Finished with this branch */ + r1_bio->bios[mirror] =NULL ; + to_put = bio; + } }else {/* * Set R1BIO_Uptodate in our master bio, so that we
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 77/185 md: dont call spare_active in md_reap_sync_thread if all member devices cant work
In reply to Greg Kroah-HartmanFrom: Guoqing Jiang <[email protected]>
[ Upstream commit 0d8ed0e9bf9643f27f4816dca61081784dedb38d ]
When add one disk to array, the md_reap_sync_thread is responsible to activate the spare and set In_sync flag for the new member in spare_active().
But if raid1 has one member disk A, and disk B is added to the array. Then we offline A before all the datas are synchronized from A to B, obviously B doesn't have the latest data as A, but B is still marked with In_sync flag.
So let's not call spare_active under the condition, otherwise B is still showed with 'U' state which is not correct.
--- drivers/md/md.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/md/md.c +2 -1
@@ -8906,7 +8906,8 @@ void md_reap_sync_thread(struct mddev *mddev)/* resync has finished, collect result */ md_unregister_thread (&mddev->sync_thread);if (!test_bit (MD_RECOVERY_INTR , &mddev->recovery) && - !test_bit (MD_RECOVERY_REQUESTED , &mddev->recovery)) { + !test_bit (MD_RECOVERY_REQUESTED , &mddev->recovery) && + mddev->degraded != mddev->raid_disks) {/* success...*/ /* activate any spares */ if (mddev->pers->spare_active (mddev)) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 78/185 md: dont set In_sync if array is frozen
In reply to Greg Kroah-HartmanFrom: Guoqing Jiang <[email protected]>
[ Upstream commit 062f5b2ae12a153644c765e7ba3b0f825427be1d ]
When a disk is added to array, the following path is called in mdadm.
Manage_subdevs -> sysfs_freeze_array
-> Manage_add
-> sysfs_set_str(&info, NULL, "sync_action","idle")Then from kernel side, Manage_add invokes the path (add_new_disk -> validate_super = super_1_validate) to set In_sync flag.
Since In_sync means "device is in_sync with rest of array", and the new added disk need to resync thread to help the synchronization of data. And md_reap_sync_thread would call spare_active to set In_sync for the new added disk finally. So don't set In_sync if array is in frozen.
--- drivers/md/md.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/md/md.c +9 -2
@@ -1763,8 +1763,15 @@ static int super_1_validate(struct mddev *mddev, struct md_rdev *rdev)if (!(le32_to_cpu (sb->feature_map) &MD_FEATURE_RECOVERY_BITMAP )) rdev->saved_raid_disk =-1 ; - }else -set_bit (In_sync, &rdev->flags); + }else { +/* +* If the array is FROZEN, then the device can't +* be in_sync with rest of array. +*/ +if (!test_bit (MD_RECOVERY_FROZEN , + &mddev->recovery)) +set_bit (In_sync, &rdev->flags); + } rdev->raid_disk = role;break ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 79/185 RAS: Fix prototype warnings
In reply to Greg Kroah-HartmanFrom: Valdis Klētnieks <[email protected]>
[ Upstream commit 0a54b809a3a2c31e1055b45b03708eb730222be1 ]
When building with C=2 and/or W=1, legitimate warnings are issued about missing prototypes:
CHECK drivers/ras/debugfs.c
drivers/ras/debugfs.c:4:15: warning: symbol 'ras_debugfs_dir' was not declared. Should it be static? drivers/ras/debugfs.c:8:5: warning: symbol 'ras_userspace_consumers' was not declared. Should it be static? drivers/ras/debugfs.c:38:12: warning: symbol 'ras_add_daemon_trace' was not declared. Should it be static? drivers/ras/debugfs.c:54:13: warning: symbol 'ras_debugfs_init' was not declared. Should it be static?
CC drivers/ras/debugfs.o
drivers/ras/debugfs.c:8:5: warning: no previous prototype for 'ras_userspace_consumers' [-Wmissing-prototypes]
8 | int ras_userspace_consumers(void)
| ^~~~~~~~~~~~~~~~~~~~~~~
drivers/ras/debugfs.c:38:12: warning: no previous prototype for 'ras_add_daemon_trace' [-Wmissing-prototypes]
38 | int __init ras_add_daemon_trace(void)
| ^~~~~~~~~~~~~~~~~~~~
drivers/ras/debugfs.c:54:13: warning: no previous prototype for 'ras_debugfs_init' [-Wmissing-prototypes]
54 | void __init ras_debugfs_init(void)
| ^~~~~~~~~~~~~~~~
Provide the proper includes.
[ bp: Take care of the same warnings for cec.c too. ]
--- drivers/ras/cec.c | 1 + drivers/ras/debugfs.c | 2 ++ 2 files changed, 3 insertions(+)
drivers/ras/cec.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/mm.h> #include <linux/gfp.h> +#include <linux/ras.h> #include <linux/kernel.h> #include <asm/mce.h>
drivers/ras/debugfs.c +2 -0
@@ -1,4 +1,6 @@#include <linux/debugfs.h> +#include <linux/ras.h> +#include "debugfs.h" struct dentry *ras_debugfs_dir;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 80/185 ACPI / processor: dont print errors for processorIDs == 0xff
In reply to Greg Kroah-HartmanFrom: Jiri Slaby <[email protected]>
[ Upstream commit 2c2b005f549544c13ef4cfb0e4842949066889bc ]
Some platforms define their processors in this manner:
Device (SCK0)
{
Name (_HID, "ACPI0004" /* Module Device */) // _HID: Hardware ID
Name (_UID, "CPUSCK0") // _UID: Unique ID
Processor (CP00, 0x00, 0x00000410, 0x06){}
Processor (CP01, 0x02, 0x00000410, 0x06){}
Processor (CP02, 0x04, 0x00000410, 0x06){}
Processor (CP03, 0x06, 0x00000410, 0x06){}
Processor (CP04, 0x01, 0x00000410, 0x06){}
Processor (CP05, 0x03, 0x00000410, 0x06){}
Processor (CP06, 0x05, 0x00000410, 0x06){}
Processor (CP07, 0x07, 0x00000410, 0x06){}
Processor (CP08, 0xFF, 0x00000410, 0x06){}
Processor (CP09, 0xFF, 0x00000410, 0x06){}
Processor (CP0A, 0xFF, 0x00000410, 0x06){}
Processor (CP0B, 0xFF, 0x00000410, 0x06){}...
The processors marked as 0xff are invalid, there are only 8 of them in this case.
So do not print an error on ids == 0xff, just print an info message. Actually, we could return ENODEV even on the first CPU with ID 0xff, but ACPI spec does not forbid the 0xff value to be a processor ID. Given 0xff could be a correct one, we would break working systems if we returned ENODEV.
--- drivers/acpi/acpi_processor.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/acpi/acpi_processor.c +7 -3
@@ -281,9 +281,13 @@ static int acpi_processor_get_info(struct acpi_device *device) }if (acpi_duplicate_processor_id (pr->acpi_id)) { -dev_err (&device->dev, -"Failed to get unique processor _UID (0x%x)\n" , - pr->acpi_id); +if (pr->acpi_id ==0xff ) +dev_info_once (&device->dev, +"Entry not well-defined, consider updating BIOS\n" ); +else +dev_err (&device->dev, +"Failed to get unique processor _UID (0x%x)\n" , + pr->acpi_id);return -ENODEV ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 81/185 EDAC, pnd2: Fix ioremap() size in dnv_rd_reg()
In reply to Greg Kroah-HartmanFrom: Stephen Douthit <[email protected]>
[ Upstream commit 29a3388bfcce7a6d087051376ea02bf8326a957b ]
Depending on how BIOS has marked the reserved region containing the 32KB MCHBAR you can get warnings like:
resource sanity check: requesting [mem 0xfed10000-0xfed1ffff], which spans more than reserved [mem 0xfed10000-0xfed17fff] caller dnv_rd_reg+0xc8/0x240 [pnd2_edac] mapping multiple BARs
Not all of the mmio regions used in dnv_rd_reg() are the same size. The MCHBAR window is 32KB and the sideband ports are 64KB. Pass the correct size to ioremap() depending on which resource we're reading from.
--- drivers/edac/pnd2_edac.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/edac/pnd2_edac.c +6 -1
@@ -266,11 +266,14 @@ static u64 get_sideband_reg_base_addr(void) } } +#define DNV_MCHBAR_SIZE 0x8000 +#define DNV_SB_PORT_SIZE 0x10000static int dnv_rd_reg (int port,int off,int op,void *data,size_t sz,char *name) {struct pci_dev *pdev;char *base;u64 addr; +unsigned long size;if (op ==4 ) { pdev =pci_get_device (PCI_VENDOR_ID_INTEL ,0x1980 ,NULL );
@@ -285,15 +288,17 @@ static int dnv_rd_reg(int port, int off, int op, void *data, size_t sz, char *na addr =get_mem_ctrl_hub_base_addr ();if (!addr)return -ENODEV ; + size =DNV_MCHBAR_SIZE ; }else {/* MMIO via sideband register base address */ addr =get_sideband_reg_base_addr ();if (!addr)return -ENODEV ; addr += (port <<16 ); + size =DNV_SB_PORT_SIZE ; } - base =ioremap ((resource_size_t )addr,0x10000 ); + base =ioremap ((resource_size_t )addr, size);if (!base)return -ENODEV ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 82/185 efi: cper: print AER info of PCIe fatal error
In reply to Greg Kroah-HartmanFrom: Xiaofei Tan <[email protected]>
[ Upstream commit b194a77fcc4001dc40aecdd15d249648e8a436d1 ]
AER info of PCIe fatal error is not printed in the current driver. Because APEI driver will panic directly for fatal error, and can't run to the place of printing AER info.
An example log is as following:
{763}[Hardware Error]: Hardware error from APEI Generic Hardware Error Source: 11 {763}[Hardware Error]: event severity: fatal
{763}[Hardware Error]: Error 0, type: fatal
{763}[Hardware Error]: section_type: PCIe error
{763}[Hardware Error]: port_type: 0, PCIe end point
{763}[Hardware Error]: version: 4.0
{763}[Hardware Error]: command: 0x0000, status: 0x0010
{763}[Hardware Error]: device_id: 0000:82:00.0
{763}[Hardware Error]: slot: 0
{763}[Hardware Error]: secondary_bus: 0x00
{763}[Hardware Error]: vendor_id: 0x8086, device_id: 0x10fb
{763}[Hardware Error]: class_code: 000002
Kernel panic - not syncing: Fatal hardware error!This issue was imported by the patch, '37448adfc7ce ("aerdrv: Move cper_print_aer() call out of interrupt context")'. To fix this issue, this patch adds print of AER info in cper_print_pcie() for fatal error.
Here is the example log after this patch applied:
{24}[Hardware Error]: Hardware error from APEI Generic Hardware Error Source: 10 {24}[Hardware Error]: event severity: fatal
{24}[Hardware Error]: Error 0, type: fatal
{24}[Hardware Error]: section_type: PCIe error
{24}[Hardware Error]: port_type: 0, PCIe end point
{24}[Hardware Error]: version: 4.0
{24}[Hardware Error]: command: 0x0546, status: 0x4010
{24}[Hardware Error]: device_id: 0000:01:00.0
{24}[Hardware Error]: slot: 0
{24}[Hardware Error]: secondary_bus: 0x00
{24}[Hardware Error]: vendor_id: 0x15b3, device_id: 0x1019
{24}[Hardware Error]: class_code: 000002
{24}[Hardware Error]: aer_uncor_status: 0x00040000, aer_uncor_mask: 0x00000000
{24}[Hardware Error]: aer_uncor_severity: 0x00062010
{24}[Hardware Error]: TLP Header: 000000c0 01010000 00000001 00000000
Kernel panic - not syncing: Fatal hardware error!--- drivers/firmware/efi/cper.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/firmware/efi/cper.c +15 -0
@@ -507,6 +507,21 @@ static void cper_print_pcie(const char *pfx, const struct cper_sec_pcie *pcie,printk ("%s""bridge: secondary_status: 0x%04x, control: 0x%04x\n" , pfx, pcie->bridge.secondary_status, pcie->bridge.control); + +/* Fatal errors call __ghes_panic() before AER handler prints this */ +if ((pcie->validation_bits &CPER_PCIE_VALID_AER_INFO ) && + (gdata->error_severity &CPER_SEV_FATAL )) { +struct aer_capability_regs *aer; + + aer = (struct aer_capability_regs *)pcie->aer_info; +printk ("%saer_uncor_status: 0x%08x, aer_uncor_mask: 0x%08x\n" , + pfx, aer->uncor_status, aer->uncor_mask); +printk ("%saer_uncor_severity: 0x%08x\n" , + pfx, aer->uncor_severity); +printk ("%sTLP Header: %08x %08x %08x %08x\n" , pfx, + aer->header_log.dw0, aer->header_log.dw1, + aer->header_log.dw2, aer->header_log.dw3); + } } static void cper_print_tstamp(const char *pfx,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 83/185 sched/fair: Use rq_lock/unlock in online_fair_sched_group
In reply to Greg Kroah-HartmanFrom: Phil Auld <[email protected]>
[ Upstream commit a46d14eca7b75fffe35603aa8b81df654353d80f ]
Enabling WARN_DOUBLE_CLOCK in /sys/kernel/debug/sched_features causes warning to fire in update_rq_clock. This seems to be caused by onlining a new fair sched group not using the rq lock wrappers.
[] rq->clock_update_flags & RQCF_UPDATED
[] WARNING: CPU: 5 PID: 54385 at kernel/sched/core.c:210 update_rq_clock+0xec/0x150
[] Call Trace:
[] online_fair_sched_group+0x53/0x100 [] cpu_cgroup_css_online+0x16/0x20 [] online_css+0x1c/0x60 [] cgroup_apply_control_enable+0x231/0x3b0 [] cgroup_mkdir+0x41b/0x530 [] kernfs_iop_mkdir+0x61/0xa0 [] vfs_mkdir+0x108/0x1a0 [] do_mkdirat+0x77/0xe0 [] do_syscall_64+0x55/0x1d0 [] entry_SYSCALL_64_after_hwframe+0x44/0xa9
Using the wrappers in online_fair_sched_group instead of the raw locking removes this warning.
[ tglx: Use rq_*lock_irq() ]
--- kernel/sched/fair.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/sched/fair.c +3 -3
@@ -9423,18 +9423,18 @@ int alloc_fair_sched_group(struct task_group *tg, struct task_group *parent)void online_fair_sched_group (struct task_group *tg) {struct sched_entity *se; +struct rq_flags rf;struct rq *rq;int i;for_each_possible_cpu (i) { rq =cpu_rq (i); se = tg->se[i]; - -raw_spin_lock_irq (&rq->lock); +rq_lock_irq (rq, &rf);update_rq_clock (rq);attach_entity_cfs_rq (se);sync_throttle (tg, i); -raw_spin_unlock_irq (&rq->lock); +rq_unlock_irq (rq, &rf); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 84/185 media: gspca: zero usb_buf on error
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit 4843a543fad3bf8221cf14e5d5f32d15cee89e84 ]
If reg_r() fails, then gspca_dev->usb_buf was left uninitialized, and some drivers used the contents of that buffer in logic.
This caused several syzbot errors:
https://syzkaller.appspot.com/bug?extid=397fd082ce5143e2f67d
https://syzkaller.appspot.com/bug?extid=1a35278dd0ebfb3a038a
https://syzkaller.appspot.com/bug?extid=06ddf1788cfd048c5e82
I analyzed the gspca drivers and zeroed the buffer where needed.
--- drivers/media/usb/gspca/konica.c | 5 +++++ drivers/media/usb/gspca/nw80x.c | 5 +++++ drivers/media/usb/gspca/ov519.c | 10 ++++++++++ drivers/media/usb/gspca/ov534.c | 5 +++++ drivers/media/usb/gspca/ov534_9.c | 1 + drivers/media/usb/gspca/se401.c | 5 +++++ drivers/media/usb/gspca/sn9c20x.c | 5 +++++ drivers/media/usb/gspca/sonixb.c | 5 +++++ drivers/media/usb/gspca/sonixj.c | 5 +++++ drivers/media/usb/gspca/spca1528.c | 5 +++++ drivers/media/usb/gspca/sq930x.c | 5 +++++ drivers/media/usb/gspca/sunplus.c | 5 +++++ drivers/media/usb/gspca/vc032x.c | 5 +++++ drivers/media/usb/gspca/w996Xcf.c | 5 +++++ 14 files changed, 71 insertions(+)
drivers/media/usb/gspca/konica.c +5 -0
@@ -123,6 +123,11 @@ static void reg_r(struct gspca_dev *gspca_dev, u16 value, u16 index)if (ret <0 ) {pr_err ("reg_r err %d\n" , ret); gspca_dev->usb_err = ret; +/* +* Make sure the buffer is zeroed to avoid uninitialized +* values. +*/ +memset (gspca_dev->usb_buf,0 ,2 ); } }
drivers/media/usb/gspca/nw80x.c +5 -0
@@ -1580,6 +1580,11 @@ static void reg_r(struct gspca_dev *gspca_dev,if (ret <0 ) {pr_err ("reg_r err %d\n" , ret); gspca_dev->usb_err = ret; +/* +* Make sure the buffer is zeroed to avoid uninitialized +* values. +*/ +memset (gspca_dev->usb_buf,0 ,USB_BUF_SZ );return ; }if (len ==1 )
drivers/media/usb/gspca/ov519.c +10 -0
@@ -2083,6 +2083,11 @@ static int reg_r(struct sd *sd, u16 index) }else {PERR ("reg_r %02x failed %d\n" , index, ret); sd->gspca_dev.usb_err = ret; +/* +* Make sure the result is zeroed to avoid uninitialized +* values. +*/ + gspca_dev->usb_buf[0 ] =0 ; }return ret;
@@ -2111,6 +2116,11 @@ static int reg_r8(struct sd *sd, }else {PERR ("reg_r8 %02x failed %d\n" , index, ret); sd->gspca_dev.usb_err = ret; +/* +* Make sure the buffer is zeroed to avoid uninitialized +* values. +*/ +memset (gspca_dev->usb_buf,0 ,8 ); }return ret;
drivers/media/usb/gspca/ov534.c +5 -0
@@ -641,6 +641,11 @@ static u8 ov534_reg_read(struct gspca_dev *gspca_dev, u16 reg)if (ret <0 ) {pr_err ("read failed %d\n" , ret); gspca_dev->usb_err = ret; +/* +* Make sure the result is zeroed to avoid uninitialized +* values. +*/ + gspca_dev->usb_buf[0 ] =0 ; }return gspca_dev->usb_buf[0 ]; }
drivers/media/usb/gspca/ov534_9.c +1 -0
@@ -1153,6 +1153,7 @@ static u8 reg_r(struct gspca_dev *gspca_dev, u16 reg)if (ret <0 ) {pr_err ("reg_r err %d\n" , ret); gspca_dev->usb_err = ret; +return 0 ; }return gspca_dev->usb_buf[0 ]; }
drivers/media/usb/gspca/se401.c +5 -0
@@ -111,6 +111,11 @@ static void se401_read_req(struct gspca_dev *gspca_dev, u16 req, int silent)pr_err ("read req failed req %#04x error %d\n" , req, err); gspca_dev->usb_err = err; +/* +* Make sure the buffer is zeroed to avoid uninitialized +* values. +*/ +memset (gspca_dev->usb_buf,0 ,READ_REQ_SIZE ); } }
drivers/media/usb/gspca/sn9c20x.c +5 -0
@@ -918,6 +918,11 @@ static void reg_r(struct gspca_dev *gspca_dev, u16 reg, u16 length)if (unlikely (result <0 || result != length)) {pr_err ("Read register %02x failed %d\n" , reg, result); gspca_dev->usb_err = result; +/* +* Make sure the buffer is zeroed to avoid uninitialized +* values. +*/ +memset (gspca_dev->usb_buf,0 ,USB_BUF_SZ ); } }
drivers/media/usb/gspca/sonixb.c +5 -0
@@ -462,6 +462,11 @@ static void reg_r(struct gspca_dev *gspca_dev,dev_err (gspca_dev->v4l2_dev.dev,"Error reading register %02x: %d\n" , value, res); gspca_dev->usb_err = res; +/* +* Make sure the result is zeroed to avoid uninitialized +* values. +*/ + gspca_dev->usb_buf[0 ] =0 ; } }
drivers/media/usb/gspca/sonixj.c +5 -0
@@ -1170,6 +1170,11 @@ static void reg_r(struct gspca_dev *gspca_dev,if (ret <0 ) {pr_err ("reg_r err %d\n" , ret); gspca_dev->usb_err = ret; +/* +* Make sure the buffer is zeroed to avoid uninitialized +* values. +*/ +memset (gspca_dev->usb_buf,0 ,USB_BUF_SZ ); } }
drivers/media/usb/gspca/spca1528.c +5 -0
@@ -80,6 +80,11 @@ static void reg_r(struct gspca_dev *gspca_dev,if (ret <0 ) {pr_err ("reg_r err %d\n" , ret); gspca_dev->usb_err = ret; +/* +* Make sure the buffer is zeroed to avoid uninitialized +* values. +*/ +memset (gspca_dev->usb_buf,0 ,USB_BUF_SZ ); } }
drivers/media/usb/gspca/sq930x.c +5 -0
@@ -434,6 +434,11 @@ static void reg_r(struct gspca_dev *gspca_dev,if (ret <0 ) {pr_err ("reg_r %04x failed %d\n" , value, ret); gspca_dev->usb_err = ret; +/* +* Make sure the buffer is zeroed to avoid uninitialized +* values. +*/ +memset (gspca_dev->usb_buf,0 ,USB_BUF_SZ ); } }
drivers/media/usb/gspca/sunplus.c +5 -0
@@ -264,6 +264,11 @@ static void reg_r(struct gspca_dev *gspca_dev,if (ret <0 ) {pr_err ("reg_r err %d\n" , ret); gspca_dev->usb_err = ret; +/* +* Make sure the buffer is zeroed to avoid uninitialized +* values. +*/ +memset (gspca_dev->usb_buf,0 ,USB_BUF_SZ ); } }
drivers/media/usb/gspca/vc032x.c +5 -0
@@ -2915,6 +2915,11 @@ static void reg_r_i(struct gspca_dev *gspca_dev,if (ret <0 ) {pr_err ("reg_r err %d\n" , ret); gspca_dev->usb_err = ret; +/* +* Make sure the buffer is zeroed to avoid uninitialized +* values. +*/ +memset (gspca_dev->usb_buf,0 ,USB_BUF_SZ ); } } static void reg_r(struct gspca_dev *gspca_dev,
drivers/media/usb/gspca/w996Xcf.c +5 -0
@@ -143,6 +143,11 @@ static int w9968cf_read_sb(struct sd *sd) }else {pr_err ("Read SB reg [01] failed\n" ); sd->gspca_dev.usb_err = ret; +/* +* Make sure the buffer is zeroed to avoid uninitialized +* values. +*/ +memset (sd->gspca_dev.usb_buf,0 ,2 ); }udelay (W9968CF_I2C_BUS_DELAY );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 85/185 perf test vfs_getname: Disable ~/.perfconfig to get default output
In reply to Greg Kroah-HartmanFrom: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit 4fe94ce1c6ba678b5f12b94bb9996eea4fc99e85 ]
To get the expected output we have to ignore whatever changes the user has in its ~/.perfconfig file, so set PERF_CONFIG to /dev/null to achieve that.
Before:
# egrep 'trace|show_' ~/.perfconfig [trace] show_zeros = yes show_duration = no show_timestamp = no show_arg_names = no show_prefix = yes # echo $PERF_CONFIG
# perf test "trace + vfs_getname" 70: Check open filename arg using perf trace + vfs_getname: FAILED! # export PERF_CONFIG=/dev/null # perf test "trace + vfs_getname" 70: Check open filename arg using perf trace + vfs_getname: Ok #
After:
# egrep 'trace|show_' ~/.perfconfig [trace] show_zeros = yes show_duration = no show_timestamp = no show_arg_names = no show_prefix = yes # echo $PERF_CONFIG
# perf test "trace + vfs_getname" 70: Check open filename arg using perf trace + vfs_getname: Ok #
--- tools/perf/tests/shell/trace+probe_vfs_getname.sh | 4 ++++ 1 file changed, 4 insertions(+)
tools/perf/tests/shell/trace+probe_vfs_getname.sh +4 -0
@@ -30,6 +30,10 @@ if [ $err -ne 0 ] ; then exit $err fi +# Do not use whatever ~/.perfconfig file, it may change the output +# via trace.{show_timestamp,show_prefix,etc} +export PERF_CONFIG=/dev/null + trace_open_vfs_getname err=$? rm -f ${file}
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 86/185 media: mtk-mdp: fix reference count on old device tree
In reply to Greg Kroah-HartmanFrom: Matthias Brugger <[email protected]>
[ Upstream commit 864919ea0380e62adb2503b89825fe358acb8216 ]
of_get_next_child() increments the reference count of the returning device_node. Decrement it in the check if we are using the old or the new DTB.
--- drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/platform/mtk-mdp/mtk_mdp_core.c +3 -1
@@ -118,7 +118,9 @@ static int mtk_mdp_probe(struct platform_device *pdev)mutex_init (&mdp->vpulock);/* Old dts had the components as child nodes */ -if (of_get_next_child (dev->of_node,NULL )) { + node =of_get_next_child (dev->of_node,NULL ); +if (node) { +of_node_put (node); parent = dev->of_node;dev_warn (dev,"device tree is out of date\n" ); }else {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 87/185 media: fdp1: Reduce FCP not found message level to debug
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 4fd22938569c14f6092c05880ca387409d78355f ]
When support for the IPMMU is not enabled, the FDP driver may be probe-deferred multiple times, causing several messages to be printed like:
rcar_fdp1 fe940000.fdp1: FCP not found (-517)
rcar_fdp1 fe944000.fdp1: FCP not found (-517)Fix this by reducing the message level to debug level, as is done in the VSP1 driver.
--- drivers/media/platform/rcar_fdp1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/rcar_fdp1.c +1 -1
@@ -2310,7 +2310,7 @@ static int fdp1_probe(struct platform_device *pdev) fdp1->fcp =rcar_fcp_get (fcp_node);of_node_put (fcp_node);if (IS_ERR (fdp1->fcp)) { -dev_err (&pdev->dev,"FCP not found (%ld)\n" , +dev_dbg (&pdev->dev,"FCP not found (%ld)\n" ,PTR_ERR (fdp1->fcp));return PTR_ERR (fdp1->fcp); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 88/185 media: rc: imon: Allow iMON RC protocol for ffdc 7e device
In reply to Greg Kroah-HartmanFrom: Darius Rad <[email protected]>
[ Upstream commit b20a6e298bcb8cb8ae18de26baaf462a6418515b ]
Allow selecting the IR protocol, MCE or iMON, for a device that identifies as follows (with config id 0x7e):
15c2:ffdc SoundGraph Inc. iMON PAD Remote Controller
As the driver is structured to default to iMON when both RC protocols are supported, existing users of this device (using MCE protocol) will need to manually switch to MCE (RC-6) protocol from userspace (with ir-keytable, sysfs).
--- drivers/media/rc/imon.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/media/rc/imon.c +6 -1
@@ -1963,12 +1963,17 @@ static void imon_get_ffdc_type(struct imon_context *ictx)break ;/* iMON VFD, MCE IR */ case 0x46 : -case 0x7e :case 0x9e :dev_info (ictx->dev,"0xffdc iMON VFD, MCE IR" ); detected_display_type =IMON_DISPLAY_TYPE_VFD ; allowed_protos =RC_PROTO_BIT_RC6_MCE ;break ; +/* iMON VFD, iMON or MCE IR */ +case 0x7e : +dev_info (ictx->dev,"0xffdc iMON VFD, iMON or MCE IR" ); + detected_display_type =IMON_DISPLAY_TYPE_VFD ; + allowed_protos |=RC_PROTO_BIT_RC6_MCE ; +break ;/* iMON LCD, MCE IR */ case 0x9f :dev_info (ictx->dev,"0xffdc iMON LCD, MCE IR" );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 89/185 dmaengine: iop-adma: use correct printk format strings
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 00c9755524fbaa28117be774d7c92fddb5ca02f3 ]
When compile-testing on other architectures, we get lots of warnings about incorrect format strings, like:
drivers/dma/iop-adma.c: In function 'iop_adma_alloc_slots':
drivers/dma/iop-adma.c:307:6: warning: format '%x' expects argument of type 'unsigned int', but argument 6 has type 'dma_addr_t {aka long long unsigned int}' [-Wformat=]
drivers/dma/iop-adma.c: In function 'iop_adma_prep_dma_memcpy':
Quoted 1 line
Quoted 1 line
drivers/dma/iop-adma.c:518:40: warning: format '%u' expects argument of type 'unsigned int', but argument 5 has type 'size_t{aka long unsigned int}' [-Wformat=]
Use %zu for printing size_t as required, and cast the dma_addr_t arguments to 'u64' for printing with %llx. Ideally this should use the %pad format string, but that requires an lvalue argument that doesn't work here.
--- drivers/dma/iop-adma.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/dma/iop-adma.c +9 -9
@@ -125,9 +125,9 @@ static void __iop_adma_slot_cleanup(struct iop_adma_chan *iop_chan)list_for_each_entry_safe (iter, _iter, &iop_chan->chain, chain_node) {pr_debug ("\tcookie: %d slot: %d busy: %d " -"this_desc: %#x next_desc: %#x ack: %d\n" , +"this_desc: %#x next_desc: %#llx ack: %d\n" , iter->async_tx.cookie, iter->idx, busy, - iter->async_tx.phys,iop_desc_get_next_desc (iter), + iter->async_tx.phys, (u64 )iop_desc_get_next_desc (iter),async_tx_test_ack (&iter->async_tx));prefetch (_iter);prefetch (&_iter->async_tx);
@@ -315,9 +315,9 @@ iop_adma_alloc_slots(struct iop_adma_chan *iop_chan, int num_slots,int i;dev_dbg (iop_chan->device->common.dev,"allocated slot: %d " -"(desc %p phys: %#x) slots_per_op %d\n" , +"(desc %p phys: %#llx) slots_per_op %d\n" , iter->idx, iter->hw_desc, - iter->async_tx.phys, slots_per_op); + (u64 )iter->async_tx.phys, slots_per_op);/* pre-ack all but the last descriptor */ if (num_slots != slots_per_op)
@@ -525,7 +525,7 @@ iop_adma_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dma_dest,return NULL ;BUG_ON (len >IOP_ADMA_MAX_BYTE_COUNT ); -dev_dbg (iop_chan->device->common.dev,"%s len: %u\n" , +dev_dbg (iop_chan->device->common.dev,"%s len: %zu\n" , __func__, len);spin_lock_bh (&iop_chan->lock);
@@ -558,7 +558,7 @@ iop_adma_prep_dma_xor(struct dma_chan *chan, dma_addr_t dma_dest,BUG_ON (len >IOP_ADMA_XOR_MAX_BYTE_COUNT );dev_dbg (iop_chan->device->common.dev, -"%s src_cnt: %d len: %u flags: %lx\n" , +"%s src_cnt: %d len: %zu flags: %lx\n" , __func__, src_cnt, len, flags);spin_lock_bh (&iop_chan->lock);
@@ -591,7 +591,7 @@ iop_adma_prep_dma_xor_val(struct dma_chan *chan, dma_addr_t *dma_src,if (unlikely (!len))return NULL ; -dev_dbg (iop_chan->device->common.dev,"%s src_cnt: %d len: %u\n" , +dev_dbg (iop_chan->device->common.dev,"%s src_cnt: %d len: %zu\n" , __func__, src_cnt, len);spin_lock_bh (&iop_chan->lock);
@@ -629,7 +629,7 @@ iop_adma_prep_dma_pq(struct dma_chan *chan, dma_addr_t *dst, dma_addr_t *src,BUG_ON (len >IOP_ADMA_XOR_MAX_BYTE_COUNT );dev_dbg (iop_chan->device->common.dev, -"%s src_cnt: %d len: %u flags: %lx\n" , +"%s src_cnt: %d len: %zu flags: %lx\n" , __func__, src_cnt, len, flags);if (dmaf_p_disabled_continue (flags))
@@ -692,7 +692,7 @@ iop_adma_prep_dma_pq_val(struct dma_chan *chan, dma_addr_t *pq, dma_addr_t *src,return NULL ;BUG_ON (len >IOP_ADMA_XOR_MAX_BYTE_COUNT ); -dev_dbg (iop_chan->device->common.dev,"%s src_cnt: %d len: %u\n" , +dev_dbg (iop_chan->device->common.dev,"%s src_cnt: %d len: %zu\n" , __func__, src_cnt, len);spin_lock_bh (&iop_chan->lock);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 90/185 perf record: Support aarch64 random socket_id assignment
In reply to Greg Kroah-HartmanFrom: Tan Xiaojun <[email protected]>
[ Upstream commit 0a4d8fb229dd78f9e0752817339e19e903b37a60 ]
Same as in the commit 01766229533f ("perf record: Support s390 random socket_id assignment"), aarch64 also have this problem.
Without this fix:
[root@localhost perf]# ./perf report --header -I -v
...
socket_id number is too big.You may need to upgrade the perf tool.
# ========
# captured on : Thu Aug 1 22:58:38 2019 # header version : 1 ... # Core ID and Socket ID information is not available ...
With this fix:
[root@localhost perf]# ./perf report --header -I -v
...
cpumask list: 0-31
cpumask list: 32-63
cpumask list: 64-95
cpumask list: 96-127
# ========
# captured on : Thu Aug 1 22:58:38 2019 # header version : 1 ... # CPU 0: Core ID 0, Socket ID 36 # CPU 1: Core ID 1, Socket ID 36 ... # CPU 126: Core ID 126, Socket ID 8442 # CPU 127: Core ID 127, Socket ID 8442 ...
--- tools/perf/util/header.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/perf/util/header.c +3 -1
@@ -1882,8 +1882,10 @@ static int process_cpu_topology(struct feat_fd *ff, void *data __maybe_unused)/* On s390 the socket_id number is not related to the numbers of cpus. * The socket_id number might be higher than the numbers of cpus. * This depends on the configuration. +* AArch64 is the same. */ -if (ph->env.arch && !strncmp (ph->env.arch,"s390" ,4 )) +if (ph->env.arch && (!strncmp (ph->env.arch,"s390" ,4 ) + || !strncmp (ph->env.arch,"aarch64" ,7 ))) do_core_id_test = false;for (i =0 ; i < (u32 )cpu_nr; i++) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 91/185 media: i2c: ov5645: Fix power sequence
In reply to Greg Kroah-HartmanFrom: Ezequiel Garcia <[email protected]>
[ Upstream commit 092e8eb90a7dc7dd210cd4e2ea36075d0a7f96af ]
This is mostly a port of Jacopo's fix:
commit aa4bb8b8838ffcc776a79f49a4d7476b82405349
Author: Jacopo Mondi <[email protected]>
Date: Fri Jul 6 05:51:52 2018 -0400
media: ov5640: Re-work MIPI startup sequence
In the OV5645 case, the changes are:
- At set_power(1) time power up MIPI Tx/Rx and set data and clock lanes in LP11 during 'sleep' and 'idle' with MIPI clock in non-continuous mode.
- At set_power(0) time power down MIPI Tx/Rx (in addition to the current power down of regulators and clock gating).
- At s_stream time enable/disable the MIPI interface output.
With this commit the sensor is able to enter LP-11 mode during power up, as expected by some CSI-2 controllers.
Many thanks to Fabio Estevam for his help debugging this issue.
--- drivers/media/i2c/ov5645.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-)
drivers/media/i2c/ov5645.c +18 -8
@@ -53,6 +53,8 @@#define OV5645_CHIP_ID_HIGH_BYTE 0x56#define OV5645_CHIP_ID_LOW 0x300b#define OV5645_CHIP_ID_LOW_BYTE 0x45 +#define OV5645_IO_MIPI_CTRL00 0x300e +#define OV5645_PAD_OUTPUT00 0x3019#define OV5645_AWB_MANUAL_CONTROL 0x3406#define OV5645_AWB_MANUAL_ENABLE BIT(0)#define OV5645_AEC_PK_MANUAL 0x3503
@@ -63,6 +65,7 @@#define OV5645_ISP_VFLIP BIT(2)#define OV5645_TIMING_TC_REG21 0x3821#define OV5645_SENSOR_MIRROR BIT(1) +#define OV5645_MIPI_CTRL00 0x4800#define OV5645_PRE_ISP_TEST_SETTING_1 0x503d#define OV5645_TEST_PATTERN_MASK 0x3#define OV5645_SET_TEST_PATTERN (x) ((x) & OV5645_TEST_PATTERN_MASK)
@@ -129,7 +132,6 @@ static const struct reg_value ov5645_global_init_setting[] = { { 0x3503, 0x07 }, { 0x3002, 0x1c }, { 0x3006, 0xc3 }, - { 0x300e, 0x45 }, { 0x3017, 0x00 }, { 0x3018, 0x00 }, { 0x302e, 0x0b },
@@ -358,7 +360,10 @@ static const struct reg_value ov5645_global_init_setting[] = { { 0x3a1f, 0x14 }, { 0x0601, 0x02 }, { 0x3008, 0x42 }, - { 0x3008, 0x02 } + { 0x3008, 0x02 }, + { OV5645_IO_MIPI_CTRL00, 0x40 }, + { OV5645_MIPI_CTRL00, 0x24 }, + { OV5645_PAD_OUTPUT00, 0x70 } }; static const struct reg_value ov5645_setting_sxga[] = {
@@ -743,13 +748,9 @@ static int ov5645_s_power(struct v4l2_subdev *sd, int on) goto exit; } - ret =ov5645_write_reg (ov5645,OV5645_SYSTEM_CTRL0 , -OV5645_SYSTEM_CTRL0_STOP ); -if (ret <0 ) { -ov5645_set_power_off (ov5645); - goto exit; - } +usleep_range (500 ,1000 ); }else { +ov5645_write_reg (ov5645,OV5645_IO_MIPI_CTRL00 ,0x58 );ov5645_set_power_off (ov5645); } }
@@ -1069,11 +1070,20 @@ static int ov5645_s_stream(struct v4l2_subdev *subdev, int enable)dev_err (ov5645->dev,"could not sync v4l2 controls\n" );return ret; } + + ret =ov5645_write_reg (ov5645,OV5645_IO_MIPI_CTRL00 ,0x45 ); +if (ret <0 ) +return ret; + ret =ov5645_write_reg (ov5645,OV5645_SYSTEM_CTRL0 ,OV5645_SYSTEM_CTRL0_START );if (ret <0 )return ret; }else { + ret =ov5645_write_reg (ov5645,OV5645_IO_MIPI_CTRL00 ,0x40 ); +if (ret <0 ) +return ret; + ret =ov5645_write_reg (ov5645,OV5645_SYSTEM_CTRL0 ,OV5645_SYSTEM_CTRL0_STOP );if (ret <0 )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 92/185 media: omap3isp: Dont set streaming state on random subdevs
In reply to Greg Kroah-HartmanFrom: Sakari Ailus <[email protected]>
[ Upstream commit 7ef57be07ac146e70535747797ef4aee0f06e9f9 ]
The streaming state should be set to the first upstream sub-device only, not everywhere, for a sub-device driver itself knows how to best control the streaming state of its own upstream sub-devices.
--- drivers/media/platform/omap3isp/isp.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/media/platform/omap3isp/isp.c +8 -0
@@ -727,6 +727,10 @@ static int isp_pipeline_enable(struct isp_pipeline *pipe, s_stream, mode); pipe->do_propagation = true; } + +/* Stop at the first external sub-device. */ +if (subdev->dev != isp->dev) +break ; }return 0 ;
@@ -841,6 +845,10 @@ static int isp_pipeline_disable(struct isp_pipeline *pipe) &subdev->entity); failure = -ETIMEDOUT ; } + +/* Stop at the first external sub-device. */ +if (subdev->dev != isp->dev) +break ; }return failure;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 93/185 media: imx: mipi csi-2: Dont fail if initial state times-out
In reply to Greg Kroah-HartmanFrom: Ezequiel Garcia <[email protected]>
[ Upstream commit 0d5078c7172c46db6c58718d817b9fcf769554b4 ]
Not all sensors will be able to guarantee a proper initial state. This may be either because the driver is not properly written, or (probably unlikely) because the hardware won't support it.
While the right solution in the former case is to fix the sensor driver, the real world not always allows right solutions, due to lack of available documentation and support on these sensors.
Let's relax this requirement, and allow the driver to support stream start, even if the sensor initial sequence wasn't the expected.
Also improve the warning message to better explain the problem and provide a hint that the sensor driver needs to be fixed.
--- drivers/staging/media/imx/imx6-mipi-csi2.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/staging/media/imx/imx6-mipi-csi2.c +4 -8
@@ -247,7 +247,7 @@ static int __maybe_unused csi2_dphy_wait_ulp(struct csi2_dev *csi2) }/* Waits for low-power LP-11 state on data and clock lanes. */ -static int csi2_dphy_wait_stopstate (struct csi2_dev *csi2) +static void csi2_dphy_wait_stopstate (struct csi2_dev *csi2) {u32 mask, reg;int ret;
@@ -258,11 +258,9 @@ static int csi2_dphy_wait_stopstate(struct csi2_dev *csi2) ret =readl_poll_timeout (csi2->base +CSI2_PHY_STATE , reg, (reg & mask) == mask,0 ,500000 );if (ret) { -v4l2_err (&csi2->sd,"LP-11 timeout, phy_state = 0x%08x\n" , reg); -return ret; +v4l2_warn (&csi2->sd,"LP-11 wait timeout, likely a sensor driver bug, expect capture failures.\n" ); +v4l2_warn (&csi2->sd,"phy_state = 0x%08x\n" , reg); } - -return 0 ; }/* Wait for active clock on the clock lane. */
@@ -320,9 +318,7 @@ static int csi2_start(struct csi2_dev *csi2)csi2_enable (csi2, true);/* Step 5 */ - ret =csi2_dphy_wait_stopstate (csi2); -if (ret) - goto err_assert_reset; +csi2_dphy_wait_stopstate (csi2);/* Step 6 */ ret =v4l2_subdev_call (csi2->src_sd, video, s_stream,1 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 94/185 net: lpc-enet: fix printk format strings
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit de6f97b2bace0e2eb6c3a86e124d1e652a587b56 ]
compile-testing this driver on other architectures showed multiple warnings:
drivers/net/ethernet/nxp/lpc_eth.c: In function 'lpc_eth_drv_probe':
drivers/net/ethernet/nxp/lpc_eth.c:1337:19: warning: format '%d' expects argument of type 'int', but argument 4 has type 'resource_size_t {aka long long unsigned int}' [-Wformat=]
drivers/net/ethernet/nxp/lpc_eth.c:1342:19: warning: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'dma_addr_t {aka long long unsigned int}' [-Wformat=]
Use format strings that work on all architectures.
--- drivers/net/ethernet/nxp/lpc_eth.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/net/ethernet/nxp/lpc_eth.c +7 -6
@@ -1371,13 +1371,14 @@ static int lpc_eth_drv_probe(struct platform_device *pdev) pldat->dma_buff_base_p = dma_handle;netdev_dbg (ndev,"IO address space :%pR\n" , res); -netdev_dbg (ndev,"IO address size :%d\n" ,resource_size (res)); +netdev_dbg (ndev,"IO address size :%zd\n" , + (size_t )resource_size (res));netdev_dbg (ndev,"IO address (mapped) :0x%p\n" , pldat->net_base);netdev_dbg (ndev,"IRQ number :%d\n" , ndev->irq); -netdev_dbg (ndev,"DMA buffer size :%d\n" , pldat->dma_buff_size); -netdev_dbg (ndev,"DMA buffer P address :0x%08x\n" , - pldat->dma_buff_base_p); +netdev_dbg (ndev,"DMA buffer size :%zd\n" , pldat->dma_buff_size); +netdev_dbg (ndev,"DMA buffer P address :%pad\n" , + &pldat->dma_buff_base_p);netdev_dbg (ndev,"DMA buffer V address :0x%p\n" , pldat->dma_buff_base_v);
@@ -1424,8 +1425,8 @@ static int lpc_eth_drv_probe(struct platform_device *pdev)if (ret) goto err_out_unregister_netdev; -netdev_info (ndev,"LPC mac at 0x%08x irq %d\n" , - res->start, ndev->irq); +netdev_info (ndev,"LPC mac at 0x%08lx irq %d\n" , + (unsigned long )res->start, ndev->irq); phydev = ndev->phydev;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 95/185 ARM: dts: imx7d: cl-som-imx7: make ethernet work again
In reply to Greg Kroah-HartmanFrom: André Draszik <[email protected]>
[ Upstream commit 9846a4524ac90b63496580b7ad50674b40d92a8f ]
Recent changes to the atheros at803x driver caused ethernet to stop working on this board.
In particular commit 6d4cd041f0af
("net: phy: at803x: disable delay only for RGMII mode") and commit cd28d1d6e52e
("net: phy: at803x: Disable phy delay for RGMII mode") fix the AR8031 driver to configure the phy's (RX/TX) delays as per the 'phy-mode' in the device tree.
This now prevents ethernet from working on this board.
It used to work before those commits, because the AR8031 comes out of reset with RX delay enabled, and the at803x driver didn't touch the delay configuration at all when "rgmii" mode was selected, and because arch/arm/mach-imx/mach-imx7d.c:ar8031_phy_fixup() unconditionally enables TX delay.
Since above commits ar8031_phy_fixup() also has no effect anymore, and the end-result is that all delays are disabled in the phy, no ethernet.
Update the device tree to restore functionality.
--- arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx7d-cl-som-imx7.dts +2 -2
@@ -43,7 +43,7 @@ <&clks IMX7D_ENET1_TIME_ROOT_CLK>; assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>; assigned-clock-rates = <0>, <100000000>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; phy-handle = <ðphy0>; fsl,magic-packet; status = "okay";
@@ -69,7 +69,7 @@ <&clks IMX7D_ENET2_TIME_ROOT_CLK>; assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>; assigned-clock-rates = <0>, <100000000>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; phy-handle = <ðphy1>; fsl,magic-packet; status = "okay";
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 96/185 media: radio/si470x: kill urb on error
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit 0d616f2a3fdbf1304db44d451d9f07008556923b ]
In the probe() function radio->int_in_urb was not killed if an error occurred in the probe sequence. It was also missing in the disconnect.
This caused this syzbot issue:
https://syzkaller.appspot.com/bug?extid=2d4fc2a0c45ad8da7e99
--- drivers/media/radio/si470x/radio-si470x-usb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/media/radio/si470x/radio-si470x-usb.c +4 -1
@@ -737,7 +737,7 @@ static int si470x_usb_driver_probe(struct usb_interface *intf,/* start radio */ retval =si470x_start_usb (radio);if (retval <0 ) - goto err_all; + goto err_buf;/* set initial frequency */ si470x_set_freq (radio,87.5 *FREQ_MUL );/* available in all regions */
@@ -752,6 +752,8 @@ static int si470x_usb_driver_probe(struct usb_interface *intf,return 0 ; err_all: +usb_kill_urb (radio->int_in_urb); +err_buf:kfree (radio->buffer); err_ctrl:v4l2_ctrl_handler_free (&radio->hdl);
@@ -825,6 +827,7 @@ static void si470x_usb_driver_disconnect(struct usb_interface *intf)mutex_lock (&radio->lock);v4l2_device_disconnect (&radio->v4l2_dev);video_unregister_device (&radio->videodev); +usb_kill_urb (radio->int_in_urb);usb_set_intfdata (intf,NULL );mutex_unlock (&radio->lock);v4l2_device_put (&radio->v4l2_dev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 97/185 media: hdpvr: add terminating 0 at end of string
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit 8b8900b729e4f31f12ac1127bde137c775c327e6 ]
dev->usbc_buf was passed as argument for %s, but it was not safeguarded by a terminating 0.
This caused this syzbot issue:
https://syzkaller.appspot.com/bug?extid=79d18aac4bf1770dd050
--- drivers/media/usb/hdpvr/hdpvr-core.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/usb/hdpvr/hdpvr-core.c +1 -0
@@ -141,6 +141,7 @@ static int device_authorization(struct hdpvr_device *dev) dev->fw_ver = dev->usbc_buf[1 ]; + dev->usbc_buf[46 ] ='\0' ;v4l2_info (&dev->v4l2_dev,"firmware version 0x%x dated %s\n" , dev->fw_ver, &dev->usbc_buf[2 ]);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 98/185 nbd: add missing config put
In reply to Greg Kroah-HartmanFrom: Mike Christie <[email protected]>
[ Upstream commit 887e975c4172d0d5670c39ead2f18ba1e4ec8133 ]
Fix bug added with the patch:
commit 8f3ea35929a0806ad1397db99a89ffee0140822a
Author: Josef Bacik <[email protected]> Date: Mon Jul 16 12:11:35 2018 -0400
nbd: handle unexpected replies better
where if the timeout handler runs when the completion path is and we fail to grab the mutex in the timeout handler we will leave a config reference and cannot free the config later.
--- drivers/block/nbd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/block/nbd.c +3 -1
@@ -340,8 +340,10 @@ static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req, } config = nbd->config; -if (!mutex_trylock (&cmd->lock)) +if (!mutex_trylock (&cmd->lock)) { +nbd_config_put (nbd);return BLK_EH_RESET_TIMER ; + }if (config->num_connections >1 ) { dev_err_ratelimited(nbd_to_dev(nbd),
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 99/185 media: dvb-core: fix a memory leak bug
In reply to Greg Kroah-HartmanFrom: Wenwen Wang <[email protected]>
[ Upstream commit fcd5ce4b3936242e6679875a4d3c3acfc8743e15 ]
In dvb_create_media_entity(), 'dvbdev->entity' is allocated through kzalloc(). Then, 'dvbdev->pads' is allocated through kcalloc(). However, if kcalloc() fails, the allocated 'dvbdev->entity' is not deallocated, leading to a memory leak bug. To fix this issue, free 'dvbdev->entity' before returning -ENOMEM.
--- drivers/media/dvb-core/dvbdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/dvb-core/dvbdev.c +3 -1
@@ -316,8 +316,10 @@ static int dvb_create_media_entity(struct dvb_device *dvbdev,if (npads) { dvbdev->pads =kcalloc (npads,sizeof (*dvbdev->pads),GFP_KERNEL ); -if (!dvbdev->pads) +if (!dvbdev->pads) { +kfree (dvbdev->entity);return -ENOMEM ; + } }switch (type) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 100/185 libperf: Fix alignment trap with xyarray contents in perf stat
In reply to Greg Kroah-HartmanFrom: Gerald BAEZA <[email protected]>
[ Upstream commit d9c5c083416500e95da098c01be092b937def7fa ]
Following the patch 'perf stat: Fix --no-scale', an alignment trap happens in process_counter_values() on ARMv7 platforms due to the attempt to copy non 64 bits aligned double words (pointed by 'count') via a NEON vectored instruction ('vld1' with 64 bits alignment constraint).
This patch sets a 64 bits alignment constraint on 'contents[]' field in 'struct xyarray' since the 'count' pointer used above points to such a structure.
--- tools/perf/util/xyarray.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/perf/util/xyarray.h +2 -1
@@ -2,6 +2,7 @@#ifndef _PERF_XYARRAY_H_#define _PERF_XYARRAY_H_ 1 +#include <linux/compiler.h> #include <sys/types.h> struct xyarray {
@@ -10,7 +11,7 @@ struct xyarray {size_t entries;size_t max_x;size_t max_y; -char contents[]; +char contents[]__aligned(8) ; };struct xyarray *xyarray__new (int xlen,int ylen,size_t entry_size);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 101/185 EDAC/amd64: Recognize DRAM device type ECC capability
In reply to Greg Kroah-HartmanFrom: Yazen Ghannam <[email protected]>
[ Upstream commit f8be8e5680225ac9caf07d4545f8529b7395327f ]
AMD Family 17h systems support x4 and x16 DRAM devices. However, the device type is not checked when setting mci.edac_ctl_cap.
Set the appropriate capability flag based on the device type.
Default to x8 DRAM device when neither the x4 or x16 bits are set.
[ bp: reverse cpk_en check to save an indentation level. ]
--- drivers/edac/amd64_edac.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/edac/amd64_edac.c +12 -2
@@ -3101,12 +3101,15 @@ static bool ecc_enabled(struct pci_dev *F3, u16 nid)static inline void f17h_determine_edac_ctl_cap (struct mem_ctl_info *mci,struct amd64_pvt *pvt) { -u8 i, ecc_en =1 , cpk_en =1 ; +u8 i, ecc_en =1 , cpk_en =1 , dev_x4 =1 , dev_x16 =1 ;for (i =0 ; i <NUM_UMCS ; i++) {if (pvt->umc[i].sdp_ctrl &UMC_SDP_INIT ) { ecc_en &= !!(pvt->umc[i].umc_cap_hi &UMC_ECC_ENABLED ); cpk_en &= !!(pvt->umc[i].umc_cap_hi &UMC_ECC_CHIPKILL_CAP ); + + dev_x4 &= !!(pvt->umc[i].dimm_cfg &BIT (6 )); + dev_x16 &= !!(pvt->umc[i].dimm_cfg &BIT (7 )); } }
@@ -3114,8 +3117,15 @@ f17h_determine_edac_ctl_cap(struct mem_ctl_info *mci, struct amd64_pvt *pvt)if (ecc_en) { mci->edac_ctl_cap |=EDAC_FLAG_SECDED ; -if (cpk_en) +if (!cpk_en) +return ; + +if (dev_x4) mci->edac_ctl_cap |=EDAC_FLAG_S4ECD4ED ; +else if (dev_x16) + mci->edac_ctl_cap |=EDAC_FLAG_S16ECD16ED ; +else + mci->edac_ctl_cap |=EDAC_FLAG_S8ECD8ED ; } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 102/185 EDAC/amd64: Decode syndrome before translating address
In reply to Greg Kroah-HartmanFrom: Yazen Ghannam <[email protected]>
[ Upstream commit 8a2eaab7daf03b23ac902481218034ae2fae5e16 ]
AMD Family 17h systems currently require address translation in order to report the system address of a DRAM ECC error. This is currently done before decoding the syndrome information. The syndrome information does not depend on the address translation, so the proper EDAC csrow/channel reporting can function without the address. However, the syndrome information will not be decoded if the address translation fails.
Decode the syndrome information before doing the address translation. The syndrome information is architecturally defined in MCA_SYND and can be considered robust. The address translation is system-specific and may fail on newer systems without proper updates to the translation algorithm.
--- drivers/edac/amd64_edac.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/edac/amd64_edac.c +7 -7
@@ -2501,13 +2501,6 @@ static void decode_umc_error(int node_id, struct mce *m) goto log_error; } -if (umc_normaddr_to_sysaddr (m->addr, pvt->mc_node_id, err.channel, &sys_addr)) { - err.err_code =ERR_NORM_ADDR ; - goto log_error; - } - -error_address_to_page_and_offset (sys_addr, &err); -if (!(m->status &MCI_STATUS_SYNDV )) { err.err_code =ERR_SYND ; goto log_error;
@@ -2524,6 +2517,13 @@ static void decode_umc_error(int node_id, struct mce *m) err.csrow = m->synd &0x7 ; +if (umc_normaddr_to_sysaddr (m->addr, pvt->mc_node_id, err.channel, &sys_addr)) { + err.err_code =ERR_NORM_ADDR ; + goto log_error; + } + +error_address_to_page_and_offset (sys_addr, &err); + log_error:__log_ecc_error (mci, &err, ecc_type); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 103/185 PM / devfreq: passive: Use non-devm notifiers
In reply to Greg Kroah-HartmanFrom: Leonard Crestez <[email protected]>
[ Upstream commit 0ef7c7cce43f6ecc2b96d447e69b2900a9655f7c ]
The devfreq passive governor registers and unregisters devfreq transition notifiers on DEVFREQ_GOV_START/GOV_STOP using devm wrappers.
If devfreq itself is registered with devm then a warning is triggered on rmmod from devm_devfreq_unregister_notifier. Call stack looks like this:
devm_devfreq_unregister_notifier+0x30/0x40 devfreq_passive_event_handler+0x4c/0x88 devfreq_remove_device.part.8+0x6c/0x9c devm_devfreq_dev_release+0x18/0x20 release_nodes+0x1b0/0x220 devres_release_all+0x78/0x84 device_release_driver_internal+0x100/0x1c0 driver_detach+0x4c/0x90 bus_remove_driver+0x7c/0xd0 driver_unregister+0x2c/0x58 platform_driver_unregister+0x10/0x18 imx_devfreq_platdrv_exit+0x14/0xd40 [imx_devfreq]
This happens because devres_release_all will first remove all the nodes into a separate todo list so the nested devres_release from devm_devfreq_unregister_notifier won't find anything.
Fix the warning by calling the non-devm APIS for frequency notification. Using devm wrappers is not actually useful for a governor anyway: it relies on the devfreq core to correctly match the GOV_START/GOV_STOP notifications.
--- drivers/devfreq/governor_passive.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/devfreq/governor_passive.c +3 -3
@@ -168,12 +168,12 @@ static int devfreq_passive_event_handler(struct devfreq *devfreq, p_data->this = devfreq; nb->notifier_call = devfreq_passive_notifier_call; - ret =devm_devfreq_register_notifier (dev, parent, nb, + ret =devfreq_register_notifier (parent, nb,DEVFREQ_TRANSITION_NOTIFIER );break ;case DEVFREQ_GOV_STOP : -devm_devfreq_unregister_notifier (dev, parent, nb, -DEVFREQ_TRANSITION_NOTIFIER ); +WARN_ON (devfreq_unregister_notifier (parent, nb, +DEVFREQ_TRANSITION_NOTIFIER ));break ;default :break ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 104/185 PM / devfreq: exynos-bus: Correct clock enable sequence
In reply to Greg Kroah-HartmanFrom: Kamil Konieczny <[email protected]>
[ Upstream commit 2c2b20e0da89c76759ee28c6824413ab2fa3bfc6 ]
Regulators should be enabled before clocks to avoid h/w hang. This require change in exynos_bus_probe() to move exynos_bus_parse_of() after exynos_bus_parent_parse_of() and change in error handling. Similar change is needed in exynos_bus_exit() where clock should be disabled before regulators.
--- drivers/devfreq/exynos-bus.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-)
drivers/devfreq/exynos-bus.c +17 -14
@@ -194,11 +194,10 @@ static void exynos_bus_exit(struct device *dev)if (ret <0 )dev_warn (dev,"failed to disable the devfreq-event devices\n" ); -if (bus->regulator) -regulator_disable (bus->regulator); -dev_pm_opp_of_remove_table (dev);clk_disable_unprepare (bus->clk); +if (bus->regulator) +regulator_disable (bus->regulator); }/*
@@ -386,6 +385,7 @@ static int exynos_bus_probe(struct platform_device *pdev)struct exynos_bus *bus;int ret, max_state;unsigned long min_freq, max_freq; +bool passive = false;if (!np) {dev_err (dev,"failed to find devicetree node\n" );
@@ -399,27 +399,27 @@ static int exynos_bus_probe(struct platform_device *pdev) bus->dev = &pdev->dev;platform_set_drvdata (pdev, bus); -/* Parse the device-tree to get the resource information */ - ret =exynos_bus_parse_of (np, bus); -if (ret <0 ) -return ret; - profile =devm_kzalloc (dev,sizeof (*profile),GFP_KERNEL ); -if (!profile) { - ret = -ENOMEM ; - goto err; - } +if (!profile) +return -ENOMEM ; node =of_parse_phandle (dev->of_node,"devfreq" ,0 );if (node) {of_node_put (node); - goto passive; + passive = true; }else { ret =exynos_bus_parent_parse_of (np, bus); +if (ret <0 ) +return ret; } +/* Parse the device-tree to get the resource information */ + ret =exynos_bus_parse_of (np, bus);if (ret <0 ) - goto err; + goto err_reg; + +if (passive) + goto passive;/* Initialize the struct profile and governor data for parent device */ profile->polling_ms =50 ;
@@ -509,6 +509,9 @@ static int exynos_bus_probe(struct platform_device *pdev) err:dev_pm_opp_of_remove_table (dev);clk_disable_unprepare (bus->clk); +err_reg: +if (!passive) +regulator_disable (bus->regulator);return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 105/185 media: cec-notifier: clear cec_adap in cec_notifier_unregister
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit 14d5511691e5290103bc480998bc322e68f139d4 ]
If cec_notifier_cec_adap_unregister() is called before cec_unregister_adapter() then everything is OK (and this is the case today). But if it is the other way around, then cec_notifier_unregister() is called first, and that doesn't set n->cec_adap to NULL.
So if e.g. cec_notifier_set_phys_addr() is called after cec_notifier_unregister() but before cec_unregister_adapter() then n->cec_adap points to an unregistered and likely deleted cec adapter. So just set n->cec_adap->notifier and n->cec_adap to NULL for rubustness.
Eventually cec_notifier_unregister will disappear and this will be simplified substantially.
--- drivers/media/cec/cec-notifier.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/cec/cec-notifier.c +2 -0
@@ -130,6 +130,8 @@ void cec_notifier_unregister(struct cec_notifier *n) {mutex_lock (&n->lock); n->callback =NULL ; + n->cec_adap->notifier =NULL ; + n->cec_adap =NULL ;mutex_unlock (&n->lock);cec_notifier_put (n); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 106/185 media: saa7146: add cleanup in hexium_attach()
In reply to Greg Kroah-HartmanFrom: Wenwen Wang <[email protected]>
[ Upstream commit 42e64117d3b4a759013f77bbcf25ab6700e55de7 ]
If saa7146_register_device() fails, no cleanup is executed, leading to memory/resource leaks. To fix this issue, perform necessary cleanup work before returning the error.
--- drivers/media/pci/saa7146/hexium_gemini.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/pci/saa7146/hexium_gemini.c +3 -0
@@ -304,6 +304,9 @@ static int hexium_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_d ret =saa7146_register_device (&hexium->video_dev, dev,"hexium gemini" ,VFL_TYPE_GRABBER );if (ret <0 ) {pr_err ("cannot register capture v4l2 device. skipping.\n" ); +saa7146_vv_release (dev); +i2c_del_adapter (&hexium->i2c_adapter); +kfree (hexium);return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 107/185 media: cpia2_usb: fix memory leaks
In reply to Greg Kroah-HartmanFrom: Wenwen Wang <[email protected]>
[ Upstream commit 1c770f0f52dca1a2323c594f01f5ec6f1dddc97f ]
In submit_urbs(), 'cam->sbuf[i].data' is allocated through kmalloc_array(). However, it is not deallocated if the following allocation for urbs fails. To fix this issue, free 'cam->sbuf[i].data' if usb_alloc_urb() fails.
--- drivers/media/usb/cpia2/cpia2_usb.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/media/usb/cpia2/cpia2_usb.c +4 -0
@@ -684,6 +684,10 @@ static int submit_urbs(struct camera_data *cam)if (!urb) {for (j =0 ; j < i; j++)usb_free_urb (cam->sbuf[j].urb); +for (j =0 ; j <NUM_SBUF ; j++) { +kfree (cam->sbuf[j].data); + cam->sbuf[j].data =NULL ; + }return -ENOMEM ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 108/185 media: saa7134: fix terminology around saa7134_i2c_eeprom_md7134_gate()
In reply to Greg Kroah-HartmanFrom: Maciej S. Szmigiero <[email protected]>
[ Upstream commit 9d802222a3405599d6e1984d9324cddf592ea1f4 ]
saa7134_i2c_eeprom_md7134_gate() function and the associated comment uses an inverted i2c gate open / closed terminology.
Let's fix this.
--- drivers/media/pci/saa7134/saa7134-i2c.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/media/pci/saa7134/saa7134-i2c.c +8 -4
@@ -351,7 +351,11 @@ static struct i2c_client saa7134_client_template = {/* ----------------------------------------------------------- */ -/* On Medion 7134 reading EEPROM needs DVB-T demod i2c gate open */ +/* +* On Medion 7134 reading the SAA7134 chip config EEPROM needs DVB-T +* demod i2c gate closed due to an address clash between this EEPROM +* and the demod one. +*/ static void saa7134_i2c_eeprom_md7134_gate (struct saa7134_dev *dev) {u8 subaddr =0x7 , dmdregval;
@@ -368,14 +372,14 @@ static void saa7134_i2c_eeprom_md7134_gate(struct saa7134_dev *dev) ret =i2c_transfer (&dev->i2c_adap, i2cgatemsg_r,2 );if ((ret ==2 ) && (dmdregval &0x2 )) { -pr_debug ("%s: DVB-T demod i2c gate was left closed\n" , +pr_debug ("%s: DVB-T demod i2c gate was left open\n" , dev->name); data[0 ] = subaddr; data[1 ] = (dmdregval & ~0x2 );if (i2c_transfer (&dev->i2c_adap, i2cgatemsg_w,1 ) !=1 ) -pr_err ("%s: EEPROM i2c gate open failure\n" , - dev->name); +pr_err ("%s: EEPROM i2c gate close failure\n" , + dev->name); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 109/185 perf trace beauty ioctl: Fix off-by-one error in cmd->string table
In reply to Greg Kroah-HartmanFrom: Benjamin Peterson <[email protected]>
[ Upstream commit b92675f4a9c02dd78052645597dac9e270679ddf ]
While tracing a program that calls isatty(3), I noticed that strace reported TCGETS for the request argument of the underlying ioctl(2) syscall while perf trace reported TCSETS. strace is corrrect. The bug in perf was due to the tty ioctl beauty table starting at 0x5400 rather than 0x5401.
Committer testing:
Using augmented_raw_syscalls.o and settings to make 'perf trace' use strace formatting, i.e. with this in ~/.perfconfig
# cat ~/.perfconfig [trace] add_events = /home/acme/git/linux/tools/perf/examples/bpf/augmented_raw_syscalls.c show_zeros = yes show_duration = no no_inherit = yes show_timestamp = no show_arg_names = no args_alignment = 40 show_prefix = yes
# strace -e ioctl stty > /dev/null
ioctl(0, TCGETS, {B38400 opost isig icanon echo ...}) = 0
ioctl(1, TIOCGWINSZ, 0x7fff8a9b0860) = -1 ENOTTY (Inappropriate ioctl for device)
ioctl(1, TCGETS, 0x7fff8a9b0540) = -1 ENOTTY (Inappropriate ioctl for device)
+++ exited with 0 +++
#Before:
# perf trace -e ioctl stty > /dev/null ioctl(0, TCSETS, 0x7fff2cf79f20) = 0 ioctl(1, TIOCSWINSZ, 0x7fff2cf79f40) = -1 ENOTTY (Inappropriate ioctl for device) ioctl(1, TCSETS, 0x7fff2cf79c20) = -1 ENOTTY (Inappropriate ioctl for device) #
After:
# perf trace -e ioctl stty > /dev/null ioctl(0, TCGETS, 0x7ffed0763920) = 0 ioctl(1, TIOCGWINSZ, 0x7ffed0763940) = -1 ENOTTY (Inappropriate ioctl for device) ioctl(1, TCGETS, 0x7ffed0763620) = -1 ENOTTY (Inappropriate ioctl for device) #
--- tools/perf/trace/beauty/ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/trace/beauty/ioctl.c +1 -1
@@ -22,7 +22,7 @@static size_t ioctl__scnprintf_tty_cmd (int nr,int dir,char *bf,size_t size) {static const char *ioctl_tty_cmd[] = { -"TCGETS" ,"TCSETS" ,"TCSETSW" ,"TCSETSF" ,"TCGETA" ,"TCSETA" ,"TCSETAW" , + [_IOC_NR (TCGETS )] ="TCGETS" ,"TCSETS" ,"TCSETSW" ,"TCSETSF" ,"TCGETA" ,"TCSETA" ,"TCSETAW" ,"TCSETAF" ,"TCSBRK" ,"TCXONC" ,"TCFLSH" ,"TIOCEXCL" ,"TIOCNXCL" ,"TIOCSCTTY" ,"TIOCGPGRP" ,"TIOCSPGRP" ,"TIOCOUTQ" ,"TIOCSTI" ,"TIOCGWINSZ" ,"TIOCSWINSZ" ,"TIOCMGET" ,"TIOCMBIS" ,"TIOCMBIC" ,"TIOCMSET" ,"TIOCGSOFTCAR" ,"TIOCSSOFTCAR" ,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 110/185 media: ov9650: add a sanity check
In reply to Greg Kroah-HartmanFrom: Mauro Carvalho Chehab <[email protected]>
[ Upstream commit 093347abc7a4e0490e3c962ecbde2dc272a8f708 ]
As pointed by cppcheck:
[drivers/media/i2c/ov9650.c:706]: (error) Shifting by a negative value is undefined behaviour [drivers/media/i2c/ov9650.c:707]: (error) Shifting by a negative value is undefined behaviour [drivers/media/i2c/ov9650.c:721]: (error) Shifting by a negative value is undefined behaviour
Prevent mangling with gains with invalid values.
As pointed by Sylvester, this should never happen in practice, as min value of V4L2_CID_GAIN control is 16 (gain is always >= 16 and m is always >= 0), but it is too hard for a static analyzer to get this, as the logic with validates control min/max is elsewhere inside V4L2 core.
--- drivers/media/i2c/ov9650.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/media/i2c/ov9650.c +5 -0
@@ -710,6 +710,11 @@ static int ov965x_set_gain(struct ov965x *ov965x, int auto_gain)for (m =6 ; m >=0 ; m--)if (gain >= (1 << m) *16 )break ; + +/* Sanity check: don't adjust the gain with a negative value */ +if (m <0 ) +return -EINVAL ; + rgain = (gain - ((1 << m) *16 )) / (1 << m); rgain |= (((1 << m) -1 ) <<4 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 111/185 ASoC: es8316: fix headphone mixer volume table
In reply to Greg Kroah-HartmanFrom: Katsuhiro Suzuki <[email protected]>
[ Upstream commit f972d02fee2496024cfd6f59021c9d89d54922a6 ]
This patch fix setting table of Headphone mixer volume. Current code uses 4 ... 7 values but these values are prohibited.
Correct settings are the following:
0000 -12dB
0001 -10.5dB
0010 -9dB
0011 -7.5dB
0100 -6dB
1000 -4.5dB
1001 -3dB
1010 -1.5dB
1011 0dB
--- sound/soc/codecs/es8316.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
sound/soc/codecs/es8316.c +5 -2
@@ -46,7 +46,10 @@ static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(adc_vol_tlv, -9600, 50, 1); static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(alc_max_gain_tlv, -650, 150, 0); static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(alc_min_gain_tlv, -1200, 150, 0); static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(alc_target_tlv, -1650, 150, 0); -static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(hpmixer_gain_tlv, -1200, 150, 0); +static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(hpmixer_gain_tlv, +0 ,4 ,TLV_DB_SCALE_ITEM (-1200 ,150 ,0 ), + 8, 11, TLV_DB_SCALE_ITEM(-450, 150, 0), +); static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(adc_pga_gain_tlv, 0, 0, TLV_DB_SCALE_ITEM(-350, 0, 0),
@@ -84,7 +87,7 @@ static const struct snd_kcontrol_new es8316_snd_controls[] = {SOC_DOUBLE_TLV ("Headphone Playback Volume" ,ES8316_CPHP_ICAL_VOL ,4 ,0 ,3 ,1 , hpout_vol_tlv),SOC_DOUBLE_TLV ("Headphone Mixer Volume" ,ES8316_HPMIX_VOL , -0 ,4 ,7 ,0 , hpmixer_gain_tlv), +0 ,4 ,11 ,0 , hpmixer_gain_tlv),SOC_ENUM ("Playback Polarity" , dacpol), SOC_DOUBLE_R_TLV("DAC Playback Volume", ES8316_DAC_VOLL,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 112/185 ACPI / CPPC: do not require the _PSD method
In reply to Greg Kroah-HartmanFrom: Al Stone <[email protected]>
[ Upstream commit 4c4cdc4c63853fee48c02e25c8605fb65a6c9924 ]
According to the ACPI 6.3 specification, the _PSD method is optional when using CPPC. The underlying assumption is that each CPU can change frequency independently from all other CPUs; _PSD is provided to tell the OS that some processors can NOT do that.
However, the acpi_get_psd() function returns ENODEV if there is no _PSD method present, or an ACPI error status if an error occurs when evaluating _PSD, if present. This makes _PSD mandatory when using CPPC, in violation of the specification, and only on Linux.
This has forced some firmware writers to provide a dummy _PSD, even though it is irrelevant, but only because Linux requires it; other OSPMs follow the spec. We really do not want to have OS specific ACPI tables, though.
So, correct acpi_get_psd() so that it does not return an error if there is no _PSD method present, but does return a failure when the method can not be executed properly. This allows _PSD to be optional as it should be.
--- drivers/acpi/cppc_acpi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/acpi/cppc_acpi.c +4 -2
@@ -365,8 +365,10 @@ static int acpi_get_psd(struct cpc_desc *cpc_ptr, acpi_handle handle)union acpi_object *psd =NULL ;struct acpi_psd_package *pdomain; - status =acpi_evaluate_object_typed (handle,"_PSD" ,NULL , &buffer, -ACPI_TYPE_PACKAGE ); + status =acpi_evaluate_object_typed (handle,"_PSD" ,NULL , + &buffer,ACPI_TYPE_PACKAGE ); +if (status ==AE_NOT_FOUND )/* _PSD is optional */ +return 0 ;if (ACPI_FAILURE (status))return -ENODEV ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 113/185 arm64: kpti: ensure patched kernel text is fetched from PoU
In reply to Greg Kroah-HartmanFrom: Mark Rutland <[email protected]>
[ Upstream commit f32c7a8e45105bd0af76872bf6eef0438ff12fb2 ]
While the MMUs is disabled, I-cache speculation can result in instructions being fetched from the PoC. During boot we may patch instructions (e.g. for alternatives and jump labels), and these may be dirty at the PoU (and stale at the PoC).
Thus, while the MMU is disabled in the KPTI pagetable fixup code we may load stale instructions into the I-cache, potentially leading to subsequent crashes when executing regions of code which have been modified at runtime.
Similarly to commit:
8ec41987436d566f ("arm64: mm: ensure patched kernel text is fetched from PoU")
... we can invalidate the I-cache after enabling the MMU to prevent such issues.
The KPTI pagetable fixup code itself should be clean to the PoC per the boot protocol, so no maintenance is required for this code.
--- arch/arm64/mm/proc.S | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/arm64/mm/proc.S +9 -0
@@ -280,6 +280,15 @@ skip_pgd: msr sctlr_el1, x18 isb + /* + * Invalidate the local I-cache so that any instructions fetched + * speculatively from the PoC are discarded, since they may have + * been dynamically patched at the PoU. + */ + ic iallu + dsb nsh + isb + /* Set the flag to zero to indicate that we're all done */ str wzr, [flag_ptr] ret
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 114/185 nvmet: fix data units read and written counters in SMART log
In reply to Greg Kroah-HartmanFrom: Tom Wu <[email protected]>
[ Upstream commit 3bec2e3754becebd4c452999adb49bc62c575ea4 ]
In nvme spec 1.3 there is a definition for data write/read counters from SMART log, (See section 5.14.1.2):
This value is reported in thousands (i.e., a value of 1 corresponds to 1000 units of 512 bytes read) and is rounded up.
However, in nvme target where value is reported with actual units, but not thousands of units as the spec requires.
--- drivers/nvme/target/admin-cmd.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/nvme/target/admin-cmd.c +8 -6
@@ -49,9 +49,11 @@ static u16 nvmet_get_smart_log_nsid(struct nvmet_req *req, } host_reads =part_stat_read (ns->bdev->bd_part, ios[READ ]); - data_units_read =part_stat_read (ns->bdev->bd_part, sectors[READ ]); + data_units_read =DIV_ROUND_UP (part_stat_read (ns->bdev->bd_part, + sectors[READ ]),1000 ); host_writes =part_stat_read (ns->bdev->bd_part, ios[WRITE ]); - data_units_written =part_stat_read (ns->bdev->bd_part, sectors[WRITE ]); + data_units_written =DIV_ROUND_UP (part_stat_read (ns->bdev->bd_part, + sectors[WRITE ]),1000 );put_unaligned_le64 (host_reads, &slog->host_reads[0 ]);put_unaligned_le64 (data_units_read, &slog->data_units_read[0 ]);
@@ -77,11 +79,11 @@ static u16 nvmet_get_smart_log_all(struct nvmet_req *req,rcu_read_lock ();list_for_each_entry_rcu (ns, &ctrl->subsys->namespaces, dev_link) { host_reads +=part_stat_read (ns->bdev->bd_part, ios[READ ]); - data_units_read += -part_stat_read (ns->bdev->bd_part, sectors[READ ]); + data_units_read +=DIV_ROUND_UP ( +part_stat_read (ns->bdev->bd_part, sectors[READ ]),1000 ); host_writes +=part_stat_read (ns->bdev->bd_part, ios[WRITE ]); - data_units_written += -part_stat_read (ns->bdev->bd_part, sectors[WRITE ]); + data_units_written +=DIV_ROUND_UP ( +part_stat_read (ns->bdev->bd_part, sectors[WRITE ]),1000 ); }rcu_read_unlock ();
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 115/185 iommu/amd: Silence warnings under memory pressure
In reply to Greg Kroah-HartmanFrom: Qian Cai <[email protected]>
[ Upstream commit 3d708895325b78506e8daf00ef31549476e8586a ]
When running heavy memory pressure workloads, the system is throwing endless warnings,
smartpqi 0000:23:00.0: AMD-Vi: IOMMU mapping error in map_sg (io-pages:
5 reason: -12)
Hardware name: HPE ProLiant DL385 Gen10/ProLiant DL385 Gen10, BIOS A40 07/10/2019 swapper/10: page allocation failure: order:0, mode:0xa20(GFP_ATOMIC), nodemask=(null),cpuset=/,mems_allowed=0,4 Call Trace: <IRQ> dump_stack+0x62/0x9a warn_alloc.cold.43+0x8a/0x148 __alloc_pages_nodemask+0x1a5c/0x1bb0 get_zeroed_page+0x16/0x20 iommu_map_page+0x477/0x540 map_sg+0x1ce/0x2f0 scsi_dma_map+0xc6/0x160 pqi_raid_submit_scsi_cmd_with_io_request+0x1c3/0x470 [smartpqi] do_IRQ+0x81/0x170 common_interrupt+0xf/0xf </IRQ>
because the allocation could fail from iommu_map_page(), and the volume of this call could be huge which may generate a lot of serial console output and cosumes all CPUs.
Fix it by silencing the warning in this call site, and there is still a dev_err() later to notify the failure.
--- drivers/iommu/amd_iommu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/iommu/amd_iommu.c +3 -1
@@ -2568,7 +2568,9 @@ static int map_sg(struct device *dev, struct scatterlist *sglist, bus_addr = address + s->dma_address + (j <<PAGE_SHIFT ); phys_addr = (sg_phys (s) &PAGE_MASK ) + (j <<PAGE_SHIFT ); - ret =iommu_map_page (domain, bus_addr, phys_addr,PAGE_SIZE , prot,GFP_ATOMIC ); + ret =iommu_map_page (domain, bus_addr, phys_addr, +PAGE_SIZE , prot, +GFP_ATOMIC | __GFP_NOWARN);if (ret) goto out_unmap;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 116/185 iommu/iova: Avoid false sharing on fq_timer_on
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 0d87308cca2c124f9bce02383f1d9632c9be89c4 ]
In commit 14bd9a607f90 ("iommu/iova: Separate atomic variables to improve performance") Jinyu Qi identified that the atomic_cmpxchg() in queue_iova() was causing a performance loss and moved critical fields so that the false sharing would not impact them.
However, avoiding the false sharing in the first place seems easy. We should attempt the atomic_cmpxchg() no more than 100 times per second. Adding an atomic_read() will keep the cache line mostly shared.
This false sharing came with commit 9a005a800ae8
("iommu/iova: Add flush timer").
--- drivers/iommu/iova.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/iommu/iova.c +3 -1
@@ -607,7 +607,9 @@ void queue_iova(struct iova_domain *iovad,spin_unlock_irqrestore (&fq->lock, flags); -if (atomic_cmpxchg (&iovad->fq_timer_on,0 ,1 ) ==0 ) +/* Avoid false sharing as much as possible. */ +if (!atomic_read (&iovad->fq_timer_on) && + !atomic_cmpxchg (&iovad->fq_timer_on,0 ,1 ))mod_timer (&iovad->fq_timer, jiffies +msecs_to_jiffies (IOVA_FQ_TIMEOUT ));
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 117/185 libtraceevent: Change users plugin directory
In reply to Greg Kroah-HartmanFrom: Tzvetomir Stoyanov <[email protected]>
[ Upstream commit e97fd1383cd77c467d2aed7fa4e596789df83977 ]
To be compliant with XDG user directory layout, the user's plugin directory is changed from ~/.traceevent/plugins to ~/.local/lib/traceevent/plugins/
--- tools/lib/traceevent/Makefile | 6 +++--- tools/lib/traceevent/event-plugin.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
tools/lib/traceevent/Makefile +3 -3
@@ -55,15 +55,15 @@ set_plugin_dir := 1 # Set plugin_dir to preffered global plugin location # If we install under $HOME directory we go under -# $(HOME)/.traceevent/plugins +# $(HOME)/.local/lib/traceevent/plugins # # We dont set PLUGIN_DIR in case we install under $HOME # directory, because by default the code looks under: -# $(HOME)/.traceevent/plugins by default. +# $(HOME)/.local/lib/traceevent/plugins by default. # ifeq ($(plugin_dir),) ifeq ($(prefix),$(HOME)) -override plugin_dir = $(HOME)/.traceevent/plugins +override plugin_dir = $(HOME)/.local/lib/traceevent/plugins set_plugin_dir := 0 else override plugin_dir = $(libdir)/traceevent/plugins
tools/lib/traceevent/event-plugin.c +1 -1
@@ -30,7 +30,7 @@#include "event-parse.h" #include "event-utils.h" -#define LOCAL_PLUGIN_DIR ".traceevent/plugins" +#define LOCAL_PLUGIN_DIR ".local/lib/traceevent/plugins/" static struct registered_plugin_options { struct registered_plugin_options *next;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 118/185 ARM: dts: exynos: Mark LDO10 as always-on on Peach Pit/Pi Chromebooks
In reply to Greg Kroah-HartmanFrom: Marek Szyprowski <[email protected]>
[ Upstream commit 5b0eeeaa37615df37a9a30929b73e9defe61ca84 ]
Commit aff138bf8e37 ("ARM: dts: exynos: Add TMU nodes regulator supply for Peach boards") assigned LDO10 to Exynos Thermal Measurement Unit, but it turned out that it supplies also some other critical parts and board freezes/crashes when it is turned off.
The mentioned commit made Exynos TMU a consumer of that regulator and in typical case Exynos TMU driver keeps it enabled from early boot. However there are such configurations (example is multi_v7_defconfig), in which some of the regulators are compiled as modules and are not available from early boot. In such case it may happen that LDO10 is turned off by regulator core, because it has no consumers yet (in this case consumer drivers cannot get it, because the supply regulators for it are not yet available). This in turn causes the board to crash. This patch restores 'always-on' property for the LDO10 regulator.
--- arch/arm/boot/dts/exynos5420-peach-pit.dts | 1 + arch/arm/boot/dts/exynos5800-peach-pi.dts | 1 + 2 files changed, 2 insertions(+)
arch/arm/boot/dts/exynos5420-peach-pit.dts +1 -0
@@ -426,6 +426,7 @@ regulator-name = "vdd_ldo10"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; + regulator-always-on; regulator-state-mem { regulator-off-in-suspend; };
arch/arm/boot/dts/exynos5800-peach-pi.dts +1 -0
@@ -426,6 +426,7 @@ regulator-name = "vdd_ldo10"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; + regulator-always-on; regulator-state-mem { regulator-off-in-suspend; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 119/185 ACPI: custom_method: fix memory leaks
In reply to Greg Kroah-HartmanFrom: Wenwen Wang <[email protected]>
[ Upstream commit 03d1571d9513369c17e6848476763ebbd10ec2cb ]
In cm_write(), 'buf' is allocated through kzalloc(). In the following execution, if an error occurs, 'buf' is not deallocated, leading to memory leaks. To fix this issue, free 'buf' before returning the error.
--- drivers/acpi/custom_method.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/acpi/custom_method.c +4 -1
@@ -48,8 +48,10 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,if ((*ppos > max_size) || (*ppos + count > max_size) || (*ppos + count < count) || - (count > uncopied_bytes)) + (count > uncopied_bytes)) { +kfree (buf);return -EINVAL ; + }if (copy_from_user (buf + (*ppos), user_buf, count)) {kfree (buf);
@@ -69,6 +71,7 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,add_taint (TAINT_OVERRIDDEN_ACPI_TABLE ,LOCKDEP_NOW_UNRELIABLE ); } +kfree (buf);return count; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 120/185 ACPI / PCI: fix acpi_pci_irq_enable() memory leak
In reply to Greg Kroah-HartmanFrom: Wenwen Wang <[email protected]>
[ Upstream commit 29b49958cf73b439b17fa29e9a25210809a6c01c ]
In acpi_pci_irq_enable(), 'entry' is allocated by kzalloc() in acpi_pci_irq_check_entry() (invoked from acpi_pci_irq_lookup()). However, it is not deallocated if acpi_pci_irq_valid() returns false, leading to a memory leak. To fix this issue, free 'entry' before returning 0.
--- drivers/acpi/pci_irq.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/acpi/pci_irq.c +3 -1
@@ -462,8 +462,10 @@ int acpi_pci_irq_enable(struct pci_dev *dev)* No IRQ known to the ACPI subsystem - maybe the BIOS / * driver reported one, then use it. Exit in any case. */ -if (!acpi_pci_irq_valid (dev, pin)) +if (!acpi_pci_irq_valid (dev, pin)) { +kfree (entry);return 0 ; + }if (acpi_isa_register_gsi (dev)) dev_warn(&dev->dev, "PCI INT %c: no GSI\n",
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 121/185 hwmon: (acpi_power_meter) Change log level for unsafe software power cap
In reply to Greg Kroah-HartmanFrom: Wang Shenran <[email protected]>
[ Upstream commit 6e4d91aa071810deac2cd052161aefb376ecf04e ]
At boot time, the acpi_power_meter driver logs the following error level
message: "Ignoring unsafe software power cap". Having read about it from a few sources, it seems that the error message can be quite misleading.
While the message can imply that Linux is ignoring the fact that the system is operating in potentially dangerous conditions, the truth is the driver found an ACPI_PMC object that supports software power capping. The driver simply decides not to use it, perhaps because it doesn't support the object.
The best solution is probably changing the log level from error to warning. All sources I have found, regarding the error, have downplayed its significance. There is not much of a reason for it to be on error level, while causing potential confusions or misinterpretations.
--- drivers/hwmon/acpi_power_meter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/hwmon/acpi_power_meter.c +2 -2
@@ -693,8 +693,8 @@ static int setup_attrs(struct acpi_power_meter_resource *resource)if (resource->caps.flags &POWER_METER_CAN_CAP ) {if (!can_cap_in_hardware ()) { -dev_err (&resource->acpi_dev->dev, -"Ignoring unsafe software power cap!\n" ); +dev_warn (&resource->acpi_dev->dev, +"Ignoring unsafe software power cap!\n" ); goto skip_unsafe_cap; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 122/185 md/raid1: fail run raid1 array when active disk less than one
In reply to Greg Kroah-HartmanFrom: Yufen Yu <[email protected]>
[ Upstream commit 07f1a6850c5d5a65c917c3165692b5179ac4cb6b ]
When run test case:
mdadm -CR /dev/md1 -l 1 -n 4 /dev/sd[a-d] --assume-clean --bitmap=internal mdadm -S /dev/md1
mdadm -A /dev/md1 /dev/sd[b-c] --run --force
mdadm --zero /dev/sda mdadm /dev/md1 -a /dev/sda
echo offline > /sys/block/sdc/device/state
echo offline > /sys/block/sdb/device/state
sleep 5
mdadm -S /dev/md1
echo running > /sys/block/sdb/device/state echo running > /sys/block/sdc/device/state mdadm -A /dev/md1 /dev/sd[a-c] --run --force
mdadm run fail with kernel message as follow:
[ 172.986064] md: kicking non-fresh sdb from array! [ 173.004210] md: kicking non-fresh sdc from array! [ 173.022383] md/raid1:md1: active with 0 out of 4 mirrors [ 173.022406] md1: failed to create bitmap (-5)
In fact, when active disk in raid1 array less than one, we need to return fail in raid1_run().
--- drivers/md/raid1.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/md/raid1.c +12 -1
@@ -3099,6 +3099,13 @@ static int raid1_run(struct mddev *mddev) !test_bit (In_sync, &conf->mirrors[i].rdev->flags) || test_bit(Faulty, &conf->mirrors[i].rdev->flags)) mddev->degraded++; +/* +* RAID1 needs at least one disk in active +*/ +if (conf->raid_disks - mddev->degraded <1 ) { + ret = -EINVAL ; + goto abort; + }if (conf->raid_disks - mddev->degraded ==1 ) mddev->recovery_cp = MaxSector;
@@ -3132,8 +3139,12 @@ static int raid1_run(struct mddev *mddev) ret =md_integrity_register (mddev);if (ret) {md_unregister_thread (&mddev->thread); -raid1_free (mddev, conf); + goto abort; } +return 0 ; + +abort: +raid1_free (mddev, conf);return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 123/185 dmaengine: ti: edma: Do not reset reserved paRAM slots
In reply to Greg Kroah-HartmanFrom: Peter Ujfalusi <[email protected]>
[ Upstream commit c5dbe60664b3660f5ac5854e21273ea2e7ff698f ]
Skip resetting paRAM slots marked as reserved as they might be used by other cores.
--- drivers/dma/edma.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/dma/edma.c +6 -3
@@ -2268,9 +2268,6 @@ static int edma_probe(struct platform_device *pdev) ecc->default_queue = info->default_queue; -for (i =0 ; i < ecc->num_slots; i++) -edma_write_slot (ecc, i, &dummy_paramset); -if (info->rsv) {/* Set the reserved slots in inuse list */ rsv_slots = info->rsv->rsv_slots;
@@ -2283,6 +2280,12 @@ static int edma_probe(struct platform_device *pdev) } } +for (i =0 ; i < ecc->num_slots; i++) { +/* Reset only unused - not reserved - paRAM slots */ +if (!test_bit (i, ecc->slot_inuse)) +edma_write_slot (ecc, i, &dummy_paramset); + } +/* Clear the xbar mapped channels in unused list */ xbar_chans = info->xbar_chans;if (xbar_chans) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 124/185 kprobes: Prohibit probing on BUG() and WARN() address
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit e336b4027775cb458dc713745e526fa1a1996b2a ]
Since BUG() and WARN() may use a trap (e.g. UD2 on x86) to get the address where the BUG() has occurred, kprobes can not do single-step out-of-line that instruction. So prohibit probing on such address.
Without this fix, if someone put a kprobe on WARN(), the kernel will crash with invalid opcode error instead of outputing warning message, because kernel can not find correct bug address.
--- include/linux/bug.h | 5 +++++ kernel/kprobes.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)
include/linux/bug.h +5 -0
@@ -45,6 +45,11 @@ int is_valid_bugaddr(unsigned long addr);#else /* !CONFIG_GENERIC_BUG */ +static inline void *find_bug (unsigned long bugaddr) +{ +return NULL ; +} +static inline enum bug_trap_type report_bug (unsigned long bug_addr,struct pt_regs *regs) {
kernel/kprobes.c +2 -1
@@ -1501,7 +1501,8 @@ static int check_kprobe_address_safe(struct kprobe *p,/* Ensure it is not in reserved area nor out of text */ if (!kernel_text_address ((unsigned long ) p->addr) ||within_kprobe_blacklist ((unsigned long ) p->addr) || -jump_label_text_reserved (p->addr, p->addr)) { +jump_label_text_reserved (p->addr, p->addr) || +find_bug ((unsigned long )p->addr)) { ret = -EINVAL ; goto out; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 125/185 s390/crypto: xts-aes-s390 fix extra run-time crypto self tests finding
In reply to Greg Kroah-HartmanFrom: Harald Freudenberger <[email protected]>
[ Upstream commit 9e323d45ba94262620a073a3f9945ca927c07c71 ]
With 'extra run-time crypto self tests' enabled, the selftest for s390-xts fails with
alg: skcipher: xts-aes-s390 encryption unexpectedly succeeded on test vector "random: len=0 klen=64"; expected_error=-22, cfg="random: inplace use_digest nosimd src_divs=[2.61%@+4006, 84.44%@+21, 1.55%@+13, 4.50%@+344, 4.26%@+21, 2.64%@+27]"
This special case with nbytes=0 is not handled correctly and this fix now makes sure that -EINVAL is returned when there is en/decrypt called with 0 bytes to en/decrypt.
--- arch/s390/crypto/aes_s390.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/s390/crypto/aes_s390.c +6 -0
@@ -572,6 +572,9 @@ static int xts_aes_encrypt(struct blkcipher_desc *desc,struct s390_xts_ctx *xts_ctx =crypto_blkcipher_ctx (desc->tfm);struct blkcipher_walk walk; +if (!nbytes) +return -EINVAL ; +if (unlikely (!xts_ctx->fc))return xts_fallback_encrypt (desc, dst, src, nbytes);
@@ -586,6 +589,9 @@ static int xts_aes_decrypt(struct blkcipher_desc *desc,struct s390_xts_ctx *xts_ctx =crypto_blkcipher_ctx (desc->tfm);struct blkcipher_walk walk; +if (!nbytes) +return -EINVAL ; +if (unlikely (!xts_ctx->fc))return xts_fallback_decrypt (desc, dst, src, nbytes);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 126/185 ASoC: dmaengine: Make the pcm->name equal to pcm->id if the name is not set
In reply to Greg Kroah-HartmanFrom: Peter Ujfalusi <[email protected]>
[ Upstream commit 2ec42f3147e1610716f184b02e65d7f493eed925 ]
Some tools use the snd_pcm_info_get_name() to try to identify PCMs or for other purposes.
Currently it is left empty with the dmaengine-pcm, in this case copy the pcm->id string as pcm->name.
For example IGT is using this to find the HDMI PCM for testing audio on it.
--- sound/soc/soc-generic-dmaengine-pcm.c | 6 ++++++ 1 file changed, 6 insertions(+)
sound/soc/soc-generic-dmaengine-pcm.c +6 -0
@@ -311,6 +311,12 @@ static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)if (!dmaengine_pcm_can_report_residue (dev, pcm->chan[i])) pcm->flags |=SND_DMAENGINE_PCM_FLAG_NO_RESIDUE ; + +if (rtd->pcm->streams[i].pcm->name[0 ] =='\0' ) { +strncpy (rtd->pcm->streams[i].pcm->name, + rtd->pcm->streams[i].pcm->id, +sizeof (rtd->pcm->streams[i].pcm->name)); + } }return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 127/185 raid5: dont set STRIPE_HANDLE to stripe which is in batch list
In reply to Greg Kroah-HartmanFrom: Guoqing Jiang <[email protected]>
[ Upstream commit 6ce220dd2f8ea71d6afc29b9a7524c12e39f374a ]
If stripe in batch list is set with STRIPE_HANDLE flag, then the stripe could be set with STRIPE_ACTIVE by the handle_stripe function. And if error happens to the batch_head at the same time, break_stripe_batch_list is called, then below warning could happen (the same report in [1]), it means a member of batch list was set with STRIPE_ACTIVE.
[7028915.431770] stripe state: 2001 [7028915.431815] ------------[ cut here ]------------ [7028915.431828] WARNING: CPU: 18 PID: 29089 at drivers/md/raid5.c:4614 break_stripe_batch_list+0x203/0x240 [raid456] [...] [7028915.431879] CPU: 18 PID: 29089 Comm: kworker/u82:5 Tainted: G O 4.14.86-1-storage #4.14.86-1.2~deb9 [7028915.431881] Hardware name: Supermicro SSG-2028R-ACR24L/X10DRH-iT, BIOS 3.1 06/18/2018 [7028915.431888] Workqueue: raid5wq raid5_do_work [raid456] [7028915.431890] task: ffff9ab0ef36d7c0 task.stack: ffffb72926f84000 [7028915.431896] RIP: 0010:break_stripe_batch_list+0x203/0x240 [raid456] [7028915.431898] RSP: 0018:ffffb72926f87ba8 EFLAGS: 00010286 [7028915.431900] RAX: 0000000000000012 RBX: ffff9aaa84a98000 RCX: 0000000000000000 [7028915.431901] RDX: 0000000000000000 RSI: ffff9ab2bfa15458 RDI: ffff9ab2bfa15458 [7028915.431902] RBP: ffff9aaa8fb4e900 R08: 0000000000000001 R09: 0000000000002eb4 [7028915.431903] R10: 00000000ffffffff R11: 0000000000000000 R12: ffff9ab1736f1b00 [7028915.431904] R13: 0000000000000000 R14: ffff9aaa8fb4e900 R15: 0000000000000001 [7028915.431906] FS: 0000000000000000(0000) GS:ffff9ab2bfa00000(0000) knlGS:0000000000000000 [7028915.431907] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [7028915.431908] CR2: 00007ff953b9f5d8 CR3: 0000000bf4009002 CR4: 00000000003606e0 [7028915.431909] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [7028915.431910] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [7028915.431910] Call Trace: [7028915.431923] handle_stripe+0x8e7/0x2020 [raid456] [7028915.431930] ? __wake_up_common_lock+0x89/0xc0 [7028915.431935] handle_active_stripes.isra.58+0x35f/0x560 [raid456] [7028915.431939] raid5_do_work+0xc6/0x1f0 [raid456]
Also commit 59fc630b8b5f9f ("RAID5: batch adjacent full stripe write") said "If a stripe is added to batch list, then only the first stripe of the list should be put to handle_list and run handle_stripe."
So don't set STRIPE_HANDLE to stripe which is already in batch list, otherwise the stripe could be put to handle_list and run handle_stripe, then the above warning could be triggered.
[1]. https://www.spinics.net/lists/raid/msg62552.html
--- drivers/md/raid5.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/md/raid5.c +2 -1
@@ -5718,7 +5718,8 @@ static bool raid5_make_request(struct mddev *mddev, struct bio * bi) do_flush = false; } -set_bit (STRIPE_HANDLE , &sh->state); +if (!sh->batch_head) +set_bit (STRIPE_HANDLE , &sh->state);clear_bit (STRIPE_DELAYED , &sh->state); if ((!sh->batch_head || sh == sh->batch_head) && (bi->bi_opf & REQ_SYNC) &&
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 128/185 mmc: core: Clarify sdio_irq_pending flag for MMC_CAP2_SDIO_IRQ_NOTHREAD
In reply to Greg Kroah-HartmanFrom: Ulf Hansson <[email protected]>
[ Upstream commit 36d57efb4af534dd6b442ea0b9a04aa6dfa37abe ]
The sdio_irq_pending flag is used to let host drivers indicate that it has signaled an IRQ. If that is the case and we only have a single SDIO func that have claimed an SDIO IRQ, our assumption is that we can avoid reading the SDIO_CCCR_INTx register and just call the SDIO func irq handler immediately. This makes sense, but the flag is set/cleared in a somewhat messy order, let's fix that up according to below.
First, the flag is currently set in sdio_run_irqs(), which is executed as a work that was scheduled from sdio_signal_irq(). To make it more implicit that the host have signaled an IRQ, let's instead immediately set the flag in sdio_signal_irq(). This also makes the behavior consistent with host drivers that uses the legacy, mmc_signal_sdio_irq() API. This have no functional impact, because we don't expect host drivers to call sdio_signal_irq() until after the work (sdio_run_irqs()) have been executed anyways.
Second, currently we never clears the flag when using the sdio_run_irqs() work, but only when using the sdio_irq_thread(). Let make the behavior consistent, by moving the flag to be cleared inside the common process_sdio_pending_irqs() function. Additionally, tweak the behavior of the flag slightly, by avoiding to clear it unless we processed the SDIO IRQ. The purpose with this at this point, is to keep the information about whether there have been an SDIO IRQ signaled by the host, so at system resume we can decide to process it without reading the SDIO_CCCR_INTx register.
--- drivers/mmc/core/sdio_irq.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/mmc/core/sdio_irq.c +6 -3
@@ -35,6 +35,7 @@ static int process_sdio_pending_irqs(struct mmc_host *host) {struct mmc_card *card = host->card;int i, ret, count; +bool sdio_irq_pending = host->sdio_irq_pending;unsigned char pending;struct sdio_func *func;
@@ -42,13 +43,16 @@ static int process_sdio_pending_irqs(struct mmc_host *host)if (mmc_card_suspended (card))return 0 ; +/* Clear the flag to indicate that we have processed the IRQ. */ + host->sdio_irq_pending = false; +/* * Optimization, if there is only 1 function interrupt registered * and we know an IRQ was signaled then call irq handler directly. * Otherwise do the full probe. */ func = card->sdio_single_irq; -if (func && host->sdio_irq_pending) { +if (func && sdio_irq_pending) { func->irq_handler (func);return 1 ; }
@@ -100,7 +104,6 @@ void sdio_run_irqs(struct mmc_host *host) {mmc_claim_host (host);if (host->sdio_irqs) { - host->sdio_irq_pending = true;process_sdio_pending_irqs (host);if (host->ops->ack_sdio_irq) host->ops->ack_sdio_irq (host);
@@ -119,6 +122,7 @@ void sdio_irq_work(struct work_struct *work)void sdio_signal_irq (struct mmc_host *host) { + host->sdio_irq_pending = true;queue_delayed_work (system_wq, &host->sdio_irq_work,0 ); }EXPORT_SYMBOL_GPL (sdio_signal_irq);
@@ -163,7 +167,6 @@ static int sdio_irq_thread(void *_host)if (ret)break ; ret =process_sdio_pending_irqs (host); - host->sdio_irq_pending = false;mmc_release_host (host);/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 129/185 mmc: sdhci: Fix incorrect switch to HS mode
In reply to Greg Kroah-HartmanFrom: Al Cooper <[email protected]>
[ Upstream commit c894e33ddc1910e14d6f2a2016f60ab613fd8b37 ]
When switching from any MMC speed mode that requires 1.8v (HS200, HS400 and HS400ES) to High Speed (HS) mode, the system ends up configured for SDR12 with a 50MHz clock which is an illegal mode.
This happens because the SDHCI_CTRL_VDD_180 bit in the SDHCI_HOST_CONTROL2 register is left set and when this bit is set, the speed mode is controlled by the SDHCI_CTRL_UHS field in the SDHCI_HOST_CONTROL2 register. The SDHCI_CTRL_UHS field will end up being set to 0 (SDR12) by sdhci_set_uhs_signaling() because there is no UHS mode being set.
The fix is to change sdhci_set_uhs_signaling() to set the SDHCI_CTRL_UHS field to SDR25 (which is the same as HS) for any switch to HS mode.
This was found on a new eMMC controller that does strict checking of the speed mode and the corresponding clock rate. It caused the switch to HS400 mode to fail because part of the sequence to switch to HS400 requires a switch from HS200 to HS before going to HS400.
--- drivers/mmc/host/sdhci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci.c +3 -1
@@ -1635,7 +1635,9 @@ void sdhci_set_uhs_signaling(struct sdhci_host *host, unsigned timing) ctrl_2 |=SDHCI_CTRL_UHS_SDR104 ; else if (timing == MMC_TIMING_UHS_SDR12) ctrl_2 |= SDHCI_CTRL_UHS_SDR12; - else if (timing == MMC_TIMING_UHS_SDR25) + else if (timing == MMC_TIMING_SD_HS || + timing == MMC_TIMING_MMC_HS || + timing == MMC_TIMING_UHS_SDR25) ctrl_2 |= SDHCI_CTRL_UHS_SDR25; else if (timing == MMC_TIMING_UHS_SDR50) ctrl_2 |= SDHCI_CTRL_UHS_SDR50;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 130/185 raid5: dont increment read_errors on EILSEQ return
In reply to Greg Kroah-HartmanFrom: Nigel Croxon <[email protected]>
[ Upstream commit b76b4715eba0d0ed574f58918b29c1b2f0fa37a8 ]
While MD continues to count read errors returned by the lower layer. If those errors are -EILSEQ, instead of -EIO, it should NOT increase the read_errors count.
When RAID6 is set up on dm-integrity target that detects massive corruption, the leg will be ejected from the array. Even if the issue is correctable with a sector re-write and the array has necessary redundancy to correct it.
The leg is ejected because it runs up the rdev->read_errors beyond conf->max_nr_stripes. The return status in dm-drypt when there is a data integrity error is -EILSEQ (BLK_STS_PROTECTION).
--- drivers/md/raid5.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/md/raid5.c +2 -1
@@ -2538,7 +2538,8 @@ static void raid5_end_read_request(struct bio * bi)int set_bad =0 ;clear_bit (R5_UPTODATE , &sh->dev[i].flags); -atomic_inc (&rdev->read_errors); +if (!(bi->bi_status ==BLK_STS_PROTECTION )) +atomic_inc (&rdev->read_errors);if (test_bit (R5_ReadRepl, &sh->dev[i].flags)) pr_warn_ratelimited( "md/raid:%s: read error on replacement device (sector %llu on %s).\n",
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 131/185 libertas: Add missing sentinel at end of if_usb.c fw_table
In reply to Greg Kroah-HartmanFrom: Kevin Easton <[email protected]>
[ Upstream commit 764f3f1ecffc434096e0a2b02f1a6cc964a89df6 ]
This sentinel tells the firmware loading process when to stop.
--- drivers/net/wireless/marvell/libertas/if_usb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/marvell/libertas/if_usb.c +2 -1
@@ -49,7 +49,8 @@ static const struct lbs_fw_table fw_table[] = { { MODEL_8388, "libertas/usb8388_v5.bin", NULL }, { MODEL_8388, "libertas/usb8388.bin", NULL }, { MODEL_8388, "usb8388.bin", NULL }, - { MODEL_8682, "libertas/usb8682.bin", NULL } + { MODEL_8682, "libertas/usb8682.bin", NULL }, + { 0, NULL, NULL } }; static const struct usb_device_id if_usb_table[] = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 132/185 e1000e: add workaround for possible stalled packet
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
[ Upstream commit e5e9a2ecfe780975820e157b922edee715710b66 ]
This works around a possible stalled packet issue, which may occur due to clock recovery from the PCH being too slow, when the LAN is transitioning from K1 at 1G link speed.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=204057
--- drivers/net/ethernet/intel/e1000e/ich8lan.c | 10 ++++++++++ drivers/net/ethernet/intel/e1000e/ich8lan.h | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/e1000e/ich8lan.c +10 -0
@@ -1447,6 +1447,16 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)else phy_reg |=0xFA ;e1e_wphy_locked (hw,I217_PLL_CLOCK_GATE_REG , phy_reg); + +if (speed ==SPEED_1000 ) { + hw->phy.ops.read_reg_locked (hw,HV_PM_CTRL , + &phy_reg); + + phy_reg |=HV_PM_CTRL_K1_CLK_REQ ; + + hw->phy.ops.write_reg_locked (hw,HV_PM_CTRL , + phy_reg); + } } hw->phy.ops.release (hw);
drivers/net/ethernet/intel/e1000e/ich8lan.h +1 -1
@@ -228,7 +228,7 @@/* PHY Power Management Control */ #define HV_PM_CTRL PHY_REG(770, 17) -#define HV_PM_CTRL_PLL_STOP_IN_K1_GIGA 0x100 +#define HV_PM_CTRL_K1_CLK_REQ 0x200#define HV_PM_CTRL_K1_ENABLE 0x4000#define I217_PLL_CLOCK_GATE_REG PHY_REG(772, 28)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 133/185 ALSA: hda - Drop unsol event handler for Intel HDMI codecs
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit f2dbe87c5ac1f88e6007ba1f1374f4bd8a197fb6 ]
We don't need to deal with the unsol events for Intel chips that are tied with the graphics via audio component notifier. Although the presence of the audio component is checked at the beginning of hdmi_unsol_event(), better to short cut by dropping unsol_event ops.
--- sound/pci/hda/patch_hdmi.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
sound/pci/hda/patch_hdmi.c +8 -1
@@ -2555,13 +2555,20 @@ static void i915_pin_cvt_fixup(struct hda_codec *codec,/* precondition and allocation for Intel codecs */ static int alloc_intel_hdmi (struct hda_codec *codec) { +int err; +/* requires i915 binding */ if (!codec->bus->core.audio_component) {codec_info (codec,"No i915 binding for Intel HDMI/DP codec\n" );return -ENODEV ; } -return alloc_generic_hdmi (codec); + err =alloc_generic_hdmi (codec); +if (err <0 ) +return err; +/* no need to handle unsol events */ + codec->patch_ops.unsol_event =NULL ; +return 0 ; }/* parse and post-process for Intel codecs */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 134/185 drm/amd/powerplay/smu7: enforce minimal VBITimeout (v2)
In reply to Greg Kroah-HartmanFrom: Ahzo <[email protected]>
[ Upstream commit f659bb6dae58c113805f92822e4c16ddd3156b79 ]
This fixes screen corruption/flickering on 75 Hz displays.
v2: make print statement debug only (Alex)
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102646
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +5 -0
@@ -3972,6 +3972,11 @@ static int smu7_program_display_gap(struct pp_hwmgr *hwmgr) data->frame_time_x2 = frame_time_in_us *2 /100 ; +if (data->frame_time_x2 <280 ) { +pr_debug ("%s: enforce minimal VBITimeout: %d -> 280\n" , __func__, data->frame_time_x2); + data->frame_time_x2 =280 ; + } + display_gap2 = pre_vbi_time_in_us * (ref_clock /100 );cgs_write_ind_register (hwmgr->device,CGS_IND_REG__SMC , ixCG_DISPLAY_GAP_CNTL2, display_gap2);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 135/185 media: ttusb-dec: Fix info-leak in ttusb_dec_send_command()
In reply to Greg Kroah-HartmanFrom: Tomas Bortoli <[email protected]>
[ Upstream commit a10feaf8c464c3f9cfdd3a8a7ce17e1c0d498da1 ]
The function at issue does not always initialize each byte allocated for 'b' and can therefore leak uninitialized memory to a USB device in the call to usb_bulk_msg()
Use kzalloc() instead of kmalloc()
--- drivers/media/usb/ttusb-dec/ttusb_dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/usb/ttusb-dec/ttusb_dec.c +1 -1
@@ -330,7 +330,7 @@ static int ttusb_dec_send_command(struct ttusb_dec *dec, const u8 command,dprintk ("%s\n" , __func__); - b =kmalloc (COMMAND_PACKET_SIZE +4 ,GFP_KERNEL ); + b =kzalloc (COMMAND_PACKET_SIZE +4 ,GFP_KERNEL );if (!b)return -ENOMEM ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 136/185 ALSA: hda/realtek - Blacklist PC beep for Lenovo ThinkCentre M73/93
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit 051c78af14fcd74a22b5af45548ad9d588247cc7 ]
Lenovo ThinkCentre M73 and M93 don't seem to have a proper beep although the driver tries to probe and set up blindly. Blacklist these machines for suppressing the beep creation.
--- sound/pci/hda/patch_realtek.c | 3 +++ 1 file changed, 3 insertions(+)
sound/pci/hda/patch_realtek.c +3 -0
@@ -977,6 +977,9 @@ static const struct snd_pci_quirk beep_white_list[] = {SND_PCI_QUIRK (0x1043 ,0x834a ,"EeePC" ,1 ),SND_PCI_QUIRK (0x1458 ,0xa002 ,"GA-MA790X" ,1 ),SND_PCI_QUIRK (0x8086 ,0xd613 ,"Intel" ,1 ), +/* blacklist -- no beep available */ +SND_PCI_QUIRK (0x17aa ,0x309e ,"Lenovo ThinkCentre M73" ,0 ), + SND_PCI_QUIRK(0x17aa, 0x30a3, "Lenovo ThinkCentre M93", 0), {} };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 137/185 btrfs: extent-tree: Make sure we only allocate extents from block groups with the same type
In reply to Greg Kroah-HartmanFrom: Qu Wenruo <[email protected]>
[ Upstream commit 2a28468e525f3924efed7f29f2bc5a2926e7e19a ]
[BUG]
With fuzzed image and MIXED_GROUPS super flag, we can hit the following BUG_ON():
kernel BUG at fs/btrfs/delayed-ref.c:491!
invalid opcode: 0000 [#1] PREEMPT SMP NOPTI
CPU: 0 PID: 1849 Comm: sync Tainted: G O 5.2.0-custom #27 RIP: 0010:update_existing_head_ref.cold+0x44/0x46 [btrfs] Call Trace: add_delayed_ref_head+0x20c/0x2d0 [btrfs] btrfs_add_delayed_tree_ref+0x1fc/0x490 [btrfs] btrfs_free_tree_block+0x123/0x380 [btrfs] __btrfs_cow_block+0x435/0x500 [btrfs] btrfs_cow_block+0x110/0x240 [btrfs] btrfs_search_slot+0x230/0xa00 [btrfs] ? __lock_acquire+0x105e/0x1e20 btrfs_insert_empty_items+0x67/0xc0 [btrfs] alloc_reserved_file_extent+0x9e/0x340 [btrfs] __btrfs_run_delayed_refs+0x78e/0x1240 [btrfs] ? kvm_clock_read+0x18/0x30 ? __sched_clock_gtod_offset+0x21/0x50 btrfs_run_delayed_refs.part.0+0x4e/0x180 [btrfs] btrfs_run_delayed_refs+0x23/0x30 [btrfs] btrfs_commit_transaction+0x53/0x9f0 [btrfs] btrfs_sync_fs+0x7c/0x1c0 [btrfs] ? __ia32_sys_fdatasync+0x20/0x20 sync_fs_one_sb+0x23/0x30 iterate_supers+0x95/0x100 ksys_sync+0x62/0xb0 __ia32_sys_sync+0xe/0x20 do_syscall_64+0x65/0x240 entry_SYSCALL_64_after_hwframe+0x49/0xbe
[CAUSE]
This situation is caused by several factors:
- Fuzzed image
The extent tree of this fs missed one backref for extent tree root. So we can allocated space from that slot.
- MIXED_BG feature
Super block has MIXED_BG flag.
- No mixed block groups exists
All block groups are just regular ones.
This makes data space_info->block_groups[] contains metadata block groups. And when we reserve space for data, we can use space in metadata block group.
Then we hit the following file operations:
- fallocate
We need to allocate data extents.
find_free_extent() choose to use the metadata block to allocate space from, and choose the space of extent tree root, since its backref is missing.
This generate one delayed ref head with is_data = 1.
- extent tree update
We need to update extent tree at run_delayed_ref time.
This generate one delayed ref head with is_data = 0, for the same bytenr of old extent tree root.
Then we trigger the BUG_ON().
[FIX]
The quick fix here is to check block_group->flags before using it.
The problem can only happen for MIXED_GROUPS fs. Regular filesystems won't have space_info with DATA|METADATA flag, and no way to hit the bug.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=203255
--- fs/btrfs/extent-tree.c | 8 ++++++++ 1 file changed, 8 insertions(+)
fs/btrfs/extent-tree.c +8 -0
@@ -7706,6 +7706,14 @@ static noinline int find_free_extent(struct btrfs_fs_info *fs_info,*/ if ((flags & extra) && !(block_group->flags & extra)) goto loop; + +/* +* This block group has different flags than we want. +* It's possible that we have MIXED_GROUP flag but no +* block group is mixed. Just skip such block group. +*/ +btrfs_release_block_group (block_group, delalloc); +continue ; } have_block_group:
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 138/185 media: omap3isp: Set device on omap3isp subdevs
In reply to Greg Kroah-HartmanFrom: Sakari Ailus <[email protected]>
[ Upstream commit e9eb103f027725053a4b02f93d7f2858b56747ce ]
The omap3isp driver registered subdevs without the dev field being set. Do that now.
--- drivers/media/platform/omap3isp/ispccdc.c | 1 + drivers/media/platform/omap3isp/ispccp2.c | 1 + drivers/media/platform/omap3isp/ispcsi2.c | 1 + drivers/media/platform/omap3isp/isppreview.c | 1 + drivers/media/platform/omap3isp/ispresizer.c | 1 + drivers/media/platform/omap3isp/ispstat.c | 2 ++ 6 files changed, 7 insertions(+)
drivers/media/platform/omap3isp/ispccdc.c +1 -0
@@ -2605,6 +2605,7 @@ int omap3isp_ccdc_register_entities(struct isp_ccdc_device *ccdc,int ret;/* Register the subdev and video node. */ + ccdc->subdev.dev = vdev->mdev->dev; ret =v4l2_device_register_subdev (vdev, &ccdc->subdev);if (ret <0 ) goto error;
drivers/media/platform/omap3isp/ispccp2.c +1 -0
@@ -1034,6 +1034,7 @@ int omap3isp_ccp2_register_entities(struct isp_ccp2_device *ccp2,int ret;/* Register the subdev and video nodes. */ + ccp2->subdev.dev = vdev->mdev->dev; ret =v4l2_device_register_subdev (vdev, &ccp2->subdev);if (ret <0 ) goto error;
drivers/media/platform/omap3isp/ispcsi2.c +1 -0
@@ -1201,6 +1201,7 @@ int omap3isp_csi2_register_entities(struct isp_csi2_device *csi2,int ret;/* Register the subdev and video nodes. */ + csi2->subdev.dev = vdev->mdev->dev; ret =v4l2_device_register_subdev (vdev, &csi2->subdev);if (ret <0 ) goto error;
drivers/media/platform/omap3isp/isppreview.c +1 -0
@@ -2228,6 +2228,7 @@ int omap3isp_preview_register_entities(struct isp_prev_device *prev,int ret;/* Register the subdev and video nodes. */ + prev->subdev.dev = vdev->mdev->dev; ret =v4l2_device_register_subdev (vdev, &prev->subdev);if (ret <0 ) goto error;
drivers/media/platform/omap3isp/ispresizer.c +1 -0
@@ -1684,6 +1684,7 @@ int omap3isp_resizer_register_entities(struct isp_res_device *res,int ret;/* Register the subdev and video nodes. */ + res->subdev.dev = vdev->mdev->dev; ret =v4l2_device_register_subdev (vdev, &res->subdev);if (ret <0 ) goto error;
drivers/media/platform/omap3isp/ispstat.c +2 -0
@@ -1018,6 +1018,8 @@ void omap3isp_stat_unregister_entities(struct ispstat *stat)int omap3isp_stat_register_entities (struct ispstat *stat,struct v4l2_device *vdev) { + stat->subdev.dev = vdev->mdev->dev; +return v4l2_device_register_subdev (vdev, &stat->subdev); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 139/185 PM / devfreq: passive: fix compiler warning
In reply to Greg Kroah-HartmanFrom: MyungJoo Ham <[email protected]>
[ Upstream commit 0465814831a926ce2f83e8f606d067d86745234e ]
The recent commit of
PM / devfreq: passive: Use non-devm notifiers had incurred compiler warning, "unused variable 'dev'".
--- drivers/devfreq/governor_passive.c | 1 - 1 file changed, 1 deletion(-)
drivers/devfreq/governor_passive.c +0 -1
@@ -152,7 +152,6 @@ static int devfreq_passive_notifier_call(struct notifier_block *nb,static int devfreq_passive_event_handler (struct devfreq *devfreq,unsigned int event,void *data) { -struct device *dev = devfreq->dev.parent;struct devfreq_passive_data *p_data = (struct devfreq_passive_data *)devfreq->data;struct devfreq *parent = (struct devfreq *)p_data->parent;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 140/185 ALSA: firewire-tascam: handle error code when getting current source of clock
In reply to Greg Kroah-HartmanFrom: Takashi Sakamoto <[email protected]>
commit 2617120f4de6d0423384e0e86b14c78b9de84d5a upstream.
The return value of snd_tscm_stream_get_clock() is ignored. This commit checks the value and handle error.
--- sound/firewire/tascam/tascam-pcm.c | 3 +++ 1 file changed, 3 insertions(+)
sound/firewire/tascam/tascam-pcm.c +3 -0
@@ -57,6 +57,9 @@ static int pcm_open(struct snd_pcm_subst goto err_locked; err =snd_tscm_stream_get_clock (tscm, &clock); +if (err <0 ) + goto err_locked; +if (clock !=SND_TSCM_CLOCK_INTERNAL ||amdtp_stream_pcm_running (&tscm->rx_stream) ||amdtp_stream_pcm_running (&tscm->tx_stream)) {
Greg Kroah-Hartman
maintainerPATCH 141/185 ALSA: firewire-tascam: check intermediate state of clock status and retry
In reply to Greg Kroah-HartmanFrom: Takashi Sakamoto <[email protected]>
commit e1a00b5b253a4f97216b9a33199a863987075162 upstream.
2 bytes in MSB of register for clock status is zero during intermediate state after changing status of sampling clock in models of TASCAM FireWire series. The duration of this state differs depending on cases. During the state, it's better to retry reading the register for current status of the clock.
In current implementation, the intermediate state is checked only when getting current sampling transmission frequency, then retry reading. This care is required for the other operations to read the register.
This commit moves the codes of check and retry into helper function commonly used for operations to read the register.
--- sound/firewire/tascam/tascam-stream.c | 42 ++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 14 deletions(-)
sound/firewire/tascam/tascam-stream.c +28 -14
@@ -9,20 +9,37 @@#include <linux/delay.h> #include "tascam.h" +#define CLOCK_STATUS_MASK 0xffff0000 +#define CLOCK_CONFIG_MASK 0x0000ffff +#define CALLBACK_TIMEOUT 500static int get_clock (struct snd_tscm *tscm,u32 *data) { +int trial =0 ;__be32 reg;int err; - err =snd_fw_transaction (tscm->unit,TCODE_READ_QUADLET_REQUEST , -TSCM_ADDR_BASE +TSCM_OFFSET_CLOCK_STATUS , - ®,sizeof (reg),0 ); -if (err >=0 ) +while (trial++ <5 ) { + err =snd_fw_transaction (tscm->unit,TCODE_READ_QUADLET_REQUEST , +TSCM_ADDR_BASE +TSCM_OFFSET_CLOCK_STATUS , + ®,sizeof (reg),0 ); +if (err <0 ) +return err; + *data =be32_to_cpu (reg); +if (*data &CLOCK_STATUS_MASK ) +break ; + +// In intermediate state after changing clock status. +msleep (50 ); + } -return err; +// Still in the intermediate state. +if (trial >=5 ) +return -EAGAIN ; + +return 0 ; } static int set_clock(struct snd_tscm *tscm, unsigned int rate,
@@ -35,7 +52,7 @@ static int set_clock(struct snd_tscm *ts err =get_clock (tscm, &data);if (err <0 )return err; - data &=0x0000ffff ; + data &=CLOCK_CONFIG_MASK ;if (rate >0 ) { data &=0x000000ff ;
@@ -80,17 +97,14 @@ static int set_clock(struct snd_tscm *tsint snd_tscm_stream_get_rate (struct snd_tscm *tscm,unsigned int *rate) { -u32 data =0x0 ; -unsigned int trials =0 ; +u32 data;int err; -while (data ==0x0 || trials++ <5 ) { - err =get_clock (tscm, &data); -if (err <0 ) -return err; + err =get_clock (tscm, &data); +if (err <0 ) +return err; - data = (data &0xff000000 ) >>24 ; - } + data = (data &0xff000000 ) >>24 ;/* Check base rate. */ if ((data &0x0f ) ==0x01 )
Greg Kroah-Hartman
maintainerPATCH 142/185 scsi: scsi_dh_rdac: zero cdb in send_mode_select()
In reply to Greg Kroah-HartmanFrom: Martin Wilck <[email protected]>
commit 57adf5d4cfd3198aa480e7c94a101fc8c4e6109d upstream.
cdb in send_mode_select() is not zeroed and is only partially filled in rdac_failover_get(), which leads to some random data getting to the device. Users have reported storage responding to such commands with INVALID FIELD IN CDB. Code before commit 327825574132 was not affected, as it called blk_rq_set_block_pc().
Fix this by zeroing out the cdb first.
Identified & fix proposed by HPE.
--- drivers/scsi/device_handler/scsi_dh_rdac.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/scsi/device_handler/scsi_dh_rdac.c +2 -0
@@ -546,6 +546,8 @@ static void send_mode_select(struct workspin_unlock (&ctlr->ms_lock); retry: +memset (cdb,0 ,sizeof (cdb)); + data_size =rdac_failover_get (ctlr, &list, cdb); RDAC_LOG(RDAC_LOG_FAILOVER, sdev, "array %s, ctlr %d, "
Greg Kroah-Hartman
maintainerPATCH 143/185 printk: Do not lose last line in kmsg buffer dump
In reply to Greg Kroah-HartmanFrom: Vincent Whitchurch <[email protected]>
commit c9dccacfccc72c32692eedff4a27a4b0833a2afd upstream.
kmsg_dump_get_buffer() is supposed to select all the youngest log messages which fit into the provided buffer. It determines the correct start index by using msg_print_text() with a NULL buffer to calculate the size of each entry. However, when performing the actual writes, msg_print_text() only writes the entry to the buffer if the written len is lesser than the size of the buffer. So if the lengths of the selected youngest log messages happen to precisely fill up the provided buffer, the last log message is not included.
We don't want to modify msg_print_text() to fill up the buffer and start returning a length which is equal to the size of the buffer, since callers of its other users, such as kmsg_dump_get_line(), depend upon the current behaviour.
Instead, fix kmsg_dump_get_buffer() to compensate for this.
For example, with the following two final prints:
[ 6.427502] AAAAAAAAAAAAA [ 6.427769] BBBBBBBB12345
A dump of a 64-byte buffer filled by kmsg_dump_get_buffer(), before this patch:
00000000: 3c 30 3e 5b 20 20 20 20 36 2e 35 32 32 31 39 37 <0>[ 6.522197 00000010: 5d 20 41 41 41 41 41 41 41 41 41 41 41 41 41 0a ] AAAAAAAAAAAAA. 00000020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 00000030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
After this patch:
00000000: 3c 30 3e 5b 20 20 20 20 36 2e 34 35 36 36 37 38 <0>[ 6.456678 00000010: 5d 20 42 42 42 42 42 42 42 42 31 32 33 34 35 0a ] BBBBBBBB12345. 00000020: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 00000030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
--- kernel/printk/printk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/printk/printk.c +1 -1
@@ -3189,7 +3189,7 @@ bool kmsg_dump_get_buffer(struct kmsg_du/* move first record forward until length fits into the buffer */ seq = dumper->cur_seq; idx = dumper->cur_idx; -while (l > size && seq < dumper->next_seq) { +while (l >= size && seq < dumper->next_seq) {struct printk_log *msg =log_from_idx (idx); l -=msg_print_text (msg, true,NULL ,0 );
Greg Kroah-Hartman
maintainerPATCH 144/185 IB/hfi1: Define variables as unsigned long to fix KASAN warning
In reply to Greg Kroah-HartmanFrom: Ira Weiny <[email protected]>
commit f8659d68e2bee5b86a1beaf7be42d942e1fc81f4 upstream.
Define the working variables to be unsigned long to be compatible with for_each_set_bit and change types as needed.
While we are at it remove unused variables from a couple of functions.
This was found because of the following KASAN warning:
==================================================================
BUG: KASAN: stack-out-of-bounds in find_first_bit+0x19/0x70
Read of size 8 at addr ffff888362d778d0 by task kworker/u308:2/1889
CPU: 21 PID: 1889 Comm: kworker/u308:2 Tainted: G W 5.3.0-rc2-mm1+ #2
Hardware name: Intel Corporation W2600CR/W2600CR, BIOS SE5C600.86B.02.04.0003.102320141138 10/23/2014
Workqueue: ib-comp-unb-wq ib_cq_poll_work [ib_core]
Call Trace:
dump_stack+0x9a/0xf0
? find_first_bit+0x19/0x70
print_address_description+0x6c/0x332
? find_first_bit+0x19/0x70
? find_first_bit+0x19/0x70
__kasan_report.cold.6+0x1a/0x3b
? find_first_bit+0x19/0x70
kasan_report+0xe/0x12
find_first_bit+0x19/0x70
pma_get_opa_portstatus+0x5cc/0xa80 [hfi1]
? ret_from_fork+0x3a/0x50
? pma_get_opa_port_ectrs+0x200/0x200 [hfi1]
? stack_trace_consume_entry+0x80/0x80
hfi1_process_mad+0x39b/0x26c0 [hfi1]
? __lock_acquire+0x65e/0x21b0
? clear_linkup_counters+0xb0/0xb0 [hfi1]
? check_chain_key+0x1d7/0x2e0
? lock_downgrade+0x3a0/0x3a0
? match_held_lock+0x2e/0x250
ib_mad_recv_done+0x698/0x15e0 [ib_core]
? clear_linkup_counters+0xb0/0xb0 [hfi1]
? ib_mad_send_done+0xc80/0xc80 [ib_core]
? mark_held_locks+0x79/0xa0
? _raw_spin_unlock_irqrestore+0x44/0x60
? rvt_poll_cq+0x1e1/0x340 [rdmavt]
__ib_process_cq+0x97/0x100 [ib_core]
ib_cq_poll_work+0x31/0xb0 [ib_core]
process_one_work+0x4ee/0xa00
? pwq_dec_nr_in_flight+0x110/0x110
? do_raw_spin_lock+0x113/0x1d0
worker_thread+0x57/0x5a0
? process_one_work+0xa00/0xa00
kthread+0x1bb/0x1e0
? kthread_create_on_node+0xc0/0xc0
ret_from_fork+0x3a/0x50
The buggy address belongs to the page:
page:ffffea000d8b5dc0 refcount:0 mapcount:0 mapping:0000000000000000 index:0x0
flags: 0x17ffffc0000000()
raw: 0017ffffc0000000 0000000000000000 ffffea000d8b5dc8 0000000000000000
raw: 0000000000000000 0000000000000000 00000000ffffffff 0000000000000000
page dumped because: kasan: bad access detected addr ffff888362d778d0 is located in stack of task kworker/u308:2/1889 at offset 32 in frame:
pma_get_opa_portstatus+0x0/0xa80 [hfi1]
this frame has 1 object:
[32, 36) 'vl_select_mask'
Memory state around the buggy address:
ffff888362d77780: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
ffff888362d77800: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
>ffff888362d77880: 00 00 00 00 00 00 f1 f1 f1 f1 04 f2 f2 f2 00 00
^
ffff888362d77900: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
ffff888362d77980: 00 00 00 00 00 00 00 00 f1 f1 f1 f1 04 f2 f2 f2==================================================================
--- drivers/infiniband/hw/hfi1/mad.c | 45 ++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 26 deletions(-)
drivers/infiniband/hw/hfi1/mad.c +19 -26
@@ -2311,7 +2311,7 @@ struct opa_port_status_req {__be32 vl_select_mask; }; -#define VL_MASK_ALL 0x000080ff +#define VL_MASK_ALL 0x00000000000080ffULstruct opa_port_status_rsp {__u8 port_num;
@@ -2610,15 +2610,14 @@ static int pma_get_opa_classportinfo(str }static void a0_portstatus (struct hfi1_pportdata *ppd, -struct opa_port_status_rsp *rsp,u32 vl_select_mask) +struct opa_port_status_rsp *rsp) {if (!is_bx (ppd->dd)) {unsigned long vl;u64 sum_vl_xmit_wait =0 ; -u32 vl_all_mask =VL_MASK_ALL ; +unsigned long vl_all_mask =VL_MASK_ALL ; -for_each_set_bit (vl, (unsigned long *)&(vl_all_mask), -8 *sizeof (vl_all_mask)) { +for_each_set_bit (vl, &vl_all_mask,BITS_PER_LONG ) {u64 tmp = sum_vl_xmit_wait +read_port_cntr (ppd,C_TX_WAIT_VL ,idx_from_vl (vl));
@@ -2642,12 +2641,12 @@ static int pma_get_opa_portstatus(struct (struct opa_port_status_req *)pmp->data;struct hfi1_devdata *dd =dd_from_ibdev (ibdev);struct opa_port_status_rsp *rsp; -u32 vl_select_mask =be32_to_cpu (req->vl_select_mask); +unsigned long vl_select_mask =be32_to_cpu (req->vl_select_mask);unsigned long vl;size_t response_data_size;u32 nports =be32_to_cpu (pmp->mad_hdr.attr_mod) >>24 ;u8 port_num = req->port_num; -u8 num_vls =hweight32 (vl_select_mask); +u8 num_vls =hweight64 (vl_select_mask);struct _vls_pctrs *vlinfo;struct hfi1_ibport *ibp =to_iport (ibdev, port);struct hfi1_pportdata *ppd =ppd_from_ibp (ibp);
@@ -2681,7 +2680,7 @@ static int pma_get_opa_portstatus(structhfi1_read_link_quality (dd, &rsp->link_quality_indicator); - rsp->vl_select_mask =cpu_to_be32 (vl_select_mask); + rsp->vl_select_mask =cpu_to_be32 ((u32 )vl_select_mask); rsp->port_xmit_data =cpu_to_be64 (read_dev_cntr (dd,C_DC_XMIT_FLITS ,CNTR_INVALID_VL )); rsp->port_rcv_data = cpu_to_be64(read_dev_cntr(dd, C_DC_RCV_FLITS,
@@ -2744,8 +2743,7 @@ static int pma_get_opa_portstatus(struct* So in the for_each_set_bit() loop below, we don't need * any additional checks for vl. */ -for_each_set_bit (vl, (unsigned long *)&(vl_select_mask), -8 *sizeof (vl_select_mask)) { +for_each_set_bit (vl, &vl_select_mask,BITS_PER_LONG ) {memset (vlinfo,0 ,sizeof (*vlinfo)); tmp =read_dev_cntr (dd,C_DC_RX_FLIT_VL ,idx_from_vl (vl));
@@ -2782,7 +2780,7 @@ static int pma_get_opa_portstatus(struct vfi++; } -a0_portstatus (ppd, rsp, vl_select_mask); +a0_portstatus (ppd, rsp);if (resp_len) *resp_len += response_data_size;
@@ -2829,16 +2827,14 @@ static u64 get_error_counter_summary(strreturn error_counter_summary; } -static void a0_datacounters (struct hfi1_pportdata *ppd,struct _port_dctrs *rsp, -u32 vl_select_mask) +static void a0_datacounters (struct hfi1_pportdata *ppd,struct _port_dctrs *rsp) {if (!is_bx (ppd->dd)) {unsigned long vl;u64 sum_vl_xmit_wait =0 ; -u32 vl_all_mask =VL_MASK_ALL ; +unsigned long vl_all_mask =VL_MASK_ALL ; -for_each_set_bit (vl, (unsigned long *)&(vl_all_mask), -8 *sizeof (vl_all_mask)) { +for_each_set_bit (vl, &vl_all_mask,BITS_PER_LONG ) {u64 tmp = sum_vl_xmit_wait +read_port_cntr (ppd,C_TX_WAIT_VL ,idx_from_vl (vl));
@@ -2894,7 +2890,7 @@ static int pma_get_opa_datacounters(struu64 port_mask;u8 port_num;unsigned long vl; -u32 vl_select_mask; +unsigned long vl_select_mask;int vfi; num_ports =be32_to_cpu (pmp->mad_hdr.attr_mod) >>24 ;
@@ -2963,8 +2959,7 @@ static int pma_get_opa_datacounters(stru* So in the for_each_set_bit() loop below, we don't need * any additional checks for vl. */ -for_each_set_bit (vl, (unsigned long *)&(vl_select_mask), -8 *sizeof (req->vl_select_mask)) { +for_each_set_bit (vl, &vl_select_mask,BITS_PER_LONG ) {memset (vlinfo,0 ,sizeof (*vlinfo)); rsp->vls[vfi].port_vl_xmit_data =
@@ -3007,7 +3002,7 @@ static int pma_get_opa_datacounters(stru vfi++; } -a0_datacounters (ppd, rsp, vl_select_mask); +a0_datacounters (ppd, rsp);if (resp_len) *resp_len += response_data_size;
@@ -3102,7 +3097,7 @@ static int pma_get_opa_porterrors(structstruct _vls_ectrs *vlinfo;unsigned long vl;u64 port_mask, tmp; -u32 vl_select_mask; +unsigned long vl_select_mask;int vfi; req = (struct opa_port_error_counters64_msg *)pmp->data;
@@ -3161,8 +3156,7 @@ static int pma_get_opa_porterrors(struct vlinfo = &rsp->vls[0 ]; vfi =0 ; vl_select_mask =be32_to_cpu (req->vl_select_mask); -for_each_set_bit (vl, (unsigned long *)&(vl_select_mask), -8 *sizeof (req->vl_select_mask)) { +for_each_set_bit (vl, &vl_select_mask,BITS_PER_LONG ) {memset (vlinfo,0 ,sizeof (*vlinfo)); rsp->vls[vfi].port_vl_xmit_discards = cpu_to_be64(read_port_cntr(ppd, C_SW_XMIT_DSCD_VL,
@@ -3372,7 +3366,7 @@ static int pma_set_opa_portstatus(structu32 nports =be32_to_cpu (pmp->mad_hdr.attr_mod) >>24 ;u64 portn =be64_to_cpu (req->port_select_mask[3 ]);u32 counter_select =be32_to_cpu (req->counter_select_mask); -u32 vl_select_mask =VL_MASK_ALL ;/* clear all per-vl cnts */ +unsigned long vl_select_mask =VL_MASK_ALL ;/* clear all per-vl cnts */ unsigned long vl;if ((nports !=1 ) || (portn !=1 << port)) {
@@ -3464,8 +3458,7 @@ static int pma_set_opa_portstatus(structif (counter_select &CS_UNCORRECTABLE_ERRORS )write_dev_cntr (dd,C_DC_UNC_ERR ,CNTR_INVALID_VL ,0 ); -for_each_set_bit (vl, (unsigned long *)&(vl_select_mask), -8 *sizeof (vl_select_mask)) { +for_each_set_bit (vl, &vl_select_mask,BITS_PER_LONG ) {if (counter_select &CS_PORT_XMIT_DATA )write_port_cntr (ppd,C_TX_FLIT_VL ,idx_from_vl (vl),0 );
Greg Kroah-Hartman
maintainerPATCH 145/185 randstruct: Check member structs in is_pure_ops_struct()
In reply to Greg Kroah-HartmanFrom: Joonwon Kang <[email protected]>
commit 60f2c82ed20bde57c362e66f796cf9e0e38a6dbb upstream.
While no uses in the kernel triggered this case, it was possible to have a false negative where a struct contains other structs which contain only function pointers because of unreachable code in is_pure_ops_struct().
--- scripts/gcc-plugins/randomize_layout_plugin.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
scripts/gcc-plugins/randomize_layout_plugin.c +5 -5
@@ -443,13 +443,13 @@ static int is_pure_ops_struct(const_treeif (node == fieldtype)continue ; -if (!is_fptr (fieldtype)) -return 0 ; - -if (code !=RECORD_TYPE && code !=UNION_TYPE ) +if (code ==RECORD_TYPE || code ==UNION_TYPE ) { +if (!is_pure_ops_struct (fieldtype)) +return 0 ;continue ; + } -if (!is_pure_ops_struct (fieldtype)) +if (!is_fptr (fieldtype))return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 146/185 ALSA: hda/realtek - Fixup mute led on HP Spectre x360
In reply to Greg Kroah-HartmanFrom: Tom Briden <[email protected]>
[ Upstream commit 7f783bd5e215a014a3c98df64bef24c2dc736def ]
This patch adds the mute LED control for HP Spectre x360 Kabylake model. The mute LED is controlled via VREF bits on NID 0x1b, so we need a new fixup function.
Note that this doesn't fix the other issues like the missing speaker output on the machine. They will be addressed by later patches.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=189331
--- sound/pci/hda/patch_realtek.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
sound/pci/hda/patch_realtek.c +19 -0
@@ -3611,6 +3611,19 @@ static void alc269_fixup_hp_mute_led_mic2(struct hda_codec *codec, } } +static void alc269_fixup_hp_mute_led_mic3 (struct hda_codec *codec, +const struct hda_fixup *fix,int action) +{ +struct alc_spec *spec = codec->spec; +if (action ==HDA_FIXUP_ACT_PRE_PROBE ) { + spec->mute_led_polarity =0 ; + spec->mute_led_nid =0x1b ; + spec->gen.vmaster_mute.hook = alc269_fixup_mic_mute_hook; + spec->gen.vmaster_mute_enum =1 ; + codec->power_filter = led_power_filter; + } +} +/* update LED status via GPIO */ static void alc_update_gpio_led (struct hda_codec *codec,unsigned int mask,bool enabled)
@@ -5385,6 +5398,7 @@ enum {ALC269_FIXUP_HP_MUTE_LED ,ALC269_FIXUP_HP_MUTE_LED_MIC1 ,ALC269_FIXUP_HP_MUTE_LED_MIC2 , +ALC269_FIXUP_HP_MUTE_LED_MIC3 ,ALC269_FIXUP_HP_GPIO_LED ,ALC269_FIXUP_HP_GPIO_MIC1_LED , ALC269_FIXUP_HP_LINE1_MIC1_LED,
@@ -5648,6 +5662,10 @@ static const struct hda_fixup alc269_fixups[] = { .type = HDA_FIXUP_FUNC, .v.func = alc269_fixup_hp_mute_led_mic2, }, + [ALC269_FIXUP_HP_MUTE_LED_MIC3] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc269_fixup_hp_mute_led_mic3, + }, [ALC269_FIXUP_HP_GPIO_LED] = { .type = HDA_FIXUP_FUNC, .v.func = alc269_fixup_hp_gpio_led,
@@ -6502,6 +6520,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x103c ,0x2337 ,"HP" ,ALC269_FIXUP_HP_MUTE_LED_MIC1 ),SND_PCI_QUIRK (0x103c ,0x221c ,"HP EliteBook 755 G2" ,ALC280_FIXUP_HP_HEADSET_MIC ),SND_PCI_QUIRK (0x103c ,0x8256 ,"HP" ,ALC221_FIXUP_HP_FRONT_MIC ), +SND_PCI_QUIRK (0x103c ,0x827e ,"HP x360" ,ALC269_FIXUP_HP_MUTE_LED_MIC3 ),SND_PCI_QUIRK (0x103c ,0x82bf ,"HP" ,ALC221_FIXUP_HP_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x103c ,0x82c0 ,"HP" ,ALC221_FIXUP_HP_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC),
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 147/185 fuse: fix missing unlock_page in fuse_writepage()
In reply to Greg Kroah-HartmanFrom: Vasily Averin <[email protected]>
commit d5880c7a8620290a6c90ced7a0e8bd0ad9419601 upstream.
unlock_page() was missing in case of an already in-flight write against the same page.
--- fs/fuse/file.c | 1 + 1 file changed, 1 insertion(+)
fs/fuse/file.c +1 -0
@@ -1699,6 +1699,7 @@ static int fuse_writepage(struct page *pWARN_ON (wbc->sync_mode ==WB_SYNC_ALL );redirty_page_for_writepage (wbc, page); +unlock_page (page);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 148/185 parisc: Disable HP HSC-PCI Cards to prevent kernel crash
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
commit 5fa1659105fac63e0f3c199b476025c2e04111ce upstream.
The HP Dino PCI controller chip can be used in two variants: as on-board controller (e.g. in B160L), or on an Add-On card ("Card-Mode") to bridge PCI components to systems without a PCI bus, e.g. to a HSC/GSC bus. One such Add-On card is the HP HSC-PCI Card which has one or more DEC Tulip PCI NIC chips connected to the on-card Dino PCI controller.
Dino in Card-Mode has a big disadvantage: All PCI memory accesses need to go through the DINO_MEM_DATA register, so Linux drivers will not be able to use the ioremap() function. Without ioremap() many drivers will not work, one example is the tulip driver which then simply crashes the kernel if it tries to access the ports on the HP HSC card.
This patch disables the HP HSC card if it finds one, and as such fixes the kernel crash on a HP D350/2 machine.
--- drivers/parisc/dino.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
drivers/parisc/dino.c +24 -0
@@ -160,6 +160,15 @@ struct dino_device (struct dino_device *)__pdata; }) +/* Check if PCI device is behind a Card-mode Dino. */ +static int pci_dev_is_behind_card_dino (struct pci_dev *dev) +{ +struct dino_device *dino_dev; + + dino_dev =DINO_DEV (parisc_walk_tree (dev->bus->bridge)); +return is_card_dino (&dino_dev->hba.dev->id); +} +/* * Dino Configuration Space Accessor Functions */
@@ -442,6 +451,21 @@ static void quirk_cirrus_cardbus(struct }DECLARE_PCI_FIXUP_ENABLE (PCI_VENDOR_ID_CIRRUS ,PCI_DEVICE_ID_CIRRUS_6832 , quirk_cirrus_cardbus ); +#ifdef CONFIG_TULIP +static void pci_fixup_tulip (struct pci_dev *dev) +{ +if (!pci_dev_is_behind_card_dino (dev)) +return ; +if (!(pci_resource_flags (dev,1 ) &IORESOURCE_MEM )) +return ; +pr_warn ("%s: HP HSC-PCI Cards with card-mode Dino not yet supported.\n" , +pci_name (dev)); +/* Disable this card by zeroing the PCI resources */ +memset (&dev->resource[0 ],0 ,sizeof (dev->resource[0 ])); +memset (&dev->resource[1 ],0 ,sizeof (dev->resource[1 ])); +} +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_DEC ,PCI_ANY_ID , pci_fixup_tulip); +#endif /* CONFIG_TULIP */ static void __init dino_bios_init (void )
Greg Kroah-Hartman
maintainerPATCH 149/185 x86/retpolines: Fix up backport of a9d57ef15cbe
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
Commit a9d57ef15cbe ("x86/retpolines: Disable switch jump tables when retpolines are enabled") added -fno-jump-tables to workaround a GCC issue while deliberately avoiding adding this flag when CONFIG_CC_IS_CLANG is set, which is defined by the kconfig system when CC=clang is provided.
However, this symbol was added in 4.18 in commit 469cb7376c06 ("kconfig:
add CC_IS_CLANG and CLANG_VERSION") so it is always undefined in 4.14, meaning -fno-jump-tables gets added when using Clang.
Fix this up by using the equivalent $(cc-name) comparison, which matches what upstream did until commit 076f421da5d4 ("kbuild: replace cc-name test with CONFIG_CC_IS_CLANG").
--- arch/x86/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/Makefile +1 -1
@@ -249,7 +249,7 @@ ifdef CONFIG_RETPOLINE # retpoline builds, however, gcc does not for x86. This has # only been fixed starting from gcc stable version 8.4.0 and # onwards, but not for older ones. See gcc bug #86952. - ifndef CONFIG_CC_IS_CLANG + ifneq ($(cc-name), clang) KBUILD_CFLAGS += $(call cc-option,-fno-jump-tables) endif endif
Greg Kroah-Hartman
maintainerPATCH 150/185 KVM: x86: always stop emulation on page fault
In reply to Greg Kroah-HartmanFrom: Jan Dakinevich <[email protected]>
commit 8530a79c5a9f4e29e6ffb35ec1a79d81f4968ec8 upstream.
inject_emulated_exception() returns true if and only if nested page fault happens. However, page fault can come from guest page tables walk, either nested or not nested. In both cases we should stop an attempt to read under RIP and give guest to step over its own page fault handler.
This is also visible when an emulated instruction causes a #GP fault and the VMware backdoor is enabled. To handle the VMware backdoor, KVM intercepts #GP faults; with only the next patch applied, x86_emulate_instruction() injects a #GP but returns EMULATE_FAIL
instead of EMULATE_DONE. EMULATE_FAIL causes handle_exception_nmi()
(or gp_interception() for SVM) to re-inject the original #GP because it thinks emulation failed due to a non-VMware opcode. This patch prevents the issue as x86_emulate_instruction() will return EMULATE_DONE after injecting the #GP.
--- arch/x86/kvm/x86.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/kvm/x86.c +3 -1
@@ -5892,8 +5892,10 @@ int x86_emulate_instruction(struct kvm_vif (reexecute_instruction (vcpu, cr2, write_fault_to_spt, emulation_type))return EMULATE_DONE ; -if (ctxt->have_exception &&inject_emulated_exception (vcpu)) +if (ctxt->have_exception) { +inject_emulated_exception (vcpu);return EMULATE_DONE ; + }if (emulation_type &EMULTYPE_SKIP )return EMULATE_FAIL ;return handle_emulation_failure (vcpu);
Greg Kroah-Hartman
maintainerPATCH 151/185 KVM: x86: set ctxt->have_exception in x86_decode_insn()
In reply to Greg Kroah-HartmanFrom: Jan Dakinevich <[email protected]>
commit c8848cee74ff05638e913582a476bde879c968ad upstream.
x86_emulate_instruction() takes into account ctxt->have_exception flag during instruction decoding, but in practice this flag is never set in x86_decode_insn().
--- arch/x86/kvm/emulate.c | 2 ++ arch/x86/kvm/x86.c | 6 ++++++ 2 files changed, 8 insertions(+)
arch/x86/kvm/emulate.c +2 -0
@@ -5298,6 +5298,8 @@ done_prefixes: ctxt->memopp->addr.mem.ea + ctxt->_eip); done: +if (rc ==X86EMUL_PROPAGATE_FAULT ) + ctxt->have_exception = true;return (rc !=X86EMUL_CONTINUE ) ?EMULATION_FAILED :EMULATION_OK ; }
arch/x86/kvm/x86.c +6 -0
@@ -5893,6 +5893,12 @@ int x86_emulate_instruction(struct kvm_v emulation_type))return EMULATE_DONE ;if (ctxt->have_exception) { +/* +* #UD should result in just EMULATION_FAILED, and trap-like +* exception should not be encountered during decode. +*/ +WARN_ON_ONCE (ctxt->exception.vector ==UD_VECTOR || +exception_type (ctxt->exception.vector) ==EXCPT_TRAP );inject_emulated_exception (vcpu);return EMULATE_DONE ; }
Greg Kroah-Hartman
maintainerPATCH 152/185 KVM: x86: Manually calculate reserved bits when loading PDPTRS
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
commit 16cfacc8085782dab8e365979356ce1ca87fd6cc upstream.
Manually generate the PDPTR reserved bit mask when explicitly loading PDPTRs. The reserved bits that are being tracked by the MMU reflect the current paging mode, which is unlikely to be PAE paging in the vast majority of flows that use load_pdptrs(), e.g. CR0 and CR4 emulation, __set_sregs(), etc... This can cause KVM to incorrectly signal a bad PDPTR, or more likely, miss a reserved bit check and subsequently fail a VM-Enter due to a bad VMCS.GUEST_PDPTR.
Add a one off helper to generate the reserved bits instead of sharing code across the MMU's calculations and the PDPTR emulation. The PDPTR reserved bits are basically set in stone, and pushing a helper into the MMU's calculation adds unnecessary complexity without improving readability.
Oppurtunistically fix/update the comment for load_pdptrs().
Note, the buggy commit also introduced a deliberate functional change, "Also remove bit 5-6 from rsvd_bits_mask per latest SDM.", which was effectively (and correctly) reverted by commit cd9ae5fe47df ("KVM: x86:
Fix page-tables reserved bits"). A bit of SDM archaeology shows that the SDM from late 2008 had a bug (likely a copy+paste error) where it listed bits 6:5 as AVL and A for PDPTEs used for 4k entries but reserved for 2mb entries. I.e. the SDM contradicted itself, and bits 6:5 are and always have been reserved.
--- arch/x86/kvm/x86.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
arch/x86/kvm/x86.c +8 -3
@@ -563,8 +563,14 @@ static int kvm_read_nested_guest_page(st data, offset, len, access); } +static inline u64 pdptr_rsvd_bits (struct kvm_vcpu *vcpu) +{ +return rsvd_bits (cpuid_maxphyaddr (vcpu),63 ) |rsvd_bits (5 ,8 ) | +rsvd_bits (1 ,2 ); +} +/* -* Load the pae pdptrs. Return true is they are all valid. +* Load the pae pdptrs. Return 1 if they are all valid, 0 otherwise. */ int load_pdptrs (struct kvm_vcpu *vcpu,struct kvm_mmu *mmu,unsigned long cr3) {
@@ -583,8 +589,7 @@ int load_pdptrs(struct kvm_vcpu *vcpu, s }for (i =0 ; i <ARRAY_SIZE (pdpte); ++i) {if ((pdpte[i] &PT_PRESENT_MASK ) && - (pdpte[i] & - vcpu->arch.mmu.guest_rsvd_check.rsvd_bits_mask[0 ][2 ])) { + (pdpte[i] &pdptr_rsvd_bits (vcpu))) { ret =0 ; goto out; }
Greg Kroah-Hartman
maintainerPATCH 153/185 media: sn9c20x: Add MSI MS-1039 laptop to flip_dmi_table
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
commit 7e0bb5828311f811309bed5749528ca04992af2f upstream.
Like a bunch of other MSI laptops the MS-1039 uses a 0c45:627b SN9C201 + OV7660 webcam which is mounted upside down.
Add it to the sn9c20x flip_dmi_table to deal with this.
--- drivers/media/usb/gspca/sn9c20x.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/media/usb/gspca/sn9c20x.c +7 -0
@@ -133,6 +133,13 @@ static const struct dmi_system_id flip_d } }, { + .ident = "MSI MS-1039", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"MICRO-STAR INT'L CO.,LTD." ), + DMI_MATCH(DMI_PRODUCT_NAME, "MS-1039"), + } + }, + { .ident ="MSI MS-1632" , .matches = { DMI_MATCH(DMI_BOARD_VENDOR, "MSI"),
Greg Kroah-Hartman
maintainerPATCH 154/185 binfmt_elf: Do not move brk for INTERP-less ET_EXEC
In reply to Greg Kroah-HartmanFrom: Kees Cook <[email protected]>
commit 7be3cb019db1cbd5fd5ffe6d64a23fefa4b6f229 upstream.
When brk was moved for binaries without an interpreter, it should have been limited to ET_DYN only. In other words, the special case was an ET_DYN that lacks an INTERP, not just an executable that lacks INTERP. The bug manifested for giant static executables, where the brk would end up in the middle of the text area on 32-bit architectures.
--- fs/binfmt_elf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/binfmt_elf.c +2 -1
@@ -1123,7 +1123,8 @@ static int load_elf_binary(struct linux_* (since it grows up, and may collide early with the stack * growing down), and into the unused ELF_ET_DYN_BASE region. */ -if (IS_ENABLED (CONFIG_ARCH_HAS_ELF_RANDOMIZE ) && !interpreter) +if (IS_ENABLED (CONFIG_ARCH_HAS_ELF_RANDOMIZE ) && + loc->elf_ex.e_type ==ET_DYN && !interpreter) current->mm->brk = current->mm->start_brk =ELF_ET_DYN_BASE ;
Greg Kroah-Hartman
maintainerPATCH 155/185 ASoC: Intel: NHLT: Fix debug print format
In reply to Greg Kroah-HartmanFrom: Amadeusz Sławiński <[email protected]>
commit 855a06da37a773fd073d51023ac9d07988c87da8 upstream.
oem_table_id is 8 chars long, so we need to limit it, otherwise it may print some unprintable characters into dmesg.
--- sound/soc/intel/skylake/skl-nhlt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/skylake/skl-nhlt.c +1 -1
@@ -215,7 +215,7 @@ int skl_nhlt_update_topology_bin(structstruct hdac_bus *bus =ebus_to_hbus (&skl->ebus);struct device *dev = bus->dev; -dev_dbg (dev,"oem_id %.6s, oem_table_id %8s oem_revision %d\n" , +dev_dbg (dev,"oem_id %.6s, oem_table_id %.8s oem_revision %d\n" , nhlt->header.oem_id, nhlt->header.oem_table_id, nhlt->header.oem_revision);
Greg Kroah-Hartman
maintainerPATCH 156/185 ASoC: Intel: Skylake: Use correct function to access iomem space
In reply to Greg Kroah-HartmanFrom: Amadeusz Sławiński <[email protected]>
commit 17d29ff98fd4b70e9ccdac5e95e18a087e2737ef upstream.
For copying from __iomem, we should use __ioread32_copy.
reported by sparse:sound/soc/intel/skylake/skl-debug.c:437:34: warning: incorrect type in argument 1 (different address spaces)sound/soc/intel/skylake/skl-debug.c:437:34: expected void [noderef] <asn:2> *tosound/soc/intel/skylake/skl-debug.c:437:34: got unsigned char *sound/soc/intel/skylake/skl-debug.c:437:51: warning: incorrect type in argument 2 (different address spaces)sound/soc/intel/skylake/skl-debug.c:437:51: expected void const *fromsound/soc/intel/skylake/skl-debug.c:437:51: got void [noderef] <asn:2> *[assigned] fw_reg_addr
--- sound/soc/intel/skylake/skl-debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/skylake/skl-debug.c +1 -1
@@ -196,7 +196,7 @@ static ssize_t fw_softreg_read(struct fimemset (d->fw_read_buff,0 ,FW_REG_BUF );if (w0_stat_sz >0 ) -__iowrite32_copy (d->fw_read_buff, fw_reg_addr, w0_stat_sz >>2 ); +__ioread32_copy (d->fw_read_buff, fw_reg_addr, w0_stat_sz >>2 );for (offset =0 ; offset <FW_REG_SIZE ; offset +=16 ) { ret +=snprintf (tmp + ret,FW_REG_BUF - ret,"%#.4x: " , offset);
Greg Kroah-Hartman
maintainerPATCH 157/185 ASoC: Intel: Fix use of potentially uninitialized variable
In reply to Greg Kroah-HartmanFrom: Amadeusz Sławiński <[email protected]>
commit 810f3b860850148788fc1ed8a6f5f807199fed65 upstream.
If ipc->ops.reply_msg_match is NULL, we may end up using uninitialized mask value.
reported by smatch:sound/soc/intel/common/sst-ipc.c:266 sst_ipc_reply_find_msg() error: uninitialized symbol 'mask'.
--- sound/soc/intel/common/sst-ipc.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/intel/common/sst-ipc.c +2 -0
@@ -231,6 +231,8 @@ struct ipc_message *sst_ipc_reply_find_mif (ipc->ops.reply_msg_match !=NULL ) header = ipc->ops.reply_msg_match (header, &mask); +else + mask = (u64)-1 ;if (list_empty (&ipc->rx_list)) { dev_err(ipc->dev, "error: rx list empty but received 0x%llx\n",
Greg Kroah-Hartman
maintainerPATCH 158/185 ARM: samsung: Fix system restart on S3C6410
In reply to Greg Kroah-HartmanFrom: Lihua Yao <[email protected]>
commit 16986074035cc0205472882a00d404ed9d213313 upstream.
S3C6410 system restart is triggered by watchdog reset.
--- arch/arm/plat-samsung/watchdog-reset.c | 1 + 1 file changed, 1 insertion(+)
arch/arm/plat-samsung/watchdog-reset.c +1 -0
@@ -67,6 +67,7 @@ void samsung_wdt_reset(void)#ifdef CONFIG_OF static const struct of_device_id s3c2410_wdt_match[] = { { .compatible ="samsung,s3c2410-wdt" }, + { .compatible ="samsung,s3c6410-wdt" }, {}, };
Greg Kroah-Hartman
maintainerPATCH 159/185 ARM: zynq: Use memcpy_toio instead of memcpy on smp bring-up
In reply to Greg Kroah-HartmanFrom: Luis Araneda <[email protected]>
commit b7005d4ef4f3aa2dc24019ffba03a322557ac43d upstream.
This fixes a kernel panic on memcpy whenFORTIFY_SOURCE is enabled.
The initial smp implementation on commit aa7eb2bb4e4a ("arm: zynq: Add smp support")
used memcpy, which worked fine until commit ee333554fed5 ("ARM: 8749/1: Kconfig: Add ARCH_HAS_FORTIFY_SOURCE") enabled overflow checks at runtime, producing a read overflow panic.
The computed size of memcpy args are:
- p_size (dst): 4294967295 = (size_t) -1
- q_size (src): 1
- size (len): 8
Additionally, the memory is marked as __iomem, so one of the memcpy_* functions should be used for read/write.
--- arch/arm/mach-zynq/platsmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-zynq/platsmp.c +1 -1
@@ -65,7 +65,7 @@ int zynq_cpun_start(u32 address, int cpu* 0x4: Jump by mov instruction * 0x8: Jumping address */ -memcpy ((__force void *)zero, &zynq_secondary_trampoline, +memcpy_toio (zero, &zynq_secondary_trampoline, trampoline_size);writel (address, zero + trampoline_size);
Greg Kroah-Hartman
maintainerPATCH 160/185 arm64: dts: rockchip: limit clock rate of MMC controllers for RK3328
In reply to Greg Kroah-HartmanFrom: Shawn Lin <[email protected]>
commit 03e61929c0d227ed3e1c322fc3804216ea298b7e upstream.
150MHz is a fundamental limitation of RK3328 Soc, w/o this limitation, eMMC, for instance, will run into 200MHz clock rate in HS200 mode, which makes the RK3328 boards not always boot properly. By adding it in rk3328.dtsi would also obviate the worry of missing it when adding new boards.
--- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 3 +++ 1 file changed, 3 insertions(+)
arch/arm64/boot/dts/rockchip/rk3328.dtsi +3 -0
@@ -685,6 +685,7 @@ <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>; clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; fifo-depth = <0x100>; + max-frequency = <150000000>; status = "disabled"; };
@@ -696,6 +697,7 @@ <&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>; clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; fifo-depth = <0x100>; + max-frequency = <150000000>; status = "disabled"; };
@@ -707,6 +709,7 @@ <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>; clock-names = "biu", "ciu", "ciu-drive", "ciu-sample"; fifo-depth = <0x100>; + max-frequency = <150000000>; status = "disabled"; };
Greg Kroah-Hartman
maintainerPATCH 161/185 alarmtimer: Use EOPNOTSUPP instead of ENOTSUPP
In reply to Greg Kroah-HartmanFrom: Thadeu Lima de Souza Cascardo <[email protected]>
commit f18ddc13af981ce3c7b7f26925f099e7c6929aba upstream.
ENOTSUPP is not supposed to be returned to userspace. This was found on an OpenPower machine, where the RTC does not support set_alarm.
On that system, a clock_nanosleep(CLOCK_REALTIME_ALARM, ...) results in "524 Unknown error 524"
Replace it with EOPNOTSUPP which results in the expected "95 Operation not supported" error.
--- kernel/time/alarmtimer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/time/alarmtimer.c +2 -2
@@ -676,7 +676,7 @@ static int alarm_timer_create(struct k_ienum alarmtimer_type type;if (!alarmtimer_get_rtcdev ()) -return -ENOTSUPP ; +return -EOPNOTSUPP ;if (!capable (CAP_WAKE_ALARM ))return -EPERM ;
@@ -794,7 +794,7 @@ static int alarm_timer_nsleep(const clocint ret =0 ;if (!alarmtimer_get_rtcdev ()) -return -ENOTSUPP ; +return -EOPNOTSUPP ;if (flags & ~TIMER_ABSTIME )return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 162/185 regulator: Defer init completion for a while after late_initcall
In reply to Greg Kroah-HartmanFrom: Mark Brown <[email protected]>
commit 55576cf1853798e86f620766e23b604c9224c19c upstream.
The kernel has no way of knowing when we have finished instantiating drivers, between deferred probe and systems that build key drivers as modules we might be doing this long after userspace has booted. This has always been a bit of an issue with regulator_init_complete since it can power off hardware that's not had it's driver loaded which can result in user visible effects, the main case is powering off displays. Practically speaking it's not been an issue in real systems since most systems that use the regulator API are embedded and build in key drivers anyway but with Arm laptops coming on the market it's becoming more of an issue so let's do something about it.
In the absence of any better idea just defer the powering off for 30s after late_initcall(), this is obviously a hack but it should mask the issue for now and it's no more arbitrary than late_initcall() itself. Ideally we'd have some heuristics to detect if we're on an affected system and tune or skip the delay appropriately, and there may be some need for a command line option to be added.
--- drivers/regulator/core.c | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-)
drivers/regulator/core.c +31 -11
@@ -4503,7 +4503,7 @@ static int __init regulator_init(void)/* init early to allow our consumers to complete system booting */ core_initcall (regulator_init); -static int __init regulator_late_cleanup (struct device *dev,void *data) +static int regulator_late_cleanup (struct device *dev,void *data) {struct regulator_dev *rdev =dev_to_rdev (dev);const struct regulator_ops *ops = rdev->desc->ops;
@@ -4552,18 +4552,9 @@ unlock:return 0 ; } -static int __init regulator_init_complete (void ) +static void regulator_init_complete_work_function (struct work_struct *work) {/* -* Since DT doesn't provide an idiomatic mechanism for -* enabling full constraints and since it's much more natural -* with DT to provide them just assume that a DT enabled -* system has full constraints. -*/ -if (of_have_populated_dt ()) - has_full_constraints = true; - -/* * Regulators may had failed to resolve their input supplies * when were registered, either because the input supply was * not registered yet or because its parent device was not
@@ -4580,6 +4571,35 @@ static int __init regulator_init_complet*/ class_for_each_device (®ulator_class,NULL ,NULL , regulator_late_cleanup); +} + +static DECLARE_DELAYED_WORK(regulator_init_complete_work, + regulator_init_complete_work_function); + +static int __init regulator_init_complete (void ) +{ +/* +* Since DT doesn't provide an idiomatic mechanism for +* enabling full constraints and since it's much more natural +* with DT to provide them just assume that a DT enabled +* system has full constraints. +*/ +if (of_have_populated_dt ()) + has_full_constraints = true; + +/* +* We punt completion for an arbitrary amount of time since +* systems like distros will load many drivers from userspace +* so consumers might not always be ready yet, this is +* particularly an issue with laptops where this might bounce +* the display off then on. Ideally we'd get a notification +* from userspace when this happens but we don't so just wait +* a bit and hope we waited long enough. It'd be better if +* we'd only do this on systems that need it, and a kernel +* command line option might be useful. +*/ +schedule_delayed_work (®ulator_init_complete_work, +msecs_to_jiffies (30000 ));return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 163/185 gfs2: clear buf_in_tr when ending a transaction in sweep_bh_for_rgrps
In reply to Greg Kroah-HartmanFrom: Bob Peterson <[email protected]>
commit f0b444b349e33ae0d3dd93e25ca365482a5d17d4 upstream.
In function sweep_bh_for_rgrps, which is a helper for punch_hole, it uses variable buf_in_tr to keep track of when it needs to commit pending block frees on a partial delete that overflows the transaction created for the delete. The problem is that the variable was initialized at the start of function sweep_bh_for_rgrps but it was never cleared, even when starting a new transaction.
This patch reinitializes the variable when the transaction is ended, so the next transaction starts out with it cleared.
--- fs/gfs2/bmap.c | 1 + 1 file changed, 1 insertion(+)
fs/gfs2/bmap.c +1 -0
@@ -1078,6 +1078,7 @@ out_unlock:gfs2_dinode_out (ip, dibh->b_data);up_write (&ip->i_rw_mutex);gfs2_trans_end (sdp); + buf_in_tr = false; }gfs2_glock_dq_uninit (rd_gh);cond_resched ();
Greg Kroah-Hartman
maintainerPATCH 164/185 memcg, oom: dont require __GFP_FS when invoking memcg OOM killer
In reply to Greg Kroah-HartmanFrom: Tetsuo Handa <[email protected]>
commit f9c645621a28e37813a1de96d9cbd89cde94a1e4 upstream.
Masoud Sharbiani noticed that commit 29ef680ae7c21110 ("memcg, oom: move out_of_memory back to the charge path") broke memcg OOM called from __xfs_filemap_fault() path. It turned out that try_charge() is retrying forever without making forward progress because mem_cgroup_oom(GFP_NOFS) cannot invoke the OOM killer due to commit 3da88fb3bacfaa33 ("mm, oom:
move GFP_NOFS check to out_of_memory").
Allowing forced charge due to being unable to invoke memcg OOM killer will lead to global OOM situation. Also, just returning -ENOMEM will be risky because OOM path is lost and some paths (e.g. get_user_pages()) will leak -ENOMEM. Therefore, invoking memcg OOM killer (despite GFP_NOFS) will be the only choice we can choose for now.
Until 29ef680ae7c21110, we were able to invoke memcg OOM killer when GFP_KERNEL reclaim failed [1]. But since 29ef680ae7c21110, we need to invoke memcg OOM killer when GFP_NOFS reclaim failed [2]. Although in the past we did invoke memcg OOM killer for GFP_NOFS [3], we might get pre-mature memcg OOM reports due to this patch.
[1]
leaker invoked oom-killer: gfp_mask=0x6200ca(GFP_HIGHUSER_MOVABLE), nodemask=(null), order=0, oom_score_adj=0
CPU: 0 PID: 2746 Comm: leaker Not tainted 4.18.0+ #19 Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 04/13/2018 Call Trace: dump_stack+0x63/0x88 dump_header+0x67/0x27a ? mem_cgroup_scan_tasks+0x91/0xf0 oom_kill_process+0x210/0x410 out_of_memory+0x10a/0x2c0 mem_cgroup_out_of_memory+0x46/0x80 mem_cgroup_oom_synchronize+0x2e4/0x310 ? high_work_func+0x20/0x20 pagefault_out_of_memory+0x31/0x76 mm_fault_error+0x55/0x115 ? handle_mm_fault+0xfd/0x220 __do_page_fault+0x433/0x4e0 do_page_fault+0x22/0x30 ? page_fault+0x8/0x30 page_fault+0x1e/0x30 RIP: 0033:0x4009f0 Code: 03 00 00 00 e8 71 fd ff ff 48 83 f8 ff 49 89 c6 74 74 48 89 c6 bf c0 0c 40 00 31 c0 e8 69 fd ff ff 45 85 ff 7e 21 31 c9 66 90 <41> 0f be 14 0e 01 d3 f7 c1 ff 0f 00 00 75 05 41 c6 04 0e 2a 48 83 RSP: 002b:00007ffe29ae96f0 EFLAGS: 00010206 RAX: 000000000000001b RBX: 0000000000000000 RCX: 0000000001ce1000 RDX: 0000000000000000 RSI: 000000007fffffe5 RDI: 0000000000000000 RBP: 000000000000000c R08: 0000000000000000 R09: 00007f94be09220d R10: 0000000000000002 R11: 0000000000000246 R12: 00000000000186a0 R13: 0000000000000003 R14: 00007f949d845000 R15: 0000000002800000 Task in /leaker killed as a result of limit of /leaker memory: usage 524288kB, limit 524288kB, failcnt 158965 memory+swap: usage 0kB, limit 9007199254740988kB, failcnt 0 kmem: usage 2016kB, limit 9007199254740988kB, failcnt 0 Memory cgroup stats for /leaker: cache:844KB rss:521136KB rss_huge:0KB shmem:0KB mapped_file:0KB dirty:132KB writeback:0KB inactive_anon:0KB active_anon:521224KB inactive_file:1012KB active_file:8KB unevictable:0KB Memory cgroup out of memory: Kill process 2746 (leaker) score 998 or sacrifice child Killed process 2746 (leaker) total-vm:536704kB, anon-rss:521176kB, file-rss:1208kB, shmem-rss:0kB oom_reaper: reaped process 2746 (leaker), now anon-rss:0kB, file-rss:0kB, shmem-rss:0kB
[2]
leaker invoked oom-killer: gfp_mask=0x600040(GFP_NOFS), nodemask=(null), order=0, oom_score_adj=0
CPU: 1 PID: 2746 Comm: leaker Not tainted 4.18.0+ #20 Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 04/13/2018 Call Trace: dump_stack+0x63/0x88 dump_header+0x67/0x27a ? mem_cgroup_scan_tasks+0x91/0xf0 oom_kill_process+0x210/0x410 out_of_memory+0x109/0x2d0 mem_cgroup_out_of_memory+0x46/0x80 try_charge+0x58d/0x650 ? __radix_tree_replace+0x81/0x100 mem_cgroup_try_charge+0x7a/0x100 __add_to_page_cache_locked+0x92/0x180 add_to_page_cache_lru+0x4d/0xf0 iomap_readpages_actor+0xde/0x1b0 ? iomap_zero_range_actor+0x1d0/0x1d0 iomap_apply+0xaf/0x130 iomap_readpages+0x9f/0x150 ? iomap_zero_range_actor+0x1d0/0x1d0 xfs_vm_readpages+0x18/0x20 [xfs] read_pages+0x60/0x140 __do_page_cache_readahead+0x193/0x1b0 ondemand_readahead+0x16d/0x2c0 page_cache_async_readahead+0x9a/0xd0 filemap_fault+0x403/0x620 ? alloc_set_pte+0x12c/0x540 ? _cond_resched+0x14/0x30 __xfs_filemap_fault+0x66/0x180 [xfs] xfs_filemap_fault+0x27/0x30 [xfs] __do_fault+0x19/0x40 __handle_mm_fault+0x8e8/0xb60 handle_mm_fault+0xfd/0x220 __do_page_fault+0x238/0x4e0 do_page_fault+0x22/0x30 ? page_fault+0x8/0x30 page_fault+0x1e/0x30 RIP: 0033:0x4009f0 Code: 03 00 00 00 e8 71 fd ff ff 48 83 f8 ff 49 89 c6 74 74 48 89 c6 bf c0 0c 40 00 31 c0 e8 69 fd ff ff 45 85 ff 7e 21 31 c9 66 90 <41> 0f be 14 0e 01 d3 f7 c1 ff 0f 00 00 75 05 41 c6 04 0e 2a 48 83 RSP: 002b:00007ffda45c9290 EFLAGS: 00010206 RAX: 000000000000001b RBX: 0000000000000000 RCX: 0000000001a1e000 RDX: 0000000000000000 RSI: 000000007fffffe5 RDI: 0000000000000000 RBP: 000000000000000c R08: 0000000000000000 R09: 00007f6d061ff20d R10: 0000000000000002 R11: 0000000000000246 R12: 00000000000186a0 R13: 0000000000000003 R14: 00007f6ce59b2000 R15: 0000000002800000 Task in /leaker killed as a result of limit of /leaker memory: usage 524288kB, limit 524288kB, failcnt 7221 memory+swap: usage 0kB, limit 9007199254740988kB, failcnt 0 kmem: usage 1944kB, limit 9007199254740988kB, failcnt 0 Memory cgroup stats for /leaker: cache:3632KB rss:518232KB rss_huge:0KB shmem:0KB mapped_file:0KB dirty:0KB writeback:0KB inactive_anon:0KB active_anon:518408KB inactive_file:3908KB active_file:12KB unevictable:0KB Memory cgroup out of memory: Kill process 2746 (leaker) score 992 or sacrifice child Killed process 2746 (leaker) total-vm:536704kB, anon-rss:518264kB, file-rss:1188kB, shmem-rss:0kB oom_reaper: reaped process 2746 (leaker), now anon-rss:0kB, file-rss:0kB, shmem-rss:0kB
[3]
leaker invoked oom-killer: gfp_mask=0x50, order=0, oom_score_adj=0 leaker cpuset=/ mems_allowed=0
CPU: 1 PID: 3206 Comm: leaker Not tainted 3.10.0-957.27.2.el7.x86_64 #1 Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 04/13/2018 Call Trace: [<ffffffffaf364147>] dump_stack+0x19/0x1b [<ffffffffaf35eb6a>] dump_header+0x90/0x229 [<ffffffffaedbb456>] ? find_lock_task_mm+0x56/0xc0 [<ffffffffaee32a38>] ? try_get_mem_cgroup_from_mm+0x28/0x60 [<ffffffffaedbb904>] oom_kill_process+0x254/0x3d0 [<ffffffffaee36c36>] mem_cgroup_oom_synchronize+0x546/0x570 [<ffffffffaee360b0>] ? mem_cgroup_charge_common+0xc0/0xc0 [<ffffffffaedbc194>] pagefault_out_of_memory+0x14/0x90 [<ffffffffaf35d072>] mm_fault_error+0x6a/0x157 [<ffffffffaf3717c8>] __do_page_fault+0x3c8/0x4f0 [<ffffffffaf371925>] do_page_fault+0x35/0x90 [<ffffffffaf36d768>] page_fault+0x28/0x30 Task in /leaker killed as a result of limit of /leaker memory: usage 524288kB, limit 524288kB, failcnt 20628 memory+swap: usage 524288kB, limit 9007199254740988kB, failcnt 0 kmem: usage 0kB, limit 9007199254740988kB, failcnt 0 Memory cgroup stats for /leaker: cache:840KB rss:523448KB rss_huge:0KB mapped_file:0KB swap:0KB inactive_anon:0KB active_anon:523448KB inactive_file:464KB active_file:376KB unevictable:0KB Memory cgroup out of memory: Kill process 3206 (leaker) score 970 or sacrifice child Killed process 3206 (leaker) total-vm:536692kB, anon-rss:523304kB, file-rss:412kB, shmem-rss:0kB
Bisected by Masoud Sharbiani.
--- mm/oom_kill.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
mm/oom_kill.c +3 -2
@@ -1050,9 +1050,10 @@ bool out_of_memory(struct oom_control *o* The OOM killer does not compensate for IO-less reclaim. * pagefault_out_of_memory lost its gfp context so we have to * make sure exclude 0 mask - all other users should have at least -* ___GFP_DIRECT_RECLAIM to get here. +* ___GFP_DIRECT_RECLAIM to get here. But mem_cgroup_oom() has to +* invoke the OOM killer even if it is a GFP_NOFS allocation. */ -if (oc->gfp_mask && !(oc->gfp_mask & __GFP_FS)) +if (oc->gfp_mask && !(oc->gfp_mask & __GFP_FS) && !is_memcg_oom (oc))return true;/*
Greg Kroah-Hartman
maintainerPATCH 165/185 memcg, kmem: do not fail __GFP_NOFAIL charges
In reply to Greg Kroah-HartmanFrom: Michal Hocko <[email protected]>
commit e55d9d9bfb69405bd7615c0f8d229d8fafb3e9b8 upstream.
Thomas has noticed the following NULL ptr dereference when using cgroup v1 kmem limit:
BUG: unable to handle kernel NULL pointer dereference at 0000000000000008 PGD 0 P4D 0 Oops: 0000 [#1] PREEMPT SMP PTI CPU: 3 PID: 16923 Comm: gtk-update-icon Not tainted 4.19.51 #42 Hardware name: Gigabyte Technology Co., Ltd. Z97X-Gaming G1/Z97X-Gaming G1, BIOS F9 07/31/2015 RIP: 0010:create_empty_buffers+0x24/0x100 Code: cd 0f 1f 44 00 00 0f 1f 44 00 00 41 54 49 89 d4 ba 01 00 00 00 55 53 48 89 fb e8 97 fe ff ff 48 89 c5 48 89 c2 eb 03 48 89 ca <48> 8b 4a 08 4c 09 22 48 85 c9 75 f1 48 89 6a 08 48 8b 43 18 48 8d RSP: 0018:ffff927ac1b37bf8 EFLAGS: 00010286 RAX: 0000000000000000 RBX: fffff2d4429fd740 RCX: 0000000100097149 RDX: 0000000000000000 RSI: 0000000000000082 RDI: ffff9075a99fbe00 RBP: 0000000000000000 R08: fffff2d440949cc8 R09: 00000000000960c0 R10: 0000000000000002 R11: 0000000000000000 R12: 0000000000000000 R13: ffff907601f18360 R14: 0000000000002000 R15: 0000000000001000 FS: 00007fb55b288bc0(0000) GS:ffff90761f8c0000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000008 CR3: 000000007aebc002 CR4: 00000000001606e0 Call Trace: create_page_buffers+0x4d/0x60 __block_write_begin_int+0x8e/0x5a0 ? ext4_inode_attach_jinode.part.82+0xb0/0xb0 ? jbd2__journal_start+0xd7/0x1f0 ext4_da_write_begin+0x112/0x3d0 generic_perform_write+0xf1/0x1b0 ? file_update_time+0x70/0x140 __generic_file_write_iter+0x141/0x1a0 ext4_file_write_iter+0xef/0x3b0 __vfs_write+0x17e/0x1e0 vfs_write+0xa5/0x1a0 ksys_write+0x57/0xd0 do_syscall_64+0x55/0x160 entry_SYSCALL_64_after_hwframe+0x44/0xa9
Tetsuo then noticed that this is because the __memcg_kmem_charge_memcg fails __GFP_NOFAIL charge when the kmem limit is reached. This is a wrong behavior because nofail allocations are not allowed to fail. Normal charge path simply forces the charge even if that means to cross the limit. Kmem accounting should be doing the same.
--- mm/memcontrol.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
mm/memcontrol.c +10 -0
@@ -2352,6 +2352,16 @@ int memcg_kmem_charge_memcg(struct pageif (!cgroup_subsys_on_dfl (memory_cgrp_subsys) && !page_counter_try_charge (&memcg->kmem, nr_pages, &counter)) { + +/* +* Enforce __GFP_NOFAIL allocation because callers are not +* prepared to see failures and likely do not have any failure +* handling code. +*/ +if (gfp & __GFP_NOFAIL) { +page_counter_charge (&memcg->kmem, nr_pages); +return 0 ; + }cancel_charge (memcg, nr_pages);return -ENOMEM ; }
Greg Kroah-Hartman
maintainerPATCH 166/185 ovl: filter of trusted xattr results in audit
In reply to Greg Kroah-HartmanFrom: Mark Salyzyn <[email protected]>
commit 5c2e9f346b815841f9bed6029ebcb06415caf640 upstream.
When filtering xattr list for reading, presence of trusted xattr results in a security audit log. However, if there is other content no errno will be set, and if there isn't, the errno will be -ENODATA and not -EPERM as is usually associated with a lack of capability. The check does not block the request to list the xattrs present.
Switch to ns_capable_noaudit to reflect a more appropriate check.
--- fs/overlayfs/inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/overlayfs/inode.c +2 -1
@@ -265,7 +265,8 @@ static bool ovl_can_list(const char *s)return true;/* Never list trusted.overlay, list other trusted for superuser only */ -return !ovl_is_private_xattr (s) &&capable (CAP_SYS_ADMIN ); +return !ovl_is_private_xattr (s) && +ns_capable_noaudit (&init_user_ns,CAP_SYS_ADMIN ); }ssize_t ovl_listxattr (struct dentry *dentry,char *list,size_t size)
Greg Kroah-Hartman
maintainerPATCH 167/185 Btrfs: fix use-after-free when using the tree modification log
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit efad8a853ad2057f96664328a0d327a05ce39c76 upstream.
At ctree.c:get_old_root(), we are accessing a root's header owner field after we have freed the respective extent buffer. This results in an use-after-free that can lead to crashes, and when CONFIG_DEBUG_PAGEALLOC is set, results in a stack trace like the following:
[ 3876.799331] stack segment: 0000 [#1] SMP DEBUG_PAGEALLOC PTI [ 3876.799363] CPU: 0 PID: 15436 Comm: pool Not tainted 5.3.0-rc3-btrfs-next-54 #1 [ 3876.799385] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.0-0-ga698c8995f-prebuilt.qemu.org 04/01/2014 [ 3876.799433] RIP: 0010:btrfs_search_old_slot+0x652/0xd80 [btrfs] (...) [ 3876.799502] RSP: 0018:ffff9f08c1a2f9f0 EFLAGS: 00010286 [ 3876.799518] RAX: ffff8dd300000000 RBX: ffff8dd85a7a9348 RCX: 000000038da26000 [ 3876.799538] RDX: 0000000000000000 RSI: ffffe522ce368980 RDI: 0000000000000246 [ 3876.799559] RBP: dae1922adadad000 R08: 0000000008020000 R09: ffffe522c0000000 [ 3876.799579] R10: ffff8dd57fd788c8 R11: 000000007511b030 R12: ffff8dd781ddc000 [ 3876.799599] R13: ffff8dd9e6240578 R14: ffff8dd6896f7a88 R15: ffff8dd688cf90b8 [ 3876.799620] FS: 00007f23ddd97700(0000) GS:ffff8dda20200000(0000) knlGS:0000000000000000 [ 3876.799643] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 3876.799660] CR2: 00007f23d4024000 CR3: 0000000710bb0005 CR4: 00000000003606f0 [ 3876.799682] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 3876.799703] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 3876.799723] Call Trace: [ 3876.799735] ? do_raw_spin_unlock+0x49/0xc0 [ 3876.799749] ? _raw_spin_unlock+0x24/0x30 [ 3876.799779] resolve_indirect_refs+0x1eb/0xc80 [btrfs] [ 3876.799810] find_parent_nodes+0x38d/0x1180 [btrfs] [ 3876.799841] btrfs_check_shared+0x11a/0x1d0 [btrfs] [ 3876.799870] ? extent_fiemap+0x598/0x6e0 [btrfs] [ 3876.799895] extent_fiemap+0x598/0x6e0 [btrfs] [ 3876.799913] do_vfs_ioctl+0x45a/0x700 [ 3876.799926] ksys_ioctl+0x70/0x80 [ 3876.799938] ? trace_hardirqs_off_thunk+0x1a/0x20 [ 3876.799953] __x64_sys_ioctl+0x16/0x20 [ 3876.799965] do_syscall_64+0x62/0x220 [ 3876.799977] entry_SYSCALL_64_after_hwframe+0x49/0xbe [ 3876.799993] RIP: 0033:0x7f23e0013dd7 (...) [ 3876.800056] RSP: 002b:00007f23ddd96ca8 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 [ 3876.800078] RAX: ffffffffffffffda RBX: 00007f23d80210f8 RCX: 00007f23e0013dd7 [ 3876.800099] RDX: 00007f23d80210f8 RSI: 00000000c020660b RDI: 0000000000000003 [ 3876.800626] RBP: 000055fa2a2a2440 R08: 0000000000000000 R09: 00007f23ddd96d7c [ 3876.801143] R10: 00007f23d8022000 R11: 0000000000000246 R12: 00007f23ddd96d80 [ 3876.801662] R13: 00007f23ddd96d78 R14: 00007f23d80210f0 R15: 00007f23ddd96d80 (...) [ 3876.805107] ---[ end trace e53161e179ef04f9 ]---
Fix that by saving the root's header owner field into a local variable before freeing the root's extent buffer, and then use that local variable when needed.
--- fs/btrfs/ctree.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/btrfs/ctree.c +3 -1
@@ -1414,6 +1414,7 @@ get_old_root(struct btrfs_root *root, u6struct tree_mod_elem *tm;struct extent_buffer *eb =NULL ;struct extent_buffer *eb_root; +u64 eb_root_owner =0 ;struct extent_buffer *old;struct tree_mod_root *old_root =NULL ;u64 old_generation =0 ;
@@ -1448,6 +1449,7 @@ get_old_root(struct btrfs_root *root, u6free_extent_buffer (old); } }else if (old_root) { + eb_root_owner =btrfs_header_owner (eb_root);btrfs_tree_read_unlock (eb_root);free_extent_buffer (eb_root); eb =alloc_dummy_extent_buffer (fs_info, logical);
@@ -1465,7 +1467,7 @@ get_old_root(struct btrfs_root *root, u6if (old_root) {btrfs_set_header_bytenr (eb, eb->start);btrfs_set_header_backref_rev (eb,BTRFS_MIXED_BACKREF_REV ); -btrfs_set_header_owner (eb,btrfs_header_owner (eb_root)); +btrfs_set_header_owner (eb, eb_root_owner);btrfs_set_header_level (eb, old_root->level);btrfs_set_header_generation (eb, old_generation); }
Greg Kroah-Hartman
maintainerPATCH 168/185 btrfs: Relinquish CPUs in btrfs_compare_trees
In reply to Greg Kroah-HartmanFrom: Nikolay Borisov <[email protected]>
commit 6af112b11a4bc1b560f60a618ac9c1dcefe9836e upstream.
When doing any form of incremental send the parent and the child trees need to be compared via btrfs_compare_trees. This can result in long loop chains without ever relinquishing the CPU. This causes softlockup detector to trigger when comparing trees with a lot of items. Example report:
watchdog: BUG: soft lockup - CPU#0 stuck for 24s! [snapperd:16153] CPU: 0 PID: 16153 Comm: snapperd Not tainted 5.2.9-1-default #1 openSUSE Tumbleweed (unreleased) Hardware name: QEMU KVM Virtual Machine, BIOS 0.0.0 02/06/2015 pstate: 40000005 (nZcv daif -PAN -UAO) pc : __ll_sc_arch_atomic_sub_return+0x14/0x20 lr : btrfs_release_extent_buffer_pages+0xe0/0x1e8 [btrfs] sp : ffff00001273b7e0 Call trace: __ll_sc_arch_atomic_sub_return+0x14/0x20 release_extent_buffer+0xdc/0x120 [btrfs] free_extent_buffer.part.0+0xb0/0x118 [btrfs] free_extent_buffer+0x24/0x30 [btrfs] btrfs_release_path+0x4c/0xa0 [btrfs] btrfs_free_path.part.0+0x20/0x40 [btrfs] btrfs_free_path+0x24/0x30 [btrfs] get_inode_info+0xa8/0xf8 [btrfs] finish_inode_if_needed+0xe0/0x6d8 [btrfs] changed_cb+0x9c/0x410 [btrfs] btrfs_compare_trees+0x284/0x648 [btrfs] send_subvol+0x33c/0x520 [btrfs] btrfs_ioctl_send+0x8a0/0xaf0 [btrfs] btrfs_ioctl+0x199c/0x2288 [btrfs] do_vfs_ioctl+0x4b0/0x820 ksys_ioctl+0x84/0xb8 __arm64_sys_ioctl+0x28/0x38 el0_svc_common.constprop.0+0x7c/0x188 el0_svc_handler+0x34/0x90 el0_svc+0x8/0xc
Fix this by adding a call to cond_resched at the beginning of the main loop in btrfs_compare_trees.
--- fs/btrfs/ctree.c | 1 + 1 file changed, 1 insertion(+)
fs/btrfs/ctree.c +1 -0
@@ -5494,6 +5494,7 @@ int btrfs_compare_trees(struct btrfs_roo advance_left = advance_right =0 ;while (1 ) { +cond_resched ();if (advance_left && !left_end_reached) { ret = tree_advance(fs_info, left_path, &left_level, left_root_level,
Greg Kroah-Hartman
maintainerPATCH 169/185 btrfs: qgroup: Fix the wrong target io_tree when freeing reserved data space
In reply to Greg Kroah-HartmanFrom: Qu Wenruo <[email protected]>
commit bab32fc069ce8829c416e8737c119f62a57970f9 upstream.
[BUG]
Under the following case with qgroup enabled, if some error happened after we have reserved delalloc space, then in error handling path, we could cause qgroup data space leakage:
Quoted 1 line
From
btrfs_truncate_block()ininode.c:
ret = btrfs_delalloc_reserve_space(inode, &data_reserved, block_start, blocksize); if (ret) goto out;
again:
page = find_or_create_page(mapping, index, mask);
if (!page) {
btrfs_delalloc_release_space(inode, data_reserved,
block_start, blocksize, true);
btrfs_delalloc_release_extents(BTRFS_I(inode), blocksize, true);
ret = -ENOMEM;
goto out;
}[CAUSE]
In the above case, btrfs_delalloc_reserve_space() will call btrfs_qgroup_reserve_data() and mark the io_tree range with EXTENT_QGROUP_RESERVED flag.
In the error handling path, we have the following call stack:btrfs_delalloc_release_space()
|- btrfs_free_reserved_data_space()
|- btrsf_qgroup_free_data()
|- __btrfs_qgroup_release_data(reserved=@reserved, free=1)
|- qgroup_free_reserved_data(reserved=@reserved)
|- clear_record_extent_bits();
|- freed += changeset.bytes_changed;However due to a completion bug, qgroup_free_reserved_data() will clear EXTENT_QGROUP_RESERVED flag in BTRFS_I(inode)->io_failure_tree, other than the correct BTRFS_I(inode)->io_tree.
Since io_failure_tree is never marked with that flag, btrfs_qgroup_free_data() will not free any data reserved space at all, causing a leakage.
This type of error handling can only be triggered by errors outside of qgroup code. So EDQUOT error from qgroup can't trigger it.
[FIX]
Fix the wrong target io_tree.
--- fs/btrfs/qgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/qgroup.c +1 -1
@@ -2951,7 +2951,7 @@ static int qgroup_free_reserved_data(str* EXTENT_QGROUP_RESERVED, we won't double free. * So not need to rush. */ - ret =clear_record_extent_bits (&BTRFS_I (inode)->io_failure_tree, + ret =clear_record_extent_bits (&BTRFS_I (inode)->io_tree, free_start, free_start + free_len -1 ,EXTENT_QGROUP_RESERVED , &changeset);if (ret <0 )
Greg Kroah-Hartman
maintainerPATCH 170/185 md/raid6: Set R5_ReadError when there is read failure on parity disk
In reply to Greg Kroah-HartmanFrom: Xiao Ni <[email protected]>
commit 143f6e733b73051cd22dcb80951c6c929da413ce upstream.
7471fb77ce4d ("md/raid6: Fix anomily when recovering a single device in RAID6.") avoids rereading P when it can be computed from other members. However, this misses the chance to re-write the right data to P. This patch sets R5_ReadError if the re-read fails.
Also, when re-read is skipped, we also missed the chance to reset rdev->read_errors to 0. It can fail the disk when there are many read errors on P member disk (other disks don't have read error)
V2: upper layer read request don't read parity/Q data. So there is no need to consider such situation.
This is Reported-by: kbuild test robot <[email protected]>
--- drivers/md/raid5.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/md/raid5.c +3 -1
@@ -2571,7 +2571,9 @@ static void raid5_end_read_request(struc && !test_bit(R5_ReadNoMerge, &sh->dev[i].flags)) retry =1 ;if (retry) -if (test_bit (R5_ReadNoMerge, &sh->dev[i].flags)) { +if (sh->qd_idx >=0 && sh->pd_idx == i) +set_bit (R5_ReadError, &sh->dev[i].flags); +else if (test_bit (R5_ReadNoMerge, &sh->dev[i].flags)) {set_bit (R5_ReadError, &sh->dev[i].flags);clear_bit (R5_ReadNoMerge, &sh->dev[i].flags); }else
Greg Kroah-Hartman
maintainerPATCH 171/185 md: dont report active array_state until after revalidate_disk() completes.
In reply to Greg Kroah-HartmanFrom: NeilBrown <[email protected]>
commit 9d4b45d6af442237560d0bb5502a012baa5234b7 upstream.
Until revalidate_disk() has completed, the size of a new md array will appear to be zero.
So we shouldn't report, through array_state, that the array is active until that time.
udev rules check array_state to see if the array is ready. As soon as it appear to be zero, fsck can be run. If it find the size to be zero, it will fail.
So add a new flag to provide an interlock between do_md_run() and array_state_show(). This flag is set while do_md_run() is active and it prevents array_state_show() from reporting that the array is active.
Before do_md_run() is called, ->pers will be NULL so array is definitely not active.
After do_md_run() is called, revalidate_disk() will have run and the array will be completely ready.
We also move various sysfs_notify*() calls out of md_run() into do_md_run() after MD_NOT_READY is cleared. This ensure the information is ready before the notification is sent.
Prior to v4.12, array_state_show() was called with the mddev->reconfig_mutex held, which provided exclusion with do_md_run().
Note that MD_NOT_READY cleared twice. This is deliberate to cover both success and error paths with minimal noise.
--- drivers/md/md.c | 11 +++++++---- drivers/md/md.h | 3 +++ 2 files changed, 10 insertions(+), 4 deletions(-)
drivers/md/md.c +7 -4
@@ -4108,7 +4108,7 @@ array_state_show(struct mddev *mddev, ch {enum array_state st = inactive; -if (mddev->pers) +if (mddev->pers && !test_bit (MD_NOT_READY , &mddev->flags))switch (mddev->ro) {case 1 : st = readonly;
@@ -5669,9 +5669,6 @@ int md_run(struct mddev *mddev)md_update_sb (mddev,0 );md_new_event (mddev); -sysfs_notify_dirent_safe (mddev->sysfs_state); -sysfs_notify_dirent_safe (mddev->sysfs_action); -sysfs_notify (&mddev->kobj,NULL ,"degraded" );return 0 ; abort:
@@ -5692,6 +5689,7 @@ static int do_md_run(struct mddev *mddev {int err; +set_bit (MD_NOT_READY , &mddev->flags); err =md_run (mddev);if (err) goto out;
@@ -5709,9 +5707,14 @@ static int do_md_run(struct mddev *mddevset_capacity (mddev->gendisk, mddev->array_sectors);revalidate_disk (mddev->gendisk); +clear_bit (MD_NOT_READY , &mddev->flags); mddev->changed =1 ;kobject_uevent (&disk_to_dev (mddev->gendisk)->kobj,KOBJ_CHANGE ); +sysfs_notify_dirent_safe (mddev->sysfs_state); +sysfs_notify_dirent_safe (mddev->sysfs_action); +sysfs_notify (&mddev->kobj,NULL ,"degraded" ); out: +clear_bit (MD_NOT_READY , &mddev->flags);return err; }
drivers/md/md.h +3 -0
@@ -243,6 +243,9 @@ enum mddev_flags {MD_UPDATING_SB ,/* md_check_recovery is updating the metadata * without explicitly holding reconfig_mutex. */ + MD_NOT_READY, /* do_md_run() is active, so 'array_state' + * must not report that array is ready yet + */ }; enum mddev_sb_flags {
Greg Kroah-Hartman
maintainerPATCH 172/185 md: only call set_in_sync() when it is expected to succeed.
In reply to Greg Kroah-HartmanFrom: NeilBrown <[email protected]>
commit 480523feae581ab714ba6610388a3b4619a2f695 upstream.
Since commit 4ad23a976413 ("MD: use per-cpu counter for writes_pending"), set_in_sync() is substantially more expensive: it can wait for a full RCU grace period which can be 10s of milliseconds.
So we should only call it when the cost is justified.
md_check_recovery() currently calls set_in_sync() every time it finds anything to do (on non-external active arrays). For an array performing resync or recovery, this will be quite often. Each call will introduce a delay to the md thread, which can noticeable affect IO submission latency.
In md_check_recovery() we only need to call set_in_sync() if 'safemode' was non-zero at entry, meaning that there has been not recent IO. So we save this "safemode was nonzero" state, and only call set_in_sync() if it was non-zero.
This measurably reduces mean and maximum IO submission latency during resync/recovery.
--- drivers/md/md.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/md/md.c +2 -1
@@ -8765,6 +8765,7 @@ void md_check_recovery(struct mddev *mddif (mddev_trylock (mddev)) {int spares =0 ; +bool try_set_sync = mddev->safemode !=0 ;if (!mddev->external && mddev->safemode ==1 ) mddev->safemode =0 ;
@@ -8810,7 +8811,7 @@ void md_check_recovery(struct mddev *mdd } } -if (!mddev->external && !mddev->in_sync) { +if (try_set_sync && !mddev->external && !mddev->in_sync) {spin_lock (&mddev->lock);set_in_sync (mddev);spin_unlock (&mddev->lock);
Greg Kroah-Hartman
maintainerPATCH 173/185 cfg80211: Purge frame registrations on iftype change
In reply to Greg Kroah-HartmanFrom: Denis Kenzior <[email protected]>
commit c1d3ad84eae35414b6b334790048406bd6301b12 upstream.
Currently frame registrations are not purged, even when changing the interface type. This can lead to potentially weird situations where frames possibly not allowed on a given interface type remain registered due to the type switching happening after registration.
The kernel currently relies on userspace apps to actually purge the registrations themselves, this is not something that the kernel should rely on.
Add a call to cfg80211_mlme_purge_registrations() to forcefully remove any registrations left over prior to switching the iftype.
--- net/wireless/util.c | 1 + 1 file changed, 1 insertion(+)
net/wireless/util.c +1 -0
@@ -1042,6 +1042,7 @@ int cfg80211_change_iface(struct cfg8021 }cfg80211_process_rdev_events (rdev); +cfg80211_mlme_purge_registrations (dev->ieee80211_ptr); } err =rdev_change_virtual_intf (rdev, dev, ntype, params);
Greg Kroah-Hartman
maintainerPATCH 174/185 /dev/mem: Bail out upon SIGKILL.
In reply to Greg Kroah-HartmanFrom: Tetsuo Handa <[email protected]>
commit 8619e5bdeee8b2c685d686281f2d2a6017c4bc15 upstream.
syzbot found that a thread can stall for minutes inside read_mem() or write_mem() after that thread was killed by SIGKILL [1]. Reading from iomem areas of /dev/mem can be slow, depending on the hardware. While reading 2GB at one read() is legal, delaying termination of killed thread for minutes is bad. Thus, allow reading/writing /dev/mem and /dev/kmem to be preemptible and killable.
[ 1335.912419][T20577] read_mem: sz=4096 count=2134565632 [ 1335.943194][T20577] read_mem: sz=4096 count=2134561536 [ 1335.978280][T20577] read_mem: sz=4096 count=2134557440 [ 1336.011147][T20577] read_mem: sz=4096 count=2134553344 [ 1336.041897][T20577] read_mem: sz=4096 count=2134549248
Theoretically, reading/writing /dev/mem and /dev/kmem can become "interruptible". But this patch chose "killable". Future patch will make them "interruptible" so that we can revert to "killable" if some program regressed.
[1] https://syzkaller.appspot.com/bug?id=a0e3436829698d5824231251fad9d8e998f94f5e
--- drivers/char/mem.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/char/mem.c +21 -0
@@ -97,6 +97,13 @@ void __weak unxlate_dev_mem_ptr(phys_add }#endif +static inline bool should_stop_iteration (void ) +{ +if (need_resched ()) +cond_resched (); +return fatal_signal_pending (current); +} +/* * This funcion reads the *physical* memory. The f_pos points directly to the * memory location.
@@ -175,6 +182,8 @@ static ssize_t read_mem(struct file *fil p += sz; count -= sz; read += sz; +if (should_stop_iteration ()) +break ; }kfree (bounce);
@@ -251,6 +260,8 @@ static ssize_t write_mem(struct file *fi p += sz; count -= sz; written += sz; +if (should_stop_iteration ()) +break ; } *ppos += written;
@@ -464,6 +475,10 @@ static ssize_t read_kmem(struct file *fi read += sz; low_count -= sz; count -= sz; +if (should_stop_iteration ()) { + count =0 ; +break ; + } } }
@@ -488,6 +503,8 @@ static ssize_t read_kmem(struct file *fi buf += sz; read += sz; p += sz; +if (should_stop_iteration ()) +break ; }free_page ((unsigned long )kbuf); }
@@ -540,6 +557,8 @@ static ssize_t do_write_kmem(unsigned lo p += sz; count -= sz; written += sz; +if (should_stop_iteration ()) +break ; } *ppos += written;
@@ -591,6 +610,8 @@ static ssize_t write_kmem(struct file *f buf += sz; virtr += sz; p += sz; +if (should_stop_iteration ()) +break ; }free_page ((unsigned long )kbuf); }
Greg Kroah-Hartman
maintainerPATCH 175/185 ext4: fix warning inside ext4_convert_unwritten_extents_endio
In reply to Greg Kroah-HartmanFrom: Rakesh Pandit <[email protected]>
commit e3d550c2c4f2f3dba469bc3c4b83d9332b4e99e1 upstream.
Really enable warning when CONFIG_EXT4_DEBUG is set and fix missing first argument. This was introduced in commit ff95ec22cd7f ("ext4:
add warning to ext4_convert_unwritten_extents_endio") and splitting extents inside endio would trigger it.
--- fs/ext4/extents.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/ext4/extents.c +2 -2
@@ -3756,8 +3756,8 @@ static int ext4_convert_unwritten_extent* illegal. */ if (ee_block != map->m_lblk || ee_len > map->m_len) { -#ifdef EXT4_DEBUG -ext4_warning ("Inode (%ld) finished: extent logical block %llu," +#ifdef CONFIG_EXT4_DEBUG +ext4_warning (inode->i_sb,"Inode (%ld) finished: extent logical block %llu," " len %u; IO logical block %llu, len %u" , inode->i_ino, (unsigned long long )ee_block, ee_len, (unsigned long long )map->m_lblk, map->m_len);
Greg Kroah-Hartman
maintainerPATCH 176/185 ext4: fix punch hole for inline_data file systems
In reply to Greg Kroah-HartmanFrom: Theodore Ts'o <[email protected]>
commit c1e8220bd316d8ae8e524df39534b8a412a45d5e upstream.
If a program attempts to punch a hole on an inline data file, we need to convert it to a normal file first.
This was detected using ext4/032 using the adv configuration. Simple reproducer:
mke2fs -Fq -t ext4 -O inline_data /dev/vdc
mount /vdc
echo "" > /vdc/testfilexfs_io -c 'truncate 33554432' /vdc/testfilexfs_io -c 'fpunch 0 1048576' /vdc/testfile
umount /vdc
e2fsck -fy /dev/vdc
--- fs/ext4/inode.c | 9 +++++++++ 1 file changed, 9 insertions(+)
fs/ext4/inode.c +9 -0
@@ -4177,6 +4177,15 @@ int ext4_punch_hole(struct inode *inode,trace_ext4_punch_hole (inode, offset, length,0 ); +ext4_clear_inode_state (inode,EXT4_STATE_MAY_INLINE_DATA ); +if (ext4_has_inline_data (inode)) { +down_write (&EXT4_I (inode)->i_mmap_sem); + ret =ext4_convert_inline_data (inode); +up_write (&EXT4_I (inode)->i_mmap_sem); +if (ret) +return ret; + } +/* * Write out all dirty pages to avoid race conditions * Then release them.
Greg Kroah-Hartman
maintainerPATCH 177/185 quota: fix wrong condition in is_quota_modification()
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
commit 6565c182094f69e4ffdece337d395eb7ec760efc upstream.
Quoted from
commit 3da40c7b0898 ("ext4: only call ext4_truncate when size <= isize")
" At LSF we decided that if we truncate up from isize we shouldn't trim
fallocated blocks that were fallocated with KEEP_SIZE and are past the
new i_size. This patch fixes ext4 to do this. "
And generic/092 of fstest have covered this case for long time, however is_quota_modification() didn't adjust based on that rule, so that in below condition, we will lose to quota block change:
- fallocate blocks beyond EOF
- remount
- truncate(file_path, file_size)
Fix it.
--- include/linux/quotaops.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/quotaops.h +1 -1
@@ -22,7 +22,7 @@ static inline struct quota_info *sb_dqop/* i_mutex must being held */ static inline bool is_quota_modification (struct inode *inode,struct iattr *ia) { -return (ia->ia_valid &ATTR_SIZE && ia->ia_size != inode->i_size) || +return (ia->ia_valid &ATTR_SIZE ) || (ia->ia_valid &ATTR_UID && !uid_eq (ia->ia_uid, inode->i_uid)) || (ia->ia_valid &ATTR_GID && !gid_eq (ia->ia_gid, inode->i_gid)); }