Commit c964081d authored by David Laight's avatar David Laight Committed by Rafael J. Wysocki
Browse files

ACPI: property: 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>
[ rjw: Subject adjustment ]
Link: https://patch.msgid.link/20251119224140.8616-14-david.laight.linux@gmail.com


Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 593ee492

drivers/acpi/property.c

+1 −1
Original line number Diff line number Diff line
@@ -1280,7 +1280,7 @@ static int acpi_data_prop_read(const struct acpi_device_data *data, 
		ret = acpi_copy_property_array_uint(items, (u64 *)val, nval);

		break;

	case DEV_PROP_STRING:

		nval = min_t(u32, nval, obj->package.count);

		nval = min(nval, obj->package.count);

		if (nval == 0)

			return -ENODATA;