[11/25] Smack: Abstract the file security blob

Commit Message

Casey Schaufler Aug. 13, 2016, 8:36 p.m. UTC

Subject: [PATCH 11/25] Smack: Abstract the file security blob

Abstract reading the file security blob.
Remove abstraction when writing the file security blob.
There is no change in the behavior of the code.

Signed-off-by: Casey Schaufler <[e-mail]>

---
 security/smack/smack.h     | 5 +++++
 security/smack/smack_lsm.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

Patch

diff --git a/security/smack/smack.h b/security/smack/smack.h
index 8849706..d95c56d 100644
--- a/security/smack/smack.h
+++ b/security/smack/smack.h
@@ -349,6 +349,11 @@  static inline struct task_smack *smack_cred(const struct cred *cred)
 	return cred->security;
 }
 
+static inline struct smack_known *smack_file(const struct file *file)
+{
+	return file->f_security;
+}
+
 /*
  * Is the directory transmuting?
  */
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index d45dfde..be7b3e6 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -1847,7 +1847,7 @@  static int smack_file_send_sigiotask(struct task_struct *tsk,
 	file = container_of(fown, struct file, f_owner);
 
 	/* we don't log here as rc can be overriden */
-	skp = file->f_security;
+	skp = smack_file(file);
 	rc = smk_access(skp, tkp, MAY_WRITE, NULL);
 	rc = smk_bu_note("sigiotask", skp, tkp, MAY_WRITE, rc);
 	if (rc != 0 && has_capability(tsk, CAP_MAC_OVERRIDE))