From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Kiper Subject: [PATCH v2 2/6] relocator: Do not use memory region if its starta is smaller than size Date: Mon, 20 Jul 2015 16:35:50 +0200 Message-ID: <1437402954-7375-3-git-send-email-daniel.kiper__15066.9881645173$1437403097$gmane$org@oracle.com> References: <1437402954-7375-1-git-send-email-daniel.kiper@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZHCBQ-0000xD-EZ for xen-devel@lists.xenproject.org; Mon, 20 Jul 2015 14:36:44 +0000 In-Reply-To: <1437402954-7375-1-git-send-email-daniel.kiper@oracle.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org, grub-devel@gnu.org Cc: jgross@suse.com, keir@xen.org, ian.campbell@citrix.com, andrew.cooper3@citrix.com, stefano.stabellini@eu.citrix.com, roy.franz@linaro.org, ning.sun@intel.com, david.vrabel@citrix.com, jbeulich@suse.com, phcoder@gmail.com, wei.liu2@citrix.com, qiaowei.ren@intel.com, richard.l.maliszewski@intel.com, gang.wei@intel.com, fu.wei@linaro.org List-Id: xen-devel@lists.xenproject.org malloc_in_range() should not use memory region if its starta is smaller than size. Otherwise target wraps around and points to region which is usually not a RAM, e.g.: loader/multiboot.c:93: segment 0: paddr=0x800000, memsz=0x3f800000, vaddr=0x800000 lib/relocator.c:1241: min_addr = 0x0, max_addr = 0xffffffffffffffff, target = 0x800000 lib/relocator.c:434: trying to allocate in 0x800000-0xffffffffffffffff aligned 0x1 size 0x3f800000 lib/relocator.c:434: trying to allocate in 0x0-0x800000 aligned 0x1 size 0x3f800000 lib/relocator.c:434: trying to allocate in 0x0-0xffffffffffffffff aligned 0x1 size 0x3f800000 lib/relocator.c:1188: allocated: 0xffffffffc07fffff+0x3f800000 lib/relocator.c:1277: allocated 0xffffffffc07fffff/0x800000 Signed-off-by: Daniel Kiper --- grub-core/lib/relocator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c index f759c7f..4eee0c5 100644 --- a/grub-core/lib/relocator.c +++ b/grub-core/lib/relocator.c @@ -748,7 +748,7 @@ malloc_in_range (struct grub_relocator *rel, /* Found an usable address. */ goto found; } - if (isinsidebefore && !isinsideafter && !from_low_priv) + if (isinsidebefore && !isinsideafter && !from_low_priv && starta >= size) { target = starta - size; if (target > end - size) -- 1.7.10.4