On Sun, Sep 27, 2026 at 07:47:36PM +0800, Jiale Yao wrote:
> The dynamic device-dax probe path publishes its devm-allocated pgmap
> before several operations that can still fail. If one of them fails,
> devres frees the pgmap while dev_dax->pgmap remains non-NULL. A later
> bind then fails the dynamic-dax invariant check and leaves the device
> unusable until its region is recreated.
>
> Defer assigning dev_dax->pgmap until the final devm action has been
> installed and probe can no longer fail. A failed probe then never
> publishes the temporary pgmap.
>
> Fixes: fc65c4eb0b2a ("device-dax: ensure dev_dax->pgmap is valid for dynamic
> devices")
> Cc: [email protected]
> Signed-off-by: Jiale Yao <[email protected]>
> ---
> drivers/dax/device.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/dax/device.c b/drivers/dax/device.c
> index d0c9b4e03b47..8cd8e05872c3 100644
> --- a/drivers/dax/device.c
> +++ b/drivers/dax/device.c
> @@ -409,7 +409,6 @@ static int dev_dax_probe(struct dev_dax *dev_dax)
> return -ENOMEM;
>
> pgmap->nr_range = dev_dax->nr_range;
> - dev_dax->pgmap = pgmap;
>
> for (i = 0; i < dev_dax->nr_range; i++) {
> struct range *range = &dev_dax->ranges[i].range;
> @@ -450,7 +449,13 @@ static int dev_dax_probe(struct dev_dax *dev_dax)
> return rc;
>
> run_dax(dax_dev);
> - return devm_add_action_or_reset(dev, dev_dax_kill, dev_dax);
> + rc = devm_add_action_or_reset(dev, dev_dax_kill, dev_dax);
> + if (rc)
> + return rc;
> +
> + /* Probe can no longer fail; expose the pgmap via dev_dax. */
> + dev_dax->pgmap = pgmap;
> + return 0;
> }
Hi Jiale,
Please address the NULL ptr dereference issue that Sashiko identified.
Could we instead register the dev_dax_kill cleanup action first, then assign
dev_dax->pgmap, and finally call run_dax()?
That would leave the pgmap unpublished on probe failure while ensuring it is
initialized before the device becomes usable. I believe the existing
kill_dev_dax()
already clears the pgmap for dynamic devices during teardown.
It sounds like you may have reproduced this issue already. Can you confirm that
you've tested the fix with a failed probe followed by a successful rebind? It
would also be good to confirm that normal bind/unbind/rebind still works.
-- Alison
>
> static struct dax_device_driver device_dax_driver = {
> --
> 2.34.1
>
