[v1] net/rds: use strscpy() to instead of strncpy()

[PATCH net-next] net/rds: use strscpy() to instead of strncpy()

yang.yang29@zte.com.cn posted 1 patch 2 years, 8 months ago

Diff against v2
Download mbox

There is a newer version of this series

net/rds/stats.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

Expand all Fold all

[PATCH net-next] net/rds: use strscpy() to instead of strncpy()

Posted by yang.yang29@zte.com.cn 2 years, 8 months ago

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

Re: [PATCH net-next] net/rds: use strscpy() to instead of strncpy()

Posted by Jakub Kicinski 2 years, 8 months ago

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.