[Qemu-devel] [PULL 09/15] migrate: Fix bounds check for migration parameters in migration.c

[Juan Quintela]

From: Ashijeet Acharya 

This patch fixes the out-of-bounds check of migration parameters in
qmp_migrate_set_parameters() for cpu-throttle-initial and
cpu-throttle-increment by adding a return statement for both as they
were broken since their introduction in 2.5 via commit 1626fee.
Due to the missing return statements, parameters were getting set to
out-of-bounds values despite the error.

Signed-off-by: Ashijeet Acharya 
Reviewed-by: Eric Blake 
Reviewed-by: Amit Shah 
Reviewed-by: Juan Quintela 
Signed-off-by: Juan Quintela 
---
 migration/migration.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/migration/migration.c b/migration/migration.c
index 42336e3..04b706f 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -796,6 +796,7 @@ void qmp_migrate_set_parameters(MigrationParameters 
*params, Error **errp)
 error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
"cpu_throttle_initial",
"an integer in the range of 1 to 99");
+return;
 }
 if (params->has_cpu_throttle_increment &&
 (params->cpu_throttle_increment < 1 ||
@@ -803,6 +804,7 @@ void qmp_migrate_set_parameters(MigrationParameters 
*params, Error **errp)
 error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
"cpu_throttle_increment",
"an integer in the range of 1 to 99");
+return;
 }

 if (params->has_compress_level) {
-- 
2.7.4

[Qemu-devel] [PULL 09/15] migrate: Fix bounds check for migration parameters in migration.c

[Juan Quintela]

From: Ashijeet Acharya 

This patch fixes the out-of-bounds check of migration parameters in
qmp_migrate_set_parameters() for cpu-throttle-initial and
cpu-throttle-increment by adding a return statement for both as they
were broken since their introduction in 2.5 via commit 1626fee.
Due to the missing return statements, parameters were getting set to
out-of-bounds values despite the error.

Signed-off-by: Ashijeet Acharya 
Reviewed-by: Eric Blake 
Reviewed-by: Amit Shah 
Reviewed-by: Juan Quintela 
Signed-off-by: Juan Quintela 
---
 migration/migration.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/migration/migration.c b/migration/migration.c
index 42336e3..04b706f 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -796,6 +796,7 @@ void qmp_migrate_set_parameters(MigrationParameters 
*params, Error **errp)
 error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
"cpu_throttle_initial",
"an integer in the range of 1 to 99");
+return;
 }
 if (params->has_cpu_throttle_increment &&
 (params->cpu_throttle_increment < 1 ||
@@ -803,6 +804,7 @@ void qmp_migrate_set_parameters(MigrationParameters 
*params, Error **errp)
 error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
"cpu_throttle_increment",
"an integer in the range of 1 to 99");
+return;
 }

 if (params->has_compress_level) {
-- 
2.7.4