All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/1] LSM/SELinux: {get,set}context hooks to access LSM security context information.
@ 2008-03-04 21:53 David P. Quigley
  2008-03-04 22:21 ` Dave Quigley
                   ` (2 more replies)
  0 siblings, 3 replies; 21+ messages in thread
From: David P. Quigley @ 2008-03-04 21:53 UTC (permalink / raw)
  To: sds, jmorris, chrisw, casey
  Cc: linux-security-module, selinux, David P. Quigley

This patch introduces two new hooks. One to get all relavent information from
an LSM about an inode an the second given that context to set it on the
inode. The setcontext call takes a flag to indicate if it should set the incore
representation, the ondisk representation or both.

Signed-off-by: David P. Quigley <dpquigl@tycho.nsa.gov>
---
 include/linux/security.h |   18 ++++++++++++++++++
 security/dummy.c         |   12 ++++++++++++
 security/security.c      |   12 ++++++++++++
 security/selinux/hooks.c |   45 ++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 86 insertions(+), 1 deletions(-)

diff --git a/include/linux/security.h b/include/linux/security.h
index fe52cde..9b1cc6f 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -112,6 +112,10 @@ struct request_sock;
 #define LSM_UNSAFE_PTRACE	2
 #define LSM_UNSAFE_PTRACE_CAP	4
 
+/* Flags for setcontext */
+#define LSM_SETCORE	1
+#define LSM_SETDISK	2
+
 #ifdef CONFIG_SECURITY
 
 /**
@@ -1395,6 +1399,9 @@ struct security_operations {
 	int (*secctx_to_secid)(char *secdata, u32 seclen, u32 *secid);
 	void (*release_secctx)(char *secdata, u32 seclen);
 
+	int (*setcontext)(struct dentry *dentry, void *ctx, u32 ctxlen, int flags);
+	int (*getcontext)(struct dentry *dentry, void **ctx, u32 *ctxlen);
+
 #ifdef CONFIG_SECURITY_NETWORK
 	int (*unix_stream_connect) (struct socket * sock,
 				    struct socket * other, struct sock * newsk);
@@ -1634,6 +1641,8 @@ int security_secid_to_secctx(u32 secid, char **secdata, u32 *seclen);
 int security_secctx_to_secid(char *secdata, u32 seclen, u32 *secid);
 void security_release_secctx(char *secdata, u32 seclen);
 
+int security_setcontext(struct dentry *dentry, void *ctx, u32 ctxlen, int flags);
+int security_getcontext(struct dentry *dentry, void **ctx, u32 *ctxlen);
 #else /* CONFIG_SECURITY */
 
 /*
@@ -2316,6 +2325,15 @@ static inline int security_secctx_to_secid(char *secdata,
 static inline void security_release_secctx(char *secdata, u32 seclen)
 {
 }
+
+static inline int security_setcontext(struct dentry *dentry, void *ctx, u32 ctxlen, int flags)
+{
+	return -EOPNOTSUPP;
+}
+static inline int security_getcontext(struct dentry *dentry, void **ctx, u32 *ctxlen)
+{
+	return -EOPNOTSUPP;
+}
 #endif	/* CONFIG_SECURITY */
 
 #ifdef CONFIG_SECURITY_NETWORK
diff --git a/security/dummy.c b/security/dummy.c
index 649326b..576f9db 100644
--- a/security/dummy.c
+++ b/security/dummy.c
@@ -960,6 +960,16 @@ static void dummy_release_secctx(char *secdata, u32 seclen)
 {
 }
 
+static int dummy_setcontext(struct dentry *dentry, void *ctx, u32 ctxlen, int flags)
+{
+	return -EOPNOTSUPP;
+}
+
+static int dummy_getcontext(struct dentry *dentry, void **ctx, u32 *ctxlen)
+{
+	return -EOPNOTSUPP;
+}
+
 #ifdef CONFIG_KEYS
 static inline int dummy_key_alloc(struct key *key, struct task_struct *ctx,
 				  unsigned long flags)
@@ -1118,6 +1128,8 @@ void security_fixup_ops (struct security_operations *ops)
  	set_to_dummy_if_null(ops, secid_to_secctx);
 	set_to_dummy_if_null(ops, secctx_to_secid);
  	set_to_dummy_if_null(ops, release_secctx);
