Skip to content

Commit e63d86b

Browse files
robertosassucschaufler
authored andcommitted
smack: Initialize the in-memory inode in smack_inode_init_security()
Currently, Smack initializes in-memory new inodes in three steps. It first sets the xattrs in smack_inode_init_security(), fetches them in smack_d_instantiate() and finally, in the same function, sets the in-memory inodes depending on xattr values, unless they are in specially-handled filesystems. Other than being inefficient, this also prevents filesystems not supporting xattrs from working properly since, without xattrs, there is no way to pass the label determined in smack_inode_init_security() to smack_d_instantiate(). Since the LSM infrastructure allows setting and getting the security field without xattrs through the inode_setsecurity and inode_getsecurity hooks, make the inode creation work too, by initializing the in-memory inode earlier in smack_inode_init_security(). Also mark the inode as instantiated, to prevent smack_d_instantiate() from overwriting the security field. As mentioned above, this potentially has impact for inodes in specially-handled filesystems in smack_d_instantiate(), if they are not handled in the same way in smack_inode_init_security(). Filesystems other than tmpfs don't call security_inode_init_security(), so they would be always initialized in smack_d_instantiate(), as before. For tmpfs, the current behavior is to assign to inodes the label '*', but actually that label is overwritten with the one fetched from the SMACK64 xattr, set in smack_inode_init_security() (default: '_'). Initializing the in-memory inode is straightforward: if not transmuting, nothing more needs to be done; if transmuting, overwrite the current inode label with the one from the parent directory, and set SMK_INODE_TRANSMUTE. Finally, set SMK_INODE_INSTANT for all cases, to mark the inode as instantiated. Signed-off-by: Roberto Sassu <[email protected]> Signed-off-by: Casey Schaufler <[email protected]>
1 parent 51b15e7 commit e63d86b

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

security/smack/smack_lsm.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -994,6 +994,7 @@ static int smack_inode_init_security(struct inode *inode, struct inode *dir,
994994
struct xattr *xattrs, int *xattr_count)
995995
{
996996
struct task_smack *tsp = smack_cred(current_cred());
997+
struct inode_smack *issp = smack_inode(inode);
997998
struct smack_known *skp = smk_of_task(tsp);
998999
struct smack_known *isp = smk_of_inode(inode);
9991000
struct smack_known *dsp = smk_of_inode(dir);
@@ -1029,7 +1030,9 @@ static int smack_inode_init_security(struct inode *inode, struct inode *dir,
10291030
* smack_inode_alloc_security().
10301031
*/
10311032
if (tsp->smk_task != tsp->smk_transmuted)
1032-
isp = dsp;
1033+
isp = issp->smk_inode = dsp;
1034+
1035+
issp->smk_flags |= SMK_INODE_TRANSMUTE;
10331036
xattr_transmute = lsm_get_xattr_slot(xattrs,
10341037
xattr_count);
10351038
if (xattr_transmute) {
@@ -1044,6 +1047,8 @@ static int smack_inode_init_security(struct inode *inode, struct inode *dir,
10441047
}
10451048
}
10461049

1050+
issp->smk_flags |= SMK_INODE_INSTANT;
1051+
10471052
if (xattr) {
10481053
xattr->value = kstrdup(isp->smk_known, GFP_NOFS);
10491054
if (!xattr->value)

0 commit comments

Comments
 (0)