selinux: enable per-file labeling for debugfs files.

upstream commit 6f29997f4a3117169eeabd41dbea4c1bd94a739c

Add support for per-file labeling of debugfs files so that
we can distinguish them in policy.  This is particularly
important in Android where certain debugfs files have to be writable
by apps and therefore the debugfs directory tree can be read and
searched by all.

Since debugfs is entirely kernel-generated, the directory tree is
immutable by userspace, and the inodes are pinned in memory, we can
simply use the same approach as with proc and label the inodes from
policy based on pathname from the root of the debugfs filesystem.
Generalize the existing labeling support used for proc and reuse it
for debugfs too.

[sds:  Back-ported to 3.10.  superblock_security_struct flags field
is only unsigned char in 3.10 so we have to redefine SE_SBGENFS.
However, this definition is kernel-private, not exposed to userspace
or stored anywhere persistent.]

Change-Id: I6460fbed6bb6bd36eb8554ac8c4fdd574edf3b07
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index c8b85ea44cfd884def0e1adaf949fbfbbdd06a35..69e6e80b9782ee25c2c75d6b02425a3a6de17b3f 100644 (file)
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -698,7 +698,10 @@ static int selinux_set_mnt_opts(struct super_block *sb,
        }
 
        if (strcmp(sb->s_type->name, "proc") == 0)
-               sbsec->flags |= SE_SBPROC;
+               sbsec->flags |= SE_SBPROC | SE_SBGENFS;
+
+       if (strcmp(sb->s_type->name, "debugfs") == 0)
+               sbsec->flags |= SE_SBGENFS;
 
        /* Determine the labeling behavior to use for this filesystem type. */
        rc = security_fs_use((sbsec->flags & SE_SBPROC) ? "proc" : sb->s_type->name, &sbsec->behavior, &sbsec->sid);
@@ -1183,12 +1186,13 @@ static inline u16 socket_type_to_security_class(int family, int type, int protoc
        return SECCLASS_SOCKET;
 }
 
-#ifdef CONFIG_PROC_FS
-static int selinux_proc_get_sid(struct dentry *dentry,
-                               u16 tclass,
-                               u32 *sid)
+static int selinux_genfs_get_sid(struct dentry *dentry,
+                                u16 tclass,
+                                u16 flags,
+                                u32 *sid)
 {
        int rc;
+       struct super_block *sb = dentry->d_inode->i_sb;
        char *buffer, *path;
 
        buffer = (char *)__get_free_page(GFP_KERNEL);
@@ -1199,26 +1203,20 @@ static int selinux_proc_get_sid(struct dentry *dentry,
        if (IS_ERR(path))
                rc = PTR_ERR(path);
        else {
-               /* each process gets a /proc/PID/ entry. Strip off the
-                * PID part to get a valid selinux labeling.
-                * e.g. /proc/1/net/rpc/nfs -> /net/rpc/nfs */
-               while (path[1] >= '0' && path[1] <= '9') {
-                       path[1] = '/';
-                       path++;
+               if (flags & SE_SBPROC) {
+                       /* each process gets a /proc/PID/ entry. Strip off the
+                        * PID part to get a valid selinux labeling.
+                        * e.g. /proc/1/net/rpc/nfs -> /net/rpc/nfs */
+                       while (path[1] >= '0' && path[1] <= '9') {
+                               path[1] = '/';
+                               path++;
+                       }
                }
-               rc = security_genfs_sid("proc", path, tclass, sid);
+               rc = security_genfs_sid(sb->s_type->name, path, tclass, sid);
        }
        free_page((unsigned long)buffer);
        return rc;
 }
-#else
-static int selinux_proc_get_sid(struct dentry *dentry,
-                               u16 tclass,
-                               u32 *sid)
-{
-       return -EINVAL;
-}
-#endif
 
 /* The inode's security attributes must be initialized before first use. */
 static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dentry)
@@ -1373,7 +1371,7 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent
                /* Default to the fs superblock SID. */
                isec->sid = sbsec->sid;
 
-               if ((sbsec->flags & SE_SBPROC) && !S_ISLNK(inode->i_mode)) {
+               if ((sbsec->flags & SE_SBGENFS) && !S_ISLNK(inode->i_mode)) {
                        /* We must have a dentry to determine the label on
                         * procfs inodes */
                        if (opt_dentry)
@@ -1396,7 +1394,8 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dent
                        if (!dentry)
                                goto out_unlock;
                        isec->sclass = inode_mode_to_security_class(inode->i_mode);
-                       rc = selinux_proc_get_sid(dentry, isec->sclass, &sid);
+                       rc = selinux_genfs_get_sid(dentry, isec->sclass,
+                                                  sbsec->flags, &sid);
                        dput(dentry);
                        if (rc)
                                goto out_unlock;

diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h
index e72d8de93725a9230b683ffb0d80a44276847278..b73ec2a71a7ce4e4d23729d377defaed87449653 100644 (file)
--- a/security/selinux/include/security.h
+++ b/security/selinux/include/security.h
@@ -55,6 +55,7 @@
 #define SE_SBINITIALIZED       0x10
 #define SE_SBPROC              0x20
 #define SE_SBLABELSUPP 0x40
+#define SE_SBGENFS     0x80
 
 #define CONTEXT_STR    "context="
 #define FSCONTEXT_STR  "fscontext="