Re: [PATCH 103/190] Revert "thunderbolt: property: Fix a missing check of kzalloc"

Mika Westerberg
2021-04-22T11:25:09Z

On Wed, Apr 21, 2021 at 02:59:38PM +0200, Greg Kroah-Hartman wrote:
> This reverts commit 6183d5a51866f3acdeeb66b75e87d44025b01a55.
>
> Commits from @umn.edu addresses have been found to be submitted in "bad
> faith" to try to test the kernel community's ability to review "known
> malicious" changes. The result of these submissions can be found in a
> paper published at the 42nd IEEE Symposium on Security and Privacy
> entitled, "Open Source Insecurity: Stealthily Introducing
> Vulnerabilities via Hypocrite Commits" written by Qiushi Wu (University
> of Minnesota) and Kangjie Lu (University of Minnesota).
>
> Because of this, all submissions from this group must be reverted from
> the kernel tree and will need to be re-reviewed again to determine if
> they actually are a valid fix. Until that work is complete, remove this
> change to ensure that no problems are being introduced into the
> codebase.

This one is a valid, although minor, fix.

> Cc: Kangjie Lu <kjlu@umn.edu>
> Cc: Mukesh Ojha <mojha@codeaurora.org>
> Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
> drivers/thunderbolt/property.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/drivers/thunderbolt/property.c b/drivers/thunderbolt/property.c
> index d5b0cdb8f0b1..841314deb446 100644
> --- a/drivers/thunderbolt/property.c
> +++ b/drivers/thunderbolt/property.c
> @@ -587,12 +587,7 @@ int tb_property_add_text(struct tb_property_dir *parent, const char *key,
> return -ENOMEM;
>
> property->length = size / 4;
> - property->value.text = kzalloc(size, GFP_KERNEL);
> - if (!property->value.text) {
> - kfree(property);
> - return -ENOMEM;
> - }
> -
> + property->value.data = kzalloc(size, GFP_KERNEL);
> strcpy(property->value.text, text);
>
> list_add_tail(&property->list, &parent->properties);
> --
> 2.31.1