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 1E595C3ABDD for ; Tue, 20 May 2025 14:00:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ABE6A6B0088; Tue, 20 May 2025 10:00:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A6E866B0089; Tue, 20 May 2025 10:00:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9ABE26B008A; Tue, 20 May 2025 10:00:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 7B38C6B0088 for ; Tue, 20 May 2025 10:00:57 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id E1136C03EC for ; Tue, 20 May 2025 14:00:56 +0000 (UTC) X-FDA: 83463447312.22.EDD6DFA Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf19.hostedemail.com (Postfix) with ESMTP id EEE781A0015 for ; Tue, 20 May 2025 14:00:54 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=I+JxI97e; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf19.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747749655; a=rsa-sha256; cv=none; b=VntPhUhNU8+xyH0ZPrrsQYzdfoG9DN8GsypLUaykOIcz4HZj+HXdX9iy4DK+TgYnQNxs33 wiF2m3kG7r/E5saBlaUGSxXibJXD6aPZisfckEhOGqien6q4bmvZcdINGIWqnzl2IA/YeG eYKfoNdImq117zNSXI9tvXfdg+CyVfY= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=I+JxI97e; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf19.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747749655; 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=Yi1n4tngTLZ3gEOYNIEaCy1yj8LeeuQm9zHz356LfX4=; b=uI4Rk5ZcUoWzvB3oe7J5ThulRXqDVE5IeoRiLwgXe/0BZQPQDyT6NSLuv4dzQj+14FLAW3 xOoeyCbiA10+a+kgCxY4QWNz2MldKr/RGwfMffWDDnJQHJT4IVA1xLb2qI05HJFNaNKLDE GNM+QZaWhcuhzVuV8Vg50gR77bs9BRo= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id A38645C562E; Tue, 20 May 2025 13:58:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 27C16C4CEE9; Tue, 20 May 2025 14:00:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1747749653; bh=ZiZU33Lo7kS1EPPVmImpLNvwguFnyj8P5M+5s/OJ5FI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I+JxI97e69B40SgUGvsYJPp7AcOG8DLl8bQLtF+mnSmwR7OWmqw6CCg3WHszftch7 pSmtv8rCiaSajwyvexFftOLoezYglJfzv2oPEaE0qsDdESALRV1JVmMgqztgClONZP vU6Xg3bb3Ubzjldao8/N9FTnKu61ap6J5LJg8Nvs= 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.6 003/117] binfmt_elf: elf_bss no longer used by load_elf_binary() Date: Tue, 20 May 2025 15:49:28 +0200 Message-ID: <20250520125804.128281403@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250520125803.981048184@linuxfoundation.org> References: <20250520125803.981048184@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: EEE781A0015 X-Stat-Signature: hrjm59itmpy6hjg3gn8c74mqdii85yfy X-HE-Tag: 1747749654-726026 X-HE-Meta: U2FsdGVkX19ng+5SchxNgE25EFbJa7LoOz3Y2Y09mfrWdOUPWhkZHE2SnANErNbZoHfe8hfeN5KduDrvcHlzeBe+DJrGkeHHpyks0H08tImX2WNr5yOaIIxc+F2wzFvYiVIsXgB4fHBh0dBvPWI7abMgA/DvYetJaqioytS/Q0Rd/AkYn69HhvWNTmmmDZcZeuTXxm9TyMiB8Oub6YtZ/Gm9r8WQgzBHQllSPqDPuKOPjQkruwJyVJ5+q/An7ohB3OcXFNc8/n/LT2+tBGpjAtV2qj6SOlF1FjMHlENuXLgBH77UVhkla6Umm0Ya3SA2K4RchJTak6AJaQOH+muLO+L9sLxw4iSBRli6lRo/koHOBqUuOo808D4IH/RbtZTcwkOanT3a9AqTPGNYrP4rgbQEEucWBB1S2ePdddELl1k52SEkuIbErv4459dZ/ZkTpV8f0OpfCTNKzoirqKZOy4Y/v9gWIfH4819wYpJm8ABqs+RHg616Z4fObMb1fE28/Ga3ZfkxH0mfq1KagV6rblhPvYtOe4zX/0gR4/tS0YxOj+nHTtaerCv5br8QDj91xcYPiAlrpg2YQejZ0826bF1hlBPv9W+NmDqtJo5md2PKM4i2s44Puym1ntyDpNERHUzmquszb46KEe6fuWWK+aRkExMKFBKQyaCTEbSbar3yFwn0nMOZ8DlhByzNSvHRqAFwmuOSs+YH1X0G93f/JEMh3mgHiG/5aXR0BAoFjqqGxU2XBQJVBjin1wVyxBUK7M1sQkME4Qu4MjhXGckWeJ7E0tLMCUJdpkNxPEkVGpYOnfaxU3kQfkTCFkjhsTpUTnFEIjDCowN0Ee+Mjk27+N69+1Z+mllRLkbjiDX4uB6OboX79jlYg6H6Ytb+fGGPzTyVpGVAD48SS6Bc5eFXuqpHrdJQEs8yVc2+tNYV3g6LFX/pED4xAPc3/kQTiHR7+PMTNedB4TVrj5uHZot M/BZOFz5 +vPZzlrmx9N34f6dCP516A5PIJvoPqHMI4254S8W+PlnpHWY4gLzFlBhh4Fe/v4gN52eiTHxt2O1WnBe/aoB70gqWL2hi5FjUVhmE+57CEc1fN9P7hvBIInt8O3w+J9vyH0dvox8dJdwdlijIWcAfNCJQEClilVgx63xAZBJXwhh4wtG5sFVlKwMxUgly/Ww3NwW0Vb0Q399CE4RFJ224HVvJi/XvC2ddoHkRCLpFDx26uE93UW2uhw3kXT+Zpbyt4oon9XY7xW90gwmzIV8hOHqjuuio0+D4YxAvp9QGxxvmynapsQ0x7QnLyRqR+CehbZaRbfmNrPRVaYwNak8Vdntpc22DbR9NKlGWQND0IKEUKLwQYaWB5QTSbIDuXBKsbm+lQFLlwh2cRKng/57hJh15cOFW1O4ANajBy3YqE0CQCITrzZb8suFTKa6/Iy6W6BGz8iWCNhi1RoWWcuM8zqpwdgkw11AYam3Z65QhAP+0TJ/ufXFN1e+ip7rGkVzXRUCYshQpkDirjGqt3u6/SPP2SgaWIECxBhFOQbye54i2dlFQeulHnSqdXdKz8ZGY69WUnTFit7/g7SrGWOpSu2A99QZaiKLtamZAFH+EA3D2HWW4EF3G4eaGNQ== 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.6-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 d59bca23c4bd9..02258b28e370e 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -854,7 +854,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; @@ -1046,7 +1046,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; @@ -1209,8 +1208,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) @@ -1222,7 +1219,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