diff options
author | Duan Jiong <duanj.fnst@cn.fujitsu.com> | 2013-09-18 20:03:27 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-13 16:08:30 -0700 |
commit | f25e4f35defd609b3e6ad2ae5e871bdbcc0af333 (patch) | |
tree | 6339668ddabe71b3155830b36c3ee3a9a52a36a8 /net | |
parent | e4e7ba12fab4eba6eb6fe2863a6e0e91cd77c7cc (diff) | |
download | linux-3.10-f25e4f35defd609b3e6ad2ae5e871bdbcc0af333.tar.gz linux-3.10-f25e4f35defd609b3e6ad2ae5e871bdbcc0af333.tar.bz2 linux-3.10-f25e4f35defd609b3e6ad2ae5e871bdbcc0af333.zip |
net:dccp: do not report ICMP redirects to user space
[ Upstream commit bd784a140712fd06674f2240eecfc4ccae421129 ]
DCCP shouldn't be setting sk_err on redirects as it
isn't an error condition. it should be doing exactly
what tcp is doing and leaving the error handler without
touching the socket.
Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r-- | net/dccp/ipv6.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index 9c61f9c02fd..6cf9f7782ad 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c @@ -135,6 +135,7 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, if (dst) dst->ops->redirect(dst, sk, skb); + goto out; } if (type == ICMPV6_PKT_TOOBIG) { |