From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: Re: [PATCH] xen/xsm: Fix x86 XSM build after commit 6ea9f04 Date: Mon, 11 May 2015 11:48:53 +0100 Message-ID: <1431341333.8263.16.camel@citrix.com> References: <1431338964-5341-1-git-send-email-julien.grall@citrix.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 1YrlGb-0002yX-NL for xen-devel@lists.xenproject.org; Mon, 11 May 2015 10:48:57 +0000 In-Reply-To: <1431338964-5341-1-git-send-email-julien.grall@citrix.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: Julien Grall Cc: xen-devel@lists.xenproject.org, dgdegra@tycho.nsa.gov, jbeulich@suse.com, andrew.cooper3@citrix.com List-Id: xen-devel@lists.xenproject.org On Mon, 2015-05-11 at 11:09 +0100, Julien Grall wrote: > Signed-off-by: Julien Grall Applied, thanks. (NB: I prefer commit logs which explain how they fix the build) > --- > xen/xsm/flask/flask_op.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c > index 802ffd4..8dee021 100644 > --- a/xen/xsm/flask/flask_op.c > +++ b/xen/xsm/flask/flask_op.c > @@ -829,10 +829,10 @@ CHECK_flask_setenforce; > CHECK_flask_transition; > > #define COMPAT > -#define flask_copyin_string(ch, pb, sz, mx) ({ \ > - XEN_GUEST_HANDLE_PARAM(char) gh; \ > - guest_from_compat_handle(gh, ch); \ > - flask_copyin_string(gh, pb, sz, mx); \ > +#define safe_copy_string_from_guest(ch, sz, mx) ({ \ > + XEN_GUEST_HANDLE_PARAM(char) gh; \ > + guest_from_compat_handle(gh, ch); \ > + safe_copy_string_from_guest(gh, sz, mx); \ > }) > > #define xen_flask_load compat_flask_load