mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH v2] thunderbolt: property: fix a missing check of kzalloc
       [not found] <ed992024-d2a6-b3e2-dd19-edb421fa6dd2@codeaurora.org>
@ 2019-03-25 20:23 ` Kangjie Lu
  2019-03-28  8:32   ` Mika Westerberg
  0 siblings, 1 reply; 2+ messages in thread
From: Kangjie Lu @ 2019-03-25 20:23 UTC (permalink / raw)
  To: kjlu
  Cc: pakki001, Andreas Noever, Michael Jamet, Mika Westerberg,
	Yehezkel Bernat, linux-kernel

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 <kjlu@umn.edu>
Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>

---
V2: no overflow issue, as pointed out by
Mika Westerberg <mika.westerberg@linux.intel.com>
---
 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(&property->list, &parent->properties);
-- 
2.17.1


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH v2] thunderbolt: property: fix a missing check of kzalloc
  2019-03-25 20:23 ` [PATCH v2] thunderbolt: property: fix a missing check of kzalloc Kangjie Lu
@ 2019-03-28  8:32   ` Mika Westerberg
  0 siblings, 0 replies; 2+ messages in thread
From: Mika Westerberg @ 2019-03-28  8:32 UTC (permalink / raw)
  To: Kangjie Lu
  Cc: pakki001, Andreas Noever, Michael Jamet, Yehezkel Bernat, linux-kernel

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 <kjlu@umn.edu>
> Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>

Applied, thanks!

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-03-28  8:32 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <ed992024-d2a6-b3e2-dd19-edb421fa6dd2@codeaurora.org>
2019-03-25 20:23 ` [PATCH v2] thunderbolt: property: fix a missing check of kzalloc Kangjie Lu
2019-03-28  8:32   ` Mika Westerberg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome