diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-02-23 15:54:08 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-02-23 15:59:35 -0800 |
| commit | ea085e5da33496b0aa965481787dc56410e5eda7 (patch) | |
| tree | 9c09875378fc2a23dd0b8d4f13bad8b98ab9836d /drivers/net/wireguard/socket.c | |
| parent | 1bb13d02e6fff32818ccde759efe88c70afd008e (diff) | |
| parent | b955554b47aff90e56ba402dfce4122cb9b28a4e (diff) | |
| download | wireguard-linux-trimmed-ea085e5da33496b0aa965481787dc56410e5eda7.tar.gz wireguard-linux-trimmed-ea085e5da33496b0aa965481787dc56410e5eda7.zip | |
Merge branch 'wireguard-fixes-for-5-12-rc1'
Jason Donenfeld says:
====================
wireguard fixes for 5.12-rc1
This series has a collection of fixes that have piled up for a little
while now, that I unfortunately didn't get a chance to send out earlier.
1) Removes unlikely() from IS_ERR(), since it's already implied.
2) Remove a bogus sparse annotation that hasn't been needed for years.
3) Addition test in the test suite for stressing parallel ndo_start_xmit.
4) Slight struct reordering in preparation for subsequent fix.
5) If skb->protocol is bogus, we no longer attempt to send icmp messages.
6) Massive memory usage fix, hit by larger deployments.
7) Fix typo in kconfig dependency logic.
(1) and (2) are tiny cleanups, and (3) is just a test, so if you're
trying to reduce churn, you could not backport these. But (4), (5), (6),
and (7) fix problems and should be applied to stable. IMO, it's probably
easiest to just apply them all to stable.
====================
Link: https://lore.kernel.org/r/20210222162549.3252778-1-Jason@zx2c4.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/wireguard/socket.c')
| -rw-r--r-- | drivers/net/wireguard/socket.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireguard/socket.c b/drivers/net/wireguard/socket.c index 410b318..d9ad850 100644 --- a/drivers/net/wireguard/socket.c +++ b/drivers/net/wireguard/socket.c @@ -53,7 +53,7 @@ static int send4(struct wg_device *wg, struct sk_buff *skb, if (unlikely(!inet_confirm_addr(sock_net(sock), NULL, 0, fl.saddr, RT_SCOPE_HOST))) { endpoint->src4.s_addr = 0; - *(__force __be32 *)&endpoint->src_if4 = 0; + endpoint->src_if4 = 0; fl.saddr = 0; if (cache) dst_cache_reset(cache); @@ -63,7 +63,7 @@ static int send4(struct wg_device *wg, struct sk_buff *skb, PTR_ERR(rt) == -EINVAL) || (!IS_ERR(rt) && rt->dst.dev->ifindex != endpoint->src_if4)))) { endpoint->src4.s_addr = 0; - *(__force __be32 *)&endpoint->src_if4 = 0; + endpoint->src_if4 = 0; fl.saddr = 0; if (cache) dst_cache_reset(cache); @@ -71,7 +71,7 @@ static int send4(struct wg_device *wg, struct sk_buff *skb, ip_rt_put(rt); rt = ip_route_output_flow(sock_net(sock), &fl, sock); } - if (unlikely(IS_ERR(rt))) { + if (IS_ERR(rt)) { ret = PTR_ERR(rt); net_dbg_ratelimited("%s: No route to %pISpfsc, error %d\n", wg->dev->name, &endpoint->addr, ret); @@ -138,7 +138,7 @@ static int send6(struct wg_device *wg, struct sk_buff *skb, } dst = ipv6_stub->ipv6_dst_lookup_flow(sock_net(sock), sock, &fl, NULL); - if (unlikely(IS_ERR(dst))) { + if (IS_ERR(dst)) { ret = PTR_ERR(dst); net_dbg_ratelimited("%s: No route to %pISpfsc, error %d\n", wg->dev->name, &endpoint->addr, ret); |