ieee802154: 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 the return values
from the helper macros are ignored by the callers.

[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>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Link: https://lore.kernel.org/r/20230613003326.3538391-1-azeemshaikh38@gmail.com
Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>

diff --git a/net/ieee802154/trace.h b/net/ieee802154/trace.h
index e5d8439b9e4535a46dfd091e6bb5910ae5711861..c16db0b326fa4f9616e34c25b27f45d0d509f67a 100644 (file)
--- a/net/ieee802154/trace.h
+++ b/net/ieee802154/trace.h
@@ -13,7 +13,7 @@
 
 #define MAXNAME                32
 #define WPAN_PHY_ENTRY __array(char, wpan_phy_name, MAXNAME)
-#define WPAN_PHY_ASSIGN        strlcpy(__entry->wpan_phy_name,  \
+#define WPAN_PHY_ASSIGN        strscpy(__entry->wpan_phy_name,  \
                                wpan_phy_name(wpan_phy), \
                                MAXNAME)
 #define WPAN_PHY_PR_FMT        "%s"

diff --git a/net/mac802154/trace.h b/net/mac802154/trace.h
index 689396d6c76a43e6c92ccfbd992efa947846e315..1574ecc4807546820b46815b9b497e0194882c33 100644 (file)
--- a/net/mac802154/trace.h
+++ b/net/mac802154/trace.h
@@ -14,7 +14,7 @@
 
 #define MAXNAME                32
 #define LOCAL_ENTRY    __array(char, wpan_phy_name, MAXNAME)
-#define LOCAL_ASSIGN   strlcpy(__entry->wpan_phy_name, \
+#define LOCAL_ASSIGN   strscpy(__entry->wpan_phy_name, \
                                wpan_phy_name(local->hw.phy), MAXNAME)
 #define LOCAL_PR_FMT   "%s"
 #define LOCAL_PR_ARG   __entry->wpan_phy_name