From: Karel Zak <kzak@redhat.com>
Date: Thu, 2 Jun 2022 14:02:54 +0000 (+0200)
Subject: libblkid: (hfs) fix label use [fuzzing]
X-Git-Tag: v2.39-rc1~644
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74e48269ee9a15e230e25d0e3d2e50f5b0ba2b04;p=thirdparty%2Futil-linux.git

libblkid: (hfs) fix label use [fuzzing]

Reported-by: Thibault Guittet <tguittet@redhat.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libblkid/src/superblocks/hfs.c b/libblkid/src/superblocks/hfs.c
index 9674b1481f..68cb30edbb 100644
--- a/libblkid/src/superblocks/hfs.c
+++ b/libblkid/src/superblocks/hfs.c
@@ -173,7 +173,10 @@ static int probe_hfs(blkid_probe pr, const struct blkid_idmag *mag)
 
 	hfs_set_uuid(pr, hfs->finder_info.id, sizeof(hfs->finder_info.id));
 
-	blkid_probe_set_label(pr, hfs->label, hfs->label_len);
+	size = hfs->label_len;
+	if ((size_t) size > sizeof(hfs->label))
+		size = sizeof(hfs->label);
+	blkid_probe_set_label(pr, hfs->label, size);
 	return 0;
 }