diff options
| author | David S. Miller <davem@davemloft.net> | 2022-03-09 14:48:11 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-03-09 14:48:11 +0000 |
| commit | cc7e2f596e64783ded1feebc55445199c9bd929e (patch) | |
| tree | 7ea74edcf6213a056753e8dbfea0e6a950ee8d39 /include/net | |
| parent | 71171ac8eb34ce7fe6b3267dce27c313ab3cb3ac (diff) | |
| parent | 23c7f8d7989e1646aac82f75761b7648c355cb8a (diff) | |
| download | linux-cc7e2f596e64783ded1feebc55445199c9bd929e.tar.gz linux-cc7e2f596e64783ded1feebc55445199c9bd929e.tar.bz2 linux-cc7e2f596e64783ded1feebc55445199c9bd929e.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
pull request (net): ipsec 2022-03-09
1) Fix IPv6 PMTU discovery for xfrm interfaces.
From Lina Wang.
2) Revert failing for policies and states that are
configured with XFRMA_IF_ID 0. It broke a
user configuration. From Kai Lueke.
3) Fix a possible buffer overflow in the ESP output path.
4) Fix ESP GSO for tunnel and BEET mode on inter address
family tunnels.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/esp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/esp.h b/include/net/esp.h index 9c5637d41d95..90cd02ff77ef 100644 --- a/include/net/esp.h +++ b/include/net/esp.h @@ -4,6 +4,8 @@ #include <linux/skbuff.h> +#define ESP_SKB_FRAG_MAXSIZE (PAGE_SIZE << SKB_FRAG_PAGE_ORDER) + struct ip_esp_hdr; static inline struct ip_esp_hdr *ip_esp_hdr(const struct sk_buff *skb) |