diff options
author | Jakub Kicinski <kuba@kernel.org> | 2024-05-04 01:56:15 +0300 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2024-05-04 01:56:15 +0300 |
commit | d0de61673908765f4e189fe26f4de6e87caf00e5 (patch) | |
tree | 4ffd1bfc4ede6ab658d65e0420fc855ae052fb29 /include/net | |
parent | f2d859045ec148ba12d26637c1ea50f16828916f (diff) | |
parent | b6d2e438e16c7d4dbde08cfb2b95b0f3f325ba40 (diff) | |
download | linux-d0de61673908765f4e189fe26f4de6e87caf00e5.tar.xz |
Merge tag 'ipsec-2024-05-02' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
pull request (net): ipsec 2024-05-02
1) Fix an error pointer dereference in xfrm_in_fwd_icmp.
From Antony Antony.
2) Preserve vlan tags for ESP transport mode software GRO.
From Paul Davey.
3) Fix a spelling mistake in an uapi xfrm.h comment.
From Anotny Antony.
* tag 'ipsec-2024-05-02' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec:
xfrm: Correct spelling mistake in xfrm.h comment
xfrm: Preserve vlan tags for transport mode software GRO
xfrm: fix possible derferencing in error path
====================
Link: https://lore.kernel.org/r/20240502084838.2269355-1-steffen.klassert@secunet.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/xfrm.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 57c743b7e4fe..cb4841a9fffd 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -1049,6 +1049,9 @@ struct xfrm_offload { #define CRYPTO_INVALID_PACKET_SYNTAX 64 #define CRYPTO_INVALID_PROTOCOL 128 + /* Used to keep whole l2 header for transport mode GRO */ + __u32 orig_mac_len; + __u8 proto; __u8 inner_ipproto; }; |