Re: [PATCH v2] thunderbolt: property: fix a missing check of kzalloc

2019-03-28 Thread Mika Westerberg
On Mon, Mar 25, 2019 at 03:23:08PM -0500, Kangjie Lu wrote:
> No check is enforced for the return value of kzalloc,
> which may lead to NULL-pointer dereference.
> 
> The patch fixes this issue.
> 
> Signed-off-by: Kangjie Lu 
> Reviewed-by: Mukesh Ojha 

Applied, thanks!


[PATCH v2] thunderbolt: property: fix a missing check of kzalloc

2019-03-25 Thread Kangjie Lu
No check is enforced for the return value of kzalloc,
which may lead to NULL-pointer dereference.

The patch fixes this issue.

Signed-off-by: Kangjie Lu 
Reviewed-by: Mukesh Ojha 

---
V2: no overflow issue, as pointed out by
Mika Westerberg 
---
 drivers/thunderbolt/property.c | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/thunderbolt/property.c b/drivers/thunderbolt/property.c
index 841314deb446..d5b0cdb8f0b1 100644
--- a/drivers/thunderbolt/property.c
+++ b/drivers/thunderbolt/property.c
@@ -587,7 +587,12 @@ int tb_property_add_text(struct tb_property_dir *parent, 
const char *key,
return -ENOMEM;
 
property->length = size / 4;
-   property->value.data = kzalloc(size, GFP_KERNEL);
+   property->value.text = kzalloc(size, GFP_KERNEL);
+   if (!property->value.text) {
+   kfree(property);
+   return -ENOMEM;
+   }
+
strcpy(property->value.text, text);
 
list_add_tail(>list, >properties);
-- 
2.17.1