Skip to content

Fix heap buffer overflow in H5VM_array_fill() #6513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jhendersonHDF wants to merge 1 commit into
base: develop
Choose a base branch
from
+33 −10
Draft

Fix heap buffer overflow in H5VM_array_fill() #6513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/H5Dfill.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ H5D__fill_init(H5D_fill_buf_info_t *fb_info, void *caller_fill_buf, H5MM_allocat
if (total_nelmts > 0)
fb_info->elmts_per_buf = MIN(total_nelmts, MAX(1, (max_buf_size / fb_info->max_elmt_size)));
else
fb_info->elmts_per_buf = max_buf_size / fb_info->max_elmt_size;
fb_info->elmts_per_buf = MAX(1, (max_buf_size / fb_info->max_elmt_size));
assert(fb_info->elmts_per_buf > 0);

/* Compute the buffer size to use */
Expand Down Expand Up @@ -388,13 +388,18 @@ H5D__fill_init(H5D_fill_buf_info_t *fb_info, void *caller_fill_buf, H5MM_allocat
else {
/* If fill value is not library default, use it to set the element size */
assert(fill->size >= 0);

if (H5T_get_size(dset_type) != (size_t)fill->size)
HGOTO_ERROR(H5E_DATASET, H5E_BADVALUE, FAIL,
"fill value type size doesn't match file type size");

fb_info->max_elmt_size = fb_info->file_elmt_size = fb_info->mem_elmt_size = (size_t)fill->size;

/* Compute the number of elements that fit within a buffer to write */
if (total_nelmts > 0)
fb_info->elmts_per_buf = MIN(total_nelmts, MAX(1, (max_buf_size / fb_info->max_elmt_size)));
else
fb_info->elmts_per_buf = max_buf_size / fb_info->max_elmt_size;
fb_info->elmts_per_buf = MAX(1, (max_buf_size / fb_info->max_elmt_size));
assert(fb_info->elmts_per_buf > 0);

/* Compute the buffer size to use */
Expand Down Expand Up @@ -433,7 +438,7 @@ H5D__fill_init(H5D_fill_buf_info_t *fb_info, void *caller_fill_buf, H5MM_allocat
if (total_nelmts > 0)
fb_info->elmts_per_buf = MIN(total_nelmts, MAX(1, (max_buf_size / fb_info->max_elmt_size)));
else
fb_info->elmts_per_buf = max_buf_size / fb_info->max_elmt_size;
fb_info->elmts_per_buf = MAX(1, (max_buf_size / fb_info->max_elmt_size));
assert(fb_info->elmts_per_buf > 0);

/* Compute the buffer size to use */
Expand Down
32 changes: 25 additions & 7 deletions src/H5Ofill.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,13 +186,13 @@ H5FL_BLK_EXTERN(type_conv);
*-------------------------------------------------------------------------
*/
static void *
H5O__fill_new_decode(H5F_t H5_ATTR_UNUSED *f, H5O_t H5_ATTR_UNUSED *open_oh,
unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags, size_t p_size,
const uint8_t *p)
H5O__fill_new_decode(H5F_t H5_ATTR_UNUSED *f, H5O_t *open_oh, unsigned H5_ATTR_UNUSED mesg_flags,
unsigned H5_ATTR_UNUSED *ioflags, size_t p_size, const uint8_t *p)
{
H5O_fill_t *fill = NULL;
const uint8_t *p_end = p + p_size - 1; /* End of the p buffer */
void *ret_value = NULL; /* Return value */
H5T_t *dt = NULL;
void *ret_value = NULL; /* Return value */

FUNC_ENTER_PACKAGE

Expand Down Expand Up @@ -303,10 +303,28 @@ H5O__fill_new_decode(H5F_t H5_ATTR_UNUSED *f, H5O_t H5_ATTR_UNUSED *open_oh,
fill->fill_defined = true;
}

/* Verify fill value size against datatype size */
if (fill->fill_defined && fill->size > 0) {
htri_t msg_exists = false;

if ((msg_exists = H5O_msg_exists_oh(open_oh, H5O_DTYPE_ID)) < 0)
HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, NULL, "unable to read object header");
if (msg_exists) {
if (NULL == (dt = H5O_msg_read_oh(f, open_oh, H5O_DTYPE_ID, NULL)))
HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, NULL, "can't read datatype message");

if ((size_t)fill->size != H5T_GET_SIZE(dt))
HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, NULL, "inconsistent fill value size");
}
}

/* Set return value */
ret_value = (void *)fill;

done:
if (dt)
H5O_msg_free(H5O_DTYPE_ID, dt);

if (!ret_value && fill) {
H5MM_xfree(fill->buf);
fill = H5FL_FREE(H5O_fill_t, fill);
Expand Down Expand Up @@ -362,13 +380,13 @@ H5O__fill_old_decode(H5F_t *f, H5O_t *open_oh, unsigned H5_ATTR_UNUSED mesg_flag

/* Get the datatype message */
if ((exists = H5O_msg_exists_oh(open_oh, H5O_DTYPE_ID)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, NULL, "unable to read object header");
HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, NULL, "unable to read object header");
if (exists) {
if (NULL == (dt = (H5T_t *)H5O_msg_read_oh(f, open_oh, H5O_DTYPE_ID, NULL)))
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, NULL, "can't read DTYPE message");
HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, NULL, "can't read DTYPE message");
/* Verify size */
if (fill->size != (ssize_t)H5T_GET_SIZE(dt))
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, NULL, "inconsistent fill value size");
HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, NULL, "inconsistent fill value size");
}

if (NULL == (fill->buf = H5MM_malloc((size_t)fill->size)))
Expand Down
Loading