greybus: es2: fix cport-count error handling

Make sure to check for short transfers when retrieving the bridge cport
count.

Also clear the request buffer when allocating it.

Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Johan Hovold 2016-02-17 19:30:40 +01:00 коммит произвёл Greg Kroah-Hartman
Родитель b59281ac07
Коммит 478ce7203c
1 изменённых файлов: 6 добавлений и 2 удалений

Просмотреть файл

@ -861,7 +861,7 @@ static int apb_get_cport_count(struct usb_device *udev)
int retval; int retval;
__le16 *cport_count; __le16 *cport_count;
cport_count = kmalloc(sizeof(*cport_count), GFP_KERNEL); cport_count = kzalloc(sizeof(*cport_count), GFP_KERNEL);
if (!cport_count) if (!cport_count)
return -ENOMEM; return -ENOMEM;
@ -870,9 +870,13 @@ static int apb_get_cport_count(struct usb_device *udev)
USB_DIR_IN | USB_TYPE_VENDOR | USB_DIR_IN | USB_TYPE_VENDOR |
USB_RECIP_INTERFACE, 0, 0, cport_count, USB_RECIP_INTERFACE, 0, 0, cport_count,
sizeof(*cport_count), ES2_TIMEOUT); sizeof(*cport_count), ES2_TIMEOUT);
if (retval < 0) { if (retval != sizeof(*cport_count)) {
dev_err(&udev->dev, "Cannot retrieve CPort count: %d\n", dev_err(&udev->dev, "Cannot retrieve CPort count: %d\n",
retval); retval);
if (retval >= 0)
retval = -EIO;
goto out; goto out;
} }