]> err.no Git - linux-2.6/commitdiff
[NETFILTER]: nf_conntrack: fix incorrect memset() size in FTP helper
authorSamir Bellabes <sbellabes@mandriva.com>
Sat, 4 Feb 2006 10:16:06 +0000 (02:16 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Sun, 5 Feb 2006 07:51:23 +0000 (23:51 -0800)
This memset() is executing with a bad size. According to Yasuyuki Kozakai,
this memset() can be deleted, as 'ftp' is declared in global area.

Signed-off-by: Samir Bellabes <sbellabes@mandriva.com>
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/netfilter/nf_conntrack_ftp.c

index ab0c920f0d30bbf840d731f8c6baddaab7c3f089..6f210f399762d8196630e2c8a087dc0f548a759d 100644 (file)
@@ -657,8 +657,6 @@ static int __init init(void)
        /* FIXME should be configurable whether IPv4 and IPv6 FTP connections
                 are tracked or not - YK */
        for (i = 0; i < ports_c; i++) {
-               memset(&ftp[i], 0, sizeof(struct nf_conntrack_helper));
-
                ftp[i][0].tuple.src.l3num = PF_INET;
                ftp[i][1].tuple.src.l3num = PF_INET6;
                for (j = 0; j < 2; j++) {