]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
thunderbolt: property: Fix a missing check of kzalloc
authorKangjie Lu <kjlu@umn.edu>
Mon, 25 Mar 2019 20:23:08 +0000 (15:23 -0500)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 13 Aug 2019 12:11:36 +0000 (14:11 +0200)
BugLink: https://bugs.launchpad.net/bugs/1837517
[ Upstream commit 6183d5a51866f3acdeeb66b75e87d44025b01a55 ]

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>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/thunderbolt/property.c

index b2f0d6386ceea26bfc738ff72d54f36cc6f7a505..ead18c532b53db15911364d8c27556a446dd2e2a 100644 (file)
@@ -578,7 +578,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);