xfs: fix mount failure crash on invalid iclog memory access
authorBrian Foster <bfoster@redhat.com>
Tue, 3 Dec 2019 15:53:15 +0000 (07:53 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Jan 2020 09:18:59 +0000 (10:18 +0100)
[ Upstream commit 798a9cada4694ca8d970259f216cec47e675bfd5 ]

syzbot (via KASAN) reports a use-after-free in the error path of
xlog_alloc_log(). Specifically, the iclog freeing loop doesn't
handle the case of a fully initialized ->l_iclog linked list.
Instead, it assumes that the list is partially constructed and NULL
terminated.

This bug manifested because there was no possible error scenario
after iclog list setup when the original code was added.  Subsequent
code and associated error conditions were added some time later,
while the original error handling code was never updated. Fix up the
error loop to terminate either on a NULL iclog or reaching the end
of the list.

Reported-by: syzbot+c732f8644185de340492@syzkaller.appspotmail.com
Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/xfs/xfs_log.c

index c3b610b687d16679a6a519d9633952d5ee961b8f..7bba551cbf90718bb510b46cc08f47b2f0dc7762 100644 (file)
@@ -1578,6 +1578,8 @@ xlog_alloc_log(
                if (iclog->ic_bp)
                        xfs_buf_free(iclog->ic_bp);
                kmem_free(iclog);
+               if (prev_iclog == log->l_iclog)
+                       break;
        }
        spinlock_destroy(&log->l_icloglock);
        xfs_buf_free(log->l_xbuf);