Re: [PATCH] xen/xsm: Fix x86 XSM build after commit 6ea9f04

[Ian Campbell <ian.campbell@citrix.com>]

On Mon, 2015-05-11 at 11:09 +0100, Julien Grall wrote:
> Signed-off-by: Julien Grall <julien.grall@citrix.com>

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