linux-kernel - Re: [PATCH] [staging] iio, adc: Do not leak memory in ad7280_event

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <4EB70100.8030703@kernel.org>
Date:	Sun, 06 Nov 2011 21:49:52 +0000
From:	Jonathan Cameron <jic23@...nel.org>
To:	Jesper Juhl <jj@...osbits.net>
CC:	linux-iio@...r.kernel.org, devel@...verdev.osuosl.org,
	linux-kernel@...r.kernel.org,
	Paul Gortmaker <paul.gortmaker@...driver.com>,
	Michael Hennerich <michael.hennerich@...log.com>,
	Greg Kroah-Hartman <gregkh@...e.de>,
	Jonathan Cameron <jic23@....ac.uk>
Subject: Re: [PATCH] [staging] iio, adc: Do not leak memory in ad7280_event_handler()

On 11/06/2011 09:49 PM, Jesper Juhl wrote:
> If ad7280_read_all_channels() returns <0 then we'll leak the memory
> allocated to 'channels' when we return and that variable goes out of
> scope.
> This patch fixes the leak.
> 
Looks right to me - good spot. Only choice is whether a single exit
point makes sense rather than undwinding it here? Michael?
I'm happy with either solution, hence the ack.

> Signed-off-by: Jesper Juhl <jj@...osbits.net>
Acked-by: Jonathan Cameron <jic23@....ac.uk>
> ---
>  drivers/staging/iio/adc/ad7280a.c |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
>  note: I don't have the hardware, so patch is compile tested only.
> 
> diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c
> index 372d059..dddc03c 100644
> --- a/drivers/staging/iio/adc/ad7280a.c
> +++ b/drivers/staging/iio/adc/ad7280a.c
> @@ -687,8 +687,10 @@ static irqreturn_t ad7280_event_handler(int irq, void *private)
>  		return IRQ_HANDLED;
>  
>  	ret = ad7280_read_all_channels(st, st->scan_cnt, channels);
> -	if (ret < 0)
> +	if (ret < 0) {
> +		kfree(channels);
>  		return IRQ_HANDLED;
> +	}
>  
>  	for (i = 0; i < st->scan_cnt; i++) {
>  		if (((channels[i] >> 23) & 0xF) <= AD7280A_CELL_VOLTAGE_6) {

--
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/