* [PATCH net-next] drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool: Use strscpy() to copy ethtool test names
@ 2026-06-08 9:55 david.laight.linux
0 siblings, 0 replies; only message in thread
From: david.laight.linux @ 2026-06-08 9:55 UTC (permalink / raw)
To: Kees Cook, linux-hardening, linux-kernel, netdev
Cc: Arnd Bergmann, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, Michael Chan, Paolo Abeni, Pavan Chebbi,
David Laight
From: David Laight <david.laight.linux@gmail.com>
The length must be specified (it is the size of the array element)
because a pointer to the array element is used to shorten the line lengths.
Signed-off-by: David Laight <david.laight.linux@gmail.com>
---
This is one of a group of patches that remove potentially unbounded
strcpy() calls.
They are mostly replaced by strscpy() or, when strlen() has just been
called, with memcpy() (usually including the '\0').
Calls with copy string literals into arrays are left unchanged.
They are safe and easily detected as such.
The changes were made by getting the compiler to detect the calls and
then fixing the code by hand.
Note that all the changes are only compile tested.
Some Makefiles were changed to allow files to contain strcpy().
As well as 'difficult to fix' files, this included 'show' functions
as they really need to use sysfs_emit() or seq_printf().
All the patches are being sent individually to avoid very long cc lists.
Apologies for the terse commit messages and likely unexpected tags.
(There are about 100 patches in total.)
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index 9b14134d62d2..68e320285a08 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -5542,18 +5542,19 @@ void bnxt_ethtool_init(struct bnxt *bp)
test_info->timeout = HWRM_CMD_TIMEOUT;
for (i = 0; i < bp->num_tests; i++) {
char *str = test_info->string[i];
+ int sz = sizeof (test_info->string[i]);
char *fw_str = resp->test_name[i];
if (i == BNXT_MACLPBK_TEST_IDX) {
- strcpy(str, "Mac loopback test (offline)");
+ strscpy(str, "Mac loopback test (offline)", sz);
} else if (i == BNXT_PHYLPBK_TEST_IDX) {
- strcpy(str, "Phy loopback test (offline)");
+ strscpy(str, "Phy loopback test (offline)", sz);
} else if (i == BNXT_EXTLPBK_TEST_IDX) {
- strcpy(str, "Ext loopback test (offline)");
+ strscpy(str, "Ext loopback test (offline)", sz);
} else if (i == BNXT_IRQ_TEST_IDX) {
- strcpy(str, "Interrupt_test (offline)");
+ strscpy(str, "Interrupt_test (offline)", sz);
} else {
- snprintf(str, ETH_GSTRING_LEN, "%s test (%s)",
+ snprintf(str, sz, "%s test (%s)",
fw_str, test_info->offline_mask & (1 << i) ?
"offline" : "online");
}
--
2.39.5
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-08 9:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-06-08 9:55 [PATCH net-next] drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool: Use strscpy() to copy ethtool test names david.laight.linux
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox