From: Dominique Martinet <asmadeus@xxxxxxxxxxxxx>
commit 26f8dd2dde6864558782d91542f89483bd59a3c2 upstream.
This reverts commit 11763a8598f888dec631a8a903f7ada32181001f.
This is a requirement to revert commit 724a08450f74 ("fs/9p: simplify
iget to remove unnecessary paths"), see that revert for details.
Fixes: 724a08450f74 ("fs/9p: simplify iget to remove unnecessary paths")
Reported-by: Will Deacon <will@xxxxxxxxxx>
Link: https://lkml.kernel.org/r/20240923100508.GA32066@willie-the-truck
Cc: stable@xxxxxxxxxxxxxxx # v6.9+
Message-ID: <20241024-revert_iget-v1-3-4cac63d25f72@xxxxxxxxxxxxx>
Signed-off-by: Dominique Martinet <asmadeus@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/9p/vfs_inode_dotl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
index 2b313fe7003e..ef9db3e03506 100644
--- a/fs/9p/vfs_inode_dotl.c
+++ b/fs/9p/vfs_inode_dotl.c
@@ -78,11 +78,11 @@ struct inode *v9fs_fid_iget_dotl(struct super_block *sb, struct p9_fid *fid)
retval = v9fs_init_inode(v9ses, inode, &fid->qid,
st->st_mode, new_decode_dev(st->st_rdev));
- v9fs_stat2inode_dotl(st, inode, 0);
kfree(st);
if (retval)
goto error;
+ v9fs_stat2inode_dotl(st, inode, 0);
v9fs_set_netfs_context(inode);
v9fs_cache_inode_get_cookie(inode);
retval = v9fs_get_acl(inode, fid);
--
2.47.0
Patches currently in stable-queue which might be from asmadeus@xxxxxxxxxxxxx are
queue-6.11/revert-fs-9p-remove-redundant-pointer-v9ses.patch
queue-6.11/revert-fs-9p-fix-uaf-in-in-v9fs_stat2inode_dotl.patch
queue-6.11/revert-fs-9p-mitigate-inode-collisions.patch
queue-6.11/revert-fs-9p-simplify-iget-to-remove-unnecessary-paths.patch
