dev

Author: jpacg

.gitignore

@@ -1,30 +1,9 @@
-# Object files
-*.o
-*.d
-*.ko
-*.obj
-*.elf
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Libraries
-*.lib
-*.a
-*.la
-*.lo
-
-# Shared objects (inc. Windows DLLs)
-*.dll
-*.so
-*.so.*
-*.dylib
-
-# Executables
-*.exe
-*.out
-*.app
-*.i*86
-*.x86_64
-*.hex
+bin
+armeabi
+x86
+obj
+local.properties
+gen
+.DS_Store
+.settings
+libs

Application.mk

@@ -1,2 +1,2 @@
 APP_ABI := armeabi-v7a
-APP_PLATFORM := android-19
+APP_PLATFORM := android-25

README.md

@@ -1,12 +1,30 @@
 su binary
 ===
 
-####说明
+Note
+========
 
- - 源码是通过CyanogenMod su修改，修改CyanogenMod su N多问题
- - 支持4.3及上机型，需要使用 `su --daemon`方式运行
+* Source code is modified by CyanogenMod su, https://github.com/CyanogenMod/android_system_extras_su
 
-####编译说明
- - 安装最新版的android ndk，并把ndk目录增加到环境变量
- - 运行make编译su
+* Supports android 4.3+ devices and need to use `su--daemon`
 
+
+Building
+========
+
+* Download the Android Native Development Kit (NDK): https://developer.android.com/ndk/downloads/index.html
+
+* Extract into some directory and put that in your path: 
+	`export PATH=NDK_DIR:$PATH`
+
+* In another directory clone this repo: 
+	`git clone https://github.com/jpacg/su-binary`
+
+* Change to the directory where the repo was cloned
+	`cd su-binary`
+
+* To start build process use the following
+	`make` or `ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk NDK_APPLICATION_MK=./Application.mk`
+
+* If all goes well you will get the compiled binary at:
+	`./libs/armeabi-v7a/su`

common.c

@@ -13,16 +13,19 @@
 #include "utils.h"
 
 #define BUFFSIZE   4096
-#define DDEXE      "/system/bin/ddexe"
-#define DDEXEREAL  "/system/bin/ddexereal"
-#define DDEXE_REAL "/system/bin/ddexe_real"
+#define MULTIUSER_APP_PER_USER_RANGE 100000
 
