| Message ID | 20231228061830.337279-2-hch@lst.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] xfs: fix a use after free in xfs_defer_finish_recovery | expand |
On Thu, Dec 28, 2023 at 06:18:30AM +0000, Christoph Hellwig wrote: > Instead of tracing the address of the recovery handler, use the name > in the defer op, similar to other defer ops related tracepoints. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Yay fewer pointer shenanigans, Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > --- > fs/xfs/libxfs/xfs_defer.c | 3 +-- > fs/xfs/xfs_trace.h | 14 ++++++++------ > 2 files changed, 9 insertions(+), 8 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_defer.c b/fs/xfs/libxfs/xfs_defer.c > index 785c92d2acaa73..e99d7890e614e1 100644 > --- a/fs/xfs/libxfs/xfs_defer.c > +++ b/fs/xfs/libxfs/xfs_defer.c > @@ -920,8 +920,7 @@ xfs_defer_finish_recovery( > > error = ops->recover_work(dfp, capture_list); > if (error) > - trace_xlog_intent_recovery_failed(mp, error, > - ops->recover_work); > + trace_xlog_intent_recovery_failed(mp, ops, error); > return error; > } > > diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h > index 0efcdb79d10e51..a986c52ff466bc 100644 > --- a/fs/xfs/xfs_trace.h > +++ b/fs/xfs/xfs_trace.h > @@ -145,21 +145,23 @@ DEFINE_ATTR_LIST_EVENT(xfs_attr_leaf_list); > DEFINE_ATTR_LIST_EVENT(xfs_attr_node_list); > > TRACE_EVENT(xlog_intent_recovery_failed, > - TP_PROTO(struct xfs_mount *mp, int error, void *function), > - TP_ARGS(mp, error, function), > + TP_PROTO(struct xfs_mount *mp, const struct xfs_defer_op_type *ops, > + int error), > + TP_ARGS(mp, ops, error), > TP_STRUCT__entry( > __field(dev_t, dev) > + __string(name, ops->name) > __field(int, error) > - __field(void *, function) > ), > TP_fast_assign( > __entry->dev = mp->m_super->s_dev; > + __assign_str(name, ops->name); > __entry->error = error; > - __entry->function = function; > ), > - TP_printk("dev %d:%d error %d function %pS", > + TP_printk("dev %d:%d optype %s error %d", > MAJOR(__entry->dev), MINOR(__entry->dev), > - __entry->error, __entry->function) > + __get_str(name), > + __entry->error) > ); > > DECLARE_EVENT_CLASS(xfs_perag_class, > -- > 2.39.2 > >
diff --git a/fs/xfs/libxfs/xfs_defer.c b/fs/xfs/libxfs/xfs_defer.c index 785c92d2acaa73..e99d7890e614e1 100644 --- a/fs/xfs/libxfs/xfs_defer.c +++ b/fs/xfs/libxfs/xfs_defer.c @@ -920,8 +920,7 @@ xfs_defer_finish_recovery( error = ops->recover_work(dfp, capture_list); if (error) - trace_xlog_intent_recovery_failed(mp, error, - ops->recover_work); + trace_xlog_intent_recovery_failed(mp, ops, error); return error; } diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h index 0efcdb79d10e51..a986c52ff466bc 100644 --- a/fs/xfs/xfs_trace.h +++ b/fs/xfs/xfs_trace.h @@ -145,21 +145,23 @@ DEFINE_ATTR_LIST_EVENT(xfs_attr_leaf_list); DEFINE_ATTR_LIST_EVENT(xfs_attr_node_list); TRACE_EVENT(xlog_intent_recovery_failed, - TP_PROTO(struct xfs_mount *mp, int error, void *function), - TP_ARGS(mp, error, function), + TP_PROTO(struct xfs_mount *mp, const struct xfs_defer_op_type *ops, + int error), + TP_ARGS(mp, ops, error), TP_STRUCT__entry( __field(dev_t, dev) + __string(name, ops->name) __field(int, error) - __field(void *, function) ), TP_fast_assign( __entry->dev = mp->m_super->s_dev; + __assign_str(name, ops->name); __entry->error = error; - __entry->function = function; ), - TP_printk("dev %d:%d error %d function %pS", + TP_printk("dev %d:%d optype %s error %d", MAJOR(__entry->dev), MINOR(__entry->dev), - __entry->error, __entry->function) + __get_str(name), + __entry->error) ); DECLARE_EVENT_CLASS(xfs_perag_class,
Instead of tracing the address of the recovery handler, use the name in the defer op, similar to other defer ops related tracepoints. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/xfs/libxfs/xfs_defer.c | 3 +-- fs/xfs/xfs_trace.h | 14 ++++++++------ 2 files changed, 9 insertions(+), 8 deletions(-)