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;
Date:   Mon, 25 Mar 2019 12:01:04 +0200
From:   Mika Westerberg <mika.westerberg@linux.intel.com>
To:     Kangjie Lu <kjlu@umn.edu>
Cc:     pakki001@umn.edu, Andreas Noever <andreas.noever@gmail.com>,
        Michael Jamet <michael.jamet@intel.com>,
        Yehezkel Bernat <YehezkelShB@gmail.com>,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH] thunderbolt: property: fix a buffer overflow and a
 missing check
Message-ID: <20190325100104.GE3622@lahna.fi.intel.com>
References: <20190324224916.1389-1-kjlu@umn.edu>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20190324224916.1389-1-kjlu@umn.edu>
Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo
User-Agent: Mutt/1.11.3 (2019-02-01)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Sun, Mar 24, 2019 at 05:49:16PM -0500, Kangjie Lu wrote:
> First, no memory is allocated for "property->value.text"; the
> following strcpy will lead to a buffer overflow.

It is actually member of union so assigning via value.txt or value.data
is the same.

So no buffer overflow.

> Second, no check is enforced for the return value of kzalloc,
> which may lead to NULL-pointer dereference.

Yes, this is valid.

Can you fix the changelog accordingly and resend?

> 
> The patch fixes the two issues.
> 
> Signed-off-by: Kangjie Lu <kjlu@umn.edu>
> ---
>  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);
> -- 
> 2.17.1