Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

netfilter: bitwise: improve error goto labels

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>

authored by

Jeremy Sowden and committed by
Florian Westphal
00bd4352 c70b921f

+6 -5
+6 -5
net/netfilter/nft_bitwise.c
··· 109 109 return err; 110 110 if (mask.type != NFT_DATA_VALUE || mask.len != priv->len) { 111 111 err = -EINVAL; 112 - goto err1; 112 + goto err_mask_release; 113 113 } 114 114 115 115 err = nft_data_init(NULL, &priv->xor, sizeof(priv->xor), &xor, 116 116 tb[NFTA_BITWISE_XOR]); 117 117 if (err < 0) 118 - goto err1; 118 + goto err_mask_release; 119 119 if (xor.type != NFT_DATA_VALUE || xor.len != priv->len) { 120 120 err = -EINVAL; 121 - goto err2; 121 + goto err_xor_release; 122 122 } 123 123 124 124 return 0; 125 - err2: 125 + 126 + err_xor_release: 126 127 nft_data_release(&priv->xor, xor.type); 127 - err1: 128 + err_mask_release: 128 129 nft_data_release(&priv->mask, mask.type); 129 130 return err; 130 131 }