a

.github/workflows/build.yml

@@ -66,7 +66,7 @@ jobs:
 
           cd ../make-shamiko-happy
           make
-          mv syscallhook.kpm demo-make-shamiko-happy.kpm
+          mv make-shamiko-happy.kpm demo-make-shamiko-happy.kpm
 
       - name: Upload elf
         uses: actions/upload-artifact@v3

.github/workflows/build_dev.yml

@@ -74,6 +74,7 @@ jobs:
 
           cd ../make-shamiko-happy
           make
+          mv make-shamiko-happy.kpm demo-make-shamiko-happy.kpm
 
       - name: Upload elf
         uses: actions/upload-artifact@v3
@@ -95,7 +96,7 @@ jobs:
             kpms/demo-hello/demo-hello.kpm
             kpms/demo-inlinehook/demo-inlinehook.kpm
             kpms/demo-syscallhook/demo-syscallhook.kpm
-            kpms/make-shamiko-happy/shamiko.kpm
+            kpms/make-shamiko-happy/demo-make-shamiko-happy.kpm
           generateReleaseNotes: true
           allowUpdates: true
           replacesArtifacts: true

kernel/patch/android/sucompat.c

@@ -35,21 +35,15 @@
 #include <predata.h>
 #include <kconfig.h>
 #include <linux/vmalloc.h>
+#include <sucompat.h>
+#include <symbol.h>
 #include <uapi/linux/limits.h>
 
 static const char sh_path[] = ANDROID_SH_PATH;
 static const char default_su_path[] = ANDROID_SU_PATH;
 static const char *current_su_path = 0;
 static const char apd_path[] = APD_PATH;
 
-struct allow_uid
-{
-    uid_t uid;
-    struct su_profile profile;
-    struct list_head list;
-    struct rcu_head rcu;
-};
-
 static struct list_head allow_uid_list;
 static spinlock_t list_lock;
 
@@ -59,7 +53,7 @@ static void allow_reclaim_callback(struct rcu_head *rcu)
     kvfree(allow);
 }
 
-static struct su_profile search_allow_uid(uid_t uid)
+struct su_profile profile_su_allow_uid(uid_t uid)
 {
     rcu_read_lock();
     struct allow_uid *pos;
@@ -75,8 +69,9 @@ static struct su_profile search_allow_uid(uid_t uid)
     rcu_read_unlock();
     return profile;
 }
+KP_EXPORT_SYMBOL(profile_su_allow_uid);
 
-static int is_allow_uid(uid_t uid)
+int is_su_allow_uid(uid_t uid)
 {
     rcu_read_lock();
     struct allow_uid *pos;
@@ -90,6 +85,7 @@ static int is_allow_uid(uid_t uid)
     rcu_read_unlock();
     return 0;
 }
