volume_id: fix fat32 cluster chain traversal

diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile
index e5fd5fcddddf91803330dc2e1a8b9c26000d5cec..e93f8b5af5936878471168e1d7b1aa1575f331cf 100644 (file)
--- a/extras/volume_id/lib/Makefile
+++ b/extras/volume_id/lib/Makefile
@@ -13,7 +13,7 @@ INSTALL_DATA  = ${INSTALL} -m 644
 INSTALL_LIB = ${INSTALL} -m 755
 
 SHLIB_CUR = 0
-SHLIB_REV = 69
+SHLIB_REV = 70
 SHLIB_AGE = 0
 SHLIB = libvolume_id.so.$(SHLIB_CUR).$(SHLIB_REV).$(SHLIB_AGE)
 

diff --git a/extras/volume_id/lib/fat.c b/extras/volume_id/lib/fat.c
index 92f316a27549dc09632b490097b26cdd32dc3148..9a2e4784d8cee165ca97f5b5a0d65c99e4456d92 100644 (file)
--- a/extras/volume_id/lib/fat.c
+++ b/extras/volume_id/lib/fat.c
@@ -349,7 +349,7 @@ fat32:
 
                /* set next cluster */
                next = le32_to_cpu(*((uint32_t *) buf)) & 0x0fffffff;
-               if (next == 0)
+               if (next < 2 || next >= 0x0ffffff0)
                        break;
        }
        if (maxloop == 0)