diff options
| author | David S. Miller <davem@davemloft.net> | 2021-08-27 11:16:29 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-08-27 11:16:29 +0100 |
| commit | fe50893aa86eb9f1c6ccf2ceef274193b6313aad (patch) | |
| tree | fac6e4190b44253974e894133d7590e4d9341e5d /net/ipv4 | |
| parent | a550409378d2aea4d2104a551c192e7a65ddd6c0 (diff) | |
| parent | 5d8dbb7fb82b8661c16d496644b931c0e2e3a12e (diff) | |
| download | linux-fe50893aa86eb9f1c6ccf2ceef274193b6313aad.tar.gz linux-fe50893aa86eb9f1c6ccf2ceef274193b6313aad.tar.bz2 linux-fe50893aa86eb9f1c6ccf2ceef274193b6313aad.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/
ipsec-next
Steffen Klassert says:
====================
pull request (net-next): ipsec-next 2021-08-27
1) Remove an unneeded extra variable in esp4 esp_ssg_unref.
From Corey Minyard.
2) Add a configuration option to change the default behaviour
to block traffic if there is no matching policy.
Joint work with Christian Langrock and Antony Antony.
3) Fix a shift-out-of-bounce bug reported from syzbot.
From Pavel Skripkin.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/esp4.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index a09e36c4a413..851f542928a3 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c @@ -97,7 +97,6 @@ static inline struct scatterlist *esp_req_sg(struct crypto_aead *aead, static void esp_ssg_unref(struct xfrm_state *x, void *tmp) { - struct esp_output_extra *extra = esp_tmp_extra(tmp); struct crypto_aead *aead = x->data; int extralen = 0; u8 *iv; @@ -105,9 +104,8 @@ static void esp_ssg_unref(struct xfrm_state *x, void *tmp) struct scatterlist *sg; if (x->props.flags & XFRM_STATE_ESN) - extralen += sizeof(*extra); + extralen += sizeof(struct esp_output_extra); - extra = esp_tmp_extra(tmp); iv = esp_tmp_iv(aead, tmp, extralen); req = esp_tmp_req(aead, iv); |