diff options
| author | Shuah Khan | 2014-03-24 20:45:13 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-04-15 23:43:01 +0200 |
| commit | 21c5e8408d105386c54603aed2cae9195143d87d (patch) | |
| tree | 8e69e1885848966a147e88ca88b295c2ad6e887c /drivers/staging/usbip | |
| parent | staging: rtl8188eu: remove spaces, correct counts to unbreak P2P ioctls (diff) | |
| download | kernel-qcow2-linux-21c5e8408d105386c54603aed2cae9195143d87d.tar.gz kernel-qcow2-linux-21c5e8408d105386c54603aed2cae9195143d87d.tar.xz kernel-qcow2-linux-21c5e8408d105386c54603aed2cae9195143d87d.zip | |
staging/usbip: userspace - fix usbipd SIGSEGV from refresh_exported_devices()
refresh_exported_devices() doesn't check udev_device_new_from_syspath()
return value and passed in null dev to udev_device_get_driver() resulting
in a segmentation fault. Change it to check for null return value from
both udev_device_new_from_syspath() and udev_device_get_driver().
Signed-off-by: Shuah Khan <shuah.kh@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/usbip')
| -rw-r--r-- | drivers/staging/usbip/userspace/libsrc/usbip_host_driver.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/staging/usbip/userspace/libsrc/usbip_host_driver.c b/drivers/staging/usbip/userspace/libsrc/usbip_host_driver.c index c5bf60b135b9..92caef7474c7 100644 --- a/drivers/staging/usbip/userspace/libsrc/usbip_host_driver.c +++ b/drivers/staging/usbip/userspace/libsrc/usbip_host_driver.c @@ -118,6 +118,7 @@ static int refresh_exported_devices(void) struct udev_list_entry *devices, *dev_list_entry; struct udev_device *dev; const char *path; + const char *driver; enumerate = udev_enumerate_new(udev_context); udev_enumerate_add_match_subsystem(enumerate, "usb"); @@ -128,10 +129,12 @@ static int refresh_exported_devices(void) udev_list_entry_foreach(dev_list_entry, devices) { path = udev_list_entry_get_name(dev_list_entry); dev = udev_device_new_from_syspath(udev_context, path); + if (dev == NULL) + continue; /* Check whether device uses usbip-host driver. */ - if (!strcmp(udev_device_get_driver(dev), - USBIP_HOST_DRV_NAME)) { + driver = udev_device_get_driver(dev); + if (driver != NULL && !strcmp(driver, USBIP_HOST_DRV_NAME)) { edev = usbip_exported_device_new(path); if (!edev) { dbg("usbip_exported_device_new failed"); |