Update steps taken to evaluate prerequisites size value
Signed-off-by: Jorge Lopez <jorge.lopez2@xxxxxx>
---
Based on the latest platform-drivers-x86.git/for-next
---
drivers/platform/x86/hp/hp-bioscfg/enum-attributes.c | 6 ++++--
drivers/platform/x86/hp/hp-bioscfg/int-attributes.c | 6 +++++-
drivers/platform/x86/hp/hp-bioscfg/order-list-attributes.c | 6 ++++--
drivers/platform/x86/hp/hp-bioscfg/passwdobj-attributes.c | 6 ++++--
drivers/platform/x86/hp/hp-bioscfg/string-attributes.c | 6 ++++--
5 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/drivers/platform/x86/hp/hp-bioscfg/enum-attributes.c b/drivers/platform/x86/hp/hp-bioscfg/enum-attributes.c
index 50855ff48926..89bb039a8a3c 100644
--- a/drivers/platform/x86/hp/hp-bioscfg/enum-attributes.c
+++ b/drivers/platform/x86/hp/hp-bioscfg/enum-attributes.c
@@ -190,9 +190,11 @@ static int hp_populate_enumeration_elements_from_package(union acpi_object *enum
enum_data->common.sequence = int_value;
break;
case PREREQUISITES_SIZE:
- enum_data->common.prerequisites_size = int_value;
- if (int_value > MAX_PREREQUISITES_SIZE)
+ if (int_value > MAX_PREREQUISITES_SIZE) {
pr_warn("Prerequisites size value exceeded the maximum number of elements supported or data may be malformed\n");
+ int_value = MAX_PREREQUISITES_SIZE;
+ }
+ enum_data->common.prerequisites_size = int_value;
/*
* This step is needed to keep the expected
diff --git a/drivers/platform/x86/hp/hp-bioscfg/int-attributes.c b/drivers/platform/x86/hp/hp-bioscfg/int-attributes.c
index a45919616fa8..86b7ac63fec2 100644
--- a/drivers/platform/x86/hp/hp-bioscfg/int-attributes.c
+++ b/drivers/platform/x86/hp/hp-bioscfg/int-attributes.c
@@ -208,8 +208,12 @@ static int hp_populate_integer_elements_from_package(union acpi_object *integer_
integer_data->common.sequence = int_value;
break;
case PREREQUISITES_SIZE:
- if (integer_data->common.prerequisites_size > MAX_PREREQUISITES_SIZE)
+ if (int_value > MAX_PREREQUISITES_SIZE) {
pr_warn("Prerequisites size value exceeded the maximum number of elements supported or data may be malformed\n");
+ int_value = MAX_PREREQUISITES_SIZE;
+ }
+ integer_data->common.prerequisites_size = int_value;
+
/*
* This step is needed to keep the expected
* element list pointing to the right obj[elem].type
diff --git a/drivers/platform/x86/hp/hp-bioscfg/order-list-attributes.c b/drivers/platform/x86/hp/hp-bioscfg/order-list-attributes.c
index aba7d26b54b2..71f588cbdf88 100644
--- a/drivers/platform/x86/hp/hp-bioscfg/order-list-attributes.c
+++ b/drivers/platform/x86/hp/hp-bioscfg/order-list-attributes.c
@@ -202,9 +202,11 @@ static int hp_populate_ordered_list_elements_from_package(union acpi_object *ord
ordered_list_data->common.sequence = int_value;
break;
case PREREQUISITES_SIZE:
- ordered_list_data->common.prerequisites_size = int_value;
- if (int_value > MAX_PREREQUISITES_SIZE)
+ if (int_value > MAX_PREREQUISITES_SIZE) {
pr_warn("Prerequisites size value exceeded the maximum number of elements supported or data may be malformed\n");
+ int_value = MAX_PREREQUISITES_SIZE;
+ }
+ ordered_list_data->common.prerequisites_size = int_value;
/*
* This step is needed to keep the expected
diff --git a/drivers/platform/x86/hp/hp-bioscfg/passwdobj-attributes.c b/drivers/platform/x86/hp/hp-bioscfg/passwdobj-attributes.c
index 3840380a5aee..afb5190afc03 100644
--- a/drivers/platform/x86/hp/hp-bioscfg/passwdobj-attributes.c
+++ b/drivers/platform/x86/hp/hp-bioscfg/passwdobj-attributes.c
@@ -289,9 +289,11 @@ static int hp_populate_password_elements_from_package(union acpi_object *passwor
password_data->common.sequence = int_value;
break;
case PREREQUISITES_SIZE:
- password_data->common.prerequisites_size = int_value;
- if (int_value > MAX_PREREQUISITES_SIZE)
+ if (int_value > MAX_PREREQUISITES_SIZE) {
pr_warn("Prerequisites size value exceeded the maximum number of elements supported or data may be malformed\n");
+ int_value = MAX_PREREQUISITES_SIZE;
+ }
+ password_data->common.prerequisites_size = int_value;
/* This step is needed to keep the expected
* element list pointing to the right obj[elem].type
diff --git a/drivers/platform/x86/hp/hp-bioscfg/string-attributes.c b/drivers/platform/x86/hp/hp-bioscfg/string-attributes.c
index 378cedb502ba..f0c20070094d 100644
--- a/drivers/platform/x86/hp/hp-bioscfg/string-attributes.c
+++ b/drivers/platform/x86/hp/hp-bioscfg/string-attributes.c
@@ -198,10 +198,12 @@ static int hp_populate_string_elements_from_package(union acpi_object *string_ob
string_data->common.sequence = int_value;
break;
case PREREQUISITES_SIZE:
+ if (int_value > MAX_PREREQUISITES_SIZE) {
+ pr_warn("Prerequisites size value exceeded the maximum number of elements supported or data may be malformed\n");
+ int_value = MAX_PREREQUISITES_SIZE;
+ }
string_data->common.prerequisites_size = int_value;
- if (string_data->common.prerequisites_size > MAX_PREREQUISITES_SIZE)
- pr_warn("Prerequisites size value exceeded the maximum number of elements supported or data may be malformed\n");
/*
* This step is needed to keep the expected
* element list pointing to the right obj[elem].type
--
2.34.1
