aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Niesluchowski <m.niesluchow@samsung.com>2014-08-19 08:26:32 -0400
committerCasey Schaufler <casey@schaufler-ca.com>2014-08-25 17:27:28 -0400
commitd83d2c26461d661384676a4eed935d925b0fcc34 (patch)
tree7f37947642d81d58f7a48e8ea9473a1894257c36
parentda1b63566c469bf3e2b24182114422e16b1aa34c (diff)
Smack: Fix setting label on successful file open
While opening with CAP_MAC_OVERRIDE file label is not set. Other calls may access it after CAP_MAC_OVERRIDE is dropped from process. Signed-off-by: Marcin Niesluchowski <m.niesluchow@samsung.com>
-rw-r--r--security/smack/smack_lsm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 16ae8534b14c..7091b46adab2 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -1477,8 +1477,10 @@ static int smack_file_open(struct file *file, const struct cred *cred)
1477 struct smk_audit_info ad; 1477 struct smk_audit_info ad;
1478 int rc; 1478 int rc;
1479 1479
1480 if (smack_privileged(CAP_MAC_OVERRIDE)) 1480 if (smack_privileged(CAP_MAC_OVERRIDE)) {
1481 file->f_security = isp->smk_inode;
1481 return 0; 1482 return 0;
1483 }
1482 1484
1483 smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_PATH); 1485 smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_PATH);
1484 smk_ad_setfield_u_fs_path(&ad, file->f_path); 1486 smk_ad_setfield_u_fs_path(&ad, file->f_path);