From: Corey Minyard <cminyard@mvista.com>
Date: Fri, 16 Jul 2021 20:28:46 +0000 (-0500)
Subject: ipsec: Remove unneeded extra variable in esp4 esp_ssg_unref()
X-Git-Tag: v5.15-rc1~157^2~52^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f8fdadef92b7a39e9a9a83bc2df68731ac6c298b;p=thirdparty%2Flinux.git

ipsec: Remove unneeded extra variable in esp4 esp_ssg_unref()

It's assigned twice, but only used to calculate the size of the
structure it points to.  Just remove it and take a sizeof the
actual structure.

Signed-off-by: Corey Minyard <cminyard@mvista.com>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---

diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index a09e36c4a4135..851f542928a33 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);