Skip to contentSkip to conversation

net: sctp: rfc4443: do not report ICMP redirects to user space

PATCH In review Daniel Borkmann 2 participants 2 messages Sep 16, 2013 – Sep 17, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: sctp: rfc4443: do not report ICMP redirects to user space

Adapt the same behaviour for SCTP as present in TCP for ICMP redirect messages. For IPv6, RFC4443, section 2.4. says:

...
(e) An ICMPv6 error message MUST NOT be originated as a result of receiving the following:
...
(e.2) An ICMPv6 redirect message [IPv6-DISC].
...

Therefore, do not report an error to user space, just invoke dst's redirect callback and leave, same for IPv4 as done in TCP as well. The implication w/o having this patch could be that the reception of such packets would generate a poll notification and in worst case it could even tear down the whole connection. Therefore, stop updating sk_err on redirects.

---
 net/sctp/input.c | 3 +--
 net/sctp/ipv6.c  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
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;
 	}
Signature · 1 line
1.7.11.7
maintainer
#1 lore raw

From: Daniel Borkmann <[email protected]>
Date: Mon, 16 Sep 2013 12:36:02 +0200

Quoted 16 lines

Adapt the same behaviour for SCTP as present in TCP for ICMP redirect messages. For IPv6, RFC4443, section 2.4. says:

...
(e) An ICMPv6 error message MUST NOT be originated as a result of receiving the following:
...
(e.2) An ICMPv6 redirect message [IPv6-DISC].
...

Therefore, do not report an error to user space, just invoke dst's redirect callback and leave, same for IPv4 as done in TCP as well. The implication w/o having this patch could be that the reception of such packets would generate a poll notification and in worst case it could even tear down the whole connection. Therefore, stop updating sk_err on redirects.

Quoted 4 lines

Applied and queued up for -stable, thanks Daniel.