lkml.org 
[lkml]   [2016]   [Nov]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 161/346] netfilter: nf_ct_expect: remove the redundant slash when policy name is empty
    3.16.39-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Liping Zhang <liping.zhang@spreadtrum.com>

    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>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    net/netfilter/nf_conntrack_expect.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/net/netfilter/nf_conntrack_expect.c
    +++ b/net/netfilter/nf_conntrack_expect.c
    @@ -556,7 +556,7 @@ static int exp_seq_show(struct seq_file
    helper = rcu_dereference(nfct_help(expect->master)->helper);
    if (helper) {
    seq_printf(s, "%s%s", expect->flags ? " " : "", helper->name);
    - if (helper->expect_policy[expect->class].name)
    + if (helper->expect_policy[expect->class].name[0])
    seq_printf(s, "/%s",
    helper->expect_policy[expect->class].name);
    }
    \
     
     \ /
      Last update: 2016-11-14 03:24    [W:4.279 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site