Skip to content

fix changes in 6.18+ #3480

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

Open
aaaaaaaa-815 wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −2
Open

fix changes in 6.18+ #3480

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions kernel/selinux/sepolicy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,7 +897,8 @@ struct selinux_policy *ksu_dup_sepolicy(struct selinux_policy *old_pol)
pr_err("sepolicy: policydb_write: %d\n", ret);
goto out_free_data;
}

// https://android.googlesource.com/kernel/common/+/35a7845718734ae638b85b420534cb859498dab6%5E%21
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 18, 0)
// https://android-review.googlesource.com/c/kernel/common/+/3009995/11/security/selinux/ss/policydb.c
// fixup config
// 4*2+8+4
Expand All @@ -915,7 +916,7 @@ struct selinux_policy *ksu_dup_sepolicy(struct selinux_policy *old_pol)
}
pr_info("new config: %u\n", *config_ptr);
}

#endif
new_pol = kmemdup(old_pol, sizeof(*old_pol), GFP_KERNEL);
if (!new_pol) {
ret = -ENOMEM;
Expand Down