From patchwork Wed Jun 26 13:23:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 18132 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f71.google.com (mail-vb0-f71.google.com [209.85.212.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A8A4925E0D for ; Wed, 26 Jun 2013 13:23:45 +0000 (UTC) Received: by mail-vb0-f71.google.com with SMTP id f12sf18302203vbg.6 for ; Wed, 26 Jun 2013 06:23:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=6ZgpUZtGEiGVD7RjxjzIMrJCq1kGS8yoyGsHvt/5Yuw=; b=NPVwO1o4DrUxGXch8jkBfQCcDH8VwfBCKjsLXbIyTnDfrVA9SrL1LQnYj5xghwm1Oo co6RW7U7cOCqlvHJ5DtK3WKbUCLp0M5bg/wZr/lupwQTZYRA4iy3Pi6Jb/l+Q/wnlvlp 5xKqqt4Rzb0cEeZX6LMUF1gauBrZTs8Fg2F3aN2p2ynah8mrg8dODdNeyh+D52TZlA9I rnMXvwoY26FOVqXAd+7R4pzkiEP0crYvGQUjrSyj7F8EtVOyHPIrM+vrW449/nHvbw+p IbLLrUF2W1IXxgbJQmYsQB+S9xmUBp7GmCMTcrnpZB3oP1r86oXwxk5/BdlMhGGE9OdN vYaQ== X-Received: by 10.224.57.65 with SMTP id b1mr3868792qah.2.1372253025075; Wed, 26 Jun 2013 06:23:45 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.49.38 with SMTP id r6ls421619qen.91.gmail; Wed, 26 Jun 2013 06:23:44 -0700 (PDT) X-Received: by 10.220.112.210 with SMTP id x18mr1725588vcp.0.1372253024967; Wed, 26 Jun 2013 06:23:44 -0700 (PDT) Received: from mail-ve0-x231.google.com (mail-ve0-x231.google.com [2607:f8b0:400c:c01::231]) by mx.google.com with ESMTPS id zw14si7664333veb.102.2013.06.26.06.23.44 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Jun 2013 06:23:44 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::231 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::231; Received: by mail-ve0-f177.google.com with SMTP id cz10so11185503veb.8 for ; Wed, 26 Jun 2013 06:23:44 -0700 (PDT) X-Received: by 10.220.110.78 with SMTP id m14mr1664445vcp.53.1372253024865; Wed, 26 Jun 2013 06:23:44 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.165.8 with SMTP id yu8csp108849veb; Wed, 26 Jun 2013 06:23:44 -0700 (PDT) X-Received: by 10.181.13.75 with SMTP id ew11mr2747958wid.2.1372253023472; Wed, 26 Jun 2013 06:23:43 -0700 (PDT) Received: from mail-wi0-x235.google.com (mail-wi0-x235.google.com [2a00:1450:400c:c05::235]) by mx.google.com with ESMTPS id ma9si9821355wjb.94.2013.06.26.06.23.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Jun 2013 06:23:43 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c05::235 is neither permitted nor denied by best guess record for domain of julien.grall@linaro.org) client-ip=2a00:1450:400c:c05::235; Received: by mail-wi0-f181.google.com with SMTP id hq4so1861673wib.8 for ; Wed, 26 Jun 2013 06:23:43 -0700 (PDT) X-Received: by 10.180.20.228 with SMTP id q4mr2750363wie.1.1372253022733; Wed, 26 Jun 2013 06:23:42 -0700 (PDT) Received: from belegaer.uk.xensource.com. (firewall.ctxuk.citrix.com. [46.33.159.2]) by mx.google.com with ESMTPSA id u9sm10837003wif.6.2013.06.26.06.23.41 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Jun 2013 06:23:41 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Cc: ian.campbell@citrix.com, Stefano.Stabellini@eu.citrix.com, patches@linaro.org, Ian.Jackson@eu.citrix.com, Julien Grall Subject: [PATCH] libxc: Fix guest boot on ARM after XSA-55 Date: Wed, 26 Jun 2013 14:23:35 +0100 Message-Id: <1372253015-24170-1-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQkpgz4ZmWvE9fWpzEnejXe5ZkvnbFo9K2SupJW7ZIEe5/lPSbkOac7hcsT64M9+bu7fBlY9 X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::231 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , XSA-55 has exposed errors for guest creation on ARM: - domain virt_base was not defined; - xc_dom_alloc_segment allocates pfn from 0 instead of the RAM base address. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- tools/libxc/xc_dom_armzimageloader.c | 1 + tools/libxc/xc_dom_core.c | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/libxc/xc_dom_armzimageloader.c b/tools/libxc/xc_dom_armzimageloader.c index 4cbbbab..54728b8 100644 --- a/tools/libxc/xc_dom_armzimageloader.c +++ b/tools/libxc/xc_dom_armzimageloader.c @@ -123,6 +123,7 @@ static int xc_dom_parse_zimage_kernel(struct xc_dom_image *dom) dom->kernel_seg.vend = v_end; dom->parms.virt_entry = entry_addr; + dom->parms.virt_base = rambase; dom->guest_type = "xen-3.0-armv7l"; DOMPRINTF("%s: %s: RAM starts at %"PRI_xen_pfn, diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c index 3df7171..0f367f6 100644 --- a/tools/libxc/xc_dom_core.c +++ b/tools/libxc/xc_dom_core.c @@ -488,6 +488,7 @@ int xc_dom_alloc_segment(struct xc_dom_image *dom, { unsigned int page_size = XC_DOM_PAGE_SIZE(dom); xen_pfn_t pages = (size + page_size - 1) / page_size; + xen_pfn_t pfn; void *ptr; if ( start == 0 ) @@ -509,16 +510,17 @@ int xc_dom_alloc_segment(struct xc_dom_image *dom, } seg->vstart = start; - seg->pfn = (seg->vstart - dom->parms.virt_base) / page_size; + pfn = (seg->vstart - dom->parms.virt_base) / page_size; + seg->pfn = pfn + dom->rambase_pfn; if ( pages > dom->total_pages || /* multiple test avoids overflow probs */ - seg->pfn > dom->total_pages || - pages > dom->total_pages - seg->pfn) + pfn > dom->total_pages || + pages > dom->total_pages - pfn) { xc_dom_panic(dom->xch, XC_OUT_OF_MEMORY, "%s: segment %s too large (0x%"PRIpfn" > " "0x%"PRIpfn" - 0x%"PRIpfn" pages)", - __FUNCTION__, name, pages, dom->total_pages, seg->pfn); + __FUNCTION__, name, pages, dom->total_pages, pfn); return -1; }