Commit de7275cb authored by David Laight's avatar David Laight Committed by Greg Kroah-Hartman
Browse files

drivers/usb/storage: 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>
Link: https://patch.msgid.link/20251119224140.8616-29-david.laight.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a5160af7

drivers/usb/storage/protocol.c

+1 −2
Original line number Diff line number Diff line
@@ -139,8 +139,7 @@ unsigned int usb_stor_access_xfer_buf(unsigned char *buffer, 
		return cnt;



	while (sg_miter_next(&miter) && cnt < buflen) {

		unsigned int len = min_t(unsigned int, miter.length,

				buflen - cnt);

		unsigned int len = min(miter.length, buflen - cnt);



		if (dir == FROM_XFER_BUF)

			memcpy(buffer + cnt, miter.addr, len);