+	set_to_dummy_if_null(ops, setcontext);
+	set_to_dummy_if_null(ops, getcontext);
 #ifdef CONFIG_SECURITY_NETWORK
 	set_to_dummy_if_null(ops, unix_stream_connect);
 	set_to_dummy_if_null(ops, unix_may_send);
diff --git a/security/security.c b/security/security.c
index d15e56c..11871ae 100644
--- a/security/security.c
+++ b/security/security.c
@@ -845,6 +845,18 @@ void security_release_secctx(char *secdata, u32 seclen)
 }
 EXPORT_SYMBOL(security_release_secctx);
 
+int security_setcontext(struct dentry *dentry, void *ctx, u32 ctxlen, int flags)
+{
+	return security_ops->setcontext(dentry, ctx, ctxlen, flags);
+}
+EXPORT_SYMBOL(security_setcontext);
+
+int security_getcontext(struct dentry *dentry, void **ctx, u32 *ctxlen)
+{
+	return security_ops->getcontext(dentry, ctx, ctxlen);
+}
+EXPORT_SYMBOL(security_getcontext);
+
 #ifdef CONFIG_SECURITY_NETWORK
 
 int security_unix_stream_connect(struct socket *sock, struct socket *other,
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 75c2e99..d28c0ed 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -75,6 +75,7 @@
 #include <linux/string.h>
 #include <linux/selinux.h>
 #include <linux/mutex.h>
+#include <linux/fsnotify.h>
 
 #include "avc.h"
 #include "objsec.h"
@@ -5163,6 +5164,47 @@ static void selinux_release_secctx(char *secdata, u32 seclen)
 	kfree(secdata);
 }
 
