ACPICA: Fix possible memory leak in nspredef

Fixed a possible leak when an attempt is made to repair a return
object.  The only current repair is an automatic buffer to string
conversion.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 15 insertions, 12 deletions

diff --git a/drivers/acpi/acpica/nspredef.c b/drivers/acpi/acpica/nspredef.c
index 7f8e066b12a3..abbb855e1b9a 100644
--- a/drivers/acpi/acpica/nspredef.c
+++ b/drivers/acpi/acpica/nspredef.c
@@ -1046,22 +1046,25 @@ acpi_ns_repair_object(u32 expected_btypes,
                 ACPI_MEMCPY(new_object->string.pointer,
                             return_object->buffer.pointer, length);
 
-                /* Install the new return object */
-
-                acpi_ut_remove_reference(return_object);
-                *return_object_ptr = new_object;
-
                 /*
-                 * If the object is a package element, we need to:
-                 * 1. Decrement the reference count of the orignal object, it was
-                 *    incremented when building the package
-                 * 2. Increment the reference count of the new object, it will be
-                 *    decremented when releasing the package
+                 * If the original object is a package element, we need to:
+                 * 1. Set the reference count of the new object to match the
+                 *    reference count of the old object.
+                 * 2. Decrement the reference count of the original object.
                  */
                 if (package_index != ACPI_NOT_PACKAGE) {
-                        acpi_ut_remove_reference(return_object);
-                        acpi_ut_add_reference(new_object);
+                        new_object->common.reference_count =
+                            return_object->common.reference_count;
+
+                        if (return_object->common.reference_count > 1) {
+                                return_object->common.reference_count--;
+                        }
                 }
+
+                /* Delete old object, install the new return object */
+
+                acpi_ut_remove_reference(return_object);
+                *return_object_ptr = new_object;
                 return (AE_OK);
 
         default: