From owner-svn-src-head@freebsd.org  Thu Sep  3 11:31:34 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DFED69C957D;
 Thu,  3 Sep 2015 11:31:34 +0000 (UTC)
 (envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D07291A07;
 Thu,  3 Sep 2015 11:31:34 +0000 (UTC)
 (envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t83BVYs7009406;
 Thu, 3 Sep 2015 11:31:34 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t83BVYEg009405;
 Thu, 3 Sep 2015 11:31:34 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201509031131.t83BVYEg009405@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: trasz set sender to
 trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Thu, 3 Sep 2015 11:31:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r287427 - head/lib/libc/posix1e
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Sep 2015 11:31:35 -0000

Author: trasz
Date: Thu Sep  3 11:31:34 2015
New Revision: 287427
URL: https://svnweb.freebsd.org/changeset/base/287427

Log:
  Fix acl_strip_np(3) breakage introduced in r279962.
  
  MFC after:	1 month
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/lib/libc/posix1e/acl_strip.c

Modified: head/lib/libc/posix1e/acl_strip.c
==============================================================================
--- head/lib/libc/posix1e/acl_strip.c	Thu Sep  3 11:30:39 2015	(r287426)
+++ head/lib/libc/posix1e/acl_strip.c	Thu Sep  3 11:31:34 2015	(r287427)
@@ -107,13 +107,13 @@ _posix1e_acl_strip_np(const acl_t aclp, 
 			if (acl_get_permset(entry, &perm) == -1)
 				goto fail;
 			if (acl_create_entry(&acl_new, &entry_new) == -1)
-				return (NULL);
+				goto fail;
 			if (acl_set_tag_type(entry_new, tag) == -1)
-				return (NULL);
+				goto fail;
 			if (acl_set_permset(entry_new, perm) == -1)
-				return (NULL);
+				goto fail;
 			if (acl_copy_entry(entry_new, entry) == -1)
-				return (NULL);
+				goto fail;
 			assert(_entry_brand(entry_new) == ACL_BRAND_POSIX);
 			break;
 		case ACL_MASK:
@@ -122,20 +122,22 @@ _posix1e_acl_strip_np(const acl_t aclp, 
 		default:
 			break;
 		}
-fail:
-	acl_free(acl_new);
-	acl_free(acl_old);
-	return (NULL);
 	}
 
 	assert(_acl_brand(acl_new) == ACL_BRAND_POSIX);
 
 	if (have_mask_entry && recalculate_mask) {
 		if (acl_calc_mask(&acl_new) == -1)
-			return (NULL);
+			goto fail;
 	}
 
 	return (acl_new);
+
+fail:
+	acl_free(acl_new);
+	acl_free(acl_old);
+
+	return (NULL);
 }
 
 acl_t