]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
netfilter: nftables: Fix a memleak from userdata error path in new objects
authorPablo Neira Ayuso <pablo@netfilter.org>
Wed, 5 May 2021 21:06:43 +0000 (23:06 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 May 2021 08:56:31 +0000 (10:56 +0200)
[ Upstream commit 85dfd816fabfc16e71786eda0a33a7046688b5b0 ]

Release object name if userdata allocation fails.

Fixes: b131c96496b3 ("netfilter: nf_tables: add userdata support for nft_object")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/netfilter/nf_tables_api.c

index 589d2f6978d3809592e17ef537abecf44ebe8fda..878ed49d0c569be7ec740af49926ac455fae68b2 100644 (file)
@@ -6246,9 +6246,9 @@ err_obj_ht:
        INIT_LIST_HEAD(&obj->list);
        return err;
 err_trans:
-       kfree(obj->key.name);
-err_userdata:
        kfree(obj->udata);
+err_userdata:
+       kfree(obj->key.name);
 err_strdup:
        if (obj->ops->destroy)
                obj->ops->destroy(&ctx, obj);