Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f649a3bf authored by Yasuyuki KOZAKAI's avatar Yasuyuki KOZAKAI Committed by David S. Miller
Browse files

[NETFILTER]: Fix truncated sequence numbers in FTP helper 



Signed-off-by: default avatarYasuyuki KOZAKAI <yasuyuki.kozkaai@toshiba.co.jp>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 25ee7e38

net/ipv4/netfilter/ip_conntrack_ftp.c

+2 −2
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ static int find_pattern(const char *data, size_t dlen, 
}



/* Look up to see if we're just after a \n. */

static int find_nl_seq(u16 seq, const struct ip_ct_ftp_master *info, int dir)

static int find_nl_seq(u32 seq, const struct ip_ct_ftp_master *info, int dir)

{

	unsigned int i;
@@ -263,7 +263,7 @@ static int find_nl_seq(u16 seq, const struct ip_ct_ftp_master *info, int dir) 
}



/* We don't update if it's older than what we have. */

static void update_nl_seq(u16 nl_seq, struct ip_ct_ftp_master *info, int dir)

static void update_nl_seq(u32 nl_seq, struct ip_ct_ftp_master *info, int dir)

{

	unsigned int i, oldest = NUM_SEQ_TO_REMEMBER;