diff options
Diffstat (limited to 'drivers/acpi/executer/exoparg2.c')
-rw-r--r-- | drivers/acpi/executer/exoparg2.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/acpi/executer/exoparg2.c b/drivers/acpi/executer/exoparg2.c index 8d70c6beef00..d8472842c1fd 100644 --- a/drivers/acpi/executer/exoparg2.c +++ b/drivers/acpi/executer/exoparg2.c | |||
@@ -344,10 +344,6 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state) | |||
344 | (length < operand[1]->integer.value) && | 344 | (length < operand[1]->integer.value) && |
345 | (operand[0]->buffer.pointer[length])) { | 345 | (operand[0]->buffer.pointer[length])) { |
346 | length++; | 346 | length++; |
347 | if (length > ACPI_MAX_STRING_CONVERSION) { | ||
348 | status = AE_AML_STRING_LIMIT; | ||
349 | goto cleanup; | ||
350 | } | ||
351 | } | 347 | } |
352 | 348 | ||
353 | /* Allocate a new string object */ | 349 | /* Allocate a new string object */ |
@@ -358,8 +354,10 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state) | |||
358 | goto cleanup; | 354 | goto cleanup; |
359 | } | 355 | } |
360 | 356 | ||
361 | /* Copy the raw buffer data with no transform. NULL terminated already */ | 357 | /* |
362 | 358 | * Copy the raw buffer data with no transform. | |
359 | * (NULL terminated already) | ||
360 | */ | ||
363 | ACPI_MEMCPY(return_desc->string.pointer, | 361 | ACPI_MEMCPY(return_desc->string.pointer, |
364 | operand[0]->buffer.pointer, length); | 362 | operand[0]->buffer.pointer, length); |
365 | break; | 363 | break; |