From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D213C388F2 for ; Sun, 8 Nov 2020 05:17:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CA66A22255 for ; Sun, 8 Nov 2020 05:17:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=arista.com header.i=@arista.com header.b="DyO5TdvX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728210AbgKHFRk (ORCPT ); Sun, 8 Nov 2020 00:17:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726144AbgKHFRi (ORCPT ); Sun, 8 Nov 2020 00:17:38 -0500 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7289BC0613CF for ; Sat, 7 Nov 2020 21:17:38 -0800 (PST) Received: by mail-wm1-x343.google.com with SMTP id 10so4327158wml.2 for ; Sat, 07 Nov 2020 21:17:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=googlenew; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vUd6dOqdaOWw315aR0DaswcpfTZy/jRQxum4V+Ace34=; b=DyO5TdvXGIW3umY4xtrgWizP3A2aAZwUGxv6+dU2uEDkKIX+BLZY8pYQV9lKibvunC 3+ZKvwDHe3rJ6NvGf9opUeFCT+9ksalRilRutQfSdICVTFWalVdvpYzf/+M3Ae6kRoXt Swx5wzJTGvr4OQ/MMjguWf0ewSBxguOP8ObI1V8QWW/+q4PKLkrnzjgLKds0hwWyAQNr cvtGqgjSNNhfoKnI8/4KqCi2PfM/0O3FHJUDBq//78oWZ4So2wKE1/ZHAwl09tLhTcuY xxlzS6fYqPeCajHUw72d2CfLoHNXcsNAnp2/y7DJ1i4uGIJGrXzwjzUU2uPLSC0tbQPA 5p1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vUd6dOqdaOWw315aR0DaswcpfTZy/jRQxum4V+Ace34=; b=Vq3yv0SQHR4S+pExPyCTnbpMXuBPHnbnpXndtGVHUXybtDN/n/CdB6fRCrUOhV7Z3T rWjTYbMPc7XEvT35VoukDplFm6USbrhU0FuZ7JvYJTUOu+3geRtqiGEIf4JGzO4Q0bC6 PuRlLbaNRjlCGemu1310JQLgq155FxmNMHa+TLdg+LFtM1g+WkiRvVcHJpp6BnebtG1g TtS1UmhuhksbbBrYCfvwAG238F6PzCt8vT177CcXNzpnrvI1tsIbEfwxcG9EKE4IkzIH 1kc1OTVBbgDzyLbYt87mRWoj61HU5hG+CHQ97QBRkjWglA3ZByuolWM24oVfs1suJA/2 EGdg== X-Gm-Message-State: AOAM533O4upUr59cc9vDp9AVBzWIktQl7aKQa2MBosx3MT+oNHGV56x/ 8exu3gul4cAArBoiphO8AAYXJSMauIk4249t X-Google-Smtp-Source: ABdhPJyf40y2NIrNfMJo2pbmAsRC6pzfkHEuGCTePTp8z+b9n7j04SFKCAxCLgCv+7nw1EJSl3Vs7g== X-Received: by 2002:a1c:b104:: with SMTP id a4mr7553746wmf.138.1604812656972; Sat, 07 Nov 2020 21:17:36 -0800 (PST) Received: from localhost.localdomain ([2a02:8084:e84:2480:228:f8ff:fe6f:83a8]) by smtp.gmail.com with ESMTPSA id r10sm8378462wmg.16.2020.11.07.21.17.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Nov 2020 21:17:36 -0800 (PST) From: Dmitry Safonov To: linux-kernel@vger.kernel.org Cc: Dmitry Safonov <0x7f454c46@gmail.com>, Dmitry Safonov , Alexander Viro , Andrew Morton , Andy Lutomirski , Arnd Bergmann , Borislav Petkov , Catalin Marinas , Christophe Leroy , Guo Ren , "H. Peter Anvin" , Ingo Molnar , Oleg Nesterov , Russell King , Thomas Bogendoerfer , Thomas Gleixner , Vincenzo Frascino , Will Deacon , x86@kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 03/19] arm64: Use in_compat_task() in arch_setup_additional_pages() Date: Sun, 8 Nov 2020 05:17:13 +0000 Message-Id: <20201108051730.2042693-4-dima@arista.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201108051730.2042693-1-dima@arista.com> References: <20201108051730.2042693-1-dima@arista.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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.28.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 430B0C4741F for ; Sun, 8 Nov 2020 05:19:33 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DFA8620897 for ; Sun, 8 Nov 2020 05:19:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="nW74n2it"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=arista.com header.i=@arista.com header.b="DyO5TdvX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DFA8620897 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=arista.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=bXjXMzU2qUg/4MuNn0hGOvj42vQ1jihf9GO0aQNQeLY=; b=nW74n2it2u+KAEa7uZU1twSTY uhf3t2NMWovX4uBTldjG04uphCK8MvcjgiXxB4quSh5lb1UnWubQdLnTQGkoGRMlARJ9r5bcLg7Ky yxiJ9TNONfB2TGw9NAOkYzoNRSy3vIQD/XzANhO7vIT3prNrl/1lEIsBxd8NcHbRooW0+Z2CeDhkE vpSb81YMb4VUKYDuujeELECuYNCpqEXho4teTEkjU3KRm/bwTvFwQVa1vEp7w7wHWDop6I/nKNzsM gG86leoS+SypUbPDQVOWllO9QuUA5HCMklFtrXvgEtXDYlEFRimfjSZH7yH9q4Xiw5FphHNom5n8C QNfPxu/1Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kbd5F-0001oO-2f; Sun, 08 Nov 2020 05:17:45 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kbd58-0001lu-VB for linux-arm-kernel@lists.infradead.org; Sun, 08 Nov 2020 05:17:40 +0000 Received: by mail-wm1-x341.google.com with SMTP id d142so5090060wmd.4 for ; Sat, 07 Nov 2020 21:17:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=googlenew; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vUd6dOqdaOWw315aR0DaswcpfTZy/jRQxum4V+Ace34=; b=DyO5TdvXGIW3umY4xtrgWizP3A2aAZwUGxv6+dU2uEDkKIX+BLZY8pYQV9lKibvunC 3+ZKvwDHe3rJ6NvGf9opUeFCT+9ksalRilRutQfSdICVTFWalVdvpYzf/+M3Ae6kRoXt Swx5wzJTGvr4OQ/MMjguWf0ewSBxguOP8ObI1V8QWW/+q4PKLkrnzjgLKds0hwWyAQNr cvtGqgjSNNhfoKnI8/4KqCi2PfM/0O3FHJUDBq//78oWZ4So2wKE1/ZHAwl09tLhTcuY xxlzS6fYqPeCajHUw72d2CfLoHNXcsNAnp2/y7DJ1i4uGIJGrXzwjzUU2uPLSC0tbQPA 5p1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vUd6dOqdaOWw315aR0DaswcpfTZy/jRQxum4V+Ace34=; b=VOtTTnVvU6jnu48DwdiICbHBhrLv7FVry6TP2Y3Yhj+E3tjnnAh1Pa39JTJQLnr2h1 b1Rfk31BUUG2jrz8UsbGiZDGwvOUVkEvUUeDW8bbGtm6NGkAIz4O17Qc3Q5wDOcKXXjn AxQDvfnMse/izE59pOPFBbme6tARACM17nSm/oe6aVRIU8TP9rY0EOZ1pV16zYrGzLtm u4CWB+VDLUNXGLwgBufASQKiXg069Ifhw+YpAJnWx9wlaRQLD2hQ3idohpfGIcN3wJQ7 UrF1NTM9XjwpicBqxm2vBYhDwVHRtDjZg8anB15QnqDmXn3s2OFYzd92M2OD6VBePPba R5aQ== X-Gm-Message-State: AOAM531fQjZ3K1TjB2IZ6WcdVWBzJ5eXAYsmZ5L5z/qWceaexiyEQ5g9 pYwLFuZQsRnYARbwzZhsNDTTqg== X-Google-Smtp-Source: ABdhPJyf40y2NIrNfMJo2pbmAsRC6pzfkHEuGCTePTp8z+b9n7j04SFKCAxCLgCv+7nw1EJSl3Vs7g== X-Received: by 2002:a1c:b104:: with SMTP id a4mr7553746wmf.138.1604812656972; Sat, 07 Nov 2020 21:17:36 -0800 (PST) Received: from localhost.localdomain ([2a02:8084:e84:2480:228:f8ff:fe6f:83a8]) by smtp.gmail.com with ESMTPSA id r10sm8378462wmg.16.2020.11.07.21.17.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Nov 2020 21:17:36 -0800 (PST) From: Dmitry Safonov To: linux-kernel@vger.kernel.org Subject: [PATCH 03/19] arm64: Use in_compat_task() in arch_setup_additional_pages() Date: Sun, 8 Nov 2020 05:17:13 +0000 Message-Id: <20201108051730.2042693-4-dima@arista.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201108051730.2042693-1-dima@arista.com> References: <20201108051730.2042693-1-dima@arista.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201108_001739_146300_3F14273A X-CRM114-Status: GOOD ( 19.94 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Bogendoerfer , Arnd Bergmann , Dmitry Safonov , Catalin Marinas , x86@kernel.org, Dmitry Safonov <0x7f454c46@gmail.com>, Oleg Nesterov , Christophe Leroy , Russell King , Ingo Molnar , Borislav Petkov , Alexander Viro , Andy Lutomirski , "H. Peter Anvin" , Guo Ren , Andrew Morton , Vincenzo Frascino , Will Deacon , Thomas Gleixner , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- 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.28.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel