linux-kernel - Re: [PATCH] iio: vncl4000: Fix early return in vcnl4200_set_power

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: <20200208141713.469fb174@archlinux>
Date:   Sat, 8 Feb 2020 14:17:13 +0000
From:   Jonathan Cameron <jic23@...nel.org>
To:     Guido Günther <agx@...xcpu.org>
Cc:     Tomas Novotny <tomas@...otny.cz>, Hartmut Knaack <knaack.h@....de>,
        Lars-Peter Clausen <lars@...afoo.de>,
        Peter Meerwald-Stadler <pmeerw@...erw.net>,
        "Angus Ainslie (Purism)" <angus@...ea.ca>,
        Marco Felsch <m.felsch@...gutronix.de>,
        Thomas Gleixner <tglx@...utronix.de>,
        linux-iio@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] iio: vncl4000: Fix early return in
 vcnl4200_set_power_state

On Fri,  7 Feb 2020 10:12:09 +0100
Guido Günther <agx@...xcpu.org> wrote:

> Don't return early unconditionally.
> 
> Signed-off-by: Guido Günther <agx@...xcpu.org>
> Reported-by: kbuild test robot <lkp@...el.com>
> Reported-by: Dan Carpenter <dan.carpenter@...cle.com>
I've merged this down into the original patch.

Thanks,

Jonathan


> 
> ---
> I've not added a 'Fixes:' line since this is not part of Linus tree yet.
> Tested proximity and ambient light on a vcnl4040 and checked the driver
> suspends/resumes correctly and puts out valid data right after resume.  
> 
>  drivers/iio/light/vcnl4000.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c
> index 3b71c7d538af..38fcd9a26046 100644
> --- a/drivers/iio/light/vcnl4000.c
> +++ b/drivers/iio/light/vcnl4000.c
> @@ -149,7 +149,7 @@ static int vcnl4200_set_power_state(struct vcnl4000_data *data, bool on)
>  	if (ret < 0)
>  		return ret;
>  
> -	return i2c_smbus_write_word_data(data->client, VCNL4200_PS_CONF1, val);
> +	ret = i2c_smbus_write_word_data(data->client, VCNL4200_PS_CONF1, val);
>  	if (ret < 0)
>  		return ret;
>