diff options
| author | Konstantin Andreev <andreev@swemel.ru> | 2025-01-17 02:40:33 +0300 |
|---|---|---|
| committer | Casey Schaufler <casey@schaufler-ca.com> | 2025-02-16 10:30:23 -0800 |
| commit | c7fb50cecff9cad19fdac5b37337eae4e42b94c7 (patch) | |
| tree | b08534a00ad16bf5b07f01bb180524cbca9e400e | |
| parent | bf9f14c91a05ec77ee3710703b699c2a32f80ae4 (diff) | |
| download | linux-c7fb50cecff9cad19fdac5b37337eae4e42b94c7.tar.gz linux-c7fb50cecff9cad19fdac5b37337eae4e42b94c7.tar.bz2 linux-c7fb50cecff9cad19fdac5b37337eae4e42b94c7.zip | |
smack: Revert "smackfs: Added check catlen"
This reverts commit ccfd889acb06eab10b98deb4b5eef0ec74157ea0
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>
| -rw-r--r-- | security/smack/smackfs.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c index 2e676a73ac43..2802c480521c 100644 --- a/security/smack/smackfs.c +++ b/security/smack/smackfs.c @@ -814,7 +814,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, 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 netlbl_lsm_secattr ncats; char mapcatset[SMK_CIPSOLEN]; @@ -901,19 +901,8 @@ static ssize_t smk_set_cipso(struct file *file, const char __user *buf, smack_catset_bit(cat, mapcatset); } - ncats.flags = 0; - if (catlen == 0) { - 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); - } + + rc = smk_netlbl_mls(maplevel, mapcatset, &ncats, SMK_CIPSOLEN); if (rc >= 0) { old_cat = skp->smk_netlabel.attr.mls.cat; rcu_assign_pointer(skp->smk_netlabel.attr.mls.cat, ncats.attr.mls.cat); |