netfilter: nf_ct_expect: remove the redundant slash when policy name is empty
authorLiping Zhang <liping.zhang@spreadtrum.com>
Mon, 8 Aug 2016 13:57:58 +0000 (21:57 +0800)
committerivanmeler <i_ivan@windowslive.com>
Wed, 13 Apr 2022 21:13:42 +0000 (21:13 +0000)
commitf60d25928832474198146af4629bc1782dcbb00b
treed2c7a4863b76a03edb576faaa3b65ea4dd796078
parent5f75d14c71ae694817f363970ece62ebc18affd6
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>
net/netfilter/nf_conntrack_expect.c