commit 966c731295ec0b7722331ea324baed3a06cdbc6f
author Treehugger Robot <treehugger-gerrit@google.com> Thu May 19 11:41:37 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 19 11:41:37 2022 +0000
tree 9c7beb6d035ed599e94604752bf84298dd640b37
parent ac62155851807c9f004bb567d0664e8bccb02fa6
parent 41bdf52d58334073e4a23543d641ed716d9f3eae

Merge "pppd: add error string for setuid" am: f1682f0e43 am: 41bdf52d58

Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/2098554

Change-Id: I5bbe95ac1cda45f40f9f909481219f4f5ddc32b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

pppd/main.c

diff --git a/pppd/main.c b/pppd/main.c
index 09f5a53..df4e36c 100644
--- a/pppd/main.c
+++ b/pppd/main.c
@@ -1735,10 +1735,9 @@
     /* here we are executing in the child */
 
     setgid(getgid());
-    setuid(uid);
-    if (getuid() != uid) {
-	fprintf(stderr, "pppd: setuid failed\n");
-	exit(1);
+    if (setuid(uid) < 0) {
+        fprintf(stderr, "pppd: setuid failed: %s\n", strerror(errno));
+        exit(1);
     }
     update_system_environment();
 #if defined(__ANDROID__)