From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 D2EC926CE33; Fri, 21 Nov 2025 13:19:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763731158; cv=none; b=ZfJ2yFt7hrjqNG2DHAzItzV1CLOmLuPkQXHKcUQCozEldOc3gu2tTQHooDRrLIkZZTagjhBTKqYG0W+J6vfTzk1PqwwEcgCgfJ8qN1qAvgRwIieBXocTi0nIFZdm3HvszzP8UAifLqVu22RVZNC1byUJUMk+Vm1uU1wd9j4ycK8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763731158; c=relaxed/simple; bh=mTcJA2zNXP/odVh1jbj/QZBFnZ0d2yqjEliOyeio1Z0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MBxvdcc3pFCEGgrehTgsYh3dvLb7Sjg5abAPCEi1y5JgZ8F7ZyyeFsamlE94RIntj9/EjpMSDPX+J4YT2WLlmn42OhzZdW81HZ8yC1R21bg4BL3L+/XRp6d15k5JgDu0AXeH3C5Yqp8iYiZUcoN0yLOUuPMWhx/PQotsFYESzxI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ffwfoKae; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ffwfoKae" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5892AC4CEF1; Fri, 21 Nov 2025 13:19:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1763731158; bh=mTcJA2zNXP/odVh1jbj/QZBFnZ0d2yqjEliOyeio1Z0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ffwfoKaeEoeKBU+NbarcrqSnwpS2YD/2VuNFnliUfbLV+cvGXUFA4BlwnF9xShEhy tOAKrpj25MJQzgaxhihan082pjM+YRrLvTcz6KKOfKcRQA+oRa6RfNqC0Ouwsq65UV KuggWB0Y/4hnXTFIXhf7735OVF2A7UbBSyhlF0y8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Stephen Abbene , Trond Myklebust , NeilBrown , Anna Schumaker , Sasha Levin Subject: [PATCH 6.17 109/247] NFSv2/v3: Fix error handling in nfs_atomic_open_v23() Date: Fri, 21 Nov 2025 14:10:56 +0100 Message-ID: <20251121130158.498181175@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251121130154.587656062@linuxfoundation.org> References: <20251121130154.587656062@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.17-stable review patch. If anyone has any objections, please let me know. ------------------ From: Trond Myklebust [ Upstream commit 85d2c2392ac6348e1171d627497034a341a250c1 ] When nfs_do_create() returns an EEXIST error, it means that a regular file could not be created. That could mean that a symlink needs to be resolved. If that's the case, a lookup needs to be kicked off. Reported-by: Stephen Abbene Link: https://bugzilla.kernel.org/show_bug.cgi?id=220710 Fixes: 7c6c5249f061 ("NFS: add atomic_open for NFSv3 to handle O_TRUNC correctly.") Signed-off-by: Trond Myklebust Reviewed-by: NeilBrown Signed-off-by: Anna Schumaker Signed-off-by: Sasha Levin --- fs/nfs/dir.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index c8dd1d0b8d850..82ef36cc9ceec 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -2270,11 +2270,12 @@ int nfs_atomic_open_v23(struct inode *dir, struct dentry *dentry, return -ENAMETOOLONG; if (open_flags & O_CREAT) { - file->f_mode |= FMODE_CREATED; error = nfs_do_create(dir, dentry, mode, open_flags); - if (error) + if (!error) { + file->f_mode |= FMODE_CREATED; + return finish_open(file, dentry, NULL); + } else if (error != -EEXIST || open_flags & O_EXCL) return error; - return finish_open(file, dentry, NULL); } if (d_in_lookup(dentry)) { /* The only flags nfs_lookup considers are -- 2.51.0