From patchwork Thu Feb 13 11:19:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 13973122 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 C536221D3CC; Thu, 13 Feb 2025 11:19:26 +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=1739445569; cv=none; b=jQjFdN2tKqqiLyAuxBk0wt00LoXSmGA54ouolEgRJtOyW3SsJxyP5xEkjjgoXizx0os4KIkIYYShz6kW+HPJgZpqsJ5d4MBAlXIgjUkCOHy+51oXdXiFTJahcB5HDgoTVWmPHOOvbOm8EFKHk3BirjScvIDAp0/BoOYKVgXkV88= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739445569; c=relaxed/simple; bh=Uc3IuVcLmmTCfUJjQfwAP2uerd10ZH+ac8x1Z6z/+qA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=sE3cgaBk6UHLPBRQbgYFNrUYh96/lfbiCzWsiJdpRx7U00GRCi1K2YlB4X6nnMUeUNQyAQm3os/8+EA4HNRitRdRuufdruy+z3HfbRbbStep3mRwrJ5NtBb6Md6m1BVh+6r7MyVlaPtz7Pe/OfJrHr+zho1P5vp3mAI73OVBKRI= 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=Gqi7qpYy; 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="Gqi7qpYy" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.net; s=s31663417; t=1739445565; x=1740050365; i=ps.report@gmx.net; bh=Uc3IuVcLmmTCfUJjQfwAP2uerd10ZH+ac8x1Z6z/+qA=; 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=Gqi7qpYyneHzcLrWIFpOUhCTGgg0h8hwBYZdtzUbnY6ORznGyN8GzhYQBB3tS8D6 j7gqg7RLcByGSmEmp4tTRx1F1NT74q8cWy1C1noreFrxO0bOMWnezhnjrEvNK+O6z 10zHVwsetDvHqnuJ1/+5KrOC9GAcm+GChv7ePaWK9LFBGxvL7gZFBRhpglJA1QGqk 7mDLoQkqAZD+H089wimQzmUlPxgi6ACcWPV0BXHSnMLN3qWGV9Ap5EUryRNA7tNWB I137OvhWo0KzjTgorjWZvQHJPaoGCeNnpaPCaM5Yy7iIs+4je3kV+95iJ4jMQHQuO JEaBFPy6Vh/Yur3azQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([82.135.81.197]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1Mlf0K-1t0zHy3iXC-00oXT7; Thu, 13 Feb 2025 12:19:25 +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 , Frederic Weisbecker Subject: [PATCH net-next v5 0/8] Some pktgen fixes/improvments (part II) Date: Thu, 13 Feb 2025 12:19:12 +0100 Message-ID: <20250213111920.1439021-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:L8tThOqtOckhVNathTFm0434wjve7tXLsFe1RNgB64f9z/KA3UL 2zrNtmfm+rVs11hAISCVRh+8NQRM9WP5Maz7Mu0tlx2JvhZqff688yUG1TtS8LJCLnVSArV 9jsQ6jEyjMaocw1tvddwOVmIuC1TMUT2HrkuZG/uenh+/7PQCWJYOKQklHndMOcgRuhdMV0 EI0Vn1HSxHTBWVm1TAefw== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:Sv9NjnxK9xA=;1sqfHhquSYpmBDb0l6u8BYQAgXL XTvCY3+cR3zLqTQ74zICUa94XU4A4T7/sfrIDk2bTxd3b48HVUqojvu1SXFma03sdMGbTB7Oj qgSkZ6d06sWXX8G68cafprIGbod1cwMNq3Sau00j3bS8TZvKQGU+Hqaoej4eDVkd45PaZAJnR D88NTOVyBdQnNeIpLnVSjcXLf16vyKG5Mi0MQSG0PLpA5lRf1Dz1Te7b5dTyGjHveWPNHdijI cXbP+wNtuNeqHOtJr/ARlBLkWWlf/r9dvNmJVVJvOtUqvOxdkW3+0GIM4hapcFmL6Thhd13Bj wNIZ/43iHUY/Tzn2bMzYiGVpv9PXV/DaaspBFWi11pLhIjZmZKhXrDhqQ3M/2JTABhER1u+3Q Z6ixgGT1QjkDz9FHH7CMYuH2t2UwrjSmKTz2jrpR+3ObyQ5IzeGdSBhNk13qZvBq50mwf3BIA vQZUlnVQghGrG3F1k6OkFa2TWZE0LD7CkyWHDhiVhpRns64Zdxv4lkj2F5GALm2C/ornNtMio F1LHhg9B8QRh1BXjhRPyENLjY7vKFAs2E3p8UXaBEhkI9ARn6xNfGPNXkX/b+1JdsyrxXgxow qbF2WEQw2Lzx9zF39wBQPFpPW+SBEzLhf5tlL6RNmvQhWeB3NL5+9Uv4RlpirFLAOqZouNvI5 GvCgtQB6xxX4jItPx8ydyQZe7W6wUFe3SGl/bxMg6k2qGK92odAFk3na3HWGsqLU57o/Eao29 titGXegnYTEKk3gtikLGamz8VUU/Pj5zpsqKe7ERh4eyxdvd5FWuEfiXhWhbddTXHjUAc9VzY hRoPJtfBg4WoG6q1iWs2Liv9Gyf+aqdCEi+nQ4tJyJVtAhAwjs89EcmKOCzAb7k0Y4Kbae2vs VXNPdoC9rQRTgCc1V8QYCXiLo8VC8v+04pu+ku1jG+gjhhtMyBqs6Gqk8zupfiYfD14N+mZ8I JWZPNGCXUFX5sVkZeKas/SPx8hsvcNQFo6lfwZRL7Wz4WBgxMytMGbz9dudlB/fD/hqJHko9O y6tQZqfVLMtVZ6Trz+ed/zSqmVpPuDriTZfq4Cv6MzN2E/RX7ssPR1Jkmn+ovfAXC9dXnXvys 9icm8urc0d1ePWc3qFwfr89FG9Vhahrva6uHRWo5kmXQfaHTfahPZvozXnezz4wEqsD0hUFMc /8PJwk+LAoKlijcpcRFMjQ+8jb2Z+ClRcaAjMCMV21iQeQHgcasCiI5nwZnugeATES6o3sdTx 42Rl4NuGQWNuqusgcSH4Llgy529neHjDfTfQNtDSfQYMa84kDi3Yuv/O8kKl+UcEeexFHXllk Z5pknFjqSvQgWJHeGeYKbXDZw8FHcSI7xD3rgHgzE9nYcvC3yrvFJ0XKca9ZcVqIYLPIKMp12 nvo4cmqmg+qmE8Ntl96fO5XMaQBY0+aNbqErg//c7I6V323f9BZnqAftxgDZsP8UPrTMvuxXH fG0wSnA== 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 - 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 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, 806 insertions(+), 130 deletions(-) create mode 100644 tools/testing/selftests/net/proc_net_pktgen.c