X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=libudev%2Flibudev-queue.c;h=f3cb5ab4986594b4a3e53e93a02508d2858f4160;hb=0c5c48040ac0f4c97f73fb3ac5493cc2d84a963b;hp=68efba0eeee2bd246e7d975aaceae73d10b1154a;hpb=214a6c791cbc0c1a190c430eb37056087e661344;p=elogind.git

diff --git a/libudev/libudev-queue.c b/libudev/libudev-queue.c
index 68efba0ee..f3cb5ab49 100644
--- a/libudev/libudev-queue.c
+++ b/libudev/libudev-queue.c
@@ -131,7 +131,7 @@ unsigned long long int udev_get_kernel_seqnum(struct udev *udev)
 	ssize_t len;
 
 	util_strscpyl(filename, sizeof(filename), udev_get_sys_path(udev), "/kernel/uevent_seqnum", NULL);
-	fd = open(filename, O_RDONLY);
+	fd = open(filename, O_RDONLY|O_CLOEXEC);
 	if (fd < 0)
 		return 0;
 	len = read(fd, buf, sizeof(buf));
@@ -215,7 +215,7 @@ static FILE *open_queue_file(struct udev_queue *udev_queue, unsigned long long i
 	FILE *queue_file;
 
 	util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev_queue->udev), "/.udev/queue.bin", NULL);
-	queue_file = fopen(filename, "r");
+	queue_file = fopen(filename, "re");
 	if (queue_file == NULL)
 		return NULL;
 
@@ -360,10 +360,14 @@ int udev_queue_get_seqnum_sequence_is_finished(struct udev_queue *udev_queue,
 		return 1;
 	if (start < seqnum)
 		start = seqnum;
-	if (start > end)
+	if (start > end) {
+		fclose(queue_file);
 		return 1;
-	if (end - start > INT_MAX - 1)
+	}
+	if (end - start > INT_MAX - 1) {
+		fclose(queue_file);
 		return -EOVERFLOW;
+	}
 	unfinished = (end - start) + 1;
 
 	while (unfinished > 0) {
@@ -484,7 +488,7 @@ struct udev_list_entry *udev_queue_get_failed_list_entry(struct udev_queue *udev
 		s = syspath;
 		l = util_strpcpyl(&s, sizeof(syspath), udev_get_sys_path(udev_queue->udev), NULL);
 		len = readlinkat(dirfd(dir), dent->d_name, s, l);
-		if (len < 0 || (size_t)len >= l)
+		if (len <= 0 || (size_t)len == l)
 			continue;
 		s[len] = '\0';
 		dbg(udev_queue->udev, "found '%s' [%s]\n", syspath, dent->d_name);