From patchwork Fri Apr 15 02:13:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 562188 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 C34B9C433FE for ; Fri, 15 Apr 2022 02:14:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348619AbiDOCQh (ORCPT ); Thu, 14 Apr 2022 22:16:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348607AbiDOCQX (ORCPT ); Thu, 14 Apr 2022 22:16:23 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2AF55ADD67; Thu, 14 Apr 2022 19:13:57 -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 dfw.source.kernel.org (Postfix) with ESMTPS id BDBF36221F; Fri, 15 Apr 2022 02:13:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1B0B3C385A1; Fri, 15 Apr 2022 02:13:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1649988836; bh=BKRZEFrsT7HckjP5sHfg9m9OXct1eM7WyctjCsktjL0=; h=Date:To:From:In-Reply-To:Subject:From; b=VobwKsOtL9/lzK56pUwdrV37Wx3MHwRc7XltBcqZa49C2J0b69TuppanPp8VWNJSh XehNRwrTmpTtowSP/bBxehpNm6xcHvk54SRhkZRkXycGcETO+3af9J6HSxF0dNYTPT D6jBG6ufJpIuv6tcbCDBrWkhg8cMyEpyw9wo40vQ= Date: Thu, 14 Apr 2022 19:13:55 -0700 To: 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, patches@lists.linux.dev, linux-mm@kvack.org, mm-commits@vger.kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org From: Andrew Morton In-Reply-To: <20220414191240.9f86d15a3e3afd848a9839a6@linux-foundation.org> Subject: [patch 11/14] revert "fs/binfmt_elf: fix PT_LOAD p_align values for loaders" Message-Id: <20220415021356.1B0B3C385A1@smtp.kernel.org> Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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();