]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
netfilter: bitwise: improve error goto labels
authorJeremy Sowden <jeremy@azazel.net>
Mon, 4 Apr 2022 12:04:15 +0000 (13:04 +0100)
committerFlorian Westphal <fw@strlen.de>
Sat, 9 Apr 2022 10:02:23 +0000 (12:02 +0200)
Replace two labels (`err1` and `err2`) with more informative ones.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Florian Westphal <fw@strlen.de>
net/netfilter/nft_bitwise.c

index dc5759fac5b6b4034b98018f65c7b17a78345392..d72143622f22e0b5800ee1263a8198c711c81101 100644 (file)
@@ -109,22 +109,23 @@ static int nft_bitwise_init_bool(struct nft_bitwise *priv,
                return err;
        if (mask.type != NFT_DATA_VALUE || mask.len != priv->len) {
                err = -EINVAL;
-               goto err1;
+               goto err_mask_release;
        }
 
        err = nft_data_init(NULL, &priv->xor, sizeof(priv->xor), &xor,
                            tb[NFTA_BITWISE_XOR]);
        if (err < 0)
-               goto err1;
+               goto err_mask_release;
        if (xor.type != NFT_DATA_VALUE || xor.len != priv->len) {
                err = -EINVAL;
-               goto err2;
+               goto err_xor_release;
        }
 
        return 0;
-err2:
+
+err_xor_release:
        nft_data_release(&priv->xor, xor.type);
-err1:
+err_mask_release:
        nft_data_release(&priv->mask, mask.type);
        return err;
 }