From patchwork Mon Jan 23 14:31:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gavrilov Ilia X-Patchwork-Id: 47174 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1644399wrn; Mon, 23 Jan 2023 06:42:52 -0800 (PST) X-Google-Smtp-Source: AMrXdXscqc8GJfObv+TgGyeA8eFxOMW05j41ENZnDTp9j0qtHnhxPtTAXjcep/60gs+/bvFvK58s X-Received: by 2002:a17:906:79d8:b0:877:a2d1:7560 with SMTP id m24-20020a17090679d800b00877a2d17560mr11876273ejo.27.1674484972584; Mon, 23 Jan 2023 06:42:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674484972; cv=none; d=google.com; s=arc-20160816; b=lZFclLIPLsxTFnco8ta4T4FsmHBsITGUkS6grIb19sxUowW7IwMBJHXrmu5NieyJXe 2Pa9ZIzyvNbiRmwA/CGYpeZBWSODmqtPFUkLEBth8vmCDuOWA2OcOsZZ7QUV9apgT3PV 9JgFEXmfCU2FgImJq6+SmTaFb7U+sjsntDKBh8vT5pMZk3pzXjU/3FOnLiw4JFOnAf4g aQ0pBtyZgumgYAJcYwwHDEkfggcliFvDclUZUVHeIzHm7fzLzwiPxXAppfoQmQC5blHr hnCQBLlIjoLezg6GM8x2Kh/bA9BuzKLz/E4xs2o58W0McZX1VbbwWlvmJvOjpylcTirq tnLQ== 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:in-reply-to:references:message-id :date:thread-index:thread-topic:subject:cc:to:from:dkim-signature :dkim-filter; bh=h57s7zxPueQ/WaUzP0DIV44jkjXvbC4rM4m6NnFYSh8=; b=bAEptPPIYhWF0XSiuiGeKHfRalFuI/CXTdaSkz34edW5+ASMZ2UFjaSFevkEeKFB+6 BCf5s8U+JryNpZwCl6mhGILNqNj6GOY6iG7iDsUS1j/Bw62KGBtDXHJucukvACpXhLUs y8vQMDBhaZXaFN1OThd9sxeHF9V9qqASxqwWbJFQDdYPrPf/Xy36iYWp79frU3U8DzP1 gBFecA+M33QJnnOO6Q4fuznQn2m3Ya/EG9HVRK3WTK2vOU10oSYCoDLvyIw/u/5dJRC3 a8m8kSS/QN5VOE4g1JuMDDYqAyAZ8mDyFDQuVU5Ly1ZNlot0FsEFSKtyOgPP3kmirbvz eThA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infotecs.ru header.s=mx header.b=DKuOEIZm; 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 qa40-20020a17090786a800b008688996dda7si29250060ejc.86.2023.01.23.06.42.27; Mon, 23 Jan 2023 06:42:52 -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=DKuOEIZm; 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 S232342AbjAWOcB (ORCPT + 99 others); Mon, 23 Jan 2023 09:32:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232324AbjAWOb6 (ORCPT ); Mon, 23 Jan 2023 09:31:58 -0500 Received: from mx0.infotecs.ru (mx0.infotecs.ru [91.244.183.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 11BE3C64C; Mon, 23 Jan 2023 06:31:57 -0800 (PST) Received: from mx0.infotecs-nt (localhost [127.0.0.1]) by mx0.infotecs.ru (Postfix) with ESMTP id 316C2104841C; Mon, 23 Jan 2023 17:31:55 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx0.infotecs.ru 316C2104841C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=infotecs.ru; s=mx; t=1674484315; bh=h57s7zxPueQ/WaUzP0DIV44jkjXvbC4rM4m6NnFYSh8=; h=From:To:CC:Subject:Date:References:In-Reply-To:From; b=DKuOEIZmHTZvj2q86LOmAsNduH4lJAWiZayRQd47P94M8cd2DfJ9K+OQuY0ymg/xD 6cXUgAGIIf9I2oO2fsB2zVB/V2ET16QHWIfzSb0q6JoVwnGooX6jGWv+FnfP8c3mIO EjTwD52ouDiPUUXZGAsXiiMNoAZvJJ9MWQw98Vn4= Received: from msk-exch-01.infotecs-nt (msk-exch-01.infotecs-nt [10.0.7.191]) by mx0.infotecs-nt (Postfix) with ESMTP id 2D7D5316A0CB; Mon, 23 Jan 2023 17:31:55 +0300 (MSK) From: Gavrilov Ilia To: "leon@kernel.org" CC: Gavrilov Ilia , "coreteam@netfilter.org" , "davem@davemloft.net" , "edumazet@google.com" , "fw@strlen.de" , "joe@perches.com" , "kadlec@netfilter.org" , "kuba@kernel.org" , "linux-kernel@vger.kernel.org" , "lvc-project@linuxtesting.org" , "netdev@vger.kernel.org" , "netfilter-devel@vger.kernel.org" , "pabeni@redhat.com" , "pablo@netfilter.org" Subject: [PATCH v2] netfilter: conntrack: remote a return value of the 'seq_print_acct' function. Thread-Topic: [PATCH v2] netfilter: conntrack: remote a return value of the 'seq_print_acct' function. Thread-Index: AQHZLzdwu2dpvZ83O0uhtAvrU7ziYQ== Date: Mon, 23 Jan 2023 14:31:54 +0000 Message-ID: <20230123143202.1785569-1-Ilia.Gavrilov@infotecs.ru> References: In-Reply-To: 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: 174927 [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 12:45: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?1755824755044874197?= 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 Reviewed-by: Leon Romanovsky --- V2: Fix coding style net/netfilter/nf_conntrack_standalone.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c index 0250725e38a4..6819d07f9692 100644 --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c @@ -275,7 +275,7 @@ 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; @@ -283,14 +283,12 @@ seq_print_acct(struct seq_file *s, const struct nf_conn *ct, int dir) acct = nf_conn_acct_find(ct); if (!acct) - return 0; + return; 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)); - - return 0; } /* return 0 on success, 1 in case of error */ @@ -342,8 +340,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 +349,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] ");