Patch "bus: mhi: core: Use correctly sized arguments for bit field" has been added to the 5.15-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    bus: mhi: core: Use correctly sized arguments for bit field

to the 5.15-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     bus-mhi-core-use-correctly-sized-arguments-for-bit-f.patch
and it can be found in the queue-5.15 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit b919a1877dfb655cdaa1c2615ef7495b3c299833
Author: Kees Cook <keescook@xxxxxxxxxxxx>
Date:   Thu Dec 16 13:42:26 2021 +0530

    bus: mhi: core: Use correctly sized arguments for bit field
    
    [ Upstream commit 5a717e93239fc373a314e03e45c43b62ebea1b26 ]
    
    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)
          |                                 ~~~~~~~~~~~~~~~~~~^~~~~
    
    Link: https://lore.kernel.org/r/20211215232446.2069794-1-keescook@xxxxxxxxxxxx
    [mani: changed the variable name "bits" to "pm_state"]
    Reviewed-by: Manivannan Sadhasivam <mani@xxxxxxxxxx>
    Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
    Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@xxxxxxxxxx>
    Link: https://lore.kernel.org/r/20211216081227.237749-10-manivannan.sadhasivam@xxxxxxxxxx
    Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/bus/mhi/core/init.c b/drivers/bus/mhi/core/init.c
index 4183945fc2c4..c0187367ae75 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 pm_state = state;
+	int index = find_last_bit(&pm_state, 32);
 
 	if (index >= ARRAY_SIZE(mhi_pm_state_str))
 		return "Invalid State";