Skip to contentSkip to conversation

ipv6: move ip6_sk_accept_pmtu from generic pmtu update path to ipv6 one

PATCH In review Hannes Frederic Sowa 2 participants 2 messages Dec 19, 2013

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

PATCH 1/1 ipv6: move ip6_sk_accept_pmtu from generic pmtu update path to ipv6 one

In commit 93b36cf3425b9b ("ipv6: support IPV6_PMTU_INTERFACE on sockets") I made a horrible mistake to add ip6_sk_accept_pmtu to the generic sctp_icmp_frag_needed path. This results in build warnings if IPv6 is disabled which were luckily caught by Fengguang's kbuild bot. But it also leads to a kernel panic IPv4 frag-needed packet is received.

---
 net/sctp/input.c | 3 ---
 net/sctp/ipv6.c  | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)
net/sctp/input.c +0 -3
index 042ec6c..2a192a7 100644
@@ -389,9 +389,6 @@ void sctp_icmp_frag_needed(struct sock *sk, struct sctp_association *asoc,
 	if (!t || (t->pathmtu <= pmtu))
 		return;
 
-	if (!ip6_sk_accept_pmtu(sk))
-		return;
-
 	if (sock_owned_by_user(sk)) {
 		asoc->pmtu_pending = 1;
 		t->pmtu_pending = 1;
net/sctp/ipv6.c +2 -1
index 32db816..00bea3f 100644
@@ -172,7 +172,8 @@ static void sctp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 
 	switch (type) {
 	case ICMPV6_PKT_TOOBIG:
-		sctp_icmp_frag_needed(sk, asoc, transport, ntohl(info));
+		if (ip6_sk_accept_pmtu(sk))
+			sctp_icmp_frag_needed(sk, asoc, transport, ntohl(info));
 		goto out_unlock;
 	case ICMPV6_PARAMPROB:
 		if (ICMPV6_UNK_NEXTHDR == code) {
Signature · 1 line
1.8.3.1
Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · Hannes Frederic Sowa

In commit 93b36cf3425b9b ("ipv6: support IPV6_PMTU_INTERFACE on sockets") I made a horrible mistake to add ip6_sk_accept_pmtu to the generic sctp_icmp_frag_needed path. This results in build warnings if IPv6 is disabled which were luckily caught by Fengguang's kbuild bot. But it also leads to a kernel panic IPv4 frag-needed packet is received.

Thanks, also cc'ing linux-sctp.

Fixes 93b36cf3425b ("ipv6: support IPV6_PMTU_INTERFACE on sockets")
Quoted 34 lines
---
  net/sctp/input.c | 3 ---
  net/sctp/ipv6.c  | 3 ++-
  2 files changed, 2 insertions(+), 4 deletions(-)
net/sctp/input.c +0 -3
index 042ec6c..2a192a7 100644
@@ -389,9 +389,6 @@ void sctp_icmp_frag_needed(struct sock *sk, struct sctp_association *asoc,
  	if (!t || (t->pathmtu <= pmtu))
  		return;
 
-	if (!ip6_sk_accept_pmtu(sk))
-		return;
-
  	if (sock_owned_by_user(sk)) {
  		asoc->pmtu_pending = 1;
  		t->pmtu_pending = 1;
net/sctp/ipv6.c +2 -1
index 32db816..00bea3f 100644
@@ -172,7 +172,8 @@ static void sctp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 
  	switch (type) {
  	case ICMPV6_PKT_TOOBIG:
-		sctp_icmp_frag_needed(sk, asoc, transport, ntohl(info));
+		if (ip6_sk_accept_pmtu(sk))
+			sctp_icmp_frag_needed(sk, asoc, transport, ntohl(info));
  		goto out_unlock;
  	case ICMPV6_PARAMPROB:
  		if (ICMPV6_UNK_NEXTHDR = code) {