queue-6.6/riscv-fix-spurious-errors-from-__get-put_kernel_nofault.patch

   1 From d080a08b06b6266cc3e0e86c5acfd80db937cb6b Mon Sep 17 00:00:00 2001
   2 From: Samuel Holland <samuel.holland@sifive.com>
   3 Date: Mon, 11 Mar 2024 19:19:13 -0700
   4 Subject: riscv: Fix spurious errors from __get/put_kernel_nofault
   5
   6 From: Samuel Holland <samuel.holland@sifive.com>
   7
   8 commit d080a08b06b6266cc3e0e86c5acfd80db937cb6b upstream.
   9
  10 These macros did not initialize __kr_err, so they could fail even if
  11 the access did not fault.
  12
  13 Cc: stable@vger.kernel.org
  14 Fixes: d464118cdc41 ("riscv: implement __get_kernel_nofault and __put_user_nofault")
  15 Signed-off-by: Samuel Holland <samuel.holland@sifive.com>
  16 Reviewed-by: Alexandre Ghiti <alexghiti@rivosinc.com>
  17 Reviewed-by: Charlie Jenkins <charlie@rivosinc.com>
  18 Link: https://lore.kernel.org/r/20240312022030.320789-1-samuel.holland@sifive.com
  19 Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
  20 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  21 ---
  22  arch/riscv/include/asm/uaccess.h |    4 ++--
  23  1 file changed, 2 insertions(+), 2 deletions(-)
  24
  25 --- a/arch/riscv/include/asm/uaccess.h
  26 +++ b/arch/riscv/include/asm/uaccess.h
  27 @@ -319,7 +319,7 @@ unsigned long __must_check clear_user(vo
  28
  29  #define __get_kernel_nofault(dst, src, type, err_label)                        \
  30  do {                                                                   \
  31 -       long __kr_err;                                                  \
  32 +       long __kr_err = 0;                                              \
  33                                                                         \
  34         __get_user_nocheck(*((type *)(dst)), (type *)(src), __kr_err);  \
  35         if (unlikely(__kr_err))                                         \
  36 @@ -328,7 +328,7 @@ do {                                                                        \
  37
  38  #define __put_kernel_nofault(dst, src, type, err_label)                        \
  39  do {                                                                   \
  40 -       long __kr_err;                                                  \
  41 +       long __kr_err = 0;                                              \
  42                                                                         \
  43         __put_user_nocheck(*((type *)(src)), (type *)(dst), __kr_err);  \
  44         if (unlikely(__kr_err))                                         \