* [PATCH] cfg80211: cfg80211: strlcpy withreturn
@ 2023-06-12 23:23 Azeem Shaikh
2023-06-13 19:24 ` Kees Cook
2023-06-14 7:40 ` Kalle Valo
0 siblings, 2 replies; 4+ messages in thread
From: Azeem Shaikh @ 2023-06-12 23:23 UTC (permalink / raw)
To: Johannes Berg
Cc: linux-hardening, Azeem Shaikh, linux-wireless, linux-kernel,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
netdev
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 WIPHY_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>
---
net/wireless/trace.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/wireless/trace.h b/net/wireless/trace.h
index 716a1fa70069..a00da3ebfed5 100644
--- a/net/wireless/trace.h
+++ b/net/wireless/trace.h
@@ -22,7 +22,7 @@
#define MAXNAME 32
#define WIPHY_ENTRY __array(char, wiphy_name, 32)
-#define WIPHY_ASSIGN strlcpy(__entry->wiphy_name, wiphy_name(wiphy), MAXNAME)
+#define WIPHY_ASSIGN strscpy(__entry->wiphy_name, wiphy_name(wiphy), MAXNAME)
#define WIPHY_PR_FMT "%s"
#define WIPHY_PR_ARG __entry->wiphy_name
--
2.41.0.162.gfafddb0af9-goog
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] cfg80211: cfg80211: strlcpy withreturn
2023-06-12 23:23 [PATCH] cfg80211: cfg80211: strlcpy withreturn Azeem Shaikh
@ 2023-06-13 19:24 ` Kees Cook
2023-06-14 7:40 ` Kalle Valo
1 sibling, 0 replies; 4+ messages in thread
From: Kees Cook @ 2023-06-13 19:24 UTC (permalink / raw)
To: Azeem Shaikh
Cc: Johannes Berg, linux-hardening, linux-wireless, linux-kernel,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
netdev
On Mon, Jun 12, 2023 at 11:23:01PM +0000, Azeem Shaikh wrote:
> 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 WIPHY_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>
--
Kees Cook
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] cfg80211: cfg80211: strlcpy withreturn
2023-06-12 23:23 [PATCH] cfg80211: cfg80211: strlcpy withreturn Azeem Shaikh
2023-06-13 19:24 ` Kees Cook
@ 2023-06-14 7:40 ` Kalle Valo
2023-06-14 13:46 ` Azeem Shaikh
1 sibling, 1 reply; 4+ messages in thread
From: Kalle Valo @ 2023-06-14 7:40 UTC (permalink / raw)
To: Azeem Shaikh
Cc: Johannes Berg, linux-hardening, linux-wireless, linux-kernel,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
netdev
Azeem Shaikh <azeemshaikh38@gmail.com> writes:
> 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 WIPHY_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>
The title should be:
wifi: cfg80211: replace strlcpy() with strlscpy()
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] cfg80211: cfg80211: strlcpy withreturn
2023-06-14 7:40 ` Kalle Valo
@ 2023-06-14 13:46 ` Azeem Shaikh
0 siblings, 0 replies; 4+ messages in thread
From: Azeem Shaikh @ 2023-06-14 13:46 UTC (permalink / raw)
To: Kalle Valo
Cc: Johannes Berg, linux-hardening, linux-wireless, linux-kernel,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
netdev
On Wed, Jun 14, 2023 at 3:40 AM Kalle Valo <kvalo@kernel.org> wrote:
>
> Azeem Shaikh <azeemshaikh38@gmail.com> writes:
>
> > 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 WIPHY_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>
>
> The title should be:
>
> wifi: cfg80211: replace strlcpy() with strlscpy()
>
Ack. Sent out a v2.
> --
> https://patchwork.kernel.org/project/linux-wireless/list/
>
> https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-06-14 13:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-12 23:23 [PATCH] cfg80211: cfg80211: strlcpy withreturn Azeem Shaikh
2023-06-13 19:24 ` Kees Cook
2023-06-14 7:40 ` Kalle Valo
2023-06-14 13:46 ` Azeem Shaikh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).