From: Mieczyslaw Nalewaj Date: Thu, 19 Jun 2025 20:26:45 +0000 (+0200) Subject: mt76: Change CRLF to LF in patch 002 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc95180540b994ffe19e27d8d18b25e8dc93ff78;p=thirdparty%2Fopenwrt.git mt76: Change CRLF to LF in patch 002 Change CRLF to LF in patch 002-wifi-mt76-replace-strlcpy-with-strscpy.patch Fixes: 225622e0f9fb ("mt76: replace strlcpy with strscpy") Signed-off-by: Mieczyslaw Nalewaj Link: https://github.com/openwrt/openwrt/pull/19185 Signed-off-by: Hauke Mehrtens --- diff --git a/package/kernel/mt76/patches/002-wifi-mt76-replace-strlcpy-with-strscpy.patch b/package/kernel/mt76/patches/002-wifi-mt76-replace-strlcpy-with-strscpy.patch index 176f6de5a0f..9e7d1ee057a 100644 --- a/package/kernel/mt76/patches/002-wifi-mt76-replace-strlcpy-with-strscpy.patch +++ b/package/kernel/mt76/patches/002-wifi-mt76-replace-strlcpy-with-strscpy.patch @@ -1,32 +1,32 @@ -From d6b484b5cb2a7d509b36a220911509ddd8b777c4 Mon Sep 17 00:00:00 2001 -From: Azeem Shaikh -Date: Mon, 3 Jul 2023 18:12:56 +0000 -Subject: 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 -Reviewed-by: Kees Cook -Signed-off-by: Kalle Valo -Link: https://lore.kernel.org/r/20230703181256.3712079-1-azeemshaikh38@gmail.com ---- - mt7615/mt7615_trace.h | 2 +- - mt76x02_trace.h | 2 +- - trace.h | 2 +- - usb_trace.h | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - +From d6b484b5cb2a7d509b36a220911509ddd8b777c4 Mon Sep 17 00:00:00 2001 +From: Azeem Shaikh +Date: Mon, 3 Jul 2023 18:12:56 +0000 +Subject: 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 +Reviewed-by: Kees Cook +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20230703181256.3712079-1-azeemshaikh38@gmail.com +--- + mt7615/mt7615_trace.h | 2 +- + mt76x02_trace.h | 2 +- + trace.h | 2 +- + usb_trace.h | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + --- a/mt7615/mt7615_trace.h +++ b/mt7615/mt7615_trace.h @@ -14,7 +14,7 @@