diff options
| author | David S. Miller <davem@davemloft.net> | 2020-02-16 19:21:56 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-16 19:21:56 -0800 |
| commit | 105ba8ae51e0178462b4cdf2f82c6e98fac19c04 (patch) | |
| tree | 45c25559bb0f029fdf9124ce469801077719a187 /drivers/net/wireguard/device.c | |
| parent | 95439795d896dc0b07099a27429c14711eb57abb (diff) | |
| parent | 5c80736eb84941b393338b8af1e032a829d78654 (diff) | |
| download | wireguard-linux-trimmed-105ba8ae51e0178462b4cdf2f82c6e98fac19c04.tar.gz wireguard-linux-trimmed-105ba8ae51e0178462b4cdf2f82c6e98fac19c04.zip | |
Merge branch 'wireguard-fixes'
Jason A. Donenfeld says:
====================
wireguard fixes for 5.6-rc2
Here are four fixes for wireguard collected since rc1:
1) Some small cleanups to the test suite to help massively parallel
builds.
2) A change in how we reset our load calculation to avoid a more
expensive comparison, suggested by Matt Dunwoodie.
3) I've been loading more and more of wireguard's surface into
syzkaller, trying to get our coverage as complete as possible,
leading in this case to a fix for mtu=0 devices.
4) A removal of superfluous code, pointed out by Eric Dumazet.
v2 fixes a logical problem in the patch for (3) pointed out by Eric Dumazet. v3
replaces some non-obvious bitmath in (3) with a more obvious expression, and
adds patch (4).
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireguard/device.c')
| -rw-r--r-- | drivers/net/wireguard/device.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireguard/device.c b/drivers/net/wireguard/device.c index 43db442..cdc9696 100644 --- a/drivers/net/wireguard/device.c +++ b/drivers/net/wireguard/device.c @@ -258,6 +258,8 @@ static void wg_setup(struct net_device *dev) enum { WG_NETDEV_FEATURES = NETIF_F_HW_CSUM | NETIF_F_RXCSUM | NETIF_F_SG | NETIF_F_GSO | NETIF_F_GSO_SOFTWARE | NETIF_F_HIGHDMA }; + const int overhead = MESSAGE_MINIMUM_LENGTH + sizeof(struct udphdr) + + max(sizeof(struct ipv6hdr), sizeof(struct iphdr)); dev->netdev_ops = &netdev_ops; dev->hard_header_len = 0; @@ -271,9 +273,8 @@ static void wg_setup(struct net_device *dev) dev->features |= WG_NETDEV_FEATURES; dev->hw_features |= WG_NETDEV_FEATURES; dev->hw_enc_features |= WG_NETDEV_FEATURES; - dev->mtu = ETH_DATA_LEN - MESSAGE_MINIMUM_LENGTH - - sizeof(struct udphdr) - - max(sizeof(struct ipv6hdr), sizeof(struct iphdr)); + dev->mtu = ETH_DATA_LEN - overhead; + dev->max_mtu = round_down(INT_MAX, MESSAGE_PADDING_MULTIPLE) - overhead; SET_NETDEV_DEVTYPE(dev, &device_type); |