From patchwork Fri Feb 21 21:52:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 867245 Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) (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 EA7C8202F89; Fri, 21 Feb 2025 21:52:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.15.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740174778; cv=none; b=WeKGOIRVKq6Zr5TkVBFqefIsrfg+TH/59o3LUyfYsfKTxajhozQI3Q0azNg83tmtSRguu8MLrGIA0Wa+D+FD2VzQsfZQCNBDlXEbAAfUe/rzlRupcm5XqsLNLQtp0QdiUzhyEQKFMT8fADBGrBwWIZ5/a9GBc2fxAQuYZoYTyCM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740174778; c=relaxed/simple; bh=tmTSEEzGyIhUtwofgL95uH8cGlP+iF/hT62XefsPlic=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rR4A5o+h4b1k7eZ2mjvJV4EJO3dNZoWt5ysPJoLtBbpr/VvXBX9FBK+S8DFnOb1lK3ZKY6AruCK2yCki+LDffncdzUMO4Abix9NB6v1Noj0giabuGSEN8gxmGfgg3gXK1YtnRdthJwNXpF4g80/l3xqkN4ywusc6X13NTCIn1XY= 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=hlCOo1bA; arc=none smtp.client-ip=212.227.15.19 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="hlCOo1bA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.net; s=s31663417; t=1740174771; x=1740779571; i=ps.report@gmx.net; bh=tmTSEEzGyIhUtwofgL95uH8cGlP+iF/hT62XefsPlic=; 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=hlCOo1bApO66I0wOFLIo035lsJc0sy7+9vnNqqq/HQO5s7mNTUUoQEEAJqYhTKmp Q18Iwl18HFcEtepEaQm+N6RH8i44R51oIQJ1WorH3nI4EohCLVrOOfH+p+rdSxzUW qL0dYst8FjAt3/YT3P9AIqR2+LH0ARLs5QQQbyN5xnDbXwXWgfMSiUjq7shZGzQlM M+/fGsP3FJ9Y+r2BZbYgnhirASFCUIzUXEDE7vtNp+HVbkbTLhTvEowij7znB7vx7 xjxrup4WYywPEiIAxhkMOIU3PRQMUtAEjzOi54D21THiBJUZyQL+CQ9hxn6aEWUlJ Neds8xjV0R+5zNfIrA== 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 1M8QS2-1thB6A47s0-001VN6; Fri, 21 Feb 2025 22:52:51 +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 2/8] net: pktgen: remove extra tmp variable (re-use len instead) Date: Fri, 21 Feb 2025 22:52:40 +0100 Message-ID: <20250221215246.383373-3-ps.report@gmx.net> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250221215246.383373-1-ps.report@gmx.net> References: <20250221215246.383373-1-ps.report@gmx.net> 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:bI3p3HO/+Lc/GQn5qL6cfUiAkOd9iq/VzYXpW/39805rR3YYite fTPlTCU1T41hxNdao7syYaNX3DS+U2FxIs2ii0IYuG7HptnkGjCrAZrSNfLgsydX2rqmQO7 7oTX2x3XtZyfdD2D2F076K4a4ipU3gwmWf1wYRCG5o3KxWfvFqvkqzdebHP2K0W38no1QNH b/ZRTviJ+14t4J7HR3RyA== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:G4maLxHccsU=;j44cNmIPra/xJeNmNUtrT7mY0m+ KpVV6uGRkiqErodz8uStjHW/zkfZTtxl3AVkiLFDr9bfflJ7yD1bUAG9K1ZWIAUR/a3wLVe5R NZD85Sy1lYv3oyOxvBrXYMdeBN3Ruy8rdV1DX600TkVgseiOchmhPrw9RCXoKs7WmsCH0mDJR QdSoQOQK2FKsi73OoJ3Rj9vTCSQti97Pg7ej5ABLZ6L0hDqWdSqlF5FDapgZ59tTO5GCoT+sJ Gem1WnhRqySNO4AFBGOSPXGJYMewJtNv4PZoiDzE8UhLzDTN/BZS+UIAwMgB+DZEuKJKYnxX5 sGswLKe5IFLPEpZoLyvp3rmLErz1KDxi//Orlwk3k3PKkgik+jWdWmoeZyFF/bUVB4XWAmJZl OWB7wg1mI37jJOS7QOTzcyjUkJIBdSuyLb+89qF84DkoRmUhY9N2RE2uGJjcLRyp+q1HYlFbq goAq86vJyBOfnMaAlV2VPgZIl7eRYmOQ+9VEJaDfV9LqW72TKY/rC5WDFhDqWxHl4NFAoJ3HK nSIFE2SMIJPljvdh2JH8HRv0m4artVMflzthToG7M36kU4y5co6ZiyKxyhnb3mRKAHCNEm/RV QFqB5Tn8+0lpJQUEZWMvnNmNsK1cdOqrsulMBAUiughL0g7rQvZQMhwrb5kGwAqvigsXSR1TH MLqFTADaaRz5g7/So8JL7WeZZRnFeLP0OUv6Ba9QwJ11ulxCxLYbUOkjBDlYohf7qprdJMrJb fsocpemBHxfq2hoK3uYTbG5XaKXh3Sx7RWQaJpQCdiTDiFGLRDqdb0nnqbsWRf6NWg1EMz0an Zn/eiSqIiz0YsfaCPn9gqnNQUnFcSr/YkStCkg0r3PFlkr6rUKHJDpVP2G1xo5wTedo3rmNK/ f5eb8lfXdccjjd1AYHpEd7aemIjDbIon13TUtLIRtW/peJGG4RKA1RT+fy53+V9JL2IAJ6Uog rRgjfv5di2ohtwEOQ+98nFUUUtOEucEvwZTD5M1raXzFqLk1tbKe7ldZRXpYjVqMHsoPV+z1H 8+XPauTdGfPmG1MCWOPxUov1AkRFk75YJdzCtcl85JPbOYZ+9O5UiV2d0nYBW5R1k3pXxKJg6 okQcdrqA1ooCWkclnDOxnLe6fQeC9xq3JLTCn7lX+sTDQGv6+SQy+9/OXtZcsAnxOgh5yD+YG alzXYgsWQQJMguX4EWMn4YVeGIuVCbPQqHPqnDyI0eRyV6HlbJa13OCOW5iNKFCaxGG1csxrg q80qbUbhqpJe8drDKhbGdGjyDV2COH+vNeWq7DwGUq3Yg+Qhzx7goVLJdkSDdBd3u5lq1fChk 0tUbIsGMuVp7YJ9QjJdlY6ewe7JI0zHF/r6MIcahO/R9y9qDEPkunfhwLsISeQIXoZRPcq01j qvpxhqnuC33X7906ZIy/5QXnaRaCAqsc4FCEP4sA5lJaxzlDi7ztYtECT8 Remove extra tmp variable in pktgen_if_write (re-use len instead). 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) - add rev-by Simon Horman Changes v3 -> v4 - new patch (factored out of patch 'net: pktgen: fix access outside of user given buffer in pktgen_if_write()') --- net/core/pktgen.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/net/core/pktgen.c b/net/core/pktgen.c index cd6b6c0dc0dc..b97a94cb85ac 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -961,7 +961,6 @@ static ssize_t pktgen_if_write(struct file *file, char name[16], valstr[32]; unsigned long value = 0; char *pg_result = NULL; - int tmp = 0; char buf[128]; pg_result = &(pkt_dev->result[0]); @@ -972,12 +971,12 @@ static ssize_t pktgen_if_write(struct file *file, } max = count; - tmp = count_trail_chars(user_buffer, max); - if (tmp < 0) { + len = count_trail_chars(user_buffer, max); + if (len < 0) { pr_warn("illegal format\n"); - return tmp; + return len; } - i = tmp; + i = len; /* Read variable name */