jfs: fix uaf in jfs_evict_inode

[ Upstream commit e0e1958f4c365e380b17ccb35617345b31ef7bf3 ]

When the execution of diMount(ipimap) fails, the object ipimap that has been
released may be accessed in diFreeSpecial(). Asynchronous ipimap release occurs
when rcu_core() calls jfs_free_node().

Therefore, when diMount(ipimap) fails, sbi->ipimap should not be initialized as
ipimap.

Reported-and-tested-by: syzbot+01cf2dbcbe2022454388@syzkaller.appspotmail.com
Signed-off-by: Edward Adam Davis <eadavis@qq.com>
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/jfs/jfs_mount.c b/fs/jfs/jfs_mount.c
index b83aae56a1f26194e154ded436834d989e3cd0bd..631b8bd3e43849e6bef9a1d04cf370b5e9687fef 100644 (file)
--- a/fs/jfs/jfs_mount.c
+++ b/fs/jfs/jfs_mount.c
@@ -172,15 +172,15 @@ int jfs_mount(struct super_block *sb)
        }
        jfs_info("jfs_mount: ipimap:0x%p", ipimap);
 
-       /* map further access of per fileset inodes by the fileset inode */
-       sbi->ipimap = ipimap;
-
        /* initialize fileset inode allocation map */
        if ((rc = diMount(ipimap))) {
                jfs_err("jfs_mount: diMount failed w/rc = %d", rc);
                goto err_ipimap;
        }
 
+       /* map further access of per fileset inodes by the fileset inode */
+       sbi->ipimap = ipimap;
+
        return rc;
 
        /*