Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756741Ab0FDVKb (ORCPT ); Fri, 4 Jun 2010 17:10:31 -0400 Received: from os.inf.tu-dresden.de ([141.76.48.99]:52243 "EHLO os.inf.tu-dresden.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752050Ab0FDVKa (ORCPT ); Fri, 4 Jun 2010 17:10:30 -0400 Date: Fri, 4 Jun 2010 23:10:25 +0200 From: Adam Lackorzynski To: linux-kernel@vger.kernel.org, Yinghai Lu , Ingo Molnar , "H. Peter Anvin" Subject: [PATCH] early_res: fix check in free_early_partial Message-ID: <20100604211025.GA17881@os.inf.tu-dresden.de> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1037 Lines: 34 free_early_partial must check the returned region of find_overlapped_early() whether it is a region at all. Otherwise the function will indefinitely loop. Signed-off-by: Adam Lackorzynski --- kernel/early_res.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/early_res.c b/kernel/early_res.c index 31aa933..9afcb4c 100644 --- a/kernel/early_res.c +++ b/kernel/early_res.c @@ -341,10 +341,11 @@ void __init free_early_partial(u64 start, u64 end) try_next: i = find_overlapped_early(start, end); - if (i >= max_early_res) + r = &early_res[i]; + + if (i >= max_early_res || !r->end) return; - r = &early_res[i]; /* hole ? */ if (r->end >= end && r->start <= start) { drop_range_partial(i, start, end); -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/