Revert "UBUNTU: SAUCE: apparmor: fix leak on securityfs pin count"

BugLink: http://bugs.launchpad.net/bugs/1669611
This reverts commit 70330b27d07be598691d3337f269d7eb09f454db.
Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Joseph Salisbury <joseph.salisbury@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>

diff --git a/include/linux/security.h b/include/linux/security.h
index a31c1db91178b6b16e865de14ba9b18eb42e485a..32a40430732eb2d5df349a967fcefbcf8b5b60dc 100644 (file)
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -1587,7 +1587,6 @@ static inline void security_audit_rule_free(void *lsmrule)
 
 #ifdef CONFIG_SECURITYFS
 extern int securityfs_pin_fs(void);
-extern void securityfs_release_fs(void);
 extern int __securityfs_setup_d_inode(struct inode *dir, struct dentry *dentry,
                                      umode_t mode, void *data,
                                      const struct file_operations *fops,
@@ -1607,9 +1606,7 @@ static inline int securityfs_pin_fs(void)
 {
        return -ENODEV;
 }
-static inline void securityfs_release_fs(void)
-{
-}
+
 static inline int __securityfs_setup_d_inode(struct inode *dir,
                                        struct dentry *dentry,
                                        umode_t mode, void *data,

diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index ee9a780b0d720a7b5d73e27c14dc3eb01f619ce7..3f1dd678ff60015bb0066c79f2f9332062e35012 100644 (file)
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -1057,7 +1057,7 @@ static int ns_mkdir_op(struct inode *dir, struct dentry *dentry, umode_t mode)
        error = __securityfs_setup_d_inode(dir, dentry, mode | S_IFDIR,  NULL,
                                           NULL, NULL);
        if (error)
-               goto out_pin;
+               goto out;
 
        ns = aa_create_ns(parent, ACCESS_ONCE(dentry->d_name.name), dentry);
        if (IS_ERR(ns)) {
@@ -1066,8 +1066,6 @@ static int ns_mkdir_op(struct inode *dir, struct dentry *dentry, umode_t mode)
        }
 
        aa_put_ns(ns);          /* list ref remains */
-out_pin:
-       securityfs_release_fs();
 out:
        aa_put_ns(parent);
 

diff --git a/security/inode.c b/security/inode.c
index e7018203a294d5c0caaeb2c16d147684ab4e06ff..692b284038601529cbb72099353b5fdc46839d10 100644 (file)
--- a/security/inode.c
+++ b/security/inode.c
@@ -51,11 +51,6 @@ int securityfs_pin_fs(void)
        return simple_pin_fs(&fs_type, &mount, &mount_count);
 }
 
-void securityfs_release_fs(void)
-{
-       simple_release_fs(&mount, &mount_count);
-}
-
 int __securityfs_setup_d_inode(struct inode *dir, struct dentry *dentry,
                               umode_t mode, void *data,
                               const struct file_operations *fops,