[PATCH 5.1 334/405] thunderbolt: property: Fix a NULL pointer dereference

[Greg Kroah-Hartman]

[ Upstream commit 106204b56f60abf1bead7dceb88f2be3e34433da ]

In case kzalloc fails, the fix releases resources and returns
-ENOMEM to avoid the NULL pointer dereference.

Signed-off-by: Kangjie Lu <k...@umn.edu>
Signed-off-by: Mika Westerberg <mika.westerb...@linux.intel.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/thunderbolt/property.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/thunderbolt/property.c b/drivers/thunderbolt/property.c
index ead18c532b53d..8c077c4f3b5b2 100644
--- a/drivers/thunderbolt/property.c
+++ b/drivers/thunderbolt/property.c
@@ -548,6 +548,11 @@ int tb_property_add_data(struct tb_property_dir *parent, 
const char *key,
 
        property->length = size / 4;
        property->value.data = kzalloc(size, GFP_KERNEL);
+       if (!property->value.data) {
+               kfree(property);
+               return -ENOMEM;
+       }
+
        memcpy(property->value.data, buf, buflen);
 
        list_add_tail(&property->list, &parent->properties);
-- 
2.20.1