Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/selinux into next

This commit is contained in:
James Morris
2016-07-07 10:15:34 +10:00
36 changed files with 3511 additions and 259 deletions

View File

@@ -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: