[kernel] r6752 - dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches

[Dann Frazier]

Author: dannf
Date: Mon May 29 05:16:20 2006
New Revision: 6752

Modified:
   dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/215_sctp-fragment-recurse.diff

Log:
update to use corrected patch from 2.6.8 tree


Modified: dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/215_sctp-fragment-recurse.diff
==============================================================================
--- dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/215_sctp-fragment-recurse.diff	(original)
+++ dists/sarge-security/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/215_sctp-fragment-recurse.diff	Mon May 29 05:16:20 2006
@@ -1,5 +1,5 @@
-Fix for CVE-2006-2274, patch from upstream 2.6 git tree, applies to sarge 2.4.27
-and 2.6.8. 
+Fix for CVE-2006-2274, patch from upstream 2.6 git tree, applies to sarge
+2.4.27 and 2.6.8. 
 
 Signed-off-by: Troy Heber <troyh at debian.org>
 
@@ -29,17 +29,17 @@
     Signed-off-by: Chris Wright <chrisw at sous-sol.org>
 
 
-diff -urpN kernel-source-2.6.8.orig/net/sctp/ulpqueue.c 2.6/net/sctp/ulpqueue.c
---- kernel-source-2.6.8.orig/net/sctp/ulpqueue.c	2004-08-13 23:38:04.000000000 -0600
-+++ 2.6/net/sctp/ulpqueue.c	2006-05-19 22:33:58.000000000 -0600
-@@ -248,6 +248,7 @@ static inline void sctp_ulpq_store_reasm
- 					 struct sctp_ulpevent *event)
+diff -uprN kernel-source-2.6.8.orig/net/sctp/ulpqueue.c kernel-source-2.6.8/net/sctp/ulpqueue.c
+--- kernel-source-2.6.8.orig/net/sctp/ulpqueue.c	2006-05-21 10:16:58.400223378 -0600
++++ kernel-source-2.6.8/net/sctp/ulpqueue.c	2006-05-21 10:17:35.894321258 -0600
+@@ -292,6 +292,7 @@ static inline void sctp_ulpq_store_reasm
+ static struct sctp_ulpevent *sctp_make_reassembled_event(struct sk_buff *f_frag, struct sk_buff *l_frag)
  {
  	struct sk_buff *pos;
 +	struct sk_buff *new = NULL;
- 	struct sctp_ulpevent *cevent;
- 	__u32 tsn, ctsn;
- 
+ 	struct sctp_ulpevent *event;
+ 	struct sk_buff *pnext, *last;
+ 	struct sk_buff *list = skb_shinfo(f_frag)->frag_list;
 @@ -310,11 +311,33 @@ static struct sctp_ulpevent *sctp_make_r
  	 */
  	if (last)