drop queue-2.6.21/restore-semantics-of-routing-header-processing.patch

unclear what the final resolution for that problem will be.

diff --git a/queue-2.6.21/restore-semantics-of-routing-header-processing.patch b/queue-2.6.21/restore-semantics-of-routing-header-processing.patch
deleted file mode 100644 (file)
index 40b312e..0000000
--- a/queue-2.6.21/restore-semantics-of-routing-header-processing.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From stable-bounces@linux.kernel.org  Fri May 11 09:19:11 2007
-Date: Sat, 12 May 2007 01:17:28 +0900 (JST)
-Message-Id: <20070512.011728.16743460.yoshfuji@linux-ipv6.org>
-To: davem@davemloft.net
-From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
-Cc: yoshfuji@linux-ipv6.org, netdev@vger.kernel.org, stable@kernel.org
-Subject: IPV6: Restore semantics of Routing Header processing.
-
-The "fix" for emerging security threats was overkill and it broke
-basic semantic of IPv6 routing header processing.  We should assume
-RT0 (or even RT2, depends on configuration) as "unknown" RH type so
-that we
-- silently ignore the routing header if segleft == 0
-- or, send ICMPv6 Parameter Problem message back to the sender,
-  otherwise.
-
-Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
-Signed-off-by: Chris Wright <chrisw@sous-sol.org>
----
- net/ipv6/exthdrs.c |   46 ++++++++++++++++------------------------------
- 1 file changed, 16 insertions(+), 30 deletions(-)
-
---- linux-2.6.21.1.orig/net/ipv6/exthdrs.c
-+++ linux-2.6.21.1/net/ipv6/exthdrs.c
-@@ -368,22 +368,13 @@ static int ipv6_rthdr_rcv(struct sk_buff
-       struct rt0_hdr *rthdr;
-       int accept_source_route = ipv6_devconf.accept_source_route;
- 
--      if (accept_source_route < 0 ||
--          ((idev = in6_dev_get(skb->dev)) == NULL)) {
--              kfree_skb(skb);
--              return -1;
--      }
--      if (idev->cnf.accept_source_route < 0) {
-+      idev = in6_dev_get(skb->dev);
-+      if (idev) {
-+              if (accept_source_route > idev->cnf.accept_source_route)
-+                      accept_source_route = idev->cnf.accept_source_route;
-               in6_dev_put(idev);
--              kfree_skb(skb);
--              return -1;
-       }
- 
--      if (accept_source_route > idev->cnf.accept_source_route)
--              accept_source_route = idev->cnf.accept_source_route;
--
--      in6_dev_put(idev);
--
-       if (!pskb_may_pull(skb, (skb->h.raw-skb->data)+8) ||
-           !pskb_may_pull(skb, (skb->h.raw-skb->data)+((skb->h.raw[1]+1)<<3))) {
-               IP6_INC_STATS_BH(ip6_dst_idev(skb->dst),
-@@ -394,23 +385,6 @@ static int ipv6_rthdr_rcv(struct sk_buff
- 
-       hdr = (struct ipv6_rt_hdr *) skb->h.raw;
- 
--      switch (hdr->type) {
--#ifdef CONFIG_IPV6_MIP6
--      case IPV6_SRCRT_TYPE_2:
--              break;
--#endif
--      case IPV6_SRCRT_TYPE_0:
--              if (accept_source_route > 0)
--                      break;
--              kfree_skb(skb);
--              return -1;
--      default:
--              IP6_INC_STATS_BH(ip6_dst_idev(skb->dst),
--                               IPSTATS_MIB_INHDRERRORS);
--              icmpv6_param_prob(skb, ICMPV6_HDR_FIELD, (&hdr->type) - skb->nh.raw);
--              return -1;
--      }
--
-       if (ipv6_addr_is_multicast(&skb->nh.ipv6h->daddr) ||
-           skb->pkt_type != PACKET_HOST) {
-               IP6_INC_STATS_BH(ip6_dst_idev(skb->dst),
-@@ -450,6 +424,8 @@ looped_back:
- 
-       switch (hdr->type) {
-       case IPV6_SRCRT_TYPE_0:
-+              if (accept_source_route <= 0)
-+                      goto unknown_rh;
-               if (hdr->hdrlen & 0x01) {
-                       IP6_INC_STATS_BH(ip6_dst_idev(skb->dst),
-                                        IPSTATS_MIB_INHDRERRORS);
-@@ -459,6 +435,8 @@ looped_back:
-               break;
- #ifdef CONFIG_IPV6_MIP6
-       case IPV6_SRCRT_TYPE_2:
-+              if (accept_source_route < 0)
-+                      goto unknown_rh;
-               /* Silently discard invalid RTH type 2 */
-               if (hdr->hdrlen != 2 || hdr->segments_left != 1) {
-                       IP6_INC_STATS_BH(ip6_dst_idev(skb->dst),
-@@ -468,6 +446,8 @@ looped_back:
-               }
-               break;
- #endif
-+      default:
-+              goto unknown_rh;
-       }
- 
-       /*
-@@ -569,6 +549,12 @@ looped_back:
-       skb_push(skb, skb->data - skb->nh.raw);
-       dst_input(skb);
-       return -1;
-+
-+unknown_rh:
-+      IP6_INC_STATS_BH(ip6_dst_idev(skb->dst), IPSTATS_MIB_INHDRERRORS);
-+      icmpv6_param_prob(skb, ICMPV6_HDR_FIELD,
-+                        (&hdr->type) - skb->nh.raw);
-+      return -1;
- }
- 
- static struct inet6_protocol rthdr_protocol = {

diff --git a/queue-2.6.21/series b/queue-2.6.21/series
index 1f70aee736eff5c317cd7d03be7d5c566bc535be..0bf00fba288ff9fb1ef35821075393f9272f8c99 100644 (file)
--- a/queue-2.6.21/series
+++ b/queue-2.6.21/series
@@ -40,8 +40,6 @@ driver-core-don-t-free-devt_attr-till-the-device-is-released.patch
 pci-quirks-disable-msi-on-rs400-200-and-rs480.patch
 fix-for-bugzilla-8426-massive-slowdown-on-scsi-cd-dvd-drive-connected-to-mptspi-driver.patch
 i386-hpet-check-if-the-counter-works.patch
-# still awaiting an ack
-#restore-semantics-of-routing-header-processing.patch
 alsa-hda-codec-fix-resume-of-stac92xx-codecs.patch
 ipmi-fix-si-address-space-settings.patch
 x86_64-fix-vgettimeofday.patch