Skip to contentSkip to conversation

Fix: run_as gid/uid test should return result to parent

PATCH David Goulet 1 participant 1 message Aug 27, 2013 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 20130827202455.GA12616@Krystal

#1 lore raw

Merged!

David

Mathieu Desnoyers:

Quoted 40 lines

Failure to do so could cause the parent to hang on read() waiting for the return value from the child.

Targets: 2.3-rc and stable-2.2 branches.

---

src/common/runas.c +6 -2
index bd51cd4..6979ad3 100644
@@ -130,14 +130,16 @@ int child_run_as(void *_data)
 		ret = setegid(data->gid);
 		if (ret < 0) {
 			PERROR("setegid");
-			return EXIT_FAILURE;
+			sendret.i = -1;
+			goto write_return;
 		}
 	}
 	if (data->uid != geteuid()) {
 		ret = seteuid(data->uid);
 		if (ret < 0) {
 			PERROR("seteuid");
-			return EXIT_FAILURE;
+			sendret.i = -1;
+			goto write_return;
 		}
 	}
 	/*
@@ -145,6 +147,8 @@ int child_run_as(void *_data)
 	 */
 	umask(0);
 	sendret.i = (*data->cmd)(data->data);
+
+write_return:
 	/* send back return value */
 	writeleft = sizeof(sendret);
 	index = 0;