[xfs-masters] [PATCH][RFC] potential NULL pointer deref in XFS on failed mount

[Jesper Juhl <jesper.juhl@xxxxxxxxx>]

The Coverity checker spotted a potential problem in XFS.

The problem is that if, in xfs_mount(), this code triggers:

        ...
        if (!mp->m_logdev_targp)
                goto error0;
        ...

Then we'll end up calling xfs_unmountfs_close() with a NULL 
'mp->m_logdev_targp'. 
This in turn will result in a call to xfs_free_buftarg() with its 'btp' 
argument == NULL. xfs_free_buftarg() dereferences 'btp' leading to
a NULL pointer dereference and crash.

I think this can happen, since the fatal call to xfs_free_buftarg() 
happens when 'm_logdev_targp != m_ddev_targp' and due to a check of
'm_ddev_targp' against NULL in xfs_mount() (and subsequent return if it is 
NULL) the two will never both be NULL when we hit the error0 label from 
the two lines cited above.

Comments welcome (please keep me on Cc: on replies).

Here's a proposed patch to fix this by testing 'btp' against NULL in 
xfs_free_buftarg().


Signed-off-by: Jesper Juhl <jesper.juhl@xxxxxxxxx>
---

 fs/xfs/linux-2.6/xfs_buf.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c
index db5f5a3..6ef1860 100644
--- a/fs/xfs/linux-2.6/xfs_buf.c
+++ b/fs/xfs/linux-2.6/xfs_buf.c
@@ -1450,6 +1450,9 @@ xfs_free_buftarg(
        xfs_buftarg_t           *btp,
        int                     external)
 {
+       if (unlikely(!btp))
+               return;
+
        xfs_flush_buftarg(btp, 1);
        if (external)
                xfs_blkdev_put(btp->bt_bdev);