Commit 5c178d81 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: nft_ct: prepare for key-dependent error unwind 



Next patch will add ZONE_ID set support which will need similar
error unwind (put operation) as conntrack labels.

Prepare for this: remove the 'label_got' boolean in favor
of a switch statement that can be extended in next patch.

As we already have that in the set_destroy function place that in
a separate function and call it from the set init function.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent ab23821f

net/netfilter/nft_ct.c

+15 −14
Original line number Original line Diff line number Diff line
@@ -386,12 +386,24 @@ static int nft_ct_get_init(const struct nft_ctx *ctx, 
	return 0;

	return 0;

}

}





static void __nft_ct_set_destroy(const struct nft_ctx *ctx, struct nft_ct *priv)

{

	switch (priv->key) {

#ifdef CONFIG_NF_CONNTRACK_LABELS

	case NFT_CT_LABELS:

		nf_connlabels_put(ctx->net);

		break;

#endif

	default:

		break;

	}

}



static int nft_ct_set_init(const struct nft_ctx *ctx,

static int nft_ct_set_init(const struct nft_ctx *ctx,

			   const struct nft_expr *expr,

			   const struct nft_expr *expr,

			   const struct nlattr * const tb[])

			   const struct nlattr * const tb[])

{

{

	struct nft_ct *priv = nft_expr_priv(expr);

	struct nft_ct *priv = nft_expr_priv(expr);

	bool label_got = false;

	unsigned int len;

	unsigned int len;

	int err;

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

		err = nf_connlabels_get(ctx->net, (len * BITS_PER_BYTE) - 1);

		if (err)

		if (err)

			return err;

			return err;

		label_got = true;

		break;

		break;

#endif

#endif

	default:

	default:
@@ -431,8 +442,7 @@ static int nft_ct_set_init(const struct nft_ctx *ctx, 
	return 0;

	return 0;





err1:

err1:

	if (label_got)

	__nft_ct_set_destroy(ctx, priv);

		nf_connlabels_put(ctx->net);

	return err;

	return err;

}

}
@@ -447,16 +457,7 @@ static void nft_ct_set_destroy(const struct nft_ctx *ctx, 
{

{

	struct nft_ct *priv = nft_expr_priv(expr);

	struct nft_ct *priv = nft_expr_priv(expr);





	switch (priv->key) {

	__nft_ct_set_destroy(ctx, priv);

#ifdef CONFIG_NF_CONNTRACK_LABELS

	case NFT_CT_LABELS:

		nf_connlabels_put(ctx->net);

		break;

#endif

	default:

		break;

	}



	nft_ct_netns_put(ctx->net, ctx->afi->family);

	nft_ct_netns_put(ctx->net, ctx->afi->family);

}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE