Commit cd912503 authored by Azeem Shaikh's avatar Azeem Shaikh Committed by Stefan Schmidt

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/89Signed-off-by: default avatarAzeem Shaikh <azeemshaikh38@gmail.com>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Link: https://lore.kernel.org/r/20230613003326.3538391-1-azeemshaikh38@gmail.comSigned-off-by: default avatarStefan Schmidt <stefan@datenfreihafen.org>
parent bd4e3d82
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#define MAXNAME 32 #define MAXNAME 32
#define WPAN_PHY_ENTRY __array(char, wpan_phy_name, MAXNAME) #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), \ wpan_phy_name(wpan_phy), \
MAXNAME) MAXNAME)
#define WPAN_PHY_PR_FMT "%s" #define WPAN_PHY_PR_FMT "%s"
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#define MAXNAME 32 #define MAXNAME 32
#define LOCAL_ENTRY __array(char, wpan_phy_name, MAXNAME) #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) wpan_phy_name(local->hw.phy), MAXNAME)
#define LOCAL_PR_FMT "%s" #define LOCAL_PR_FMT "%s"
#define LOCAL_PR_ARG __entry->wpan_phy_name #define LOCAL_PR_ARG __entry->wpan_phy_name
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment