diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2020-01-02 17:47:50 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-01-05 14:08:32 -0800 |
| commit | 04d2ea92a18417619182cbb79063f154892b0150 (patch) | |
| tree | 2ebb4659020f7e52516f939025f43497125959ba /drivers/net/wireguard | |
| parent | wireguard: selftests: remove ancient kernel compatibility code (diff) | |
| download | linux-dev-04d2ea92a18417619182cbb79063f154892b0150.tar.xz linux-dev-04d2ea92a18417619182cbb79063f154892b0150.zip | |
wireguard: queueing: do not account for pfmemalloc when clearing skb header
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>
Diffstat (limited to 'drivers/net/wireguard')
| -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 e49a464238fd..fecb559cbdb6 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; |