Linux 4.19.75
Greg KH
maintainerI'm announcing the release of the 4.19.75 kernel.
All users of the 4.19 kernel series must upgrade.
The updated 4.19.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.19.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/filesystems/overlayfs.txt | 2 Makefile | 2 arch/arm/boot/dts/am571x-idk.dts | 7 arch/arm/boot/dts/am572x-idk.dts | 7 arch/arm/boot/dts/am574x-idk.dts | 7 arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 1 arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 7 arch/arm/boot/dts/am57xx-beagle-x15-revc.dts | 7 arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi | 50 +++--- arch/arm/mach-omap1/ams-delta-fiq-handler.S | 3 arch/arm/mach-omap1/ams-delta-fiq.c | 4 arch/arm/mach-omap2/omap4-common.c | 3 arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 3 arch/arm/mm/init.c | 8 - arch/arm64/kernel/cpufeature.c | 6 arch/powerpc/mm/pgtable-radix.c | 16 -- arch/s390/net/bpf_jit_comp.c | 12 - arch/x86/events/amd/ibs.c | 13 + arch/x86/events/intel/core.c | 6 arch/x86/hyperv/mmu.c | 8 - arch/x86/include/asm/perf_event.h | 12 + arch/x86/include/asm/uaccess.h | 4 arch/x86/kernel/apic/io_apic.c | 8 - drivers/atm/Kconfig | 2 drivers/block/floppy.c | 4 drivers/bus/ti-sysc.c | 19 +- drivers/dma/ti/dma-crossbar.c | 4 drivers/dma/ti/omap-dma.c | 4 drivers/firmware/google/vpd.c | 4 drivers/firmware/google/vpd_decode.c | 55 ++++--- drivers/firmware/google/vpd_decode.h | 6 drivers/fpga/altera-ps-spi.c | 11 - drivers/hid/wacom_sys.c | 10 - drivers/hid/wacom_wac.c | 4 drivers/i2c/busses/i2c-designware-slave.c | 1 drivers/infiniband/core/cma.c | 7 drivers/infiniband/core/restrack.c | 6 drivers/input/mouse/elan_i2c_core.c | 2 drivers/iommu/amd_iommu.c | 40 ++++- drivers/media/usb/dvb-usb/technisat-usb2.c | 22 +-- drivers/media/usb/tm6000/tm6000-dvb.c | 3 drivers/net/ethernet/amd/xgbe/xgbe-main.c | 10 + drivers/net/ethernet/aquantia/atlantic/aq_vec.c | 3 drivers/net/ethernet/ibm/ibmvnic.c | 6 drivers/net/ethernet/marvell/sky2.c | 7 drivers/net/ethernet/qlogic/qed/qed_main.c | 4 drivers/net/ethernet/seeq/sgiseeq.c | 7 drivers/net/ieee802154/mac802154_hwsim.c | 8 - drivers/net/usb/r8152.c | 5 drivers/net/wireless/marvell/mwifiex/ie.c | 3 drivers/net/wireless/marvell/mwifiex/uap_cmd.c | 9 + drivers/net/xen-netfront.c | 2 drivers/pci/controller/dwc/pcie-kirin.c | 4 drivers/phy/renesas/phy-rcar-gen3-usb2.c | 2 drivers/tty/serial/atmel_serial.c | 1 drivers/tty/serial/sprd_serial.c | 2 drivers/usb/core/config.c | 12 + drivers/usb/host/xhci-tegra.c | 10 + fs/binfmt_elf.c | 11 + fs/cifs/connect.c | 22 +++ fs/nfs/dir.c | 2 fs/nfs/nfs4file.c | 12 - fs/nfs/pagelist.c | 2 fs/nfs/proc.c | 7 fs/overlayfs/ovl_entry.h | 1 fs/overlayfs/super.c | 73 ++++++---- include/net/sock_reuseport.h | 21 ++ include/uapi/linux/netfilter/xt_nfacct.h | 5 kernel/kallsyms.c | 6 net/batman-adv/bat_v_ogm.c | 18 +- net/bridge/netfilter/ebtables.c | 8 - net/core/filter.c | 8 - net/core/sock_reuseport.c | 15 +- net/ipv4/datagram.c | 2 net/ipv4/udp.c | 5 net/ipv6/datagram.c | 2 net/ipv6/ip6_gre.c | 2 net/ipv6/udp.c | 5 net/netfilter/nf_conntrack_ftp.c | 2 net/netfilter/nf_flow_table_core.c | 2 net/netfilter/nft_flow_offload.c | 6 net/netfilter/xt_nfacct.c | 36 +++- net/netfilter/xt_physdev.c | 6 net/sched/sch_generic.c | 6 net/wireless/nl80211.c | 4 net/xdp/xdp_umem.c | 4 security/keys/request_key_auth.c | 6 tools/bpf/bpftool/prog.c | 4 tools/power/x86/turbostat/turbostat.c | 2 tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c | 28 ++- tools/testing/selftests/bpf/test_sock.c | 7 virt/kvm/coalesced_mmio.c | 17 +- 92 files changed, 562 insertions(+), 290 deletions(-)
Aaron Armstrong Skomra (1):
HID: wacom: generic: read HID_DG_CONTACTMAX from any feature report
Alan Stern (1):
USB: usbcore: Fix slab-out-of-bounds bug during device reset
Amir Goldstein (1):
ovl: fix regression caused by overlapping layers detection
Aneesh Kumar K.V (1):
powerpc/mm/radix: Use the right page size for vmemmap mapping
Ben Hutchings (1):
tools/power x86_energy_perf_policy: Fix "uninitialized variable" warnings at -O2
Benjamin Tissoires (1):
Input: elan_i2c - remove Lenovo Legion Y7000 PnpID
Christophe JAILLET (2):
Kconfig: Fix the reference to the IDT77105 Phy driver in the description of ATM_NICSTAR_USE_IDT77105
net: seeq: Fix the function used to release some memory in an error handling path
Chunyan Zhang (1):
serial: sprd: correct the wrong sequence of arguments
Cong Wang (1):
net_sched: let qdisc_put() accept NULL pointer
Dan Carpenter (1):
cifs: Use kzfree() to zero out the password
Dmitry Bogdanov (1):
net: aquantia: fix out of memory condition on rx side
Dongli Zhang (1):
xen-netfront: do not assume sk_buff_head list is empty in error handling
Doug Berger (1):
ARM: 8874/1: mm: only adjust sections of valid mm structures
Faiz Abbas (2):
ARM: dts: am57xx: Disable voltage switching for SD card
ARM: dts: dra74x: Fix iodelay configuration for mmc3
Greg Kroah-Hartman (1):
Linux 4.19.75
Hillf Danton (1):
keys: Fix missing null pointer check in request_key_auth_describe()
Hung-Te Lin (1):
firmware: google: check if size is valid when decoding VPD data
Ilya Leoshkevich (4):
s390/bpf: fix lcgr instruction encoding
s390/bpf: use 32-bit index for tail calls
selftests/bpf: fix "bind{4, 6} deny specific IP & port" on s390
bpf: allow narrow loads of some sk_reuseport_md fields with offset > 0
Ivan Khoronzhuk (1):
xdp: unpin xdp umem pages in error path
Jann Horn (1):
floppy: fix usercopy direction
Janusz Krzysztofik (1):
ARM: OMAP1: ams-delta-fiq: Fix missing irq_ack
Jarkko Nikula (1):
i2c: designware: Synchronize IRQs when unregistering slave client
Joerg Roedel (1):
iommu/amd: Fix race in increase_address_space()
Josh Hunt (1):
perf/x86/intel: Restrict period on Nehalem
Juliana Rodrigueiro (1):
netfilter: xt_nfacct: Fix alignment mismatch in xt_nfacct_match_info
Kees Cook (1):
binfmt_elf: move brk out of mmap when doing direct loader exec
Kim Phillips (1):
perf/x86/amd/ibs: Fix sample bias for dispatched micro-ops
Leon Romanovsky (1):
RDMA/restrack: Release task struct which was hold by CM_ID object
Marc Zyngier (1):
kallsyms: Don't let kallsyms_lookup_size_offset() fail on retrieving the first symbol
Masashi Honma (1):
nl80211: Fix possible Spectre-v1 for CQM RSSI thresholds
Matt Delco (1):
KVM: coalesced_mmio: add bounds checking
Nagarjuna Kristam (1):
usb: host: xhci-tegra: Set DMA mask correctly
Naoya Horiguchi (1):
tools/power turbostat: fix buffer overrun
Nathan Chancellor (1):
PCI: kirin: Fix section mismatch warning
Pablo Neira Ayuso (2):
netfilter: nf_flow_table: set default timeout after successful insertion
netfilter: nft_flow_offload: missing netlink attribute policy
Peter Zijlstra (1):
x86/uaccess: Don't leak the AC flags into __get_user() argument evaluation
Phil Reid (1):
fpga: altera-ps-spi: Fix getting of optional confd gpio
Prashant Malani (1):
r8152: Set memory to all 0xFFs on failed reg reads
Quentin Monnet (1):
tools: bpftool: close prog FD before exit on showing a single program
Razvan Stefanescu (1):
tty/serial: atmel: reschedule TX after RX was started
Ronnie Sahlberg (1):
cifs: set domainName when a domain-key is used in multiuser
Sean Young (2):
media: tm6000: double free if usb disconnect while streaming
media: technisat-usb2: break out of loop at end of buffer
Stuart Hayes (1):
iommu/amd: Flush old domains in kdump kernel
Suman Anna (1):
bus: ti-sysc: Simplify cleanup upon failures in sysc_probe()
Sven Eckelmann (1):
batman-adv: Only read OGM2 tvlv_len after buffer len check
Takashi Iwai (1):
sky2: Disable MSI on yet another ASUS boards (P6Xxxx)
Thomas Falcon (1):
ibmvnic: Do not process reset during or after device removal
Thomas Gleixner (1):
x86/apic: Fix arch_dynirq_lower_bound() bug for DT enabled machines
Thomas Jarosch (1):
netfilter: nf_conntrack_ftp: Fix debug output
Tianyu Lan (1):
x86/hyper-v: Fix overflow bug in fill_gva_list()
Todd Seidelmann (2):
netfilter: ebtables: Fix argument order to ADD_COUNTER
netfilter: xt_physdev: Fix spurious error message in physdev_mt_check
Tony Lindgren (3):
ARM: OMAP2+: Fix missing SYSC_HAS_RESET_STATUS for dra7 epwmss
bus: ti-sysc: Fix using configured sysc mask value
ARM: OMAP2+: Fix omap4 errata warning on other SoCs
Trond Myklebust (5):
NFSv4: Fix return values for nfs4_file_open()
NFSv4: Fix return value in nfs_finish_open()
NFS: Fix initialisation of I/O result struct in nfs_pgio_rpcsetup
NFSv2: Fix eof handling
NFSv2: Fix write regression
Wen Huang (1):
mwifiex: Fix three heap overflow at parsing element in cfg80211_ap_settings
Wenwen Wang (3):
qed: Add cleanup in qed_slowpath_start()
dmaengine: ti: dma-crossbar: Fix a memory leak bug
dmaengine: ti: omap-dma: Add cleanup in omap_dma_probe()
Will Deacon (1):
arm64: kpti: Whitelist Cortex-A CPUs that don't implement the CSV3 field
Willem de Bruijn (1):
udp: correct reuseport selection with connected sockets
Xin Long (1):
ip6_gre: fix a dst leak in ip6erspan_tunnel_xmit
Yoshihiro Shimoda (1):
phy: renesas: rcar-gen3-usb2: Disable clearing VBUS in over-current
YueHaibing (3):
ieee802154: hwsim: Fix error handle path in hwsim_init_module
ieee802154: hwsim: unregister hw while hwsim_subscribe_all_others fails
amd-xgbe: Fix error path in xgbe_mod_init()
Zephaniah E. Loss-Cutler-Hull (1):
tools/power x86_energy_perf_policy: Fix argument parsing
zhaoyang (1):
ARM: 8901/1: add a criteria for pfn_valid of arm
Greg KH
maintainerDocumentation/filesystems/overlayfs.txt +1 -1
@@ -302,7 +302,7 @@ beneath or above the path of another overlay lower layer path. Using an upper layer path and/or a workdir path that are already used by another overlay mount is not allowed and may fail with EBUSY. Using -partially overlapping paths is not allowed but will not fail with EBUSY. +partially overlapping paths is not allowed and may fail with EBUSY. If files are accessed from two overlayfs mounts which share or overlap the upper layer and/or workdir path the behavior of the overlay is undefined, though it will not result in a crash or deadlock.
Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 19 -SUBLEVEL = 74 +SUBLEVEL = 75 EXTRAVERSION = NAME = "People's Front"
arch/arm/boot/dts/am571x-idk.dts +1 -6
@@ -98,14 +98,9 @@ }; &mmc1 { - pinctrl-names = "default", "hs", "sdr12", "sdr25", "sdr50", "ddr50", "sdr104"; + pinctrl-names = "default", "hs"; pinctrl-0 = <&mmc1_pins_default_no_clk_pu>; pinctrl-1 = <&mmc1_pins_hs>; - pinctrl-2 = <&mmc1_pins_sdr12>; - pinctrl-3 = <&mmc1_pins_sdr25>; - pinctrl-4 = <&mmc1_pins_sdr50>; - pinctrl-5 = <&mmc1_pins_ddr50_rev20 &mmc1_iodelay_ddr50_conf>; - pinctrl-6 = <&mmc1_pins_sdr104 &mmc1_iodelay_sdr104_rev20_conf>; }; &mmc2 {
arch/arm/boot/dts/am572x-idk.dts +1 -6
@@ -20,14 +20,9 @@ }; &mmc1 { - pinctrl-names = "default", "hs", "sdr12", "sdr25", "sdr50", "ddr50", "sdr104"; + pinctrl-names = "default", "hs"; pinctrl-0 = <&mmc1_pins_default_no_clk_pu>; pinctrl-1 = <&mmc1_pins_hs>; - pinctrl-2 = <&mmc1_pins_sdr12>; - pinctrl-3 = <&mmc1_pins_sdr25>; - pinctrl-4 = <&mmc1_pins_sdr50>; - pinctrl-5 = <&mmc1_pins_ddr50 &mmc1_iodelay_ddr_rev20_conf>; - pinctrl-6 = <&mmc1_pins_sdr104 &mmc1_iodelay_sdr104_rev20_conf>; }; &mmc2 {
arch/arm/boot/dts/am574x-idk.dts +1 -6
@@ -24,14 +24,9 @@ }; &mmc1 { - pinctrl-names = "default", "hs", "sdr12", "sdr25", "sdr50", "ddr50", "sdr104"; + pinctrl-names = "default", "hs"; pinctrl-0 = <&mmc1_pins_default_no_clk_pu>; pinctrl-1 = <&mmc1_pins_hs>; - pinctrl-2 = <&mmc1_pins_default>; - pinctrl-3 = <&mmc1_pins_hs>; - pinctrl-4 = <&mmc1_pins_sdr50>; - pinctrl-5 = <&mmc1_pins_ddr50 &mmc1_iodelay_ddr_conf>; - pinctrl-6 = <&mmc1_pins_ddr50 &mmc1_iodelay_sdr104_conf>; }; &mmc2 {
arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi +1 -0
@@ -433,6 +433,7 @@ bus-width = <4>; cd-gpios = <&gpio6 27 GPIO_ACTIVE_LOW>; /* gpio 219 */ + no-1-8-v; }; &mmc2 {
arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts +1 -6
@@ -19,14 +19,9 @@ }; &mmc1 { - pinctrl-names = "default", "hs", "sdr12", "sdr25", "sdr50", "ddr50", "sdr104"; + pinctrl-names = "default", "hs"; pinctrl-0 = <&mmc1_pins_default>; pinctrl-1 = <&mmc1_pins_hs>; - pinctrl-2 = <&mmc1_pins_sdr12>; - pinctrl-3 = <&mmc1_pins_sdr25>; - pinctrl-4 = <&mmc1_pins_sdr50>; - pinctrl-5 = <&mmc1_pins_ddr50 &mmc1_iodelay_ddr_rev11_conf>; - pinctrl-6 = <&mmc1_pins_sdr104 &mmc1_iodelay_sdr104_rev11_conf>; vmmc-supply = <&vdd_3v3>; vqmmc-supply = <&ldo1_reg>; };
arch/arm/boot/dts/am57xx-beagle-x15-revc.dts +1 -6
@@ -19,14 +19,9 @@ }; &mmc1 { - pinctrl-names = "default", "hs", "sdr12", "sdr25", "sdr50", "ddr50", "sdr104"; + pinctrl-names = "default", "hs"; pinctrl-0 = <&mmc1_pins_default>; pinctrl-1 = <&mmc1_pins_hs>; - pinctrl-2 = <&mmc1_pins_sdr12>; - pinctrl-3 = <&mmc1_pins_sdr25>; - pinctrl-4 = <&mmc1_pins_sdr50>; - pinctrl-5 = <&mmc1_pins_ddr50 &mmc1_iodelay_ddr_rev20_conf>; - pinctrl-6 = <&mmc1_pins_sdr104 &mmc1_iodelay_sdr104_rev20_conf>; vmmc-supply = <&vdd_3v3>; vqmmc-supply = <&ldo1_reg>; };
arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi +25 -25
77 lines not on this page · raw message
arch/arm/mach-omap1/ams-delta-fiq-handler.S +2 -1
@@ -135,6 +135,8 @@ restart: orr r11, r11, r13 @ mask all requested interrupts str r11, [r12, #OMAP1510_GPIO_INT_MASK] + str r13, [r12, #OMAP1510_GPIO_INT_STATUS] @ ack all requested interrupts + ands r10, r13, #KEYBRD_CLK_MASK @ extract keyboard status - set? beq hksw @ no - try next source
@@ -142,7 +144,6 @@ restart: @@@@@@@@@@@@@@@@@@@@@@ @ Keyboard clock FIQ mode interrupt handler @ r10 now contains KEYBRD_CLK_MASK, use it - str r10, [r12, #OMAP1510_GPIO_INT_STATUS] @ ack the interrupt bic r11, r11, r10 @ unmask it str r11, [r12, #OMAP1510_GPIO_INT_MASK]
arch/arm/mach-omap1/ams-delta-fiq.c +1 -3
@@ -73,9 +73,7 @@ static irqreturn_t deferred_fiq(int irq, void *dev_id)* interrupts default to since commit 80ac93c27441 * requires interrupt already acked and unmasked. */ -if (irq_chip->irq_ack) - irq_chip->irq_ack (d); -if (irq_chip->irq_unmask) +if (!WARN_ON_ONCE (!irq_chip->irq_unmask)) irq_chip->irq_unmask (d); }for (; irq_counter[gpio] < fiq_count; irq_counter[gpio]++)
arch/arm/mach-omap2/omap4-common.c +3 -0
@@ -131,6 +131,9 @@ static int __init omap4_sram_init(void)struct device_node *np;struct gen_pool *sram_pool; +if (!soc_is_omap44xx () && !soc_is_omap54xx ()) +return 0 ; + np =of_find_compatible_node (NULL ,NULL ,"ti,omap4-mpu" );if (!np) pr_warn("%s:Unable to allocate sram needed to handle errata I688\n",
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +2 -1
@@ -385,7 +385,8 @@ static struct omap_hwmod dra7xx_dcan2_hwmod = {static struct omap_hwmod_class_sysconfig dra7xx_epwmss_sysc = { .rev_offs =0x0 , .sysc_offs =0x4 , - .sysc_flags =SYSC_HAS_SIDLEMODE |SYSC_HAS_SOFTRESET , + .sysc_flags =SYSC_HAS_SIDLEMODE |SYSC_HAS_SOFTRESET | +SYSC_HAS_RESET_STATUS , .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART ), .sysc_fields = &omap_hwmod_sysc_type2, };
arch/arm/mm/init.c +7 -1
@@ -196,6 +196,11 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max_low,#ifdef CONFIG_HAVE_ARCH_PFN_VALID int pfn_valid (unsigned long pfn) { +phys_addr_t addr =__pfn_to_phys (pfn); + +if (__phys_to_pfn (addr) != pfn) +return 0 ; +return memblock_is_map_memory (__pfn_to_phys (pfn)); }EXPORT_SYMBOL (pfn_valid);
@@ -713,7 +718,8 @@ static void update_sections_early(struct section_perm perms[], int n)if (t->flags &PF_KTHREAD )continue ;for_each_thread (t, s) -set_section_perms (perms, n, true, s->mm); +if (s->mm) +set_section_perms (perms, n, true, s->mm); }set_section_perms (perms, n, true, current->active_mm);set_section_perms (perms, n, true, &init_mm);
arch/arm64/kernel/cpufeature.c +6 -0
@@ -895,6 +895,12 @@ static bool unmap_kernel_at_el0(const struct arm64_cpu_capabilities *entry,static const struct midr_range kpti_safe_list[] = {MIDR_ALL_VERSIONS (MIDR_CAVIUM_THUNDERX2 ),MIDR_ALL_VERSIONS (MIDR_BRCM_VULCAN ), +MIDR_ALL_VERSIONS (MIDR_CORTEX_A35 ), +MIDR_ALL_VERSIONS (MIDR_CORTEX_A53 ), +MIDR_ALL_VERSIONS (MIDR_CORTEX_A55 ), +MIDR_ALL_VERSIONS (MIDR_CORTEX_A57 ), +MIDR_ALL_VERSIONS (MIDR_CORTEX_A72 ), +MIDR_ALL_VERSIONS (MIDR_CORTEX_A73 ), {/* sentinel */ } };char const *str ="command line option" ;
arch/powerpc/mm/pgtable-radix.c +7 -9
@@ -521,14 +521,6 @@ void __init radix__early_init_devtree(void) mmu_psize_defs[MMU_PAGE_64K ].shift =16 ; mmu_psize_defs[MMU_PAGE_64K ].ap =0x5 ; found: -#ifdef CONFIG_SPARSEMEM_VMEMMAP -if (mmu_psize_defs[MMU_PAGE_2M ].shift) { -/* -* map vmemmap using 2M if available -*/ - mmu_vmemmap_psize =MMU_PAGE_2M ; - } -#endif /* CONFIG_SPARSEMEM_VMEMMAP */ return ; }
@@ -567,7 +559,13 @@ void __init radix__early_init_mmu(void)#ifdef CONFIG_SPARSEMEM_VMEMMAP /* vmemmap mapping */ - mmu_vmemmap_psize = mmu_virtual_psize; +if (mmu_psize_defs[MMU_PAGE_2M ].shift) { +/* +* map vmemmap using 2M if available +*/ + mmu_vmemmap_psize =MMU_PAGE_2M ; + }else + mmu_vmemmap_psize = mmu_virtual_psize;#endif /* * initialize page table size
arch/s390/net/bpf_jit_comp.c +7 -5
@@ -841,7 +841,7 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int ibreak ;case BPF_ALU64 |BPF_NEG :/* dst = -dst */ /* lcgr %dst,%dst */ -EMIT4 (0xb9130000 , dst_reg, dst_reg); +EMIT4 (0xb9030000 , dst_reg, dst_reg);break ;/* * BPF_FROM_BE/LE
@@ -1015,8 +1015,8 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i/* llgf %w1,map.max_entries(%b2) */ EMIT6_DISP_LH (0xe3000000 ,0x0016 ,REG_W1 ,REG_0 ,BPF_REG_2 , offsetof(struct bpf_array, map.max_entries)); -/* clgrj %b3,%w1,0xa,label0: if %b3 >= %w1 goto out */ -EMIT6_PCREL_LABEL (0xec000000 ,0x0065 ,BPF_REG_3 , +/* clrj %b3,%w1,0xa,label0: if (u32)%b3 >= (u32)%w1 goto out */ +EMIT6_PCREL_LABEL (0xec000000 ,0x0077 ,BPF_REG_3 ,REG_W1 ,0 ,0xa );/*
@@ -1042,8 +1042,10 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i* goto out; */ -/* sllg %r1,%b3,3: %r1 = index * 8 */ -EMIT6_DISP_LH (0xeb000000 ,0x000d ,REG_1 ,BPF_REG_3 ,REG_0 ,3 ); +/* llgfr %r1,%b3: %r1 = (u32) index */ +EMIT4 (0xb9160000 ,REG_1 ,BPF_REG_3 ); +/* sllg %r1,%r1,3: %r1 *= 8 */ +EMIT6_DISP_LH (0xeb000000 ,0x000d ,REG_1 ,REG_1 ,REG_0 ,3 );/* lg %r1,prog(%b2,%r1) */ EMIT6_DISP_LH (0xe3000000 ,0x0004 ,REG_1 ,BPF_REG_2 ,REG_1 , offsetof(struct bpf_array , ptrs));
arch/x86/events/amd/ibs.c +10 -3
@@ -672,10 +672,17 @@ static int perf_ibs_handle_irq(struct perf_ibs *perf_ibs, struct pt_regs *iregs) throttle =perf_event_overflow (event, &data, ®s); out: -if (throttle) +if (throttle) {perf_ibs_stop (event,0 ); -else -perf_ibs_enable_event (perf_ibs, hwc, period >>4 ); + }else { + period >>=4 ; + +if ((ibs_caps &IBS_CAPS_RDWROPCNT ) && + (*config &IBS_OP_CNT_CTL )) + period |= *config &IBS_OP_CUR_CNT_RAND ; + +perf_ibs_enable_event (perf_ibs, hwc, period); + }perf_event_update_userpage (event);
arch/x86/events/intel/core.c +6 -0
@@ -3319,6 +3319,11 @@ static u64 bdw_limit_period(struct perf_event *event, u64 left)return left; } +static u64 nhm_limit_period (struct perf_event *event,u64 left) +{ +return max (left,32ULL ); +} +PMU_FORMAT_ATTR (event,"config:0-7" );PMU_FORMAT_ATTR (umask,"config:8-15" );PMU_FORMAT_ATTR (edge,"config:18" );
@@ -4115,6 +4120,7 @@ __init int intel_pmu_init(void) x86_pmu.pebs_constraints = intel_nehalem_pebs_event_constraints; x86_pmu.enable_all = intel_pmu_nhm_enable_all; x86_pmu.extra_regs = intel_nehalem_extra_regs; + x86_pmu.limit_period = nhm_limit_period; x86_pmu.cpu_events = nhm_events_attrs;
arch/x86/hyperv/mmu.c +5 -3
@@ -37,12 +37,14 @@ static inline int fill_gva_list(u64 gva_list[], int offset,* Lower 12 bits encode the number of additional * pages to flush (in addition to the 'cur' page). */ -if (diff >=HV_TLB_FLUSH_UNIT ) +if (diff >=HV_TLB_FLUSH_UNIT ) { gva_list[gva_n] |= ~PAGE_MASK ; -else if (diff) + cur +=HV_TLB_FLUSH_UNIT ; + }else if (diff) { gva_list[gva_n] |= (diff -1 ) >>PAGE_SHIFT ; + cur = end; + } - cur +=HV_TLB_FLUSH_UNIT ; gva_n++; }while (cur < end);
arch/x86/include/asm/perf_event.h +8 -4
@@ -209,16 +209,20 @@ struct x86_pmu_capability {#define IBSCTL_LVT_OFFSET_VALID (1ULL<<8)#define IBSCTL_LVT_OFFSET_MASK 0x0F -/* ibs fetch bits/masks */ +/* IBS fetch bits/masks */ #define IBS_FETCH_RAND_EN (1ULL<<57)#define IBS_FETCH_VAL (1ULL<<49)#define IBS_FETCH_ENABLE (1ULL<<48)#define IBS_FETCH_CNT 0xFFFF0000ULL#define IBS_FETCH_MAX_CNT 0x0000FFFFULL -/* ibs op bits/masks */ -/* lower 4 bits of the current count are ignored: */ -#define IBS_OP_CUR_CNT (0xFFFF0ULL<<32) +/* +* IBS op bits/masks +* The lower 7 bits of the current count are random bits +* preloaded by hardware and ignored in software +*/ +#define IBS_OP_CUR_CNT (0xFFF80ULL<<32) +#define IBS_OP_CUR_CNT_RAND (0x0007FULL<<32)#define IBS_OP_CNT_CTL (1ULL<<19)#define IBS_OP_VAL (1ULL<<18)#define IBS_OP_ENABLE (1ULL<<17)
arch/x86/include/asm/uaccess.h +3 -1
@@ -451,8 +451,10 @@ do { \ ({ \ int __gu_err; \ __inttype(*(ptr)) __gu_val; \ + __typeof__(ptr) __gu_ptr = (ptr); \ + __typeof__(size) __gu_size = (size); \ __uaccess_begin_nospec(); \ - __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \ + __get_user_size(__gu_val, __gu_ptr, __gu_size, __gu_err, -EFAULT); \ __uaccess_end(); \ (x) = (__force __typeof__(*(ptr)))__gu_val; \ __builtin_expect(__gu_err, 0); \
arch/x86/kernel/apic/io_apic.c +7 -1
@@ -2432,7 +2432,13 @@ unsigned int arch_dynirq_lower_bound(unsigned int from)* dmar_alloc_hwirq() may be called before setup_IO_APIC(), so use * gsi_top if ioapic_dynirq_base hasn't been initialized yet. */ -return ioapic_initialized ? ioapic_dynirq_base : gsi_top; +if (!ioapic_initialized) +return gsi_top; +/* +* For DT enabled machines ioapic_dynirq_base is irrelevant and not +* updated. So simply return @from if ioapic_dynirq_base == 0. +*/ +return ioapic_dynirq_base ? : from; }#ifdef CONFIG_X86_32
drivers/atm/Kconfig +1 -1
@@ -200,7 +200,7 @@ config ATM_NICSTAR_USE_SUNI make the card work). config ATM_NICSTAR_USE_IDT77105 - bool "Use IDT77015 PHY driver (25Mbps)" + bool "Use IDT77105 PHY driver (25Mbps)" depends on ATM_NICSTAR help Support for the PHYsical layer chip in ForeRunner LE25 cards. In
drivers/block/floppy.c +2 -2
@@ -3791,7 +3791,7 @@ static int compat_getdrvprm(int drive, v.native_format =UDP ->native_format;mutex_unlock (&floppy_mutex); -if (copy_from_user (arg, &v,sizeof (struct compat_floppy_drive_params ))) +if (copy_to_user (arg, &v,sizeof (struct compat_floppy_drive_params )))return -EFAULT ;return 0 ; }
@@ -3827,7 +3827,7 @@ static int compat_getdrvstat(int drive, bool poll, v.bufblocks =UDRS ->bufblocks;mutex_unlock (&floppy_mutex); -if (copy_from_user (arg, &v,sizeof (struct compat_floppy_drive_struct ))) +if (copy_to_user (arg, &v,sizeof (struct compat_floppy_drive_struct )))return -EFAULT ;return 0 ; Eintr:
drivers/bus/ti-sysc.c +8 -11
@@ -1022,10 +1022,7 @@ static int sysc_init_sysc_mask(struct sysc *ddata)if (error)return 0 ; -if (val) - ddata->cfg.sysc_val = val & ddata->cap->sysc_mask; -else - ddata->cfg.sysc_val = ddata->cap->sysc_mask; + ddata->cfg.sysc_val = val & ddata->cap->sysc_mask;return 0 ; }
@@ -1688,7 +1685,7 @@ static int sysc_probe(struct platform_device *pdev) error =sysc_init_dts_quirks (ddata);if (error) - goto unprepare; +return error; error =sysc_get_clocks (ddata);if (error)
@@ -1696,27 +1693,27 @@ static int sysc_probe(struct platform_device *pdev) error =sysc_map_and_check_registers (ddata);if (error) - goto unprepare; +return error; error =sysc_init_sysc_mask (ddata);if (error) - goto unprepare; +return error; error =sysc_init_idlemodes (ddata);if (error) - goto unprepare; +return error; error =sysc_init_syss_mask (ddata);if (error) - goto unprepare; +return error; error =sysc_init_pdata (ddata);if (error) - goto unprepare; +return error; error =sysc_init_resets (ddata);if (error) -return error; + goto unprepare;pm_runtime_enable (ddata->dev); error =sysc_init_module (ddata);
drivers/dma/ti/dma-crossbar.c +3 -1
@@ -395,8 +395,10 @@ static int ti_dra7_xbar_probe(struct platform_device *pdev) ret =of_property_read_u32_array (node, pname, (u32 *)rsv_events, nelm *2 ); -if (ret) +if (ret) { +kfree (rsv_events);return ret; + }for (i =0 ; i < nelm; i++) { ti_dra7_xbar_reserve(rsv_events[i][0], rsv_events[i][1],
drivers/dma/ti/omap-dma.c +3 -1
@@ -1543,8 +1543,10 @@ static int omap_dma_probe(struct platform_device *pdev) rc =devm_request_irq (&pdev->dev, irq, omap_dma_irq,IRQF_SHARED ,"omap-dma-engine" , od); -if (rc) +if (rc) { +omap_dma_free (od);return rc; + } }if (omap_dma_glbl_read (od,CAPS_0 ) &CAPS_0_SUPPORT_LL123 )
drivers/firmware/google/vpd.c +2 -2
@@ -100,8 +100,8 @@ static int vpd_section_check_key_name(const u8 *key, s32 key_len)return VPD_OK ; } -static int vpd_section_attrib_add (const u8 *key,s32 key_len, -const u8 *value,s32 value_len, +static int vpd_section_attrib_add (const u8 *key,u32 key_len, +const u8 *value,u32 value_len,void *arg) {int ret;
drivers/firmware/google/vpd_decode.c +32 -23
84 lines not on this page · raw message
drivers/firmware/google/vpd_decode.h +3 -3
@@ -33,8 +33,8 @@ enum { };/* Callback for vpd_decode_string to invoke. */ -typedef int vpd_decode_callback (const u8 *key,s32 key_len, -const u8 *value,s32 value_len, +typedef int vpd_decode_callback (const u8 *key,u32 key_len, +const u8 *value,u32 value_len,void *arg);/*
@@ -52,7 +52,7 @@ typedef int vpd_decode_callback(const u8 *key, s32 key_len,* If one entry is successfully decoded, sends it to callback and returns the * result. */ -int vpd_decode_string (const s32 max_len,const u8 *input_buf,s32 *consumed, +int vpd_decode_string (const u32 max_len,const u8 *input_buf,u32 *consumed,vpd_decode_callback callback,void *callback_arg);#endif /* __VPD_DECODE_H */
drivers/fpga/altera-ps-spi.c +7 -4
@@ -207,7 +207,7 @@ static int altera_ps_write_complete(struct fpga_manager *mgr,return -EIO ; } -if (!IS_ERR (conf->confd)) { +if (conf->confd) {if (!gpiod_get_raw_value_cansleep (conf->confd)) {dev_err (&mgr->dev,"CONF_DONE is inactive!\n" );return -EIO ;
@@ -265,10 +265,13 @@ static int altera_ps_probe(struct spi_device *spi)return PTR_ERR (conf->status); } - conf->confd =devm_gpiod_get (&spi->dev,"confd" ,GPIOD_IN ); + conf->confd =devm_gpiod_get_optional (&spi->dev,"confd" ,GPIOD_IN );if (IS_ERR (conf->confd)) { -dev_warn (&spi->dev,"Not using confd gpio: %ld\n" , -PTR_ERR (conf->confd)); +dev_err (&spi->dev,"Failed to get confd gpio: %ld\n" , +PTR_ERR (conf->confd)); +return PTR_ERR (conf->confd); + }else if (!conf->confd) { +dev_warn (&spi->dev,"Not using confd gpio" ); }/* Register manager with unique name */
drivers/hid/wacom_sys.c +6 -4
@@ -282,14 +282,16 @@ static void wacom_feature_mapping(struct hid_device *hdev,/* leave touch_max as is if predefined */ if (!features->touch_max) {/* read manually */ - data =kzalloc (2 ,GFP_KERNEL ); + n =hid_report_len (field->report); + data =hid_alloc_report_buf (field->report,GFP_KERNEL );if (!data)break ; data[0 ] = field->report->id; ret =wacom_get_report (hdev,HID_FEATURE_REPORT , - data,2 ,WAC_CMD_RETRIES ); -if (ret ==2 ) { - features->touch_max = data[1 ]; + data, n,WAC_CMD_RETRIES ); +if (ret == n) { + ret =hid_report_raw_event (hdev, +HID_FEATURE_REPORT , data, n,0 ); }else { features->touch_max =16 ; hid_warn(hdev, "wacom_feature_mapping: "
drivers/hid/wacom_wac.c +4 -0
@@ -2533,6 +2533,7 @@ static void wacom_wac_finger_event(struct hid_device *hdev,struct wacom *wacom =hid_get_drvdata (hdev);struct wacom_wac *wacom_wac = &wacom->wacom_wac;unsigned equivalent_usage =wacom_equivalent_usage (usage->hid); +struct wacom_features *features = &wacom->wacom_wac.features;switch (equivalent_usage) {case HID_GD_X :
@@ -2553,6 +2554,9 @@ static void wacom_wac_finger_event(struct hid_device *hdev,case HID_DG_TIPSWITCH : wacom_wac->hid_data.tipswitch = value;break ; +case HID_DG_CONTACTMAX : + features->touch_max = value; +return ; }
drivers/i2c/busses/i2c-designware-slave.c +1 -0
@@ -94,6 +94,7 @@ static int i2c_dw_unreg_slave(struct i2c_client *slave) dev->disable_int (dev); dev->disable (dev); +synchronize_irq (dev->irq); dev->slave =NULL ;pm_runtime_put (dev->dev);
drivers/infiniband/core/cma.c +3 -4
@@ -1723,8 +1723,8 @@ void rdma_destroy_id(struct rdma_cm_id *id)mutex_lock (&id_priv->handler_mutex);mutex_unlock (&id_priv->handler_mutex); +rdma_restrack_del (&id_priv->res);if (id_priv->cma_dev) { -rdma_restrack_del (&id_priv->res);if (rdma_cap_ib_cm (id_priv->id.device,1 )) {if (id_priv->cm_id.ib)ib_destroy_cm_id (id_priv->cm_id.ib);
@@ -3463,10 +3463,9 @@ int rdma_bind_addr(struct rdma_cm_id *id, struct sockaddr *addr)return 0 ; err2: -if (id_priv->cma_dev) { -rdma_restrack_del (&id_priv->res); +rdma_restrack_del (&id_priv->res); +if (id_priv->cma_dev)cma_release_dev (id_priv); - } err1:cma_comp_exch (id_priv,RDMA_CM_ADDR_BOUND ,RDMA_CM_IDLE );return ret;
drivers/infiniband/core/restrack.c +4 -2
@@ -209,7 +209,7 @@ void rdma_restrack_del(struct rdma_restrack_entry *res)struct ib_device *dev;if (!res->valid) -return ; + goto out; dev =res_to_dev (res);if (!dev)
@@ -222,8 +222,10 @@ void rdma_restrack_del(struct rdma_restrack_entry *res)down_write (&dev->res.rwsem);hash_del (&res->node); res->valid = false; +up_write (&dev->res.rwsem); + +out:if (res->task)put_task_struct (res->task); -up_write (&dev->res.rwsem); }EXPORT_SYMBOL (rdma_restrack_del);
drivers/input/mouse/elan_i2c_core.c +1 -1
@@ -1358,7 +1358,7 @@ static const struct acpi_device_id elan_acpi_id[] = { { "ELAN0618", 0 }, { "ELAN0619", 0 }, { "ELAN061A", 0 }, - { "ELAN061B", 0 }, +/* { "ELAN061B", 0 }, not working on the Lenovo Legion Y7000 */ { "ELAN061C", 0 }, { "ELAN061D", 0 }, { "ELAN061E", 0 },
drivers/iommu/amd_iommu.c +35 -5
@@ -1153,6 +1153,17 @@ static void amd_iommu_flush_tlb_all(struct amd_iommu *iommu)iommu_completion_wait (iommu); } +static void amd_iommu_flush_tlb_domid (struct amd_iommu *iommu,u32 dom_id) +{ +struct iommu_cmd cmd; + +build_inv_iommu_pages (&cmd,0 ,CMD_INV_IOMMU_ALL_PAGES_ADDRESS , + dom_id,1 ); +iommu_queue_command (iommu, &cmd); + +iommu_completion_wait (iommu); +} +static void amd_iommu_flush_all (struct amd_iommu *iommu) {struct iommu_cmd cmd;
@@ -1329,18 +1340,21 @@ static void domain_flush_devices(struct protection_domain *domain)* another level increases the size of the address space by 9 bits to a size up * to 64 bits. */ -static bool increase_address_space (struct protection_domain *domain, +static void increase_address_space (struct protection_domain *domain,gfp_t gfp) { +unsigned long flags;u64 *pte; -if (domain->mode ==PAGE_MODE_6_LEVEL ) +spin_lock_irqsave (&domain->lock, flags); + +if (WARN_ON_ONCE (domain->mode ==PAGE_MODE_6_LEVEL ))/* address space already 64 bit large */ -return false; + goto out; pte = (void *)get_zeroed_page (gfp);if (!pte) -return false; + goto out; *pte =PM_LEVEL_PDE (domain->mode,iommu_virt_to_phys (domain->pt_root));
@@ -1348,7 +1362,10 @@ static bool increase_address_space(struct protection_domain *domain, domain->mode +=1 ; domain->updated = true; -return true; +out: +spin_unlock_irqrestore (&domain->lock, flags); + +return ; } static u64 *alloc_pte(struct protection_domain *domain,
@@ -1838,6 +1855,7 @@ static void set_dte_entry(u16 devid, struct protection_domain *domain, {u64 pte_root =0 ;u64 flags =0 ; +u32 old_domid;if (domain->mode !=PAGE_MODE_NONE ) pte_root =iommu_virt_to_phys (domain->pt_root);
@@ -1887,8 +1905,20 @@ static void set_dte_entry(u16 devid, struct protection_domain *domain, flags &= ~DEV_DOMID_MASK ; flags |= domain->id; + old_domid = amd_iommu_dev_table[devid].data[1 ] &DEV_DOMID_MASK ; amd_iommu_dev_table[devid].data[1 ] = flags; amd_iommu_dev_table[devid].data[0 ] = pte_root; + +/* +* A kdump kernel might be replacing a domain ID that was copied from +* the previous kernel--if so, it needs to flush the translation cache +* entries for the old domain ID that is being overwritten +*/ +if (old_domid) { +struct amd_iommu *iommu = amd_iommu_rlookup_table[devid]; + +amd_iommu_flush_tlb_domid (iommu, old_domid); + } }static void clear_dte_entry (u16 devid)
drivers/media/usb/dvb-usb/technisat-usb2.c +10 -12
@@ -607,10 +607,9 @@ static int technisat_usb2_frontend_attach(struct dvb_usb_adapter *a)static int technisat_usb2_get_ir (struct dvb_usb_device *d) {struct technisat_usb2_state *state = d->priv; -u8 *buf = state->buf; -u8 *b; -int ret;struct ir_raw_event ev; +u8 *buf = state->buf; +int i, ret; buf[0 ] =GET_IR_DATA_VENDOR_REQUEST ; buf[1 ] =0x08 ;
@@ -646,26 +645,25 @@ static int technisat_usb2_get_ir(struct dvb_usb_device *d)return 0 ;/* no key pressed */ /* decoding */ - b = buf+1 ;#if 0 deb_rc ("RC: %d " , ret); -debug_dump (b, ret, deb_rc); +debug_dump (buf +1 , ret, deb_rc);#endif ev.pulse =0 ; -while (1 ) { - ev.pulse = !ev.pulse; - ev.duration = (*b *FIRMWARE_CLOCK_DIVISOR *FIRMWARE_CLOCK_TICK ) /1000 ; -ir_raw_event_store (d->rc_dev, &ev); - - b++; -if (*b ==0xff ) { +for (i =1 ; i <ARRAY_SIZE (state->buf); i++) { +if (buf[i] ==0xff ) { ev.pulse =0 ; ev.duration =888888 *2 ;ir_raw_event_store (d->rc_dev, &ev);break ; } + + ev.pulse = !ev.pulse; + ev.duration = (buf[i] *FIRMWARE_CLOCK_DIVISOR * +FIRMWARE_CLOCK_TICK ) /1000 ; +ir_raw_event_store (d->rc_dev, &ev); }ir_raw_event_handle (d->rc_dev);
drivers/media/usb/tm6000/tm6000-dvb.c +3 -0
@@ -105,6 +105,7 @@ static void tm6000_urb_received(struct urb *urb)printk (KERN_ERR "tm6000: error %s\n" , __func__);kfree (urb->transfer_buffer);usb_free_urb (urb); + dev->dvb->bulk_urb =NULL ; } } }
@@ -135,6 +136,7 @@ static int tm6000_start_stream(struct tm6000_core *dev) dvb->bulk_urb->transfer_buffer =kzalloc (size,GFP_KERNEL );if (!dvb->bulk_urb->transfer_buffer) {usb_free_urb (dvb->bulk_urb); + dvb->bulk_urb =NULL ;return -ENOMEM ; }
@@ -161,6 +163,7 @@ static int tm6000_start_stream(struct tm6000_core *dev)kfree (dvb->bulk_urb->transfer_buffer);usb_free_urb (dvb->bulk_urb); + dvb->bulk_urb =NULL ;return ret; }
drivers/net/ethernet/amd/xgbe/xgbe-main.c +8 -2
@@ -469,13 +469,19 @@ static int __init xgbe_mod_init(void) ret =xgbe_platform_init ();if (ret) -return ret; + goto err_platform_init; ret =xgbe_pci_init ();if (ret) -return ret; + goto err_pci_init;return 0 ; + +err_pci_init: +xgbe_platform_exit (); +err_platform_init: +unregister_netdevice_notifier (&xgbe_netdev_notifier); +return ret; } static void __exit xgbe_mod_exit(void)
drivers/net/ethernet/aquantia/atlantic/aq_vec.c +2 -1
@@ -89,6 +89,7 @@ static int aq_vec_poll(struct napi_struct *napi, int budget) } } +err_exit:if (!was_tx_cleaned) work_done = budget;
@@ -98,7 +99,7 @@ static int aq_vec_poll(struct napi_struct *napi, int budget) 1U << self->aq_ring_param.vec_idx); } } -err_exit: +return work_done; }
drivers/net/ethernet/ibm/ibmvnic.c +5 -1
@@ -1998,6 +1998,10 @@ static void __ibmvnic_reset(struct work_struct *work) rwi =get_next_rwi (adapter);while (rwi) { +if (adapter->state ==VNIC_REMOVING || + adapter->state ==VNIC_REMOVED ) + goto out; +if (adapter->force_reset_recovery) { adapter->force_reset_recovery = false; rc =do_hard_reset (adapter, rwi, reset_state);
@@ -2022,7 +2026,7 @@ static void __ibmvnic_reset(struct work_struct *work)netdev_dbg (adapter->netdev,"Reset failed\n" );free_all_rwi (adapter); } - +out: adapter->resetting = false;if (we_lock_rtnl)rtnl_unlock ();
drivers/net/ethernet/marvell/sky2.c +7 -0
@@ -4954,6 +4954,13 @@ static const struct dmi_system_id msi_blacklist[] = { DMI_MATCH(DMI_BOARD_NAME, "P6T"), }, }, + { + .ident = "ASUS P6X", + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."), + DMI_MATCH(DMI_BOARD_NAME, "P6X"), + }, + }, {} };
drivers/net/ethernet/qlogic/qed/qed_main.c +3 -1
@@ -1150,7 +1150,7 @@ static int qed_slowpath_start(struct qed_dev *cdev, &drv_version);if (rc) {DP_NOTICE (cdev,"Failed sending drv version command\n" ); -return rc; + goto err4; } }
@@ -1158,6 +1158,8 @@ static int qed_slowpath_start(struct qed_dev *cdev,return 0 ; +err4: +qed_ll2_dealloc_if (cdev); err3:qed_hw_stop (cdev); err2:
drivers/net/ethernet/seeq/sgiseeq.c +4 -3
@@ -793,15 +793,16 @@ static int sgiseeq_probe(struct platform_device *pdev)printk (KERN_ERR "Sgiseeq: Cannot register net device, " "aborting.\n" ); err = -ENODEV ; - goto err_out_free_page; + goto err_out_free_attrs; }printk (KERN_INFO "%s: %s %pM\n" , dev->name, sgiseeqstr, dev->dev_addr);return 0 ; -err_out_free_page: -free_page ((unsigned long ) sp->srings); +err_out_free_attrs: +dma_free_attrs (&pdev->dev,sizeof (*sp->srings), sp->srings, + sp->srings_dma,DMA_ATTR_NON_CONSISTENT ); err_out_free_dev:free_netdev (dev);
drivers/net/ieee802154/mac802154_hwsim.c +5 -3
@@ -821,7 +821,7 @@ static int hwsim_add_one(struct genl_info *info, struct device *dev, err =hwsim_subscribe_all_others (phy);if (err <0 ) {mutex_unlock (&hwsim_phys_lock); - goto err_reg; + goto err_subscribe; } }list_add_tail (&phy->list, &hwsim_phys);
@@ -831,6 +831,8 @@ static int hwsim_add_one(struct genl_info *info, struct device *dev,return idx; +err_subscribe: +ieee802154_unregister_hw (phy->hw); err_reg:kfree (pib); err_pib:
@@ -920,9 +922,9 @@ static __init int hwsim_init_module(void)return 0 ; platform_drv: -genl_unregister_family (&hwsim_genl_family); -platform_dev:platform_device_unregister (mac802154hwsim_dev); +platform_dev: +genl_unregister_family (&hwsim_genl_family);return rc; }
drivers/net/usb/r8152.c +4 -1
@@ -788,8 +788,11 @@ int get_registers(struct r8152 *tp, u16 value, u16 index, u16 size, void *data) ret =usb_control_msg (tp->udev,usb_rcvctrlpipe (tp->udev,0 ),RTL8152_REQ_GET_REGS ,RTL8152_REQT_READ , value, index, tmp, size,500 ); +if (ret <0 ) +memset (data,0xff , size); +else +memcpy (data, tmp, size); -memcpy (data, tmp, size);kfree (tmp);return ret;
drivers/net/wireless/marvell/mwifiex/ie.c +3 -0
@@ -241,6 +241,9 @@ static int mwifiex_update_vs_ie(const u8 *ies, int ies_len, } vs_ie = (struct ieee_types_header *)vendor_ie; +if (le16_to_cpu (ie->ie_length) + vs_ie->len +2 > +IEEE_MAX_IE_SIZE ) +return -EINVAL ;memcpy (ie->ie_buffer +le16_to_cpu (ie->ie_length), vs_ie, vs_ie->len +2 );le16_unaligned_add_cpu (&ie->ie_length, vs_ie->len +2 );
drivers/net/wireless/marvell/mwifiex/uap_cmd.c +8 -1
@@ -265,6 +265,8 @@ mwifiex_set_uap_rates(struct mwifiex_uap_bss_param *bss_cfg, rate_ie = (void *)cfg80211_find_ie (WLAN_EID_SUPP_RATES , var_pos, len);if (rate_ie) { +if (rate_ie->len >MWIFIEX_SUPPORTED_RATES ) +return ;memcpy (bss_cfg->rates, rate_ie +1 , rate_ie->len); rate_len = rate_ie->len; }
@@ -272,8 +274,11 @@ mwifiex_set_uap_rates(struct mwifiex_uap_bss_param *bss_cfg, rate_ie = (void *)cfg80211_find_ie (WLAN_EID_EXT_SUPP_RATES , params->beacon.tail, params->beacon.tail_len); -if (rate_ie) +if (rate_ie) { +if (rate_ie->len >MWIFIEX_SUPPORTED_RATES - rate_len) +return ;memcpy (bss_cfg->rates + rate_len, rate_ie +1 , rate_ie->len); + }return ; }
@@ -391,6 +396,8 @@ mwifiex_set_wmm_params(struct mwifiex_private *priv, params->beacon.tail_len);if (vendor_ie) { wmm_ie = vendor_ie; +if (*(wmm_ie +1 ) >sizeof (struct mwifiex_types_wmm_info )) +return ;memcpy (&bss_cfg->wmm_info, wmm_ie +sizeof (struct ieee_types_header ), *(wmm_ie +1 )); priv->wmm_enabled =1 ;
drivers/net/xen-netfront.c +1 -1
@@ -909,7 +909,7 @@ static RING_IDX xennet_fill_frags(struct netfront_queue *queue,__pskb_pull_tail (skb, pull_to -skb_headlen (skb)); }if (unlikely (skb_shinfo (skb)->nr_frags >=MAX_SKB_FRAGS )) { - queue->rx.rsp_cons = ++cons; + queue->rx.rsp_cons = ++cons +skb_queue_len (list);kfree_skb (nskb);return ~0U ; }
drivers/pci/controller/dwc/pcie-kirin.c +2 -2
@@ -467,8 +467,8 @@ static int kirin_pcie_add_msi(struct dw_pcie *pci,return 0 ; } -static int __init kirin_add_pcie_port (struct dw_pcie *pci, -struct platform_device *pdev) +static int kirin_add_pcie_port (struct dw_pcie *pci, +struct platform_device *pdev) {int ret;
drivers/phy/renesas/phy-rcar-gen3-usb2.c +2 -0
@@ -66,6 +66,7 @@ USB2_OBINT_IDDIGCHG)/* VBCTRL */ +#define USB2_VBCTRL_OCCLREN BIT(16)#define USB2_VBCTRL_DRVVBUSSEL BIT(8)/* LINECTRL1 */
@@ -289,6 +290,7 @@ static void rcar_gen3_init_otg(struct rcar_gen3_chan *ch)u32 val; val =readl (usb2_base +USB2_VBCTRL ); + val &= ~USB2_VBCTRL_OCCLREN ;writel (val |USB2_VBCTRL_DRVVBUSSEL , usb2_base +USB2_VBCTRL );writel (USB2_OBINT_BITS , usb2_base +USB2_OBINTSTA ); val =readl (usb2_base +USB2_OBINTEN );
drivers/tty/serial/atmel_serial.c +0 -1
@@ -1270,7 +1270,6 @@ atmel_handle_transmit(struct uart_port *port, unsigned int pending) atmel_port->hd_start_rx = false;atmel_start_rx (port); -return ; }atmel_tasklet_schedule (atmel_port, &atmel_port->tasklet_tx);
drivers/tty/serial/sprd_serial.c +1 -1
@@ -232,7 +232,7 @@ static inline void sprd_rx(struct uart_port *port)if (lsr & (SPRD_LSR_BI |SPRD_LSR_PE |SPRD_LSR_FE |SPRD_LSR_OE )) -if (handle_lsr_errors (port, &lsr, &flag)) +if (handle_lsr_errors (port, &flag, &lsr))continue ;if (uart_handle_sysrq_char (port, ch))continue ;
drivers/usb/core/config.c +8 -4
@@ -925,7 +925,7 @@ int usb_get_bos_descriptor(struct usb_device *dev)struct usb_bos_descriptor *bos;struct usb_dev_cap_header *cap;struct usb_ssp_cap_descriptor *ssp_cap; -unsigned char *buffer; +unsigned char *buffer, *buffer0;int length, total_len, num, i, ssac;__u8 cap_type;int ret;
@@ -970,10 +970,12 @@ int usb_get_bos_descriptor(struct usb_device *dev) ret = -ENOMSG ; goto err; } + + buffer0 = buffer; total_len -= length; + buffer += length;for (i =0 ; i < num; i++) { - buffer += length; cap = (struct usb_dev_cap_header *)buffer;if (total_len <sizeof (*cap) || total_len < cap->bLength) {
@@ -987,8 +989,6 @@ int usb_get_bos_descriptor(struct usb_device *dev)break ; } - total_len -= length; -if (cap->bDescriptorType !=USB_DT_DEVICE_CAPABILITY ) {dev_warn (ddev,"descriptor type invalid, skip\n" );continue ;
@@ -1023,7 +1023,11 @@ int usb_get_bos_descriptor(struct usb_device *dev)default :break ; } + + total_len -= length; + buffer += length; } + dev->bos->desc->wTotalLength =cpu_to_le16 (buffer - buffer0);return 0 ;
drivers/usb/host/xhci-tegra.c +10 -0
@@ -1148,6 +1148,16 @@ static int tegra_xusb_probe(struct platform_device *pdev)tegra_xusb_ipfs_config (tegra, regs); +/* +* The XUSB Falcon microcontroller can only address 40 bits, so set +* the DMA mask accordingly. +*/ + err =dma_set_mask_and_coherent (tegra->dev,DMA_BIT_MASK (40 )); +if (err <0 ) { +dev_err (&pdev->dev,"failed to set DMA mask: %d\n" , err); + goto put_rpm; + } + err =tegra_xusb_load_firmware (tegra);if (err <0 ) {dev_err (&pdev->dev,"failed to load firmware: %d\n" , err);
fs/binfmt_elf.c +11 -0
@@ -1137,6 +1137,17 @@ static int load_elf_binary(struct linux_binprm *bprm) current->mm->start_stack = bprm->p;if ((current->flags &PF_RANDOMIZE ) && (randomize_va_space >1 )) { +/* +* For architectures with ELF randomization, when executing +* a loader directly (i.e. no interpreter listed in ELF +* headers), move the brk area out of the mmap region +* (since it grows up, and may collide early with the stack +* growing down), and into the unused ELF_ET_DYN_BASE region. +*/ +if (IS_ENABLED (CONFIG_ARCH_HAS_ELF_RANDOMIZE ) && !interpreter) + current->mm->brk = current->mm->start_brk = +ELF_ET_DYN_BASE ; + current->mm->brk = current->mm->start_brk =arch_randomize_brk (current->mm);#ifdef compat_brk_randomized
fs/cifs/connect.c +22 -0
@@ -2756,6 +2756,7 @@ static int cifs_set_cifscreds(struct smb_vol *vol, struct cifs_ses *ses) { int rc = 0; +int is_domain =0 ;const char *delim, *payload;char *desc;ssize_t len;
@@ -2803,6 +2804,7 @@ cifs_set_cifscreds(struct smb_vol *vol, struct cifs_ses *ses) rc =PTR_ERR (key); goto out_err; } + is_domain =1 ; }down_read (&key->sem);
@@ -2860,6 +2862,26 @@ cifs_set_cifscreds(struct smb_vol *vol, struct cifs_ses *ses) goto out_key_put; } +/* +* If we have a domain key then we must set the domainName in the +* for the request. +*/ +if (is_domain && ses->domainName) { + vol->domainname =kstrndup (ses->domainName, +strlen (ses->domainName), +GFP_KERNEL ); +if (!vol->domainname) { +cifs_dbg (FYI ,"Unable to allocate %zd bytes for " +"domain\n" , len); + rc = -ENOMEM ; +kfree (vol->username); + vol->username =NULL ; +kzfree (vol->password); + vol->password =NULL ; + goto out_key_put; + } + } + out_key_put:up_read (&key->sem);key_put (key);
fs/nfs/dir.c +1 -1
@@ -1486,7 +1486,7 @@ static int nfs_finish_open(struct nfs_open_context *ctx,if (S_ISREG (file->f_path.dentry->d_inode->i_mode))nfs_file_set_open_context (file, ctx);else - err = -ESTALE ; + err = -EOPENSTALE ; out:return err; }
fs/nfs/nfs4file.c +6 -6
@@ -73,13 +73,13 @@ nfs4_file_open(struct inode *inode, struct file *filp)if (IS_ERR (inode)) { err =PTR_ERR (inode);switch (err) { -case -EPERM : -case -EACCES : -case -EDQUOT : -case -ENOSPC : -case -EROFS : - goto out_put_ctx;default : + goto out_put_ctx; +case -ENOENT : +case -ESTALE : +case -EISDIR : +case -ENOTDIR : +case -ELOOP : goto out_drop; } }
fs/nfs/pagelist.c +1 -1
@@ -567,7 +567,7 @@ static void nfs_pgio_rpcsetup(struct nfs_pgio_header *hdr, } hdr->res.fattr = &hdr->fattr; - hdr->res.count = count; + hdr->res.count =0 ; hdr->res.eof =0 ; hdr->res.verf = &hdr->verf;nfs_fattr_init (&hdr->fattr);
fs/nfs/proc.c +5 -2
@@ -594,7 +594,8 @@ static int nfs_read_done(struct rpc_task *task, struct nfs_pgio_header *hdr)/* Emulate the eof flag, which isn't normally needed in NFSv2 * as it is guaranteed to always return the file attributes */ -if (hdr->args.offset + hdr->res.count >= hdr->res.fattr->size) +if ((hdr->res.count ==0 && hdr->args.count >0 ) || + hdr->args.offset + hdr->res.count >= hdr->res.fattr->size) hdr->res.eof =1 ; }return 0 ;
@@ -615,8 +616,10 @@ static int nfs_proc_pgio_rpc_prepare(struct rpc_task *task,static int nfs_write_done (struct rpc_task *task,struct nfs_pgio_header *hdr) { -if (task->tk_status >=0 ) +if (task->tk_status >=0 ) { + hdr->res.count = hdr->args.count;nfs_writeback_update_inode (hdr); + }return 0 ; }
fs/overlayfs/ovl_entry.h +1 -0
@@ -69,6 +69,7 @@ struct ovl_fs {bool workdir_locked;/* Traps in ovl inode cache */ struct inode *upperdir_trap; +struct inode *workbasedir_trap;struct inode *workdir_trap;struct inode *indexdir_trap;/* Inode numbers in all layers do not use the high xino_bits */
fs/overlayfs/super.c +47 -26
146 lines not on this page · raw message
include/net/sock_reuseport.h +20 -1
@@ -21,7 +21,8 @@ struct sock_reuseport {unsigned int synq_overflow_ts;/* ID stays the same even after the size of socks[] grows. */ unsigned int reuseport_id; -bool bind_inany; + unsigned int bind_inany:1; + unsigned int has_conns:1;struct bpf_prog __rcu *prog;/* optional BPF sock selector */ struct sock *socks[0 ];/* array of sock pointers */ };
@@ -35,6 +36,24 @@ extern struct sock *reuseport_select_sock(struct sock *sk,struct sk_buff *skb, int hdr_len);extern int reuseport_attach_prog (struct sock *sk,struct bpf_prog *prog); + +static inline bool reuseport_has_conns (struct sock *sk,bool set) +{ +struct sock_reuseport *reuse; +bool ret = false; + +rcu_read_lock (); + reuse =rcu_dereference (sk->sk_reuseport_cb); +if (reuse) { +if (set) + reuse->has_conns =1 ; + ret = reuse->has_conns; + } +rcu_read_unlock (); + +return ret; +} +int reuseport_get_id (struct sock_reuseport *reuse);#endif /* _SOCK_REUSEPORT_H */
include/uapi/linux/netfilter/xt_nfacct.h +5 -0
@@ -11,4 +11,9 @@ struct xt_nfacct_match_info { struct nf_acct *nfacct; }; +struct xt_nfacct_match_info_v1 { +char name[NFACCT_NAME_MAX ]; +struct nf_acct *nfacct __attribute__((aligned (8 ))); +}; +#endif /* _XT_NFACCT_MATCH_H */
kernel/kallsyms.c +4 -2
@@ -262,8 +262,10 @@ int kallsyms_lookup_size_offset(unsigned long addr, unsigned long *symbolsize, {char namebuf[KSYM_NAME_LEN ]; -if (is_ksym_addr (addr)) -return !!get_symbol_pos (addr, symbolsize, offset); +if (is_ksym_addr (addr)) { +get_symbol_pos (addr, symbolsize, offset); +return 1 ; + }return !!module_address_lookup (addr, symbolsize, offset,NULL , namebuf) || !!__bpf_address_lookup (addr, symbolsize, offset, namebuf); }
net/batman-adv/bat_v_ogm.c +12 -6
@@ -643,17 +643,23 @@ batadv_v_ogm_process_per_outif(struct batadv_priv *bat_priv,* batadv_v_ogm_aggr_packet() - checks if there is another OGM aggregated * @buff_pos: current position in the skb * @packet_len: total length of the skb -* @tvlv_len: tvlv length of the previously considered OGM +* @ogm2_packet: potential OGM2 in buffer * * Return: true if there is enough space for another OGM, false otherwise. */ -static bool batadv_v_ogm_aggr_packet (int buff_pos,int packet_len, -__be16 tvlv_len) +static bool +batadv_v_ogm_aggr_packet (int buff_pos,int packet_len, +const struct batadv_ogm2_packet *ogm2_packet) {int next_buff_pos =0 ; - next_buff_pos += buff_pos +BATADV_OGM2_HLEN ; - next_buff_pos +=ntohs (tvlv_len); +/* check if there is enough space for the header */ + next_buff_pos += buff_pos +sizeof (*ogm2_packet); +if (next_buff_pos > packet_len) +return false; + +/* check if there is enough space for the optional TVLV */ + next_buff_pos +=ntohs (ogm2_packet->tvlv_len);return (next_buff_pos <= packet_len) && (next_buff_pos <=BATADV_MAX_AGGREGATION_BYTES );
@@ -830,7 +836,7 @@ int batadv_v_ogm_packet_recv(struct sk_buff *skb, ogm_packet = (struct batadv_ogm2_packet *)skb->data;while (batadv_v_ogm_aggr_packet (ogm_offset,skb_headlen (skb), - ogm_packet->tvlv_len)) { + ogm_packet)) {batadv_v_ogm_process (skb, ogm_offset, if_incoming); ogm_offset +=BATADV_OGM2_HLEN ;
net/bridge/netfilter/ebtables.c +4 -4
@@ -225,7 +225,7 @@ unsigned int ebt_do_table(struct sk_buff *skb,return NF_DROP ; } -ADD_COUNTER (*(counter_base + i),1 , skb->len); +ADD_COUNTER (*(counter_base + i), skb->len,1 );/* these should only watch: not modify, nor tell us * what to do with the packet
@@ -963,8 +963,8 @@ static void get_counters(const struct ebt_counter *oldcounters,continue ; counter_base =COUNTER_BASE (oldcounters, nentries, cpu);for (i =0 ; i < nentries; i++) -ADD_COUNTER (counters[i], counter_base[i].pcnt, - counter_base[i].bcnt); +ADD_COUNTER (counters[i], counter_base[i].bcnt, + counter_base[i].pcnt); } }
@@ -1289,7 +1289,7 @@ static int do_update_counters(struct net *net, const char *name,/* we add to the counters of the first cpu */ for (i =0 ; i < num_counters; i++) -ADD_COUNTER (t->private->counters[i], tmp[i].pcnt, tmp[i].bcnt); +ADD_COUNTER (t->private->counters[i], tmp[i].bcnt, tmp[i].pcnt);write_unlock_bh (&t->lock); ret =0 ;
net/core/filter.c +4 -4
@@ -7234,13 +7234,13 @@ sk_reuseport_is_valid_access(int off, int size,return size == size_default;/* Fields that allow narrowing */ -case offsetof(struct sk_reuseport_md , eth_protocol): + case bpf_ctx_range(struct sk_reuseport_md, eth_protocol): if (size < FIELD_SIZEOF(struct sk_buff, protocol))return false;/* fall through */ -case offsetof(struct sk_reuseport_md , ip_protocol): -case offsetof(struct sk_reuseport_md , bind_inany): -case offsetof(struct sk_reuseport_md , len): + case bpf_ctx_range(struct sk_reuseport_md, ip_protocol): + case bpf_ctx_range(struct sk_reuseport_md, bind_inany): + case bpf_ctx_range(struct sk_reuseport_md, len):bpf_ctx_record_field_size (info, size_default);return bpf_ctx_narrow_access_ok (off, size, size_default);
net/core/sock_reuseport.c +13 -2
@@ -292,8 +292,19 @@ struct sock *reuseport_select_sock(struct sock *sk, select_by_hash:/* no bpf or invalid bpf result: fall back to hash usage */ -if (!sk2) - sk2 = reuse->socks[reciprocal_scale (hash, socks)]; +if (!sk2) { +int i, j; + + i = j =reciprocal_scale (hash, socks); +while (reuse->socks[i]->sk_state ==TCP_ESTABLISHED ) { + i++; +if (i >= reuse->num_socks) + i =0 ; +if (i == j) + goto out; + } + sk2 = reuse->socks[i]; + } } out:
net/ipv4/datagram.c +2 -0
@@ -19,6 +19,7 @@#include <net/sock.h> #include <net/route.h> #include <net/tcp_states.h> +#include <net/sock_reuseport.h> int __ip4_datagram_connect (struct sock *sk,struct sockaddr *uaddr,int addr_len) {
@@ -73,6 +74,7 @@ int __ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len } inet->inet_daddr = fl4->daddr; inet->inet_dport = usin->sin_port; +reuseport_has_conns (sk, true); sk->sk_state =TCP_ESTABLISHED ;sk_set_txhash (sk); inet->inet_id = jiffies;
net/ipv4/udp.c +3 -2
@@ -443,12 +443,13 @@ static struct sock *udp4_lib_lookup2(struct net *net, score =compute_score (sk, net, saddr, sport, daddr, hnum, dif, sdif, exact_dif);if (score > badness) { -if (sk->sk_reuseport) { +if (sk->sk_reuseport && + sk->sk_state !=TCP_ESTABLISHED ) { hash =udp_ehashfn (net, daddr, hnum, saddr, sport); result =reuseport_select_sock (sk, hash, skb,sizeof (struct udphdr )); -if (result) +if (result && !reuseport_has_conns (sk, false))return result; } badness = score;
net/ipv6/datagram.c +2 -0
@@ -31,6 +31,7 @@#include <net/ip6_route.h> #include <net/tcp_states.h> #include <net/dsfield.h> +#include <net/sock_reuseport.h> #include <linux/errqueue.h> #include <linux/uaccess.h>
@@ -258,6 +259,7 @@ int __ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr, goto out; } +reuseport_has_conns (sk, true); sk->sk_state =TCP_ESTABLISHED ;sk_set_txhash (sk); out:
net/ipv6/ip6_gre.c +1 -1
@@ -988,7 +988,7 @@ static netdev_tx_t ip6erspan_tunnel_xmit(struct sk_buff *skb,if (unlikely (!tun_info || !(tun_info->mode &IP_TUNNEL_INFO_TX ) ||ip_tunnel_info_af (tun_info) !=AF_INET6 )) -return -EINVAL ; + goto tx_err; key = &tun_info->key;memset (&fl6,0 ,sizeof (fl6));
net/ipv6/udp.c +3 -2
@@ -177,13 +177,14 @@ static struct sock *udp6_lib_lookup2(struct net *net, score =compute_score (sk, net, saddr, sport, daddr, hnum, dif, sdif, exact_dif);if (score > badness) { -if (sk->sk_reuseport) { +if (sk->sk_reuseport && + sk->sk_state !=TCP_ESTABLISHED ) { hash =udp6_ehashfn (net, daddr, hnum, saddr, sport); result =reuseport_select_sock (sk, hash, skb,sizeof (struct udphdr )); -if (result) +if (result && !reuseport_has_conns (sk, false))return result; } result = sk;
net/netfilter/nf_conntrack_ftp.c +1 -1
@@ -323,7 +323,7 @@ static int find_pattern(const char *data, size_t dlen, i++; } -pr_debug ("Skipped up to `%c'!\n" , skip); +pr_debug ("Skipped up to 0x%hhx delimiter!\n" , skip); *numoff = i; *numlen =getnum (data + i, dlen - i, cmd, term, numoff);
net/netfilter/nf_flow_table_core.c +1 -1
@@ -203,7 +203,7 @@ int flow_offload_add(struct nf_flowtable *flow_table, struct flow_offload *flow)return err; } - flow->timeout = (u32 )jiffies; + flow->timeout = (u32 )jiffies +NF_FLOW_TIMEOUT ;return 0 ; }EXPORT_SYMBOL_GPL (flow_offload_add);
net/netfilter/nft_flow_offload.c +6 -0
@@ -149,6 +149,11 @@ static int nft_flow_offload_validate(const struct nft_ctx *ctx,return nft_chain_validate_hooks (ctx->chain, hook_mask); } +static const struct nla_policy nft_flow_offload_policy[NFTA_FLOW_MAX +1 ] = { + [NFTA_FLOW_TABLE_NAME ] = { .type =NLA_STRING , + .len =NFT_NAME_MAXLEN -1 }, +}; +static int nft_flow_offload_init (const struct nft_ctx *ctx,const struct nft_expr *expr,const struct nlattr *const tb[])
@@ -207,6 +212,7 @@ static const struct nft_expr_ops nft_flow_offload_ops = {static struct nft_expr_type nft_flow_offload_type__read_mostly = { .name ="flow_offload" , .ops = &nft_flow_offload_ops, + .policy = nft_flow_offload_policy, .maxattr =NFTA_FLOW_MAX , .owner =THIS_MODULE , };
net/netfilter/xt_nfacct.c +25 -11
@@ -57,25 +57,39 @@ nfacct_mt_destroy(const struct xt_mtdtor_param *par)nfnl_acct_put (info->nfacct); } -static struct xt_match nfacct_mt_reg__read_mostly = { - .name ="nfacct" , - .family =NFPROTO_UNSPEC , - .checkentry = nfacct_mt_checkentry, - .match = nfacct_mt, - .destroy = nfacct_mt_destroy, - .matchsize =sizeof (struct xt_nfacct_match_info ), - .usersize = offsetof(struct xt_nfacct_match_info , nfacct), - .me =THIS_MODULE , +static struct xt_match nfacct_mt_reg[]__read_mostly = { + { + .name ="nfacct" , + .revision =0 , + .family =NFPROTO_UNSPEC , + .checkentry = nfacct_mt_checkentry, + .match = nfacct_mt, + .destroy = nfacct_mt_destroy, + .matchsize =sizeof (struct xt_nfacct_match_info ), + .usersize = offsetof(struct xt_nfacct_match_info , nfacct), + .me =THIS_MODULE , + }, + { + .name ="nfacct" , + .revision =1 , + .family =NFPROTO_UNSPEC , + .checkentry = nfacct_mt_checkentry, + .match = nfacct_mt, + .destroy = nfacct_mt_destroy, + .matchsize =sizeof (struct xt_nfacct_match_info_v1 ), + .usersize = offsetof(struct xt_nfacct_match_info_v1 , nfacct), + .me =THIS_MODULE , + }, };static int __init nfacct_mt_init (void ) { -return xt_register_match (&nfacct_mt_reg); +return xt_register_matches (nfacct_mt_reg,ARRAY_SIZE (nfacct_mt_reg)); } static void __exit nfacct_mt_exit(void) { -xt_unregister_match (&nfacct_mt_reg); +xt_unregister_matches (nfacct_mt_reg,ARRAY_SIZE (nfacct_mt_reg)); }module_init (nfacct_mt_init);
net/netfilter/xt_physdev.c +2 -4
@@ -104,11 +104,9 @@ static int physdev_mt_check(const struct xt_mtchk_param *par)if (info->bitmask & (XT_PHYSDEV_OP_OUT |XT_PHYSDEV_OP_ISOUT ) && (!(info->bitmask &XT_PHYSDEV_OP_BRIDGED ) || info->invert &XT_PHYSDEV_OP_BRIDGED ) && - par->hook_mask & ((1 <<NF_INET_LOCAL_OUT ) | - (1 <<NF_INET_FORWARD ) | (1 <<NF_INET_POST_ROUTING ))) { + par->hook_mask & (1 <<NF_INET_LOCAL_OUT )) {pr_info_ratelimited ("--physdev-out and --physdev-is-out only supported in the FORWARD and POSTROUTING chains with bridged traffic\n" ); -if (par->hook_mask & (1 <<NF_INET_LOCAL_OUT )) -return -EINVAL ; +return -EINVAL ; }if (!brnf_probed) {
net/sched/sch_generic.c +5 -1
@@ -947,9 +947,13 @@ void qdisc_free(struct Qdisc *qdisc)void qdisc_destroy (struct Qdisc *qdisc) { -const struct Qdisc_ops *ops = qdisc->ops; +const struct Qdisc_ops *ops;struct sk_buff *skb, *tmp; +if (!qdisc) +return ; + ops = qdisc->ops; +if (qdisc->flags &TCQ_F_BUILTIN || !refcount_dec_and_test (&qdisc->refcnt))return ;
net/wireless/nl80211.c +3 -1
@@ -10270,9 +10270,11 @@ static int cfg80211_cqm_rssi_update(struct cfg80211_registered_device *rdev, hyst = wdev->cqm_config->rssi_hyst; n = wdev->cqm_config->n_rssi_thresholds; -for (i =0 ; i < n; i++) +for (i =0 ; i < n; i++) { + i =array_index_nospec (i, n);if (last < wdev->cqm_config->rssi_thresholds[i])break ; + } low_index = i -1 ;if (low_index >=0 ) {
net/xdp/xdp_umem.c +3 -1
@@ -322,7 +322,7 @@ static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr) umem->pages =kcalloc (umem->npgs,sizeof (*umem->pages),GFP_KERNEL );if (!umem->pages) { err = -ENOMEM ; - goto out_account; + goto out_pin; }for (i =0 ; i < umem->npgs; i++)
@@ -330,6 +330,8 @@ static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr)return 0 ; +out_pin: +xdp_umem_unpin_pages (umem); out_account:xdp_umem_unaccount_pages (umem);return err;
security/keys/request_key_auth.c +6 -0
@@ -71,6 +71,9 @@ static void request_key_auth_describe(const struct key *key, {struct request_key_auth *rka =get_request_key_auth (key); +if (!rka) +return ; +seq_puts (m,"key:" );seq_puts (m, key->description);if (key_is_positive (key))
@@ -88,6 +91,9 @@ static long request_key_auth_read(const struct key *key,size_t datalen;long ret; +if (!rka) +return -EKEYREVOKED ; + datalen = rka->callout_len; ret = datalen;
tools/bpf/bpftool/prog.c +3 -1
@@ -381,7 +381,9 @@ static int do_show(int argc, char **argv)if (fd <0 )return -1 ; -return show_prog (fd); + err =show_prog (fd); +close (fd); +return err; }if (argc)
tools/power/x86/turbostat/turbostat.c +1 -1
@@ -4953,7 +4953,7 @@ int initialize_counters(int cpu_id)void allocate_output_buffer () { - output_buffer =calloc (1 , (1 + topo.num_cpus) *1024 ); + output_buffer =calloc (1 , (1 + topo.num_cpus) *2048 ); outp = output_buffer;if (outp ==NULL )err (-1 ,"calloc output buffer" );
tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c +16 -12
@@ -546,7 +546,7 @@ void cmdline(int argc, char **argv) progname = argv[0 ]; -while ((opt =getopt_long_only (argc, argv,"+a:c:dD:E:e:f:m:M:rt:u:vw" , +while ((opt =getopt_long_only (argc, argv,"+a:c:dD:E:e:f:m:M:rt:u:vw:" , long_options, &option_index)) !=-1 ) {switch (opt) {case 'a' :
@@ -1260,6 +1260,15 @@ void probe_dev_msr(void)if (system ("/sbin/modprobe msr > /dev/null 2>&1" ))err (-5 ,"no /dev/cpu/0/msr, Try \"# modprobe msr\" " ); } + +static void get_cpuid_or_exit (unsigned int leaf, +unsigned int *eax,unsigned int *ebx, +unsigned int *ecx,unsigned int *edx) +{ +if (!__get_cpuid (leaf, eax, ebx, ecx, edx)) +errx (1 ,"Processor not supported\n" ); +} +/* * early_cpuid() * initialize turbo_is_enabled, has_hwp, has_epb
@@ -1267,15 +1276,10 @@ void probe_dev_msr(void)*/ void early_cpuid (void ) { -unsigned int eax, ebx, ecx, edx, max_level; +unsigned int eax, ebx, ecx, edx;unsigned int fms, family, model; -__get_cpuid (0 , &max_level, &ebx, &ecx, &edx); - -if (max_level <6 ) -errx (1 ,"Processor not supported\n" ); - -__get_cpuid (1 , &fms, &ebx, &ecx, &edx); +get_cpuid_or_exit (1 , &fms, &ebx, &ecx, &edx); family = (fms >>8 ) &0xf ; model = (fms >>4 ) &0xf ;if (family ==6 || family ==0xf )
@@ -1289,7 +1293,7 @@ void early_cpuid(void) bdx_highest_ratio = msr &0xFF ; } -__get_cpuid (0x6 , &eax, &ebx, &ecx, &edx); +get_cpuid_or_exit (0x6 , &eax, &ebx, &ecx, &edx); turbo_is_enabled = (eax >>1 ) &1 ; has_hwp = (eax >>7 ) &1 ; has_epb = (ecx >>3 ) &1 ;
@@ -1307,7 +1311,7 @@ void parse_cpuid(void) eax = ebx = ecx = edx =0 ; -__get_cpuid (0 , &max_level, &ebx, &ecx, &edx); +get_cpuid_or_exit (0 , &max_level, &ebx, &ecx, &edx);if (ebx ==0x756e6547 && edx ==0x49656e69 && ecx ==0x6c65746e ) genuine_intel =1 ;
@@ -1316,7 +1320,7 @@ void parse_cpuid(void)fprintf (stderr,"CPUID(0): %.4s%.4s%.4s " , (char *)&ebx, (char *)&edx, (char *)&ecx); -__get_cpuid (1 , &fms, &ebx, &ecx, &edx); +get_cpuid_or_exit (1 , &fms, &ebx, &ecx, &edx); family = (fms >>8 ) &0xf ; model = (fms >>4 ) &0xf ; stepping = fms &0xf ;
@@ -1341,7 +1345,7 @@ void parse_cpuid(void)errx (1 ,"CPUID: no MSR" ); -__get_cpuid (0x6 , &eax, &ebx, &ecx, &edx); +get_cpuid_or_exit (0x6 , &eax, &ebx, &ecx, &edx);/* turbo_is_enabled already set */ /* has_hwp already set */ has_hwp_notify = eax & (1 <<8 );
tools/testing/selftests/bpf/test_sock.c +5 -2
@@ -13,6 +13,7 @@#include <bpf/bpf.h> #include "cgroup_helpers.h" +#include "bpf_endian.h" #include "bpf_rlimit.h" #include "bpf_util.h"
@@ -231,7 +232,8 @@ static struct sock_test tests[] = {/* if (ip == expected && port == expected) */ BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , offsetof(struct bpf_sock, src_ip6[3])), -BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 ,0x01000000 ,4 ), +BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 , +__bpf_constant_ntohl (0x00000001 ),4 ),BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , offsetof(struct bpf_sock , src_port)), BPF_JMP_IMM(BPF_JNE, BPF_REG_7, 0x2001, 2),
@@ -260,7 +262,8 @@ static struct sock_test tests[] = {/* if (ip == expected && port == expected) */ BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , offsetof(struct bpf_sock , src_ip4)), -BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 ,0x0100007F ,4 ), +BPF_JMP_IMM (BPF_JNE ,BPF_REG_7 , +__bpf_constant_ntohl (0x7F000001 ),4 ),BPF_LDX_MEM (BPF_W ,BPF_REG_7 ,BPF_REG_6 , offsetof(struct bpf_sock , src_port)), BPF_JMP_IMM(BPF_JNE, BPF_REG_7, 0x1002, 2),
virt/kvm/coalesced_mmio.c +10 -7
@@ -40,7 +40,7 @@ static int coalesced_mmio_in_range(struct kvm_coalesced_mmio_dev *dev,return 1 ; } -static int coalesced_mmio_has_room (struct kvm_coalesced_mmio_dev *dev) +static int coalesced_mmio_has_room (struct kvm_coalesced_mmio_dev *dev,u32 last) {struct kvm_coalesced_mmio_ring *ring;unsigned avail;
@@ -52,7 +52,7 @@ static int coalesced_mmio_has_room(struct kvm_coalesced_mmio_dev *dev)* there is always one unused entry in the buffer */ ring = dev->kvm->coalesced_mmio_ring; - avail = (ring->first - ring->last -1 ) %KVM_COALESCED_MMIO_MAX ; + avail = (ring->first - last -1 ) %KVM_COALESCED_MMIO_MAX ;if (avail ==0 ) {/* full */ return 0 ;
@@ -67,24 +67,27 @@ static int coalesced_mmio_write(struct kvm_vcpu *vcpu, {struct kvm_coalesced_mmio_dev *dev =to_mmio (this);struct kvm_coalesced_mmio_ring *ring = dev->kvm->coalesced_mmio_ring; +__u32 insert;if (!coalesced_mmio_in_range (dev, addr, len))return -EOPNOTSUPP ;spin_lock (&dev->kvm->ring_lock); -if (!coalesced_mmio_has_room (dev)) { + insert =READ_ONCE (ring->last); +if (!coalesced_mmio_has_room (dev, insert) || + insert >=KVM_COALESCED_MMIO_MAX ) {spin_unlock (&dev->kvm->ring_lock);return -EOPNOTSUPP ; }/* copy data in first free entry of the ring */ - ring->coalesced_mmio[ring->last].phys_addr = addr; - ring->coalesced_mmio[ring->last].len = len; -memcpy (ring->coalesced_mmio[ring->last].data, val, len); + ring->coalesced_mmio[insert].phys_addr = addr; + ring->coalesced_mmio[insert].len = len; +memcpy (ring->coalesced_mmio[insert].data, val, len);smp_wmb (); - ring->last = (ring->last +1 ) %KVM_COALESCED_MMIO_MAX ; + ring->last = (insert +1 ) %KVM_COALESCED_MMIO_MAX ;spin_unlock (&dev->kvm->ring_lock);return 0 ; }