Received-SPF: pass (google.com: domain of linux-kernel+bounces-101512-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Message-ID: <tencent_938637BC4BA674C576F366443D5336109609@qq.com>
From: Edward Adam Davis <eadavis@qq.com>
To: syzbot+9b5ec5ccf7234cc6cb86@syzkaller.appspotmail.com
Cc: brauner@kernel.org,
	jack@suse.cz,
	linux-fsdevel@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	syzkaller-bugs@googlegroups.com,
	viro@zeniv.linux.org.uk
Subject: [PATCH] libfs: fix warning in stashed_dentry_prune
Date: Wed, 13 Mar 2024 21:07:00 +0800
In-Reply-To: <0000000000003ea6ba0613882a96@google.com>
References: <0000000000003ea6ba0613882a96@google.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Initialize d_fsdata in advance to avoid warnings when recycling dentry due to
inode allocation failures.

Fixes: 2558e3b23112 ("libfs: add stashed_dentry_prune()")
Reported-and-tested-by: syzbot+9b5ec5ccf7234cc6cb86@syzkaller.appspotmail.com
Signed-off-by: Edward Adam Davis <eadavis@qq.com>
---
 fs/libfs.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/fs/libfs.c b/fs/libfs.c
index 0d14ae808fcf..67dc503272eb 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -2013,6 +2013,8 @@ static struct dentry *prepare_anon_dentry(struct dentry **stashed,
 	if (!dentry)
 		return ERR_PTR(-ENOMEM);
 
+	/* Store address of location where dentry's supposed to be stashed. */
+	dentry->d_fsdata = stashed;
 	inode = new_inode_pseudo(sb);
 	if (!inode) {
 		dput(dentry);
@@ -2029,9 +2031,6 @@ static struct dentry *prepare_anon_dentry(struct dentry **stashed,
 	WARN_ON_ONCE(!S_ISREG(inode->i_mode));
 	WARN_ON_ONCE(!IS_IMMUTABLE(inode));
 
-	/* Store address of location where dentry's supposed to be stashed. */
-	dentry->d_fsdata = stashed;
-
 	/* @data is now owned by the fs */
 	d_instantiate(dentry, inode);
 	return dentry;
-- 
2.43.0