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 531E0C54E58 for ; Wed, 20 Mar 2024 19:29:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C91906B008C; Wed, 20 Mar 2024 15:29:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C41FC6B0092; Wed, 20 Mar 2024 15:29:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B30CE6B0096; Wed, 20 Mar 2024 15:29:50 -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 A41BA6B008C for ; Wed, 20 Mar 2024 15:29:50 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 6ECC6140AD0 for ; Wed, 20 Mar 2024 19:29:50 +0000 (UTC) X-FDA: 81918407340.22.3451723 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf07.hostedemail.com (Postfix) with ESMTP id C34474000D for ; Wed, 20 Mar 2024 19:29:48 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=l6z8UkWz; dmarc=none; spf=none (imf07.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1710962988; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=yvq+o8b7UjuJnPOttI4lLotYQ0Q3sPL2mIWTZN8jvW0=; b=1siMG+M50qRhmjp8qiQGaBLFoznzk6N2f9DTMMVNyx1EzV3nh9REABLNvnyxEpRHrTXAfZ s/WV2jGYrA6sAtIckKE4noDbxNhmpRsgXg4i/GI2wjl22N5wdBCewUOUc/hQ9Vpv74RPnW pZN3Evhi+3UZpnwHGLrzSFpzqgcKRVg= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=l6z8UkWz; dmarc=none; spf=none (imf07.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710962988; a=rsa-sha256; cv=none; b=SIcE9gJAPVJIVohtxEEgzJ2jPFoapT9dE9Sknpbice6rPsOSenahXYoTmKuFox1rwYZiDp +dkWRBNBrVYwMJIZrOkZLeZYyVdS4GzmB0pgdjD147XnAgmcQxTM2VoTmTLWE5Tm24+7GJ XEKIkrN8h28FfGEaF+O9lc0A4juAT+o= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=yvq+o8b7UjuJnPOttI4lLotYQ0Q3sPL2mIWTZN8jvW0=; b=l6z8UkWzI0ESS7o9ZWcOPP5lby 9zxxbsnFzQthW6djG85BtYcfSPsQF2oOY1v/H/GtyB6eLQiOMHEdm8i+3uwmmBtZWaA0zBuhcKzME TDAcb/GEg7WgmDOHWSq5ABZel17C8g7W0aEu4Qkey+7Q68CtMZLmFMmppnaHL8bIk6DoJZzdz+ZU+ MApl7pBBBV69Lo1vj1t/67Mjo0OvdOFMw+btrI7qA+gZR5qnZ6OTqhAAB2QIHt4RMHkn7g/jgOLbs Kt7xRzUDH5w+mM8+JH2gex+3Hxce9HYaRLVufdF/50egFUWr2wvNETPIidYey2WCeyeyWKfgury6j h/fwfNVg==; Received: from willy by casper.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rn1dB-00000004xuW-1mOR; Wed, 20 Mar 2024 19:29:45 +0000 Date: Wed, 20 Mar 2024 19:29:45 +0000 From: Matthew Wilcox To: Max Filippov Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Eric Biederman , Kees Cook , 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: References: <20240320182607.1472887-1-jcmvbkbc@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240320182607.1472887-1-jcmvbkbc@gmail.com> X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: C34474000D X-Stat-Signature: os9hu4wqda8fofx5uoaba1nij43j3mut X-Rspam-User: X-HE-Tag: 1710962988-134052 X-HE-Meta: U2FsdGVkX19c3EotCAUnAkI66Ap5tO4x7Yel0V+zPjckxVwzcdgKzX6xNrPCvNNlOrduXjaMPUHGe7Ey2rjIIl6jea+4Ajm+wKbNr2B0uiaioV1Zm8uh5zWjuczZKP1NL2H58PzNzxxOY9srE/hQf+AWEd08zbTbdnOc/e8CDBVG0c4W3UsR3FoKUPg8dztnixE7GRqLcQPcFPteq7JJ4sDi4K0SKHhA87W1ge+dh6n/rUAC0t9nOJR+Is4aJFGax6oCJX0LTifT99j5WFUlAK7xTOsZ3qBTpK85oOXAMQFA8K1QLolLs7K42YaxFcNv6TK3fvIHBxcDVeV9isCgBlQQL24IMT8ydWjm4oJZB3iMwQ3P8mfNPXC4CTodis26k3uF8xhd0U9Gfm9OeFLcOSegFylMWdr+flKEAfLgdBGq/SRXC3HrWyqEmD4kMxRQEdFLF/OqIE2QPWJ3g432TdthGO4cF4Y0I2QVGL0cbwoNm0iKxoTer05/80VG9ZY9zqlbblQkFy1+2XdLFNqEICptigC7WES98z3Df5cEZYt0lg5qM6XM8PXiwDYATdBfR2AaozXit+A8UcDx+vmMKC9xaNGrM7afzUO/xWgyT4BBOzLvjN1Ptzzj7XFA1YCQ5L+M3hzXmazwp0UTJ5GQ1MeftwJaSD5zaL0p9OKpZYhl1jJzlhwcDR+3joeoyNMAzb9UGmRgyMhBJJbMXpv5mug75/TzYJhx81Zzv6frE5niqfUB8I5+RQPngGc1AIEExxEg5FvZlrADKMgA1Th4+uQW8nmTNErMj/JSDEqYi+wp9LvNZ/sBQFlZiIw+Y2xM7LLw72sH8yEAmG9/DWQiJMLuxuqrQvQdYl9HpPgl6ojh2QLCMDcua1riurqcuaO+kB8kfXa7UQipSo2SFy/IayQv2+63xpQ0k04zwMENVJ61O/brdh/q5Q4LyQUfn/UdsM+KI4uYkb7qigcDvbb hN56wLmZ +emGa+KOK/Ao15HnwbPFzz3wDYU1KjZiPkvuRkOSpcrPbyE6yBdVLnXe8zwMst7fQqFrceHOnhOMPOWHgItyaKe+5IU/sZp4XSycxWjofYKUShly2PBHmMHe08wUeRnQxGFclqSk/X5q7IR27cxf+bwXBsUyi89SkOg60dhXzHdD4AbG9WIa3mw/FC0EmnETdGREQcHS8iE3Fxbv8OjWplsUFWEvLfXug4TjDEQfbUen7yqfAuwdsaZ9Q2a8NMOOzC3UbhsrduskyRYs= 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 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(). Do you know which commit broke this, ie how far back should this be backported? Or has it always been broken? > Cc: stable@vger.kernel.org > Signed-off-by: Max Filippov > --- > fs/exec.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/fs/exec.c b/fs/exec.c > index af4fbb61cd53..5ee2545c3e18 100644 > --- a/fs/exec.c > +++ b/fs/exec.c > @@ -895,6 +895,7 @@ int transfer_args_to_stack(struct linux_binprm *bprm, > goto out; > } > > + bprm->exec += *sp_location - MAX_ARG_PAGES * PAGE_SIZE; > *sp_location = sp; > > out: > -- > 2.39.2 > >