From: Eric Paris <eparis@redhat.com>
To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
selinux@tycho.nsa.gov, netfilter-devel@vger.kernel.org
Cc: eparis@redhat.com, equinox@diac24.net, eric.dumazet@gmail.com,
davem@davemloft.net, hzhong@gmail.com, jmorris@namei.org,
kaber@trash.net, kuznet@ms2.inr.ac.ru, paul.moore@hp.com,
pekkas@netcore.fi, sds@tycho.nsa.gov, yoshfuji@linux-ipv6.org
Subject: [PATCH 2/3] network: tcp_connect should return certain errors up the stack
Date: Tue, 16 Nov 2010 16:52:49 -0500 [thread overview]
Message-ID: <20101116215249.6727.89763.stgit@paris.rdu.redhat.com> (raw)
In-Reply-To: <20101116215238.6727.39248.stgit@paris.rdu.redhat.com>
The current tcp_connect code completely ignores errors from sending an skb.
This makes sense in many situations (like -ENOBUFFS) but I want to be able to
immediately fail connections if they are denied by the SELinux netfilter hook.
Netfilter does not normally return ECONNREFUSED when it drops a packet so we
respect that error code as a final and fatal error that can not be recovered.
Based-on-patch-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Eric Paris <eparis@redhat.com>
---
net/ipv4/tcp_output.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index e961522..15dcd7b 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -2592,6 +2592,7 @@ int tcp_connect(struct sock *sk)
{
struct tcp_sock *tp = tcp_sk(sk);
struct sk_buff *buff;
+ int err;
tcp_connect_init(sk);
@@ -2614,7 +2615,9 @@ int tcp_connect(struct sock *sk)
sk->sk_wmem_queued += buff->truesize;
sk_mem_charge(sk, buff->truesize);
tp->packets_out += tcp_skb_pcount(buff);
- tcp_transmit_skb(sk, buff, 1, sk->sk_allocation);
+ err = tcp_transmit_skb(sk, buff, 1, sk->sk_allocation);
+ if (err == -ECONNREFUSED)
+ return err;
/* We change tp->snd_nxt after the tcp_transmit_skb() call
* in order to make this packet get counted in tcpOutSegs.
next prev parent reply other threads:[~2010-11-16 21:55 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-16 21:52 [PATCH 1/3] netfilter: allow hooks to pass error code back " Eric Paris
2010-11-16 21:52 ` Eric Paris [this message]
2010-11-17 18:56 ` [PATCH 2/3] network: tcp_connect should return certain errors " David Miller
2010-11-16 21:52 ` [PATCH 3/3] SELinux: return -ECONNREFUSED from ip_postroute to signal fatal error Eric Paris
2010-11-17 11:43 ` Patrick McHardy
2010-11-17 14:38 ` Eric Paris
2010-11-17 18:55 ` David Miller
2010-11-17 18:56 ` David Miller
2010-11-19 15:11 ` Paul Moore
2010-11-17 18:55 ` [PATCH 1/3] netfilter: allow hooks to pass error code back up the stack David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101116215249.6727.89763.stgit@paris.rdu.redhat.com \
--to=eparis@redhat.com \
--cc=davem@davemloft.net \
--cc=equinox@diac24.net \
--cc=eric.dumazet@gmail.com \
--cc=hzhong@gmail.com \
--cc=jmorris@namei.org \
--cc=kaber@trash.net \
--cc=kuznet@ms2.inr.ac.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=paul.moore@hp.com \
--cc=pekkas@netcore.fi \
--cc=sds@tycho.nsa.gov \
--cc=selinux@tycho.nsa.gov \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome