michaelh/zephyr
1
0
Fork 0
Code Releases Activity

random: ctr_drbg: Thread safe in SMP

Browse source 
irq_lock() does not make this this csprng api thread safe
in SMP systems. Change it to use a mutex.

Signed-off-by: Flavio Ceolin <flavio.ceolin@intel.com>
This commit is contained in:
Flavio Ceolin 2023-09-21 17:20:27 -07:00 • committed by Maureen Helm
commit 37be80ddbe
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
subsys/random/rand32_ctr_drbg.c
View file

@ -33,6 +33,7 @@
static const struct device *entropy_dev; static const struct device *entropy_dev;
static const unsigned char drbg_seed[] = CONFIG_CS_CTR_DRBG_PERSONALIZATION; static const unsigned char drbg_seed[] = CONFIG_CS_CTR_DRBG_PERSONALIZATION;
static bool ctr_initialised; static bool ctr_initialised;
static struct k_mutex ctr_lock;
#if defined(CONFIG_MBEDTLS) #if defined(CONFIG_MBEDTLS)
@ -105,7 +106,8 @@ static int ctr_drbg_initialize(void)
int z_impl_sys_csrand_get(void *dst, uint32_t outlen) int z_impl_sys_csrand_get(void *dst, uint32_t outlen)
{ {
int ret; int ret;
unsigned int key = irq_lock();
k_mutex_lock(&ctr_lock, K_FOREVER);
if (unlikely(!ctr_initialised)) { if (unlikely(!ctr_initialised)) {
ret = ctr_drbg_initialize(); ret = ctr_drbg_initialize();
@ -151,7 +153,7 @@ int z_impl_sys_csrand_get(void *dst, uint32_t outlen)
} }
#endif #endif
end: end:
irq_unlock(key); k_mutex_unlock(&ctr_lock);
return ret; return ret;
} }