Re: [PATCH 116/190] Revert "thunderbolt: property: Fix a NULL pointer dereference"

[James Morris]

On Wed, 21 Apr 2021, Greg Kroah-Hartman wrote:

> This reverts commit 106204b56f60abf1bead7dceb88f2be3e34433da.
> 
> 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.
> 
> Cc: Kangjie Lu <kjlu@xxxxxxx>
> Cc: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> ---
>  drivers/thunderbolt/property.c | 5 -----
>  1 file changed, 5 deletions(-)

The original patch looks correct.


Reviewed-by: James Morris <jamorris@xxxxxxxxxxxxxxxxxxx>

> 
> diff --git a/drivers/thunderbolt/property.c b/drivers/thunderbolt/property.c
> index ee76449524a3..b2f0d6386cee 100644
> --- a/drivers/thunderbolt/property.c
> +++ b/drivers/thunderbolt/property.c
> @@ -548,11 +548,6 @@ 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.31.1
> 

-- 
James Morris
<jmorris@xxxxxxxxx>