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 69419E7717D for ; Wed, 11 Dec 2024 16:48:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E267C6B009B; Wed, 11 Dec 2024 11:48:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DD7326B009C; Wed, 11 Dec 2024 11:48:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C77A86B009D; Wed, 11 Dec 2024 11:48:26 -0500 (EST) 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 A665F6B009B for ; Wed, 11 Dec 2024 11:48:26 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 3DC6D1A1371 for ; Wed, 11 Dec 2024 16:48:26 +0000 (UTC) X-FDA: 82883260488.07.0747CF7 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf25.hostedemail.com (Postfix) with ESMTP id 339C5A0016 for ; Wed, 11 Dec 2024 16:48:06 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=JCzrzn4N; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=r0JdujfP; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=JCzrzn4N; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=r0JdujfP; spf=pass (imf25.hostedemail.com: domain of jack@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=jack@suse.cz; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1733935680; 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=kVgazgq1PikQ/169F+CRX5eNyOAH+ARoQ+7953vu2/A=; b=rYaAgxl74dizAw2FvkzEO8HsnyCgJTdVgomJe7+155QigTjmncosQ+E0da475M7czG30QF MKNnmItrjbBkg4WpJ3lXbSY6AO5Pr9HJQXJagYR1kD1IUlAG2FQHI3oveH7Id2b9OPu7EO 6kXwl+YpB25vRv+pPlUssM/PRzjFNQo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733935680; a=rsa-sha256; cv=none; b=aHJqj32Y3amxYUM1GsvGyEQc9hp5JarBqDIP1YX2+tfsn1DY+GkBFEc3Srw+Hzp4QT4Rk7 y67cDBtOSLVfYlKYKLcB/O08VGOFyn2N07tW4OPztUhheYkNavo1FnDVvYaUfeFWLW1yPD NqBVPfyvX4JYQuWY7oKZ5+OX8jLG7cM= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=JCzrzn4N; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=r0JdujfP; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=JCzrzn4N; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=r0JdujfP; spf=pass (imf25.hostedemail.com: domain of jack@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=jack@suse.cz; dmarc=none Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 4B90D2117B; Wed, 11 Dec 2024 16:48:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1733935702; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=kVgazgq1PikQ/169F+CRX5eNyOAH+ARoQ+7953vu2/A=; b=JCzrzn4NkNwitIrDl6BEfFHTA5bXkjvmDw5mJ2PkaupDO2kdFQwyXAXTvnQ8Fy9XcodufA 83pNCRi6gT7rpnrSPXh6grzSYo0h/2tPFeUK/9RUevGimcxqUo7UhAFphtl+DchViG1ygo gIgRBWd7n/LaePieCt4fCv0G31yYgdg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1733935702; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=kVgazgq1PikQ/169F+CRX5eNyOAH+ARoQ+7953vu2/A=; b=r0JdujfPg2zXdNiLJAJ9fV8jIJm+zxrFllPeWFblT+UrxAkeKdb3thwqzmmAR7tuoIIK5R hwVocnNyOFdJOOBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1733935702; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=kVgazgq1PikQ/169F+CRX5eNyOAH+ARoQ+7953vu2/A=; b=JCzrzn4NkNwitIrDl6BEfFHTA5bXkjvmDw5mJ2PkaupDO2kdFQwyXAXTvnQ8Fy9XcodufA 83pNCRi6gT7rpnrSPXh6grzSYo0h/2tPFeUK/9RUevGimcxqUo7UhAFphtl+DchViG1ygo gIgRBWd7n/LaePieCt4fCv0G31yYgdg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1733935702; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=kVgazgq1PikQ/169F+CRX5eNyOAH+ARoQ+7953vu2/A=; b=r0JdujfPg2zXdNiLJAJ9fV8jIJm+zxrFllPeWFblT+UrxAkeKdb3thwqzmmAR7tuoIIK5R hwVocnNyOFdJOOBA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 322FC1344A; Wed, 11 Dec 2024 16:48:22 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id ZZQ6DFbCWWcDXgAAD6G6ig (envelope-from ); Wed, 11 Dec 2024 16:48:22 +0000 Received: by quack3.suse.cz (Postfix, from userid 1000) id DFDC5A0894; Wed, 11 Dec 2024 17:48:21 +0100 (CET) Date: Wed, 11 Dec 2024 17:48:21 +0100 From: Jan Kara To: Dan Carpenter Cc: Amir Goldstein , Alexander Viro , Christian Brauner , Jan Kara , Kees Cook , Eric Biederman , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: [PATCH next] binfmt_elf: Fix potential Oops in load_elf_binary() Message-ID: <20241211164821.ki4wy4ltffgx677t@quack3> References: <5952b626-ef08-4293-8a73-f1496af4e987@stanley.mountain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5952b626-ef08-4293-8a73-f1496af4e987@stanley.mountain> X-Rspamd-Action: no action X-Rspamd-Queue-Id: 339C5A0016 X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: ieubxaobr7komo1i4jdzpngekyedubm3 X-HE-Tag: 1733935686-981575 X-HE-Meta: U2FsdGVkX197TpbEt2fenTyoJxkdyNBNqr339wJz3w8ZcrxWXcsvPpWJtW96aT31AKrmZI5rVkiQhUJB9lX9TPbtXUSHjHPEUj+GiphJ0LLZ9ipgxcIB3zvfy/TdUxRAvhf+Foepq2bYXRJYH5nK1AKJeyDiT3p5nnsgzpyPPIbYzOWaT2HwN+C8mP1qXcXW8Rll+E1StRKaUbnJgywcYcCcnROc291HR69I2mdgkzYi5wrsJXvWU49DECxIB9+R8MGpM2iyeu/x0zZ6I8tLGEdNPxfeAICfJDVW+xAeq4VOdblzKqEofGRUP29YzELCWX3TbTyTMOLBUq7+8pIHzoF5P9J7wEydyLquTRsaeSTrga/GG84ToVeDlQrZ2CdDvRaWEIUsMuZehwEp4p3enuZRfjOphgkU/XdthQwMf/nZ5s9Zf+UTOt18eaWnakbrCCStNNkWouZ2FkfTUB0Tm0XPbZRjq65OpCGzNTyFoevBYXA937aL5fjjmJ4DLy+ZGO2eZqndsiQIQ8nyoubIhnAm6ODFKX/q/vSx2HAVKp+/xUiiM1h9lvhmS5N94oXLIK47B2gYErfEV7tk9QcycWl+m1wLhtnqM8i7YbMCKqqNqSq/FIkRjJh39LUl2agElXPoDCL5R5pIjUW4mIJJcwiMhqH79VkrtqdAVxqm4eXjPfE97P9At/kawWMgBoBHD7FTQQulod9v6dfFaOiIQlSthFpB6O7UWJ32auPj/Gt558AwykVGS4nb8tiut1kYWEQyAC1unbKb9051u+s7VPDcv8xN+7/8NS7poR4tu0RYd2jKq+dwf98d9JPuPeEKZLA9Z++kfUN2NWd1/modZptJ7KQUbAc8WkK/KjossVzRex2sesjmEdXEj65N9cP5rUAkJkepIfzqXwY0sYGWS6hBtdtBl18R50sX1bQiy1qSLc2oRND+bPTBSvoN8d4+qdgtkX08JukDEGAEmDj qxzkoarA +bToz+FZDH0QHAAYh/M62n8FGYwSpW849ZwMnhMVgiMIDzx82Bii6gMSCzMmrF8jfQZST+FzEMYOLlektG4+j+8Vgm8T/kXjVJAAmZIoG7iqL2AmKSN9LpoDH/HwSPe1I5gemQo2pxjEd42pbkqLpC9zTHJodyk8eessUeEQ5fgH6/3HRP3hj71irbNp0D/3bc+7OB5it3djzXdkRsMwmxIRNmTGdgG8+pv47oLBOeAX+THT6B2R+rF1YrzL4KUl7+W9t5GyTjQdjYj8w5QVKgUUspQRwRl8S7cPeW8fKjyX87kkS23MsazoGS/W68wlW+Amhx+ubVch/QrFmd621AfMgEpBG7V02A3uG9vnrlptj4Ajl4pHx2+pawc14BO812WkjRHJNvB6wtXA8mGiwf88g8sQxiIYsOOT53Cm2G9Tcctas37qoZRoJ1GLqM+BiW/tl 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 11-12-24 12:21:39, Dan Carpenter wrote: > This function call was changed from allow_write_access() which has a NULL > check to exe_file_allow_write_access() which doesn't. Check for NULL > before calling it. > > Fixes: 871387b27c20 ("fs: don't block write during exec on pre-content watched files") > Signed-off-by: Dan Carpenter Thanks for noticing! I've opted to change exe_file_allow_write_access() to check for NULL instead to be 1:1 replacement for allow_write_access(). Because bugs like this one are very easy to introduce. Honza > --- > fs/binfmt_elf.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c > index 8054f44d39cf..db9cb4c20125 100644 > --- a/fs/binfmt_elf.c > +++ b/fs/binfmt_elf.c > @@ -1354,9 +1354,10 @@ static int load_elf_binary(struct linux_binprm *bprm) > kfree(interp_elf_ex); > kfree(interp_elf_phdata); > out_free_file: > - exe_file_allow_write_access(interpreter); > - if (interpreter) > + if (interpreter) { > + exe_file_allow_write_access(interpreter); > fput(interpreter); > + } > out_free_ph: > kfree(elf_phdata); > goto out; > -- > 2.45.2 > -- Jan Kara SUSE Labs, CR