diff options
| author | Patrick McHardy <kaber@trash.net> | 2007-05-24 16:41:50 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-05-24 16:41:50 -0700 |
| commit | 25b86e05467a2bf936b78695ef49039e3bbd1e0c (patch) | |
| tree | 756282cad7ea20d2df257633c799d0b6baceba46 /include | |
| parent | 5fe26f53fe9e2ba5dca2835a4ca69d0ba7b5f707 (diff) | |
| download | linux-3.10-25b86e05467a2bf936b78695ef49039e3bbd1e0c.tar.gz linux-3.10-25b86e05467a2bf936b78695ef49039e3bbd1e0c.tar.bz2 linux-3.10-25b86e05467a2bf936b78695ef49039e3bbd1e0c.zip | |
[NETFILTER]: nf_conntrack_ftp: fix newline sequence number calculation
When the packet size is changed by the FTP NAT helper, the connection
tracking helper adjusts the sequence number of the newline character
by the size difference. This is wrong because NAT sequence number
adjustment happens after helpers are called, so the unadjusted number
is compared to the already adjusted one.
Based on report by YU, Haitao <yuhaitao@tsinghua.org.cn>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netfilter/nf_conntrack_ftp.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/netfilter/nf_conntrack_ftp.h b/include/linux/netfilter/nf_conntrack_ftp.h index 81453ea7e4c..b7c360ffd0d 100644 --- a/include/linux/netfilter/nf_conntrack_ftp.h +++ b/include/linux/netfilter/nf_conntrack_ftp.h @@ -37,8 +37,7 @@ extern unsigned int (*nf_nat_ftp_hook)(struct sk_buff **pskb, enum nf_ct_ftp_type type, unsigned int matchoff, unsigned int matchlen, - struct nf_conntrack_expect *exp, - u32 *seq); + struct nf_conntrack_expect *exp); #endif /* __KERNEL__ */ #endif /* _NF_CONNTRACK_FTP_H */ |