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

[CRYPTO] users: Fix up scatterlist conversion errors 



This patch fixes the errors made in the users of the crypto layer during
the sg_init_table conversion.  It also adds a few conversions that were
missing altogether.

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

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/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) {

drivers/scsi/iscsi_tcp.c

+2 −3
Original line number Diff line number Diff line
@@ -674,9 +674,8 @@ partial_sg_digest_update(struct hash_desc *desc, struct scatterlist *sg, 
{

	struct scatterlist temp;



	memcpy(&temp, sg, sizeof(struct scatterlist));

	temp.offset = offset;

	temp.length = length;

	sg_init_table(&temp, 1);

	sg_set_page(&temp, sg_page(sg), length, offset);

	crypto_hash_update(desc, &temp, length);

}

fs/ecryptfs/crypto.c

+2 −0
Original line number Diff line number Diff line
@@ -279,6 +279,8 @@ int virt_to_scatterlist(const void *addr, int size, struct scatterlist *sg, 
	int offset;

	int remainder_of_page;



	sg_init_table(sg, sg_size);



	while (size > 0 && i < sg_size) {

		pg = virt_to_page(addr);

		offset = offset_in_page(addr);