| From 5a5c3ae1f82743c49d7d2391a8970ce92aa9ae20 Mon Sep 17 00:00:00 2001 |
| From: Kangjie Lu <kjlu@umn.edu> |
| Date: Tue, 12 Mar 2019 03:33:28 -0500 |
| Subject: thunderbolt: property: Fix a NULL pointer dereference |
| |
| [ 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 <kjlu@umn.edu> |
| Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> |
| Signed-off-by: Sasha Levin <sashal@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 67fd0b5551ded..be3f8b592b05b 100644 |
| --- a/drivers/thunderbolt/property.c |
| +++ b/drivers/thunderbolt/property.c |
| @@ -551,6 +551,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 |
| |
