From nobody Fri Feb 13 00:07:44 2026 Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 617931474AB; Tue, 4 Jun 2024 15:53:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717516398; cv=none; b=RCVmBXs/ZWlFJpruSL33mxSZqVzLyaEclFerLE2TKkP/KzZujwDIj1uEnUCGh/+/qb/rRKmv2Bc3+ZWXrEl/6oEvL5s/4TEyc/l22iZkevh4b5VEinRPkyNsVQdLfatK3qIA13m/a4jS7gkRkQp0rzvSg48WUjFTa+acd3rUKiU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717516398; c=relaxed/simple; bh=tMBXAI4+JUxnDlQdGAtRefkZXdzUZEdU1Qfk31P+ms0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LbPLUfBhrtSa6DqDku6ZFnjireAFoOY3KpQu8vBndJfNvbkkXrz0cCw3Gqrwwhqyd5v9XFVMzgqxLqvclMa63mG0uRni40TQJdSKVmxmTRPZGvF0eDnh93qOlt5IPbMdd1z9qg27j4Mm94RBtOt6WlZTxl8o3c8QUrSVXeAe+70= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=k3XY6rne; arc=none smtp.client-ip=209.85.167.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="k3XY6rne" Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-52b98fb5c32so3594006e87.1; Tue, 04 Jun 2024 08:53:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717516394; x=1718121194; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=R6PdKVABS3e7RwAi2tNTcCnkObTlYGjLjXFR+XzE8rQ=; b=k3XY6rneW9phJswCeoym4yRut8Z6vJox1iI9/Qtyv5bxTl2MyqWPrT5XZ13MyOn2jO ZeyutxEKx8W2HpFC8PnVq49MsWYNtuyXxqwfvJSMHC2P5egUHSSmciZ9tmobjRa/6Kim hs/TLdcHQGCL91PuomhgSyaHjdLv0Uva++BVZGwgQgvaY9VtON5CVSS6R5gRl4ggOwtS 36YqsfO3xVTDtjsIpSba62sEgX0lokFj323gqWcYLUyKceWVoQkMtXDW/UC1GBB+ZG7g o7AJjfkbW0GMm6jgseAsS+abxoRzUSOdrGY8RIiaApf2p8kOXhu5BUyYt/tQjh9ufLd2 uovg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717516394; x=1718121194; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=R6PdKVABS3e7RwAi2tNTcCnkObTlYGjLjXFR+XzE8rQ=; b=tIQVgfQtbjjDygrODimoPyqGTpMkevkRCTDjMBQONHuYqL8sxEo1g6uurZIklj+e/0 0IsVpCJbQNimPFGw+AGqc4xpHbQRCQ6EgAbHMdZnQxeu6DykvtJ1gn7uUTzAtNeFIL0m FEGDF9msl5tOq6uRz+NjNj9Mb1UnLbQtTdZJH5PquV6jTwVDiHSagj5sj7KngvE2dIAN PmrcHHATcStP3t8VrDkJ0LlzEcxJRZW8WEyP3rdlxuXrKTkJUCWtfIdwYszG9JfM5IMc MDt2zh+2uUNpj1PMx09T802XWqiaORGgCjKQQ93dMA0NKKsf70vYr+tnzrvJ5zY3GgwT lkMg== X-Forwarded-Encrypted: i=1; AJvYcCWseEDb4Yt0WeDbTfk4Oj0aghkndylZhWwC8DE6yjjcwgumSKVMwT1N92wKBeCMD+GC9YEh0TMyYv1gn1ED40oJkU6p9BSYOAPtZDnhSqFxp6tfzmYTa0Bsf6l+QvZq2nViiojU4T+tgkajfA== X-Gm-Message-State: AOJu0YzEU2Ic3Cp5M2Fww1QIrMXHkY1wqYAkz9ImgGJSEz9QqY+HBnMG fAO8nC8Wgik0WtzPsuMfy4rXPHeOS6SNcg1M1FbfcYkByzAufu7k X-Google-Smtp-Source: AGHT+IFixkhL6B2yIFzDCIiEU0g30JheVCrHFR8NduhYQFccsu8JGd7qRECjDW3EvwWRTQfxaN6/cg== X-Received: by 2002:a05:6512:3b96:b0:52b:944c:3bb3 with SMTP id 2adb3069b0e04-52b944c3c5fmr9032283e87.55.1717516394277; Tue, 04 Jun 2024 08:53:14 -0700 (PDT) Received: from f.. (cst-prg-5-143.cust.vodafone.cz. [46.135.5.143]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a68e624db7esm423380066b.66.2024.06.04.08.53.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jun 2024 08:53:12 -0700 (PDT) From: Mateusz Guzik To: brauner@kernel.org Cc: viro@zeniv.linux.org.uk, jack@suse.cz, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Mateusz Guzik Subject: [PATCH 1/3] vfs: stop using user_path_at_empty in do_readlinkat Date: Tue, 4 Jun 2024 17:52:55 +0200 Message-ID: <20240604155257.109500-2-mjguzik@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240604155257.109500-1-mjguzik@gmail.com> References: <20240604155257.109500-1-mjguzik@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It is the only consumer and it saddles getname_flags with an argument set to NULL by everyone else. Instead the routine can do the empty check on its own. Then user_path_at_empty can get retired and getname_flags can lose the argument. Signed-off-by: Mateusz Guzik Reviewed-by: Jan Kara --- fs/stat.c | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/fs/stat.c b/fs/stat.c index 70bd3e888cfa..7f7861544500 100644 --- a/fs/stat.c +++ b/fs/stat.c @@ -488,34 +488,39 @@ static int do_readlinkat(int dfd, const char __user *= pathname, char __user *buf, int bufsiz) { struct path path; + struct filename *name; int error; - int empty =3D 0; unsigned int lookup_flags =3D LOOKUP_EMPTY; =20 if (bufsiz <=3D 0) return -EINVAL; =20 retry: - error =3D user_path_at_empty(dfd, pathname, lookup_flags, &path, &empty); - if (!error) { - struct inode *inode =3D d_backing_inode(path.dentry); + name =3D getname_flags(pathname, lookup_flags, NULL); + error =3D filename_lookup(dfd, name, lookup_flags, &path, NULL); + if (unlikely(error)) { + putname(name); + return error; + } =20 - error =3D empty ? -ENOENT : -EINVAL; - /* - * AFS mountpoints allow readlink(2) but are not symlinks - */ - if (d_is_symlink(path.dentry) || inode->i_op->readlink) { - error =3D security_inode_readlink(path.dentry); - if (!error) { - touch_atime(&path); - error =3D vfs_readlink(path.dentry, buf, bufsiz); - } - } - path_put(&path); - if (retry_estale(error, lookup_flags)) { - lookup_flags |=3D LOOKUP_REVAL; - goto retry; + /* + * AFS mountpoints allow readlink(2) but are not symlinks + */ + if (d_is_symlink(path.dentry) || + d_backing_inode(path.dentry)->i_op->readlink) { + error =3D security_inode_readlink(path.dentry); + if (!error) { + touch_atime(&path); + error =3D vfs_readlink(path.dentry, buf, bufsiz); } + } else { + error =3D (name->name[0] =3D=3D '\0') ? -ENOENT : -EINVAL; + } + path_put(&path); + putname(name); + if (retry_estale(error, lookup_flags)) { + lookup_flags |=3D LOOKUP_REVAL; + goto retry; } return error; } --=20 2.39.2 From nobody Fri Feb 13 00:07:44 2026 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D73021482F8; Tue, 4 Jun 2024 15:53:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717516400; cv=none; b=IKPwXz1t3ZMpof1j+JcFmq/bFuHCzNvgDKIC3ZgEHwoSjMC+Lx6hI5t2QzhcAHupNuP2Ox+vaoxopBmKf3gkhQkTMkEALgmomAxS/ve9IuStlc5+3T9TffeNnVIpOeKekMQ0Bft0pGdv3h8YY4FHWv98Ec/9KMjQC1VoxeMXwVY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717516400; c=relaxed/simple; bh=QkW3SvG5lIBGi+xj5/6s/uyRlY3WWLtM5dqC8ElbGu0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XWKfmoJf/8hKiV19ILwsJLKOB9YLM2zMwtatTriY9o0XcdqPrzuGAbPRKqY/Im8mWccKinSCGO3uqlo9OMIRiS0TIEt36nFcpdwSPOF2APQDSksN6y37+SGufJX5QQ7WzG0aSKikxux3JTcxsbWwVEeo3s4oWFXpqeDHyZl1mV0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ifBz3601; arc=none smtp.client-ip=209.85.218.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ifBz3601" Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-a66e9eac48fso142718766b.2; Tue, 04 Jun 2024 08:53:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717516397; x=1718121197; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UkzuhEo4BQwLs6INDRHAya/ilVzdn/qWQpTRJpM6bwU=; b=ifBz3601fODlXbkO8fPjY+CNjvptFRteSdJEsSWo1iagp9vkeqTiAXxnAr7ApXfCOW OBpydLpfH9q6DYvEAPktrnI3U7XNNi1iqgPoPNAvLx3Z8o63oX8XWhMqkDHs4YOGj5A3 76yZozo/SjOLw/ImTXk//xgpJaMEPart74nrdHChHgbv6vwt1jrJ9WOTEyFID4CxPRdL EkWUFLP0ut2MfTqGid0yWZx4fnN53Zv3ieFlXvM7CZdSXyV2hV8hgA0AbbbNrs+thLHc ctHgctwttAoQBM7xD/IixkLXkFXfs6PMeQ8W2kccpQgkpnefWnTM6kGrfQ0AninJBYep N6Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717516397; x=1718121197; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UkzuhEo4BQwLs6INDRHAya/ilVzdn/qWQpTRJpM6bwU=; b=HE7gY8STZvj7vFUstAqSumg1gBzWj/IOtgijjeJLNKGXBJfTVI5+N1UQgafq3rWmkV wB8XzpU/lU8D6VeoDr573QudhMNzGwyLJ1pd8KHkrS5xt6FRNE/Lm0AB/j7ga7qVcf9F /FK0AfGYkyco5z34/xM9QLm3o5d8xkvwkCws4L2RiIRRxy5Z7gvYUFwyPUkoEtPAI56Y ztkmKSadsOJLrFGVlKoZ74Lt0/O/J3lHOqr9soYte1FNWP+LZDVu4Ll+gdo1zoH+vqDe gd6WUq56jsDfR6fL9yT0FTIQCu0JtQKxtFvggkHcQ5B6/VVx+k8NJDlDQqNTDpcyXeGF YC0A== X-Forwarded-Encrypted: i=1; AJvYcCUX1X1NxSuH9fhDlsY3zBu2vt9B69wAljoftAlKbRGrdTF6gDrC6XeoEuECXF83e/LdGTSt5rJz9IyzPOESLO8kCy7d2ZqrakeZ4Sr6YQ5FiKvOcaRYQ97eUqfIHmW17tHVilNlcSj6gOa3YA== X-Gm-Message-State: AOJu0YyCQFdiD6FE7ENJ6+cjzRvrp6/n3PDlfZuBNlJHkNsukwQ9m0it 4y9uexZtTq7Na8Ew4zjnl+V+wm6d5Ys8Ckyy/LM9bsp60yo2aci8 X-Google-Smtp-Source: AGHT+IFr8HmHXhs0JYPKGkjVrHmJxxh9xiS7V7agvtpCEtFOygZyXTjd/Q2OFd5DXjS1KGIsAf/Lhg== X-Received: by 2002:a17:906:5957:b0:a68:a958:db18 with SMTP id a640c23a62f3a-a68a958dcbamr681321066b.76.1717516397189; Tue, 04 Jun 2024 08:53:17 -0700 (PDT) Received: from f.. (cst-prg-5-143.cust.vodafone.cz. [46.135.5.143]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a68e624db7esm423380066b.66.2024.06.04.08.53.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jun 2024 08:53:16 -0700 (PDT) From: Mateusz Guzik To: brauner@kernel.org Cc: viro@zeniv.linux.org.uk, jack@suse.cz, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Mateusz Guzik Subject: [PATCH 2/3] vfs: retire user_path_at_empty and drop empty arg from getname_flags Date: Tue, 4 Jun 2024 17:52:56 +0200 Message-ID: <20240604155257.109500-3-mjguzik@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240604155257.109500-1-mjguzik@gmail.com> References: <20240604155257.109500-1-mjguzik@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" No users after do_readlinkat started doing the job on its own. Signed-off-by: Mateusz Guzik Reviewed-by: Jan Kara --- fs/fsopen.c | 2 +- fs/namei.c | 16 +++++++--------- fs/stat.c | 6 +++--- include/linux/fs.h | 2 +- include/linux/namei.h | 8 +------- io_uring/statx.c | 3 +-- io_uring/xattr.c | 4 ++-- 7 files changed, 16 insertions(+), 25 deletions(-) diff --git a/fs/fsopen.c b/fs/fsopen.c index 6593ae518115..e7d0080c4f8b 100644 --- a/fs/fsopen.c +++ b/fs/fsopen.c @@ -451,7 +451,7 @@ SYSCALL_DEFINE5(fsconfig, fallthrough; case FSCONFIG_SET_PATH: param.type =3D fs_value_is_filename; - param.name =3D getname_flags(_value, lookup_flags, NULL); + param.name =3D getname_flags(_value, lookup_flags); if (IS_ERR(param.name)) { ret =3D PTR_ERR(param.name); goto out_key; diff --git a/fs/namei.c b/fs/namei.c index 37fb0a8aa09a..950ad6bdd9fe 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -126,7 +126,7 @@ #define EMBEDDED_NAME_MAX (PATH_MAX - offsetof(struct filename, iname)) =20 struct filename * -getname_flags(const char __user *filename, int flags, int *empty) +getname_flags(const char __user *filename, int flags) { struct filename *result; char *kname; @@ -190,8 +190,6 @@ getname_flags(const char __user *filename, int flags, i= nt *empty) atomic_set(&result->refcnt, 1); /* The empty path is special. */ if (unlikely(!len)) { - if (empty) - *empty =3D 1; if (!(flags & LOOKUP_EMPTY)) { putname(result); return ERR_PTR(-ENOENT); @@ -209,13 +207,13 @@ getname_uflags(const char __user *filename, int uflag= s) { int flags =3D (uflags & AT_EMPTY_PATH) ? LOOKUP_EMPTY : 0; =20 - return getname_flags(filename, flags, NULL); + return getname_flags(filename, flags); } =20 struct filename * getname(const char __user * filename) { - return getname_flags(filename, 0, NULL); + return getname_flags(filename, 0); } =20 struct filename * @@ -2922,16 +2920,16 @@ int path_pts(struct path *path) } #endif =20 -int user_path_at_empty(int dfd, const char __user *name, unsigned flags, - struct path *path, int *empty) +int user_path_at(int dfd, const char __user *name, unsigned flags, + struct path *path) { - struct filename *filename =3D getname_flags(name, flags, empty); + struct filename *filename =3D getname_flags(name, flags); int ret =3D filename_lookup(dfd, filename, flags, path, NULL); =20 putname(filename); return ret; } -EXPORT_SYMBOL(user_path_at_empty); +EXPORT_SYMBOL(user_path_at); =20 int __check_sticky(struct mnt_idmap *idmap, struct inode *dir, struct inode *inode) diff --git a/fs/stat.c b/fs/stat.c index 7f7861544500..16aa1f5ceec4 100644 --- a/fs/stat.c +++ b/fs/stat.c @@ -300,7 +300,7 @@ int vfs_fstatat(int dfd, const char __user *filename, return vfs_fstat(dfd, stat); } =20 - name =3D getname_flags(filename, getname_statx_lookup_flags(statx_flags),= NULL); + name =3D getname_flags(filename, getname_statx_lookup_flags(statx_flags)); ret =3D vfs_statx(dfd, name, statx_flags, stat, STATX_BASIC_STATS); putname(name); =20 @@ -496,7 +496,7 @@ static int do_readlinkat(int dfd, const char __user *pa= thname, return -EINVAL; =20 retry: - name =3D getname_flags(pathname, lookup_flags, NULL); + name =3D getname_flags(pathname, lookup_flags); error =3D filename_lookup(dfd, name, lookup_flags, &path, NULL); if (unlikely(error)) { putname(name); @@ -710,7 +710,7 @@ SYSCALL_DEFINE5(statx, int ret; struct filename *name; =20 - name =3D getname_flags(filename, getname_statx_lookup_flags(flags), NULL); + name =3D getname_flags(filename, getname_statx_lookup_flags(flags)); ret =3D do_statx(dfd, name, flags, mask, buffer); putname(name); =20 diff --git a/include/linux/fs.h b/include/linux/fs.h index 0283cf366c2a..dfe22a622df6 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2685,7 +2685,7 @@ static inline struct file *file_clone_open(struct fil= e *file) } extern int filp_close(struct file *, fl_owner_t id); =20 -extern struct filename *getname_flags(const char __user *, int, int *); +extern struct filename *getname_flags(const char __user *, int); extern struct filename *getname_uflags(const char __user *, int); extern struct filename *getname(const char __user *); extern struct filename *getname_kernel(const char *); diff --git a/include/linux/namei.h b/include/linux/namei.h index 967aa9ea9f96..8ec8fed3bce8 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h @@ -50,13 +50,7 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT}; =20 extern int path_pts(struct path *path); =20 -extern int user_path_at_empty(int, const char __user *, unsigned, struct p= ath *, int *empty); - -static inline int user_path_at(int dfd, const char __user *name, unsigned = flags, - struct path *path) -{ - return user_path_at_empty(dfd, name, flags, path, NULL); -} +extern int user_path_at(int, const char __user *, unsigned, struct path *); =20 struct dentry *lookup_one_qstr_excl(const struct qstr *name, struct dentry *base, diff --git a/io_uring/statx.c b/io_uring/statx.c index abb874209caa..f7f9b202eec0 100644 --- a/io_uring/statx.c +++ b/io_uring/statx.c @@ -37,8 +37,7 @@ int io_statx_prep(struct io_kiocb *req, const struct io_u= ring_sqe *sqe) sx->flags =3D READ_ONCE(sqe->statx_flags); =20 sx->filename =3D getname_flags(path, - getname_statx_lookup_flags(sx->flags), - NULL); + getname_statx_lookup_flags(sx->flags)); =20 if (IS_ERR(sx->filename)) { int ret =3D PTR_ERR(sx->filename); diff --git a/io_uring/xattr.c b/io_uring/xattr.c index 44905b82eea8..6cf41c3bc369 100644 --- a/io_uring/xattr.c +++ b/io_uring/xattr.c @@ -96,7 +96,7 @@ int io_getxattr_prep(struct io_kiocb *req, const struct i= o_uring_sqe *sqe) =20 path =3D u64_to_user_ptr(READ_ONCE(sqe->addr3)); =20 - ix->filename =3D getname_flags(path, LOOKUP_FOLLOW, NULL); + ix->filename =3D getname_flags(path, LOOKUP_FOLLOW); if (IS_ERR(ix->filename)) { ret =3D PTR_ERR(ix->filename); ix->filename =3D NULL; @@ -189,7 +189,7 @@ int io_setxattr_prep(struct io_kiocb *req, const struct= io_uring_sqe *sqe) =20 path =3D u64_to_user_ptr(READ_ONCE(sqe->addr3)); =20 - ix->filename =3D getname_flags(path, LOOKUP_FOLLOW, NULL); + ix->filename =3D getname_flags(path, LOOKUP_FOLLOW); if (IS_ERR(ix->filename)) { ret =3D PTR_ERR(ix->filename); ix->filename =3D NULL; --=20 2.39.2 From nobody Fri Feb 13 00:07:44 2026 Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 856F7144D23; Tue, 4 Jun 2024 15:53:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717516404; cv=none; b=g6yN8xwFR7E0R2XF4VstYZGHAPTa8J3E65raf9uqLEPAzoMV7meEb7pBFr+u8rKwK2kngc9kdTu2I+M4zgWk5WCTXB7DTEnMRssbGXkCOUMlMnDerL6d42CZ4GIPsGCu5giSDpd6SjPjLxIPQNwo88GzhOADd++oXrZb7zW31Jg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717516404; c=relaxed/simple; bh=kAUbSWZu/OF2JsDzEwfqVSaWjodhEmkXT4WzF6JA3HQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LolR3Ah1e3BMEKfqi7qIxYFCQDGZXbdcsXPawudspdX1xkqky401y0Fw6RvXQ95mx5K5QU+wJERIdDEcswNXCL3IJplO/On+aq1OyiAnyKRqLQnyfZe7TtHZ47hnV5uQo5tCS5iKDc0U7UjQwa7K/tzZ9qM5eSOa8Mp4aBYsPyo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=B+JOkelR; arc=none smtp.client-ip=209.85.208.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="B+JOkelR" Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-57a30dbdb7fso1789939a12.3; Tue, 04 Jun 2024 08:53:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717516401; x=1718121201; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=X41l9HlS1nc5iU7TqM8UMs4TqS7XVR3m4QqEEfH5sx8=; b=B+JOkelRjgL6pV60yTJExdwecOoQOdz8XNANEsgfq3tTF0PWw9kkOArOYmp3u7RLU/ +CBt2RyK754SrjdcFAHuhPO6O8dxquvbRsElggaXkWsP49fj69wibvxpTnWQQjwsZwng /nrJSP92Bg9WYcdwGX67H/UFVxza+nbZ7sQc/WpXlqxf0VhLE2ZU/ldG8p/5bAHDn9EJ jjMnh5qZYvDL5JLqSOMwoQp6pOzVpfd7faPySzV/PQll8fEQ7TjiHKipQhrlMiMJRY/v TyqB8Q92ZQs3PPBg4o7VWzuFacWCir7AZSzigYNWKLb8ZGCk4eWdUzXGA5sQzxrOyfFI VYxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717516401; x=1718121201; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=X41l9HlS1nc5iU7TqM8UMs4TqS7XVR3m4QqEEfH5sx8=; b=r0f96GGg5fxpbadhjffBI/aCxqKimZI7NQxQ+y6ZCP1J3lsPl9+65St7PxZrrCCLk4 144D/oA0ORLHpxj7yyc4pqOk2FfuPlg1T35CRDIbuA/22ecPGRL5RgUInS5RorFQJJob /d/V6gj7VYSDDYBX0gy3rrINdIbUNwLEjBWA6xF5n/lqXWwXRcnsE+WcNghsMt3rOHjB avfYeUujiC2PzvefXFhySj5C/VNXs9X3ViyJ7yj2DOHgN4vtodtWl7dhUXC7YY3r+pCp /Ds/l3WjwBPGzaAMue5hCoGz984Bb6I/x76aHx8AtS7W9Gx9I9eDcfRdeztYWWEtCqXk 1Abg== X-Forwarded-Encrypted: i=1; AJvYcCWPWLgeXgKsPODvZDAZO3b5/ODqTRJjxCHrRJK8+tGHv4ezDyBjw7voLSeQ+8PFvXf0MzUssvwKdI0gsqfwpm6FHzkUaFIMCl345t7khbvttNJHltCxdek5tzBZFEeSH/LAsEL4P7Pmr4cSfA== X-Gm-Message-State: AOJu0YzZMY1dcCdYN3mn/6TTftP9OqQhl8K0Sxc2QA3jyNpzQ1DKjI6F 5aAA1DmJvCXJj8T9pg8TwC98at/F7uGlcoAqqAtN/i1ZivBLp/as X-Google-Smtp-Source: AGHT+IFAkRcSmB0oQofZuTC56FBTE9aVGJAt+c/6xgXpiXgjfNI7f19R2PmjUc3upWoKhiksr2jvjA== X-Received: by 2002:a17:906:aac1:b0:a62:a63c:18f0 with SMTP id a640c23a62f3a-a681fe4e408mr788174766b.1.1717516400529; Tue, 04 Jun 2024 08:53:20 -0700 (PDT) Received: from f.. (cst-prg-5-143.cust.vodafone.cz. [46.135.5.143]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a68e624db7esm423380066b.66.2024.06.04.08.53.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jun 2024 08:53:19 -0700 (PDT) From: Mateusz Guzik To: brauner@kernel.org Cc: viro@zeniv.linux.org.uk, jack@suse.cz, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Mateusz Guzik Subject: [PATCH 3/3] vfs: shave a branch in getname_flags Date: Tue, 4 Jun 2024 17:52:57 +0200 Message-ID: <20240604155257.109500-4-mjguzik@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240604155257.109500-1-mjguzik@gmail.com> References: <20240604155257.109500-1-mjguzik@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Check for an error while copying and no path in one branch. Signed-off-by: Mateusz Guzik Reviewed-by: Jan Kara --- fs/namei.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 950ad6bdd9fe..f25dcb9077dd 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -148,9 +148,20 @@ getname_flags(const char __user *filename, int flags) result->name =3D kname; =20 len =3D strncpy_from_user(kname, filename, EMBEDDED_NAME_MAX); - if (unlikely(len < 0)) { - __putname(result); - return ERR_PTR(len); + /* + * Handle both empty path and copy failure in one go. + */ + if (unlikely(len <=3D 0)) { + if (unlikely(len < 0)) { + __putname(result); + return ERR_PTR(len); + } + + /* The empty path is special. */ + if (!(flags & LOOKUP_EMPTY)) { + __putname(result); + return ERR_PTR(-ENOENT); + } } =20 /* @@ -188,14 +199,6 @@ getname_flags(const char __user *filename, int flags) } =20 atomic_set(&result->refcnt, 1); - /* The empty path is special. */ - if (unlikely(!len)) { - if (!(flags & LOOKUP_EMPTY)) { - putname(result); - return ERR_PTR(-ENOENT); - } - } - result->uptr =3D filename; result->aname =3D NULL; audit_getname(result); --=20 2.39.2