X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-cred.c;h=eda0c9dd8b1d11408638167d860e905a63487fc5;hb=0891ef4826e347d5554c630b5c0ce73c68f76c9c;hp=8a77700912b6be8278334c663c91698cf248011e;hpb=a05138e6bf1257b0e7b1ad90c974fb9e12f1d040;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-cred.c b/src/afb-cred.c
index 8a777009..eda0c9dd 100644
--- a/src/afb-cred.c
+++ b/src/afb-cred.c
@@ -29,14 +29,40 @@
 
 #define MAX_LABEL_LENGTH  1024
 
+#if !defined(NO_DEFAULT_PEERCRED) && !defined(ADD_DEFAULT_PEERCRED)
+#  define NO_DEFAULT_PEERCRED
+#endif
+
+#if !defined(DEFAULT_PEERSEC_LABEL)
+#  define DEFAULT_PEERSEC_LABEL "NoLabel"
+#endif
+#if !defined(DEFAULT_PEERCRED_UID)
+#  define DEFAULT_PEERCRED_UID 99 /* nobody */
+#endif
+#if !defined(DEFAULT_PEERCRED_GID)
+#  define DEFAULT_PEERCRED_GID 99 /* nobody */
+#endif
+#if !defined(DEFAULT_PEERCRED_PID)
+#  define DEFAULT_PEERCRED_PID 0  /* no process */
+#endif
+
 static struct afb_cred *current;
 
 static struct afb_cred *mkcred(uid_t uid, gid_t gid, pid_t pid, const char *label, size_t size)
 {
 	struct afb_cred *cred;
-	char *dest;
-
-	cred = malloc(1 + size + sizeof *cred);
+	char *dest, user[64];
+	size_t i;
+	uid_t u;
+
+	i = 0;
+	u = uid;
+	do {
+		user[i++] = (char)('0' + u % 10);
+		u = u / 10;
+	} while(u && i < sizeof user);
+
+	cred = malloc(2 + i + size + sizeof *cred);
 	if (!cred)
 		errno = ENOMEM;
 	else {
@@ -45,12 +71,16 @@ static struct afb_cred *mkcred(uid_t uid, gid_t gid, pid_t pid, const char *labe
 		cred->gid = gid;
 		cred->pid = pid;
 		dest = (char*)(&cred[1]);
-		memcpy(dest, label, size);
-		dest[size] = 0;
+		cred->user = dest;
+		while(i)
+			*dest++ = user[--i];
+		*dest++ = 0;
 		cred->label = dest;
 		cred->id = dest;
+		memcpy(dest, label, size);
+		dest[size] = 0;
 		dest = strrchr(dest, ':');
-		if (dest && dest[1])
+		if (dest)
 			cred->id = &dest[1];
 	}
 	return cred;
@@ -77,7 +107,7 @@ static struct afb_cred *mkcurrent()
 
 struct afb_cred *afb_cred_create(uid_t uid, gid_t gid, pid_t pid, const char *label)
 {
-	label = label ? : "";
+	label = label ? : DEFAULT_PEERSEC_LABEL;
 	return mkcred(uid, gid, pid, label, strlen(label));
 }
 
@@ -91,19 +121,30 @@ struct afb_cred *afb_cred_create_for_socket(int fd)
 	/* get the credentials */
 	length = (socklen_t)(sizeof ucred);
 	rc = getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &ucred, &length);
-	if (rc < 0 || length != (socklen_t)(sizeof ucred)) {
+	if (rc < 0 || length != (socklen_t)(sizeof ucred) || !~ucred.uid) {
+#if !defined(NO_DEFAULT_PEERCRED)
+		ucred.uid = DEFAULT_PEERCRED_UID;
+		ucred.gid = DEFAULT_PEERCRED_GID;
+		ucred.pid = DEFAULT_PEERCRED_PID;
+#else
 		if (!rc)
 			errno = EINVAL;
 		return NULL;
+#endif
 	}
 
 	/* get the security label */
 	length = (socklen_t)(sizeof label);
 	rc = getsockopt(fd, SOL_SOCKET, SO_PEERSEC, label, &length);
 	if (rc < 0 || length > (socklen_t)(sizeof label)) {
+#if !defined(NO_DEFAULT_PEERSEC)
+		length = (socklen_t)strlen(DEFAULT_PEERSEC_LABEL);
+		strcpy (label, DEFAULT_PEERSEC_LABEL);
+#else
 		if (!rc)
 			errno = EINVAL;
 		return NULL;
+#endif
 	}
 
 	/* makes the result */