ACPI: Battery: Allow extract string from integer
PATCH 1/1 ACPI: Battery: Allow extract string from integer
Some machines return integer instead of expected string.
---
drivers/acpi/battery.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-)
drivers/acpi/battery.c +15 -10
@@ -260,7 +260,7 @@ static int extract_package(struct acpi_battery *battery,union acpi_object *package, struct acpi_offsets *offsets, int num) { - int i, *x; + int i;union acpi_object *element;if (package->type !=ACPI_TYPE_PACKAGE )return -EFAULT ;
@@ -269,16 +269,21 @@ static int extract_package(struct acpi_battery *battery,return -EFAULT ; element = &package->package.elements[i];if (offsets[i].mode) { -if (element->type !=ACPI_TYPE_STRING && - element->type !=ACPI_TYPE_BUFFER ) -return -EFAULT ; -strncpy ((u8 *)battery + offsets[i].offset, - element->string.pointer,32 ); +u8 *ptr = (u8 *)battery + offsets[i].offset; +if (element->type ==ACPI_TYPE_STRING || + element->type ==ACPI_TYPE_BUFFER ) +strncpy (ptr, element->string.pointer,32 ); +else if (element->type ==ACPI_TYPE_INTEGER ) { +strncpy (ptr, (u8 *)&element->integer.value, +sizeof (acpi_integer)); + ptr[sizeof (acpi_integer)] =0 ; + }else return -EFAULT ; }else { -if (element->type !=ACPI_TYPE_INTEGER ) -return -EFAULT ; - x = (int *)((u8 *)battery + offsets[i].offset); - *x = element->integer.value; +if (element->type ==ACPI_TYPE_INTEGER ) { +int *x = (int *)((u8 *)battery + + offsets[i].offset); + *x = element->integer.value; + }else return -EFAULT ; } }return 0 ;
Applied.
Andrey, Frans,
thanks for helping with Alexey's patch this weekend.
-Len
Quoted 58 lines · Alexey Starikovskiy
Some machines return integer instead of expected string.
Signed-off-by Alexey Starikovskiy <[email protected]>---
drivers/acpi/battery.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-)drivers/acpi/battery.c +15
-11@@ -260,7 +260,7 @@ static int extract_package(struct acpi_battery *battery,union acpi_object *package, struct acpi_offsets *offsets, int num) { - int i, *x; + int i;union acpi_object *element;if (package->type !=ACPI_TYPE_PACKAGE )return -EFAULT ;@@ -269,16 +269,21 @@ static int extract_package(struct acpi_battery *battery,return -EFAULT ; element = &package->package.elements[i];if (offsets[i].mode) { -if (element->type !=ACPI_TYPE_STRING && - element->type !=ACPI_TYPE_BUFFER ) -return -EFAULT ; -strncpy ((u8 *)battery + offsets[i].offset, - element->string.pointer,32 ); +u8 *ptr = (u8 *)battery + offsets[i].offset; +if (element->type ==ACPI_TYPE_STRING || + element->type ==ACPI_TYPE_BUFFER ) +strncpy (ptr, element->string.pointer,32 ); +else if (element->type ==ACPI_TYPE_INTEGER ) { +strncpy (ptr, (u8 *)&element->integer.value, +sizeof (acpi_integer)); + ptr[sizeof (acpi_integer)] =0 ; + }else return -EFAULT ; }else { -if (element->type !=ACPI_TYPE_INTEGER ) -return -EFAULT ; - x = (int *)((u8 *)battery + offsets[i].offset); - *x = element->integer.value; +if (element->type ==ACPI_TYPE_INTEGER ) { +int *x = (int *)((u8 *)battery + + offsets[i].offset); + *x = element->integer.value; + }else return -EFAULT ; } }return 0 ; -To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi,
Quoted 4 lines · Len Brown
Applied.
Andrey, Frans,
thanks for helping with Alexey's patch this weekend.
Please let me know when it goes to Linus.
Thanks,
Rafael
Quoted 65 lines · Alexey Starikovskiy
Quoted 54 lines
Some machines return integer instead of expected string.
Signed-off-by Alexey Starikovskiy <[email protected]>---
drivers/acpi/battery.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-)drivers/acpi/battery.c +15
-11@@ -260,7 +260,7 @@ static int extract_package(struct acpi_battery *battery,union acpi_object *package, struct acpi_offsets *offsets, int num) { - int i, *x; + int i;union acpi_object *element;if (package->type !=ACPI_TYPE_PACKAGE )return -EFAULT ;@@ -269,16 +269,21 @@ static int extract_package(struct acpi_battery *battery,return -EFAULT ; element = &package->package.elements[i];if (offsets[i].mode) { -if (element->type !=ACPI_TYPE_STRING && - element->type !=ACPI_TYPE_BUFFER ) -return -EFAULT ; -strncpy ((u8 *)battery + offsets[i].offset, - element->string.pointer,32 ); +u8 *ptr = (u8 *)battery + offsets[i].offset; +if (element->type ==ACPI_TYPE_STRING || + element->type ==ACPI_TYPE_BUFFER ) +strncpy (ptr, element->string.pointer,32 ); +else if (element->type ==ACPI_TYPE_INTEGER ) { +strncpy (ptr, (u8 *)&element->integer.value, +sizeof (acpi_integer)); + ptr[sizeof (acpi_integer)] =0 ; + }else return -EFAULT ; }else { -if (element->type !=ACPI_TYPE_INTEGER ) -return -EFAULT ; - x = (int *)((u8 *)battery + offsets[i].offset); - *x = element->integer.value; +if (element->type ==ACPI_TYPE_INTEGER ) { +int *x = (int *)((u8 *)battery + + offsets[i].offset); + *x = element->integer.value; + }else return -EFAULT ; } }return 0 ; -Quoted 4 lines
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Len Brown
reviewerQuoted 9 lines · Rafael J. Wysocki
Hi,
Quoted 4 lines · Len Brown
Applied.
Andrey, Frans,
thanks for helping with Alexey's patch this weekend.Please let me know when it goes to Linus.
It went up last night, so it is included in 2.6.24-rc1-git6
thanks,
-Len
Quoted 71 lines
Quoted 55 lines · Alexey Starikovskiy
Quoted 53 lines
Some machines return integer instead of expected string.
Signed-off-by Alexey Starikovskiy <[email protected]>---
drivers/acpi/battery.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-)drivers/acpi/battery.c +15
-10@@ -260,7 +260,7 @@ static int extract_package(struct acpi_battery *battery,union acpi_object *package, struct acpi_offsets *offsets, int num) { - int i, *x; + int i;union acpi_object *element;if (package->type !=ACPI_TYPE_PACKAGE )return -EFAULT ;@@ -269,16 +269,21 @@ static int extract_package(struct acpi_battery *battery,return -EFAULT ; element = &package->package.elements[i];if (offsets[i].mode) { -if (element->type !=ACPI_TYPE_STRING && - element->type !=ACPI_TYPE_BUFFER ) -return -EFAULT ; -strncpy ((u8 *)battery + offsets[i].offset, - element->string.pointer,32 ); +u8 *ptr = (u8 *)battery + offsets[i].offset; +if (element->type ==ACPI_TYPE_STRING || + element->type ==ACPI_TYPE_BUFFER ) +strncpy (ptr, element->string.pointer,32 ); +else if (element->type ==ACPI_TYPE_INTEGER ) { +strncpy (ptr, (u8 *)&element->integer.value, +sizeof (acpi_integer)); + ptr[sizeof (acpi_integer)] =0 ; + }else return -EFAULT ; }else { -if (element->type !=ACPI_TYPE_INTEGER ) -return -EFAULT ; - x = (int *)((u8 *)battery + offsets[i].offset); - *x = element->integer.value; +if (element->type ==ACPI_TYPE_INTEGER ) { +int *x = (int *)((u8 *)battery + + offsets[i].offset); + *x = element->integer.value; + }else return -EFAULT ; } }return 0 ;Quoted 11 lines
Quoted 5 lines
-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html