-int exists(const char *path) {
-    return !access(path, R_OK);
+typedef uid_t userid_t;
+userid_t multiuser_get_user_id(uid_t uid) {
+    return uid / MULTIUSER_APP_PER_USER_RANGE;
+}
+
+int file_exists(const char *path) {
+    return access(path, R_OK) == 0;
 }
 
 int setxattr(const char *path, const char *value) {
-    if (!exists("/sys/fs/selinux")) {
+    if (!file_exists("/sys/fs/selinux")) {
         return 0;
     }
     return syscall(__NR_setxattr, path, "security.selinux", value, strlen(value), 0);
@@ -114,11 +117,11 @@ int mount_system() {
 
     ret = get_mounts_dev_dir("/system", &dev, &dir);
     if (ret < 0) {
-        system("mount -o remount rw /system");
+        system("mount -o remount,rw /system");
         return mount("ro", "/system", NULL, 32800, NULL);
     }
 
-    system("mount -o remount rw /system");
+    system("mount -o remount,rw /system");
     ret = mount(dev, dir, "none", MS_REMOUNT, NULL);
     free(dev);
     free(dir);
@@ -139,91 +142,8 @@ static int write_file(const char *path, const char *data, uid_t owner, gid_t gro
     return n == len ? 0 : -1;;
 }
 
-int OPPO() {
-    char brand[PROPERTY_VALUE_MAX];
-    char *data = read_file("/system/build.prop");
-    get_property(data, brand, "ro.product.brand", "0");
-    free(data);
-
-    if (strstr(brand, "OPPO")) {
-        return write_file("/system/etc/install_recovery.sh", \
-            "#!/system/bin/sh\n/system/xbin/su --daemon &\n", \
-            0, 0, 0755);
-    }
-
-    return 0;
-}
-
-int install_recovery_sh() {
-    if (getuid() != 0 || getgid() != 0) {
-        PLOGE("install_recovery_sh requires root. uid/gid not root");
-        return -1;
-    }
-    mount_system();
-
-    write_file("/system/etc/install-recovery.sh", \
-        "#!/system/bin/sh\n/system/xbin/su --daemon &\n", \
-        0, 0, 0755);
-
-    return OPPO();
-}
-
-int install() {
-    if (getuid() != 0 || getgid() != 0) {
-        PLOGE("install requires root. uid/gid not root");
-        return -1;
-    }
-    mount_system();
-    install_recovery_sh();
-
-    if (exists(DDEXE)) {
-        if (!exists(DDEXE_REAL) && !exists(DDEXEREAL)) {
-            copy_file(DDEXE, DDEXE_REAL);
-        }
-        else if (exists(DDEXEREAL)){
-            copy_file(DDEXEREAL, DDEXE_REAL);
-            unlink(DDEXEREAL);
-        }
-        else {
-        }
-    }
-    chown(DDEXE_REAL, 0, 2000);
-    chmod(DDEXE_REAL, 0755);
-
-    if (exists(DDEXE_REAL)) {
-        unlink(DDEXE);
-        write_file(DDEXE, \
-            "#!/system/bin/sh\n/system/xbin/su --daemon &\n/system/bin/ddexe_real\n", \
-            0, 2000, 0755);
-    }
-
-    setxattr(DDEXE, "u:object_r:system_file:s0");
-    setxattr(DDEXE_REAL, "u:object_r:system_file:s0");
-    return 0;
-}
-
-int uninstall() {
-    if (getuid() != 0 || getgid() != 0) {
-        PLOGE("uninstall requires root. uid/gid not root");
-        return -1;
-    }
-    mount_system();
-
-    if (exists(DDEXEREAL)) {
-        copy_file(DDEXEREAL, DDEXE);
-        unlink(DDEXEREAL);
-    }
-    else if (exists(DDEXE_REAL)) {
-        copy_file(DDEXE_REAL, DDEXE);
-        unlink(DDEXE_REAL);
-    }
-    else {
-    }
-
-    chown(DDEXE, 0, 2000);
-    chmod(DDEXE, 0755);
-
-    setxattr(DDEXE, "u:object_r:system_file:s0");
+int fix_unused(const char* fmt, ...)
+{
     return 0;
 }
 
@@ -233,8 +153,10 @@ char* format(const char* fmt, ...) {
     char    *buffer;
     va_start( args, fmt );
     len = vsnprintf(NULL, 0, fmt, args ) + 1;
-    buffer = (char*)malloc(len * sizeof(char));
-    vsprintf( buffer, fmt, args );
+    buffer = (char*)malloc(len);
+    vsnprintf( buffer, len, fmt, args );
+    va_end( args );
+
     return buffer;
 }
 
@@ -243,9 +165,10 @@ int tolog(const char* fmt, ...) {
     int     len;
     char    *buffer;
     va_start( args, fmt );
-    len = vsnprintf(NULL, 0, fmt, args ) + 1;
-    buffer = (char*)malloc(len * sizeof(char));
-    vsprintf( buffer, fmt, args );
+    len = vsnprintf( NULL, 0, fmt, args ) + 1;
+    buffer = (char*)malloc( len );
+    vsnprintf( buffer, len, fmt, args );
+    va_end( args );
 
     printf("%s\n", buffer);
     free(buffer);

common.h

@@ -1,31 +1,40 @@
 #ifndef COMMON_H
 #define COMMON_H
 
+#include <sys/types.h>
+
 #define AID_ROOT             0  /* traditional unix root user */
 #define AID_SHELL         2000  /* adb and debug shell user */
 
-int exists(const char *path);
+int file_exists(const char *path);
 int setxattr(const char *path, const char *value);
 int selinux_attr_set_priv();
 int copy_file(const char *src_file, const char *dst_file);
 int get_mounts_dev_dir(const char *arg, char **dev, char **dir);
 
 int mount_system();
-int install();
-int uninstall();
+
+int fix_unused(const char* fmt, ...);
 int tolog(const char* fmt, ...);
 char* format(const char* fmt, ...);
 
+typedef uid_t userid_t;
+userid_t multiuser_get_user_id(uid_t uid);
+
 #include <errno.h>
 #include <string.h>
 #ifndef PLOGE
 #define PLOGE(fmt,args...) ALOGE(fmt " failed with %d: %s", ##args, errno, strerror(errno))
 #define PLOGEV(fmt,err,args...) ALOGE(fmt " failed with %d: %s", ##args, err, strerror(err))
 #endif // !PLOGE
 
-#define ALOGW
-#define ALOGE
-#define ALOGD
-#define ALOGV
+#define ALOGW fix_unused
+#define ALOGE fix_unused
+#define ALOGD fix_unused
+#define ALOGV fix_unused
+
+#ifndef MS_SLAVE
+#define MS_SLAVE		1<<19	/* Slave */
+#endif
 
 #endif