From 061b7443ccae2050864b8665c76c9c545cbcf991 Mon Sep 17 00:00:00 2001 From: Dong Jinguang Date: Fri, 29 Dec 2017 17:00:37 +0800 Subject: [PATCH] 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 --- lib/blkid/probe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/blkid/probe.c b/lib/blkid/probe.c index 3bcf4c3..865d9aa 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; -- 1.8.3.1