December 2020 - Linux-stable-mirror

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.4.47 release. There are 134 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 Thu, 18 Jun 2020 15:30:25 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.47-rc1… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.4.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.4.47-rc1 Marc Zyngier <maz(a)kernel.org> KVM: arm64: Save the host's PtrAuth keys in non-preemptible context Marc Zyngier <maz(a)kernel.org> KVM: arm64: Synchronize sysreg state on injecting an AArch32 exception Juergen Gross <jgross(a)suse.com> xen/pvcalls-back: test for errors when calling backend_connect() Jiri Kosina <jkosina(a)suse.cz> block/floppy: fix contended case in floppy_queue_rq() Ulf Hansson <ulf.hansson(a)linaro.org> mmc: sdio: Fix several potential memory leaks in mmc_sdio_init_card() Ulf Hansson <ulf.hansson(a)linaro.org> mmc: sdio: Fix potential NULL pointer error in mmc_sdio_init_card() Ludovic Desroches <ludovic.desroches(a)microchip.com> ARM: dts: at91: sama5d2_ptc_ek: fix sdmmc0 node description Masahiro Yamada <yamada.masahiro(a)socionext.com> mmc: uniphier-sd: call devm_request_irq() after tmio_mmc_host_probe() Ulf Hansson <ulf.hansson(a)linaro.org> mmc: tmio: Further fixup runtime PM management at remove Ludovic Barre <ludovic.barre(a)st.com> mmc: mmci_sdmmc: fix DMA API warning overlapping mappings Veerabhadrarao Badiganti <vbadigan(a)codeaurora.org> mmc: sdhci-msm: Clear tuning done flag while hs400 tuning Chris Wilson <chris(a)chris-wilson.co.uk> agp/intel: Reinforce the barrier after GTT updates Barret Rhoden <brho(a)google.com> perf: Add cond_resched() to task_function_call() OGAWA Hirofumi <hirofumi(a)mail.parknet.co.jp> fat: don't allow to mount if the FAT length == 0 Wang Hai <wanghai38(a)huawei.com> mm/slub: fix a memory leak in sysfs_slab_add() Ezequiel Garcia <ezequiel(a)collabora.com> drm/vkms: Hold gem object while still in-use Casey Schaufler <casey(a)schaufler-ca.com> Smack: slab-out-of-bounds in vsscanf Qiujun Huang <hqjagain(a)gmail.com> ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb Qiujun Huang <hqjagain(a)gmail.com> ath9x: Fix stack-out-of-bounds Write in ath9k_hif_usb_rx_cb Qiujun Huang <hqjagain(a)gmail.com> ath9k: Fix use-after-free Write in ath9k_htc_rx_msg Qiujun Huang <hqjagain(a)gmail.com> ath9k: Fix use-after-free Read in ath9k_wmi_ctrl_rx Qiujun Huang <hqjagain(a)gmail.com> ath9k: Fix use-after-free Read in htc_connect_service Masami Hiramatsu <mhiramat(a)kernel.org> selftests/ftrace: Return unsupported if no error_log file Dick Kennedy <dick.kennedy(a)broadcom.com> scsi: lpfc: Fix negation of else clause in lpfc_prep_node_fc4type Sumit Saxena <sumit.saxena(a)broadcom.com> scsi: megaraid_sas: TM command refire leads to controller firmware crash Marc Zyngier <maz(a)kernel.org> KVM: arm64: Make vcpu_cp1x() work on Big Endian hosts James Morse <james.morse(a)arm.com> KVM: arm64: Stop writing aarch32's CSSELR into ACTLR Xing Li <lixing(a)loongson.cn> KVM: MIPS: Fix VPN2_MASK definition for variable cpu_vmbits Xing Li <lixing(a)loongson.cn> KVM: MIPS: Define KVM_ENTRYHI_ASID to cpu_asid_mask(&boot_cpu_data) Sean Christopherson <sean.j.christopherson(a)intel.com> KVM: nVMX: Consult only the "basic" exit reason when routing nested exit Paolo Bonzini <pbonzini(a)redhat.com> KVM: nSVM: leave ASID aside in copy_vmcb_control_area Paolo Bonzini <pbonzini(a)redhat.com> KVM: nSVM: fix condition for filtering async PF Sean Christopherson <sean.j.christopherson(a)intel.com> KVM: nVMX: Skip IBPB when switching between vmcs01 and vmcs02 Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> video: fbdev: w100fb: Fix a potential double free. Sam Ravnborg <sam(a)ravnborg.org> video: vt8500lcdfb: fix fallthrough warning Qiuxu Zhuo <qiuxu.zhuo(a)intel.com> EDAC/skx: Use the mcmtr register to retrieve close_pg/bank_xor_enable Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> cpufreq: Fix up cpufreq_boost_set_sw() Suman Anna <s-anna(a)ti.com> remoteproc: Fix and restore the parenting hierarchy for vdev Tero Kristo <t-kristo(a)ti.com> remoteproc: Fall back to using parent memory pool if no dedicated available Eric W. Biederman <ebiederm(a)xmission.com> proc: Use new_inode not new_inode_pseudo Yuxuan Shui <yshuiv7(a)gmail.com> ovl: initialize error in ovl_copy_xattr Maxim Mikityanskiy <maximmi(a)mellanox.com> net/mlx5e: Fix repeated XSK usage on one channel Shay Drory <shayd(a)mellanox.com> net/mlx5: Fix fatal error handling during device load Shay Drory <shayd(a)mellanox.com> net/mlx5: drain health workqueue in case of driver load error tannerlove <tannerlove(a)google.com> selftests/net: in rxtimestamp getopt_long needs terminating null entry Wang Hai <wanghai38(a)huawei.com> dccp: Fix possible memleak in dccp_init and dccp_fini Longpeng(Mike) <longpeng2(a)huawei.com> crypto: virtio: Fix dest length calculation in __virtio_crypto_skcipher_do_req() Longpeng(Mike) <longpeng2(a)huawei.com> crypto: virtio: Fix src/dst scatterlist calculation in __virtio_crypto_skcipher_do_req() Longpeng(Mike) <longpeng2(a)huawei.com> crypto: virtio: Fix use-after-free in virtio_crypto_skcipher_finalize_req() Franck LENORMAND <franck.lenormand(a)nxp.com> firmware: imx: scu: Fix corruption of header Peng Fan <peng.fan(a)nxp.com> firmware: imx-scu: Support one TX and one RX Leonard Crestez <leonard.crestez(a)nxp.com> firmware: imx: warn on unexpected RX Tony Luck <tony.luck(a)intel.com> x86/{mce,mm}: Unmap the entire page if the whole page is affected and poisoned Wei Yongjun <weiyongjun1(a)huawei.com> crypto: drbg - fix error return code in drbg_alloc_state() Eric Biggers <ebiggers(a)google.com> crypto: algapi - Avoid spurious modprobe on LOADED Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> crypto: cavium/nitrox - Fix 'nitrox_get_first_device()' when ndevlist is fully iterated Linus Torvalds <torvalds(a)linux-foundation.org> gup: document and work around "COW can break either way" issue Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> PM: runtime: clk: Fix clk_pm_runtime_get() error path Justin Chen <justinpopo6(a)gmail.com> spi: bcm-qspi: when tx/rx buffer is NULL set to 0 Florian Fainelli <f.fainelli(a)gmail.com> spi: bcm-qspi: Handle clock probe deferral Lukas Wunner <lukas(a)wunner.de> spi: bcm2835aux: Fix controller unregister order Lukas Wunner <lukas(a)wunner.de> spi: bcm2835: Fix controller unregister order Lukas Wunner <lukas(a)wunner.de> spi: pxa2xx: Fix runtime PM ref imbalance on probe error Lukas Wunner <lukas(a)wunner.de> spi: pxa2xx: Fix controller unregister order Lukas Wunner <lukas(a)wunner.de> spi: Fix controller unregister order Lukas Wunner <lukas(a)wunner.de> spi: dw: Fix controller unregister order Ryusuke Konishi <konishi.ryusuke(a)gmail.com> nilfs2: fix null pointer dereference at nilfs_segctor_do_construct() Dave Rodgman <dave.rodgman(a)arm.com> lib/lzo: fix ambiguous encoding bug in lzo-rle Nick Desaulniers <ndesaulniers(a)google.com> arm64: acpi: fix UBSAN warning Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> ACPI: PM: Avoid using power resources if there are none for D0 Ard Biesheuvel <ardb(a)kernel.org> ACPI: GED: add support for _Exx / _Lxx handler methods Qiushi Wu <wu000273(a)umn.edu> ACPI: CPPC: Fix reference count leak in acpi_cppc_processor_probe() Qiushi Wu <wu000273(a)umn.edu> ACPI: sysfs: Fix reference count leak in acpi_sysfs_add_hotplug_profile() Kai-Heng Feng <kai.heng.feng(a)canonical.com> ALSA: usb-audio: Add vendor, product and profile name for HP Thunderbolt Dock Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Fix inconsistent card PM state after resume Michał Mirosław <mirq-linux(a)rere.qmqm.pl> ALSA: pcm: fix snd_pcm_link() lockdep splat Michał Mirosław <mirq-linux(a)rere.qmqm.pl> ALSA: pcm: disallow linking stream to itself Hui Wang <hui.wang(a)canonical.com> ALSA: hda/realtek - add a pintbl quirk for several Lenovo machines Takashi Sakamoto <o-takashi(a)sakamocchi.jp> ALSA: fireface: fix configuration error for nominal sampling transfer frequency Chuhong Yuan <hslester96(a)gmail.com> ALSA: es1688: Add the missed snd_card_free() Fabio Estevam <festevam(a)gmail.com> watchdog: imx_sc_wdt: Fix reboot on crash Namjae Jeon <namjae.jeon(a)samsung.com> smb3: add indatalen that can be a non-zero value to calculation of credit charge in smb2 ioctl Steve French <stfrench(a)microsoft.com> smb3: fix incorrect number of credits when ioctl MaxOutputResponse > 64K Ard Biesheuvel <ardb(a)kernel.org> efi/efivars: Add missing kobject_put() in sysfs entry creation error path Denis Efremov <efremov(a)linux.com> io_uring: use kvfree() in io_sqe_buffer_register() Pavel Dobias <dobias(a)2n.cz> ASoC: max9867: fix volume controls Christophe Leroy <christophe.leroy(a)csgroup.eu> powerpc/ptdump: Properly handle non standard page size Eiichi Tsukata <eiichi.tsukata(a)nutanix.com> KVM: x86: Fix APIC page invalidation race Felipe Franciosi <felipe(a)nutanix.com> KVM: x86: respect singlestep when emulating instruction Sean Christopherson <sean.j.christopherson(a)intel.com> KVM: x86/mmu: Set mmio_value to '0' if reserved #PF can't be generated Kan Liang <kan.liang(a)linux.intel.com> perf/x86/intel: Add more available bits for OFFCORE_RESPONSE of Intel Tremont Hill Ma <maahiuzeon(a)gmail.com> x86/reboot/quirks: Add MacBook6,1 reboot quirk Anthony Steinhauser <asteinhauser(a)google.com> x86/speculation: PR_SPEC_FORCE_DISABLE enforcement for indirect branches. Anthony Steinhauser <asteinhauser(a)google.com> x86/speculation: Avoid force-disabling IBPB based on STIBP and enhanced IBRS. Anthony Steinhauser <asteinhauser(a)google.com> x86/speculation: Prevent rogue cross-process SSBD shutdown Xiaochun Lee <lixc17(a)lenovo.com> x86/PCI: Mark Intel C620 MROMs as having non-compliant BARs Bob Haarman <inglorion(a)google.com> x86_64: Fix jiffies ODR violation Qiujun Huang <hqjagain(a)gmail.com> sctp: fix refcount bug in sctp_wfree Marcelo Ricardo Leitner <marcelo.leitner(a)gmail.com> sctp: fix possibly using a bad saddr with a given dst Luca Coelho <luciano.coelho(a)intel.com> iwlwifi: mvm: fix NVM check for 3168 devices Qian Cai <cai(a)lca.pw> ipv4: fix a RCU-list lock in fib_triestat_seq_show Miklos Szeredi <mszeredi(a)redhat.com> aio: fix async fsync creds Amir Goldstein <amir73il(a)gmail.com> fanotify: fix ignore mask logic for events on child and on dir Vlad Buslov <vladbu(a)mellanox.com> selftests: fix flower parent qdisc Waiman Long <longman(a)redhat.com> mm: add kvfree_sensitive() for freeing sensitive data objects Masami Hiramatsu <mhiramat(a)kernel.org> perf probe: Accept the instance number of kretprobe event Heikki Krogerus <heikki.krogerus(a)linux.intel.com> kobject: Make sure the parent does not get released before its children Bjorn Helgaas <bhelgaas(a)google.com> PCI/PM: Adjust pcie_wait_for_link_delay() for caller delay Paolo Bonzini <pbonzini(a)redhat.com> KVM: x86: only do L1TF workaround on affected processors Kim Phillips <kim.phillips(a)amd.com> x86/cpu/amd: Make erratum #1054 a legacy erratum Petr Tesarik <ptesarik(a)suse.com> s390/pci: Log new handle in clp_disable_fh() Daniel Jordan <daniel.m.jordan(a)oracle.com> padata: add separate cpuhp node for CPUHP_PADATA_DEAD Jason Gunthorpe <jgg(a)ziepe.ca> RDMA/uverbs: Make the event_queue fds return POLLERR when disassociated Arnd Bergmann <arnd(a)arndb.de> smack: avoid unused 'sip' variable warning Masashi Honma <masashi.honma(a)gmail.com> ath9k_htc: Silence undersized packet warnings Sasha Levin <sashal(a)kernel.org> spi: dw: Fix native CS being unset Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> ASoC: SOF: imx: fix undefined reference issue YueHaibing <yuehaibing(a)huawei.com> ASoC: SOF: imx8: Fix randbuild error Cédric Le Goater <clg(a)kaod.org> powerpc/xive: Clear the page tables for the ESB IO mapping Thomas Falcon <tlfalcon(a)linux.ibm.com> drivers/net/ibmvnic: Update VNIC protocol version reporting Andreas Gruenbacher <agruenba(a)redhat.com> gfs2: Even more gfs2_find_jhead fixes Guo Ren <guoren(a)linux.alibaba.com> csky: Fixup abiv2 syscall_trace break a4 & a5 Dennis Kadioglu <denk(a)eclipso.email> Input: synaptics - add a second working PNP_ID for Lenovo T470s Jens Axboe <axboe(a)kernel.dk> sched/fair: Don't NUMA balance for kthreads Fredrik Strupe <fredrik(a)strupe.net> ARM: 8977/1: ptrace: Fix mask for thumb breakpoint hook Stephan Gerhold <stephan(a)gerhold.net> Input: mms114 - fix handling of mms345l Nick Desaulniers <ndesaulniers(a)google.com> elfnote: mark all .note sections SHF_ALLOC Fangrui Song <maskray(a)google.com> bpf: Support llvm-objcopy for vmlinux BTF Ido Schimmel <idosch(a)mellanox.com> vxlan: Avoid infinite loop when suppressing NS messages with invalid options Ido Schimmel <idosch(a)mellanox.com> bridge: Avoid infinite loop when suppressing NS messages with invalid options Willem de Bruijn <willemb(a)google.com> tun: correct header offsets in napi frags mode Vasily Averin <vvs(a)virtuozzo.com> net_failover: fixed rollback in net_failover_open() Vadim Pasternak <vadimp(a)mellanox.com> mlxsw: core: Use different get_trend() callbacks for different thermal zones Hangbin Liu <liuhangbin(a)gmail.com> ipv6: fix IPV6_ADDRFORM operation logic ------------- Diffstat: Documentation/lzo.txt | 8 +- Makefile | 4 +- arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts | 2 - arch/arm/include/asm/kvm_emulate.h | 3 +- arch/arm/include/asm/kvm_host.h | 2 + arch/arm/kernel/ptrace.c | 4 +- arch/arm64/include/asm/acpi.h | 5 +- arch/arm64/include/asm/kvm_emulate.h | 6 -- arch/arm64/include/asm/kvm_host.h | 8 +- arch/arm64/kvm/handle_exit.c | 19 +---- arch/arm64/kvm/sys_regs.c | 10 ++- arch/csky/abiv2/inc/abi/entry.h | 2 + arch/csky/kernel/entry.S | 6 +- arch/mips/include/asm/kvm_host.h | 6 +- arch/powerpc/kernel/vmlinux.lds.S | 6 -- arch/powerpc/mm/ptdump/ptdump.c | 21 ++--- arch/powerpc/sysdev/xive/common.c | 5 ++ arch/s390/pci/pci_clp.c | 3 +- arch/x86/events/intel/core.c | 4 +- arch/x86/include/asm/set_memory.h | 19 +++-- arch/x86/kernel/cpu/amd.c | 3 +- arch/x86/kernel/cpu/bugs.c | 92 +++++++++++++--------- arch/x86/kernel/cpu/mce/core.c | 11 ++- arch/x86/kernel/process.c | 28 +++---- arch/x86/kernel/reboot.c | 8 ++ arch/x86/kernel/time.c | 4 - arch/x86/kernel/vmlinux.lds.S | 4 +- arch/x86/kvm/mmu.c | 46 +++++------ arch/x86/kvm/svm.c | 6 +- arch/x86/kvm/vmx/nested.c | 4 +- arch/x86/kvm/vmx/vmx.c | 18 ++++- arch/x86/kvm/vmx/vmx.h | 3 +- arch/x86/kvm/x86.c | 9 +-- arch/x86/pci/fixup.c | 4 + crypto/algapi.c | 2 +- crypto/drbg.c | 4 +- drivers/acpi/cppc_acpi.c | 1 + drivers/acpi/device_pm.c | 2 +- drivers/acpi/evged.c | 22 +++++- drivers/acpi/scan.c | 28 ++++--- drivers/acpi/sysfs.c | 4 +- drivers/block/floppy.c | 10 +-- drivers/char/agp/intel-gtt.c | 4 +- drivers/clk/clk.c | 6 +- drivers/cpufreq/cpufreq.c | 11 +-- drivers/crypto/cavium/nitrox/nitrox_main.c | 4 +- drivers/crypto/virtio/virtio_crypto_algs.c | 21 +++-- drivers/edac/i10nm_base.c | 2 +- drivers/edac/skx_base.c | 20 ++--- drivers/edac/skx_common.c | 6 +- drivers/edac/skx_common.h | 2 +- drivers/firmware/efi/efivars.c | 4 +- drivers/firmware/imx/imx-scu.c | 72 +++++++++++++---- drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 8 ++ drivers/gpu/drm/vkms/vkms_drv.h | 5 -- drivers/gpu/drm/vkms/vkms_gem.c | 11 +-- drivers/infiniband/core/uverbs_main.c | 2 + drivers/input/mouse/synaptics.c | 1 + drivers/input/touchscreen/mms114.c | 12 ++- drivers/mmc/core/sdio.c | 61 +++++++------- drivers/mmc/host/mmci_stm32_sdmmc.c | 3 + drivers/mmc/host/sdhci-msm.c | 6 ++ drivers/mmc/host/tmio_mmc_core.c | 6 +- drivers/mmc/host/uniphier-sd.c | 12 +-- drivers/net/ethernet/ibm/ibmvnic.c | 8 +- .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 4 + drivers/net/ethernet/mellanox/mlx5/core/health.c | 14 +++- drivers/net/ethernet/mellanox/mlx5/core/main.c | 5 ++ drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 23 +++++- drivers/net/net_failover.c | 3 +- drivers/net/tun.c | 14 +++- drivers/net/vxlan.c | 4 + drivers/net/wireless/ath/ath9k/hif_usb.c | 58 +++++++++++--- drivers/net/wireless/ath/ath9k/hif_usb.h | 6 ++ drivers/net/wireless/ath/ath9k/htc_drv_init.c | 10 ++- drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 6 +- drivers/net/wireless/ath/ath9k/htc_hst.c | 6 +- drivers/net/wireless/ath/ath9k/wmi.c | 6 +- drivers/net/wireless/ath/ath9k/wmi.h | 3 +- drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 2 +- drivers/pci/pci.c | 4 +- drivers/remoteproc/remoteproc_core.c | 2 +- drivers/remoteproc/remoteproc_virtio.c | 12 +++ drivers/scsi/lpfc/lpfc_ct.c | 1 - drivers/scsi/megaraid/megaraid_sas_fusion.c | 7 +- drivers/spi/spi-bcm-qspi.c | 20 +++-- drivers/spi/spi-bcm2835.c | 4 +- drivers/spi/spi-bcm2835aux.c | 4 +- drivers/spi/spi-dw.c | 14 +++- drivers/spi/spi-pxa2xx.c | 5 +- drivers/spi/spi.c | 3 +- drivers/video/fbdev/vt8500lcdfb.c | 1 + drivers/video/fbdev/w100fb.c | 2 + drivers/watchdog/imx_sc_wdt.c | 5 ++ drivers/xen/pvcalls-back.c | 3 +- fs/aio.c | 8 ++ fs/cifs/smb2pdu.c | 4 +- fs/fat/inode.c | 6 ++ fs/gfs2/lops.c | 15 ++-- fs/io_uring.c | 4 +- fs/nilfs2/segment.c | 2 + fs/notify/fanotify/fanotify.c | 5 +- fs/overlayfs/copy_up.c | 2 +- fs/proc/inode.c | 2 +- fs/proc/self.c | 2 +- fs/proc/thread_self.c | 2 +- include/asm-generic/vmlinux.lds.h | 22 +++++- include/linux/elfnote.h | 2 +- include/linux/kvm_host.h | 4 +- include/linux/mm.h | 1 + include/linux/padata.h | 6 +- include/linux/set_memory.h | 2 +- include/net/inet_hashtables.h | 6 ++ kernel/bpf/sysfs_btf.c | 11 ++- kernel/events/core.c | 23 +++--- kernel/padata.c | 14 ++-- kernel/sched/fair.c | 2 +- lib/kobject.c | 30 ++++--- lib/lzo/lzo1x_compress.c | 13 +++ mm/gup.c | 44 +++++++++-- mm/huge_memory.c | 7 +- mm/slub.c | 4 +- mm/util.c | 18 +++++ net/bridge/br_arp_nd_proxy.c | 4 + net/dccp/proto.c | 7 +- net/ipv4/fib_trie.c | 3 + net/ipv6/ipv6_sockglue.c | 13 +-- net/sctp/ipv6.c | 20 +++-- net/sctp/protocol.c | 28 ++++--- net/sctp/socket.c | 31 ++++++-- scripts/link-vmlinux.sh | 24 +++--- security/keys/internal.h | 11 --- security/keys/keyctl.c | 16 ++-- security/smack/smack.h | 6 -- security/smack/smack_lsm.c | 25 ++---- security/smack/smackfs.c | 10 +++ sound/core/pcm_native.c | 20 ++++- sound/firewire/fireface/ff-protocol-latter.c | 12 +-- sound/isa/es1688/es1688.c | 4 +- sound/pci/hda/patch_realtek.c | 6 ++ sound/soc/codecs/max9867.c | 4 +- sound/soc/sof/imx/Kconfig | 17 +++- sound/usb/card.c | 19 +++-- sound/usb/quirks-table.h | 20 +++++ sound/usb/usbaudio.h | 2 +- tools/perf/util/probe-event.c | 3 +- .../ftrace/test.d/ftrace/tracing-error-log.tc | 2 + .../networking/timestamping/rxtimestamp.c | 1 + .../tc-testing/tc-tests/filters/tests.json | 6 +- tools/testing/selftests/tc-testing/tdc_batch.py | 6 +- virt/kvm/arm/aarch32.c | 28 +++++++ virt/kvm/arm/arm.c | 22 +++++- virt/kvm/kvm_main.c | 26 +++--- 153 files changed, 1079 insertions(+), 572 deletions(-)

