debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

adjust patch to apply during linux-2.6 build 

svn path=/dists/etch/linux-2.6/; revision=8385
This commit is contained in:
dann frazier 2007-03-22 16:04:53 +00:00
parent 83ca4e05d6
commit 8e91fa80aa
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
debian/patches/bugfix/ipv6_setsockopt-NULL-deref.patch vendored
View File

@ -13,16 +13,16 @@ Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@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@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;