Linux 4.19.19
Greg KH
maintainerI'm announcing the release of the 4.19.19 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:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arc/include/asm/perf_event.h | 3 arch/arc/lib/memset-archs.S | 40 + arch/arc/mm/init.c | 3 arch/s390/include/asm/mmu_context.h | 5 arch/s390/kernel/early.c | 4 arch/s390/kernel/setup.c | 2 arch/s390/kernel/smp.c | 12 arch/x86/entry/entry_64_compat.S | 6 arch/x86/include/asm/mmu_context.h | 18 arch/x86/kernel/kvm.c | 7 arch/x86/kvm/vmx.c | 14 arch/x86/kvm/x86.c | 5 arch/x86/lib/kaslr.c | 4 drivers/acpi/nfit/core.c | 61 ++ drivers/char/mwave/mwavedd.c | 7 drivers/clk/socfpga/clk-pll-s10.c | 2 drivers/clk/socfpga/clk-s10.c | 20 drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 1 drivers/gpu/drm/meson/meson_crtc.c | 23 - drivers/gpu/drm/meson/meson_drv.c | 5 drivers/hv/hv_balloon.c | 10 drivers/hv/ring_buffer.c | 31 - drivers/hv/vmbus_drv.c | 91 ++-- drivers/ide/ide-proc.c | 2 drivers/input/joystick/xpad.c | 3 drivers/input/misc/uinput.c | 5 drivers/irqchip/irq-gic-v3-its.c | 25 - drivers/md/dm-crypt.c | 25 - drivers/md/dm-thin-metadata.c | 4 drivers/md/dm-thin-metadata.h | 2 drivers/md/dm-thin.c | 10 drivers/misc/ibmvmc.c | 7 drivers/misc/mei/hw-me-regs.h | 2 drivers/misc/mei/pci-me.c | 4 drivers/mmc/host/dw_mmc-bluefield.c | 5 drivers/mmc/host/meson-gx-mmc.c | 18 drivers/net/can/dev.c | 27 - drivers/net/can/flexcan.c | 2 drivers/net/ethernet/amd/xgbe/xgbe-common.h | 2 drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 22 drivers/net/ethernet/mellanox/mlxsw/pci.c | 12 drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 3 drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c | 4 drivers/net/ethernet/sun/cassini.c | 15 drivers/net/ethernet/sun/cassini.h | 15 drivers/net/phy/marvell.c | 37 + drivers/net/phy/mdio_bus.c | 1 drivers/net/ppp/pppoe.c | 1 drivers/nvme/target/rdma.c | 17 drivers/s390/char/sclp_config.c | 2 drivers/scsi/ufs/ufshcd.c | 10 drivers/staging/rtl8188eu/os_dep/usb_intf.c | 1 drivers/tty/n_hdlc.c | 1 drivers/tty/serial/serial_core.c | 12 drivers/tty/tty_io.c | 3 drivers/tty/vt/vt.c | 50 -- drivers/usb/core/ledtrig-usbport.c | 17 drivers/usb/dwc3/gadget.c | 2 drivers/usb/serial/pl2303.c | 1 drivers/usb/serial/pl2303.h | 2 drivers/usb/serial/usb-serial-simple.c | 3 drivers/vhost/net.c | 3 drivers/vhost/vhost.c | 97 +++- drivers/vhost/vhost.h | 3 drivers/video/console/vgacon.c | 7 fs/ceph/caps.c | 2 fs/cifs/cifssmb.c | 35 + fs/cifs/connect.c | 21 fs/cifs/smb2misc.c | 7 fs/cifs/smb2ops.c | 62 +- fs/notify/inotify/inotify_user.c | 6 include/linux/bpf_verifier.h | 13 include/linux/filter.h | 10 include/linux/hyperv.h | 5 include/linux/skbuff.h | 1 include/net/ip_fib.h | 2 include/uapi/linux/input.h | 6 kernel/bpf/core.c | 54 +- kernel/bpf/map_in_map.c | 17 kernel/bpf/verifier.c | 470 +++++++++++++++++---- kernel/time/posix-cpu-timers.c | 1 mm/page_alloc.c | 12 net/bridge/br_forward.c | 9 net/bridge/br_netfilter_ipv6.c | 1 net/bridge/netfilter/nft_reject_bridge.c | 1 net/can/bcm.c | 27 + net/ipv4/fib_frontend.c | 4 net/ipv4/fib_trie.c | 15 net/ipv4/ip_gre.c | 23 - net/ipv4/ip_input.c | 1 net/ipv4/tcp.c | 2 net/ipv4/udp.c | 16 net/ipv6/ip6_gre.c | 14 net/ipv6/udp.c | 16 net/openvswitch/flow_netlink.c | 2 net/sched/act_tunnel_key.c | 19 net/sched/cls_api.c | 3 net/sched/cls_flower.c | 19 sound/pci/hda/patch_conexant.c | 1 sound/pci/hda/patch_realtek.c | 2 sound/soc/codecs/rt5514-spi.c | 2 sound/soc/codecs/tlv320aic32x4.c | 4 sound/soc/intel/atom/sst-mfld-platform-pcm.c | 8 tools/testing/selftests/x86/protection_keys.c | 41 + 105 files changed, 1299 insertions(+), 515 deletions(-)
Alex Deucher (1):
drm/amdgpu: Add APTX quirk for Lenovo laptop
Alexander Popov (1):
KVM: x86: Fix single-step debugging
Alexander Usyskin (1):
mei: me: mark LBG devices as having dma support
Alexei Starovoitov (2):
bpf: improve verifier branch analysis
bpf: add per-insn complexity limit
Andrew Lunn (2):
net: phy: marvell: Errata for mv88e6390 internal PHYs
net: phy: marvell: Fix deadlock from wrong locking
Anthony Wong (1):
ALSA: hda - Add mute LED support for HP ProBook 470 G5
Charles Yeh (1):
USB: serial: pl2303: add new PID to support PL2303TB
Christian Borntraeger (1):
s390/early: improve machine detection
Christian Lamparter (1):
USB: leds: fix regression in usbport led trigger
Christoph Hellwig (1):
ide: fix a typo in the settings proc file name
Cong Wang (1):
net_sched: refetch skb protocol for each filter
Dan Williams (2):
acpi/nfit: Block function zero DSMs
acpi/nfit: Fix command-supported detection
Daniel Borkmann (10):
bpf: move {prev_,}insn_idx into verifier env
bpf: move tmp variable into ax register in interpreter
bpf: enable access to ax register also from verifier rewrite
bpf: restrict map value pointer arithmetic for unprivileged
bpf: restrict stack pointer arithmetic for unprivileged
bpf: restrict unknown scalars of mixed signed bounds for unprivileged
bpf: fix check_map_access smin_value test when pointer contains offset
bpf: prevent out of bounds speculation on pointer arithmetic
bpf: fix sanitation of alu op with pointer / scalar type from different paths
bpf: fix inner map masking to prevent oob under speculation
Daniel Drake (1):
x86/kaslr: Fix incorrect i8254 outb() parameters
Dave Hansen (2):
x86/pkeys: Properly copy pkey state at fork() x86/selftests/pkeys: Fork() to check for state being preserved
David Hildenbrand (1):
s390/smp: Fix calling smp_call_ipl_cpu() from ipl CPU
Davide Caratti (1):
net/sched: act_tunnel_key: fix memory leak in case of action replace
Deepa Dinamani (2):
Input: input_event - provide override for sparc64
Input: input_event - fix the CONFIG_SPARC64 mixup
Dexuan Cui (1):
Drivers: hv: vmbus: Check for ring when getting debug info
Dinh Nguyen (2):
clk: socfpga: stratix10: fix rate calculation for pll clocks
clk: socfpga: stratix10: fix naming convention for the fixed-clocks
Dmitry Torokhov (1):
Input: uinput - fix undefined behavior in uinput_validate_absinfo()
Eugeniy Paltsev (3):
ARCv2: lib: memeset: fix doing prefetchw outside of buffer
ARC: adjust memblock_reserve of kernel memory
ARC: perf: map generic branches to correct hardware condition
Gerald Schaefer (1):
s390/smp: fix CPU hotplug deadlock with CPU rescan
Greg Kroah-Hartman (2):
tty: Handle problem if line discipline does not have receive_buf Linux 4.19.19
Gustavo A. R. Silva (3):
ASoC: rt5514-spi: Fix potential NULL pointer dereference
misc: ibmvsm: Fix potential NULL pointer dereference char/mwave: fix potential Spectre v1 vulnerability
Hangbin Liu (1):
ip6_gre: update version related info when changing link
Ido Schimmel (2):
net: ipv4: Fix memory leak in network namespace dismantle
mlxsw: pci: Ring CQ's doorbell before RDQ's
Israel Rukshin (1):
nvmet-rdma: Add unlikely for response allocated check
Ivan Vecera (1):
net/sched: cls_flower: allocate mask dynamically in fl_change()
Jack Pham (1):
usb: dwc3: gadget: Clear req->needs_extra_trb flag on cleanup
Jan Beulich (1):
x86/entry/64/compat: Fix stack switching for XEN PV
Jason Wang (1):
vhost: log dirty page correctly
Joe Thornber (1):
dm thin: fix passdown_double_checking_shared_status()
Kailang Yang (1):
ALSA: hda/realtek - Fix typo for ALC225 model
Kangjie Lu (1):
ASoC: atom: fix a missing check of snd_pcm_lib_malloc_pages
KarimAllah Ahmed (1):
KVM/nVMX: Do not validate that posted_intr_desc_addr is page aligned
Lendacky, Thomas (1):
amd-xgbe: Fix mdio access for non-zero ports and clause 45 PHYs
Liming Sun (1):
mmc: dw_mmc-bluefield: : Fix the license information
Manfred Schlaegl (1):
can: dev: __can_get_echo_skb(): fix bogous check for non-existing skb by removing it
Marc Gonzalez (1):
scsi: ufs: Use explicit access size in ufshcd_dump_regs
Marc Zyngier (1):
irqchip/gic-v3-its: Align PCI Multi-MSI allocation on their size
Martin Schwidefsky (1):
s390/mm: always force a load of the primary ASCE on context switch
Max Schulze (1):
USB: serial: simple: add Motorola Tetra TPG2200 device id
Michael Straube (1):
staging: rtl8188eu: Add device code for D-Link DWA-121 rev B1
Michal Hocko (1):
Revert "mm, memory_hotplug: initialize struct pages for the full memory section"
Milan Broz (1):
dm crypt: fix parsing of extended IV arguments
Neil Armstrong (1):
drm/meson: Fix atomic mode switching regression
Nicolas Pitre (4):
vgacon: unconfuse vc_origin when using soft scrollback
vt: make vt_console_print() compatible with the unicode screen buffer
vt: always call notifier with the console lock held
vt: invoke notifier on screen size change
Nir Dotan (2):
mlxsw: pci: Increase PCI SW reset timeout
mlxsw: spectrum_fid: Update dummy FID index
Oliver Hartkopp (1):
can: bcm: check timer values before ktime conversion
Olivier Matz (1):
ip6_gre: fix tunnel list corruption for x-netns
Paul Fulghum (1):
tty/n_hdlc: fix __might_sleep warning
Pavel Shilovsky (4):
CIFS: Fix possible hang during async MTU reads and writes
CIFS: Fix credits calculations for reads with errors
CIFS: Fix credit calculation for encrypted reads with errors
CIFS: Do not reconnect TCP session in add_credits()
Raju Rangoju (1):
nvmet-rdma: fix null dereference under heavy load
Remi Pommarel (1):
mmc: meson-gx: Free irq in release() callback
Ronnie Sahlberg (1):
smb3: add credits we receive from oplock/break PDUs
Ross Lagerwall (2):
net: Fix usage of pskb_trim_rcsum
openvswitch: Avoid OOB read when parsing flow nlattrs
Samir Virmani (1):
uart: Fix crash in uart_write and uart_put_char
Sean Christopherson (2):
KVM: x86: Fix PV IPIs for 32-bit KVM host
KVM: x86: WARN_ONCE if sending a PV IPI returns a fatal error
Tetsuo Handa (1):
inotify: Fix fd refcount leak in inotify_add_watch().
Thomas Gleixner (2):
posix-cpu-timers: Unbreak timer rearming
net: sun: cassini: Cleanup license conflict
Thomas Petazzoni (1):
net: phy: mdio_bus: add missing device_del() in mdiobus_register() error handling
Tom Panfil (1):
Input: xpad - add support for SteelSeries Stratus Duo
Tom Roeder (1):
kvm: x86/vmx: Use kzalloc for cached_vmcs12
Tomas Winkler (1):
mei: me: add denverton innovation engine device IDs
Uwe Kleine-König (1):
can: flexcan: fix NULL pointer exception during bringup
Vitaly Kuznetsov (1):
hv_balloon: avoid touching uninitialized struct page during tail onlining
Willem de Bruijn (2):
udp: with udp_segment release on error path
tcp: allow MSG_ZEROCOPY transmission also in CLOSE_WAIT state
Xin Long (1):
erspan: build the header with the right proto according to erspan_ver
Yan, Zheng (1):
ceph: clear inode pointer when snap realm gets dropped by its inode
Yunjian Wang (1):
net: bridge: Fix ethernet header pointer before check skb forwardable
b-ak (1):
ASoC: tlv320aic32x4: Kernel OOPS while entering DAPM standby mode
Greg KH
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 19 -SUBLEVEL = 18 +SUBLEVEL = 19 EXTRAVERSION = NAME = "People's Front"
arch/arc/include/asm/perf_event.h +2 -1
@@ -103,7 +103,8 @@ static const char * const arc_pmu_ev_hw_map[] = {/* counts condition */ [PERF_COUNT_HW_INSTRUCTIONS ] ="iall" , - [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = "ijmp", /* Excludes ZOL jumps */ + /* All jump instructions that are taken */ + [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = "ijmptak", [PERF_COUNT_ARC_BPOK ] ="bpok" ,/* NP-NT, PT-T, PNT-NT */ #ifdef CONFIG_ISA_ARCV2 [PERF_COUNT_HW_BRANCH_MISSES] = "bpmp",
arch/arc/lib/memset-archs.S +32 -8
@@ -7,11 +7,39 @@ */ #include <linux/linkage.h> +#include <asm/cache.h> -#undef PREALLOC_NOT_AVAIL +/* + * The memset implementation below is optimized to use prefetchw and prealloc + * instruction in case of CPU with 64B L1 data cache line (L1_CACHE_SHIFT == 6) + * If you want to implement optimized memset for other possible L1 data cache + * line lengths (32B and 128B) you should rewrite code carefully checking + * we don't call any prefetchw/prealloc instruction for L1 cache lines which + * don't belongs to memset area. + */ + +#if L1_CACHE_SHIFT == 6 + +.macro PREALLOC_INSTR reg, off + prealloc [\reg, \off] +.endm + +.macro PREFETCHW_INSTR reg, off + prefetchw [\reg, \off] +.endm + +#else + +.macro PREALLOC_INSTR +.endm + +.macro PREFETCHW_INSTR +.endm + +#endif ENTRY_CFI(memset) - prefetchw [r0] ; Prefetch the write location + PREFETCHW_INSTR r0, 0 ; Prefetch the first write location mov.f 0, r2 ;;; if size is zero jz.d [blink]
@@ -48,11 +76,8 @@ ENTRY_CFI(memset) lpnz @.Lset64bytes ;; LOOP START -#ifdef PREALLOC_NOT_AVAIL - prefetchw [r3, 64] ;Prefetch the next write location -#else - prealloc [r3, 64] -#endif + PREALLOC_INSTR r3, 64 ; alloc next line w/o fetching + #ifdef CONFIG_ARC_HAS_LL64 std.ab r4, [r3, 8] std.ab r4, [r3, 8]
@@ -85,7 +110,6 @@ ENTRY_CFI(memset) lsr.f lp_count, r2, 5 ;Last remaining max 124 bytes lpnz .Lset32bytes ;; LOOP START - prefetchw [r3, 32] ;Prefetch the next write location #ifdef CONFIG_ARC_HAS_LL64 std.ab r4, [r3, 8] std.ab r4, [r3, 8]
arch/arc/mm/init.c +2 -1
@@ -138,7 +138,8 @@ void __init setup_arch_memory(void)*/ memblock_add_node (low_mem_start, low_mem_sz,0 ); -memblock_reserve (low_mem_start,__pa (_end) - low_mem_start); +memblock_reserve (CONFIG_LINUX_LINK_BASE , +__pa (_end) -CONFIG_LINUX_LINK_BASE );#ifdef CONFIG_BLK_DEV_INITRD if (initrd_start)
arch/s390/include/asm/mmu_context.h +2 -3
@@ -89,8 +89,6 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, {int cpu =smp_processor_id (); -if (prev == next) -return ; S390_lowcore.user_asce = next->context.asce;cpumask_set_cpu (cpu, &next->context.cpu_attach_mask);/* Clear previous user-ASCE from CR1 and CR7 */
@@ -102,7 +100,8 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,__ctl_load (S390_lowcore.vdso_asce,7 ,7 );clear_cpu_flag (CIF_ASCE_SECONDARY ); } -cpumask_clear_cpu (cpu, &prev->context.cpu_attach_mask); +if (prev != next) +cpumask_clear_cpu (cpu, &prev->context.cpu_attach_mask); }#define finish_arch_post_lock_switch finish_arch_post_lock_switch
arch/s390/kernel/early.c +2 -2
@@ -64,10 +64,10 @@ static noinline __init void detect_machine_type(void)if (stsi (vmms,3 ,2 ,2 ) || !vmms->count)return ; -/* Running under KVM? If not we assume z/VM */ +/* Detect known hypervisors */ if (!memcmp (vmms->vm[0 ].cpi,"\xd2\xe5\xd4" ,3 )) S390_lowcore.machine_flags |=MACHINE_FLAG_KVM ; -else +else if (!memcmp (vmms->vm[0 ].cpi,"\xa9\x61\xe5\xd4" ,4 )) S390_lowcore.machine_flags |=MACHINE_FLAG_VM ; }
arch/s390/kernel/setup.c +2 -0
@@ -882,6 +882,8 @@ void __init setup_arch(char **cmdline_p)pr_info ("Linux is running under KVM in 64-bit mode\n" ); else if (MACHINE_IS_LPAR) pr_info("Linux is running natively in 64-bit mode\n"); + else + pr_info("Linux is running as a guest in 64-bit mode\n");/* Have one command line that is parsed and saved in /proc/cmdline */ /* boot_command_line has been already set up in early.c */
arch/s390/kernel/smp.c +10 -2
@@ -371,9 +371,13 @@ void smp_call_online_cpu(void (*func)(void *), void *data)*/ void smp_call_ipl_cpu (void (*func)(void *),void *data) { +struct lowcore *lc = pcpu_devices->lowcore; + +if (pcpu_devices[0 ].address ==stap ()) + lc = &S390_lowcore; +pcpu_delegate (&pcpu_devices[0 ], func, data, - pcpu_devices->lowcore->panic_stack - -PANIC_FRAME_OFFSET +PAGE_SIZE ); + lc->panic_stack -PANIC_FRAME_OFFSET +PAGE_SIZE ); }int smp_find_processor_id (u16 address)
@@ -1152,7 +1156,11 @@ static ssize_t __ref rescan_store(struct device *dev, {int rc; + rc =lock_device_hotplug_sysfs (); +if (rc) +return rc; rc =smp_rescan_cpus (); +unlock_device_hotplug ();return rc ? rc : count; }static DEVICE_ATTR_WO (rescan);
arch/x86/entry/entry_64_compat.S +4 -2
@@ -356,7 +356,8 @@ ENTRY(entry_INT80_compat) /* Need to switch before accessing the thread stack. */ SWITCH_TO_KERNEL_CR3 scratch_reg=%rdi - movq %rsp, %rdi + /* In the Xen PV case we already run on the thread stack. */ + ALTERNATIVE "movq %rsp, %rdi", "jmp .Lint80_keep_stack", X86_FEATURE_XENPV movq PER_CPU_VAR(cpu_current_top_of_stack), %rsp pushq 6*8(%rdi) /* regs->ss */
@@ -365,8 +366,9 @@ ENTRY(entry_INT80_compat) pushq 3*8(%rdi) /* regs->cs */ pushq 2*8(%rdi) /* regs->ip */ pushq 1*8(%rdi) /* regs->orig_ax */ - pushq (%rdi) /* pt_regs->di */ +.Lint80_keep_stack: + pushq %rsi /* pt_regs->si */ xorl %esi, %esi /* nospec si */ pushq %rdx /* pt_regs->dx */
arch/x86/include/asm/mmu_context.h +18 -0
@@ -178,6 +178,10 @@ static inline void switch_ldt(struct mm_struct *prev, struct mm_struct *next)void enter_lazy_tlb (struct mm_struct *mm,struct task_struct *tsk); +/* +* Init a new mm. Used on mm copies, like at fork() +* and on mm's that are brand-new, like at execve(). +*/ static inline int init_new_context (struct task_struct *tsk,struct mm_struct *mm) {
@@ -228,8 +232,22 @@ do { \ } while (0)#endif +static inline void arch_dup_pkeys (struct mm_struct *oldmm, +struct mm_struct *mm) +{ +#ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS +if (!cpu_feature_enabled (X86_FEATURE_OSPKE )) +return ; + +/* Duplicate the oldmm pkey state in mm: */ + mm->context.pkey_allocation_map = oldmm->context.pkey_allocation_map; + mm->context.execute_only_pkey = oldmm->context.execute_only_pkey; +#endif +} +static inline int arch_dup_mmap (struct mm_struct *oldmm,struct mm_struct *mm) { +arch_dup_pkeys (oldmm, mm);paravirt_arch_dup_mmap (oldmm, mm);return ldt_dup_context (oldmm, mm); }
arch/x86/kernel/kvm.c +5 -2
@@ -457,6 +457,7 @@ static void __send_ipi_mask(const struct cpumask *mask, int vector)#else u64 ipi_bitmap =0 ;#endif +long ret;if (cpumask_empty (mask))return ;
@@ -482,8 +483,9 @@ static void __send_ipi_mask(const struct cpumask *mask, int vector) }else if (apic_id < min +KVM_IPI_CLUSTER_SIZE ) { max = apic_id < max ? max : apic_id; }else { -kvm_hypercall4 (KVM_HC_SEND_IPI , (unsigned long )ipi_bitmap, + ret =kvm_hypercall4 (KVM_HC_SEND_IPI , (unsigned long )ipi_bitmap, (unsigned long )(ipi_bitmap >>BITS_PER_LONG ), min, icr); +WARN_ONCE (ret <0 ,"KVM: failed to send PV IPI: %ld" , ret); min = max = apic_id; ipi_bitmap =0 ; }
@@ -491,8 +493,9 @@ static void __send_ipi_mask(const struct cpumask *mask, int vector) }if (ipi_bitmap) { -kvm_hypercall4 (KVM_HC_SEND_IPI , (unsigned long )ipi_bitmap, + ret =kvm_hypercall4 (KVM_HC_SEND_IPI , (unsigned long )ipi_bitmap, (unsigned long )(ipi_bitmap >>BITS_PER_LONG ), min, icr); +WARN_ONCE (ret <0 ,"KVM: failed to send PV IPI: %ld" , ret); }local_irq_restore (flags);
arch/x86/kvm/vmx.c +9 -5
@@ -8290,11 +8290,11 @@ static int enter_vmx_operation(struct kvm_vcpu *vcpu)if (r <0 ) goto out_vmcs02; - vmx->nested.cached_vmcs12 =kmalloc (VMCS12_SIZE ,GFP_KERNEL ); + vmx->nested.cached_vmcs12 =kzalloc (VMCS12_SIZE ,GFP_KERNEL );if (!vmx->nested.cached_vmcs12) goto out_cached_vmcs12; - vmx->nested.cached_shadow_vmcs12 =kmalloc (VMCS12_SIZE ,GFP_KERNEL ); + vmx->nested.cached_shadow_vmcs12 =kzalloc (VMCS12_SIZE ,GFP_KERNEL );if (!vmx->nested.cached_shadow_vmcs12) goto out_cached_shadow_vmcs12;
@@ -11733,7 +11733,7 @@ static int nested_vmx_check_apicv_controls(struct kvm_vcpu *vcpu, !nested_exit_intr_ack_set (vcpu) || (vmcs12->posted_intr_nv &0xff00 ) || (vmcs12->posted_intr_desc_addr &0x3f ) || - (!page_address_valid(vcpu, vmcs12->posted_intr_desc_addr)))) + (vmcs12->posted_intr_desc_addr >> cpuid_maxphyaddr(vcpu)))) return -EINVAL;/* tpr shadow is needed by all apicv features. */
@@ -13984,13 +13984,17 @@ static int vmx_get_nested_state(struct kvm_vcpu *vcpu,else if (enable_shadow_vmcs && !vmx->nested.sync_shadow_vmcs)copy_shadow_to_vmcs12 (vmx); -if (copy_to_user (user_kvm_nested_state->data, vmcs12,sizeof (*vmcs12))) +/* +* Copy over the full allocated size of vmcs12 rather than just the size +* of the struct. +*/ +if (copy_to_user (user_kvm_nested_state->data, vmcs12,VMCS12_SIZE ))return -EFAULT ;if (nested_cpu_has_shadow_vmcs (vmcs12) && vmcs12->vmcs_link_pointer !=-1ull ) {if (copy_to_user (user_kvm_nested_state->data +VMCS12_SIZE , -get_shadow_vmcs12 (vcpu),sizeof (*vmcs12))) +get_shadow_vmcs12 (vcpu),VMCS12_SIZE ))return -EFAULT ; }
arch/x86/kvm/x86.c +2 -3
@@ -6277,8 +6277,7 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu,toggle_interruptibility (vcpu, ctxt->interruptibility); vcpu->arch.emulate_regs_need_sync_to_vcpu = false;kvm_rip_write (vcpu, ctxt->eip); -if (r ==EMULATE_DONE && - (ctxt->tf || (vcpu->guest_debug &KVM_GUESTDBG_SINGLESTEP ))) +if (r ==EMULATE_DONE && ctxt->tf)kvm_vcpu_do_singlestep (vcpu, &r);if (!ctxt->have_exception ||exception_type (ctxt->exception.vector) ==EXCPT_TRAP )
@@ -6868,10 +6867,10 @@ int kvm_emulate_hypercall(struct kvm_vcpu *vcpu)case KVM_HC_CLOCK_PAIRING : ret =kvm_pv_clock_pairing (vcpu, a0, a1);break ; +#endif case KVM_HC_SEND_IPI : ret =kvm_pv_send_ipi (vcpu->kvm, a0, a1, a2, a3, op_64_bit);break ; -#endif default : ret = -KVM_ENOSYS ;break ;
arch/x86/lib/kaslr.c +2 -2
@@ -36,8 +36,8 @@ static inline u16 i8254(void)u16 status, timer; do { - outb(I8254_PORT_CONTROL, - I8254_CMD_READBACK | I8254_SELECT_COUNTER0); + outb(I8254_CMD_READBACK | I8254_SELECT_COUNTER0, + I8254_PORT_CONTROL); status = inb(I8254_PORT_COUNTER0); timer = inb(I8254_PORT_COUNTER0); timer |= inb(I8254_PORT_COUNTER0) << 8;
drivers/acpi/nfit/core.c +47 -14
102 lines not on this page · raw message
drivers/char/mwave/mwavedd.c +7 -0
@@ -59,6 +59,7 @@#include <linux/mutex.h> #include <linux/delay.h> #include <linux/serial_8250.h> +#include <linux/nospec.h> #include "smapi.h" #include "mwavedd.h" #include "3780i.h"
@@ -289,6 +290,8 @@ static long mwave_ioctl(struct file *file, unsigned int iocmd, ipcnum);return -EINVAL ; } + ipcnum =array_index_nospec (ipcnum, +ARRAY_SIZE (pDrvData->IPCs)); PRINTK_3(TRACE_MWAVE, "mwavedd::mwave_ioctl IOCTL_MW_REGISTER_IPC" " ipcnum %x entry usIntCount %x\n",
@@ -317,6 +320,8 @@ static long mwave_ioctl(struct file *file, unsigned int iocmd, " Invalid ipcnum %x\n", ipcnum);return -EINVAL ; } + ipcnum =array_index_nospec (ipcnum, +ARRAY_SIZE (pDrvData->IPCs)); PRINTK_3(TRACE_MWAVE, "mwavedd::mwave_ioctl IOCTL_MW_GET_IPC" " ipcnum %x, usIntCount %x\n",
@@ -383,6 +388,8 @@ static long mwave_ioctl(struct file *file, unsigned int iocmd, ipcnum);return -EINVAL ; } + ipcnum =array_index_nospec (ipcnum, +ARRAY_SIZE (pDrvData->IPCs));mutex_lock (&mwave_mutex);if (pDrvData->IPCs[ipcnum].bIsEnabled == true) { pDrvData->IPCs[ipcnum].bIsEnabled = false;
drivers/clk/socfpga/clk-pll-s10.c +1 -1
@@ -43,7 +43,7 @@ static unsigned long clk_pll_recalc_rate(struct clk_hw *hwclk,/* Read mdiv and fdiv from the fdbck register */ reg =readl (socfpgaclk->hw.reg +0x4 ); mdiv = (reg &SOCFPGA_PLL_MDIV_MASK ) >>SOCFPGA_PLL_MDIV_SHIFT ; - vco_freq = (unsigned long long )parent_rate * (mdiv +6 ); + vco_freq = (unsigned long long )vco_freq * (mdiv +6 );return (unsigned long )vco_freq; }
drivers/clk/socfpga/clk-s10.c +10 -10
@@ -12,17 +12,17 @@#include "stratix10-clk.h" -static const char *const pll_mux[] = {"osc1" ,"cb_intosc_hs_div2_clk" , -"f2s_free_clk" ,}; +static const char *const pll_mux[] = {"osc1" ,"cb-intosc-hs-div2-clk" , +"f2s-free-clk" ,};static const char *const cntr_mux[] = {"main_pll" ,"periph_pll" , -"osc1" ,"cb_intosc_hs_div2_clk" , -"f2s_free_clk" }; -static const char *const boot_mux[] = {"osc1" ,"cb_intosc_hs_div2_clk" ,}; +"osc1" ,"cb-intosc-hs-div2-clk" , +"f2s-free-clk" }; +static const char *const boot_mux[] = {"osc1" ,"cb-intosc-hs-div2-clk" ,};static const char *const noc_free_mux[] = {"main_noc_base_clk" ,"peri_noc_base_clk" , -"osc1" ,"cb_intosc_hs_div2_clk" , -"f2s_free_clk" }; +"osc1" ,"cb-intosc-hs-div2-clk" , +"f2s-free-clk" };static const char *const emaca_free_mux[] = {"peri_emaca_clk" ,"boot_clk" };static const char *const emacb_free_mux[] = {"peri_emacb_clk" ,"boot_clk" };
@@ -33,14 +33,14 @@ static const char * const s2f_usr1_free_mux[] = {"peri_s2f_usr1_clk", "boot_clk"static const char *const psi_ref_free_mux[] = {"peri_psi_ref_clk" ,"boot_clk" };static const char *const mpu_mux[] = {"mpu_free_clk" ,"boot_clk" ,}; -static const char *const s2f_usr0_mux[] = {"f2s_free_clk" ,"boot_clk" }; +static const char *const s2f_usr0_mux[] = {"f2s-free-clk" ,"boot_clk" };static const char *const emac_mux[] = {"emaca_free_clk" ,"emacb_free_clk" };static const char *const noc_mux[] = {"noc_free_clk" ,"boot_clk" };static const char *const mpu_free_mux[] = {"main_mpu_base_clk" ,"peri_mpu_base_clk" , -"osc1" ,"cb_intosc_hs_div2_clk" , -"f2s_free_clk" }; +"osc1" ,"cb-intosc-hs-div2-clk" , +"f2s-free-clk" };/* clocks in AO (always on) controller */ static const struct stratix10_pll_clock s10_pll_clks[] = {
drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c +1 -0
@@ -576,6 +576,7 @@ static const struct amdgpu_px_quirk amdgpu_px_quirk_list[] = { { 0x1002, 0x6900, 0x1028, 0x0812, AMDGPU_PX_QUIRK_FORCE_ATPX }, { 0x1002, 0x6900, 0x1028, 0x0813, AMDGPU_PX_QUIRK_FORCE_ATPX }, { 0x1002, 0x6900, 0x1025, 0x125A, AMDGPU_PX_QUIRK_FORCE_ATPX }, + { 0x1002, 0x6900, 0x17AA, 0x3806, AMDGPU_PX_QUIRK_FORCE_ATPX }, { 0, 0, 0, 0, 0 }, };
drivers/gpu/drm/meson/meson_crtc.c +2 -21
@@ -45,7 +45,6 @@ struct meson_crtc {struct drm_crtc base;struct drm_pending_vblank_event *event;struct meson_drm *priv; -bool enabled; };#define to_meson_crtc (x) container_of(x, struct meson_crtc, base)
@@ -81,7 +80,8 @@ static const struct drm_crtc_funcs meson_crtc_funcs = { }; -static void meson_crtc_enable (struct drm_crtc *crtc) +static void meson_crtc_atomic_enable (struct drm_crtc *crtc, +struct drm_crtc_state *old_state) {struct meson_crtc *meson_crtc =to_meson_crtc (crtc);struct drm_crtc_state *crtc_state = crtc->state;
@@ -103,20 +103,6 @@ static void meson_crtc_enable(struct drm_crtc *crtc)drm_crtc_vblank_on (crtc); - meson_crtc->enabled = true; -} - -static void meson_crtc_atomic_enable (struct drm_crtc *crtc, -struct drm_crtc_state *old_state) -{ -struct meson_crtc *meson_crtc =to_meson_crtc (crtc); -struct meson_drm *priv = meson_crtc->priv; - -DRM_DEBUG_DRIVER ("\n" ); - -if (!meson_crtc->enabled) -meson_crtc_enable (crtc); - priv->viu.osd1_enabled = true; }
@@ -142,8 +128,6 @@ static void meson_crtc_atomic_disable(struct drm_crtc *crtc, crtc->state->event =NULL ; } - - meson_crtc->enabled = false; } static void meson_crtc_atomic_begin(struct drm_crtc *crtc,
@@ -152,9 +136,6 @@ static void meson_crtc_atomic_begin(struct drm_crtc *crtc,struct meson_crtc *meson_crtc =to_meson_crtc (crtc);unsigned long flags; -if (crtc->state->enable && !meson_crtc->enabled) -meson_crtc_enable (crtc); -if (crtc->state->event) {WARN_ON (drm_crtc_vblank_get (crtc) !=0 );
drivers/gpu/drm/meson/meson_drv.c +5 -0
@@ -82,6 +82,10 @@ static const struct drm_mode_config_funcs meson_mode_config_funcs = { .fb_create = drm_gem_fb_create, }; +static const struct drm_mode_config_helper_funcs meson_mode_config_helpers = { + .atomic_commit_tail = drm_atomic_helper_commit_tail_rpm, +}; +static irqreturn_t meson_irq (int irq,void *arg) {struct drm_device *dev = arg;
@@ -246,6 +250,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) drm->mode_config.max_width =3840 ; drm->mode_config.max_height =2160 ; drm->mode_config.funcs = &meson_mode_config_funcs; + drm->mode_config.helper_private = &meson_mode_config_helpers;/* Hardware Initialization */
drivers/hv/hv_balloon.c +6 -4
@@ -888,12 +888,14 @@ static unsigned long handle_pg_range(unsigned long pg_start, pfn_cnt -= pgs_ol;/* * Check if the corresponding memory block is already -* online by checking its last previously backed page. -* In case it is we need to bring rest (which was not -* backed previously) online too. +* online. It is possible to observe struct pages still +* being uninitialized here so check section instead. +* In case the section is online we need to bring the +* rest of pfns (which were not backed previously) +* online too. */ if (start_pfn > has->start_pfn && - !PageReserved (pfn_to_page (start_pfn -1 ))) +online_section_nr (pfn_to_section_nr (start_pfn)))hv_bring_pgs_online (has, start_pfn, pgs_ol); }
drivers/hv/ring_buffer.c +15 -16
@@ -164,26 +164,25 @@ hv_get_ringbuffer_availbytes(const struct hv_ring_buffer_info *rbi, }/* Get various debug metrics for the specified ring buffer. */ -void hv_ringbuffer_get_debuginfo (const struct hv_ring_buffer_info *ring_info, -struct hv_ring_buffer_debug_info *debug_info) +int hv_ringbuffer_get_debuginfo (const struct hv_ring_buffer_info *ring_info, +struct hv_ring_buffer_debug_info *debug_info) {u32 bytes_avail_towrite;u32 bytes_avail_toread; -if (ring_info->ring_buffer) { -hv_get_ringbuffer_availbytes (ring_info, - &bytes_avail_toread, - &bytes_avail_towrite); - - debug_info->bytes_avail_toread = bytes_avail_toread; - debug_info->bytes_avail_towrite = bytes_avail_towrite; - debug_info->current_read_index = - ring_info->ring_buffer->read_index; - debug_info->current_write_index = - ring_info->ring_buffer->write_index; - debug_info->current_interrupt_mask = - ring_info->ring_buffer->interrupt_mask; - } +if (!ring_info->ring_buffer) +return -EINVAL ; + +hv_get_ringbuffer_availbytes (ring_info, + &bytes_avail_toread, + &bytes_avail_towrite); + debug_info->bytes_avail_toread = bytes_avail_toread; + debug_info->bytes_avail_towrite = bytes_avail_towrite; + debug_info->current_read_index = ring_info->ring_buffer->read_index; + debug_info->current_write_index = ring_info->ring_buffer->write_index; + debug_info->current_interrupt_mask + = ring_info->ring_buffer->interrupt_mask; +return 0 ; }EXPORT_SYMBOL_GPL (hv_ringbuffer_get_debuginfo);
drivers/hv/vmbus_drv.c +61 -30
181 lines not on this page · raw message
drivers/ide/ide-proc.c +1 -1
@@ -544,7 +544,7 @@ void ide_proc_port_register_devices(ide_hwif_t *hwif) drive->proc =proc_mkdir (drive->name, parent);if (drive->proc) {ide_add_proc_entries (drive->proc, generic_drive_entries, drive); -proc_create_data ("setting" ,S_IFREG |S_IRUSR |S_IWUSR , +proc_create_data ("settings" ,S_IFREG |S_IRUSR |S_IWUSR , drive->proc, &ide_settings_proc_fops, drive); }
drivers/input/joystick/xpad.c +3 -0
@@ -252,6 +252,8 @@ static const struct xpad_device { { 0x0f30, 0x0202, "Joytech Advanced Controller", 0, XTYPE_XBOX }, { 0x0f30, 0x8888, "BigBen XBMiniPad Controller", 0, XTYPE_XBOX }, { 0x102c, 0xff0c, "Joytech Wireless Advanced Controller", 0, XTYPE_XBOX }, + { 0x1038, 0x1430, "SteelSeries Stratus Duo", 0, XTYPE_XBOX360 }, + { 0x1038, 0x1431, "SteelSeries Stratus Duo", 0, XTYPE_XBOX360 }, { 0x11c9, 0x55f0, "Nacon GC-100XF", 0, XTYPE_XBOX360 }, { 0x12ab, 0x0004, "Honey Bee Xbox360 dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 }, { 0x12ab, 0x0301, "PDP AFTERGLOW AX.1", 0, XTYPE_XBOX360 },
@@ -428,6 +430,7 @@ static const struct usb_device_id xpad_table[] = {XPAD_XBOXONE_VENDOR (0x0e6f ),/* 0x0e6f X-Box One controllers */ XPAD_XBOX360_VENDOR (0x0f0d ),/* Hori Controllers */ XPAD_XBOXONE_VENDOR (0x0f0d ),/* Hori Controllers */ +XPAD_XBOX360_VENDOR (0x1038 ),/* SteelSeries Controllers */ XPAD_XBOX360_VENDOR (0x11c9 ),/* Nacon GC100XF */ XPAD_XBOX360_VENDOR (0x12ab ),/* X-Box 360 dance pads */ XPAD_XBOX360_VENDOR(0x1430), /* RedOctane X-Box 360 controllers */
drivers/input/misc/uinput.c +3 -2
@@ -39,6 +39,7 @@#include <linux/init.h> #include <linux/fs.h> #include <linux/miscdevice.h> +#include <linux/overflow.h> #include <linux/input/mt.h> #include "../input-compat.h"
@@ -405,7 +406,7 @@ static int uinput_open(struct inode *inode, struct file *file)static int uinput_validate_absinfo (struct input_dev *dev,unsigned int code,const struct input_absinfo *abs) { -int min, max; +int min, max, range; min = abs->minimum; max = abs->maximum;
@@ -417,7 +418,7 @@ static int uinput_validate_absinfo(struct input_dev *dev, unsigned int code,return -EINVAL ; } -if (abs->flat > max - min) { +if (!check_sub_overflow (max, min, &range) && abs->flat > range) {printk (KERN_DEBUG "%s: abs_flat #%02x out of range: %d (min:%d/max:%d)\n" ,UINPUT_NAME , code, abs->flat, min, max);
drivers/irqchip/irq-gic-v3-its.c +13 -12
@@ -2267,13 +2267,14 @@ static void its_free_device(struct its_device *its_dev)kfree (its_dev); } -static int its_alloc_device_irq (struct its_device *dev,irq_hw_number_t *hwirq) +static int its_alloc_device_irq (struct its_device *dev,int nvecs,irq_hw_number_t *hwirq) {int idx; - idx =find_first_zero_bit (dev->event_map.lpi_map, - dev->event_map.nr_lpis); -if (idx == dev->event_map.nr_lpis) + idx =bitmap_find_free_region (dev->event_map.lpi_map, + dev->event_map.nr_lpis, +get_count_order (nvecs)); +if (idx <0 )return -ENOSPC ; *hwirq = dev->event_map.lpi_base + idx;
@@ -2369,21 +2370,21 @@ static int its_irq_domain_alloc(struct irq_domain *domain, unsigned int virq,int err;int i; -for (i =0 ; i < nr_irqs; i++) { - err =its_alloc_device_irq (its_dev, &hwirq); -if (err) -return err; + err =its_alloc_device_irq (its_dev, nr_irqs, &hwirq); +if (err) +return err; - err =its_irq_gic_domain_alloc (domain, virq + i, hwirq); +for (i =0 ; i < nr_irqs; i++) { + err =its_irq_gic_domain_alloc (domain, virq + i, hwirq + i);if (err)return err;irq_domain_set_hwirq_and_chip (domain, virq + i, - hwirq, &its_irq_chip, its_dev); + hwirq + i, &its_irq_chip, its_dev);irqd_set_single_target (irq_desc_get_irq_data (irq_to_desc (virq + i)));pr_debug ("ID:%d pID:%d vID:%d\n" , - (int )(hwirq - its_dev->event_map.lpi_base), - (int ) hwirq, virq + i); + (int )(hwirq + i - its_dev->event_map.lpi_base), + (int )(hwirq + i), virq + i); }return 0 ;
drivers/md/dm-crypt.c +17 -8
@@ -2405,9 +2405,21 @@ static int crypt_ctr_cipher_new(struct dm_target *ti, char *cipher_in, char *key* capi:cipher_api_spec-iv:ivopts */ tmp = &cipher_in[strlen ("capi:" )]; - cipher_api =strsep (&tmp,"-" ); - *ivmode =strsep (&tmp,":" ); - *ivopts = tmp; + +/* Separate IV options if present, it can contain another '-' in hash name */ + *ivopts =strrchr (tmp,':' ); +if (*ivopts) { + **ivopts ='\0' ; + (*ivopts)++; + } +/* Parse IV mode */ + *ivmode =strrchr (tmp,'-' ); +if (*ivmode) { + **ivmode ='\0' ; + (*ivmode)++; + } +/* The rest is crypto API spec */ + cipher_api = tmp;if (*ivmode && !strcmp (*ivmode,"lmk" )) cc->tfms_count =64 ;
@@ -2477,11 +2489,8 @@ static int crypt_ctr_cipher_old(struct dm_target *ti, char *cipher_in, char *key goto bad_mem; chainmode =strsep (&tmp,"-" ); - *ivopts =strsep (&tmp,"-" ); - *ivmode =strsep (&*ivopts,":" ); - -if (tmp) -DMWARN ("Ignoring unexpected additional cipher options" ); + *ivmode =strsep (&tmp,":" ); + *ivopts = tmp;/* * For compatibility with the original dm-crypt mapping format, if
drivers/md/dm-thin-metadata.c +2 -2
@@ -1678,7 +1678,7 @@ int dm_thin_remove_range(struct dm_thin_device *td,return r; } -int dm_pool_block_is_used (struct dm_pool_metadata *pmd,dm_block_t b,bool *result) +int dm_pool_block_is_shared (struct dm_pool_metadata *pmd,dm_block_t b,bool *result) {int r;uint32_t ref_count;
@@ -1686,7 +1686,7 @@ int dm_pool_block_is_used(struct dm_pool_metadata *pmd, dm_block_t b, bool *resudown_read (&pmd->root_lock); r =dm_sm_get_count (pmd->data_sm, b, &ref_count);if (!r) - *result = (ref_count !=0 ); + *result = (ref_count >1 );up_read (&pmd->root_lock);return r;
drivers/md/dm-thin-metadata.h +1 -1
@@ -195,7 +195,7 @@ int dm_pool_get_metadata_dev_size(struct dm_pool_metadata *pmd,int dm_pool_get_data_dev_size (struct dm_pool_metadata *pmd,dm_block_t *result); -int dm_pool_block_is_used (struct dm_pool_metadata *pmd,dm_block_t b,bool *result); +int dm_pool_block_is_shared (struct dm_pool_metadata *pmd,dm_block_t b,bool *result);int dm_pool_inc_data_range (struct dm_pool_metadata *pmd,dm_block_t b,dm_block_t e);int dm_pool_dec_data_range (struct dm_pool_metadata *pmd,dm_block_t b,dm_block_t e);
drivers/md/dm-thin.c +5 -5
@@ -1048,7 +1048,7 @@ static void passdown_double_checking_shared_status(struct dm_thin_new_mapping *m* passdown we have to check that these blocks are now unused. */ int r =0 ; -bool used = true; +bool shared = true;struct thin_c *tc = m->tc;struct pool *pool = tc->pool;dm_block_t b = m->data_block, e, end = m->data_block + m->virt_end - m->virt_begin;
@@ -1058,11 +1058,11 @@ static void passdown_double_checking_shared_status(struct dm_thin_new_mapping *mwhile (b != end) {/* find start of unmapped run */ for (; b < end; b++) { - r =dm_pool_block_is_used (pool->pmd, b, &used); + r =dm_pool_block_is_shared (pool->pmd, b, &shared);if (r) goto out; -if (!used) +if (!shared)break ; }
@@ -1071,11 +1071,11 @@ static void passdown_double_checking_shared_status(struct dm_thin_new_mapping *m/* find end of run */ for (e = b +1 ; e != end; e++) { - r =dm_pool_block_is_used (pool->pmd, e, &used); + r =dm_pool_block_is_shared (pool->pmd, e, &shared);if (r) goto out; -if (used) +if (shared)break ; }
drivers/misc/ibmvmc.c +5 -2
@@ -820,21 +820,24 @@ static int ibmvmc_send_msg(struct crq_server_adapter *adapter,* * Return: * 0 - Success +* Non-zero - Failure */ static int ibmvmc_open (struct inode *inode,struct file *file) {struct ibmvmc_file_session *session; -int rc =0 ;pr_debug ("%s: inode = 0x%lx, file = 0x%lx, state = 0x%x\n" , __func__, (unsigned long )inode, (unsigned long )file, ibmvmc.state); session =kzalloc (sizeof (*session),GFP_KERNEL ); +if (!session) +return -ENOMEM ; + session->file = file; file->private_data = session; -return rc; +return 0 ; }/**
drivers/misc/mei/hw-me-regs.h +2 -0
@@ -127,6 +127,8 @@#define MEI_DEV_ID_BXT_M 0x1A9A/* Broxton M */ #define MEI_DEV_ID_APL_I 0x5A9A/* Apollo Lake I */ +#define MEI_DEV_ID_DNV_IE 0x19E5/* Denverton IE */ +#define MEI_DEV_ID_GLK 0x319A/* Gemini Lake */ #define MEI_DEV_ID_KBP 0xA2BA/* Kaby Point */
drivers/misc/mei/pci-me.c +3 -1
@@ -88,11 +88,13 @@ static const struct pci_device_id mei_me_pci_tbl[] = { {MEI_PCI_DEVICE(MEI_DEV_ID_SPT_2, MEI_ME_PCH8_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H, MEI_ME_PCH8_SPS_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H_2, MEI_ME_PCH8_SPS_CFG)}, - {MEI_PCI_DEVICE(MEI_DEV_ID_LBG, MEI_ME_PCH8_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_LBG, MEI_ME_PCH12_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_BXT_M, MEI_ME_PCH8_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_APL_I, MEI_ME_PCH8_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_DNV_IE, MEI_ME_PCH8_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_GLK, MEI_ME_PCH8_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_KBP, MEI_ME_PCH8_CFG)},
drivers/mmc/host/dw_mmc-bluefield.c +0 -5
@@ -1,11 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2018 Mellanox Technologies. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. */ #include <linux/bitfield.h>
drivers/mmc/host/meson-gx-mmc.c +11 -7
@@ -174,6 +174,8 @@ struct meson_host {struct sd_emmc_desc *descs;dma_addr_t descs_dma_addr; +int irq; +bool vqmmc_enabled; };
@@ -1181,7 +1183,7 @@ static int meson_mmc_probe(struct platform_device *pdev)struct resource *res;struct meson_host *host;struct mmc_host *mmc; -int ret, irq; +int ret; mmc =mmc_alloc_host (sizeof (struct meson_host ), &pdev->dev);if (!mmc)
@@ -1228,8 +1230,8 @@ static int meson_mmc_probe(struct platform_device *pdev) goto free_host; } - irq =platform_get_irq (pdev,0 ); -if (irq <=0 ) { + host->irq =platform_get_irq (pdev,0 ); +if (host->irq <=0 ) {dev_err (&pdev->dev,"failed to get interrupt resource.\n" ); ret = -EINVAL ; goto free_host;
@@ -1283,9 +1285,8 @@ static int meson_mmc_probe(struct platform_device *pdev)writel (IRQ_CRC_ERR |IRQ_TIMEOUTS |IRQ_END_OF_CHAIN , host->regs +SD_EMMC_IRQ_EN ); - ret =devm_request_threaded_irq (&pdev->dev, irq, meson_mmc_irq, - meson_mmc_irq_thread,IRQF_SHARED , -NULL , host); + ret =request_threaded_irq (host->irq, meson_mmc_irq, + meson_mmc_irq_thread,IRQF_SHARED ,NULL , host);if (ret) goto err_init_clk;
@@ -1303,7 +1304,7 @@ static int meson_mmc_probe(struct platform_device *pdev)if (host->bounce_buf ==NULL ) {dev_err (host->dev,"Unable to map allocate DMA bounce buffer.\n" ); ret = -ENOMEM ; - goto err_init_clk; + goto err_free_irq; } host->descs = dma_alloc_coherent(host->dev, SD_EMMC_DESC_BUF_LEN,
@@ -1322,6 +1323,8 @@ static int meson_mmc_probe(struct platform_device *pdev) err_bounce_buf:dma_free_coherent (host->dev, host->bounce_buf_size, host->bounce_buf, host->bounce_dma_addr); +err_free_irq: +free_irq (host->irq, host); err_init_clk:clk_disable_unprepare (host->mmc_clk); err_core_clk:
@@ -1339,6 +1342,7 @@ static int meson_mmc_remove(struct platform_device *pdev)/* disable interrupts */ writel (0 , host->regs +SD_EMMC_IRQ_EN ); +free_irq (host->irq, host);dma_free_coherent (host->dev,SD_EMMC_DESC_BUF_LEN , host->descs, host->descs_dma_addr);
drivers/net/can/dev.c +13 -14
@@ -480,8 +480,6 @@ EXPORT_SYMBOL_GPL(can_put_echo_skb);struct sk_buff *__can_get_echo_skb (struct net_device *dev,unsigned int idx,u8 *len_ptr) {struct can_priv *priv =netdev_priv (dev); -struct sk_buff *skb = priv->echo_skb[idx]; -struct canfd_frame *cf;if (idx >= priv->echo_skb_max) { netdev_err(dev, "%s: BUG! Trying to access can_priv::echo_skb out of bounds (%u/max %u)\n",
@@ -489,20 +487,21 @@ struct sk_buff *__can_get_echo_skb(struct net_device *dev, unsigned int idx, u8return NULL ; } -if (!skb) { -netdev_err (dev,"%s: BUG! Trying to echo non existing skb: can_priv::echo_skb[%u]\n" , - __func__, idx); -return NULL ; - } +if (priv->echo_skb[idx]) { +/* Using "struct canfd_frame::len" for the frame +* length is supported on both CAN and CANFD frames. +*/ +struct sk_buff *skb = priv->echo_skb[idx]; +struct canfd_frame *cf = (struct canfd_frame *)skb->data; +u8 len = cf->len; -/* Using "struct canfd_frame::len" for the frame -* length is supported on both CAN and CANFD frames. -*/ - cf = (struct canfd_frame *)skb->data; - *len_ptr = cf->len; - priv->echo_skb[idx] =NULL ; + *len_ptr = len; + priv->echo_skb[idx] =NULL ; -return skb; +return skb; + } + +return NULL ; }/*
drivers/net/can/flexcan.c +1 -1
@@ -1004,7 +1004,7 @@ static int flexcan_chip_start(struct net_device *dev) } }else {/* clear and invalidate unused mailboxes first */ -for (i =FLEXCAN_TX_MB_RESERVED_OFF_FIFO ; i <=ARRAY_SIZE (regs->mb); i++) { +for (i =FLEXCAN_TX_MB_RESERVED_OFF_FIFO ; i <ARRAY_SIZE (regs->mb); i++) { priv->write (FLEXCAN_MB_CODE_RX_INACTIVE , ®s->mb[i].can_ctrl); }
drivers/net/ethernet/amd/xgbe/xgbe-common.h +0 -2
@@ -431,8 +431,6 @@#define MAC_MDIOSCAR_PA_WIDTH 5#define MAC_MDIOSCAR_RA_INDEX 0#define MAC_MDIOSCAR_RA_WIDTH 16 -#define MAC_MDIOSCAR_REG_INDEX 0 -#define MAC_MDIOSCAR_REG_WIDTH 21#define MAC_MDIOSCCDR_BUSY_INDEX 22#define MAC_MDIOSCCDR_BUSY_WIDTH 1#define MAC_MDIOSCCDR_CMD_INDEX 16
drivers/net/ethernet/amd/xgbe/xgbe-dev.c +16 -6
@@ -1284,6 +1284,20 @@ static void xgbe_write_mmd_regs(struct xgbe_prv_data *pdata, int prtad, } } +static unsigned int xgbe_create_mdio_sca (int port,int reg) +{ +unsigned int mdio_sca, da; + + da = (reg &MII_ADDR_C45 ) ? reg >>16 :0 ; + + mdio_sca =0 ; +XGMAC_SET_BITS (mdio_sca,MAC_MDIOSCAR ,RA , reg); +XGMAC_SET_BITS (mdio_sca,MAC_MDIOSCAR ,PA , port); +XGMAC_SET_BITS (mdio_sca,MAC_MDIOSCAR ,DA , da); + +return mdio_sca; +} +static int xgbe_write_ext_mii_regs (struct xgbe_prv_data *pdata,int addr,int reg,u16 val) {
@@ -1291,9 +1305,7 @@ static int xgbe_write_ext_mii_regs(struct xgbe_prv_data *pdata, int addr,reinit_completion (&pdata->mdio_complete); - mdio_sca =0 ; -XGMAC_SET_BITS (mdio_sca,MAC_MDIOSCAR ,REG , reg); -XGMAC_SET_BITS (mdio_sca,MAC_MDIOSCAR ,DA , addr); + mdio_sca =xgbe_create_mdio_sca (addr, reg);XGMAC_IOWRITE (pdata,MAC_MDIOSCAR , mdio_sca); mdio_sccd =0 ;
@@ -1317,9 +1329,7 @@ static int xgbe_read_ext_mii_regs(struct xgbe_prv_data *pdata, int addr,reinit_completion (&pdata->mdio_complete); - mdio_sca =0 ; -XGMAC_SET_BITS (mdio_sca,MAC_MDIOSCAR ,REG , reg); -XGMAC_SET_BITS (mdio_sca,MAC_MDIOSCAR ,DA , addr); + mdio_sca =xgbe_create_mdio_sca (addr, reg);XGMAC_IOWRITE (pdata,MAC_MDIOSCAR , mdio_sca); mdio_sccd =0 ;
drivers/net/ethernet/mellanox/mlxsw/pci.c +7 -5
@@ -604,29 +604,31 @@ static void mlxsw_pci_cq_tasklet(unsigned long data)u16 wqe_counter =mlxsw_pci_cqe_wqe_counter_get (cqe);u8 sendq =mlxsw_pci_cqe_sr_get (q->u.cq.v, cqe);u8 dqn =mlxsw_pci_cqe_dqn_get (q->u.cq.v, cqe); +char ncqe[MLXSW_PCI_CQE_SIZE_MAX ]; + +memcpy (ncqe, cqe, q->elem_size); +mlxsw_pci_queue_doorbell_consumer_ring (mlxsw_pci, q);if (sendq) {struct mlxsw_pci_queue *sdq; sdq =mlxsw_pci_sdq_get (mlxsw_pci, dqn);mlxsw_pci_cqe_sdq_handle (mlxsw_pci, sdq, - wqe_counter, cqe); + wqe_counter, ncqe); q->u.cq.comp_sdq_count++; }else {struct mlxsw_pci_queue *rdq; rdq =mlxsw_pci_rdq_get (mlxsw_pci, dqn);mlxsw_pci_cqe_rdq_handle (mlxsw_pci, rdq, - wqe_counter, q->u.cq.v, cqe); + wqe_counter, q->u.cq.v, ncqe); q->u.cq.comp_rdq_count++; }if (++items == credits)break ; } -if (items) { -mlxsw_pci_queue_doorbell_consumer_ring (mlxsw_pci, q); +if (items)mlxsw_pci_queue_doorbell_arm_consumer_ring (mlxsw_pci, q); - } }static u16 mlxsw_pci_cq_elem_count (const struct mlxsw_pci_queue *q)
drivers/net/ethernet/mellanox/mlxsw/pci_hw.h +2 -1
@@ -27,7 +27,7 @@#define MLXSW_PCI_SW_RESET 0xF0010#define MLXSW_PCI_SW_RESET_RST_BIT BIT(0) -#define MLXSW_PCI_SW_RESET_TIMEOUT_MSECS 5000 +#define MLXSW_PCI_SW_RESET_TIMEOUT_MSECS 13000#define MLXSW_PCI_SW_RESET_WAIT_MSECS 100#define MLXSW_PCI_FW_READY 0xA1844#define MLXSW_PCI_FW_READY_MASK 0xFFFF
@@ -53,6 +53,7 @@#define MLXSW_PCI_WQE_SIZE 32/* 32 bytes per element */ #define MLXSW_PCI_CQE01_SIZE 16/* 16 bytes per element */ #define MLXSW_PCI_CQE2_SIZE 32/* 32 bytes per element */ +#define MLXSW_PCI_CQE_SIZE_MAX MLXSW_PCI_CQE2_SIZE#define MLXSW_PCI_EQE_SIZE 16/* 16 bytes per element */ #define MLXSW_PCI_WQE_COUNT (MLXSW_PCI_AQ_SIZE / MLXSW_PCI_WQE_SIZE)#define MLXSW_PCI_CQE01_COUNT (MLXSW_PCI_AQ_SIZE / MLXSW_PCI_CQE01_SIZE)
drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c +2 -2
@@ -696,8 +696,8 @@ static const struct mlxsw_sp_fid_ops mlxsw_sp_fid_dummy_ops = {static const struct mlxsw_sp_fid_family mlxsw_sp_fid_dummy_family = { .type =MLXSW_SP_FID_TYPE_DUMMY , .fid_size =sizeof (struct mlxsw_sp_fid ), - .start_index =MLXSW_SP_RFID_BASE -1 , - .end_index =MLXSW_SP_RFID_BASE -1 , + .start_index =VLAN_N_VID -1 , + .end_index =VLAN_N_VID -1 , .ops = &mlxsw_sp_fid_dummy_ops, };
drivers/net/ethernet/sun/cassini.c +1 -14
@@ -1,22 +1,9 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0+ /* cassini.c: Sun Microsystems Cassini(+) ethernet driver. * * Copyright (C) 2004 Sun Microsystems Inc. * Copyright (C) 2003 Adrian Sun ([email protected]) * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License as -* published by the Free Software Foundation; either version 2 of the -* License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, see <http://www.gnu.org/licenses/>. -* * This driver uses the sungem driver (c) David Miller * ([email protected]) as its basis. *
drivers/net/ethernet/sun/cassini.h +1 -14
@@ -1,23 +1,10 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0+ */ /* $Id: cassini.h,v 1.16 2004/08/17 21:15:16 zaumen Exp $ * cassini.h: Definitions for Sun Microsystems Cassini(+) ethernet driver. * * Copyright (C) 2004 Sun Microsystems Inc. * Copyright (c) 2003 Adrian Sun ([email protected]) * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License as -* published by the Free Software Foundation; either version 2 of the -* License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, see <http://www.gnu.org/licenses/>. -* * vendor id: 0x108E (Sun Microsystems, Inc.) * device id: 0xabba (Cassini) * revision ids: 0x01 = Cassini
drivers/net/phy/marvell.c +35 -2
@@ -1063,6 +1063,39 @@ static int m88e1145_config_init(struct phy_device *phydev)return 0 ; } +/* The VOD can be out of specification on link up. Poke an +* undocumented register, in an undocumented page, with a magic value +* to fix this. +*/ +static int m88e6390_errata (struct phy_device *phydev) +{ +int err; + + err =phy_write (phydev,MII_BMCR , +BMCR_ANENABLE |BMCR_SPEED1000 |BMCR_FULLDPLX ); +if (err) +return err; + +usleep_range (300 ,400 ); + + err =phy_write_paged (phydev,0xf8 ,0x08 ,0x36 ); +if (err) +return err; + +return genphy_soft_reset (phydev); +} + +static int m88e6390_config_aneg (struct phy_device *phydev) +{ +int err; + + err =m88e6390_errata (phydev); +if (err) +return err; + +return m88e1510_config_aneg (phydev); +} +/** * fiber_lpa_to_ethtool_lpa_t * @lpa: value of the MII_LPA register for fiber link
@@ -1418,7 +1451,7 @@ static int m88e1318_set_wol(struct phy_device *phydev,* before enabling it if !phy_interrupt_is_valid() */ if (!phy_interrupt_is_valid (phydev)) -phy_read (phydev,MII_M1011_IEVENT ); +__phy_read (phydev,MII_M1011_IEVENT );/* Enable the WOL interrupt */ err = __phy_modify(phydev, MII_88E1318S_PHY_CSIER, 0,
@@ -2313,7 +2346,7 @@ static struct phy_driver marvell_drivers[] = { .flags = PHY_HAS_INTERRUPT, .probe = m88e6390_probe, .config_init = &marvell_config_init, - .config_aneg = &m88e1510_config_aneg, + .config_aneg = &m88e6390_config_aneg, .read_status = &marvell_read_status, .ack_interrupt = &marvell_ack_interrupt, .config_intr = &marvell_config_intr,
drivers/net/phy/mdio_bus.c +1 -0
@@ -391,6 +391,7 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner)if (IS_ERR (gpiod)) {dev_err (&bus->dev,"mii_bus %s couldn't get reset GPIO\n" , bus->id); +device_del (&bus->dev);return PTR_ERR (gpiod); }else if (gpiod) { bus->reset_gpiod = gpiod;
drivers/net/ppp/pppoe.c +1 -0
@@ -445,6 +445,7 @@ static int pppoe_rcv(struct sk_buff *skb, struct net_device *dev,if (pskb_trim_rcsum (skb, len)) goto drop; + ph =pppoe_hdr (skb); pn =pppoe_pernet (dev_net (dev));/* Note that get_item does a sock_hold(), so sk_pppox(po)
drivers/nvme/target/rdma.c +15 -2
@@ -139,6 +139,10 @@ static void nvmet_rdma_recv_done(struct ib_cq *cq, struct ib_wc *wc);static void nvmet_rdma_read_data_done (struct ib_cq *cq,struct ib_wc *wc);static void nvmet_rdma_qp_event (struct ib_event *event,void *priv);static void nvmet_rdma_queue_disconnect (struct nvmet_rdma_queue *queue); +static void nvmet_rdma_free_rsp (struct nvmet_rdma_device *ndev, +struct nvmet_rdma_rsp *r); +static int nvmet_rdma_alloc_rsp (struct nvmet_rdma_device *ndev, +struct nvmet_rdma_rsp *r);static const struct nvmet_fabrics_ops nvmet_rdma_ops;
@@ -182,9 +186,17 @@ nvmet_rdma_get_rsp(struct nvmet_rdma_queue *queue)spin_unlock_irqrestore (&queue->rsps_lock, flags);if (unlikely (!rsp)) { - rsp =kmalloc (sizeof (*rsp),GFP_KERNEL ); +int ret; + + rsp =kzalloc (sizeof (*rsp),GFP_KERNEL );if (unlikely (!rsp))return NULL ; + ret =nvmet_rdma_alloc_rsp (queue->dev, rsp); +if (unlikely (ret)) { +kfree (rsp); +return NULL ; + } + rsp->allocated = true; }
@@ -196,7 +208,8 @@ nvmet_rdma_put_rsp(struct nvmet_rdma_rsp *rsp) {unsigned long flags; -if (rsp->allocated) { +if (unlikely (rsp->allocated)) { +nvmet_rdma_free_rsp (rsp->queue->dev, rsp);kfree (rsp);return ; }
drivers/s390/char/sclp_config.c +2 -0
@@ -60,7 +60,9 @@ static void sclp_cpu_capability_notify(struct work_struct *work)static void __ref sclp_cpu_change_notify (struct work_struct *work) { +lock_device_hotplug ();smp_rescan_cpus (); +unlock_device_hotplug (); }static void sclp_conf_receiver_fn (struct evbuf_header *evbuf)
drivers/scsi/ufs/ufshcd.c +8 -2
@@ -109,13 +109,19 @@int ufshcd_dump_regs (struct ufs_hba *hba,size_t offset,size_t len,const char *prefix) { -u8 *regs; +u32 *regs; +size_t pos; + +if (offset %4 !=0 || len %4 !=0 )/* keep readl happy */ +return -EINVAL ; regs =kzalloc (len,GFP_KERNEL );if (!regs)return -ENOMEM ; -memcpy_fromio (regs, hba->mmio_base + offset, len); +for (pos =0 ; pos < len; pos +=4 ) + regs[pos /4 ] =ufshcd_readl (hba, offset + pos); +ufshcd_hex_dump (prefix, regs, len);kfree (regs);
drivers/staging/rtl8188eu/os_dep/usb_intf.c +1 -0
@@ -35,6 +35,7 @@ static const struct usb_device_id rtw_usb_id_tbl[] = { {USB_DEVICE(0x2001, 0x330F)}, /* DLink DWA-125 REV D1 */ {USB_DEVICE(0x2001, 0x3310)}, /* Dlink DWA-123 REV D1 */ {USB_DEVICE(0x2001, 0x3311)}, /* DLink GO-USB-N150 REV B1 */ + {USB_DEVICE(0x2001, 0x331B)}, /* D-Link DWA-121 rev B1 */ {USB_DEVICE(0x2357, 0x010c)}, /* TP-Link TL-WN722N v2 */ {USB_DEVICE(0x0df6, 0x0076)}, /* Sitecom N150 v2 */ {USB_DEVICE(USB_VENDER_ID_REALTEK, 0xffef)}, /* Rosewill RNX-N150NUB */
drivers/tty/n_hdlc.c +1 -0
@@ -597,6 +597,7 @@ static ssize_t n_hdlc_tty_read(struct tty_struct *tty, struct file *file,/* too large for caller's buffer */ ret = -EOVERFLOW ; }else { +__set_current_state (TASK_RUNNING );if (copy_to_user (buf, rbuf->buf, rbuf->count)) ret = -EFAULT ;else
drivers/tty/serial/serial_core.c +8 -4
@@ -550,10 +550,12 @@ static int uart_put_char(struct tty_struct *tty, unsigned char c)int ret =0 ; circ = &state->xmit; -if (!circ->buf) + port =uart_port_lock (state, flags); +if (!circ->buf) { +uart_port_unlock (port, flags);return 0 ; + } - port =uart_port_lock (state, flags);if (port &&uart_circ_chars_free (circ) !=0 ) { circ->buf[circ->head] = c; circ->head = (circ->head +1 ) & (UART_XMIT_SIZE -1 );
@@ -586,11 +588,13 @@ static int uart_write(struct tty_struct *tty,return -EL3HLT ; } + port =uart_port_lock (state, flags); circ = &state->xmit; -if (!circ->buf) +if (!circ->buf) { +uart_port_unlock (port, flags);return 0 ; + } - port =uart_port_lock (state, flags);while (port) { c =CIRC_SPACE_TO_END (circ->head, circ->tail,UART_XMIT_SIZE );if (count < c)
drivers/tty/tty_io.c +2 -1
@@ -2188,7 +2188,8 @@ static int tiocsti(struct tty_struct *tty, char __user *p) ld =tty_ldisc_ref_wait (tty);if (!ld)return -EIO ; - ld->ops->receive_buf (tty, &ch, &mbz,1 ); +if (ld->ops->receive_buf) + ld->ops->receive_buf (tty, &ch, &mbz,1 );tty_ldisc_deref (ld);return 0 ; }
drivers/tty/vt/vt.c +17 -33
102 lines not on this page · raw message
drivers/usb/core/ledtrig-usbport.c +10 -7
@@ -119,11 +119,6 @@ static const struct attribute_group ports_group = { .attrs = ports_attrs, }; -static const struct attribute_group *ports_groups[] = { - &ports_group, -NULL -}; -/*************************************** * Adding & removing ports ***************************************/
@@ -307,6 +302,7 @@ static int usbport_trig_notify(struct notifier_block *nb, unsigned long action,static int usbport_trig_activate (struct led_classdev *led_cdev) {struct usbport_trig_data *usbport_data; +int err; usbport_data =kzalloc (sizeof (*usbport_data),GFP_KERNEL );if (!usbport_data)
@@ -315,6 +311,9 @@ static int usbport_trig_activate(struct led_classdev *led_cdev)/* List of ports */ INIT_LIST_HEAD (&usbport_data->ports); + err =sysfs_create_group (&led_cdev->dev->kobj, &ports_group); +if (err) + goto err_free;usb_for_each_dev (usbport_data, usbport_trig_add_usb_dev_ports);usbport_trig_update_count (usbport_data);
@@ -322,8 +321,11 @@ static int usbport_trig_activate(struct led_classdev *led_cdev) usbport_data->nb.notifier_call = usbport_trig_notify;led_set_trigger_data (led_cdev, usbport_data);usb_register_notify (&usbport_data->nb); -return 0 ; + +err_free: +kfree (usbport_data); +return err; }static void usbport_trig_deactivate (struct led_classdev *led_cdev)
@@ -335,6 +337,8 @@ static void usbport_trig_deactivate(struct led_classdev *led_cdev)usbport_trig_remove_port (usbport_data, port); } +sysfs_remove_group (&led_cdev->dev->kobj, &ports_group); +usb_unregister_notify (&usbport_data->nb);kfree (usbport_data);
@@ -344,7 +348,6 @@ static struct led_trigger usbport_led_trigger = { .name = "usbport", .activate = usbport_trig_activate, .deactivate = usbport_trig_deactivate, - .groups = ports_groups, };static int __init usbport_trig_init (void )
drivers/usb/dwc3/gadget.c +2 -0
@@ -177,6 +177,8 @@ static void dwc3_gadget_del_and_unmap_request(struct dwc3_ep *dep, req->started = false;list_del (&req->list); req->remaining =0 ; + req->unaligned = false; + req->zero = false;if (req->request.status == -EINPROGRESS ) req->request.status = status;
drivers/usb/serial/pl2303.c +1 -0
@@ -46,6 +46,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_HCR331) }, { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_MOTOROLA) }, { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_ZTEK) }, + { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_TB) }, { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID) }, { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID_RSAQ5) }, { USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_ID),
drivers/usb/serial/pl2303.h +2 -0
@@ -8,6 +8,7 @@#define PL2303_VENDOR_ID 0x067b#define PL2303_PRODUCT_ID 0x2303 +#define PL2303_PRODUCT_ID_TB 0x2304#define PL2303_PRODUCT_ID_RSAQ2 0x04bb#define PL2303_PRODUCT_ID_DCU11 0x1234#define PL2303_PRODUCT_ID_PHAROS 0xaaa0
@@ -20,6 +21,7 @@#define PL2303_PRODUCT_ID_MOTOROLA 0x0307#define PL2303_PRODUCT_ID_ZTEK 0xe1f1 +#define ATEN_VENDOR_ID 0x0557#define ATEN_VENDOR_ID2 0x0547#define ATEN_PRODUCT_ID 0x2008
drivers/usb/serial/usb-serial-simple.c +2 -1
@@ -85,7 +85,8 @@ DEVICE(moto_modem, MOTO_IDS);/* Motorola Tetra driver */ #define MOTOROLA_TETRA_IDS () \ { USB_DEVICE(0x0cad, 0x9011) },/* Motorola Solutions TETRA PEI */ \ - { USB_DEVICE(0x0cad, 0x9012) } /* MTP6550 */ + { USB_DEVICE(0x0cad, 0x9012) }, /* MTP6550 */ \ + { USB_DEVICE(0x0cad, 0x9016) } /* TPG2200 */DEVICE (motorola_tetra,MOTOROLA_TETRA_IDS );/* Novatel Wireless GPS driver */
drivers/vhost/net.c +2 -1
@@ -1024,7 +1024,8 @@ static void handle_rx(struct vhost_net *net)if (nvq->done_idx >VHOST_NET_BATCH )vhost_net_signal_used (nvq);if (unlikely (vq_log)) -vhost_log_write (vq, vq_log, log, vhost_len); +vhost_log_write (vq, vq_log, log, vhost_len, + vq->iov, in); total_len += vhost_len;if (unlikely (vhost_exceeds_weight (++recv_pkts, total_len))) {vhost_poll_queue (&vq->poll);
drivers/vhost/vhost.c +83 -14
133 lines not on this page · raw message
drivers/vhost/vhost.h +2 -1
@@ -205,7 +205,8 @@ bool vhost_vq_avail_empty(struct vhost_dev *, struct vhost_virtqueue *);bool vhost_enable_notify (struct vhost_dev *,struct vhost_virtqueue *);int vhost_log_write (struct vhost_virtqueue *vq,struct vhost_log *log, -unsigned int log_num,u64 len); +unsigned int log_num,u64 len, +struct iovec *iov,int count);int vq_iotlb_prefetch (struct vhost_virtqueue *vq);struct vhost_msg_node *vhost_new_msg (struct vhost_virtqueue *vq,int type);
drivers/video/console/vgacon.c +4 -3
@@ -271,6 +271,7 @@ static void vgacon_scrollback_update(struct vc_data *c, int t, int count)static void vgacon_restore_screen (struct vc_data *c) { + c->vc_origin = c->vc_visible_origin; vgacon_scrollback_cur->save =0 ;if (!vga_is_gfx && !vgacon_scrollback_cur->restore) {
@@ -287,8 +288,7 @@ static void vgacon_scrolldelta(struct vc_data *c, int lines)int start, end, count, soff;if (!lines) { - c->vc_visible_origin = c->vc_origin; -vga_set_mem_top (c); +vgacon_restore_screen (c);return ; }
@@ -298,6 +298,7 @@ static void vgacon_scrolldelta(struct vc_data *c, int lines)if (!vgacon_scrollback_cur->save) {vgacon_cursor (c,CM_ERASE );vgacon_save_screen (c); + c->vc_origin = (unsigned long )c->vc_screenbuf; vgacon_scrollback_cur->save =1 ; }
@@ -335,7 +336,7 @@ static void vgacon_scrolldelta(struct vc_data *c, int lines)int copysize;int diff = c->vc_rows - count; -void *d = (void *) c->vc_origin; +void *d = (void *) c->vc_visible_origin;void *s = (void *) c->vc_screenbuf; count *= c->vc_size_row;
fs/ceph/caps.c +2 -0
@@ -1030,6 +1030,8 @@ static void drop_inode_snap_realm(struct ceph_inode_info *ci)list_del_init (&ci->i_snap_realm_item); ci->i_snap_realm_counter++; ci->i_snap_realm =NULL ; +if (realm->ino == ci->i_vino.ino) + realm->inode =NULL ;spin_unlock (&realm->inodes_with_caps_lock);ceph_put_snap_realm (ceph_sb_to_client (ci->vfs_inode.i_sb)->mdsc, realm);
fs/cifs/cifssmb.c +23 -12
@@ -1458,18 +1458,26 @@ cifs_discard_remaining_data(struct TCP_Server_Info *server) }static int -cifs_readv_discard (struct TCP_Server_Info *server,struct mid_q_entry *mid) +__cifs_readv_discard (struct TCP_Server_Info *server,struct mid_q_entry *mid, +bool malformed) {int length; -struct cifs_readdata *rdata = mid->callback_data; length =cifs_discard_remaining_data (server); -dequeue_mid (mid, rdata->result); +dequeue_mid (mid, malformed); mid->resp_buf = server->smallbuf; server->smallbuf =NULL ;return length; } +static int +cifs_readv_discard (struct TCP_Server_Info *server,struct mid_q_entry *mid) +{ +struct cifs_readdata *rdata = mid->callback_data; + +return __cifs_readv_discard (server, mid, rdata->result); +} +int cifs_readv_receive (struct TCP_Server_Info *server,struct mid_q_entry *mid) {
@@ -1511,12 +1519,23 @@ cifs_readv_receive(struct TCP_Server_Info *server, struct mid_q_entry *mid)return -1 ; } +/* set up first two iov for signature check and to get credits */ + rdata->iov[0 ].iov_base = buf; + rdata->iov[0 ].iov_len =4 ; + rdata->iov[1 ].iov_base = buf +4 ; + rdata->iov[1 ].iov_len = server->total_read -4 ; +cifs_dbg (FYI ,"0: iov_base=%p iov_len=%zu\n" , + rdata->iov[0 ].iov_base, rdata->iov[0 ].iov_len); +cifs_dbg (FYI ,"1: iov_base=%p iov_len=%zu\n" , + rdata->iov[1 ].iov_base, rdata->iov[1 ].iov_len); +/* Was the SMB read successful? */ rdata->result = server->ops->map_error (buf, false);if (rdata->result !=0 ) {cifs_dbg (FYI ,"%s: server returned error %d\n" , __func__, rdata->result); -return cifs_readv_discard (server, mid); +/* normal error on read response */ +return __cifs_readv_discard (server, mid, false); }/* Is there enough to get to the rest of the READ_RSP header? */
@@ -1560,14 +1579,6 @@ cifs_readv_receive(struct TCP_Server_Info *server, struct mid_q_entry *mid) server->total_read += length; } -/* set up first iov for signature check */ - rdata->iov[0 ].iov_base = buf; - rdata->iov[0 ].iov_len =4 ; - rdata->iov[1 ].iov_base = buf +4 ; - rdata->iov[1 ].iov_len = server->total_read -4 ; -cifs_dbg (FYI ,"0: iov_base=%p iov_len=%u\n" , - rdata->iov[0 ].iov_base, server->total_read); -/* how much data is in the response? */ #ifdef CONFIG_CIFS_SMB_DIRECT use_rdma_mr = rdata->mr;
fs/cifs/connect.c +21 -0
@@ -533,6 +533,21 @@ server_unresponsive(struct TCP_Server_Info *server)return false; } +static inline bool +zero_credits (struct TCP_Server_Info *server) +{ +int val; + +spin_lock (&server->req_lock); + val = server->credits + server->echo_credits + server->oplock_credits; +if (server->in_flight ==0 && val ==0 ) { +spin_unlock (&server->req_lock); +return true; + } +spin_unlock (&server->req_lock); +return false; +} +static int cifs_readv_from_socket (struct TCP_Server_Info *server,struct msghdr *smb_msg) {
@@ -545,6 +560,12 @@ cifs_readv_from_socket(struct TCP_Server_Info *server, struct msghdr *smb_msg)for (total_read =0 ;msg_data_left (smb_msg); total_read += length) {try_to_freeze (); +/* reconnect if no credits and no requests in flight */ +if (zero_credits (server)) { +cifs_reconnect (server); +return -ECONNABORTED ; + } +if (server_unresponsive (server))return -ECONNABORTED ;if (cifs_rdma_enabled (server) && server->smbd_conn)
fs/cifs/smb2misc.c +7 -0
@@ -648,6 +648,13 @@ smb2_is_valid_oplock_break(char *buffer, struct TCP_Server_Info *server)if (rsp->sync_hdr.Command !=SMB2_OPLOCK_BREAK )return false; +if (rsp->sync_hdr.CreditRequest) { +spin_lock (&server->req_lock); + server->credits +=le16_to_cpu (rsp->sync_hdr.CreditRequest); +spin_unlock (&server->req_lock); +wake_up (&server->request_q); + } +if (rsp->StructureSize != smb2_rsp_struct_sizes[SMB2_OPLOCK_BREAK_HE ]) {if (le16_to_cpu (rsp->StructureSize) ==44 )
fs/cifs/smb2ops.c +42 -20
126 lines not on this page · raw message
fs/notify/inotify/inotify_user.c +4 -2
@@ -724,8 +724,10 @@ SYSCALL_DEFINE3(inotify_add_watch, int, fd, const char __user *, pathname,return -EBADF ;/* IN_MASK_ADD and IN_MASK_CREATE don't make sense together */ -if (unlikely ((mask &IN_MASK_ADD ) && (mask &IN_MASK_CREATE ))) -return -EINVAL ; +if (unlikely ((mask &IN_MASK_ADD ) && (mask &IN_MASK_CREATE ))) { + ret = -EINVAL ; + goto fput_and_out; + }/* verify that this is indeed an inotify instance */ if (unlikely (f.file->f_op != &inotify_fops)) {
include/linux/bpf_verifier.h +13 -0
@@ -134,6 +134,7 @@ struct bpf_verifier_state {struct bpf_func_state *frame[MAX_CALL_FRAMES ];struct bpf_verifier_state *parent;u32 curframe; +bool speculative; };/* linked list of verifier states used to prune search */
@@ -142,15 +143,25 @@ struct bpf_verifier_state_list {struct bpf_verifier_state_list *next; }; +/* Possible states for alu_state member. */ +#define BPF_ALU_SANITIZE_SRC 1U +#define BPF_ALU_SANITIZE_DST 2U +#define BPF_ALU_NEG_VALUE (1U << 2) +#define BPF_ALU_NON_POINTER (1U << 3) +#define BPF_ALU_SANITIZE (BPF_ALU_SANITIZE_SRC | \ + BPF_ALU_SANITIZE_DST) +struct bpf_insn_aux_data {union {enum bpf_reg_type ptr_type;/* pointer type for load/store insns */ unsigned long map_state;/* pointer/poison value for maps */ s32 call_imm;/* saved imm field of call insn */ +u32 alu_limit;/* limit for add/sub register with pointer */ };int ctx_field_size;/* the ctx field size for load insn, maybe 0 */ int sanitize_stack_off;/* stack slot to be cleared */ bool seen;/* this insn was processed by the verifier */ +u8 alu_state;/* used in combination with alu_limit */ };#define MAX_USED_MAPS 64/* max number of maps accessed by one eBPF program */
@@ -186,6 +197,8 @@ struct bpf_subprog_info {* one verifier_env per bpf_check() call */ struct bpf_verifier_env { +u32 insn_idx; +u32 prev_insn_idx;struct bpf_prog *prog;/* eBPF program being verified */ const struct bpf_verifier_ops *ops;struct bpf_verifier_stack_elem *head;/* stack of verifier states to be processed */
include/linux/filter.h +3 -7
@@ -53,14 +53,10 @@ struct sock_reuseport;#define BPF_REG_D BPF_REG_8/* data, callee-saved */ #define BPF_REG_H BPF_REG_9/* hlen, callee-saved */ -/* Kernel hidden auxiliary/helper register for hardening step. -* Only used by eBPF JITs. It's nothing more than a temporary -* register that JITs use internally, only that here it's part -* of eBPF instructions that have been rewritten for blinding -* constants. See JIT pre-step in bpf_jit_blind_constants(). -*/ +/* Kernel hidden auxiliary/helper register. */ #define BPF_REG_AX MAX_BPF_REG -#define MAX_BPF_JIT_REG (MAX_BPF_REG + 1) +#define MAX_BPF_EXT_REG (MAX_BPF_REG + 1) +#define MAX_BPF_JIT_REG MAX_BPF_EXT_REG/* unused opcode to mark special call to bpf_tail_call() helper */ #define BPF_TAIL_CALL 0xf0
include/linux/hyperv.h +3 -2
@@ -1166,8 +1166,9 @@ struct hv_ring_buffer_debug_info {u32 bytes_avail_towrite; }; -void hv_ringbuffer_get_debuginfo (const struct hv_ring_buffer_info *ring_info, -struct hv_ring_buffer_debug_info *debug_info); + +int hv_ringbuffer_get_debuginfo (const struct hv_ring_buffer_info *ring_info, +struct hv_ring_buffer_debug_info *debug_info);/* Vmbus interface */ #define vmbus_driver_register (driver) \
include/linux/skbuff.h +1 -0
@@ -3178,6 +3178,7 @@ int pskb_trim_rcsum_slow(struct sk_buff *skb, unsigned int len);* * This is exactly the same as pskb_trim except that it ensures the * checksum of received packets are still valid after the operation. +* It can change skb pointers. */ static inline int pskb_trim_rcsum (struct sk_buff *skb,unsigned int len)
include/net/ip_fib.h +1 -1
@@ -230,7 +230,7 @@ int fib_table_delete(struct net *, struct fib_table *, struct fib_config *, struct netlink_ext_ack *extack);int fib_table_dump (struct fib_table *table,struct sk_buff *skb,struct netlink_callback *cb); -int fib_table_flush (struct net *net,struct fib_table *table); +int fib_table_flush (struct net *net,struct fib_table *table,bool flush_all);struct fib_table *fib_trie_unmerge (struct fib_table *main_tb);void fib_table_flush_external (struct fib_table *table);void fib_free_table (struct fib_table *tb);
include/uapi/linux/input.h +5 -1
@@ -26,13 +26,17 @@*/ struct input_event { -#if (__BITS_PER_LONG !=32 || !defined(__USE_TIME_BITS64)) && !defined(__KERNEL) +#if (__BITS_PER_LONG !=32 || !defined(__USE_TIME_BITS64)) && !defined(__KERNEL__)struct timeval time;#define input_event_sec time.tv_sec#define input_event_usec time.tv_usec#else __kernel_ulong_t __sec; +#if defined(__sparc__) && defined(__arch64__) +unsigned int __usec; +#else __kernel_ulong_t __usec; +#endif #define input_event_sec __sec#define input_event_usec __usec#endif
kernel/bpf/core.c +37 -17
106 lines not on this page · raw message
kernel/bpf/map_in_map.c +15 -2
@@ -12,6 +12,7 @@struct bpf_map *bpf_map_meta_alloc (int inner_map_ufd) {struct bpf_map *inner_map, *inner_map_meta; +u32 inner_map_meta_size;struct fd f; f =fdget (inner_map_ufd);
@@ -35,7 +36,12 @@ struct bpf_map *bpf_map_meta_alloc(int inner_map_ufd)return ERR_PTR (-EINVAL ); } - inner_map_meta =kzalloc (sizeof (*inner_map_meta),GFP_USER ); + inner_map_meta_size =sizeof (*inner_map_meta); +/* In some cases verifier needs to access beyond just base map. */ +if (inner_map->ops == &array_map_ops) + inner_map_meta_size =sizeof (struct bpf_array ); + + inner_map_meta =kzalloc (inner_map_meta_size,GFP_USER );if (!inner_map_meta) {fdput (f);return ERR_PTR (-ENOMEM );
@@ -45,9 +51,16 @@ struct bpf_map *bpf_map_meta_alloc(int inner_map_ufd) inner_map_meta->key_size = inner_map->key_size; inner_map_meta->value_size = inner_map->value_size; inner_map_meta->map_flags = inner_map->map_flags; - inner_map_meta->ops = inner_map->ops; inner_map_meta->max_entries = inner_map->max_entries; +/* Misc members not needed in bpf_map_meta_equal() check. */ + inner_map_meta->ops = inner_map->ops; +if (inner_map->ops == &array_map_ops) { + inner_map_meta->unpriv_array = inner_map->unpriv_array; + container_of(inner_map_meta, struct bpf_array, map)->index_mask = + container_of(inner_map, struct bpf_array, map)->index_mask; + } +fdput (f);return inner_map_meta; }
kernel/bpf/verifier.c +395 -75
624 lines not on this page · raw message
net/bridge/netfilter/nft_reject_bridge.c +1 -0
Lines of this file are not shown. View the raw message.
sound/soc/intel/atom/sst-mfld-platform-pcm.c +7 -1
Lines of this file are not shown. View the raw message.
tools/testing/selftests/x86/protection_keys.c +31 -10
41 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.