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 D342CC54E71 for ; Fri, 22 Mar 2024 03:56:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4101D6B0083; Thu, 21 Mar 2024 23:56:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3C04E6B0087; Thu, 21 Mar 2024 23:56:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2AEB66B0088; Thu, 21 Mar 2024 23:56:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 1D13D6B0083 for ; Thu, 21 Mar 2024 23:56:00 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id ACCFD1A0759 for ; Fri, 22 Mar 2024 03:55:59 +0000 (UTC) X-FDA: 81923311638.01.DE844E4 Received: from mail-io1-f41.google.com (mail-io1-f41.google.com [209.85.166.41]) by imf07.hostedemail.com (Postfix) with ESMTP id D3A2040010 for ; Fri, 22 Mar 2024 03:55:56 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=hudZfA5m; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf07.hostedemail.com: domain of keescook@chromium.org designates 209.85.166.41 as permitted sender) smtp.mailfrom=keescook@chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711079756; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=mDi7jYxaJ9l+KBr/OHl27LOvhUXGML1wd1U7ONJ3R9g=; b=ge1UMsPU0yyeJy6CohUVmRmOzSwTT0dqd7pYx35JMsouNko3sIr9QyDmwocHHalzXQ7MHv GRVG5jADre3iXPGtnCH5jp5Kh7YBWVQYMj65Wz4x1Lu/RrHx54Uy+YhiRnHUXozqFrPjdq mR+GHNBVTg4Kp4vMne2QT96d5L0dTWA= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=hudZfA5m; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf07.hostedemail.com: domain of keescook@chromium.org designates 209.85.166.41 as permitted sender) smtp.mailfrom=keescook@chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711079756; a=rsa-sha256; cv=none; b=hUkqHTfhuplfT7uq1+o2S+ku7kUR54dXXjwcbSuyViJcalnydC1ZtZZD/+U+huYn9+j23u tWUxWtKh4H1Q/IJ+hIJ44hgBy33BkiVmHAZx51frDQk2RIia0xDXNppvFlmgT8M2iUvE1c nJo9IdfV6vkURkAzXRTusrSNnOjPit8= Received: by mail-io1-f41.google.com with SMTP id ca18e2360f4ac-7cc01644f51so76188139f.2 for ; Thu, 21 Mar 2024 20:55:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1711079756; x=1711684556; darn=kvack.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=mDi7jYxaJ9l+KBr/OHl27LOvhUXGML1wd1U7ONJ3R9g=; b=hudZfA5mW/nN3s1rdXUv9Lw7FSVf5Hu964Nf1pa9Na6HG1gkzsBjBJM999/noHhMHA sXPrLaPpyyV5sVMmkrW7Z9IG1HA4oX9q4aROOjE/M0bKqUR3Mz/9ZRBryG79Qucgfch7 XnzUbm7So1zDHzzjtJqDLgFlsCA3DeHdCJVbw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711079756; x=1711684556; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=mDi7jYxaJ9l+KBr/OHl27LOvhUXGML1wd1U7ONJ3R9g=; b=BKmwMjckAc4SFMkUHkYUUJJXOY09c8cFwCpoX+Yf3TqcRcqh4cjcN6DXZXP/Ywt+G3 ekYF2aKPMrk1P8ptiQi+mS4+rm1GmTMMXgVacEmqBPEPlqFHF1T7oKF+aVHu1zVxx92L fkMdPFpKAnlFV63Tuw7BiE5mAXXAu01MLzaSRyB/fG5f4djit4pQmysLl4HdOx9caV83 uEBWlrzkYgZajyS1ivDWtXII2N2QGUuGf46RHlvg/Q9ulxqdU4QpKX1uyGfS1BlwWev3 k0W5TtYvb25EOcsfOxhXlDk64P1OIKUEmFl2wtbOSHSlxiiFM4Uh6vhxzM3XlZnI74Vp t0ag== X-Forwarded-Encrypted: i=1; AJvYcCXfpgHiug3sCEyxmdUZebrTK2LKx8pDYY5NWIr+wg1mJA1YPexaNFzxPhZf0gjYAYuX6YWKVsZ2mZb9cWVsHP66qlA= X-Gm-Message-State: AOJu0YwVPmhUsuJH8u5wlkvbuPj0wotDnUhv2q0B+fz1EsSzEpQFIxC0 eo+X2Q1CxDzFSIFX6zv4uuMtsAS9uOh5PeQGp+glsEe92Qg7uwr4/TZjnbx9UJ/YahtI/8GoF9k = X-Google-Smtp-Source: AGHT+IEPtsYWgPg/WZkii4z9qiUUkjOuefnGilZT+nf3dukXjrJpHFNordVwWK4Jzptl7XhBimQxVw== X-Received: by 2002:a05:6a20:9151:b0:1a3:59ac:a626 with SMTP id x17-20020a056a20915100b001a359aca626mr1814803pzc.41.1711079284701; Thu, 21 Mar 2024 20:48:04 -0700 (PDT) Received: from www.outflux.net ([198.0.35.241]) by smtp.gmail.com with ESMTPSA id u2-20020a17090ae00200b0029c693a1e6dsm782334pjy.17.2024.03.21.20.48.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Mar 2024 20:48:04 -0700 (PDT) Date: Thu, 21 Mar 2024 20:48:03 -0700 From: Kees Cook To: Max Filippov Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Eric Biederman , Alexander Viro , Christian Brauner , Jan Kara , Rich Felker , stable@vger.kernel.org Subject: Re: [PATCH] exec: fix linux_binprm::exec in transfer_args_to_stack() Message-ID: <202403212041.AEB471AC@keescook> References: <20240320182607.1472887-1-jcmvbkbc@gmail.com> <202403211004.19F5EE27F@keescook> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Rspamd-Queue-Id: D3A2040010 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: mbkazdutq4cy4fq5z5w91idr8usts8jj X-HE-Tag: 1711079756-40792 X-HE-Meta: U2FsdGVkX1/aJKh9JsrQlitDwFLWdZsWMdfAkACKBwaCXBOLcd7MxH3BxLYTU2Izdw3RuPVvHh91Nd10BtfSqXEVlU37PWmZPkfkyvCWgYkM1V8S4IJhvRot5Oaz3ehNLYdWhNJKcnBv567zuIFkXqx4jgnbd3b/YDz8Ag8c0gvhQ/DHgBGWObg/dh5yEo0OOCHzp/I9i/YTYt7YFfP+AY8T9rB5atDnYy4+MA8gjQdj0CFFmmj4wsfRzYoqiJ7x2Aq6h0xXmjBCvIOQBiTVsofIRzmuWhPxiSczm0Y3Pzha00LQeoHYbAaQJDGs6WgQ8WiDndxXKIud8BGOUS1le7zhRg3EsRqFf+CV5fsp/Cq93vQmrRmRKyTdmpun8+Mg/jVr5x60O6vlC3oNcCM3MPFH5FYKry7P0Z3Ui9GA/HjlYGfE+kMqraOwjGxv297w7jRWhYphOsadkEhbtLjVoty6DfE4zxaWCGuBrbTMsz9TU2X11eTlDiGHy8BTKjlIbpseJTfg59zO6y12MJ2/uI3lHlGBsN2lLx0/rXoLYcU5B5XvARpoMrWUfjWq5SHEh03R5m80W6xXvPpwfiZb1+oelerOf5h53Ymj3L+tIhYhgo+l/EJmZAb2cYWITWe8A1xDa+YjcISRM8f95RhfMvJM6+PEJxvuEsD/lwhwGBnhoCmUQZF80nG+JTDZf4Ihx3Kn7iRwOj8e/xSP5T2LYtjk0tATeeRyEYuUdo3b4cNLuyEuUSMWlVqrdCUP0XJPC1uF7o6yGl/lyER/Dfcab6iQ1w/CqcGHS8qiP41jrCSpKyfb4YJuSbW09oHqzpGPOJm8dg6F9y9a52Ut7RMsGlOSw6nhRABA9f4DGnJNHeeeJqHaon3OcxW1S4r9T76dUuIQ+jjOnlgC+Qd02r8uz6J1y7jUb7tFhOcIXIBF/A6X+YuqwNm+39AuEkvAa3qv+Ngo/yLuvTTA1lmPyM3 Oczwch8M GwOty552EUFPDBxSY5oz8a1elA1frPEqhEmJP1VlU/EcyfGgD6HQasy7i5arzwZHtX1rg5ip43TMHeqRvTfSL8FeQ3dqpwJLLrX+JpPRDzNo/KssK4/yXid8wXzYKOBcupR9zwQYFGxd9K3AnsGpusIqmlvRU3PmIukXck0D0zV/5TZRbniIo5LoHwecT0gP+iSn/yXGqPvGidbHn3jJI+vf++2hnVJGsF4pvv6SAEeuhStqOzOCpaozz6xUwC5T0WD03H3PvwRzXMWTn9lPdX7Ann6UFnUvc3xJYTK5h9NP9ggACBERa6pbaKA6bBqgtb5yvkuWSWjU701mm4ZnO81Hc/DBnaoaQ7hCZADPm7HpsGXk7ujmEJtI55p3H9evb9UHzYkEBWL2VP+XbcIll7hx8S8vTw9ztfyCyaj+6jCNkM1+QQPPgk1tNFMcPVInAZumqacqpI1oS+S3WI+4Nn+bqdDCVUTlaqEgzaIGsjdDNvC40blj+kF38K0PUh6sikdh6Liszte1u2l1pFxJTlKTGHRpUeaDzSVrGvuavxk82Dj3fHhrFnPb03D86pWJ2uzGt+VF+blt4Xgvlog1T5JbnD5eLXFUuGoah 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: On Thu, Mar 21, 2024 at 12:52:16PM -0700, Max Filippov wrote: > On Thu, Mar 21, 2024 at 10:05 AM Kees Cook wrote: > > > > On Wed, Mar 20, 2024 at 11:26:07AM -0700, Max Filippov wrote: > > > In NUMMU kernel the value of linux_binprm::p is the offset inside the > > > temporary program arguments array maintained in separate pages in the > > > linux_binprm::page. linux_binprm::exec being a copy of linux_binprm::p > > > thus must be adjusted when that array is copied to the user stack. > > > Without that adjustment the value passed by the NOMMU kernel to the ELF > > > program in the AT_EXECFN entry of the aux array doesn't make any sense > > > and it may break programs that try to access memory pointed to by that > > > entry. > > > > > > Adjust linux_binprm::exec before the successful return from the > > > transfer_args_to_stack(). > > > > What's the best way to test this? (Is there a qemu setup I can use to > > see the before/after of AT_EXECFN?) > > I put a readme with the steps to build such system here: > http://jcmvbkbc.org/~dumb/tmp/202403211236/README > it uses a prebuilt rootfs image and a 6.8 kernel branch with two > patches on top of it: one adds a dts and a defconfig and the other > is this fix. The rootfs boots successfully with this fix, but panics > if this fix is removed. Ah, perfect! Thanks for this. > The easiest way to actually see the AT_EXECFN is, I guess, to > do something like that: > ---8<--- > diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c > index fefc642541cb..22d34272a570 100644 > --- a/fs/binfmt_elf_fdpic.c > +++ b/fs/binfmt_elf_fdpic.c > @@ -659,6 +659,7 @@ static int create_elf_fdpic_tables(struct > linux_binprm *bprm, > NEW_AUX_ENT(AT_EGID, (elf_addr_t) > from_kgid_munged(cred->user_ns, cred->egid)); > NEW_AUX_ENT(AT_SECURE, bprm->secureexec); > NEW_AUX_ENT(AT_EXECFN, bprm->exec); > + pr_info("%s: AT_EXECFN = %#lx\n", __func__, bprm->exec); > > #ifdef ARCH_DLINFO > nr = 0; > ---8<--- Does musl have something like the LD_SHOW_AUXV env variable. With glibc, I usually explore auxv like so: $ LD_SHOW_AUXV=1 uname -a | grep EXECFN AT_EXECFN: /usr/bin/uname > > How did you encounter the problem? > > I'm doing xtensa FDPIC port of musl libc and this issue popped up when > I began testing it on qemu-system-xtensa with the real linux kernel. > Related post to the musl ML: > https://www.openwall.com/lists/musl/2024/03/20/2 Thanks! -- Kees Cook