Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org AA87360A50
Subject: Re: [PATCH] thunderbolt: property: fix a buffer overflow and a
 missing check
To:     Kangjie Lu <kjlu@umn.edu>
Cc:     pakki001@umn.edu, Andreas Noever <andreas.noever@gmail.com>,
        Michael Jamet <michael.jamet@intel.com>,
        Mika Westerberg <mika.westerberg@linux.intel.com>,
        Yehezkel Bernat <YehezkelShB@gmail.com>,
        linux-kernel@vger.kernel.org
References: <20190324224916.1389-1-kjlu@umn.edu>
From:   Mukesh Ojha <mojha@codeaurora.org>
Message-ID: <9a518b6f-0036-2425-a40e-68d1f5f8d5c4@codeaurora.org>
Date:   Wed, 27 Mar 2019 20:15:39 +0530
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101
 Thunderbird/60.6.0
MIME-Version: 1.0
In-Reply-To: <20190324224916.1389-1-kjlu@umn.edu>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 8bit
Content-Language: en-US
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


On 3/25/2019 4:19 AM, Kangjie Lu wrote:
> First, no memory is allocated for "property->value.text"; the
> following strcpy will lead to a buffer overflow.

Fix the commit text as there is no  overflow.

only the check and resource cleanp is the fix.

>
> Second, no check is enforced for the return value of kzalloc,
> which may lead to NULL-pointer dereference.
>
> The patch fixes the two issues.
>
> Signed-off-by: Kangjie Lu <kjlu@umn.edu
Otherwise looks good.

Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>

-Mukesh

> ---
>   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);