3 years, 11 months

5
140
0 0

[PATCH v3] riscv: set max_pfn to the PFN of the last page

by Vincent Chen

The current max_pfn equals to zero. In this case, I found it caused users cannot get some page information through /proc such as kpagecount in v5.6 kernel because of new sanity checks. The following message is displayed by stress-ng test suite with the command "stress-ng --verbose --physpage 1 -t 1" on HiFive unleashed board. # stress-ng --verbose --physpage 1 -t 1 stress-ng: debug: [109] 4 processors online, 4 processors configured stress-ng: info: [109] dispatching hogs: 1 physpage stress-ng: debug: [109] cache allocate: reducing cache level from L3 (too high) to L0 stress-ng: debug: [109] get_cpu_cache: invalid cache_level: 0 stress-ng: info: [109] cache allocate: using built-in defaults as no suitable cache found stress-ng: debug: [109] cache allocate: default cache size: 2048K stress-ng: debug: [109] starting stressors stress-ng: debug: [109] 1 stressor spawned stress-ng: debug: [110] stress-ng-physpage: started [110] (instance 0) stress-ng: error: [110] stress-ng-physpage: cannot read page count for address 0x3fd34de000 in /proc/kpagecount, errno=0 (Success) stress-ng: error: [110] stress-ng-physpage: cannot read page count for address 0x3fd32db078 in /proc/kpagecount, errno=0 (Success) ... stress-ng: error: [110] stress-ng-physpage: cannot read page count for address 0x3fd32db078 in /proc/kpagecount, errno=0 (Success) stress-ng: debug: [110] stress-ng-physpage: exited [110] (instance 0) stress-ng: debug: [109] process [110] terminated stress-ng: info: [109] successful run completed in 1.00s # After applying this patch, the kernel can pass the test. # stress-ng --verbose --physpage 1 -t 1 stress-ng: debug: [104] 4 processors online, 4 processors configured stress-ng: info: [104] dispatching hogs: 1 physpage stress-ng: info: [104] cache allocate: using defaults, can't determine cache details from sysfs stress-ng: debug: [104] cache allocate: default cache size: 2048K stress-ng: debug: [104] starting stressors stress-ng: debug: [104] 1 stressor spawned stress-ng: debug: [105] stress-ng-physpage: started [105] (instance 0) stress-ng: debug: [105] stress-ng-physpage: exited [105] (instance 0) stress-ng: debug: [104] process [105] terminated stress-ng: info: [104] successful run completed in 1.01s # Fixes: 0651c263c8e3 (RISC-V: Move setup_bootmem() to mm/init.c) Cc: stable(a)vger.kernel.org Signed-off-by: Vincent Chen <vincent.chen(a)sifive.com> Reviewed-by: Anup Patel <anup(a)brainfault.org> Reviewed-by: Yash Shah <yash.shah(a)sifive.com> Tested-by: Yash Shah <yash.shah(a)sifive.com> Changes since v1: 1. Add Fixes line and Cc stable kernel Changes since v2: 1. Fix typo in Anup email address --- arch/riscv/mm/init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index fab855963c73..157924baa191 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -149,7 +149,8 @@ void __init setup_bootmem(void) memblock_reserve(vmlinux_start, vmlinux_end - vmlinux_start); set_max_mapnr(PFN_DOWN(mem_size)); - max_low_pfn = PFN_DOWN(memblock_end_of_DRAM()); + max_pfn = PFN_DOWN(memblock_end_of_DRAM()); + max_low_pfn = max_pfn; #ifdef CONFIG_BLK_DEV_INITRD setup_initrd(); -- 2.7.4

