Skip to contentSkip to conversation

ipv6: Do route updating for redirect in ndisc layer

PATCH In review Duan Jiong 4 participants 6 messages Sep 9, 2013 – Sep 12, 2013

Subsystems (7)
lore
Share & tools
lore

Duan Jiong

author
#0 lore raw

PATCH 1/1 ipv6: Do route updating for redirect in ndisc layer

From: Duan Jiong <[email protected]>

In rfc2473, we can know that the tunnel ICMP redirect message should not be reported to the source of the original packet, so after calling ip6_tnl_err(), the rel_msg is set to 0 in function ip4ip6_err(), and the redirect will never be handled.

In order to deal with this, we have to choices:
1.move the call to ->redirect to ip6_tnl_err
and afterwards set rel_msg to 0
2.factor out the calls to ->redirect into the
ndisc layer

In this patch , i choose the second one, because i found the ip6_redirect() could be replaced with ip6_redirect_no_header(), we could always use ip6_redirect() for route updating in ndisc layer and use the data of the redirected header option just for finding the socket to be notified and then notify user in protocols' err_handler.

---
 include/net/ip6_route.h |  3 ---
 net/dccp/ipv6.c         |  7 -------
 net/ipv6/ah6.c          |  4 +---
 net/ipv6/esp6.c         |  4 +---
 net/ipv6/icmp.c         |  2 --
 net/ipv6/ip6_tunnel.c   |  5 -----
 net/ipv6/ipcomp6.c      |  4 +---
 net/ipv6/ndisc.c        |  6 ++----
 net/ipv6/raw.c          |  2 --
 net/ipv6/route.c        | 29 ++---------------------------
 net/ipv6/tcp_ipv6.c     |  8 --------
 net/ipv6/udp.c          |  2 --
 net/sctp/input.c        | 12 ------------
 net/sctp/ipv6.c         |  3 ---
 14 files changed, 7 insertions(+), 84 deletions(-)
include/net/ip6_route.h +0 -3
index f525e70..5db259e 100644
@@ -133,9 +133,6 @@ extern void ip6_update_pmtu(struct sk_buff *skb, struct net *net, __be32 mtu,
 extern void ip6_sk_update_pmtu(struct sk_buff *skb, struct sock *sk,
 			       __be32 mtu);
 extern void ip6_redirect(struct sk_buff *skb, struct net *net, int oif, u32 mark);
-extern void ip6_redirect_no_header(struct sk_buff *skb, struct net *net, int oif,
-				   u32 mark);
-extern void ip6_sk_redirect(struct sk_buff *skb, struct sock *sk);
 
 struct netlink_callback;
 
net/dccp/ipv6.c +0 -7
index 9c61f9c..ed124f7 100644
@@ -130,13 +130,6 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 
 	np = inet6_sk(sk);
 
-	if (type == NDISC_REDIRECT) {
-		struct dst_entry *dst = __sk_dst_check(sk, np->dst_cookie);
-
-		if (dst)
-			dst->ops->redirect(dst, sk, skb);
-	}
-
 	if (type == ICMPV6_PKT_TOOBIG) {
 		struct dst_entry *dst = NULL;
 
net/ipv6/ah6.c +1 -3
index 73784c3..084c1e7 100644
@@ -627,9 +627,7 @@ static void ah6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 	if (!x)
 		return;
 
-	if (type == NDISC_REDIRECT)
-		ip6_redirect(skb, net, skb->dev->ifindex, 0);
-	else
+	if (type == ICMPV6_PKT_TOOBIG)
 		ip6_update_pmtu(skb, net, info, 0, 0);
 	xfrm_state_put(x);
 }
net/ipv6/esp6.c +1 -3
index d3618a7..b65f9c3 100644
@@ -446,9 +446,7 @@ static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 	if (!x)
 		return;
 
-	if (type == NDISC_REDIRECT)
-		ip6_redirect(skb, net, skb->dev->ifindex, 0);
-	else
+	if (type == ICMPV6_PKT_TOOBIG)
 		ip6_update_pmtu(skb, net, info, 0, 0);
 	xfrm_state_put(x);
 }
