Skip to contentSkip to conversation

media: atomisp: avoid ACPI package count underflow in gmin_cfg_get_dsm

PATCH In review Mohamed El Harake 3 participants 3 messages Apr 9 – Apr 10

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

PATCH 1/1 media: atomisp: avoid ACPI package count underflow in gmin_cfg_get_dsm

From: Mohamad El Harake <[email protected]>

gmin_cfg_get_dsm() iterates over ACPI _DSM package elements as key/value pairs using obj->package.count - 1 as the loop bound.

If package.count is 0, the subtraction underflows and may lead to out-of-bounds access.

Use i + 1 < obj->package.count instead.

---
 drivers/staging/media/atomisp/pci/atomisp_csi2_bridge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/atomisp/pci/atomisp_csi2_bridge.c +1 -1
index ba61cc28fac1..cca91c6d71a5 100644
@@ -113,7 +113,7 @@ static char *gmin_cfg_get_dsm(struct acpi_device *adev, const char *key)
 	if (!obj)
 		return NULL;
 
-	for (i = 0; i < obj->package.count - 1; i += 2) {
+	for (i = 0; i + 1 < obj->package.count; i += 2) {
 		key_el = &obj->package.elements[i + 0];
 		val_el = &obj->package.elements[i + 1];
 
Signature · 1 line
2.43.0
#1 lore raw
Quoted 9 lines · Mohamed El Harake

From: Mohamad El Harake <[email protected]>

gmin_cfg_get_dsm() iterates over ACPI _DSM package elements as key/value pairs using obj->package.count - 1 as the loop bound.

If package.count is 0, the subtraction underflows and may lead to out-of-bounds access.

Use i + 1 < obj->package.count instead.

how was this bug tested? and is there any way to reproduce this?

--
regards,
jose a. p-a

maintainer Reviewed-by on v1 1/1
#2 lore raw
In reply to Mohamed El Harake

Hi,

Quoted 11 lines · Mohamed El Harake

From: Mohamad El Harake <[email protected]>

gmin_cfg_get_dsm() iterates over ACPI _DSM package elements as key/value pairs using obj->package.count - 1 as the loop bound.

If package.count is 0, the subtraction underflows and may lead to out-of-bounds access.

Use i + 1 < obj->package.count instead.

Thanks, patch looks good to me:

Regards,

Hans

Quoted 17 lines
---
 drivers/staging/media/atomisp/pci/atomisp_csi2_bridge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/atomisp/pci/atomisp_csi2_bridge.c +1 -1
index ba61cc28fac1..cca91c6d71a5 100644
@@ -113,7 +113,7 @@ static char *gmin_cfg_get_dsm(struct acpi_device *adev, const char *key)
 	if (!obj)
 		return NULL;
 
-	for (i = 0; i < obj->package.count - 1; i += 2) {
+	for (i = 0; i + 1 < obj->package.count; i += 2) {
 		key_el = &obj->package.elements[i + 0];
 		val_el = &obj->package.elements[i + 1];