Commit 14ca8ce1 authored by David Laight's avatar David Laight Committed by Herbert Xu
Browse files

crypto: ccp - use min() instead of min_t() 



min_t(unsigned int, a, b) casts an 'unsigned long' to 'unsigned int'.
Use min(a, b) instead as it promotes any 'unsigned int' to 'unsigned long'
and so cannot discard significant bits.

In this case the 'unsigned long' value is small enough that the result
is ok.

Detected by an extra check added to min_t().

Signed-off-by: default avatarDavid Laight <david.laight.linux@gmail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 0f8ead58

drivers/crypto/ccp/ccp-dev.c

+1 −1
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ int ccp_trng_read(struct hwrng *rng, void *data, size_t max, bool wait) 
{

	struct ccp_device *ccp = container_of(rng, struct ccp_device, hwrng);

	u32 trng_value;

	int len = min_t(int, sizeof(trng_value), max);

	int len = min(sizeof(trng_value), max);



	/* Locking is provided by the caller so we can update device

	 * hwrng-related fields safely