Linux 4.14.16
Greg KH
maintainerI'm announcing the release of the 4.14.16 kernel.
All users of the 4.14 kernel series must upgrade.
The updated 4.14.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.14.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/arm/net/bpf_jit_32.c | 225 ++++++++-------- arch/arm64/net/bpf_jit_comp.c | 20 - arch/s390/kvm/kvm-s390.c | 18 - arch/x86/events/amd/power.c | 2 arch/x86/kernel/cpu/microcode/core.c | 2 arch/x86/kernel/cpu/microcode/intel.c | 20 + arch/x86/mm/tlb.c | 34 ++ drivers/cpufreq/cpufreq_governor.c | 19 + drivers/gpu/drm/vc4/vc4_gem.c | 12 drivers/infiniband/hw/mlx5/main.c | 9 drivers/input/joystick/xpad.c | 19 + drivers/input/mouse/trackpoint.c | 245 +++++++++++------- drivers/input/mouse/trackpoint.h | 34 +- drivers/net/ethernet/emulex/benet/be_main.c | 9 drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c | 6 drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c | 27 + drivers/net/ethernet/mellanox/mlx5/core/main.c | 3 drivers/net/ethernet/mellanox/mlx5/core/vport.c | 22 + drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 10 drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 2 drivers/net/ethernet/realtek/r8169.c | 9 drivers/net/ppp/ppp_generic.c | 5 drivers/net/ppp/pppoe.c | 11 drivers/net/tun.c | 15 - drivers/net/usb/lan78xx.c | 1 drivers/net/vmxnet3/vmxnet3_drv.c | 2 drivers/net/vrf.c | 5 fs/btrfs/delayed-inode.c | 26 - fs/nfsd/auth.c | 6 fs/orangefs/devorangefs-req.c | 3 fs/orangefs/file.c | 7 fs/orangefs/orangefs-kernel.h | 11 fs/orangefs/waitqueue.c | 4 include/linux/bpf.h | 21 + include/linux/mlx5/driver.h | 19 + include/linux/mlx5/mlx5_ifc.h | 5 include/linux/vermagic.h | 8 include/net/arp.h | 3 include/net/ipv6.h | 1 include/net/net_namespace.h | 10 include/net/tls.h | 2 init/Kconfig | 7 kernel/bpf/core.c | 23 + kernel/bpf/verifier.c | 37 ++ kernel/time/hrtimer.c | 3 lib/test_bpf.c | 11 mm/page_alloc.c | 6 net/core/dev.c | 19 + net/core/filter.c | 10 net/core/flow_dissector.c | 3 net/core/neighbour.c | 4 net/core/sysctl_net_core.c | 6 net/dccp/ccids/ccid2.c | 3 net/ipv4/arp.c | 7 net/ipv4/esp4_offload.c | 3 net/ipv4/igmp.c | 2 net/ipv4/route.c | 1 net/ipv4/tcp.c | 3 net/ipv4/tcp_offload.c | 3 net/ipv4/tcp_timer.c | 15 + net/ipv4/udp_offload.c | 3 net/ipv6/esp6_offload.c | 3 net/ipv6/ip6_gre.c | 14 - net/ipv6/ip6_output.c | 9 net/ipv6/ipv6_sockglue.c | 2 net/ipv6/tcpv6_offload.c | 3 net/ipv6/udp_offload.c | 3 net/netfilter/nfnetlink_cthelper.c | 10 net/netfilter/xt_osf.c | 7 net/netlink/af_netlink.c | 3 net/sctp/offload.c | 3 net/sctp/socket.c | 40 +- net/socket.c | 9 net/tipc/node.c | 26 + net/tls/tls_main.c | 17 + net/tls/tls_sw.c | 16 - net/xfrm/xfrm_policy.c | 8 tools/testing/selftests/bpf/test_verifier.c | 29 +- 79 files changed, 845 insertions(+), 440 deletions(-)
Aaron Ma (1):
Input: trackpoint - force 3 buttons if 0 button is reported
Alexei Starovoitov (2):
bpf: introduce BPF_JIT_ALWAYS_ON config
bpf: fix 32-bit divide by zero
Alexey Kodanev (2):
dccp: don't restart ccid2_hc_tx_rto_expire() if sk in closed state
ip6_gre: init dev->mtu and dev->hard_header_len correctly
Andy Lutomirski (1):
x86/mm/64: Fix vmapped stack syncing on very-large-memory 4-level systems
Ben Hutchings (2):
ipv6: Fix getsockopt() for sockets with default IPV6_AUTOFLOWLABEL
nfsd: auth: Fix gid sorting when rootsquash enabled
Boris Brezillon (1):
drm/vc4: Fix NULL pointer dereference in vc4_save_hang_state()
Borislav Petkov (1):
x86/microcode: Fix again accessing initrd after having been freed
Christian Borntraeger (1):
KVM: s390: add proper locking for CMMA migration bitmap
Cong Wang (2):
tipc: fix a memory leak in tipc_nl_node_get_link()
tun: fix a memory leak for tfile->tx_array
Dan Streetman (1):
net: tcp: close sock if net namespace is exiting
Daniel Borkmann (3):
bpf: avoid false sharing of map refcount with max_entries
bpf: reject stores into ctx via st and xadd
bpf, arm64: fix stack_depth tracking in combination with tail calls
David Ahern (2):
net: vrf: Add support for sends to local broadcast address
netlink: extack needs to be reset each time through loop
Dmitry Torokhov (1):
Input: trackpoint - only expose supported controls for Elan, ALPS and NXP
Eran Ben Elisha (1):
{net,ib}/mlx5: Don't disable local loopback multicast traffic when needed
Eric Dumazet (4):
ipv6: ip6_make_skb() needs to clear cork.base.dst
net: qdisc_pkt_len_init() should be more robust
flow_dissector: properly cap thoff field
bpf: fix divides by zero
Felix Fietkau (1):
net: igmp: fix source address check for IGMPv3 reports
Francois Romieu (1):
r8169: fix memory corruption on retrieval of hardware statistics.
Greg Kroah-Hartman (2):
Revert "module: Add retpoline tag to VERMAGIC" Linux 4.14.16
Guillaume Nault (2):
pppoe: take ->needed_headroom of lower device into account on xmit
ppp: unlock all_ppp_mutex before registering device
Ilya Lesokhin (1):
net/tls: Only attach to sockets in ESTABLISHED state
Ivan Vecera (1):
be2net: restore properly promisc mode after queues reconfiguration
Jakub Kicinski (1):
nfp: use the correct index for link speed table
Jia Zhang (1):
x86/microcode/intel: Extend BDW late-loading further with LLC size check
Jim Westfall (2):
net: Allow neigh contructor functions ability to modify the primary_key
ipv4: Make neigh lookup keys for loopback/point-to-point devices be INADDR_ANY
Josef Bacik (1):
Btrfs: fix stale entries in readdir
Kevin Cernekee (2):
netfilter: nfnetlink_cthelper: Add missing permission checks
netfilter: xt_osf: Add missing permission checks
Lorenzo Colitti (1):
net: ipv4: Make "ip route get" match iif lo rules again.
Mark Furneaux (1):
Input: xpad - add support for PDP Xbox One controllers
Martin Brandenburg (3):
orangefs: use list_for_each_entry_safe in purge_waiting_ops
orangefs: initialize op on loop restart in orangefs_devreq_read
orangefs: fix deadlock; do not write i_size in read_iter
Mike Maloney (1):
ipv6: fix udpv6 sendmsg crash caused by too small MTU
Neil Horman (1):
vmxnet3: repair memory leak
Rafael J. Wysocki (1):
cpufreq: governor: Ensure sufficiently large sampling intervals
Russell King (8):
ARM: net: bpf: avoid 'bx' instruction on non-Thumb capable CPUs
ARM: net: bpf: fix tail call jumps
ARM: net: bpf: fix stack alignment
ARM: net: bpf: move stack documentation
ARM: net: bpf: correct stack layout documentation
ARM: net: bpf: fix register saving
ARM: net: bpf: fix LDX instructions
ARM: net: bpf: clarify tail_call index
Sabrina Dubroca (3):
tls: fix sw_ctx leak
tls: return -EBUSY if crypto_info is already set
tls: reset crypto_info when do_tls_setsockopt_tx fails
Saeed Mahameed (1):
net/mlx5: Fix get vector affinity helper function
Steffen Klassert (1):
xfrm: Fix a race in the xdst pcpu cache.
Talat Batheesh (1):
net/mlx5e: Fix fixpoint divide exception in mlx5e_am_stats_compare
Thomas Gleixner (1):
hrtimer: Reset hrtimer cpu base proper on CPU hotplug
Vlastimil Babka (1):
mm, page_alloc: fix potential false positive in __zone_watermark_ok
Willem de Bruijn (1):
gso: validate gso_type in GSO handlers
Xiao Liang (1):
perf/x86/amd/power: Do not load AMD power module on !AMD platforms
Xin Long (4):
sctp: do not allow the v4 socket to bind a v4mapped v6 address
sctp: return error if the asoc has been peeled off in sctp_wait_for_sndbuf
sctp: reinit stream if stream outcnt has been change by sinit in sendmsg
netlink: reset extack earlier in netlink_rcv_skb
Yuiko Oshino (1):
lan78xx: Fix failure in USB Full Speed
Yuval Mintz (1):
mlxsw: spectrum_router: Don't log an error on missing neighbor
[email protected] (1):
net/tls: Fix inverted error codes to avoid endless loop
Greg KH
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 14 -SUBLEVEL = 15 +SUBLEVEL = 16 EXTRAVERSION = NAME = Petit Gorille
arch/arm/net/bpf_jit_32.c +111 -114
387 lines not on this page · raw message
arch/arm64/net/bpf_jit_comp.c +11 -9
@@ -148,7 +148,8 @@ static inline int epilogue_offset(const struct jit_ctx *ctx)/* Stack must be multiples of 16B */ #define STACK_ALIGN (sz) (((sz) + 15) & ~15) -#define PROLOGUE_OFFSET 8 +/* Tail call offset to jump into */ +#define PROLOGUE_OFFSET 7static int build_prologue (struct jit_ctx *ctx) {
@@ -200,19 +201,19 @@ static int build_prologue(struct jit_ctx *ctx)/* Initialize tail_call_cnt */ emit (A64_MOVZ (1 , tcc,0 ,0 ), ctx); -/* 4 byte extra for skb_copy_bits buffer */ - ctx->stack_size = prog->aux->stack_depth +4 ; - ctx->stack_size =STACK_ALIGN (ctx->stack_size); - -/* Set up function call stack */ -emit (A64_SUB_I (1 ,A64_SP ,A64_SP , ctx->stack_size), ctx); - cur_offset = ctx->idx - idx0;if (cur_offset !=PROLOGUE_OFFSET ) {pr_err_once ("PROLOGUE_OFFSET = %d, expected %d!\n" , cur_offset,PROLOGUE_OFFSET );return -1 ; } + +/* 4 byte extra for skb_copy_bits buffer */ + ctx->stack_size = prog->aux->stack_depth +4 ; + ctx->stack_size =STACK_ALIGN (ctx->stack_size); + +/* Set up function call stack */ +emit (A64_SUB_I (1 ,A64_SP ,A64_SP , ctx->stack_size), ctx);return 0 ; }
@@ -260,11 +261,12 @@ static int emit_bpf_tail_call(struct jit_ctx *ctx)emit (A64_LDR64 (prg, tmp, prg), ctx);emit (A64_CBZ (1 , prg, jmp_offset), ctx); -/* goto *(prog->bpf_func + prologue_size); */ +/* goto *(prog->bpf_func + prologue_offset); */ off = offsetof(struct bpf_prog , bpf_func);emit_a64_mov_i64 (tmp, off, ctx);emit (A64_LDR64 (tmp, prg, tmp), ctx);emit (A64_ADD_I (1 , tmp, tmp,sizeof (u32) *PROLOGUE_OFFSET ), ctx); +emit (A64_ADD_I (1 ,A64_SP ,A64_SP , ctx->stack_size), ctx);emit (A64_BR (tmp), ctx);/* out: */
arch/s390/kvm/kvm-s390.c +11 -7
@@ -768,7 +768,7 @@ static void kvm_s390_sync_request_broadcast(struct kvm *kvm, int req)/* * Must be called with kvm->srcu held to avoid races on memslots, and with -* kvm->lock to avoid races with ourselves and kvm_s390_vm_stop_migration. +* kvm->slots_lock to avoid races with ourselves and kvm_s390_vm_stop_migration. */ static int kvm_s390_vm_start_migration (struct kvm *kvm) {
@@ -824,7 +824,7 @@ static int kvm_s390_vm_start_migration(struct kvm *kvm) }/* -* Must be called with kvm->lock to avoid races with ourselves and +* Must be called with kvm->slots_lock to avoid races with ourselves and * kvm_s390_vm_start_migration. */ static int kvm_s390_vm_stop_migration (struct kvm *kvm)
@@ -839,6 +839,8 @@ static int kvm_s390_vm_stop_migration(struct kvm *kvm)if (kvm->arch.use_cmma) {kvm_s390_sync_request_broadcast (kvm,KVM_REQ_STOP_MIGRATION ); +/* We have to wait for the essa emulation to finish */ +synchronize_srcu (&kvm->srcu);vfree (mgs->pgste_bitmap); }kfree (mgs);
@@ -848,14 +850,12 @@ static int kvm_s390_vm_stop_migration(struct kvm *kvm)static int kvm_s390_vm_set_migration (struct kvm *kvm,struct kvm_device_attr *attr) { -int idx, res = -ENXIO ; +int res = -ENXIO ; -mutex_lock (&kvm->lock); +mutex_lock (&kvm->slots_lock);switch (attr->attr) {case KVM_S390_VM_MIGRATION_START : - idx =srcu_read_lock (&kvm->srcu); res =kvm_s390_vm_start_migration (kvm); -srcu_read_unlock (&kvm->srcu, idx);break ;case KVM_S390_VM_MIGRATION_STOP : res =kvm_s390_vm_stop_migration (kvm);
@@ -863,7 +863,7 @@ static int kvm_s390_vm_set_migration(struct kvm *kvm,default :break ; } -mutex_unlock (&kvm->lock); +mutex_unlock (&kvm->slots_lock);return res; }
@@ -1753,7 +1753,9 @@ long kvm_arch_vm_ioctl(struct file *filp, r = -EFAULT ;if (copy_from_user (&args, argp,sizeof (args)))break ; +mutex_lock (&kvm->slots_lock); r =kvm_s390_get_cmma_bits (kvm, &args); +mutex_unlock (&kvm->slots_lock);if (!r) { r =copy_to_user (argp, &args,sizeof (args));if (r)
@@ -1767,7 +1769,9 @@ long kvm_arch_vm_ioctl(struct file *filp, r = -EFAULT ;if (copy_from_user (&args, argp,sizeof (args)))break ; +mutex_lock (&kvm->slots_lock); r =kvm_s390_set_cmma_bits (kvm, &args); +mutex_unlock (&kvm->slots_lock);break ; }default :
arch/x86/events/amd/power.c +1 -1
@@ -277,7 +277,7 @@ static int __init amd_power_pmu_init(void)int ret;if (!x86_match_cpu (cpu_match)) -return 0 ; +return -ENODEV ;if (!boot_cpu_has (X86_FEATURE_ACC_POWER ))return -ENODEV ;
arch/x86/kernel/cpu/microcode/core.c +1 -1
@@ -239,7 +239,7 @@ static int __init save_microcode_in_initrd(void)break ;case X86_VENDOR_AMD :if (c->x86 >=0x10 ) -return save_microcode_in_initrd_amd (cpuid_eax (1 )); + ret =save_microcode_in_initrd_amd (cpuid_eax (1 ));break ;default :break ;
arch/x86/kernel/cpu/microcode/intel.c +18 -2
@@ -45,6 +45,9 @@ static const char ucode_path[] = "kernel/x86/microcode/GenuineIntel.bin";/* Current microcode patch used in early patching on the APs. */ static struct microcode_intel *intel_ucode_patch; +/* last level cache size per core */ +static int llc_size_per_core; +static inline bool cpu_signatures_match (unsigned int s1,unsigned int p1,unsigned int s2,unsigned int p2) {
@@ -912,12 +915,14 @@ static bool is_blacklisted(unsigned int cpu)/* * Late loading on model 79 with microcode revision less than 0x0b000021 -* may result in a system hang. This behavior is documented in item -* BDF90, #334165 (Intel Xeon Processor E7-8800/4800 v4 Product Family). +* and LLC size per core bigger than 2.5MB may result in a system hang. +* This behavior is documented in item BDF90, #334165 (Intel Xeon +* Processor E7-8800/4800 v4 Product Family). */ if (c->x86 ==6 && c->x86_model ==INTEL_FAM6_BROADWELL_X && c->x86_mask ==0x01 && + llc_size_per_core >2621440 && c->microcode <0x0b000021 ) {pr_err_once ("Erratum BDF90: late loading with revision < 0x0b000021 (0x%x) disabled.\n" , c->microcode);pr_err_once ("Please consider either early loading through initrd/built-in or a potential BIOS update.\n" );
@@ -975,6 +980,15 @@ static struct microcode_ops microcode_intel_ops = { .apply_microcode = apply_microcode_intel, }; +static int __init calc_llc_size_per_core (struct cpuinfo_x86 *c) +{ +u64 llc_size = c->x86_cache_size *1024 ; + +do_div (llc_size, c->x86_max_cores); + +return (int )llc_size; +} +struct microcode_ops *__init init_intel_microcode (void ) {struct cpuinfo_x86 *c = &boot_cpu_data;
@@ -985,5 +999,7 @@ struct microcode_ops * __init init_intel_microcode(void)return NULL ; } + llc_size_per_core =calc_llc_size_per_core (c); +return µcode_intel_ops; }
arch/x86/mm/tlb.c +29 -5
@@ -151,6 +151,34 @@ void switch_mm(struct mm_struct *prev, struct mm_struct *next,local_irq_restore (flags); } +static void sync_current_stack_to_mm (struct mm_struct *mm) +{ +unsigned long sp = current_stack_pointer; +pgd_t *pgd =pgd_offset (mm, sp); + +if (CONFIG_PGTABLE_LEVELS >4 ) { +if (unlikely (pgd_none (*pgd))) { +pgd_t *pgd_ref =pgd_offset_k (sp); + +set_pgd (pgd, *pgd_ref); + } + }else { +/* +* "pgd" is faked. The top level entries are "p4d"s, so sync +* the p4d. This compiles to approximately the same code as +* the 5-level case. +*/ +p4d_t *p4d =p4d_offset (pgd, sp); + +if (unlikely (p4d_none (*p4d))) { +pgd_t *pgd_ref =pgd_offset_k (sp); +p4d_t *p4d_ref =p4d_offset (pgd_ref, sp); + +set_p4d (p4d, *p4d_ref); + } + } +} +void switch_mm_irqs_off (struct mm_struct *prev,struct mm_struct *next,struct task_struct *tsk) {
@@ -226,11 +254,7 @@ void switch_mm_irqs_off(struct mm_struct *prev, struct mm_struct *next,* mapped in the new pgd, we'll double-fault. Forcibly * map it. */ -unsigned int index =pgd_index (current_stack_pointer); -pgd_t *pgd = next->pgd + index; - -if (unlikely (pgd_none (*pgd))) -set_pgd (pgd, init_mm.pgd[index]); +sync_current_stack_to_mm (next); }/* Stop remote flushes for the previous mm */
drivers/cpufreq/cpufreq_governor.c +16 -3
@@ -22,6 +22,8 @@#include "cpufreq_governor.h" +#define CPUFREQ_DBS_MIN_SAMPLING_INTERVAL (2 * TICK_NSEC / NSEC_PER_USEC) + static DEFINE_PER_CPU(struct cpu_dbs_info, cpu_dbs);static DEFINE_MUTEX (gov_dbs_data_mutex);
@@ -47,11 +49,15 @@ ssize_t store_sampling_rate(struct gov_attr_set *attr_set, const char *buf, {struct dbs_data *dbs_data =to_dbs_data (attr_set);struct policy_dbs_info *policy_dbs; +unsigned int sampling_interval;int ret; - ret =sscanf (buf,"%u" , &dbs_data->sampling_rate); -if (ret !=1 ) + + ret =sscanf (buf,"%u" , &sampling_interval); +if (ret !=1 || sampling_interval <CPUFREQ_DBS_MIN_SAMPLING_INTERVAL )return -EINVAL ; + dbs_data->sampling_rate = sampling_interval; +/* * We are operating under dbs_data->mutex and so the list and its * entries can't be freed concurrently.
@@ -430,7 +436,14 @@ int cpufreq_dbs_governor_init(struct cpufreq_policy *policy)if (ret) goto free_policy_dbs_info; - dbs_data->sampling_rate =cpufreq_policy_transition_delay_us (policy); +/* +* The sampling interval should not be less than the transition latency +* of the CPU and it also cannot be too small for dbs_update() to work +* correctly. +*/ + dbs_data->sampling_rate = max_t(unsigned int, +CPUFREQ_DBS_MIN_SAMPLING_INTERVAL , +cpufreq_policy_transition_delay_us (policy));if (!have_governor_per_policy ()) gov->gdbs_data = dbs_data;
drivers/gpu/drm/vc4/vc4_gem.c +6 -6
@@ -146,7 +146,7 @@ vc4_save_hang_state(struct drm_device *dev)struct vc4_exec_info *exec[2 ];struct vc4_bo *bo;unsigned long irqflags; -unsigned int i, j, unref_list_count, prev_idx; +unsigned int i, j, k, unref_list_count; kernel_state =kcalloc (1 ,sizeof (*kernel_state),GFP_KERNEL );if (!kernel_state)
@@ -182,24 +182,24 @@ vc4_save_hang_state(struct drm_device *dev)return ; } - prev_idx =0 ; + k =0 ;for (i =0 ; i <2 ; i++) {if (!exec[i])continue ;for (j =0 ; j < exec[i]->bo_count; j++) {drm_gem_object_get (&exec[i]->bo[j]->base); - kernel_state->bo[j + prev_idx] = &exec[i]->bo[j]->base; + kernel_state->bo[k++] = &exec[i]->bo[j]->base; }list_for_each_entry (bo, &exec[i]->unref_list, unref_head) {drm_gem_object_get (&bo->base.base); - kernel_state->bo[j + prev_idx] = &bo->base.base; - j++; + kernel_state->bo[k++] = &bo->base.base; } - prev_idx = j +1 ; } +WARN_ON_ONCE (k != state->bo_count); +if (exec[0 ]) state->start_bin = exec[0 ]->ct0ca;if (exec[1 ])
drivers/infiniband/hw/mlx5/main.c +6 -3
@@ -1276,7 +1276,8 @@ static int mlx5_ib_alloc_transport_domain(struct mlx5_ib_dev *dev, u32 *tdn)return err;if ((MLX5_CAP_GEN (dev->mdev, port_type) !=MLX5_CAP_PORT_TYPE_ETH ) || - !MLX5_CAP_GEN (dev->mdev, disable_local_lb)) + (!MLX5_CAP_GEN (dev->mdev, disable_local_lb_uc) && + !MLX5_CAP_GEN (dev->mdev, disable_local_lb_mc)))return err;mutex_lock (&dev->lb_mutex);
@@ -1294,7 +1295,8 @@ static void mlx5_ib_dealloc_transport_domain(struct mlx5_ib_dev *dev, u32 tdn)mlx5_core_dealloc_transport_domain (dev->mdev, tdn);if ((MLX5_CAP_GEN (dev->mdev, port_type) !=MLX5_CAP_PORT_TYPE_ETH ) || - !MLX5_CAP_GEN (dev->mdev, disable_local_lb)) + (!MLX5_CAP_GEN (dev->mdev, disable_local_lb_uc) && + !MLX5_CAP_GEN (dev->mdev, disable_local_lb_mc)))return ;mutex_lock (&dev->lb_mutex);
@@ -4161,7 +4163,8 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) }if ((MLX5_CAP_GEN (mdev, port_type) ==MLX5_CAP_PORT_TYPE_ETH ) && -MLX5_CAP_GEN (mdev, disable_local_lb)) + (MLX5_CAP_GEN (mdev, disable_local_lb_uc) || +MLX5_CAP_GEN (mdev, disable_local_lb_mc)))mutex_init (&dev->lb_mutex); dev->ib_active = true;
drivers/input/joystick/xpad.c +19 -0
@@ -229,6 +229,7 @@ static const struct xpad_device { { 0x0e6f, 0x0213, "Afterglow Gamepad for Xbox 360", 0, XTYPE_XBOX360 }, { 0x0e6f, 0x021f, "Rock Candy Gamepad for Xbox 360", 0, XTYPE_XBOX360 }, { 0x0e6f, 0x0246, "Rock Candy Gamepad for Xbox One 2015", 0, XTYPE_XBOXONE }, + { 0x0e6f, 0x02ab, "PDP Controller for Xbox One", 0, XTYPE_XBOXONE }, { 0x0e6f, 0x0301, "Logic3 Controller", 0, XTYPE_XBOX360 }, { 0x0e6f, 0x0346, "Rock Candy Gamepad for Xbox One 2016", 0, XTYPE_XBOXONE }, { 0x0e6f, 0x0401, "Logic3 Controller", 0, XTYPE_XBOX360 },
@@ -475,6 +476,22 @@ static const u8 xboxone_hori_init[] = { 0x00, 0x00, 0x00, 0x80, 0x00 }; +/* +* This packet is required for some of the PDP pads to start +* sending input reports. One of those pads is (0x0e6f:0x02ab). +*/ +static const u8 xboxone_pdp_init1[] = { +0x0a ,0x20 ,0x00 ,0x03 ,0x00 ,0x01 ,0x14 +}; + +/* +* This packet is required for some of the PDP pads to start +* sending input reports. One of those pads is (0x0e6f:0x02ab). +*/ +static const u8 xboxone_pdp_init2[] = { +0x06 ,0x20 ,0x00 ,0x02 ,0x01 ,0x00 +}; +/* * A specific rumble packet is required for some PowerA pads to start * sending input reports. One of those pads is (0x24c6:0x543a).
@@ -505,6 +522,8 @@ static const struct xboxone_init_packet xboxone_init_packets[] = {XBOXONE_INIT_PKT (0x0e6f ,0x0165 , xboxone_hori_init),XBOXONE_INIT_PKT (0x0f0d ,0x0067 , xboxone_hori_init),XBOXONE_INIT_PKT (0x0000 ,0x0000 , xboxone_fw2015_init), +XBOXONE_INIT_PKT (0x0e6f ,0x02ab , xboxone_pdp_init1), +XBOXONE_INIT_PKT (0x0e6f ,0x02ab , xboxone_pdp_init2),XBOXONE_INIT_PKT (0x24c6 ,0x541a , xboxone_rumblebegin_init),XBOXONE_INIT_PKT (0x24c6 ,0x542a , xboxone_rumblebegin_init), XBOXONE_INIT_PKT(0x24c6, 0x543a, xboxone_rumblebegin_init),
drivers/input/mouse/trackpoint.c +151 -94
397 lines not on this page · raw message
drivers/input/mouse/trackpoint.h +21 -13
@@ -21,10 +21,16 @@#define TP_COMMAND 0xE2/* Commands start with this */ #define TP_READ_ID 0xE1/* Sent for device identification */ -#define TP_MAGIC_IDENT 0x03/* Sent after a TP_READ_ID followed */ -/* by the firmware ID */ -/* Firmware ID includes 0x1, 0x2, 0x3 */ +/* +* Valid first byte responses to the "Read Secondary ID" (0xE1) command. +* 0x01 was the original IBM trackpoint, others implement very limited +* subset of trackpoint features. +*/ +#define TP_VARIANT_IBM 0x01 +#define TP_VARIANT_ALPS 0x02 +#define TP_VARIANT_ELAN 0x03 +#define TP_VARIANT_NXP 0x04/* * Commands
@@ -136,18 +142,20 @@#define MAKE_PS2_CMD (params, results, cmd) ((params<<12) | (results<<8) | (cmd)) -struct trackpoint_data -{ -unsigned char sensitivity, speed, inertia, reach; -unsigned char draghys, mindrag; -unsigned char thresh, upthresh; -unsigned char ztime, jenks; -unsigned char drift_time; +struct trackpoint_data { +u8 variant_id; +u8 firmware_id; + +u8 sensitivity, speed, inertia, reach; +u8 draghys, mindrag; +u8 thresh, upthresh; +u8 ztime, jenks; +u8 drift_time;/* toggles */ -unsigned char press_to_select; -unsigned char skipback; -unsigned char ext_dev; +bool press_to_select; +bool skipback; +bool ext_dev; };#ifdef CONFIG_MOUSE_PS2_TRACKPOINT
drivers/net/ethernet/emulex/benet/be_main.c +9 -0
@@ -4634,6 +4634,15 @@ int be_update_queues(struct be_adapter *adapter)be_schedule_worker (adapter); +/* +* The IF was destroyed and re-created. We need to clear +* all promiscuous flags valid for the destroyed IF. +* Without this promisc mode is not restored during +* be_open() because the driver thinks that it is +* already enabled in HW. +*/ + adapter->if_flags &= ~BE_IF_FLAGS_ALL_PROMISCUOUS ; +if (netif_running (netdev)) status =be_open (netdev);
drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c +6 -0
@@ -197,9 +197,15 @@ static int mlx5e_am_stats_compare(struct mlx5e_rx_am_stats *curr,return (curr->bpms > prev->bpms) ?MLX5E_AM_STATS_BETTER :MLX5E_AM_STATS_WORSE ; +if (!prev->ppms) +return curr->ppms ?MLX5E_AM_STATS_BETTER : +MLX5E_AM_STATS_SAME ; +if (IS_SIGNIFICANT_DIFF (curr->ppms, prev->ppms))return (curr->ppms > prev->ppms) ?MLX5E_AM_STATS_BETTER :MLX5E_AM_STATS_WORSE ; +if (!prev->epms) +return MLX5E_AM_STATS_SAME ;if (IS_SIGNIFICANT_DIFF (curr->epms, prev->epms)) return (curr->epms < prev->epms) ? MLX5E_AM_STATS_BETTER :
drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c +18 -9
@@ -238,15 +238,19 @@ static int mlx5e_test_loopback_setup(struct mlx5e_priv *priv,int err =0 ;/* Temporarily enable local_lb */ -if (MLX5_CAP_GEN (priv->mdev, disable_local_lb)) { -mlx5_nic_vport_query_local_lb (priv->mdev, &lbtp->local_lb); -if (!lbtp->local_lb) -mlx5_nic_vport_update_local_lb (priv->mdev, true); + err =mlx5_nic_vport_query_local_lb (priv->mdev, &lbtp->local_lb); +if (err) +return err; + +if (!lbtp->local_lb) { + err =mlx5_nic_vport_update_local_lb (priv->mdev, true); +if (err) +return err; } err =mlx5e_refresh_tirs (priv, true);if (err) -return err; + goto out; lbtp->loopback_ok = false;init_completion (&lbtp->comp);
@@ -256,16 +260,21 @@ static int mlx5e_test_loopback_setup(struct mlx5e_priv *priv, lbtp->pt.dev = priv->netdev; lbtp->pt.af_packet_priv = lbtp;dev_add_pack (&lbtp->pt); + +return 0 ; + +out: +if (!lbtp->local_lb) +mlx5_nic_vport_update_local_lb (priv->mdev, false); +return err; }static void mlx5e_test_loopback_cleanup (struct mlx5e_priv *priv,struct mlx5e_lbt_priv *lbtp) { -if (MLX5_CAP_GEN (priv->mdev, disable_local_lb)) { -if (!lbtp->local_lb) -mlx5_nic_vport_update_local_lb (priv->mdev, false); - } +if (!lbtp->local_lb) +mlx5_nic_vport_update_local_lb (priv->mdev, false);dev_remove_pack (&lbtp->pt);mlx5e_refresh_tirs (priv, false);
drivers/net/ethernet/mellanox/mlx5/core/main.c +1 -2
@@ -577,8 +577,7 @@ static int mlx5_core_set_hca_defaults(struct mlx5_core_dev *dev)int ret =0 ;/* Disable local_lb by default */ -if ((MLX5_CAP_GEN (dev, port_type) ==MLX5_CAP_PORT_TYPE_ETH ) && -MLX5_CAP_GEN (dev, disable_local_lb)) +if (MLX5_CAP_GEN (dev, port_type) ==MLX5_CAP_PORT_TYPE_ETH ) ret =mlx5_nic_vport_update_local_lb (dev, false);return ret;
drivers/net/ethernet/mellanox/mlx5/core/vport.c +16 -6
@@ -908,23 +908,33 @@ int mlx5_nic_vport_update_local_lb(struct mlx5_core_dev *mdev, bool enable)void *in;int err; -mlx5_core_dbg (mdev,"%s local_lb\n" , enable ?"enable" :"disable" ); +if (!MLX5_CAP_GEN (mdev, disable_local_lb_mc) && + !MLX5_CAP_GEN (mdev, disable_local_lb_uc)) +return 0 ; + in =kvzalloc (inlen,GFP_KERNEL );if (!in)return -ENOMEM ; -MLX5_SET (modify_nic_vport_context_in, in, - field_select.disable_mc_local_lb,1 );MLX5_SET (modify_nic_vport_context_in, in, nic_vport_context.disable_mc_local_lb, !enable); - -MLX5_SET (modify_nic_vport_context_in, in, - field_select.disable_uc_local_lb,1 );MLX5_SET (modify_nic_vport_context_in, in, nic_vport_context.disable_uc_local_lb, !enable); +if (MLX5_CAP_GEN (mdev, disable_local_lb_mc)) +MLX5_SET (modify_nic_vport_context_in, in, + field_select.disable_mc_local_lb,1 ); + +if (MLX5_CAP_GEN (mdev, disable_local_lb_uc)) +MLX5_SET (modify_nic_vport_context_in, in, + field_select.disable_uc_local_lb,1 ); + err =mlx5_modify_nic_vport_context (mdev, in, inlen); +if (!err) +mlx5_core_dbg (mdev,"%s local_lb\n" , + enable ?"enable" :"disable" ); +kvfree (in);return err; }
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +2 -8
@@ -1531,11 +1531,8 @@ static void mlxsw_sp_router_neigh_ent_ipv4_process(struct mlxsw_sp *mlxsw_sp, dipn =htonl (dip); dev = mlxsw_sp->router->rifs[rif]->dev; n =neigh_lookup (&arp_tbl, &dipn, dev); -if (!n) { -netdev_err (dev,"Failed to find matching neighbour for IP=%pI4h\n" , - &dip); +if (!n)return ; - }netdev_dbg (dev,"Updating neighbour with IP=%pI4h\n" , &dip);neigh_event_send (n,NULL );
@@ -1562,11 +1559,8 @@ static void mlxsw_sp_router_neigh_ent_ipv6_process(struct mlxsw_sp *mlxsw_sp, dev = mlxsw_sp->router->rifs[rif]->dev; n =neigh_lookup (&nd_tbl, &dip, dev); -if (!n) { -netdev_err (dev,"Failed to find matching neighbour for IP=%pI6c\n" , - &dip); +if (!n)return ; - }netdev_dbg (dev,"Updating neighbour with IP=%pI6c\n" , &dip);neigh_event_send (n,NULL );
drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c +1 -1
@@ -306,7 +306,7 @@ nfp_net_get_link_ksettings(struct net_device *netdev, ls >= ARRAY_SIZE(ls_to_ethtool))return 0 ; - cmd->base.speed = ls_to_ethtool[sts]; + cmd->base.speed = ls_to_ethtool[ls]; cmd->base.duplex =DUPLEX_FULL ;return 0 ;
drivers/net/ethernet/realtek/r8169.c +2 -7
@@ -2239,19 +2239,14 @@ static bool rtl8169_do_counters(struct net_device *dev, u32 counter_cmd)void __iomem *ioaddr = tp->mmio_addr;dma_addr_t paddr = tp->counters_phys_addr;u32 cmd; -bool ret;RTL_W32 (CounterAddrHigh, (u64 )paddr >>32 ); +RTL_R32 (CounterAddrHigh); cmd = (u64 )paddr &DMA_BIT_MASK (32 );RTL_W32 (CounterAddrLow, cmd);RTL_W32 (CounterAddrLow, cmd | counter_cmd); - ret =rtl_udelay_loop_wait_low (tp, &rtl_counters_cond,10 ,1000 ); - -RTL_W32 (CounterAddrLow,0 ); -RTL_W32 (CounterAddrHigh,0 ); - -return ret; +return rtl_udelay_loop_wait_low (tp, &rtl_counters_cond,10 ,1000 ); }static bool rtl8169_reset_counters (struct net_device *dev)
drivers/net/ppp/ppp_generic.c +3 -2
@@ -1003,17 +1003,18 @@ static int ppp_unit_register(struct ppp *ppp, int unit, bool ifname_is_set)if (!ifname_is_set)snprintf (ppp->dev->name,IFNAMSIZ ,"ppp%i" , ppp->file.index); +mutex_unlock (&pn->all_ppp_mutex); + ret =register_netdevice (ppp->dev);if (ret <0 ) goto err_unit;atomic_inc (&ppp_unit_count); -mutex_unlock (&pn->all_ppp_mutex); -return 0 ; err_unit: +mutex_lock (&pn->all_ppp_mutex);unit_put (&pn->units_idr, ppp->file.index); err:mutex_unlock (&pn->all_ppp_mutex);
drivers/net/ppp/pppoe.c +6 -5
@@ -842,6 +842,7 @@ static int pppoe_sendmsg(struct socket *sock, struct msghdr *m,struct pppoe_hdr *ph;struct net_device *dev;char *start; +int hlen;lock_sock (sk);if (sock_flag (sk,SOCK_DEAD ) || !(sk->sk_state &PPPOX_CONNECTED )) {
@@ -860,16 +861,16 @@ static int pppoe_sendmsg(struct socket *sock, struct msghdr *m,if (total_len > (dev->mtu + dev->hard_header_len)) goto end; - - skb =sock_wmalloc (sk, total_len + dev->hard_header_len +32 , -0 ,GFP_KERNEL ); + hlen =LL_RESERVED_SPACE (dev); + skb =sock_wmalloc (sk, hlen +sizeof (*ph) + total_len + + dev->needed_tailroom,0 ,GFP_KERNEL );if (!skb) { error = -ENOMEM ; goto end; }/* Reserve space for headers. */ -skb_reserve (skb, dev->hard_header_len); +skb_reserve (skb, hlen);skb_reset_network_header (skb); skb->dev = dev;
@@ -930,7 +931,7 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb)/* Copy the data if there is no space for the header or if it's * read-only. */ -if (skb_cow_head (skb,sizeof (*ph) + dev->hard_header_len)) +if (skb_cow_head (skb,LL_RESERVED_SPACE (dev) +sizeof (*ph))) goto abort;__skb_push (skb,sizeof (*ph));
drivers/net/tun.c +13 -2
@@ -534,6 +534,14 @@ static void tun_queue_purge(struct tun_file *tfile)skb_queue_purge (&tfile->sk.sk_error_queue); } +static void tun_cleanup_tx_array (struct tun_file *tfile) +{ +if (tfile->tx_array.ring.queue) { +skb_array_cleanup (&tfile->tx_array); +memset (&tfile->tx_array,0 ,sizeof (tfile->tx_array)); + } +} +static void __tun_detach (struct tun_file *tfile,bool clean) {struct tun_file *ntfile;
@@ -575,8 +583,7 @@ static void __tun_detach(struct tun_file *tfile, bool clean) tun->dev->reg_state == NETREG_REGISTERED)unregister_netdevice (tun->dev); } -if (tun) -skb_array_cleanup (&tfile->tx_array); +tun_cleanup_tx_array (tfile);sock_put (&tfile->sk); } }
@@ -616,11 +623,13 @@ static void tun_detach_all(struct net_device *dev)/* Drop read queue */ tun_queue_purge (tfile);sock_put (&tfile->sk); +tun_cleanup_tx_array (tfile); }list_for_each_entry_safe (tfile, tmp, &tun->disabled, next) {tun_enable_queue (tfile);tun_queue_purge (tfile);sock_put (&tfile->sk); +tun_cleanup_tx_array (tfile); }BUG_ON (tun->numdisabled !=0 );
@@ -2624,6 +2633,8 @@ static int tun_chr_open(struct inode *inode, struct file * file)sock_set_flag (&tfile->sk,SOCK_ZEROCOPY ); +memset (&tfile->tx_array,0 ,sizeof (tfile->tx_array)); +return 0 ; }
drivers/net/usb/lan78xx.c +1 -0
@@ -2396,6 +2396,7 @@ static int lan78xx_reset(struct lan78xx_net *dev) buf =DEFAULT_BURST_CAP_SIZE /FS_USB_PKT_SIZE ; dev->rx_urb_size =DEFAULT_BURST_CAP_SIZE ; dev->rx_qlen =4 ; + dev->tx_qlen =4 ; } ret =lan78xx_write_reg (dev,BURST_CAP , buf);
drivers/net/vmxnet3/vmxnet3_drv.c +1 -1
@@ -1616,7 +1616,6 @@ static void vmxnet3_rq_destroy(struct vmxnet3_rx_queue *rq, rq->rx_ring[i].basePA); rq->rx_ring[i].base =NULL ; } - rq->buf_info[i] =NULL ; }if (rq->data_ring.base) {
@@ -1638,6 +1637,7 @@ static void vmxnet3_rq_destroy(struct vmxnet3_rx_queue *rq, (rq->rx_ring[0 ].size + rq->rx_ring[1 ].size);dma_free_coherent (&adapter->pdev->dev, sz, rq->buf_info[0 ], rq->buf_info_pa); + rq->buf_info[0 ] = rq->buf_info[1 ] =NULL ; } }
drivers/net/vrf.c +3 -2
@@ -674,8 +674,9 @@ static struct sk_buff *vrf_ip_out(struct net_device *vrf_dev, struct sock *sk, struct sk_buff *skb) { - /* don't divert multicast */ - if (ipv4_is_multicast(ip_hdr(skb)->daddr)) +/* don't divert multicast or local broadcast */ +if (ipv4_is_multicast (ip_hdr (skb)->daddr) || +ipv4_is_lbcast (ip_hdr (skb)->daddr))return skb;if (qdisc_tx_is_default (vrf_dev))
fs/btrfs/delayed-inode.c +8 -18
@@ -1677,28 +1677,18 @@ void btrfs_readdir_put_delayed_items(struct inode *inode,int btrfs_should_delete_dir_index (struct list_head *del_list,u64 index) { -struct btrfs_delayed_item *curr, *next; -int ret; - -if (list_empty (del_list)) -return 0 ; +struct btrfs_delayed_item *curr; +int ret =0 ; -list_for_each_entry_safe (curr, next, del_list, readdir_list) { +list_for_each_entry (curr, del_list, readdir_list) {if (curr->key.offset > index)break ; - -list_del (&curr->readdir_list); - ret = (curr->key.offset == index); - -if (refcount_dec_and_test (&curr->refs)) -kfree (curr); - -if (ret) -return 1 ; -else -continue ; +if (curr->key.offset == index) { + ret =1 ; +break ; + } } -return 0 ; +return ret; }/*
fs/nfsd/auth.c +3 -3
@@ -60,10 +60,10 @@ int nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp) gi->gid[i] = exp->ex_anon_gid; else gi->gid[i] = rqgi->gid[i]; - -/* Each thread allocates its own gi, no race */ -groups_sort (gi); } + +/* Each thread allocates its own gi, no race */ +groups_sort (gi); }else { gi =get_group_info (rqgi); }
fs/orangefs/devorangefs-req.c +2 -1
@@ -162,7 +162,7 @@ static ssize_t orangefs_devreq_read(struct file *file,struct orangefs_kernel_op_s *op, *temp;__s32 proto_ver =ORANGEFS_KERNEL_PROTO_VERSION ;static __s32 magic =ORANGEFS_DEVREQ_MAGIC ; -struct orangefs_kernel_op_s *cur_op =NULL ; +struct orangefs_kernel_op_s *cur_op;unsigned long ret;/* We do not support blocking IO. */
@@ -186,6 +186,7 @@ static ssize_t orangefs_devreq_read(struct file *file,return -EAGAIN ; restart: + cur_op =NULL ;/* Get next op (if any) from top of list. */ spin_lock (&orangefs_request_list_lock);list_for_each_entry_safe (op, temp, &orangefs_request_list, list) {
fs/orangefs/file.c +2 -5
@@ -446,7 +446,7 @@ ssize_t orangefs_inode_read(struct inode *inode,static ssize_t orangefs_file_read_iter (struct kiocb *iocb,struct iov_iter *iter) {struct file *file = iocb->ki_filp; -loff_t pos = *(&iocb->ki_pos); +loff_t pos = iocb->ki_pos;ssize_t rc =0 ;BUG_ON (iocb->private);
@@ -486,9 +486,6 @@ static ssize_t orangefs_file_write_iter(struct kiocb *iocb, struct iov_iter *ite } } -if (file->f_pos >i_size_read (file->f_mapping->host)) -orangefs_i_size_write (file->f_mapping->host, file->f_pos); - rc =generic_write_checks (iocb, iter);if (rc <=0 ) {
@@ -502,7 +499,7 @@ static ssize_t orangefs_file_write_iter(struct kiocb *iocb, struct iov_iter *ite* pos to the end of the file, so we will wait till now to set * pos... */ - pos = *(&iocb->ki_pos); + pos = iocb->ki_pos; rc = do_readv_writev(ORANGEFS_IO_WRITE, file,
fs/orangefs/orangefs-kernel.h +0 -11
@@ -566,17 +566,6 @@ do { \ sys_attr.mask =ORANGEFS_ATTR_SYS_ALL_SETABLE ; \ }while (0 ) -static inline void orangefs_i_size_write(struct inode *inode, loff_t i_size) -{ -#if BITS_PER_LONG ==32 && defined(CONFIG_SMP ) -inode_lock (inode); -#endif -i_size_write (inode, i_size); -#if BITS_PER_LONG ==32 && defined(CONFIG_SMP ) -inode_unlock (inode); -#endif -} - static inline void orangefs_set_timeout(struct dentry *dentry) {unsigned long time = jiffies + orangefs_dcache_timeout_msecs*HZ /1000 ;
fs/orangefs/waitqueue.c +2 -2
@@ -29,10 +29,10 @@ static void orangefs_clean_up_interrupted_operation(struct orangefs_kernel_op_s*/ void purge_waiting_ops (void ) { -struct orangefs_kernel_op_s *op; +struct orangefs_kernel_op_s *op, *tmp;spin_lock (&orangefs_request_list_lock); -list_for_each_entry (op, &orangefs_request_list, list) { +list_for_each_entry_safe (op, tmp, &orangefs_request_list, list) { gossip_debug(GOSSIP_WAIT_DEBUG, "pvfs2-client-core: purging op tag %llu %s\n", llu(op->tag),
include/linux/bpf.h +16 -5
@@ -42,7 +42,14 @@ struct bpf_map_ops { };struct bpf_map { -atomic_t refcnt; +/* 1st cacheline with read-mostly members of which some +* are also accessed in fast-path (e.g. ops, max_entries). +*/ +const struct bpf_map_ops *ops____cacheline_aligned ; +struct bpf_map *inner_map_meta; +#ifdef CONFIG_SECURITY +void *security; +#endif enum bpf_map_type map_type;u32 key_size;u32 value_size;
@@ -52,11 +59,15 @@ struct bpf_map {u32 id;int numa_node;bool unpriv_array; -struct user_struct *user; -const struct bpf_map_ops *ops; -struct work_struct work; +/* 7 bytes hole */ + +/* 2nd cacheline with misc members to avoid false sharing +* particularly with refcounting. +*/ +struct user_struct *user____cacheline_aligned ; +atomic_t refcnt;atomic_t usercnt; -struct bpf_map *inner_map_meta; +struct work_struct work; };/* function argument constraints */
include/linux/mlx5/driver.h +18 -1
@@ -36,6 +36,7 @@#include <linux/kernel.h> #include <linux/completion.h> #include <linux/pci.h> +#include <linux/irq.h> #include <linux/spinlock_types.h> #include <linux/semaphore.h> #include <linux/slab.h>
@@ -1194,7 +1195,23 @@ enum {static inline const struct cpumask *mlx5_get_vector_affinity (struct mlx5_core_dev *dev,int vector) { -return pci_irq_get_affinity (dev->pdev,MLX5_EQ_VEC_COMP_BASE + vector); +const struct cpumask *mask; +struct irq_desc *desc; +unsigned int irq; +int eqn; +int err; + + err =mlx5_vector2eqn (dev, vector, &eqn, &irq); +if (err) +return NULL ; + + desc =irq_to_desc (irq); +#ifdef CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK + mask =irq_data_get_effective_affinity_mask (&desc->irq_data); +#else + mask = desc->irq_common_data.affinity; +#endif +return mask; }#endif /* MLX5_DRIVER_H */
include/linux/mlx5/mlx5_ifc.h +3 -2
@@ -1023,8 +1023,9 @@ struct mlx5_ifc_cmd_hca_cap_bits {u8 log_max_wq_sz[0x5 ];u8 nic_vport_change_event[0x1 ]; -u8 disable_local_lb[0x1 ]; -u8 reserved_at_3e2[0x9 ]; +u8 disable_local_lb_uc[0x1 ]; +u8 disable_local_lb_mc[0x1 ]; +u8 reserved_at_3e3[0x8 ];u8 log_max_vlan_list[0x5 ];u8 reserved_at_3f0[0x3 ];u8 log_max_current_mc_list[0x5 ];
include/linux/vermagic.h +1 -7
@@ -31,17 +31,11 @@#else #define MODULE_RANDSTRUCT_PLUGIN #endif -#ifdef RETPOLINE -#define MODULE_VERMAGIC_RETPOLINE "retpoline " -#else -#define MODULE_VERMAGIC_RETPOLINE "" -#endif #define VERMAGIC_STRING \ UTS_RELEASE " " \ MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \ MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \ MODULE_ARCH_VERMAGIC \ - MODULE_RANDSTRUCT_PLUGIN \ - MODULE_VERMAGIC_RETPOLINE + MODULE_RANDSTRUCT_PLUGIN
include/net/arp.h +3 -0
@@ -20,6 +20,9 @@ static inline u32 arp_hashfn(const void *pkey, const struct net_device *dev, u32static inline struct neighbour *__ipv4_neigh_lookup_noref (struct net_device *dev,u32 key) { +if (dev->flags & (IFF_LOOPBACK |IFF_POINTOPOINT )) + key =INADDR_ANY ; +return ___neigh_lookup_noref (&arp_tbl, neigh_key_eq32, arp_hashfn, &key, dev); }
include/net/ipv6.h +1 -0
@@ -291,6 +291,7 @@ int ipv6_flowlabel_opt_get(struct sock *sk, struct in6_flowlabel_req *freq, int flags);int ip6_flowlabel_init (void );void ip6_flowlabel_cleanup (void ); +bool ip6_autoflowlabel (struct net *net,const struct ipv6_pinfo *np);static inline void fl6_sock_release (struct ip6_flowlabel *fl) {
include/net/net_namespace.h +10 -0
@@ -223,6 +223,11 @@ int net_eq(const struct net *net1, const struct net *net2) return net1 == net2; } +static inline int check_net (const struct net *net) +{ +return atomic_read (&net->count) !=0 ; +} +void net_drop_ns (void *);#else
@@ -247,6 +252,11 @@ int net_eq(const struct net *net1, const struct net *net2) return 1; } +static inline int check_net (const struct net *net) +{ +return 1 ; +} +#define net_drop_ns NULL#endif
include/net/tls.h +1 -1
@@ -168,7 +168,7 @@ static inline bool tls_is_pending_open_record(struct tls_context *tls_ctx)static inline void tls_err_abort (struct sock *sk) { - sk->sk_err = -EBADMSG ; + sk->sk_err =EBADMSG ; sk->sk_error_report (sk); }
init/Kconfig +7 -0
@@ -1342,6 +1342,13 @@ config BPF_SYSCALL Enable the bpf() system call that allows to manipulate eBPF programs and maps via file descriptors. +config BPF_JIT_ALWAYS_ON + bool "Permanently enable BPF JIT and remove BPF interpreter" + depends on BPF_SYSCALL && HAVE_EBPF_JIT && BPF_JIT + help + Enables BPF JIT and removes BPF interpreter to avoid + speculative execution of BPF instructions by the interpreter + config SHMEM bool "Use full shmem filesystem" if EXPERT default y
kernel/bpf/core.c +21 -2
@@ -760,6 +760,7 @@ noinline u64 __bpf_call_base(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5) }EXPORT_SYMBOL_GPL (__bpf_call_base); +#ifndef CONFIG_BPF_JIT_ALWAYS_ON /** * __bpf_prog_run - run eBPF program on a given context * @ctx: is the data we are operating on
@@ -948,7 +949,7 @@ static unsigned int ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn,DST = tmp;CONT ; ALU_MOD_X: -if (unlikely (SRC ==0 )) +if (unlikely ((u32 )SRC ==0 ))return 0 ; tmp = (u32 )DST ;DST =do_div (tmp, (u32 )SRC );
@@ -967,7 +968,7 @@ static unsigned int ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn,DST =div64_u64 (DST ,SRC );CONT ; ALU_DIV_X: -if (unlikely (SRC ==0 )) +if (unlikely ((u32 )SRC ==0 ))return 0 ; tmp = (u32 )DST ;do_div (tmp, (u32 )SRC );
@@ -1310,6 +1311,14 @@ EVAL6(PROG_NAME_LIST, 224, 256, 288, 320, 352, 384)EVAL4 (PROG_NAME_LIST ,416 ,448 ,480 ,512 ) }; +#else +static unsigned int __bpf_prog_ret0 (const void *ctx, +const struct bpf_insn *insn) +{ +return 0 ; +} +#endif +bool bpf_prog_array_compatible (struct bpf_array *array,const struct bpf_prog *fp) {
@@ -1357,9 +1366,13 @@ static int bpf_check_tail_call(const struct bpf_prog *fp)*/ struct bpf_prog *bpf_prog_select_runtime (struct bpf_prog *fp,int *err) { +#ifndef CONFIG_BPF_JIT_ALWAYS_ON u32 stack_depth =max_t (u32, fp->aux->stack_depth,1 ); fp->bpf_func = interpreters[(round_up (stack_depth,32 ) /32 ) -1 ]; +#else + fp->bpf_func = __bpf_prog_ret0; +#endif /* eBPF JITs can rewrite the program in case constant * blinding is active. However, in case of error during
@@ -1368,6 +1381,12 @@ struct bpf_prog *bpf_prog_select_runtime(struct bpf_prog *fp, int *err)* be JITed, but falls back to the interpreter. */ fp =bpf_int_jit_compile (fp); +#ifdef CONFIG_BPF_JIT_ALWAYS_ON +if (!fp->jited) { + *err = -ENOTSUPP ; +return fp; + } +#endif bpf_prog_lock_ro (fp);/* The tail call compatibility check can only be done at
kernel/bpf/verifier.c +37 -0
@@ -986,6 +986,13 @@ static bool is_pointer_value(struct bpf_verifier_env *env, int regno)return __is_pointer_value (env->allow_ptr_leaks, &env->cur_state.regs[regno]); } +static bool is_ctx_reg (struct bpf_verifier_env *env,int regno) +{ +const struct bpf_reg_state *reg = &env->cur_state.regs[regno]; + +return reg->type ==PTR_TO_CTX ; +} +static int check_pkt_ptr_alignment (const struct bpf_reg_state *reg,int off,int size,bool strict) {
@@ -1258,6 +1265,12 @@ static int check_xadd(struct bpf_verifier_env *env, int insn_idx, struct bpf_insreturn -EACCES ; } +if (is_ctx_reg (env, insn->dst_reg)) { +verbose ("BPF_XADD stores into R%d context is not allowed\n" , + insn->dst_reg); +return -EACCES ; + } +/* check whether atomic_add can read the memory */ err =check_mem_access (env, insn_idx, insn->dst_reg, insn->off,BPF_SIZE (insn->code),BPF_READ ,-1 );
@@ -3859,6 +3872,12 @@ static int do_check(struct bpf_verifier_env *env)if (err)return err; +if (is_ctx_reg (env, insn->dst_reg)) { +verbose ("BPF_ST stores into R%d context is not allowed\n" , + insn->dst_reg); +return -EACCES ; + } +/* check that memory (dst_reg + off) is writeable */ err = check_mem_access(env, insn_idx, insn->dst_reg, insn->off, BPF_SIZE(insn->code), BPF_WRITE,
@@ -4304,6 +4323,24 @@ static int fixup_bpf_calls(struct bpf_verifier_env *env)int i, cnt, delta =0 ;for (i =0 ; i < insn_cnt; i++, insn++) { +if (insn->code == (BPF_ALU |BPF_MOD |BPF_X ) || + insn->code == (BPF_ALU |BPF_DIV |BPF_X )) { +/* due to JIT bugs clear upper 32-bits of src register +* before div/mod operation +*/ + insn_buf[0 ] =BPF_MOV32_REG (insn->src_reg, insn->src_reg); + insn_buf[1 ] = *insn; + cnt =2 ; + new_prog =bpf_patch_insn_data (env, i + delta, insn_buf, cnt); +if (!new_prog) +return -ENOMEM ; + + delta += cnt -1 ; + env->prog = prog = new_prog; + insn = new_prog->insnsi + i + delta; +continue ; + } +if (insn->code != (BPF_JMP |BPF_CALL ))continue ;
kernel/time/hrtimer.c +3 -0
@@ -655,7 +655,9 @@ static void hrtimer_reprogram(struct hrtimer *timer,static inline void hrtimer_init_hres (struct hrtimer_cpu_base *base) { base->expires_next =KTIME_MAX ; + base->hang_detected =0 ; base->hres_active =0 ; + base->next_timer =NULL ; }/*
@@ -1591,6 +1593,7 @@ int hrtimers_prepare_cpu(unsigned int cpu)timerqueue_init_head (&cpu_base->clock_base[i].active); } + cpu_base->active_bases =0 ; cpu_base->cpu = cpu;hrtimer_init_hres (cpu_base);return 0 ;
lib/test_bpf.c +7 -4
@@ -6207,9 +6207,8 @@ static struct bpf_prog *generate_filter(int which, int *err)return NULL ; } } -/* We don't expect to fail. */ if (*err) { -pr_cont ("FAIL to attach err=%d len=%d\n" , +pr_cont ("FAIL to prog_create err=%d len=%d\n" , *err, fprog.len);return NULL ; }
@@ -6233,6 +6232,10 @@ static struct bpf_prog *generate_filter(int which, int *err)* checks. */ fp =bpf_prog_select_runtime (fp, err); +if (*err) { +pr_cont ("FAIL to select_runtime err=%d\n" , *err); +return NULL ; + }break ; }
@@ -6418,8 +6421,8 @@ static __init int test_bpf(void) pass_cnt++;continue ; } - -return err; + err_cnt++; +continue ; }pr_cont ("jited:%u " , fp->jited);
mm/page_alloc.c +3 -3
@@ -3011,9 +3011,6 @@ bool __zone_watermark_ok(struct zone *z, unsigned int order, unsigned long mark,if (!area->nr_free)continue ; -if (alloc_harder) -return true; -for (mt =0 ; mt <MIGRATE_PCPTYPES ; mt++) {if (!list_empty (&area->free_list[mt]))return true;
@@ -3025,6 +3022,9 @@ bool __zone_watermark_ok(struct zone *z, unsigned int order, unsigned long mark, return true; }#endif +if (alloc_harder && + !list_empty (&area->free_list[MIGRATE_HIGHATOMIC ])) +return true; }return false; }
net/core/dev.c +15 -4
@@ -3128,10 +3128,21 @@ static void qdisc_pkt_len_init(struct sk_buff *skb) hdr_len =skb_transport_header (skb) -skb_mac_header (skb);/* + transport layer */ -if (likely (shinfo->gso_type & (SKB_GSO_TCPV4 |SKB_GSO_TCPV6 ))) - hdr_len +=tcp_hdrlen (skb); -else - hdr_len +=sizeof (struct udphdr ); +if (likely (shinfo->gso_type & (SKB_GSO_TCPV4 |SKB_GSO_TCPV6 ))) { +const struct tcphdr *th; +struct tcphdr _tcphdr; + + th =skb_header_pointer (skb,skb_transport_offset (skb), +sizeof (_tcphdr), &_tcphdr); +if (likely (th)) + hdr_len +=__tcp_hdrlen (th); + }else { +struct udphdr _udphdr; + +if (skb_header_pointer (skb,skb_transport_offset (skb), +sizeof (_udphdr), &_udphdr)) + hdr_len +=sizeof (struct udphdr ); + }if (shinfo->gso_type &SKB_GSO_DODGY ) gso_segs = DIV_ROUND_UP(skb->len - hdr_len,
net/core/filter.c +6 -4
@@ -457,6 +457,10 @@ static int bpf_convert_filter(struct sock_filter *prog, int len, convert_bpf_extensions(fp, &insn))break ; +if (fp->code == (BPF_ALU |BPF_DIV |BPF_X ) || + fp->code == (BPF_ALU |BPF_MOD |BPF_X )) + *insn++ =BPF_MOV32_REG (BPF_REG_X ,BPF_REG_X ); + *insn =BPF_RAW_INSN (fp->code,BPF_REG_A ,BPF_REG_X ,0 , fp->k);break ;
@@ -1053,11 +1057,9 @@ static struct bpf_prog *bpf_migrate_filter(struct bpf_prog *fp)*/ goto out_err_free; -/* We are guaranteed to never error here with cBPF to eBPF -* transitions, since there's no issue with type compatibility -* checks on program arrays. -*/ fp =bpf_prog_select_runtime (fp, &err); +if (err) + goto out_err_free;kfree (old_prog);return fp;
net/core/flow_dissector.c +1 -2
@@ -876,8 +876,8 @@ bool __skb_flow_dissect(const struct sk_buff *skb, out_good: ret = true; - key_control->thoff = (u16 )nhoff; out: + key_control->thoff =min_t (u16, nhoff, skb ? skb->len : hlen); key_basic->n_proto = proto; key_basic->ip_proto = ip_proto;
@@ -885,7 +885,6 @@ bool __skb_flow_dissect(const struct sk_buff *skb, out_bad: ret = false; - key_control->thoff =min_t (u16, nhoff, skb ? skb->len : hlen); goto out; }EXPORT_SYMBOL (__skb_flow_dissect);
net/core/neighbour.c +2 -2
@@ -532,7 +532,7 @@ struct neighbour *__neigh_create(struct neigh_table *tbl, const void *pkey,if (atomic_read (&tbl->entries) > (1 << nht->hash_shift)) nht =neigh_hash_grow (tbl, nht->hash_shift +1 ); - hash_val = tbl->hash (pkey, dev, nht->hash_rnd) >> (32 - nht->hash_shift); + hash_val = tbl->hash (n->primary_key, dev, nht->hash_rnd) >> (32 - nht->hash_shift);if (n->parms->dead) { rc =ERR_PTR (-EINVAL );
@@ -544,7 +544,7 @@ struct neighbour *__neigh_create(struct neigh_table *tbl, const void *pkey, n1 !=NULL ; n1 = rcu_dereference_protected(n1->next, lockdep_is_held(&tbl->lock))) { -if (dev == n1->dev && !memcmp (n1->primary_key, pkey, key_len)) { +if (dev == n1->dev && !memcmp (n1->primary_key, n->primary_key, key_len)) {if (want_ref)neigh_hold (n1); rc = n1;
net/core/sysctl_net_core.c +6 -0
@@ -325,7 +325,13 @@ static struct ctl_table net_core_table[] = { .data = &bpf_jit_enable, .maxlen = sizeof(int), .mode =0644 , +#ifndef CONFIG_BPF_JIT_ALWAYS_ON .proc_handler = proc_dointvec +#else + .proc_handler = proc_dointvec_minmax, + .extra1 = &one, + .extra2 = &one, +#endif }, # ifdef CONFIG_HAVE_EBPF_JIT {
net/dccp/ccids/ccid2.c +3 -0
@@ -140,6 +140,9 @@ static void ccid2_hc_tx_rto_expire(unsigned long data)ccid2_pr_debug ("RTO_EXPIRE\n" ); +if (sk->sk_state ==DCCP_CLOSED ) + goto out; +/* back-off timer */ hc->tx_rto <<=1 ;if (hc->tx_rto >DCCP_RTO_MAX )
net/ipv4/arp.c +6 -1
@@ -223,11 +223,16 @@ static bool arp_key_eq(const struct neighbour *neigh, const void *pkey)static int arp_constructor (struct neighbour *neigh) { -__be32 addr = *(__be32 *)neigh->primary_key; +__be32 addr;struct net_device *dev = neigh->dev;struct in_device *in_dev;struct neigh_parms *parms; +u32 inaddr_any =INADDR_ANY ; +if (dev->flags & (IFF_LOOPBACK |IFF_POINTOPOINT )) +memcpy (neigh->primary_key, &inaddr_any, arp_tbl.key_len); + + addr = *(__be32 *)neigh->primary_key;rcu_read_lock (); in_dev =__in_dev_get_rcu (dev);if (!in_dev) {
net/ipv4/esp4_offload.c +3 -0
@@ -121,6 +121,9 @@ static struct sk_buff *esp4_gso_segment(struct sk_buff *skb,if (!xo) goto out; +if (!(skb_shinfo (skb)->gso_type &SKB_GSO_ESP )) + goto out; + seq = xo->seq.low; x = skb->sp->xvec[skb->sp->len -1 ];
net/ipv4/igmp.c +1 -1
@@ -332,7 +332,7 @@ static __be32 igmpv3_get_srcaddr(struct net_device *dev,return htonl (INADDR_ANY );for_ifa (in_dev) { -if (inet_ifa_match (fl4->saddr, ifa)) +if (fl4->saddr == ifa->ifa_local)return fl4->saddr; }endfor_ifa (in_dev);
net/ipv4/route.c +1 -0
@@ -2762,6 +2762,7 @@ static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,if (err ==0 && rt->dst.error) err = -rt->dst.error; }else { + fl4.flowi4_iif =LOOPBACK_IFINDEX ; rt =ip_route_output_key_hash_rcu (net, &fl4, &res, skb); err =0 ;if (IS_ERR (rt))
net/ipv4/tcp.c +3 -0
@@ -2273,6 +2273,9 @@ void tcp_close(struct sock *sk, long timeout)tcp_send_active_reset (sk,GFP_ATOMIC );__NET_INC_STATS (sock_net (sk),LINUX_MIB_TCPABORTONMEMORY ); + }else if (!check_net (sock_net (sk))) { +/* Not possible to send reset; just close */ +tcp_set_state (sk,TCP_CLOSE ); } }
net/ipv4/tcp_offload.c +3 -0
@@ -32,6 +32,9 @@ static void tcp_gso_tstamp(struct sk_buff *skb, unsigned int ts_seq,static struct sk_buff *tcp4_gso_segment (struct sk_buff *skb,netdev_features_t features) { +if (!(skb_shinfo (skb)->gso_type &SKB_GSO_TCPV4 )) +return ERR_PTR (-EINVAL ); +if (!pskb_may_pull (skb,sizeof (struct tcphdr )))return ERR_PTR (-EINVAL );
net/ipv4/tcp_timer.c +15 -0
@@ -50,11 +50,19 @@ static void tcp_write_err(struct sock *sk)* to prevent DoS attacks. It is called when a retransmission timeout * or zero probe timeout occurs on orphaned socket. * +* Also close if our net namespace is exiting; in that case there is no +* hope of ever communicating again since all netns interfaces are already +* down (or about to be down), and we need to release our dst references, +* which have been moved to the netns loopback interface, so the namespace +* can finish exiting. This condition is only possible if we are a kernel +* socket, as those do not hold references to the namespace. +* * Criteria is still not confirmed experimentally and may change. * We kill the socket, if: * 1. If number of orphaned sockets exceeds an administratively configured * limit. * 2. If we have strong memory pressure. +* 3. If our net namespace is exiting. */ static int tcp_out_of_resources (struct sock *sk,bool do_reset) {
@@ -83,6 +91,13 @@ static int tcp_out_of_resources(struct sock *sk, bool do_reset)__NET_INC_STATS (sock_net (sk),LINUX_MIB_TCPABORTONMEMORY );return 1 ; } + +if (!check_net (sock_net (sk))) { +/* Not possible to send reset; just close */ +tcp_done (sk); +return 1 ; + } +return 0 ; }
net/ipv4/udp_offload.c +3 -0
@@ -203,6 +203,9 @@ static struct sk_buff *udp4_ufo_fragment(struct sk_buff *skb, goto out; } +if (!(skb_shinfo (skb)->gso_type &SKB_GSO_UDP )) + goto out; +if (!pskb_may_pull (skb,sizeof (struct udphdr ))) goto out;
net/ipv6/esp6_offload.c +3 -0
@@ -148,6 +148,9 @@ static struct sk_buff *esp6_gso_segment(struct sk_buff *skb,if (!xo) goto out; +if (!(skb_shinfo (skb)->gso_type &SKB_GSO_ESP )) + goto out; + seq = xo->seq.low; x = skb->sp->xvec[skb->sp->len -1 ];
net/ipv6/ip6_gre.c +7 -7
@@ -337,11 +337,12 @@ static struct ip6_tnl *ip6gre_tunnel_locate(struct net *net, nt->dev = dev; nt->net =dev_net (dev); -ip6gre_tnl_link_config (nt,1 );if (register_netdevice (dev) <0 ) goto failed_free; +ip6gre_tnl_link_config (nt,1 ); +/* Can use a lockless transmit, unless we generate output sequences */ if (!(nt->parms.o_flags &TUNNEL_SEQ )) dev->features |=NETIF_F_LLTX ;
@@ -1307,7 +1308,6 @@ static void ip6gre_netlink_parms(struct nlattr *data[],static int ip6gre_tap_init (struct net_device *dev) { -struct ip6_tnl *tunnel;int ret; ret =ip6gre_tunnel_init_common (dev);
@@ -1316,10 +1316,6 @@ static int ip6gre_tap_init(struct net_device *dev) dev->priv_flags |=IFF_LIVE_ADDR_CHANGE ; - tunnel =netdev_priv (dev); - -ip6gre_tnl_link_config (tunnel,1 ); -return 0 ; }
@@ -1411,12 +1407,16 @@ static int ip6gre_newlink(struct net *src_net, struct net_device *dev, nt->dev = dev; nt->net =dev_net (dev); -ip6gre_tnl_link_config (nt, !tb[IFLA_MTU ]); err =register_netdevice (dev);if (err) goto out; +ip6gre_tnl_link_config (nt, !tb[IFLA_MTU ]); + +if (tb[IFLA_MTU ]) +ip6_tnl_change_mtu (dev,nla_get_u32 (tb[IFLA_MTU ])); +dev_hold (dev);ip6gre_tunnel_link (ign, nt);
net/ipv6/ip6_output.c +6 -3
@@ -166,7 +166,7 @@ int ip6_output(struct net *net, struct sock *sk, struct sk_buff *skb) !(IP6CB(skb)->flags & IP6SKB_REROUTED)); } -static bool ip6_autoflowlabel (struct net *net,const struct ipv6_pinfo *np) +bool ip6_autoflowlabel (struct net *net,const struct ipv6_pinfo *np) {if (!np->autoflowlabel_set)return ip6_default_np_autolabel (net);
@@ -1206,14 +1206,16 @@ static int ip6_setup_cork(struct sock *sk, struct inet_cork_full *cork, v6_cork->tclass = ipc6->tclass;if (rt->dst.flags &DST_XFRM_TUNNEL ) mtu = np->pmtudisc >=IPV6_PMTUDISC_PROBE ? - rt->dst.dev->mtu :dst_mtu (&rt->dst); +READ_ONCE (rt->dst.dev->mtu) :dst_mtu (&rt->dst);else mtu = np->pmtudisc >=IPV6_PMTUDISC_PROBE ? - rt->dst.dev->mtu :dst_mtu (rt->dst.path); +READ_ONCE (rt->dst.dev->mtu) :dst_mtu (rt->dst.path);if (np->frag_size < mtu) {if (np->frag_size) mtu = np->frag_size; } +if (mtu <IPV6_MIN_MTU ) +return -EINVAL ; cork->base.fragsize = mtu;if (dst_allfrag (rt->dst.path)) cork->base.flags |=IPCORK_ALLFRAG ;
@@ -1733,6 +1735,7 @@ struct sk_buff *ip6_make_skb(struct sock *sk, cork.base.flags =0 ; cork.base.addr =0 ; cork.base.opt =NULL ; + cork.base.dst =NULL ; v6_cork.opt =NULL ; err =ip6_setup_cork (sk, &cork, &v6_cork, ipc6, rt, fl6);if (err) {
net/ipv6/ipv6_sockglue.c +1 -1
@@ -1324,7 +1324,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,break ;case IPV6_AUTOFLOWLABEL : - val = np->autoflowlabel; + val =ip6_autoflowlabel (sock_net (sk), np);break ;case IPV6_RECVFRAGSIZE :
net/ipv6/tcpv6_offload.c +3 -0
@@ -46,6 +46,9 @@ static struct sk_buff *tcp6_gso_segment(struct sk_buff *skb, {struct tcphdr *th; +if (!(skb_shinfo (skb)->gso_type &SKB_GSO_TCPV6 )) +return ERR_PTR (-EINVAL ); +if (!pskb_may_pull (skb,sizeof (*th)))return ERR_PTR (-EINVAL );
net/ipv6/udp_offload.c +3 -0
@@ -42,6 +42,9 @@ static struct sk_buff *udp6_ufo_fragment(struct sk_buff *skb,const struct ipv6hdr *ipv6h;struct udphdr *uh; +if (!(skb_shinfo (skb)->gso_type &SKB_GSO_UDP )) + goto out; +if (!pskb_may_pull (skb,sizeof (struct udphdr ))) goto out;
net/netfilter/nfnetlink_cthelper.c +10 -0
@@ -17,6 +17,7 @@#include <linux/types.h> #include <linux/list.h> #include <linux/errno.h> +#include <linux/capability.h> #include <net/netlink.h> #include <net/sock.h>
@@ -407,6 +408,9 @@ static int nfnl_cthelper_new(struct net *net, struct sock *nfnl,struct nfnl_cthelper *nlcth;int ret =0 ; +if (!capable (CAP_NET_ADMIN )) +return -EPERM ; +if (!tb[NFCTH_NAME ] || !tb[NFCTH_TUPLE ])return -EINVAL ;
@@ -611,6 +615,9 @@ static int nfnl_cthelper_get(struct net *net, struct sock *nfnl,struct nfnl_cthelper *nlcth;bool tuple_set = false; +if (!capable (CAP_NET_ADMIN )) +return -EPERM ; +if (nlh->nlmsg_flags &NLM_F_DUMP ) {struct netlink_dump_control c = { .dump = nfnl_cthelper_dump_table,
@@ -678,6 +685,9 @@ static int nfnl_cthelper_del(struct net *net, struct sock *nfnl,struct nfnl_cthelper *nlcth, *n;int j =0 , ret; +if (!capable (CAP_NET_ADMIN )) +return -EPERM ; +if (tb[NFCTH_NAME ]) helper_name =nla_data (tb[NFCTH_NAME ]);
net/netfilter/xt_osf.c +7 -0
@@ -19,6 +19,7 @@#include <linux/module.h> #include <linux/kernel.h> +#include <linux/capability.h> #include <linux/if.h> #include <linux/inetdevice.h> #include <linux/ip.h>
@@ -70,6 +71,9 @@ static int xt_osf_add_callback(struct net *net, struct sock *ctnl,struct xt_osf_finger *kf =NULL , *sf;int err =0 ; +if (!capable (CAP_NET_ADMIN )) +return -EPERM ; +if (!osf_attrs[OSF_ATTR_FINGER ])return -EINVAL ;
@@ -115,6 +119,9 @@ static int xt_osf_remove_callback(struct net *net, struct sock *ctnl,struct xt_osf_finger *sf;int err = -ENOENT ; +if (!capable (CAP_NET_ADMIN )) +return -EPERM ; +if (!osf_attrs[OSF_ATTR_FINGER ])return -EINVAL ;
net/netlink/af_netlink.c +2 -1
@@ -2393,13 +2393,14 @@ int netlink_rcv_skb(struct sk_buff *skb, int (*cb)(struct sk_buff *, struct nlmsghdr *, struct netlink_ext_ack *)) { -struct netlink_ext_ack extack = {}; +struct netlink_ext_ack extack;struct nlmsghdr *nlh;int err;while (skb->len >=nlmsg_total_size (0 )) {int msglen; +memset (&extack,0 ,sizeof (extack)); nlh =nlmsg_hdr (skb); err =0 ;
net/sctp/offload.c +3 -0
@@ -45,6 +45,9 @@ static struct sk_buff *sctp_gso_segment(struct sk_buff *skb,struct sk_buff *segs =ERR_PTR (-EINVAL );struct sctphdr *sh; +if (!(skb_shinfo (skb)->gso_type &SKB_GSO_SCTP )) + goto out; + sh =sctp_hdr (skb);if (!pskb_may_pull (skb,sizeof (*sh))) goto out;
net/sctp/socket.c +20 -20
@@ -84,7 +84,7 @@static int sctp_writeable (struct sock *sk);static void sctp_wfree (struct sk_buff *skb);static int sctp_wait_for_sndbuf (struct sctp_association *asoc,long *timeo_p, -size_t msg_len,struct sock **orig_sk); +size_t msg_len);static int sctp_wait_for_packet (struct sock *sk,int *err,long *timeo_p);static int sctp_wait_for_connect (struct sctp_association *,long *timeo_p);static int sctp_wait_for_accept (struct sock *sk,long timeo);
@@ -334,16 +334,14 @@ static struct sctp_af *sctp_sockaddr_af(struct sctp_sock *opt,if (len <sizeof (struct sockaddr ))return NULL ; +if (!opt->pf->af_supported (addr->sa.sa_family, opt)) +return NULL ; +/* V4 mapped address are really of AF_INET family */ if (addr->sa.sa_family ==AF_INET6 && -ipv6_addr_v4mapped (&addr->v6.sin6_addr)) { -if (!opt->pf->af_supported (AF_INET , opt)) -return NULL ; - }else { -/* Does this PF support this AF? */ -if (!opt->pf->af_supported (addr->sa.sa_family, opt)) -return NULL ; - } +ipv6_addr_v4mapped (&addr->v6.sin6_addr) && + !opt->pf->af_supported (AF_INET , opt)) +return NULL ;/* If we get this far, af is valid. */ af =sctp_get_af_specific (addr->sa.sa_family);
@@ -1882,8 +1880,14 @@ static int sctp_sendmsg(struct sock *sk, struct msghdr *msg, size_t msg_len)*/ if (sinit) {if (sinit->sinit_num_ostreams) { - asoc->c.sinit_num_ostreams = - sinit->sinit_num_ostreams; +__u16 outcnt = sinit->sinit_num_ostreams; + + asoc->c.sinit_num_ostreams = outcnt; +/* outcnt has been changed, so re-init stream */ + err =sctp_stream_init (&asoc->stream, outcnt,0 , +GFP_KERNEL ); +if (err) + goto out_free; }if (sinit->sinit_max_instreams) { asoc->c.sinit_max_instreams =
@@ -1963,7 +1967,7 @@ static int sctp_sendmsg(struct sock *sk, struct msghdr *msg, size_t msg_len) timeo =sock_sndtimeo (sk, msg->msg_flags &MSG_DONTWAIT );if (!sctp_wspace (asoc)) {/* sk can be changed by peel off when waiting for buf. */ - err =sctp_wait_for_sndbuf (asoc, &timeo, msg_len, &sk); + err =sctp_wait_for_sndbuf (asoc, &timeo, msg_len);if (err) {if (err == -ESRCH ) {/* asoc is already dead. */
@@ -7827,12 +7831,12 @@ void sctp_sock_rfree(struct sk_buff *skb)/* Helper function to wait for space in the sndbuf. */ static int sctp_wait_for_sndbuf (struct sctp_association *asoc,long *timeo_p, -size_t msg_len,struct sock **orig_sk) +size_t msg_len) {struct sock *sk = asoc->base.sk; -int err =0 ;long current_timeo = *timeo_p;DEFINE_WAIT (wait); +int err =0 ;pr_debug ("%s: asoc:%p, timeo:%ld, msg_len:%zu\n" , __func__, asoc, *timeo_p, msg_len);
@@ -7861,17 +7865,13 @@ static int sctp_wait_for_sndbuf(struct sctp_association *asoc, long *timeo_p,release_sock (sk); current_timeo =schedule_timeout (current_timeo);lock_sock (sk); -if (sk != asoc->base.sk) { -release_sock (sk); - sk = asoc->base.sk; -lock_sock (sk); - } +if (sk != asoc->base.sk) + goto do_error; *timeo_p = current_timeo; } out: - *orig_sk = sk;finish_wait (&asoc->wait, &wait);/* Release the association's refcnt. */
net/socket.c +9 -0
@@ -2642,6 +2642,15 @@ static int __init sock_init(void)core_initcall (sock_init);/* early initcall */ +static int __init jit_init (void ) +{ +#ifdef CONFIG_BPF_JIT_ALWAYS_ON + bpf_jit_enable =1 ; +#endif +return 0 ; +} +pure_initcall (jit_init); +#ifdef CONFIG_PROC_FS void socket_seq_show (struct seq_file *seq) {
net/tipc/node.c +14 -12
@@ -1848,36 +1848,38 @@ int tipc_nl_node_get_link(struct sk_buff *skb, struct genl_info *info)if (strcmp (name, tipc_bclink_name) ==0 ) { err =tipc_nl_add_bc_link (net, &msg); -if (err) { -nlmsg_free (msg.skb); -return err; - } +if (err) + goto err_free; }else {int bearer_id;struct tipc_node *node;struct tipc_link *link; node =tipc_node_find_by_name (net, name, &bearer_id); -if (!node) -return -EINVAL ; +if (!node) { + err = -EINVAL ; + goto err_free; + }tipc_node_read_lock (node); link = node->links[bearer_id].link;if (!link) {tipc_node_read_unlock (node); -nlmsg_free (msg.skb); -return -EINVAL ; + err = -EINVAL ; + goto err_free; } err =__tipc_nl_add_link (net, &msg, link,0 );tipc_node_read_unlock (node); -if (err) { -nlmsg_free (msg.skb); -return err; - } +if (err) + goto err_free; }return genlmsg_reply (msg.skb, info); + +err_free: +nlmsg_free (msg.skb); +return err; }int tipc_nl_node_reset_link_stats (struct sk_buff *skb,struct genl_info *info)
net/tls/tls_main.c +14 -3
@@ -364,14 +364,16 @@ static int do_tls_setsockopt_tx(struct sock *sk, char __user *optval, crypto_info = &ctx->crypto_send;/* Currently we don't support set crypto info more than one time */ -if (TLS_CRYPTO_INFO_READY (crypto_info)) +if (TLS_CRYPTO_INFO_READY (crypto_info)) { + rc = -EBUSY ; goto out; + }switch (tmp_crypto_info.cipher_type) {case TLS_CIPHER_AES_GCM_128 : {if (optlen !=sizeof (struct tls12_crypto_info_aes_gcm_128 )) { rc = -EINVAL ; - goto out; + goto err_crypto_info; } rc = copy_from_user( crypto_info,
@@ -386,7 +388,7 @@ static int do_tls_setsockopt_tx(struct sock *sk, char __user *optval, }default : rc = -EINVAL ; - goto out; + goto err_crypto_info; } ctx->sk_write_space = sk->sk_write_space;
@@ -444,6 +446,15 @@ static int tls_init(struct sock *sk)struct tls_context *ctx;int rc =0 ; +/* The TLS ulp is currently supported only for TCP sockets +* in ESTABLISHED state. +* Supporting sockets in LISTEN state will require us +* to modify the accept implementation to clone rather then +* share the ulp context. +*/ +if (sk->sk_state !=TCP_ESTABLISHED ) +return -ENOTSUPP ; +/* allocate tls context */ ctx =kzalloc (sizeof (*ctx),GFP_KERNEL );if (!ctx) {
net/tls/tls_sw.c +9 -7
@@ -407,7 +407,7 @@ int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)while (msg_data_left (msg)) {if (sk->sk_err) { - ret = sk->sk_err; + ret = -sk->sk_err; goto send_end; }
@@ -560,7 +560,7 @@ int tls_sw_sendpage(struct sock *sk, struct page *page,size_t copy, required_size;if (sk->sk_err) { - ret = sk->sk_err; + ret = -sk->sk_err; goto sendpage_end; }
@@ -697,18 +697,17 @@ int tls_set_sw_offload(struct sock *sk, struct tls_context *ctx) }default : rc = -EINVAL ; - goto out; + goto free_priv; } ctx->prepend_size =TLS_HEADER_SIZE + nonce_size; ctx->tag_size = tag_size; ctx->overhead_size = ctx->prepend_size + ctx->tag_size; ctx->iv_size = iv_size; - ctx->iv =kmalloc (iv_size +TLS_CIPHER_AES_GCM_128_SALT_SIZE , -GFP_KERNEL ); + ctx->iv =kmalloc (iv_size +TLS_CIPHER_AES_GCM_128_SALT_SIZE ,GFP_KERNEL );if (!ctx->iv) { rc = -ENOMEM ; - goto out; + goto free_priv; }memcpy (ctx->iv, gcm_128_info->salt,TLS_CIPHER_AES_GCM_128_SALT_SIZE );memcpy (ctx->iv +TLS_CIPHER_AES_GCM_128_SALT_SIZE , iv, iv_size);
@@ -756,7 +755,7 @@ int tls_set_sw_offload(struct sock *sk, struct tls_context *ctx) rc =crypto_aead_setauthsize (sw_ctx->aead_send, ctx->tag_size);if (!rc) - goto out; +return 0 ; free_aead:crypto_free_aead (sw_ctx->aead_send);
@@ -767,6 +766,9 @@ int tls_set_sw_offload(struct sock *sk, struct tls_context *ctx) free_iv:kfree (ctx->iv); ctx->iv =NULL ; +free_priv: +kfree (ctx->priv_ctx); + ctx->priv_ctx =NULL ; out:return rc; }
net/xfrm/xfrm_policy.c +7 -1
@@ -2056,8 +2056,11 @@ xfrm_bundle_lookup(struct net *net, const struct flowi *fl, u16 family, u8 dir,if (num_xfrms <=0 ) goto make_dummy_bundle; +local_bh_disable (); xdst =xfrm_resolve_and_create_bundle (pols, num_pols, fl, family, - xflo->dst_orig); + xflo->dst_orig); +local_bh_enable (); +if (IS_ERR (xdst)) { err =PTR_ERR (xdst);if (err != -EAGAIN )
@@ -2144,9 +2147,12 @@ struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry *dst_orig, goto no_transform; } +local_bh_disable (); xdst =xfrm_resolve_and_create_bundle ( pols, num_pols, fl, family, dst_orig); +local_bh_enable (); +if (IS_ERR (xdst)) {xfrm_pols_put (pols, num_pols); err =PTR_ERR (xdst);
tools/testing/selftests/bpf/test_verifier.c +27 -2
@@ -2595,6 +2595,29 @@ static struct bpf_test tests[] = { .result = ACCEPT, .prog_type = BPF_PROG_TYPE_SCHED_CLS, }, + { + "context stores via ST", + .insns = { +BPF_MOV64_IMM (BPF_REG_0 ,0 ), +BPF_ST_MEM (BPF_DW ,BPF_REG_1 , offsetof(struct __sk_buff , mark),0 ), + BPF_EXIT_INSN(), + }, + .errstr ="BPF_ST stores into R1 context is not allowed" , + .result = REJECT, + .prog_type = BPF_PROG_TYPE_SCHED_CLS, + }, + { +"context stores via XADD" , + .insns = { +BPF_MOV64_IMM (BPF_REG_0 ,0 ), +BPF_RAW_INSN (BPF_STX |BPF_XADD |BPF_W ,BPF_REG_1 , +BPF_REG_0 , offsetof(struct __sk_buff , mark),0 ), + BPF_EXIT_INSN(), + }, + .errstr ="BPF_XADD stores into R1 context is not allowed" , + .result = REJECT, + .prog_type = BPF_PROG_TYPE_SCHED_CLS, + }, {"direct packet access: test1" , .insns = {
@@ -4317,7 +4340,8 @@ static struct bpf_test tests[] = { .fixup_map1 = { 2 }, .errstr_unpriv = "R2 leaks addr into mem", .result_unpriv = REJECT, - .result =ACCEPT , + .result = REJECT, + .errstr ="BPF_XADD stores into R1 context is not allowed" , }, { "leak pointer into ctx 2",
@@ -4331,7 +4355,8 @@ static struct bpf_test tests[] = { }, .errstr_unpriv = "R10 leaks addr into mem", .result_unpriv = REJECT, - .result = ACCEPT, + .result = REJECT, + .errstr = "BPF_XADD stores into R1 context is not allowed", }, { "leak pointer into ctx 3",