From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3884C33CB2 for ; Tue, 14 Jan 2020 21:29:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6B97524670 for ; Tue, 14 Jan 2020 21:29:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=azazel.net header.i=@azazel.net header.b="obZY7LOe" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728731AbgANV3C (ORCPT ); Tue, 14 Jan 2020 16:29:02 -0500 Received: from kadath.azazel.net ([81.187.231.250]:55010 "EHLO kadath.azazel.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728748AbgANV3C (ORCPT ); Tue, 14 Jan 2020 16:29:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20190108; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=SWH2fsNHdgS1g123EuVLW1bcyZaGJmRYynG26l5tOK8=; b=obZY7LOezXECioY8kYKWPVwMW+ sSAD0LhyxHlFcEst2TFrVby/KIlnlhxvn/Zy50HFT8yTwG6gWeVSl/5xFaoTa/NvI0mRg7bQTMnac k6HbbMe5+rbkfKKJUg/xnCssYBrc7ShIishBXZ0P2jy9WCNmEMvGaBpniOH5H2CymVjU5pW0SgS/M ZeQo0+byG3sxZzR/8MOsKWno14ZozW2jFqU5OBOfdS7518oe3EUggO6Hq9r+TfULQvfn914eNcONC slXHHjMrVFhiLvYfc7swYZINoCN3UGMNrdT8ccJf7CvenAJNegqdB8BMfBqe7GkjzaRQmLKh8rZCP nPPXuOxw==; Received: from [2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae] (helo=ulthar.dreamlands) by kadath.azazel.net with esmtp (Exim 4.92) (envelope-from ) id 1irTkC-0001CO-Qz; Tue, 14 Jan 2020 21:29:00 +0000 From: Jeremy Sowden To: Pablo Neira Ayuso Cc: Netfilter Devel Subject: [PATCH nf-next 2/3] netfilter: bitwise: replace gotos with returns. Date: Tue, 14 Jan 2020 21:28:59 +0000 Message-Id: <20200114212900.134015-3-jeremy@azazel.net> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200114212900.134015-1-jeremy@azazel.net> References: <20200114212900.134015-1-jeremy@azazel.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org 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 --- net/netfilter/nft_bitwise.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/net/netfilter/nft_bitwise.c b/net/netfilter/nft_bitwise.c index 10e9d50e4e19..d7724250be1f 100644 --- a/net/netfilter/nft_bitwise.c +++ b/net/netfilter/nft_bitwise.c @@ -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; -- 2.24.1