From patchwork Wed Feb 19 08:45:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 13981760 X-Patchwork-Delegate: kuba@kernel.org 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 975AA1EFF94; Wed, 19 Feb 2025 08:45:46 +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=1739954748; cv=none; b=iq0xTGh8N32mWbiaSSH7Cs5xPo9/YnvKU3CBIl42wjTelh2fZTdQmUf//m+paZ/wl4A/5uSTbSbLKwZgBg9AelpwIIzvP3jLalE3U14ANKpA64ag3T39qdV0Hp+LjqSW5vgy9YY3RzN5xHt+Hvn28pgn9vy/8x6t0AiyYofaf7g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739954748; c=relaxed/simple; bh=jQSyn7wtfwTSn8STW3p9jeiyw5W5pOvWUq+BYK5KgUg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sC9iPrRMdgJC4TYhoXW9jEar7nS5gOotHHPtqK4gHnaY4QFeMvYMAgnFMvKsHCb3xiNPwig2aYsNw0yDcggW9ziGiewXxph4pMCJFXILfxidlArSedU1Qu89jdo5dw8pX2JZ7cu3tU4EhSHzk99b+IRZgUHtHT6tq1kym3jhFyo= 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=aIJ2iyGu; 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="aIJ2iyGu" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.net; s=s31663417; t=1739954734; x=1740559534; i=ps.report@gmx.net; bh=jQSyn7wtfwTSn8STW3p9jeiyw5W5pOvWUq+BYK5KgUg=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-ID:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=aIJ2iyGuaiMbE93A8dGpRLJ+KLxRMmNzm4Ckzx95d2mdRud6MSRyo4HS2pbuK7ys Fa8LtsGCLdcMUrgG6BDGCih8jT2wucwyuVER13gEV0/a960+dMyV2XUr8NY1vHNEX 2VndcWJU2GTzPNvAxRgw0yAvpiozQH3mT514wJdTx1785MONbjASELWJLGAmbvTaQ Q1NQZ/iHeVglPzjGmv61YyHMA0+0CAz4BoP+F9QpndI7GSswNXzxOVUJW67I2LcIX 3v4BoHX1ZbxWhOFp8lRD4OTzQAYeYSnuDZELi4oOdns6Qn7vTRUNC2zG4RkhUowJA o2rtvlyhy11fZwuqCg== 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-1thcm12Q7L-001O5Z; Wed, 19 Feb 2025 09:45:34 +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 3/7] net: pktgen: fix hex32_arg parsing for short reads Date: Wed, 19 Feb 2025 09:45:23 +0100 Message-ID: <20250219084527.20488-4-ps.report@gmx.net> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219084527.20488-1-ps.report@gmx.net> References: <20250219084527.20488-1-ps.report@gmx.net> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:9pn5Xrv/PCkdI1VP/j57XJtVIK9FZHbIOPMwNdHfkmam32zOdAm V3b7cvWY9P+wHyNgfwx7nbq44iVrmXbrbUNtCgVLJf1z8OyZAQh36qya793zF+d0PoB9uqf Bouu9Sw1vfW9btRlDKLCpjDeA05aUQYEdIg31el2U5IypYm3nbIG+Q+m16js8ugMb/tieI+ 75ncs1bnoYBZN5UAlMQ9w== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:RaQ9u2grzD4=;0in4g0i/E6fnVkVP6XR0MTGuMyl ahQVdQqLxK7T2Ri78B57hAyJP1fxTHLZKQBfHb7BCKDkBP4oyRHkx3UFmqMiLSoxHUEuZ/569 qhuMyX2+3Ot1Wo3AzawAPBIRCXLtKi7LAmDgBXEyCP7LjE1Dqav12YTlvhR6CYlylHcbpytYC tvo0u3FWqtNNJYATSXdvJgUhJkdzt+CLyMbYUXZPFUu/JG/9KzPJYQGbsEzod02D7sFbAqINC wzY0LJFQ950tmicGMtgaPHcHsFUH3lNY8qJuBmykpMmq5koUSZSceQIC+PERW7bLMjMl4aC4Q 2BbBkJoTuulBLnUjoA9snroAipAR0zoF+DRLdaRV5I8aFM/7SiWZKKY3e6LxqdqNJi+7qaMdI bhHp/b00E0XudeK3qRGHUPRv/CKTP/dd8g5dPOb3FDC1+pzsAP8IyIenRj6SDRJfyrwUP82Gf Q3xfJWnP2ukk/p/P2CHIJwtm9+D1a5qDHl/3+4h73lYZCm428t8J+vt8pckR8dtL3YtFo/MNw EcswZagW/vATFCrAZf4V98aqhxNR5H06C4YX9NyzDZ7NY2PTBkGQtpMLkMTXzSrtyCjaWlpcS egNc0W/zm7SrOboiKVrPdz+viLzz9H3AA0uvL3V2/p6ufXvgAQfp3652AGAkIUEOF75Jvgtzz AO4aZhcjyMPa+wNs50KIGwRC8Y6tj9KKgtdiKak1L9/4p2N6e4is5DGftoCO0i6oWq0ODJOaU OLWbDEYquVAK3cqljFor0jxrLJYX8W8lINwjnT5GZTulTZM22Z26FdoVeKfiucZl54Z1Ce0h8 C1S6mCz64Fm/z8Jhkk+AejmfatQEhtevj/SP+ntPVPEct5aTbJ2S4CBYewrhe5zW8A4+jpWEF eSdpbgCZnjNYlGNIqfVAsn/phHcWUVWsphUizEOXSjXBJHqFGOXkOGhrUcea0AI2DIF0dYLUG 37kcLjL98gcarm/G7mu3FxvdCn3T4XO5Wfc8QwaZ1GgM0DUMPRTdjvdZUP0U+jrqNHzxNDVcn LPT5gGQM8xkT5YgMpGNBCIjALEZY0cHbL5U1pVC3vLdRUmMQrSu3IlWEjkCrSQKHRcEg635Jp HCxw3ILK0yJCT3I9iea7bkTvkZOPVXXGco3sxfBpbBYxknjlE4AKrNaTJTAzMt1/kKWQgly/1 Mnz8o2MvVmUbUsGAMvMRcDODWOuI0Jt+zCjm5USI/StOSVf/zb1hmVNGMM53osUoxiqvfos3N AeNGrCS5uV4ov1j4c+EcKZImadhURSO/IromrvryaHiRz8NMuiPRJ5fCirlUnXC7OM2AaXdLO vIe5e9e0w5pZcj+Yiw8S/wcZa7vGnduCOn9KFm+55DGXkFOPqyxE8Rs0QFerML+BVE1lA7ozC D9pVZWlOtNHmMI4RaPAt80qqg4Quz3hp9qNfGJNmQ9Lc4VwFWfHn5Rs9uL X-Patchwork-Delegate: kuba@kernel.org Fix hex32_arg parsing for short reads (here 7 hex digits instead of the expected 8), shift result only on successful input parsing. - before the patch $ echo "mpls 0000123" > /proc/net/pktgen/lo\@0 $ grep mpls /proc/net/pktgen/lo\@0 mpls: 00001230 Result: OK: mpls=00001230 - with patch applied $ echo "mpls 0000123" > /proc/net/pktgen/lo\@0 $ grep mpls /proc/net/pktgen/lo\@0 mpls: 00000123 Result: OK: mpls=00000123 Signed-off-by: Peter Seiderer Reviewed-by: Simon Horman --- Changes v5 -> v6 - no changes Changes v4 -> v5 - split up patchset into part i/ii (suggested by Simon Horman) Changes v3 -> v4 - add rev-by Simon Horman Changes v2 -> v3: - no changes Changes v1 -> v2: - new patch --- net/core/pktgen.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 4f8ec6c9bed4..28dbbf70e142 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -753,14 +753,15 @@ static int hex32_arg(const char __user *user_buffer, unsigned long maxlen, for (; i < maxlen; i++) { int value; char c; - *num <<= 4; if (get_user(c, &user_buffer[i])) return -EFAULT; value = hex_to_bin(c); - if (value >= 0) + if (value >= 0) { + *num <<= 4; *num |= value; - else + } else { break; + } } return i; }