diff options
author | Yasuyuki KOZAKAI <yasuyuki.kozkaai@toshiba.co.jp> | 2005-04-25 15:00:04 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-04-25 15:00:04 -0400 |
commit | f649a3bfd1b0ad8872312ed1c223d69b74406e1f (patch) | |
tree | 1ce19f6f84280f6c3f4709d618cd855443b5a1a4 /net | |
parent | 25ee7e3832951cf5896b194f6cd929a44863f419 (diff) |
[NETFILTER]: Fix truncated sequence numbers in FTP helper
Signed-off-by: Yasuyuki KOZAKAI <yasuyuki.kozkaai@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/ipv4/netfilter/ip_conntrack_ftp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_ftp.c b/net/ipv4/netfilter/ip_conntrack_ftp.c index 12b88cbb11db..dd86503aa788 100644 --- a/net/ipv4/netfilter/ip_conntrack_ftp.c +++ b/net/ipv4/netfilter/ip_conntrack_ftp.c | |||
@@ -252,7 +252,7 @@ static int find_pattern(const char *data, size_t dlen, | |||
252 | } | 252 | } |
253 | 253 | ||
254 | /* Look up to see if we're just after a \n. */ | 254 | /* Look up to see if we're just after a \n. */ |
255 | static int find_nl_seq(u16 seq, const struct ip_ct_ftp_master *info, int dir) | 255 | static int find_nl_seq(u32 seq, const struct ip_ct_ftp_master *info, int dir) |
256 | { | 256 | { |
257 | unsigned int i; | 257 | unsigned int i; |
258 | 258 | ||
@@ -263,7 +263,7 @@ static int find_nl_seq(u16 seq, const struct ip_ct_ftp_master *info, int dir) | |||
263 | } | 263 | } |
264 | 264 | ||
265 | /* We don't update if it's older than what we have. */ | 265 | /* We don't update if it's older than what we have. */ |
266 | static void update_nl_seq(u16 nl_seq, struct ip_ct_ftp_master *info, int dir) | 266 | static void update_nl_seq(u32 nl_seq, struct ip_ct_ftp_master *info, int dir) |
267 | { | 267 | { |
268 | unsigned int i, oldest = NUM_SEQ_TO_REMEMBER; | 268 | unsigned int i, oldest = NUM_SEQ_TO_REMEMBER; |
269 | 269 | ||