Skip to content

Commit f3a7b62

Browse files
committed
Revert "kernel: core_hook: earlier escape_to_root already-root check"
This reverts commit 6df2225.
1 parent 1ee7796 commit f3a7b62

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

kernel/core_hook.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,17 +137,18 @@ void escape_to_root(void)
137137
{
138138
struct cred *cred;
139139

140-
if (current_euid().val == 0) {
141-
pr_warn("Already root, don't escape!\n");
142-
return;
143-
}
144-
145140
cred = prepare_creds();
146141
if (!cred) {
147142
pr_warn("prepare_creds failed!\n");
148143
return;
149144
}
150145

146+
if (cred->euid.val == 0) {
147+
pr_warn("Already root, don't escape!\n");
148+
abort_creds(cred);
149+
return;
150+
}
151+
151152
struct root_profile *profile = ksu_get_root_profile(cred->uid.val);
152153

153154
cred->uid.val = profile->uid;

0 commit comments

Comments
 (0)