From patchwork Wed Feb 19 08:45:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 13981752 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) (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 8BFA81E8322; Wed, 19 Feb 2025 08:45:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.15.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739954739; cv=none; b=OdhHTwMvkjS5YynwTP1d1eBoLmxuBsKedsXWvmY9PQNh3nc1Q8uWHiXZ9rLoKZKlXkdJUvf/oLCTYmBFC9zyWu1GgCFnDRuEPaJXsSeN/RQjQxf+UbmIveRBwG/daWOdYdeArB8tnKJBd9fAXlA4Bmwex95ae/M/iZJDwFROtOg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739954739; c=relaxed/simple; bh=N8FKd1y9sx2kP6D+NpX8eCIKG+Qi7i1WGdQ3MQuOdIE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=ed022N4eQVSyqN3tyHIBTzWtfh4HLVkb6Q7yKLr/DoWAh2y9RjGoeyZ+z2kNXOEcmSzOhiJp69pTm8tOAs2aBjarHvH08WzY4oJwV7a7vJ46LW5SZSZeHMNulnY3xeghWO4me3rE7QG2M8mgZuPYe7uQvsuJq6YnVqWXtSiqXBU= 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=PVSvwqaq; arc=none smtp.client-ip=212.227.15.15 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="PVSvwqaq" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.net; s=s31663417; t=1739954733; x=1740559533; i=ps.report@gmx.net; bh=N8FKd1y9sx2kP6D+NpX8eCIKG+Qi7i1WGdQ3MQuOdIE=; 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=PVSvwqaqWxq+jCB+AtxPzPKKUFODgyMrZ7gt+K2NoBAWk/LrDDOaSzB4fGegAl+X rgmUGv7czPdp2a6bqiZI4cARsZGp/z/9Ub8aU0rTF21URu9PbvlVgwC2QXIROMWnc JI3VNKlqrryVpPzPFz1+yN6orm57JQKR9Jy81U3+3TmYdgcX8+lOCA/RzyRO2NtO/ nWiuAdrDqmoZJ9rT14R44ZTlVvbH8jX61wOEy2oRlzXlBFAEyxg61m15KABOR9kr9 1jsIFSS5zjySPYGJ9jp7EbDFzzj4RWsoE+bTHy9JJuxgLKTR3nTnOpTTe8eiBHywb SJxTob31coav4S7WGg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([82.135.81.84]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1M72oH-1thcm22gQx-001O5Z; Wed, 19 Feb 2025 09:45:33 +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 , Artem Chernyshev , Frederic Weisbecker Subject: [PATCH net-next v6 0/7] Some pktgen fixes/improvments (part I) Date: Wed, 19 Feb 2025 09:45:20 +0100 Message-ID: <20250219084527.20488-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:CU1ll5xGBegrW6P8sRPmNQW2NPo7XEfPHpUPvfxRXq7M88ncuA2 Hp+MjRwt+awObOF7FOSMPJh8Ug4rNKaKyd9Vh6vp1fqAaOrsTqwa3GY8kTHVNjNsnZRjyrQ xqncPYjiyK3JpHrmnsXu8x2zL1npr1ewPZZGXUmcD0FQ1RIXBGLlpIX2OA6OA7RZy1ezjXU sPexsr2e6OHli9wpoGUYQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:Z5sx5iUzW30=;ziBqDdH42UmN0p2nBrl9K+I29Rf XWU9+b882/YCmTNf4R7YpGQinXT8yGKXEr3NZC7EwSeiXBVZeJTZx3MjgDg3rApbEfqheyCGb 7bZU0pD//6czmww1elfZh0IuNxu8mV7EO+l8i59Avtg4KJTvYzmXs3TDW/hyCQk12xKNbVk5z VPkBQ5+PhIU0xy5X/ESMXs4S5AJnMzmPJ4oenpMes+SfxiWM2piA9McghfSPylLhDSuROxHob 6uYrbwEoPNVn396RlyTGkoqz0MzpR0mHpI/K9UOPOyvbsUGyn1oXd4zRuWTfvijOu4upLiOzi DSFU7lSUM3fPJH2SonND0D0m7vXjenYIZdizXqdQLO72Sttbtik3GVGSWihU3TNR2w40xPmZq SNYh7vsmD8Z5utaKAnoYPNtJMxOuxDKMUxDDuUwUDZgF9I66pmtvMPcWZ2v0eYQDmJsmD0jQn cDDv1SnFmojhpBpRp5ccR9/8ThWI2FFQNiWoUDjpADX9+CcfoFMOAop5qiSMlOBQB+jyr4no8 ULbb3XGokXwsfAJL3N3jgO9RlY3HLkeTEh7SHGvyNmjzEaS0bmND+ePFMlUORfKAGlQ9vYe5B +07yWgLu7bxus8FEYngZt28S5QaYnD25MeG5o/8298tjFRVKuFLOBlZDNJQStuUCO5AEiye6C v56dN2P/LMOgkWRn5aN7uJo+/O2LqOZYwYmJ3cZ7kNh3DUywRgrhB7q1uok6RvRWKgD1fBqdf +q4QfCJUBjJfgzF1xnhvWQU4h0VKUHf+ldLB5yCLF6w5SmGBMCIt5nNUXhdkDaeVuOYdZDjID 7XL36/rfcSlT8pJAiPpPpppicgVR9wLlrZAW+wgF5/STxiEWF0n4eJa5KOsoF9wZ3AhOU/L/w 6b2MP4oOuYzCvMTPMT+wnFWfrz3UZEEWkz3u3/esam/1fvFci7GB9tdVFsenRocYoz82xC2d6 6a/82tl0lr78JopktcoJYNeKrJNPzx8ZxmAXGHmiOQ1F3h8s+2iGrQZjsm7dQJDXdNqLOZVjI Shqa1OPUR/wH+lf1guAmCv79KzRFRaRtcsF56sYCdMxgNOnXf50p6hMkQlKlDV5+VxQnzZZpR DaYUW5UNUrzn6ir5+bdBx2nYXM4m8rYgxwEbtR7U369vVmh6/dZygYMFe9lIYkaL96vHJp8ED K80e5zmuwOsQCFFItClgrv56PxkzgQnbscdEVHaq5EamaJkQtHj6DQCn1hXCzEsOU8O8WOdAH hD9Z4a5cg06ypNbAO/3vocewMDX4kNH0Z3S1fihkVWw4ACBA2ux3PnPi2vILotpgRPQJjjF98 mAEPbgHXkdG9NkeuJkBHHz/kEUK2psmdzQ14Gds3Le1OuuTGeYzssDHSixvY55HQqKGq7N1XK 2jk3eBbv74OSvL988OXGSaEdeaPukLByNh6utEGaU8WHc8oJByN0izvXKZ 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 (this one) - 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 (will follow): - 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' Changes v4 -> v5: - split up patchset into part i/ii (suggested by Simon Horman) 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 (7): 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() net/core/pktgen.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-)