Skip to contentSkip to conversation

ipmi/watchdog: use strscpy() to instead of strncpy()

PATCH In review [email protected] 2 participants 2 messages Dec 5, 2022 IPMI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ipmi/watchdog: use strscpy() to instead of strncpy()

Xu Panda <[email protected]>

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

---
 drivers/char/ipmi/ipmi_watchdog.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/char/ipmi/ipmi_watchdog.c +1 -2
index 47365150e431..0d4a8dcacfd4 100644
@@ -213,8 +213,7 @@ static int set_param_str(const char *val, const struct kernel_param *kp)
 	char       valcp[16];
 	char       *s;
 
-	strncpy(valcp, val, 15);
-	valcp[15] = '\0';
+	strscpy(valcp, val, 16);
 
 	s = strstrip(valcp);
 
Signature · 1 line
2.15.2
#1 lore raw
Quoted 4 lines · On Mon, Dec 05, 2022 at 07:36:40PM +0800, [email protected] wrote:

Xu Panda <[email protected]>

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

This looks right. Applied, thanks.

-corey

Quoted 23 lines
---
 drivers/char/ipmi/ipmi_watchdog.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/char/ipmi/ipmi_watchdog.c +1 -2
index 47365150e431..0d4a8dcacfd4 100644
@@ -213,8 +213,7 @@ static int set_param_str(const char *val, const struct kernel_param *kp)
 	char       valcp[16];
 	char       *s;
 
-	strncpy(valcp, val, 15);
-	valcp[15] = '\0';
+	strscpy(valcp, val, 16);
 
 	s = strstrip(valcp);
 
Signature · 1 line
2.15.2