Linux 4.9.97
Greg KH
maintainerI'm announcing the release of the 4.9.97 kernel.
All users of the 4.9 kernel series must upgrade.
The updated 4.9.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.9.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
------------
Documentation/kernel-parameters.txt | 3 Makefile | 2 arch/mips/Kconfig | 1 arch/s390/Kconfig | 47 +++++ arch/s390/Makefile | 10 + arch/s390/include/asm/alternative.h | 149 +++++++++++++++++ arch/s390/include/asm/barrier.h | 24 ++ arch/s390/include/asm/facility.h | 18 ++ arch/s390/include/asm/kvm_host.h | 3 arch/s390/include/asm/lowcore.h | 7 arch/s390/include/asm/nospec-branch.h | 17 + arch/s390/include/asm/processor.h | 4 arch/s390/include/asm/thread_info.h | 4 arch/s390/include/uapi/asm/kvm.h | 5 arch/s390/kernel/Makefile | 6 arch/s390/kernel/alternative.c | 112 ++++++++++++ arch/s390/kernel/early.c | 5 arch/s390/kernel/entry.S | 250 ++++++++++++++++++++++++++--- arch/s390/kernel/ipl.c | 1 arch/s390/kernel/module.c | 65 +++++++ arch/s390/kernel/nospec-branch.c | 169 +++++++++++++++++++ arch/s390/kernel/processor.c | 18 ++ arch/s390/kernel/setup.c | 14 + arch/s390/kernel/smp.c | 7 arch/s390/kernel/uprobes.c | 9 + arch/s390/kernel/vmlinux.lds.S | 37 ++++ arch/s390/kvm/kvm-s390.c | 13 + arch/s390/kvm/vsie.c | 30 +++ arch/x86/kernel/tsc.c | 2 drivers/acpi/acpi_video.c | 27 ++- drivers/cdrom/cdrom.c | 2 drivers/gpu/drm/drm_dp_dual_mode_helper.c | 39 +++- drivers/gpu/drm/i915/i915_drv.h | 6 drivers/gpu/drm/i915/intel_display.c | 9 - drivers/gpu/drm/i915/intel_pm.c | 6 drivers/gpu/drm/vc4/vc4_bo.c | 2 drivers/gpu/drm/vc4/vc4_validate_shaders.c | 1 drivers/i2c/busses/i2c-i801.c | 29 +++ drivers/infiniband/hw/mlx5/qp.c | 3 drivers/input/misc/drv260x.c | 2 drivers/media/usb/stkwebcam/stk-sensor.c | 6 drivers/media/usb/stkwebcam/stk-webcam.c | 11 - drivers/media/usb/stkwebcam/stk-webcam.h | 2 drivers/message/fusion/mptsas.c | 1 drivers/net/bonding/bond_main.c | 3 drivers/net/ethernet/ti/cpsw.c | 2 drivers/net/ppp/pppoe.c | 4 drivers/net/team/team.c | 38 +++- drivers/net/usb/cdc_ether.c | 10 + drivers/net/usb/r8152.c | 2 drivers/net/wireless/ath/ath10k/mac.c | 5 drivers/net/wireless/ath/ath9k/hw.c | 4 drivers/net/wireless/mac80211_hwsim.c | 7 drivers/of/base.c | 2 drivers/pci/pci.c | 52 ++++-- drivers/pinctrl/intel/pinctrl-intel.c | 23 -- drivers/power/supply/bq2415x_charger.c | 5 drivers/s390/block/dasd_alias.c | 13 + drivers/s390/char/Makefile | 2 drivers/s390/cio/chsc.c | 14 + drivers/usb/musb/musb_core.c | 8 fs/cifs/dir.c | 9 - fs/jbd2/journal.c | 2 include/linux/if_vlan.h | 7 include/net/llc_conn.h | 1 include/uapi/linux/kvm.h | 1 kernel/events/callchain.c | 21 +- kernel/events/core.c | 4 net/core/dev.c | 2 net/core/neighbour.c | 40 +++- net/dns_resolver/dns_key.c | 13 - net/ipv4/tcp.c | 6 net/ipv4/tcp_input.c | 7 net/ipv6/route.c | 2 net/l2tp/l2tp_ppp.c | 7 net/llc/af_llc.c | 14 + net/llc/llc_c_ac.c | 9 - net/llc/llc_conn.c | 22 ++ net/packet/af_packet.c | 82 ++++++--- net/packet/internal.h | 10 - net/sched/act_ife.c | 2 net/sctp/ipv6.c | 60 +++--- net/strparser/strparser.c | 7 net/tipc/netlink.c | 3 tools/perf/util/dso.c | 16 - 85 files changed, 1458 insertions(+), 261 deletions(-)
Alexander Aring (1):
net: sched: ife: signal not finding metaid
Andreas Kemnade (1):
usb: musb: fix enumeration after resume
Benjamin Beichler (1):
mac80211_hwsim: fix use-after-free bug in hwsim_exit_net
Benjamin Tissoires (1):
i2c: i801: store and restore the SLVCMD register at load and unload
Christian Borntraeger (3):
KVM: s390: wire up bpb feature
KVM: s390: force bp isolation for VSIE
s390/entry.S: fix spurious zeroing of r0
Colin Ian King (1):
power: supply: bq2415x: check for NULL acpi_id to avoid null pointer dereference
Cong Wang (3):
llc: delete timers synchronously in llc_sk_free()
llc: hold llc_sap before release_sock()
llc: fix NULL pointer deref for SOCK_ZAPPED
Dan Carpenter (2):
stk-webcam: fix an endian bug in stk_camera_read_reg()
cdrom: information leak in cdrom_ioctl_media_changed()
Daniel J Blueman (1):
drm/vc4: Fix memory leak during BO teardown
Dmitry Torokhov (1):
Input: drv260x - fix initializing overdrive voltage
Doron Roberts-Kedes (1):
strparser: Fix incorrect strp->need_bytes value.
Eric Biggers (1):
KEYS: DNS: limit the length of option strings
Eric Dumazet (5):
net: validate attribute sizes in neigh_dump_table()
tipc: add policy for TIPC_NLA_NET_ADDR
tcp: md5: reject TCP_MD5SIG or TCP_MD5SIG_EXT on established sockets
net: af_packet: fix race in PACKET_{R|T}X_RING
ipv6: add RTA_TABLE and RTA_PREFSRC to rtm_ipv6_policy
Eugeniu Rosca (1):
s390: Replace IS_ENABLED(EXPOLINE_*) with IS_ENABLED(CONFIG_EXPOLINE_*)
Felix Fietkau (1):
ath9k_hw: check if the chip failed to wake up
Grant Grundler (1):
r8152: add Linksys USB3GIGV1 id
Greg Kroah-Hartman (3):
Revert "perf tools: Decompress kernel module when reading DSO data" Revert "pinctrl: intel: Initialize GPIO properly when used through irqchip" Linux 4.9.97
Guillaume Nault (2):
l2tp: check sockaddr length in pppol2tp_connect()
pppoe: check sockaddr length in pppoe_connect()
Hans de Goede (1):
ACPI / video: Only default only_lcd to true on Win8-ready _desktops_
Heiko Carstens (2):
s390: enable CPU alternatives unconditionally s390/uprobes: implement arch_uretprobe_is_alive()
Imre Deak (2):
drm/i915: Fix LSPCON TMDS output buffer enabling from low-power state drm/i915/bxt, glk: Increase PCODE timeouts during CDCLK freq changing
Ivan Khoronzhuk (1):
net: ethernet: ti: cpsw: fix tx vlan priority mapping
Jann Horn (1):
tcp: don't read out-of-bounds opsize
Jean Delvare (2):
i2c: i801: Save register SMBSLVCMD value only once
i2c: i801: Restore configuration at shutdown
Jiri Olsa (2):
perf: Fix sample_max_stack maximum check
perf: Return proper values for user stack errors
Karthikeyan Periyasamy (1):
Revert "ath10k: send (re)assoc peer command when NSS changed"
Leon Romanovsky (1):
RDMA/mlx5: Fix NULL dereference while accessing XRC_TGT QPs
Martin K. Petersen (1):
scsi: mptsas: Disable WRITE SAME
Martin Schwidefsky (13):
s390: scrub registers on kernel entry and KVM exit
s390: add optimized array_index_mask_nospec s390/alternative: use a copy of the facility bit mask
s390: add options to change branch prediction behaviour for the kernel
s390: run user space and KVM guests with modified branch prediction
s390: introduce execute-trampolines for branches
s390: do not bypass BPENTER for interrupt system calls
s390: move nobp parameter functions to nospec-branch.c
s390: add automatic detection of the spectre defense
s390: report spectre mitigation via syslog
s390: add sysfs attributes for spectre
s390: correct nospec auto detection init order
s390: correct module section names for expoline code revert
Matt Redfearn (1):
MIPS: Generic: Fix big endian CPUs on generic machine
Merlijn Wajer (2):
usb: musb: call pm_runtime_{get,put}_sync before reading vbus registers
usb: musb: Fix external abort in musb_remove on omap2430
Paolo Abeni (1):
team: avoid adding twice the same option to the event list
Paul Burton (1):
OF: Prevent unaligned access in of_alias_scan()
Sahitya Tummala (1):
jbd2: fix use after free in kjournald2()
Sebastian Ott (1):
s390/cio: update chpid descriptor after resource accessibility event
Sinan Kaya (1):
PCI: Wait up to 60 seconds for device to become ready after FLR
Stefan Haberland (1):
s390/dasd: fix IO error for newly defined devices
Steve French (1):
cifs: do not allow creating sockets except with SMB1 posix exensions
Toshiaki Makita (1):
vlan: Fix reading memory beyond skb->tail in skb_vlan_tagged_multi
Vasily Gorbik (1):
s390: introduce CPU alternatives
Willem de Bruijn (1):
packet: fix bitfield update race
Wolfgang Bumiller (1):
net: fix deadlock while clearing neighbor proxy table
Xiaoming Gao (1):
x86/tsc: Prevent 32bit truncation in calc_hpet_ref()
Xin Long (3):
bonding: do not set slave_dev npinfo before slave_enable_netpoll in bond_enslave
team: fix netconsole setup over team
sctp: do not check port in sctp_inet6_cmp_addr
Greg KH
maintainerDocumentation/kernel-parameters.txt +3 -0
@@ -2640,6 +2640,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. noalign [KNL,ARM] + noaltinstr [S390] Disables alternative instructions patching + (CPU alternatives feature). + noapic [SMP,APIC] Tells the kernel to not make use of any IOAPICs that may be present in the system.
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 9 -SUBLEVEL = 96 +SUBLEVEL = 97 EXTRAVERSION = NAME = Roaring Lionus
arch/mips/Kconfig +1 -0
@@ -95,6 +95,7 @@ config MIPS_GENERIC select PCI_DRIVERS_GENERIC select PINCTRL select SMP_UP if SMP + select SWAP_IO_SPACE select SYS_HAS_CPU_MIPS32_R1 select SYS_HAS_CPU_MIPS32_R2 select SYS_HAS_CPU_MIPS32_R6
arch/s390/Kconfig +47 -0
65 lines not on this page · raw message
arch/s390/Makefile +10 -0
@@ -79,6 +79,16 @@ ifeq ($(call cc-option-yn,-mwarn-dynamicstack),y) cflags-$(CONFIG_WARN_DYNAMIC_STACK) += -mwarn-dynamicstack endif +ifdef CONFIG_EXPOLINE + ifeq ($(call cc-option-yn,$(CC_FLAGS_MARCH) -mindirect-branch=thunk),y) + CC_FLAGS_EXPOLINE := -mindirect-branch=thunk + CC_FLAGS_EXPOLINE += -mfunction-return=thunk + CC_FLAGS_EXPOLINE += -mindirect-branch-table + export CC_FLAGS_EXPOLINE + cflags-y += $(CC_FLAGS_EXPOLINE) -DCC_USING_EXPOLINE + endif +endif + ifdef CONFIG_FUNCTION_TRACER # make use of hotpatch feature if the compiler supports it cc_hotpatch := -mhotpatch=0,3
arch/s390/include/asm/alternative.h new file +149 -0
149 lines not on this page · raw message
arch/s390/include/asm/barrier.h +24 -0
@@ -48,6 +48,30 @@ do { \#define __smp_mb__before_atomic () barrier()#define __smp_mb__after_atomic () barrier() +/** +* array_index_mask_nospec - generate a mask for array_idx() that is +* ~0UL when the bounds check succeeds and 0 otherwise +* @index: array element index +* @size: number of elements in array +*/ +#define array_index_mask_nospec array_index_mask_nospec +static inline unsigned long array_index_mask_nospec (unsigned long index, +unsigned long size) +{ +unsigned long mask; + +if (__builtin_constant_p (size) && size >0 ) { + asm(" clgr %2,%1\n" +" slbgr %0,%0\n" + :"=d" (mask) :"d" (size-1 ),"d" (index) :"cc" ); +return mask; + } + asm(" clgr %1,%2\n" +" slbgr %0,%0\n" + :"=d" (mask) :"d" (size),"d" (index) :"cc" ); +return ~mask; +} +#include <asm-generic/barrier.h> #endif /* __ASM_BARRIER_H */
arch/s390/include/asm/facility.h +18 -0
@@ -17,6 +17,24 @@#define MAX_FACILITY_BIT (256*8)/* stfle_fac_list has 256 bytes */ +static inline void __set_facility (unsigned long nr,void *facilities) +{ +unsigned char *ptr = (unsigned char *) facilities; + +if (nr >=MAX_FACILITY_BIT ) +return ; + ptr[nr >>3 ] |=0x80 >> (nr &7 ); +} + +static inline void __clear_facility (unsigned long nr,void *facilities) +{ +unsigned char *ptr = (unsigned char *) facilities; + +if (nr >=MAX_FACILITY_BIT ) +return ; + ptr[nr >>3 ] &= ~(0x80 >> (nr &7 )); +} +static inline int __test_facility (unsigned long nr,void *facilities) {unsigned char *ptr;
arch/s390/include/asm/kvm_host.h +2 -1
@@ -181,7 +181,8 @@ struct kvm_s390_sie_block {__u16 ipa;/* 0x0056 */ __u32 ipb;/* 0x0058 */ __u32 scaoh;/* 0x005c */ -__u8 reserved60;/* 0x0060 */ +#define FPF_BPBC 0x20 +__u8 fpf;/* 0x0060 */ __u8 ecb;/* 0x0061 */ __u8 ecb2;/* 0x0062 */ #define ECB3_AES 0x04
arch/s390/include/asm/lowcore.h +5 -2
@@ -135,7 +135,9 @@ struct lowcore {/* Per cpu primary space access list */ __u32 paste[16 ];/* 0x0400 */ -__u8 pad_0x04c0[0x0e00 -0x0440 ];/* 0x0440 */ +/* br %r1 trampoline */ +__u16 br_r1_trampoline;/* 0x0440 */ +__u8 pad_0x0442[0x0e00 -0x0442 ];/* 0x0442 */ /* * 0xe00 contains the address of the IPL Parameter Information
@@ -150,7 +152,8 @@ struct lowcore {__u8 pad_0x0e20[0x0f00 -0x0e20 ];/* 0x0e20 */ /* Extended facility list */ -__u64 stfle_fac_list[32 ];/* 0x0f00 */ +__u64 stfle_fac_list[16 ];/* 0x0f00 */ +__u64 alt_stfle_fac_list[16 ];/* 0x0f80 */ __u8 pad_0x1000[0x11b0 -0x1000 ];/* 0x1000 */ /* Pointer to vector register save area */
arch/s390/include/asm/nospec-branch.h new file +17 -0
@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_S390_EXPOLINE_H +#define _ASM_S390_EXPOLINE_H + +#ifndef __ASSEMBLY__ + +#include <linux/types.h> + +extern int nospec_disable; + +void nospec_init_branches (void ); +void nospec_auto_detect (void ); +void nospec_revert (s32 *start,s32 *end); + +#endif /* __ASSEMBLY__ */ + +#endif /* _ASM_S390_EXPOLINE_H */
arch/s390/include/asm/processor.h +4 -0
@@ -84,6 +84,7 @@ void cpu_detect_mhz_feature(void);extern const struct seq_operations cpuinfo_op;extern int sysctl_ieee_emulation_warnings;extern void execve_tail (void ); +extern void __bpon (void );/* * User space process size: 2GB for 31 bit, 4TB or 8PT for 64 bit.
@@ -359,6 +360,9 @@ extern void memcpy_absolute(void *, void *, size_t);memcpy_absolute (&(dest), &__tmp,sizeof (__tmp)); \ } +extern int s390_isolate_bp (void ); +extern int s390_isolate_bp_guest (void ); +#endif /* __ASSEMBLY__ */ #endif /* __ASM_S390_PROCESSOR_H */
arch/s390/include/asm/thread_info.h +4 -0
@@ -79,6 +79,8 @@ int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);#define TIF_SECCOMP 5/* secure computing */ #define TIF_SYSCALL_TRACEPOINT 6/* syscall tracepoint instrumentation */ #define TIF_UPROBE 7/* breakpointed or single-stepping */ +#define TIF_ISOLATE_BP 8/* Run process with isolated BP */ +#define TIF_ISOLATE_BP_GUEST 9/* Run KVM guests with isolated BP */ #define TIF_31BIT 16/* 32bit process */ #define TIF_MEMDIE 17/* is terminating due to OOM killer */ #define TIF_RESTORE_SIGMASK 18/* restore signal mask in do_signal() */
@@ -94,6 +96,8 @@ int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);#define _TIF_SECCOMP _BITUL(TIF_SECCOMP)#define _TIF_SYSCALL_TRACEPOINT _BITUL(TIF_SYSCALL_TRACEPOINT)#define _TIF_UPROBE _BITUL(TIF_UPROBE) +#define _TIF_ISOLATE_BP _BITUL(TIF_ISOLATE_BP) +#define _TIF_ISOLATE_BP_GUEST _BITUL(TIF_ISOLATE_BP_GUEST)#define _TIF_31BIT _BITUL(TIF_31BIT)#define _TIF_SINGLE_STEP _BITUL(TIF_SINGLE_STEP)
arch/s390/include/uapi/asm/kvm.h +4 -1
@@ -197,6 +197,7 @@ struct kvm_guest_debug_arch {#define KVM_SYNC_VRS (1UL << 6)#define KVM_SYNC_RICCB (1UL << 7)#define KVM_SYNC_FPRS (1UL << 8) +#define KVM_SYNC_BPBC (1UL << 10)/* definition of registers in kvm_run */ struct kvm_sync_regs {__u64 prefix;/* prefix register */
@@ -217,7 +218,9 @@ struct kvm_sync_regs { };__u8 reserved[512 ];/* for future vector expansion */ __u32 fpc;/* valid on KVM_SYNC_VRS or KVM_SYNC_FPRS */ -__u8 padding[52 ];/* riccb needs to be 64byte aligned */ + __u8 bpbc : 1; /* bp mode */ + __u8 reserved2 : 7; +__u8 padding1[51 ];/* riccb needs to be 64byte aligned */ __u8 riccb[64 ];/* runtime instrumentation controls block */ };
arch/s390/kernel/Makefile +5 -1
@@ -42,6 +42,7 @@ ifneq ($(CC_FLAGS_MARCH),-march=z900) CFLAGS_REMOVE_sclp.o += $(CC_FLAGS_MARCH) CFLAGS_sclp.o += -march=z900 CFLAGS_REMOVE_als.o += $(CC_FLAGS_MARCH) +CFLAGS_REMOVE_als.o += $(CC_FLAGS_EXPOLINE) CFLAGS_als.o += -march=z900 AFLAGS_REMOVE_head.o += $(CC_FLAGS_MARCH) AFLAGS_head.o += -march=z900
@@ -57,10 +58,13 @@ obj-y += processor.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o nmi.o obj-y += debug.o irq.o ipl.o dis.o diag.o sclp.o vdso.o als.o obj-y += sysinfo.o jump_label.o lgr.o os_info.o machine_kexec.o pgm_check.o obj-y += runtime_instr.o cache.o fpu.o dumpstack.o -obj-y += entry.o reipl.o relocate_kernel.o +obj-y += entry.o reipl.o relocate_kernel.o alternative.o +obj-y += nospec-branch.o extra-y += head.o head64.o vmlinux.lds +CFLAGS_REMOVE_nospec-branch.o += $(CC_FLAGS_EXPOLINE) + obj-$(CONFIG_MODULES) += module.o obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_SCHED_TOPOLOGY) += topology.o
arch/s390/kernel/alternative.c new file +112 -0
112 lines not on this page · raw message
arch/s390/kernel/early.c +5 -0
@@ -299,6 +299,11 @@ static noinline __init void setup_facility_list(void) {stfle (S390_lowcore.stfle_fac_list,ARRAY_SIZE (S390_lowcore.stfle_fac_list)); +memcpy (S390_lowcore.alt_stfle_fac_list, + S390_lowcore.stfle_fac_list, +sizeof (S390_lowcore.alt_stfle_fac_list)); +if (!IS_ENABLED (CONFIG_KERNEL_NOBP )) +__clear_facility (82 , S390_lowcore.alt_stfle_fac_list); }static __init void detect_diag9c (void )
arch/s390/kernel/entry.S +225 -25
523 lines not on this page · raw message
arch/s390/kernel/ipl.c +1 -0
@@ -563,6 +563,7 @@ static struct kset *ipl_kset;static void __ipl_run (void *unused) { +__bpon ();diag308 (DIAG308_LOAD_CLEAR ,NULL );if (MACHINE_IS_VM )__cpcmd ("IPL" ,NULL ,0 ,NULL );
arch/s390/kernel/module.c +61 -4
89 lines not on this page · raw message
arch/s390/kernel/nospec-branch.c new file +169 -0
169 lines not on this page · raw message
arch/s390/kernel/processor.c +18 -0
@@ -179,3 +179,21 @@ const struct seq_operations cpuinfo_op = { .stop = c_stop, .show = show_cpuinfo, }; + +int s390_isolate_bp (void ) +{ +if (!test_facility (82 )) +return -EOPNOTSUPP ; +set_thread_flag (TIF_ISOLATE_BP ); +return 0 ; +} +EXPORT_SYMBOL (s390_isolate_bp); + +int s390_isolate_bp_guest (void ) +{ +if (!test_facility (82 )) +return -EOPNOTSUPP ; +set_thread_flag (TIF_ISOLATE_BP_GUEST ); +return 0 ; +} +EXPORT_SYMBOL (s390_isolate_bp_guest);
arch/s390/kernel/setup.c +13 -1
@@ -63,6 +63,8 @@#include <asm/sclp.h> #include <asm/sysinfo.h> #include <asm/numa.h> +#include <asm/alternative.h> +#include <asm/nospec-branch.h> #include "entry.h" /*
@@ -335,7 +337,9 @@ static void __init setup_lowcore(void) lc->machine_flags = S390_lowcore.machine_flags; lc->stfl_fac_list = S390_lowcore.stfl_fac_list;memcpy (lc->stfle_fac_list, S390_lowcore.stfle_fac_list, -MAX_FACILITY_BIT /8 ); +sizeof (lc->stfle_fac_list)); +memcpy (lc->alt_stfle_fac_list, S390_lowcore.alt_stfle_fac_list, +sizeof (lc->alt_stfle_fac_list));if (MACHINE_HAS_VX ) lc->vector_save_area_addr = (unsigned long ) &lc->vector_save_area;
@@ -372,6 +376,7 @@ static void __init setup_lowcore(void)#ifdef CONFIG_SMP lc->spinlock_lockval =arch_spin_lockval (0 );#endif + lc->br_r1_trampoline =0x07f1 ;/* br %r1 */ set_prefix ((u32 )(unsigned long ) lc); lowcore_ptr[0 ] = lc;
@@ -871,6 +876,9 @@ void __init setup_arch(char **cmdline_p) init_mm.end_data = (unsigned long ) &_edata; init_mm.brk = (unsigned long ) &_end; +if (IS_ENABLED (CONFIG_EXPOLINE_AUTO )) +nospec_auto_detect (); +parse_early_param ();#ifdef CONFIG_CRASH_DUMP /* Deactivate elfcorehdr= kernel parameter */
@@ -931,6 +939,10 @@ void __init setup_arch(char **cmdline_p)conmode_default ();set_preferred_console (); +apply_alternative_instructions (); +if (IS_ENABLED (CONFIG_EXPOLINE )) +nospec_init_branches (); +/* Setup zfcpdump support */ setup_zfcpdump ();
arch/s390/kernel/smp.c +6 -1
@@ -205,6 +205,7 @@ static int pcpu_alloc_lowcore(struct pcpu *pcpu, int cpu) lc->panic_stack = panic_stack +PANIC_FRAME_OFFSET ; lc->cpu_nr = cpu; lc->spinlock_lockval =arch_spin_lockval (cpu); + lc->br_r1_trampoline =0x07f1 ;/* br %r1 */ if (MACHINE_HAS_VX ) lc->vector_save_area_addr = (unsigned long ) &lc->vector_save_area;
@@ -253,7 +254,9 @@ static void pcpu_prepare_secondary(struct pcpu *pcpu, int cpu)__ctl_store (lc->cregs_save_area,0 ,15 );save_access_regs ((unsigned int *) lc->access_regs_save_area);memcpy (lc->stfle_fac_list, S390_lowcore.stfle_fac_list, -MAX_FACILITY_BIT /8 ); +sizeof (lc->stfle_fac_list)); +memcpy (lc->alt_stfle_fac_list, S390_lowcore.alt_stfle_fac_list, +sizeof (lc->alt_stfle_fac_list)); }static void pcpu_attach_task (struct pcpu *pcpu,struct task_struct *tsk)
@@ -302,6 +305,7 @@ static void pcpu_delegate(struct pcpu *pcpu, void (*func)(void *),mem_assign_absolute (lc->restart_fn, (unsigned long ) func);mem_assign_absolute (lc->restart_data, (unsigned long ) data);mem_assign_absolute (lc->restart_source, source_cpu); +__bpon (); asmvolatile ("0: sigp 0,%0,%2 # sigp restart to target cpu\n" " brc 2,0b # busy, try again\n"
@@ -875,6 +879,7 @@ void __cpu_die(unsigned int cpu)void __noreturn cpu_die (void ) {idle_task_exit (); +__bpon ();pcpu_sigp_retry (pcpu_devices +smp_processor_id (),SIGP_STOP ,0 );for (;;) ; }
arch/s390/kernel/uprobes.c +9 -0
@@ -147,6 +147,15 @@ unsigned long arch_uretprobe_hijack_return_addr(unsigned long trampoline,return orig; } +bool arch_uretprobe_is_alive (struct return_instance *ret,enum rp_check ctx, +struct pt_regs *regs) +{ +if (ctx ==RP_CHECK_CHAIN_CALL ) +return user_stack_pointer (regs) <= ret->stack; +else +return user_stack_pointer (regs) < ret->stack; +} +/* Instruction Emulation */ static void adjust_psw_addr (psw_t *psw,unsigned long len)
arch/s390/kernel/vmlinux.lds.S +37 -0
@@ -99,6 +99,43 @@ SECTIONS EXIT_DATA } + /* + * struct alt_inst entries. From the header (alternative.h): + * "Alternative instructions for different CPU types or capabilities" + * Think locking instructions on spinlocks. + * Note, that it is a part of __init region. + */ + . = ALIGN(8); + .altinstructions : { + __alt_instructions = .; + *(.altinstructions) + __alt_instructions_end = .; + } + + /* + * And here are the replacement instructions. The linker sticks + * them as binary blobs. The .altinstructions has enough data to + * get the address and the length of them to patch the kernel safely. + * Note, that it is a part of __init region. + */ + .altinstr_replacement : { + *(.altinstr_replacement) + } + + /* + * Table with the patch locations to undo expolines + */ + .nospec_call_table : { + __nospec_call_start = . ; + *(.s390_indirect*) + __nospec_call_end = . ; + } + .nospec_return_table : { + __nospec_return_start = . ; + *(.s390_return*) + __nospec_return_end = . ; + } + /* early.c uses stsi, which requires page aligned data. */ . = ALIGN(PAGE_SIZE); INIT_DATA_SECTION(0x100)
arch/s390/kvm/kvm-s390.c +12 -1
@@ -401,6 +401,9 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)case KVM_CAP_S390_RI : r =test_facility (64 );break ; +case KVM_CAP_S390_BPB : + r =test_facility (82 ); +break ;default : r =0 ; }
@@ -1713,6 +1716,8 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)kvm_s390_set_prefix (vcpu,0 );if (test_kvm_facility (vcpu->kvm,64 )) vcpu->run->kvm_valid_regs |=KVM_SYNC_RICCB ; +if (test_kvm_facility (vcpu->kvm,82 )) + vcpu->run->kvm_valid_regs |=KVM_SYNC_BPBC ;/* fprs can be synchronized via vrs, even if the guest has no vx. With * MACHINE_HAS_VX, (load|store)_fpu_regs() will work with vrs format. */
@@ -1829,7 +1834,6 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)if (test_fp_ctl (current->thread.fpu.fpc))/* User space provided an invalid FPC, let's clear it */ current->thread.fpu.fpc =0 ; -save_access_regs (vcpu->arch.host_acrs);restore_access_regs (vcpu->run->s.regs.acrs);gmap_enable (vcpu->arch.enabled_gmap);
@@ -1877,6 +1881,7 @@ static void kvm_s390_vcpu_initial_reset(struct kvm_vcpu *vcpu) current->thread.fpu.fpc =0 ; vcpu->arch.sie_block->gbea =1 ; vcpu->arch.sie_block->pp =0 ; + vcpu->arch.sie_block->fpf &= ~FPF_BPBC ; vcpu->arch.pfault_token =KVM_S390_PFAULT_TOKEN_INVALID ;kvm_clear_async_pf_completion_queue (vcpu);if (!kvm_s390_user_cpu_state_ctrl (vcpu->kvm))
@@ -2744,6 +2749,11 @@ static void sync_regs(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)if (riccb->valid) vcpu->arch.sie_block->ecb3 |=0x01 ; } +if ((kvm_run->kvm_dirty_regs &KVM_SYNC_BPBC ) && +test_kvm_facility (vcpu->kvm,82 )) { + vcpu->arch.sie_block->fpf &= ~FPF_BPBC ; + vcpu->arch.sie_block->fpf |= kvm_run->s.regs.bpbc ?FPF_BPBC :0 ; + } kvm_run->kvm_dirty_regs =0 ; }
@@ -2762,6 +2772,7 @@ static void store_regs(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) kvm_run->s.regs.pft = vcpu->arch.pfault_token; kvm_run->s.regs.pfs = vcpu->arch.pfault_select; kvm_run->s.regs.pfc = vcpu->arch.pfault_compare; + kvm_run->s.regs.bpbc = (vcpu->arch.sie_block->fpf &FPF_BPBC ) ==FPF_BPBC ; }int kvm_arch_vcpu_ioctl_run (struct kvm_vcpu *vcpu,struct kvm_run *kvm_run)
arch/s390/kvm/vsie.c +30 -0
@@ -217,6 +217,12 @@ static void unshadow_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)memcpy (scb_o->gcr, scb_s->gcr,128 ); scb_o->pp = scb_s->pp; +/* branch prediction */ +if (test_kvm_facility (vcpu->kvm,82 )) { + scb_o->fpf &= ~FPF_BPBC ; + scb_o->fpf |= scb_s->fpf &FPF_BPBC ; + } +/* interrupt intercept */ switch (scb_s->icptcode) {case ICPT_PROGI :
@@ -259,6 +265,7 @@ static int shadow_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) scb_s->ecb3 =0 ; scb_s->ecd =0 ; scb_s->fac =0 ; + scb_s->fpf =0 ; rc =prepare_cpuflags (vcpu, vsie_page);if (rc)
@@ -316,6 +323,9 @@ static int shadow_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)prefix_unmapped (vsie_page); scb_s->ecb |= scb_o->ecb &0x10U ; } +/* branch prediction */ +if (test_kvm_facility (vcpu->kvm,82 )) + scb_s->fpf |= scb_o->fpf &FPF_BPBC ;/* SIMD */ if (test_kvm_facility (vcpu->kvm,129 )) { scb_s->eca |= scb_o->eca &0x00020000U ;
@@ -754,6 +764,7 @@ static int do_vsie_run(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) {struct kvm_s390_sie_block *scb_s = &vsie_page->scb_s;struct kvm_s390_sie_block *scb_o = vsie_page->scb_o; +int guest_bp_isolation;int rc;handle_last_fault (vcpu, vsie_page);
@@ -764,6 +775,20 @@ static int do_vsie_run(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)s390_handle_mcck ();srcu_read_unlock (&vcpu->kvm->srcu, vcpu->srcu_idx); + +/* save current guest state of bp isolation override */ + guest_bp_isolation =test_thread_flag (TIF_ISOLATE_BP_GUEST ); + +/* +* The guest is running with BPBC, so we have to force it on for our +* nested guest. This is done by enabling BPBC globally, so the BPBC +* control in the SCB (which the nested guest can modify) is simply +* ignored. +*/ +if (test_kvm_facility (vcpu->kvm,82 ) && + vcpu->arch.sie_block->fpf &FPF_BPBC ) +set_thread_flag (TIF_ISOLATE_BP_GUEST ); +local_irq_disable ();guest_enter_irqoff ();local_irq_enable ();
@@ -773,6 +798,11 @@ static int do_vsie_run(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)local_irq_disable ();guest_exit_irqoff ();local_irq_enable (); + +/* restore guest state for bp isolation override */ +if (!guest_bp_isolation) +clear_thread_flag (TIF_ISOLATE_BP_GUEST ); + vcpu->srcu_idx =srcu_read_lock (&vcpu->kvm->srcu);if (rc >0 )
arch/x86/kernel/tsc.c +1 -1
@@ -409,7 +409,7 @@ static unsigned long calc_hpet_ref(u64 deltatsc, u64 hpet1, u64 hpet2) hpet2 -= hpet1; tmp = ((u64 )hpet2 *hpet_readl (HPET_PERIOD ));do_div (tmp,1000000 ); -do_div (deltatsc, tmp); + deltatsc =div64_u64 (deltatsc, tmp);return (unsigned long ) deltatsc; }
drivers/acpi/acpi_video.c +25 -2
@@ -2069,6 +2069,25 @@ static int __init intel_opregion_present(void)return opregion; } +static bool dmi_is_desktop (void ) +{ +const char *chassis_type; + + chassis_type =dmi_get_system_info (DMI_CHASSIS_TYPE ); +if (!chassis_type) +return false; + +if (!strcmp (chassis_type,"3" ) ||/* 3: Desktop */ + !strcmp (chassis_type,"4" ) ||/* 4: Low Profile Desktop */ + !strcmp (chassis_type,"5" ) ||/* 5: Pizza Box */ + !strcmp (chassis_type,"6" ) ||/* 6: Mini Tower */ + !strcmp (chassis_type,"7" ) ||/* 7: Tower */ + !strcmp (chassis_type,"11" ))/* 11: Main Server Chassis */ +return true; + +return false; +} +int acpi_video_register (void ) {int ret =0 ;
@@ -2089,8 +2108,12 @@ int acpi_video_register(void)* win8 ready (where we also prefer the native backlight driver, so * normally the acpi_video code should not register there anyways). */ -if (only_lcd ==-1 ) - only_lcd =acpi_osi_is_win8 (); +if (only_lcd ==-1 ) { +if (dmi_is_desktop () &&acpi_osi_is_win8 ()) + only_lcd = true; +else + only_lcd = false; + }dmi_check_system (video_dmi_table);
drivers/cdrom/cdrom.c +1 -1
@@ -2368,7 +2368,7 @@ static int cdrom_ioctl_media_changed(struct cdrom_device_info *cdi,if (!CDROM_CAN (CDC_SELECT_DISC ) || arg ==CDSL_CURRENT )return media_changed (cdi,1 ); -if ((unsigned int )arg >= cdi->capacity) +if (arg >= cdi->capacity)return -EINVAL ; info =kmalloc (sizeof (*info),GFP_KERNEL );
drivers/gpu/drm/drm_dp_dual_mode_helper.c +32 -7
@@ -322,19 +322,44 @@ int drm_dp_dual_mode_set_tmds_output(enum drm_dp_dual_mode_type type, {uint8_t tmds_oen = enable ?0 :DP_DUAL_MODE_TMDS_DISABLE ;ssize_t ret; +int retry;if (type <DRM_DP_DUAL_MODE_TYPE2_DVI )return 0 ; - ret =drm_dp_dual_mode_write (adapter,DP_DUAL_MODE_TMDS_OEN , - &tmds_oen,sizeof (tmds_oen)); -if (ret) { -DRM_DEBUG_KMS ("Failed to %s TMDS output buffers\n" , - enable ?"enable" :"disable" ); -return ret; +/* +* LSPCON adapters in low-power state may ignore the first write, so +* read back and verify the written value a few times. +*/ +for (retry =0 ; retry <3 ; retry++) { +uint8_t tmp; + + ret =drm_dp_dual_mode_write (adapter,DP_DUAL_MODE_TMDS_OEN , + &tmds_oen,sizeof (tmds_oen)); +if (ret) { +DRM_DEBUG_KMS ("Failed to %s TMDS output buffers (%d attempts)\n" , + enable ?"enable" :"disable" , + retry +1 ); +return ret; + } + + ret =drm_dp_dual_mode_read (adapter,DP_DUAL_MODE_TMDS_OEN , + &tmp,sizeof (tmp)); +if (ret) { +DRM_DEBUG_KMS ("I2C read failed during TMDS output buffer %s (%d attempts)\n" , + enable ?"enabling" :"disabling" , + retry +1 ); +return ret; + } + +if (tmp == tmds_oen) +return 0 ; } -return 0 ; +DRM_DEBUG_KMS ("I2C write value mismatch during TMDS output buffer %s\n" , + enable ?"enabling" :"disabling" ); + +return -EIO ; }EXPORT_SYMBOL (drm_dp_dual_mode_set_tmds_output);
drivers/gpu/drm/i915/i915_drv.h +5 -1
@@ -3681,7 +3681,11 @@ extern void intel_display_print_error_state(struct drm_i915_error_state_buf *e, struct intel_display_error_state *error);int sandybridge_pcode_read (struct drm_i915_private *dev_priv,u32 mbox,u32 *val); -int sandybridge_pcode_write (struct drm_i915_private *dev_priv,u32 mbox,u32 val); +int sandybridge_pcode_write_timeout (struct drm_i915_private *dev_priv,u32 mbox, +u32 val,int timeout_us); +#define sandybridge_pcode_write (dev_priv, mbox, val) \ + sandybridge_pcode_write_timeout(dev_priv, mbox, val, 500) +int skl_pcode_request (struct drm_i915_private *dev_priv,u32 mbox,u32 request,u32 reply_mask,u32 reply,int timeout_base_ms);
drivers/gpu/drm/i915/intel_display.c +5 -4
@@ -6012,8 +6012,8 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv, int cdclk)/* Inform power controller of upcoming frequency change */ mutex_lock (&dev_priv->rps.hw_lock); - ret =sandybridge_pcode_write (dev_priv,HSW_PCODE_DE_WRITE_FREQ_REQ , -0x80000000 ); + ret =sandybridge_pcode_write_timeout (dev_priv,HSW_PCODE_DE_WRITE_FREQ_REQ , +0x80000000 ,2000 );mutex_unlock (&dev_priv->rps.hw_lock);if (ret) {
@@ -6044,8 +6044,9 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv, int cdclk)I915_WRITE (CDCLK_CTL , val);mutex_lock (&dev_priv->rps.hw_lock); - ret =sandybridge_pcode_write (dev_priv,HSW_PCODE_DE_WRITE_FREQ_REQ , -DIV_ROUND_UP (cdclk,25000 )); + ret =sandybridge_pcode_write_timeout (dev_priv, +HSW_PCODE_DE_WRITE_FREQ_REQ , +DIV_ROUND_UP (cdclk,25000 ),2000 );mutex_unlock (&dev_priv->rps.hw_lock);if (ret) {
drivers/gpu/drm/i915/intel_pm.c +3 -3
@@ -7913,8 +7913,8 @@ int sandybridge_pcode_read(struct drm_i915_private *dev_priv, u32 mbox, u32 *valreturn 0 ; } -int sandybridge_pcode_write (struct drm_i915_private *dev_priv, -u32 mbox,u32 val) +int sandybridge_pcode_write_timeout (struct drm_i915_private *dev_priv, +u32 mbox,u32 val,int timeout_us) {int status;
@@ -7935,7 +7935,7 @@ int sandybridge_pcode_write(struct drm_i915_private *dev_priv,if (intel_wait_for_register_fw (dev_priv,GEN6_PCODE_MAILBOX ,GEN6_PCODE_READY ,0 , -500 )) { + timeout_us)) {DRM_ERROR ("timeout waiting for pcode write (%d) to finish\n" , mbox);return -ETIMEDOUT ; }
drivers/gpu/drm/vc4/vc4_bo.c +2 -0
@@ -80,6 +80,7 @@ static void vc4_bo_destroy(struct vc4_bo *bo)struct vc4_dev *vc4 =to_vc4_dev (obj->dev);if (bo->validated_shader) { +kfree (bo->validated_shader->uniform_addr_offsets);kfree (bo->validated_shader->texture_samples);kfree (bo->validated_shader); bo->validated_shader =NULL ;
@@ -328,6 +329,7 @@ void vc4_free_object(struct drm_gem_object *gem_bo) }if (bo->validated_shader) { +kfree (bo->validated_shader->uniform_addr_offsets);kfree (bo->validated_shader->texture_samples);kfree (bo->validated_shader); bo->validated_shader =NULL ;
drivers/gpu/drm/vc4/vc4_validate_shaders.c +1 -0
@@ -874,6 +874,7 @@ vc4_validate_shader(struct drm_gem_cma_object *shader_obj) fail:kfree (validation_state.branch_targets);if (validated_shader) { +kfree (validated_shader->uniform_addr_offsets);kfree (validated_shader->texture_samples);kfree (validated_shader); }
drivers/i2c/busses/i2c-i801.c +28 -1
@@ -243,6 +243,7 @@ struct i801_priv {struct i2c_adapter adapter;unsigned long smba;unsigned char original_hstcfg; +unsigned char original_slvcmd;struct pci_dev *pci_dev;unsigned int features;
@@ -962,13 +963,24 @@ static int i801_enable_host_notify(struct i2c_adapter *adapter)if (!priv->host_notify)return -ENOMEM ; -outb_p (SMBSLVCMD_HST_NTFY_INTREN ,SMBSLVCMD (priv)); +if (!(SMBSLVCMD_HST_NTFY_INTREN & priv->original_slvcmd)) +outb_p (SMBSLVCMD_HST_NTFY_INTREN | priv->original_slvcmd, +SMBSLVCMD (priv)); +/* clear Host Notify bit to allow a new notification */ outb_p (SMBSLVSTS_HST_NTFY_STS ,SMBSLVSTS (priv));return 0 ; } +static void i801_disable_host_notify (struct i801_priv *priv) +{ +if (!(priv->features &FEATURE_HOST_NOTIFY )) +return ; + +outb_p (priv->original_slvcmd,SMBSLVCMD (priv)); +} +static const struct i2c_algorithm smbus_algorithm = { .smbus_xfer = i801_access, .functionality = i801_func,
@@ -1589,6 +1601,10 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)outb_p (inb_p (SMBAUXCTL (priv)) & ~(SMBAUXCTL_CRC |SMBAUXCTL_E32B ),SMBAUXCTL (priv)); +/* Remember original Host Notify setting */ +if (priv->features &FEATURE_HOST_NOTIFY ) + priv->original_slvcmd =inb_p (SMBSLVCMD (priv)); +/* Default timeout in interrupt mode: 200 ms */ priv->adapter.timeout =HZ /5 ;
@@ -1666,6 +1682,7 @@ static void i801_remove(struct pci_dev *dev)pm_runtime_forbid (&dev->dev);pm_runtime_get_noresume (&dev->dev); +i801_disable_host_notify (priv);i801_del_mux (priv);i2c_del_adapter (&priv->adapter);i801_acpi_remove (priv);
@@ -1679,6 +1696,15 @@ static void i801_remove(struct pci_dev *dev)*/ } +static void i801_shutdown (struct pci_dev *dev) +{ +struct i801_priv *priv =pci_get_drvdata (dev); + +/* Restore config registers to avoid hard hang on some systems */ +i801_disable_host_notify (priv); +pci_write_config_byte (dev,SMBHSTCFG , priv->original_hstcfg); +} +#ifdef CONFIG_PM static int i801_suspend (struct device *dev) {
@@ -1711,6 +1737,7 @@ static struct pci_driver i801_driver = { .id_table = i801_ids, .probe = i801_probe, .remove = i801_remove, + .shutdown = i801_shutdown, .driver = { .pm = &i801_pm_ops, },
drivers/infiniband/hw/mlx5/qp.c +2 -1
@@ -2848,7 +2848,8 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,* If we moved a kernel QP to RESET, clean up all old CQ * entries and reinitialize the QP. */ -if (new_state ==IB_QPS_RESET && !ibqp->uobject) { +if (new_state ==IB_QPS_RESET && + !ibqp->uobject && ibqp->qp_type !=IB_QPT_XRC_TGT ) {mlx5_ib_cq_clean (recv_cq, base->mqp.qpn, ibqp->srq ?to_msrq (ibqp->srq) :NULL );if (send_cq != recv_cq)
drivers/input/misc/drv260x.c +1 -1
@@ -521,7 +521,7 @@ static int drv260x_probe(struct i2c_client *client,if (!haptics)return -ENOMEM ; - haptics->rated_voltage =DRV260X_DEF_OD_CLAMP_VOLT ; + haptics->overdrive_voltage =DRV260X_DEF_OD_CLAMP_VOLT ; haptics->rated_voltage =DRV260X_DEF_RATED_VOLT ;if (pdata) {
drivers/media/usb/stkwebcam/stk-sensor.c +3 -3
@@ -228,7 +228,7 @@static int stk_sensor_outb (struct stk_camera *dev,u8 reg,u8 val) {int i =0 ; -int tmpval =0 ; +u8 tmpval =0 ;if (stk_camera_write_reg (dev,STK_IIC_TX_INDEX , reg))return 1 ;
@@ -253,7 +253,7 @@ static int stk_sensor_outb(struct stk_camera *dev, u8 reg, u8 val)static int stk_sensor_inb (struct stk_camera *dev,u8 reg,u8 *val) {int i =0 ; -int tmpval =0 ; +u8 tmpval =0 ;if (stk_camera_write_reg (dev,STK_IIC_RX_INDEX , reg))return 1 ;
@@ -274,7 +274,7 @@ static int stk_sensor_inb(struct stk_camera *dev, u8 reg, u8 *val)if (stk_camera_read_reg (dev,STK_IIC_RX_VALUE , &tmpval))return 1 ; - *val = (u8 ) tmpval; + *val = tmpval;return 0 ; }
drivers/media/usb/stkwebcam/stk-webcam.c +6 -5
@@ -144,7 +144,7 @@ int stk_camera_write_reg(struct stk_camera *dev, u16 index, u8 value)return 0 ; } -int stk_camera_read_reg (struct stk_camera *dev,u16 index,int *value) +int stk_camera_read_reg (struct stk_camera *dev,u16 index,u8 *value) {struct usb_device *udev = dev->udev;unsigned char *buf;
@@ -163,7 +163,7 @@ int stk_camera_read_reg(struct stk_camera *dev, u16 index, int *value)sizeof (u8), 500);if (ret >=0 ) -memcpy (value, buf,sizeof (u8)); + *value = *buf;kfree (buf);return ret;
@@ -171,9 +171,10 @@ int stk_camera_read_reg(struct stk_camera *dev, u16 index, int *value)static int stk_start_stream (struct stk_camera *dev) { -int value; +u8 value;int i, ret; -int value_116, value_117; +u8 value_116, value_117; +if (!is_present (dev))return -ENODEV ;
@@ -213,7 +214,7 @@ static int stk_start_stream(struct stk_camera *dev)static int stk_stop_stream (struct stk_camera *dev) { -int value; +u8 value;int i;if (is_present (dev)) {stk_camera_read_reg (dev,0x0100 , &value);
drivers/media/usb/stkwebcam/stk-webcam.h +1 -1
@@ -129,7 +129,7 @@ struct stk_camera {#define vdev_to_camera (d) container_of(d, struct stk_camera, vdev)int stk_camera_write_reg (struct stk_camera *,u16 ,u8 ); -int stk_camera_read_reg (struct stk_camera *,u16 ,int *); +int stk_camera_read_reg (struct stk_camera *,u16 ,u8 *);int stk_sensor_init (struct stk_camera *);int stk_sensor_configure (struct stk_camera *);
drivers/message/fusion/mptsas.c +1 -0
@@ -1994,6 +1994,7 @@ static struct scsi_host_template mptsas_driver_template = { .cmd_per_lun = 7, .use_clustering = ENABLE_CLUSTERING, .shost_attrs = mptscsih_host_attrs, + .no_write_same = 1, };static int mptsas_get_linkerrors (struct sas_phy *phy)
drivers/net/bonding/bond_main.c +1 -2
@@ -1654,8 +1654,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) }/* switch(bond_mode) */ #ifdef CONFIG_NET_POLL_CONTROLLER - slave_dev->npinfo = bond->dev->npinfo; -if (slave_dev->npinfo) { +if (bond->dev->npinfo) {if (slave_enable_netpoll (new_slave)) {netdev_info (bond_dev,"master_dev is using netpoll, but new slave device does not support netpoll\n" ); res = -EBUSY ;
drivers/net/ethernet/ti/cpsw.c +1 -1
@@ -124,7 +124,7 @@ do { \#define RX_PRIORITY_MAPPING 0x76543210#define TX_PRIORITY_MAPPING 0x33221100 -#define CPDMA_TX_PRIORITY_MAP 0x01234567 +#define CPDMA_TX_PRIORITY_MAP 0x76543210#define CPSW_VLAN_AWARE BIT(1)#define CPSW_ALE_VLAN_AWARE 1
drivers/net/ppp/pppoe.c +4 -0
@@ -620,6 +620,10 @@ static int pppoe_connect(struct socket *sock, struct sockaddr *uservaddr,lock_sock (sk); error = -EINVAL ; + +if (sockaddr_len !=sizeof (struct sockaddr_pppox )) + goto end; +if (sp->sa_protocol !=PX_PROTO_OE ) goto end;
drivers/net/team/team.c +31 -7
@@ -261,6 +261,17 @@ static void __team_option_inst_mark_removed_port(struct team *team, } } +static bool __team_option_inst_tmp_find (const struct list_head *opts, +const struct team_option_inst *needle) +{ +struct team_option_inst *opt_inst; + +list_for_each_entry (opt_inst, opts, tmp_list) +if (opt_inst == needle) +return true; +return false; +} +static int __team_options_register (struct team *team,const struct team_option *option,size_t option_count)
@@ -1067,14 +1078,11 @@ static void team_port_leave(struct team *team, struct team_port *port) }#ifdef CONFIG_NET_POLL_CONTROLLER -static int team_port_enable_netpoll (struct team *team,struct team_port *port) +static int __team_port_enable_netpoll (struct team_port *port) {struct netpoll *np;int err; -if (!team->dev->npinfo) -return 0 ; - np =kzalloc (sizeof (*np),GFP_KERNEL );if (!np)return -ENOMEM ;
@@ -1088,6 +1096,14 @@ static int team_port_enable_netpoll(struct team *team, struct team_port *port)return err; } +static int team_port_enable_netpoll (struct team_port *port) +{ +if (!port->team->dev->npinfo) +return 0 ; + +return __team_port_enable_netpoll (port); +} +static void team_port_disable_netpoll (struct team_port *port) {struct netpoll *np = port->np;
@@ -1102,7 +1118,7 @@ static void team_port_disable_netpoll(struct team_port *port) kfree(np); }#else -static int team_port_enable_netpoll (struct team *team,struct team_port *port) +static int team_port_enable_netpoll (struct team_port *port) {return 0 ; }
@@ -1210,7 +1226,7 @@ static int team_port_add(struct team *team, struct net_device *port_dev) goto err_vids_add; } - err =team_port_enable_netpoll (team, port); + err =team_port_enable_netpoll (port);if (err) {netdev_err (dev,"Failed to enable netpoll on device %s\n" , portname);
@@ -1908,7 +1924,7 @@ static int team_netpoll_setup(struct net_device *dev,mutex_lock (&team->lock);list_for_each_entry (port, &team->port_list, list) { - err =team_port_enable_netpoll (team, port); + err =__team_port_enable_netpoll (port);if (err) {__team_netpoll_cleanup (team);break ;
@@ -2569,6 +2585,14 @@ static int team_nl_cmd_options_set(struct sk_buff *skb, struct genl_info *info)if (err) goto team_put; opt_inst->changed = true; + +/* dumb/evil user-space can send us duplicate opt, +* keep only the last one +*/ +if (__team_option_inst_tmp_find (&opt_inst_list, + opt_inst)) +continue ; +list_add (&opt_inst->tmp_list, &opt_inst_list); }if (!opt_found) {
drivers/net/usb/cdc_ether.c +10 -0
@@ -530,6 +530,7 @@ static const struct driver_info wwan_info = {#define REALTEK_VENDOR_ID 0x0bda#define SAMSUNG_VENDOR_ID 0x04e8#define LENOVO_VENDOR_ID 0x17ef +#define LINKSYS_VENDOR_ID 0x13b1#define NVIDIA_VENDOR_ID 0x0955#define HP_VENDOR_ID 0x03f0
@@ -719,6 +720,15 @@ static const struct usb_device_id products[] = { .driver_info = 0, }, +#if IS_ENABLED (CONFIG_USB_RTL8152 ) +/* Linksys USB3GIGV1 Ethernet Adapter */ +{ +USB_DEVICE_AND_INTERFACE_INFO (LINKSYS_VENDOR_ID ,0x0041 ,USB_CLASS_COMM , + USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), + .driver_info =0 , +}, +#endif + /* Lenovo Thinkpad USB 3.0 Ethernet Adapters (based on Realtek RTL8153) */ { USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0x7205, USB_CLASS_COMM,
drivers/net/usb/r8152.c +2 -0
@@ -519,6 +519,7 @@ enum rtl8152_flags {#define VENDOR_ID_REALTEK 0x0bda#define VENDOR_ID_SAMSUNG 0x04e8#define VENDOR_ID_LENOVO 0x17ef +#define VENDOR_ID_LINKSYS 0x13b1#define VENDOR_ID_NVIDIA 0x0955#define MCU_TYPE_PLA 0x0100
@@ -4506,6 +4507,7 @@ static struct usb_device_id rtl8152_table[] = { {REALTEK_USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101)}, {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x7205)}, {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x304f)}, + {REALTEK_USB_DEVICE(VENDOR_ID_LINKSYS, 0x0041)}, {REALTEK_USB_DEVICE(VENDOR_ID_NVIDIA, 0x09ff)}, {} };
drivers/net/wireless/ath/ath10k/mac.c +2 -3
@@ -5819,9 +5819,8 @@ static void ath10k_sta_rc_update_wk(struct work_struct *wk) sta->addr, smps, err); } -if (changed &IEEE80211_RC_SUPP_RATES_CHANGED || - changed &IEEE80211_RC_NSS_CHANGED ) { -ath10k_dbg (ar,ATH10K_DBG_MAC ,"mac update sta %pM supp rates/nss\n" , +if (changed &IEEE80211_RC_SUPP_RATES_CHANGED ) { +ath10k_dbg (ar,ATH10K_DBG_MAC ,"mac update sta %pM supp rates\n" , sta->addr); err =ath10k_station_assoc (ar, arvif->vif, sta, true);
drivers/net/wireless/ath/ath9k/hw.c +4 -0
@@ -1603,6 +1603,10 @@ bool ath9k_hw_check_alive(struct ath_hw *ah)int count =50 ;u32 reg, last_val; +/* Check if chip failed to wake up */ +if (REG_READ (ah,AR_CFG ) ==0xdeadbeef ) +return false; +if (AR_SREV_9300 (ah))return !ath9k_hw_detect_mac_hang (ah);
drivers/net/wireless/mac80211_hwsim.c +5 -2
@@ -3346,8 +3346,11 @@ static void __net_exit hwsim_exit_net(struct net *net)continue ;list_del (&data->list); -INIT_WORK (&data->destroy_work, destroy_radio); -schedule_work (&data->destroy_work); +spin_unlock_bh (&hwsim_radio_lock); +mac80211_hwsim_del_radio (data,wiphy_name (data->hw->wiphy), +NULL ); +spin_lock_bh (&hwsim_radio_lock); + }spin_unlock_bh (&hwsim_radio_lock); }
drivers/of/base.c +1 -1
@@ -2109,7 +2109,7 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))continue ;/* Allocate an alias_prop with enough space for the stem */ - ap =dt_alloc (sizeof (*ap) + len +1 ,4 ); + ap = dt_alloc(sizeof(*ap) + len + 1, __alignof__(*ap));if (!ap)continue ;memset (ap,0 ,sizeof (*ap) + len +1 );
drivers/pci/pci.c +37 -15
64 lines not on this page · raw message
drivers/pinctrl/intel/pinctrl-intel.c +8 -15
@@ -368,18 +368,6 @@ static void __intel_gpio_set_direction(void __iomem *padcfg0, bool input)writel (value, padcfg0); } -static void intel_gpio_set_gpio_mode (void __iomem *padcfg0) -{ -u32 value; - -/* Put the pad into GPIO mode */ - value =readl (padcfg0) & ~PADCFG0_PMODE_MASK ; -/* Disable SCI/SMI/NMI generation */ - value &= ~(PADCFG0_GPIROUTIOXAPIC |PADCFG0_GPIROUTSCI ); - value &= ~(PADCFG0_GPIROUTSMI |PADCFG0_GPIROUTNMI ); -writel (value, padcfg0); -} -static int intel_gpio_request_enable (struct pinctrl_dev *pctldev,struct pinctrl_gpio_range *range,unsigned pin)
@@ -387,6 +375,7 @@ static int intel_gpio_request_enable(struct pinctrl_dev *pctldev,struct intel_pinctrl *pctrl =pinctrl_dev_get_drvdata (pctldev);void __iomem *padcfg0;unsigned long flags; +u32 value;raw_spin_lock_irqsave (&pctrl->lock, flags);
@@ -396,7 +385,13 @@ static int intel_gpio_request_enable(struct pinctrl_dev *pctldev, } padcfg0 =intel_get_padcfg (pctrl, pin,PADCFG0 ); -intel_gpio_set_gpio_mode (padcfg0); +/* Put the pad into GPIO mode */ + value =readl (padcfg0) & ~PADCFG0_PMODE_MASK ; +/* Disable SCI/SMI/NMI generation */ + value &= ~(PADCFG0_GPIROUTIOXAPIC |PADCFG0_GPIROUTSCI ); + value &= ~(PADCFG0_GPIROUTSMI |PADCFG0_GPIROUTNMI ); +writel (value, padcfg0); +/* Disable TX buffer and enable RX (this will be input) */ __intel_gpio_set_direction (padcfg0, true);
@@ -775,8 +770,6 @@ static int intel_gpio_irq_type(struct irq_data *d, unsigned type)raw_spin_lock_irqsave (&pctrl->lock, flags); -intel_gpio_set_gpio_mode (reg); - value =readl (reg); value &= ~(PADCFG0_RXEVCFG_MASK |PADCFG0_RXINV );
drivers/power/supply/bq2415x_charger.c +5 -0
@@ -1569,6 +1569,11 @@ static int bq2415x_probe(struct i2c_client *client, acpi_id =acpi_match_device (client->dev.driver->acpi_match_table, &client->dev); +if (!acpi_id) { +dev_err (&client->dev,"failed to match device name\n" ); + ret = -ENODEV ; + goto error_1; + } name =kasprintf (GFP_KERNEL ,"%s-%d" , acpi_id->id, num); }if (!name) {
drivers/s390/block/dasd_alias.c +11 -2
@@ -591,13 +591,22 @@ static int _schedule_lcu_update(struct alias_lcu *lcu,int dasd_alias_add_device (struct dasd_device *device) {struct dasd_eckd_private *private = device->private; -struct alias_lcu *lcu; +__u8 uaddr = private->uid.real_unit_addr; +struct alias_lcu *lcu = private->lcu;unsigned long flags;int rc; - lcu = private->lcu; rc =0 ;spin_lock_irqsave (&lcu->lock, flags); +/* +* Check if device and lcu type differ. If so, the uac data may be +* outdated and needs to be updated. +*/ +if (private->uid.type != lcu->uac->unit[uaddr].ua_type) { + lcu->flags |=UPDATE_PENDING ; +DBF_DEV_EVENT (DBF_WARNING , device,"%s" , +"uid type mismatch - trigger rescan" ); + }if (!(lcu->flags &UPDATE_PENDING )) { rc =_add_device_to_lcu (lcu, device, device);if (rc)
drivers/s390/char/Makefile +2 -0
@@ -2,6 +2,8 @@ # S/390 character devices # +CFLAGS_REMOVE_sclp_early_core.o += $(CC_FLAGS_EXPOLINE) + obj-y += ctrlchar.o keyboard.o defkeymap.o sclp.o sclp_rw.o sclp_quiesce.o \ sclp_cmd.o sclp_config.o sclp_cpi_sys.o sclp_ocf.o sclp_ctl.o \ sclp_early.o
drivers/s390/cio/chsc.c +11 -3
@@ -451,6 +451,7 @@ static void chsc_process_sei_link_incident(struct chsc_sei_nt0_area *sei_area)static void chsc_process_sei_res_acc (struct chsc_sei_nt0_area *sei_area) { +struct channel_path *chp;struct chp_link link;struct chp_id chpid;int status;
@@ -463,10 +464,17 @@ static void chsc_process_sei_res_acc(struct chsc_sei_nt0_area *sei_area) chpid.id = sei_area->rsid;/* allocate a new channel path structure, if needed */ status =chp_get_status (chpid); -if (status <0 ) -chp_new (chpid); -else if (!status) +if (!status)return ; + +if (status <0 ) { +chp_new (chpid); + }else { + chp =chpid_to_chp (chpid); +mutex_lock (&chp->lock); +chp_update_desc (chp); +mutex_unlock (&chp->lock); + }memset (&link,0 ,sizeof (struct chp_link )); link.chpid = chpid;if ((sei_area->vf &0xc0 ) !=0 ) {
drivers/usb/musb/musb_core.c +6 -2
@@ -1774,6 +1774,7 @@ musb_vbus_show(struct device *dev, struct device_attribute *attr, char *buf)int vbus;u8 devctl; +pm_runtime_get_sync (dev);spin_lock_irqsave (&musb->lock, flags); val = musb->a_wait_bcon; vbus =musb_platform_get_vbus_status (musb);
@@ -1787,6 +1788,7 @@ musb_vbus_show(struct device *dev, struct device_attribute *attr, char *buf) vbus =0 ; }spin_unlock_irqrestore (&musb->lock, flags); +pm_runtime_put_sync (dev);return sprintf (buf,"Vbus %s, timeout %lu msec\n" , vbus ?"on" :"off" , val);
@@ -2483,10 +2485,11 @@ static int musb_remove(struct platform_device *pdev)musb_generic_disable (musb);spin_unlock_irqrestore (&musb->lock, flags);musb_writeb (musb->mregs,MUSB_DEVCTL ,0 ); +musb_platform_exit (musb); +pm_runtime_dont_use_autosuspend (musb->controller);pm_runtime_put_sync (musb->controller);pm_runtime_disable (musb->controller); -musb_platform_exit (musb); musb_phy_callback =NULL ;if (musb->dma_controller)musb_dma_controller_destroy (musb->dma_controller);
@@ -2710,7 +2713,8 @@ static int musb_resume(struct device *dev)if ((devctl & mask) != (musb->context.devctl & mask)) musb->port1_status =0 ; -musb_start (musb); +musb_enable_interrupts (musb); +musb_platform_enable (musb);spin_lock_irqsave (&musb->lock, flags); error =musb_run_resume_work (musb);
fs/cifs/dir.c +5 -4
@@ -673,6 +673,9 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, umode_t mode, goto mknod_out; } +if (!S_ISCHR (mode) && !S_ISBLK (mode)) + goto mknod_out; +if (!(cifs_sb->mnt_cifs_flags &CIFS_MOUNT_UNX_EMUL )) goto mknod_out;
@@ -681,10 +684,8 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, umode_t mode, buf =kmalloc (sizeof (FILE_ALL_INFO ),GFP_KERNEL );if (buf ==NULL ) { -kfree (full_path); rc = -ENOMEM ; -free_xid (xid); -return rc; + goto mknod_out; }if (backup_cred (cifs_sb))
@@ -731,7 +732,7 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, umode_t mode, pdev->minor =cpu_to_le64 (MINOR (device_number)); rc = tcon->ses->server->ops->sync_write (xid, &fid, &io_parms, &bytes_written, iov,1 ); - }/* else if (S_ISFIFO) */ + } tcon->ses->server->ops->close (xid, tcon, &fid);d_drop (direntry);
fs/jbd2/journal.c +1 -1
@@ -276,11 +276,11 @@ static int kjournald2(void *arg) goto loop; end_loop: -write_unlock (&journal->j_state_lock);del_timer_sync (&journal->j_commit_timer); journal->j_task =NULL ;wake_up (&journal->j_wait_done_commit);jbd_debug (1 ,"Journal thread exiting.\n" ); +write_unlock (&journal->j_state_lock);return 0 ; }
include/linux/if_vlan.h +5 -2
@@ -600,7 +600,7 @@ static inline bool skb_vlan_tagged(const struct sk_buff *skb)* Returns true if the skb is tagged with multiple vlan headers, regardless * of whether it is hardware accelerated or not. */ -static inline bool skb_vlan_tagged_multi (const struct sk_buff *skb) +static inline bool skb_vlan_tagged_multi (struct sk_buff *skb) {__be16 protocol = skb->protocol;
@@ -610,6 +610,9 @@ static inline bool skb_vlan_tagged_multi(const struct sk_buff *skb)if (likely (!eth_type_vlan (protocol)))return false; +if (unlikely (!pskb_may_pull (skb,VLAN_ETH_HLEN ))) +return false; + veh = (struct vlan_ethhdr *)skb->data; protocol = veh->h_vlan_encapsulated_proto; }
@@ -627,7 +630,7 @@ static inline bool skb_vlan_tagged_multi(const struct sk_buff *skb)* * Returns features without unsafe ones if the skb has multiple tags. */ -static inline netdev_features_t vlan_features_check (const struct sk_buff *skb, +static inline netdev_features_t vlan_features_check (struct sk_buff *skb,netdev_features_t features) {if (skb_vlan_tagged_multi (skb)) {
include/net/llc_conn.h +1 -0
@@ -97,6 +97,7 @@ static __inline__ char llc_backlog_type(struct sk_buff *skb)struct sock *llc_sk_alloc (struct net *net,int family,gfp_t priority,struct proto *prot,int kern); +void llc_sk_stop_all_timers (struct sock *sk,bool sync);void llc_sk_free (struct sock *sk);void llc_sk_reset (struct sock *sk);
include/uapi/linux/kvm.h +1 -0
@@ -870,6 +870,7 @@ struct kvm_ppc_smmu_info {#define KVM_CAP_S390_USER_INSTR0 130#define KVM_CAP_MSI_DEVID 131#define KVM_CAP_PPC_HTM 132 +#define KVM_CAP_S390_BPB 152#ifdef KVM_CAP_IRQ_ROUTING
kernel/events/callchain.c +12 -9
@@ -117,19 +117,22 @@ int get_callchain_buffers(int event_max_stack) goto exit; } +/* +* If requesting per event more than the global cap, +* return a different error to help userspace figure +* this out. +* +* And also do it here so that we have &callchain_mutex held. +*/ +if (event_max_stack > sysctl_perf_event_max_stack) { + err = -EOVERFLOW ; + goto exit; + } +if (count >1 ) {/* If the allocation failed, give up */ if (!callchain_cpus_entries) err = -ENOMEM ; -/* -* If requesting per event more than the global cap, -* return a different error to help userspace figure -* this out. -* -* And also do it here so that we have &callchain_mutex held. -*/ -if (event_max_stack > sysctl_perf_event_max_stack) - err = -EOVERFLOW ; goto exit; }
kernel/events/core.c +2 -2
@@ -9456,9 +9456,9 @@ static int perf_copy_attr(struct perf_event_attr __user *uattr,* __u16 sample size limit. */ if (attr->sample_stack_user >=USHRT_MAX ) - ret = -EINVAL ; +return -EINVAL ;else if (!IS_ALIGNED (attr->sample_stack_user,sizeof (u64))) - ret = -EINVAL ; +return -EINVAL ; }if (attr->sample_type &PERF_SAMPLE_REGS_INTR )
net/core/dev.c +1 -1
@@ -2871,7 +2871,7 @@ netdev_features_t passthru_features_check(struct sk_buff *skb, }EXPORT_SYMBOL (passthru_features_check); -static netdev_features_t dflt_features_check (const struct sk_buff *skb, +static netdev_features_t dflt_features_check (struct sk_buff *skb,struct net_device *dev,netdev_features_t features) {
net/core/neighbour.c +26 -14
@@ -54,7 +54,8 @@ do { \static void neigh_timer_handler (unsigned long arg);static void __neigh_notify (struct neighbour *n,int type,int flags);static void neigh_update_notify (struct neighbour *neigh); -static int pneigh_ifdown (struct neigh_table *tbl,struct net_device *dev); +static int pneigh_ifdown_and_unlock (struct neigh_table *tbl, +struct net_device *dev);#ifdef CONFIG_PROC_FS static const struct file_operations neigh_stat_seq_fops;
@@ -254,8 +255,7 @@ int neigh_ifdown(struct neigh_table *tbl, struct net_device *dev) {write_lock_bh (&tbl->lock);neigh_flush_dev (tbl, dev); -pneigh_ifdown (tbl, dev); -write_unlock_bh (&tbl->lock); +pneigh_ifdown_and_unlock (tbl, dev);del_timer_sync (&tbl->proxy_timer);pneigh_queue_purge (&tbl->proxy_queue);
@@ -645,9 +645,10 @@ int pneigh_delete(struct neigh_table *tbl, struct net *net, const void *pkey,return -ENOENT ; } -static int pneigh_ifdown (struct neigh_table *tbl,struct net_device *dev) +static int pneigh_ifdown_and_unlock (struct neigh_table *tbl, +struct net_device *dev) { -struct pneigh_entry *n, **np; +struct pneigh_entry *n, **np, *freelist =NULL ;u32 h;for (h =0 ; h <=PNEIGH_HASHMASK ; h++) {
@@ -655,16 +656,23 @@ static int pneigh_ifdown(struct neigh_table *tbl, struct net_device *dev)while ((n = *np) !=NULL ) {if (!dev || n->dev == dev) { *np = n->next; -if (tbl->pdestructor) - tbl->pdestructor (n); -if (n->dev) -dev_put (n->dev); -kfree (n); + n->next = freelist; + freelist = n;continue ; } np = &n->next; } } +write_unlock_bh (&tbl->lock); +while ((n = freelist)) { + freelist = n->next; + n->next =NULL ; +if (tbl->pdestructor) + tbl->pdestructor (n); +if (n->dev) +dev_put (n->dev); +kfree (n); + }return -ENOENT ; }
@@ -2279,12 +2287,16 @@ static int neigh_dump_table(struct neigh_table *tbl, struct sk_buff *skb, err =nlmsg_parse (nlh,sizeof (struct ndmsg ), tb,NDA_MAX ,NULL );if (!err) { -if (tb[NDA_IFINDEX ]) +if (tb[NDA_IFINDEX ]) { +if (nla_len (tb[NDA_IFINDEX ]) !=sizeof (u32)) +return -EINVAL ; filter_idx =nla_get_u32 (tb[NDA_IFINDEX ]); - -if (tb[NDA_MASTER ]) + } +if (tb[NDA_MASTER ]) { +if (nla_len (tb[NDA_MASTER ]) !=sizeof (u32)) +return -EINVAL ; filter_master_idx =nla_get_u32 (tb[NDA_MASTER ]); - + }if (filter_idx || filter_master_idx) flags |=NLM_F_DUMP_FILTERED ; }
net/dns_resolver/dns_key.c +6 -7
@@ -25,6 +25,7 @@#include <linux/moduleparam.h> #include <linux/slab.h> #include <linux/string.h> +#include <linux/ratelimit.h> #include <linux/kernel.h> #include <linux/keyctl.h> #include <linux/err.h>
@@ -91,9 +92,9 @@ dns_resolver_preparse(struct key_preparsed_payload *prep) next_opt =memchr (opt,'#' , end - opt) ?: end; opt_len = next_opt - opt; -if (!opt_len) { -printk (KERN_WARNING -"Empty option to dns_resolver key\n" ); +if (opt_len <=0 || opt_len >128 ) { +pr_warn_ratelimited ("Invalid option length (%d) for dns_resolver key\n" , + opt_len);return -EINVAL ; }
@@ -127,10 +128,8 @@ dns_resolver_preparse(struct key_preparsed_payload *prep) } bad_option_value: -printk (KERN_WARNING -"Option '%*.*s' to dns_resolver key:" -" bad/missing value\n" , - opt_nlen, opt_nlen, opt); +pr_warn_ratelimited ("Option '%*.*s' to dns_resolver key: bad/missing value\n" , + opt_nlen, opt_nlen, opt);return -EINVAL ; }while (opt = next_opt +1 , opt < end); }
net/ipv4/tcp.c +4 -2
@@ -2662,8 +2662,10 @@ static int do_tcp_setsockopt(struct sock *sk, int level,#ifdef CONFIG_TCP_MD5SIG case TCP_MD5SIG : -/* Read the IP->Key mappings from userspace */ - err = tp->af_specific->md5_parse (sk, optval, optlen); +if ((1 << sk->sk_state) & (TCPF_CLOSE |TCPF_LISTEN )) + err = tp->af_specific->md5_parse (sk, optval, optlen); +else + err = -EINVAL ;break ;#endif case TCP_USER_TIMEOUT :
net/ipv4/tcp_input.c +2 -5
@@ -3943,11 +3943,8 @@ const u8 *tcp_parse_md5sig_option(const struct tcphdr *th)int length = (th->doff <<2 ) -sizeof (*th);const u8 *ptr = (const u8 *)(th +1 ); -/* If the TCP option is too short, we can short cut */ -if (length <TCPOLEN_MD5SIG ) -return NULL ; - -while (length >0 ) { +/* If not enough data remaining, we can short cut */ +while (length >=TCPOLEN_MD5SIG ) {int opcode = *ptr++;int opsize;
net/ipv6/route.c +2 -0
@@ -2811,6 +2811,7 @@ void rt6_mtu_change(struct net_device *dev, unsigned int mtu)static const struct nla_policy rtm_ipv6_policy[RTA_MAX +1 ] = { [RTA_GATEWAY ] = { .len =sizeof (struct in6_addr ) }, + [RTA_PREFSRC ] = { .len =sizeof (struct in6_addr ) }, [RTA_OIF ] = { .type =NLA_U32 }, [RTA_IIF ] = { .type =NLA_U32 }, [RTA_PRIORITY ] = { .type =NLA_U32 },
@@ -2820,6 +2821,7 @@ static const struct nla_policy rtm_ipv6_policy[RTA_MAX+1] = { [RTA_ENCAP_TYPE] = { .type = NLA_U16 }, [RTA_ENCAP] = { .type = NLA_NESTED }, [RTA_EXPIRES] = { .type = NLA_U32 }, + [RTA_TABLE] = { .type = NLA_U32 }, }; static int rtm_to_fib6_config(struct sk_buff *skb, struct nlmsghdr *nlh,
net/l2tp/l2tp_ppp.c +7 -0
@@ -590,6 +590,13 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,lock_sock (sk); error = -EINVAL ; + +if (sockaddr_len !=sizeof (struct sockaddr_pppol2tp ) && + sockaddr_len !=sizeof (struct sockaddr_pppol2tpv3 ) && + sockaddr_len !=sizeof (struct sockaddr_pppol2tpin6 ) && + sockaddr_len !=sizeof (struct sockaddr_pppol2tpv3in6 )) + goto end; +if (sp->sa_protocol !=PX_PROTO_OL2TP ) goto end;
net/llc/af_llc.c +12 -2
@@ -197,9 +197,19 @@ static int llc_ui_release(struct socket *sock) llc->laddr.lsap, llc->daddr.lsap);if (!llc_send_disc (sk))llc_ui_wait_for_disc (sk, sk->sk_rcvtimeo); -if (!sock_flag (sk,SOCK_ZAPPED )) +if (!sock_flag (sk,SOCK_ZAPPED )) { +struct llc_sap *sap = llc->sap; + +/* Hold this for release_sock(), so that llc_backlog_rcv() +* could still use it. +*/ +llc_sap_hold (sap);llc_sap_remove_socket (llc->sap, sk); -release_sock (sk); +release_sock (sk); +llc_sap_put (sap); + }else { +release_sock (sk); + }if (llc->dev)dev_put (llc->dev);sock_put (sk);
net/llc/llc_c_ac.c +1 -8
@@ -1096,14 +1096,7 @@ int llc_conn_ac_inc_tx_win_size(struct sock *sk, struct sk_buff *skb)int llc_conn_ac_stop_all_timers (struct sock *sk,struct sk_buff *skb) { -struct llc_sock *llc =llc_sk (sk); - -del_timer (&llc->pf_cycle_timer.timer); -del_timer (&llc->ack_timer.timer); -del_timer (&llc->rej_sent_timer.timer); -del_timer (&llc->busy_state_timer.timer); - llc->ack_must_be_send =0 ; - llc->ack_pf =0 ; +llc_sk_stop_all_timers (sk, false);return 0 ; }
net/llc/llc_conn.c +21 -1
@@ -951,6 +951,26 @@ struct sock *llc_sk_alloc(struct net *net, int family, gfp_t priority, struct prreturn sk; } +void llc_sk_stop_all_timers (struct sock *sk,bool sync) +{ +struct llc_sock *llc =llc_sk (sk); + +if (sync) { +del_timer_sync (&llc->pf_cycle_timer.timer); +del_timer_sync (&llc->ack_timer.timer); +del_timer_sync (&llc->rej_sent_timer.timer); +del_timer_sync (&llc->busy_state_timer.timer); + }else { +del_timer (&llc->pf_cycle_timer.timer); +del_timer (&llc->ack_timer.timer); +del_timer (&llc->rej_sent_timer.timer); +del_timer (&llc->busy_state_timer.timer); + } + + llc->ack_must_be_send =0 ; + llc->ack_pf =0 ; +} +/** * llc_sk_free - Frees a LLC socket * @sk - socket to free
@@ -963,7 +983,7 @@ void llc_sk_free(struct sock *sk) llc->state =LLC_CONN_OUT_OF_SVC ;/* Stop all (possibly) running timers */ -llc_conn_ac_stop_all_timers (sk,NULL ); +llc_sk_stop_all_timers (sk, true);#ifdef DEBUG_LLC_CONN_ALLOC printk(KERN_INFO "%s: unackq=%d, txq=%d\n", __func__, skb_queue_len(&llc->pdu_unack_q),
net/packet/af_packet.c +58 -24
186 lines not on this page · raw message
net/packet/internal.h +5 -5
@@ -109,10 +109,12 @@ struct packet_sock {int copy_thresh;spinlock_t bind_lock;struct mutex pg_vec_lock; - unsigned int running:1, /* prot_hook is attached*/ - auxdata:1, +unsigned int running;/* bind_lock must be held */ + unsigned int auxdata:1, /* writer must hold sock lock */ origdev:1, - has_vnet_hdr:1; + has_vnet_hdr:1, + tp_loss:1, + tp_tx_has_off:1;int pressure;int ifindex;/* bound device */ __be16 num;
@@ -122,8 +124,6 @@ struct packet_sock {enum tpacket_versions tp_version;unsigned int tp_hdrlen;unsigned int tp_reserve; - unsigned int tp_loss:1; - unsigned int tp_tx_has_off:1;unsigned int tp_tstamp;struct net_device __rcu *cached_dev;int (*xmit)(struct sk_buff *skb);
net/sched/act_ife.c +1 -1
@@ -634,7 +634,7 @@ int find_decode_metaid(struct sk_buff *skb, struct tcf_ife_info *ife, } } -return 0 ; +return -ENOENT ; }struct ifeheadr {
net/sctp/ipv6.c +30 -30
75 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.