Commit a02a6422 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

[IPSEC]: Use ALIGN macro in ESP 



This patch uses the macro ALIGN in all the applicable spots for ESP.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e1c73b78

net/ipv4/esp4.c

+6 −5
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <net/esp.h>

#include <asm/scatterlist.h>

#include <linux/crypto.h>

#include <linux/kernel.h>

#include <linux/pfkeyv2.h>

#include <linux/random.h>

#include <net/icmp.h>
@@ -42,10 +43,10 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb) 
	esp = x->data;

	alen = esp->auth.icv_trunc_len;

	tfm = esp->conf.tfm;

	blksize = (crypto_tfm_alg_blocksize(tfm) + 3) & ~3;

	clen = (clen + 2 + blksize-1)&~(blksize-1);

	blksize = ALIGN(crypto_tfm_alg_blocksize(tfm), 4);

	clen = ALIGN(clen + 2, blksize);

	if (esp->conf.padlen)

		clen = (clen + esp->conf.padlen-1)&~(esp->conf.padlen-1);

		clen = ALIGN(clen, esp->conf.padlen);



	if ((nfrags = skb_cow_data(skb, clen-skb->len+alen, &trailer)) < 0)

		goto error;
@@ -307,13 +308,13 @@ static u32 esp4_get_max_size(struct xfrm_state *x, int mtu) 
	u32 blksize = crypto_tfm_alg_blocksize(esp->conf.tfm);



	if (x->props.mode) {

		mtu = (mtu + 2 + blksize-1)&~(blksize-1);

		mtu = ALIGN(mtu + 2, blksize);

	} else {

		/* The worst case. */

		mtu += 2 + blksize;

	}

	if (esp->conf.padlen)

		mtu = (mtu + esp->conf.padlen-1)&~(esp->conf.padlen-1);

		mtu = ALIGN(mtu, esp->conf.padlen);



	return mtu + x->props.header_len + esp->auth.icv_trunc_len;

}

net/ipv6/esp6.c

+6 −5
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <net/esp.h>

#include <asm/scatterlist.h>

#include <linux/crypto.h>

#include <linux/kernel.h>

#include <linux/pfkeyv2.h>

#include <linux/random.h>

#include <net/icmp.h>
@@ -66,10 +67,10 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb) 


	alen = esp->auth.icv_trunc_len;

	tfm = esp->conf.tfm;

	blksize = (crypto_tfm_alg_blocksize(tfm) + 3) & ~3;

	clen = (clen + 2 + blksize-1)&~(blksize-1);

	blksize = ALIGN(crypto_tfm_alg_blocksize(tfm), 4);

	clen = ALIGN(clen + 2, blksize);

	if (esp->conf.padlen)

		clen = (clen + esp->conf.padlen-1)&~(esp->conf.padlen-1);

		clen = ALIGN(clen, esp->conf.padlen);



	if ((nfrags = skb_cow_data(skb, clen-skb->len+alen, &trailer)) < 0) {

		goto error;
@@ -238,13 +239,13 @@ static u32 esp6_get_max_size(struct xfrm_state *x, int mtu) 
	u32 blksize = crypto_tfm_alg_blocksize(esp->conf.tfm);



	if (x->props.mode) {

		mtu = (mtu + 2 + blksize-1)&~(blksize-1);

		mtu = ALIGN(mtu + 2, blksize);

	} else {

		/* The worst case. */

		mtu += 2 + blksize;

	}

	if (esp->conf.padlen)

		mtu = (mtu + esp->conf.padlen-1)&~(esp->conf.padlen-1);

		mtu = ALIGN(mtu, esp->conf.padlen);



	return mtu + x->props.header_len + esp->auth.icv_full_len;

}