[kernel] r8000 - in people/dannf/kernel-source-2.6.8-2.6.8/debian: . patches patches/series

[Dann Frazier]

Author: dannf
Date: Wed Dec 13 08:56:58 2006
New Revision: 8000

Added:
   people/dannf/kernel-source-2.6.8-2.6.8/debian/patches/ipt_ULOG-bogus-errors.dpatch
Modified:
   people/dannf/kernel-source-2.6.8-2.6.8/debian/changelog
   people/dannf/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-16sarge6dannf1
Log:
* Fix erroneous calculation of 'len' parameter to NLMSG_PUT resulting in
  bogus 'error during NLMSG_PUT' messages (closes: #372621)

Modified: people/dannf/kernel-source-2.6.8-2.6.8/debian/changelog
==============================================================================
--- people/dannf/kernel-source-2.6.8-2.6.8/debian/changelog	(original)
+++ people/dannf/kernel-source-2.6.8-2.6.8/debian/changelog	Wed Dec 13 08:56:58 2006
@@ -8,8 +8,10 @@
     (closes: #354493)
   * Fix data corruption with dm-crypt over RAID5 (closes: #336153)
   * Add VLAN support for 3c59x/90x series hardware (closes: #349774)
+  * Fix erroneous calculation of 'len' parameter to NLMSG_PUT resulting in
+    bogus 'error during NLMSG_PUT' messages (closes: #372621)
 
- -- dann frazier <dannf at debian.org>  Wed, 13 Dec 2006 00:46:58 -0700
+ -- dann frazier <dannf at debian.org>  Wed, 13 Dec 2006 00:55:52 -0700
 
 kernel-source-2.6.8 (2.6.8-16sarge6) stable-security; urgency=high
 

Added: people/dannf/kernel-source-2.6.8-2.6.8/debian/patches/ipt_ULOG-bogus-errors.dpatch
==============================================================================
--- (empty file)
+++ people/dannf/kernel-source-2.6.8-2.6.8/debian/patches/ipt_ULOG-bogus-errors.dpatch	Wed Dec 13 08:56:58 2006
@@ -0,0 +1,54 @@
+diff -Naru a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c
+--- a/net/ipv4/netfilter/ipt_ULOG.c	2006-12-13 08:12:57 -08:00
++++ b/net/ipv4/netfilter/ipt_ULOG.c	2006-12-13 08:12:57 -08:00
+@@ -1,7 +1,7 @@
+ /*
+  * netfilter module for userspace packet logging daemons
+  *
+- * (C) 2000-2002 by Harald Welte <laforge at netfilter.org>
++ * (C) 2000-2004 by Harald Welte <laforge at netfilter.org>
+  *
+  * 2000/09/22 ulog-cprange feature added
+  * 2001/01/04 in-kernel queue as proposed by Sebastian Zander 
+@@ -13,6 +13,8 @@
+  * 2002/07/07 remove broken nflog_rcv() function -HW
+  * 2002/08/29 fix shifted/unshifted nlgroup bug -HW
+  * 2002/10/30 fix uninitialized mac_len field - <Anders K. Pedersen>
++ * 2004/10/25 fix erroneous calculation of 'len' parameter to NLMSG_PUT
++ *	      resulting in bogus 'error during NLMSG_PUT' messages.
+  *
+  * (C) 1999-2001 Paul `Rusty' Russell
+  * (C) 2002-2004 Netfilter Core Team <coreteam at netfilter.org>
+@@ -212,7 +214,7 @@
+ 
+ 	/* NLMSG_PUT contains a hidden goto nlmsg_failure !!! */
+ 	nlh = NLMSG_PUT(ub->skb, 0, ub->qlen, ULOG_NL_EVENT, 
+-			size - sizeof(*nlh));
++			sizeof(*pm)+copy_len);
+ 	ub->qlen++;
+ 
+ 	pm = NLMSG_DATA(nlh);
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2004/10/25 16:05:16-07:00 laforge at netfilter.org 
+#   [NETFILTER]: fix ipt_ULOG bogus error messages
+#   
+#   Please apply the fix below, it addresses some bogus error messages
+#   ('error during NLMSG_PUT') that were printed because of a wrong
+#   calculation of the 'len' parameter to NLMSG_PUT().
+#   
+#   Signed-off-by: Harald Welte <laforge at netfilter.org>
+#   Signed-off-by: David S. Miller <davem at davemloft.net>
+# 
+# net/ipv4/netfilter/ipt_ULOG.c
+#   2004/10/25 16:04:57-07:00 laforge at netfilter.org +4 -2
+#   [NETFILTER]: fix ipt_ULOG bogus error messages
+#   
+#   Please apply the fix below, it addresses some bogus error messages
+#   ('error during NLMSG_PUT') that were printed because of a wrong
+#   calculation of the 'len' parameter to NLMSG_PUT().
+#   
+#   Signed-off-by: Harald Welte <laforge at netfilter.org>
+#   Signed-off-by: David S. Miller <davem at davemloft.net>
+# 

Modified: people/dannf/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-16sarge6dannf1
==============================================================================
--- people/dannf/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-16sarge6dannf1	(original)
+++ people/dannf/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-16sarge6dannf1	Wed Dec 13 08:56:58 2006
@@ -4,3 +4,4 @@
 + drivers-block-ioctl-enotty.dpatch
 + dm-crypt-fix-data-corruption-with-dm-crypt-over-raid5.dpatch
 + 3c59x-3c90x-vlan-support.dpatch
++ ipt_ULOG-bogus-errors.dpatch