+KP_EXPORT_SYMBOL(is_su_allow_uid);
 
 int su_add_allow_uid(uid_t uid, struct su_profile *profile, int async)
 {
@@ -267,8 +263,8 @@ static void handle_before_execve(hook_local_t *hook_local, char **__user u_filen
 
     if (!strcmp(current_su_path, filename)) {
         uid_t uid = current_uid();
-        if (!is_allow_uid(uid)) return;
-        struct su_profile profile = search_allow_uid(uid);
+        if (!is_su_allow_uid(uid)) return;
+        struct su_profile profile = profile_su_allow_uid(uid);
 
         uid_t to_uid = profile.to_uid;
         const char *sctx = profile.scontext;
@@ -446,7 +442,7 @@ static void su_handler_arg1_ufilename_before(hook_fargs6_t *args, void *udata)
     args->local.data0 = 0;
 
     uid_t uid = current_uid();
-    if (!is_allow_uid(uid)) return;
+    if (!is_su_allow_uid(uid)) return;
 
     char __user *ufilename = (char __user *)syscall_argn(args, 1);
     char filename[SU_PATH_MAX_LEN];

kernel/patch/common/sha256.c

@@ -0,0 +1,156 @@
+/*********************************************************************
+* Filename:   sha256.c
+* Author:     Brad Conte (brad AT bradconte.com)
+* Copyright:
+* Disclaimer: This code is presented "as is" without any guarantees.
+* Details:    Implementation of the SHA-256 hashing algorithm.
+              SHA-256 is one of the three algorithms in the SHA2
+              specification. The others, SHA-384 and SHA-512, are not
+              offered in this implementation.
+              Algorithm specification can be found here:
+               * http://csrc.nist.gov/publications/fips/fips180-2/fips180-2withchangenotice.pdf
+              This implementation uses little endian byte order.
+*********************************************************************/
+
+/*************************** HEADER FILES ***************************/
+#include "sha256.h"
+
+/****************************** MACROS ******************************/
+#define ROTLEFT(a, b) (((a) << (b)) | ((a) >> (32 - (b))))
+#define ROTRIGHT(a, b) (((a) >> (b)) | ((a) << (32 - (b))))
+
+#define CH(x, y, z) (((x) & (y)) ^ (~(x) & (z)))
+#define MAJ(x, y, z) (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
+#define EP0(x) (ROTRIGHT(x, 2) ^ ROTRIGHT(x, 13) ^ ROTRIGHT(x, 22))
+#define EP1(x) (ROTRIGHT(x, 6) ^ ROTRIGHT(x, 11) ^ ROTRIGHT(x, 25))
+#define SIG0(x) (ROTRIGHT(x, 7) ^ ROTRIGHT(x, 18) ^ ((x) >> 3))
+#define SIG1(x) (ROTRIGHT(x, 17) ^ ROTRIGHT(x, 19) ^ ((x) >> 10))
+
+/**************************** VARIABLES *****************************/
+static const WORD k[64] = { 0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4,
+                            0xab1c5ed5, 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe,
+                            0x9bdc06a7, 0xc19bf174, 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f,
+                            0x4a7484aa, 0x5cb0a9dc, 0x76f988da, 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7,
+                            0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967, 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc,
+                            0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, 0xa2bfe8a1, 0xa81a664b,
+                            0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070, 0x19a4c116,
+                            0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
+                            0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7,
+                            0xc67178f2 };
+
+/*********************** FUNCTION DEFINITIONS ***********************/
+void sha256_transform(SHA256_CTX *ctx, const BYTE data[])
+{
+    WORD a, b, c, d, e, f, g, h, i, j, t1, t2, m[64];
+
+    for (i = 0, j = 0; i < 16; ++i, j += 4)
+        m[i] = (data[j] << 24) | (data[j + 1] << 16) | (data[j + 2] << 8) | (data[j + 3]);
+    for (; i < 64; ++i)
+        m[i] = SIG1(m[i - 2]) + m[i - 7] + SIG0(m[i - 15]) + m[i - 16];
+
+    a = ctx->state[0];
+    b = ctx->state[1];
+    c = ctx->state[2];
+    d = ctx->state[3];
+    e = ctx->state[4];
+    f = ctx->state[5];
+    g = ctx->state[6];
+    h = ctx->state[7];
+
+    for (i = 0; i < 64; ++i) {
+        t1 = h + EP1(e) + CH(e, f, g) + k[i] + m[i];
+        t2 = EP0(a) + MAJ(a, b, c);
+        h = g;
+        g = f;
+        f = e;
+        e = d + t1;
+        d = c;
+        c = b;
+        b = a;
+        a = t1 + t2;
+    }
+
+    ctx->state[0] += a;
+    ctx->state[1] += b;
+    ctx->state[2] += c;
+    ctx->state[3] += d;
+    ctx->state[4] += e;
+    ctx->state[5] += f;
+    ctx->state[6] += g;
+    ctx->state[7] += h;
+}
+
+void sha256_init(SHA256_CTX *ctx)
+{
+    ctx->datalen = 0;
+    ctx->bitlen = 0;
+    ctx->state[0] = 0x6a09e667;
+    ctx->state[1] = 0xbb67ae85;
+    ctx->state[2] = 0x3c6ef372;
+    ctx->state[3] = 0xa54ff53a;
+    ctx->state[4] = 0x510e527f;
+    ctx->state[5] = 0x9b05688c;
+    ctx->state[6] = 0x1f83d9ab;
+    ctx->state[7] = 0x5be0cd19;
+}
+
+void sha256_update(SHA256_CTX *ctx, const BYTE data[], size_t len)
+{
+    WORD i;
+
+    for (i = 0; i < len; ++i) {
+        ctx->data[ctx->datalen] = data[i];
+        ctx->datalen++;
+        if (ctx->datalen == 64) {
+            sha256_transform(ctx, ctx->data);
+            ctx->bitlen += 512;
+            ctx->datalen = 0;
+        }
+    }
+}
+
+void sha256_final(SHA256_CTX *ctx, BYTE hash[])
+{
+    WORD i;
+
+    i = ctx->datalen;
+
+    // Pad whatever data is left in the buffer.
+    if (ctx->datalen < 56) {
+        ctx->data[i++] = 0x80;
+        while (i < 56)
+            ctx->data[i++] = 0x00;
+    } else {
+        ctx->data[i++] = 0x80;
+        while (i < 64)
+            ctx->data[i++] = 0x00;
+        sha256_transform(ctx, ctx->data);
+        for (int i = 0; i < 56; i++)
+            ctx->data[i] = 0;
+    }
+
+    // Append to the padding the total message's length in bits and transform.
+    ctx->bitlen += ctx->datalen * 8;
+    ctx->data[63] = ctx->bitlen;
+    ctx->data[62] = ctx->bitlen >> 8;
+    ctx->data[61] = ctx->bitlen >> 16;
+    ctx->data[60] = ctx->bitlen >> 24;
+    ctx->data[59] = ctx->bitlen >> 32;
+    ctx->data[58] = ctx->bitlen >> 40;
+    ctx->data[57] = ctx->bitlen >> 48;
+    ctx->data[56] = ctx->bitlen >> 56;
+    sha256_transform(ctx, ctx->data);
+
+    // Since this implementation uses little endian byte ordering and SHA uses big endian,
+    // reverse all the bytes when copying the final state to the output hash.
+    for (i = 0; i < 4; ++i) {
+        hash[i] = (ctx->state[0] >> (24 - i * 8)) & 0x000000ff;
+        hash[i + 4] = (ctx->state[1] >> (24 - i * 8)) & 0x000000ff;
+        hash[i + 8] = (ctx->state[2] >> (24 - i * 8)) & 0x000000ff;
+        hash[i + 12] = (ctx->state[3] >> (24 - i * 8)) & 0x000000ff;
+        hash[i + 16] = (ctx->state[4] >> (24 - i * 8)) & 0x000000ff;
+        hash[i + 20] = (ctx->state[5] >> (24 - i * 8)) & 0x000000ff;
+        hash[i + 24] = (ctx->state[6] >> (24 - i * 8)) & 0x000000ff;
+        hash[i + 28] = (ctx->state[7] >> (24 - i * 8)) & 0x000000ff;
+    }
+}

kernel/patch/include/sha256.h

@@ -0,0 +1,35 @@
+/*********************************************************************
+* Filename:   sha256.h
+* Author:     Brad Conte (brad AT bradconte.com)
+* Copyright:
+* Disclaimer: This code is presented "as is" without any guarantees.
+* Details:    Defines the API for the corresponding SHA1 implementation.
+*********************************************************************/
+
+#ifndef SHA256_H
+#define SHA256_H
+
+/*************************** HEADER FILES ***************************/
+#include <ktypes.h>
+
+/****************************** MACROS ******************************/
+#define SHA256_BLOCK_SIZE 32 // SHA256 outputs a 32 byte digest
+
+/**************************** DATA TYPES ****************************/
+typedef unsigned char BYTE; // 8-bit byte
+typedef unsigned int WORD; // 32-bit word, change to "long" for 16-bit machines
+
+typedef struct
+{
+    BYTE data[64];
+    WORD datalen;
+    unsigned long long bitlen;
+    WORD state[8];
+} SHA256_CTX;
+
+/*********************** FUNCTION DECLARATIONS **********************/
+void sha256_init(SHA256_CTX *ctx);
+void sha256_update(SHA256_CTX *ctx, const BYTE data[], size_t len);
+void sha256_final(SHA256_CTX *ctx, BYTE hash[]);
+
+#endif // SHA256_H

kernel/patch/include/sucompat.h

@@ -0,0 +1,23 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/* 
+ * Copyright (C) 2024 bmax121. All Rights Reserved.
+ */
+
+#ifndef _KP_SUCOMPAT_H_
+#define _KP_SUCOMPAT_H_
+
+#include <ktypes.h>
+#include <uapi/scdefs.h>
+
+struct allow_uid
+{
+    uid_t uid;
+    struct su_profile profile;
+    struct list_head list;
+    struct rcu_head rcu;
+};
+
+struct su_profile profile_su_allow_uid(uid_t uid);
+int is_su_allow_uid(uid_t uid);
+
+#endif

kpms/make-shamiko-happy/main.c

@@ -15,6 +15,7 @@
 #include <linux/sched.h>
 #include <linux/cred.h>
 #include <linux/string.h>
+#include <sucompat.h>
 
 KPM_NAME("make-shamiko-happy");
 KPM_VERSION("1.0.0");
@@ -49,12 +50,13 @@ void prctl_before(hook_fargs6_t *args, void *udata)
         int rc = compat_copy_to_user((void *)arg2, &version, 4);
         printk("fake ksu version: %d, %d", version, rc);
     } else if (cmd == 12 || cmd == 13) {
-        bool res;
+        // TODO: default behavior,
+        uid_t uid = arg2;
+        bool res = is_su_allow_uid(uid);
         if (cmd == 13) {
-            res = true;
+            res = !res;
             printk("fake ksu unmount: uid: %d\n", arg2);
         } else {
-            res = false;
             printk("fake ksu allow: uid: %d\n", arg2);
         }
         compat_copy_to_user((void *)arg3, &res, sizeof(res));

tools/kptools.c

@@ -51,6 +51,7 @@ void print_usage(char **argv)
         "  -i, --image PATH                 Kernel image path.\n"
         "  -k, --kpimg PATH                 KernelPatch image path.\n"
         "  -s, --skey PATH                  Set superkey.\n"
+        // "  -S, --skey PATH                  Set superkey .\n"
         "  -o, --out PATH                   Patched image path.\n"
         "  -a  --addition KEY=VALUE         Add additional information.\n"