diff options
| author | David S. Miller <davem@davemloft.net> | 2022-01-06 11:54:20 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-01-06 11:54:20 +0000 |
| commit | d093d17c9554be794b1bd83971fb6d0ae3ea77b1 (patch) | |
| tree | 7c397973f12f7ce6883fbe98757a807295c18b64 /net/ipv6 | |
| parent | 4e023b44d5cec470df1366a93112293cceddc3e8 (diff) | |
| parent | 4e484b3e969b52effd95c17f7a86f39208b2ccf4 (diff) | |
| download | linux-d093d17c9554be794b1bd83971fb6d0ae3ea77b1.tar.gz linux-d093d17c9554be794b1bd83971fb6d0ae3ea77b1.tar.bz2 linux-d093d17c9554be794b1bd83971fb6d0ae3ea77b1.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 2022-01-06
1) Fix some clang_analyzer warnings about never read variables.
From luo penghao.
2) Check for pols[0] only once in xfrm_expand_policies().
From Jean Sacren.
3) The SA curlft.use_time was updated only on SA cration time.
Update whenever the SA is used. From Antony Antony
4) Add support for SM3 secure hash.
From Xu Jia.
5) Add support for SM4 symmetric cipher algorithm.
From Xu Jia.
6) Add a rate limit for SA mapping change messages.
From Antony Antony.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/esp6.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index f0bac6f7ab6b..8bb2c407b46b 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c @@ -114,7 +114,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; @@ -122,7 +121,7 @@ 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); iv = esp_tmp_iv(aead, tmp, extralen); req = esp_tmp_req(aead, iv); |