December 2020 - Linux-stable-mirror

[PATCH AUTOSEL 5.10 001/217] soc: aspeed-lpc-ctrl: Fail probe of lpc-ctrl if reserved memory is not aligned

by Sasha Levin

From: Andrew Jeffery <andrew(a)aj.id.au> [ Upstream commit 6bf4ddbe2b4805f0628922446a7e85e34013cd10 ] Alignment is a hardware constraint of the LPC2AHB bridge, and misaligned reserved memory will present as corrupted data. Signed-off-by: Andrew Jeffery <andrew(a)aj.id.au> Reviewed-by: Joel Stanley <joel(a)jms.id.au> Link: https://lore.kernel.org/r/20191016233950.10100-1-andrew@aj.id.au Signed-off-by: Joel Stanley <joel(a)jms.id.au> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- drivers/soc/aspeed/aspeed-lpc-ctrl.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/soc/aspeed/aspeed-lpc-ctrl.c b/drivers/soc/aspeed/aspeed-lpc-ctrl.c index 01ed21e8bfee5..dd147af494fdf 100644 --- a/drivers/soc/aspeed/aspeed-lpc-ctrl.c +++ b/drivers/soc/aspeed/aspeed-lpc-ctrl.c @@ -4,6 +4,7 @@ */ #include <linux/clk.h> +#include <linux/log2.h> #include <linux/mfd/syscon.h> #include <linux/miscdevice.h> #include <linux/mm.h> @@ -241,6 +242,18 @@ static int aspeed_lpc_ctrl_probe(struct platform_device *pdev) lpc_ctrl->mem_size = resource_size(&resm); lpc_ctrl->mem_base = resm.start; + + if (!is_power_of_2(lpc_ctrl->mem_size)) { + dev_err(dev, "Reserved memory size must be a power of 2, got %u\n", + (unsigned int)lpc_ctrl->mem_size); + return -EINVAL; + } + + if (!IS_ALIGNED(lpc_ctrl->mem_base, lpc_ctrl->mem_size)) { + dev_err(dev, "Reserved memory must be naturally aligned for size %u\n", + (unsigned int)lpc_ctrl->mem_size); + return -EINVAL; + } } lpc_ctrl->regmap = syscon_node_to_regmap( -- 2.27.0

3 years, 9 months

2
79
0 0

[PATCH 4.19 00/57] 4.19.161-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.19.161 release. There are 57 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, 03 Dec 2020 08:46:29 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.161-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.19.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.19.161-rc1 Alan Stern <stern(a)rowland.harvard.edu> USB: core: Fix regression in Hercules audio card Xiaochen Shen <xiaochen.shen(a)intel.com> x86/resctrl: Add necessary kernfs_put() calls to prevent refcount leak Xiaochen Shen <xiaochen.shen(a)intel.com> x86/resctrl: Remove superfluous kernfs_get() calls to prevent refcount leak Anand K Mistry <amistry(a)google.com> x86/speculation: Fix prctl() when spectre_v2_user={seccomp,prctl},ibpb Zhang Qilong <zhangqilong3(a)huawei.com> usb: gadget: Fix memleak in gadgetfs_fill_super penghao <penghao(a)uniontech.com> USB: quirks: Add USB_QUIRK_DISCONNECT_SUSPEND quirk for Lenovo A630Z TIO built-in usb-audio card Zhang Qilong <zhangqilong3(a)huawei.com> usb: gadget: f_midi: Fix memleak in f_midi_alloc Alan Stern <stern(a)rowland.harvard.edu> USB: core: Change %pK for __user pointers to %px Masami Hiramatsu <mhiramat(a)kernel.org> perf probe: Fix to die_entrypc() returns error correctly Marc Kleine-Budde <mkl(a)pengutronix.de> can: m_can: fix nominal bitiming tseg2 min for version >= 3.1 Kaixu Xia <kaixuxia(a)tencent.com> platform/x86: toshiba_acpi: Fix the wrong variable assignment Benjamin Berg <bberg(a)redhat.com> platform/x86: thinkpad_acpi: Send tablet mode switch at wakeup time Marc Kleine-Budde <mkl(a)pengutronix.de> can: gs_usb: fix endianess problem with candleLight firmware Ard Biesheuvel <ardb(a)kernel.org> efivarfs: revert "fix memory leak in efivarfs_create()" Rui Miguel Silva <rui.silva(a)linaro.org> optee: add writeback to valid memory type Lijun Pan <ljp(a)linux.ibm.com> ibmvnic: fix NULL pointer dereference in ibmvic_reset_crq Lijun Pan <ljp(a)linux.ibm.com> ibmvnic: fix NULL pointer dereference in reset_sub_crq_queues Shay Agroskin <shayagr(a)amazon.com> net: ena: set initial DMA width to avoid intel iommu issue Krzysztof Kozlowski <krzk(a)kernel.org> nfc: s3fwrn5: use signed integer for parsing GPIO numbers Xiongfeng Wang <wangxiongfeng2(a)huawei.com> IB/mthca: fix return value of error branch in mthca_init_cq() Julian Wiedmann <jwi(a)linux.ibm.com> s390/qeth: fix tear down of async TX buffers Raju Rangoju <rajur(a)chelsio.com> cxgb4: fix the panic caused by non smac rewrite Michael Chan <michael.chan(a)broadcom.com> bnxt_en: Release PCI regions when DMA mask setup fails during probe. Dexuan Cui <decui(a)microsoft.com> video: hyperv_fb: Fix the cache type when mapping the VRAM Zhang Changzhong <zhangchangzhong(a)huawei.com> bnxt_en: fix error return code in bnxt_init_board() Zhang Changzhong <zhangchangzhong(a)huawei.com> bnxt_en: fix error return code in bnxt_init_one() Stanley Chu <stanley.chu(a)mediatek.com> scsi: ufs: Fix race between shutdown and runtime resume flow Marc Kleine-Budde <mkl(a)pengutronix.de> ARM: dts: dra76x: m_can: fix order of clocks Taehee Yoo <ap420073(a)gmail.com> batman-adv: set .owner to THIS_MODULE Marc Zyngier <maz(a)kernel.org> phy: tegra: xusb: Fix dangling pointer on probe failure Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> xtensa: uaccess: Add missing __user to strncpy_from_user() prototype Sami Tolvanen <samitolvanen(a)google.com> perf/x86: fix sysfs type mismatches Mike Christie <michael.christie(a)oracle.com> scsi: target: iscsi: Fix cmd abort fabric stop race Lee Duncan <lduncan(a)suse.com> scsi: libiscsi: Fix NOP race condition Sugar Zhang <sugar.zhang(a)rock-chips.com> dmaengine: pl330: _prep_dma_memcpy: Fix wrong burst size Minwoo Im <minwoo.im.dev(a)gmail.com> nvme: free sq/cq dbbuf pointers when dbbuf set fails Jens Axboe <axboe(a)kernel.dk> proc: don't allow async path resolution of /proc/self components Hans de Goede <hdegoede(a)redhat.com> HID: Add Logitech Dinovo Edge battery quirk Brian Masney <bmasney(a)redhat.com> x86/xen: don't unbind uninitialized lock_kicker_irq Marc Ferland <ferlandm(a)amotus.ca> dmaengine: xilinx_dma: use readl_poll_timeout_atomic variant Chris Ye <lzye(a)google.com> HID: add HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE for Gamevice devices Pablo Ceballos <pceballos(a)google.com> HID: hid-sensor-hub: Fix issue with devices with no report ID Hans de Goede <hdegoede(a)redhat.com> Input: i8042 - allow insmod to succeed on devices without an i8042 controller Jiri Kosina <jkosina(a)suse.cz> HID: add support for Sega Saturn Frank Yang <puilp0502(a)gmail.com> HID: cypress: Support Varmilo Keyboards' media hotkeys Kai Vehmanen <kai.vehmanen(a)linux.intel.com> ALSA: hda/hdmi: fix incorrect locking in hdmi_pcm_close Lyude Paul <lyude(a)redhat.com> drm/atomic_helper: Stop modesets on unregistered connectors harder Will Deacon <will(a)kernel.org> arm64: pgtable: Ensure dirty bit is preserved across pte_wrprotect() Will Deacon <will(a)kernel.org> arm64: pgtable: Fix pte_accessible() Paolo Bonzini <pbonzini(a)redhat.com> KVM: x86: Fix split-irqchip vs interrupt injection window request Paolo Bonzini <pbonzini(a)redhat.com> KVM: x86: handle !lapic_in_kernel case in kvm_cpu_*_extint Zenghui Yu <yuzenghui(a)huawei.com> KVM: arm64: vgic-v3: Drop the reporting of GICR_TYPER.Last for userspace Hauke Mehrtens <hauke(a)hauke-m.de> wireless: Use linux/stddef.h instead of stddef.h Filipe Manana <fdmanana(a)suse.com> btrfs: fix lockdep splat when reading qgroup config on mount Johannes Thumshirn <johannes.thumshirn(a)wdc.com> btrfs: don't access possibly stale fs_info data for printing duplicate device Cong Wang <cong.wang(a)bytedance.com> netfilter: clear skb->next in NF_HOOK_LIST() Igor Lubashev <ilubashe(a)akamai.com> perf event: Check ref_reloc_sym before using it ------------- Diffstat: Makefile | 4 +- arch/arm/boot/dts/dra76x.dtsi | 4 +- arch/arm64/include/asm/pgtable.h | 34 +++--- arch/x86/events/intel/cstate.c | 6 +- arch/x86/events/intel/rapl.c | 14 +-- arch/x86/events/intel/uncore.c | 4 +- arch/x86/events/intel/uncore.h | 12 +- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kernel/cpu/bugs.c | 4 +- arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 65 +++++------ arch/x86/kvm/irq.c | 85 ++++++-------- arch/x86/kvm/lapic.c | 2 +- arch/x86/kvm/x86.c | 18 +-- arch/x86/xen/spinlock.c | 12 +- arch/xtensa/include/asm/uaccess.h | 2 +- drivers/dma/pl330.c | 2 +- drivers/dma/xilinx/xilinx_dma.c | 4 +- drivers/gpu/drm/drm_atomic.c | 21 ---- drivers/gpu/drm/drm_atomic_helper.c | 21 +++- drivers/gpu/drm/drm_connector.c | 11 +- drivers/gpu/drm/i915/intel_dp_mst.c | 8 +- drivers/hid/hid-cypress.c | 44 +++++++- drivers/hid/hid-ids.h | 8 ++ drivers/hid/hid-input.c | 3 + drivers/hid/hid-quirks.c | 5 + drivers/hid/hid-sensor-hub.c | 3 +- drivers/infiniband/hw/mthca/mthca_cq.c | 10 +- drivers/input/serio/i8042.c | 12 +- drivers/net/can/m_can/m_can.c | 2 +- drivers/net/can/usb/gs_usb.c | 131 ++++++++++++---------- drivers/net/ethernet/amazon/ena/ena_netdev.c | 17 ++- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 3 +- drivers/net/ethernet/ibm/ibmvnic.c | 6 + drivers/nfc/s3fwrn5/i2c.c | 4 +- drivers/nvme/host/pci.c | 15 +++ drivers/phy/tegra/xusb.c | 1 + drivers/platform/x86/thinkpad_acpi.c | 1 + drivers/platform/x86/toshiba_acpi.c | 3 +- drivers/s390/net/qeth_core_main.c | 6 - drivers/scsi/libiscsi.c | 23 ++-- drivers/scsi/ufs/ufshcd.c | 6 +- drivers/target/iscsi/iscsi_target.c | 17 ++- drivers/tee/optee/call.c | 3 +- drivers/usb/core/devio.c | 14 +-- drivers/usb/core/quirks.c | 10 ++ drivers/usb/gadget/function/f_midi.c | 10 +- drivers/usb/gadget/legacy/inode.c | 3 + drivers/video/fbdev/hyperv_fb.c | 7 +- fs/btrfs/qgroup.c | 2 +- fs/btrfs/volumes.c | 8 +- fs/efivarfs/inode.c | 2 + fs/efivarfs/super.c | 1 - fs/proc/self.c | 7 ++ include/drm/drm_connector.h | 71 +++++++++++- include/linux/netfilter.h | 2 +- include/scsi/libiscsi.h | 3 + include/uapi/linux/wireless.h | 6 +- net/batman-adv/log.c | 1 + sound/pci/hda/patch_hdmi.c | 20 ++-- tools/perf/util/dwarf-aux.c | 8 ++ tools/perf/util/event.c | 7 +- virt/kvm/arm/vgic/vgic-mmio-v3.c | 22 +++- 63 files changed, 541 insertions(+), 324 deletions(-)

