* [PATCH v2] fortify: Avoid shadowing previous locals
@ 2021-10-25 21:05 Qian Cai
2021-10-25 22:42 ` Kees Cook
0 siblings, 1 reply; 2+ messages in thread
From: Qian Cai @ 2021-10-25 21:05 UTC (permalink / raw)
To: Kees Cook; +Cc: linux-hardening, linux-kernel, Qian Cai
__compiletime_strlen macro expansion will shadow p_size and p_len local
variables. Just rename those in __compiletime_strlen.
Signed-off-by: Qian Cai <quic_qiancai@quicinc.com>
---
include/linux/fortify-string.h | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/include/linux/fortify-string.h b/include/linux/fortify-string.h
index fdb0a74c9ca2..a6cd6815f249 100644
--- a/include/linux/fortify-string.h
+++ b/include/linux/fortify-string.h
@@ -10,18 +10,18 @@ void __read_overflow(void) __compiletime_error("detected read beyond size of obj
void __read_overflow2(void) __compiletime_error("detected read beyond size of object (2nd parameter)");
void __write_overflow(void) __compiletime_error("detected write beyond size of object (1st parameter)");
-#define __compiletime_strlen(p) \
-({ \
- unsigned char *__p = (unsigned char *)(p); \
- size_t ret = (size_t)-1; \
- size_t p_size = __builtin_object_size(p, 1); \
- if (p_size != (size_t)-1) { \
- size_t p_len = p_size - 1; \
- if (__builtin_constant_p(__p[p_len]) && \
- __p[p_len] == '\0') \
- ret = __builtin_strlen(__p); \
- } \
- ret; \
+#define __compiletime_strlen(p) \
+({ \
+ unsigned char *__p = (unsigned char *)(p); \
+ size_t __ret = (size_t)-1; \
+ size_t __p_size = __builtin_object_size(p, 1); \
+ if (__p_size != (size_t)-1) { \
+ size_t __p_len = __p_size - 1; \
+ if (__builtin_constant_p(__p[__p_len]) && \
+ __p[__p_len] == '\0') \
+ __ret = __builtin_strlen(__p); \
+ } \
+ __ret; \
})
#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)
--
2.30.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] fortify: Avoid shadowing previous locals
2021-10-25 21:05 [PATCH v2] fortify: Avoid shadowing previous locals Qian Cai
@ 2021-10-25 22:42 ` Kees Cook
0 siblings, 0 replies; 2+ messages in thread
From: Kees Cook @ 2021-10-25 22:42 UTC (permalink / raw)
To: Qian Cai; +Cc: Kees Cook, linux-kernel, linux-hardening
On Mon, 25 Oct 2021 17:05:28 -0400, Qian Cai wrote:
> __compiletime_strlen macro expansion will shadow p_size and p_len local
> variables. Just rename those in __compiletime_strlen.
I've adjusted the changelog a bit to have more detail.
Applied to for-next/overflow, thanks!
[1/1] fortify: Avoid shadowing previous locals
https://git.kernel.org/kees/c/95cadae320be
--
Kees Cook
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-10-25 22:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-25 21:05 [PATCH v2] fortify: Avoid shadowing previous locals Qian Cai
2021-10-25 22:42 ` Kees Cook
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).