From patchwork Fri Feb 21 21:52:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 13986352 Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) (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 57D5F255E5B; Fri, 21 Feb 2025 21:52:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.15.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740174782; cv=none; b=plRHJwjPfFCuPBkBS0+6kZBx1egsk07FZhb1AQ+9ZUbh2xYvZ+i/e7TAPrlV4Iuv6ZttXGtWrlz8tcG++FGHRTe9HGkGwFmu9jzQUERC0pCqWUV1xS0Jwr5B7t1QqYz09BQX8gHHg6AwK928paYe2dSnr7c7uIts9JTvhROhxxE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740174782; c=relaxed/simple; bh=36qu90QFkfh/TWXfafQ5DnfQF7WOPbCksE3LS7A+DZc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=X0GDPdyZN+qMJjyPLUDRoD0z2kT8qy5xWkEEUmzf53AotTybQE34mFkM/ZPJaBGbT6nSZN/b4JwiAIB3Icjh9wCLE/8IZVbZblpu+T+/S9lrssHipXHfhxXqb2G4wywXGS60/+Wj1V9tL/YCgANmiqrz2tBU6FDsfpQsmhKSob4= 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=kelNeF2g; arc=none smtp.client-ip=212.227.15.18 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="kelNeF2g" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.net; s=s31663417; t=1740174770; x=1740779570; i=ps.report@gmx.net; bh=36qu90QFkfh/TWXfafQ5DnfQF7WOPbCksE3LS7A+DZc=; 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=kelNeF2gm7FVdTlXQquVUvxTGiRUqrTjsdQGzv17TlivzbKKeSVyHMCiWvgt3y1q CqQeYj7PkBd5imp1kWpjPXMQX1kP/khdfUMpTScrnDL2hLHI+Sy9UCR4vf/SaedzM wYwIk38JkZCj+AvvjMPqETxfDVs4yI107yLqkPPGFG61PBAFRphT5/3Kc6emRWAKw 4KyY+5rg1q9WhkSYKSFmHUgyz6qMest+QZ536vsBtR0sLa5LYV3Fqi2CgOpc1HBws go7X9WL3QRvHb+IK6hlm3p45NyuXRxPaUQ9wZt8+h0+7zRStvtnJ4RwGWpPE04KO9 HEeKkxLWu2DH+iYo3Q== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([82.135.81.92]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MmULr-1t3hPX1Igr-00niN3; Fri, 21 Feb 2025 22:52:50 +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 , Thomas Gleixner , Artem Chernyshev , Nam Cao Subject: [PATCH net-next v6 0/8] Some pktgen fixes/improvments (part II) Date: Fri, 21 Feb 2025 22:52:38 +0100 Message-ID: <20250221215246.383373-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:zRJzzLNwN8qZqZy2NwK6bh/SyHb6eOJp5Asv2jeQ38x6RT1spFB 0zGKrZUzld8uqAoDCT8Ff8BGF1UUZmunP+NfwwG6WPbvQ7uIJdyWTs5KI0pSct2ApAE58/Z LiAxx9Jolwnzv2tCW9mdKAJOnIcsxgnh4ubcyjc9psPmXVkaQIUiplkznJlGJq6yDR2+a6D /g3brsre0yqXqlcXJW/Og== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:D+4KnJYiKK8=;rzMISlDMsTJXE8VjmYrnHRRkf4H GUSm7TGM3ZIAqYV1nbeqPnnk32RXwcB3m2ZvHoMiGpulDR99QfsOneKvFFqTS3Ryq0GLSPGJL njjkEWKH83+zE2VhuBXSf0RJKsb+0FomCI6hE1VY7HG32LUaovDX2h73t5Nl14ioUIFMWAt4N zzO0zGCRBnobs+dfmWXGHNdDajFrBr9Dm4mi3EiNIahBABAPYxkePkGPpy4E0x3IiKZYPGLjh 8FjINOjwpAesSWmXjcAK6QvXp8/NUYOLo4OVwIusNOmedBvLJJ6JMWrM4/7twSkUlM1/vZReJ GMqGkotnIACQPT2mDnbZ/zBEC/08F5m69OT/VI2rk4FDPjoUDUpV0TKi/F2Ho/LpuO7MHfP7b YY7Z+H6s1FRK9PRbNRyFBEuxzF5mC9abONYSE7IuRnrF2nlqbnA01VgbcDr4FG4B7cguFuZkd MCgc9fVCTjo367pKBNpjDWDPS5x9+0WvhyZ1YFs94ir3cOBH4tXxv2Y1fedDqhS2XEtIKXR8k Q1cs+5KITFEBzrHBT6EcHFesWxXHrNkNKXWYdc62k1bOONBkb28ULAiirEoDtKTmQA9xkmwcI iS//WbBeGSj0EwI9vVD0sEh6TIrz/iHcLmsR+7S8ucoCLTFdVs9hynhAGDWX2xPFBHr9PGcta aJwTP1jT6rWNu0j5fIAq6TGl//3QE1fwjAUbqbBhaK+PQv1IYuQZ4bZFrtkjNwVjpzFSDf8RA q+oS5YDL7RQM36uIn5cFukd78+xgVEwUO0sfNE3H1wWyowjq5Z7c36mQ7ax4HJR1mLgHvHDpF wHPkeq3Y5ELQ6B38+9CI4ZY6nkAQZUt4h2xWYV1wth7GjS3LnL8HjmCGfEYlY7+vN5gmayp3v 6Ubz3/oIxn4t4+z3LNWGuD0ldtNhcPMy8hemBRNBNGoVJfUO5vUB2DErUJUZsiePdz9y+RybD 5dS+TQC7z9LxFXfT/cyxXJLcfrCNDCasRXjoYsW6fidJUNiHa0CwfG6AxZ8y9/53sb4VaDZ4q Dw/hMVutgfij6B06vUzE808nmtmSRIewKdYgmb+aFHNfX+kSunx7HO+dp70GTVGGdYjR3VFqE K7UIYmeSPGdTbxcWn7pxPzQveM8CT5CFQSUrndW9d+LQe2TEP/keMnqu2YDZccgG44tQcQ9r9 yE1Yc/LIAgQzO597vmd76qNYx6w0tgQmDzIj8CvW5qks5LVtrmhciQQUYKDo7KKkoh7gtpaw9 UhrHm3kPdKf0g4QJ4hUQssdahRrL+HVJmpw8PcK3XE0jXu0RqLumYxhL0VZVxeQSLLe25WX+b zX5cMQpd5h/h1CJexiCqwl8kYWCFsbZndFjKnv8ByYD80IDXTSCyNWb0Pes88kqxpw9Wz4mpx xCCL89EERFnZoJ0/Er6+iQOqRB4isQ5OsFI/u2SvXtFO8pIhSG2QiF4cUs 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() And 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 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 tyop 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