| Message ID | 20240819141843.875665-2-thorsten.blum@toblux.com |
|---|---|
| State | Accepted |
| Commit | 7f60adffe531c06bacab79dbf687f0ea85fb99e8 |
| Headers | show |
| Series | crypto: jitter - Use min() to simplify jent_read_entropy() | expand |
On Mon, Aug 19, 2024 at 04:18:44PM +0200, Thorsten Blum wrote: > Use the min() macro to simplify the jent_read_entropy() function and > improve its readability. > > Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com> > --- > crypto/jitterentropy.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) Patch applied. Thanks.
diff --git a/crypto/jitterentropy.c b/crypto/jitterentropy.c index d7056de8c0d7..3b390bd6c119 100644 --- a/crypto/jitterentropy.c +++ b/crypto/jitterentropy.c @@ -146,6 +146,7 @@ struct rand_data { #define JENT_ENTROPY_SAFETY_FACTOR 64 #include <linux/fips.h> +#include <linux/minmax.h> #include "jitterentropy.h" /*************************************************************************** @@ -638,10 +639,7 @@ int jent_read_entropy(struct rand_data *ec, unsigned char *data, return -2; } - if ((DATA_SIZE_BITS / 8) < len) - tocopy = (DATA_SIZE_BITS / 8); - else - tocopy = len; + tocopy = min(DATA_SIZE_BITS / 8, len); if (jent_read_random_block(ec->hash_state, p, tocopy)) return -1;
Use the min() macro to simplify the jent_read_entropy() function and improve its readability. Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com> --- crypto/jitterentropy.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)