From 5c82c444fba6fd3cf506c777546a5481755808ff Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Thu, 15 Aug 2019 21:25:16 -0700 Subject: commonlib/region: Fix up overflow check in region_is_subregion() region_is_subregion() checks whether the size of the inner region is larger than the size of the outer region... which isn't really necessary because we're already checking the starts and ends of both regions. Maybe this was added to ensure the inner region doesn't overflow? But it's not guaranteed to catch that in all cases. Replace it with a proper overflow check. Change-Id: I9e442053584a479a323c1fa1c0591934ff83eb10 Signed-off-by: Julius Werner Reviewed-on: https://review.coreboot.org/c/coreboot/+/34892 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh --- src/commonlib/region.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/commonlib/region.c') diff --git a/src/commonlib/region.c b/src/commonlib/region.c index 541a125ad4..b5858f91c0 100644 --- a/src/commonlib/region.c +++ b/src/commonlib/region.c @@ -27,10 +27,10 @@ int region_is_subregion(const struct region *p, const struct region *c) if (region_offset(c) < region_offset(p)) return 0; - if (region_sz(c) > region_sz(p)) + if (region_end(c) > region_end(p)) return 0; - if (region_end(c) > region_end(p)) + if (region_end(c) < region_offset(c)) return 0; return 1; -- cgit v1.2.3