Revert "UBUNTU: SAUCE: apparmor: fix reference count leak when securityfs_setup_d_ino...

BugLink: http://bugs.launchpad.net/bugs/1669611
This reverts commit 06393b1b553569a0b21731f69148eaa3f4971bcd.
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/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index 3f1dd678ff60015bb0066c79f2f9332062e35012..74ed9a9a772920ddac7e4f79b144d9011b4da536 100644 (file)
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -1052,12 +1052,12 @@ static int ns_mkdir_op(struct inode *dir, struct dentry *dentry, umode_t mode)
        error = securityfs_pin_fs();
        inode_lock_nested(dir, I_MUTEX_PARENT);
        if (error)
-               goto out;
+               return error;
 
        error = __securityfs_setup_d_inode(dir, dentry, mode | S_IFDIR,  NULL,
                                           NULL, NULL);
        if (error)
-               goto out;
+               return error;
 
        ns = aa_create_ns(parent, ACCESS_ONCE(dentry->d_name.name), dentry);
        if (IS_ERR(ns)) {
@@ -1066,7 +1066,6 @@ static int ns_mkdir_op(struct inode *dir, struct dentry *dentry, umode_t mode)
        }
 
        aa_put_ns(ns);          /* list ref remains */
-out:
        aa_put_ns(parent);
 
        return error;