Skip to contentSkip to conversation

platform/x86: intel_skl_int3472: Uninitialized variable in skl_int3472_handle_gpio_resources()

PATCH In review Dan Carpenter 3 participants 3 messages Jun 25, 2021 – Jun 28, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 platform/x86: intel_skl_int3472: Uninitialized variable in skl_int3472_handle_gpio_resources()

This function returns negative error codes, zero (to indicate that everything has been completed successfully) and one (to indicate that more resources need to be handled still).

This code prints an uninitialized error message when the function returns one which potentially leads to an Oops.

Fixes 5de691bffe57 ("platform/x86: Add intel_skl_int3472 driver")
---
 .../platform/x86/intel/int3472/intel_skl_int3472_discrete.c   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/platform/x86/intel/int3472/intel_skl_int3472_discrete.c +2 -2
index 17c6fe830765..9fe0a2527e1c 100644
@@ -286,10 +286,10 @@ static int skl_int3472_handle_gpio_resources(struct acpi_resource *ares,
 	int3472->ngpios++;
 	ACPI_FREE(obj);
 
-	if (ret)
+	if (ret < 0)
 		return dev_err_probe(int3472->dev, ret, err_msg);
 
-	return 0;
+	return ret;
 }
 
 static int skl_int3472_parse_crs(struct int3472_discrete_device *int3472)
Signature · 1 line
2.30.2
Reviewed-by on v1 1/1
#1 lore raw

Hi Dan, thanks for the patch

Quoted 6 lines · Dan Carpenter

This function returns negative error codes, zero (to indicate that everything has been completed successfully) and one (to indicate that more resources need to be handled still).

This code prints an uninitialized error message when the function returns one which potentially leads to an Oops.

Ah! In the default case of the switch, took me a while to see that. Thanks very much, good catch.

Quoted 24 lines
Fixes 5de691bffe57 ("platform/x86: Add intel_skl_int3472 driver")
---
 .../platform/x86/intel/int3472/intel_skl_int3472_discrete.c   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/platform/x86/intel/int3472/intel_skl_int3472_discrete.c +2 -2
index 17c6fe830765..9fe0a2527e1c 100644
@@ -286,10 +286,10 @@ static int skl_int3472_handle_gpio_resources(struct acpi_resource *ares,
 	int3472->ngpios++;
 	ACPI_FREE(obj);
 
-	if (ret)
+	if (ret < 0)
 		return dev_err_probe(int3472->dev, ret, err_msg);
 
-	return 0;
+	return ret;
 }
 
 static int skl_int3472_parse_crs(struct int3472_discrete_device *int3472)
#2 lore raw
In reply to Dan Carpenter

Hi,

Quoted 9 lines · Dan Carpenter

This function returns negative error codes, zero (to indicate that everything has been completed successfully) and one (to indicate that more resources need to be handled still).

This code prints an uninitialized error message when the function returns one which potentially leads to an Oops.

Fixes 5de691bffe57 ("platform/x86: Add intel_skl_int3472 driver")

Thank you for your patch, I've applied this patch to my review-hans branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans

Note it will show up in my review-hans branch once I've pushed my local branch there, which might take a while.

Once I've run some tests on this branch the patches there will be added to the platform-drivers-x86/for-next branch and eventually will be included in the pdx86 pull-request to Linus for the next merge-window.

Regards,

Hans

Quoted 22 lines
---
 .../platform/x86/intel/int3472/intel_skl_int3472_discrete.c   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/platform/x86/intel/int3472/intel_skl_int3472_discrete.c +2 -2
index 17c6fe830765..9fe0a2527e1c 100644
@@ -286,10 +286,10 @@ static int skl_int3472_handle_gpio_resources(struct acpi_resource *ares,
 	int3472->ngpios++;
 	ACPI_FREE(obj);
 
-	if (ret)
+	if (ret < 0)
 		return dev_err_probe(int3472->dev, ret, err_msg);
 
-	return 0;
+	return ret;
 }
 
 static int skl_int3472_parse_crs(struct int3472_discrete_device *int3472)