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 40103C54E58 for ; Mon, 11 Mar 2024 16:24:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AF9536B00C6; Mon, 11 Mar 2024 12:24:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AA8166B00C7; Mon, 11 Mar 2024 12:24:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 970746B00C8; Mon, 11 Mar 2024 12:24:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 871896B00C6 for ; Mon, 11 Mar 2024 12:24:12 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 4DB581C0C35 for ; Mon, 11 Mar 2024 16:24:12 +0000 (UTC) X-FDA: 81885280344.15.1D029C1 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf04.hostedemail.com (Postfix) with ESMTP id 2A01540008 for ; Mon, 11 Mar 2024 16:24:09 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b="tK7oi/Mw"; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=rlDwVZ60; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=KsuQBzSG; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=jzhtDdT0; spf=pass (imf04.hostedemail.com: domain of jack@suse.cz designates 195.135.223.131 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=1710174250; 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=Gviz5aamPw6bk1Yn/7A3J9/ubb5Bc95XhumqFeNN1XY=; b=tS0GL2b2i7MjggoTYC0XeIyzb2SR/hoapD34EsAYHjlF1DCzrx+ScXutnBvfE8G9wMJYwg vzVYWzRIreyZcBMT4UTMK65kUiMdMeXW1yYuR/SAA90P1EYHI/gm5WevLPzV2DkrdGKY3p Oc8U4U7Mh+gPurbS8N+k5nPQJ+wCOWU= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b="tK7oi/Mw"; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=rlDwVZ60; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=KsuQBzSG; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=jzhtDdT0; spf=pass (imf04.hostedemail.com: domain of jack@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=jack@suse.cz; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710174250; a=rsa-sha256; cv=none; b=yu2TW8TPBfxYGoSex1sVxlbKtlcEC6UWGDpLNAQgiptMgK85Pw0/c7+MKNHZg5577jAruF CFnpeG/nltHL0Bp2lDYW9xNXUir2jL6BCPGQg4RiPuzztEmzvUThS90j6iVPY2cLM3FIN8 W0/ax2rdqTwOzKzjGCqbKgxxNcadL1Y= 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-out2.suse.de (Postfix) with ESMTPS id 6676A5C922; Mon, 11 Mar 2024 16:24:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1710174248; 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=Gviz5aamPw6bk1Yn/7A3J9/ubb5Bc95XhumqFeNN1XY=; b=tK7oi/MwDjs5+QGIyJm895NxQuZCxk1I3xYUasuE7NieqDMvUF35GyFsnezsxvGrl+qvrc Ch31f59wUdyKJ0w4F9lzbpYlCGu8bH0lg5n06h2/I40lEevzULkTgaT5zoLdNXYg7/S7UN I3ZMTvcQeN9mEeewsmOz2e+vy4SHN0s= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1710174248; 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=Gviz5aamPw6bk1Yn/7A3J9/ubb5Bc95XhumqFeNN1XY=; b=rlDwVZ60gnNkXjgzoRpSqjKQwHVZf0C/DnFnoLKhzaW2kyJPXLVGnUOGUWwqXcDeuhJwQ3 qUFIhNWD5i5KjpAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1710174246; 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=Gviz5aamPw6bk1Yn/7A3J9/ubb5Bc95XhumqFeNN1XY=; b=KsuQBzSGY3fEOHsRlsOsznJCdxQICyIoKDdm8Vn+f3w8nW9qrRwT+90/WKF4gKu2+jsrPr AY8JL5VPPhzyFwXyG3cHIzPRbQjjODfIG4WSZn5Y1VKdhHxcvClHIfcEzzWTWIq6tn6cIH 3rygFR4sJsvRTOEoQ7QV4KBtN7Jl3MQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1710174246; 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=Gviz5aamPw6bk1Yn/7A3J9/ubb5Bc95XhumqFeNN1XY=; b=jzhtDdT0N+uL90UQCPBu9X87oMs/u+fIl3ARPtRp7x4/3oZcymnuXyZVy7sbdQ2XtitIBV GgZdtqq/mSUSenCw== 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 5BC711395F; Mon, 11 Mar 2024 16:24:06 +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 kLtdFiYw72VwFQAAD6G6ig (envelope-from ); Mon, 11 Mar 2024 16:24:06 +0000 Received: by quack3.suse.cz (Postfix, from userid 1000) id 158D6A0807; Mon, 11 Mar 2024 17:24:06 +0100 (CET) Date: Mon, 11 Mar 2024 17:24:06 +0100 From: Jan Kara To: Kees Cook Cc: Eric Biederman , Alexander Viro , Christian Brauner , Jan Kara , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: Re: [PATCH] exec: Simplify remove_arg_zero() error path Message-ID: <20240311162406.7vc64qbta24psk3j@quack3> References: <20240309214826.work.449-kees@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240309214826.work.449-kees@kernel.org> X-Rspamd-Queue-Id: 2A01540008 X-Rspam-User: X-Stat-Signature: s8tb6a9wnzw8om8re8awyh6gejmrubky X-Rspamd-Server: rspam01 X-HE-Tag: 1710174249-939201 X-HE-Meta: U2FsdGVkX18zk9OEWRhTXCwqLYsMfPnY/WKnXLiAN62pHoFx9hUckWn3PGynzQOEg8ZIN6O7H156rH5OCloN18L2nDyq14TQbbeu401kk7+OZl8hFwr0tp5s/LTw0DymfeL/8/D+Vr7hPHXror1gzWhvcv2Vmm00rUFM19eAFjysk0tKtHVzNmLceYaEMXWE+4KUdqN4KjVa3B0qJn9YYjKx5SHA7TW3xodLJeRPph7XMjtDJ3P/af6WcvDJJFuvfAmyz0CtDpFMEqGIh6yAiNgW314BftojOwOILvPOWSrK2irWSTvks66Tucx7aDe+xiIBsuRH0sfdq6SgKGhBCbUw8FD1kBOZXpI8hmNygx8N4EksMkG7Pcu+PZyCYOEy8hIU6MelXLscpSYax6RFRTkAsAtm7fZFRlqrIqrYL2wpZx7dukjTRbUW1F0a3uKE7Purs7+uTpxan80m/w8J4w8Vy4PXuYAs43iJhGFSVIn70QYPuwU6jFvXjmHYNnGS9oVBQvmt/rFoO1Fn+Zmz7Y/SsTcS4+FdTdJ1iB5aIN+wiBwB+sssR7zNqXEv0VTYaLbA5Ch9shZsE4V6GR2VVvKDskVd8CLVBq23gnCpvrXwqOa1wK7ajmlRFwYZm7eAN3YcZ4qcc9X34xTvYI3Tx9MhqXwR30GewqYv1hUN+Hpr1TO1GUYhId+Imv8ENqgWpC/OU9GT9rD5Ec0dynp1wok5BeFMuK8+3w6wbU4Np8CH55/hkk1z8ZQWs2e9ltbtDf5Cnckl1hDT4fkBP5wY31Aaj+crlIUfgHgK5vGX1m0U5rGwpgeQLTBJmQC4s1pHcI4YZThL7jJzW/1pHJJKo0yLtbJkZpl0ICwfAb1g9IUTGizkdhhOtaOw9oQhTnN2ntQkmXcfDonsrfpTvIOi3zav3agpO7ZmD4ZC05GlGyfUNC3RYjfVwkNgLJGCdW01 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 Sat 09-03-24 13:48:30, Kees Cook wrote: > We don't need the "out" label any more, so remove "ret" and return > directly on error. > > Signed-off-by: Kees Cook Looks good. Feel free to add: Reviewed-by: Jan Kara Honza > --- > Cc: Eric Biederman > Cc: Alexander Viro > Cc: Christian Brauner > Cc: Jan Kara > Cc: linux-mm@kvack.org > Cc: linux-fsdevel@vger.kernel.org > --- > fs/exec.c | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/fs/exec.c b/fs/exec.c > index 715e1a8aa4f0..e7d9d6ad980b 100644 > --- a/fs/exec.c > +++ b/fs/exec.c > @@ -1720,7 +1720,6 @@ static int prepare_binprm(struct linux_binprm *bprm) > */ > int remove_arg_zero(struct linux_binprm *bprm) > { > - int ret = 0; > unsigned long offset; > char *kaddr; > struct page *page; > @@ -1731,10 +1730,8 @@ int remove_arg_zero(struct linux_binprm *bprm) > do { > offset = bprm->p & ~PAGE_MASK; > page = get_arg_page(bprm, bprm->p, 0); > - if (!page) { > - ret = -EFAULT; > - goto out; > - } > + if (!page) > + return -EFAULT; > kaddr = kmap_local_page(page); > > for (; offset < PAGE_SIZE && kaddr[offset]; > @@ -1748,8 +1745,7 @@ int remove_arg_zero(struct linux_binprm *bprm) > bprm->p++; > bprm->argc--; > > -out: > - return ret; > + return 0; > } > EXPORT_SYMBOL(remove_arg_zero); > > -- > 2.34.1 > -- Jan Kara SUSE Labs, CR