summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2014-05-04 13:03:32 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2014-05-06 13:58:42 -0400
commit50c6e282bdf5e8dabf8d7cf7b162545a55645fd9 (patch)
treefcfe808968508a7c1aa6e93ded9bc6d3944b6c68 /fs
parent60942f2f235ce7b817166cdf355eed729094834d (diff)
downloadop-kernel-dev-50c6e282bdf5e8dabf8d7cf7b162545a55645fd9.zip
op-kernel-dev-50c6e282bdf5e8dabf8d7cf7b162545a55645fd9.tar.gz
posix_acl: handle NULL ACL in posix_acl_equiv_mode
Various filesystems don't bother checking for a NULL ACL in posix_acl_equiv_mode, and thus can dereference a NULL pointer when it gets passed one. This usually happens from the NFS server, as the ACL tools never pass a NULL ACL, but instead of one representing the mode bits. Instead of adding boilerplat to all filesystems put this check into one place, which will allow us to remove the check from other filesystems as well later on. Signed-off-by: Christoph Hellwig <hch@lst.de> Reported-by: Ben Greear <greearb@candelatech.com> Reported-by: Marco Munderloh <munderl@tnt.uni-hannover.de>, Cc: Chuck Lever <chuck.lever@oracle.com> Cc: stable@vger.kernel.org Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/posix_acl.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/posix_acl.c b/fs/posix_acl.c
index 9e363e4..0855f77 100644
--- a/fs/posix_acl.c
+++ b/fs/posix_acl.c
@@ -246,6 +246,12 @@ posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p)
umode_t mode = 0;
int not_equiv = 0;
+ /*
+ * A null ACL can always be presented as mode bits.
+ */
+ if (!acl)
+ return 0;
+
FOREACH_ACL_ENTRY(pa, acl, pe) {
switch (pa->e_tag) {
case ACL_USER_OBJ:
OpenPOWER on IntegriCloud