net/ipv6/icmp.c +0 -2
index eef8d94..4bde43c 100644
@@ -91,8 +91,6 @@ static void icmpv6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 
 	if (type == ICMPV6_PKT_TOOBIG)
 		ip6_update_pmtu(skb, net, info, 0, 0);
-	else if (type == NDISC_REDIRECT)
-		ip6_redirect(skb, net, skb->dev->ifindex, 0);
 
 	if (!(type & ICMPV6_INFOMSG_MASK))
 		if (icmp6->icmp6_type == ICMPV6_ECHO_REQUEST)
net/ipv6/ip6_tunnel.c +0 -5
index 61355f7..3ea834b 100644
@@ -576,9 +576,6 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 		rel_type = ICMP_DEST_UNREACH;
 		rel_code = ICMP_FRAG_NEEDED;
 		break;
-	case NDISC_REDIRECT:
-		rel_type = ICMP_REDIRECT;
-		rel_code = ICMP_REDIR_HOST;
 	default:
 		return 0;
 	}
@@ -637,8 +634,6 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 
 		skb_dst(skb2)->ops->update_pmtu(skb_dst(skb2), NULL, skb2, rel_info);
 	}
-	if (rel_type == ICMP_REDIRECT)
-		skb_dst(skb2)->ops->redirect(skb_dst(skb2), NULL, skb2);
 
 	icmp_send(skb2, rel_type, rel_code, htonl(rel_info));
 
net/ipv6/ipcomp6.c +1 -3
index 5636a91..9624058 100644
@@ -75,9 +75,7 @@ static void ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 	if (!x)
 		return;
 
-	if (type == NDISC_REDIRECT)
-		ip6_redirect(skb, net, skb->dev->ifindex, 0);
-	else
+	if (type == ICMPV6_PKT_TOOBIG)
 		ip6_update_pmtu(skb, net, info, 0, 0);
 	xfrm_state_put(x);
 }
net/ipv6/ndisc.c +2 -4
index 1217945..e990f09 100644
@@ -1368,11 +1368,9 @@ static void ndisc_redirect_rcv(struct sk_buff *skb)
 	if (!ndisc_parse_options(msg->opt, ndoptlen, &ndopts))
 		return;
 
-	if (!ndopts.nd_opts_rh) {
-		ip6_redirect_no_header(skb, dev_net(skb->dev),
-					skb->dev->ifindex, 0);
+	ip6_redirect(skb, dev_net(skb->dev), skb->dev->ifindex, 0);
+	if (!ndopts.nd_opts_rh)
 		return;
-	}
 
 	hdr = (u8 *)ndopts.nd_opts_rh;
 	hdr += 8;
net/ipv6/raw.c +0 -2
index 58916bb..ea62e1f 100644
@@ -335,8 +335,6 @@ static void rawv6_err(struct sock *sk, struct sk_buff *skb,
 		ip6_sk_update_pmtu(skb, sk, info);
 		harderr = (np->pmtudisc == IPV6_PMTUDISC_DO);
 	}
-	if (type == NDISC_REDIRECT)
-		ip6_sk_redirect(skb, sk);
 	if (np->recverr) {
 		u8 *payload = skb->data;
 		if (!inet->hdrincl)
net/ipv6/route.c +2 -27
index c979dd9..151bd6c 100644
@@ -1227,27 +1227,7 @@ static struct dst_entry *ip6_route_redirect(struct net *net,
 				flags, __ip6_route_redirect);
 }
 
