Attachment 911529 Details for Bug 1112315 – Correct the return values in squashfs probe

[patch] Correct the return values in squashfs probe

0001-Correct-the-return-values-in-squashfs-probe.patch (text/plain), 1.31 KB, created by David Shea on 2014-06-23 17:39:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Shea

Created: 2014-06-23 17:39:37 UTC

Size: 1.31 KB

patch

obsolete

>From d76743007406b8a9117162a54b315a3ea0f54f03 Mon Sep 17 00:00:00 2001
>From: David Shea <dshea@redhat.com>
>Date: Mon, 23 Jun 2014 13:29:29 -0400
>Subject: [PATCH] Correct the return values in squashfs probe
>
>Returning -1 can cause squashfs v3 detection to make v4 detection fail.
>---
> 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..c8f9641 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 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);
> 
>-- 
>2.0.0
>

Actions: View | Diff

Attachments on bug 1112315: 911529