1 files changed, 16 insertions, 35 deletions

diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index d3618a78fcac..b8719df0366e 100644
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -164,10 +164,9 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb)
         u8 *iv;
         u8 *tail;
         __be32 *seqhi;
-        struct esp_data *esp = x->data;
 
         /* skb is pure payload to encrypt */
-        aead = esp->aead;
+        aead = x->data;
         alen = crypto_aead_authsize(aead);
 
         tfclen = 0;
@@ -181,8 +180,6 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb)
         }
         blksize = ALIGN(crypto_aead_blocksize(aead), 4);
         clen = ALIGN(skb->len + 2 + tfclen, blksize);
-        if (esp->padlen)
-                clen = ALIGN(clen, esp->padlen);
         plen = clen - skb->len - tfclen;
 
         err = skb_cow_data(skb, tfclen + plen + alen, &trailer);
@@ -271,8 +268,7 @@ error:
 static int esp_input_done2(struct sk_buff *skb, int err)
 {
         struct xfrm_state *x = xfrm_input_state(skb);
-        struct esp_data *esp = x->data;
-        struct crypto_aead *aead = esp->aead;
+        struct crypto_aead *aead = x->data;
         int alen = crypto_aead_authsize(aead);
         int hlen = sizeof(struct ip_esp_hdr) + crypto_aead_ivsize(aead);
         int elen = skb->len - hlen;
@@ -325,8 +321,7 @@ static void esp_input_done(struct crypto_async_request *base, int err)
 static int esp6_input(struct xfrm_state *x, struct sk_buff *skb)
 {
         struct ip_esp_hdr *esph;
-        struct esp_data *esp = x->data;
-        struct crypto_aead *aead = esp->aead;
+        struct crypto_aead *aead = x->data;
         struct aead_request *req;
         struct sk_buff *trailer;
         int elen = skb->len - sizeof(*esph) - crypto_aead_ivsize(aead);
@@ -414,9 +409,8 @@ out:
 
 static u32 esp6_get_mtu(struct xfrm_state *x, int mtu)
 {
-        struct esp_data *esp = x->data;
-        u32 blksize = ALIGN(crypto_aead_blocksize(esp->aead), 4);
-        u32 align = max_t(u32, blksize, esp->padlen);
+        struct crypto_aead *aead = x->data;
+        u32 blksize = ALIGN(crypto_aead_blocksize(aead), 4);
         unsigned int net_adj;
 
         if (x->props.mode != XFRM_MODE_TUNNEL)
@@ -424,8 +418,8 @@ static u32 esp6_get_mtu(struct xfrm_state *x, int mtu)
         else
                 net_adj = 0;
 
-        return ((mtu - x->props.header_len - crypto_aead_authsize(esp->aead) -
-                 net_adj) & ~(align - 1)) + net_adj - 2;
+        return ((mtu - x->props.header_len - crypto_aead_authsize(aead) -
+                 net_adj) & ~(blksize - 1)) + net_adj - 2;
 }
 
 static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
@@ -436,8 +430,7 @@ static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
         struct ip_esp_hdr *esph = (struct ip_esp_hdr *)(skb->data + offset);
         struct xfrm_state *x;
 
-        if (type != ICMPV6_DEST_UNREACH &&
-            type != ICMPV6_PKT_TOOBIG &&
+        if (type != ICMPV6_PKT_TOOBIG &&
             type != NDISC_REDIRECT)
                 return;
 
@@ -455,18 +448,16 @@ static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 
 static void esp6_destroy(struct xfrm_state *x)
 {
-        struct esp_data *esp = x->data;
+        struct crypto_aead *aead = x->data;
 
-        if (!esp)
+        if (!aead)
                 return;
 
-        crypto_free_aead(esp->aead);
-        kfree(esp);
+        crypto_free_aead(aead);
 }
 
 static int esp_init_aead(struct xfrm_state *x)
 {
-        struct esp_data *esp = x->data;
         struct crypto_aead *aead;
         int err;
 
@@ -475,7 +466,7 @@ static int esp_init_aead(struct xfrm_state *x)
         if (IS_ERR(aead))
                 goto error;
 
-        esp->aead = aead;
+        x->data = aead;
 
         err = crypto_aead_setkey(aead, x->aead->alg_key,
                                  (x->aead->alg_key_len + 7) / 8);
@@ -492,7 +483,6 @@ error:
 
 static int esp_init_authenc(struct xfrm_state *x)
 {
-        struct esp_data *esp = x->data;
         struct crypto_aead *aead;
         struct crypto_authenc_key_param *param;
         struct rtattr *rta;
@@ -527,7 +517,7 @@ static int esp_init_authenc(struct xfrm_state *x)
         if (IS_ERR(aead))
                 goto error;
 
-        esp->aead = aead;
+        x->data = aead;
 
         keylen = (x->aalg ? (x->aalg->alg_key_len + 7) / 8 : 0) +
                  (x->ealg->alg_key_len + 7) / 8 + RTA_SPACE(sizeof(*param));
@@ -582,7 +572,6 @@ error:
 
 static int esp6_init_state(struct xfrm_state *x)
 {
-        struct esp_data *esp;
         struct crypto_aead *aead;
         u32 align;
         int err;
@@ -590,11 +579,7 @@ static int esp6_init_state(struct xfrm_state *x)
         if (x->encap)
                 return -EINVAL;
 
-        esp = kzalloc(sizeof(*esp), GFP_KERNEL);
-        if (esp == NULL)
-                return -ENOMEM;
-
-        x->data = esp;
+        x->data = NULL;
 
         if (x->aead)
                 err = esp_init_aead(x);
@@ -604,9 +589,7 @@ static int esp6_init_state(struct xfrm_state *x)
         if (err)
                 goto error;
 
-        aead = esp->aead;
-
-        esp->padlen = 0;
+        aead = x->data;
 
         x->props.header_len = sizeof(struct ip_esp_hdr) +
                               crypto_aead_ivsize(aead);
@@ -626,9 +609,7 @@ static int esp6_init_state(struct xfrm_state *x)
         }
 
         align = ALIGN(crypto_aead_blocksize(aead), 4);
-        if (esp->padlen)
-                align = max_t(u32, align, esp->padlen);
-        x->props.trailer_len = align + 1 + crypto_aead_authsize(esp->aead);
+        x->props.trailer_len = align + 1 + crypto_aead_authsize(aead);
 
 error:
         return err;