* [PATCH net-next] net/rds: use strscpy() to instead of strncpy()
@ 2023-01-09 11:48 yang.yang29
2023-01-10 3:48 ` Jakub Kicinski
0 siblings, 1 reply; 2+ messages in thread
From: yang.yang29 @ 2023-01-09 11:48 UTC (permalink / raw)
To: santosh.shilimkar
Cc: davem, edumazet, kuba, pabeni, netdev, linux-rdma, rds-devel,
linux-kernel, xu.panda, yang.yang29
From: Xu Panda <xu.panda@zte.com.cn>
The implementation of strscpy() is more robust and safer.
That's now the recommended way to copy NUL-terminated strings.
Signed-off-by: Xu Panda <xu.panda@zte.com.cn>
Signed-off-by: Yang Yang <yang.yang29@zte.com.cn>
---
net/rds/stats.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net/rds/stats.c b/net/rds/stats.c
index 9e87da43c004..6a5a60d36d60 100644
--- a/net/rds/stats.c
+++ b/net/rds/stats.c
@@ -89,8 +89,7 @@ void rds_stats_info_copy(struct rds_info_iterator *iter,
for (i = 0; i < nr; i++) {
BUG_ON(strlen(names[i]) >= sizeof(ctr.name));
- strncpy(ctr.name, names[i], sizeof(ctr.name) - 1);
- ctr.name[sizeof(ctr.name) - 1] = '\0';
+ strscpy(ctr.name, names[i], sizeof(ctr.name));
ctr.value = values[i];
rds_info_copy(iter, &ctr, sizeof(ctr));
--
2.15.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] net/rds: use strscpy() to instead of strncpy()
2023-01-09 11:48 [PATCH net-next] net/rds: use strscpy() to instead of strncpy() yang.yang29
@ 2023-01-10 3:48 ` Jakub Kicinski
0 siblings, 0 replies; 2+ messages in thread
From: Jakub Kicinski @ 2023-01-10 3:48 UTC (permalink / raw)
To: yang.yang29
Cc: santosh.shilimkar, davem, edumazet, pabeni, netdev, linux-rdma,
rds-devel, linux-kernel, xu.panda
On Mon, 9 Jan 2023 19:48:43 +0800 (CST) yang.yang29@zte.com.cn wrote:
> BUG_ON(strlen(names[i]) >= sizeof(ctr.name));
> - strncpy(ctr.name, names[i], sizeof(ctr.name) - 1);
> - ctr.name[sizeof(ctr.name) - 1] = '\0';
> + strscpy(ctr.name, names[i], sizeof(ctr.name));
You can make use of the fact that strscpy returns useful information
and the copy and the preceding BUG_ON() together.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-01-10 3:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-09 11:48 [PATCH net-next] net/rds: use strscpy() to instead of strncpy() yang.yang29
2023-01-10 3:48 ` Jakub Kicinski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).