Merge branch 'work.xattr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[cascardo/linux.git] / security / smack / smack_lsm.c

diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 516b3f5..1cb0602 100644 (file)
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -1857,14 +1857,14 @@ static int smack_file_send_sigiotask(struct task_struct *tsk,
 
        /* we don't log here as rc can be overriden */
        skp = file->f_security;
-       rc = smk_access(skp, tkp, MAY_WRITE, NULL);
-       rc = smk_bu_note("sigiotask", skp, tkp, MAY_WRITE, rc);
+       rc = smk_access(skp, tkp, MAY_DELIVER, NULL);
+       rc = smk_bu_note("sigiotask", skp, tkp, MAY_DELIVER, rc);
        if (rc != 0 && has_capability(tsk, CAP_MAC_OVERRIDE))
                rc = 0;
 
        smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_TASK);
        smk_ad_setfield_u_tsk(&ad, tsk);
-       smack_log(skp->smk_known, tkp->smk_known, MAY_WRITE, rc, &ad);
+       smack_log(skp->smk_known, tkp->smk_known, MAY_DELIVER, rc, &ad);
        return rc;
 }
 
@@ -2265,8 +2265,8 @@ static int smack_task_kill(struct task_struct *p, struct siginfo *info,
         * can write the receiver.
         */
        if (secid == 0) {
-               rc = smk_curacc(tkp, MAY_WRITE, &ad);
-               rc = smk_bu_task(p, MAY_WRITE, rc);
+               rc = smk_curacc(tkp, MAY_DELIVER, &ad);
+               rc = smk_bu_task(p, MAY_DELIVER, rc);
                return rc;
        }
        /*
@@ -2275,8 +2275,8 @@ static int smack_task_kill(struct task_struct *p, struct siginfo *info,
         * we can't take privilege into account.
         */
        skp = smack_from_secid(secid);
-       rc = smk_access(skp, tkp, MAY_WRITE, &ad);
-       rc = smk_bu_note("USB signal", skp, tkp, MAY_WRITE, rc);
+       rc = smk_access(skp, tkp, MAY_DELIVER, &ad);
+       rc = smk_bu_note("USB signal", skp, tkp, MAY_DELIVER, rc);
        return rc;
 }