From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:36238) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4HKG-0003La-7g for qemu-devel@nongnu.org; Thu, 15 Sep 2011 15:10:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R4HKF-0004ei-6Z for qemu-devel@nongnu.org; Thu, 15 Sep 2011 15:10:20 -0400 Received: from mail-yw0-f45.google.com ([209.85.213.45]:65337) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4HKE-0004eY-UL for qemu-devel@nongnu.org; Thu, 15 Sep 2011 15:10:19 -0400 Received: by ywm39 with SMTP id 39so2912933ywm.4 for ; Thu, 15 Sep 2011 12:10:18 -0700 (PDT) Message-ID: <4E724D97.4020806@codemonkey.ws> Date: Thu, 15 Sep 2011 14:10:15 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <4E70A29F.1010105@redhat.com> In-Reply-To: <4E70A29F.1010105@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PULL] Memory core integer overflow fix List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Avi Kivity Cc: qemu-devel On 09/14/2011 07:48 AM, Avi Kivity wrote: > Please pull from > > git://github.com/avikivity/qemu.git memory/core > > to receive a core fix for an integer overflow problem hitting ppc: > > David Gibson (1): > Fix subtle integer overflow bug in memory API Pulled. Thanks. Regards, Anthony Liguori > > memory.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/memory.c b/memory.c > index 57f0fa4..101b67c 100644 > --- a/memory.c > +++ b/memory.c > @@ -55,8 +55,8 @@ static AddrRange addrrange_shift(AddrRange range, int64_t delta) > > static bool addrrange_intersects(AddrRange r1, AddrRange r2) > { > - return (r1.start >= r2.start && r1.start < r2.start + r2.size) > - || (r2.start >= r1.start && r2.start < r1.start + r1.size); > + return (r1.start >= r2.start && (r1.start - r2.start) < r2.size) > + || (r2.start >= r1.start && (r2.start - r1.start) < r1.size); > } > > static AddrRange addrrange_intersection(AddrRange r1, AddrRange r2) >