summaryrefslogtreecommitdiffstats
path: root/security/smack
diff options
context:
space:
mode:
authorJames Morris2016-07-07 02:15:34 +0200
committerJames Morris2016-07-07 02:15:34 +0200
commitd011a4d861ce583466a8ae72a0c8e7f51c8cba4e (patch)
tree1ff8dfe7d486f5648e69ee85e54cde1987d8296a /security/smack
parentima: extend the measurement entry specific pcr (diff)
parentnetlabel: Implement CALIPSO config functions for SMACK. (diff)
downloadkernel-qcow2-linux-d011a4d861ce583466a8ae72a0c8e7f51c8cba4e.tar.gz
kernel-qcow2-linux-d011a4d861ce583466a8ae72a0c8e7f51c8cba4e.tar.xz
kernel-qcow2-linux-d011a4d861ce583466a8ae72a0c8e7f51c8cba4e.zip
Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'security/smack')
-rw-r--r--security/smack/smack_lsm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 6777295f4b2b..722f3844286b 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -3992,7 +3992,7 @@ access_check:
rc = smk_bu_note("IPv4 delivery", skp, ssp->smk_in,
MAY_WRITE, rc);
if (rc != 0)
- netlbl_skbuff_err(skb, rc, 0);
+ netlbl_skbuff_err(skb, sk->sk_family, rc, 0);
break;
#if IS_ENABLED(CONFIG_IPV6)
case PF_INET6: