Skip to content

Commit 6d24b17

Browse files
djbwstellarhopper
authored andcommitted
dax: Fix dax_mapping_release() use after free
A CONFIG_DEBUG_KOBJECT_RELEASE test of removing a device-dax region provider (like modprobe -r dax_hmem) yields: kobject: 'mapping0' (ffff93eb460e8800): kobject_release, parent 0000000000000000 (delayed 2000) [..] DEBUG_LOCKS_WARN_ON(1) WARNING: CPU: 23 PID: 282 at kernel/locking/lockdep.c:232 __lock_acquire+0x9fc/0x2260 [..] RIP: 0010:__lock_acquire+0x9fc/0x2260 [..] Call Trace: <TASK> [..] lock_acquire+0xd4/0x2c0 ? ida_free+0x62/0x130 _raw_spin_lock_irqsave+0x47/0x70 ? ida_free+0x62/0x130 ida_free+0x62/0x130 dax_mapping_release+0x1f/0x30 device_release+0x36/0x90 kobject_delayed_cleanup+0x46/0x150 Due to attempting ida_free() on an ida object that has already been freed. Devices typically only hold a reference on their parent while registered. If a child needs a parent object to complete its release it needs to hold a reference that it drops from its release callback. Arrange for a dax_mapping to pin its parent dev_dax instance until dax_mapping_release(). Fixes: 0b07ce8 ("device-dax: introduce 'mapping' devices") Signed-off-by: Dan Williams <dan.j.williams@intel.com> Link: https://lore.kernel.org/r/168577283412.1672036.16111545266174261446.stgit@dwillia2-xfh.jf.intel.com Reviewed-by: Dave Jiang <dave.jiang@intel.com> Reviewed-by: Fan Ni <fan.ni@samsung.com> Reviewed-by: Ira Weiny <ira.weiny@intel.com> Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
1 parent e98d14f commit 6d24b17

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

drivers/dax/bus.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,10 +635,12 @@ EXPORT_SYMBOL_GPL(alloc_dax_region);
635635
static void dax_mapping_release(struct device *dev)
636636
{
637637
struct dax_mapping *mapping = to_dax_mapping(dev);
638-
struct dev_dax *dev_dax = to_dev_dax(dev->parent);
638+
struct device *parent = dev->parent;
639+
struct dev_dax *dev_dax = to_dev_dax(parent);
639640

640641
ida_free(&dev_dax->ida, mapping->id);
641642
kfree(mapping);
643+
put_device(parent);
642644
}
643645

644646
static void unregister_dax_mapping(void *data)
@@ -778,6 +780,7 @@ static int devm_register_dax_mapping(struct dev_dax *dev_dax, int range_id)
778780
dev = &mapping->dev;
779781
device_initialize(dev);
780782
dev->parent = &dev_dax->dev;
783+
get_device(dev->parent);
781784
dev->type = &dax_mapping_type;
782785
dev_set_name(dev, "mapping%d", mapping->id);
783786
rc = device_add(dev);

0 commit comments

Comments
 (0)