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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 25A75C43462 for ; Wed, 31 Mar 2021 14:27:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C959560FF0 for ; Wed, 31 Mar 2021 14:26:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236072AbhCaO0b (ORCPT ); Wed, 31 Mar 2021 10:26:31 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:55598 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235890AbhCaO0K (ORCPT ); Wed, 31 Mar 2021 10:26:10 -0400 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lRbnK-0008UR-IX; Wed, 31 Mar 2021 14:26:06 +0000 From: Colin King To: Pablo Neira Ayuso , Jozsef Kadlecsik , Florian Westphal , "David S . Miller" , Jakub Kicinski , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH][next] netfilter: nf_log_bridge: Fix missing assignment of ret on a call to nf_log_register Date: Wed, 31 Mar 2021 15:26:06 +0100 Message-Id: <20210331142606.1422498-1-colin.king@canonical.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Colin Ian King Currently the call to nf_log_register is returning an error code that is not being assigned to ret and yet ret is being checked. Fix this by adding in the missing assignment. Addresses-Coverity: ("Logically dead code") Fixes: 8d02e7da87a0 ("netfilter: nf_log_bridge: merge with nf_log_syslog") Signed-off-by: Colin Ian King --- net/netfilter/nf_log_syslog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/nf_log_syslog.c b/net/netfilter/nf_log_syslog.c index 025ab9c66d13..2518818ed479 100644 --- a/net/netfilter/nf_log_syslog.c +++ b/net/netfilter/nf_log_syslog.c @@ -1042,7 +1042,7 @@ static int __init nf_log_syslog_init(void) if (ret < 0) goto err4; - nf_log_register(NFPROTO_BRIDGE, &nf_bridge_logger); + ret = nf_log_register(NFPROTO_BRIDGE, &nf_bridge_logger); if (ret < 0) goto err5; -- 2.30.2