On Sun, Jan 02, 2022 at 08:19:43PM +0300, Pavel Skripkin wrote:
> Alexander reported a use of uninitialized value in
> atusb_set_extended_addr(), that is caused by reading 0 bytes via
> usb_control_msg().
>
> Since there is an API, that cannot read less bytes, than was requested,
> let's move atusb driver to use it. It will fix all potintial bugs with
> uninit values and make code more modern
>
> Fail log:
>
> BUG: KASAN: uninit-cmp in ieee802154_is_valid_extended_unicast_addr include/linux/ieee802154.h:310 [inline]
> BUG: KASAN: uninit-cmp in atusb_set_extended_addr drivers/net/ieee802154/atusb.c:1000 [inline]
> BUG: KASAN: uninit-cmp in atusb_probe.cold+0x29f/0x14db drivers/net/ieee802154/atusb.c:1056
> Uninit value used in comparison: 311daa649a2003bd stack handle: 000000009a2003bd
> ieee802154_is_valid_extended_unicast_addr include/linux/ieee802154.h:310 [inline]
> atusb_set_extended_addr drivers/net/ieee802154/atusb.c:1000 [inline]
> atusb_probe.cold+0x29f/0x14db drivers/net/ieee802154/atusb.c:1056
> usb_probe_interface+0x314/0x7f0 drivers/usb/core/driver.c:396
>
> Fixes: 7490b008d123 ("ieee802154: add support for atusb transceiver")
> Cc: stable@xxxxxxxxxxxxxxx # 5.9
> Reported-by: Alexander Potapenko <glider@xxxxxxxxxx>
> Signed-off-by: Pavel Skripkin <paskripkin@xxxxxxxxx>
> ---
> drivers/net/ieee802154/atusb.c | 61 +++++++++++++++++++++-------------
> 1 file changed, 38 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/net/ieee802154/atusb.c b/drivers/net/ieee802154/atusb.c
> index 23ee0b14cbfa..43befea0110f 100644
> --- a/drivers/net/ieee802154/atusb.c
> +++ b/drivers/net/ieee802154/atusb.c
> @@ -80,10 +80,9 @@ struct atusb_chip_data {
> * in atusb->err and reject all subsequent requests until the error is cleared.
> */
>
> -static int atusb_control_msg(struct atusb *atusb, unsigned int pipe,
> - __u8 request, __u8 requesttype,
> - __u16 value, __u16 index,
> - void *data, __u16 size, int timeout)
> +static int atusb_control_msg_recv(struct atusb *atusb, __u8 request, __u8 requesttype,
> + __u16 value, __u16 index,
> + void *data, __u16 size, int timeout)
Why do you need a wrapper function at all? Why not just call the real
usb functions instead?
> {
> struct usb_device *usb_dev = atusb->usb_dev;
> int ret;
> @@ -91,8 +90,30 @@ static int atusb_control_msg(struct atusb *atusb, unsigned int pipe,
> if (atusb->err)
> return atusb->err;
>
> - ret = usb_control_msg(usb_dev, pipe, request, requesttype,
> - value, index, data, size, timeout);
> + ret = usb_control_msg_recv(usb_dev, 0, request, requesttype,
> + value, index, data, size, timeout, GFP_KERNEL);
> + if (ret < 0) {
> + atusb->err = ret;
> + dev_err(&usb_dev->dev,
> + "%s: req 0x%02x val 0x%x idx 0x%x, error %d\n",
> + __func__, request, value, index, ret);
> + }
Why save off the error value at all? And was that message needed?
> +
> + return ret;
> +}
> +
> +static int atusb_control_msg_send(struct atusb *atusb, __u8 request, __u8 requesttype,
> + __u16 value, __u16 index,
> + void *data, __u16 size, int timeout)
> +{
> + struct usb_device *usb_dev = atusb->usb_dev;
> + int ret;
> +
> + if (atusb->err)
> + return atusb->err;
> +
> + ret = usb_control_msg_send(usb_dev, 0, request, requesttype,
> + value, index, data, size, timeout, GFP_KERNEL);
> if (ret < 0) {
> atusb->err = ret;
> dev_err(&usb_dev->dev,
> @@ -107,8 +128,7 @@ static int atusb_command(struct atusb *atusb, u8 cmd, u8 arg)
> struct usb_device *usb_dev = atusb->usb_dev;
>
> dev_dbg(&usb_dev->dev, "%s: cmd = 0x%x\n", __func__, cmd);
> - return atusb_control_msg(atusb, usb_sndctrlpipe(usb_dev, 0),
> - cmd, ATUSB_REQ_TO_DEV, arg, 0, NULL, 0, 1000);
> + return atusb_control_msg_send(atusb, cmd, ATUSB_REQ_TO_DEV, arg, 0, NULL, 0, 1000);
> }
>
> static int atusb_write_reg(struct atusb *atusb, u8 reg, u8 value)
> @@ -116,9 +136,8 @@ static int atusb_write_reg(struct atusb *atusb, u8 reg, u8 value)
> struct usb_device *usb_dev = atusb->usb_dev;
>
> dev_dbg(&usb_dev->dev, "%s: 0x%02x <- 0x%02x\n", __func__, reg, value);
> - return atusb_control_msg(atusb, usb_sndctrlpipe(usb_dev, 0),
> - ATUSB_REG_WRITE, ATUSB_REQ_TO_DEV,
> - value, reg, NULL, 0, 1000);
> + return atusb_control_msg_send(atusb, ATUSB_REG_WRITE, ATUSB_REQ_TO_DEV,
> + value, reg, NULL, 0, 1000);
This return value can be different, are you sure you want to call this
this way?
I would recommend just moving to use the real USB functions and no
wrapper function at all like this, it will make things more obvious and
easier to understand over time.
thanks,
greg k-h
