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

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 3bcf4c3d2448375db989c0d8a9d04ed4522ac8ef..865d9aa36211f8d942ea64e8571eab0de1054786 100644 (file)
--- 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;