Smack: Fix wrong backporting for Smack 67/86667/2
authorjooseong lee <jooseong.lee@samsung.com>
Fri, 2 Sep 2016 08:09:30 +0000 (17:09 +0900)
committerJoonyoung Shim <jy0922.shim@samsung.com>
Mon, 5 Sep 2016 01:05:23 +0000 (18:05 -0700)
Regard of:
Smack: secmark support for netfilter (d587ffac0e6b0849334d575bca4e9e1caa48f891)

Smack used to use a mix of smack_known struct and char* throughout its
APIs and implementation. I confused it. It should be char*, not smack_known struct.

(The latest kernel has a unified format, smack_known struct.)

Change-Id: Ifd93e8b3d85c867c8d7a903470abc45e589a1a37
Signed-off-by: jooseong lee <jooseong.lee@samsung.com>
security/smack/smack_lsm.c

index a7f2b5b..b72abc2 100644 (file)
@@ -3751,8 +3751,8 @@ access_check:
                ad.a.u.net->netif = skb->skb_iif;
                ipv6_skb_to_auditdata(skb, &ad.a, NULL);
 #endif /* CONFIG_AUDIT */
-               rc = smk_access(skp, ssp->smk_in, MAY_WRITE, &ad);
-               rc = smk_bu_note("IPv6 delivery", skp, ssp->smk_in,
+               rc = smk_access(skp, ssp->smk_in->smk_known, MAY_WRITE, &ad);
+               rc = smk_bu_note("IPv6 delivery", skp, ssp->smk_in->smk_known,
                                        MAY_WRITE, rc);
 #else /* CONFIG_SECURITY_SMACK_NETFILTER */
                rc = smk_ipv6_port_check(sk, &sadd, SMK_RECEIVING);