From patchwork Mon Oct 16 14:08:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gavrilov Ilia X-Patchwork-Id: 153473 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp3487765vqb; Mon, 16 Oct 2023 07:09:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGAlVUBb59xxqC0Jx9ugP9p3UbmynWkthmOw4ex/Fqi8HF/W5f3V18F28YFo3/zu3aZhVOD X-Received: by 2002:a05:6a20:8f02:b0:15c:b7bb:2bd9 with SMTP id b2-20020a056a208f0200b0015cb7bb2bd9mr40119474pzk.6.1697465355931; Mon, 16 Oct 2023 07:09:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697465355; cv=none; d=google.com; s=arc-20160816; b=AlE+ba6SBNswK+34FDo0xFRoWzwnFoce1Qu1pNoS/C+WtolzPCKWvhGZZS8UgOJqjy D+WtWgGPND5Nbh82vTDHf4h53L+gk2dSg5Ah0/XTAAcLdCBRYcCdR2XQdMkTpHhAr9II x92yQkNcC4vNLuTGQu9il9BNYMC1qJe/vKBY5YVGUdqHmq6vTszue814OhyLHEKKqgC4 m9qLK6Me9I4jTQJh2BqMXDMiwWB+54aq7cOnLsO99pHf0dy/WO72nMAE9thQSO2goHdm up9xH6kcxxPRMalJ8bCAvX7POdZ20HJszntgH2yyBEwx60mtipgvIheYQh411uR+fx5N rz/g== 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=+ZC8GtdyCkRDxzr5JIpKd7VwUl5MmIl1Af5SMfJNu+M=; fh=Zv7/RXyse6qIAdoSP5g9JxN8wItiYgv19Y8jT1Vgp9w=; b=IobWkknkb0A5JCm3SPdwwM7Xy2PD0YML7GAuyWvNSvwrpB299uWln9yXFftunbF22J n+S2pcMuTPn48YUQscyUtiLAbZer3JL/9Qb8g/i2Z6pNCQkZTPkUwF2OvqLoI2D9gCtA jOAw26Rfm2HFT16kixuemcYtJoU1OiJehPcmlHeG5hvvBPaTXb34YM6IFByOw4jS6/4d C6sU/8pJbRdi19tDWUQLWegYPn0JQTVinM79PPSIlfFAJB+QxvC/LqbqC366OCeFDvtt aN7SDPPRnN3kZW2lpA7nALgNYkXPM/nK+Xcx3kJ0/ZWiG/ro7CJ13rRa8bmx5IGqTXKq Uh3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infotecs.ru header.s=mx header.b=g9ekjkro; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id nu9-20020a17090b1b0900b00268a8e0cab3si6691798pjb.178.2023.10.16.07.09.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 07:09:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@infotecs.ru header.s=mx header.b=g9ekjkro; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 49FC98032036; Mon, 16 Oct 2023 07:09:15 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233529AbjJPOJJ (ORCPT + 18 others); Mon, 16 Oct 2023 10:09:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35630 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229784AbjJPOJI (ORCPT ); Mon, 16 Oct 2023 10:09:08 -0400 Received: from mx0.infotecs.ru (mx0.infotecs.ru [91.244.183.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E6FB9F; Mon, 16 Oct 2023 07:09:04 -0700 (PDT) Received: from mx0.infotecs-nt (localhost [127.0.0.1]) by mx0.infotecs.ru (Postfix) with ESMTP id 2E58610D45E4; Mon, 16 Oct 2023 17:09:00 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx0.infotecs.ru 2E58610D45E4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=infotecs.ru; s=mx; t=1697465340; bh=+ZC8GtdyCkRDxzr5JIpKd7VwUl5MmIl1Af5SMfJNu+M=; h=From:To:CC:Subject:Date:From; b=g9ekjkro5OTpLaHHhJsqrXI7Zv+df7nSf73SdJugv1btmf57bBwDj2ao952WWQxU/ O8GftW08kqj6+7TO1EUBUiIksrGEEzHoa+liB9EDw0TiDg3Bem9G137a4oAj/JecXw SZpQrvrvUmf0dk1Jv/or0ZiulZf4YXDxkQI/Lloo= Received: from msk-exch-02.infotecs-nt (msk-exch-02.infotecs-nt [10.0.7.192]) by mx0.infotecs-nt (Postfix) with ESMTP id 2ACAE309B5EE; Mon, 16 Oct 2023 17:09:00 +0300 (MSK) From: Gavrilov Ilia To: "David S. Miller" CC: Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jason Gunthorpe , "Greg Kroah-Hartman" , "Jason A. Donenfeld" , Kees Cook , Yunsheng Lin , Dmitry Safonov <0x7f454c46@gmail.com>, "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "lvc-project@linuxtesting.org" Subject: [PATCH net] net: pktgen: Fix interface flags printing Thread-Topic: [PATCH net] net: pktgen: Fix interface flags printing Thread-Index: AQHaADpPvpSeWfXDTUmbVpNurCN1KQ== Date: Mon, 16 Oct 2023 14:08:59 +0000 Message-ID: <20231016140631.1245318-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: 5 X-KLMS-Message-Action: clean X-KLMS-AntiSpam-Status: not scanned, disabled by settings X-KLMS-AntiSpam-Interceptor-Info: not scanned X-KLMS-AntiPhishing: Clean, bases: 2023/10/16 11:09:00 X-KLMS-AntiVirus: Kaspersky Security for Linux Mail Server, version 8.0.3.30, bases: 2023/10/16 12:06:00 #22200180 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,RCVD_IN_DNSWL_BLOCKED, 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 16 Oct 2023 07:09:15 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779921433288800310 X-GMAIL-MSGID: 1779921433288800310 Device flags are displayed incorrectly: 1) The comparison (i == F_FLOW_SEQ) is always false, because F_FLOW_SEQ is equal to (1 << FLOW_SEQ_SHIFT) == 2048, and the maximum value of the 'i' variable is (NR_PKT_FLAG - 1) == 17. It should be compared with FLOW_SEQ_SHIFT. 2) Similarly to the F_IPSEC flag. 3) Also add spaces to the print end of the string literal "spi:%u" to prevent the output from merging with the flag that follows. Found by InfoTeCS on behalf of Linux Verification Center (linuxtesting.org) with SVACE. Fixes: 99c6d3d20d62 ("pktgen: Remove brute-force printing of flags") Signed-off-by: Gavrilov Ilia --- net/core/pktgen.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/net/core/pktgen.c b/net/core/pktgen.c index f56b8d697014..4d1696677c48 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -669,19 +669,19 @@ static int pktgen_if_show(struct seq_file *seq, void *v) seq_puts(seq, " Flags: "); for (i = 0; i < NR_PKT_FLAGS; i++) { - if (i == F_FLOW_SEQ) + if (i == FLOW_SEQ_SHIFT) if (!pkt_dev->cflows) continue; - if (pkt_dev->flags & (1 << i)) + if (pkt_dev->flags & (1 << i)) { seq_printf(seq, "%s ", pkt_flag_names[i]); - else if (i == F_FLOW_SEQ) - seq_puts(seq, "FLOW_RND "); - #ifdef CONFIG_XFRM - if (i == F_IPSEC && pkt_dev->spi) - seq_printf(seq, "spi:%u", pkt_dev->spi); + if (i == IPSEC_SHIFT && pkt_dev->spi) + seq_printf(seq, "spi:%u ", pkt_dev->spi); #endif + } else if (i == FLOW_SEQ_SHIFT) { + seq_puts(seq, "FLOW_RND "); + } } seq_puts(seq, "\n");