d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

loader: rs_alloc() may return NULL

Browse Source 
rs_alloc() in zfs reader code may return NULL, so we need to check the return value and error out if needed.
MFC after:	1 week
This commit is contained in:
Toomas Soome 2019-10-26 18:29:02 +00:00
parent 20795e252a
commit 4efce32a51
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=354119
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
stand/libsa/zfs/zfsimpl.c
View File

@ -840,12 +840,17 @@ vdev_indirect_remap(vdev_t *vd, uint64_t offset, uint64_t asize, void *arg)
list_t stack;
spa_t *spa = vd->spa;
zio_t *zio = arg;
remap_segment_t *rs;
list_create(&stack, sizeof (remap_segment_t),
offsetof(remap_segment_t, rs_node));
for (remap_segment_t *rs = rs_alloc(vd, offset, asize, 0);
rs != NULL; rs = list_remove_head(&stack)) {
rs = rs_alloc(vd, offset, asize, 0);
if (rs == NULL) {
printf("vdev_indirect_remap: out of memory.\n");
zio->io_error = ENOMEM;
}
for ( ; rs != NULL; rs = list_remove_head(&stack)) {
vdev_t *v = rs->rs_vd;
uint64_t num_entries = 0;
/* vdev_indirect_mapping_t *vim = v->v_mapping; */
@ -853,6 +858,9 @@ vdev_indirect_remap(vdev_t *vd, uint64_t offset, uint64_t asize, void *arg)
vdev_indirect_mapping_duplicate_adjacent_entries(v,
rs->rs_offset, rs->rs_asize, &num_entries);
if (num_entries == 0)
zio->io_error = ENOMEM;
for (uint64_t i = 0; i < num_entries; i++) {
vdev_indirect_mapping_entry_phys_t *m = &mapping[i];
uint64_t size = DVA_GET_ASIZE(&m->vimep_dst);
@ -865,9 +873,18 @@ vdev_indirect_remap(vdev_t *vd, uint64_t offset, uint64_t asize, void *arg)
vdev_t *dst_v = vdev_lookup_top(spa, dst_vdev);
if (dst_v->v_read == vdev_indirect_read) {
list_insert_head(&stack,
rs_alloc(dst_v, dst_offset + inner_offset,
inner_size, rs->rs_split_offset));
remap_segment_t *o;
o = rs_alloc(dst_v, dst_offset + inner_offset,
inner_size, rs->rs_split_offset);
if (o == NULL) {
printf("vdev_indirect_remap: "
"out of memory.\n");
zio->io_error = ENOMEM;
break;
}
list_insert_head(&stack, o);
}
vdev_indirect_gather_splits(rs->rs_split_offset, dst_v,
dst_offset + inner_offset,