diff options
| author | Tom Caputi <[email protected]> | 2019-01-17 18:47:08 -0500 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-01-17 15:47:08 -0800 |
| commit | 305781da4bbe11acef8707894d7e33f8aef3ca8e (patch) | |
| tree | 3ac436d2d8c1fe88daee63964e838bdab9f63cd2 /cmd | |
| parent | 75058f33034d23801818582996d3dc941c545910 (diff) | |
Fix error handling incallers of dbuf_hold_level()
Currently, the functions dbuf_prefetch_indirect_done() and
dmu_assign_arcbuf_by_dnode() assume that dbuf_hold_level() cannot
fail. In the event of an error the former will cause a NULL pointer
dereference and the later will trigger a VERIFY. This patch adds
error handling to these functions and their callers where necessary.
Reviewed by: Matt Ahrens <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Tom Caputi <[email protected]>
Closes #8291
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/ztest/ztest.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c index da763d74d..111ed9835 100644 --- a/cmd/ztest/ztest.c +++ b/cmd/ztest/ztest.c @@ -4847,14 +4847,14 @@ ztest_dmu_read_write_zcopy(ztest_ds_t *zd, uint64_t id) FTAG, &dbt, DMU_READ_NO_PREFETCH) == 0); } if (i != 5 || chunksize < (SPA_MINBLOCKSIZE * 2)) { - dmu_assign_arcbuf_by_dbuf(bonus_db, off, - bigbuf_arcbufs[j], tx); + VERIFY0(dmu_assign_arcbuf_by_dbuf(bonus_db, + off, bigbuf_arcbufs[j], tx)); } else { - dmu_assign_arcbuf_by_dbuf(bonus_db, off, - bigbuf_arcbufs[2 * j], tx); - dmu_assign_arcbuf_by_dbuf(bonus_db, + VERIFY0(dmu_assign_arcbuf_by_dbuf(bonus_db, + off, bigbuf_arcbufs[2 * j], tx)); + VERIFY0(dmu_assign_arcbuf_by_dbuf(bonus_db, off + chunksize / 2, - bigbuf_arcbufs[2 * j + 1], tx); + bigbuf_arcbufs[2 * j + 1], tx)); } if (i == 1) { dmu_buf_rele(dbt, FTAG); |