Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 590025a2 authored by Liping Zhang's avatar Liping Zhang Committed by Pablo Neira Ayuso
Browse files

netfilter: nft_ct: fix unpaired nf_connlabels_get/put call 



We only get nf_connlabels if the user add ct label set expr successfully,
but we will also put nf_connlabels if the user delete ct lable get expr.
This is mismathced, and will cause ct label expr cannot work properly.

Also, if we init something fail, we should put nf_connlabels back.
Otherwise, we may waste to alloc the memory that will never be used.

Signed-off-by: default avatarLiping Zhang <liping.zhang@spreadtrum.com>
Acked-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent f4dc7771

net/netfilter/nft_ct.c

+19 −6
Original line number Diff line number Diff line
@@ -366,6 +366,7 @@ static int nft_ct_set_init(const struct nft_ctx *ctx, 
			   const struct nlattr * const tb[])

{

	struct nft_ct *priv = nft_expr_priv(expr);

	bool label_got = false;

	unsigned int len;

	int err;
@@ -384,6 +385,7 @@ static int nft_ct_set_init(const struct nft_ctx *ctx, 
		err = nf_connlabels_get(ctx->net, (len * BITS_PER_BYTE) - 1);

		if (err)

			return err;

		label_got = true;

		break;

#endif

	default:
@@ -393,16 +395,27 @@ static int nft_ct_set_init(const struct nft_ctx *ctx, 
	priv->sreg = nft_parse_register(tb[NFTA_CT_SREG]);

	err = nft_validate_register_load(priv->sreg, len);

	if (err < 0)

		return err;

		goto err1;



	err = nft_ct_l3proto_try_module_get(ctx->afi->family);

	if (err < 0)

		return err;

		goto err1;



	return 0;



err1:

	if (label_got)

		nf_connlabels_put(ctx->net);

	return err;

}



static void nft_ct_get_destroy(const struct nft_ctx *ctx,

			       const struct nft_expr *expr)

{

	nft_ct_l3proto_module_put(ctx->afi->family);

}



static void nft_ct_destroy(const struct nft_ctx *ctx,

static void nft_ct_set_destroy(const struct nft_ctx *ctx,

			       const struct nft_expr *expr)

{

	struct nft_ct *priv = nft_expr_priv(expr);
@@ -475,7 +488,7 @@ static const struct nft_expr_ops nft_ct_get_ops = { 
	.size		= NFT_EXPR_SIZE(sizeof(struct nft_ct)),

	.eval		= nft_ct_get_eval,

	.init		= nft_ct_get_init,

	.destroy	= nft_ct_destroy,

	.destroy	= nft_ct_get_destroy,

	.dump		= nft_ct_get_dump,

};
@@ -484,7 +497,7 @@ static const struct nft_expr_ops nft_ct_set_ops = { 
	.size		= NFT_EXPR_SIZE(sizeof(struct nft_ct)),

	.eval		= nft_ct_set_eval,

	.init		= nft_ct_set_init,

	.destroy	= nft_ct_destroy,

	.destroy	= nft_ct_set_destroy,

	.dump		= nft_ct_set_dump,

};