2 files changed, 12 insertions, 0 deletions

diff --git a/drivers/acpi/namespace/nsnames.c b/drivers/acpi/namespace/nsnames.c
index cffef1bcbdbc..549db42f16cf 100644
--- a/drivers/acpi/namespace/nsnames.c
+++ b/drivers/acpi/namespace/nsnames.c
@@ -137,6 +137,10 @@ char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node)
         /* Calculate required buffer size based on depth below root */
 
         size = acpi_ns_get_pathname_length(node);
+        if (!size) {
+                ACPI_ERROR((AE_INFO, "Invalid node failure"));
+                return_PTR(NULL);
+        }
 
         /* Allocate a buffer to be returned to caller */
 
@@ -229,6 +233,10 @@ acpi_ns_handle_to_pathname(acpi_handle target_handle,
         /* Determine size required for the caller buffer */
 
         required_size = acpi_ns_get_pathname_length(node);
+        if (!required_size) {
+                ACPI_ERROR((AE_INFO, "Invalid node failure"));
+                return_ACPI_STATUS(AE_ERROR);
+        }
 
         /* Validate/Allocate/Clear caller buffer */
 
diff --git a/drivers/acpi/utilities/utalloc.c b/drivers/acpi/utilities/utalloc.c
index 3dfb8a442b26..e7bf34a7b1d2 100644
--- a/drivers/acpi/utilities/utalloc.c
+++ b/drivers/acpi/utilities/utalloc.c
@@ -242,6 +242,10 @@ acpi_ut_initialize_buffer(struct acpi_buffer * buffer,
 {
         acpi_status status = AE_OK;
 
+        if (!required_length) {
+                WARN_ON(1);
+                return AE_ERROR;
+        }
         switch (buffer->length) {
         case ACPI_NO_BUFFER: