From 980c345fc658bdc906fdc20217be3619904e8e33 Mon Sep 17 00:00:00 2001 From: tkusumi Date: Sun, 1 Dec 2019 16:33:33 +0000 Subject: dm: Fix race on pdev create List lookup and insert need to be atomic. https://github.com/DragonFlyBSD/DragonFlyBSD/commit/ac816675c8321309b49d6a335f95c5388036803f take-from: DragonFlyBSD --- sys/dev/dm/dm_pdev.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'sys/dev/dm/dm_pdev.c') diff --git a/sys/dev/dm/dm_pdev.c b/sys/dev/dm/dm_pdev.c index f7188b4e103..4ae5ab3657d 100644 --- a/sys/dev/dm/dm_pdev.c +++ b/sys/dev/dm/dm_pdev.c @@ -1,4 +1,4 @@ -/* $NetBSD: dm_pdev.c,v 1.10 2018/01/05 14:22:26 christos Exp $ */ +/* $NetBSD: dm_pdev.c,v 1.11 2019/12/01 16:33:33 tkusumi Exp $ */ /* * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: dm_pdev.c,v 1.10 2018/01/05 14:22:26 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dm_pdev.c,v 1.11 2019/12/01 16:33:33 tkusumi Exp $"); #include #include @@ -103,15 +103,17 @@ dm_pdev_insert(const char *dev_name) mutex_exit(&dm_pdev_mutex); return dmp; } - mutex_exit(&dm_pdev_mutex); - if ((dmp = dm_pdev_alloc(dev_name)) == NULL) + if ((dmp = dm_pdev_alloc(dev_name)) == NULL) { + mutex_exit(&dm_pdev_mutex); return NULL; + } dev_pb = pathbuf_create(dev_name); if (dev_pb == NULL) { aprint_debug("%s: pathbuf_create on device: %s failed!\n", __func__, dev_name); + mutex_exit(&dm_pdev_mutex); kmem_free(dmp, sizeof(dm_pdev_t)); return NULL; } @@ -120,13 +122,13 @@ dm_pdev_insert(const char *dev_name) if (error) { aprint_debug("%s: dk_lookup on device: %s (error %d)\n", __func__, dev_name, error); + mutex_exit(&dm_pdev_mutex); kmem_free(dmp, sizeof(dm_pdev_t)); return NULL; } getdisksize(dmp->pdev_vnode, &dmp->pdev_numsec, &dmp->pdev_secsize); dmp->ref_cnt = 1; - mutex_enter(&dm_pdev_mutex); SLIST_INSERT_HEAD(&dm_pdev_list, dmp, next_pdev); mutex_exit(&dm_pdev_mutex); -- cgit