]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
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)
committerKhalid Elmously <khalid.elmously@canonical.com>
Wed, 29 Jan 2020 05:08:43 +0000 (00:08 -0500)
BugLink: https://bugs.launchpad.net/bugs/1860816
commit 798a9cada4694ca8d970259f216cec47e675bfd5 upstream.

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
fs/xfs/xfs_log.c

index 7fc3c1ad36bcd0e490058c78f39e5883505da1c6..ab76cfc68cb84d13395dffb98e3b603d97f07401 100644 (file)
@@ -1468,6 +1468,8 @@ out_free_iclog:
                prev_iclog = iclog->ic_next;
                kmem_free(iclog->ic_data);
                kmem_free(iclog);
+               if (prev_iclog == log->l_iclog)
+                       break;
        }
 out_free_log:
        kmem_free(log);