From: Dong Jinguang <dongjinguang@huawei.com>
Date: Fri, 29 Dec 2017 09:00:37 +0000 (+0800)
Subject: AOSP: blkid: sanity check 'end' address must be greater than or equal to 'lable'... 
X-Git-Tag: v1.44.0-rc1~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=061b7443ccae2050864b8665c76c9c545cbcf991;p=thirdparty%2Fe2fsprogs.git

AOSP: blkid: sanity check 'end' address must be greater than or equal to 'lable' address.

Avoid a potential out-of-bounds memory access address of label

Test: mma -j8 and boot devices
Change-Id: I155aa4e26f7079f517be3202de0032a86368559d
From AOSP commit: 38324e758b803e99419d24e16a00b32f8ebbf473
---

diff --git a/lib/blkid/probe.c b/lib/blkid/probe.c
index 3bcf4c3d2..865d9aa36 100644
--- a/lib/blkid/probe.c
+++ b/lib/blkid/probe.c
@@ -41,7 +41,7 @@ static int figure_label_len(const unsigned char *label, int len)
 {
 	const unsigned char *end = label + len - 1;
 
-	while ((*end == ' ' || *end == 0) && end >= label)
+	while (end >= label && (*end == ' ' || *end == 0))
 		--end;
 	if (end >= label)
 		return end - label + 1;