diff options
| author | David S. Miller <davem@davemloft.net> | 2023-06-20 15:33:50 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-06-20 15:33:50 +0300 |
| commit | e438edaae26ce80c3fcc498fbba0c8f7e78497e5 (patch) | |
| tree | 077dc534801399df737853197ebef71265c83019 /net/ipv4 | |
| parent | 440d71e2edf283465c7a9ed151efd589d71b6307 (diff) | |
| parent | f015b900bc3285322029b4a7d132d6aeb0e51857 (diff) | |
| download | linux-e438edaae26ce80c3fcc498fbba0c8f7e78497e5.tar.xz | |
Merge tag 'ipsec-2023-06-20' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
ipsec-2023-06-20
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/esp4_offload.c | 3 | ||||
| -rw-r--r-- | net/ipv4/xfrm4_input.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv4/esp4_offload.c b/net/ipv4/esp4_offload.c index 3969fa805679..ee848be59e65 100644 --- a/net/ipv4/esp4_offload.c +++ b/net/ipv4/esp4_offload.c @@ -340,6 +340,9 @@ static int esp_xmit(struct xfrm_state *x, struct sk_buff *skb, netdev_features_ secpath_reset(skb); + if (skb_needs_linearize(skb, skb->dev->features) && + __skb_linearize(skb)) + return -ENOMEM; return 0; } diff --git a/net/ipv4/xfrm4_input.c b/net/ipv4/xfrm4_input.c index ad2afeef4f10..eac206a290d0 100644 --- a/net/ipv4/xfrm4_input.c +++ b/net/ipv4/xfrm4_input.c @@ -164,6 +164,7 @@ drop: kfree_skb(skb); return 0; } +EXPORT_SYMBOL(xfrm4_udp_encap_rcv); int xfrm4_rcv(struct sk_buff *skb) { |