Skip to contentSkip to conversation

staging: rtl8723bs: use strscpy() for ifname copy

PATCH In review Svyatoslav Nikolenko 2 participants 2 messages Aug 26 – Sep 1 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: rtl8723bs: use strscpy() for ifname copy

Replace snprintf() with strscpy() when copying ifname into registry_par to avoid unnecessary format specifier parsing.

---
 drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/os_dep/os_intfs.c +1 -1
index f31196f54b3e..dd0c5fc813c8 100644
@@ -256,7 +256,7 @@ static void loadparam(struct adapter *padapter, struct net_device *pnetdev)
 
 	registry_par->enable80211d = (u8)rtw_80211d;
 
-	snprintf(registry_par->ifname, 16, "%s", ifname);
+	strscpy(registry_par->ifname, ifname, sizeof(registry_par->ifname));
 
 	registry_par->notch_filter = (u8)rtw_notch_filter;
 
Signature · 1 line
2.47.3
#1 lore raw
Quoted 13 lines · Svyatoslav Nikolenko

Replace snprintf() with strscpy() when copying ifname into registry_par to avoid unnecessary format specifier parsing.

---
 drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/os_dep/os_intfs.c +0 -0
index f31196f54b3e..dd0c5fc813c8 100644

drivers/staging/rtl8723bs/os_dep/os_intfs.c static void loadparam(struct adapter *padapter, struct net_device *pnetdev) · line 261

Quoted 7 lines
drivers/staging/rtl8723bs/os_dep/os_intfs.c +1 -1
@@ -256,7 +256,7 @@ static void loadparam(struct adapter *padapter, struct net_device *pnetdev)
 
 	registry_par->enable80211d = (u8)rtw_80211d;
 
-	snprintf(registry_par->ifname, 16, "%s", ifname);
+	strscpy(registry_par->ifname, ifname, sizeof(registry_par->ifname));
 
 	registry_par->notch_filter = (u8)rtw_notch_filter;

the ifname module option, and field, should just be removed from this driver entirely. Can you do that instead?

thanks,

greg k-h