Skip to contentSkip to conversation

xfs: fix a use after free in xfs_defer_finish_recovery

PATCH Superseded Christoph Hellwig 2 participants 5 messages Dec 28, 2023 XFS filesystem

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 xfs: fix a use after free in xfs_defer_finish_recovery

dfp will be freed by ->recover_work and thus the tracepoint in case of an error can lead to a use after free.

Store the defer ops in a local variable to avoid that.

Fixes 7f2f7531e0d4 ("xfs: store an ops pointer in struct xfs_defer_pending")
---
 fs/xfs/libxfs/xfs_defer.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
fs/xfs/libxfs/xfs_defer.c +3 -2
index ca7f0ac0489604..785c92d2acaa73 100644
@@ -915,12 +915,13 @@ xfs_defer_finish_recovery(
 	struct xfs_defer_pending	*dfp,
 	struct list_head		*capture_list)
 {
+	const struct xfs_defer_op_type	*ops = dfp->dfp_ops;
 	int				error;
 
-	error = dfp->dfp_ops->recover_work(dfp, capture_list);
+	error = ops->recover_work(dfp, capture_list);
 	if (error)
 		trace_xlog_intent_recovery_failed(mp, error,
-				dfp->dfp_ops->recover_work);
+				ops->recover_work);
 	return error;
 }
 
Signature · 1 line
2.39.2
#1 lore raw

PATCH 2/2 xfs: use the op name in trace_xlog_intent_recovery_failed

Instead of tracing the address of the recovery handler, use the name in the defer op, similar to other defer ops related tracepoints.

---
 fs/xfs/libxfs/xfs_defer.c |  3 +--
 fs/xfs/xfs_trace.h        | 14 ++++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)
fs/xfs/libxfs/xfs_defer.c +1 -2
index 785c92d2acaa73..e99d7890e614e1 100644
@@ -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;
 }
 
fs/xfs/xfs_trace.h +8 -6
index 0efcdb79d10e51..a986c52ff466bc 100644
@@ -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,
Signature · 1 line
2.39.2
Reviewed-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] xfs: use the op name in trace_xlog_intent_recovery_failed

Quoted 4 lines · Christoph Hellwig

Instead of tracing the address of the recovery handler, use the name in the defer op, similar to other defer ops related tracepoints.

Yay fewer pointer shenanigans,

--D

Quoted 57 lines
---
 fs/xfs/libxfs/xfs_defer.c |  3 +--
 fs/xfs/xfs_trace.h        | 14 ++++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)
fs/xfs/libxfs/xfs_defer.c +1 -2
index 785c92d2acaa73..e99d7890e614e1 100644
@@ -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;
 }
 
fs/xfs/xfs_trace.h +8 -6
index 0efcdb79d10e51..a986c52ff466bc 100644
@@ -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,
Signature · 1 line
2.39.2
Reviewed-by on v1 1/2
#3 lore raw
In reply to Christoph Hellwig
Quoted 17 lines · Christoph Hellwig

dfp will be freed by ->recover_work and thus the tracepoint in case of an error can lead to a use after free.

Store the defer ops in a local variable to avoid that.

Fixes 7f2f7531e0d4 ("xfs: store an ops pointer in struct xfs_defer_pending")
---
 fs/xfs/libxfs/xfs_defer.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
fs/xfs/libxfs/xfs_defer.c +0 -0
index ca7f0ac0489604..785c92d2acaa73 100644

fs/xfs/libxfs/xfs_defer.c xfs_defer_finish_recovery( · line 921

Quoted 8 lines
fs/xfs/libxfs/xfs_defer.c +2 -1
@@ -915,12 +915,13 @@ xfs_defer_finish_recovery(
 	struct xfs_defer_pending	*dfp,
 	struct list_head		*capture_list)
 {
+	const struct xfs_defer_op_type	*ops = dfp->dfp_ops;
 	int				error;
 
-	error = dfp->dfp_ops->recover_work(dfp, capture_list);
+	error = ops->recover_work(dfp, capture_list);

Since I suck at remembering that dfp can be freed by recovery work, can you add a comment to that effect? e.g.

	/* dfp is freed by recover_work and must not be accessed further */
	error = ops->recover_work(dfp, capture_list);

With that added,

--D

Quoted 11 lines
fs/xfs/libxfs/xfs_defer.c +1 -1
 	if (error)
 		trace_xlog_intent_recovery_failed(mp, error,
-				dfp->dfp_ops->recover_work);
+				ops->recover_work);
 	return error;
 }
 
Signature · 1 line
2.39.2
#4 lore raw
Quoted 5 lines · Darrick J. Wong

fs/xfs/libxfs/xfs_defer.c xfs_defer_finish_recovery( · line 921

Quoted 2 lines
fs/xfs/libxfs/xfs_defer.c +1 -1
-	error = dfp->dfp_ops->recover_work(dfp, capture_list);
+	error = ops->recover_work(dfp, capture_list);

Since I suck at remembering that dfp can be freed by recovery work, can you add a comment to that effect? e.g.

Sure.