]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
nfs3_list_one_acl(): check get_acl() result with IS_ERR_OR_NULL
authorAndrey Utkin <andrey.krieger.utkin@gmail.com>
Sat, 26 Jul 2014 11:58:01 +0000 (14:58 +0300)
committerTrond Myklebust <trond.myklebust@primarydata.com>
Sun, 3 Aug 2014 21:05:22 +0000 (17:05 -0400)
There was a check for result being not NULL. But get_acl() may return
NULL, or ERR_PTR, or actual pointer.
The purpose of the function where current change is done is to "list
ACLs only when they are available", so any error condition of get_acl()
mustn't be elevated, and returning 0 there is still valid.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=81111
Signed-off-by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Fixes: 74adf83f5d77 (nfs: only show Posix ACLs in listxattr if actually...)
Cc: stable@vger.kernel.org # 3.14+
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
fs/nfs/nfs3acl.c

index 8f854dde4150e1f3dc2ace238d2ddda44e580d63..d0fec260132add4ce0d8917cd1bb47c15408be90 100644 (file)
@@ -256,7 +256,7 @@ nfs3_list_one_acl(struct inode *inode, int type, const char *name, void *data,
        char *p = data + *result;
 
        acl = get_acl(inode, type);
-       if (!acl)
+       if (IS_ERR_OR_NULL(acl))
                return 0;
 
        posix_acl_release(acl);