[sorry for forgetting the Signed-off-by in the 2.6.x patch, it is hereby
implied]
Hi Dave!
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@xxxxxxxxxxxxx>
diff -Nru --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver'
--exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd'
--exclude '*.mod.c' --exclude '*~'
linux-2.4.28-pre3-plain/net/ipv4/netfilter/ipt_ULOG.c
linux-2.4.28-pre3-ulog/net/ipv4/netfilter/ipt_ULOG.c
--- linux-2.4.28-pre3-plain/net/ipv4/netfilter/ipt_ULOG.c 2004-08-08
01:26:06.000000000 +0200
+++ linux-2.4.28-pre3-ulog/net/ipv4/netfilter/ipt_ULOG.c 2004-10-25
09:46:06.319745399 +0200
@@ -1,7 +1,7 @@
/*
* netfilter module for userspace packet logging daemons
*
- * (C) 2000-2002 by Harald Welte <laforge@xxxxxxxxxxxx>
+ * (C) 2000-2004 by Harald Welte <laforge@xxxxxxxxxxxxx>
*
* 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.
*
* Released under the terms of the GPL
*
@@ -203,7 +205,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);
--
- Harald Welte <laforge@xxxxxxxxxxxxx> http://www.netfilter.org/
============================================================================
"Fragmentation is like classful addressing -- an interesting early
architectural error that shows how much experimentation was going
on while IP was being designed." -- Paul Vixie
signature.asc
Description: Digital signature
|