Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 388e1074 authored by derfelot's avatar derfelot
Browse files

net: Update WireGuard to v1.0.20210219

parent 990b2313

net/wireguard/compat/Makefile.include

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src)) 


ccflags-y += -include $(kbuild-dir)/compat/compat.h

asflags-y += -include $(kbuild-dir)/compat/compat-asm.h

LINUXINCLUDE := -DCOMPAT_VERSION=$(VERSION) -DCOMPAT_PATCHLEVEL=$(PATCHLEVEL) -DCOMPAT_SUBLEVEL=$(SUBLEVEL) -I$(kbuild-dir)/compat/version $(LINUXINCLUDE)



ifeq ($(wildcard $(srctree)/include/linux/ptr_ring.h),)

ccflags-y += -I$(kbuild-dir)/compat/ptr_ring/include

net/wireguard/compat/compat.h

+33 −5
Original line number Diff line number Diff line
@@ -823,7 +823,7 @@ static __always_inline void old_rcu_barrier(void) 
#define COMPAT_CANNOT_DEPRECIATE_BH_RCU

#endif



#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 10) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) && !defined(ISRHEL8)) || LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 217)

#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 10) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) && !defined(ISRHEL8) && !defined(ISUBUNTU1804)) || LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 217)

static inline void skb_mark_not_on_list(struct sk_buff *skb)

{

	skb->next = NULL;
@@ -933,11 +933,11 @@ static inline int skb_ensure_writable(struct sk_buff *skb, int write_len) 
#endif



#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)

#include <linux/icmpv6.h>

#include <net/icmp.h>

#if IS_ENABLED(CONFIG_NF_NAT)

#include <linux/ip.h>

#include <linux/icmpv6.h>

#include <net/ipv6.h>

#include <net/icmp.h>

#include <net/netfilter/nf_conntrack.h>

#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) && !defined(ISRHEL8)

#include <net/netfilter/nf_nat_core.h>
@@ -951,6 +951,7 @@ static inline void __compat_icmp_ndo_send(struct sk_buff *skb_in, int type, int 


	ct = nf_ct_get(skb_in, &ctinfo);

	if (!ct || !(ct->status & IPS_SRC_NAT)) {

		memset(skb_in->cb, 0, sizeof(skb_in->cb));

		icmp_send(skb_in, type, code, info);

		return;

	}
@@ -966,6 +967,7 @@ static inline void __compat_icmp_ndo_send(struct sk_buff *skb_in, int type, int 


	orig_ip = ip_hdr(skb_in)->saddr;

	ip_hdr(skb_in)->saddr = ct->tuplehash[0].tuple.src.u3.ip;

	memset(skb_in->cb, 0, sizeof(skb_in->cb));

	icmp_send(skb_in, type, code, info);

	ip_hdr(skb_in)->saddr = orig_ip;

out:
@@ -980,6 +982,7 @@ static inline void __compat_icmpv6_ndo_send(struct sk_buff *skb_in, u8 type, u8 


	ct = nf_ct_get(skb_in, &ctinfo);

	if (!ct || !(ct->status & IPS_SRC_NAT)) {

		memset(skb_in->cb, 0, sizeof(skb_in->cb));

		icmpv6_send(skb_in, type, code, info);

		return;

	}
@@ -995,14 +998,23 @@ static inline void __compat_icmpv6_ndo_send(struct sk_buff *skb_in, u8 type, u8 


	orig_ip = ipv6_hdr(skb_in)->saddr;

	ipv6_hdr(skb_in)->saddr = ct->tuplehash[0].tuple.src.u3.in6;

	memset(skb_in->cb, 0, sizeof(skb_in->cb));

	icmpv6_send(skb_in, type, code, info);

	ipv6_hdr(skb_in)->saddr = orig_ip;

out:

	consume_skb(cloned_skb);

}

#else

#define __compat_icmp_ndo_send icmp_send

#define __compat_icmpv6_ndo_send icmpv6_send

static inline void __compat_icmp_ndo_send(struct sk_buff *skb_in, int type, int code, __be32 info)

{

	memset(skb_in->cb, 0, sizeof(skb_in->cb));

	icmp_send(skb_in, type, code, info);

}

static inline void __compat_icmpv6_ndo_send(struct sk_buff *skb_in, u8 type, u8 code, __u32 info)

{

	memset(skb_in->cb, 0, sizeof(skb_in->cb));

	icmpv6_send(skb_in, type, code, info);

}

#endif

#define icmp_ndo_send __compat_icmp_ndo_send

#define icmpv6_ndo_send __compat_icmpv6_ndo_send
@@ -1068,6 +1080,22 @@ static const struct header_ops ip_tunnel_header_ops = { .parse_protocol = ip_tun 
#define kfree_sensitive(a) kzfree(a)

#endif



#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) && !defined(ISRHEL7)

#define xchg_release xchg

#endif



#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) && !defined(ISRHEL7)

#include <asm/barrier.h>

#ifndef smp_load_acquire

#define smp_load_acquire(p)                                            \

({                                                                     \

       typeof(*p) ___p1 = ACCESS_ONCE(*p);                             \

       smp_mb();                                                       \

       ___p1;                                                          \

})

#endif

#endif



#if defined(ISUBUNTU1604) || defined(ISRHEL7)

#include <linux/siphash.h>

#ifndef _WG_LINUX_SIPHASH_H

net/wireguard/compat/simd/include/linux/simd.h

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include <linux/sched.h>

#include <asm/simd.h>

#if defined(CONFIG_X86_64)

#include <linux/version.h>

#include <asm/fpu/api.h>

#elif defined(CONFIG_KERNEL_MODE_NEON)

#include <asm/neon.h>

net/wireguard/compat/version/linux/version.h

0 → 100644
+10 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (C) 2015-2021 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.

 */



#include_next <linux/version.h>

#undef KERNEL_VERSION

#define KERNEL_VERSION(a, b, c) (((a) << 24) + ((b) << 16) + (c))

#undef LINUX_VERSION_CODE

#define LINUX_VERSION_CODE KERNEL_VERSION(COMPAT_VERSION, COMPAT_PATCHLEVEL, COMPAT_SUBLEVEL)

net/wireguard/crypto/zinc/curve25519/curve25519.c

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include "../selftest/run.h"



#include <asm/unaligned.h>

#include <linux/version.h>

#include <linux/string.h>

#include <linux/random.h>

#include <linux/module.h>