wifi: rtl8xxxu: Use strscpy instead of sprintf

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

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c
index 0f77312dd0ca97b258625708b1c237e233ba4f5f..ef38891ddbd1c1f9e57d70e7b9a8f5b2213e362a 100644 (file)
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c
@@ -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;

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c
index 8f4396da0c102eb3957877ee19e175479300c949..df357b3b6fe02b2f0e32083149a2467105a9bc34 100644 (file)
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c
@@ -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;

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
index 400810191d7602268ffe90226f40bee929aa9f2c..802b9246c79d40168d8ff058d6390fecfc0c943d 100644 (file)
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
@@ -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;
        }

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c
index 33a1114a58535f93e455233aedbf222287f6b723..c8ab71ed4ff499e537182196827284af3f2bc4dc 100644 (file)
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c
@@ -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;
 

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
index 558572bdd2c8f345763147f0a3cd849b1d9060de..ece82e613bf020d05636e5dbc15202a852ecf0ff 100644 (file)
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
@@ -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;

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
index e4eb17d03cd7b115f5cde40600338fb1133a044e..e8fcd531c4375f3de9125ab2f98e510ced3deb93 100644 (file)
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
@@ -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));
        }
 }