From patchwork Sat Apr 9 22:17:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 559479 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CAA2BC433EF for ; Sat, 9 Apr 2022 22:17:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232530AbiDIWTf (ORCPT ); Sat, 9 Apr 2022 18:19:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232571AbiDIWTe (ORCPT ); Sat, 9 Apr 2022 18:19:34 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B745C36B59; Sat, 9 Apr 2022 15:17:23 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 6A075B8077B; Sat, 9 Apr 2022 22:17:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2908CC385A0; Sat, 9 Apr 2022 22:17:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1649542641; bh=pvCEBaBJUMTRj+swKZkxhmRi+c2W+8U2Q9YZOdZD34c=; h=Date:To:From:Subject:From; b=q5I5Fc5c1dFfDGrGhdk9ZPNrlswHSTy6cKgTs8OarKRFJx9qSMrn3smjYE0BmrpWt F0Cp/u9eDcG2FDYydVTNJ90ri4MK2AZgx+CPWxa6oSQRyoWqnrkqEoJDkg7y6slN0S lPwDVzi/uxc6e0MvwE+KAR3hmkiPwegTPylqQ+5A= Date: Sat, 09 Apr 2022 15:17:20 -0700 To: mm-commits@vger.kernel.org, viro@zeniv.linux.org.uk, surenb@google.com, stable@vger.kernel.org, sspatil@google.com, songliubraving@fb.com, shuah@kernel.org, rppt@kernel.org, rientjes@google.com, regressions@leemhuis.info, ndesaulniers@google.com, mike.kravetz@oracle.com, maskray@google.com, kirill.shutemov@linux.intel.com, irogers@google.com, hughd@google.com, hjl.tools@gmail.com, ckennelly@google.com, adobriyan@gmail.com, akpm@linux-foundation.org, akpm@linux-foundation.org From: Andrew Morton Subject: + revert-fs-binfmt_elf-fix-pt_load-p_align-values-for-loaders.patch added to -mm tree Message-Id: <20220409221721.2908CC385A0@smtp.kernel.org> Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch titled Subject: revert "fs/binfmt_elf: fix PT_LOAD p_align values for loaders" has been added to the -mm tree. Its filename is revert-fs-binfmt_elf-fix-pt_load-p_align-values-for-loaders.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/revert-fs-binfmt_elf-fix-pt_load-p_align-values-for-loaders.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/revert-fs-binfmt_elf-fix-pt_load-p_align-values-for-loaders.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton Subject: revert "fs/binfmt_elf: fix PT_LOAD p_align values for loaders" 925346c129da11 ("fs/binfmt_elf: fix PT_LOAD p_align values for loaders") is an attempt to fix regressions due to 9630f0d60fec5f ("fs/binfmt_elf: use PT_LOAD p_align values for static PIE"). But regressionss continue to be reported: https://lore.kernel.org/lkml/cb5b81bd-9882-e5dc-cd22-54bdbaaefbbc@leemhuis.info/ https://bugzilla.kernel.org/show_bug.cgi?id=215720 https://lkml.kernel.org/r/b685f3d0-da34-531d-1aa9-479accd3e21b@leemhuis.info This patch reverts the fix, so the original can also be reverted. Fixes: 925346c129da11 ("fs/binfmt_elf: fix PT_LOAD p_align values for loaders") Cc: H.J. Lu Cc: Chris Kennelly Cc: Al Viro Cc: Alexey Dobriyan Cc: Song Liu Cc: David Rientjes Cc: Ian Rogers Cc: Hugh Dickins Cc: Suren Baghdasaryan Cc: Sandeep Patil Cc: Fangrui Song Cc: Nick Desaulniers Cc: Kirill A. Shutemov Cc: Mike Kravetz Cc: Shuah Khan Cc: Thorsten Leemhuis Cc: Mike Rapoport Cc: Signed-off-by: Andrew Morton --- fs/binfmt_elf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/binfmt_elf.c~revert-fs-binfmt_elf-fix-pt_load-p_align-values-for-loaders +++ a/fs/binfmt_elf.c @@ -1118,7 +1118,7 @@ out_free_interp: * without MAP_FIXED nor MAP_FIXED_NOREPLACE). */ alignment = maximum_alignment(elf_phdata, elf_ex->e_phnum); - if (interpreter || alignment > ELF_MIN_ALIGN) { + if (alignment > ELF_MIN_ALIGN) { load_bias = ELF_ET_DYN_BASE; if (current->flags & PF_RANDOMIZE) load_bias += arch_mmap_rnd();