[Qemu-devel] [PATCH v3] migrate: Fix bounds check for migration parameters in migration.c

[Qemu-devel] [PATCH v3] migrate: Fix bounds check for migration parameters in migration.c

[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 <ashijeetacharya@gmail.com>
---
 migration/migration.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/migration/migration.c b/migration/migration.c
index 9b4aa55..cd8334c 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -805,6 +805,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 ||
@@ -812,6 +813,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_max_bandwidth &&
         (params->max_bandwidth < 0 || params->max_bandwidth > SIZE_MAX)) {
-- 
2.6.2

Re: [Qemu-devel] [PATCH v3] migrate: Fix bounds check for migration parameters in migration.c

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 956 bytes --]

On 09/09/2016 03:37 PM, Ashijeet Acharya wrote:
> 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 <ashijeetacharya@gmail.com>
> ---

Remember, after the --- is a good place to give a description of how v3
is better than v1.  Also, since I gave a reviewed-by on v1, and it looks
like all you changed was the commit message, you can manually add my R-b
line during your 'git commit --amend', so that reviewers can shave some
time on the second round of reviews.


-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]