Skip to contentSkip to conversation

crypto: rng - Use unregister_rngs in register_rngs

PATCH In review Thorsten Blum 2 participants 2 messages Jan 26 – Feb 6 Crypto API

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 crypto: rng - Use unregister_rngs in register_rngs

Replace the for loop with a call to crypto_unregister_rngs(). Return 'ret' immediately and remove the goto statement to simplify the error handling code. No functional changes.

---
 crypto/rng.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
crypto/rng.c +4 -8
index ee1768c5a400..475b6a42d826 100644
@@ -203,17 +203,13 @@ int crypto_register_rngs(struct rng_alg *algs, int count)
 
 	for (i = 0; i < count; i++) {
 		ret = crypto_register_rng(algs + i);
-		if (ret)
-			goto err;
+		if (ret) {
+			crypto_unregister_rngs(algs, i);
+			return ret;
+		}
 	}
 
 	return 0;
-
-err:
-	for (--i; i >= 0; --i)
-		crypto_unregister_rng(algs + i);
-
-	return ret;
 }
 EXPORT_SYMBOL_GPL(crypto_register_rngs);
 
Signature · 2 lines
Thorsten Blum <[email protected]>
GPG: 1D60 735E 8AEF 3BE4 73B6  9D84 7336 78FD 8DFE EAD4
maintainer
#1 lore raw
Quoted 8 lines · Thorsten Blum

Replace the for loop with a call to crypto_unregister_rngs(). Return 'ret' immediately and remove the goto statement to simplify the error handling code. No functional changes.

---
 crypto/rng.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

Patch applied. Thanks.

Signature · 3 lines
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt