refactor: Expose get_pkg_from_apk_path and integrate it into apk_sign.c's package extraction with system app fallback.

Author: sakana164

kernel/apk_sign.c

@@ -6,6 +6,7 @@
 #include <linux/version.h>
 #ifdef CONFIG_KSU_DEBUG
 #include <linux/moduleparam.h>
+#include "throne_tracker.h"
 #endif
 #include <crypto/hash.h>
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0)
@@ -24,26 +25,29 @@ struct sdesc {
 };
 
 #ifdef CONFIG_KSU_DEBUG
+extern int get_pkg_from_apk_path(char *pkg, const char *path);
+
 // Extract package name from APK path for debug logging
-// Examples:
-//   "/data/app/~~xxx==/me.weishu.kernelsu-yyy==/base.apk" -> "me.weishu.kernelsu"
-//   "/data/app/MIUICalculator/base.apk" -> "MIUICalculator"
-//   "/system/app/Calculator/Calculator.apk" -> "Calculator"
+// Reuses get_pkg_from_apk_path() for third-party apps, with fallback for system apps
 static const char *extract_package_name(const char *path)
 {
     static char pkg_name[256];
+    
+    // Try official function first (handles third-party apps)
+    if (get_pkg_from_apk_path(pkg_name, path) == 0)
+        return pkg_name;
+    
+    // Fallback for system apps: extract directory name
     const char *last_slash = NULL;
     const char *second_last_slash = NULL;
 
-    // Find last two '/' in path
     for (const char *p = path; *p; p++) {
         if (*p == '/') {
             second_last_slash = last_slash;
             last_slash = p;
         }
     }
 
-    // Extract directory name between the two slashes
     if (!second_last_slash || !last_slash)
         return path;
 
@@ -54,7 +58,7 @@ static const char *extract_package_name(const char *path)
     memcpy(pkg_name, second_last_slash + 1, len);
     pkg_name[len] = '\0';
 
-    // Remove ".apk" suffix if present (e.g., /system/app/Calc/Calc.apk)
+    // Remove .apk suffix if present
     len = strlen(pkg_name);
     if (len > 4 && !strcmp(pkg_name + len - 4, ".apk"))
         pkg_name[len - 4] = '\0';

kernel/throne_tracker.c

@@ -22,6 +22,45 @@ struct uid_data {
     char package[KSU_MAX_PACKAGE_NAME];
 };
 
+int get_pkg_from_apk_path(char *pkg, const char *path)
+{
+    int len = strlen(path);
+    if (len >= KSU_MAX_PACKAGE_NAME || len < 1)
+        return -1;
+
+    const char *last_slash = NULL;
+    const char *second_last_slash = NULL;
+
+    int i;
+    for (i = len - 1; i >= 0; i--) {
+        if (path[i] == '/') {
+            if (!last_slash) {
+                last_slash = &path[i];
+            } else {
+                second_last_slash = &path[i];
+                break;
+            }
+        }
+    }
+
+    if (!last_slash || !second_last_slash)
+        return -1;
+
+    const char *last_hyphen = strchr(second_last_slash, '-');
+    if (!last_hyphen || last_hyphen > last_slash)
+        return -1;
+
+    int pkg_len = last_hyphen - second_last_slash - 1;
+    if (pkg_len >= KSU_MAX_PACKAGE_NAME || pkg_len <= 0)
+        return -1;
+
+    // Copying the package name
+    strncpy(pkg, second_last_slash + 1, pkg_len);
+    pkg[pkg_len] = '\0';
+
+    return 0;
+}
+
 static void crown_manager(const char *apk, struct list_head *uid_data)
 {
     char pkg[KSU_MAX_PACKAGE_NAME];