diff options
| author | David S. Miller <davem@davemloft.net> | 2022-02-25 11:44:15 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-02-25 11:44:15 +0100 |
| commit | 31372fe9668e52c1f700c628c9fa716dd453f784 (patch) | |
| tree | 319f69063036ed82820b72081073556c0fa05d2d /net/ipv4 | |
| parent | net: dcb: flush lingering app table entries for unregistered devices (diff) | |
| parent | xfrm: enforce validity of offload input flags (diff) | |
| download | linux-31372fe9668e52c1f700c628c9fa716dd453f784.tar.xz linux-31372fe9668e52c1f700c628c9fa716dd453f784.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
1) Fix PMTU for IPv6 if the reported MTU minus the ESP overhead is
smaller than 1280. From Jiri Bohac.
2) Fix xfrm interface ID and inter address family tunneling when
migrating xfrm states. From Yan Yan.
3) Add missing xfrm intrerface ID initialization on xfrmi_changelink.
From Antony Antony.
4) Enforce validity of xfrm offload input flags so that userspace can't
send undefined flags to the offload driver.
From Leon Romanovsky.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/esp4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index 851f542928a3..e1b1d080e908 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c @@ -671,7 +671,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb) struct xfrm_dst *dst = (struct xfrm_dst *)skb_dst(skb); u32 padto; - padto = min(x->tfcpad, __xfrm_state_mtu(x, dst->child_mtu_cached)); + padto = min(x->tfcpad, xfrm_state_mtu(x, dst->child_mtu_cached)); if (skb->len < padto) esp.tfclen = padto - skb->len; } |