summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSooyoung Ha <yoosah.ha@samsung.com>2016-06-20 11:53:15 +0900
committerSooyoung Ha <yoosah.ha@samsung.com>2016-06-20 11:53:22 +0900
commit7e20f3b88f0dfd2b1114df842204d8891eafa21c (patch)
treedd20b438c0984ca7e6900ae4b3c5035f005d9e7a
parente506b9244224f354ea75ff437fb745eabcea3390 (diff)
downloademulator-kernel-7e20f3b88f0dfd2b1114df842204d8891eafa21c.tar.gz
emulator-kernel-7e20f3b88f0dfd2b1114df842204d8891eafa21c.tar.bz2
emulator-kernel-7e20f3b88f0dfd2b1114df842204d8891eafa21c.zip
Revert "Smack: secmark connections"
This reverts commit 6ba4ad7bf7475bb7d4fdf2374d921e0ef7be7f8f. Change-Id: I5c6fc1260855249e5086a8dfcb6361c949795213 Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
-rw-r--r--security/smack/smack_lsm.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 65f947402782..5b367d320ee7 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -3929,18 +3929,6 @@ static int smack_inet_conn_request(struct sock *sk, struct sk_buff *skb,
}
#endif /* CONFIG_IPV6 */
-#ifdef CONFIG_SECURITY_SMACK_NETFILTER
- /*
- * If there is a secmark use it rather than the CIPSO label.
- * If there is no secmark fall back to CIPSO.
- * The secmark is assumed to reflect policy better.
- */
- if (skb && skb->secmark != 0) {
- skp = smack_from_secid(skb->secmark);
- goto access_check;
- }
-#endif /* CONFIG_SECURITY_SMACK_NETFILTER */
-
netlbl_secattr_init(&secattr);
rc = netlbl_skbuff_getattr(skb, family, &secattr);
if (rc == 0)
@@ -3949,10 +3937,6 @@ static int smack_inet_conn_request(struct sock *sk, struct sk_buff *skb,
skp = &smack_known_huh;
netlbl_secattr_destroy(&secattr);
-#ifdef CONFIG_SECURITY_SMACK_NETFILTER
-access_check:
-#endif
-
#ifdef CONFIG_AUDIT
smk_ad_init_net(&ad, __func__, LSM_AUDIT_DATA_NET, &net);
ad.a.u.net->family = family;