Attachment 663075 Details for Bug 861952 – The fix

[patch] The fix

busybox-1.2.0-findfs.patch (text/plain), 1.02 KB, created by Denys Vlasenko on 2012-12-13 17:35:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Denys Vlasenko

Created: 2012-12-13 17:35:19 UTC

Size: 1.02 KB

patch

obsolete

>diff -urpN busybox-1.2.0/e2fsprogs/blkid/probe.c busybox-1.2.0-findfs/e2fsprogs/blkid/probe.c
>--- busybox-1.2.0/e2fsprogs/blkid/probe.c	2006-07-01 00:42:08.000000000 +0200
>+++ busybox-1.2.0-findfs/e2fsprogs/blkid/probe.c	2011-12-06 14:24:19.849493302 +0100
>@@ -574,16 +574,20 @@ blkid_dev blkid_verify(blkid_cache cache
> 	    printf("need to revalidate %s (time since last check %lu)\n",
> 		   dev->bid_name, diff));
> 
>-	if (((fd = open(dev->bid_name, O_RDONLY)) < 0) ||
>-	    (fstat(fd, &st) < 0)) {
>+	fd = open(dev->bid_name, O_RDONLY);
>+	if (fd < 0
>+	 || fstat(fd, &st) < 0
>+	) {
> 		if (errno == ENXIO || errno == ENODEV || errno == ENOENT) {
> 			blkid_free_dev(dev);
>+			if (fd >= 0) close(fd);
> 			return NULL;
> 		}
> 		/* We don't have read permission, just return cache data. */
> 		DBG(DEBUG_PROBE,
> 		    printf("returning unverified data for %s\n",
> 			   dev->bid_name));
>+		if (fd >= 0) close(fd);
> 		return dev;
> 	}
> 
>@@ -652,6 +656,7 @@ try_again:
> 
> 	if (!dev->bid_type) {
> 		blkid_free_dev(dev);
>+		close(fd);
> 		return NULL;
> 	}
>

Actions: View | Diff

Attachments on bug 861952: 663075