Skip to contentSkip to conversation

wifi: ipw2200: use strscpy() to instead of strncpy()

PATCH In review [email protected] 2 participants 3 messages Dec 23, 2022 – Jan 18, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 wifi: ipw2200: 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.

---
 drivers/net/wireless/intel/ipw2x00/ipw2200.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/intel/ipw2x00/ipw2200.c +1 -2
index ca802af8cddc..6656cea496b1 100644
@@ -1483,8 +1483,7 @@ static ssize_t scan_age_store(struct device *d, struct device_attribute *attr,
 
 	IPW_DEBUG_INFO("enter\n");
 
-	strncpy(buffer, buf, len);
-	buffer[len] = 0;
+	strncpy(buffer, buf, len + 1);
 
 	if (p[1] == 'x' || p[1] == 'X' || p[0] == 'x' || p[0] == 'X') {
 		p++;
Signature · 1 line
2.15.2
#1 lore raw
Quoted 16 lines · On Fri, 2022-12-23 at 10:56 +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.

---
 drivers/net/wireless/intel/ipw2x00/ipw2200.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/intel/ipw2x00/ipw2200.c +0 -0
index ca802af8cddc..6656cea496b1 100644

drivers/net/wireless/intel/ipw2x00/ipw2200.c static ssize_t scan_age_store(struct device *d, struct device_attribute *attr, · line 1487

Quoted 7 lines
drivers/net/wireless/intel/ipw2x00/ipw2200.c +1 -2
@@ -1483,8 +1483,7 @@ static ssize_t scan_age_store(struct device *d, struct device_attribute *attr,
 
 	IPW_DEBUG_INFO("enter\n");
 
-	strncpy(buffer, buf, len);
-	buffer[len] = 0;
+	strncpy(buffer, buf, len + 1);
 

Ummm?

But anyway - why bother ... ancient drivers, clearly OK code.

johannes

#2 lore raw
Quoted 1 line

But anyway - why bother ... ancient drivers, clearly OK code.

Thank you, got it, it's useful information. Sorry for to bother and please ignore this patch.