Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

[mv-sheeva.git] / security / tomoyo / common.c

diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c
index 8bedfb1992e5040674f5d342d7e8800eab565037..92cea656ad2162e07fef90ef71fb08d3cfe01878 100644 (file)
--- a/security/tomoyo/common.c
+++ b/security/tomoyo/common.c
@@ -2177,6 +2177,10 @@ static int __init tomoyo_initerface_init(void)
 {
        struct dentry *tomoyo_dir;
 
+       /* Don't create securityfs entries unless registered. */
+       if (current_cred()->security != &tomoyo_kernel_domain)
+               return 0;
+
        tomoyo_dir = securityfs_create_dir("tomoyo", NULL);
        tomoyo_create_entry("domain_policy",    0600, tomoyo_dir,
                            TOMOYO_DOMAINPOLICY);