aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorChad Hanson <chanson@trustedcs.com>2013-12-23 17:45:01 -0500
committerBen Hutchings <ben@decadent.org.uk>2014-02-15 19:20:15 +0000
commit3831c7b4d90558d946d67c83cc04c6eca2a9ef99 (patch)
tree335b0529d0dad8dfc8e753e45f4795b2688b807b /security
parent1af2979ff5d42c46e1e542d64184f100028132c1 (diff)
downloadkernel_samsung_smdk4412-3831c7b4d90558d946d67c83cc04c6eca2a9ef99.zip
kernel_samsung_smdk4412-3831c7b4d90558d946d67c83cc04c6eca2a9ef99.tar.gz
kernel_samsung_smdk4412-3831c7b4d90558d946d67c83cc04c6eca2a9ef99.tar.bz2
selinux: fix broken peer recv check
commit 46d01d63221c3508421dd72ff9c879f61053cffc upstream. Fix a broken networking check. Return an error if peer recv fails. If secmark is active and the packet recv succeeds the peer recv error is ignored. Signed-off-by: Chad Hanson <chanson@trustedcs.com> Signed-off-by: Paul Moore <pmoore@redhat.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'security')
-rw-r--r--security/selinux/hooks.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 5898f34..b910072 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -4181,8 +4181,10 @@ static int selinux_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)
}
err = avc_has_perm(sk_sid, peer_sid, SECCLASS_PEER,
PEER__RECV, &ad);
- if (err)
+ if (err) {
selinux_netlbl_err(skb, err, 0);
+ return err;
+ }
}
if (secmark_active) {