Skip to content

Commit 801aae5

Browse files
fadlyas07fadlyas07
committed
Merge branch 'main' of https://github.com/tiann/KernelSU
* 'main' of https://github.com/tiann/KernelSU: Add a formatting string for the update list tiann#2556 (tiann#2597) Revert "website: Fix ads" Fix fallback option for createRootShell() (tiann#2593) Update zip-extensions and set needed features for zip (tiann#2592) ci: update kmi versions (tiann#2591) ksud/installer: /odm handling (tiann#2513) build(deps): bump the maven group across 1 directory with 12 updates (tiann#2579) build(deps): bump the crates group across 1 directory with 53 updates (tiann#2585) build(deps): bump the npm group across 1 directory with 24 updates (tiann#2586) Translations update from Hosted Weblate (tiann#2558) website: Fix ads kernel/throne_tracker: we just uninstalled the manager, stop looking for it (tiann#2584) Conflicts: kernel/core_hook.c Change-Id: I2cfcf1b3ab3108f16d377b80bf9573afa38cd4a6
2 parents abe6b78 + d8ce238 commit 801aae5

File tree

26 files changed

+749
-556
lines changed

26 files changed

+749
-556
lines changed

‎.github/workflows/build-kernel-a12.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ jobs:
2727
os_patch_level: 2024-08
2828
- sub_level: 226
2929
os_patch_level: 2024-11
30+
- sub_level: 233
31+
os_patch_level: 2025-02
32+
- sub_level: 236
33+
os_patch_level: 2025-05
3034
uses: ./.github/workflows/gki-kernel.yml
3135
secrets: inherit
3236
with:

‎.github/workflows/build-kernel-a13.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@ jobs:
3636
- version: "5.10"
3737
sub_level: 223
3838
os_patch_level: 2024-11
39+
- version: "5.10"
40+
sub_level: 228
41+
os_patch_level: 2025-01
42+
- version: "5.10"
43+
sub_level: 234
44+
os_patch_level: 2025-03
3945
- version: "5.15"
4046
sub_level: 148
4147
os_patch_level: 2024-05
@@ -51,6 +57,15 @@ jobs:
5157
- version: "5.15"
5258
sub_level: 167
5359
os_patch_level: 2024-11
60+
- version: "5.15"
61+
sub_level: 178
62+
os_patch_level: 2024-11
63+
- version: "5.15"
64+
sub_level: 170
65+
os_patch_level: 2025-01
66+
- version: "5.15"
67+
sub_level: 178
68+
os_patch_level: 2025-03
5469
uses: ./.github/workflows/gki-kernel.yml
5570
secrets: inherit
5671
with:

‎.github/workflows/build-kernel-a14.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,12 @@ jobs:
3939
- version: "5.15"
4040
sub_level: 167
4141
os_patch_level: 2024-11
42+
- version: "5.15"
43+
sub_level: 170
44+
os_patch_level: 2025-01
45+
- version: "5.15"
46+
sub_level: 178
47+
os_patch_level: 2025-03
4248
- version: "6.1"
4349
sub_level: 75
4450
os_patch_level: 2024-05
@@ -63,6 +69,15 @@ jobs:
6369
- version: "6.1"
6470
sub_level: 115
6571
os_patch_level: 2024-12
72+
- version: "6.1"
73+
sub_level: 118
74+
os_patch_level: 2025-01
75+
- version: "6.1"
76+
sub_level: 128
77+
os_patch_level: 2025-03
78+
- version: "6.1"
79+
sub_level: 134
80+
os_patch_level: 2025-05
6681
uses: ./.github/workflows/gki-kernel.yml
6782
secrets: inherit
6883
with:

‎.github/workflows/build-kernel-a15.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,21 @@ jobs:
3636
- version: "6.6"
3737
sub_level: 57
3838
os_patch_level: 2024-12
39+
- version: "6.6"
40+
sub_level: 58
41+
os_patch_level: 2025-01
42+
- version: "6.6"
43+
sub_level: 66
44+
os_patch_level: 2025-02
45+
- version: "6.6"
46+
sub_level: 77
47+
os_patch_level: 2025-03
48+
- version: "6.6"
49+
sub_level: 82
50+
os_patch_level: 2025-04
51+
- version: "6.6"
52+
sub_level: 87
53+
os_patch_level: 2025-05
3954
uses: ./.github/workflows/gki-kernel.yml
4055
secrets: inherit
4156
with:

‎.github/workflows/build-lkm.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
matrix:
1616
include:
1717
- version: "android12-5.10"
18-
sub_level: 233
19-
os_patch_level: 2025-02
18+
sub_level: 236
19+
os_patch_level: 2025-05
2020
- version: "android13-5.10"
2121
sub_level: 234
2222
os_patch_level: 2025-03
@@ -27,11 +27,11 @@ jobs:
2727
sub_level: 178
2828
os_patch_level: 2025-03
2929
- version: "android14-6.1"
30-
sub_level: 128
31-
os_patch_level: 2025-03
30+
sub_level: 134
31+
os_patch_level: 2025-05
3232
- version: "android15-6.6"
33-
sub_level: 77
34-
os_patch_level: 2025-03
33+
sub_level: 87
34+
os_patch_level: 2025-05
3535
uses: ./.github/workflows/gki-kernel.yml
3636
with:
3737
version: ${{ matrix.version }}

‎kernel/core_hook.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,6 +1083,7 @@ int ksu_handle_setuid(struct cred *new, const struct cred *old)
10831083
#else
10841084
// fixme: use `collect_mounts` and `iterate_mount` to iterate all mountpoint and
10851085
// filter the mountpoint whose target is `/data/adb`
1086+
try_umount("/odm", true, 0);
10861087
ksu_try_umount("/system", true, 0);
10871088
ksu_try_umount("/vendor", true, 0);
10881089
ksu_try_umount("/product", true, 0);

‎kernel/throne_tracker.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,12 +346,14 @@ void ksu_track_throne()
346346
if (ksu_is_manager_uid_valid()) {
347347
pr_info("manager is uninstalled, invalidate it!\n");
348348
ksu_invalidate_manager_uid();
349+
goto prune;
349350
}
350351
pr_info("Searching manager...\n");
351352
search_manager("/data/app", 2, &uid_list);
352353
pr_info("Search manager finished\n");
353354
}
354355

356+
prune:
355357
// then prune the allowlist
356358
ksu_prune_allowlist(is_uid_exist, &uid_list);
357359
out:

‎manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ fun createRootShell(globalMnt: Boolean = false): Shell {
8181
Log.w(TAG, "ksu failed: ", e)
8282
try {
8383
if (globalMnt) {
84-
builder.build("su")
85-
} else {
8684
builder.build("su", "-mm")
85+
} else {
86+
builder.build("su")
8787
}
8888
} catch (e: Throwable) {
8989
Log.e(TAG, "su failed: ", e)

‎manager/app/src/main/java/me/weishu/kernelsu/ui/viewmodel/ModuleViewModel.kt‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,10 @@ class ModuleViewModel : ViewModel() {
129129
}
130130
}
131131

132+
private fun sanitizeVersionString(version: String): String {
133+
return version.replace(Regex("[^a-zA-Z0-9.\\-_]"), "_")
134+
}
135+
132136
fun checkUpdate(m: ModuleInfo): Triple<String, String, String> {
133137
val empty = Triple("", "", "")
134138
if (m.updateJson.isEmpty() || m.remove || m.update || !m.enabled) {
@@ -158,7 +162,8 @@ class ModuleViewModel : ViewModel() {
158162
JSONObject(result)
159163
}.getOrNull() ?: return empty
160164

161-
val version = updateJson.optString("version", "")
165+
var version = updateJson.optString("version", "")
166+
version = sanitizeVersionString(version)
162167
val versionCode = updateJson.optInt("versionCode", 0)
163168
val zipUrl = updateJson.optString("zipUrl", "")
164169
val changelog = updateJson.optString("changelog", "")
@@ -168,4 +173,4 @@ class ModuleViewModel : ViewModel() {
168173

169174
return Triple(zipUrl, version, changelog)
170175
}
171-
}
176+
}

‎manager/app/src/main/res/values-ar/strings.xml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,5 +136,8 @@
136136
<string name="module_sort_enabled_first">فرز (الممكن أولاً)</string>
137137
<string name="module_sort_action_first">فرز (الإجراء أولاً)</string>
138138
<string name="settings_disable_su">تعطيل توافق su</string>
139-
<string name="settings_disable_su_summary">قم بتعطيل أي تطبيقات مؤقتا من الحصول على امتيازات الجذر عبر الأمر su (لن تتأثر عمليات الجذر الحالية).</string>
139+
<string name="settings_disable_su_summary">قم بتعطيل قدره التطبيقات مؤقتا من الحصول على امتيازات المسخدم الخارق عبر الأمر su (لن تتأثر عمليات الجذر الحالية).</string>
140+
<string name="module_install_prompt_with_name">الحزم الاتيه سيتم تثبيتها %1$s</string>
141+
<string name="confirm">تأكيد</string>
142+
<string name="su_not_allowed">من الغير ممكن اعطاء صلاحيات (المسخدم الخارق) لـ %s</string>
140143
</resources>

0 commit comments

Comments
 (0)