Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

Conflicts:
	net/xfrm/xfrm_policy.c

Minor merge conflict in xfrm_policy.c, consisting of overlapping
changes which were trivial to resolve.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 15 insertions, 34 deletions

diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index 109ee89f123e..7785b28061ac 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -121,7 +121,6 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
         struct aead_givcrypt_request *req;
         struct scatterlist *sg;
         struct scatterlist *asg;
-        struct esp_data *esp;
         struct sk_buff *trailer;
         void *tmp;
         u8 *iv;
@@ -139,8 +138,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
 
         /* skb is pure payload to encrypt */
 
-        esp = x->data;
-        aead = esp->aead;
+        aead = x->data;
         alen = crypto_aead_authsize(aead);
 
         tfclen = 0;
@@ -154,8 +152,6 @@ static int esp_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);
@@ -280,8 +276,7 @@ static int esp_input_done2(struct sk_buff *skb, int err)
 {
         const struct iphdr *iph;
         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;
@@ -376,8 +371,7 @@ static void esp_input_done(struct crypto_async_request *base, int err)
 static int esp_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);
@@ -459,9 +453,8 @@ out:
 
 static u32 esp4_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;
 
         switch (x->props.mode) {
@@ -476,8 +469,8 @@ static u32 esp4_get_mtu(struct xfrm_state *x, int mtu)
                 BUG();
         }
 
-        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 esp4_err(struct sk_buff *skb, u32 info)
@@ -511,18 +504,16 @@ static void esp4_err(struct sk_buff *skb, u32 info)
 
 static void esp_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;
 
@@ -531,7 +522,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);
@@ -548,7 +539,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;
@@ -583,7 +573,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));
@@ -638,16 +628,11 @@ error:
 
 static int esp_init_state(struct xfrm_state *x)
 {
-        struct esp_data *esp;
         struct crypto_aead *aead;
         u32 align;
         int err;
 
-        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);
@@ -657,9 +642,7 @@ static int esp_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);
@@ -683,9 +666,7 @@ static int esp_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;