From: Keir Fraser Subject: Re: [PATCH] e820: fix clip_to_limit() Date: Mon, 09 Nov 2009 20:46:13 +0000 Message-ID: References: <4AF875E9.4040807@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <4AF875E9.4040807@gmail.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Xiao Guangrong Cc: Xiao Guangrong , xen-devel List-Id: xen-devel@lists.xenproject.org I think the 'break' is in the wrong place. Actually also I think the case of successful change_range_type() is also wrong, as i=0 will be skipped on the next iteration of the loop. Overall I decided that modifying the e820 map inside the iterator loop was just bad and confusing, so I've rewritten it in response to your bug discovery. Please take a look at xen-unstable:20419 and let me know if you see any issues. Thanks, Keir On 09/11/2009 20:04, "Xiao Guangrong" wrote: > In clip_to_limit(), after memmove(&e820.map[i], &e820.map[i+1], ...), the > original > e820.map[i+1] become current e820.map[i] but the next loop count is i+1, so > the original > e820.map[i+1] will be skipped > > Actually, e820 is sorted form low to high by sanitize_e820_map(), so we can > simply break > the loop if we meet the item which overrun "limit" > > Signed-off-by: Xiao Guangrong > > diff -r 93bc06dd1161 -r 5e06f2790d93 xen/arch/x86/e820.c > --- a/xen/arch/x86/e820.c Tue Nov 10 02:41:59 2009 +0800 > +++ b/xen/arch/x86/e820.c Tue Nov 10 03:51:08 2009 +0800 > @@ -389,6 +389,7 @@ > (e820.nr_map - i - 1) * sizeof(struct e820entry)); > e820.nr_map--; > } > + break; > } > > if ( old_limit )