Skip to content

Commit

Permalink
usbip: tools: Fix read_usb_vudc_device() error path handling
Browse files Browse the repository at this point in the history
This isn't really accurate right. fread() doesn't always
return 0 in error. It could return < number of elements
and set errno.

Signed-off-by: GwanYeong Kim <gy741.kim@gmail.com>
Acked-by: Shuah Khan <skhan@linuxfoundation.org>
Link: https://lore.kernel.org/r/20191018032223.4644-1-gy741.kim@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
GwanYeong Kim authored and Greg Kroah-Hartman committed Oct 28, 2019
1 parent d5501d5 commit 28df064
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions tools/usb/usbip/libsrc/usbip_device_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ int read_usb_vudc_device(struct udev_device *sdev, struct usbip_usb_device *dev)
FILE *fd = NULL;
struct udev_device *plat;
const char *speed;
int ret = 0;
size_t ret;

plat = udev_device_get_parent(sdev);
path = udev_device_get_syspath(plat);
Expand All @@ -79,8 +79,10 @@ int read_usb_vudc_device(struct udev_device *sdev, struct usbip_usb_device *dev)
if (!fd)
return -1;
ret = fread((char *) &descr, sizeof(descr), 1, fd);
if (ret < 0)
if (ret != 1) {
err("Cannot read vudc device descr file: %s", strerror(errno));
goto err;
}
fclose(fd);

copy_descr_attr(dev, &descr, bDeviceClass);
Expand Down

0 comments on commit 28df064

Please sign in to comment.