Commit 0f5a2c55 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [CRYPTO] users: Fix up scatterlist conversion errors
  [CRYPTO] tcrypt: Move sg_init_table out of timing loops
  [NETNS]: Fix get_net_ns_by_pid
  [NET]: Marking struct pernet_operations __net_initdata was inappropriate
  [INET] ESP: Must #include <linux/scatterlist.h>
  [TCP] IPV6: fix softnet build breakage
parents 26adc0d5 68e3f5dd

crypto/tcrypt.c

+14 −6
Original line number Diff line number Diff line
@@ -572,9 +572,11 @@ static int test_hash_jiffies_digest(struct hash_desc *desc, char *p, int blen, 
	int bcount;

	int ret;



	sg_init_table(sg, 1);



	for (start = jiffies, end = start + sec * HZ, bcount = 0;

	     time_before(jiffies, end); bcount++) {

		sg_init_one(sg, p, blen);

		sg_set_buf(sg, p, blen);

		ret = crypto_hash_digest(desc, sg, blen, out);

		if (ret)

			return ret;
@@ -597,13 +599,15 @@ static int test_hash_jiffies(struct hash_desc *desc, char *p, int blen, 
	if (plen == blen)

		return test_hash_jiffies_digest(desc, p, blen, out, sec);



	sg_init_table(sg, 1);



	for (start = jiffies, end = start + sec * HZ, bcount = 0;

	     time_before(jiffies, end); bcount++) {

		ret = crypto_hash_init(desc);

		if (ret)

			return ret;

		for (pcount = 0; pcount < blen; pcount += plen) {

			sg_init_one(sg, p + pcount, plen);

			sg_set_buf(sg, p + pcount, plen);

			ret = crypto_hash_update(desc, sg, plen);

			if (ret)

				return ret;
@@ -628,12 +632,14 @@ static int test_hash_cycles_digest(struct hash_desc *desc, char *p, int blen, 
	int i;

	int ret;



	sg_init_table(sg, 1);



	local_bh_disable();

	local_irq_disable();



	/* Warm-up run. */

	for (i = 0; i < 4; i++) {

		sg_init_one(sg, p, blen);

		sg_set_buf(sg, p, blen);

		ret = crypto_hash_digest(desc, sg, blen, out);

		if (ret)

			goto out;
@@ -645,7 +651,7 @@ static int test_hash_cycles_digest(struct hash_desc *desc, char *p, int blen, 


		start = get_cycles();



		sg_init_one(sg, p, blen);

		sg_set_buf(sg, p, blen);

		ret = crypto_hash_digest(desc, sg, blen, out);

		if (ret)

			goto out;
@@ -679,6 +685,8 @@ static int test_hash_cycles(struct hash_desc *desc, char *p, int blen, 
	if (plen == blen)

		return test_hash_cycles_digest(desc, p, blen, out);



	sg_init_table(sg, 1);



	local_bh_disable();

	local_irq_disable();
@@ -688,7 +696,7 @@ static int test_hash_cycles(struct hash_desc *desc, char *p, int blen, 
		if (ret)

			goto out;

		for (pcount = 0; pcount < blen; pcount += plen) {

			sg_init_one(sg, p + pcount, plen);

			sg_set_buf(sg, p + pcount, plen);

			ret = crypto_hash_update(desc, sg, plen);

			if (ret)

				goto out;
@@ -708,7 +716,7 @@ static int test_hash_cycles(struct hash_desc *desc, char *p, int blen, 
		if (ret)

			goto out;

		for (pcount = 0; pcount < blen; pcount += plen) {

			sg_init_one(sg, p + pcount, plen);

			sg_set_buf(sg, p + pcount, plen);

			ret = crypto_hash_update(desc, sg, plen);

			if (ret)

				goto out;

drivers/crypto/padlock-sha.c

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static void padlock_sha_bypass(struct crypto_tfm *tfm) 
	if (ctx(tfm)->data && ctx(tfm)->used) {

		struct scatterlist sg;



		sg_set_buf(&sg, ctx(tfm)->data, ctx(tfm)->used);

		sg_init_one(&sg, ctx(tfm)->data, ctx(tfm)->used);

		crypto_hash_update(&ctx(tfm)->fallback, &sg, sg.length);

	}
@@ -79,7 +79,7 @@ static void padlock_sha_update(struct crypto_tfm *tfm, 


	if (unlikely(ctx(tfm)->bypass)) {

		struct scatterlist sg;

		sg_set_buf(&sg, (uint8_t *)data, length);

		sg_init_one(&sg, (uint8_t *)data, length);

		crypto_hash_update(&ctx(tfm)->fallback, &sg, length);

		return;

	}

drivers/md/dm-crypt.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti, 
		return -ENOMEM;

	}



	sg_set_buf(&sg, cc->key, cc->key_size);

	sg_init_one(&sg, cc->key, cc->key_size);

	desc.tfm = hash_tfm;

	desc.flags = CRYPTO_TFM_REQ_MAY_SLEEP;

	err = crypto_hash_digest(&desc, &sg, cc->key_size, salt);

drivers/net/loopback.c

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static __net_exit void loopback_net_exit(struct net *net) 
	unregister_netdev(dev);

}



static struct pernet_operations __net_initdata loopback_net_ops = {

static struct pernet_operations loopback_net_ops = {

       .init = loopback_net_init,

       .exit = loopback_net_exit,

};

drivers/net/ppp_mppe.c

+9 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ MODULE_VERSION("1.0.2"); 
static unsigned int

setup_sg(struct scatterlist *sg, const void *address, unsigned int length)

{

	sg_init_one(sg, address, length);

	sg_set_buf(sg, address, length);

	return length;

}
@@ -140,6 +140,8 @@ static void get_new_key_from_sha(struct ppp_mppe_state * state) 
	struct scatterlist sg[4];

	unsigned int nbytes;



	sg_init_table(sg, 4);



	nbytes = setup_sg(&sg[0], state->master_key, state->keylen);

	nbytes += setup_sg(&sg[1], sha_pad->sha_pad1,

			   sizeof(sha_pad->sha_pad1));
@@ -166,6 +168,8 @@ static void mppe_rekey(struct ppp_mppe_state * state, int initial_key) 
	if (!initial_key) {

		crypto_blkcipher_setkey(state->arc4, state->sha1_digest,

					state->keylen);

		sg_init_table(sg_in, 1);

		sg_init_table(sg_out, 1);

		setup_sg(sg_in, state->sha1_digest, state->keylen);

		setup_sg(sg_out, state->session_key, state->keylen);

		if (crypto_blkcipher_encrypt(&desc, sg_out, sg_in,
@@ -421,6 +425,8 @@ mppe_compress(void *arg, unsigned char *ibuf, unsigned char *obuf, 
	isize -= 2;



	/* Encrypt packet */

	sg_init_table(sg_in, 1);

	sg_init_table(sg_out, 1);

	setup_sg(sg_in, ibuf, isize);

	setup_sg(sg_out, obuf, osize);

	if (crypto_blkcipher_encrypt(&desc, sg_out, sg_in, isize) != 0) {
@@ -608,6 +614,8 @@ mppe_decompress(void *arg, unsigned char *ibuf, int isize, unsigned char *obuf, 
	 * Decrypt the first byte in order to check if it is

	 * a compressed or uncompressed protocol field.

	 */

	sg_init_table(sg_in, 1);

	sg_init_table(sg_out, 1);

	setup_sg(sg_in, ibuf, 1);

	setup_sg(sg_out, obuf, 1);

	if (crypto_blkcipher_decrypt(&desc, sg_out, sg_in, 1) != 0) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE