Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8659c6b authored by T.J. Mercier's avatar T.J. Mercier Committed by Automerger Merge Worker
Browse files

Merge "Throw exception for negative UIDs/GIDs" into main am: 23388759 am:... 

Merge "Throw exception for negative UIDs/GIDs" into main am: 23388759 am: 2642c838 am: c71df450

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2868961



Change-Id: Icca5fbf95e5136ab77d7118e1d873429a31b4f04
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5d65571a c71df450

core/jni/android_util_Process.cpp

+37 −3
Original line number Diff line number Diff line
@@ -282,6 +282,11 @@ void android_os_Process_setProcessGroup(JNIEnv* env, jobject clazz, int pid, jin 
void android_os_Process_setProcessFrozen(

        JNIEnv *env, jobject clazz, jint pid, jint uid, jboolean freeze)

{

    if (uid < 0) {

        jniThrowExceptionFmt(env, "java/lang/IllegalArgumentException", "uid is negative: %d", uid);

        return;

    }



    bool success = true;



    if (freeze) {
@@ -305,6 +310,11 @@ jint android_os_Process_getProcessGroup(JNIEnv* env, jobject clazz, jint pid) 
}



jint android_os_Process_createProcessGroup(JNIEnv* env, jobject clazz, jint uid, jint pid) {

    if (uid < 0) {

        return jniThrowExceptionFmt(env, "java/lang/IllegalArgumentException",

                                    "uid is negative: %d", uid);

    }



    return createProcessGroup(uid, pid);

}
@@ -590,12 +600,21 @@ void android_os_Process_setArgV0(JNIEnv* env, jobject clazz, jstring name) 


jint android_os_Process_setUid(JNIEnv* env, jobject clazz, jint uid)

{

    if (uid < 0) {

        return jniThrowExceptionFmt(env, "java/lang/IllegalArgumentException",

                                    "uid is negative: %d", uid);

    }



    return setuid(uid) == 0 ? 0 : errno;

}



jint android_os_Process_setGid(JNIEnv* env, jobject clazz, jint uid)

{

    return setgid(uid) == 0 ? 0 : errno;

jint android_os_Process_setGid(JNIEnv* env, jobject clazz, jint gid) {

    if (gid < 0) {

        return jniThrowExceptionFmt(env, "java/lang/IllegalArgumentException",

                                    "gid is negative: %d", gid);

    }



    return setgid(gid) == 0 ? 0 : errno;

}



static int pid_compare(const void* v1, const void* v2)
@@ -1235,11 +1254,21 @@ jintArray android_os_Process_getPidsForCommands(JNIEnv* env, jobject clazz, 


jint android_os_Process_killProcessGroup(JNIEnv* env, jobject clazz, jint uid, jint pid)

{

    if (uid < 0) {

        return jniThrowExceptionFmt(env, "java/lang/IllegalArgumentException",

                                    "uid is negative: %d", uid);

    }



    return killProcessGroup(uid, pid, SIGKILL);

}



jint android_os_Process_sendSignalToProcessGroup(JNIEnv* env, jobject clazz, jint uid, jint pid,

                                                 jint signal) {

    if (uid < 0) {

        return jniThrowExceptionFmt(env, "java/lang/IllegalArgumentException",

                                    "uid is negative: %d", uid);

    }



    return sendSignalToProcessGroup(uid, pid, signal);

}
@@ -1258,6 +1287,11 @@ static jint android_os_Process_nativePidFdOpen(JNIEnv* env, jobject, jint pid, j 
}



void android_os_Process_freezeCgroupUID(JNIEnv* env, jobject clazz, jint uid, jboolean freeze) {

    if (uid < 0) {

        jniThrowExceptionFmt(env, "java/lang/IllegalArgumentException", "uid is negative: %d", uid);

        return;

    }



    bool success = true;



    if (freeze) {