Received: by 2002:ab2:6203:0:b0:1f5:f2ab:c469 with SMTP id o3csp2849440lqt; Tue, 23 Apr 2024 03:40:46 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUYquDDpH59OijXwhgV7v9E8Ziw/TIzukXsAf9duOQbr1aiZH7csWNjHJ/ObsqyFAyElqDEGqQ+zGq1Pp2QhOZ0ebLHB81WzJH5fcGgew== X-Google-Smtp-Source: AGHT+IGdNnUpC6RYV/qBQw9+MXT9JXm6ISeCXuQ9YLNWPoYOvBlpwd2x8nL14uoplMLYt+cCkBj4 X-Received: by 2002:a05:6870:f153:b0:22e:8d62:fa75 with SMTP id l19-20020a056870f15300b0022e8d62fa75mr16259712oac.44.1713868846062; Tue, 23 Apr 2024 03:40:46 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1713868846; cv=pass; d=google.com; s=arc-20160816; b=bEzhv3hD7YXP6SCBS2PxzEHZb9f+tZEU+UIkJMic4bOV/bGuCT50PM06mI+SapwMbp 1RlBXk/quTDOtEeJ5+novGiLT5HnBP4I23Ww3x+1P7FBep9K1l0Vct6dbo0q5rlI2vLC R1kjJJyFBhiCkggl4d5aDLEW6FgcOP1f+foQvFjwGX4pXH9GIV6RgERmLz5LYiTcV8Ry AZdL4+oQiN949jLS3TvqcbKbKrObxoWNEUosHMTY8bfpD0n2qQGoWWeSt6+PzyrhBwBH is4ge5HWo3Mifnj2ePA9dMwWoCEdiJ51yhztuMSM5DqCpMHqHTZlQL2AchtNS8mjd23f dUbg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=5kgbLMAE980GVvENsTEIPE4CBNTxsGKzzeodVahHYoU=; fh=9AzAXS4w4IsN+VvRGocCrL3OXJQhCk/z3Vdk6r2WJmY=; b=tq5LdG5rr5ogJWEcvNv0EiuPGaLuSyCDEVILu1mSQqbPwhgXp+C9QJZh/Edz5DKm3L UZweZPQ+vXuqKT90+Jv2q7mtZwLN+nlrYZJrdmYdRFY2dhIUKAAJELXIqW/H4i8B1ChR 3Nyj2ZxY646q1GyW5Y34gWfSrG1SYOMUpvNsiy2xWLxfZIvok77XHMXpL3gfTCp4/0v4 CLpPj9HkJGYmDaOmcyrfInXYqaT9KS+plQ2O6sKP8esYM6lqYMhowd+nSNMe83JPmVGr Uzpan2JnAutlY0Toqgq5R/kQb+3/PrAeV4bTK+FNOSf301jbAyrPtXVqxy26R7hiXL3K t2tw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@yandex.ru header.s=mail header.b=ASAY3s+Q; arc=pass (i=1 spf=pass spfdomain=yandex.ru dkim=pass dkdomain=yandex.ru dmarc=pass fromdomain=yandex.ru); spf=pass (google.com: domain of linux-kernel+bounces-154883-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-154883-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id 206-20020a6302d7000000b0060257c61207si1849345pgc.752.2024.04.23.03.40.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Apr 2024 03:40:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-154883-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@yandex.ru header.s=mail header.b=ASAY3s+Q; arc=pass (i=1 spf=pass spfdomain=yandex.ru dkim=pass dkdomain=yandex.ru dmarc=pass fromdomain=yandex.ru); spf=pass (google.com: domain of linux-kernel+bounces-154883-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-154883-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id F3900281680 for ; Tue, 23 Apr 2024 10:40:44 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 78C2C69959; Tue, 23 Apr 2024 10:40:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=yandex.ru header.i=@yandex.ru header.b="ASAY3s+Q" Received: from forward100b.mail.yandex.net (forward100b.mail.yandex.net [178.154.239.147]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E075D54BE7; Tue, 23 Apr 2024 10:40:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=178.154.239.147 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713868834; cv=none; b=oflPYZVcqbSFMngX/yp04MGHJwFu9QhF0Z77o81doDEu9R48jZc3tBdfUbn5iR0KLe2PXUYFR9Z9v8sBZfw3sOoW1dEurEp2lO5IBb9y1DoIMMgoV5zU5IKce4gLGMGk9zoDr9oR4XxyiN+bjX4pw8ToTxq2fKNAWZfZG2JpbaA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713868834; c=relaxed/simple; bh=t2/9kzu5cn37NlBr754kfbC9x4lMRcCfuiRc7DMS7GA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TGEQwaH/UhONzTr8vy+ugoiFM1qulAPv5BY94Qh43eBAEewkBtQXTP3SlrvW2xE/NjSBXI4WBttjg/mlSzYFhPBGW93pttrMGFj65TmuI/PPRhbtTSPaUrUZEQ+9WYpqgzdDBnkgAqIA2OczyXqu8QG0vh++cRNNsi70w43DZ1g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=yandex.ru; spf=pass smtp.mailfrom=yandex.ru; dkim=pass (1024-bit key) header.d=yandex.ru header.i=@yandex.ru header.b=ASAY3s+Q; arc=none smtp.client-ip=178.154.239.147 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=yandex.ru Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=yandex.ru Received: from mail-nwsmtp-smtp-production-main-39.myt.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-39.myt.yp-c.yandex.net [IPv6:2a02:6b8:c12:3b13:0:640:bf9:0]) by forward100b.mail.yandex.net (Yandex) with ESMTPS id 299A060ADF; Tue, 23 Apr 2024 13:40:24 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-39.myt.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id MeHq0QCOr0U0-n6Cxqhxt; Tue, 23 Apr 2024 13:40:23 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1713868823; bh=5kgbLMAE980GVvENsTEIPE4CBNTxsGKzzeodVahHYoU=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=ASAY3s+Qu4TnCCbqgsJLM+3bWzkUEYNCPvTHiOzVwoqBq6iU0XOzQeLotoOJfjYL2 JRsNMCkPLEazXJvKlyL8CfAZPlnHjDjP45i7B5D/499Kjk2FLzhn8RBlyDoGlQYaMc LmY1Onj5mCVK4Q3fBzz3EuOCIN7f/8aWaaFEPcNg= Authentication-Results: mail-nwsmtp-smtp-production-main-39.myt.yp-c.yandex.net; dkim=pass header.i=@yandex.ru From: Stas Sergeev To: linux-kernel@vger.kernel.org Cc: Stas Sergeev , Eric Biederman , Alexander Viro , Christian Brauner , Jan Kara , Andy Lutomirski , linux-fsdevel@vger.kernel.org Subject: [PATCH 1/2] fs: reorganize path_openat() Date: Tue, 23 Apr 2024 13:40:01 +0300 Message-ID: <20240423104002.9012-2-stsp2@yandex.ru> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240423104002.9012-1-stsp2@yandex.ru> References: <20240423104002.9012-1-stsp2@yandex.ru> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This patch moves the call to alloc_empty_file() below the call to path_init(). That changes is needed for the next patch, which adds a cred override for alloc_empty_file(). The needed cred info is only available after the call to path_init(). No functional changes are intended by that patch. Signed-off-by: Stas Sergeev CC: Eric Biederman CC: Alexander Viro CC: Christian Brauner CC: Jan Kara CC: Andy Lutomirski CC: linux-fsdevel@vger.kernel.org CC: linux-kernel@vger.kernel.org --- fs/namei.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index c5b2a25be7d0..2fde2c320ae9 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3782,22 +3782,30 @@ static struct file *path_openat(struct nameidata *nd, struct file *file; int error; - file = alloc_empty_file(op->open_flag, current_cred()); - if (IS_ERR(file)) - return file; - - if (unlikely(file->f_flags & __O_TMPFILE)) { + if (unlikely(op->open_flag & __O_TMPFILE)) { + file = alloc_empty_file(op->open_flag, current_cred()); + if (IS_ERR(file)) + return file; error = do_tmpfile(nd, flags, op, file); - } else if (unlikely(file->f_flags & O_PATH)) { + } else if (unlikely(op->open_flag & O_PATH)) { + file = alloc_empty_file(op->open_flag, current_cred()); + if (IS_ERR(file)) + return file; error = do_o_path(nd, flags, file); } else { const char *s = path_init(nd, flags); - while (!(error = link_path_walk(s, nd)) && - (s = open_last_lookups(nd, file, op)) != NULL) - ; + file = alloc_empty_file(op->open_flag, current_cred()); + error = PTR_ERR_OR_ZERO(file); + if (!error) { + while (!(error = link_path_walk(s, nd)) && + (s = open_last_lookups(nd, file, op)) != NULL) + ; + } if (!error) error = do_open(nd, file, op); terminate_walk(nd); + if (IS_ERR(file)) + return file; } if (likely(!error)) { if (likely(file->f_mode & FMODE_OPENED)) -- 2.44.0