3 years, 11 months

3
2
0 0

FAILED: patch "[PATCH] SMB3.1.1: do not log warning message if server doesn't" failed to apply to 5.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 7955f105afb6034af344038d663bc98809483cdd Mon Sep 17 00:00:00 2001 From: Steve French <stfrench(a)microsoft.com> Date: Wed, 9 Dec 2020 22:19:00 -0600 Subject: [PATCH] SMB3.1.1: do not log warning message if server doesn't populate salt In the negotiate protocol preauth context, the server is not required to populate the salt (although it is done by most servers) so do not warn on mount. We retain the checks (warn) that the preauth context is the minimum size and that the salt does not exceed DataLength of the SMB response. Although we use the defaults in the case that the preauth context response is invalid, these checks may be useful in the future as servers add support for additional mechanisms. CC: Stable <stable(a)vger.kernel.org> Reviewed-by: Shyam Prasad N <sprasad(a)microsoft.com> Reviewed-by: Pavel Shilovsky <pshilov(a)microsoft.com> Signed-off-by: Steve French <stfrench(a)microsoft.com> diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index acb72705062d..fc06c762fbbf 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -427,8 +427,8 @@ build_preauth_ctxt(struct smb2_preauth_neg_context *pneg_ctxt) pneg_ctxt->ContextType = SMB2_PREAUTH_INTEGRITY_CAPABILITIES; pneg_ctxt->DataLength = cpu_to_le16(38); pneg_ctxt->HashAlgorithmCount = cpu_to_le16(1); - pneg_ctxt->SaltLength = cpu_to_le16(SMB311_SALT_SIZE); - get_random_bytes(pneg_ctxt->Salt, SMB311_SALT_SIZE); + pneg_ctxt->SaltLength = cpu_to_le16(SMB311_LINUX_CLIENT_SALT_SIZE); + get_random_bytes(pneg_ctxt->Salt, SMB311_LINUX_CLIENT_SALT_SIZE); pneg_ctxt->HashAlgorithms = SMB2_PREAUTH_INTEGRITY_SHA512; } @@ -566,6 +566,9 @@ static void decode_preauth_context(struct smb2_preauth_neg_context *ctxt) if (len < MIN_PREAUTH_CTXT_DATA_LEN) { pr_warn_once("server sent bad preauth context\n"); return; + } else if (len < MIN_PREAUTH_CTXT_DATA_LEN + le16_to_cpu(ctxt->SaltLength)) { + pr_warn_once("server sent invalid SaltLength\n"); + return; } if (le16_to_cpu(ctxt->HashAlgorithmCount) != 1) pr_warn_once("Invalid SMB3 hash algorithm count\n"); diff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h index fa57b03ca98c..204a622b89ed 100644 --- a/fs/cifs/smb2pdu.h +++ b/fs/cifs/smb2pdu.h @@ -333,12 +333,20 @@ struct smb2_neg_context { /* Followed by array of data */ } __packed; -#define SMB311_SALT_SIZE 32 +#define SMB311_LINUX_CLIENT_SALT_SIZE 32 /* Hash Algorithm Types */ #define SMB2_PREAUTH_INTEGRITY_SHA512 cpu_to_le16(0x0001) #define SMB2_PREAUTH_HASH_SIZE 64 -#define MIN_PREAUTH_CTXT_DATA_LEN (SMB311_SALT_SIZE + 6) +/* + * SaltLength that the server send can be zero, so the only three required + * fields (all __le16) end up six bytes total, so the minimum context data len + * in the response is six bytes which accounts for + * + * HashAlgorithmCount, SaltLength, and 1 HashAlgorithm. + */ +#define MIN_PREAUTH_CTXT_DATA_LEN 6 + struct smb2_preauth_neg_context { __le16 ContextType; /* 1 */ __le16 DataLength; @@ -346,7 +354,7 @@ struct smb2_preauth_neg_context { __le16 HashAlgorithmCount; /* 1 */ __le16 SaltLength; __le16 HashAlgorithms; /* HashAlgorithms[0] since only one defined */ - __u8 Salt[SMB311_SALT_SIZE]; + __u8 Salt[SMB311_LINUX_CLIENT_SALT_SIZE]; } __packed; /* Encryption Algorithms Ciphers */

