From patchwork Mon Mar 17 14:06:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 26363 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f199.google.com (mail-ig0-f199.google.com [209.85.213.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 22178202FA for ; Mon, 17 Mar 2014 14:07:12 +0000 (UTC) Received: by mail-ig0-f199.google.com with SMTP id uy17sf9762801igb.2 for ; Mon, 17 Mar 2014 07:07:11 -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=ixEST+dkZe5NV0JrWOqccgWK+2i6qacbi8Hj9pSl/xc=; b=YdVWNWsFmvQs805PA8WQy4MoGNQlrPOSrbdVZ99g9VzSxYI2HuXrl7HGFr/mRWlU71 2uSIk4/x9v4KAQmZetyymlQCH2V4u4PJf2V6VEetG2rzJAR9J9J+4QUlZAoICB+LZNQi 9IV5iyxRUYLBAbB9IoNrxAlLheHT9ND+jCfIlIWfBXAazOb61QRoRZWWQQTmhn+ggqJB FyUTm9Sh8jVIGNqbv/iIawmHi3z7wpjE+VVhiZES4uP+Ltd8XH+/KzCNfmiO+4qXP2kQ gXzoY6hSsfhynK3PBmuF621rVfuZ6/z7djqretf8xclNcLboyBYH5nZ9bt0o8u+WHaWs HFoQ== X-Gm-Message-State: ALoCoQlHZMY+eTRsVEjvJsRk9sU/L1cSp1coPDZCHN634mJw5fCSvvPYpkZqgc7eSayOK7oaEFUz X-Received: by 10.43.69.210 with SMTP id yd18mr8644080icb.10.1395065231641; Mon, 17 Mar 2014 07:07:11 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.21.213 with SMTP id 79ls934479qgl.35.gmail; Mon, 17 Mar 2014 07:07:11 -0700 (PDT) X-Received: by 10.52.61.133 with SMTP id p5mr16936420vdr.4.1395065231447; Mon, 17 Mar 2014 07:07:11 -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 eh16si5287736vcb.18.2014.03.17.07.07.11 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Mar 2014 07:07:11 -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 oy12so5617138veb.26 for ; Mon, 17 Mar 2014 07:07:11 -0700 (PDT) X-Received: by 10.58.133.15 with SMTP id oy15mr19365851veb.19.1395065231359; Mon, 17 Mar 2014 07:07:11 -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 i9csp130010vck; Mon, 17 Mar 2014 07:07:08 -0700 (PDT) X-Received: by 10.58.185.145 with SMTP id fc17mr20639273vec.14.1395065228237; Mon, 17 Mar 2014 07:07:08 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id xs6si2833072vec.110.2014.03.17.07.07.07 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 17 Mar 2014 07:07:08 -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 1WPYBX-0002NQ-4D; Mon, 17 Mar 2014 14:06:35 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WPYBU-0002Ju-4H for xen-devel@lists.xenproject.org; Mon, 17 Mar 2014 14:06:32 +0000 Received: from [85.158.143.35:36563] by server-1.bemta-4.messagelabs.com id E9/32-09853-76107235; Mon, 17 Mar 2014 14:06:31 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-5.tower-21.messagelabs.com!1395065190!2662851!1 X-Originating-IP: [74.125.83.53] 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 16964 invoked from network); 17 Mar 2014 14:06:30 -0000 Received: from mail-ee0-f53.google.com (HELO mail-ee0-f53.google.com) (74.125.83.53) by server-5.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 17 Mar 2014 14:06:30 -0000 Received: by mail-ee0-f53.google.com with SMTP id b57so3473774eek.26 for ; Mon, 17 Mar 2014 07:06:30 -0700 (PDT) X-Received: by 10.14.115.1 with SMTP id d1mr24108358eeh.30.1395065190513; Mon, 17 Mar 2014 07:06:30 -0700 (PDT) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id x3sm39716538eep.17.2014.03.17.07.06.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Mar 2014 07:06:29 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Mon, 17 Mar 2014 14:06:00 +0000 Message-Id: <1395065165-15915-11-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1395065165-15915-1-git-send-email-julien.grall@linaro.org> References: <1395065165-15915-1-git-send-email-julien.grall@linaro.org> Cc: stefano.stabellini@citrix.com, Julien Grall , tim@xen.org, ian.campbell@citrix.com Subject: [Xen-devel] [PATCH v2 10/15] 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 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 9dd9081..85a615b 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;