UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

wireguard: socket: remove bogus __be32 annotation 

The endpoint->src_if4 has nothing to do with fixed-endian numbers; remove
the bogus annotation.

This was introduced in
https://git.zx2c4.com/wireguard-monolithic-historical/commit?id=14e7d0a499a676ec55176c0de2f9fcbd34074a82
in the historical WireGuard repo because the old code used to
zero-initialize multiple members as follows:

    endpoint->src4.s_addr = endpoint->src_if4 = fl.saddr = 0;

Because fl.saddr is fixed-endian and an assignment returns a value with the
type of its left operand, this meant that sparse detected an assignment
between values of different endianness.

Since then, this assignment was already split up into separate statements;
just the cast survived.

Signed-off-by: Jann Horn <jannh@google.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jann Horn 2021-02-22 17:25:44 +01:00 committed by Jakub Kicinski
parent 30ac4e2f54
commit 7f57bd8dc2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireguard/socket.c
View File

@ -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, if (unlikely(!inet_confirm_addr(sock_net(sock), NULL, 0,
fl.saddr, RT_SCOPE_HOST))) { fl.saddr, RT_SCOPE_HOST))) {
endpoint->src4.s_addr = 0; endpoint->src4.s_addr = 0;
*(__force __be32 *)&endpoint->src_if4 = 0; endpoint->src_if4 = 0;
fl.saddr = 0; fl.saddr = 0;
if (cache) if (cache)
dst_cache_reset(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) && PTR_ERR(rt) == -EINVAL) || (!IS_ERR(rt) &&
rt->dst.dev->ifindex != endpoint->src_if4)))) { rt->dst.dev->ifindex != endpoint->src_if4)))) {
endpoint->src4.s_addr = 0; endpoint->src4.s_addr = 0;
*(__force __be32 *)&endpoint->src_if4 = 0; endpoint->src_if4 = 0;
fl.saddr = 0; fl.saddr = 0;
if (cache) if (cache)
dst_cache_reset(cache); dst_cache_reset(cache);