Skip to contentSkip to conversation

crypto: tegra: use kernel entropy instead of ad-hoc

PATCH New Linus Walleij 4 participants 6 messages Sep 9, 2013 – Sep 16, 2013 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 crypto: tegra: use kernel entropy instead of ad-hoc

The way I read the Tegra AES RNG is that it has a homebrew algorithm for initializing the 128bit RNG using timespec and the unique chip ID. This looks like reinventing the (square) wheel, instead just grab 128bits from the kernel entropy pool where the time and (after another patch) chip unique ID is already mixed in.

Incidentally this also gets rid of a rather ugly cross-dependence on the machine using an extern declaration.

Cc Stephen Warren <[email protected]>
Cc Varun Wadekar <[email protected]>
Cc Neil Horman <[email protected]>
Cc linux-tegra at vger.kernel.org

---
Only compile-tested as I don't have this platform.

---
 drivers/crypto/tegra-aes.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)
drivers/crypto/tegra-aes.c +3 -12
index 2d58da9..7f42bfe 100644
@@ -199,8 +199,6 @@ static void aes_workqueue_handler(struct work_struct *work);
 static DECLARE_WORK(aes_work, aes_workqueue_handler);
 static struct workqueue_struct *aes_wq;
 
-extern unsigned long long tegra_chip_uid(void);
-
 static inline u32 aes_readl(struct tegra_aes_dev *dd, u32 offset)
 {
 	return readl(dd->io_base + offset);
@@ -713,9 +711,8 @@ static int tegra_aes_rng_reset(struct crypto_rng *tfm, u8 *seed,
 	struct tegra_aes_dev *dd = aes_dev;
 	struct tegra_aes_ctx *ctx = &rng_ctx;
 	struct tegra_aes_slot *key_slot;
-	struct timespec ts;
 	int ret = 0;
-	u64 nsec, tmp[2];
+	u8 tmp[16]; /* 16 bytes = 128 bits of entropy */
 	u8 *dt;
 
 	if (!ctx || !dd) {
@@ -778,14 +775,8 @@ static int tegra_aes_rng_reset(struct crypto_rng *tfm, u8 *seed,
 	if (dd->ivlen >= (2 * DEFAULT_RNG_BLK_SZ + AES_KEYSIZE_128)) {
 		dt = dd->iv + DEFAULT_RNG_BLK_SZ + AES_KEYSIZE_128;
 	} else {
-		getnstimeofday(&ts);
-		nsec = timespec_to_ns(&ts);
-		do_div(nsec, 1000);
-		nsec ^= dd->ctr << 56;
-		dd->ctr++;
-		tmp[0] = nsec;
-		tmp[1] = tegra_chip_uid();
-		dt = (u8 *)tmp;
+		get_random_bytes(tmp, sizeof(tmp));
+		dt = tmp;
 	}
 	memcpy(dd->dt, dt, DEFAULT_RNG_BLK_SZ);
 
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH 1/1 crypto: tegra: use kernel entropy instead of ad-hoc

Quoted 9 lines · Linus Walleij

The way I read the Tegra AES RNG is that it has a homebrew algorithm for initializing the 128bit RNG using timespec and the unique chip ID. This looks like reinventing the (square) wheel, instead just grab 128bits from the kernel entropy pool where the time and (after another patch) chip unique ID is already mixed in.

Incidentally this also gets rid of a rather ugly cross-dependence on the machine using an extern declaration.

This sounds reasonable to me, although I know little about the driver. Varun, can you please comment?

maintainer
#2 lore raw
Quoted 8 lines · Stephen Warren
Quoted 7 lines · Linus Walleij

The way I read the Tegra AES RNG is that it has a homebrew algorithm for initializing the 128bit RNG using timespec and the unique chip ID. This looks like reinventing the (square) wheel, instead just grab 128bits from the kernel entropy pool where the time and (after another patch) chip unique ID is already mixed in.

Quoted 7 lines
Quoted 2 lines

Incidentally this also gets rid of a rather ugly cross-dependence on the machine using an extern declaration.

This sounds reasonable to me, although I know little about the driver. Varun, can you please comment?

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
#3 lore raw

PATCH 1/1 crypto: tegra: use kernel entropy instead of ad-hoc

Quoted 12 lines · Herbert Xu
Quoted 11 lines · Stephen Warren
Quoted 9 lines · Linus Walleij

The way I read the Tegra AES RNG is that it has a homebrew algorithm for initializing the 128bit RNG using timespec and the unique chip ID. This looks like reinventing the (square) wheel, instead just grab 128bits from the kernel entropy pool where the time and (after another patch) chip unique ID is already mixed in.

Incidentally this also gets rid of a rather ugly cross-dependence on the machine using an extern declaration.

Quoted 6 lines
Quoted 4 lines

This sounds reasonable to me, although I know little about the driver. Varun, can you please comment?

Patch applied. Thanks.

I'm curious which kernel version it was merged for; it'd be nice to remove tegra_chip_uid() from the Tegra tree now since it's unused, but that obviously requires this patch in the history.

A message that is not in the archive (sent off-list or not yet received): [email protected]

#5 lore raw
Quoted 4 lines · Stephen Warren

I'm curious which kernel version it was merged for; it'd be nice to remove tegra_chip_uid() from the Tegra tree now since it's unused, but that obviously requires this patch in the history.

This is in cryptodev which will be pushed upstream for 3.13.

Cheers,

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
#6 lore raw

PATCH 1/1 crypto: tegra: use kernel entropy instead of ad-hoc

Quoted 7 lines · Herbert Xu
Quoted 4 lines · Stephen Warren

I'm curious which kernel version it was merged for; it'd be nice to remove tegra_chip_uid() from the Tegra tree now since it's unused, but that obviously requires this patch in the history.

This is in cryptodev which will be pushed upstream for 3.13.

OK, I guess I'll send you the follow-on cleanup patch then. While it does touch arch/arm/mach-tegra code, I hope it won't conflict with anything else going through the Tegra tree, so should be safe.