[Xen-changelog] [xen staging-4.11] XSM: adjust Kconfig names

[patchbot@xxxxxxx]

commit f459e531d7018d0dc536d22d131e6a4f955ffb9e
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Tue Jun 18 16:05:31 2019 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Tue Jun 18 16:05:31 2019 +0200

    XSM: adjust Kconfig names
    
    Since the Kconfig option renaming was not backported, the new uses of
    involved CONFIG_* settings should have been adopted to the existing
    names in the XSA-295 series. Do this now, also changing XSM_SILO to just
    SILO to better match its FLASK counterpart.
    
    To avoid breaking the Kconfig menu structure also adjust XSM_POLICY's
    dependency (as was also silently done on master during the renaming).
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 xen/common/Kconfig    | 14 +++++++-------
 xen/include/xsm/xsm.h |  2 +-
 xen/xsm/Makefile      |  2 +-
 xen/xsm/xsm_core.c    |  8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/xen/common/Kconfig b/xen/common/Kconfig
index e4af3f13eb..15021df250 100644
--- a/xen/common/Kconfig
+++ b/xen/common/Kconfig
@@ -130,7 +130,7 @@ config FLASK_AVC_STATS
 config XSM_POLICY
        bool "Compile Xen with a built-in security policy"
        default y if HAS_CHECKPOLICY = "y"
-       depends on XSM
+       depends on FLASK
        ---help---
          This includes a default XSM policy in the hypervisor so that the
          bootloader does not need to load a policy to get sane behavior from an
@@ -143,7 +143,7 @@ config XSM_POLICY
 
          If unsure, say Y.
 
-config XSM_SILO
+config SILO
        def_bool y
        prompt "SILO support"
        depends on XSM
@@ -158,16 +158,16 @@ config XSM_SILO
 choice
        prompt "Default XSM implementation"
        depends on XSM
-       default XSM_SILO_DEFAULT if XSM_SILO && ARM
-       default XSM_FLASK_DEFAULT if XSM_FLASK
-       default XSM_SILO_DEFAULT if XSM_SILO
+       default XSM_SILO_DEFAULT if SILO && ARM
+       default XSM_FLASK_DEFAULT if FLASK
+       default XSM_SILO_DEFAULT if SILO
        default XSM_DUMMY_DEFAULT
        config XSM_DUMMY_DEFAULT
                bool "Match non-XSM behavior"
        config XSM_FLASK_DEFAULT
-               bool "FLux Advanced Security Kernel" if XSM_FLASK
+               bool "FLux Advanced Security Kernel" if FLASK
        config XSM_SILO_DEFAULT
-               bool "SILO" if XSM_SILO
+               bool "SILO" if SILO
 endchoice
 
 config LATE_HWDOM
diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h
index 0c803531eb..2779819e1e 100644
--- a/xen/include/xsm/xsm.h
+++ b/xen/include/xsm/xsm.h
@@ -738,7 +738,7 @@ extern const unsigned char xsm_init_policy[];
 extern const unsigned int xsm_init_policy_size;
 #endif
 
-#ifdef CONFIG_XSM_SILO
+#ifdef CONFIG_SILO
 extern void silo_init(void);
 #else
 static inline void silo_init(void) {}
diff --git a/xen/xsm/Makefile b/xen/xsm/Makefile
index 50e21303b3..0f0d7f9ad4 100644
--- a/xen/xsm/Makefile
+++ b/xen/xsm/Makefile
@@ -1,6 +1,6 @@
 obj-y += xsm_core.o
 obj-$(CONFIG_XSM) += xsm_policy.o
 obj-$(CONFIG_XSM) += dummy.o
-obj-$(CONFIG_XSM_SILO) += silo.o
+obj-$(CONFIG_SILO) += silo.o
 
 subdir-$(CONFIG_FLASK) += flask
diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c
index 1179cdf610..616a87ceb4 100644
--- a/xen/xsm/xsm_core.c
+++ b/xen/xsm/xsm_core.c
@@ -38,9 +38,9 @@ enum xsm_bootparam {
 };
 
 static enum xsm_bootparam __initdata xsm_bootparam =
-#ifdef CONFIG_XSM_FLASK_DEFAULT
+#if defined(CONFIG_XSM_FLASK_DEFAULT)
     XSM_BOOTPARAM_FLASK;
-#elif CONFIG_XSM_SILO_DEFAULT
+#elif defined(CONFIG_XSM_SILO_DEFAULT)
     XSM_BOOTPARAM_SILO;
 #else
     XSM_BOOTPARAM_DUMMY;
@@ -52,11 +52,11 @@ static int __init parse_xsm_param(const char *s)
 
     if ( !strcmp(s, "dummy") )
         xsm_bootparam = XSM_BOOTPARAM_DUMMY;
-#ifdef CONFIG_XSM_FLASK
+#ifdef CONFIG_FLASK
     else if ( !strcmp(s, "flask") )
         xsm_bootparam = XSM_BOOTPARAM_FLASK;
 #endif
-#ifdef CONFIG_XSM_SILO
+#ifdef CONFIG_SILO
     else if ( !strcmp(s, "silo") )
         xsm_bootparam = XSM_BOOTPARAM_SILO;
 #endif
--
generated by git-patchbot for /home/xen/git/xen.git#staging-4.11

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