diff options
| author | Al Stone <ahs3@redhat.com> | 2013-10-09 14:21:10 -0600 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-10 22:31:21 +0200 |
| commit | e83dda06242073b1c7f9a88f1001e32a4b9fcd1d (patch) | |
| tree | cf75d28d881175bd8eb0c9b9c1f823984782d167 /drivers/acpi/utils.c | |
| parent | 088f1fd267c7f43b5d87850a0fa0c7e851ecae97 (diff) | |
| download | linux-0-day-e83dda06242073b1c7f9a88f1001e32a4b9fcd1d.tar.gz linux-0-day-e83dda06242073b1c7f9a88f1001e32a4b9fcd1d.tar.xz | |
ACPI: improve acpi_extract_package() utility
The current version requires one to know the size of the package
a priori; this is almost impossible if the package is composed of
strings of variable length. This change allows the utility to
allocate a buffer of the proper size if asked.
Signed-off-by: Al Stone <al.stone@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/utils.c')
| -rw-r--r-- | drivers/acpi/utils.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c index 552248b0005b0..fc2cd32840805 100644 --- a/drivers/acpi/utils.c +++ b/drivers/acpi/utils.c @@ -169,11 +169,20 @@ acpi_extract_package(union acpi_object *package, /* * Validate output buffer. */ - if (buffer->length < size_required) { + if (buffer->length == ACPI_ALLOCATE_BUFFER) { + buffer->pointer = ACPI_ALLOCATE(size_required); + if (!buffer->pointer) + return AE_NO_MEMORY; buffer->length = size_required; - return AE_BUFFER_OVERFLOW; - } else if (buffer->length != size_required || !buffer->pointer) { - return AE_BAD_PARAMETER; + memset(buffer->pointer, 0, size_required); + } else { + if (buffer->length < size_required) { + buffer->length = size_required; + return AE_BUFFER_OVERFLOW; + } else if (buffer->length != size_required || + !buffer->pointer) { + return AE_BAD_PARAMETER; + } } head = buffer->pointer; |