TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-02-21 11:28:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

LD_LIBRARY_PATH patch for apex should not propagate

Browse Source 
Fix #1832
This commit is contained in:
topjohnwu 2019-09-13 15:22:49 -04:00
parent 6e46d394b1
commit ef1b928532
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
native/jni/su/su_daemon.cpp
View File

@ -321,13 +321,12 @@ void su_daemon_handler(int client, struct ucred *credential) {
// Setup environment // Setup environment
umask(022); umask(022);
char path[32], buf[4096]; char path[32];
snprintf(path, sizeof(path), "/proc/%d/cwd", ctx.pid); snprintf(path, sizeof(path), "/proc/%d/cwd", ctx.pid);
xreadlink(path, buf, sizeof(buf)); chdir(path);
chdir(buf);
snprintf(path, sizeof(path), "/proc/%d/environ", ctx.pid); snprintf(path, sizeof(path), "/proc/%d/environ", ctx.pid);
memset(buf, 0, sizeof(buf)); char buf[4096] = { 0 };
int fd = open(path, O_RDONLY); int fd = xopen(path, O_RDONLY);
read(fd, buf, sizeof(buf)); read(fd, buf, sizeof(buf));
close(fd); close(fd);
clearenv(); clearenv();
@ -340,13 +339,14 @@ void su_daemon_handler(int client, struct ucred *credential) {
pw = getpwuid(ctx.req.uid); pw = getpwuid(ctx.req.uid);
if (pw) { if (pw) {
setenv("HOME", pw->pw_dir, 1); setenv("HOME", pw->pw_dir, 1);
if (ctx.req.login || ctx.req.uid) { setenv("USER", pw->pw_name, 1);
setenv("USER", pw->pw_name, 1); setenv("LOGNAME", pw->pw_name, 1);
setenv("LOGNAME", pw->pw_name, 1);
}
setenv("SHELL", ctx.req.shell, 1); setenv("SHELL", ctx.req.shell, 1);
} }
} }
const char *ld_path = getenv("LD_LIBRARY_PATH");
if (ld_path && strncmp(ld_path, ":/apex/com.android.runtime/lib", 30) == 0)
unsetenv("LD_LIBRARY_PATH");
// Unblock all signals // Unblock all signals
sigset_t block_set; sigset_t block_set;