3 years, 9 months

11
77
0 0

[PATCH 4.9 000/128] 4.9.228-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.9.228 release. There are 128 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 Sun, 21 Jun 2020 14:15:50 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.228-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.9.228-rc1 Adrian Hunter <adrian.hunter(a)intel.com> perf symbols: Fix debuginfo search for Ubuntu Masami Hiramatsu <mhiramat(a)kernel.org> perf probe: Do not show the skipped events H. Nikolaus Schaller <hns(a)goldelico.com> w1: omap-hdq: cleanup to add missing newline for some dev_dbg Miquel Raynal <miquel.raynal(a)bootlin.com> mtd: rawnand: pasemi: Fix the probe error path Álvaro Fernández Rojas <noltari(a)gmail.com> mtd: rawnand: brcmnand: fix hamming oob layout NeilBrown <neilb(a)suse.de> sunrpc: clean up properly in gss_mech_unregister() NeilBrown <neilb(a)suse.de> sunrpc: svcauth_gss_register_pseudoflavor must reject duplicate registrations. Masahiro Yamada <masahiroy(a)kernel.org> kbuild: force to build vmlinux if CONFIG_MODVERSION=y Michael Ellerman <mpe(a)ellerman.id.au> drivers/macintosh: Fix memleak in windfarm_pm112 driver Dmitry Osipenko <digetx(a)gmail.com> ARM: tegra: Correct PL310 Auxiliary Control Register initialization Douglas Anderson <dianders(a)chromium.org> kernel/cpu_pm: Fix uninitted local in cpu_pm Al Viro <viro(a)zeniv.linux.org.uk> sparc64: fix misuses of access_process_vm() in genregs32_[sg]et() Al Viro <viro(a)zeniv.linux.org.uk> sparc32: fix register window handling in genregs32_[gs]et() Jonathan Bakker <xc-racer2(a)live.ca> pinctrl: samsung: Save/restore eint_mask over suspend for EINT_TYPE GPIOs Anders Roxell <anders.roxell(a)linaro.org> power: vexpress: add suppress_bind_attrs to true Kai-Heng Feng <kai.heng.feng(a)canonical.com> igb: Report speed and duplex as unknown when device is runtime suspended Larry Finger <Larry.Finger(a)lwfinger.net> b43_legacy: Fix connection problem with WPA3 Larry Finger <Larry.Finger(a)lwfinger.net> b43: Fix connection problem with WPA3 Larry Finger <Larry.Finger(a)lwfinger.net> b43legacy: Fix case where channel status is corrupted Chuhong Yuan <hslester96(a)gmail.com> media: go7007: fix a miss of snd_card_free Christian Lamparter <chunkeey(a)gmail.com> carl9170: remove P2P_GO support Punit Agrawal <punit1.agrawal(a)toshiba.co.jp> e1000e: Relax condition to trigger reset for ME workaround Ashok Raj <ashok.raj(a)intel.com> PCI: Program MPS for RCiEP devices Giuliano Procida <gprocida(a)google.com> blk-mq: move blk_mq_update_nr_hw_queues synchronize_rcu call Omar Sandoval <osandov(a)fb.com> btrfs: fix error handling when submitting direct I/O bio Eric Biggers <ebiggers(a)google.com> ext4: fix race between ext4_sync_parent() and rename() Harshad Shirwadkar <harshadshirwadkar(a)gmail.com> ext4: fix EXT_MAX_EXTENT/INDEX to check for zeroed eh_max Roberto Sassu <roberto.sassu(a)huawei.com> evm: Fix possible memory leak in evm_calc_hmac_or_hash() Roberto Sassu <roberto.sassu(a)huawei.com> ima: Directly assign the ima_default_policy pointer to ima_rules Krzysztof Struczynski <krzysztof.struczynski(a)huawei.com> ima: Fix ima digest hash table key calculation Andrea Arcangeli <aarcange(a)redhat.com> mm: thp: make the THP mapcount atomic against __split_huge_pmd_locked() Marcos Paulo de Souza <mpdesouza(a)suse.com> btrfs: send: emit file capabilities after chown Qiushi Wu <wu000273(a)umn.edu> cpuidle: Fix three reference count leaks Serge Semin <Sergey.Semin(a)baikalelectronics.ru> spi: dw: Return any value retrieved from the dma_transfer callback Haibo Chen <haibo.chen(a)nxp.com> mmc: sdhci-esdhc-imx: fix the mask for tuning start point Xie XiuQi <xiexiuqi(a)huawei.com> ixgbe: fix signed-integer-overflow warning Ulf Hansson <ulf.hansson(a)linaro.org> staging: greybus: sdio: Respect the cmd->busy_timeout from the mmc core YuanJunQing <yuanjunqing66(a)163.com> MIPS: Fix IRQ tracing when call handle_fpe() and handle_msa_fpe() Jiaxun Yang <jiaxun.yang(a)flygoat.com> PCI: Don't disable decoding when mmio_always_on is set Alexander Sverdlin <alexander.sverdlin(a)nokia.com> macvlan: Skip loopback packets in RX handler Finn Thain <fthain(a)telegraphics.com.au> m68k: mac: Don't call via_flush_cache() on Mac IIfx Arvind Sankar <nivedita(a)alum.mit.edu> x86/mm: Stop printing BRK addresses Serge Semin <Sergey.Semin(a)baikalelectronics.ru> mips: Add udelay lpj numbers adjustment Arvind Sankar <nivedita(a)alum.mit.edu> x86/boot: Correct relocation destination on old linkers Pali Rohár <pali(a)kernel.org> mwifiex: Fix memory corruption in dump_station Dan Carpenter <dan.carpenter(a)oracle.com> rtlwifi: Fix a double free in _rtl_usb_tx_urb_setup() Guoqing Jiang <guoqing.jiang(a)cloud.ionos.com> md: don't flush workqueue unconditionally in md_open Daniel Thompson <daniel.thompson(a)linaro.org> kgdb: Fix spurious true from in_dbg_master() Serge Semin <Sergey.Semin(a)baikalelectronics.ru> mips: cm: Fix an invalid error code of INTVN_*_ERR Jiaxun Yang <jiaxun.yang(a)flygoat.com> MIPS: Truncate link address into 32bit for 32bit kernel Jeremy Kerr <jk(a)ozlabs.org> powerpc/spufs: fix copy_to_user while atomic Yunjian Wang <wangyunjian(a)huawei.com> net: allwinner: Fix use correct return type for ndo_start_xmit() Wei Yongjun <weiyongjun1(a)huawei.com> net: lpc-enet: fix error return code in lpc_mii_init() Jann Horn <jannh(a)google.com> exit: Move preemption fixup up, move blocking operations down Nathan Chancellor <natechancellor(a)gmail.com> lib/mpi: Fix 64-bit MIPS build with Clang Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_nat: return EOPNOTSUPP if type or flags are not supported Tiezhu Yang <yangtiezhu(a)loongson.cn> MIPS: Make sparse_init() using top-down allocation Kieran Bingham <kieran.bingham+renesas(a)ideasonboard.com> media: platform: fcp: Set appropriate DMA parameters Colin Ian King <colin.king(a)canonical.com> media: dvb: return -EREMOTEIO on i2c transfer failure. Jitao Shi <jitao.shi(a)mediatek.com> dt-bindings: display: mediatek: control dpi pins mode to avoid leakage Kees Cook <keescook(a)chromium.org> e1000: Distribute switch variables for initialization Christoph Hellwig <hch(a)lst.de> staging: android: ion: use vmap instead of vm_map_ram Jia-Ju Bai <baijiaju1990(a)gmail.com> net: vmxnet3: fix possible buffer overflow caused by bad DMA value in vmxnet3_get_rss() Jon Doron <arilou(a)gmail.com> x86/kvm/hyper-v: Explicitly align hcall param for kvm_hyperv_exit Linus Walleij <linus.walleij(a)linaro.org> ARM: 8978/1: mm: make act_mm() respect THREAD_SIZE Filipe Manana <fdmanana(a)suse.com> btrfs: do not ignore error from btrfs_next_leaf() when inserting checksums Serge Semin <Sergey.Semin(a)baikalelectronics.ru> clocksource: dw_apb_timer_of: Fix missing clockevent timers Serge Semin <Sergey.Semin(a)baikalelectronics.ru> spi: dw: Enable interrupts in accordance with DMA xfer mode Douglas Anderson <dianders(a)chromium.org> kgdb: Prevent infinite recursive entries to the debugger Hsin-Yu Chao <hychao(a)chromium.org> Bluetooth: Add SCO fallback for invalid LMP parameters error Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> spi: dw: Zero DMA Tx and Rx configurations on stack Arthur Kiyanovski <akiyano(a)amazon.com> net: ena: fix error returning in ena_com_get_hash_function() Julien Thierry <jthierry(a)redhat.com> objtool: Ignore empty alternatives Brad Love <brad(a)nextdimension.cc> media: si2157: Better check for running tuner in init Ard Biesheuvel <ardb(a)kernel.org> ACPI: GED: use correct trigger type field in _Exx / _Lxx handling Colin Ian King <colin.king(a)canonical.com> media: dvb_frontend: ensure that inital front end status initialized Xiaolong Huang <butterflyhuangxx(a)gmail.com> can: kvaser_usb: kvaser_usb_leaf: Fix some info-leaks to USB devices 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() 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 Marc Zyngier <maz(a)kernel.org> KVM: arm64: Make vcpu_cp1x() work on Big Endian hosts 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 Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> video: fbdev: w100fb: Fix a potential double free. 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 Lukas Wunner <lukas(a)wunner.de> spi: bcm2835: Fix controller unregister order Lukas Wunner <lukas(a)wunner.de> spi: pxa2xx: Fix controller unregister order Lukas Wunner <lukas(a)wunner.de> spi: Fix controller unregister order Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> spi: No need to assign dummy value in spi_unregister_controller() Lukas Wunner <lukas(a)wunner.de> spi: dw: Fix controller unregister order Sasha Levin <sashal(a)kernel.org> spi: dw: fix possible race condition 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. Thomas Lendacky <Thomas.Lendacky(a)amd.com> x86/speculation: Add support for STIBP always-on preferred mode Waiman Long <longman(a)redhat.com> x86/speculation: Change misspelled STIPB to STIBP Michał Mirosław <mirq-linux(a)rere.qmqm.pl> ALSA: pcm: disallow linking stream to itself Justin Chen <justinpopo6(a)gmail.com> spi: bcm-qspi: when tx/rx buffer is NULL set to 0 Lukas Wunner <lukas(a)wunner.de> spi: bcm2835aux: Fix controller unregister order Ryusuke Konishi <konishi.ryusuke(a)gmail.com> nilfs2: fix null pointer dereference at nilfs_segctor_do_construct() Tejun Heo <tj(a)kernel.org> cgroup, blkcg: Prepare some symbols for module and !CONFIG_CGROUP usages 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() Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Fix inconsistent card PM state after resume Chuhong Yuan <hslester96(a)gmail.com> ALSA: es1688: Add the missed snd_card_free() Ard Biesheuvel <ardb(a)kernel.org> efi/efivars: Add missing kobject_put() in sysfs entry creation error path Hill Ma <maahiuzeon(a)gmail.com> x86/reboot/quirks: Add MacBook6,1 reboot quirk 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 Masashi Honma <masashi.honma(a)gmail.com> ath9k_htc: Silence undersized packet warnings Thomas Falcon <tlfalcon(a)linux.ibm.com> drivers/net/ibmvnic: Update VNIC protocol version reporting 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 Su Kang Yin <cantona(a)cantona.net> crypto: talitos - fix ECB and CBC algs ivsize Johannes Thumshirn <jthumshirn(a)suse.de> scsi: return correct blkprep status code in case scsi_init_io() fails. Ido Schimmel <idosch(a)mellanox.com> vxlan: Avoid infinite loop when suppressing NS messages with invalid options Hangbin Liu <liuhangbin(a)gmail.com> ipv6: fix IPV6_ADDRFORM operation logic ------------- Diffstat: .../bindings/display/mediatek/mediatek,dpi.txt | 6 + Documentation/virtual/kvm/api.txt | 2 + Makefile | 17 +- arch/arm/kernel/ptrace.c | 4 +- arch/arm/mach-tegra/tegra.c | 4 +- arch/arm/mm/proc-macros.S | 3 +- arch/arm64/include/asm/kvm_host.h | 6 +- arch/m68k/include/asm/mac_via.h | 1 + arch/m68k/mac/config.c | 21 +- arch/m68k/mac/via.c | 6 +- arch/mips/Makefile | 13 +- arch/mips/boot/compressed/Makefile | 2 +- arch/mips/include/asm/kvm_host.h | 6 +- arch/mips/kernel/genex.S | 6 +- arch/mips/kernel/mips-cm.c | 6 +- arch/mips/kernel/setup.c | 10 + arch/mips/kernel/time.c | 70 +++++++ arch/mips/kernel/vmlinux.lds.S | 2 +- arch/powerpc/platforms/cell/spufs/file.c | 113 ++++++---- arch/sparc/kernel/ptrace_32.c | 228 +++++++++------------ arch/sparc/kernel/ptrace_64.c | 17 +- arch/x86/boot/compressed/head_32.S | 5 +- arch/x86/boot/compressed/head_64.S | 1 + arch/x86/include/asm/cpufeatures.h | 2 +- arch/x86/include/asm/nospec-branch.h | 1 + arch/x86/kernel/cpu/bugs.c | 94 ++++++--- arch/x86/kernel/process.c | 28 +-- arch/x86/kernel/process.h | 2 +- arch/x86/kernel/reboot.c | 8 + arch/x86/kernel/time.c | 4 - arch/x86/kernel/vmlinux.lds.S | 4 +- arch/x86/kvm/svm.c | 2 +- arch/x86/kvm/vmx.c | 2 +- arch/x86/mm/init.c | 2 - arch/x86/pci/fixup.c | 4 + block/blk-mq.c | 8 +- drivers/acpi/cppc_acpi.c | 4 +- drivers/acpi/device_pm.c | 2 +- drivers/acpi/evged.c | 22 +- drivers/acpi/scan.c | 28 ++- drivers/acpi/sysfs.c | 4 +- drivers/char/agp/intel-gtt.c | 4 +- drivers/clocksource/dw_apb_timer_of.c | 6 +- drivers/cpuidle/sysfs.c | 6 +- drivers/crypto/talitos.c | 2 +- drivers/firmware/efi/efivars.c | 4 +- drivers/macintosh/windfarm_pm112.c | 21 +- drivers/md/md.c | 3 +- drivers/media/dvb-core/dvb_frontend.c | 2 +- drivers/media/platform/rcar-fcp.c | 5 + drivers/media/tuners/si2157.c | 15 +- drivers/media/usb/dvb-usb/dibusb-mb.c | 2 +- drivers/media/usb/go7007/snd-go7007.c | 35 ++-- drivers/mmc/host/sdhci-esdhc-imx.c | 2 +- drivers/mtd/nand/brcmnand/brcmnand.c | 11 +- drivers/mtd/nand/pasemi_nand.c | 4 +- drivers/net/can/usb/kvaser_usb.c | 6 +- drivers/net/ethernet/allwinner/sun4i-emac.c | 4 +- drivers/net/ethernet/amazon/ena/ena_com.c | 6 +- drivers/net/ethernet/ibm/ibmvnic.c | 8 +- drivers/net/ethernet/intel/e1000/e1000_main.c | 4 +- drivers/net/ethernet/intel/e1000e/e1000.h | 1 - drivers/net/ethernet/intel/e1000e/netdev.c | 12 +- drivers/net/ethernet/intel/igb/igb_ethtool.c | 3 +- drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 2 +- drivers/net/ethernet/nxp/lpc_eth.c | 3 +- drivers/net/macvlan.c | 4 + drivers/net/vmxnet3/vmxnet3_ethtool.c | 2 + 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 | 3 + drivers/net/wireless/ath/ath9k/wmi.c | 5 +- drivers/net/wireless/ath/ath9k/wmi.h | 3 +- drivers/net/wireless/ath/carl9170/fw.c | 4 +- drivers/net/wireless/ath/carl9170/main.c | 21 +- drivers/net/wireless/broadcom/b43/main.c | 2 +- drivers/net/wireless/broadcom/b43legacy/main.c | 1 + drivers/net/wireless/broadcom/b43legacy/xmit.c | 1 + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 14 +- drivers/net/wireless/realtek/rtlwifi/usb.c | 8 +- drivers/pci/probe.c | 24 ++- drivers/pinctrl/samsung/pinctrl-exynos.c | 9 + drivers/power/reset/vexpress-poweroff.c | 1 + drivers/scsi/scsi_lib.c | 4 +- drivers/spi/spi-bcm-qspi.c | 8 +- drivers/spi/spi-bcm2835.c | 4 +- drivers/spi/spi-bcm2835aux.c | 4 +- drivers/spi/spi-dw-mid.c | 16 +- drivers/spi/spi-dw.c | 14 +- drivers/spi/spi-pxa2xx.c | 4 +- drivers/spi/spi.c | 5 +- drivers/staging/android/ion/ion_heap.c | 4 +- drivers/staging/greybus/sdio.c | 10 +- drivers/video/fbdev/w100fb.c | 2 + drivers/w1/masters/omap_hdq.c | 10 +- fs/btrfs/file-item.c | 6 +- fs/btrfs/inode.c | 6 +- fs/btrfs/send.c | 67 ++++++ fs/ext4/ext4_extents.h | 9 +- fs/ext4/fsync.c | 28 ++- fs/fat/inode.c | 6 + fs/fs-writeback.c | 1 + fs/nilfs2/segment.c | 2 + fs/overlayfs/copy_up.c | 2 +- fs/proc/inode.c | 2 +- fs/proc/self.c | 2 +- fs/proc/thread_self.c | 2 +- include/linux/kgdb.h | 2 +- include/linux/sunrpc/gss_api.h | 1 + include/linux/sunrpc/svcauth_gss.h | 3 +- include/uapi/linux/dvb/frontend.h | 1 + include/uapi/linux/kvm.h | 2 + kernel/cpu_pm.c | 4 +- kernel/debug/debug_core.c | 1 + kernel/events/core.c | 23 ++- kernel/exit.c | 25 ++- kernel/sched/fair.c | 2 +- lib/mpi/longlong.h | 2 +- mm/huge_memory.c | 31 ++- mm/slub.c | 4 +- net/bluetooth/hci_event.c | 1 + net/ipv6/ipv6_sockglue.c | 13 +- net/netfilter/nft_nat.c | 4 +- net/sunrpc/auth_gss/gss_mech_switch.c | 12 +- net/sunrpc/auth_gss/svcauth_gss.c | 18 +- security/integrity/evm/evm_crypto.c | 2 +- security/integrity/ima/ima.h | 7 +- security/integrity/ima/ima_policy.c | 3 +- security/smack/smackfs.c | 10 + sound/core/pcm_native.c | 5 + sound/isa/es1688/es1688.c | 4 +- sound/usb/card.c | 20 +- sound/usb/usbaudio.h | 2 +- tools/objtool/check.c | 6 + tools/perf/builtin-probe.c | 3 + tools/perf/util/dso.c | 16 ++ tools/perf/util/dso.h | 1 + tools/perf/util/probe-finder.c | 1 + tools/perf/util/symbol.c | 2 + 142 files changed, 1010 insertions(+), 566 deletions(-)

