Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
References: <e24752dd9ea739c86bca9cfe79f7f29b0afa0182.1579005255.git.michal.simek@xilinx.com>
In-Reply-To: <e24752dd9ea739c86bca9cfe79f7f29b0afa0182.1579005255.git.michal.simek@xilinx.com>
From:   Michal Simek <monstr@monstr.eu>
Date:   Tue, 4 Feb 2020 11:34:10 +0100
Message-ID: <CAHTX3dJa09azvz=J4FbMAspt1x2wTaG3SWGWAzsDtOiEm7x5+Q@mail.gmail.com>
Subject: Re: [PATCH] microblaze: Prevent the overflow of the start
To:     LKML <linux-kernel@vger.kernel.org>,
        Michal Simek <monstr@monstr.eu>, git <git@xilinx.com>
Cc:     Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

=C3=BAt 14. 1. 2020 v 13:34 odes=C3=ADlatel Michal Simek <michal.simek@xili=
nx.com> napsal:
>
> From: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
>
> In case the start + cache size is more than the max int the
> start overflows.
> Prevent the same.
>
> Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
>
>  arch/microblaze/kernel/cpu/cache.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/microblaze/kernel/cpu/cache.c b/arch/microblaze/kernel/=
cpu/cache.c
> index 0bde47e4fa69..dcba53803fa5 100644
> --- a/arch/microblaze/kernel/cpu/cache.c
> +++ b/arch/microblaze/kernel/cpu/cache.c
> @@ -92,7 +92,8 @@ static inline void __disable_dcache_nomsr(void)
>  #define CACHE_LOOP_LIMITS(start, end, cache_line_length, cache_size)   \
>  do {                                                                   \
>         int align =3D ~(cache_line_length - 1);                          =
 \
> -       end =3D min(start + cache_size, end);                            =
 \
> +       if (start <  UINT_MAX - cache_size)                             \
> +               end =3D min(start + cache_size, end);                    =
 \
>         start &=3D align;                                                =
 \
>  } while (0)
>
> --
> 2.24.0
>

Applied.
M

--=20
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs