]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
SELinux: Only return netlink error when we know the return is fatal
authorEric Paris <eparis@redhat.com>
Tue, 23 Nov 2010 06:28:02 +0000 (06:28 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 23 Nov 2010 18:50:17 +0000 (10:50 -0800)
Some of the SELinux netlink code returns a fatal error when the error might
actually be transient.  This patch just silently drops packets on
potentially transient errors but continues to return a permanant error
indicator when the denial was because of policy.

Based-on-comments-by: Paul Moore <paul.moore@hp.com>
Signed-off-by: Eric Paris <eparis@redhat.com>
Reviewed-by: Paul Moore <paul.moore@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
security/selinux/hooks.c

index 2c145f12d9917722a7f732f4a66c718d2f5b09ab..f590fb8e91430909246213934b17970f827870c7 100644 (file)
@@ -4589,7 +4589,7 @@ static unsigned int selinux_ip_postroute(struct sk_buff *skb, int ifindex,
                }
                if (secmark_perm == PACKET__FORWARD_OUT) {
                        if (selinux_skb_peerlbl_sid(skb, family, &peer_sid))
-                               return NF_DROP_ERR(-ECONNREFUSED);
+                               return NF_DROP;
                } else
                        peer_sid = SECINITSID_KERNEL;
        } else {
@@ -4602,7 +4602,7 @@ static unsigned int selinux_ip_postroute(struct sk_buff *skb, int ifindex,
        ad.u.net.netif = ifindex;
        ad.u.net.family = family;
        if (selinux_parse_skb(skb, &ad, &addrp, 0, NULL))
-               return NF_DROP_ERR(-ECONNREFUSED);
+               return NF_DROP;
 
        if (secmark_active)
                if (avc_has_perm(peer_sid, skb->secmark,
@@ -4614,13 +4614,13 @@ static unsigned int selinux_ip_postroute(struct sk_buff *skb, int ifindex,
                u32 node_sid;
 
                if (sel_netif_sid(ifindex, &if_sid))
-                       return NF_DROP_ERR(-ECONNREFUSED);
+                       return NF_DROP;
                if (avc_has_perm(peer_sid, if_sid,
                                 SECCLASS_NETIF, NETIF__EGRESS, &ad))
                        return NF_DROP_ERR(-ECONNREFUSED);
 
                if (sel_netnode_sid(addrp, family, &node_sid))
-                       return NF_DROP_ERR(-ECONNREFUSED);
+                       return NF_DROP;
                if (avc_has_perm(peer_sid, node_sid,
                                 SECCLASS_NODE, NODE__SENDTO, &ad))
                        return NF_DROP_ERR(-ECONNREFUSED);