3 years, 9 months

6
134
0 0

[PATCH] drm/rockchip: Require the YTR modifier for AFBC

by Alyssa Rosenzweig

The AFBC decoder used in the Rockchip VOP assumes the use of the YUV-like colourspace transform (YTR). YTR is lossless for RGB(A) buffers, which covers the RGBA8 and RGB565 formats supported in vop_convert_afbc_format. Use of YTR is signaled with the AFBC_FORMAT_MOD_YTR modifier, which prior to this commit was missing. As such, a producer would have to generate buffers that do not use YTR, which the VOP would erroneously decode as YTR, leading to severe visual corruption. The upstream AFBC support was developed against a captured frame, which failed to exercise modifier support. Prior to bring-up of AFBC in Mesa (in the Panfrost driver), no open userspace respected modifier reporting. As such, this change is not expected to affect broken userspaces. Tested on RK3399 with Panfrost and Weston. Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig(a)collabora.com> --- drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h index 4a2099cb5..857d97cdc 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h @@ -17,9 +17,20 @@ #define NUM_YUV2YUV_COEFFICIENTS 12 +/* AFBC supports a number of configurable modes. Relevant to us is block size + * (16x16 or 32x8), storage modifiers (SPARSE, SPLIT), and the YUV-like + * colourspace transform (YTR). 16x16 SPARSE mode is always used. SPLIT mode + * could be enabled via the hreg_block_split register, but is not currently + * handled. The colourspace transform is implicitly always assumed by the + * decoder, so consumers must use this transform as well. + * + * Failure to match modifiers will cause errors displaying AFBC buffers + * produced by conformant AFBC producers, including Mesa. + */ #define ROCKCHIP_AFBC_MOD \ DRM_FORMAT_MOD_ARM_AFBC( \ AFBC_FORMAT_MOD_BLOCK_SIZE_16x16 | AFBC_FORMAT_MOD_SPARSE \ + | AFBC_FORMAT_MOD_YTR \ ) enum vop_data_format { -- 2.28.0

