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 72BE7C3DA6D for ; Tue, 20 May 2025 13:56:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EAE2A6B0089; Tue, 20 May 2025 09:56:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E5DF96B008A; Tue, 20 May 2025 09:56:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CFF796B0092; Tue, 20 May 2025 09:56:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id ABFA06B0089 for ; Tue, 20 May 2025 09:56:24 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 4A1561603A4 for ; Tue, 20 May 2025 13:56:24 +0000 (UTC) X-FDA: 83463435888.26.13A1683 Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf18.hostedemail.com (Postfix) with ESMTP id 578FE1C0007 for ; Tue, 20 May 2025 13:56:22 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=IzQaXQ3O; spf=pass (imf18.hostedemail.com: domain of gregkh@linuxfoundation.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747749382; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=DEaB9DwfoXT6KGWfSOa5uI9Ap1JoAR9hlfBeg6OpzBs=; b=dPAFWw8Gj1X0ycrMkTHPSxyb9qnt1R13JIeDOBkAKtdKPiiMlIU1DCxcWE2a3GtRzczflr /bzDyb5xk014jK1Je6ML0Epokx0kLxfN+gNL5gpTWBRhez5Cve4UrZXGjRixr+Z4/k/Bs3 dy4EWFN75wjn/So2dtQrP2N4Yz/zMX0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747749382; a=rsa-sha256; cv=none; b=J4FK/wVdZR40qmMgEUIoYWuHOZmcL5ZSQQkRhLOQ2jt1WC1Igw8jUKvzpBXrITgJmygnrz MxjmUzYpdGa+dq381/AJZ40jGLV0udin+GJVQpHdjVZaG/5IUVlEVjTbgwWLVktqrYZj1p JrqPFTJrUB6HFQ9f8vrmCLIbUY2vFt4= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=IzQaXQ3O; spf=pass (imf18.hostedemail.com: domain of gregkh@linuxfoundation.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id B7EA4629F8; Tue, 20 May 2025 13:56:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1B043C4CEEB; Tue, 20 May 2025 13:56:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1747749381; bh=4ubUthK49Sp3mkO7AL+/eHYpZMlPHY4R02bVOtJrYCA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IzQaXQ3O2KGu3o7/TBPDSZfF6JA/Z32HCSdXYlYpv7dsEpLVV0rvFwNnoTYq7w/2P /Jl1BIkLn7470rZsOKTOVTC/kQRBfzdJLOEaU5l9PGDIogavNfkn2WYtYsgDnLYrgj csDibiWF269PSXqigdv0m4wTTQutC8Hf7BVZDeFA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Eric Biederman , Alexander Viro , Christian Brauner , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Pedro Falcato , Sebastian Ott , Kees Cook , Sasha Levin Subject: [PATCH 6.1 03/97] binfmt_elf: elf_bss no longer used by load_elf_binary() Date: Tue, 20 May 2025 15:49:28 +0200 Message-ID: <20250520125800.798369981@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250520125800.653047540@linuxfoundation.org> References: <20250520125800.653047540@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 578FE1C0007 X-Stat-Signature: o4qinnytbapdek5x1n6p4one5rpfbfu7 X-Rspam-User: X-HE-Tag: 1747749382-12968 X-HE-Meta: U2FsdGVkX18yp3KtcDltrzUImnCwiQu9FGs6qX1PUKK6FfkQEcQhdWPPApoh5/hLsigx/EGG9+hwUJXVrg1f5d1vNT8uxSOs2FzaoLf+BxEwN2FieXqHuaAu2trikFe3XjO6nzLkeFLzbMctFmxdq++FJIhIpKZyuDJnktWiUaYkWa2hZlkVjth5b3VWi0ji3ytGw6iNS77JWQbLGOutMuub2JsRZJailcolQagzpk92qO6VxrmBCKMipj8L++V+lQlhCR7gEUqRu01XmdeyU2MCSCQINJoNj9a5lVyEym3qAlCSlXk1k631ADGU1oPlcIdLqPd0c+HXeAEq/iD1PQakY6f3RVbLWFLZ0AK+IGP3sFMcisE3GzSZe/0Ew3rXyiSdUN0pBgUkWT2vCkb4u4bW1WyMWFab6fNH5ax6ysMqdtX2q2jNFTL3WKZO7bvqYVoPGjrUP7NNqsnZKd7N75JVPs/a0+8CKvql8RQPxnMuvO4ByjfcLJogVOtLeKxkLR7TQ+4pHgarBzLFEpyC3ekmWKqF1umv4x5ZmapDrYpk65BFC0zonX4QqmZ6EV3S741hGDrQ/YiBzxoHM/SPbOH6+pnEhN+/VxHDEYuqOk5mJFIf60SJUMwdURMUmdA3c1bXjCWkEYUGEX1iHxP4xjbGk+6c3fmAzVOQ8JPAlfKt2ewNe7cseIgKa+jZZNjbpzMBAJ7j+af0jC+wEgdUebP+wm3A36VRs7Hv2JgYlE6VT61gxmqG6yXl0cMmBejRuq2+x8WwILTi0urZjXOLHZMEDuuTf5JIPUtFe9XFjJwMA1IG1A2Hmio5yKrr/jC9fA4KTNQoXq6QVVQ6Wg1U+jObgC+l6SC5Fi4K1AbZA9WpRvuGnuSGzcfJyZ0tIDK5SCl2e8MEM39ozq7tkqhxuffUel2MebqVITLvi2aX03zNgXyFIhRWqi4xtQ1BKXLbRGQJHD29QDxhI8MccUC WJ5QBsvu jqPsfN7VDtdAgEL3ir0C9psG+MDpqDOq6x/wqgWuuPIAvtCierHM9A88Npq4hMRTxHysNjUdRoUHTZ1s7vMiFaQ2ApKD0ID4uzLWNlCFaLPM2a7qoepRM72r/FaJsbCIZfhSYUNXvgBMgwxsbmtI++7bGJk1Nenwivn7y+Ha7Xse5i0bocShQ1+JA83C49PhbTiw2h0Zy3yQ3vE9we64+A5PHZNDtHNUY/c+Kux9P6lDgaOBqxJtKACtWi2ObSFe7K8yH8Ssie5PEjw1lgdiK0fqVURyxiHtGYpZZeRMxd9+/DZWJBdS4VEHo/7zpx7EDcXnBV6y9M8GML9hchhMJWERprg6yc+mU8iodxc72PBCK5pG27SX63SCE+GuaxKps68Oxv9UhCRHseB65cQkiOaLfR//cxZXtZDihcFZ2/OOOiBYiaSj0fRH+78m6mny4dsr+YMoYUGNtRYKW7Julu+vSMXvj8SWtmEw/twve2MTKCDBz8RIhdxrNP6bDZhpFGxYfiZhf7WCT1iMimpHH3ZybItnjcK21bIigP36Cn6B600Zqbh+/6MOiXC1ufFWVQi3z/ygUmtYDdlE9kiKuWVrCCVAV3bCVQDFYWJ98fkHpXuzpGDOYgRJ4XQ== 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: List-Subscribe: List-Unsubscribe: 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kees Cook [ Upstream commit 8ed2ef21ff564cf4a25c098ace510ee6513c9836 ] With the BSS handled generically via the new filesz/memsz mismatch handling logic in elf_load(), elf_bss no longer needs to be tracked. Drop the variable. Cc: Eric Biederman Cc: Alexander Viro Cc: Christian Brauner Cc: linux-fsdevel@vger.kernel.org Cc: linux-mm@kvack.org Suggested-by: Eric Biederman Tested-by: Pedro Falcato Signed-off-by: Sebastian Ott Link: https://lore.kernel.org/r/20230929032435.2391507-2-keescook@chromium.org Signed-off-by: Kees Cook Stable-dep-of: 11854fe263eb ("binfmt_elf: Move brk for static PIE even if ASLR disabled") Signed-off-by: Sasha Levin --- fs/binfmt_elf.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index ea2968d343bb6..2672b9dca1af0 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -855,7 +855,7 @@ static int load_elf_binary(struct linux_binprm *bprm) unsigned long error; struct elf_phdr *elf_ppnt, *elf_phdata, *interp_elf_phdata = NULL; struct elf_phdr *elf_property_phdata = NULL; - unsigned long elf_bss, elf_brk; + unsigned long elf_brk; int retval, i; unsigned long elf_entry; unsigned long e_entry; @@ -1047,7 +1047,6 @@ static int load_elf_binary(struct linux_binprm *bprm) if (retval < 0) goto out_free_dentry; - elf_bss = 0; elf_brk = 0; start_code = ~0UL; @@ -1210,8 +1209,6 @@ static int load_elf_binary(struct linux_binprm *bprm) k = elf_ppnt->p_vaddr + elf_ppnt->p_filesz; - if (k > elf_bss) - elf_bss = k; if ((elf_ppnt->p_flags & PF_X) && end_code < k) end_code = k; if (end_data < k) @@ -1223,7 +1220,6 @@ static int load_elf_binary(struct linux_binprm *bprm) e_entry = elf_ex->e_entry + load_bias; phdr_addr += load_bias; - elf_bss += load_bias; elf_brk += load_bias; start_code += load_bias; end_code += load_bias; -- 2.39.5