-void ip6_redirect(struct sk_buff *skb, struct net *net, int oif, u32 mark)
-{
-	const struct ipv6hdr *iph = (struct ipv6hdr *) skb->data;
-	struct dst_entry *dst;
-	struct flowi6 fl6;
-
-	memset(&fl6, 0, sizeof(fl6));
-	fl6.flowi6_oif = oif;
-	fl6.flowi6_mark = mark;
-	fl6.flowi6_flags = 0;
-	fl6.daddr = iph->daddr;
-	fl6.saddr = iph->saddr;
-	fl6.flowlabel = ip6_flowinfo(iph);
-
-	dst = ip6_route_redirect(net, &fl6, &ipv6_hdr(skb)->saddr);
-	rt6_do_redirect(dst, NULL, skb);
-	dst_release(dst);
-}
-EXPORT_SYMBOL_GPL(ip6_redirect);
-
-void ip6_redirect_no_header(struct sk_buff *skb, struct net *net, int oif,
+void ip6_redirect(struct sk_buff *skb, struct net *net, int oif,
 			    u32 mark)
 {
 	const struct ipv6hdr *iph = ipv6_hdr(skb);
@@ -1266,12 +1246,7 @@ void ip6_redirect_no_header(struct sk_buff *skb, struct net *net, int oif,
 	rt6_do_redirect(dst, NULL, skb);
 	dst_release(dst);
 }
-
-void ip6_sk_redirect(struct sk_buff *skb, struct sock *sk)
-{
-	ip6_redirect(skb, sock_net(sk), sk->sk_bound_dev_if, sk->sk_mark);
-}
-EXPORT_SYMBOL_GPL(ip6_sk_redirect);
+EXPORT_SYMBOL_GPL(ip6_redirect);
 
 static unsigned int ip6_default_advmss(const struct dst_entry *dst)
 {
net/ipv6/tcp_ipv6.c +0 -8
index 5c71501..61fe8e5 100644
@@ -382,14 +382,6 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 
 	np = inet6_sk(sk);
 
-	if (type == NDISC_REDIRECT) {
-		struct dst_entry *dst = __sk_dst_check(sk, np->dst_cookie);
-
-		if (dst)
-			dst->ops->redirect(dst, sk, skb);
-		goto out;
-	}
-
 	if (type == ICMPV6_PKT_TOOBIG) {
 		/* We are not interested in TCP_LISTEN and open_requests
 		 * (SYN-ACKs send out by Linux are always <576bytes so
net/ipv6/udp.c +0 -2
index f405815..a40b392 100644
@@ -525,8 +525,6 @@ void __udp6_lib_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 
 	if (type == ICMPV6_PKT_TOOBIG)
 		ip6_sk_update_pmtu(skb, sk, info);
-	if (type == NDISC_REDIRECT)
-		ip6_sk_redirect(skb, sk);
 
 	np = inet6_sk(sk);
 
net/sctp/input.c +0 -12
index 5f20686..0d2d4b7 100644
@@ -413,18 +413,6 @@ void sctp_icmp_frag_needed(struct sock *sk, struct sctp_association *asoc,
 	sctp_retransmit(&asoc->outqueue, t, SCTP_RTXR_PMTUD);
 }
 
-void sctp_icmp_redirect(struct sock *sk, struct sctp_transport *t,
-			struct sk_buff *skb)
-{
-	struct dst_entry *dst;
-
-	if (!t)
-		return;
-	dst = sctp_transport_dst_check(t);
-	if (dst)
-		dst->ops->redirect(dst, sk, skb);
-}
-
 /*
  * SCTP Implementer's Guide, 2.37 ICMP handling procedures
  *
net/sctp/ipv6.c +0 -3
index da613ce..1d143d1 100644
@@ -181,9 +181,6 @@ static void sctp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 			goto out_unlock;
 		}
 		break;
-	case NDISC_REDIRECT:
-		sctp_icmp_redirect(sk, transport, skb);
-		break;
 	default:
 		break;
 	}
Signature · 1 line
1.8.3.1
#1 lore raw
Quoted 6 lines · Duan Jiong
net/ipv6/tcp_ipv6.c +0 -0
index 5c71501..61fe8e5 100644
@@ -382,14 +382,6 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 

net/ipv6/tcp_ipv6.c static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, · line 392

Quoted 10 lines
net/ipv6/tcp_ipv6.c +0 -8
 	np = inet6_sk(sk);
 
-	if (type == NDISC_REDIRECT) {
-		struct dst_entry *dst = __sk_dst_check(sk, np->dst_cookie);
-
-		if (dst)
-			dst->ops->redirect(dst, sk, skb);
-		goto out;
-	}
-

You dropped the "goto out" here in case of an NDISC_REDIRECT, so this sends an EPROTO further up the socket layer. Was this intended?

Also:

In some _err() functions there is this check, e.g. ah6.c:

    621         if (type != ICMPV6_DEST_UNREACH &&
    622             type != ICMPV6_PKT_TOOBIG &&
    623             type != NDISC_REDIRECT)
    624                 return;

It could actually be adjusted now as we don't handle NDISC_REDIRECTs here any more. I don't see any side-effects down the code in these functions. We could also only just match on ICMPV6_PKT_TOOBIG. Can you confirm?

Greetings,

Hannes

author
#2 lore raw
Quoted 9 lines · Hannes Frederic Sowa
Quoted 8 lines · Duan Jiong
net/ipv6/tcp_ipv6.c +0 -0
index 5c71501..61fe8e5 100644
@@ -382,14 +382,6 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 
 	np = inet6_sk(sk);
 
Quoted 12 lines

net/ipv6/tcp_ipv6.c static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, · line 392

Quoted 8 lines
net/ipv6/tcp_ipv6.c +0 -8
-	if (type == NDISC_REDIRECT) {
-		struct dst_entry *dst = __sk_dst_check(sk, np->dst_cookie);
-
-		if (dst)
-			dst->ops->redirect(dst, sk, skb);
-		goto out;
-	}
-

You dropped the "goto out" here in case of an NDISC_REDIRECT, so this sends an EPROTO further up the socket layer. Was this intended?

I'm sorry, i didn't notice the variable err was assigned to EPROTO. I only thought that message should be sent to the socket layer, because i found that in function sctp_v6_err().

In addition, the rfc 4443 said the Redirect Message is not the ICMPv6 Error Message, so i think we shouldn't call those err_handler function, in other words we shouldn't call the icmpv6_notify().

How do you think of this?

Quoted 4 lines

Also:

In some _err() functions there is this check, e.g. ah6.c:

Quoted 9 lines
    621         if (type != ICMPV6_DEST_UNREACH &&
    622             type != ICMPV6_PKT_TOOBIG &&
    623             type != NDISC_REDIRECT)
    624                 return;

It could actually be adjusted now as we don't handle NDISC_REDIRECTs here any more. I don't see any side-effects down the code in these functions. We could also only just match on ICMPV6_PKT_TOOBIG. Can you confirm?

Yes, i agree this.

Thanks,
Duan

#3 lore raw

[added Cc to Daniel and Vlad because of ipv6/sctp/redirect problem]

Quoted 27 lines · Duan Jiong
Quoted 9 lines · Hannes Frederic Sowa
Quoted 8 lines · Duan Jiong
net/ipv6/tcp_ipv6.c +0 -0
index 5c71501..61fe8e5 100644
@@ -382,14 +382,6 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 
 	np = inet6_sk(sk);
 
Quoted 12 lines

net/ipv6/tcp_ipv6.c static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, · line 392

Quoted 8 lines
net/ipv6/tcp_ipv6.c +0 -8
-	if (type == NDISC_REDIRECT) {
-		struct dst_entry *dst = __sk_dst_check(sk, np->dst_cookie);
-
-		if (dst)
-			dst->ops->redirect(dst, sk, skb);
-		goto out;
-	}
-

You dropped the "goto out" here in case of an NDISC_REDIRECT, so this sends an EPROTO further up the socket layer. Was this intended?

I'm sorry, i didn't notice the variable err was assigned to EPROTO. I only thought that message should be sent to the socket layer, because i found that in function sctp_v6_err().

Quoted 5 lines

In addition, the rfc 4443 said the Redirect Message is not the ICMPv6 Error Message, so i think we shouldn't call those err_handler function, in other words we shouldn't call the icmpv6_notify().

How do you think of this?

Hm, thats hard.

First of, when the kernel started publishing these errors it had a contract with user-space we cannot break now. This includes all error handling functions which call ipv6_icmp_error. So we only have to care about INET6_PROTO_FINAL protocols, bbecause they mostly operate in socket space (in this case these are the raw and the udp protocol and currently sctp). Especially I do think it is important to report the redirects to raw sockets. The other non-final protocols only need to be notified for mtu reduction currently. Maybe we could stop notifying non-final protocols for redirects, but I don't think this will improve things.

Also we cannot know if the router sending the redirect discarded the original packet or if it forwarded it just notifying us of a better route, so we don't know if an actual error happend. So I would do the same thing as IPv4 sockets, set sk_err to zero and queue up the icmp packet on the socket's error queue (for udp and raw).

Regarding notifying tcp sockets about the redirect seems wrong. It would generate a poll notification and I do think it could even tear down the whole connection. I guess sctp should also stop updating sk_err on redirects. But let's Cc Daniel and Vlad about this. My guess is that sctp could go into some error recovery mode because of this which would be wrong.

So, for this patch I would leave the logic as is and not change anything at the error reporting. Maybe Daniel and Vlad could check if we should suppress redirect information for ipv6 in sctp, too? But this should go into another patch. Regarding the EPROTO problem in raw and udp, let's see if all the problems go away if we update icmpv6_err_convert to set *err to 0.

Greetings,

Hannes

#4 lore raw
Quoted 54 lines · Hannes Frederic Sowa

[added Cc to Daniel and Vlad because of ipv6/sctp/redirect problem]

Quoted 27 lines · Duan Jiong
Quoted 9 lines · Hannes Frederic Sowa
Quoted 8 lines · Duan Jiong
net/ipv6/tcp_ipv6.c +0 -0
index 5c71501..61fe8e5 100644
@@ -382,14 +382,6 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 
  	np = inet6_sk(sk);
 
Quoted 12 lines

net/ipv6/tcp_ipv6.c static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, · line 392

Quoted 8 lines
net/ipv6/tcp_ipv6.c +0 -8
-	if (type == NDISC_REDIRECT) {
-		struct dst_entry *dst = __sk_dst_check(sk, np->dst_cookie);
-
-		if (dst)
-			dst->ops->redirect(dst, sk, skb);
-		goto out;
-	}
-

You dropped the "goto out" here in case of an NDISC_REDIRECT, so this sends an EPROTO further up the socket layer. Was this intended?

I'm sorry, i didn't notice the variable err was assigned to EPROTO. I only thought that message should be sent to the socket layer, because i found that in function sctp_v6_err().

Quoted 5 lines

In addition, the rfc 4443 said the Redirect Message is not the ICMPv6 Error Message, so i think we shouldn't call those err_handler function, in other words we shouldn't call the icmpv6_notify().

How do you think of this?

Hm, thats hard.

First of, when the kernel started publishing these errors it had a contract with user-space we cannot break now. This includes all error handling functions which call ipv6_icmp_error. So we only have to care about INET6_PROTO_FINAL protocols, bbecause they mostly operate in socket space (in this case these are the raw and the udp protocol and currently sctp). Especially I do think it is important to report the redirects to raw sockets. The other non-final protocols only need to be notified for mtu reduction currently. Maybe we could stop notifying non-final protocols for redirects, but I don't think this will improve things.

Also we cannot know if the router sending the redirect discarded the original packet or if it forwarded it just notifying us of a better route, so we don't know if an actual error happend. So I would do the same thing as IPv4 sockets, set sk_err to zero and queue up the icmp packet on the socket's error queue (for udp and raw).

Quoted 6 lines

Regarding notifying tcp sockets about the redirect seems wrong. It would generate a poll notification and I do think it could even tear down the whole connection. I guess sctp should also stop updating sk_err on redirects. But let's Cc Daniel and Vlad about this. My guess is that sctp could go into some error recovery mode because of this which would be wrong.

You are right. SCTP 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.

Thanks
-vlad

Quoted 17 lines

So, for this patch I would leave the logic as is and not change anything at the error reporting. Maybe Daniel and Vlad could check if we should suppress redirect information for ipv6 in sctp, too? But this should go into another patch. Regarding the EPROTO problem in raw and udp, let's see if all the problems go away if we update icmpv6_err_convert to set *err to 0.

Greetings,

Hannes

--
To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#5 lore raw
Quoted 62 lines · Vlad Yasevich
Quoted 54 lines · Hannes Frederic Sowa

[added Cc to Daniel and Vlad because of ipv6/sctp/redirect problem]

Quoted 27 lines · Duan Jiong
Quoted 9 lines · Hannes Frederic Sowa
Quoted 8 lines · Duan Jiong
net/ipv6/tcp_ipv6.c +0 -0
index 5c71501..61fe8e5 100644
@@ -382,14 +382,6 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 
      np = inet6_sk(sk);
 
Quoted 12 lines

net/ipv6/tcp_ipv6.c static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, · line 392

Quoted 8 lines
net/ipv6/tcp_ipv6.c +0 -8
-    if (type == NDISC_REDIRECT) {
-        struct dst_entry *dst = __sk_dst_check(sk, np->dst_cookie);
-
-        if (dst)
-            dst->ops->redirect(dst, sk, skb);
-        goto out;
-    }
-

You dropped the "goto out" here in case of an NDISC_REDIRECT, so this sends an EPROTO further up the socket layer. Was this intended?

I'm sorry, i didn't notice the variable err was assigned to EPROTO. I only thought that message should be sent to the socket layer, because i found that in function sctp_v6_err().

Quoted 5 lines

In addition, the rfc 4443 said the Redirect Message is not the ICMPv6 Error Message, so i think we shouldn't call those err_handler function, in other words we shouldn't call the icmpv6_notify().

How do you think of this?

Hm, thats hard.

First of, when the kernel started publishing these errors it had a contract with user-space we cannot break now. This includes all error handling functions which call ipv6_icmp_error. So we only have to care about INET6_PROTO_FINAL protocols, bbecause they mostly operate in socket space (in this case these are the raw and the udp protocol and currently sctp). Especially I do think it is important to report the redirects to raw sockets. The other non-final protocols only need to be notified for mtu reduction currently. Maybe we could stop notifying non-final protocols for redirects, but I don't think this will improve things.

Also we cannot know if the router sending the redirect discarded the original packet or if it forwarded it just notifying us of a better route, so we don't know if an actual error happend. So I would do the same thing as IPv4 sockets, set sk_err to zero and queue up the icmp packet on the socket's error queue (for udp and raw).

Quoted 6 lines

Regarding notifying tcp sockets about the redirect seems wrong. It would generate a poll notification and I do think it could even tear down the whole connection. I guess sctp should also stop updating sk_err on redirects. But let's Cc Daniel and Vlad about this. My guess is that sctp could go into some error recovery mode because of this which would be wrong.

Quoted 2 lines

You are right. SCTP 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.

Yep, probably something like ...

net/sctp/input.c +1 -2
index 5f20686..98b69bb 100644
@@ -634,8 +634,7 @@ void sctp_v4_err(struct sk_buff *skb, __u32 info)
                break;
        case ICMP_REDIRECT:
                sctp_icmp_redirect(sk, transport, skb);
-               err = 0;
-               break;
+               /* Fall through to out_unlock. */
        default:
                goto out_unlock;
        }
net/sctp/ipv6.c +1 -1
index 4f52e2c..e7b2d4f 100644
@@ -183,7 +183,7 @@ static void sctp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
                break;
        case NDISC_REDIRECT:
                sctp_icmp_redirect(sk, transport, skb);
-               break;
+               goto out_unlock;
        default:
                break;
        }
Quoted 21 lines

Thanks
-vlad

Quoted 17 lines

So, for this patch I would leave the logic as is and not change anything at the error reporting. Maybe Daniel and Vlad could check if we should suppress redirect information for ipv6 in sctp, too? But this should go into another patch. Regarding the EPROTO problem in raw and udp, let's see if all the problems go away if we update icmpv6_err_convert to set *err to 0.

Greetings,

Hannes

--
To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html