| From 481c945980499a54e0496794fdf738f9099bbdb9 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 9 Oct 2019 17:10:56 +0200 |
| Subject: MIPS: fw: sni: Fix out of bounds init of o32 stack |
| |
| From: Thomas Bogendoerfer <tbogendoerfer@suse.de> |
| |
| [ Upstream commit efcb529694c3b707dc0471b312944337ba16e4dd ] |
| |
| Use ARRAY_SIZE to caluculate the top of the o32 stack. |
| |
| Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de> |
| Signed-off-by: Paul Burton <paul.burton@mips.com> |
| Cc: Ralf Baechle <ralf@linux-mips.org> |
| Cc: James Hogan <jhogan@kernel.org> |
| Cc: linux-mips@vger.kernel.org |
| Cc: linux-kernel@vger.kernel.org |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/mips/fw/sni/sniprom.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/arch/mips/fw/sni/sniprom.c b/arch/mips/fw/sni/sniprom.c |
| index 6aa264b9856ac..7c6151d412bd7 100644 |
| --- a/arch/mips/fw/sni/sniprom.c |
| +++ b/arch/mips/fw/sni/sniprom.c |
| @@ -42,7 +42,7 @@ |
| |
| /* O32 stack has to be 8-byte aligned. */ |
| static u64 o32_stk[4096]; |
| -#define O32_STK &o32_stk[sizeof(o32_stk)] |
| +#define O32_STK (&o32_stk[ARRAY_SIZE(o32_stk)]) |
| |
| #define __PROM_O32(fun, arg) fun arg __asm__(#fun); \ |
| __asm__(#fun " = call_o32") |
| -- |
| 2.20.1 |
| |