[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20190724171648.GW19023@42.do-not-panic.com>
Date: Wed, 24 Jul 2019 17:16:48 +0000
From: Luis Chamberlain <mcgrof@...nel.org>
To: Alexandre Ghiti <alex@...ti.fr>
Cc: Andrew Morton <akpm@...ux-foundation.org>,
Christoph Hellwig <hch@....de>,
Russell King <linux@...linux.org.uk>,
Catalin Marinas <catalin.marinas@....com>,
Will Deacon <will.deacon@....com>,
Ralf Baechle <ralf@...ux-mips.org>,
Paul Burton <paul.burton@...s.com>,
James Hogan <jhogan@...nel.org>,
Palmer Dabbelt <palmer@...ive.com>,
Albert Ou <aou@...s.berkeley.edu>,
Alexander Viro <viro@...iv.linux.org.uk>,
Kees Cook <keescook@...omium.org>,
linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-mips@...r.kernel.org, linux-riscv@...ts.infradead.org,
linux-fsdevel@...r.kernel.org, linux-mm@...ck.org
Subject: Re: [PATCH REBASE v4 12/14] mips: Replace arch specific way to
determine 32bit task with generic version
On Wed, Jul 24, 2019 at 01:58:48AM -0400, Alexandre Ghiti wrote:
> Mips uses TASK_IS_32BIT_ADDR to determine if a task is 32bit, but
> this define is mips specific and other arches do not have it: instead,
> use !IS_ENABLED(CONFIG_64BIT) || is_compat_task() condition.
>
> Signed-off-by: Alexandre Ghiti <alex@...ti.fr>
> Reviewed-by: Kees Cook <keescook@...omium.org>
> ---
> arch/mips/mm/mmap.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
> index faa5aa615389..d4eafbb82789 100644
> --- a/arch/mips/mm/mmap.c
> +++ b/arch/mips/mm/mmap.c
> @@ -17,6 +17,7 @@
> #include <linux/sched/signal.h>
> #include <linux/sched/mm.h>
> #include <linux/sizes.h>
> +#include <linux/compat.h>
>
> unsigned long shm_align_mask = PAGE_SIZE - 1; /* Sane caches */
> EXPORT_SYMBOL(shm_align_mask);
> @@ -191,7 +192,7 @@ static inline unsigned long brk_rnd(void)
>
> rnd = rnd << PAGE_SHIFT;
> /* 32MB for 32bit, 1GB for 64bit */
> - if (TASK_IS_32BIT_ADDR)
> + if (!IS_ENABLED(CONFIG_64BIT) || is_compat_task())
> rnd = rnd & SZ_32M;
> else
> rnd = rnd & SZ_1G;
> --
Since there are at least two users why not just create an inline for
this which describes what we are looking for and remove the comments?
Luis
Powered by blists - more mailing lists