[kernel] r8385 - dists/etch/linux-2.6/debian/patches/bugfix

[Dann Frazier]

Author: dannf
Date: Thu Mar 22 16:04:53 2007
New Revision: 8385

Modified:
   dists/etch/linux-2.6/debian/patches/bugfix/ipv6_setsockopt-NULL-deref.patch
Log:
adjust patch to apply during linux-2.6 build

Modified: dists/etch/linux-2.6/debian/patches/bugfix/ipv6_setsockopt-NULL-deref.patch
==============================================================================
--- dists/etch/linux-2.6/debian/patches/bugfix/ipv6_setsockopt-NULL-deref.patch	(original)
+++ dists/etch/linux-2.6/debian/patches/bugfix/ipv6_setsockopt-NULL-deref.patch	Thu Mar 22 16:04:53 2007
@@ -13,16 +13,16 @@
 Signed-off-by: David S. Miller <davem at davemloft.net>
 ---
 
-diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
-index 4e0561a..b82333b 100644
---- a/net/ipv6/ipv6_sockglue.c
-+++ b/net/ipv6/ipv6_sockglue.c
-@@ -413,7 +413,7 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
+Adjusted to apply to Debian's 2.6.18 by dann frazier <dannf at debian.org>
+
+--- source/net/ipv6/ipv6_sockglue.c.orig	2007-03-22 09:58:17.000000000 -0600
++++ source/net/ipv6/ipv6_sockglue.c	2007-03-22 09:59:22.000000000 -0600
+@@ -408,7 +408,7 @@
  		}
  
  		/* routing header option needs extra check */
 -		if (optname == IPV6_RTHDR && opt->srcrt) {
 +		if (optname == IPV6_RTHDR && opt && opt->srcrt) {
  			struct ipv6_rt_hdr *rthdr = opt->srcrt;
- 			switch (rthdr->type) {
- 			case IPV6_SRCRT_TYPE_0:
+ 			if (rthdr->type)
+ 				goto sticky_done;