提交 c67cf079 编写于 作者: I Ilias Stamatis 提交者: Erik Skultety

test_driver: sanitize user-provided array in testDomainGetDiskErrors

Zero out the user provided memory in order to avoid potentially freeing
uninitialized memory.
Signed-off-by: NIlias Stamatis <stamatis.iliass@gmail.com>
Reviewed-by: NErik Skultety <eskultet@redhat.com>
上级 cfec206e
...@@ -3275,6 +3275,7 @@ static int testDomainGetDiskErrors(virDomainPtr dom, ...@@ -3275,6 +3275,7 @@ static int testDomainGetDiskErrors(virDomainPtr dom,
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
int ret = -1; int ret = -1;
size_t i; size_t i;
size_t nerrors;
virCheckFlags(0, -1); virCheckFlags(0, -1);
...@@ -3284,8 +3285,13 @@ static int testDomainGetDiskErrors(virDomainPtr dom, ...@@ -3284,8 +3285,13 @@ static int testDomainGetDiskErrors(virDomainPtr dom,
if (virDomainObjCheckActive(vm) < 0) if (virDomainObjCheckActive(vm) < 0)
goto cleanup; goto cleanup;
nerrors = MIN(vm->def->ndisks, maxerrors);
if (errors) { if (errors) {
for (i = 0; i < MIN(vm->def->ndisks, maxerrors); i++) { /* sanitize input */
memset(errors, 0, sizeof(virDomainDiskError) * nerrors);
for (i = 0; i < nerrors; i++) {
if (VIR_STRDUP(errors[i].disk, vm->def->disks[i]->dst) < 0) if (VIR_STRDUP(errors[i].disk, vm->def->disks[i]->dst) < 0)
goto cleanup; goto cleanup;
errors[i].error = (i % (VIR_DOMAIN_DISK_ERROR_LAST - 1)) + 1; errors[i].error = (i % (VIR_DOMAIN_DISK_ERROR_LAST - 1)) + 1;
...@@ -3297,7 +3303,7 @@ static int testDomainGetDiskErrors(virDomainPtr dom, ...@@ -3297,7 +3303,7 @@ static int testDomainGetDiskErrors(virDomainPtr dom,
cleanup: cleanup:
if (ret < 0) { if (ret < 0) {
for (i = 0; i < MIN(vm->def->ndisks, maxerrors); i++) for (i = 0; i < nerrors; i++)
VIR_FREE(errors[i].disk); VIR_FREE(errors[i].disk);
} }
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册