Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 12:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

wifi: rtl8xxxu: Use strscpy instead of sprintf

Browse Source 
Fill priv->chip_name and priv->chip_vendor with strscpy instead of
sprintf. This is just to prevent future bugs in case the name of a
chip/vendor becomes longer than the size of chip_name/chip_vendor.

Suggested-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
Reviewed-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/5fc9cc0e-eecb-8428-aeb1-f745791c0f16@gmail.com
This commit is contained in:
Bitterblue Smith 2022-11-10 15:59:29 +02:00 committed by Kalle Valo
parent 486e0315c4
commit 9b00565abf
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c
View File

@ -327,7 +327,7 @@ static int rtl8188fu_identify_chip(struct rtl8xxxu_priv *priv)
u32 sys_cfg, vendor;
int ret = 0;
sprintf(priv->chip_name, "8188FU");
strscpy(priv->chip_name, "8188FU", sizeof(priv->chip_name));
priv->rtl_chip = RTL8188F;
priv->rf_paths = 1;
priv->rx_paths = 1;

8
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c
View File

@ -345,12 +345,12 @@ static int rtl8192cu_identify_chip(struct rtl8xxxu_priv *priv)
bonding = rtl8xxxu_read32(priv, REG_HPON_FSM);
bonding &= HPON_FSM_BONDING_MASK;
if (bonding == HPON_FSM_BONDING_1T2R) {
sprintf(priv->chip_name, "8191CU");
strscpy(priv->chip_name, "8191CU", sizeof(priv->chip_name));
priv->tx_paths = 1;
priv->usb_interrupts = 1;
priv->rtl_chip = RTL8191C;
} else {
sprintf(priv->chip_name, "8192CU");
strscpy(priv->chip_name, "8192CU", sizeof(priv->chip_name));
priv->tx_paths = 2;
priv->usb_interrupts = 0;
priv->rtl_chip = RTL8192C;
@ -358,7 +358,7 @@ static int rtl8192cu_identify_chip(struct rtl8xxxu_priv *priv)
priv->rf_paths = 2;
priv->rx_paths = 2;
} else {
sprintf(priv->chip_name, "8188CU");
strscpy(priv->chip_name, "8188CU", sizeof(priv->chip_name));
priv->rf_paths = 1;
priv->rx_paths = 1;
priv->tx_paths = 1;
@ -451,7 +451,7 @@ static int rtl8192cu_parse_efuse(struct rtl8xxxu_priv *priv)
priv->power_base = &rtl8192c_power_base;
if (efuse->rf_regulatory & 0x20) {
sprintf(priv->chip_name, "8188RU");
strscpy(priv->chip_name, "8188RU", sizeof(priv->chip_name));
priv->rtl_chip = RTL8188R;
priv->hi_pa = 1;
priv->no_pape = 1;

4
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
View File

@ -496,11 +496,11 @@ static int rtl8192eu_identify_chip(struct rtl8xxxu_priv *priv)
bonding = rtl8xxxu_read32(priv, REG_HPON_FSM);
bonding &= HPON_FSM_BONDING_MASK;
if (bonding == HPON_FSM_BONDING_1T2R) {
sprintf(priv->chip_name, "8191EU");
strscpy(priv->chip_name, "8191EU", sizeof(priv->chip_name));
priv->tx_paths = 1;
priv->rtl_chip = RTL8191E;
} else {
sprintf(priv->chip_name, "8192EU");
strscpy(priv->chip_name, "8192EU", sizeof(priv->chip_name));
priv->tx_paths = 2;
priv->rtl_chip = RTL8192E;
}

2
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c
View File

@ -144,7 +144,7 @@ static int rtl8723au_identify_chip(struct rtl8xxxu_priv *priv)
goto out;
}
sprintf(priv->chip_name, "8723AU");
strscpy(priv->chip_name, "8723AU", sizeof(priv->chip_name));
priv->usb_interrupts = 1;
priv->rtl_chip = RTL8723A;

2
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
View File

@ -319,7 +319,7 @@ static int rtl8723bu_identify_chip(struct rtl8xxxu_priv *priv)
goto out;
}
sprintf(priv->chip_name, "8723BU");
strscpy(priv->chip_name, "8723BU", sizeof(priv->chip_name));
priv->rtl_chip = RTL8723B;
priv->rf_paths = 1;
priv->rx_paths = 1;

12
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
View File

@ -1592,10 +1592,10 @@ static void rtl8xxxu_print_chipinfo(struct rtl8xxxu_priv *priv)
void rtl8xxxu_identify_vendor_1bit(struct rtl8xxxu_priv *priv, u32 vendor)
{
if (vendor) {
sprintf(priv->chip_vendor, "UMC");
strscpy(priv->chip_vendor, "UMC", sizeof(priv->chip_vendor));
priv->vendor_umc = 1;
} else {
sprintf(priv->chip_vendor, "TSMC");
strscpy(priv->chip_vendor, "TSMC", sizeof(priv->chip_vendor));
}
}
@ -1603,18 +1603,18 @@ void rtl8xxxu_identify_vendor_2bits(struct rtl8xxxu_priv *priv, u32 vendor)
{
switch (vendor) {
case SYS_CFG_VENDOR_ID_TSMC:
sprintf(priv->chip_vendor, "TSMC");
strscpy(priv->chip_vendor, "TSMC", sizeof(priv->chip_vendor));
break;
case SYS_CFG_VENDOR_ID_SMIC:
sprintf(priv->chip_vendor, "SMIC");
strscpy(priv->chip_vendor, "SMIC", sizeof(priv->chip_vendor));
priv->vendor_smic = 1;
break;
case SYS_CFG_VENDOR_ID_UMC:
sprintf(priv->chip_vendor, "UMC");
strscpy(priv->chip_vendor, "UMC", sizeof(priv->chip_vendor));
priv->vendor_umc = 1;
break;
default:
sprintf(priv->chip_vendor, "unknown");
strscpy(priv->chip_vendor, "unknown", sizeof(priv->chip_vendor));
}
}