Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/55997 )
Change subject: layout: Fix overlap-check routine ......................................................................
layout: Fix overlap-check routine
Fixes a regression introduced by commit 06a89d713 (layout: Introduce layout_next()). A negation was dropped by accident which resulted in comparisons with later, not-included regions instead of included ones.
Change-Id: I18168b9bd9a7d0fe2ba04fb091d1600f65d6dd5b Signed-off-by: Nico Huber nico.huber@secunet.com Reviewed-on: https://review.coreboot.org/c/flashrom/+/55997 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Anastasia Klimchuk aklm@chromium.org Reviewed-by: Edward O'Callaghan quasisec@chromium.org Reviewed-by: Angel Pons th3fanbus@gmail.com --- M layout.c 1 file changed, 1 insertion(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved Anastasia Klimchuk: Looks good to me, approved
diff --git a/layout.c b/layout.c index e688f79..36aa247 100644 --- a/layout.c +++ b/layout.c @@ -257,7 +257,7 @@
const struct romentry *rhs = lhs; while ((rhs = layout_next(l, rhs))) { - if (rhs->included) + if (!rhs->included) continue;
if (lhs->start > rhs->end)