linux-kernel - Re: [PATCH] media: rc: i2c: Fix an error message

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: <20210512163651.GA5987@gofer.mess.org>
Date:   Wed, 12 May 2021 17:36:51 +0100
From:   Sean Young <sean@...s.org>
To:     Christophe JAILLET <christophe.jaillet@...adoo.fr>
Cc:     mchehab@...nel.org, linux-media@...r.kernel.org,
        linux-kernel@...r.kernel.org, kernel-janitors@...r.kernel.org
Subject: Re: [PATCH] media: rc: i2c: Fix an error message

On Thu, May 06, 2021 at 07:38:56AM +0200, Christophe JAILLET wrote:
> 'ret' is known to be 1 here. In fact 'i' is expected instead.
> Store the return value of 'i2c_master_recv()' in 'ret' so that the error
> message print the correct error code.

Nice catch, applied!

Thanks
Sean

> 
> Fixes: acaa34bf06e9 ('media: rc: implement zilog transmitter")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@...adoo.fr>
> ---
>  drivers/media/i2c/ir-kbd-i2c.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/media/i2c/ir-kbd-i2c.c b/drivers/media/i2c/ir-kbd-i2c.c
> index e8119ad0bc71..92376592455e 100644
> --- a/drivers/media/i2c/ir-kbd-i2c.c
> +++ b/drivers/media/i2c/ir-kbd-i2c.c
> @@ -678,8 +678,8 @@ static int zilog_tx(struct rc_dev *rcdev, unsigned int *txbuf,
>  		goto out_unlock;
>  	}
>  
> -	i = i2c_master_recv(ir->tx_c, buf, 1);
> -	if (i != 1) {
> +	ret = i2c_master_recv(ir->tx_c, buf, 1);
> +	if (ret != 1) {
>  		dev_err(&ir->rc->dev, "i2c_master_recv failed with %d\n", ret);
>  		ret = -EIO;
>  		goto out_unlock;
> -- 
> 2.30.2