X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafm-run.c;h=4de0fd261b07ab3b9a96b61ad3d0471572dc4f8a;hb=d7890b93b8a0a9d0cd96b07f4b4e1326a52bc012;hp=c5d15523c3d125922c68adc4feb7332e2aca1c83;hpb=448982b69026464c16ca0545aa91173a935e49f7;p=src%2Fapp-framework-main.git

diff --git a/src/afm-run.c b/src/afm-run.c
index c5d1552..4de0fd2 100644
--- a/src/afm-run.c
+++ b/src/afm-run.c
@@ -1,5 +1,5 @@
 /*
- Copyright 2015 IoT.bzh
+ Copyright 2015, 2016 IoT.bzh
 
  author: José Bollo <jose.bollo@iot.bzh>
 
@@ -16,6 +16,8 @@
  limitations under the License.
 */
 
+#define _GNU_SOURCE
+
 #include <fcntl.h>
 #include <unistd.h>
 #include <signal.h>
@@ -27,6 +29,13 @@
 #include <limits.h>
 #include <string.h>
 
+#include <linux/xattr.h>
+#if SIMULATE_LIBSMACK
+#include "simulation/smack.h"
+#else
+#include <sys/smack.h>
+#endif
+
 #include <json-c/json.h>
 
 #include "verbose.h"
@@ -95,6 +104,7 @@ static int runnerid = 0;
  * home directory of the user.
  */
 static const char fwk_user_app_dir[] = FWK_USER_APP_DIR;
+static const char fwk_user_app_label[] = FWK_USER_APP_DIR_LABEL;
 
 /*
  * Path of the root directory for applications of the
@@ -411,7 +421,7 @@ static int fill_launch_desc(struct json_object *appli,
 static json_object *mkstate(struct apprun *runner)
 {
 	const char *state;
-	struct json_object *result, *obj;
+	struct json_object *result, *obj, *pids;
 	int rc;
 
 	/* the structure */
@@ -423,6 +433,23 @@ static json_object *mkstate(struct apprun *runner)
 	if (!j_add_integer(result, "runid", runner->runid))
 		goto error2;
 
+	/* the pids */
+	switch(runner->state) {
+	case as_starting:
+	case as_running:
+	case as_stopped:
+		pids = j_add_new_array(result, "pids");
+		if (!pids)
+			goto error2;
+		if (!j_add_integer(pids, NULL, runner->pids[0]))
+			goto error2;
+		if (runner->pids[1] && !j_add_integer(pids, NULL, runner->pids[1]))
+			goto error2;
+		break;
+	default:
+		break;
+	}
+
 	/* the state */
 	switch(runner->state) {
 	case as_starting:
@@ -613,7 +640,6 @@ struct json_object *afm_run_state(int runid)
 int afm_run_init()
 {
 	char buf[2048];
-	char dir[PATH_MAX];
 	int rc;
 	uid_t me;
 	struct passwd passwd, *pw;
@@ -632,25 +658,34 @@ int afm_run_init()
 		ERROR("getpwuid_r failed for uid=%d: %m",(int)me);
 		return -1;
 	}
-	rc = snprintf(dir, sizeof dir, "%s/%s", passwd.pw_dir,
-							fwk_user_app_dir);
-	if (rc >= (int)sizeof dir) {
-		ERROR("buffer overflow in user_app_dir for uid=%d",(int)me);
+	rc = asprintf(&homeappdir, "%s/%s", passwd.pw_dir, fwk_user_app_dir);
+	if (rc < 0) {
+		errno = ENOMEM;
+		ERROR("allocating homeappdir for uid=%d failed", (int)me);
 		return -1;
 	}
-	rc = create_directory(dir, 0755, 1);
+	rc = create_directory(homeappdir, 0755, 1);
 	if (rc && errno != EEXIST) {
-		ERROR("creation of directory %s failed in user_app_dir: %m",
-									dir);
+		ERROR("creation of directory %s failed: %m", homeappdir);
+		free(homeappdir);
 		return -1;
 	}
-	homeappdir = strdup(dir);
-	if (homeappdir == NULL) {
-		errno = ENOMEM;
-		ERROR("out of memory in user_app_dir for %s : %m", dir);
+	rc = smack_remove_label_for_path(homeappdir,
+						XATTR_NAME_SMACKTRANSMUTE, 0);
+	if (rc < 0 && errno != ENODATA) {
+		ERROR("can't remove smack transmutation of directory %s: %m",
+								homeappdir);
+		free(homeappdir);
+		return -1;
+	}
+	rc = smack_set_label_for_path(homeappdir, XATTR_NAME_SMACK, 0,
+							fwk_user_app_label);
+	if (rc < 0) {
+		ERROR("can't set smack label %s to directory %s: %m",
+					fwk_user_app_label, homeappdir);
+		free(homeappdir);
 		return -1;
 	}
-
 	/* install signal handlers */
 	siga.sa_flags = SA_SIGINFO | SA_NOCLDWAIT;
 	sigemptyset(&siga.sa_mask);