| From 4ca070ef0dd885616ef294d269a9bf8e3b258e1a Mon Sep 17 00:00:00 2001 |
| From: Johan Hovold <johan@kernel.org> |
| Date: Mon, 24 May 2021 11:09:12 +0200 |
| Subject: i2c: robotfuzz-osif: fix control-request directions |
| |
| From: Johan Hovold <johan@kernel.org> |
| |
| commit 4ca070ef0dd885616ef294d269a9bf8e3b258e1a upstream. |
| |
| 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 |
| Signed-off-by: Johan Hovold <johan@kernel.org> |
| Signed-off-by: Wolfram Sang <wsa@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/i2c/busses/i2c-robotfuzz-osif.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- 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 |
| } |
| } |
| |
| - 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_interfa |
| * 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"); |
