| Message ID | 1394640969-25583-11-git-send-email-julien.grall@linaro.org |
|---|---|
| State | Accepted, archived |
| Commit | 3abbf0d1051d916c111b066aff1f0051af9af571 |
| Headers | show |
On 03/12/2014 12:16 PM, Julien Grall wrote: > 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 <julien.grall@linaro.org> > Cc: Daniel De Graaf <dgdegra@tycho.nsa.gov> Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov> > --- > 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; >
On Thu, 2014-03-13 at 10:34 -0400, Daniel De Graaf wrote: > On 03/12/2014 12:16 PM, Julien Grall wrote: > > 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 <julien.grall@linaro.org> > > Cc: Daniel De Graaf <dgdegra@tycho.nsa.gov> > > Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov> Acked-by: Ian Campbell <ian.campbell@citrix.com>
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;
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 <julien.grall@linaro.org> Cc: Daniel De Graaf <dgdegra@tycho.nsa.gov> --- xen/xsm/flask/flask_op.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)