3 years, 11 months

2
1
0 0

[PATCH] drm/i915/gt: Program mocs:63 for cache eviction on gen9

by Chris Wilson

Ville noticed that the last mocs entry is used unconditionally by the HW when it performs cache evictions, and noted that while the value is not meant to be writable by the driver, we should program it to a reasonable value nevertheless. As it turns out, we can change the value of mocs:63 and the value we were programming into it would cause hard hangs in conjunction with atomic operations. Suggested-by: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/2707 Fixes: 3bbaba0ceaa2 ("drm/i915: Added Programming of the MOCS") Signed-off-by: Chris Wilson <chris(a)chris-wilson.co.uk> Cc: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Cc: Jason Ekstrand <jason(a)jlekstrand.net> Cc: <stable(a)vger.kernel.org> # v4.3+ --- drivers/gpu/drm/i915/gt/intel_mocs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gt/intel_mocs.c b/drivers/gpu/drm/i915/gt/intel_mocs.c index 254873e1646e..6ae512847f64 100644 --- a/drivers/gpu/drm/i915/gt/intel_mocs.c +++ b/drivers/gpu/drm/i915/gt/intel_mocs.c @@ -131,7 +131,10 @@ static const struct drm_i915_mocs_entry skl_mocs_table[] = { GEN9_MOCS_ENTRIES, MOCS_ENTRY(I915_MOCS_CACHED, LE_3_WB | LE_TC_2_LLC_ELLC | LE_LRUM(3), - L3_3_WB) + L3_3_WB), + MOCS_ENTRY(63, + LE_3_WB | LE_TC_1_LLC | LE_LRUM(3), + L3_1_UC) }; /* NOTE: the LE_TGT_CACHE is not used on Broxton */ -- 2.20.1

