]> granicus.if.org Git - zfs/commitdiff
Illumos 5592 - NULL pointer dereference in dsl_prop_notify_all_cb()
authorJustin T. Gibbs <justing@spectralogic.com>
Thu, 2 Apr 2015 12:00:07 +0000 (23:00 +1100)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 28 Apr 2015 23:25:58 +0000 (16:25 -0700)
5592 NULL pointer dereference in dsl_prop_notify_all_cb()
Author: Justin T. Gibbs <justing@spectralogic.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: George Wilson <george@delphix.com>
Reviewed by: Will Andrews <will@freebsd.org>
Approved by: Robert Mustacchi <rm@joyent.com>

References:
  https://www.illumos.org/issues/5592
  https://github.com/illumos/illumos-gate/commit/9d47dec

Ported-by: Chris Dunlop <chris@onthe.net.au>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
module/zfs/dsl_dataset.c

index a5310edcef3d4d73ab20a6f898278011731cfbdf..de2703868e440149688648546463d8778a81817f 100644 (file)
@@ -354,8 +354,19 @@ dsl_dataset_snap_remove(dsl_dataset_t *ds, const char *name, dmu_tx_t *tx,
 boolean_t
 dsl_dataset_try_add_ref(dsl_pool_t *dp, dsl_dataset_t *ds, void *tag)
 {
-       return (dmu_buf_try_add_ref(ds->ds_dbuf, dp->dp_meta_objset,
-           ds->ds_object, DMU_BONUS_BLKID, tag));
+       dmu_buf_t *dbuf = ds->ds_dbuf;
+       boolean_t result = B_FALSE;
+
+       if (dbuf != NULL && dmu_buf_try_add_ref(dbuf, dp->dp_meta_objset,
+           ds->ds_object, DMU_BONUS_BLKID, tag)) {
+
+               if (ds == dmu_buf_get_user(dbuf))
+                       result = B_TRUE;
+               else
+                       dmu_buf_rele(dbuf, tag);
+       }
+
+       return (result);
 }
 
 int