leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netfilter: nf_conntrack_ftp: Fix debug output

Browse Source 
The find_pattern() debug output was printing the 'skip' character.
This can be a NULL-byte and messes up further pr_debug() output.

Output without the fix:
kernel: nf_conntrack_ftp: Pattern matches!
kernel: nf_conntrack_ftp: Skipped up to `<7>nf_conntrack_ftp: find_pattern `PORT': dlen = 8
kernel: nf_conntrack_ftp: find_pattern `EPRT': dlen = 8

Output with the fix:
kernel: nf_conntrack_ftp: Pattern matches!
kernel: nf_conntrack_ftp: Skipped up to 0x0 delimiter!
kernel: nf_conntrack_ftp: Match succeeded!
kernel: nf_conntrack_ftp: conntrack_ftp: match `172,17,0,100,200,207' (20 bytes at 4150681645)
kernel: nf_conntrack_ftp: find_pattern `PORT': dlen = 8

Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Thomas Jarosch 2019-08-21 16:14:28 +02:00 committed by Pablo Neira Ayuso
parent 3cf2f450ff
commit 3a069024d3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/netfilter/nf_conntrack_ftp.c
View File

@ -322,7 +322,7 @@ static int find_pattern(const char *data, size_t dlen,
i++; i++;
} }
pr_debug("Skipped up to `%c'!\n", skip); pr_debug("Skipped up to 0x%hhx delimiter!\n", skip);
*numoff = i; *numoff = i;
*numlen = getnum(data + i, dlen - i, cmd, term, numoff); *numlen = getnum(data + i, dlen - i, cmd, term, numoff);