[PATCH] ACPICA: ACPI 5.1: Add support for runtime validation of _DSD package.

[PATCH] ACPICA: ACPI 5.1: Add support for runtime validation of _DSD package.

[Lv Zheng]

From: Mika Westerberg <mika.westerberg@linux.intel.com>

Adds ACPICA kernel runtime support to validate contents/format
of the _DSD package, similar to the iASL support. Ported by
Mika Westerberg.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
---
 drivers/acpi/acpica/nsprepkg.c |   39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/drivers/acpi/acpica/nsprepkg.c b/drivers/acpi/acpica/nsprepkg.c
index 68f7258..1b13b92 100644
--- a/drivers/acpi/acpica/nsprepkg.c
+++ b/drivers/acpi/acpica/nsprepkg.c
@@ -316,6 +316,45 @@ acpi_ns_check_package(struct acpi_evaluate_info *info,
 		    acpi_ns_check_package_list(info, package, elements, count);
 		break;
 
+	case ACPI_PTYPE2_UUID_PAIR:
+
+		/* The package must contain pairs of (UUID + type) */
+
+		if (count & 1) {
+			expected_count = count + 1;
+			goto package_too_small;
+		}
+
+		while (count > 0) {
+			status = acpi_ns_check_object_type(info, elements,
+							   package->ret_info.
+							   object_type1, 0);
+			if (ACPI_FAILURE(status)) {
+				return (status);
+			}
+
+			/* Validate length of the UUID buffer */
+
+			if ((*elements)->buffer.length != 16) {
+				ACPI_WARN_PREDEFINED((AE_INFO,
+						      info->full_pathname,
+						      info->node_flags,
+						      "Invalid length for UUID Buffer"));
+				return (AE_AML_OPERAND_VALUE);
+			}
+
+			status = acpi_ns_check_object_type(info, elements + 1,
+							   package->ret_info.
+							   object_type2, 0);
+			if (ACPI_FAILURE(status)) {
+				return (status);
+			}
+
+			elements += 2;
+			count -= 2;
+		}
+		break;
+
 	default:
 
 		/* Should not get here if predefined info table is correct */
-- 
1.7.10

Re: [PATCH] ACPICA: ACPI 5.1: Add support for runtime validation of _DSD package.

[Rafael J. Wysocki]

On Friday, August 29, 2014 09:32:42 AM Lv Zheng wrote:
> From: Mika Westerberg <mika.westerberg@linux.intel.com>
> 
> Adds ACPICA kernel runtime support to validate contents/format
> of the _DSD package, similar to the iASL support. Ported by
> Mika Westerberg.
> 
> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
> Signed-off-by: Bob Moore <robert.moore@intel.com>
> Signed-off-by: Lv Zheng <lv.zheng@intel.com>

Queued up for 3.17-rc4, thanks!

> ---
>  drivers/acpi/acpica/nsprepkg.c |   39 +++++++++++++++++++++++++++++++++++++++
>  1 file changed, 39 insertions(+)
> 
> diff --git a/drivers/acpi/acpica/nsprepkg.c b/drivers/acpi/acpica/nsprepkg.c
> index 68f7258..1b13b92 100644
> --- a/drivers/acpi/acpica/nsprepkg.c
> +++ b/drivers/acpi/acpica/nsprepkg.c
> @@ -316,6 +316,45 @@ acpi_ns_check_package(struct acpi_evaluate_info *info,
>  		    acpi_ns_check_package_list(info, package, elements, count);
>  		break;
>  
> +	case ACPI_PTYPE2_UUID_PAIR:
> +
> +		/* The package must contain pairs of (UUID + type) */
> +
> +		if (count & 1) {
> +			expected_count = count + 1;
> +			goto package_too_small;
> +		}
> +
> +		while (count > 0) {
> +			status = acpi_ns_check_object_type(info, elements,
> +							   package->ret_info.
> +							   object_type1, 0);
> +			if (ACPI_FAILURE(status)) {
> +				return (status);
> +			}
> +
> +			/* Validate length of the UUID buffer */
> +
> +			if ((*elements)->buffer.length != 16) {
> +				ACPI_WARN_PREDEFINED((AE_INFO,
> +						      info->full_pathname,
> +						      info->node_flags,
> +						      "Invalid length for UUID Buffer"));
> +				return (AE_AML_OPERAND_VALUE);
> +			}
> +
> +			status = acpi_ns_check_object_type(info, elements + 1,
> +							   package->ret_info.
> +							   object_type2, 0);
> +			if (ACPI_FAILURE(status)) {
> +				return (status);
> +			}
> +
> +			elements += 2;
> +			count -= 2;
> +		}
> +		break;
> +
>  	default:
>  
>  		/* Should not get here if predefined info table is correct */
> 

-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.