xfs: fix a use after free in xfs_defer_finish_recovery

Source kernel commit: 4f6ac47b55e3ce6e982807928d6074ec105ab66e

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")
Reported-by: kernel test robot <oliver.sang@intel.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandanbabu@kernel.org>
Reviewed-by: Bill O'Donnell <bodonnel@redhat.com>

diff --git a/libxfs/xfs_defer.c b/libxfs/xfs_defer.c
index 077e992980743e08fe2c2e36b96b80ac850e1e96..5bdc8f5a258a3af1d416e6f16696696f57b45a1f 100644 (file)
--- a/libxfs/xfs_defer.c
+++ b/libxfs/xfs_defer.c
@@ -909,12 +909,14 @@ 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);
+       /* dfp is freed by recover_work and must not be accessed afterwards */
+       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;
 }