Merge pull request #95 from pylerSM/patch-17

devadvance · web-flow · commit 4c8a86574761 · 2016-07-30T22:26:00.000-04:00
Disable regex filtering on X86 (causes seg fault)
diff --git a/app/src/main/jni/rootcloak.c b/app/src/main/jni/rootcloak.c
@@ -105,11 +105,11 @@ int open(const char *path, int oflag, ... ) {
         original_open = dlsym(RTLD_NEXT, "open");
     }
     int fd = original_open(path, oflag);
+    #if !(defined(__i386__) || defined(__x86_64__))
     if (fd != -1) {
         int status;
         regex_t re;
         
-        #if 0
         if (regcomp(&re, "^/proc/[0-9]+/(stat|cmdline)$", REG_EXTENDED | REG_NOSUB) == 0) {
             status = regexec(&re, path, 0, NULL, 0);
             regfree(&re);
@@ -148,8 +148,8 @@ int open(const char *path, int oflag, ... ) {
                 }
             }
         }
-        #endif
     }
+    #endif
     return fd;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -105,11 +105,11 @@ int open(const char *path, int oflag, ... ) {`
`105`	`105`	`original_open = dlsym(RTLD_NEXT, "open");`
`106`	`106`	`}`
`107`	`107`	`int fd = original_open(path, oflag);`
	`108`	`+ #if !(defined(__i386__) \|\| defined(__x86_64__))`
`108`	`109`	`if (fd != -1) {`
`109`	`110`	`int status;`
`110`	`111`	`regex_t re;`
`111`	`112`
`112`		`- #if 0`
`113`	`113`	`if (regcomp(&re, "^/proc/[0-9]+/(stat\|cmdline)$", REG_EXTENDED \| REG_NOSUB) == 0) {`
`114`	`114`	`status = regexec(&re, path, 0, NULL, 0);`
`115`	`115`	`regfree(&re);`
`@@ -148,8 +148,8 @@ int open(const char *path, int oflag, ... ) {`
`148`	`148`	`}`
`149`	`149`	`}`
`150`	`150`	`}`
`151`		`- #endif`
`152`	`151`	`}`
	`152`	`+ #endif`
`153`	`153`	`return fd;`
`154`	`154`	`}`
`155`	`155`