Hi Dave!
This is the 4th of my 2.6 merge of recent bugfixes (all tested against
2.4.22-pre7). You might need to apply them incrementally (didn't test
it in a different order).
Author: Patrick McHardy <kaber@trash.net>
Fix locking of ipt_helper.
Please apply,
diff -Nru --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linux-2.6.0-test1-nftest3/net/ipv4/netfilter/ipt_helper.c linux-2.6.0-test1-nftest4/net/ipv4/netfilter/ipt_helper.c
--- linux-2.6.0-test1-nftest3/net/ipv4/netfilter/ipt_helper.c 2003-07-14 05:36:42.000000000 +0200
+++ linux-2.6.0-test1-nftest4/net/ipv4/netfilter/ipt_helper.c 2003-07-19 16:32:30.000000000 +0200
@@ -10,6 +10,7 @@
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/netfilter_ipv4/ip_conntrack.h>
+#include <linux/netfilter_ipv4/ip_conntrack_core.h>
#include <linux/netfilter_ipv4/ip_conntrack_helper.h>
#include <linux/netfilter_ipv4/ip_tables.h>
#include <linux/netfilter_ipv4/ipt_helper.h>
@@ -34,6 +35,7 @@
struct ip_conntrack_expect *exp;
struct ip_conntrack *ct;
enum ip_conntrack_info ctinfo;
+ int ret = 0;
ct = ip_conntrack_get((struct sk_buff *)skb, &ctinfo);
if (!ct) {
@@ -47,23 +49,27 @@
}
exp = ct->master;
+ READ_LOCK(&ip_conntrack_lock);
if (!exp->expectant) {
DEBUGP("ipt_helper: expectation %p without expectant !?!\n",
exp);
- return 0;
+ goto out_unlock;
}
if (!exp->expectant->helper) {
DEBUGP("ipt_helper: master ct %p has no helper\n",
exp->expectant);
- return 0;
+ goto out_unlock;
}
DEBUGP("master's name = %s , info->name = %s\n",
exp->expectant->helper->name, info->name);
- return !strncmp(exp->expectant->helper->name, info->name,
- strlen(exp->expectant->helper->name)) ^ info->invert;
+ ret = !strncmp(exp->expectant->helper->name, info->name,
+ strlen(exp->expectant->helper->name)) ^ info->invert;
+out_unlock:
+ READ_UNLOCK(&ip_conntrack_lock);
+ return ret;
}
static int check(const char *tablename,
-- - Harald Welte <laforge@netfilter.org> 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
This archive was generated by hypermail 2b29 : Thu Jul 31 2003 - 22:00:27 EST