lkml.org 
[lkml]   [2018]   [Mar]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 093/177] netfilter: x_tables: unlock on error in xt_find_table_lock()
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Dan Carpenter <dan.carpenter@oracle.com>


    [ Upstream commit 7dde07e9c53617549d67dd3e1d791496d0d3868e ]

    According to my static checker we should unlock here before the return.
    That seems reasonable to me as well.

    Fixes" b9e69e127397 ("netfilter: xtables: don't hook tables by default")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Acked-by: Florian Westphal <fw@strlen.de>
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/netfilter/x_tables.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/net/netfilter/x_tables.c
    +++ b/net/netfilter/x_tables.c
    @@ -1006,8 +1006,10 @@ struct xt_table *xt_find_table_lock(stru
    list_for_each_entry(t, &init_net.xt.tables[af], list) {
    if (strcmp(t->name, name))
    continue;
    - if (!try_module_get(t->me))
    + if (!try_module_get(t->me)) {
    + mutex_unlock(&xt[af].mutex);
    return NULL;
    + }

    mutex_unlock(&xt[af].mutex);
    if (t->table_init(net) != 0) {

    \
     
     \ /
      Last update: 2018-03-23 12:19    [W:4.020 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site