From: Xu Panda <xu.panda@xxxxxxxxxx>
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@xxxxxxxxxx>
Signed-off-by: Yang Yang <yang.yang29@xxxxxxxxxx>
---
change for v2
- Use the returns of strscpy to make the copy and the preceding
BUG_ON() together.Thanks to Jakub Kicinski.
---
net/rds/stats.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/net/rds/stats.c b/net/rds/stats.c
index 9e87da43c004..7018c67418f5 100644
--- a/net/rds/stats.c
+++ b/net/rds/stats.c
@@ -88,9 +88,7 @@ void rds_stats_info_copy(struct rds_info_iterator *iter,
size_t i;
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';
+ BUG_ON(strscpy(ctr.name, names[i], sizeof(ctr.name)) < 0);
ctr.value = values[i];
rds_info_copy(iter, &ctr, sizeof(ctr));
--
2.15.2
