diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-01-02 17:47:50 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2022-07-07 13:26:40 +0200 |
| commit | 2056e6971aa3aef827475c3fc1df1c07f9db3a7e (patch) | |
| tree | 524500dea34538f4908537e26695c1f255f28c32 | |
| parent | 999bc20705aef6c2512789690d55216110960ec0 (diff) | |
| download | wireguard-linux-trimmed-2056e6971aa3aef827475c3fc1df1c07f9db3a7e.tar.gz wireguard-linux-trimmed-2056e6971aa3aef827475c3fc1df1c07f9db3a7e.zip | |
wireguard: queueing: do not account for pfmemalloc when clearing skb header
commit ff33c59320444d9f5a005598480b74903933963a upstream.
Before 8b7008620b84 ("net: Don't copy pfmemalloc flag in __copy_skb_
header()"), the pfmemalloc flag used to be between headers_start and
headers_end, which is a region we clear when preparing the packet for
encryption/decryption. This is a parameter we certainly want to
preserve, which is why 8b7008620b84 moved it out of there. The code here
was written in a world before 8b7008620b84, though, where we had to
manually account for it. This commit brings things up to speed.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | drivers/net/wireguard/queueing.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/wireguard/queueing.h b/drivers/net/wireguard/queueing.h index 58fdd63..e62c714 100644 --- a/drivers/net/wireguard/queueing.h +++ b/drivers/net/wireguard/queueing.h @@ -83,13 +83,10 @@ static inline __be16 wg_skb_examine_untrusted_ip_hdr(struct sk_buff *skb) static inline void wg_reset_packet(struct sk_buff *skb) { - const int pfmemalloc = skb->pfmemalloc; - skb_scrub_packet(skb, true); memset(&skb->headers_start, 0, offsetof(struct sk_buff, headers_end) - offsetof(struct sk_buff, headers_start)); - skb->pfmemalloc = pfmemalloc; skb->queue_mapping = 0; skb->nohdr = 0; skb->peeked = 0; |