ソースを参照

crypto: rng - ensure that the RNG is ready before using

Otherwise, we might be seeding the RNG using bad randomness, which is
dangerous. The one use of this function from within the kernel -- not
from userspace -- is being removed (keys/big_key), so that call site
isn't relevant in assessing this.

Cc: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Jason A. Donenfeld 8 年 前
コミット
c2176f0098
1 ファイル変更4 行追加2 行削除
  1. 4 2
      crypto/rng.c

+ 4 - 2
crypto/rng.c

@@ -43,12 +43,14 @@ int crypto_rng_reset(struct crypto_rng *tfm, const u8 *seed, unsigned int slen)
 		if (!buf)
 		if (!buf)
 			return -ENOMEM;
 			return -ENOMEM;
 
 
-		get_random_bytes(buf, slen);
+		err = get_random_bytes_wait(buf, slen);
+		if (err)
+			goto out;
 		seed = buf;
 		seed = buf;
 	}
 	}
 
 
 	err = crypto_rng_alg(tfm)->seed(tfm, seed, slen);
 	err = crypto_rng_alg(tfm)->seed(tfm, seed, slen);
-
+out:
 	kzfree(buf);
 	kzfree(buf);
 	return err;
 	return err;
 }
 }