linux-kernel - RE: [PATCH][next] media: cxd2880-spi: fix two memory leaks of dvb

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]

Message-ID: <02699364973B424C83A42A84B04FDA850B34D9CB@JPYOKXMS113.jp.sony.com>
Date:   Mon, 7 Jan 2019 02:25:03 +0000
From:   <Yasunari.Takiguchi@...y.com>
To:     <colin.king@...onical.com>, <mchehab@...nel.org>,
        <linux-media@...r.kernel.org>
CC:     <kernel-janitors@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
        <Yasunari.Takiguchi@...y.com>
Subject: RE: [PATCH][next] media: cxd2880-spi: fix two memory leaks of
 dvb_spi

Hi Colin

Thanks for finding that.
Acked-by: Yasunari Takiguchi <Yasunari.Takiguchi@...y.com>　

Takiguchi

> -----Original Message-----
> From: Colin King [mailto:colin.king@...onical.com]
> Sent: Saturday, December 22, 2018 11:12 PM
> To: Takiguchi, Yasunari (SSS); Mauro Carvalho Chehab;
> linux-media@...r.kernel.org
> Cc: kernel-janitors@...r.kernel.org; linux-kernel@...r.kernel.org
> Subject: [PATCH][next] media: cxd2880-spi: fix two memory leaks of dvb_spi
> 
> From: Colin Ian King <colin.king@...onical.com>
> 
> There are two return paths that do not kfree dvb_spi. Fix the memory
> leaks by returning via the exit label fail_adapter that will free
> dvi_spi.
> 
> Detected by CoverityScan, CID#1475991 ("Resource Leak")
> 
> Fixes: cb496cd472af ("media: cxd2880-spi: Add optional vcc regulator")
> Signed-off-by: Colin Ian King <colin.king@...onical.com>
> ---
>  drivers/media/spi/cxd2880-spi.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/media/spi/cxd2880-spi.c
> b/drivers/media/spi/cxd2880-spi.c
> index d5c433e20d4a..3499c90dc695 100644
> --- a/drivers/media/spi/cxd2880-spi.c
> +++ b/drivers/media/spi/cxd2880-spi.c
> @@ -522,13 +522,15 @@ cxd2880_spi_probe(struct spi_device *spi)
> 
>  	dvb_spi->vcc_supply = devm_regulator_get_optional(&spi->dev,
> "vcc");
>  	if (IS_ERR(dvb_spi->vcc_supply)) {
> -		if (PTR_ERR(dvb_spi->vcc_supply) == -EPROBE_DEFER)
> -			return -EPROBE_DEFER;
> +		if (PTR_ERR(dvb_spi->vcc_supply) == -EPROBE_DEFER) {
> +			ret = -EPROBE_DEFER;
> +			goto fail_adapter;
> +		}
>  		dvb_spi->vcc_supply = NULL;
>  	} else {
>  		ret = regulator_enable(dvb_spi->vcc_supply);
> -		if (ret)
> -			return ret;
> +		if (ret)
> +			goto fail_adapter;
>  	}
> 
>  	dvb_spi->spi = spi;
> --
> 2.19.1