diff options
| author | Justin T. Gibbs <[email protected]> | 2015-04-02 22:59:15 +1100 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-04-28 16:25:44 -0700 |
| commit | 6ebebaceb1091142b81430291c610d79b6a3073e (patch) | |
| tree | 70197ad52e7d910f4a860dcfc1d475aa5d073efc /include/sys/dsl_dataset.h | |
| parent | 0c66c32d1d8b64a261cceb5f50a9e86777c5d0b2 (diff) | |
Illumos 5531 - NULL pointer dereference in dsl_prop_get_ds()
5531 NULL pointer dereference in dsl_prop_get_ds()
Author: Justin T. Gibbs <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: Dan McDonald <[email protected]>
Reviewed by: George Wilson <[email protected]>
Reviewed by: Bayard Bell <[email protected]>
Approved by: Robert Mustacchi <[email protected]>
References:
https://www.illumos.org/issues/5531
https://github.com/illumos/illumos-gate/commit/e57a022
Ported-by: Chris Dunlop <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'include/sys/dsl_dataset.h')
| -rw-r--r-- | include/sys/dsl_dataset.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sys/dsl_dataset.h b/include/sys/dsl_dataset.h index 7e5c0a7cb..edfc5509e 100644 --- a/include/sys/dsl_dataset.h +++ b/include/sys/dsl_dataset.h @@ -197,6 +197,8 @@ dsl_dataset_phys(dsl_dataset_t *ds) int dsl_dataset_hold(struct dsl_pool *dp, const char *name, void *tag, dsl_dataset_t **dsp); +boolean_t dsl_dataset_try_add_ref(struct dsl_pool *dp, dsl_dataset_t *ds, + void *tag); int dsl_dataset_hold_obj(struct dsl_pool *dp, uint64_t dsobj, void *tag, dsl_dataset_t **); void dsl_dataset_rele(dsl_dataset_t *ds, void *tag); |