* [PATCH] bus: mhi: core: Use correctly sized arguments for bit field
@ 2021-12-15 23:24 Kees Cook
2021-12-16 5:25 ` Manivannan Sadhasivam
0 siblings, 1 reply; 2+ messages in thread
From: Kees Cook @ 2021-12-15 23:24 UTC (permalink / raw)
To: Manivannan Sadhasivam
Cc: Kees Cook, Hemant Kumar, Bhaumik Bhatt, Greg Kroah-Hartman,
Loic Poulain, Yury Norov, Carl Huang, Carl Yin, linux-kernel,
mhi, linux-arm-msm, linux-hardening
The find.h APIs are designed to be used only on unsigned long arguments.
This can technically result in a over-read, but it is harmless in this
case. Regardless, fix it to avoid the warning seen under -Warray-bounds,
which we'd like to enable globally:
In file included from ./include/linux/bitmap.h:9,
from ./include/linux/cpumask.h:12,
from ./arch/x86/include/asm/cpumask.h:5,
from ./arch/x86/include/asm/msr.h:11,
from ./arch/x86/include/asm/processor.h:22,
from ./arch/x86/include/asm/cpufeature.h:5,
from ./arch/x86/include/asm/thread_info.h:53,
from ./include/linux/thread_info.h:60,
from ./arch/x86/include/asm/preempt.h:7,
from ./include/linux/preempt.h:78,
from ./include/linux/spinlock.h:55,
from ./include/linux/wait.h:9,
from ./include/linux/wait_bit.h:8,
from ./include/linux/fs.h:6,
from ./include/linux/debugfs.h:15,
from drivers/bus/mhi/core/init.c:7:
drivers/bus/mhi/core/init.c: In function 'to_mhi_pm_state_str':
./include/linux/find.h:187:37: warning: array subscript 'long unsigned int[0]' is partly outside array bounds of 'enum mhi_pm_state[1]' [-Warray-bounds]
187 | unsigned long val = *addr & GENMASK(size - 1, 0);
| ^~~~~
drivers/bus/mhi/core/init.c:80:51: note: while referencing 'state'
80 | const char *to_mhi_pm_state_str(enum mhi_pm_state state)
| ~~~~~~~~~~~~~~~~~~^~~~~
Signed-off-by: Kees Cook <keescook@chromium.org>
---
drivers/bus/mhi/core/init.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/bus/mhi/core/init.c b/drivers/bus/mhi/core/init.c
index f1ec34417592..b91f75fff962 100644
--- a/drivers/bus/mhi/core/init.c
+++ b/drivers/bus/mhi/core/init.c
@@ -79,7 +79,8 @@ static const char * const mhi_pm_state_str[] = {
const char *to_mhi_pm_state_str(enum mhi_pm_state state)
{
- int index = find_last_bit((unsigned long *)&state, 32);
+ unsigned long bits = state;
+ int index = find_last_bit(&bits, 32);
if (index >= ARRAY_SIZE(mhi_pm_state_str))
return "Invalid State";
--
2.30.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] bus: mhi: core: Use correctly sized arguments for bit field
2021-12-15 23:24 [PATCH] bus: mhi: core: Use correctly sized arguments for bit field Kees Cook
@ 2021-12-16 5:25 ` Manivannan Sadhasivam
0 siblings, 0 replies; 2+ messages in thread
From: Manivannan Sadhasivam @ 2021-12-16 5:25 UTC (permalink / raw)
To: Kees Cook
Cc: Hemant Kumar, Bhaumik Bhatt, Greg Kroah-Hartman, Loic Poulain,
Yury Norov, Carl Huang, Carl Yin, linux-kernel, mhi,
linux-arm-msm, linux-hardening
On Wed, Dec 15, 2021 at 03:24:46PM -0800, Kees Cook wrote:
> The find.h APIs are designed to be used only on unsigned long arguments.
> This can technically result in a over-read, but it is harmless in this
> case. Regardless, fix it to avoid the warning seen under -Warray-bounds,
> which we'd like to enable globally:
>
> In file included from ./include/linux/bitmap.h:9,
> from ./include/linux/cpumask.h:12,
> from ./arch/x86/include/asm/cpumask.h:5,
> from ./arch/x86/include/asm/msr.h:11,
> from ./arch/x86/include/asm/processor.h:22,
> from ./arch/x86/include/asm/cpufeature.h:5,
> from ./arch/x86/include/asm/thread_info.h:53,
> from ./include/linux/thread_info.h:60,
> from ./arch/x86/include/asm/preempt.h:7,
> from ./include/linux/preempt.h:78,
> from ./include/linux/spinlock.h:55,
> from ./include/linux/wait.h:9,
> from ./include/linux/wait_bit.h:8,
> from ./include/linux/fs.h:6,
> from ./include/linux/debugfs.h:15,
> from drivers/bus/mhi/core/init.c:7:
> drivers/bus/mhi/core/init.c: In function 'to_mhi_pm_state_str':
> ./include/linux/find.h:187:37: warning: array subscript 'long unsigned int[0]' is partly outside array bounds of 'enum mhi_pm_state[1]' [-Warray-bounds]
> 187 | unsigned long val = *addr & GENMASK(size - 1, 0);
> | ^~~~~
> drivers/bus/mhi/core/init.c:80:51: note: while referencing 'state'
> 80 | const char *to_mhi_pm_state_str(enum mhi_pm_state state)
> | ~~~~~~~~~~~~~~~~~~^~~~~
>
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>
A small nit pick below but I'll fix it up while applying.
Thanks,
Mani
> ---
> drivers/bus/mhi/core/init.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/bus/mhi/core/init.c b/drivers/bus/mhi/core/init.c
> index f1ec34417592..b91f75fff962 100644
> --- a/drivers/bus/mhi/core/init.c
> +++ b/drivers/bus/mhi/core/init.c
> @@ -79,7 +79,8 @@ static const char * const mhi_pm_state_str[] = {
>
> const char *to_mhi_pm_state_str(enum mhi_pm_state state)
> {
> - int index = find_last_bit((unsigned long *)&state, 32);
> + unsigned long bits = state;
Variable "bits" could be changed to "pm_state".
> + int index = find_last_bit(&bits, 32);
>
> if (index >= ARRAY_SIZE(mhi_pm_state_str))
> return "Invalid State";
> --
> 2.30.2
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-12-16 5:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-15 23:24 [PATCH] bus: mhi: core: Use correctly sized arguments for bit field Kees Cook
2021-12-16 5:25 ` Manivannan Sadhasivam
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.