samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

smack: Revert "smackfs: Added check catlen"

Browse Source 
[ Upstream commit c7fb50cecff9cad19fdac5b37337eae4e42b94c7 ]

This reverts commit ccfd889acb

The indicated commit
* does not describe the problem that change tries to solve
* has programming issues
* introduces a bug: forever clears NETLBL_SECATTR_MLS_CAT
         in (struct smack_known *)skp->smk_netlabel.flags

Reverting the commit to reapproach original problem

Signed-off-by: Konstantin Andreev <andreev@swemel.ru>
Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Konstantin Andreev
2025-01-17 02:40:33 +03:00
committed by Greg Kroah-Hartman
parent e30f31434e
commit 3d6d13540f
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
security/smack/smackfs.c
View File

@@ -830,7 +830,7 @@ static int smk_open_cipso(struct inode *inode, struct file *file)
static ssize_t smk_set_cipso(struct file *file, const char __user *buf, static ssize_t smk_set_cipso(struct file *file, const char __user *buf,
size_t count, loff_t *ppos, int format) size_t count, loff_t *ppos, int format)
{ {
struct netlbl_lsm_catmap *old_cat, *new_cat = NULL; struct netlbl_lsm_catmap *old_cat;
struct smack_known *skp; struct smack_known *skp;
struct netlbl_lsm_secattr ncats; struct netlbl_lsm_secattr ncats;
char mapcatset[SMK_CIPSOLEN]; char mapcatset[SMK_CIPSOLEN];
@@ -917,19 +917,8 @@ static ssize_t smk_set_cipso(struct file *file, const char __user *buf,
smack_catset_bit(cat, mapcatset); smack_catset_bit(cat, mapcatset);
} }
ncats.flags = 0;
if (catlen == 0) { rc = smk_netlbl_mls(maplevel, mapcatset, &ncats, SMK_CIPSOLEN);
ncats.attr.mls.cat = NULL;
ncats.attr.mls.lvl = maplevel;
new_cat = netlbl_catmap_alloc(GFP_ATOMIC);
if (new_cat)
new_cat->next = ncats.attr.mls.cat;
ncats.attr.mls.cat = new_cat;
skp->smk_netlabel.flags &= ~(1U << 3);
rc = 0;
} else {
rc = smk_netlbl_mls(maplevel, mapcatset, &ncats, SMK_CIPSOLEN);
}
if (rc >= 0) { if (rc >= 0) {
old_cat = skp->smk_netlabel.attr.mls.cat; old_cat = skp->smk_netlabel.attr.mls.cat;
rcu_assign_pointer(skp->smk_netlabel.attr.mls.cat, ncats.attr.mls.cat); rcu_assign_pointer(skp->smk_netlabel.attr.mls.cat, ncats.attr.mls.cat);