- Kernel - mailweb.openeuler.org

[PATCH 01/43] mpls: fix warning with multi-label encap
by Yang Yingliang 10 Oct '20

10 Oct '20

From: George Wilkie <gwilkie(a)vyatta.att-mail.com> [ Upstream commit 2f3f7d1fa0d1039b24a55d127ed190f196fc3e79 ] If you configure a route with multiple labels, e.g. ip route add 10.10.3.0/24 encap mpls 16/100 via 10.10.2.2 dev ens4 A warning is logged: kernel: [ 130.561819] netlink: 'ip': attribute type 1 has an invalid length. This happens because mpls_iptunnel_policy has set the type of MPLS_IPTUNNEL_DST to fixed size NLA_U32. Change it to a minimum size. nla_get_labels() does the remaining validation. Fixes: e3e4712ec096 ("mpls: ip tunnel support") Signed-off-by: George Wilkie <gwilkie(a)vyatta.att-mail.com> Reviewed-by: David Ahern <dsahern(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Signed-off-by: Aichun Li <liaichun(a)huawei.com> Reviewed-by: wangxiaopeng <wangxiaopeng7(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- net/mpls/mpls_iptunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mpls/mpls_iptunnel.c b/net/mpls/mpls_iptunnel.c index 8141eb10752f..b556acebdc86 100644 --- a/net/mpls/mpls_iptunnel.c +++ b/net/mpls/mpls_iptunnel.c @@ -28,7 +28,7 @@ #include "internal.h" static const struct nla_policy mpls_iptunnel_policy[MPLS_IPTUNNEL_MAX + 1] = { - [MPLS_IPTUNNEL_DST] = { .type = NLA_U32 }, + [MPLS_IPTUNNEL_DST] = { .len = sizeof(u32) }, [MPLS_IPTUNNEL_TTL] = { .type = NLA_U8 }, }; -- 2.25.1

1 42

[PATCH] hdlc_ppp: add range checks in ppp_cp_parse_cr()
by Yang Yingliang 10 Oct '20

10 Oct '20

From: Dan Carpenter <dan.carpenter(a)oracle.com> stable inclusion from linux-4.19.148 commit 45676c0bc28eff8f46455b28e2db80a77676488b CVE: CVE-2020-25643 -------------------------------- [ Upstream commit 66d42ed8b25b64eb63111a2b8582c5afc8bf1105 ] There are a couple bugs here: 1) If opt[1] is zero then this results in a forever loop. If the value is less than 2 then it is invalid. 2) It assumes that "len" is more than sizeof(valid_accm) or 6 which can result in memory corruption. In the case of LCP_OPTION_ACCM, then we should check "opt[1]" instead of "len" because, if "opt[1]" is less than sizeof(valid_accm) then "nak_len" gets out of sync and it can lead to memory corruption in the next iterations through the loop. In case of LCP_OPTION_MAGIC, the only valid value for opt[1] is 6, but the code is trying to log invalid data so we should only discard the data when "len" is less than 6 because that leads to a read overflow. Reported-by: ChenNan Of Chaitin Security Research Lab <whutchennan(a)gmail.com> Fixes: e022c2f07ae5 ("WAN: new synchronous PPP implementation for generic HDLC.") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> Reviewed-by: Eric Dumazet <edumazet(a)google.com> Reviewed-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Reviewed-by: Jason Yan <yanaijie(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/net/wan/hdlc_ppp.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c index ab8b3cbbb205..85844f26547d 100644 --- a/drivers/net/wan/hdlc_ppp.c +++ b/drivers/net/wan/hdlc_ppp.c @@ -386,11 +386,8 @@ static void ppp_cp_parse_cr(struct net_device *dev, u16 pid, u8 id, } for (opt = data; len; len -= opt[1], opt += opt[1]) { - if (len < 2 || len < opt[1]) { - dev->stats.rx_errors++; - kfree(out); - return; /* bad packet, drop silently */ - } + if (len < 2 || opt[1] < 2 || len < opt[1]) + goto err_out; if (pid == PID_LCP) switch (opt[0]) { @@ -398,6 +395,8 @@ static void ppp_cp_parse_cr(struct net_device *dev, u16 pid, u8 id, continue; /* MRU always OK and > 1500 bytes? */ case LCP_OPTION_ACCM: /* async control character map */ + if (opt[1] < sizeof(valid_accm)) + goto err_out; if (!memcmp(opt, valid_accm, sizeof(valid_accm))) continue; @@ -409,6 +408,8 @@ static void ppp_cp_parse_cr(struct net_device *dev, u16 pid, u8 id, } break; case LCP_OPTION_MAGIC: + if (len < 6) + goto err_out; if (opt[1] != 6 || (!opt[2] && !opt[3] && !opt[4] && !opt[5])) break; /* reject invalid magic number */ @@ -427,6 +428,11 @@ static void ppp_cp_parse_cr(struct net_device *dev, u16 pid, u8 id, ppp_cp_event(dev, pid, RCR_GOOD, CP_CONF_ACK, id, req_len, data); kfree(out); + return; + +err_out: + dev->stats.rx_errors++; + kfree(out); } static int ppp_rx(struct sk_buff *skb) -- 2.25.1

1 0

[PATCH 000/237] backport stable-4.19.149
by Yang Yingliang 10 Oct '20

10 Oct '20

Adrian Hunter (1): perf kcore_copy: Fix module map when there are no modules loaded Al Viro (1): fix dget_parent() fastpath race Alain Michaud (1): Bluetooth: guard against controllers sending zero'd events Alex Deucher (2): drm/amdgpu/powerplay: fix AVFS handling with custom powerplay table drm/amdgpu/powerplay/smu7: fix AVFS handling with custom powerplay table Alex Williamson (1): vfio/pci: Clear error and request eventfd ctx after releasing Alexander Duyck (1): e1000: Do not perform reset in reset_task if we are already down Alexandre Belloni (2): rtc: sa1100: fix possible race condition rtc: ds1374: fix possible race condition Amelie Delaunay (2): dmaengine: stm32-mdma: use vchan_terminate_vdesc() in .terminate_all dmaengine: stm32-dma: use vchan_terminate_vdesc() in .terminate_all Andreas Steinmetz (1): ALSA: usb-audio: Fix case when USB MIDI interface has more than one extra endpoint descriptor Andy Lutomirski (1): selftests/x86/syscall_nt: Clear weird flags after each test Anshuman Khandual (1): arm64/cpufeature: Drop TraceFilt feature exposure from ID_DFR0 register Anthony Iliopoulos (1): nvme: explicitly update mpath disk capacity on revalidation Aric Cyr (1): drm/amd/display: dal_ddc_i2c_payloads_create can fail causing panic Ayush Sawal (1): crypto: chelsio - This fixes the kernel panic which occurs during a libkcapi test Balsundar P (1): scsi: aacraid: fix illegal IO beyond last LBA Bart Van Assche (3): scsi: ufs: Make ufshcd_add_command_trace() easier to read scsi: ufs: Fix a race condition in the tracing code RDMA/rxe: Fix configuration of atomic queue pair attributes Bob Peterson (1): gfs2: clean up iopen glock mess in gfs2_create_inode Boris Brezillon (1): mtd: parser: cmdline: Support MTD names containing one or more colons Bradley Bolen (1): mmc: core: Fix size overflow for mmc partitions Brian Foster (1): xfs: fix attr leaf header freemap.size underflow Chris Wilson (1): dma-fence: Serialise signal enabling (dma_fence_enable_sw_signaling) Christian Borntraeger (1): s390/zcrypt: Fix ZCRYPT_PERDEV_REQCNT ioctl Christophe JAILLET (4): RDMA/iw_cgxb4: Fix an error handling path in 'c4iw_connect()' perf cpumap: Fix snprintf overflow check SUNRPC: Fix a potential buffer overflow in 'svc_print_xprts()' scsi: aacraid: Fix error handling paths in aac_probe_one() Chuck Lever (1): svcrdma: Fix leak of transport addresses Colin Ian King (2): media: tda10071: fix unsigned sign extension overflow USB: EHCI: ehci-mv: fix less than zero comparison of an unsigned int Cong Wang (1): atm: fix a memory leak of vcc->user_back Dan Carpenter (1): media: staging/imx: Missing assignment in imx_media_capture_device_register() Daniel Borkmann (1): bpf: Fix clobbering of r2 in bpf_gen_ld_abs Darrick J. Wong (3): xfs: fix log reservation overflows when allocating large rt extents xfs: don't ever return a stale pointer from __xfs_dir3_free_read xfs: mark dir corrupt when lookup-by-hash fails Dave Hansen (1): x86/pkeys: Add check for pkey "overflow" David Sterba (1): btrfs: don't force read-only after error in drop snapshot Dennis Li (1): drm/amdkfd: fix a memory leak issue Dinghao Liu (8): drm/nouveau/debugfs: fix runtime pm imbalance on error drm/nouveau: fix runtime pm imbalance on error drm/nouveau/dispnv50: fix runtime pm imbalance on error ASoC: img-i2s-out: Fix runtime PM imbalance on error wlcore: fix runtime pm imbalance in wl1271_tx_work wlcore: fix runtime pm imbalance in wlcore_regdomain_config mtd: rawnand: omap_elm: Fix runtime PM imbalance on error PCI: tegra: Fix runtime PM imbalance on error Dinh Nguyen (1): clk: stratix10: use do_div() for 64-bit calculation Divya Indi (1): tracing: Adding NULL checks for trace_array descriptor pointer Dmitry Baryshkov (1): regmap: fix page selection for noinc reads Dmitry Bogdanov (1): net: qed: RDMA personality shouldn't fail VF load Dmitry Osipenko (2): PM / devfreq: tegra30: Fix integer overflow on CPU's freq max out dmaengine: tegra-apb: Prevent race conditions on channel's freeing Don Brace (1): scsi: hpsa: correct race condition in offload enabled Doug Smythies (1): tools/power/x86/intel_pstate_tracer: changes for python 3 compatibility Douglas Anderson (1): bdev: Reduce time holding bd_mutex in sync in blkdev_close() Eric Dumazet (2): net: silence data-races on sk_backlog.tail mac802154: tx: fix use-after-free Felix Fietkau (1): mt76: clear skb pointers from rx aggregation reorder buffer during cleanup Fuqian Huang (1): m68k: q40: Fix info-leak in rtc_ioctl Gabriel Ravier (1): tools: gpio-hammer: Avoid potential overflow in main Gao Xiang (1): mm, THP, swap: fix allocating cluster for swapfile by mistake Greg Kroah-Hartman (1): Linux 4.19.149 Gustavo Romero (1): KVM: PPC: Book3S HV: Treat TM-related invalid form instructions on P9 like the valid ones Hans de Goede (2): ASoC: Intel: bytcr_rt5640: Add quirk for MPMAN Converter9 2-in-1 i2c: core: Call i2c_acpi_install_space_handler() before i2c_acpi_register_devices() Hillf Danton (1): Bluetooth: prefetch channel before killing sock Hou Tao (2): mtd: cfi_cmdset_0002: don't free cfi->cfiq in error path of cfi_amdstd_setup() ubi: fastmap: Free unused fastmap anchor peb during detach Howard Chung (1): Bluetooth: L2CAP: handle l2cap config request during open state Hui Wang (1): ALSA: hda/realtek - Couldn't detect Mic if booting with headset plugged Ian Rogers (5): perf parse-events: Fix 3 use after frees found with clang ASAN perf mem2node: Avoid double free related to realloc perf evsel: Fix 2 memory leaks perf trace: Fix the selection for architectures to generate the errno name tables perf metricgroup: Free metric_events on error Ilya Leoshkevich (1): s390/init: add missing __init annotations Israel Rukshin (2): nvme: Fix controller creation races with teardown flow nvmet-rdma: fix double free of rdma queue Ivan Lazeev (1): tpm_crb: fix fTPM on AMD Zen+ CPUs Ivan Safonov (1): staging:r8188eu: avoid skb_clone for amsdu to msdu conversion Jaewon Kim (1): mm/mmap.c: initialize align_offset explicitly for vm_unmapped_area James Morse (1): firmware: arm_sdei: Use cpus_read_lock() to avoid races with cpuhp James Smart (3): scsi: lpfc: Fix kernel crash at lpfc_nvme_info_show during remote port bounce scsi: lpfc: Fix RQ buffer leakage when no IOCBs available scsi: lpfc: Fix coverity errors in fmdi attribute handling Jan Höppner (1): s390/dasd: Fix zero write for FBA devices Jason Gunthorpe (1): RDMA/cm: Remove a race freeing timewait_info Javed Hasan (2): scsi: libfc: Handling of extra kref scsi: libfc: Skip additional kref updating work event Jeff Layton (2): ceph: ensure we have a new cap before continuing in fill_inode ceph: fix potential race in ceph_check_caps Jia He (1): mm: fix double page fault on arm64 if PTE_AF is cleared Jin Yao (1): perf parse-events: Use strcmp() to compare the PMU name Jing Xiangfeng (1): atm: eni: fix the missed pci_disable_device() for eni_init_one() Jiri Olsa (1): perf stat: Fix duration_time value for higher intervals Jiri Slaby (3): ata: define AC_ERR_OK ata: make qc_prep return ata_completion_errors ata: sata_mv, avoid trigerrable BUG_ON Joakim Tjernlund (1): ALSA: usb-audio: Add delay quirk for H570e USB headsets Joe Perches (1): kernel/sys.c: avoid copying possible padding bytes in copy_to_user John Clements (1): drm/amdgpu: increase atombios cmd timeout John Garry (2): bus: hisi_lpc: Fixup IO ports addresses to avoid use-after-free in host removal perf jevents: Fix leak of mapfile memory John Meneghini (1): nvme-multipath: do not reset on unknown status Jonathan Bakker (3): power: supply: max17040: Correct voltage reading phy: samsung: s5pv210-usb2: Add delay after reset tty: serial: samsung: Correct clock selection logic Jordan Crouse (1): drm/msm/a5xx: Always set an OPP supported hardware value Josef Bacik (1): tracing: Set kernel_stack's caller size properly Josh Poimboeuf (1): objtool: Fix noreturn detection for ignored functions Kai-Heng Feng (1): ALSA: hda/realtek: Enable front panel headset LED on Lenovo ThinkStation P520 Kangjie Lu (1): gma/gma500: fix a memory disclosure bug due to uninitialized bytes Kevin Kou (1): sctp: move trace_sctp_probe_path into sctp_outq_sack Kirill A. Shutemov (1): mm: avoid data corruption on CoW fault into PFN-mapped VMA Krzysztof Kozlowski (1): dt-bindings: sound: wm8994: Correct required supplies based on actual implementaion Kusanagi Kouichi (1): debugfs: Fix !DEBUG_FS debugfs_create_automount Lee Jones (1): mfd: mfd-core: Protect against NULL call-back function pointer Linus Lüssing (4): batman-adv: bla: fix type misuse for backbone_gw hash indexing batman-adv: mcast/TT: fix wrongly dropped or rerouted packets batman-adv: mcast: fix duplicate mcast packets in BLA backbone from mesh batman-adv: mcast: fix duplicate mcast packets from BLA backbone to mesh Liu Jian (1): ieee802154: fix one possible memleak in ca8210_dev_com_init Liu Song (1): ubifs: Fix out-of-bounds memory access caused by abnormal value of node_len Madhuparna Bhowmik (2): drivers: char: tlclk.c: Avoid data race between init and interrupt handler rapidio: avoid data race between file operation callbacks and mport_cdev_add(). Manish Mandlik (1): Bluetooth: Fix refcount use-after-free issue Marc Zyngier (1): KVM: arm64: Assume write fault on S1PTW permission fault on instruction fetch Marco Elver (1): seqlock: Require WRITE_ONCE surrounding raw_seqcount_barrier Marek Szyprowski (1): drm/vc4/vc4_hdmi: fill ASoC card owner Martin Cerveny (1): drm/sun4i: sun8i-csc: Secondary CSC register correction Masami Hiramatsu (1): kprobes: Fix to check probe enabled before disarm_kprobe_ftrace() Matthias Fend (1): dmaengine: zynqmp_dma: fix burst length configuration Maxim Mikityanskiy (1): Bluetooth: btrtl: Use kvmalloc for FW allocations Maximilian Luz (1): mwifiex: Increase AES key storage size to 256 bits Mert Dirik (1): ar5523: Add USB ID of SMCWUSBT-G2 wireless adapter Miaohe Lin (1): KVM: arm/arm64: vgic: Fix potential double free dist->spis in __kvm_vgic_destroy() Miaoqing Pan (2): ath10k: fix array out-of-bounds access ath10k: fix memory leak for tpc_stats_final Mikel Rychliski (1): PCI: Use ioremap(), not phys_to_virt() for platform ROM Miklos Szeredi (1): fuse: don't check refcount after stealing page Mikulas Patocka (1): arch/x86/lib/usercopy_64.c: fix __copy_user_flushcache() cache writeback Mohan Kumar (1): ALSA: hda: Clear RIRB status before reading WP Nathan Chancellor (2): tracing: Use address-of operator on section symbols mm/kmemleak.c: use address-of operator on section symbols Nicholas Piggin (1): powerpc/traps: Make unrecoverable NMIs die instead of panic Nick Desaulniers (1): lib/string.c: implement stpcpy Nikhil Devshatwar (1): media: ti-vpe: cal: Restrict DMA to avoid memory corruption Niklas Söderlund (1): thermal: rcar_thermal: Handle probe error gracefully Nilesh Javali (1): scsi: qedi: Fix termination timeouts in session logout Oleh Kravchenko (1): leds: mlxreg: Fix possible buffer overflow Oliver O'Halloran (1): powerpc/eeh: Only dump stack once if an MMIO loop is detected Palmer Dabbelt (1): RISC-V: Take text_mutex in ftrace_init_nop() Pan Bian (3): scsi: fnic: fix use after free RDMA/qedr: Fix potential use after free RDMA/i40iw: Fix potential use after free Paolo Bonzini (1): KVM: x86: fix incorrect comparison in trace event Pavel Machek (1): drm/msm: fix leaks if initialization fails Pavel Shilovsky (1): CIFS: Properly process SMB3 lease breaks Peter Ujfalusi (1): serial: 8250_omap: Fix sleeping function called from invalid context during probe Pratik Rajesh Sampat (1): cpufreq: powernv: Fix frame-size-overflow in powernv_cpufreq_work_fn Qian Cai (4): skbuff: fix a data race in skb_queue_len() random: fix data races at timer_rand_state mm/vmscan.c: fix data races using kswapd_classzone_idx vfio/pci: fix memory leaks of eventfd ctx Qu Wenruo (1): btrfs: qgroup: fix data leak caused by race between writeback and truncate Rafael J. Wysocki (1): ACPI: EC: Reference count query handlers under lock Raviteja Narayanam (1): serial: uartps: Wait for tx_empty in console setup Rodrigo Siqueira (1): drm/amd/display: Stop if retimer is not available Russell King (1): ASoC: kirkwood: fix IRQ error handling Sagar Biradar (1): scsi: aacraid: Disabling TM path and only processing IOP reset Sagi Grimberg (1): nvme: fix possible deadlock when I/O is blocked Sakari Ailus (1): media: smiapp: Fix error handling at NVM reading Sascha Hauer (1): ubi: Fix producing anchor PEBs Satendra Singh Thakur (1): dmaengine: mediatek: hsdma_probe: fixed a memory leak when devm_request_irq fails Sean Christopherson (1): KVM: x86: Reset MMU context if guest toggles CR4.SMAP or CR4.PKE Shreyas Joshi (1): printk: handle blank console arguments passed in. Sonny Sasaka (1): Bluetooth: Handle Inquiry Cancel error after Inquiry Complete Stefan Berger (1): tpm: ibmvtpm: Wait for buffer to be set before proceeding Stephen Kitt (1): clk/ti/adpll: allocate room for terminating null Steve Grubb (1): audit: CONFIG_CHANGE don't log internal bookkeeping as an event Steve Rutherford (1): KVM: Remove CREATE_IRQCHIP/SET_PIT2 race Stuart Hayes (1): PCI: pciehp: Fix MSI interrupt race Sven Eckelmann (1): batman-adv: Add missing include for in_interrupt() Sven Schnelle (2): selftests/ftrace: fix glob selftest lockdep: fix order in trace_hardirqs_off_caller() Sylwester Nawrocki (2): ASoC: wm8994: Skip setting of the WM8994_MICBIAS register for WM1811 ASoC: wm8994: Ensure the device is resumed in wm89xx_mic_detect functions Takashi Iwai (3): ALSA: usb-audio: Don't create a mixer element with bogus volume range media: go7007: Fix URB type for interrupt handling ALSA: hda: Fix potential race in unsol event handler Tang Bin (1): USB: EHCI: ehci-mv: fix error handling in mv_ehci_probe() Thomas Gleixner (3): x86/ioapic: Unbreak check_timer() bpf: Remove recursion prevention from rcu free callback x86/speculation/mds: Mark mds_user_clear_cpu_buffers() __always_inline Thomas Richter (2): s390/cpum_sf: Use kzalloc and minor changes perf test: Fix test trace+probe_vfs_getname.sh on s390 Tianjia Zhang (1): clocksource/drivers/h8300_timer8: Fix wrong return value in h8300_8timer_init() Tom Lendacky (1): KVM: SVM: Add a dedicated INVD intercept routine Tom Rix (3): ieee802154/adf7242: check status of adf7242_read_reg ALSA: asihpi: fix iounmap in error handler tracing: fix double free Tonghao Zhang (2): net: openvswitch: use u64 for meter bucket net: openvswitch: use div_u64() for 64-by-32 divisions Trond Myklebust (2): nfsd: Don't add locks to closed or closing open stateids NFS: Fix races nfs_page_group_destroy() vs nfs_destroy_unlinked_subrequests() Tuong Lien (1): tipc: fix memory leak in service subscripting Tzung-Bi Shih (1): ASoC: max98090: remove msleep in PLL unlocked workaround Vasily Averin (5): neigh_stat_seq_next() should increase position index rt_cpu_seq_next should increase position index ipv6_route_seq_next should increase position index mm/swapfile.c: swap_next should increase position index selinux: sel_avc_get_stat_idx should increase position index Vignesh Raghavendra (2): serial: 8250_port: Don't service RX FIFO if throttled serial: 8250: 8250_omap: Terminate DMA before pushing data on RX timeout Vincent Whitchurch (1): ARM: 8948/1: Prevent OOB access in stacktrace Wei Li (1): MIPS: Add the missing 'CPU_1074K' into __get_cpu_type() Wei Yongjun (2): sparc64: vcc: Fix error return code in vcc_probe() scsi: cxlflash: Fix error return code in cxlflash_probe() Wen Gong (1): ath10k: use kzalloc to read for ath10k_sdio_hif_diag_read Wen Yang (1): drm/omap: fix possible object reference leak Will Deacon (1): arm64: cpufeature: Relax checks for AArch32 support at EL[0-2] Xianting Tian (1): mm/filemap.c: clear page error before actual read Xie XiuQi (1): perf util: Fix memory leak of prefix_if_not_in Yonghong Song (1): bpf: Fix a rcu warning for bpffs map pretty-print Yu Chen (1): usb: dwc3: Increase timeout for CmdAct cleared by device controller Zeng Tao (1): vfio/pci: fix racy on error and request eventfd ctx Zenghui Yu (1): KVM: arm64: vgic-its: Fix memory leak on the error path of vgic_add_lpi() Zhang Xiaoxu (1): cifs: Fix double add page to memcg when cifs_readpages Zhu Yanjun (1): RDMA/rxe: Set sys_image_guid to be aligned with HW IB devices Zhuang Yanying (1): KVM: fix overflow of zero page refcount with ksm running peter chang (1): scsi: pm80xx: Cleanup command when a reset times out zhengbin (1): media: mc-device.c: fix memleak in media_device_register_entity .../devicetree/bindings/sound/wm8994.txt | 18 ++- Documentation/driver-api/libata.rst | 2 +- Makefile | 2 +- arch/arm/include/asm/kvm_emulate.h | 11 +- arch/arm/kernel/stacktrace.c | 2 + arch/arm/kernel/traps.c | 6 +- arch/arm64/include/asm/kvm_emulate.h | 9 +- arch/arm64/kernel/cpufeature.c | 12 +- arch/arm64/kvm/hyp/switch.c | 2 +- arch/m68k/q40/config.c | 1 + arch/mips/include/asm/cpu-type.h | 1 + arch/powerpc/include/asm/kvm_asm.h | 3 + arch/powerpc/kernel/eeh.c | 2 +- arch/powerpc/kernel/traps.c | 6 +- arch/powerpc/kvm/book3s_hv_tm.c | 28 +++- arch/powerpc/kvm/book3s_hv_tm_builtin.c | 16 +- arch/riscv/include/asm/ftrace.h | 7 + arch/riscv/kernel/ftrace.c | 19 +++ arch/s390/kernel/perf_cpum_sf.c | 9 +- arch/s390/kernel/setup.c | 6 +- arch/x86/include/asm/nospec-branch.h | 4 +- arch/x86/include/asm/pkeys.h | 5 + arch/x86/kernel/apic/io_apic.c | 1 + arch/x86/kernel/fpu/xstate.c | 9 +- arch/x86/kvm/mmutrace.h | 2 +- arch/x86/kvm/svm.c | 8 +- arch/x86/kvm/x86.c | 13 +- arch/x86/lib/usercopy_64.c | 2 +- drivers/acpi/ec.c | 16 +- drivers/ata/acard-ahci.c | 6 +- drivers/ata/libahci.c | 6 +- drivers/ata/libata-core.c | 9 +- drivers/ata/libata-sff.c | 12 +- drivers/ata/pata_macio.c | 6 +- drivers/ata/pata_pxa.c | 8 +- drivers/ata/pdc_adma.c | 7 +- drivers/ata/sata_fsl.c | 4 +- drivers/ata/sata_inic162x.c | 4 +- drivers/ata/sata_mv.c | 34 ++-- drivers/ata/sata_nv.c | 18 ++- drivers/ata/sata_promise.c | 6 +- drivers/ata/sata_qstor.c | 8 +- drivers/ata/sata_rcar.c | 6 +- drivers/ata/sata_sil.c | 8 +- drivers/ata/sata_sil24.c | 6 +- drivers/ata/sata_sx4.c | 6 +- drivers/atm/eni.c | 2 +- drivers/base/regmap/regmap.c | 12 +- drivers/bluetooth/btrtl.c | 20 +-- drivers/bus/hisi_lpc.c | 27 +++- drivers/char/random.c | 12 +- drivers/char/tlclk.c | 17 +- drivers/char/tpm/tpm_crb.c | 123 +++++++++++---- drivers/char/tpm/tpm_ibmvtpm.c | 9 ++ drivers/char/tpm/tpm_ibmvtpm.h | 1 + drivers/clk/socfpga/clk-pll-s10.c | 4 +- drivers/clk/ti/adpll.c | 11 +- drivers/clocksource/h8300_timer8.c | 2 +- drivers/cpufreq/powernv-cpufreq.c | 13 +- drivers/crypto/chelsio/chcr_algo.c | 5 +- drivers/crypto/chelsio/chtls/chtls_io.c | 10 +- drivers/devfreq/tegra-devfreq.c | 4 +- drivers/dma-buf/dma-fence.c | 78 +++++----- drivers/dma/mediatek/mtk-hsdma.c | 4 +- drivers/dma/stm32-dma.c | 9 +- drivers/dma/stm32-mdma.c | 9 +- drivers/dma/tegra20-apb-dma.c | 3 +- drivers/dma/xilinx/zynqmp_dma.c | 24 +-- drivers/firmware/arm_sdei.c | 26 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 31 ++-- drivers/gpu/drm/amd/amdgpu/atom.c | 4 +- .../drm/amd/amdkfd/kfd_device_queue_manager.c | 2 + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 67 ++++---- .../gpu/drm/amd/display/dc/core/dc_link_ddc.c | 52 +++---- .../gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 7 + .../drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 7 + drivers/gpu/drm/gma500/cdv_intel_display.c | 2 + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 27 +++- drivers/gpu/drm/msm/msm_drv.c | 6 +- drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 +- drivers/gpu/drm/nouveau/nouveau_debugfs.c | 5 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 4 +- .../drm/nouveau/nvkm/subdev/bios/shadowpci.c | 17 +- .../gpu/drm/omapdrm/dss/omapdss-boot-init.c | 4 +- drivers/gpu/drm/radeon/radeon_bios.c | 30 ++-- drivers/gpu/drm/sun4i/sun8i_csc.h | 2 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 1 + drivers/i2c/i2c-core-base.c | 2 +- drivers/infiniband/core/cm.c | 25 +-- drivers/infiniband/hw/cxgb4/cm.c | 4 +- drivers/infiniband/hw/i40iw/i40iw_cm.c | 2 +- drivers/infiniband/hw/qedr/qedr_iw_cm.c | 2 +- drivers/infiniband/sw/rxe/rxe.c | 2 + drivers/infiniband/sw/rxe/rxe_qp.c | 7 +- drivers/leds/leds-mlxreg.c | 4 +- drivers/media/dvb-frontends/tda10071.c | 9 +- drivers/media/i2c/smiapp/smiapp-core.c | 3 +- drivers/media/media-device.c | 65 ++++---- drivers/media/platform/ti-vpe/cal.c | 6 +- drivers/media/usb/go7007/go7007-usb.c | 4 +- drivers/mfd/mfd-core.c | 10 ++ drivers/mmc/core/mmc.c | 9 +- drivers/mtd/chips/cfi_cmdset_0002.c | 1 - drivers/mtd/cmdlinepart.c | 23 ++- drivers/mtd/nand/raw/omap_elm.c | 1 + drivers/mtd/ubi/fastmap-wl.c | 46 ++++-- drivers/mtd/ubi/fastmap.c | 14 +- drivers/mtd/ubi/ubi.h | 6 +- drivers/mtd/ubi/wl.c | 32 ++-- drivers/mtd/ubi/wl.h | 1 - drivers/net/ethernet/intel/e1000/e1000_main.c | 18 ++- drivers/net/ethernet/qlogic/qed/qed_sriov.c | 1 + drivers/net/ieee802154/adf7242.c | 4 +- drivers/net/ieee802154/ca8210.c | 1 + drivers/net/wireless/ath/ar5523/ar5523.c | 2 + drivers/net/wireless/ath/ath10k/debug.c | 3 +- drivers/net/wireless/ath/ath10k/sdio.c | 18 ++- drivers/net/wireless/ath/ath10k/wmi.c | 49 +++--- drivers/net/wireless/marvell/mwifiex/fw.h | 2 +- .../wireless/marvell/mwifiex/sta_cmdresp.c | 4 +- drivers/net/wireless/mediatek/mt76/agg-rx.c | 1 + drivers/net/wireless/ti/wlcore/main.c | 4 +- drivers/net/wireless/ti/wlcore/tx.c | 1 + drivers/nvme/host/core.c | 12 +- drivers/nvme/host/multipath.c | 21 ++- drivers/nvme/host/nvme.h | 19 ++- drivers/nvme/target/rdma.c | 30 ++-- drivers/pci/controller/pci-tegra.c | 3 +- drivers/pci/hotplug/pciehp_hpc.c | 26 +++- drivers/pci/rom.c | 17 -- drivers/phy/samsung/phy-s5pv210-usb2.c | 4 + drivers/power/supply/max17040_battery.c | 2 +- drivers/rapidio/devices/rio_mport_cdev.c | 14 +- drivers/rtc/rtc-ds1374.c | 15 +- drivers/rtc/rtc-sa1100.c | 18 ++- drivers/s390/block/dasd_fba.c | 9 +- drivers/s390/crypto/zcrypt_api.c | 3 +- drivers/scsi/aacraid/aachba.c | 8 +- drivers/scsi/aacraid/commsup.c | 2 +- drivers/scsi/aacraid/linit.c | 46 ++++-- drivers/scsi/cxlflash/main.c | 1 + drivers/scsi/fnic/fnic_scsi.c | 3 +- drivers/scsi/hpsa.c | 80 +++++++--- drivers/scsi/libfc/fc_rport.c | 13 +- drivers/scsi/lpfc/lpfc_attr.c | 35 +++-- drivers/scsi/lpfc/lpfc_ct.c | 137 +++++++++-------- drivers/scsi/lpfc/lpfc_hw.h | 36 ++--- drivers/scsi/lpfc/lpfc_sli.c | 4 + drivers/scsi/pm8001/pm8001_sas.c | 50 ++++-- drivers/scsi/qedi/qedi_iscsi.c | 3 + drivers/scsi/ufs/ufshcd.c | 14 +- drivers/staging/media/imx/imx-media-capture.c | 2 +- drivers/staging/rtl8188eu/core/rtw_recv.c | 19 +-- drivers/thermal/rcar_thermal.c | 6 +- drivers/tty/serial/8250/8250_omap.c | 8 +- drivers/tty/serial/8250/8250_port.c | 16 +- drivers/tty/serial/samsung.c | 8 +- drivers/tty/serial/xilinx_uartps.c | 8 + drivers/tty/vcc.c | 1 + drivers/usb/dwc3/gadget.c | 2 +- drivers/usb/host/ehci-mv.c | 8 +- drivers/vfio/pci/vfio_pci.c | 13 ++ fs/block_dev.c | 10 ++ fs/btrfs/extent-tree.c | 2 - fs/btrfs/inode.c | 23 ++- fs/ceph/caps.c | 14 +- fs/ceph/inode.c | 5 +- fs/cifs/cifsglob.h | 9 +- fs/cifs/file.c | 21 ++- fs/cifs/misc.c | 17 +- fs/cifs/smb1ops.c | 8 +- fs/cifs/smb2misc.c | 32 +--- fs/cifs/smb2ops.c | 44 ++++-- fs/cifs/smb2pdu.h | 2 +- fs/dcache.c | 4 +- fs/fuse/dev.c | 1 - fs/gfs2/inode.c | 13 +- fs/nfs/pagelist.c | 67 +++++--- fs/nfs/write.c | 10 +- fs/nfsd/nfs4state.c | 73 +++++---- fs/ubifs/io.c | 16 +- fs/xfs/libxfs/xfs_attr_leaf.c | 4 +- fs/xfs/libxfs/xfs_dir2_node.c | 1 + fs/xfs/libxfs/xfs_trans_resv.c | 96 +++++++++--- fs/xfs/scrub/dir.c | 3 + include/linux/debugfs.h | 5 +- include/linux/libata.h | 13 +- include/linux/mmc/card.h | 2 +- include/linux/nfs_page.h | 2 + include/linux/pci.h | 1 - include/linux/seqlock.h | 11 +- include/linux/skbuff.h | 14 +- include/net/sock.h | 4 +- include/trace/events/sctp.h | 9 -- kernel/audit_watch.c | 2 - kernel/bpf/hashtab.c | 8 - kernel/bpf/inode.c | 4 +- kernel/kprobes.c | 5 +- kernel/printk/printk.c | 3 + kernel/sys.c | 4 +- kernel/trace/trace.c | 5 +- kernel/trace/trace_entries.h | 2 +- kernel/trace/trace_events.c | 2 + kernel/trace/trace_events_hist.c | 1 - kernel/trace/trace_preemptirq.c | 4 +- lib/string.c | 24 +++ mm/filemap.c | 8 + mm/kmemleak.c | 2 +- mm/memory.c | 121 +++++++++++++-- mm/mmap.c | 2 + mm/swapfile.c | 4 +- mm/vmscan.c | 45 +++--- net/atm/lec.c | 6 + net/batman-adv/bridge_loop_avoidance.c | 145 ++++++++++++++---- net/batman-adv/bridge_loop_avoidance.h | 4 +- net/batman-adv/routing.c | 4 + net/batman-adv/soft-interface.c | 6 +- net/bluetooth/hci_event.c | 25 ++- net/bluetooth/l2cap_core.c | 29 ++-- net/bluetooth/l2cap_sock.c | 18 ++- net/core/filter.c | 4 +- net/core/neighbour.c | 1 + net/ipv4/route.c | 1 + net/ipv4/tcp.c | 2 +- net/ipv6/ip6_fib.c | 7 +- net/llc/af_llc.c | 2 +- net/mac802154/tx.c | 8 +- net/openvswitch/meter.c | 4 +- net/openvswitch/meter.h | 2 +- net/sctp/outqueue.c | 6 + net/sunrpc/svc_xprt.c | 19 ++- net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 1 + net/tipc/topsrv.c | 4 +- net/unix/af_unix.c | 11 +- security/selinux/selinuxfs.c | 1 + sound/hda/hdac_bus.c | 4 + sound/pci/asihpi/hpioctl.c | 4 +- sound/pci/hda/hda_controller.c | 11 +- sound/pci/hda/patch_realtek.c | 13 +- sound/soc/codecs/max98090.c | 8 +- sound/soc/codecs/wm8994.c | 10 ++ sound/soc/codecs/wm_hubs.c | 3 + sound/soc/codecs/wm_hubs.h | 1 + sound/soc/img/img-i2s-out.c | 8 +- sound/soc/intel/boards/bytcr_rt5640.c | 10 ++ sound/soc/kirkwood/kirkwood-dma.c | 2 +- sound/usb/midi.c | 29 +++- sound/usb/mixer.c | 10 ++ sound/usb/quirks.c | 7 +- tools/gpio/gpio-hammer.c | 17 +- tools/objtool/check.c | 2 +- tools/perf/builtin-stat.c | 2 +- tools/perf/pmu-events/jevents.c | 15 +- .../perf/tests/shell/lib/probe_vfs_getname.sh | 2 +- tools/perf/trace/beauty/arch_errno_names.sh | 2 +- tools/perf/util/cpumap.c | 10 +- tools/perf/util/evsel.c | 3 + tools/perf/util/mem2node.c | 3 +- tools/perf/util/metricgroup.c | 3 + tools/perf/util/parse-events.c | 9 +- tools/perf/util/sort.c | 2 +- tools/perf/util/symbol-elf.c | 7 + .../intel_pstate_tracer.py | 22 +-- .../ftrace/test.d/ftrace/func-filter-glob.tc | 2 +- tools/testing/selftests/x86/syscall_nt.c | 1 + virt/kvm/arm/mmio.c | 2 +- virt/kvm/arm/mmu.c | 5 +- virt/kvm/arm/vgic/vgic-init.c | 1 + virt/kvm/arm/vgic/vgic-its.c | 11 +- virt/kvm/kvm_main.c | 1 + 270 files changed, 2313 insertions(+), 1196 deletions(-) -- 2.25.1

1 237

[PATCH 01/65] mm: memcg: make memory.oom.group tolerable to task migration
by Yang Yingliang 10 Oct '20

10 Oct '20

From: Roman Gushchin <guro(a)fb.com> mainline inclusion from mainline-5.7-rc1 commit 48fe267c503ec22014ba4e83d002b07caad034d0 category: bugfix bugzilla: 33351 CVE: NA ------------------------------------------------- If a task is getting moved out of the OOMing cgroup, it might result in unexpected OOM killings if memory.oom.group is used anywhere in the cgroup tree. Imagine the following example: A (oom.group = 1) / \ (OOM) B C Let's say B's memory.max is exceeded and it's OOMing. The OOM killer selects a task in B as a victim, but someone asynchronously moves the task into C. mem_cgroup_get_oom_group() will iterate over all ancestors of C up to the root cgroup. In theory it had to stop at the oom_domain level - the memory cgroup which is OOMing. But because B is not an ancestor of C, it's not happening. Instead it chooses A (because it's oom.group is set), and kills all tasks in A. This behavior is wrong because the OOM happened in B, so there is no reason to kill anything outside. Fix this by checking it the memory cgroup to which the task belongs is a descendant of the oom_domain. If not, memory.oom.group should be ignored, and the OOM killer should kill only the victim task. Reported-by: Dan Schatzberg <dschatzberg(a)fb.com> Signed-off-by: Roman Gushchin <guro(a)fb.com> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Acked-by: Michal Hocko <mhocko(a)suse.com> Acked-by: Johannes Weiner <hannes(a)cmpxchg.org> Link: http://lkml.kernel.org/r/20200316223510.3176148-1-guro@fb.com Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> (cherry picked from commit 48fe267c503ec22014ba4e83d002b07caad034d0) Signed-off-by: Kefeng Wang <wangkefeng.wang(a)huawei.com> Signed-off-by: Liu Shixin <liushixin2(a)huawei.com> Reviewed-by: Kefeng Wang <wangkefeng.wang(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- mm/memcontrol.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 1342b9540476..8611f3301686 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1856,6 +1856,14 @@ struct mem_cgroup *mem_cgroup_get_oom_group(struct task_struct *victim, if (memcg == root_mem_cgroup) goto out; + /* + * If the victim task has been asynchronously moved to a different + * memory cgroup, we might end up killing tasks outside oom_domain. + * In this case it's better to ignore memory.group.oom. + */ + if (unlikely(!mem_cgroup_is_descendant(memcg, oom_domain))) + goto out; + /* * Traverse the memory cgroup hierarchy from the victim task's * cgroup up to the OOMing cgroup (or root) to find the -- 2.25.1

1 64

[PATCH] mm/swapfile: fix and annotate various data races
by Yang Yingliang 30 Sep '20

30 Sep '20

From: Qian Cai <cai(a)lca.pw> mainline inclusion from mainline-v5.9-rc1 commit a449bf58e45abf919b27ba62a9dcbae3ad36e725 category: bugfix bugzilla: NA CVE: NA ------------------------------------------------- swap_info_struct si.highest_bit, si.swap_map[offset] and si.flags could be accessed concurrently separately as noticed by KCSAN, === si.highest_bit === write to 0xffff8d5abccdc4d4 of 4 bytes by task 5353 on cpu 24: swap_range_alloc+0x81/0x130 swap_range_alloc at mm/swapfile.c:681 scan_swap_map_slots+0x371/0xb90 get_swap_pages+0x39d/0x5c0 get_swap_page+0xf2/0x524 add_to_swap+0xe4/0x1c0 shrink_page_list+0x1795/0x2870 shrink_inactive_list+0x316/0x880 shrink_lruvec+0x8dc/0x1380 shrink_node+0x317/0xd80 do_try_to_free_pages+0x1f7/0xa10 try_to_free_pages+0x26c/0x5e0 __alloc_pages_slowpath+0x458/0x1290 read to 0xffff8d5abccdc4d4 of 4 bytes by task 6672 on cpu 70: scan_swap_map_slots+0x4a6/0xb90 scan_swap_map_slots at mm/swapfile.c:892 get_swap_pages+0x39d/0x5c0 get_swap_page+0xf2/0x524 add_to_swap+0xe4/0x1c0 shrink_page_list+0x1795/0x2870 shrink_inactive_list+0x316/0x880 shrink_lruvec+0x8dc/0x1380 shrink_node+0x317/0xd80 do_try_to_free_pages+0x1f7/0xa10 try_to_free_pages+0x26c/0x5e0 __alloc_pages_slowpath+0x458/0x1290 Reported by Kernel Concurrency Sanitizer on: CPU: 70 PID: 6672 Comm: oom01 Tainted: G W L 5.5.0-next-20200205+ #3 Hardware name: HPE ProLiant DL385 Gen10/ProLiant DL385 Gen10, BIOS A40 07/10/2019 === si.swap_map[offset] === write to 0xffffbc370c29a64c of 1 bytes by task 6856 on cpu 86: __swap_entry_free_locked+0x8c/0x100 __swap_entry_free_locked at mm/swapfile.c:1209 (discriminator 4) __swap_entry_free.constprop.20+0x69/0xb0 free_swap_and_cache+0x53/0xa0 unmap_page_range+0x7f8/0x1d70 unmap_single_vma+0xcd/0x170 unmap_vmas+0x18b/0x220 exit_mmap+0xee/0x220 mmput+0x10e/0x270 do_exit+0x59b/0xf40 do_group_exit+0x8b/0x180 read to 0xffffbc370c29a64c of 1 bytes by task 6855 on cpu 20: _swap_info_get+0x81/0xa0 _swap_info_get at mm/swapfile.c:1140 free_swap_and_cache+0x40/0xa0 unmap_page_range+0x7f8/0x1d70 unmap_single_vma+0xcd/0x170 unmap_vmas+0x18b/0x220 exit_mmap+0xee/0x220 mmput+0x10e/0x270 do_exit+0x59b/0xf40 do_group_exit+0x8b/0x180 === si.flags === write to 0xffff956c8fc6c400 of 8 bytes by task 6087 on cpu 23: scan_swap_map_slots+0x6fe/0xb50 scan_swap_map_slots at mm/swapfile.c:887 get_swap_pages+0x39d/0x5c0 get_swap_page+0x377/0x524 add_to_swap+0xe4/0x1c0 shrink_page_list+0x1795/0x2870 shrink_inactive_list+0x316/0x880 shrink_lruvec+0x8dc/0x1380 shrink_node+0x317/0xd80 do_try_to_free_pages+0x1f7/0xa10 try_to_free_pages+0x26c/0x5e0 __alloc_pages_slowpath+0x458/0x1290 read to 0xffff956c8fc6c400 of 8 bytes by task 6207 on cpu 63: _swap_info_get+0x41/0xa0 __swap_info_get at mm/swapfile.c:1114 put_swap_page+0x84/0x490 __remove_mapping+0x384/0x5f0 shrink_page_list+0xff1/0x2870 shrink_inactive_list+0x316/0x880 shrink_lruvec+0x8dc/0x1380 shrink_node+0x317/0xd80 do_try_to_free_pages+0x1f7/0xa10 try_to_free_pages+0x26c/0x5e0 __alloc_pages_slowpath+0x458/0x1290 The writes are under si->lock but the reads are not. For si.highest_bit and si.swap_map[offset], data race could trigger logic bugs, so fix them by having WRITE_ONCE() for the writes and READ_ONCE() for the reads except those isolated reads where they compare against zero which a data race would cause no harm. Thus, annotate them as intentional data races using the data_race() macro. For si.flags, the readers are only interested in a single bit where a data race there would cause no issue there. [cai(a)lca.pw: add a missing annotation for si->flags in memory.c] Link: http://lkml.kernel.org/r/1581612647-5958-1-git-send-email-cai@lca.pw Signed-off-by: Qian Cai <cai(a)lca.pw> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> Cc: Marco Elver <elver(a)google.com> Cc: Hugh Dickins <hughd(a)google.com> Link: http://lkml.kernel.org/r/1581095163-12198-1-git-send-email-cai@lca.pw Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> [yyl: remove data_race(), this macro is used when KCSAN is enabled] Reviewed-by: Kefeng Wang <wangkefeng.wang(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- mm/swapfile.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 60ccb3072318..41400ae4e7c1 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -639,7 +639,7 @@ static void swap_range_alloc(struct swap_info_struct *si, unsigned long offset, if (offset == si->lowest_bit) si->lowest_bit += nr_entries; if (end == si->highest_bit) - si->highest_bit -= nr_entries; + WRITE_ONCE(si->highest_bit, si->highest_bit - nr_entries); si->inuse_pages += nr_entries; if (si->inuse_pages == si->pages) { si->lowest_bit = si->max; @@ -671,7 +671,7 @@ static void swap_range_free(struct swap_info_struct *si, unsigned long offset, if (end > si->highest_bit) { bool was_full = !si->highest_bit; - si->highest_bit = end; + WRITE_ONCE(si->highest_bit, end); if (was_full && (si->flags & SWP_WRITEOK)) add_to_avail_list(si); } @@ -804,7 +804,7 @@ static int scan_swap_map_slots(struct swap_info_struct *si, else goto done; } - si->swap_map[offset] = usage; + WRITE_ONCE(si->swap_map[offset], usage); inc_cluster_info_page(si, si->cluster_info, offset); unlock_cluster(ci); @@ -850,12 +850,13 @@ static int scan_swap_map_slots(struct swap_info_struct *si, scan: spin_unlock(&si->lock); - while (++offset <= si->highest_bit) { + while (++offset <= READ_ONCE(si->highest_bit)) { if (!si->swap_map[offset]) { spin_lock(&si->lock); goto checks; } - if (vm_swap_full() && si->swap_map[offset] == SWAP_HAS_CACHE) { + if (vm_swap_full() && + READ_ONCE(si->swap_map[offset]) == SWAP_HAS_CACHE) { spin_lock(&si->lock); goto checks; } @@ -870,7 +871,8 @@ static int scan_swap_map_slots(struct swap_info_struct *si, spin_lock(&si->lock); goto checks; } - if (vm_swap_full() && si->swap_map[offset] == SWAP_HAS_CACHE) { + if (vm_swap_full() && + READ_ONCE(si->swap_map[offset]) == SWAP_HAS_CACHE) { spin_lock(&si->lock); goto checks; } @@ -1166,7 +1168,10 @@ static unsigned char __swap_entry_free_locked(struct swap_info_struct *p, } usage = count | has_cache; - p->swap_map[offset] = usage ? : SWAP_HAS_CACHE; + if (usage) + WRITE_ONCE(p->swap_map[offset], usage); + else + WRITE_ONCE(p->swap_map[offset], SWAP_HAS_CACHE); return usage; } @@ -3522,7 +3527,7 @@ static int __swap_duplicate(swp_entry_t entry, unsigned char usage) } else err = -ENOENT; /* unused swap entry */ - p->swap_map[offset] = count | has_cache; + WRITE_ONCE(p->swap_map[offset], count | has_cache); unlock_out: unlock_cluster_or_swap_info(p, ci); -- 2.25.1

1 0

[PATCH] iommu: fix a mistake for iommu_unregister_device_fault_handler
by Yang Yingliang 30 Sep '20

30 Sep '20

From: Bixuan Cui <cuibixuan(a)huawei.com> ascend inclusion category: bugfix bugzilla: NA CVE: NA ------------------------------------------------- Fix a mistake check for commit bd6c06e0917d ("iommu: introduce device fault report API") Fixes: bd6c06e0917d ("iommu: introduce device fault report API") Signed-off-by: Bixuan Cui <cuibixuan(a)huawei.com> Reviewed-by: Hanjun Guo <guohanjun(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/iommu/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 831c5065f7f8..bee6b8fcfe0e 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -982,7 +982,7 @@ int iommu_unregister_device_fault_handler(struct device *dev) mutex_lock(&param->lock); /* we cannot unregister handler if there are pending faults */ - if (list_empty(&param->fault_param->faults)) { + if (!list_empty(&param->fault_param->faults)) { ret = -EBUSY; goto unlock; } -- 2.25.1

1 0

[PATCH] arm64: Kconfig: change fix compile error if gcc don't support armv8.4-a
by Yang Yingliang 30 Sep '20

30 Sep '20

hulk inclusion category: feature CVE: NA ----------------------- After 4d0831e8a029 ("kconfig: unify cc-option and as-option") in mainline, we can use cc-option. But in linux-4.19, this patch is not merged, so we will get the follow error: CC scripts/mod/empty.o CC scripts/mod/devicetable-offsets.s Assembler messages: Error: unknown architecture `armv8.4-a' Error: unrecognized option -march=armv8.4-a Fix this by changing cc-option to as-option. Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Reviewed-by: Hanjun Guo <guohanjun(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- arch/arm64/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 1ef7862d1b75..e379fca3c8ad 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1307,7 +1307,7 @@ endmenu menu "ARMv8.4 architectural features" config AS_HAS_ARMV8_4 - def_bool $(cc-option,-Wa$(comma)-march=armv8.4-a) + def_bool $(as-option,-Wa$(comma)-march=armv8.4-a) config ARM64_TLB_RANGE bool "Enable support for tlbi range feature" -- 2.25.1

1 0

[PATCH 1/2] block: loop: set discard granularity and alignment for block device backed loop
by Yang Yingliang 30 Sep '20

30 Sep '20

From: Ming Lei <ming.lei(a)redhat.com> mainline inclusion from mainline-v5.9-rc3 commit bcb21c8cc9947286211327d663ace69f07d37a76 category: bugfix bugzilla: NA CVE: NA ------------------------------------------------- In case of block device backend, if the backend supports write zeros, the loop device will set queue flag of QUEUE_FLAG_DISCARD. However, limits.discard_granularity isn't setup, and this way is wrong, see the following description in Documentation/ABI/testing/sysfs-block: A discard_granularity of 0 means that the device does not support discard functionality. Especially 9b15d109a6b2 ("block: improve discard bio alignment in __blkdev_issue_discard()") starts to take q->limits.discard_granularity for computing max discard sectors. And zero discard granularity may cause kernel oops, or fail discard request even though the loop queue claims discard support via QUEUE_FLAG_DISCARD. Fix the issue by setup discard granularity and alignment. Fixes: c52abf563049 ("loop: Better discard support for block devices") Signed-off-by: Ming Lei <ming.lei(a)redhat.com> Reviewed-by: Christoph Hellwig <hch(a)lst.de> Acked-by: Coly Li <colyli(a)suse.de> Cc: Hannes Reinecke <hare(a)suse.com> Cc: Xiao Ni <xni(a)redhat.com> Cc: Martin K. Petersen <martin.petersen(a)oracle.com> Cc: Evan Green <evgreen(a)chromium.org> Cc: Gwendal Grignou <gwendal(a)chromium.org> Cc: Chaitanya Kulkarni <chaitanya.kulkarni(a)wdc.com> Cc: Andrzej Pietrasiewicz <andrzej.p(a)collabora.com> Cc: Christoph Hellwig <hch(a)lst.de> Cc: <stable(a)vger.kernel.org> Signed-off-by: Jens Axboe <axboe(a)kernel.dk> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Reviewed-by: Yufen Yu <yuyufen(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/block/loop.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index da68c42aed68..19042b42a8ba 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -864,6 +864,7 @@ static void loop_config_discard(struct loop_device *lo) struct file *file = lo->lo_backing_file; struct inode *inode = file->f_mapping->host; struct request_queue *q = lo->lo_queue; + u32 granularity, max_discard_sectors; /* * If the backing device is a block device, mirror its zeroing @@ -876,11 +877,10 @@ static void loop_config_discard(struct loop_device *lo) struct request_queue *backingq; backingq = bdev_get_queue(inode->i_bdev); - blk_queue_max_discard_sectors(q, - backingq->limits.max_write_zeroes_sectors); - blk_queue_max_write_zeroes_sectors(q, - backingq->limits.max_write_zeroes_sectors); + max_discard_sectors = backingq->limits.max_write_zeroes_sectors; + granularity = backingq->limits.discard_granularity ?: + queue_physical_block_size(backingq); /* * We use punch hole to reclaim the free space used by the @@ -889,23 +889,26 @@ static void loop_config_discard(struct loop_device *lo) * useful information. */ } else if (!file->f_op->fallocate || lo->lo_encrypt_key_size) { - q->limits.discard_granularity = 0; - q->limits.discard_alignment = 0; - blk_queue_max_discard_sectors(q, 0); - blk_queue_max_write_zeroes_sectors(q, 0); + max_discard_sectors = 0; + granularity = 0; } else { - q->limits.discard_granularity = inode->i_sb->s_blocksize; - q->limits.discard_alignment = 0; - - blk_queue_max_discard_sectors(q, UINT_MAX >> 9); - blk_queue_max_write_zeroes_sectors(q, UINT_MAX >> 9); + max_discard_sectors = UINT_MAX >> 9; + granularity = inode->i_sb->s_blocksize; } - if (q->limits.max_write_zeroes_sectors) + if (max_discard_sectors) { + q->limits.discard_granularity = granularity; + blk_queue_max_discard_sectors(q, max_discard_sectors); + blk_queue_max_write_zeroes_sectors(q, max_discard_sectors); blk_queue_flag_set(QUEUE_FLAG_DISCARD, q); - else + } else { + q->limits.discard_granularity = 0; + blk_queue_max_discard_sectors(q, 0); + blk_queue_max_write_zeroes_sectors(q, 0); blk_queue_flag_clear(QUEUE_FLAG_DISCARD, q); + } + q->limits.discard_alignment = 0; } static void loop_unprepare_queue(struct loop_device *lo) -- 2.25.1

1 1

[PATCH 1/2] Revert "KVM: arm64: Add kvm_extable for vaxorcism code"
by Yang Yingliang 30 Sep '20

30 Sep '20

This reverts commit 8cc25436c41592b2236b4d2911a3031131a62872. --- arch/arm64/include/asm/kvm_asm.h | 15 ---------- arch/arm64/kernel/vmlinux.lds.S | 8 ----- arch/arm64/kvm/hyp/entry.S | 16 ++++------ arch/arm64/kvm/hyp/hyp-entry.S | 51 +++++++++++++------------------- arch/arm64/kvm/hyp/switch.c | 31 ------------------- 5 files changed, 26 insertions(+), 95 deletions(-) diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h index 5df55a4dab42..400cb2af5ba6 100644 --- a/arch/arm64/include/asm/kvm_asm.h +++ b/arch/arm64/include/asm/kvm_asm.h @@ -146,21 +146,6 @@ extern u32 __kvm_get_mdcr_el2(void); kern_hyp_va \vcpu .endm -/* - * KVM extable for unexpected exceptions. - * In the same format _asm_extable, but output to a different section so that - * it can be mapped to EL2. The KVM version is not sorted. The caller must - * ensure: - * x18 has the hypervisor value to allow any Shadow-Call-Stack instrumented - * code to write to it, and that SPSR_EL2 and ELR_EL2 are restored by the fixup. - */ -.macro _kvm_extable, from, to - .pushsection __kvm_ex_table, "a" - .align 3 - .long (\from - .), (\to - .) - .popsection -.endm - #endif #endif /* __ARM_KVM_ASM_H__ */ diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S index 69e7c8d4a00f..d6050c6e65bc 100644 --- a/arch/arm64/kernel/vmlinux.lds.S +++ b/arch/arm64/kernel/vmlinux.lds.S @@ -24,13 +24,6 @@ ENTRY(_text) jiffies = jiffies_64; - -#define HYPERVISOR_EXTABLE \ - . = ALIGN(SZ_8); \ - __start___kvm_ex_table = .; \ - *(__kvm_ex_table) \ - __stop___kvm_ex_table = .; - #define HYPERVISOR_TEXT \ /* \ * Align to 4 KB so that \ @@ -46,7 +39,6 @@ jiffies = jiffies_64; __hyp_idmap_text_end = .; \ __hyp_text_start = .; \ *(.hyp.text) \ - HYPERVISOR_EXTABLE \ __hyp_text_end = .; #define IDMAP_TEXT \ diff --git a/arch/arm64/kvm/hyp/entry.S b/arch/arm64/kvm/hyp/entry.S index 90e012fa3ca5..a0552b5177c5 100644 --- a/arch/arm64/kvm/hyp/entry.S +++ b/arch/arm64/kvm/hyp/entry.S @@ -164,22 +164,18 @@ alternative_endif // This is our single instruction exception window. A pending // SError is guaranteed to occur at the earliest when we unmask // it, and at the latest just after the ISB. + .global abort_guest_exit_start abort_guest_exit_start: isb + .global abort_guest_exit_end abort_guest_exit_end: - msr daifset, #4 // Mask aborts - ret - - _kvm_extable abort_guest_exit_start, 9997f - _kvm_extable abort_guest_exit_end, 9997f -9997: - msr daifset, #4 // Mask aborts - mov x0, #(1 << ARM_EXIT_WITH_SERROR_BIT) - // restore the EL1 exception context so that we can report some - // information. Merge the exception code with the SError pending bit. + // If the exception took place, restore the EL1 exception + // context so that we can report some information. + // Merge the exception code with the SError pending bit. + tbz x0, #ARM_EXIT_WITH_SERROR_BIT, 1f msr elr_el2, x2 msr esr_el2, x3 msr spsr_el2, x4 diff --git a/arch/arm64/kvm/hyp/hyp-entry.S b/arch/arm64/kvm/hyp/hyp-entry.S index c3e4ae84f3a4..71591a6ee63e 100644 --- a/arch/arm64/kvm/hyp/hyp-entry.S +++ b/arch/arm64/kvm/hyp/hyp-entry.S @@ -26,30 +26,6 @@ #include <asm/kvm_mmu.h> #include <asm/mmu.h> -.macro save_caller_saved_regs_vect - /* x0 and x1 were saved in the vector entry */ - stp x2, x3, [sp, #-16]! - stp x4, x5, [sp, #-16]! - stp x6, x7, [sp, #-16]! - stp x8, x9, [sp, #-16]! - stp x10, x11, [sp, #-16]! - stp x12, x13, [sp, #-16]! - stp x14, x15, [sp, #-16]! - stp x16, x17, [sp, #-16]! -.endm - -.macro restore_caller_saved_regs_vect - ldp x16, x17, [sp], #16 - ldp x14, x15, [sp], #16 - ldp x12, x13, [sp], #16 - ldp x10, x11, [sp], #16 - ldp x8, x9, [sp], #16 - ldp x6, x7, [sp], #16 - ldp x4, x5, [sp], #16 - ldp x2, x3, [sp], #16 - ldp x0, x1, [sp], #16 -.endm - .text .pushsection .hyp.text, "ax" @@ -209,14 +185,27 @@ el2_sync: el2_error: - save_caller_saved_regs_vect - stp x29, x30, [sp, #-16]! - - bl kvm_unexpected_el2_exception - - ldp x29, x30, [sp], #16 - restore_caller_saved_regs_vect + ldp x0, x1, [sp], #16 + /* + * Only two possibilities: + * 1) Either we come from the exit path, having just unmasked + * PSTATE.A: change the return code to an EL2 fault, and + * carry on, as we're already in a sane state to handle it. + * 2) Or we come from anywhere else, and that's a bug: we panic. + * + * For (1), x0 contains the original return code and x1 doesn't + * contain anything meaningful at that stage. We can reuse them + * as temp registers. + * For (2), who cares? + */ + mrs x0, elr_el2 + adr x1, abort_guest_exit_start + cmp x0, x1 + adr x1, abort_guest_exit_end + ccmp x0, x1, #4, ne + b.ne __hyp_panic + mov x0, #(1 << ARM_EXIT_WITH_SERROR_BIT) eret sb diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c index e9ea7cf3e98f..acd2d84b190c 100644 --- a/arch/arm64/kvm/hyp/switch.c +++ b/arch/arm64/kvm/hyp/switch.c @@ -25,7 +25,6 @@ #include <asm/barrier.h> #include <asm/cpufeature.h> -#include <asm/extable.h> #include <asm/kprobes.h> #include <asm/kvm_asm.h> #include <asm/kvm_emulate.h> @@ -37,9 +36,6 @@ #include <asm/processor.h> #include <asm/thread_info.h> -extern struct exception_table_entry __start___kvm_ex_table; -extern struct exception_table_entry __stop___kvm_ex_table; - /* Check whether the FP regs were dirtied while in the host-side run loop: */ static bool __hyp_text update_fp_enabled(struct kvm_vcpu *vcpu) { @@ -730,30 +726,3 @@ void __hyp_text __noreturn hyp_panic(struct kvm_cpu_context *host_ctxt) unreachable(); } - -asmlinkage void __hyp_text kvm_unexpected_el2_exception(void) -{ - unsigned long addr, fixup; - struct kvm_cpu_context *host_ctxt; - struct exception_table_entry *entry, *end; - unsigned long elr_el2 = read_sysreg(elr_el2); - - entry = hyp_symbol_addr(__start___kvm_ex_table); - end = hyp_symbol_addr(__stop___kvm_ex_table); - host_ctxt = __hyp_this_cpu_ptr(kvm_host_cpu_state); - - while (entry < end) { - addr = (unsigned long)&entry->insn + entry->insn; - fixup = (unsigned long)&entry->fixup + entry->fixup; - - if (addr != elr_el2) { - entry++; - continue; - } - - write_sysreg(fixup, elr_el2); - return; - } - - hyp_panic(host_ctxt); -} -- 2.25.1

2 3

[PATCH 1/3] net: hns3: modify the sensitive words
by Yang Yingliang 30 Sep '20

30 Sep '20

From: Shengzui You <youshengzui(a)huawei.com> driver inclusion category: bugfix bugzilla: NA CVE: NA ----------------------------------- Reviewed-by: Weiwei Deng <dengweiwei(a)huawei.com> Reviewed-by: Zhaohui Zhong <zhongzhaohui(a)huawei.com> Reviewed-by: Junxin Chen <chenjunxin1(a)huawei.com> Signed-off-by: Shengzui You <youshengzui(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- .../hisilicon/hns3/hns-customer/hns3pf/hclge_main_it.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns-customer/hns3pf/hclge_main_it.h b/drivers/net/ethernet/hisilicon/hns3/hns-customer/hns3pf/hclge_main_it.h index cd1636e6dd65..343e036412d4 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns-customer/hns3pf/hclge_main_it.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns-customer/hns3pf/hclge_main_it.h @@ -36,14 +36,14 @@ typedef void (*nic_event_fn_t) (struct net_device *netdev, enum hnae3_event_type_custom); /** - * nic_register_event - register for nic event listening + * nic_register_event - register for nic event handling * @event_call: nic event handler * return 0 - success , negative - fail */ int nic_register_event(nic_event_fn_t event_call); /** - * nic_unregister_event - quit nic event listening + * nic_unregister_event - quit nic event handling * return 0 - success , negative - fail */ int nic_unregister_event(void); -- 2.25.1

1 2