aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorChad Hanson <chanson@trustedcs.com>2013-12-23 17:45:01 -0500
committerPaul Moore <pmoore@redhat.com>2013-12-23 17:45:17 -0500
commit46d01d63221c3508421dd72ff9c879f61053cffc (patch)
treea540d957750613679ab917082b9d88e7f8561959 /security
parentf5835372ebedf26847c2b9e193284075cc9c1f7f (diff)
downloadlinux-46d01d63221c3508421dd72ff9c879f61053cffc.tar.gz
selinux: fix broken peer recv check
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> Cc: stable@vger.kernel.org Signed-off-by: Paul Moore <pmoore@redhat.com>
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 419491d8e7d..5db26468b5c 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -4334,8 +4334,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) {