From 8e91fa80aac81cdeff07b793d426112052330357 Mon Sep 17 00:00:00 2001 From: dann frazier Date: Thu, 22 Mar 2007 16:04:53 +0000 Subject: [PATCH] adjust patch to apply during linux-2.6 build svn path=/dists/etch/linux-2.6/; revision=8385 --- .../bugfix/ipv6_setsockopt-NULL-deref.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/patches/bugfix/ipv6_setsockopt-NULL-deref.patch b/debian/patches/bugfix/ipv6_setsockopt-NULL-deref.patch index 0a21ff639..3e2d3dcdb 100644 --- a/debian/patches/bugfix/ipv6_setsockopt-NULL-deref.patch +++ b/debian/patches/bugfix/ipv6_setsockopt-NULL-deref.patch @@ -13,16 +13,16 @@ Acked-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller --- -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 + +--- 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;