From patchwork Thu Feb 27 13:55:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 13994543 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (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 39F03231A2D; Thu, 27 Feb 2025 13:56:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740664586; cv=none; b=gjugJrddMT4of6CkhX+71H1SRcemexo0mq60Olp7D7OODhMRkqR2YOSia5kvebQKF4t3Vwb8o85uPOui5vYHAb2w+aRU8bMHy5plwU5bWui4UXM9AuFB9PodnAchgeOmnX2kamxP4Cj49RCE1mZtalj3Ua1DMbqHAIVpkveT09Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740664586; c=relaxed/simple; bh=JgGQVVAhjrzOOCs+tFIJPn5/RIQ8L4OMx++skv9az9E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hhLFuS/MIdIsJ8eOQz8pHCOvxkwcaqnGC8I+4QrX+lQI7VsC1qMV4B8Ikml82vXY2uhxtpEqL0bF+Yyj4Jl6q63BmJpQPqm6FAO3PRM8FpPdem3Ff3Go/g8LQRxHKKsFLqT5d3CfuTx9Be/76cnGkzLPzg+4dCyHxQbtuS7MQqg= 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=GhtadAWS; arc=none smtp.client-ip=212.227.17.20 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="GhtadAWS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.net; s=s31663417; t=1740664574; x=1741269374; i=ps.report@gmx.net; bh=JgGQVVAhjrzOOCs+tFIJPn5/RIQ8L4OMx++skv9az9E=; 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=GhtadAWSYXO9ggz/SCi8mD8APvIGdJhbi2m7MJQJl/m2VLwEFdbW85c0VmoZhAcO pAr6JB6j4PdBG44xscw7y91jz6rbzz2m7+dZPBt8gzPdGAxgt8/iInzE+a82TOFAh kFriNiUQnbaqyUDYqvGbmTVzPkl75nfMZFDaQs0pOrPZN+PCXKfHsBZ8QKP2gizRB LxGAGt0uJXTdS7UPtVcHEVDe5D/My/1d47vv+uhCIuuG2wG9lTWGSiZFa0e9eITK2 7Oxl2jMF3eqThwpsZl73815O3p2wzbYxg9yZvNrL3e6JgcU/H8yk3mTxTfoIvYvBw GUg/dEEHC485rZB/Ag== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([82.135.81.151]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1M72oB-1twB4z0zXj-00D6Yw; Thu, 27 Feb 2025 14:56:14 +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 , Fedor Pchelkin , Arnd Bergmann , Nam Cao Subject: [PATCH net-next v8 2/8] net: pktgen: remove extra tmp variable (re-use len instead) Date: Thu, 27 Feb 2025 14:55:58 +0100 Message-ID: <20250227135604.40024-3-ps.report@gmx.net> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250227135604.40024-1-ps.report@gmx.net> References: <20250227135604.40024-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:X36GMHKlFQYWbPGzh0isIFHJJaFo6jhBUDudzhYm3OOXtpqURVk svPTMi+Z2UB6WZ4LkITVRp+P8PtJSxMknZXurPvcHD6FJCEiNBH2v/Z1v+bT+L0S3js+F82 CHTOyi/ZuRA97fIF9MXRUeLnb3MUau+msB8x3vOBT+iQW0xpt2zlGqTfZ5avqx3Pu9qRGWT 33b2PG2eBSACgX9erVOJg== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:QB+H4xaP0Kc=;orwU92IZ52FMWIGSfgV2i8UK5aQ ScyhfYVlPsBc52p7OUeNvlPLJkJiFpOCnnLDm8wlWSnzKyFoCbgjfpq9xXCA3LRigvXZMNGzD POrOL8jKNTiuJnvtamvZs5Hsqqlt/kmnnRyof9hYQK1wR/1qn07QbYwDkWZcRWjZd434jhQQU JcQqQC7irNxHNCq+teM3SKkxjv63YmpFHXj7TaKaOyXECFYxhhR4ILovtGRuSYKpupiBOCtN1 3/zyQ3J0JzniH7Lh/+fs9JeJMjV6VLTUyCX+CgxcovMXEuukN02k8Do7xHETbIV3Ghuc+T/E9 cBnWcuVElKp9L6AqYRIEO+uc52OOmLExQjqPfBgNq6VVvs6QtUMAl+2qW/I1yQ8V601sF0mRI +ImtbEffwkgJ9sTxvAMbUpXVNplQdXnLOempOkIHw0/haRTEIwObn0rK5PHXJX9gXSbfB8Uz2 r9g78myxn7dmZbHTDae57GTZbmLVN4jxSFxcJYpEn9sSTLcHQcDZyhChmbeNMMlJebRzswR89 U5ES67Z3G7bcWegtzrBtZw/RtF/AgCZOXv8LA/UYy2cFxnCEcLQkuFVPXcWTSzPXehGuUTFMq 6aK1V399KrxzwGgpRaMpuMk1YVAfZ6+b4tHZcLSeL4U6HdBJ0PVdyfel66lVDk9V6DO54a4wl WHJDfbGwnioGGxEJnt9TX2D/LkZe/gwTJ2gdEs6V6GSd4SZB/+qcQCLyU9twcPYn3VcgtD+pQ BgRVQsvaQUH6M16OqqkYN/z3VBUQxfKDjtYZeesFMSCSJs/oyueMkRE693uG2UziKATUfg7fT m3rOZSSgUN5MUw6HG7D5AKH+jWlUiOLsUiK/WLDSb48PYfwHfIo8d/cK9ksn7Dwgs4+pS+CwP pXClMTHA/+hxXaG+bdZplrjJnDORVsDAhFMDx0MnFVykEkM3NbgcpzHhZGihfsPg3ETvU0HwO pRm58TiiDiqQFLJT0PT97LRn+JaumAYUAEWjN5nv+G+5b7V0qJ/QNrbn0UFi6E27021D7sHwW WpYQW0gTOUgpQIyq1qHRGc8POTKo5RjBWt9Nui5hTXjYVg/eZ2tFWJDHGyCEHKvFbi1f5EkhH OcJLVztzIoSN/gCW+GfmRcTVqsZ/sIgrxLgwEM25VyRrfPNFkC0nN1kYMafy/ODA3fbpbn2NH YwgiDvA+Sy9CYqVNsGC/y3jSSag9e7c7iR+uhaSG2EmWNccgWHeXpTk8Tmgkuk4ziTVA1sqEw zUTzPwFyta3Lt1clTwJQOZ/kLc3a2kqbEzWsj1v7LzUvrXBHxe1so3EU+GnS+1Xz1yknxh358 VsJjkoPxe/4PeikkTeJd+NoaQ9IZJgRNZYL/DGHlh2t1eBsO4kGJCwbzk4a7YJhhI9sKKeEts zZ05x5me4hj+1MZcEwP2K+jpvxf2h3m5guED8c99PT4dpUZBWFT+qTB6UYE4We2bj9ExQ467m doq8cog== Remove extra tmp variable in pktgen_if_write (re-use len instead). Signed-off-by: Peter Seiderer Reviewed-by: Simon Horman --- Changes v7 -> v8 - rebased on actual net-next/main - no changes Changes v6 -> v7 - rebased on actual net-next/main - no changes 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 4775cdd2ae1c..9a5fc1298bd3 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -959,7 +959,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]); @@ -970,12 +969,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 */