diff options
| author | David S. Miller <davem@davemloft.net> | 2022-04-15 11:20:10 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-04-15 11:20:10 +0100 |
| commit | 2cc7fb9d24129be0612df8d32a1358ac91ead8d1 (patch) | |
| tree | bb9ae3ad85f9784e066139358ce441b22713589e /include | |
| parent | 29e8e659f984be00d75ec5fef4e37c88def72712 (diff) | |
| parent | 5bd8baab087dff657e05387aee802e70304cc813 (diff) | |
| download | linux-rpi-2cc7fb9d24129be0612df8d32a1358ac91ead8d1.tar.gz linux-rpi-2cc7fb9d24129be0612df8d32a1358ac91ead8d1.tar.bz2 linux-rpi-2cc7fb9d24129be0612df8d32a1358ac91ead8d1.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
pull request (net): ipsec 2022-04-14
1) Fix the output interface for VRF cases in xfrm_dst_lookup.
From David Ahern.
2) Fix write out of bounds by doing COW on esp output when the
packet size is larger than a page.
From Sabrina Dubroca.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/esp.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/esp.h b/include/net/esp.h index 90cd02ff77ef..9c5637d41d95 100644 --- a/include/net/esp.h +++ b/include/net/esp.h @@ -4,8 +4,6 @@ #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) |