Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

hwrng: core - use min3() instead of nested min_t()

min_t(u16, a, b) is likely to discard significant bits.
Replace:
min_t(u16, min_t(u16, default_quality, 1024), rng->quality ?: 1024);
with:
min3(default_quality, 1024, rng->quality ?: 1024);

Signed-off-by: David Laight <david.laight.linux@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

David Laight and committed by
Herbert Xu
0f8ead58 6c5d5b6d

+1 -1
+1 -1
drivers/char/hw_random/core.c
··· 545 545 init_completion(&rng->dying); 546 546 547 547 /* Adjust quality field to always have a proper value */ 548 - rng->quality = min_t(u16, min_t(u16, default_quality, 1024), rng->quality ?: 1024); 548 + rng->quality = min3(default_quality, 1024, rng->quality ?: 1024); 549 549 550 550 if (!cur_rng_set_by_user && 551 551 (!current_rng || rng->quality > current_rng->quality)) {