tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UBUNTU: SAUCE: apparmor4.0.0 [39/90]: LSM stacking v39: LSM: Remove lsmblob scaffolding

Browse Source 
BugLink: http://bugs.launchpad.net/bugs/2028253

Remove the scaffold member from the lsmblob. Remove the
remaining places it is being set.

Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
(cherry picked from commit e292f430ce1dccc78725662677c4977f9e6e3d6d
https://git.launchpad.net/~apparmor-dev/ubuntu-kernel-next)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
This commit is contained in:
Casey Schaufler
2023-11-16 12:59:39 -08:00
committed by Paolo Pisati
parent 5f3aa067a4
commit f0d47d7519
7 changed files with 6 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/linux/security.h
-6
View File
@@ -143,11 +143,6 @@ enum lockdown_reason {
LOCKDOWN_CONFIDENTIALITY_MAX,
};
/* stacking scaffolding */
struct lsmblob_scaffold {
u32 secid;
};
/*
* A "security context" is the text representation of
* the information used by LSMs.
@@ -168,7 +163,6 @@ struct lsmblob {
struct lsmblob_smack smack;
struct lsmblob_apparmor apparmor;
struct lsmblob_bpf bpf;
struct lsmblob_scaffold scaffold;
};
extern const char *const lockdown_reasons[LOCKDOWN_CONFIDENTIALITY_MAX+1];
security/apparmor/audit.c
+1 -5
View File
@@ -280,11 +280,7 @@ int aa_audit_rule_match(struct lsmblob *blob, u32 field, u32 op, void *vrule,
if (lsmid != LSM_ID_UNDEF || lsmid != LSM_ID_APPARMOR)
return 0;
/* stacking scaffolding */
if (!blob->apparmor.label && blob->scaffold.secid)
label = aa_secid_to_label(blob->scaffold.secid);
else
label = blob->apparmor.label;
label = blob->apparmor.label;
if (!label)
return -ENOENT;
security/apparmor/lsm.c
-4
View File
@@ -986,8 +986,6 @@ static void apparmor_current_getlsmblob_subj(struct lsmblob *blob)
struct aa_label *label = __begin_current_label_crit_section();
blob->apparmor.label = label;
/* stacking scaffolding */
blob->scaffold.secid = label->secid;
__end_current_label_crit_section(label);
}
@@ -997,8 +995,6 @@ static void apparmor_task_getlsmblob_obj(struct task_struct *p,
struct aa_label *label = aa_get_task_label(p);
blob->apparmor.label = label;
/* stacking scaffolding */
blob->scaffold.secid = label->secid;
aa_put_label(label);
}
security/apparmor/secid.c
+1 -5
View File
@@ -98,11 +98,7 @@ int apparmor_lsmblob_to_secctx(struct lsmblob *blob, struct lsmcontext *cp)
int flags = FLAG_VIEW_SUBNS | FLAG_HIDDEN_UNCONFINED | FLAG_ABS_ROOT;
int len;
/* stacking scaffolding */
if (!blob->apparmor.label && blob->scaffold.secid)
label = aa_secid_to_label(blob->scaffold.secid);
else
label = blob->apparmor.label;
label = blob->apparmor.label;
if (!label)
return -EINVAL;
security/selinux/hooks.c
-14
View File
@@ -3528,8 +3528,6 @@ static void selinux_inode_getlsmblob(struct inode *inode, struct lsmblob *blob)
struct inode_security_struct *isec = inode_security_novalidate(inode);
blob->selinux.secid = isec->sid;
/* stacking scaffolding */
blob->scaffold.secid = isec->sid;
}
static int selinux_inode_copy_up(struct dentry *src, struct cred **new)
@@ -4049,8 +4047,6 @@ static void selinux_cred_getsecid(const struct cred *c, u32 *secid)
static void selinux_cred_getlsmblob(const struct cred *c, struct lsmblob *blob)
{
blob->selinux.secid = cred_sid(c);
/* stacking scaffolding */
blob->scaffold.secid = blob->selinux.secid;
}
/*
@@ -4191,16 +4187,12 @@ static int selinux_task_getsid(struct task_struct *p)
static void selinux_current_getlsmblob_subj(struct lsmblob *blob)
{
blob->selinux.secid = current_sid();
/* stacking scaffolding */
blob->scaffold.secid = blob->selinux.secid;
}
static void selinux_task_getlsmblob_obj(struct task_struct *p,
struct lsmblob *blob)
{
blob->selinux.secid = task_sid_obj(p);
/* stacking scaffolding */
blob->scaffold.secid = blob->selinux.secid;
}
static int selinux_task_setnice(struct task_struct *p, int nice)
@@ -6362,8 +6354,6 @@ static void selinux_ipc_getlsmblob(struct kern_ipc_perm *ipcp,
{
struct ipc_security_struct *isec = selinux_ipc(ipcp);
blob->selinux.secid = isec->sid;
/* stacking scaffolding */
blob->scaffold.secid = isec->sid;
}
static void selinux_d_instantiate(struct dentry *dentry, struct inode *inode)
@@ -6665,10 +6655,6 @@ static int selinux_lsmblob_to_secctx(struct lsmblob *blob,
u32 seclen;
u32 ret;
/* stacking scaffolding */
if (!secid)
secid = blob->scaffold.secid;
if (cp) {
cp->id = LSM_ID_SELINUX;
ret = security_sid_to_context(secid, &cp->context, &cp->len);
security/selinux/ss/services.c
-4
View File
@@ -3667,10 +3667,6 @@ int selinux_audit_rule_match(struct lsmblob *blob, u32 field, u32 op,
goto out;
}
/* stacking scaffolding */
if (!blob->selinux.secid && blob->scaffold.secid)
blob->selinux.secid = blob->scaffold.secid;
ctxt = sidtab_search(policy->sidtab, blob->selinux.secid);
if (unlikely(!ctxt)) {
WARN_ONCE(1, "selinux_audit_rule_match: unrecognized SID %d\n",
security/smack/smack_lsm.c
+4 -29
View File
@@ -1645,11 +1645,7 @@ static int smack_inode_listsecurity(struct inode *inode, char *buffer,
*/
static void smack_inode_getlsmblob(struct inode *inode, struct lsmblob *blob)
{
struct smack_known *skp = smk_of_inode(inode);
blob->smack.skp = skp;
/* stacking scaffolding */
blob->scaffold.secid = skp->smk_secid;
blob->smack.skp = smk_of_inode(inode);
}
/*
@@ -2157,8 +2153,6 @@ static void smack_cred_getlsmblob(const struct cred *cred,
{
rcu_read_lock();
blob->smack.skp = smk_of_task(smack_cred(cred));
/* stacking scaffolding */
blob->scaffold.secid = blob->smack.skp->smk_secid;
rcu_read_unlock();
}
@@ -2260,11 +2254,7 @@ static int smack_task_getsid(struct task_struct *p)
*/
static void smack_current_getlsmblob_subj(struct lsmblob *blob)
{
struct smack_known *skp = smk_of_current();
blob->smack.skp = skp;
/* stacking scaffolding */
blob->scaffold.secid = skp->smk_secid;
blob->smack.skp = smk_of_current();
}
/**
@@ -2277,11 +2267,7 @@ static void smack_current_getlsmblob_subj(struct lsmblob *blob)
static void smack_task_getlsmblob_obj(struct task_struct *p,
struct lsmblob *blob)
{
struct smack_known *skp = smk_of_task_struct_obj(p);
blob->smack.skp = skp;
/* stacking scaffolding */
blob->scaffold.secid = skp->smk_secid;
blob->smack.skp = smk_of_task_struct_obj(p);
}
/**
@@ -3452,11 +3438,8 @@ static void smack_ipc_getlsmblob(struct kern_ipc_perm *ipp,
struct lsmblob *blob)
{
struct smack_known **iskpp = smack_ipc(ipp);
struct smack_known *iskp = *iskpp;
blob->smack.skp = iskp;
/* stacking scaffolding */
blob->scaffold.secid = iskp->smk_secid;
blob->smack.skp = *iskpp;
}
/**
@@ -4797,10 +4780,6 @@ static int smack_audit_rule_match(struct lsmblob *blob, u32 field, u32 op,
if (field != AUDIT_SUBJ_USER && field != AUDIT_OBJ_USER)
return 0;
/* stacking scaffolding */
if (!skp && blob->scaffold.secid)
skp = smack_from_secid(blob->scaffold.secid);
/*
* No need to do string comparisons. If a match occurs,
* both pointers will point to the same smack_known
@@ -4863,10 +4842,6 @@ static int smack_lsmblob_to_secctx(struct lsmblob *blob, struct lsmcontext *cp)
struct smack_known *skp = blob->smack.skp;
int len;
/* stacking scaffolding */
if (!skp && blob->scaffold.secid)
skp = smack_from_secid(blob->scaffold.secid);
len = strlen(skp->smk_known);
if (cp) {