diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-05-19 12:49:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-05-19 12:49:28 +0000 |
| commit | a33087b36f99196d4d561b7a25d32caa0afca6e2 (patch) | |
| tree | 9c7beb6d035ed599e94604752bf84298dd640b37 | |
| parent | c88566d7be6abc37ede127d66264d7d2b8865c45 (diff) | |
| parent | 0f6a950aa4e5b900c53e679e748a7a2d32e0fdd9 (diff) | |
| download | ppp-a33087b36f99196d4d561b7a25d32caa0afca6e2.tar.gz | |
Merge "pppd: add error string for setuid" am: f1682f0e43 am: 41bdf52d58 am: 966c731295 am: 0f6a950aa4main-16k-with-phones
Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/2098554
Change-Id: Ia8be5be364e5ab09cd711913078578d2927ae732
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | pppd/main.c | 7 |
1 files changed, 3 insertions, 4 deletions
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 @@ device_script(program, in, out, dont_wait) /* 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__) |