+/*
+ *	This hook requires that the inode i_mutex be locked
+ */
+static int selinux_setcontext(struct dentry *dentry, void *ctx, u32 ctxlen, int flags)
+{
+	struct inode *inode = dentry->d_inode;
+	int rc = 0;
+
+	if (flags & LSM_SETCORE) {
+		rc = selinux_inode_setsecurity(inode, XATTR_SELINUX_SUFFIX,
+						ctx, ctxlen, 0);
+		if(rc)
+			return rc;
+	}
+	if (flags & LSM_SETDISK) {
+		rc = -EOPNOTSUPP;
+		if (inode->i_op->setxattr) {
+			rc = inode->i_op->setxattr(dentry, XATTR_NAME_SELINUX, ctx, ctxlen, 0);
+			if (!rc) {
+				fsnotify_xattr(dentry);
+				security_inode_post_setxattr(dentry, XATTR_NAME_SELINUX, ctx,
+						ctxlen, 0);
+			}
+		} else {
+			rc = security_inode_setsecurity(inode, XATTR_SELINUX_SUFFIX, ctx,
+					ctxlen, 0);
+			if (!rc)
+				fsnotify_xattr(dentry);
+		}
+	}
+	
+	return rc;
+}
+static int selinux_getcontext(struct dentry *dentry, void **ctx, u32 *ctxlen)
+{
+	struct inode *inode = dentry->d_inode;
+	
+	*ctxlen = selinux_inode_getsecurity(inode, XATTR_SELINUX_SUFFIX,
+						ctx, true);
+	return *ctxlen;
+}
 #ifdef CONFIG_KEYS
 
 static int selinux_key_alloc(struct key *k, struct task_struct *tsk,
@@ -5351,7 +5393,8 @@ static struct security_operations selinux_ops = {
 	.secid_to_secctx =		selinux_secid_to_secctx,
 	.secctx_to_secid =		selinux_secctx_to_secid,
 	.release_secctx =		selinux_release_secctx,
-
+	.setcontext =			selinux_setcontext,
+	.getcontext =			selinux_getcontext,
         .unix_stream_connect =		selinux_socket_unix_stream_connect,
 	.unix_may_send =		selinux_socket_unix_may_send,
 
-- 
1.5.4.1


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

^ permalink raw reply related	[flat|nested] 21+ messages in thread
* Re: [PATCH 1/1] LSM/SELinux: {get,set}context hooks to access LSM security context information.
@ 2008-03-04 22:53 Casey Schaufler
  2008-03-04 22:33 ` Dave Quigley
  0 siblings, 1 reply; 21+ messages in thread
From: Casey Schaufler @ 2008-03-04 22:53 UTC (permalink / raw)
  To: David P. Quigley, sds, jmorris, chrisw
  Cc: linux-security-module, selinux, David P. Quigley

----- Original Message ----
> From: David P. Quigley <dpquigl@tycho.nsa.gov>
> To: sds@tycho.nsa.gov; jmorris@namei.org; chrisw@sous-sol.org; casey@schaufler-ca.com
> Cc: linux-security-module@vger.kernel.org; selinux@tycho.nsa.gov; David P. Quigley <dpquigl@tycho.nsa.gov>
> Sent: Tuesday, March 4, 2008 1:53:43 PM
> Subject: [PATCH 1/1] LSM/SELinux: {get,set}context hooks to access LSM security context information.
> 
> This patch introduces two new hooks. One to get all relavent information from
> an LSM about an inode an the second given that context to set it on the
> inode. The setcontext call takes a flag to indicate if it should set the incore
> representation, the ondisk representation or both.

Please coordinate with David Powell and Ahmed Darwish on these.
File system cacheing and audit both require similar functionality
and have proposed it in slightly different manners and with
slightly different names.


> Signed-off-by: David P. Quigley 
> ---
> include/linux/security.h | 18 ++++++++++++++++++
> security/dummy.c | 12 ++++++++++++
> security/security.c | 12 ++++++++++++
> security/selinux/hooks.c | 45 ++++++++++++++++++++++++++++++++++++++++++++-
> 4 files changed, 86 insertions(+), 1 deletions(-)
> 
> diff --git a/include/linux/security.h b/include/linux/security.h
> index fe52cde..9b1cc6f 100644
> --- a/include/linux/security.h
> +++ b/include/linux/security.h
> @@ -112,6 +112,10 @@ struct request_sock;
> #define LSM_UNSAFE_PTRACE 2
> #define LSM_UNSAFE_PTRACE_CAP 4
> 
> +/* Flags for setcontext */
> +#define LSM_SETCORE 1
> +#define LSM_SETDISK 2
> +
> #ifdef CONFIG_SECURITY
> 
> /**
> @@ -1395,6 +1399,9 @@ struct security_operations {
> int (*secctx_to_secid)(char *secdata, u32 seclen, u32 *secid);
> void (*release_secctx)(char *secdata, u32 seclen);
> 
> + int (*setcontext)(struct dentry *dentry, void *ctx, u32 ctxlen, int flags);
> + int (*getcontext)(struct dentry *dentry, void **ctx, u32 *ctxlen);
> +
> #ifdef CONFIG_SECURITY_NETWORK
> int (*unix_stream_connect) (struct socket * sock,
> struct socket * other, struct sock * newsk);
> @@ -1634,6 +1641,8 @@ int security_secid_to_secctx(u32 secid, char **secdata, 
> u32 *seclen);
> int security_secctx_to_secid(char *secdata, u32 seclen, u32 *secid);
> void security_release_secctx(char *secdata, u32 seclen);
> 
> +int security_setcontext(struct dentry *dentry, void *ctx, u32 ctxlen, int 
> flags);
> +int security_getcontext(struct dentry *dentry, void **ctx, u32 *ctxlen);
> #else /* CONFIG_SECURITY */
> 
> /*
> @@ -2316,6 +2325,15 @@ static inline int security_secctx_to_secid(char *secdata,
> static inline void security_release_secctx(char *secdata, u32 seclen)
> {
> }
> +
> +static inline int security_setcontext(struct dentry *dentry, void *ctx, u32 
> ctxlen, int flags)
> +{
> + return -EOPNOTSUPP;
> +}
> +static inline int security_getcontext(struct dentry *dentry, void **ctx, u32 
> *ctxlen)
> +{
> + return -EOPNOTSUPP;
> +}
> #endif /* CONFIG_SECURITY */
> 
> #ifdef CONFIG_SECURITY_NETWORK
> diff --git a/security/dummy.c b/security/dummy.c
> index 649326b..576f9db 100644
> --- a/security/dummy.c
> +++ b/security/dummy.c
> @@ -960,6 +960,16 @@ static void dummy_release_secctx(char *secdata, u32 seclen)
> {
> }
> 
> +static int dummy_setcontext(struct dentry *dentry, void *ctx, u32 ctxlen, int 
> flags)
> +{
> + return -EOPNOTSUPP;
> +}
> +
> +static int dummy_getcontext(struct dentry *dentry, void **ctx, u32 *ctxlen)
> +{
> + return -EOPNOTSUPP;
> +}
> +
> #ifdef CONFIG_KEYS
> static inline int dummy_key_alloc(struct key *key, struct task_struct *ctx,
> unsigned long flags)
> @@ -1118,6 +1128,8 @@ void security_fixup_ops (struct security_operations *ops)
> set_to_dummy_if_null(ops, secid_to_secctx);
> set_to_dummy_if_null(ops, secctx_to_secid);
> set_to_dummy_if_null(ops, release_secctx);
> + set_to_dummy_if_null(ops, setcontext);
> + set_to_dummy_if_null(ops, getcontext);
> #ifdef CONFIG_SECURITY_NETWORK
> set_to_dummy_if_null(ops, unix_stream_connect);
> set_to_dummy_if_null(ops, unix_may_send);
> diff --git a/security/security.c b/security/security.c
> index d15e56c..11871ae 100644
> --- a/security/security.c
> +++ b/security/security.c
> @@ -845,6 +845,18 @@ void security_release_secctx(char *secdata, u32 seclen)
> }
> EXPORT_SYMBOL(security_release_secctx);
> 
> +int security_setcontext(struct dentry *dentry, void *ctx, u32 ctxlen, int 
> flags)
> +{
> + return security_ops->setcontext(dentry, ctx, ctxlen, flags);
> +}
> +EXPORT_SYMBOL(security_setcontext);
> +
> +int security_getcontext(struct dentry *dentry, void **ctx, u32 *ctxlen)
> +{
> + return security_ops->getcontext(dentry, ctx, ctxlen);
> +}
> +EXPORT_SYMBOL(security_getcontext);
> +
> #ifdef CONFIG_SECURITY_NETWORK
> 
> int security_unix_stream_connect(struct socket *sock, struct socket *other,
> diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
> index 75c2e99..d28c0ed 100644
> --- a/security/selinux/hooks.c
> +++ b/security/selinux/hooks.c
> @@ -75,6 +75,7 @@
> #include 
> #include 
> #include 
> +#include 
> 
> #include "avc.h"
> #include "objsec.h"
> @@ -5163,6 +5164,47 @@ static void selinux_release_secctx(char *secdata, u32 
> seclen)
> kfree(secdata);
> }
> 
> +/*
> + * This hook requires that the inode i_mutex be locked
> + */
> +static int selinux_setcontext(struct dentry *dentry, void *ctx, u32 ctxlen, int 
> flags)
> +{
> + struct inode *inode = dentry->d_inode;
> + int rc = 0;
> +
> + if (flags & LSM_SETCORE) {
> + rc = selinux_inode_setsecurity(inode, XATTR_SELINUX_SUFFIX,
> + ctx, ctxlen, 0);
> + if(rc)
> + return rc;
> + }
> + if (flags & LSM_SETDISK) {
> + rc = -EOPNOTSUPP;
> + if (inode->i_op->setxattr) {
> + rc = inode->i_op->setxattr(dentry, XATTR_NAME_SELINUX, ctx, ctxlen, 
> 0);
> + if (!rc) {
> + fsnotify_xattr(dentry);
> + security_inode_post_setxattr(dentry, XATTR_NAME_SELINUX, ctx,
> + ctxlen, 0);
> + }
> + } else {
> + rc = security_inode_setsecurity(inode, XATTR_SELINUX_SUFFIX, ctx,
> + ctxlen, 0);
> + if (!rc)
> + fsnotify_xattr(dentry);
> + }
> + }
> + 
> + return rc;
> +}
> +static int selinux_getcontext(struct dentry *dentry, void **ctx, u32 *ctxlen)
> +{
> + struct inode *inode = dentry->d_inode;
> + 
> + *ctxlen = selinux_inode_getsecurity(inode, XATTR_SELINUX_SUFFIX,
> + ctx, true);
> + return *ctxlen;
> +}
> #ifdef CONFIG_KEYS
> 
> static int selinux_key_alloc(struct key *k, struct task_struct *tsk,
> @@ -5351,7 +5393,8 @@ static struct security_operations selinux_ops = {
> .secid_to_secctx = selinux_secid_to_secctx,
> .secctx_to_secid = selinux_secctx_to_secid,
> .release_secctx = selinux_release_secctx,
> -
> + .setcontext = selinux_setcontext,
> + .getcontext = selinux_getcontext,
> .unix_stream_connect = selinux_socket_unix_stream_connect,
> .unix_may_send = selinux_socket_unix_may_send,
> 
> -- 
> 1.5.4.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-security-module" 
> in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at 
> http://vger.kernel.org/majordomo-info.html


 
Casey Schaufler
casey@schaufler-ca.com 

--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

^ permalink raw reply	[flat|nested] 21+ messages in thread
* Re: [PATCH 1/1] LSM/SELinux: {get,set}context hooks to access LSM security context information.
@ 2008-03-05  1:08 Casey Schaufler
  2008-03-05 13:41 ` Dave Quigley
  2008-03-05 14:08 ` Stephen Smalley
  0 siblings, 2 replies; 21+ messages in thread
From: Casey Schaufler @ 2008-03-05  1:08 UTC (permalink / raw)
  To: Dave Quigley, Chris Wright; +Cc: sds, jmorris, linux-security-module, selinux


----- Original Message ----
> From: Dave Quigley <dpquigl@tycho.nsa.gov>
> To: Chris Wright <chrisw@sous-sol.org>
> Cc: sds@tycho.nsa.gov; jmorris@namei.org; casey@schaufler-ca.com; linux-security-module@vger.kernel.org; selinux@tycho.nsa.gov
> Sent: Tuesday, March 4, 2008 3:07:06 PM
> Subject: Re: [PATCH 1/1] LSM/SELinux: {get,set}context hooks to access LSM security context information.
> 
> 
> On Tue, 2008-03-04 at 15:26 -0800, Chris Wright wrote:
> > * David P. Quigley (dpquigl@tycho.nsa.gov) wrote:
> > > +/* Flags for setcontext */
> > > +#define LSM_SETCORE 1
> > > +#define LSM_SETDISK 2
> > > +
> > > #ifdef CONFIG_SECURITY
> > > 
> > > /**
> > > @@ -1395,6 +1399,9 @@ struct security_operations {
> > > int (*secctx_to_secid)(char *secdata, u32 seclen, u32 *secid);
> > > void (*release_secctx)(char *secdata, u32 seclen);
> > > 
> > > + int (*setcontext)(struct dentry *dentry, void *ctx, u32 ctxlen, int 
> flags);
> > > + int (*getcontext)(struct dentry *dentry, void **ctx, u32 *ctxlen);
> > 
> > Is this meant to address Casey's argument about the mac label hook name?
> > Also, why have you made the distinction of in-core vs. on disk in the
> > interface? As I mentioned, I think just needs a little better
> > description of why.
> > 
> > thanks,
> > -chris
> 
> The reason for the differentiation is that NFS inodes don't need their
> on-disk representation set. Normally this would be taken care of with an
> inode_getsecurity call but as you noted Casey objected to a hook to get
> the suffix name.

No, I objected to a hook that is specific to MAC LSMs that
store a single label as an xattr. I objected to it because it
was being used to support one file system on one LSM and
suggested that for that reason it should be an interface
private to either the specific LSM or the specific filesystem.

> Also he did have a point in that the context may have
> several components to it that could have multiple suffixes. So I need a
> hook that allows us to set possibly multiple internal security values
> based on a security context and without using an xattr name.

You could use Ahmed's hook to get the secid of a file and then
use secid_to_secctx to get the context. That's what audit has to
do.


Casey Schaufler
casey@schaufler-ca.com 

--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

^ permalink raw reply	[flat|nested] 21+ messages in thread

end of thread, other threads:[~2008-03-05 18:24 UTC | newest]

Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-04 21:53 [PATCH 1/1] LSM/SELinux: {get,set}context hooks to access LSM security context information David P. Quigley
2008-03-04 22:21 ` Dave Quigley
2008-03-04 23:26 ` Chris Wright
2008-03-04 23:07   ` Dave Quigley
2008-03-04 23:52     ` Chris Wright
2008-03-04 23:35       ` Dave Quigley
2008-03-05  0:10         ` Chris Wright
2008-03-04 23:59           ` Dave Quigley
2008-03-05  0:31             ` James Morris
2008-03-05  1:39             ` Chris Wright
2008-03-04 23:48 ` James Morris
2008-03-04 23:26   ` Dave Quigley
  -- strict thread matches above, loose matches on Subject: below --
2008-03-04 22:53 Casey Schaufler
2008-03-04 22:33 ` Dave Quigley
2008-03-04 23:14   ` Chris Wright
2008-03-04 22:51     ` Dave Quigley
2008-03-04 22:59       ` Dave Quigley
2008-03-05  1:08 Casey Schaufler
2008-03-05 13:41 ` Dave Quigley
2008-03-05 14:08 ` Stephen Smalley
2008-03-05 17:24   ` Casey Schaufler

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.