linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johan Hovold <johan@kernel.org>
To: Wolfram Sang <wsa@kernel.org>
Cc: linux-i2c@vger.kernel.org, linux-usb@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	syzbot+9d7dadd15b8819d73f41@syzkaller.appspotmail.com,
	stable@vger.kernel.org, Andrew Lunn <andrew@lunn.ch>
Subject: Re: [PATCH] i2c: robotfuzz-osif: fix control-request directions
Date: Wed, 23 Jun 2021 10:52:04 +0200	[thread overview]
Message-ID: <YNL2NLSpBQqnc2bH@hovoldconsulting.com> (raw)
In-Reply-To: <20210524090912.3989-1-johan@kernel.org>

On Mon, May 24, 2021 at 11:09:12AM +0200, Johan Hovold wrote:
> The direction of the pipe argument must match the request-type direction
> bit or control requests may fail depending on the host-controller-driver
> implementation.
> 
> Control transfers without a data stage are treated as OUT requests by
> the USB stack and should be using usb_sndctrlpipe(). Failing to do so
> will now trigger a warning.
> 
> Fix the OSIFI2C_SET_BIT_RATE and OSIFI2C_STOP requests which erroneously
> used the osif_usb_read() helper and set the IN direction bit.
> 
> Reported-by: syzbot+9d7dadd15b8819d73f41@syzkaller.appspotmail.com
> Fixes: 83e53a8f120f ("i2c: Add bus driver for for OSIF USB i2c device.")
> Cc: stable@vger.kernel.org      # 3.14
> Cc: Andrew Lunn <andrew@lunn.ch>
> Signed-off-by: Johan Hovold <johan@kernel.org>
> ---

Wolfram, can you pick this one up for 5.14?

Johan

>  drivers/i2c/busses/i2c-robotfuzz-osif.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-robotfuzz-osif.c b/drivers/i2c/busses/i2c-robotfuzz-osif.c
> index a39f7d092797..66dfa211e736 100644
> --- a/drivers/i2c/busses/i2c-robotfuzz-osif.c
> +++ b/drivers/i2c/busses/i2c-robotfuzz-osif.c
> @@ -83,7 +83,7 @@ static int osif_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs,
>  			}
>  		}
>  
> -		ret = osif_usb_read(adapter, OSIFI2C_STOP, 0, 0, NULL, 0);
> +		ret = osif_usb_write(adapter, OSIFI2C_STOP, 0, 0, NULL, 0);
>  		if (ret) {
>  			dev_err(&adapter->dev, "failure sending STOP\n");
>  			return -EREMOTEIO;
> @@ -153,7 +153,7 @@ static int osif_probe(struct usb_interface *interface,
>  	 * Set bus frequency. The frequency is:
>  	 * 120,000,000 / ( 16 + 2 * div * 4^prescale).
>  	 * Using dev = 52, prescale = 0 give 100KHz */
> -	ret = osif_usb_read(&priv->adapter, OSIFI2C_SET_BIT_RATE, 52, 0,
> +	ret = osif_usb_write(&priv->adapter, OSIFI2C_SET_BIT_RATE, 52, 0,
>  			    NULL, 0);
>  	if (ret) {
>  		dev_err(&interface->dev, "failure sending bit rate");

  reply	other threads:[~2021-06-23  8:52 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-24  9:09 [PATCH] i2c: robotfuzz-osif: fix control-request directions Johan Hovold
2021-06-23  8:52 ` Johan Hovold [this message]
2021-06-24 20:10   ` Wolfram Sang
2021-06-24 20:32     ` Andrew Lunn
2021-06-25 12:47     ` Johan Hovold

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=YNL2NLSpBQqnc2bH@hovoldconsulting.com \
    --to=johan@kernel.org \
    --cc=andrew@lunn.ch \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=syzbot+9d7dadd15b8819d73f41@syzkaller.appspotmail.com \
    --cc=wsa@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).