TheCloud/f3
1
0
Fork 0
mirror of https://github.com/AltraMayor/f3.git synced 2025-09-12 08:36:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

f3probe: handle failures in usb_fd_from_block_dev()

Browse Source 
Function usb_fd_from_block_dev() wasn't releasing resources
if any error happened.

Reported-by: Peter Skensved
This commit is contained in:
Michel Machado 2015-03-30 07:36:11 -04:00
parent 902db294ef
commit 4d913c1442
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libdevs.c
View File

@ -635,30 +635,36 @@ static int usb_fd_from_block_dev(int block_fd, int open_flags)
udev = udev_new(); udev = udev_new();
if (!udev) { if (!udev) {
warnx("Can't load library udev"); warnx("Can't load library udev");
return - EOPNOTSUPP; usb_fd = -EOPNOTSUPP;
goto out;
} }
usb_dev = map_block_to_usb_dev(udev, block_fd); usb_dev = map_block_to_usb_dev(udev, block_fd);
if (!usb_dev) { if (!usb_dev) {
warnx("Block device is not backed by a USB device"); warnx("Block device is not backed by a USB device");
return - EINVAL; usb_fd = -EINVAL;
goto udev;
} }
usb_filename = udev_device_get_devnode(usb_dev); usb_filename = udev_device_get_devnode(usb_dev);
if (!usb_filename) { if (!usb_filename) {
warnx("%s(): Out of memory", __func__); warnx("%s(): Out of memory", __func__);
return - ENOMEM; usb_fd = -ENOMEM;
goto usb_dev;
} }
usb_fd = open(usb_filename, open_flags | O_NONBLOCK); usb_fd = open(usb_filename, open_flags | O_NONBLOCK);
if (usb_fd < 0) { if (usb_fd < 0) {
int rc = - errno; usb_fd = - errno;
warn("Can't open device `%s'", usb_filename); warn("Can't open device `%s'", usb_filename);
return rc; goto usb_dev;
} }
usb_dev:
udev_device_unref(usb_dev); udev_device_unref(usb_dev);
udev:
assert(!udev_unref(udev)); assert(!udev_unref(udev));
out:
return usb_fd; return usb_fd;
} }