From patchwork Mon Jan 23 08:19:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gavrilov Ilia X-Patchwork-Id: 47063 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1493226wrn; Mon, 23 Jan 2023 00:32:55 -0800 (PST) X-Google-Smtp-Source: AMrXdXtYGWChoaogOhLGIqADn81ekd9nBPY2p1qpHCOajXr1dj00OYr2eGp9mMyhBKCQp8htKPU/ X-Received: by 2002:a05:6402:3226:b0:498:1ca:80d0 with SMTP id g38-20020a056402322600b0049801ca80d0mr30581252eda.28.1674462775334; Mon, 23 Jan 2023 00:32:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674462775; cv=none; d=google.com; s=arc-20160816; b=hAk9C06OXeTQj+m5ivJGVC9fWaSDSR1XWPcpRtDqTAMPTSTCV1eRO3RQw672BwzQZP WL1Dw3r6VGQKARVOR/c3a3nbZLJN1RN9lqJM6LMOtp0s180CVksR8Rqfb27fgtLEsNr8 lC7+w08hrvfrmjVr3cr1msfnXK2vmx67SL5UWpD1SClUGJ0tubNWUITXVBwk7VBbAx1M OmpPhPzq9g24oDq/CO9VsCqZAeCDKoMgP2W8X3i/gdrZGOza7SZOUnFHiwiUUEC7LNze jiq6ZWQEYRT96QCarJyjSvZDvJu//5KPT5YcoNjgZU6oEfVzavt2NXgg2RKKQ4SCqepw yAgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :content-language:accept-language:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature:dkim-filter; bh=UYNvFu2ftjGj1CHXawVAguz9o1/cVkuIuyh3pOYpg2I=; b=QXg516FLNCrIce3VaUi7a4fz/w4NcB96NIT74O7XwOo7/sD4eulf1CA5IjFkuS8xow pI+4D2SK/Ic+8KSs8y/5tGgJfmeNoqmSi5+y41k6Sd3Tskd9Oy9TFv9d6vAwGzeB4jNx ZYktdvGhjcp7e3sTEB9zh62HDKV01Zh/AqKaP3VndpvJ9MQUVLIpGGwdaQW/OzqWIcQJ YMz4Ulwitg/CleeUaHm295Bifs1CopcSY5pH/kXiWhOJBLqLdd+dE1NJmfJHdJOtxDWD Ixen/acVSSmSWAlngaynsCYyxOxFLTfRDsC2CgRtoFu+TBxEPV+aQ4cDFbNndut1VZT3 Zjqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infotecs.ru header.s=mx header.b=InXeXHyd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=infotecs.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hv13-20020a17090760cd00b008726f2c7f90si22374013ejc.835.2023.01.23.00.32.32; Mon, 23 Jan 2023 00:32:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infotecs.ru header.s=mx header.b=InXeXHyd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=infotecs.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231263AbjAWIUB (ORCPT + 99 others); Mon, 23 Jan 2023 03:20:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230355AbjAWIT6 (ORCPT ); Mon, 23 Jan 2023 03:19:58 -0500 Received: from mx0.infotecs.ru (mx0.infotecs.ru [91.244.183.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 52EF21A947; Mon, 23 Jan 2023 00:19:55 -0800 (PST) Received: from mx0.infotecs-nt (localhost [127.0.0.1]) by mx0.infotecs.ru (Postfix) with ESMTP id 333D31024B98; Mon, 23 Jan 2023 11:19:51 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx0.infotecs.ru 333D31024B98 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=infotecs.ru; s=mx; t=1674461991; bh=UYNvFu2ftjGj1CHXawVAguz9o1/cVkuIuyh3pOYpg2I=; h=From:To:CC:Subject:Date:From; b=InXeXHydVPLRaKk1T4TlO/mNi9rAChZhaC3nlv5bkKz/JFD9Rp95fXBinAyhTAOjr KqWHB0JvgeXY4b/lfYTPb9KCLBZFAWQcburvkjp5FynnVGx4Gvyjm+XkD44hNcjgSF 76AFRDW10C3A/aKD3Bb8Hz+AZXuVlvFMg0ncPHQ8= Received: from msk-exch-02.infotecs-nt (msk-exch-02.infotecs-nt [10.0.7.192]) by mx0.infotecs-nt (Postfix) with ESMTP id 2F0EE316973F; Mon, 23 Jan 2023 11:19:51 +0300 (MSK) From: Gavrilov Ilia To: Pablo Neira Ayuso CC: Jozsef Kadlecsik , Florian Westphal , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , "Joe Perches" , "netfilter-devel@vger.kernel.org" , "coreteam@netfilter.org" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "lvc-project@linuxtesting.org" Subject: [PATCH] netfilter: conntrack: remote a return value of the 'seq_print_acct' function. Thread-Topic: [PATCH] netfilter: conntrack: remote a return value of the 'seq_print_acct' function. Thread-Index: AQHZLwN2IudSa+yU30iWUXYGCT8Rrg== Date: Mon, 23 Jan 2023 08:19:50 +0000 Message-ID: <20230123081957.1380790-1-Ilia.Gavrilov@infotecs.ru> Accept-Language: ru-RU, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.17.0.10] x-exclaimer-md-config: 208ac3cd-1ed4-4982-a353-bdefac89ac0a MIME-Version: 1.0 X-KLMS-Rule-ID: 1 X-KLMS-Message-Action: clean X-KLMS-AntiSpam-Lua-Profiles: 174913 [Jan 23 2023] X-KLMS-AntiSpam-Version: 5.9.59.0 X-KLMS-AntiSpam-Envelope-From: Ilia.Gavrilov@infotecs.ru X-KLMS-AntiSpam-Rate: 0 X-KLMS-AntiSpam-Status: not_detected X-KLMS-AntiSpam-Method: none X-KLMS-AntiSpam-Auth: dkim=none X-KLMS-AntiSpam-Info: LuaCore: 502 502 69dee8ef46717dd3cb3eeb129cb7cc8dab9e30f6, {Tracking_from_domain_doesnt_match_to}, 127.0.0.199:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;infotecs.ru:7.1.1 X-MS-Exchange-Organization-SCL: -1 X-KLMS-AntiSpam-Interceptor-Info: scan successful X-KLMS-AntiPhishing: Clean, bases: 2023/01/23 07:22:00 X-KLMS-AntiVirus: Kaspersky Security for Linux Mail Server, version 8.0.3.30, bases: 2023/01/23 00:37:00 #20794104 X-KLMS-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755801479417324007?= X-GMAIL-MSGID: =?utf-8?q?1755801479417324007?= The static 'seq_print_acct' function always returns 0. Change the return value to 'void' and remove unnecessary checks. Found by InfoTeCS on behalf of Linux Verification Center (linuxtesting.org) with SVACE. Fixes: 1ca9e41770cb ("netfilter: Remove uses of seq_ return values") Signed-off-by: Ilia.Gavrilov --- net/netfilter/nf_conntrack_standalone.c | 26 ++++++++++--------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c index 0250725e38a4..bee99d4bcf36 100644 --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c @@ -275,22 +275,18 @@ static const char* l4proto_name(u16 proto) return "unknown"; } -static unsigned int +static void seq_print_acct(struct seq_file *s, const struct nf_conn *ct, int dir) { - struct nf_conn_acct *acct; - struct nf_conn_counter *counter; + struct nf_conn_acct *acct = nf_conn_acct_find(ct); - acct = nf_conn_acct_find(ct); - if (!acct) - return 0; - - counter = acct->counter; - seq_printf(s, "packets=%llu bytes=%llu ", - (unsigned long long)atomic64_read(&counter[dir].packets), - (unsigned long long)atomic64_read(&counter[dir].bytes)); + if (acct) { + struct nf_conn_counter *counter = acct->counter; - return 0; + seq_printf(s, "packets=%llu bytes=%llu ", + (unsigned long long)atomic64_read(&counter[dir].packets), + (unsigned long long)atomic64_read(&counter[dir].bytes)); + } } /* return 0 on success, 1 in case of error */ @@ -342,8 +338,7 @@ static int ct_seq_show(struct seq_file *s, void *v) if (seq_has_overflowed(s)) goto release; - if (seq_print_acct(s, ct, IP_CT_DIR_ORIGINAL)) - goto release; + seq_print_acct(s, ct, IP_CT_DIR_ORIGINAL); if (!(test_bit(IPS_SEEN_REPLY_BIT, &ct->status))) seq_puts(s, "[UNREPLIED] "); @@ -352,8 +347,7 @@ static int ct_seq_show(struct seq_file *s, void *v) ct_show_zone(s, ct, NF_CT_ZONE_DIR_REPL); - if (seq_print_acct(s, ct, IP_CT_DIR_REPLY)) - goto release; + seq_print_acct(s, ct, IP_CT_DIR_REPLY); if (test_bit(IPS_HW_OFFLOAD_BIT, &ct->status)) seq_puts(s, "[HW_OFFLOAD] ");