svn commit: r314710 - stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Martin Matuska]

Author: mm
Date: Sun Mar  5 21:41:48 2017
New Revision: 314710
URL: https://svnweb.freebsd.org/changeset/base/314710

Log:
  MFC r314572:
  
  Fix null pointer dereference in zfs_freebsd_setacl().
  
  Prevents unprivileged users from panicking the kernel by calling
  __acl_delete_*() on files or directories inside a ZFS mount.

Modified:
  stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Sun Mar  5 21:16:50 2017	(r314709)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Sun Mar  5 21:41:48 2017	(r314710)
@@ -5866,6 +5866,9 @@ zfs_freebsd_setacl(ap)
 	if (ap->a_type != ACL_TYPE_NFS4)
 		return (EINVAL);
 
+	if (ap->a_aclp == NULL)
+		return (EINVAL);
+
 	if (ap->a_aclp->acl_cnt < 1 || ap->a_aclp->acl_cnt > MAX_ACL_ENTRIES)
 		return (EINVAL);