summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorSamir Bellabes <sbellabes@mandriva.com>2006-02-04 02:16:06 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2006-02-04 23:51:23 -0800
commitdf4e9574a36748c3a4d9b03ffca6b42321a797a9 (patch)
tree7710a26a7b5b491eafe6d1d7fef896b25631c248 /net
parent19ea7302df2eb4f2ad7f29af814d8cf55fc8b9c9 (diff)
downloadlinux-stable-df4e9574a36748c3a4d9b03ffca6b42321a797a9.tar.gz
linux-stable-df4e9574a36748c3a4d9b03ffca6b42321a797a9.tar.bz2
linux-stable-df4e9574a36748c3a4d9b03ffca6b42321a797a9.zip
[NETFILTER]: nf_conntrack: fix incorrect memset() size in FTP helper
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>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/nf_conntrack_ftp.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c
index ab0c920f0d30..6f210f399762 100644
--- a/net/netfilter/nf_conntrack_ftp.c
+++ b/net/netfilter/nf_conntrack_ftp.c
@@ -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++) {