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

devstat_selectdevs: resize dev_select only after copying data out of it

Browse Source 
The resizing could be a downsizing so some data would be lost and we
could attempt to read past the end of the new memory allocation.

MFC after:	2 weeks
Sponsored by:	Panzura
This commit is contained in:
Andriy Gapon 2019-12-03 09:48:43 +00:00
parent 3995097fde
commit 84a03ac69a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/libdevstat/devstat.c
View File

@ -584,10 +584,10 @@ devstat_selectdevs(struct device_selection **dev_select, int *num_selected,
* In this case, we have selected devices before, but the device
* list has changed since we last selected devices, so we need to
* either enlarge or reduce the size of the device selection list.
* But delay the resizing until after copying the data to old_dev_select
* as to not lose any data in the case of reducing the size.
*/
} else if (*num_selections != numdevs) {
*dev_select = (struct device_selection *)reallocf(*dev_select,
numdevs * sizeof(struct device_selection));
*select_generation = current_generation;
init_selections = 1;
/*
@ -645,6 +645,11 @@ devstat_selectdevs(struct device_selection **dev_select, int *num_selected,
sizeof(struct device_selection) * *num_selections);
}
if (!changed && *num_selections != numdevs) {
*dev_select = (struct device_selection *)reallocf(*dev_select,
numdevs * sizeof(struct device_selection));
}
if (init_selections != 0) {
bzero(*dev_select, sizeof(struct device_selection) * numdevs);