3 years, 11 months

3
4
0 0

[PATCH v1] trace: Fix race in trace_open and buffer resize call

by Gaurav Kohli

Below race can come, if trace_open and resize of cpu buffer is running parallely on different cpus CPUX CPUY ring_buffer_resize atomic_read(&buffer->resize_disabled) tracing_open tracing_reset_online_cpus ring_buffer_reset_cpu rb_reset_cpu rb_update_pages remove/insert pages resetting pointer This race can cause data abort or some times infinte loop in rb_remove_pages and rb_insert_pages while checking pages for sanity. Take buffer lock to fix this. Signed-off-by: Gaurav Kohli <gkohli(a)codeaurora.org> Cc: stable(a)vger.kernel.org --- Changes since v0: -Addressed Steven's review comments. diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 93ef0ab..15bf28b 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -4866,6 +4866,9 @@ void ring_buffer_reset_cpu(struct trace_buffer *buffer, int cpu) if (!cpumask_test_cpu(cpu, buffer->cpumask)) return; + /* prevent another thread from changing buffer sizes */ + mutex_lock(&buffer->mutex); + atomic_inc(&cpu_buffer->resize_disabled); atomic_inc(&cpu_buffer->record_disabled); @@ -4876,6 +4879,8 @@ void ring_buffer_reset_cpu(struct trace_buffer *buffer, int cpu) atomic_dec(&cpu_buffer->record_disabled); atomic_dec(&cpu_buffer->resize_disabled); + + mutex_unlock(&buffer->mutex); } EXPORT_SYMBOL_GPL(ring_buffer_reset_cpu); @@ -4889,6 +4894,9 @@ void ring_buffer_reset_online_cpus(struct trace_buffer *buffer) struct ring_buffer_per_cpu *cpu_buffer; int cpu; + /* prevent another thread from changing buffer sizes */ + mutex_lock(&buffer->mutex); + for_each_online_buffer_cpu(buffer, cpu) { cpu_buffer = buffer->buffers[cpu]; @@ -4907,6 +4915,8 @@ void ring_buffer_reset_online_cpus(struct trace_buffer *buffer) atomic_dec(&cpu_buffer->record_disabled); atomic_dec(&cpu_buffer->resize_disabled); } + + mutex_unlock(&buffer->mutex); } /** -- Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

