fortify: strlen: Avoid shadowing previous locals
authorQian Cai <quic_qiancai@quicinc.com>
Mon, 25 Oct 2021 21:05:28 +0000 (17:05 -0400)
committerKees Cook <keescook@chromium.org>
Mon, 25 Oct 2021 22:34:41 +0000 (15:34 -0700)
commit95cadae320be46583078690ac89ffe63c95cc9d2
treef2ba7d7a5a2f2689e1df7ee942feacec54162c9e
parent9a48e7564ac83fb0f1d5b0eac5fe8a7af62da398
fortify: strlen: Avoid shadowing previous locals

The __compiletime_strlen() macro expansion will shadow p_size and p_len
local variables. No callers currently use any of the shadowed names
for their "p" variable, so there are no code generation problems.

Add "__" prefixes to variable definitions __compiletime_strlen() to
avoid new W=2 warnings:

./include/linux/fortify-string.h: In function 'strnlen':
./include/linux/fortify-string.h:17:9: warning: declaration of 'p_size' shadows a previous local [-Wshadow]
   17 |  size_t p_size = __builtin_object_size(p, 1); \
      |         ^~~~~~
./include/linux/fortify-string.h:77:17: note: in expansion of macro '__compiletime_strlen'
   77 |  size_t p_len = __compiletime_strlen(p);
      |                 ^~~~~~~~~~~~~~~~~~~~
./include/linux/fortify-string.h:76:9: note: shadowed declaration is here
   76 |  size_t p_size = __builtin_object_size(p, 1);
      |         ^~~~~~

Signed-off-by: Qian Cai <quic_qiancai@quicinc.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20211025210528.261643-1-quic_qiancai@quicinc.com
include/linux/fortify-string.h