]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[NETFILTER]: nf_conntrack_netbios_ns: fix uninitialized member in expectation
authorPatrick McHardy <kaber@trash.net>
Tue, 9 Jan 2007 08:03:26 +0000 (00:03 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Tue, 9 Jan 2007 08:30:07 +0000 (00:30 -0800)
->helper is uninitialized in the expectation registered by the netbios_ns
helper and it later copied to the expected connection, which causes invalid
memory dereferences when trying to call the helper.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/netfilter/nf_conntrack_netbios_ns.c

index a5b234e444dc789c2ae5fe679408a329512bb847..2a48efdf0d6764bc85bf3b2bb0e6cadc4171ccf6 100644 (file)
@@ -89,6 +89,7 @@ static int help(struct sk_buff **pskb, unsigned int protoff,
 
        exp->expectfn             = NULL;
        exp->flags                = NF_CT_EXPECT_PERMANENT;
+       exp->helper               = NULL;
 
        nf_conntrack_expect_related(exp);
        nf_conntrack_expect_put(exp);