From: Dmitry Safonov <dima@arista.com>
To: linux-kernel@vger.kernel.org
Cc: Dmitry Safonov <0x7f454c46@gmail.com>,
Dmitry Safonov <dima@arista.com>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Andrew Morton <akpm@linux-foundation.org>,
Andy Lutomirski <luto@kernel.org>, Arnd Bergmann <arnd@arndb.de>,
Borislav Petkov <bp@alien8.de>,
Catalin Marinas <catalin.marinas@arm.com>,
Christophe Leroy <christophe.leroy@csgroup.eu>,
Guo Ren <guoren@kernel.org>, "H. Peter Anvin" <hpa@zytor.com>,
Ingo Molnar <mingo@redhat.com>, Oleg Nesterov <oleg@redhat.com>,
Russell King <linux@armlinux.org.uk>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
Thomas Gleixner <tglx@linutronix.de>,
Vincenzo Frascino <vincenzo.frascino@arm.com>,
Will Deacon <will@kernel.org>,
x86@kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 03/19] arm64: Use in_compat_task() in arch_setup_additional_pages()
Date: Tue, 24 Nov 2020 00:29:16 +0000 [thread overview]
Message-ID: <20201124002932.1220517-4-dima@arista.com> (raw)
In-Reply-To: <20201124002932.1220517-1-dima@arista.com>
Instead of providing compat_arch_setup_additional_pages(), check if the
task is compatible from personality, which is set earlier in
load_elf_binary(). That will align code with powerpc and sparc, also
it'll allow to completely remove compat_arch_setyp_addtional_pages()
macro after doing the same for x86, simiplifying the binfmt code
in the end.
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
arch/arm64/include/asm/elf.h | 5 -----
arch/arm64/kernel/vdso.c | 21 ++++++++++-----------
2 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
index d1073ffa7f24..a81953bcc1cf 100644
--- a/arch/arm64/include/asm/elf.h
+++ b/arch/arm64/include/asm/elf.h
@@ -237,11 +237,6 @@ do { \
#else
#define COMPAT_ARCH_DLINFO
#endif
-struct linux_binprm;
-extern int aarch32_setup_additional_pages(struct linux_binprm *bprm,
- int uses_interp);
-#define compat_arch_setup_additional_pages \
- aarch32_setup_additional_pages
#endif /* CONFIG_COMPAT */
diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c
index cee5d04ea9ad..1b710deb84d6 100644
--- a/arch/arm64/kernel/vdso.c
+++ b/arch/arm64/kernel/vdso.c
@@ -401,29 +401,24 @@ static int aarch32_sigreturn_setup(struct mm_struct *mm)
return PTR_ERR_OR_ZERO(ret);
}
-int aarch32_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
+static int aarch32_setup_additional_pages(struct linux_binprm *bprm,
+ int uses_interp)
{
struct mm_struct *mm = current->mm;
int ret;
- if (mmap_write_lock_killable(mm))
- return -EINTR;
-
ret = aarch32_kuser_helpers_setup(mm);
if (ret)
- goto out;
+ return ret;
if (IS_ENABLED(CONFIG_COMPAT_VDSO)) {
ret = __setup_additional_pages(VDSO_ABI_AA32, mm, bprm,
uses_interp);
if (ret)
- goto out;
+ return ret;
}
- ret = aarch32_sigreturn_setup(mm);
-out:
- mmap_write_unlock(mm);
- return ret;
+ return aarch32_sigreturn_setup(mm);
}
#endif /* CONFIG_COMPAT */
@@ -460,7 +455,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
if (mmap_write_lock_killable(mm))
return -EINTR;
- ret = __setup_additional_pages(VDSO_ABI_AA64, mm, bprm, uses_interp);
+ if (is_compat_task())
+ ret = aarch32_setup_additional_pages(bprm, uses_interp);
+ else
+ ret = __setup_additional_pages(VDSO_ABI_AA64, mm, bprm, uses_interp);
+
mmap_write_unlock(mm);
return ret;
--
2.29.2
next prev parent reply other threads:[~2020-11-24 0:29 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-24 0:29 [PATCH v2 00/19] Add generic vdso_base tracking Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 01/19] x86/elf: Check in_x32_syscall() in compat_arch_setup_additional_pages() Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 02/19] elf: Move arch_setup_additional_pages() to generic elf.h Dmitry Safonov
2020-11-24 6:12 ` Christophe Leroy
2020-11-26 19:45 ` Dmitry Safonov
2020-11-24 0:29 ` Dmitry Safonov [this message]
2020-11-24 0:29 ` [PATCH v2 04/19] x86: Remove compat_arch_setup_additional_pages() Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 05/19] elf: " Dmitry Safonov
2020-11-24 6:13 ` Christophe Leroy
2020-11-26 19:45 ` Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 06/19] elf/vdso: Reuse arch_setup_additional_pages() parameters Dmitry Safonov
2020-11-24 6:18 ` Christophe Leroy
2020-11-26 19:46 ` Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 07/19] elf: Use sysinfo_ehdr in ARCH_DLINFO() Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 08/19] arm/vdso: Remove vdso pointer from mm->context Dmitry Safonov
2020-11-24 6:22 ` Christophe Leroy
2020-11-26 19:48 ` Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 09/19] s390/vdso: Remove vdso_base " Dmitry Safonov
2020-11-24 6:22 ` Christophe Leroy
2020-11-24 0:29 ` [PATCH v2 10/19] sparc/vdso: Remove vdso " Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 11/19] mm/mmap: Make vm_special_mapping::mremap return void Dmitry Safonov
2020-11-24 6:25 ` Christophe Leroy
2020-11-24 0:29 ` [PATCH v2 12/19] x86/signal: Land on &frame->retcode when vdso isn't mapped Dmitry Safonov
2020-11-24 23:08 ` Andy Lutomirski
2020-11-24 0:29 ` [PATCH v2 13/19] x86/signal: Check if vdso_image_32 is mapped before trying to land on it Dmitry Safonov
2020-11-24 23:43 ` Andy Lutomirski
2020-11-26 20:00 ` Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 14/19] mm: Add vdso_base in mm_struct Dmitry Safonov
2020-11-24 23:37 ` Andy Lutomirski
2020-11-24 0:29 ` [PATCH v2 15/19] x86/vdso: Migrate to generic vdso_base Dmitry Safonov
2020-11-24 2:51 ` kernel test robot
2020-11-24 0:29 ` [PATCH v2 16/19] arm/vdso: " Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 17/19] arm64/vdso: Migrate compat signals " Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 18/19] arm64/vdso: Migrate native " Dmitry Safonov
2020-11-24 0:29 ` [PATCH v2 19/19] mips/vdso: Migrate " Dmitry Safonov
2020-11-24 6:53 ` [PATCH v2 00/19] Add generic vdso_base tracking Christophe Leroy
2020-11-26 20:41 ` Dmitry Safonov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201124002932.1220517-4-dima@arista.com \
--to=dima@arista.com \
--cc=0x7f454c46@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=christophe.leroy@csgroup.eu \
--cc=guoren@kernel.org \
--cc=hpa@zytor.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=oleg@redhat.com \
--cc=tglx@linutronix.de \
--cc=tsbogend@alpha.franken.de \
--cc=vincenzo.frascino@arm.com \
--cc=viro@zeniv.linux.org.uk \
--cc=will@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).