Unverified Commit 66294d48 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14511 netfilter: nft_inner: incorrect percpu area handling under softirq 

Merge Pull Request from: @ci-robot 
 
PR sync from: Cheng Yu <serein.chengyu@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/Z5LBAX5OLVA3OLUVMGZ5P7U5ZT5UPWRS/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBEAOQ 
 
Link:https://gitee.com/openeuler/kernel/pulls/14511

 

Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents fc1d9b69 fb9067b5

include/net/netfilter/nf_tables_core.h

+1 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ enum { 
};



struct nft_inner_tun_ctx {

	unsigned long cookie;

	u16	type;

	u16	inner_tunoff;

	u16	inner_lloff;

net/netfilter/nft_inner.c

+45 −12
Original line number Diff line number Diff line
@@ -210,35 +210,66 @@ static int nft_inner_parse(const struct nft_inner *priv, 
			   struct nft_pktinfo *pkt,

			   struct nft_inner_tun_ctx *tun_ctx)

{

	struct nft_inner_tun_ctx ctx = {};

	u32 off = pkt->inneroff;



	if (priv->flags & NFT_INNER_HDRSIZE &&

	    nft_inner_parse_tunhdr(priv, pkt, &ctx, &off) < 0)

	    nft_inner_parse_tunhdr(priv, pkt, tun_ctx, &off) < 0)

		return -1;



	if (priv->flags & (NFT_INNER_LL | NFT_INNER_NH)) {

		if (nft_inner_parse_l2l3(priv, pkt, &ctx, off) < 0)

		if (nft_inner_parse_l2l3(priv, pkt, tun_ctx, off) < 0)

			return -1;

	} else if (priv->flags & NFT_INNER_TH) {

		ctx.inner_thoff = off;

		ctx.flags |= NFT_PAYLOAD_CTX_INNER_TH;

		tun_ctx->inner_thoff = off;

		tun_ctx->flags |= NFT_PAYLOAD_CTX_INNER_TH;

	}



	*tun_ctx = ctx;

	tun_ctx->type = priv->type;

	tun_ctx->cookie = (unsigned long)pkt->skb;

	pkt->flags |= NFT_PKTINFO_INNER_FULL;



	return 0;

}



static bool nft_inner_restore_tun_ctx(const struct nft_pktinfo *pkt,

				      struct nft_inner_tun_ctx *tun_ctx)

{

	struct nft_inner_tun_ctx *this_cpu_tun_ctx;



	local_bh_disable();

	this_cpu_tun_ctx = this_cpu_ptr(&nft_pcpu_tun_ctx);

	if (this_cpu_tun_ctx->cookie != (unsigned long)pkt->skb) {

		local_bh_enable();

		return false;

	}

	*tun_ctx = *this_cpu_tun_ctx;

	local_bh_enable();



	return true;

}



static void nft_inner_save_tun_ctx(const struct nft_pktinfo *pkt,

				   const struct nft_inner_tun_ctx *tun_ctx)

{

	struct nft_inner_tun_ctx *this_cpu_tun_ctx;



	local_bh_disable();

	this_cpu_tun_ctx = this_cpu_ptr(&nft_pcpu_tun_ctx);

	if (this_cpu_tun_ctx->cookie != tun_ctx->cookie)

		*this_cpu_tun_ctx = *tun_ctx;

	local_bh_enable();

}



static bool nft_inner_parse_needed(const struct nft_inner *priv,

				   const struct nft_pktinfo *pkt,

				   const struct nft_inner_tun_ctx *tun_ctx)

				   struct nft_inner_tun_ctx *tun_ctx)

{

	if (!(pkt->flags & NFT_PKTINFO_INNER_FULL))

		return true;



	if (!nft_inner_restore_tun_ctx(pkt, tun_ctx))

		return true;



	if (priv->type != tun_ctx->type)

		return true;
@@ -248,27 +279,29 @@ static bool nft_inner_parse_needed(const struct nft_inner *priv, 
static void nft_inner_eval(const struct nft_expr *expr, struct nft_regs *regs,

			   const struct nft_pktinfo *pkt)

{

	struct nft_inner_tun_ctx *tun_ctx = this_cpu_ptr(&nft_pcpu_tun_ctx);

	const struct nft_inner *priv = nft_expr_priv(expr);

	struct nft_inner_tun_ctx tun_ctx = {};



	if (nft_payload_inner_offset(pkt) < 0)

		goto err;



	if (nft_inner_parse_needed(priv, pkt, tun_ctx) &&

	    nft_inner_parse(priv, (struct nft_pktinfo *)pkt, tun_ctx) < 0)

	if (nft_inner_parse_needed(priv, pkt, &tun_ctx) &&

	    nft_inner_parse(priv, (struct nft_pktinfo *)pkt, &tun_ctx) < 0)

		goto err;



	switch (priv->expr_type) {

	case NFT_INNER_EXPR_PAYLOAD:

		nft_payload_inner_eval((struct nft_expr *)&priv->expr, regs, pkt, tun_ctx);

		nft_payload_inner_eval((struct nft_expr *)&priv->expr, regs, pkt, &tun_ctx);

		break;

	case NFT_INNER_EXPR_META:

		nft_meta_inner_eval((struct nft_expr *)&priv->expr, regs, pkt, tun_ctx);

		nft_meta_inner_eval((struct nft_expr *)&priv->expr, regs, pkt, &tun_ctx);

		break;

	default:

		WARN_ON_ONCE(1);

		goto err;

	}

	nft_inner_save_tun_ctx(pkt, &tun_ctx);



	return;

err:

	regs->verdict.code = NFT_BREAK;