net: Update WireGuard to 1.0.20200712 snapshot (6d065485) · Commits · e / devices / android_kernel_sony_msm8998

net/wireguard/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		#
		# Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.

		ccflags-y := -O3 -fvisibility=hidden
		ccflags-y := -O3
		ccflags-$(CONFIG_WIREGUARD_DEBUG) += -DDEBUG -g
		ccflags-y += -D'pr_fmt(fmt)=KBUILD_MODNAME ": " fmt'
		ccflags-y += -Wframe-larger-than=2048

net/wireguard/compat/compat.h

+53 −30

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@
		#define ISRHEL7
		#elif RHEL_MAJOR == 8
		#define ISRHEL8
		#if RHEL_MINOR == 1
		#if RHEL_MINOR == 2
		#define ISCENTOS8
		#endif
		#endif
		@@ -26,20 +26,16 @@
		#define ISUBUNTU1404
		#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)
		#define ISUBUNTU1604
		#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
		#define ISUBUNTU1804
		#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
		#define ISUBUNTU1904
		#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
		#define ISUBUNTU1910
		#endif
		#endif
		#ifdef CONFIG_SUSE_KERNEL
		#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)
		#define ISOPENSUSE42
		#endif
		#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
		#define ISOPENSUSE15
		#endif
		#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
		#define ISOPENSUSE152
		#endif
		#if defined(CONFIG_SUSE_KERNEL) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
		#define ISOPENSUSE151
		#endif

		#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
		@@ -98,7 +94,7 @@

		#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 83)
		#define ipv6_dst_lookup_flow(a, b, c, d) ipv6_dst_lookup_flow(b, c, d)
		#elif (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 5) && LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)) \|\| (LINUX_VERSION_CODE < KERNEL_VERSION(5, 3, 18) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)) \|\| ((!defined(ISRHEL8) \|\| defined(ISCENTOS8)) && !defined(ISDEBIAN) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 119) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)) \|\| (LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 181) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)) \|\| (LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 224) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)) \|\| LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 224)
		#elif (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 5) && LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)) \|\| (LINUX_VERSION_CODE < KERNEL_VERSION(5, 3, 18) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0) && !defined(ISUBUNTU1904)) \|\| (!defined(ISRHEL8) && !defined(ISDEBIAN) && !defined(ISUBUNTU1804) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 119) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)) \|\| (LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 181) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)) \|\| (LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 224) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)) \|\| (LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 224) && !defined(ISUBUNTU1604))
		#define ipv6_dst_lookup_flow(a, b, c, d) ipv6_dst_lookup(a, b, &dst, c) + (void *)0 ?: dst
		#endif

		@@ -115,7 +111,7 @@ static const struct ipv6_stub_type ipv6_stub_impl = {
		static const struct ipv6_stub_type *ipv6_stub = &ipv6_stub_impl;
		#endif

		#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0) && IS_ENABLED(CONFIG_IPV6) && !defined(ISOPENSUSE42) && !defined(ISRHEL7)
		#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0) && IS_ENABLED(CONFIG_IPV6) && !defined(ISRHEL7)
		#include <net/addrconf.h>
		static inline bool ipv6_mod_enabled(void)
		{
		@@ -222,9 +218,11 @@ static inline void skb_scrub_packet(struct sk_buff *skb, bool xnet)
		skb_orphan(skb);
		skb->mark = 0;
		}
		#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
		#define skb_scrub_packet(a, b) skb_scrub_packet(a)
		#endif

		#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) \|\| defined(ISUBUNTU1404)) && !defined(ISRHEL7)
		#if ((LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0)) \|\| LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 63) \|\| defined(ISUBUNTU1404)) && !defined(ISRHEL7)
		#include <linux/random.h>
		static inline u32 __compat_prandom_u32_max(u32 ep_ro)
		{
		@@ -233,7 +231,8 @@ static inline u32 __compat_prandom_u32_max(u32 ep_ro)
		#define prandom_u32_max __compat_prandom_u32_max
		#endif

		#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 75) && !defined(ISRHEL7)
		#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0)
		#include <linux/kernel.h>
		#ifndef U8_MAX
		#define U8_MAX ((u8)~0U)
		#endif
		@@ -272,9 +271,7 @@ static inline u32 __compat_prandom_u32_max(u32 ep_ro)
		#endif
		#endif

		#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 60) && !defined(ISRHEL7)
		/* Making this static may very well invalidate its usefulness,
		* but so it goes with compat code. */
		#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 3) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)) \|\| (LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 35) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)) \|\| (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 24) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) && !defined(ISUBUNTU1404)) \|\| (LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 33) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)) \|\| (LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 60) && !defined(ISRHEL7))
		static inline void memzero_explicit(void *s, size_t count)
		{
		memset(s, 0, count);
		@@ -287,7 +284,7 @@ static const struct in6_addr __compat_in6addr_any = IN6ADDR_ANY_INIT;
		#define in6addr_any __compat_in6addr_any
		#endif

		#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) && !defined(ISOPENSUSE15)
		#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) && !defined(ISOPENSUSE151)
		#include <linux/completion.h>
		#include <linux/random.h>
		#include <linux/errno.h>
		@@ -383,7 +380,7 @@ static inline bool rng_is_initialized(void)
		}
		#endif

		#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0) && !defined(ISOPENSUSE15)
		#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0) && !defined(ISOPENSUSE151)
		static inline int get_random_bytes_wait(void *buf, int nbytes)
		{
		int ret = wait_for_random_bytes();
		@@ -526,7 +523,7 @@ static inline void __compat_kvfree(const void *addr)
		#define priv_destructor destructor
		#endif

		#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0) && !defined(ISOPENSUSE15)
		#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0) && !defined(ISOPENSUSE151)
		#define wg_newlink(a,b,c,d,e) wg_newlink(a,b,c,d)
		#endif

		@@ -665,12 +662,12 @@ struct __compat_dummy_container { char dev; };
		#define COMPAT_CANNOT_USE_AVX512
		#endif

		#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) && !defined(ISOPENSUSE15)
		#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) && !defined(ISOPENSUSE151)
		#include <net/genetlink.h>
		#define genl_dump_check_consistent(a, b) genl_dump_check_consistent(a, b, &genl_family)
		#endif

		#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0) && !defined(ISRHEL7) && !defined(ISOPENSUSE15)
		#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0) && !defined(ISRHEL7) && !defined(ISOPENSUSE151)
		static inline void skb_put_data(struct sk_buff skb, const void *data, unsigned int len)
		{
		void *tmp = skb_put(skb, len);
		@@ -727,7 +724,7 @@ static inline void cpu_to_le32_array(u32 *buf, unsigned int words)
		}
		#endif

		#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) && !defined(ISOPENSUSE15)
		#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) && !defined(ISOPENSUSE151)
		#include <crypto/algapi.h>
		static inline void crypto_xor_cpy(u8 dst, const u8 src1, const u8 *src2,
		unsigned int size)
		@@ -788,7 +785,7 @@ struct __kernel_timespec {
		#endif
		#endif

		#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) && (!defined(ISRHEL8) \|\| defined(ISCENTOS8))
		#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) && !defined(ISRHEL8)
		#include <linux/skbuff.h>
		#define skb_probe_transport_header(a) skb_probe_transport_header(a, 0)
		#endif
		@@ -797,7 +794,7 @@ struct __kernel_timespec {
		#define ignore_df local_df
		#endif

		#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) && (!defined(ISRHEL8) \|\| defined(ISCENTOS8))
		#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) && !defined(ISRHEL8)
		/* Note that all intentional uses of the non-_bh variety need to explicitly
		* undef these, conditionalized on COMPAT_CANNOT_DEPRECIATE_BH_RCU.
		*/
		@@ -829,7 +826,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) && !defined(ISRHEL8) && !defined(ISOPENSUSE15)
		#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 10) && !defined(ISRHEL8) && !defined(ISOPENSUSE151)
		static inline void skb_mark_not_on_list(struct sk_buff *skb)
		{
		skb->next = NULL;
		@@ -839,7 +836,7 @@ static inline void skb_mark_not_on_list(struct sk_buff *skb)
		#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0) && !defined(ISRHEL8)
		#define NLA_EXACT_LEN NLA_UNSPEC
		#endif
		#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) && (!defined(ISRHEL8) \|\| defined(ISCENTOS8))
		#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) && !defined(ISRHEL8)
		#define NLA_MIN_LEN NLA_UNSPEC
		#define COMPAT_CANNOT_INDIVIDUAL_NETLINK_OPS_POLICY
		#endif
		@@ -855,7 +852,7 @@ static inline void skb_mark_not_on_list(struct sk_buff *skb)
		#endif
		#endif

		#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0) && !defined(ISOPENSUSE152)
		#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
		#define genl_dumpit_info(cb) ({ \
		struct { struct nlattr *attrs; } a = (void )((u8 )cb->args + offsetofend(struct dump_ctx, next_allowedip)); \
		BUILD_BUG_ON(sizeof(cb->args) < offsetofend(struct dump_ctx, next_allowedip) + sizeof(*a)); \
		@@ -1018,7 +1015,7 @@ out:
		#define COMPAT_CANNOT_USE_MAX_MTU
		#endif

		#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 14) && LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)) \|\| (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 29) && !defined(ISUBUNTU1910))
		#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 14) && LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)) \|\| (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 29) && !defined(ISUBUNTU1910) && !defined(ISUBUNTU1904) && (!defined(ISRHEL8) \|\| defined(ISCENTOS8)))
		#include <linux/skbuff.h>
		#include <net/sch_generic.h>
		static inline void skb_reset_redirect(struct sk_buff *skb)
		@@ -1042,6 +1039,32 @@ static inline void skb_reset_redirect(struct sk_buff *skb)
		#define sw_hash ignore_df = 0; skb->nf_trace = skb->ooo_okay
		#endif

		#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 3, 0)
		#define pre_exit exit
		#endif

		#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
		#include <linux/skbuff.h>
		static inline __be16 ip_tunnel_parse_protocol(const struct sk_buff *skb)
		{
		if (skb_network_header(skb) >= skb->head &&
		(skb_network_header(skb) + sizeof(struct iphdr)) <= skb_tail_pointer(skb) &&
		ip_hdr(skb)->version == 4)
		return htons(ETH_P_IP);
		if (skb_network_header(skb) >= skb->head &&
		(skb_network_header(skb) + sizeof(struct ipv6hdr)) <= skb_tail_pointer(skb) &&
		ipv6_hdr(skb)->version == 6)
		return htons(ETH_P_IPV6);
		return 0;
		}
		#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0) \|\| defined(ISRHEL8)
		static const struct header_ops ip_tunnel_header_ops = { .parse_protocol = ip_tunnel_parse_protocol };
		#else
		#define header_ops hard_header_len
		#define ip_tunnel_header_ops (char )0 - (char *)0
		#endif
		#endif

		#if defined(ISUBUNTU1604) \|\| defined(ISRHEL7)
		#include <linux/siphash.h>
		#ifndef _WG_LINUX_SIPHASH_H

net/wireguard/compat/udp_tunnel/udp_tunnel.c

+12 −5

Original line number	Diff line number	Diff line
		@@ -135,7 +135,7 @@ static void __compat_fake_destructor(struct sk_buff *skb)
		{
		}

		#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0)
		#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0)
		static void __compat_iptunnel_xmit(struct rtable rt, struct sk_buff skb,
		__be32 src, __be32 dst, __u8 proto,
		__u8 tos, __u8 ttl, __be16 df, bool xnet)
		@@ -183,7 +183,7 @@ void udp_tunnel_xmit_skb(struct rtable rt, struct sock sk, struct sk_buff *skb
		bool xnet, bool nocheck)
		{
		struct udphdr *uh;
		#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0)
		#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
		struct net_device *dev = skb->dev;
		int ret;
		#endif
		@@ -204,15 +204,22 @@ void udp_tunnel_xmit_skb(struct rtable rt, struct sock sk, struct sk_buff *skb
		skb->sk = sk;
		if (!skb->destructor)
		skb->destructor = __compat_fake_destructor;
		#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0)
		#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
		ret =
		#endif
		iptunnel_xmit(
		#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
		sk,
		#endif
		rt, skb, src, dst, IPPROTO_UDP, tos, ttl, df, xnet);
		#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0)
		#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
		dev_net(dev),
		#endif
		rt, skb, src, dst, IPPROTO_UDP, tos, ttl, df
		#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0) \|\| LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0)
		, xnet
		#endif
		);
		#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
		if (ret)
		iptunnel_xmit_stats(ret - 8, &dev->stats, dev->tstats);
		#endif

net/wireguard/device.c

+28 −31

Original line number	Diff line number	Diff line
		@@ -53,17 +53,18 @@ static int wg_open(struct net_device *dev)
		#endif
		#endif

		mutex_lock(&wg->device_update_lock);
		ret = wg_socket_init(wg, wg->incoming_port);
		if (ret < 0)
		return ret;
		mutex_lock(&wg->device_update_lock);
		goto out;
		list_for_each_entry(peer, &wg->peer_list, peer_list) {
		wg_packet_send_staged_packets(peer);
		if (peer->persistent_keepalive_interval)
		wg_packet_send_keepalive(peer);
		}
		out:
		mutex_unlock(&wg->device_update_lock);
		return 0;
		return ret;
		}

		#ifdef CONFIG_PM_SLEEP
		@@ -233,6 +234,7 @@ static void wg_destruct(struct net_device *dev)
		list_del(&wg->device_list);
		rtnl_unlock();
		mutex_lock(&wg->device_update_lock);
		rcu_assign_pointer(wg->creating_net, NULL);
		wg->incoming_port = 0;
		wg_socket_reinit(wg, NULL, NULL);
		/* The final references are cleared in the below calls to destroy_workqueue. */
		@@ -248,13 +250,11 @@ static void wg_destruct(struct net_device *dev)
		skb_queue_purge(&wg->incoming_handshakes);
		free_percpu(dev->tstats);
		free_percpu(wg->incoming_handshakes_worker);
		if (wg->have_creating_net_ref)
		put_net(wg->creating_net);
		kvfree(wg->index_hashtable);
		kvfree(wg->peer_hashtable);
		mutex_unlock(&wg->device_update_lock);

		pr_debug("%s: Interface deleted\n", dev->name);
		pr_debug("%s: Interface destroyed\n", dev->name);
		free_netdev(dev);
		}

		@@ -270,6 +270,7 @@ static void wg_setup(struct net_device *dev)
		max(sizeof(struct ipv6hdr), sizeof(struct iphdr));

		dev->netdev_ops = &netdev_ops;
		dev->header_ops = &ip_tunnel_header_ops;
		dev->hard_header_len = 0;
		dev->addr_len = 0;
		dev->needed_headroom = DATA_PACKET_HEAD_ROOM;
		@@ -306,7 +307,7 @@ static int wg_newlink(struct net src_net, struct net_device dev,
		struct wg_device *wg = netdev_priv(dev);
		int ret = -ENOMEM;

		wg->creating_net = src_net;
		rcu_assign_pointer(wg->creating_net, src_net);
		init_rwsem(&wg->static_identity.lock);
		mutex_init(&wg->socket_update_lock);
		mutex_init(&wg->device_update_lock);
		@@ -407,30 +408,26 @@ static struct rtnl_link_ops link_ops __read_mostly = {
		.newlink = wg_newlink,
		};

		static int wg_netdevice_notification(struct notifier_block *nb,
		unsigned long action, void *data)
		static void wg_netns_pre_exit(struct net *net)
		{
		struct net_device dev = ((struct netdev_notifier_info )data)->dev;
		struct wg_device *wg = netdev_priv(dev);

		ASSERT_RTNL();

		if (action != NETDEV_REGISTER \|\| dev->netdev_ops != &netdev_ops)
		return 0;
		struct wg_device *wg;

		if (dev_net(dev) == wg->creating_net && wg->have_creating_net_ref) {
		put_net(wg->creating_net);
		wg->have_creating_net_ref = false;
		} else if (dev_net(dev) != wg->creating_net &&
		!wg->have_creating_net_ref) {
		wg->have_creating_net_ref = true;
		get_net(wg->creating_net);
		rtnl_lock();
		list_for_each_entry(wg, &device_list, device_list) {
		if (rcu_access_pointer(wg->creating_net) == net) {
		pr_debug("%s: Creating namespace exiting\n", wg->dev->name);
		netif_carrier_off(wg->dev);
		mutex_lock(&wg->device_update_lock);
		rcu_assign_pointer(wg->creating_net, NULL);
		wg_socket_reinit(wg, NULL, NULL);
		mutex_unlock(&wg->device_update_lock);
		}
		return 0;
		}
		rtnl_unlock();
		}

		static struct notifier_block netdevice_notifier = {
		.notifier_call = wg_netdevice_notification
		static struct pernet_operations pernet_ops = {
		.pre_exit = wg_netns_pre_exit
		};

		int __init wg_device_init(void)
		@@ -443,18 +440,18 @@ int __init wg_device_init(void)
		return ret;
		#endif

		ret = register_netdevice_notifier(&netdevice_notifier);
		ret = register_pernet_device(&pernet_ops);
		if (ret)
		goto error_pm;

		ret = rtnl_link_register(&link_ops);
		if (ret)
		goto error_netdevice;
		goto error_pernet;

		return 0;

		error_netdevice:
		unregister_netdevice_notifier(&netdevice_notifier);
		error_pernet:
		unregister_pernet_device(&pernet_ops);
		error_pm:
		#ifdef CONFIG_PM_SLEEP
		unregister_pm_notifier(&pm_notifier);
		@@ -465,7 +462,7 @@ error_pm:
		void wg_device_uninit(void)
		{
		rtnl_link_unregister(&link_ops);
		unregister_netdevice_notifier(&netdevice_notifier);
		unregister_pernet_device(&pernet_ops);
		#ifdef CONFIG_PM_SLEEP
		unregister_pm_notifier(&pm_notifier);
		#endif

net/wireguard/device.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ struct wg_device {
		struct net_device *dev;
		struct crypt_queue encrypt_queue, decrypt_queue;
		struct sock __rcu sock4, sock6;
		struct net *creating_net;
		struct net __rcu *creating_net;
		struct noise_static_identity static_identity;
		struct workqueue_struct handshake_receive_wq, handshake_send_wq;
		struct workqueue_struct *packet_crypt_wq;
		@@ -56,7 +56,6 @@ struct wg_device {
		unsigned int num_peers, device_update_gen;
		u32 fwmark;
		u16 incoming_port;
		bool have_creating_net_ref;
		};

		int wg_device_init(void);