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

Commit e231c2ee authored Feb 07, 2008 by David Howells Committed by Linus Torvalds Feb 07, 2008

Convert ERR_PTR(PTR_ERR(p)) instances to ERR_CAST(p)

Convert instances of ERR_PTR(PTR_ERR(p)) to ERR_CAST(p) using:

perl -spi -e 's/ERR_PTR[(]PTR_ERR[(](.*)[)][)]/ERR_CAST(\1)/' `grep -rl 'ERR_PTR[(]*PTR_ERR' fs crypto net security`

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent d1bc8e95

crypto/cbc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -224,7 +224,7 @@ static struct crypto_instance crypto_cbc_alloc(struct rtattr *tb)
		alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,
		CRYPTO_ALG_TYPE_MASK);
		if (IS_ERR(alg))
		return ERR_PTR(PTR_ERR(alg));
		return ERR_CAST(alg);

		inst = ERR_PTR(-EINVAL);
		if (!is_power_of_2(alg->cra_blocksize))

crypto/cryptd.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -230,7 +230,7 @@ static struct crypto_instance *cryptd_alloc_blkcipher(
		alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_BLKCIPHER,
		CRYPTO_ALG_TYPE_MASK);
		if (IS_ERR(alg))
		return ERR_PTR(PTR_ERR(alg));
		return ERR_CAST(alg);

		inst = cryptd_alloc_instance(alg, state);
		if (IS_ERR(inst))
		@@ -267,7 +267,7 @@ static struct crypto_instance cryptd_alloc(struct rtattr *tb)

		algt = crypto_get_attr_type(tb);
		if (IS_ERR(algt))
		return ERR_PTR(PTR_ERR(algt));
		return ERR_CAST(algt);

		switch (algt->type & algt->mask & CRYPTO_ALG_TYPE_MASK) {
		case CRYPTO_ALG_TYPE_BLKCIPHER:

crypto/ecb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -128,7 +128,7 @@ static struct crypto_instance crypto_ecb_alloc(struct rtattr *tb)
		alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,
		CRYPTO_ALG_TYPE_MASK);
		if (IS_ERR(alg))
		return ERR_PTR(PTR_ERR(alg));
		return ERR_CAST(alg);

		inst = crypto_alloc_instance("ecb", alg);
		if (IS_ERR(inst))

crypto/hmac.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -213,7 +213,7 @@ static struct crypto_instance hmac_alloc(struct rtattr *tb)
		alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_HASH,
		CRYPTO_ALG_TYPE_HASH_MASK);
		if (IS_ERR(alg))
		return ERR_PTR(PTR_ERR(alg));
		return ERR_CAST(alg);

		inst = crypto_alloc_instance("hmac", alg);
		if (IS_ERR(inst))

crypto/lrw.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -241,7 +241,7 @@ static struct crypto_instance alloc(struct rtattr *tb)
		alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,
		CRYPTO_ALG_TYPE_MASK);
		if (IS_ERR(alg))
		return ERR_PTR(PTR_ERR(alg));
		return ERR_CAST(alg);

		inst = crypto_alloc_instance("lrw", alg);
		if (IS_ERR(inst))