xfs: only trace buffer items if they exist
PATCH 1/1 xfs: only trace buffer items if they exist
From: Dave Chinner <[email protected]>
The commit 2d3d0c5 ("xfs: lobotomise xfs_trans_read_buf_map()") left a landmine in the tracing code: trace_xfs_trans_buf_read() is now call on all buffers that are read through this interface rather than just buffers in transactions. For buffers outside transaction context, bp->b_fspriv is null, and so the buf log item tracing functions cannot be called. This causes a NULL pointer dereference in the trace_xfs_trans_buf_read() function when tracing is turned on.
--- fs/xfs/xfs_trans_buf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/xfs/xfs_trans_buf.c +3 -2
@@ -327,9 +327,10 @@ xfs_trans_read_buf_map(return -EIO ; } -if (tp) +if (tp) {_xfs_trans_bjoin (tp, bp,1 ); -trace_xfs_trans_read_buf (bp->b_fspriv); +trace_xfs_trans_read_buf (bp->b_fspriv); + } *bpp = bp;return 0 ;
Signature · 6 lines
2.0.0 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Quoted 11 lines · Dave Chinner
From: Dave Chinner <[email protected]>
The commit 2d3d0c5 ("xfs: lobotomise
xfs_trans_read_buf_map()") left a landmine in the tracing code:trace_xfs_trans_buf_read()is now call on all buffers that are read through this interface rather than just buffers in transactions. For buffers outside transaction context,bp->b_fsprivis null, and so the buf log item tracing functions cannot be called. This causes a NULL pointer dereference in thetrace_xfs_trans_buf_read()function when tracing is turned on.
Quoted 2 lines
Signed-off-by Dave Chinner <[email protected]>---
Ah, I hit this a week or so ago and completely forgot to dig into it. Thanks!
Quoted 27 lines
fs/xfs/xfs_trans_buf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)fs/xfs/xfs_trans_buf.c +3
-2@@ -327,9 +327,10 @@ xfs_trans_read_buf_map(return -EIO ; } -if (tp) +if (tp) {_xfs_trans_bjoin (tp, bp,1 ); -trace_xfs_trans_read_buf (bp->b_fspriv); +trace_xfs_trans_read_buf (bp->b_fspriv); + } *bpp = bp;return 0 ;Signature · 6 lines
2.0.0 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs