linux-kernel - Re: [PATCH 1/2 v2] HID: kfree() NULL pointer cleanup

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Thu, 4 Aug 2011 23:52:23 +0200 (CEST)
From:	Jiri Kosina <jkosina@...e.cz>
To:	Bojan Prtvar <prtvar.b@...il.com>
Cc:	julia@...u.dk, linux-input@...r.kernel.org,
	linux-kernel@...r.kernel.org, kernel-janitors@...r.kernel.org
Subject: Re: [PATCH 1/2 v2] HID: kfree() NULL pointer cleanup

On Thu, 4 Aug 2011, Bojan Prtvar wrote:

> Checking for NULL pointers before kfree() is redundant.
> v2:
> No need for freeing pm in case when it's not allocated.
> 
> Reported-by: Julia Lawall <julia@...u.dk>
> Signed-off-by: Bojan Prtvar <prtvar.b@...il.com>
> ---
>  drivers/hid/hid-prodikeys.c |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/hid/hid-prodikeys.c b/drivers/hid/hid-prodikeys.c
> index 158b389..f779009 100644
> --- a/drivers/hid/hid-prodikeys.c
> +++ b/drivers/hid/hid-prodikeys.c
> @@ -816,7 +816,7 @@ static int pk_probe(struct hid_device *hdev, const struct hid_device_id *id)
>  	if (pm == NULL) {
>  		hid_err(hdev, "can't alloc descriptor\n");
>  		ret = -ENOMEM;
> -		goto err_free;
> +		goto err_free_pk;
>  	}
>  
>  	pm->pk = pk;
> @@ -849,10 +849,10 @@ static int pk_probe(struct hid_device *hdev, const struct hid_device_id *id)
>  err_stop:
>  	hid_hw_stop(hdev);
>  err_free:
> -	if (pm != NULL)
> -		kfree(pm);
> -
> +	kfree(pm);
> +err_free_pk:
>  	kfree(pk);
> +
>  	return ret;
>  }
>  

Applied, thanks to both.

-- 
Jiri Kosina
SUSE Labs
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/