Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

usbip: tools: Fix read_usb_vudc_device() error path handling

Browse source 
[ Upstream commit 28df0642abbf6d66908a2858922a7e4b21cdd8c2 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
GwanYeong Kim 2019-10-18 03:22:23 +00:00 committed by Greg Kroah-Hartman
parent cd9561a53d
commit e36be79593
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/usb/usbip/libsrc/usbip_device_driver.c
View file

@ -81,7 +81,7 @@ int read_usb_vudc_device(struct udev_device *sdev, struct usbip_usb_device *dev)
FILE *fd = NULL; FILE *fd = NULL;
struct udev_device *plat; struct udev_device *plat;
const char *speed; const char *speed;
int ret = 0; size_t ret;
plat = udev_device_get_parent(sdev); plat = udev_device_get_parent(sdev);
path = udev_device_get_syspath(plat); path = udev_device_get_syspath(plat);
@ -91,8 +91,10 @@ int read_usb_vudc_device(struct udev_device *sdev, struct usbip_usb_device *dev)
if (!fd) if (!fd)
return -1; return -1;
ret = fread((char *) &descr, sizeof(descr), 1, fd); 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; goto err;
}
fclose(fd); fclose(fd);
copy_descr_attr(dev, &descr, bDeviceClass); copy_descr_attr(dev, &descr, bDeviceClass);