Skip to contentSkip to conversation

rcu/trace: use strscpy() to instead of strncpy()

PATCH In review [email protected] 2 participants 2 messages Jan 5, 2023 Tracing

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rcu/trace: use strscpy() to instead of strncpy()

From: Xu Panda <[email protected]>

The implementation of strscpy() is more robust and safer. That's now the recommended way to copy NUL-terminated strings.

---
 include/trace/events/rcu.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
include/trace/events/rcu.h +1 -2
index 90b2fb0292cb..2703992edecd 100644
@@ -776,9 +776,8 @@ TRACE_EVENT_RCU(rcu_torture_read,
 	),
 
 	TP_fast_assign(
-		strncpy(__entry->rcutorturename, rcutorturename,
+		strscpy(__entry->rcutorturename, rcutorturename,
 			RCUTORTURENAME_LEN);
-		__entry->rcutorturename[RCUTORTURENAME_LEN - 1] = 0;
 		__entry->rhp = rhp;
 		__entry->secs = secs;
 		__entry->c_old = c_old;
Signature · 1 line
2.15.2
#1 lore raw
Quoted 7 lines · On Thu, Jan 05, 2023 at 08:17:57PM +0800, [email protected] wrote:

From: Xu Panda <[email protected]>

The implementation of strscpy() is more robust and safer. That's now the recommended way to copy NUL-terminated strings.

Queued for testing and additional review, thank you!

Please see below for the traditional wordsmithing and please let me know if I messed anything up.

Thanx, Paul

------------------------------------------------------------------------

commit 4034fe140e75d6e51b72d1fd16805e053b9b633c

Author: Xu Panda <[email protected]>
Date:   Thu Jan 5 20:17:57 2023 +0800

rcu/trace: use strscpy() to instead of strncpy()

This commit saves a line of code by switching from strncpy() to strscpy() by permitting the later NUL assignment to be removed. While in the area, save another line by taking advantage of 100 characters.

include/trace/events/rcu.h +1 -3
index 90b2fb0292cb1..c19ac1fa8a607 100644
@@ -776,9 +776,7 @@ TRACE_EVENT_RCU(rcu_torture_read,
 	),
 
 	TP_fast_assign(
-		strncpy(__entry->rcutorturename, rcutorturename,
-			RCUTORTURENAME_LEN);
-		__entry->rcutorturename[RCUTORTURENAME_LEN - 1] = 0;
+		strscpy(__entry->rcutorturename, rcutorturename, RCUTORTURENAME_LEN);
 		__entry->rhp = rhp;
 		__entry->secs = secs;
 		__entry->c_old = c_old;