3 years, 9 months

5
4
0 0

[PATCH] iio: adc: ab8500-gpadc: Fix off by 10 to 3

by Linus Walleij

Fix an off by three orders of magnitude error in the AB8500 GPADC driver. Luckily it showed up quite quickly when trying to make use of it. The processed reads were returning microvolts, microamperes and microcelsius instead of millivolts, milliamperes and millicelsius as advertised. Cc: stable(a)vger.kernel.org Fixes: 07063bbfa98e ("iio: adc: New driver for the AB8500 GPADC") Signed-off-by: Linus Walleij <linus.walleij(a)linaro.org> --- drivers/iio/adc/ab8500-gpadc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iio/adc/ab8500-gpadc.c b/drivers/iio/adc/ab8500-gpadc.c index 6f9a3e2d5533..7b5212ba5501 100644 --- a/drivers/iio/adc/ab8500-gpadc.c +++ b/drivers/iio/adc/ab8500-gpadc.c @@ -918,7 +918,7 @@ static int ab8500_gpadc_read_raw(struct iio_dev *indio_dev, return processed; /* Return millivolt or milliamps or millicentigrades */ - *val = processed * 1000; + *val = processed; return IIO_VAL_INT; } -- 2.29.2

3 years, 9 months

2
2
0 0

FAILED: patch "[PATCH] scsi: qla2xxx: Fix crash during driver load on big endian" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-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 8de309e7299a00b3045fb274f82b326f356404f0 Mon Sep 17 00:00:00 2001 From: Arun Easi <aeasi(a)marvell.com> Date: Wed, 2 Dec 2020 05:23:04 -0800 Subject: [PATCH] scsi: qla2xxx: Fix crash during driver load on big endian machines Crash stack: [576544.715489] Unable to handle kernel paging request for data at address 0xd00000000f970000 [576544.715497] Faulting instruction address: 0xd00000000f880f64 [576544.715503] Oops: Kernel access of bad area, sig: 11 [#1] [576544.715506] SMP NR_CPUS=2048 NUMA pSeries : [576544.715703] NIP [d00000000f880f64] .qla27xx_fwdt_template_valid+0x94/0x100 [qla2xxx] [576544.715722] LR [d00000000f7952dc] .qla24xx_load_risc_flash+0x2fc/0x590 [qla2xxx] [576544.715726] Call Trace: [576544.715731] [c0000004d0ffb000] [c0000006fe02c350] 0xc0000006fe02c350 (unreliable) [576544.715750] [c0000004d0ffb080] [d00000000f7952dc] .qla24xx_load_risc_flash+0x2fc/0x590 [qla2xxx] [576544.715770] [c0000004d0ffb170] [d00000000f7aa034] .qla81xx_load_risc+0x84/0x1a0 [qla2xxx] [576544.715789] [c0000004d0ffb210] [d00000000f79f7c8] .qla2x00_setup_chip+0xc8/0x910 [qla2xxx] [576544.715808] [c0000004d0ffb300] [d00000000f7a631c] .qla2x00_initialize_adapter+0x4dc/0xb00 [qla2xxx] [576544.715826] [c0000004d0ffb3e0] [d00000000f78ce28] .qla2x00_probe_one+0xf08/0x2200 [qla2xxx] Link: https://lore.kernel.org/r/20201202132312.19966-8-njavali@marvell.com Fixes: f73cb695d3ec ("[SCSI] qla2xxx: Add support for ISP2071.") Cc: stable(a)vger.kernel.org Reviewed-by: Himanshu Madhani <himanshu.madhani(a)oracle.com> Signed-off-by: Arun Easi <aeasi(a)marvell.com> Signed-off-by: Nilesh Javali <njavali(a)marvell.com> Signed-off-by: Martin K. Petersen <martin.petersen(a)oracle.com> diff --git a/drivers/scsi/qla2xxx/qla_tmpl.c b/drivers/scsi/qla2xxx/qla_tmpl.c index 84f4416d366f..a6bb1c0e2245 100644 --- a/drivers/scsi/qla2xxx/qla_tmpl.c +++ b/drivers/scsi/qla2xxx/qla_tmpl.c @@ -928,7 +928,8 @@ qla27xx_template_checksum(void *p, ulong size) static inline int qla27xx_verify_template_checksum(struct qla27xx_fwdt_template *tmp) { - return qla27xx_template_checksum(tmp, tmp->template_size) == 0; + return qla27xx_template_checksum(tmp, + le32_to_cpu(tmp->template_size)) == 0; } static inline int @@ -944,7 +945,7 @@ qla27xx_execute_fwdt_template(struct scsi_qla_host *vha, ulong len = 0; if (qla27xx_fwdt_template_valid(tmp)) { - len = tmp->template_size; + len = le32_to_cpu(tmp->template_size); tmp = memcpy(buf, tmp, len); ql27xx_edit_template(vha, tmp); qla27xx_walk_template(vha, tmp, buf, &len); @@ -960,7 +961,7 @@ qla27xx_fwdt_calculate_dump_size(struct scsi_qla_host *vha, void *p) ulong len = 0; if (qla27xx_fwdt_template_valid(tmp)) { - len = tmp->template_size; + len = le32_to_cpu(tmp->template_size); qla27xx_walk_template(vha, tmp, NULL, &len); } @@ -972,7 +973,7 @@ qla27xx_fwdt_template_size(void *p) { struct qla27xx_fwdt_template *tmp = p; - return tmp->template_size; + return le32_to_cpu(tmp->template_size); } int diff --git a/drivers/scsi/qla2xxx/qla_tmpl.h b/drivers/scsi/qla2xxx/qla_tmpl.h index c47184db5081..6e0987edfceb 100644 --- a/drivers/scsi/qla2xxx/qla_tmpl.h +++ b/drivers/scsi/qla2xxx/qla_tmpl.h @@ -12,7 +12,7 @@ struct __packed qla27xx_fwdt_template { __le32 template_type; __le32 entry_offset; - uint32_t template_size; + __le32 template_size; uint32_t count; /* borrow field for running/residual count */ __le32 entry_count;

3 years, 9 months

3
2
0 0

FAILED: patch "[PATCH] remoteproc: qcom_q6v5_mss: Validate MBA firmware size before" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-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 e013f455d95add874f310dc47c608e8c70692ae5 Mon Sep 17 00:00:00 2001 From: Sibi Sankar <sibis(a)codeaurora.org> Date: Thu, 23 Jul 2020 01:40:45 +0530 Subject: [PATCH] remoteproc: qcom_q6v5_mss: Validate MBA firmware size before load The following mem abort is observed when the mba firmware size exceeds the allocated mba region. MBA firmware size is restricted to a maximum size of 1M and remaining memory region is used by modem debug policy firmware when available. Hence verify whether the MBA firmware size lies within the allocated memory region and is not greater than 1M before loading. Err Logs: Unable to handle kernel paging request at virtual address Mem abort info: ... Call trace: __memcpy+0x110/0x180 rproc_start+0x40/0x218 rproc_boot+0x5b4/0x608 state_store+0x54/0xf8 dev_attr_store+0x44/0x60 sysfs_kf_write+0x58/0x80 kernfs_fop_write+0x140/0x230 vfs_write+0xc4/0x208 ksys_write+0x74/0xf8 __arm64_sys_write+0x24/0x30 ... Reviewed-by: Bjorn Andersson <bjorn.andersson(a)linaro.org> Fixes: 051fb70fd4ea4 ("remoteproc: qcom: Driver for the self-authenticating Hexagon v5") Cc: stable(a)vger.kernel.org Signed-off-by: Sibi Sankar <sibis(a)codeaurora.org> Link: https://lore.kernel.org/r/20200722201047.12975-2-sibis@codeaurora.org Signed-off-by: Bjorn Andersson <bjorn.andersson(a)linaro.org> diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c index 03d7f3d702b3..7826f229957d 100644 --- a/drivers/remoteproc/qcom_q6v5_mss.c +++ b/drivers/remoteproc/qcom_q6v5_mss.c @@ -411,6 +411,12 @@ static int q6v5_load(struct rproc *rproc, const struct firmware *fw) { struct q6v5 *qproc = rproc->priv; + /* MBA is restricted to a maximum size of 1M */ + if (fw->size > qproc->mba_size || fw->size > SZ_1M) { + dev_err(qproc->dev, "MBA firmware load failed\n"); + return -EINVAL; + } + memcpy(qproc->mba_region, fw->data, fw->size); return 0;

3 years, 10 months

3
2
0 0

FAILED: patch "[PATCH] remoteproc: qcom_q6v5_mss: Validate modem blob firmware size" failed to apply to 4.19-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.19-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 135b9e8d1cd8ba5ac9ad9bcf24b464b7b052e5b8 Mon Sep 17 00:00:00 2001 From: Sibi Sankar <sibis(a)codeaurora.org> Date: Thu, 23 Jul 2020 01:40:46 +0530 Subject: [PATCH] remoteproc: qcom_q6v5_mss: Validate modem blob firmware size before load The following mem abort is observed when one of the modem blob firmware size exceeds the allocated mpss region. Fix this by restricting the copy size to segment size using request_firmware_into_buf before load. Err Logs: Unable to handle kernel paging request at virtual address Mem abort info: ... Call trace: __memcpy+0x110/0x180 rproc_start+0xd0/0x190 rproc_boot+0x404/0x550 state_store+0x54/0xf8 dev_attr_store+0x44/0x60 sysfs_kf_write+0x58/0x80 kernfs_fop_write+0x140/0x230 vfs_write+0xc4/0x208 ksys_write+0x74/0xf8 ... Reviewed-by: Bjorn Andersson <bjorn.andersson(a)linaro.org> Fixes: 051fb70fd4ea4 ("remoteproc: qcom: Driver for the self-authenticating Hexagon v5") Cc: stable(a)vger.kernel.org Signed-off-by: Sibi Sankar <sibis(a)codeaurora.org> Link: https://lore.kernel.org/r/20200722201047.12975-3-sibis@codeaurora.org Signed-off-by: Bjorn Andersson <bjorn.andersson(a)linaro.org> diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c index 7826f229957d..8199d9f59209 100644 --- a/drivers/remoteproc/qcom_q6v5_mss.c +++ b/drivers/remoteproc/qcom_q6v5_mss.c @@ -1173,15 +1173,14 @@ static int q6v5_mpss_load(struct q6v5 *qproc) } else if (phdr->p_filesz) { /* Replace "xxx.xxx" with "xxx.bxx" */ sprintf(fw_name + fw_name_len - 3, "b%02d", i); - ret = request_firmware(&seg_fw, fw_name, qproc->dev); + ret = request_firmware_into_buf(&seg_fw, fw_name, qproc->dev, + ptr, phdr->p_filesz); if (ret) { dev_err(qproc->dev, "failed to load %s\n", fw_name); iounmap(ptr); goto release_firmware; } - memcpy(ptr, seg_fw->data, seg_fw->size); - release_firmware(seg_fw); }

3 years, 10 months

2
1
0 0

[PATCH 5.4 000/142] 5.4.44-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.4.44 release. There are 142 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 Wed, 03 Jun 2020 17:38:19 +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.44-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.44-rc1 Changbin Du <changbin.du(a)intel.com> perf: Make perf able to build with latest libbfd Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_conntrack_pptp: fix compilation warning with W=1 build Nathan Chancellor <natechancellor(a)gmail.com> netfilter: conntrack: Pass value of ctinfo to __nf_conntrack_update Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: conntrack: comparison of unsigned in cthelper confirmation Dmitry Torokhov <dmitry.torokhov(a)gmail.com> Revert "Input: i8042 - add ThinkPad S230u to i8042 nomux list" Qiushi Wu <wu000273(a)umn.edu> bonding: Fix reference count leak in bond_sysfs_slave_add. Vladimir Oltean <vladimir.oltean(a)nxp.com> net: dsa: declare lockless TX feature for slave ports David Ahern <dsahern(a)gmail.com> ipv4: nexthop version of fib_info_nh_uses_dev David Ahern <dsahern(a)gmail.com> nexthop: Expand nexthop_is_multipath in a few places Nikolay Aleksandrov <nikolay(a)cumulusnetworks.com> nexthops: don't modify published nexthop groups David Ahern <dsahern(a)gmail.com> nexthops: Move code from remove_nexthop_from_groups to remove_nh_grp_entry Eric Dumazet <edumazet(a)google.com> crypto: chelsio/chtls: properly set tp->lsndtime Qiushi Wu <wu000273(a)umn.edu> qlcnic: fix missing release in qlcnic_83xx_interrupt_test. Björn Töpel <bjorn.topel(a)intel.com> xsk: Add overflow check for u64 division, stored into u32 Pradeep Kumar Chitrapu <pradeepc(a)codeaurora.org> ieee80211: Fix incorrect mask for default PE duration Michael Chan <michael.chan(a)broadcom.com> bnxt_en: Fix accumulation of bp->net_stats_prev. Xin Long <lucien.xin(a)gmail.com> esp6: get the right proto for transport mode in esp6_gso_encap Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_conntrack_pptp: prevent buffer overflows in debug code Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nfnetlink_cthelper: unbreak userspace helper support Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: conntrack: make conntrack userspace helpers work again Phil Sutter <phil(a)nwl.cc> netfilter: ipset: Fix subcounter update skip Michael Braun <michael-dev(a)fami-braun.de> netfilter: nft_reject_bridge: enable reject with bridge vlan Xin Long <lucien.xin(a)gmail.com> ip_vti: receive ipip packet by calling ip_tunnel_rcv Antony Antony <antony(a)phenome.org> xfrm: fix error in comment Xin Long <lucien.xin(a)gmail.com> xfrm: fix a NULL-ptr deref in xfrm_local_error Xin Long <lucien.xin(a)gmail.com> xfrm: fix a warning in xfrm_policy_insert_list Nicolas Dichtel <nicolas.dichtel(a)6wind.com> xfrm interface: fix oops when deleting a x-netns interface Xin Long <lucien.xin(a)gmail.com> xfrm: call xfrm_output_gso when inner_protocol is set in xfrm_output Xin Long <lucien.xin(a)gmail.com> xfrm: remove the xfrm_state_put call becofe going to out_reset Xin Long <lucien.xin(a)gmail.com> xfrm: do pskb_pull properly in __xfrm_transport_prep Xin Long <lucien.xin(a)gmail.com> xfrm: allow to accept packets with ipv6 NEXTHDR_HOP in xfrm_input Al Viro <viro(a)zeniv.linux.org.uk> copy_xstate_to_kernel(): don't leave parts of destination uninitialized Alexander Dahl <post(a)lespocky.de> x86/dma: Fix max PFN arithmetic overflow on 32 bit systems Linus Lüssing <ll(a)simonwunderlich.de> mac80211: mesh: fix discovery timer re-arming issue / crash Andy Lutomirski <luto(a)kernel.org> x86/syscalls: Revert "x86/syscalls: Make __X32_SYSCALL_BIT be unsigned long" Johannes Berg <johannes.berg(a)intel.com> cfg80211: fix debugfs rename crash Helge Deller <deller(a)gmx.de> parisc: Fix kernel panic in mem_init() Qiushi Wu <wu000273(a)umn.edu> iommu: Fix reference count leak in iommu_group_alloc. Linus Walleij <linus.walleij(a)linaro.org> gpio: fix locking open drain IRQ lines Jens Axboe <axboe(a)kernel.dk> Revert "block: end bio with BLK_STS_AGAIN in case of non-mq devs and REQ_NOWAIT" Arnd Bergmann <arnd(a)arndb.de> include/asm-generic/topology.h: guard cpumask_of_node() macro argument Alexander Potapenko <glider(a)google.com> fs/binfmt_elf.c: allocate initialized memory in fill_thread_core_info() Konstantin Khlebnikov <khlebnikov(a)yandex-team.ru> mm: remove VM_BUG_ON(PageSlab()) from page_mapcount() Hugh Dickins <hughd(a)google.com> mm,thp: stop leaking unreleased file pages Valentine Fatiev <valentinef(a)mellanox.com> IB/ipoib: Fix double free of skb in case of multicast traffic in CM mode Simon Ser <contact(a)emersion.fr> drm/amd/display: drop cursor position check in atomic test Jason Gunthorpe <jgg(a)ziepe.ca> RDMA/core: Fix double destruction of uobject Jeff Layton <jlayton(a)kernel.org> ceph: flush release queue when handling caps for unknown inode Jerry Lee <leisurelysw24(a)gmail.com> libceph: ignore pool overlay and cache logic on redirects Kailang Yang <kailang(a)realtek.com> ALSA: hda/realtek - Add new codec supported for ALC287 Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Quirks for Gigabyte TRX40 Aorus Master onboard audio Vinod Koul <vkoul(a)kernel.org> clk: qcom: gcc: Fix parent for gpll0_out_even Eric W. Biederman <ebiederm(a)xmission.com> exec: Always set cap_ambient in cap_bprm_set_creds Chris Chiu <chiu(a)endlessm.com> ALSA: usb-audio: mixer: volume quirk for ESS Technology Asus USB DAC Takashi Iwai <tiwai(a)suse.de> ALSA: hda/realtek - Add a model for Thinkpad T570 without DAC workaround Changming Liu <liu.changm(a)northeastern.edu> ALSA: hwdep: fix a left shifting 1 by 31 UB bug Qiushi Wu <wu000273(a)umn.edu> RDMA/pvrdma: Fix missing pci disable in pvrdma_pci_probe() Tiezhu Yang <yangtiezhu(a)loongson.cn> gpio: bcm-kona: Fix return value of bcm_kona_gpio_probe() Tiezhu Yang <yangtiezhu(a)loongson.cn> gpio: pxa: Fix return value of pxa_gpio_probe() Peng Hao <richard.peng(a)oppo.com> mmc: block: Fix use-after-free issue for rpmb Hamish Martin <hamish.martin(a)alliedtelesis.co.nz> ARM: dts: bcm: HR2: Fix PPI interrupt types Vincent Stehlé <vincent.stehle(a)laposte.net> ARM: dts: bcm2835-rpi-zero-w: Fix led polarity Robert Beckett <bob.beckett(a)collabora.com> ARM: dts/imx6q-bx50v3: Set display interface clock parents Kaike Wan <kaike.wan(a)intel.com> IB/qib: Call kobject_put() when kobject_init_and_add() fails Paul Cercueil <paul(a)crapouillou.net> gpu/drm: Ingenic: Fix opaque pointer casted to wrong type Dennis YC Hsieh <dennis-yc.hsieh(a)mediatek.com> soc: mediatek: cmdq: return send msg error code Hsin-Yi Wang <hsinyi(a)chromium.org> arm64: dts: mt8173: fix vcodec-enc clock Takashi Iwai <tiwai(a)suse.de> gpio: exar: Fix bad handling for ida_simple_get error path Russell King <rmk+kernel(a)armlinux.org.uk> ARM: uaccess: fix DACR mismatch with nested exceptions Russell King <rmk+kernel(a)armlinux.org.uk> ARM: uaccess: integrate uaccess_save and uaccess_restore Russell King <rmk+kernel(a)armlinux.org.uk> ARM: uaccess: consolidate uaccess asm to asm/uaccess-asm.h Łukasz Stelmach <l.stelmach(a)samsung.com> ARM: 8970/1: decompressor: increase tag size Wei Yongjun <weiyongjun1(a)huawei.com> Input: synaptics-rmi4 - fix error return code in rmi_driver_probe() Evan Green <evgreen(a)chromium.org> Input: synaptics-rmi4 - really fix attn_data use-after-free Kevin Locke <kevin(a)kevinlocke.name> Input: i8042 - add ThinkPad S230u to i8042 reset list Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> Input: dlink-dir685-touchkeys - fix a typo in driver name Łukasz Patron <priv.luk(a)gmail.com> Input: xpad - add custom init packet for Xbox One S controllers Brendan Shanks <bshanks(a)codeweavers.com> Input: evdev - call input_flush_device() on release(), not flush() Kevin Locke <kevin(a)kevinlocke.name> Input: i8042 - add ThinkPad S230u to i8042 nomux list James Hilliard <james.hilliard1(a)gmail.com> Input: usbtouchscreen - add support for BonXeon TP Madhuparna Bhowmik <madhuparnabhowmik10(a)gmail.com> drivers: net: hamradio: Fix suspicious RCU usage warning in bpqether.c Matteo Croce <mcroce(a)redhat.com> samples: bpf: Fix build error Al Viro <viro(a)zeniv.linux.org.uk> csky: Fixup raw_copy_from_user() Steve French <stfrench(a)microsoft.com> cifs: Fix null pointer check in cifs_read Amy Shih <amy.shih(a)advantech.com.tw> hwmon: (nct7904) Fix incorrect range of temperature limit registers Liu Yibin <jiulong(a)linux.alibaba.com> csky: Fixup remove duplicate irq_disable Mao Han <han_mao(a)linux.alibaba.com> csky: Fixup perf callchain unwind Liu Yibin <jiulong(a)linux.alibaba.com> csky: Fixup msa highest 3 bits mask Tero Kristo <t-kristo(a)ti.com> clk: ti: am33xx: fix RTC clock parent Kefeng Wang <wangkefeng.wang(a)huawei.com> riscv: stacktrace: Fix undefined reference to `walk_stackframe' Denis V. Lunev <den(a)openvz.org> IB/i40iw: Remove bogus call to netdev_master_upper_dev_get() Arnd Bergmann <arnd(a)arndb.de> net: freescale: select CONFIG_FIXED_PHY where needed Masahiro Yamada <masahiroy(a)kernel.org> usb: gadget: legacy: fix redundant initialization warnings Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> usb: phy: twl6030-usb: Fix a resource leak in an error handling path in 'twl6030_usb_probe()' Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> usb: dwc3: pci: Enable extcon driver for Intel Merrifield Lei Xue <carmark.dlut(a)gmail.com> cachefiles: Fix race between read_waiter and read_copier involving op->to_do Felix Kuehling <Felix.Kuehling(a)amd.com> drm/amdgpu: Use GEM obj reference for KFD BOs Evan Quan <evan.quan(a)amd.com> drm/amd/powerplay: perform PG ungate prior to CG ungate Evan Quan <evan.quan(a)amd.com> drm/amdgpu: drop unnecessary cancel_delayed_work_sync on PG ungate Andreas Gruenbacher <agruenba(a)redhat.com> gfs2: Grab glock reference sooner in gfs2_add_revoke Bob Peterson <rpeterso(a)redhat.com> gfs2: don't call quota_unhold if quotas are not locked Bob Peterson <rpeterso(a)redhat.com> gfs2: move privileged user check to gfs2_quota_lock_check Chuhong Yuan <hslester96(a)gmail.com> net: microchip: encx24j600: add missed kthread_stop Andrew Oakley <andrew(a)adoakley.name> ALSA: usb-audio: add mapping for ASRock TRX40 Creator Stephen Warren <swarren(a)nvidia.com> gpio: tegra: mask GPIO IRQs during IRQ shutdown Johan Jonker <jbx6244(a)gmail.com> ARM: dts: rockchip: fix pinctrl sub nodename for spi in rk322x.dtsi Johan Jonker <jbx6244(a)gmail.com> ARM: dts: rockchip: swap clock-names of gpu nodes Johan Jonker <jbx6244(a)gmail.com> arm64: dts: rockchip: swap interrupts interrupt-names rk3399 gpu node Johan Jonker <jbx6244(a)gmail.com> arm64: dts: rockchip: fix status for &gmac2phy in rk3328-evb.dts Johan Jonker <jbx6244(a)gmail.com> ARM: dts: rockchip: fix phy nodename for rk3229-xms6 Johan Jonker <jbx6244(a)gmail.com> ARM: dts: rockchip: fix phy nodename for rk3228-evb Jiri Pirko <jiri(a)mellanox.com> mlxsw: spectrum: Fix use-after-free of split/unsplit/type_set in case reload fails Qiushi Wu <wu000273(a)umn.edu> net/mlx4_core: fix a memory leak bug. Qiushi Wu <wu000273(a)umn.edu> net: sun: fix missing release regions in cas_init_one(). Vadim Fedorenko <vfedorenko(a)novek.ru> net/tls: free record only on encryption error Vadim Fedorenko <vfedorenko(a)novek.ru> net/tls: fix encryption error checking Roi Dayan <roid(a)mellanox.com> net/mlx5: Annotate mutex destroy for root ns Shay Drory <shayd(a)mellanox.com> net/mlx5: Fix error flow in case of function_setup failure Moshe Shemesh <moshe(a)mellanox.com> net/mlx5e: Update netdev txq on completions during closure Moshe Shemesh <moshe(a)mellanox.com> net/mlx5: Fix memory leak in mlx5_events_init Roi Dayan <roid(a)mellanox.com> net/mlx5e: Fix inner tirs handling Tariq Toukan <tariqt(a)mellanox.com> net/mlx5e: kTLS, Destroy key object after destroying the TIS Eric Dumazet <edumazet(a)google.com> tipc: block BH before using dst_cache Jere Leppänen <jere.leppanen(a)nokia.com> sctp: Start shutdown on association restart if in SHUTDOWN-SENT state and socket is closed Neil Horman <nhorman(a)tuxdriver.com> sctp: Don't add the shutdown timer if its already been added Marc Payne <marc.payne(a)mdpsys.co.uk> r8152: support additional Microsoft Surface Ethernet Adapter variant David Ahern <dsahern(a)gmail.com> nexthop: Fix attribute checking for groups Vinay Kumar Yadav <vinay.yadav(a)chelsio.com> net/tls: fix race condition causing kernel panic Roman Mashak <mrv(a)mojatatu.com> net sched: fix reporting the first-time use timestamp Yuqi Jin <jinyuqi(a)huawei.com> net: revert "net: get rid of an signed integer overflow in ip_idents_reserve()" Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> net: qrtr: Fix passing invalid reference to qrtr_local_enqueue() Stephen Worley <sworley(a)cumulusnetworks.com> net: nlmsg_cancel() if put fails for nhmsg Russell King <rmk+kernel(a)armlinux.org.uk> net: mvpp2: fix RX hashing for non-10G ports Moshe Shemesh <moshe(a)mellanox.com> net/mlx5: Add command entry handling completion Vadim Fedorenko <vfedorenko(a)novek.ru> net: ipip: fix wrong address family in init error path Martin KaFai Lau <kafai(a)fb.com> net: inet_csk: Fix so_reuseport bind-address cache in tb->fast* Boris Sukholitko <boris.sukholitko(a)broadcom.com> __netif_receive_skb_core: pass skb by reference Grygorii Strashko <grygorii.strashko(a)ti.com> net: ethernet: ti: cpsw: fix ASSERT_RTNL() warning during suspend DENG Qingfang <dqfext(a)gmail.com> net: dsa: mt7530: fix roaming from DSA user ports Sabrina Dubroca <sd(a)queasysnail.net> net: don't return invalid table id error when we fall back to PF_UNSPEC Vladimir Oltean <vladimir.oltean(a)nxp.com> dpaa_eth: fix usage as DSA master, try 3 Eric Dumazet <edumazet(a)google.com> ax25: fix setsockopt(SO_BINDTODEVICE) ------------- Diffstat: Makefile | 4 +- arch/arm/boot/compressed/vmlinux.lds.S | 2 +- arch/arm/boot/dts/bcm-hr2.dtsi | 6 +- arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 2 +- arch/arm/boot/dts/imx6q-b450v3.dts | 7 -- arch/arm/boot/dts/imx6q-b650v3.dts | 7 -- arch/arm/boot/dts/imx6q-b850v3.dts | 11 -- arch/arm/boot/dts/imx6q-bx50v3.dtsi | 15 +++ arch/arm/boot/dts/rk3036.dtsi | 2 +- arch/arm/boot/dts/rk3228-evb.dts | 2 +- arch/arm/boot/dts/rk3229-xms6.dts | 2 +- arch/arm/boot/dts/rk322x.dtsi | 6 +- arch/arm/boot/dts/rk3xxx.dtsi | 2 +- arch/arm/include/asm/assembler.h | 75 +------------ arch/arm/include/asm/uaccess-asm.h | 117 +++++++++++++++++++++ arch/arm/kernel/entry-armv.S | 11 +- arch/arm/kernel/entry-header.S | 9 +- arch/arm64/boot/dts/mediatek/mt8173.dtsi | 4 +- arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 8 +- arch/csky/abiv1/inc/abi/entry.h | 4 +- arch/csky/abiv2/inc/abi/entry.h | 4 +- arch/csky/include/asm/uaccess.h | 49 +++++---- arch/csky/kernel/entry.S | 2 - arch/csky/kernel/perf_callchain.c | 9 +- arch/csky/lib/usercopy.c | 8 +- arch/parisc/mm/init.c | 2 +- arch/riscv/kernel/stacktrace.c | 2 +- arch/x86/include/asm/dma.h | 2 +- arch/x86/include/uapi/asm/unistd.h | 11 +- arch/x86/kernel/fpu/xstate.c | 86 ++++++++------- block/blk-core.c | 11 +- drivers/clk/qcom/gcc-sm8150.c | 3 +- drivers/clk/ti/clk-33xx.c | 2 +- drivers/crypto/chelsio/chtls/chtls_io.c | 2 +- drivers/gpio/gpio-bcm-kona.c | 2 +- drivers/gpio/gpio-exar.c | 7 +- drivers/gpio/gpio-pxa.c | 4 +- drivers/gpio/gpio-tegra.c | 1 + drivers/gpio/gpiolib.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 5 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 6 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 12 +-- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7 -- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 6 +- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 6 +- drivers/gpu/drm/ingenic/ingenic-drm.c | 2 +- drivers/hwmon/nct7904.c | 4 +- drivers/infiniband/core/rdma_core.c | 20 ++-- drivers/infiniband/hw/i40iw/i40iw_cm.c | 8 -- drivers/infiniband/hw/qib/qib_sysfs.c | 9 +- drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 2 +- drivers/infiniband/ulp/ipoib/ipoib.h | 4 + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 15 +-- drivers/infiniband/ulp/ipoib/ipoib_ib.c | 9 +- drivers/infiniband/ulp/ipoib/ipoib_main.c | 10 +- drivers/input/evdev.c | 19 +--- drivers/input/joystick/xpad.c | 12 +++ drivers/input/keyboard/dlink-dir685-touchkeys.c | 2 +- drivers/input/rmi4/rmi_driver.c | 5 +- drivers/input/serio/i8042-x86ia64io.h | 7 ++ drivers/input/touchscreen/usbtouchscreen.c | 1 + drivers/iommu/iommu.c | 2 +- drivers/mmc/core/block.c | 2 +- drivers/net/bonding/bond_sysfs_slave.c | 4 +- drivers/net/dsa/mt7530.c | 9 +- drivers/net/dsa/mt7530.h | 1 + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- drivers/net/ethernet/freescale/Kconfig | 2 + drivers/net/ethernet/freescale/dpaa/Kconfig | 1 + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +- drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c | 2 +- drivers/net/ethernet/mellanox/mlx4/fw.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 14 +++ drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +- .../ethernet/mellanox/mlx5/core/en_accel/ktls.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 12 ++- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 9 +- drivers/net/ethernet/mellanox/mlx5/core/events.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 6 ++ .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 3 +- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 14 ++- drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 8 ++ drivers/net/ethernet/microchip/encx24j600.c | 5 +- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 4 +- drivers/net/ethernet/sun/cassini.c | 3 +- drivers/net/ethernet/ti/cpsw.c | 4 + drivers/net/hamradio/bpqether.c | 3 +- drivers/net/usb/cdc_ether.c | 11 +- drivers/net/usb/r8152.c | 1 + drivers/soc/mediatek/mtk-cmdq-helper.c | 4 +- drivers/usb/dwc3/dwc3-pci.c | 1 + drivers/usb/gadget/legacy/inode.c | 3 +- drivers/usb/phy/phy-twl6030-usb.c | 12 ++- fs/binfmt_elf.c | 2 +- fs/cachefiles/rdwr.c | 2 +- fs/ceph/caps.c | 2 +- fs/cifs/file.c | 2 +- fs/gfs2/log.c | 6 +- fs/gfs2/quota.c | 6 +- fs/gfs2/quota.h | 3 +- include/asm-generic/topology.h | 2 +- include/linux/ieee80211.h | 2 +- include/linux/mlx5/driver.h | 1 + include/linux/mm.h | 15 ++- include/linux/netfilter/nf_conntrack_pptp.h | 2 +- include/net/act_api.h | 3 +- include/net/ip_fib.h | 11 +- include/net/nexthop.h | 67 +++++++++--- include/net/tls.h | 4 + include/rdma/uverbs_std_types.h | 2 +- include/uapi/linux/xfrm.h | 2 +- mm/khugepaged.c | 1 + net/ax25/af_ax25.c | 6 +- net/bridge/netfilter/nft_reject_bridge.c | 6 ++ net/ceph/osd_client.c | 4 +- net/core/dev.c | 20 +++- net/dsa/slave.c | 1 + net/dsa/tag_mtk.c | 15 +++ net/ipv4/esp4_offload.c | 4 +- net/ipv4/fib_frontend.c | 22 ++-- net/ipv4/inet_connection_sock.c | 43 ++++---- net/ipv4/ip_vti.c | 23 +++- net/ipv4/ipip.c | 2 +- net/ipv4/ipmr.c | 2 +- net/ipv4/netfilter/nf_nat_pptp.c | 7 +- net/ipv4/nexthop.c | 105 +++++++++++------- net/ipv4/route.c | 14 ++- net/ipv6/esp6_offload.c | 13 ++- net/ipv6/ip6_fib.c | 2 +- net/ipv6/ip6mr.c | 2 +- net/mac80211/mesh_hwmp.c | 7 ++ net/netfilter/ipset/ip_set_list_set.c | 2 +- net/netfilter/nf_conntrack_core.c | 80 ++++++++++++-- net/netfilter/nf_conntrack_pptp.c | 62 ++++++----- net/netfilter/nfnetlink_cthelper.c | 3 +- net/qrtr/qrtr.c | 2 +- net/sctp/sm_sideeffect.c | 14 ++- net/sctp/sm_statefuns.c | 9 +- net/tipc/udp_media.c | 6 +- net/tls/tls_sw.c | 50 ++++++--- net/wireless/core.c | 2 +- net/xdp/xdp_umem.c | 8 +- net/xfrm/xfrm_device.c | 8 +- net/xfrm/xfrm_input.c | 2 +- net/xfrm/xfrm_interface.c | 21 ++++ net/xfrm/xfrm_output.c | 15 +-- net/xfrm/xfrm_policy.c | 7 +- samples/bpf/lwt_len_hist_user.c | 2 - security/commoncap.c | 1 + sound/core/hwdep.c | 4 +- sound/pci/hda/patch_realtek.c | 39 +++++-- sound/usb/mixer.c | 8 ++ sound/usb/mixer_maps.c | 24 +++++ sound/usb/quirks-table.h | 26 +++++ tools/arch/x86/include/uapi/asm/unistd.h | 2 +- tools/perf/util/srcline.c | 16 ++- 159 files changed, 1101 insertions(+), 594 deletions(-)

3 years, 10 months

5
152
0 0

[PATCH v2] x86/apic/of: Fix CPU devicetree-node lookups

by Johan Hovold

Architectures that describe the CPU topology in devicetree and that do not have an identity mapping between physical and logical CPU ids need to override the default implementation of arch_match_cpu_phys_id(). Failing to do so breaks CPU devicetree-node lookups using of_get_cpu_node() and of_cpu_device_node_get() which several drivers rely on. It also causes the CPU struct devices exported through sysfs to point to the wrong devicetree nodes. On x86, CPUs are described in devicetree using their APIC ids and those do not generally coincide with the logical ids, even if CPU0 typically uses APIC id 0. Add the missing implementation of arch_match_cpu_phys_id() so that CPU-node lookups work also with SMP. Apart from fixing the broken sysfs devicetree-node links this likely do not affect users of mainline kernels as the above mentioned drivers are currently not used on x86 as far as I know. Fixes: 4e07db9c8db8 ("x86/devicetree: Use CPU description from Device Tree") Cc: stable <stable(a)vger.kernel.org> # 4.17 Signed-off-by: Johan Hovold <johan(a)kernel.org> --- Thomas, Hope this looks better to you. My use case for this is still out-of-tree, but since CPU-node lookup is generic functionality and with observable impact also for mainline users (sysfs) I added a stable tag. Johan Changes in v2 - rewrite commit message - add Fixes tag - add stable tag for the benefit of out-of-tree users arch/x86/kernel/apic/apic.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index b3eef1d5c903..19c0119892dd 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -2311,6 +2311,11 @@ static int cpuid_to_apicid[] = { [0 ... NR_CPUS - 1] = -1, }; +bool arch_match_cpu_phys_id(int cpu, u64 phys_id) +{ + return phys_id == cpuid_to_apicid[cpu]; +} + #ifdef CONFIG_SMP /** * apic_id_is_primary_thread - Check whether APIC ID belongs to a primary thread -- 2.26.2

3 years, 10 months

1
1
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror December 2020