From: Xin Li <talons.lee@gmail.com>
To: xen-devel@lists.xen.org
Cc: Sergey Dyasli <sergey.dyasli@citrix.com>,
Stefano Stabellini <sstabellini@kernel.org>,
Wei Liu <wei.liu2@citrix.com>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
George Dunlap <George.Dunlap@eu.citrix.com>,
Xin Li <xin.li@citrix.com>, Tim Deegan <tim@xen.org>,
Jan Beulich <JBeulich@suse.com>,
Andrew Cooper <andrew.cooper3@citrix.com>,
Ming Lu <ming.lu@citrix.com>,
Daniel De Graaf <dgdegra@tycho.nsa.gov>
Subject: [PATCH 1/2] xen/xsm: Introduce new boot parameter xsm
Date: Sat, 29 Sep 2018 17:22:50 +0800 [thread overview]
Message-ID: <20180929092251.17661-1-xin.li@citrix.com> (raw)
Introduce new boot parameter xsm to choose which xsm module is enabled,
and set default to dummy.
Signed-off-by: Xin Li <xin.li@citrix.com>
---
CC: Daniel De Graaf <dgdegra@tycho.nsa.gov>
CC: George Dunlap <George.Dunlap@eu.citrix.com>
CC: Jan Beulich <JBeulich@suse.com>
CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Tim Deegan <tim@xen.org>
CC: Wei Liu <wei.liu2@citrix.com>
CC: Sergey Dyasli <sergey.dyasli@citrix.com>
CC: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Ming Lu <ming.lu@citrix.com>
v4:
1. change the default XSM boot parameter name from "default" to "dummy".
2. Kconfig, remove XSM_FLASK from EXPERT.
3. Kconfig, add new choice to select the default XSM module.
---
docs/misc/xen-command-line.markdown | 13 ++++++++
xen/common/Kconfig | 13 +++++++-
xen/xsm/xsm_core.c | 46 ++++++++++++++++++++++++++++-
3 files changed, 70 insertions(+), 2 deletions(-)
diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown
index 1ffd586224..cf9924f53f 100644
--- a/docs/misc/xen-command-line.markdown
+++ b/docs/misc/xen-command-line.markdown
@@ -899,6 +899,19 @@ hardware domain is architecture dependent.
Note that specifying zero as domU value means zero, while for dom0 it means
to use the default.
+### xsm
+> `= dummy | flask`
+
+> Default: `dummy`
+
+Specify which XSM module should be enabled. This option is only available if
+the hypervisor was compiled with XSM support.
+
+* `dummy`: this is the default choice. Basic restriction for common deployment
+ (the dummy module) will be applied. it's also used when XSM is compiled out.
+* `flask`: this is the policy based access control. To choose this, the
+ separated option in kconfig must also be enabled.
+
### flask
> `= permissive | enforcing | late | disabled`
diff --git a/xen/common/Kconfig b/xen/common/Kconfig
index 1a6d6281c1..f802efb625 100644
--- a/xen/common/Kconfig
+++ b/xen/common/Kconfig
@@ -116,7 +116,7 @@ config XSM
config XSM_FLASK
def_bool y
- prompt "FLux Advanced Security Kernel support" if EXPERT = "y"
+ prompt "FLux Advanced Security Kernel support"
depends on XSM
---help---
Enables FLASK (FLux Advanced Security Kernel) as the access control
@@ -154,6 +154,17 @@ config XSM_FLASK_POLICY
If unsure, say Y.
+choice
+ prompt "Default XSM implementation"
+ depends on XSM
+ default XSM_FLASK_DEFAULT if XSM_FLASK
+ 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
+endchoice
+
config LATE_HWDOM
bool "Dedicated hardware domain"
default n
diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c
index 9645e244c3..df284ec463 100644
--- a/xen/xsm/xsm_core.c
+++ b/xen/xsm/xsm_core.c
@@ -31,6 +31,37 @@
struct xsm_operations *xsm_ops;
+enum xsm_bootparam {
+ XSM_BOOTPARAM_DUMMY,
+ XSM_BOOTPARAM_FLASK,
+};
+
+static enum xsm_bootparam __initdata xsm_bootparam =
+#ifdef CONFIG_XSM_FLASK_DEFAULT
+ XSM_BOOTPARAM_FLASK;
+#else
+ XSM_BOOTPARAM_DUMMY;
+#endif
+
+static int __init parse_xsm_param(const char *s)
+{
+ int rc = 0;
+
+ if ( !strcmp(s, "dummy") )
+ xsm_bootparam = XSM_BOOTPARAM_DUMMY;
+#ifdef CONFIG_XSM_FLASK
+ else if ( !strcmp(s, "flask") )
+ xsm_bootparam = XSM_BOOTPARAM_FLASK;
+#endif
+ else {
+ printk("XSM: can't parse boot parameter xsm=%s\n", s);
+ rc = -EINVAL;
+ }
+
+ return rc;
+}
+custom_param("xsm", parse_xsm_param);
+
static inline int verify(struct xsm_operations *ops)
{
/* verify the security_operations structure exists */
@@ -57,7 +88,20 @@ static int __init xsm_core_init(const void *policy_buffer, size_t policy_size)
}
xsm_ops = &dummy_xsm_ops;
- flask_init(policy_buffer, policy_size);
+
+ switch ( xsm_bootparam )
+ {
+ case XSM_BOOTPARAM_DUMMY:
+ break;
+
+ case XSM_BOOTPARAM_FLASK:
+ flask_init(policy_buffer, policy_size);
+ break;
+
+ default:
+ printk("XSM: Invalid value for xsm= boot parameter\n");
+ break;
+ }
return 0;
}
--
2.18.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
next reply other threads:[~2018-09-29 9:22 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-29 9:22 Xin Li [this message]
2018-09-29 9:22 ` [PATCH 2/2] xen/xsm: Add new SILO mode for XSM Xin Li
2018-10-01 15:21 ` [Non-DoD Source] " DeGraaf, Daniel G
2018-10-02 9:33 ` Jan Beulich
2018-10-08 7:49 ` Xin Li (Talons)
2018-10-08 8:28 ` Jan Beulich
2018-10-01 15:17 ` [Non-DoD Source] [PATCH 1/2] xen/xsm: Introduce new boot parameter xsm DeGraaf, Daniel G
2018-10-08 6:32 ` Xin Li (Talons)
2018-10-02 9:11 ` Jan Beulich
2018-10-08 6:30 ` Xin Li (Talons)
-- strict thread matches above, loose matches on Subject: below --
2018-09-28 8:18 Xin Li
2018-09-28 17:15 ` Daniel De Graaf
2018-07-03 1:26 Xin Li
2018-07-03 6:10 ` Xin Li (Talons)
2018-07-03 7:12 ` Jan Beulich
2018-07-03 8:58 ` Xin Li (Talons)
2018-07-04 16:54 ` George Dunlap
2018-07-05 1:38 ` Xin Li (Talons)
2018-08-17 19:11 ` Daniel De Graaf
2018-06-29 9:28 Xin Li
2018-06-29 9:47 ` Andrew Cooper
2018-06-29 10:04 ` Jan Beulich
2018-07-02 7:34 ` Xin Li (Talons)
2018-07-02 8:24 ` Jan Beulich
2018-07-02 8:39 ` Xin Li (Talons)
2018-07-02 9:04 ` Jan Beulich
2018-07-02 7:21 ` Xin Li (Talons)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180929092251.17661-1-xin.li@citrix.com \
--to=talons.lee@gmail.com \
--cc=George.Dunlap@eu.citrix.com \
--cc=JBeulich@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=dgdegra@tycho.nsa.gov \
--cc=konrad.wilk@oracle.com \
--cc=ming.lu@citrix.com \
--cc=sergey.dyasli@citrix.com \
--cc=sstabellini@kernel.org \
--cc=tim@xen.org \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.org \
--cc=xin.li@citrix.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.