ACPI: property: Fix return value for nval == 0 in acpi_data_prop_read()
PATCH 1/1 ACPI: property: Fix return value for nval == 0 in acpi_data_prop_read()
While analysing code for software and OF node for the corner case when caller asks to read zero items in the supposed to be an array of values I found that ACPI behaves differently to what OF does, i.e.
1. It returns -EINVAL when caller asks to read zero items from integer array, while OF returns 0, if no other errors happened.
2. It returns -EINVAL when caller asks to read zero items from string array, while OF returns -ENODATA, if no other errors happened.
Amend ACPI implementation to follow what OF does.
--- drivers/acpi/property.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/acpi/property.c +4 -5
@@ -1189,8 +1189,6 @@ static int acpi_data_prop_read(const struct acpi_device_data *data,return -EOVERFLOW ;break ; } -if (nval ==0 ) -return -EINVAL ;if (obj->type ==ACPI_TYPE_BUFFER ) {if (proptype !=DEV_PROP_U8 )
@@ -1214,9 +1212,10 @@ 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 : - ret =acpi_copy_property_array_string ( - items, (char **)val, -min_t (u32, nval, obj->package.count)); + nval =min_t (u32, nval, obj->package.count); +if (nval ==0 ) +return -ENODATA ; + ret =acpi_copy_property_array_string (items, (char **)val, nval);break ;default : ret = -EINVAL ;
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
Quoted 37 lines · Andy Shevchenko
While analysing code for software and OF node for the corner case when caller asks to read zero items in the supposed to be an array of values I found that ACPI behaves differently to what OF does, i.e.
1. It returns
-EINVALwhen caller asks to read zero items from integer array, while OF returns 0, if no other errors happened.2. It returns
-EINVALwhen caller asks to read zero items from string array, while OF returns-ENODATA, if no other errors happened.Amend ACPI implementation to follow what OF does.
Fixes b31384fa5de3 ("Driver core: Unified device properties interface for platform firmware")Signed-off-by Andy Shevchenko <[email protected]>--- drivers/acpi/property.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)drivers/acpi/property.c +0
-3@@ -1189,8 +1189,6 @@ static int acpi_data_prop_read(const struct acpi_device_data *data,return -EOVERFLOW ;break ; } -if (nval ==0 ) -return -EINVAL ;if (obj->type ==ACPI_TYPE_BUFFER ) {if (proptype !=DEV_PROP_U8 )@@ -1214,9 +1212,10 @@ 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 : - ret = acpi_copy_property_array_string(
drivers/acpi/property.c static int acpi_data_prop_read(const struct acpi_device_data *data,
Quoted 10 lines
drivers/acpi/property.c +4
-3- items, (char **)val, - min_t(u32, nval, obj->package.count)); + nval =min_t (u32, nval, obj->package.count); +if (nval ==0 ) +return -ENODATA ; + ret =acpi_copy_property_array_string (items, (char **)val, nval);break ;default : ret = -EINVAL ; --
Applied as 6.14-rc material, thanks!