[NETFILTER] nf_conntrack: fix memset() size.

[NETFILTER] nf_conntrack: fix memset() size.

[Samir Bellabes]

Hi,

This patch fix a bad size in memset().
The memory handle by 'struct nf_conntrack_helper ftp[MAX_PORTS][2]' is
only set for ftp[*][0], but not for ftp[*][1].

please apply, thanks
sam


[NETFILTER] nf_conntrack: fix memset() size.

memset() don't set memory of the 'struct nf_conntrack_helper' at ftp[*][1]

Signed-off-by: Samir Bellabes <sbellabes@mandriva.com>

---
 
 net/netfilter/nf_conntrack_ftp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

applies-to: 84cf4e20ce5038cb701373c6d9f97195dfd23dfc
34b60542dcfb5fbc2f37de6157cc31d35c6b66df
diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c
index ab0c920..e2c9f36 100644
--- a/net/netfilter/nf_conntrack_ftp.c
+++ b/net/netfilter/nf_conntrack_ftp.c
@@ -657,7 +657,7 @@ 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));
+               memset(&ftp[i], 0, 2*sizeof(struct nf_conntrack_helper));
                
                ftp[i][0].tuple.src.l3num = PF_INET;
                ftp[i][1].tuple.src.l3num = PF_INET6;

Re: [NETFILTER] nf_conntrack: fix memset() size.

[Yasuyuki KOZAKAI]

Hi,

From: Samir Bellabes <sbellabes@mandriva.com>
Date: Wed, 25 Jan 2006 04:30:20 +0100

> This patch fix a bad size in memset().
> The memory handle by 'struct nf_conntrack_helper ftp[MAX_PORTS][2]' is
> only set for ftp[*][0], but not for ftp[*][1].
> 
> please apply, thanks
> sam

Thanks. But I think better change is just removing this memset()
because 'ftp' is declared in global area. Can I ask you to re-send a patch
which just removes this memset() ?

-- Yasuyuki Kozakai

Re: [NETFILTER] nf_conntrack: fix memset() size.

[Samir Bellabes]

Yasuyuki KOZAKAI <yasuyuki.kozakai@toshiba.co.jp> writes:

> From: Samir Bellabes <sbellabes@mandriva.com>
>> This patch fix a bad size in memset().
>> The memory handle by 'struct nf_conntrack_helper ftp[MAX_PORTS][2]' is
>> only set for ftp[*][0], but not for ftp[*][1].
>
> Thanks. But I think better change is just removing this memset()
> because 'ftp' is declared in global area. Can I ask you to re-send a patch
> which just removes this memset() ?

[PATCH] [NETFILTER] nf_conntrack_ftp : delete bogus memset()

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>

---

 net/netfilter/nf_conntrack_ftp.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

applies-to: 84cf4e20ce5038cb701373c6d9f97195dfd23dfc
2b9fb3186e686e0f1029c33d7a2aaa2dcf20b36f
diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c
index ab0c920..6f210f3 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++) {

Re: [NETFILTER] nf_conntrack: fix memset() size.

[Yasuyuki KOZAKAI]

From: Samir Bellabes <sbellabes@mandriva.com>
Date: Wed, 25 Jan 2006 05:44:06 +0100

> [PATCH] [NETFILTER] nf_conntrack_ftp : delete bogus memset()
> 
> 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>

Well, your mailer or something seems to replace tab with white spaces.
OK, I've fixed up this to save more mails. Anyway, thanks a lot !

Harald, or Patrick, please apply this.


[PATCH] [NETFILTER] nf_conntrack_ftp : delete bogus memset()

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>

---

diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c
index ab0c920..6f210f3 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++) {

Re: [NETFILTER] nf_conntrack: fix memset() size.

[Patrick McHardy]

Yasuyuki KOZAKAI wrote:
> From: Samir Bellabes <sbellabes@mandriva.com>
> Date: Wed, 25 Jan 2006 05:44:06 +0100
> 
> 
>>[PATCH] [NETFILTER] nf_conntrack_ftp : delete bogus memset()
>>
>>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>
> 
> 
> Well, your mailer or something seems to replace tab with white spaces.
> OK, I've fixed up this to save more mails. Anyway, thanks a lot !
> 
> Harald, or Patrick, please apply this.

Done, thanks.