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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE48EC433EF for ; Sat, 12 Feb 2022 00:32:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 85E676B007B; Fri, 11 Feb 2022 19:32:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7E3D16B007D; Fri, 11 Feb 2022 19:32:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 65E096B007E; Fri, 11 Feb 2022 19:32:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0193.hostedemail.com [216.40.44.193]) by kanga.kvack.org (Postfix) with ESMTP id 566696B007B for ; Fri, 11 Feb 2022 19:32:25 -0500 (EST) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 0FD1A180FC130 for ; Sat, 12 Feb 2022 00:32:25 +0000 (UTC) X-FDA: 79132251450.28.AFBF108 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf04.hostedemail.com (Postfix) with ESMTP id A82264000C for ; Sat, 12 Feb 2022 00:32:24 +0000 (UTC) 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 1513261D1B; Sat, 12 Feb 2022 00:32:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 62DA0C340E9; Sat, 12 Feb 2022 00:32:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1644625943; bh=Ii6CJdn+ZXTJ8g78+Oc9EAcGtBjX9EXN10RNwwQN4hQ=; h=Date:To:From:In-Reply-To:Subject:From; b=c+f2Fw6r9EEN1KyU8jiaDFKuYZWNjsRECEQy79AcTGrGFSMO0Rc14/zARKjK+L85N 2xt4zRGpf/H7sqk8mTJ50Cc+lyv6bCu81NekJlPxzPro4xkkJ+n8d2mkSuOFCa/XN+ BA6xyRXu0Ob1vhWbSpBLx7ZCXd2ag0pgBvO3N53U= Date: Fri, 11 Feb 2022 16:32:22 -0800 To: viro@zeniv.linux.org.uk,rsalvaterra@gmail.com,keescook@chromium.org,hjl.tools@gmail.com,ebiederm@xmission.com,rppt@linux.ibm.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: <20220211162756.9f8e8baef81183041ccfc16f@linux-foundation.org> Subject: [patch 1/5] fs/binfmt_elf: fix PT_LOAD p_align values for loaders Message-Id: <20220212003223.62DA0C340E9@smtp.kernel.org> X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: A82264000C X-Stat-Signature: 7bsyxxuyytc8k8nxyqzx6b3ypy4y89gx Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=c+f2Fw6r; dmarc=none; spf=pass (imf04.hostedemail.com: domain of akpm@linux-foundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org X-HE-Tag: 1644625944-285548 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Mike Rapoport Subject: fs/binfmt_elf: fix PT_LOAD p_align values for loaders Rui Salvaterra reported that Aisleroit solitaire crashes with "Wrong __data_start/_end pair" assertion from libgc after update to v5.17-rc1. Bisection pointed to commit 9630f0d60fec ("fs/binfmt_elf: use PT_LOAD p_align values for static PIE") that fixed handling of static PIEs, but made the condition that guards load_bias calculation to exclude loader binaries. Restoring the check for presence of interpreter fixes the problem. Link: https://lkml.kernel.org/r/20220202121433.3697146-1-rppt@kernel.org Fixes: 9630f0d60fec ("fs/binfmt_elf: use PT_LOAD p_align values for static PIE") Signed-off-by: Mike Rapoport Reported-by: Rui Salvaterra Tested-by: Rui Salvaterra Cc: Alexander Viro Cc: Eric Biederman Cc: "H.J. Lu" Cc: Kees Cook Signed-off-by: Andrew Morton --- --- a/fs/binfmt_elf.c~fs-binfmt_elf-fix-pt_load-p_align-values-for-loaders +++ a/fs/binfmt_elf.c @@ -1117,7 +1117,7 @@ out_free_interp: * without MAP_FIXED nor MAP_FIXED_NOREPLACE). */ alignment = maximum_alignment(elf_phdata, elf_ex->e_phnum); - if (alignment > ELF_MIN_ALIGN) { + if (interpreter || alignment > ELF_MIN_ALIGN) { load_bias = ELF_ET_DYN_BASE; if (current->flags & PF_RANDOMIZE) load_bias += arch_mmap_rnd(); _