Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kernel: no need to umount and mark as root for manager uid #1549

Merged
merged 4 commits into from
Mar 29, 2024
Merged

kernel: no need to umount and mark as root for manager uid #1549

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4467587
kernel: no need umount and mark as root for manager uid
5ec1cff Mar 28, 2024
dc340e9
Update kernel/allowlist.c
5ec1cff Mar 28, 2024
15ef913
Merge branch 'main' into manager-umount
5ec1cff Mar 28, 2024
7141a55
Merge branch 'main' into manager-umount
5ec1cff Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion kernel/allowlist.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include "selinux/selinux.h"
#include "kernel_compat.h"
#include "allowlist.h"
#include "manager.h"

#define FILE_MAGIC 0x7f4b5355 // ' KSU', u32
#define FILE_FORMAT_VERSION 3 // u32
Expand Down Expand Up @@ -274,6 +275,11 @@ bool __ksu_is_allow_uid(uid_t uid)
return false;
}

if (likely(ksu_is_manager_uid_valid()) && unlikely(ksu_get_manager_uid() == uid)) {
// manager is always allowed!
return true;
}

if (likely(uid <= BITMAP_UID_MAX)) {
return !!(allow_list_bitmap[uid / BITS_PER_BYTE] & (1 << (uid % BITS_PER_BYTE)));
} else {
Expand All @@ -289,7 +295,12 @@ bool __ksu_is_allow_uid(uid_t uid)
bool ksu_uid_should_umount(uid_t uid)
{
struct app_profile profile = { .current_uid = uid };
bool found = ksu_get_app_profile(&profile);
bool found;
if (likely(ksu_is_manager_uid_valid()) && unlikely(ksu_get_manager_uid() == uid)) {
// we should not umount on manager!
return false;
}
found = ksu_get_app_profile(&profile);
5ec1cff marked this conversation as resolved.
Show resolved Hide resolved
if (!found) {
// no app profile found, it must be non root app
return default_non_root_profile.umount_modules;
Expand Down
Loading