From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 22 Aug 2008 16:43:14 +0000 (-0400)
Subject: libblkid: Fix potential crash if blkid cache is out of date when probing
X-Git-Tag: v1.41.1~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b7adf06904e6577c5d8bee7f0197a1b1032fa68;p=thirdparty%2Fe2fsprogs.git

libblkid: Fix potential crash if blkid cache is out of date when probing

Fix bug added in 57926c8c5566f0ef5b77db326d58aa0643cf6270

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/lib/blkid/devname.c b/lib/blkid/devname.c
index 89b33f214..86fd44cb2 100644
--- a/lib/blkid/devname.c
+++ b/lib/blkid/devname.c
@@ -129,12 +129,12 @@ static void probe_one(blkid_cache cache, const char *ptname,
 		      dev_t devno, int pri, int only_if_new)
 {
 	blkid_dev dev = NULL;
-	struct list_head *p;
+	struct list_head *p, *pnext;
 	const char **dir;
 	char *devname = NULL;
 
 	/* See if we already have this device number in the cache. */
-	list_for_each(p, &cache->bic_devs) {
+	list_for_each_safe(p, pnext, &cache->bic_devs) {
 		blkid_dev tmp = list_entry(p, struct blkid_struct_dev,
 					   bid_devs);
 #ifdef HAVE_DEVMAPPER