From: jooseong lee Date: Fri, 2 Sep 2016 08:09:30 +0000 (+0900) Subject: Smack: Fix wrong backporting for Smack X-Git-Tag: accepted/tizen/mobile/20160905.065816~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d6e68cb0303d38fca82d33ef265e035cd9cfe442;p=profile%2Fmobile%2Fplatform%2Fkernel%2Flinux-3.10-sc7730.git Smack: Fix wrong backporting for Smack 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 --- diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index a7f2b5b..b72abc2 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -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);