Fix libblkid's squashfs probe return checking.
Related: rhbz#1112315
This commit is contained in:
parent
594dffa0d4
commit
9016a84fba
46
util-linux-squashfs-probe.patch
Normal file
46
util-linux-squashfs-probe.patch
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
From cbccd7a4f8ffcded136e83fb7c3aeedc393d312d Mon Sep 17 00:00:00 2001
|
||||||
|
From: David Shea <dshea@redhat.com>
|
||||||
|
Date: Mon, 23 Jun 2014 13:41:48 -0400
|
||||||
|
Subject: [PATCH] libblkid: correct the return values in squashfs probe
|
||||||
|
|
||||||
|
Returning -1 can cause squashfs v3 detection to make v4 detection fail.
|
||||||
|
|
||||||
|
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||||||
|
---
|
||||||
|
libblkid/src/superblocks/squashfs.c | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/libblkid/src/superblocks/squashfs.c b/libblkid/src/superblocks/squashfs.c
|
||||||
|
index a35d60f..8ed2838 100644
|
||||||
|
--- a/libblkid/src/superblocks/squashfs.c
|
||||||
|
+++ b/libblkid/src/superblocks/squashfs.c
|
||||||
|
@@ -41,7 +41,7 @@ static int probe_squashfs(blkid_probe pr, const struct blkid_idmag *mag)
|
||||||
|
major = le16_to_cpu(sq->s_major);
|
||||||
|
minor = le16_to_cpu(sq->s_minor);
|
||||||
|
if (major < 4)
|
||||||
|
- return -1;
|
||||||
|
+ return 1;
|
||||||
|
|
||||||
|
blkid_probe_sprintf_version(pr, "%u.%u", major, minor);
|
||||||
|
|
||||||
|
@@ -56,7 +56,7 @@ static int probe_squashfs3(blkid_probe pr, const struct blkid_idmag *mag)
|
||||||
|
|
||||||
|
sq = blkid_probe_get_sb(pr, mag, struct sqsh_super_block);
|
||||||
|
if (!sq)
|
||||||
|
- return -1;
|
||||||
|
+ return errno ? -errno : 1;
|
||||||
|
|
||||||
|
if (strcmp(mag->magic, "sqsh") == 0) {
|
||||||
|
major = be16_to_cpu(sq->s_major);
|
||||||
|
@@ -67,7 +67,7 @@ static int probe_squashfs3(blkid_probe pr, const struct blkid_idmag *mag)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (major > 3)
|
||||||
|
- return -1;
|
||||||
|
+ return 1;
|
||||||
|
|
||||||
|
blkid_probe_sprintf_version(pr, "%u.%u", major, minor);
|
||||||
|
|
||||||
|
--
|
||||||
|
1.9.3
|
||||||
|
|
Loading…
Reference in New Issue
Block a user