|
@@ -1545,9 +1545,9 @@ static int smack_inode_listsecurity(struct inode *inode, char *buffer,
|
|
|
*/
|
|
|
static void smack_inode_getsecid(struct inode *inode, u32 *secid)
|
|
|
{
|
|
|
- struct inode_smack *isp = inode->i_security;
|
|
|
+ struct smack_known *skp = smk_of_inode(inode);
|
|
|
|
|
|
- *secid = isp->smk_inode->smk_secid;
|
|
|
+ *secid = skp->smk_secid;
|
|
|
}
|
|
|
|
|
|
/*
|
|
@@ -4538,12 +4538,10 @@ static int smack_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen)
|
|
|
|
|
|
static int smack_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen)
|
|
|
{
|
|
|
- int len = 0;
|
|
|
- len = smack_inode_getsecurity(inode, XATTR_SMACK_SUFFIX, ctx, true);
|
|
|
+ struct smack_known *skp = smk_of_inode(inode);
|
|
|
|
|
|
- if (len < 0)
|
|
|
- return len;
|
|
|
- *ctxlen = len;
|
|
|
+ *ctx = skp->smk_known;
|
|
|
+ *ctxlen = strlen(skp->smk_known);
|
|
|
return 0;
|
|
|
}
|
|
|
|