xfs: fix use after free in buf log item unlock assert
PATCH 1/1 xfs: fix use after free in buf log item unlock assert
The xfs_buf_log_item ->iop_unlock() callback asserts that the buffer is unlocked when either non-stale or aborted. This assert occurs after the bli refcount has been dropped and the log item potentially freed. The aborted check is thus a potential use after free. This problem has been reproduced with KASAN enabled via generic/475.
Fix up xfs_buf_item_unlock() to query aborted state before the bli reference is dropped to prevent a potential use after free.
--- fs/xfs/xfs_buf_item.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/xfs/xfs_buf_item.c +3 -1
@@ -605,6 +605,8 @@ xfs_buf_item_unlock(#if defined(DEBUG ) || defined(XFS_WARN )bool ordered = bip->bli_flags &XFS_BLI_ORDERED ;bool dirty = bip->bli_flags &XFS_BLI_DIRTY ; +bool aborted =test_bit (XFS_LI_ABORTED , + &lip->li_flags);#endif trace_xfs_buf_item_unlock (bip);
@@ -633,7 +635,7 @@ xfs_buf_item_unlock( released =xfs_buf_item_put (bip);if (hold || (stale && !released))return ; -ASSERT (!stale ||test_bit (XFS_LI_ABORTED , &lip->li_flags)); +ASSERT (!stale || aborted);xfs_buf_relse (bp); }
Signature · 1 line
2.17.2
Quoted 10 lines · Brian Foster
The
xfs_buf_log_item->iop_unlock() callback asserts that the buffer is unlocked when either non-stale or aborted. This assert occurs after the bli refcount has been dropped and the log item potentially freed. The aborted check is thus a potential use after free. This problem has been reproduced with KASAN enabled via generic/475.Fix up
xfs_buf_item_unlock()to query aborted state before the bli reference is dropped to prevent a potential use after free.Signed-off-by Brian Foster <[email protected]>
Seems reasonable,
--D
Quoted 29 lines
--- fs/xfs/xfs_buf_item.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)fs/xfs/xfs_buf_item.c +3
-1@@ -605,6 +605,8 @@ xfs_buf_item_unlock(#if defined(DEBUG ) || defined(XFS_WARN )bool ordered = bip->bli_flags &XFS_BLI_ORDERED ;bool dirty = bip->bli_flags &XFS_BLI_DIRTY ; +bool aborted =test_bit (XFS_LI_ABORTED , + &lip->li_flags);#endif trace_xfs_buf_item_unlock (bip);@@ -633,7 +635,7 @@ xfs_buf_item_unlock( released =xfs_buf_item_put (bip);if (hold || (stale && !released))return ; -ASSERT (!stale ||test_bit (XFS_LI_ABORTED , &lip->li_flags)); +ASSERT (!stale || aborted);xfs_buf_relse (bp); }Signature · 1 line
2.17.2
Quoted 11 lines · Brian Foster
The
xfs_buf_log_item->iop_unlock() callback asserts that the buffer is unlocked when either non-stale or aborted. This assert occurs after the bli refcount has been dropped and the log item potentially freed. The aborted check is thus a potential use after free. This problem has been reproduced with KASAN enabled via generic/475.Fix up
xfs_buf_item_unlock()to query aborted state before the bli reference is dropped to prevent a potential use after free.Signed-off-by Brian Foster <[email protected]>---
Ping on this one.. looks like it was reviewed and maybe fell through the cracks?
Brian
Quoted 28 lines
fs/xfs/xfs_buf_item.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)fs/xfs/xfs_buf_item.c +3
-1@@ -605,6 +605,8 @@ xfs_buf_item_unlock(#if defined(DEBUG ) || defined(XFS_WARN )bool ordered = bip->bli_flags &XFS_BLI_ORDERED ;bool dirty = bip->bli_flags &XFS_BLI_DIRTY ; +bool aborted =test_bit (XFS_LI_ABORTED , + &lip->li_flags);#endif trace_xfs_buf_item_unlock (bip);@@ -633,7 +635,7 @@ xfs_buf_item_unlock( released =xfs_buf_item_put (bip);if (hold || (stale && !released))return ; -ASSERT (!stale ||test_bit (XFS_LI_ABORTED , &lip->li_flags)); +ASSERT (!stale || aborted);xfs_buf_relse (bp); }Signature · 1 line
2.17.2
Quoted 7 lines · Brian Foster
Quoted 6 lines · Brian Foster
The
xfs_buf_log_item->iop_unlock() callback asserts that the buffer is unlocked when either non-stale or aborted. This assert occurs after the bli refcount has been dropped and the log item potentially freed. The aborted check is thus a potential use after free. This problem has been reproduced with KASAN enabled via generic/475.
Quoted 8 lines
Quoted 5 lines
Fix up
xfs_buf_item_unlock()to query aborted state before the bli reference is dropped to prevent a potential use after free.Signed-off-by Brian Foster <[email protected]>---
Ping on this one.. looks like it was reviewed and maybe fell through the cracks?
Yep. Spreadsheet says it's in 5.0-rc6, and ... totally not upstream. :( Sorry about that.
--D
Quoted 30 lines
Brian
Quoted 28 lines
fs/xfs/xfs_buf_item.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)fs/xfs/xfs_buf_item.c +3
-1@@ -605,6 +605,8 @@ xfs_buf_item_unlock(#if defined(DEBUG ) || defined(XFS_WARN )bool ordered = bip->bli_flags &XFS_BLI_ORDERED ;bool dirty = bip->bli_flags &XFS_BLI_DIRTY ; +bool aborted =test_bit (XFS_LI_ABORTED , + &lip->li_flags);#endif trace_xfs_buf_item_unlock (bip);@@ -633,7 +635,7 @@ xfs_buf_item_unlock( released =xfs_buf_item_put (bip);if (hold || (stale && !released))return ; -ASSERT (!stale ||test_bit (XFS_LI_ABORTED , &lip->li_flags)); +ASSERT (!stale || aborted);xfs_buf_relse (bp); }Signature · 1 line
2.17.2