From: Chad Hanson <chanson@trustedcs.com>
Date: Mon, 23 Dec 2013 22:45:01 +0000 (-0500)
Subject: selinux: fix broken peer recv check
X-Git-Tag: v3.2.55~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3831c7b4d90558d946d67c83cc04c6eca2a9ef99;p=people%2Fms%2Flinux.git

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

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 5898f342ee47..b910072eaaad 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) {