diff mbox series

ACPICA: Fix dereference in acpi_ev_address_space_dispatch()

Message ID 20241031173146.1459-1-grurikov@gmail.com
State New
Headers show
Series ACPICA: Fix dereference in acpi_ev_address_space_dispatch() | expand

Commit Message

George Rurikov Oct. 31, 2024, 5:31 p.m. UTC
When support for  PCC Opregion was added, validation of field_obj
was missed.
Based on the acpi_ev_address_space_dispatch function description,
field_obj can be NULL, and also when acpi_ev_address_space_dispatch
is called in the acpi_ex_region_read() NULL is passed as field_obj.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: 0acf24ad7e10 ("ACPICA: Add support for PCC Opregion special context data")
Cc: stable@vger.kernel.org
Signed-off-by: George Rurikov <grurikov@gmail.com>
---
 drivers/acpi/acpica/evregion.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

Comments

Sudeep Holla Nov. 5, 2024, 5:11 p.m. UTC | #1
On Thu, Oct 31, 2024 at 05:31:46PM +0000, George Rurikov wrote:
> * # Be careful, this email looks suspicious; * WARNING!  This email has multiple suspicious indicators that suggest it is malicious, please handle links and attachments with extreme care. *
> When support for  PCC Opregion was added, validation of field_obj
> was missed.
> Based on the acpi_ev_address_space_dispatch function description,
> field_obj can be NULL, and also when acpi_ev_address_space_dispatch
> is called in the acpi_ex_region_read() NULL is passed as field_obj.
>
> Found by Linux Verification Center (linuxtesting.org) with SVACE.
>

LGTM, please submit this to ACPICA project as specified in the documentation
if not already done. Otherwise a reference to the merge request there would
be good here.

--
Regards,
Sudeep
diff mbox series

Patch

diff --git a/drivers/acpi/acpica/evregion.c b/drivers/acpi/acpica/evregion.c
index cf53b9535f18..03e8b6f186af 100644
--- a/drivers/acpi/acpica/evregion.c
+++ b/drivers/acpi/acpica/evregion.c
@@ -164,13 +164,17 @@  acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
 		}
 
 		if (region_obj->region.space_id == ACPI_ADR_SPACE_PLATFORM_COMM) {
-			struct acpi_pcc_info *ctx =
-			    handler_desc->address_space.context;
-
-			ctx->internal_buffer =
-			    field_obj->field.internal_pcc_buffer;
-			ctx->length = (u16)region_obj->region.length;
-			ctx->subspace_id = (u8)region_obj->region.address;
+			if (field_obj != NULL) {
+				struct acpi_pcc_info *ctx =
+					handler_desc->address_space.context;
+
+				ctx->internal_buffer =
+					field_obj->field.internal_pcc_buffer;
+				ctx->length = (u16)region_obj->region.length;
+				ctx->subspace_id = (u8)region_obj->region.address;
+			} else {
+				return_ACPI_STATUS(AE_ERROR);
+			}
 		}
 
 		if (region_obj->region.space_id ==