From patchwork Thu Feb 27 13:55:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 13994545 Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D196522F397; Thu, 27 Feb 2025 13:56:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.22 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740664588; cv=none; b=J9fAAO3R4PdWSov3vdT6/rRUdxl6gUXxQ2sO+MTHe6rErcy1/c/aFvG9xgW6ojnkQ3Ja4rM1nSXCG0KcUvoesh9SdxUCq/ZBTL659M6MGe9StfXp///UzI4ZLEee9C1soeRIKUojreb5Cxw2y0Wlr7EY7kxr/GdMnh9LwaGx1R8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740664588; c=relaxed/simple; bh=rIwbnndQllhsERXn5i8gCFpQ2C2ImHtd/yeJjzMGTdM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=eRBr5XXh7t/vl9g8WtNtTOwHh+a71Oe1J6bQWIjhjQyTiwUFIIFHg6knY2FeQBn26z6xfGCCugGpinSEYkLi5DljmvoJUyAHrZPevqqMCFAve/g8U+JLTv7uCeEYhOG/lIweMyT5zYWDej6rObnslk7Qz31IoDNbsUSXIeIJEzs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.net; spf=pass smtp.mailfrom=gmx.net; dkim=pass (2048-bit key) header.d=gmx.net header.i=ps.report@gmx.net header.b=ESTdm5U2; arc=none smtp.client-ip=212.227.17.22 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmx.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.net header.i=ps.report@gmx.net header.b="ESTdm5U2" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.net; s=s31663417; t=1740664573; x=1741269373; i=ps.report@gmx.net; bh=rIwbnndQllhsERXn5i8gCFpQ2C2ImHtd/yeJjzMGTdM=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-ID: MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=ESTdm5U2GXMiHLmVdcJu1VUmKacFf4vwJ2dVsFZj/QPKEyVZVYojEE+qMz4esZJw bvzhXVWxJm6PmZMnjnvBYW7/DXhpEIYCOa3EjuG2Qy9tATGz3Fcbi+zPcQhW77WBy t/TjpRNTsRf1s2vY1425Wtoa0Igf4XVDqK2wj3DDEOqiXpgNkw2nKWnZT209yHKNX t73wOkRO5/Sxicugka+wsqjRPLtyvUrl1NG9XIOKf6HKpRHMzYl1o+XuFJ4JsB+nu xuFhxMxZ95lGZheEfnBhFRjPKahDnUYXaEUzoq0xjB8Jaa4+FbP1Juw05Cyc0SYLZ GRLXDcHfeeaKC5jkIQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([82.135.81.151]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N2V0B-1t9nU21bl1-00zPt8; Thu, 27 Feb 2025 14:56:13 +0100 From: Peter Seiderer To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan , Peter Seiderer , Fedor Pchelkin , Arnd Bergmann , Nam Cao Subject: [PATCH net-next v8 0/8] Some pktgen fixes/improvments (part II) Date: Thu, 27 Feb 2025 14:55:56 +0100 Message-ID: <20250227135604.40024-1-ps.report@gmx.net> X-Mailer: git-send-email 2.48.1 Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:+ZMmjWgRGNeQx0O4QwigHiJpGjVQt7Q8Rw3QwqNjovR9mCW8EiI TsSYu3S+hMVVa3b+gDkZ/rnBIjYNuoq8sj7MmTVCjBk3S7S7v/R5TVaD3f7cg6GurCvyJdo lbA1YRhgQ4f9jqmk9oE8yAJp4WcQMOCRVYg8UZFLnXZ4QLDV+j7IxI4ELNf4yeUa7wKX/mx lTGFh5ScSjMeVDy4uS7vQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:MSuGgCwiDNY=;Oxbc96fIjGrD3UIJiyfvJLQgLtG h+g3gqeQJqISNcsmxw4L1pm9ZLEkSFG2cNN9kQK6b88LCIDjgzDTchemravWYtJyrAiUoeFbg 6A2TicshDf46ou8Pw5kyTKDRevLDo8E93YGYOelXtRmeB96TmjJA0ZZlSUf6yuEaYjj8Dkn7s BRd7z2rGyD8H4xXo/M9VfUL654Iz0qvWTkNqIJ6qLEFsfvHcIhw3WT3DFSm+V9wmJpNhcuPxr L8vGqkMp41DSqQVonqEAPreW1TQHTb4VFQECSrUy8Q+OpflUfmyECsILLlL9pJx5V2IWon9/L a6b21UpsY89u+TsXhHf+6Lw7OtvUOTL0oNHjHeiqfPJBFz3MXgnIrB1HWxoTf3agyy/hh06oP lPVFmfbqR9HkyywzFwXNgpruLrNsTw0E7nl5RKP/VnMvd+EYuqOg7KEc82yZEA5rYMBUEMW0L TdpV6ujnSbgFmwBMNFoEUhNeKiadDwgnC5EucdpQd+GxNylrV6VXL7rgsq+TjqpPKd5fUu0Dp s2pZ7XcS3RoBXx+Xe/zVET/XODTy1mNBucDN1bBdaEcOw8w+GfYSoO/AVnZPxw3WqDmvvkl+F IXp8xIDrdjJ+7U4ulECbJsPpTILuToRgDz4rfbARvPeyRXQTcI1Rdu3/GOir6+CSgXAoaCKiH 3uUeDLfkv2Q3HIlut/D8pSvAsINHb+xRY7X1jponZlsLZRohmGbHo0DX3JIFNgGU296+hRPIH qsqz6vyH6bnNbgSFu2hXkGpBPIJo0KTeHzEcWd2W88odpuAgzvxYPbNcVVLMavmyjLBNiZBJp Gk2MwZQeDEV3/eP2s8ITHKlUCmMTvxwrsMEbBGx2G9lOrZxKSLavlUebce2EiGLmV3OhQPjUQ XSbYL0obwMk78gPeYgKbIuVwfd8sNn9TPyZOx03UhmYSafpvuopV3B0QGfNb60Jq9DZtBKnuI ixuj3Uc3HTlPFQ6cpTFmp3SsgHqL4n3/fU47Phdv4PPBIEaO86riBffAytFmWfAXhalg1o+/m INlWxZyHcdrBFXdrk/LGJFdX6b5l26hBxsmQgCWvCEgEQQGKjHIBqR51uhUVHNufMavvqO8II jA/AeIpxxf5x19TOU7c5ECol/sgaYSVLhAXd2xb2ehHvpbqlHjqNY/jXZJxDjpogclWsdWQh+ 9N/FV5FScyJGuMZxQM8M5LjdYtSApciXQPp7ga1wBAkDezHLc2g/IVqsVdjxbrAPqOQJLqhWS HFEa9Hu0cgHxQ0W1aFVnFK+/7i7T+0LP+o8jcs2UNBRx8AZlO9r02T5saMaXj5VtFjXGk6Ul8 6G4BuGZDo/7F4229F1/voM2zkASmCfK/CbLNATDdyMLwn/Z40+0lD5ckuopdmwrlOrekFb2Pz CWKBhR08/myxkXdeRRA7wcNHHkPKcX0j4wEKZN4UoH48iEbVfsXCqfGh4UWcrkKFQ1BScMd9C 2cYAD5g== While taking a look at '[PATCH net] pktgen: Avoid out-of-range in get_imix_entries' ([1]) and '[PATCH net v2] pktgen: Avoid out-of-bounds access in get_imix_entries' ([2], [3]) and doing some tests and code review I detected that the /proc/net/pktgen/... parsing logic does not honour the user given buffer bounds (resulting in out-of-bounds access). This can be observed e.g. by the following simple test (sometimes the old/'longer' previous value is re-read from the buffer): $ echo add_device lo@0 > /proc/net/pktgen/kpktgend_0 $ echo "min_pkt_size 12345" > /proc/net/pktgen/lo\@0 && grep min_pkt_size /proc/net/pktgen/lo\@0 Params: count 1000 min_pkt_size: 12345 max_pkt_size: 0 Result: OK: min_pkt_size=12345 $ echo -n "min_pkt_size 123" > /proc/net/pktgen/lo\@0 && grep min_pkt_size /proc/net/pktgen/lo\@0 Params: count 1000 min_pkt_size: 12345 max_pkt_size: 0 Result: OK: min_pkt_size=12345 $ echo "min_pkt_size 123" > /proc/net/pktgen/lo\@0 && grep min_pkt_size /proc/net/pktgen/lo\@0 Params: count 1000 min_pkt_size: 123 max_pkt_size: 0 Result: OK: min_pkt_size=123 So fix the out-of-bounds access (and some minor findings) and add a simple proc_net_pktgen selftest... Patch set splited into part I (now already applied to net-next) - net: pktgen: replace ENOTSUPP with EOPNOTSUPP - net: pktgen: enable 'param=value' parsing - net: pktgen: fix hex32_arg parsing for short reads - net: pktgen: fix 'rate 0' error handling (return -EINVAL) - net: pktgen: fix 'ratep 0' error handling (return -EINVAL) - net: pktgen: fix ctrl interface command parsing - net: pktgen: fix access outside of user given buffer in pktgen_thread_write() nd part II (this one): - net: pktgen: use defines for the various dec/hex number parsing digits lengths - net: pktgen: fix mix of int/long - net: pktgen: remove extra tmp variable (re-use len instead) - net: pktgen: remove some superfluous variable initializing - net: pktgen: fix mpls maximum labels list parsing - net: pktgen: fix access outside of user given buffer in pktgen_if_write() - net: pktgen: fix mpls reset parsing - net: pktgen: remove all superfluous index assignements - selftest: net: add proc_net_pktgen Regards, Peter Changes v7 -> v8: - rebased on actual net-next/main - add rev-by Simon Horman - net: pktgen: fix mpls maximum labels list parsing - slightly rephrase commit message, omit '/16' (suggested by Paolo Abeni) - net: pktgen: fix mpls reset parsing - fix c99 comment (suggested by Paolo Abeni) - selftest: net: add proc_net_pktgen - fix c99 comments (suggested by Paolo Abeni) Changes v6 -> v7: - rebased on actual net-next/main - selftest: net: add proc_net_pktgen - fixed conflict in tools/testing/selftests/net/config Changes v5 -> v6: - add rev-by Simon Horman - drop patch 'net: pktgen: use defines for the various dec/hex number parsing digits lengths' - adjust to dropped patch 'net: pktgen: use defines for the various dec/hex number parsing digits lengths' - net: pktgen: fix mix of int/long - fix line break (suggested by Simon Horman) Changes v4 -> v5: - split up patchset into part i/ii (suggested by Simon Horman) - add rev-by Simon Horman - net: pktgen: align some variable declarations to the most common pattern -> net: pktgen: fix mix of int/long - instead of align to most common pattern (int) adjust all usages to size_t for i and max and ssize_t for len and adjust function signatures of hex32_arg(), count_trail_chars(), num_arg() and strn_len() accordingly - respect reverse xmas tree order for local variable declarations (where possible without too much code churn) - update subject line and patch description - dropped net: pktgen: hex32_arg/num_arg error out in case no characters are available - keep empty hex/num arg is implicit assumed as zero value - dropped net: pktgen: num_arg error out in case no valid character is parsed - keep empty hex/num arg is implicit assumed as zero value - Change patch description ('Fixes:' -> 'Addresses the following:', suggested by Simon Horman) - net: pktgen: remove all superfluous index assignements - new patch (suggested by Simon Horman) - selftest: net: add proc_net_pktgen - addapt to dropped patch 'net: pktgen: hex32_arg/num_arg error out in case no characters are available', empty hex/num arg is now implicit assumed as zero value (instead of failure) Changes v3 -> v4: - add rev-by Simon Horman - new patch 'net: pktgen: use defines for the various dec/hex number parsing digits lengths' (suggested by Simon Horman) - replace C99 comment (suggested by Paolo Abeni) - drop available characters check in strn_len() (suggested by Paolo Abeni) - factored out patch 'net: pktgen: align some variable declarations to the most common pattern' (suggested by Paolo Abeni) - factored out patch 'net: pktgen: remove extra tmp variable (re-use len instead)' (suggested by Paolo Abeni) - factored out patch 'net: pktgen: remove some superfluous variable initializing' (suggested by Paolo Abeni) - factored out patch 'net: pktgen: fix mpls maximum labels list parsing' (suggested by Paolo Abeni) - factored out 'net: pktgen: hex32_arg/num_arg error out in case no characters are available' (suggested by Paolo Abeni) - factored out 'net: pktgen: num_arg error out in case no valid character is parsed' (suggested by Paolo Abeni) Changes v2 -> v3: - new patch: 'net: pktgen: fix ctrl interface command parsing' - new patch: 'net: pktgen: fix mpls reset parsing' - tools/testing/selftests/net/proc_net_pktgen.c: - fix typo in change description ('v1 -> v1' and tyop) - rename some vars to better match usage add_loopback_0 -> thr_cmd_add_loopback_0 rm_loopback_0 -> thr_cmd_rm_loopback_0 wrong_ctrl_cmd -> wrong_thr_cmd legacy_ctrl_cmd -> legacy_thr_cmd ctrl_fd -> thr_fd - add ctrl interface tests Changes v1 -> v2: - new patch: 'net: pktgen: fix hex32_arg parsing for short reads' - new patch: 'net: pktgen: fix 'rate 0' error handling (return -EINVAL)' - new patch: 'net: pktgen: fix 'ratep 0' error handling (return -EINVAL)' - net/core/pktgen.c: additional fix get_imix_entries() and get_labels() - tools/testing/selftests/net/proc_net_pktgen.c: - fix typo not vs. nod (suggested by Jakub Kicinski) - fix misaligned line (suggested by Jakub Kicinski) - enable fomerly commented out CONFIG_XFRM dependent test (command spi), as CONFIG_XFRM is enabled via tools/testing/selftests/net/config CONFIG_XFRM_INTERFACE/CONFIG_XFRM_USER (suggestex by Jakub Kicinski) - add CONFIG_NET_PKTGEN=m to tools/testing/selftests/net/config (suggested by Jakub Kicinski) - add modprobe pktgen to FIXTURE_SETUP() (suggested by Jakub Kicinski) - fix some checkpatch warnings (Missing a blank line after declarations) - shrink line length by re-naming some variables (command -> cmd, device -> dev) - add 'rate 0' testcase - add 'ratep 0' testcase [1] https://lore.kernel.org/netdev/20241006221221.3744995-1-artem.chernyshev@red-soft.ru/ [2] https://lore.kernel.org/netdev/20250109083039.14004-1-pchelkin@ispras.ru/ [3] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=76201b5979768500bca362871db66d77cb4c225e Peter Seiderer (8): net: pktgen: fix mix of int/long net: pktgen: remove extra tmp variable (re-use len instead) net: pktgen: remove some superfluous variable initializing net: pktgen: fix mpls maximum labels list parsing net: pktgen: fix access outside of user given buffer in pktgen_if_write() net: pktgen: fix mpls reset parsing net: pktgen: remove all superfluous index assignements selftest: net: add proc_net_pktgen net/core/pktgen.c | 288 ++++---- tools/testing/selftests/net/Makefile | 1 + tools/testing/selftests/net/config | 1 + tools/testing/selftests/net/proc_net_pktgen.c | 646 ++++++++++++++++++ 4 files changed, 805 insertions(+), 131 deletions(-) create mode 100644 tools/testing/selftests/net/proc_net_pktgen.c