From nobody Fri Dec 19 08:23:12 2025 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 B5CA629A3EB; Tue, 15 Apr 2025 11:29:43 +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=1744716585; cv=none; b=cCLb1FuW+ZrvOBjw1kgCMREwgFelD3D4ziMAy9+dmPQ2vTO9Tv+Y5pwQIOHJt3j1tnAAEe58nKVSBYbLcZ67ClFkg1C4ihLT+BeyspOdstiYKFLw6XY+CWZ6z3bHD+uj2OhiY6sEXyg3bIsiufa9ZBemN7NJyRk7hQhMUeFnMEg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744716585; c=relaxed/simple; bh=n9qZGXD7GYfsn6JDx2SNkZTrCisSdPpoZAIHfFc7Lmw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EniwN6TYnEA1TA7Oykqa+xFVOhQpZHelw/fqAKT/nB7xaBgBn1zBGh94fopyPxwID/E8hlgD+aCIMngiB+Q87QBVIXqYL1AQe116GGvQgyP4I4lIJKnmACqEbqC0jjK5PgD9q4Nt5qB6sZvX1+g4mAgc9nb19dTGpt0OmOd55Oc= 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=qV8Cpw0J; 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="qV8Cpw0J" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.net; s=s31663417; t=1744716570; x=1745321370; i=ps.report@gmx.net; bh=n9qZGXD7GYfsn6JDx2SNkZTrCisSdPpoZAIHfFc7Lmw=; 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=qV8Cpw0JVNfoAkrdVtTkpwHkYtvSgkc+DQRqb8H9YJN6QOivrq7HpJxZknRm02QQ ronKt1dUkNrZWwVBDk6uS5SUJn8zpmp2qd2VX+bzlK02GPXEaPm32DJBr1LK98xoD pu6wozsTuIgaA9sqTHHPmzsXOtV7EPE10+1BubyO29I2RDNRk7NmWqDmcPHgu9SJp 9+PliDvyukOUM6GG17lcnFE+6/ieiV+D88EWXsuT/BuBDzI+Z2IoOh2oyrs64I5n0 avUm/vwp5zLgQOmxQiWIdAYeE7W/cpoVEYpK9ZtfF4eVdH6IlN7WAKAbwyb483PIF Nn/RbdhC8XxwLD48cQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([82.135.81.153]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1N9MpS-1szgKM32bE-00uE5K; Tue, 15 Apr 2025 13:29:30 +0200 From: Peter Seiderer To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , Peter Seiderer Subject: [PATCH net-next v2 3/3] net: pktgen: fix code style (WARNING: Prefer strscpy over strcpy) Date: Tue, 15 Apr 2025 13:29:16 +0200 Message-ID: <20250415112916.113455-4-ps.report@gmx.net> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250415112916.113455-1-ps.report@gmx.net> References: <20250415112916.113455-1-ps.report@gmx.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:u6y7H1hdnkE2N2yMjXkmXobNOizobzYkBbOaEBQf+tdhN9SRASb Tj8TrjW5B+JnbFHkDE7hPlbUiuKW/quMPiECj5yfq7Z28nJ4qPDOl8Kj58c8Wb89ye0ajgb OtBmyufseb37ZchU0OIchTt5AD3lB2C+d7D62TDQzVAOPAsWn9CYMmZnfTu/Q9hZCMrOWLk u9R5+1w9FaTGXsjNKoCbQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:Ac8MjRSmW9M=;JkoAH0XHkJjGs/Q8BmEt4sAjSw8 RJsVe307LfTpgGDcv/ITjW+mBhDZLXXYRxLTnrukG4Y2EXeOKvqtpKnvnfWPu9iTv7gcqXGnW 39ozDtTYGPpR04US0moddphl/VceoHesl3v9GPEh8iu/S8TR2A475md/7edYoowwMdcVkzjgv MOnua6YZDHASqZgvV23UV3Zup01uv5U1mdn0GTLdcykJQWjdK7lDy58xp/JR/1WCGEoPDGgdZ RncRH3DEdXC0oIPazkyxmkpVgrGB8RCLbHt1XBmDJUKRt57COc6HS1vWMEHMUsZwRqNadFqGH dvZbgNUYWmMNTMgL3x9NCVbFxgY1qIr8TRFs+mHmoj56xqtsJHI/kCd7g1I9PBpYvJnxz+PU8 gsgjDgafr/FB1yEoCIdYOGCpqgEkaes2uY1B5uADsLyB/CbfKK/eiL8lM+A1U1yZ+rnVfWTnj hdpFNrRV+KvwK/PQ9YjjeFz4tOHHhQAmX/M5iXGxHNR7ydOLnNwAb7Rs6edSr/APnCvKBg4DX 51BNmk4t5Ozdg+GqUb1YUu3ovWQhli2tLpS0r1OUcmkNsikOMWtro0K+c3FWTwikGQojBkbAx YPhGf079bE0JeUz+CE1L11Lrrqp0bQuUKPRa2F8KwEtqFu5J0L/lrPJSSiGgGD5Bb1O462OAE bONv9rWtgmAz8LjzDPCcWSDB5tEiBVIO903xYY9eGKdndYvPZqtJpa2LjZJGUTzA5e7GEptIS GVszGG7FsSccLE/mFpy54q58Hhuu4CxQZFn6Dw/Akw3116mvaljteuCPVZ8srrZBJdUCpDzRg xLuFB2zMAg7kXqfCaoKrvI93fynEzYQ7x86qzTIpvMPu8GbFmH4IrKDk3/n99JtSzmfM41K1A aMvHlIYi7xVbMd85noGISOI5w61wONI94o3dZTOZQ0LLO7OyEjfEx+Y/YJP4A9aIUSvXtkohI yJMetlLeofWAXKMcvo1NM2HR0SnDRWGLDEVekCSutGblAWykPwBk/fj4EAPsuttEQ8QJOlKjX nzgcVzDYlokVw+0RtTw7d3hAdloBnXovCD9rgRVMU9fNElMRAS/kPpAa/HBWmU3aLQfKMpwk+ j6pCfgLzlmgRGpYvpvzPdehDoTQPR+n5YqnRzIQ1dnEs/Y7M4NiArfmXpo3c1/p4xS2sjYNiD nRXGfzQG1RLwDbSC8wA6o8E9Dp2M8o35I5B7aZbVxntIE4eiMiaMhoWvBTFZuCSS86Cd4kbng zlwUtIWEcL8DCzjMsYNRElejpRt1hiwl35qfqUTh/uqvQe+VeARLAoDPXBVGo26IlYv65huFF z4RMIt9RRc2R1OW4Po/YZYUUwnNWO7gJMz7KqIqnfoo3CG9Y0dqeuT1WODScE05UQis0KDA9e xMf8nkDichbbWxC+h4xYG1hoGWVEGLF7kaLJUXjrvUEXrSwyYtvEtilBfh8M+AjVz76jjwM/P 01xjCtAvF/wjYvdFMiVFFyQu/z4F4oRzwxhmxd25XWbFlptqel37EfJJF5aJC9oVwhLbGbasZ MFj8uUXWTgbIa6Zstq4= Content-Type: text/plain; charset="utf-8" Fix checkpatch code style warnings: WARNING: Prefer strscpy over strcpy - see: https://github.com/KSPP/linux/= issues/88 #1423: FILE: net/core/pktgen.c:1423: + strcpy(pkt_dev->dst_min, buf); WARNING: Prefer strscpy over strcpy - see: https://github.com/KSPP/linux/= issues/88 #1444: FILE: net/core/pktgen.c:1444: + strcpy(pkt_dev->dst_max, buf); WARNING: Prefer strscpy over strcpy - see: https://github.com/KSPP/linux/= issues/88 #1554: FILE: net/core/pktgen.c:1554: + strcpy(pkt_dev->src_min, buf); WARNING: Prefer strscpy over strcpy - see: https://github.com/KSPP/linux/= issues/88 #1575: FILE: net/core/pktgen.c:1575: + strcpy(pkt_dev->src_max, buf); WARNING: Prefer strscpy over strcpy - see: https://github.com/KSPP/linux/= issues/88 #3231: FILE: net/core/pktgen.c:3231: + strcpy(pkt_dev->result, "Starting"); WARNING: Prefer strscpy over strcpy - see: https://github.com/KSPP/linux/= issues/88 #3235: FILE: net/core/pktgen.c:3235: + strcpy(pkt_dev->result, "Error starting"); WARNING: Prefer strscpy over strcpy - see: https://github.com/KSPP/linux/= issues/88 #3849: FILE: net/core/pktgen.c:3849: + strcpy(pkt_dev->odevname, ifname); While at it squash memset/strcpy pattern into single strscpy_pad call. Signed-off-by: Peter Seiderer Reviewed-by: Simon Horman --- Changes v1 -> v2: - squash memset/strscpy pattern into single strscpy_pad call (suggested by Jakub Kicinski) --- net/core/pktgen.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 9d56f9765411..0ebe5461d4d9 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -1419,8 +1419,7 @@ static ssize_t pktgen_if_write(struct file *file, return -EFAULT; buf[len] =3D 0; if (strcmp(buf, pkt_dev->dst_min) !=3D 0) { - memset(pkt_dev->dst_min, 0, sizeof(pkt_dev->dst_min)); - strcpy(pkt_dev->dst_min, buf); + strscpy_pad(pkt_dev->dst_min, buf); pkt_dev->daddr_min =3D in_aton(pkt_dev->dst_min); pkt_dev->cur_daddr =3D pkt_dev->daddr_min; } @@ -1440,8 +1439,7 @@ static ssize_t pktgen_if_write(struct file *file, return -EFAULT; buf[len] =3D 0; if (strcmp(buf, pkt_dev->dst_max) !=3D 0) { - memset(pkt_dev->dst_max, 0, sizeof(pkt_dev->dst_max)); - strcpy(pkt_dev->dst_max, buf); + strscpy_pad(pkt_dev->dst_max, buf); pkt_dev->daddr_max =3D in_aton(pkt_dev->dst_max); pkt_dev->cur_daddr =3D pkt_dev->daddr_max; } @@ -1550,8 +1548,7 @@ static ssize_t pktgen_if_write(struct file *file, return -EFAULT; buf[len] =3D 0; if (strcmp(buf, pkt_dev->src_min) !=3D 0) { - memset(pkt_dev->src_min, 0, sizeof(pkt_dev->src_min)); - strcpy(pkt_dev->src_min, buf); + strscpy_pad(pkt_dev->src_min, buf); pkt_dev->saddr_min =3D in_aton(pkt_dev->src_min); pkt_dev->cur_saddr =3D pkt_dev->saddr_min; } @@ -1571,8 +1568,7 @@ static ssize_t pktgen_if_write(struct file *file, return -EFAULT; buf[len] =3D 0; if (strcmp(buf, pkt_dev->src_max) !=3D 0) { - memset(pkt_dev->src_max, 0, sizeof(pkt_dev->src_max)); - strcpy(pkt_dev->src_max, buf); + strscpy_pad(pkt_dev->src_max, buf); pkt_dev->saddr_max =3D in_aton(pkt_dev->src_max); pkt_dev->cur_saddr =3D pkt_dev->saddr_max; } @@ -3228,11 +3224,11 @@ static void pktgen_run(struct pktgen_thread *t) =20 set_pkt_overhead(pkt_dev); =20 - strcpy(pkt_dev->result, "Starting"); + strscpy(pkt_dev->result, "Starting"); pkt_dev->running =3D 1; /* Cranke yeself! */ started++; } else - strcpy(pkt_dev->result, "Error starting"); + strscpy(pkt_dev->result, "Error starting"); } rcu_read_unlock(); if (started) @@ -3846,7 +3842,7 @@ static int pktgen_add_device(struct pktgen_thread *t,= const char *ifname) if (!pkt_dev) return -ENOMEM; =20 - strcpy(pkt_dev->odevname, ifname); + strscpy(pkt_dev->odevname, ifname); pkt_dev->flows =3D vzalloc_node(array_size(MAX_CFLOWS, sizeof(struct flow_state)), node); --=20 2.49.0