wifi: mt76: Replace strlcpy() with strscpy()

strlcpy() reads the entire source buffer first.
This read may exceed the destination size limit.
This is both inefficient and can lead to linear read
overflows if a source string is not NUL-terminated [1].
In an effort to remove strlcpy() completely [2], replace
strlcpy() here with strscpy().

Direct replacement is safe here since DEV_ASSIGN is only used by
TRACE macros and the return values are ignored.

[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
[2] https://github.com/KSPP/linux/issues/89

Signed-off-by: Azeem Shaikh <azeemshaikh38@gmail.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230703181256.3712079-1-azeemshaikh38@gmail.com

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615_trace.h b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615_trace.h
index d3eb49d83b98de7a32d018313840ed352cf77ab0..9be5a58a4e6dc113ad0ee134926d349f189e4e68 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615_trace.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615_trace.h
@@ -14,7 +14,7 @@
 
 #define MAXNAME                32
 #define DEV_ENTRY      __array(char, wiphy_name, 32)
-#define DEV_ASSIGN     strlcpy(__entry->wiphy_name,    \
+#define DEV_ASSIGN     strscpy(__entry->wiphy_name,    \
                                wiphy_name(mt76_hw(dev)->wiphy), MAXNAME)
 #define DEV_PR_FMT     "%s"
 #define DEV_PR_ARG     __entry->wiphy_name

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_trace.h b/drivers/net/wireless/mediatek/mt76/mt76x02_trace.h
index 6a98092e996b3d5e34a27ac5476eed511d95c59d..11d119cd0f6fd0349228444e9d225e9bfc531073 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_trace.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_trace.h
@@ -14,7 +14,7 @@
 
 #define MAXNAME                32
 #define DEV_ENTRY      __array(char, wiphy_name, 32)
-#define DEV_ASSIGN     strlcpy(__entry->wiphy_name,    \
+#define DEV_ASSIGN     strscpy(__entry->wiphy_name,    \
                                wiphy_name(mt76_hw(dev)->wiphy), MAXNAME)
 #define DEV_PR_FMT     "%s"
 #define DEV_PR_ARG     __entry->wiphy_name

diff --git a/drivers/net/wireless/mediatek/mt76/trace.h b/drivers/net/wireless/mediatek/mt76/trace.h
index c3d0ef8e28903855b5510cb0eae2b220b2f52592..109a07f9733a8ee73efdda8fc7a99858eac28f47 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/trace.h
+++ b/drivers/net/wireless/mediatek/mt76/trace.h
@@ -14,7 +14,7 @@
 
 #define MAXNAME                32
 #define DEV_ENTRY      __array(char, wiphy_name, 32)
-#define DEVICE_ASSIGN  strlcpy(__entry->wiphy_name,    \
+#define DEVICE_ASSIGN  strscpy(__entry->wiphy_name,    \
                                wiphy_name(dev->hw->wiphy), MAXNAME)
 #define DEV_PR_FMT     "%s"
 #define DEV_PR_ARG     __entry->wiphy_name

diff --git a/drivers/net/wireless/mediatek/mt76/usb_trace.h b/drivers/net/wireless/mediatek/mt76/usb_trace.h
index f5ab3215af800e0ef7432bab17428293bb53985c..7b261ddb2ac66f3196d29a23a434d5884401ed57 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/usb_trace.h
+++ b/drivers/net/wireless/mediatek/mt76/usb_trace.h
@@ -14,7 +14,7 @@
 
 #define MAXNAME                32
 #define DEV_ENTRY      __array(char, wiphy_name, 32)
-#define DEV_ASSIGN     strlcpy(__entry->wiphy_name,    \
+#define DEV_ASSIGN     strscpy(__entry->wiphy_name,    \
                                wiphy_name(dev->hw->wiphy), MAXNAME)
 #define DEV_PR_FMT     "%s "
 #define DEV_PR_ARG     __entry->wiphy_name