Attachment 147252 Details for Bug 223818 – rediffed patch

[patch] rediffed patch

linux-kernel-test.patch (text/plain), 4.83 KB, created by Neil Horman on 2007-02-02 20:47:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neil Horman

Created: 2007-02-02 20:47:58 UTC

Size: 4.83 KB

patch

obsolete

>--- linux-2.6.9/include/net/sctp/sctp.h.orig	2007-02-02 13:54:37.000000000 -0500
>+++ linux-2.6.9/include/net/sctp/sctp.h	2007-02-02 13:59:40.000000000 -0500
>@@ -174,11 +174,9 @@ struct sctp_association *__sctp_lookup_a
> 	const union sctp_addr *,
> 	struct sctp_transport **);
> struct sock *sctp_err_lookup(int family, struct sk_buff *,
>-			     struct sctphdr *, struct sctp_endpoint **,
>-			     struct sctp_association **,
>+			     struct sctphdr *, struct sctp_association **,
> 			     struct sctp_transport **);
>-void sctp_err_finish(struct sock *, struct sctp_endpoint *,
>-			    struct sctp_association *);
>+void sctp_err_finish(struct sock *, struct sctp_association *);
> void sctp_icmp_frag_needed(struct sock *, struct sctp_association *,
> 			   struct sctp_transport *t, __u32 pmtu);
> 
>--- linux-2.6.9/net/sctp/ipv6.c.orig	2007-02-02 13:54:06.000000000 -0500
>+++ linux-2.6.9/net/sctp/ipv6.c	2007-02-02 13:59:40.000000000 -0500
>@@ -91,7 +91,6 @@ void sctp_v6_err(struct sk_buff *skb, st
> 	struct ipv6hdr *iph = (struct ipv6hdr *)skb->data;
> 	struct sctphdr *sh = (struct sctphdr *)(skb->data + offset);
> 	struct sock *sk;
>-	struct sctp_endpoint *ep;
> 	struct sctp_association *asoc;
> 	struct sctp_transport *transport;
> 	struct ipv6_pinfo *np;
>@@ -105,7 +104,7 @@ void sctp_v6_err(struct sk_buff *skb, st
> 	savesctp  = skb->h.raw;
> 	skb->nh.ipv6h = iph;
> 	skb->h.raw = (char *)sh;
>-	sk = sctp_err_lookup(AF_INET6, skb, sh, &ep, &asoc, &transport);
>+	sk = sctp_err_lookup(AF_INET6, skb, sh, &asoc, &transport);
> 	/* Put back, the original pointers. */
> 	skb->nh.raw = saveip;
> 	skb->h.raw = savesctp;
>@@ -136,7 +135,7 @@ void sctp_v6_err(struct sk_buff *skb, st
> 	}
> 
> out_unlock:
>-	sctp_err_finish(sk, ep, asoc);
>+	sctp_err_finish(sk, asoc);
> out:
> 	if (likely(idev != NULL))
> 		in6_dev_put(idev);
>--- linux-2.6.9/net/sctp/input.c.orig	2007-02-02 13:54:06.000000000 -0500
>+++ linux-2.6.9/net/sctp/input.c	2007-02-02 14:01:56.000000000 -0500
>@@ -378,7 +378,6 @@ void sctp_icmp_frag_needed(struct sock *
> /* Common lookup code for icmp/icmpv6 error handler. */
> struct sock *sctp_err_lookup(int family, struct sk_buff *skb,
> 			     struct sctphdr *sctphdr,
>-			     struct sctp_endpoint **epp,
> 			     struct sctp_association **app,
> 			     struct sctp_transport **tpp)
> {
>@@ -386,11 +385,10 @@ struct sock *sctp_err_lookup(int family,
> 	union sctp_addr daddr;
> 	struct sctp_af *af;
> 	struct sock *sk = NULL;
>-	struct sctp_endpoint *ep = NULL;
> 	struct sctp_association *asoc = NULL;
> 	struct sctp_transport *transport = NULL;
> 
>-	*app = NULL; *epp = NULL; *tpp = NULL;
>+	*app = NULL; *tpp = NULL;
> 
> 	af = sctp_get_af_specific(family);
> 	if (unlikely(!af)) {
>@@ -405,25 +403,15 @@ struct sock *sctp_err_lookup(int family,
> 	 * packet.
> 	 */
> 	asoc = __sctp_lookup_association(&saddr, &daddr, &transport);
>-	if (!asoc) {
>-		/* If there is no matching association, see if it matches any
>-		 * endpoint. This may happen for an ICMP error generated in
>-		 * response to an INIT_ACK.
>-		 */
>-		ep = __sctp_rcv_lookup_endpoint(&daddr);
>-		if (!ep) {
>-			return NULL;
>-		}
>-	}
>+	if (!asoc)
>+		return NULL;
> 
>-	if (asoc) {
>-		if (ntohl(sctphdr->vtag) != asoc->c.peer_vtag) {
>-			ICMP_INC_STATS_BH(ICMP_MIB_INERRORS);
>-			goto out;
>-		}
>-		sk = asoc->base.sk;
>-	} else
>-		sk = ep->base.sk;
>+	sk = asoc->base.sk;
>+
>+	if (ntohl(sctphdr->vtag) != asoc->c.peer_vtag) {
>+		ICMP_INC_STATS_BH(ICMP_MIB_INERRORS);
>+		goto out;
>+	}
> 
> 	sctp_bh_lock_sock(sk);
> 
>@@ -433,7 +421,6 @@ struct sock *sctp_err_lookup(int family,
> 	if (sock_owned_by_user(sk))
> 		NET_INC_STATS_BH(LINUX_MIB_LOCKDROPPEDICMPS);
> 
>-	*epp = ep;
> 	*app = asoc;
> 	*tpp = transport;
> 	return sk;
>@@ -441,20 +428,15 @@ struct sock *sctp_err_lookup(int family,
> out:
> 	if (asoc)
> 		sctp_association_put(asoc);
>-	if (ep)
>-		sctp_endpoint_put(ep);
> 	return NULL;
> }
> 
> /* Common cleanup code for icmp/icmpv6 error handler. */
>-void sctp_err_finish(struct sock *sk, struct sctp_endpoint *ep,
>-		     struct sctp_association *asoc)
>+void sctp_err_finish(struct sock *sk, struct sctp_association *asoc)
> {
> 	sctp_bh_unlock_sock(sk);
> 	if (asoc)
> 		sctp_association_put(asoc);
>-	if (ep)
>-		sctp_endpoint_put(ep);
> }
> 
> /*
>@@ -479,7 +461,6 @@ void sctp_v4_err(struct sk_buff *skb, __
> 	int type = skb->h.icmph->type;
> 	int code = skb->h.icmph->code;
> 	struct sock *sk;
>-	struct sctp_endpoint *ep;
> 	struct sctp_association *asoc;
> 	struct sctp_transport *transport;
> 	struct inet_opt *inet;
>@@ -496,7 +477,7 @@ void sctp_v4_err(struct sk_buff *skb, __
> 	savesctp  = skb->h.raw;
> 	skb->nh.iph = iph;
> 	skb->h.raw = (char *)sh;
>-	sk = sctp_err_lookup(AF_INET, skb, sh, &ep, &asoc, &transport);
>+	sk = sctp_err_lookup(AF_INET, skb, sh, &asoc, &transport);
> 	/* Put back, the original pointers. */
> 	skb->nh.raw = saveip;
> 	skb->h.raw = savesctp;
>@@ -546,7 +527,7 @@ void sctp_v4_err(struct sk_buff *skb, __
> 	}
> 
> out_unlock:
>-	sctp_err_finish(sk, ep, asoc);
>+	sctp_err_finish(sk, asoc);
> }
> 
> /*

Actions: View | Diff

Attachments on bug 223818: 147230 | 147252