Commit 04f6d70f authored by Eric Paris's avatar Eric Paris Committed by David S. Miller

SELinux: Only return netlink error when we know the return is fatal

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: default avatarPaul Moore <paul.moore@hp.com>
Signed-off-by: default avatarEric Paris <eparis@redhat.com>
Reviewed-by: default avatarPaul Moore <paul.moore@hp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eb06acdc
...@@ -4589,7 +4589,7 @@ static unsigned int selinux_ip_postroute(struct sk_buff *skb, int ifindex, ...@@ -4589,7 +4589,7 @@ static unsigned int selinux_ip_postroute(struct sk_buff *skb, int ifindex,
} }
if (secmark_perm == PACKET__FORWARD_OUT) { if (secmark_perm == PACKET__FORWARD_OUT) {
if (selinux_skb_peerlbl_sid(skb, family, &peer_sid)) if (selinux_skb_peerlbl_sid(skb, family, &peer_sid))
return NF_DROP_ERR(-ECONNREFUSED); return NF_DROP;
} else } else
peer_sid = SECINITSID_KERNEL; peer_sid = SECINITSID_KERNEL;
} else { } else {
...@@ -4602,7 +4602,7 @@ static unsigned int selinux_ip_postroute(struct sk_buff *skb, int ifindex, ...@@ -4602,7 +4602,7 @@ static unsigned int selinux_ip_postroute(struct sk_buff *skb, int ifindex,
ad.u.net.netif = ifindex; ad.u.net.netif = ifindex;
ad.u.net.family = family; ad.u.net.family = family;
if (selinux_parse_skb(skb, &ad, &addrp, 0, NULL)) if (selinux_parse_skb(skb, &ad, &addrp, 0, NULL))
return NF_DROP_ERR(-ECONNREFUSED); return NF_DROP;
if (secmark_active) if (secmark_active)
if (avc_has_perm(peer_sid, skb->secmark, if (avc_has_perm(peer_sid, skb->secmark,
...@@ -4614,13 +4614,13 @@ static unsigned int selinux_ip_postroute(struct sk_buff *skb, int ifindex, ...@@ -4614,13 +4614,13 @@ static unsigned int selinux_ip_postroute(struct sk_buff *skb, int ifindex,
u32 node_sid; u32 node_sid;
if (sel_netif_sid(ifindex, &if_sid)) if (sel_netif_sid(ifindex, &if_sid))
return NF_DROP_ERR(-ECONNREFUSED); return NF_DROP;
if (avc_has_perm(peer_sid, if_sid, if (avc_has_perm(peer_sid, if_sid,
SECCLASS_NETIF, NETIF__EGRESS, &ad)) SECCLASS_NETIF, NETIF__EGRESS, &ad))
return NF_DROP_ERR(-ECONNREFUSED); return NF_DROP_ERR(-ECONNREFUSED);
if (sel_netnode_sid(addrp, family, &node_sid)) if (sel_netnode_sid(addrp, family, &node_sid))
return NF_DROP_ERR(-ECONNREFUSED); return NF_DROP;
if (avc_has_perm(peer_sid, node_sid, if (avc_has_perm(peer_sid, node_sid,
SECCLASS_NODE, NODE__SENDTO, &ad)) SECCLASS_NODE, NODE__SENDTO, &ad))
return NF_DROP_ERR(-ECONNREFUSED); return NF_DROP_ERR(-ECONNREFUSED);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment