From: Daniel De Graaf <dgdegra@tycho.nsa.gov>
To: xen-devel@lists.xen.org
Cc: Daniel De Graaf <dgdegra@tycho.nsa.gov>
Subject: [PATCH 15/17] xsm: clean up unregistration
Date: Mon, 20 Jun 2016 10:04:24 -0400 [thread overview]
Message-ID: <1466431466-28055-16-git-send-email-dgdegra@tycho.nsa.gov> (raw)
In-Reply-To: <1466431466-28055-1-git-send-email-dgdegra@tycho.nsa.gov>
The only possible value of original_ops was &dummy_xsm_ops, and
unregister_xsm was never used.
Signed-off-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
xen/include/xsm/xsm.h | 1 -
xen/xsm/flask/flask_op.c | 4 +---
xen/xsm/flask/hooks.c | 3 ---
xen/xsm/xsm_core.c | 16 ----------------
4 files changed, 1 insertion(+), 23 deletions(-)
diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h
index 0d525ec..4b8843d 100644
--- a/xen/include/xsm/xsm.h
+++ b/xen/include/xsm/xsm.h
@@ -750,7 +750,6 @@ extern bool has_xsm_magic(paddr_t);
#endif
extern int register_xsm(struct xsm_operations *ops);
-extern int unregister_xsm(struct xsm_operations *ops);
extern struct xsm_operations dummy_xsm_ops;
extern void xsm_fixup_ops(struct xsm_operations *ops);
diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c
index 3ad4bdc..719c2d7 100644
--- a/xen/xsm/flask/flask_op.c
+++ b/xen/xsm/flask/flask_op.c
@@ -58,8 +58,6 @@ static int flask_security_make_bools(void);
extern int ss_initialized;
-extern struct xsm_operations *original_ops;
-
static void __init parse_flask_param(char *s)
{
if ( !strcmp(s, "enforcing") )
@@ -243,7 +241,7 @@ static int flask_disable(void)
flask_disabled = 1;
/* Reset xsm_ops to the original module. */
- xsm_ops = original_ops;
+ xsm_ops = &dummy_xsm_ops;
return 0;
}
diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c
index d632b0e..2692a6f 100644
--- a/xen/xsm/flask/hooks.c
+++ b/xen/xsm/flask/hooks.c
@@ -35,8 +35,6 @@
#include <objsec.h>
#include <conditional.h>
-struct xsm_operations *original_ops = NULL;
-
static u32 domain_sid(struct domain *dom)
{
struct domain_security_struct *dsec = dom->ssid;
@@ -1842,7 +1840,6 @@ __init void flask_init(void)
avc_init();
- original_ops = xsm_ops;
if ( register_xsm(&flask_ops) )
panic("Flask: Unable to register with XSM");
diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c
index 78d881b..8df1a3c 100644
--- a/xen/xsm/xsm_core.c
+++ b/xen/xsm/xsm_core.c
@@ -144,22 +144,6 @@ int __init register_xsm(struct xsm_operations *ops)
return 0;
}
-
-int unregister_xsm(struct xsm_operations *ops)
-{
- if ( ops != xsm_ops )
- {
- printk("%s: trying to unregister "
- "a security_opts structure that is not "
- "registered, failing.\n", __FUNCTION__);
- return -EINVAL;
- }
-
- xsm_ops = &dummy_xsm_ops;
-
- return 0;
-}
-
#endif
long do_xsm_op (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op)
--
2.7.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-06-20 14:04 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-20 14:04 [PATCH v2 00/17] XSM/FLASK updates for 4.8 Daniel De Graaf
2016-06-20 14:04 ` [PATCH 01/17] flask/policy: split into modules Daniel De Graaf
2016-06-20 14:04 ` [PATCH 02/17] flask/policy: split out rules for system_r Daniel De Graaf
2016-06-20 14:04 ` [PATCH 03/17] flask/policy: move user definitions and constraints into modules Daniel De Graaf
2016-06-20 14:04 ` [PATCH 04/17] flask/policy: remove unused support for binary modules Daniel De Graaf
2016-06-20 14:04 ` [PATCH 05/17] flask/policy: xenstore stubdom policy Daniel De Graaf
2016-06-20 14:04 ` [PATCH 06/17] flask/policy: remove unused example Daniel De Graaf
2016-06-20 14:04 ` [PATCH 07/17] flask: unify {get, set}vcpucontext permissions Daniel De Graaf
2016-06-20 14:27 ` Doug Goldstein
2016-06-20 14:35 ` Andrew Cooper
2016-06-20 14:50 ` Daniel De Graaf
2016-06-20 14:58 ` Andrew Cooper
2016-06-20 14:04 ` [PATCH 08/17] flask: remove unused secondary context in ocontext Daniel De Graaf
2016-06-20 14:30 ` Doug Goldstein
2016-06-20 14:04 ` [PATCH 09/17] flask: remove unused AVC callback functions Daniel De Graaf
2016-06-20 14:32 ` Doug Goldstein
2016-06-20 14:04 ` [PATCH 10/17] flask: remove xen_flask_userlist operation Daniel De Graaf
2016-06-20 14:19 ` Jan Beulich
2016-06-20 14:35 ` Doug Goldstein
2016-06-20 15:07 ` Daniel De Graaf
2016-06-20 15:16 ` Doug Goldstein
2016-06-20 14:04 ` [PATCH 11/17] flask: improve unknown permission handling Daniel De Graaf
2016-06-20 14:37 ` Doug Goldstein
2016-06-20 14:04 ` [PATCH 12/17] xen/xsm: remove .xsm_initcall.init section Daniel De Graaf
2016-06-20 14:38 ` Doug Goldstein
2016-06-21 15:21 ` Andrew Cooper
2016-06-21 15:41 ` Julien Grall
2016-06-21 16:03 ` Andrew Cooper
2016-06-20 14:04 ` [PATCH 13/17] xen: move FLASK entry under XSM in Kconfig Daniel De Graaf
2016-06-20 14:41 ` Doug Goldstein
2016-06-20 14:42 ` Doug Goldstein
2016-06-20 14:46 ` Doug Goldstein
2016-06-20 15:11 ` Daniel De Graaf
2016-06-20 15:28 ` Jan Beulich
2016-06-20 16:49 ` Doug Goldstein
2016-06-21 17:09 ` [PATCH 13/17 v3] " Daniel De Graaf
2016-06-24 14:43 ` Doug Goldstein
2016-06-20 14:04 ` [PATCH 14/17] xsm: annotate setup functions with __init Daniel De Graaf
2016-06-20 14:46 ` Doug Goldstein
2016-06-20 14:04 ` Daniel De Graaf [this message]
2016-06-20 14:47 ` [PATCH 15/17] xsm: clean up unregistration Doug Goldstein
2016-06-20 14:04 ` [PATCH 16/17] xen: Make FLASK_AVC_STATS kconfig option visible Daniel De Graaf
2016-06-20 14:49 ` Doug Goldstein
2016-06-20 14:04 ` [PATCH 17/17] xsm: add a default policy to .init.data Daniel De Graaf
2016-06-20 14:52 ` Doug Goldstein
2016-06-24 16:30 ` Julien Grall
2016-06-24 16:50 ` Konrad Rzeszutek Wilk
2016-06-24 17:34 ` Daniel De Graaf
2016-06-24 17:40 ` Konrad Rzeszutek Wilk
2016-06-24 17:42 ` Daniel De Graaf
2016-06-24 17:46 ` Konrad Rzeszutek Wilk
2016-06-24 18:02 ` Daniel De Graaf
2016-06-24 18:36 ` Konrad Rzeszutek Wilk
2016-06-24 17:41 ` Konrad Rzeszutek Wilk
2016-06-24 17:47 ` Julien Grall
2016-06-24 17:44 ` Julien Grall
2016-06-21 15:24 ` [PATCH v2 00/17] XSM/FLASK updates for 4.8 Andrew Cooper
2016-06-27 9:48 ` Andrew Cooper
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=1466431466-28055-16-git-send-email-dgdegra@tycho.nsa.gov \
--to=dgdegra@tycho.nsa.gov \
--cc=xen-devel@lists.xen.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).