netfilter: bitwise: replace gotos with returns. (577c734a) · Commits · 戴 / test

When dumping a bitwise expression, if any of the puts fails, we use goto to jump to a label. However, no clean-up is required and the only statement at the label is a return. Drop the goto's and return immediately instead. Signed-off-by:

Jeremy Sowden <jeremy@azazel.net> Signed-off-by:

Pablo Neira Ayuso <pablo@netfilter.org>

net/netfilter/nft_bitwise.c

+5 −8

Original line number	Diff line number	Diff line
		@@ -107,24 +107,21 @@ static int nft_bitwise_dump(struct sk_buff skb, const struct nft_expr expr)
		const struct nft_bitwise *priv = nft_expr_priv(expr);

		if (nft_dump_register(skb, NFTA_BITWISE_SREG, priv->sreg))
		goto nla_put_failure;
		return -1;
		if (nft_dump_register(skb, NFTA_BITWISE_DREG, priv->dreg))
		goto nla_put_failure;
		return -1;
		if (nla_put_be32(skb, NFTA_BITWISE_LEN, htonl(priv->len)))
		goto nla_put_failure;
		return -1;

		if (nft_data_dump(skb, NFTA_BITWISE_MASK, &priv->mask,
		NFT_DATA_VALUE, priv->len) < 0)
		goto nla_put_failure;
		return -1;

		if (nft_data_dump(skb, NFTA_BITWISE_XOR, &priv->xor,
		NFT_DATA_VALUE, priv->len) < 0)
		goto nla_put_failure;
		return -1;

		return 0;

		nla_put_failure:
		return -1;
		}

		static struct nft_data zero;

Admin message