r3069 - trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches

[Simon Horman]

Author: horms
Date: 2005-05-13 02:57:50 +0000 (Fri, 13 May 2005)
New Revision: 3069

Added:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/net-ipv4-fib_hash-crash.dpatch
Log:
added missing patch

Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/net-ipv4-fib_hash-crash.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/net-ipv4-fib_hash-crash.dpatch	2005-05-13 02:55:40 UTC (rev 3068)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/net-ipv4-fib_hash-crash.dpatch	2005-05-13 02:57:50 UTC (rev 3069)
@@ -0,0 +1,66 @@
+# origin: kaber (BitKeeper)
+# cset: 1.2104 (2.6) key=423bba8brL9iqryqalMjl7qMjwdfsw
+# URL: http://linux.bkbits.net:8080/linux-2.6/cset@423bba8brL9iqryqalMjl7qMjwdfsw
+# inclusion: upstream
+# descrition: [PATCH] Fix crash while reading /proc/net/route
+# revision date: Fri, 08 Apr 2005 14:55:03 +0900
+#
+# S rset: ChangeSet|1.2103..1.2104
+# I rset: net/ipv4/fib_hash.c|1.36..1.37
+#
+# Key:
+# S: Skipped  ChangeSet file only
+# O: Original Followed by Updated
+# U: Updated  Included with updated range of versions
+# I: Included Included verbatim
+# E: Excluded Excluded on request from user
+# D: Deleted  Manually deleted by subsequent user edit
+# R: Revised  Manually revised by subsequent user edit
+#
+#
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2005/03/18 21:37:15-08:00 kaber@trash.net 
+#   [PATCH] Fix crash while reading /proc/net/route
+#   
+#   [IPV4]: Fix crash while reading /proc/net/route caused by stale pointers
+#   
+#   Signed-off-by: Patrick McHardy <kaber@trash.net>
+#   Signed-off-by: David S. Miller <davem@davemloft.net>
+#   Signed-off-by: Chris Wright <chrisw@osdl.org>
+#   Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+# 
+# net/ipv4/fib_hash.c
+#   2005/03/16 15:58:42-08:00 kaber@trash.net +11 -1
+#   Fix crash while reading /proc/net/route
+# 
+#
+===== net/ipv4/fib_hash.c 1.36 vs 1.37 =====
+--- 1.36/net/ipv4/fib_hash.c	2005-02-28 04:07:04 +09:00
++++ 1.37/net/ipv4/fib_hash.c	2005-03-17 08:58:42 +09:00
+@@ -919,13 +919,23 @@ out:
+ 	return fa;
+ }
+ 
++static struct fib_alias *fib_get_idx(struct seq_file *seq, loff_t pos)
++{
++	struct fib_alias *fa = fib_get_first(seq);
++
++	if (fa)
++		while (pos && (fa = fib_get_next(seq)))
++			--pos;
++	return pos ? NULL : fa;
++}
++
+ static void *fib_seq_start(struct seq_file *seq, loff_t *pos)
+ {
+ 	void *v = NULL;
+ 
+ 	read_lock(&fib_hash_lock);
+ 	if (ip_fib_main_table)
+-		v = *pos ? fib_get_next(seq) : SEQ_START_TOKEN;
++		v = *pos ? fib_get_idx(seq, *pos - 1) : SEQ_START_TOKEN;
+ 	return v;
+ }
+