Skip to content

Commit

Permalink
nfs3_list_one_acl(): check get_acl() result with IS_ERR_OR_NULL
Browse files Browse the repository at this point in the history
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: 74adf83 (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>
  • Loading branch information
Andrey Utkin authored and Trond Myklebust committed Aug 3, 2014
1 parent 9806755 commit 7a9e75a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/nfs/nfs3acl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 7a9e75a

Please sign in to comment.