From patchwork Wed Mar 12 16:16:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 26139 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f72.google.com (mail-pb0-f72.google.com [209.85.160.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 29D77203AB for ; Wed, 12 Mar 2014 16:17:37 +0000 (UTC) Received: by mail-pb0-f72.google.com with SMTP id jt11sf2876059pbb.7 for ; Wed, 12 Mar 2014 09:17:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:cc:subject:precedence:list-id:list-unsubscribe:list-post :list-help:list-subscribe:mime-version:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :list-archive:content-type:content-transfer-encoding; bh=wRgEC13ZE4kD1k7CsFZDc8MIkyF5w/Y6/wX7uQXoaO4=; b=E+CNQrIq5Q6pRaMpt4SZfnPZU38PbueKNrus0wT7zndJ9Gg75f/vF5mGNNI0NVaAJf 7vz1EBpdrH9n7QkWoWK43hmBpVb/GqmaEeVLTLK/BnSHCO3BLGHnAVbVKHi8abI4BfGD P0SjQgwDNvtJfYuGa1kAxfo81vC9nof+016lTqN9SY0y7mYNZs1VkyJtwKzRhjwajEWr jBVQUN28LQ3VvieCx/1QA1xcEvNT6TdIi7XDScGi89k0BJG6Vk9G2qt+TOq4peE5NoPV n4szbaANU15Q//sX6TGrsDXORLDeaUAgmVa09CugeXmQZvHOiBfvOLpDzZS5n7JYKvsO Vd/A== X-Gm-Message-State: ALoCoQmcZiAOVCfTFenqLf/otR6BS582T9y+UBwx4sPpcil2jCLDJ/FmhYG1b2HPd+a6AaE16wOE X-Received: by 10.68.197.73 with SMTP id is9mr1996749pbc.0.1394641056136; Wed, 12 Mar 2014 09:17:36 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.29.101 with SMTP id a92ls1153505qga.66.gmail; Wed, 12 Mar 2014 09:17:36 -0700 (PDT) X-Received: by 10.52.65.132 with SMTP id x4mr920353vds.36.1394641055987; Wed, 12 Mar 2014 09:17:35 -0700 (PDT) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by mx.google.com with ESMTPS id f7si6923075vcz.132.2014.03.12.09.17.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 12 Mar 2014 09:17:35 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.181; Received: by mail-ve0-f181.google.com with SMTP id oy12so10238300veb.40 for ; Wed, 12 Mar 2014 09:17:35 -0700 (PDT) X-Received: by 10.220.136.6 with SMTP id p6mr33358656vct.9.1394641055542; Wed, 12 Mar 2014 09:17:35 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp301295vck; Wed, 12 Mar 2014 09:17:35 -0700 (PDT) X-Received: by 10.140.89.99 with SMTP id u90mr3685326qgd.93.1394641055088; Wed, 12 Mar 2014 09:17:35 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id f67si13180434qgf.146.2014.03.12.09.17.34 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 12 Mar 2014 09:17:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNlpf-0007Pv-EV; Wed, 12 Mar 2014 16:16:39 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WNlpd-0007NM-G6 for xen-devel@lists.xenproject.org; Wed, 12 Mar 2014 16:16:37 +0000 Received: from [193.109.254.147:35657] by server-10.bemta-14.messagelabs.com id 3F/23-10711-46880235; Wed, 12 Mar 2014 16:16:36 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-15.tower-27.messagelabs.com!1394640996!1236065!1 X-Originating-IP: [74.125.82.170] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5748 invoked from network); 12 Mar 2014 16:16:36 -0000 Received: from mail-we0-f170.google.com (HELO mail-we0-f170.google.com) (74.125.82.170) by server-15.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 12 Mar 2014 16:16:36 -0000 Received: by mail-we0-f170.google.com with SMTP id w61so11560850wes.29 for ; Wed, 12 Mar 2014 09:16:36 -0700 (PDT) X-Received: by 10.180.219.44 with SMTP id pl12mr8292390wic.12.1394640995979; Wed, 12 Mar 2014 09:16:35 -0700 (PDT) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id dk9sm70840335wjb.4.2014.03.12.09.16.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Mar 2014 09:16:34 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Wed, 12 Mar 2014 16:16:05 +0000 Message-Id: <1394640969-25583-11-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1394640969-25583-1-git-send-email-julien.grall@linaro.org> References: <1394640969-25583-1-git-send-email-julien.grall@linaro.org> Cc: stefano.stabellini@citrix.com, Daniel De Graaf , Julien Grall , tim@xen.org, ian.campbell@citrix.com Subject: [Xen-devel] [RFC 10/14] xen/xsm: flask: flask_copying_string is taking a XEN_GUEST_HANDLE as first param X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.181 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 Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: Rather than x86, on ARM XEN_GUEST_HANDLE and XEN_GUEST_HANDLE_PARAM are not compatible. This will result to a compilation failure on ARM when XSM will be enabled. Signed-off-by: Julien Grall Cc: Daniel De Graaf Acked-by: Daniel De Graaf Acked-by: Ian Campbell --- xen/xsm/flask/flask_op.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 3eb3a01..7233da9 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -76,7 +76,7 @@ static int domain_has_security(struct domain *d, u32 perms) perms, NULL); } -static int flask_copyin_string(XEN_GUEST_HANDLE_PARAM(char) u_buf, char **buf, +static int flask_copyin_string(XEN_GUEST_HANDLE(char) u_buf, char **buf, size_t size, size_t max_size) { char *tmp;