提交 3cd80700 编写于 作者: J Jeremy Sowden 提交者: Zheng Zengkai

netfilter: bitwise: improve error goto labels

stable inclusion
from stable-v5.10.140
commit 8790eecdea019fe9a94e69271dc1633dd26c9505
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I63FTT

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=8790eecdea019fe9a94e69271dc1633dd26c9505

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

[ Upstream commit 00bd4352 ]

Replace two labels (`err1` and `err2`) with more informative ones.
Signed-off-by: NJeremy Sowden <jeremy@azazel.net>
Signed-off-by: NFlorian Westphal <fw@strlen.de>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: NWei Li <liwei391@huawei.com>
上级 94bc7bfd
...@@ -109,22 +109,23 @@ static int nft_bitwise_init_bool(struct nft_bitwise *priv, ...@@ -109,22 +109,23 @@ static int nft_bitwise_init_bool(struct nft_bitwise *priv,
return err; return err;
if (mask.type != NFT_DATA_VALUE || mask.len != priv->len) { if (mask.type != NFT_DATA_VALUE || mask.len != priv->len) {
err = -EINVAL; err = -EINVAL;
goto err1; goto err_mask_release;
} }
err = nft_data_init(NULL, &priv->xor, sizeof(priv->xor), &xor, err = nft_data_init(NULL, &priv->xor, sizeof(priv->xor), &xor,
tb[NFTA_BITWISE_XOR]); tb[NFTA_BITWISE_XOR]);
if (err < 0) if (err < 0)
goto err1; goto err_mask_release;
if (xor.type != NFT_DATA_VALUE || xor.len != priv->len) { if (xor.type != NFT_DATA_VALUE || xor.len != priv->len) {
err = -EINVAL; err = -EINVAL;
goto err2; goto err_xor_release;
} }
return 0; return 0;
err2:
err_xor_release:
nft_data_release(&priv->xor, xor.type); nft_data_release(&priv->xor, xor.type);
err1: err_mask_release:
nft_data_release(&priv->mask, mask.type); nft_data_release(&priv->mask, mask.type);
return err; return err;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册