Re: [PATCH] thunderbolt: property: fix a NULL pointer dereference

2019-03-13 Thread Mika Westerberg
On Tue, Mar 12, 2019 at 03:33:28AM -0500, Kangjie Lu wrote:
> In case kzalloc fails, the fix releases resources and returns
> -ENOMEM to avoid the NULL pointer dereference.
> 
> Signed-off-by: Kangjie Lu 

Applied, thanks!


[PATCH] thunderbolt: property: fix a NULL pointer dereference

2019-03-12 Thread Kangjie Lu
In case kzalloc fails, the fix releases resources and returns
-ENOMEM to avoid the NULL pointer dereference.

Signed-off-by: Kangjie Lu 
---
 drivers/thunderbolt/property.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/drivers/thunderbolt/property.c b/drivers/thunderbolt/property.c
index b2f0d6386cee..ee76449524a3 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(>list, >properties);
-- 
2.17.1