]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
apparmor: Fix an error code in aafs_create()
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 13 Jul 2017 07:39:20 +0000 (10:39 +0300)
committerSeth Forshee <seth.forshee@canonical.com>
Tue, 5 Sep 2017 12:34:46 +0000 (07:34 -0500)
We accidentally forgot to set the error code on this path.  It means we
return NULL instead of an error pointer.  I looked through a bunch of
callers and I don't think it really causes a big issue, but the
documentation says we're supposed to return error pointers here.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Serge Hallyn <serge@hallyn.com>
Signed-off-by: John Johansen <john.johansen@canonical.com>
(cherry picked from commit aee58bf341db52a3a3563c6b972bfd4fc2d41e46 linux-next)
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
security/apparmor/apparmorfs.c

index 853c2ec8e0c9521e53fe2c6edecb0b7913cfad26..2caeb748070cabdd2ad16c2af6c7aa05cfa726d8 100644 (file)
@@ -248,8 +248,10 @@ static struct dentry *aafs_create(const char *name, umode_t mode,
 
        inode_lock(dir);
        dentry = lookup_one_len(name, parent, strlen(name));
-       if (IS_ERR(dentry))
+       if (IS_ERR(dentry)) {
+               error = PTR_ERR(dentry);
                goto fail_lock;
+       }
 
        if (d_really_is_positive(dentry)) {
                error = -EEXIST;