[Xen-changelog] [xen master] xsm/flask: Fix build following "xsm: correct AVC lookups for two sysctls"

[patchbot@xxxxxxx]

commit 320e02d27af75dc137ce2f012437c07f1728d70c
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Thu Aug 10 14:13:00 2017 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Thu Aug 10 15:40:38 2017 +0100

    xsm/flask: Fix build following "xsm: correct AVC lookups for two sysctls"
    
    avc_current_has_perm() takes 4 arguments, not 3.  Spotted by a Travis
    randconfig run which actually turned XSM on.
    
    https://travis-ci.org/xen-project/xen/jobs/263063220
    
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Acked-by: Daniel De Graaf <dgdegra@xxxxxxxxxxxxx>
---
 xen/xsm/flask/hooks.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c
index 17560b1..9114627 100644
--- a/xen/xsm/flask/hooks.c
+++ b/xen/xsm/flask/hooks.c
@@ -815,11 +815,11 @@ static int flask_sysctl(int cmd)
 
     case XEN_SYSCTL_get_cpu_levelling_caps:
         return avc_current_has_perm(SECINITSID_XEN, SECCLASS_XEN2,
-                                    XEN2__GET_CPU_LEVELLING_CAPS);
+                                    XEN2__GET_CPU_LEVELLING_CAPS, NULL);
 
     case XEN_SYSCTL_get_cpu_featureset:
         return avc_current_has_perm(SECINITSID_XEN, SECCLASS_XEN2,
-                                    XEN2__GET_CPU_FEATURESET);
+                                    XEN2__GET_CPU_FEATURESET, NULL);
 
     case XEN_SYSCTL_livepatch_op:
         return avc_current_has_perm(SECINITSID_XEN, SECCLASS_XEN2,
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog