Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[CRYPTO]: Use CRYPTO_TFM_REQ_MAY_SLEEP where appropriate 



This patch goes through the current users of the crypto layer and sets
CRYPTO_TFM_REQ_MAY_SLEEP at crypto_alloc_tfm() where all crypto operations
are performed in process context.

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

drivers/block/cryptoloop.c

+4 −2
Original line number Diff line number Diff line
@@ -57,9 +57,11 @@ cryptoloop_init(struct loop_device *lo, const struct loop_info64 *info) 
	mode = strsep(&cmsp, "-");



	if (mode == NULL || strcmp(mode, "cbc") == 0)

		tfm = crypto_alloc_tfm(cipher, CRYPTO_TFM_MODE_CBC);

		tfm = crypto_alloc_tfm(cipher, CRYPTO_TFM_MODE_CBC |

					       CRYPTO_TFM_REQ_MAY_SLEEP);

	else if (strcmp(mode, "ecb") == 0)

		tfm = crypto_alloc_tfm(cipher, CRYPTO_TFM_MODE_ECB);

		tfm = crypto_alloc_tfm(cipher, CRYPTO_TFM_MODE_ECB |

					       CRYPTO_TFM_REQ_MAY_SLEEP);

	if (tfm == NULL)

		return -EINVAL;

drivers/md/dm-crypt.c

+4 −3
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti, 
	}



	/* Hash the cipher key with the given hash algorithm */

	hash_tfm = crypto_alloc_tfm(opts, 0);

	hash_tfm = crypto_alloc_tfm(opts, CRYPTO_TFM_REQ_MAY_SLEEP);

	if (hash_tfm == NULL) {

		ti->error = PFX "Error initializing ESSIV hash";

		return -EINVAL;
@@ -172,7 +172,8 @@ static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti, 


	/* Setup the essiv_tfm with the given salt */

	essiv_tfm = crypto_alloc_tfm(crypto_tfm_alg_name(cc->tfm),

	                             CRYPTO_TFM_MODE_ECB);

	                             CRYPTO_TFM_MODE_ECB |

	                             CRYPTO_TFM_REQ_MAY_SLEEP);

	if (essiv_tfm == NULL) {

		ti->error = PFX "Error allocating crypto tfm for ESSIV";

		kfree(salt);
@@ -587,7 +588,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv) 
		goto bad1;

	}



	tfm = crypto_alloc_tfm(cipher, crypto_flags);

	tfm = crypto_alloc_tfm(cipher, crypto_flags | CRYPTO_TFM_REQ_MAY_SLEEP);

	if (!tfm) {

		ti->error = PFX "Error allocating crypto tfm";

		goto bad1;

drivers/net/wireless/airo.c

+1 −1
Original line number Diff line number Diff line
@@ -1301,7 +1301,7 @@ static int micsetup(struct airo_info *ai) { 
	int i;



	if (ai->tfm == NULL)

	        ai->tfm = crypto_alloc_tfm("aes", 0);

	        ai->tfm = crypto_alloc_tfm("aes", CRYPTO_TFM_REQ_MAY_SLEEP);



        if (ai->tfm == NULL) {

                printk(KERN_ERR "airo: failed to load transform for AES\n");

fs/nfsd/nfs4recover.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ nfs4_make_rec_clidname(char *dname, struct xdr_netobj *clname) 


	dprintk("NFSD: nfs4_make_rec_clidname for %.*s\n",

			clname->len, clname->data);

	tfm = crypto_alloc_tfm("md5", 0);

	tfm = crypto_alloc_tfm("md5", CRYPTO_TFM_REQ_MAY_SLEEP);

	if (tfm == NULL)

		goto out;

	cksum.len = crypto_tfm_alg_digestsize(tfm);

net/sunrpc/auth_gss/gss_krb5_crypto.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ make_checksum(s32 cksumtype, char *header, int hdrlen, struct xdr_buf *body, 
				" unsupported checksum %d", cksumtype);

			goto out;

	}

	if (!(tfm = crypto_alloc_tfm(cksumname, 0)))

	if (!(tfm = crypto_alloc_tfm(cksumname, CRYPTO_TFM_REQ_MAY_SLEEP)))

		goto out;

	cksum->len = crypto_tfm_alg_digestsize(tfm);

	if ((cksum->data = kmalloc(cksum->len, GFP_KERNEL)) == NULL)