Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "selinux: cache zygote context types when loading policy"

Browse source 
This reverts commit fd3f9648e3.
This commit is contained in:
Ksawlii 2024-12-13 19:44:19 +01:00
parent 37f44d83a1
commit 352f8ae637
2 changed files with 0 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
security/selinux/include/security.h
View file

@ -87,11 +87,6 @@ extern int selinux_enabled_boot;
struct selinux_avc; struct selinux_avc;
struct selinux_policy; struct selinux_policy;
struct context_types {
u32 webview_zygote;
u32 zygote;
};
struct selinux_state { struct selinux_state {
#ifdef CONFIG_SECURITY_SELINUX_DISABLE #ifdef CONFIG_SECURITY_SELINUX_DISABLE
bool disabled; bool disabled;
@ -105,8 +100,6 @@ struct selinux_state {
bool android_netlink_route; bool android_netlink_route;
bool android_netlink_getneigh; bool android_netlink_getneigh;
struct context_types types;
struct page *status_page; struct page *status_page;
struct mutex status_lock; struct mutex status_lock;

32
security/selinux/selinuxfs.c
View file

@ -41,8 +41,6 @@
#include "security.h" #include "security.h"
#include "objsec.h" #include "objsec.h"
#include "conditional.h" #include "conditional.h"
#include "ss/services.h"
#include "ss/symtab.h"
enum sel_inos { enum sel_inos {
SEL_ROOT_INO = 2, SEL_ROOT_INO = 2,
@ -613,30 +611,6 @@ out:
return ret; return ret;
} }
static int resolve_context_type(struct selinux_load_state *state, const char *name, u32 *out_type)
{
struct type_datum *typdatum = symtab_search(&state->policy->policydb.p_types, name);
if (!typdatum || typdatum->attribute) {
pr_err("SELinux: missing type_datum for %s\n", name);
return -EINVAL;
}
*out_type = typdatum->value;
return 0;
}
static int resolve_context_types(struct selinux_load_state *lstate, struct context_types *types) {
int rc;
#define RESOLVE_TYPE(t) rc = resolve_context_type(lstate, #t, &types->t); if (rc) return rc
RESOLVE_TYPE(webview_zygote);
RESOLVE_TYPE(zygote);
#undef RESOLVE_TYPE
return 0;
}
static ssize_t sel_write_load(struct file *file, const char __user *buf, static ssize_t sel_write_load(struct file *file, const char __user *buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
@ -682,12 +656,6 @@ static ssize_t sel_write_load(struct file *file, const char __user *buf,
goto out; goto out;
} }
length = resolve_context_types(&load_state, &fsi->state->types);
if (length) {
selinux_policy_cancel(fsi->state, &load_state);
goto out;
}
selinux_policy_commit(fsi->state, &load_state); selinux_policy_commit(fsi->state, &load_state);
length = count; length = count;
audit_log(audit_context(), GFP_KERNEL, AUDIT_MAC_POLICY_LOAD, audit_log(audit_context(), GFP_KERNEL, AUDIT_MAC_POLICY_LOAD,