| commit | 38a8f8f7f6c61ca1cc6409ee9b0f89b21a8dad79 | |
| author | Liping Zhang <liping.zhang@spreadtrum.com> | |
| Mon, 8 Aug 2016 13:57:58 +0000 (8 21:57 +0800) | ||
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| Wed, 31 Jan 2018 13:46:13 +0000 (31 14:46 +0100) | ||
| tree | 855e57e3a65aa37aec10d035359e4f624beb88a8 | treesnapshot (tar.gz zip) |
| parent | 4003d8b836ab6426976e28e0bac6bddc2234b88d | commitdiff |
netfilter: nf_ct_expect: remove the redundant slash when policy name is empty
commit b173a28f62cf929324a8a6adcc45adadce311d16 upstream.
The 'name' filed in struct nf_conntrack_expect_policy{} is not a
pointer, so check it is NULL or not will always return true. Even if the
name is empty, slash will always be displayed like follows:
# cat /proc/net/nf_conntrack_expect
297 l3proto = 2 proto=6 src=1.1.1.1 dst=2.2.2.2 sport=1 dport=1025 ftp/
^
Fixes: 3a8fc53a45c4 ("netfilter: nf_ct_helper: allocate 16 bytes for the helper and policy names")
Signed-off-by: Liping Zhang <liping.zhang@spreadtrum.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Acked-by: Michal Kubecek <mkubecek@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit b173a28f62cf929324a8a6adcc45adadce311d16 upstream.
The 'name' filed in struct nf_conntrack_expect_policy{} is not a
pointer, so check it is NULL or not will always return true. Even if the
name is empty, slash will always be displayed like follows:
# cat /proc/net/nf_conntrack_expect
297 l3proto = 2 proto=6 src=1.1.1.1 dst=2.2.2.2 sport=1 dport=1025 ftp/
^
Fixes: 3a8fc53a45c4 ("netfilter: nf_ct_helper: allocate 16 bytes for the helper and policy names")
Signed-off-by: Liping Zhang <liping.zhang@spreadtrum.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Acked-by: Michal Kubecek <mkubecek@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| net/netfilter/nf_conntrack_expect.c | diffblobblamehistory |