3 years, 11 months

4
12
0 0

[PATCH v5] s390/vfio-ap: clean up vfio_ap resources when KVM pointer invalidated

by Tony Krowiak

The vfio_ap device driver registers a group notifier with VFIO when the file descriptor for a VFIO mediated device for a KVM guest is opened to receive notification that the KVM pointer is set (VFIO_GROUP_NOTIFY_SET_KVM event). When the KVM pointer is set, the vfio_ap driver takes the following actions: 1. Stashes the KVM pointer in the vfio_ap_mdev struct that holds the state of the mediated device. 2. Calls the kvm_get_kvm() function to increment its reference counter. 3. Sets the function pointer to the function that handles interception of the instruction that enables/disables interrupt processing. 4. Sets the masks in the KVM guest's CRYCB to pass AP resources through to the guest. In order to avoid memory leaks, when the notifier is called to receive notification that the KVM pointer has been set to NULL, the vfio_ap device driver should reverse the actions taken when the KVM pointer was set. Fixes: 258287c994de ("s390: vfio-ap: implement mediated device open callback") Cc: stable(a)vger.kernel.org Signed-off-by: Tony Krowiak <akrowiak(a)linux.ibm.com> Reviewed-by: Halil Pasic <pasic(a)linux.ibm.com> Reviewed-by: Cornelia Huck <cohuck(a)redhat.com> --- drivers/s390/crypto/vfio_ap_ops.c | 49 ++++++++++++++++++------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/drivers/s390/crypto/vfio_ap_ops.c b/drivers/s390/crypto/vfio_ap_ops.c index e0bde8518745..7339043906cf 100644 --- a/drivers/s390/crypto/vfio_ap_ops.c +++ b/drivers/s390/crypto/vfio_ap_ops.c @@ -1037,19 +1037,14 @@ static int vfio_ap_mdev_set_kvm(struct ap_matrix_mdev *matrix_mdev, { struct ap_matrix_mdev *m; - mutex_lock(&matrix_dev->lock); - list_for_each_entry(m, &matrix_dev->mdev_list, node) { - if ((m != matrix_mdev) && (m->kvm == kvm)) { - mutex_unlock(&matrix_dev->lock); + if ((m != matrix_mdev) && (m->kvm == kvm)) return -EPERM; - } } matrix_mdev->kvm = kvm; kvm_get_kvm(kvm); kvm->arch.crypto.pqap_hook = &matrix_mdev->pqap_hook; - mutex_unlock(&matrix_dev->lock); return 0; } @@ -1083,35 +1078,52 @@ static int vfio_ap_mdev_iommu_notifier(struct notifier_block *nb, return NOTIFY_DONE; } +static void vfio_ap_mdev_unset_kvm(struct ap_matrix_mdev *matrix_mdev) +{ + kvm_arch_crypto_clear_masks(matrix_mdev->kvm); + matrix_mdev->kvm->arch.crypto.pqap_hook = NULL; + vfio_ap_mdev_reset_queues(matrix_mdev->mdev); + kvm_put_kvm(matrix_mdev->kvm); + matrix_mdev->kvm = NULL; +} + static int vfio_ap_mdev_group_notifier(struct notifier_block *nb, unsigned long action, void *data) { - int ret; + int ret, notify_rc = NOTIFY_OK; struct ap_matrix_mdev *matrix_mdev; if (action != VFIO_GROUP_NOTIFY_SET_KVM) return NOTIFY_OK; matrix_mdev = container_of(nb, struct ap_matrix_mdev, group_notifier); + mutex_lock(&matrix_dev->lock); if (!data) { - matrix_mdev->kvm = NULL; - return NOTIFY_OK; + if (matrix_mdev->kvm) + vfio_ap_mdev_unset_kvm(matrix_mdev); + goto notify_done; } ret = vfio_ap_mdev_set_kvm(matrix_mdev, data); - if (ret) - return NOTIFY_DONE; + if (ret) { + notify_rc = NOTIFY_DONE; + goto notify_done; + } /* If there is no CRYCB pointer, then we can't copy the masks */ - if (!matrix_mdev->kvm->arch.crypto.crycbd) - return NOTIFY_DONE; + if (!matrix_mdev->kvm->arch.crypto.crycbd) { + notify_rc = NOTIFY_DONE; + goto notify_done; + } kvm_arch_crypto_set_masks(matrix_mdev->kvm, matrix_mdev->matrix.apm, matrix_mdev->matrix.aqm, matrix_mdev->matrix.adm); - return NOTIFY_OK; +notify_done: + mutex_unlock(&matrix_dev->lock); + return notify_rc; } static void vfio_ap_irq_disable_apqn(int apqn) @@ -1222,13 +1234,8 @@ static void vfio_ap_mdev_release(struct mdev_device *mdev) struct ap_matrix_mdev *matrix_mdev = mdev_get_drvdata(mdev); mutex_lock(&matrix_dev->lock); - if (matrix_mdev->kvm) { - kvm_arch_crypto_clear_masks(matrix_mdev->kvm); - matrix_mdev->kvm->arch.crypto.pqap_hook = NULL; - vfio_ap_mdev_reset_queues(mdev); - kvm_put_kvm(matrix_mdev->kvm); - matrix_mdev->kvm = NULL; - } + if (matrix_mdev->kvm) + vfio_ap_mdev_unset_kvm(matrix_mdev); mutex_unlock(&matrix_dev->lock); vfio_unregister_notifier(mdev_dev(mdev), VFIO_IOMMU_NOTIFY, -- 2.21.1

3 years, 11 months

3
3
0 0

Re: [PATCH 1/1] kernel/crash_core.c - Add crashkernel=auto for x86 and ARM

by Kairui Song

On Fri, Nov 20, 2020 at 4:28 AM Saeed Mirzamohammadi <saeed.mirzamohammadi(a)oracle.com> wrote: > > Hi, > > And I think crashkernel=auto could be used as an indicator that user > want the kernel to control the crashkernel size, so some further work > could be done to adjust the crashkernel more accordingly. eg. when > memory encryption is enabled, increase the crashkernel value for the > auto estimation, as it's known to consume more crashkernel memory. > > Thanks for the suggestion! I tried to keep it simple and leave it to the user to change Kconfig in case a different range is needed. Based on experience, these ranges work well for most of the regular cases. Yes, I think the current implementation is a very good start. There are some use cases, where kernel is expected to reserve more memory, like: - when memory encryption is enabled, an extra swiotlb size of memory should be reserved - on pcc, fadump will expect more memory to be reserved I believe there are a lot more cases like these. I tried to come up with some patches to let the kernel reserve more memory automatically, when such conditions are detected, but changing the crashkernel= specified value is really weird. But if we have a crashkernel=auto, then kernel automatically reserve more memory will make sense. > But why not make it arch-independent? This crashkernel=auto idea > should simply work with every arch. > > > Thanks! I’ll be making it arch-independent in the v2 patch. > > > #include <asm/page.h> > #include <asm/sections.h> > @@ -41,6 +42,15 @@ static int __init parse_crashkernel_mem(char *cmdline, > unsigned long long *crash_base) > { > char *cur = cmdline, *tmp; > + unsigned long long total_mem = system_ram; > + > + /* > + * Firmware sometimes reserves some memory regions for it's own use. > + * so we get less than actual system memory size. > + * Workaround this by round up the total size to 128M which is > + * enough for most test cases. > + */ > + total_mem = roundup(total_mem, SZ_128M); > > > I think this rounding may be better moved to the arch specified part > where parse_crashkernel is called? > > > Thanks for the suggestion. Could you please elaborate why do we need to do that? Every arch gets their total memory value using different methods, (just check every parse_crashkernel call, and the system_ram param is filled in many different ways), so I'm really not sure if this rounding is always suitable. > > Thanks, > Saeed > > -- Best Regards, Kairui Song

3 years, 11 months

4
5
0 0

FAILED: patch "[PATCH] iio: buffer: Fix demux update" failed to apply to 4.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 19ef7b70ca9487773c29b449adf0c70f540a0aab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nuno=20S=C3=A1?= <nuno.sa(a)analog.com> Date: Thu, 12 Nov 2020 15:43:22 +0100 Subject: [PATCH] iio: buffer: Fix demux update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When updating the buffer demux, we will skip a scan element from the device in the case `in_ind != out_ind` and we enter the while loop. in_ind should only be refreshed with `find_next_bit()` in the end of the loop. Note, to cause problems we need a situation where we are skippig over an element (channel not enabled) that happens to not have the same size as the next element. Whilst this is a possible situation we haven't actually identified any cases in mainline where it happens as most drivers have consistent channel storage sizes with the exception of the timestamp which is the last element and hence never skipped over. Fixes: 5ada4ea9be16 ("staging:iio: add demux optionally to path from device to buffer") Signed-off-by: Nuno Sá <nuno.sa(a)analog.com> Link: https://lore.kernel.org/r/20201112144323.28887-1-nuno.sa@analog.com Cc: <Stable(a)vger.kernel.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron(a)huawei.com> diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c index 9663dec3dcf3..2f7426a2f47c 100644 --- a/drivers/iio/industrialio-buffer.c +++ b/drivers/iio/industrialio-buffer.c @@ -853,12 +853,12 @@ static int iio_buffer_update_demux(struct iio_dev *indio_dev, indio_dev->masklength, in_ind + 1); while (in_ind != out_ind) { - in_ind = find_next_bit(indio_dev->active_scan_mask, - indio_dev->masklength, - in_ind + 1); length = iio_storage_bytes_for_si(indio_dev, in_ind); /* Make sure we are aligned */ in_loc = roundup(in_loc, length) + length; + in_ind = find_next_bit(indio_dev->active_scan_mask, + indio_dev->masklength, + in_ind + 1); } length = iio_storage_bytes_for_si(indio_dev, in_ind); out_loc = roundup(out_loc, length);

3 years, 11 months

3
2
0 0

FAILED: patch "[PATCH] spi: npcm-fiu: Disable clock in probe error path" failed to apply to 5.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 234266a5168bbe8220d263e3aa7aa80cf921c483 Mon Sep 17 00:00:00 2001 From: Lukas Wunner <lukas(a)wunner.de> Date: Mon, 7 Dec 2020 09:17:16 +0100 Subject: [PATCH] spi: npcm-fiu: Disable clock in probe error path If the call to devm_spi_register_master() fails on probe of the NPCM FIU SPI driver, the clock "fiu->clk" is erroneously not unprepared and disabled. Fix it. Fixes: ace55c411b11 ("spi: npcm-fiu: add NPCM FIU controller driver") Signed-off-by: Lukas Wunner <lukas(a)wunner.de> Cc: <stable(a)vger.kernel.org> # v5.4+ Cc: Tomer Maimon <tmaimon77(a)gmail.com> Link: https://lore.kernel.org/r/9ae62f4e1cfe542bec57ac2743e6fca9f9548f55.16072868… Signed-off-by: Mark Brown <broonie(a)kernel.org> diff --git a/drivers/spi/spi-npcm-fiu.c b/drivers/spi/spi-npcm-fiu.c index 1cb9329de945..b62471ab6d7f 100644 --- a/drivers/spi/spi-npcm-fiu.c +++ b/drivers/spi/spi-npcm-fiu.c @@ -677,7 +677,7 @@ static int npcm_fiu_probe(struct platform_device *pdev) struct npcm_fiu_spi *fiu; void __iomem *regbase; struct resource *res; - int id; + int id, ret; ctrl = devm_spi_alloc_master(dev, sizeof(*fiu)); if (!ctrl) @@ -735,7 +735,11 @@ static int npcm_fiu_probe(struct platform_device *pdev) ctrl->num_chipselect = fiu->info->max_cs; ctrl->dev.of_node = dev->of_node; - return devm_spi_register_master(dev, ctrl); + ret = devm_spi_register_master(dev, ctrl); + if (ret) + clk_disable_unprepare(fiu->clk); + + return ret; } static int npcm_fiu_remove(struct platform_device *pdev)

3 years, 11 months

3
2
0 0

[PATCH] ASoC: Intel: Skylake: Check the kcontrol against NULL

by Lukasz Majczak

There is no check for the kcontrol against NULL and in some cases it causes kernel to crash. Fixes: 2d744ecf2b984 ("ASoC: Intel: Skylake: Automatic DMIC format configuration according to information from NHLT") Cc: <stable(a)vger.kernel.org> # 5.4+ Signed-off-by: Lukasz Majczak <lma(a)semihalf.com> --- sound/soc/intel/skylake/skl-topology.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index ae466cd592922..c9abbe4ff0ba3 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -3618,12 +3618,18 @@ static void skl_tplg_complete(struct snd_soc_component *component) int i; list_for_each_entry(dobj, &component->dobj_list, list) { - struct snd_kcontrol *kcontrol = dobj->control.kcontrol; - struct soc_enum *se = - (struct soc_enum *)kcontrol->private_value; - char **texts = dobj->control.dtexts; + struct snd_kcontrol *kcontrol; + struct soc_enum *se; + char **texts; char chan_text[4]; + kcontrol = dobj->control.kcontrol; + if(!kcontrol) + continue; + + se = (struct soc_enum *)kcontrol->private_value; + texts = dobj->control.dtexts; + if (dobj->type != SND_SOC_DOBJ_ENUM || dobj->control.kcontrol->put != skl_tplg_multi_config_set_dmic) base-commit: 69fe63aa100220c8fd1f451dd54dd0895df1441d -- 2.25.1

3 years, 11 months

6
8
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror December 2020