| Message ID | 20191018032223.4644-1-gy741.kim@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 28df0642abbf6d66908a2858922a7e4b21cdd8c2 |
| Headers | show |
| Series | [v3] usbip: tools: Fix read_usb_vudc_device() error path handling | expand |
On 10/17/19 9:22 PM, GwanYeong Kim wrote: > 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> > --- > tools/usb/usbip/libsrc/usbip_device_driver.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/tools/usb/usbip/libsrc/usbip_device_driver.c b/tools/usb/usbip/libsrc/usbip_device_driver.c > index 051d7d3f443b..927a151fa9aa 100644 > --- a/tools/usb/usbip/libsrc/usbip_device_driver.c > +++ b/tools/usb/usbip/libsrc/usbip_device_driver.c > @@ -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); > @@ -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); > Looks good. Acked-by: Shuah Khan <skhan@linuxfoundation.org> thanks, -- Shuah
diff --git a/tools/usb/usbip/libsrc/usbip_device_driver.c b/tools/usb/usbip/libsrc/usbip_device_driver.c index 051d7d3f443b..927a151fa9aa 100644 --- a/tools/usb/usbip/libsrc/usbip_device_driver.c +++ b/tools/usb/usbip/libsrc/usbip_device_driver.c @@ -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); @@ -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);
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> --- tools/usb/usbip/libsrc/usbip_device_driver.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)