commit 0f3a5e88ddc12f033edd8f3bbe0457ff2d3146e4
author repo sync <gcondra@google.com> Tue May 14 19:06:25 2013 -0700
committer repo sync <gcondra@google.com> Tue May 14 20:39:03 2013 -0700
tree 232eb03b931767669b8594b1b434b15c6e6d35fa
parent 1d857f3e2e739c001b7cbbd1e37b92a038e46b98

Call lsetfilecon directly in fixcon.

This avoids the spurious double-lookup from calling restorecon.

Bug: 8967715
Change-Id: I3e92804dca245501ca974bda7a0d7d1c459c58da

src/android.c

diff --git a/src/android.c b/src/android.c
index d156ea2..6f05ca8 100644
--- a/src/android.c
+++ b/src/android.c
@@ -691,7 +691,8 @@
 
 static int file_requires_fixup(const char *pathname,
 		struct selabel_handle *sehandle_old,
-		struct selabel_handle *sehandle_new)
+		struct selabel_handle *sehandle_new,
+		char **context)
 {
 	int ret;
 	struct stat sb;
@@ -740,10 +741,10 @@
 out:
 	if (current_context)
 		freecon(current_context);
-	if (new_context)
-		freecon(new_context);
 	if (old_context)
 		freecon(old_context);
+	if (new_context)
+		*context = new_context;
 	return ret;
 }
 
@@ -752,14 +753,19 @@
 		struct selabel_handle *sehandle_new)
 {
 	int requires_fixup;
+	char *new_context = NULL;
 
-	requires_fixup = file_requires_fixup(pathname, sehandle_old, sehandle_new);
+	requires_fixup = file_requires_fixup(pathname, sehandle_old, sehandle_new, &new_context);
+
+	if (requires_fixup > 0)
+		lsetfilecon(pathname, new_context);
+
+	if (new_context)
+		freecon(new_context);
+
 	if (requires_fixup < 0)
 		return -1;
 
-	if (requires_fixup)
-		selinux_android_restorecon(pathname);
-
 	return 0;
 }