Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-28 16:52:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

crypto: jitter - Use min() to simplify jent_read_entropy()

Browse Source 
Use the min() macro to simplify the jent_read_entropy() function and
improve its readability.

Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Thorsten Blum 2024-08-19 16:18:44 +02:00 committed by Herbert Xu
parent ce3d2d6b15
commit 7f60adffe5
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/jitterentropy.c
View File

@ -146,6 +146,7 @@ struct rand_data {
#define JENT_ENTROPY_SAFETY_FACTOR 64 #define JENT_ENTROPY_SAFETY_FACTOR 64
#include <linux/fips.h> #include <linux/fips.h>
#include <linux/minmax.h>
#include "jitterentropy.h" #include "jitterentropy.h"
/*************************************************************************** /***************************************************************************
@ -638,10 +639,7 @@ int jent_read_entropy(struct rand_data *ec, unsigned char *data,
return -2; return -2;
} }
if ((DATA_SIZE_BITS / 8) < len) tocopy = min(DATA_SIZE_BITS / 8, len);
tocopy = (DATA_SIZE_BITS / 8);
else
tocopy = len;
if (jent_read_random_block(ec->hash_state, p, tocopy)) if (jent_read_random_block(ec->hash_state, p, tocopy))
return -1; return -1;