smack: Fix a bidirectional UDS connect check typo 97/55797/2
authorZbigniew Jasinski <z.jasinski@samsung.com>
Mon, 29 Dec 2014 14:34:58 +0000 (15:34 +0100)
committerSeung-Woo Kim <sw0312.kim@samsung.com>
Wed, 30 Dec 2015 00:59:06 +0000 (09:59 +0900)
The 54e70ec5eb090193b03e69d551fa6771a5a217c4 commit introduced a
bidirectional check that should have checked for mutual WRITE access
between two labels. Due to a typo subject's OUT label is checked with
object's OUT. Should be OUT to IN.

Change-Id: I020748ac01bb12ed421be4ee20ab8d922c3399fe
Signed-off-by: Zbigniew Jasinski <z.jasinski@samsung.com>
[Backport from mainline to 3.10]
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
security/smack/smack_lsm.c

index 5ebb442..9f6357c 100644 (file)
@@ -3334,7 +3334,7 @@ static int smack_unix_stream_connect(struct sock *sock,
 
        if (!smack_privileged(CAP_MAC_OVERRIDE)) {
                skp = ssp->smk_out;
-               okp = osp->smk_out;
+               okp = osp->smk_in;
 #ifdef CONFIG_AUDIT
                smk_ad_init_net(&ad, __func__, LSM_AUDIT_DATA_NET, &net);
                smk_ad_setfield_u_net_sk(&ad, other);
@@ -3343,6 +3343,8 @@ static int smack_unix_stream_connect(struct sock *sock,
                rc = smk_bu_note("UDS connect", skp, okp->smk_known,
                                        MAY_WRITE, rc);
                if (rc == 0) {
+                       okp = osp->smk_out;
+                       skp = ssp->smk_in;
                        rc = smk_access(okp, skp->smk_known, MAY_WRITE, NULL);
                        rc = smk_bu_note("UDS connect", okp, skp->smk_known,
                                                MAY_WRITE, rc);