net: Use NDRNG device in srand_mac()
authorMatthias Brugger <mbrugger@suse.com>
Fri, 18 Dec 2020 09:28:04 +0000 (10:28 +0100)
committerTom Rini <trini@konsulko.com>
Tue, 19 Jan 2021 14:15:02 +0000 (09:15 -0500)
When calling srand_mac we use a weak seed dependent on the
mac address. If present, use a RNG device instead to incerase entropy.

Signed-off-by: Matthias Brugger <mbrugger@suse.com>
Reviewed-by: Torsten Duwe <duwe@suse.de>
net/net_rand.h

index 4bf9bd8..6a52cda 100644 (file)
@@ -10,6 +10,8 @@
 #define __NET_RAND_H__
 
 #include <common.h>
+#include <dm/uclass.h>
+#include <rng.h>
 
 /*
  * Return a seed for the PRNG derived from the eth0 MAC address.
@@ -37,7 +39,22 @@ static inline unsigned int seed_mac(void)
  */
 static inline void srand_mac(void)
 {
-       srand(seed_mac());
+       int ret;
+       struct udevice *devp;
+       u32 randv = 0;
+
+       if (IS_ENABLED(CONFIG_DM_RNG)) {
+               ret = uclass_get_device(UCLASS_RNG, 0, &devp);
+               if (ret) {
+                       ret = dm_rng_read(devp, &randv, sizeof(randv));
+                       if (ret < 0)
+                               randv = 0;
+               }
+       }
+       if (randv)
+               srand(randv);
+       else
+               srand(seed_mac());
 }
 
 #endif /* __NET_RAND_H__ */