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 B211BC04FFE for ; Wed, 8 May 2024 17:32:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E78746B009E; Wed, 8 May 2024 13:31:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DFEEE6B009F; Wed, 8 May 2024 13:31:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C2A9E6B00A0; Wed, 8 May 2024 13:31:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 8CC776B009E for ; Wed, 8 May 2024 13:31:58 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 3D295C11CE for ; Wed, 8 May 2024 17:31:58 +0000 (UTC) X-FDA: 82095921516.28.883D66A Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf30.hostedemail.com (Postfix) with ESMTP id A05EA8002A for ; Wed, 8 May 2024 17:31:53 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=RDKjyBXE; spf=pass (imf30.hostedemail.com: domain of keescook@chromium.org designates 209.85.214.170 as permitted sender) smtp.mailfrom=keescook@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715189513; 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=4rcMwpi5swukR9fu2rr+tgqRl98owlkzS7lAQiTyYR0=; b=BIG+SsrQpz+hZA7Rxd+XCRATlpnIFmIoHm8lOcOLFVv03sb1tdrhcQyEjL24NGtx+ws5MN o/B+oZsq3dnUwHpB2szGVJEemh4FGrH8O8ZAwuV69MDKSpk3lWKVEg3S+0d7HEE39zJ5nr +CujzrWmcuhhtaXcKhS8faD0IvoJ7qY= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=RDKjyBXE; spf=pass (imf30.hostedemail.com: domain of keescook@chromium.org designates 209.85.214.170 as permitted sender) smtp.mailfrom=keescook@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715189513; a=rsa-sha256; cv=none; b=aRGYHKG28cTuYeiA9hsa04ITZwjvS4CQpAyRchTrA8YkBI55tblcZEOGHRP9lwd/6BodTo NNrZMYSDbcm2QotwP1EQs6ikoHk41tWG7FkdriaCRdS/dbhp0GicIqbDG71+jNTGE1wicu DcLVDlZILWO+gmXX7bS/v3N98Hl5o6w= Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1ed835f3c3cso42205105ad.3 for ; Wed, 08 May 2024 10:31:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1715189512; x=1715794312; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4rcMwpi5swukR9fu2rr+tgqRl98owlkzS7lAQiTyYR0=; b=RDKjyBXEwgwhownYOMbbMmtEgTx35DDQ28mcJvb9dsIWggWkPnk7r3r54TEBmfH3fz RdsceG6Vhe4nD1+igqj8RKA1p+vOLy66nD4jJHuGLwuNiYf+l+oxl+oGvr+PtFIFAS6K SLlBpGyqGZZ94wMzO69j++mCZ1hvuBOmQLnsk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715189512; x=1715794312; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4rcMwpi5swukR9fu2rr+tgqRl98owlkzS7lAQiTyYR0=; b=fQl9yYL68O0FpdCkRSvvvqS0JgMI+0ZoyoysoUP8DKHH8ZiZnCYdGlvwSHp2yy3jSq 0AIox3f3IjKx3I8OS8OHhy6cFoyi+dwyispFgFVOByv0V0agxsHiJ6uRRS5k5FjjvwVU Z4HyKDDzzbTPvPJaGCuOaHc1HRmqCEO0K4fr88JaG9KpEMDEeBJA6cC0ilQVMvpTm9TW iQgo8fqAW+mHjKDZwAGgKmKKAkKLtl8k9IChp0LGAsXbuW0mM+qPIRIjbgCDpYzkmGuq 5BFpjkh7mJmqAamtd68X5rl5++FhJKOxMKJdVs0r2Qpfx16ssF+XW8eKtTE2AoMu8PKI vCDg== X-Forwarded-Encrypted: i=1; AJvYcCXaXRkjk97J45Z7CFtfqc3hqDneLReAJPgKmjew1Lh97MuYD++GJWvLH1zqsctfC6bYgwFaHvxPbr1k7U6mM49BdjU= X-Gm-Message-State: AOJu0YzT5Qu89qzCLinS6Z9LTFCWTS4bPgzhJGqi2a8SH3s4la34E3vX Jobsy47H8PUGyNyGfTL2M1Z6/vQMao7kbq3QgymwWTM9aWPGxqzQO00p/X5EJQ== X-Google-Smtp-Source: AGHT+IFNr+b2pAfQcWXsO87OnrvROJLzoQf+GfNtUyLNTbuK3rS25oOgdGVm7lFzQQasZ1Pfzw4/2A== X-Received: by 2002:a17:902:6506:b0:1e6:766c:6a26 with SMTP id d9443c01a7336-1eeb017cfd1mr35094695ad.12.1715189512601; Wed, 08 May 2024 10:31:52 -0700 (PDT) Received: from www.outflux.net ([198.0.35.241]) by smtp.gmail.com with ESMTPSA id la13-20020a170902fa0d00b001ec412676adsm12094121plb.275.2024.05.08.10.31.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 May 2024 10:31:52 -0700 (PDT) From: Kees Cook To: "H . J . Lu" Cc: Kees Cook , Mike Rapoport , Rui Salvaterra , Victor Stinner , Jan Palus , Alexander Viro , Christian Brauner , Jan Kara , Eric Biederman , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Chris Kennelly , Shuah Khan , Muhammad Usama Anjum , John Hubbard , Fangrui Song , Andrew Morton , Yang Yingliang , Mike Rapoport , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH 3/3] binfmt_elf: Honor PT_LOAD alignment for static PIE Date: Wed, 8 May 2024 10:31:48 -0700 Message-Id: <20240508173149.677910-3-keescook@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240508172848.work.131-kees@kernel.org> References: <20240508172848.work.131-kees@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=5293; i=keescook@chromium.org; h=from:subject; bh=eUy8l4dx1nlgASZnAXri0kDxbx6zhnXlB+I6YzLFjTw=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBmO7cEJD8sdRg2kTQVgy9QHVOS08welrL7Y9Xmg lC0fTmRrBSJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZju3BAAKCRCJcvTf3G3A JtM8EACdAwapwoIf1FEL7K12lEwr6cSDnpSo/80JcopA9tWkFKXsiep6tWvoxZDOzJ1vc9e6b4V YLAAZBeXNl/xk6VrycAfh+xwdHN2k+KNbWvuJiD34NZowKV8tHkpCLzfyBMxlsEnwkpvxp4gaSj d4IhlEOcmwxk6K5OT+QsSmcjMCjEBIVRIK0goPl4GHq8aOi+sRueJ8TaFrjvw1+8mrbvG2DdFCe Uv8kWkvlo/ILaWPFZ0NusPLLdDhExA73NKe/ve4YZAfk0p6FRzmyWuHOaT7dkEYmU9yuB2JtgFA K2DJetC6ue7f0Q13jS3/JzqgB2vtfz+FNYDwsf5pZqI/0ziFNMCvidOe43tE7Iw0Lmdt2/BgPNL r8gTuz9/tlA2bbDc3e/kRUhuX5nwaHcjR/r8IVSalFQmyqc5IPAk37VHvGDmg6DIbep/8qnwvCF QLG5UBoysuC4MgK+oc4o06z7rfYgL2DuXeo2iJifxHJslw72FqLeVf4SKpDzrWKHhqNWvN5fVlO iCNqiQqRpRch+qbtKbcDu6uw3gg9q5q8qzx+EEXIHGhqVyKXRZKdXgMmXXp/my+9/udZV/cFPHl Axrb6nLzkWUCWdMUTIN4aZHCt5ihat6gagmdxw0UNkomFQUeEHsgPbhNUGZztz5L0i7eTM6zPj0 PxL8C6OI/h070mg== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 Content-Transfer-Encoding: 8bit X-Stat-Signature: pw85jnr5w61wn78siwowx6u6a3qftadc X-Rspam-User: X-Rspamd-Queue-Id: A05EA8002A X-Rspamd-Server: rspam05 X-HE-Tag: 1715189513-583242 X-HE-Meta: U2FsdGVkX18puOo07yNy0Pr86NUFjGjIVyXHQTgtEMWdppbrHAZhMsqO4SHDXDzQXnB2jFflRBQnBLX1/Mma4P2PALakhPWZMIKuNHpSxN8rS5nZch5ua16xvr2EGZgUwOGQb1WWdAWnlKOHfoTm42kZaqxGDgzV4o8l4uXVfAGfoZ0JgFfh239xj4mBlLjj1Tz1DaKoJ2peaZN/31yoYu5zSDk88Yb78w9d4v19ji7WA/g0w85GxhKrkGxnYc9GsztoMbOGCwGzLfmhxUnKlDP4SFLHaVYYY69CcmEWBhZ1IQGqriiJHQ1XywDOhMyEHEYwb5u+pq0XlFNyh+0QhdfsHQkDYqL9kX6TkY/T4k7ZD8FmRWQhU2ao+Bg+vAYYPB+giQejhuIIhMpo2ob1cKHT9e2T2li7OPdQxWJF+T6y8GDXj9hcyLIlUU1thICdRlpPvbvHMVzk6shn/NuotFZwhiXU19flY09EoQfKcoGdgtaPKusY/wr0jaxbwdvMijQQIwg8f2kfg407moqz8r2Pp4BMUazR5nQReEZ7iLMygs58p0RBI+vOxJ3HRztXiNOP0CjCWOW6YNjm7EzLfHkRHmLvzRrNyJHwWYJ2/8UBUwC4EoXP6rYT9pGK4g5/OnGo6yIcm4z6eqjK9pGemidbTnFlGLypOl66l4bKWwkFZUjbS+fxARhiX1LCv+6o1+z/vULDIowuUwrSvS4RWmDyGNT6iVln0fChHOblEChZI0k5arYwmt/Wf+HGBlJDV6MYLhnVDHaCsD7xdgXWxBgsMQy2baSb9eoRDa+AbvuzHPohvDNOqQvfmF8GKkoJKBf+VsKwHChTUGnAmO9R1jGI2idIwGfekRxjuI6nhwHgykpZw0kdLTKc8IpvyeT3eGwIsVQrj8a2gpsXBezwEvw79kZXpwHLG8vNaachNtRV4XN9lLrWbyHzwyF/asVyrIK6cBDQtFtgshBvcxE gjMl6W4z ldqYUtk3cOt+T5gf2JEebjr3YWDD01M68rLoO8B4aFZvcOUoOMjMXbMBx7GGCNUV+NuIMHQaAKi145GMVO41b5rYOD8XZSAL/fY61xBnpuxkyv4JafhV8HZnkF6C68LUS4yE4OMTiMkWFeaMZrUHHITGn9Z/j6sdRKNmRZ0iOakZK2zBJsn6n1ylmJKNzrTEZTQ+Mwc5ov2PQGKsBbzkWqt6kRFX9S4rvdAbUGztFDVHfRVfpRbGbH55NM8LCQ5jXWya9u8b24BGyITLYY8l90DfX61YVnbzvkBNh6xvwW5FVkD+aEfRtFN8CURLceuQadaMq3SCdhKipe3/X9RXPQrohjYExevZWelZx22CmcvHzmy+MedyDjgqnA+EdDkZ9ND/GLT47vEkLeW7b+oVU1mCoxmz8DIVGUGYDhR2NaUhF63tfpfZiDYxqsn0NujMR/x0Nqcvawi3V6QWVKNzLr5cZqyP2mTZIVhFkkBukIfhxD/OqQLyWWt1lRPYFrIlIqMYQ2ln6F69LmXhiP/p2TGLY/0MqCgM6XMkUv6thLmtVLp5Z4TX/XCSLeVEDlGzBhm+rqmvaUEUz08HxVxVlG1R/CILjyWuoWVmGXbG5fDfewqZjxLN+6KCWM0bSOfLnhn3lITYL8KWEZhqmHwas7/6H05tAIN/dhuBEUFiDlOa1E8Ex0r2paX7KIhdKwl0Fgyl0xw2KS4yBrsbSjR4ID0wp6doFjlaCTDscCn77x/bWoxevV59i9SaIdqRtfpkNR0mHuFAvWONHmclgMfWIwYylliJG+meKEbdrO63DGF9fgwT0cX/QIaGHAo/4U3Gghr45EZmW9DqE+nsQ0ZRP3ivYR6Df8/b8mA65OK4ZDIGUo7OSUQDyb5d3bN7YGSCEcRHL 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: The p_align values in PT_LOAD were ignored for static PIE executables (i.e. ET_DYN without PT_INTERP). This is because there is no way to request a non-fixed mmap region with a specific alignment. ET_DYN with PT_INTERP uses a separate base address (ELF_ET_DYN_BASE) and binfmt_elf performs the ASLR itself, which means it can also apply alignment. For the mmap region, the address selection happens deep within the vm_mmap() implementation (when the requested address is 0). The earlier attempt to implement this: commit 9630f0d60fec ("fs/binfmt_elf: use PT_LOAD p_align values for static PIE") commit 925346c129da ("fs/binfmt_elf: fix PT_LOAD p_align values for loaders") did not take into account the different base address origins, and were eventually reverted: aeb7923733d1 ("revert "fs/binfmt_elf: use PT_LOAD p_align values for static PIE"") In order to get the correct alignment from an mmap base, binfmt_elf must perform a 0-address load first, then tear down the mapping and perform alignment on the resulting address. Since this is slightly more overhead, only do this when it is needed (i.e. the alignment is not the default ELF alignment). This does, however, have the benefit of being able to use MAP_FIXED_NOREPLACE, to avoid potential collisions. With this fixed, enable the static PIE self tests again. Reported-by: H.J. Lu Closes: https://bugzilla.kernel.org/show_bug.cgi?id=215275 Signed-off-by: Kees Cook --- Cc: H.J. Lu Cc: Mike Rapoport Cc: Rui Salvaterra Cc: Victor Stinner Cc: Jan Palus Cc: Alexander Viro Cc: Christian Brauner Cc: Jan Kara Cc: Eric Biederman Cc: linux-fsdevel@vger.kernel.org Cc: linux-mm@kvack.org --- fs/binfmt_elf.c | 42 +++++++++++++++++++++++---- tools/testing/selftests/exec/Makefile | 2 +- 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 56432e019d4e..cbb07a9c02d4 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -1088,10 +1088,13 @@ static int load_elf_binary(struct linux_binprm *bprm) goto out_free_dentry; } + /* Calculate any requested alignment. */ + alignment = maximum_alignment(elf_phdata, elf_ex->e_phnum); + /* * There are effectively two types of ET_DYN - * binaries: programs (i.e. PIE: ET_DYN with INTERP) - * and loaders (ET_DYN without INTERP, since they + * binaries: programs (i.e. PIE: ET_DYN with PT_INTERP) + * and loaders (ET_DYN without PT_INTERP, since they * _are_ the ELF interpreter). The loaders must * be loaded away from programs since the program * may otherwise collide with the loader (especially @@ -1111,15 +1114,44 @@ static int load_elf_binary(struct linux_binprm *bprm) * without MAP_FIXED nor MAP_FIXED_NOREPLACE). */ if (interpreter) { + /* On ET_DYN with PT_INTERP, we do the ASLR. */ load_bias = ELF_ET_DYN_BASE; if (current->flags & PF_RANDOMIZE) load_bias += arch_mmap_rnd(); - alignment = maximum_alignment(elf_phdata, elf_ex->e_phnum); + /* Adjust alignment as requested. */ if (alignment) load_bias &= ~(alignment - 1); elf_flags |= MAP_FIXED_NOREPLACE; - } else - load_bias = 0; + } else { + /* + * For ET_DYN without PT_INTERP, we rely on + * the architectures's (potentially ASLR) mmap + * base address (via a load_bias of 0). + * + * When a large alignment is requested, we + * must do the allocation at address "0" right + * now to discover where things will load so + * that we can adjust the resulting alignment. + * In this case (load_bias != 0), we can use + * MAP_FIXED_NOREPLACE to make sure the mapping + * doesn't collide with anything. + */ + if (alignment > ELF_MIN_ALIGN) { + load_bias = elf_load(bprm->file, 0, elf_ppnt, + elf_prot, elf_flags, total_size); + if (BAD_ADDR(load_bias)) { + retval = IS_ERR_VALUE(load_bias) ? + PTR_ERR((void*)load_bias) : -EINVAL; + goto out_free_dentry; + } + vm_munmap(load_bias, total_size); + /* Adjust alignment as requested. */ + if (alignment) + load_bias &= ~(alignment - 1); + elf_flags |= MAP_FIXED_NOREPLACE; + } else + load_bias = 0; + } /* * Since load_bias is used for all subsequent loading diff --git a/tools/testing/selftests/exec/Makefile b/tools/testing/selftests/exec/Makefile index 619cff81d796..ab67d58cfab7 100644 --- a/tools/testing/selftests/exec/Makefile +++ b/tools/testing/selftests/exec/Makefile @@ -6,7 +6,7 @@ CFLAGS += -D_GNU_SOURCE ALIGNS := 0x1000 0x200000 0x1000000 ALIGN_PIES := $(patsubst %,load_address.%,$(ALIGNS)) ALIGN_STATIC_PIES := $(patsubst %,load_address.static.%,$(ALIGNS)) -ALIGNMENT_TESTS := $(ALIGN_PIES) +ALIGNMENT_TESTS := $(ALIGN_PIES) $(ALIGN_STATIC_PIES) TEST_PROGS := binfmt_script.py TEST_GEN_PROGS := execveat non-regular $(ALIGNMENT_TESTS) -- 2.34.1