commit 27116babeb4b68f6da9628f32b17251141c24cdb
author maxwen <max.weninger@gmail.com> Fri Aug 14 21:41:28 2015 +0200
committer Ethan Yonker <dees_troy@teamw.in> Thu Oct 15 14:54:06 2015 -0500
tree 6880bf3c93c160c176ba7b1706436f2ed90f06b4
parent cd3f398fa3715f3fd0850b2b26d660595dc7e7cd

busybox: squashed commit of merging cm-12.1

With fixes to LOCAL_C_INCLUDES for libsepol in M and fixed
some missing includes to enable building for 64 bit devices

Conflicts:
	Android.mk
	android/libc/arch-x86/syscalls/swapoff.S
	android/libc/arch-x86/syscalls/swapon.S
	android/libc/arch-x86/syscalls/sysinfo.S
	android/librpc/pmap_rmt.c
	android/reboot.c
	include-full/copy-current.sh
	include-minimal/copy-current.sh
	include/platform.h
	networking/interface.c
	networking/nslookup.c

Change-Id: If6092fa87f3d21190db1af4f70daa150eb462660

libbb/run_shell.c

diff --git a/libbb/run_shell.c b/libbb/run_shell.c
index 4d92c3c..9494f27 100644
--- a/libbb/run_shell.c
+++ b/libbb/run_shell.c
@@ -34,16 +34,18 @@
 #endif
 
 #if ENABLE_SELINUX
-static security_context_t current_sid;
+static security_context_t current_sid = NULL;
 
 void FAST_FUNC renew_current_security_context(void)
 {
-	freecon(current_sid);  /* Release old context  */
+	if (current_sid)
+		freecon(current_sid);  /* Release old context  */
 	getcon(&current_sid);  /* update */
 }
 void FAST_FUNC set_current_security_context(security_context_t sid)
 {
-	freecon(current_sid);  /* Release old context  */
+	if (current_sid)
+		freecon(current_sid);  /* Release old context  */
 	current_sid = sid;
 }
 
@@ -82,6 +84,7 @@
 	args[argno] = NULL;
 
 #if ENABLE_SELINUX
+	renew_current_security_context();
 	if (current_sid)
 		setexeccon(current_sid);
 	if (ENABLE_FEATURE_CLEAN_UP)