diff options
| author | David S. Miller <davem@davemloft.net> | 2020-06-23 14:50:34 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-23 14:50:34 -0700 |
| commit | d3043c89e415d3754799c60e1b9fef5f2842dd82 (patch) | |
| tree | ec7ca53c9862c0769edb011dbf8360e6973df215 /drivers/net/wireguard/device.h | |
| parent | df25f3828e5f181d11919947451df84229de487b (diff) | |
| parent | be0d977e56c769b2610db430604ad7ff1ed31408 (diff) | |
| download | wireguard-linux-trimmed-d3043c89e415d3754799c60e1b9fef5f2842dd82.tar.gz wireguard-linux-trimmed-d3043c89e415d3754799c60e1b9fef5f2842dd82.zip | |
Merge branch 'wg-fixes'
Jason A. Donenfeld says:
====================
wireguard fixes for 5.8-rc3
This series contains two fixes, one cosmetic and one quite important:
1) Avoid the `if ((x = f()) == y)` pattern, from Frank
Werner-Krippendorf.
2) Mitigate a potential memory leak by creating circular netns
references, while also making the netns semantics a bit more
robust.
Patch (2) has a "Fixes:" line and should be backported to stable.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireguard/device.h')
| -rw-r--r-- | drivers/net/wireguard/device.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireguard/device.h b/drivers/net/wireguard/device.h index b15a8be..4d0144e 100644 --- a/drivers/net/wireguard/device.h +++ b/drivers/net/wireguard/device.h @@ -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); |