From patchwork Fri Sep 9 20:33:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ashijeet Acharya X-Patchwork-Id: 668253 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sW8SP71Dhz9ryT for ; Sat, 10 Sep 2016 06:48:53 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=lKK48kzH; dkim-atps=neutral Received: from localhost ([::1]:60154 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1biSjC-0002DA-LM for incoming@patchwork.ozlabs.org; Fri, 09 Sep 2016 16:48:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55917) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1biSVQ-00069k-Ok for qemu-devel@nongnu.org; Fri, 09 Sep 2016 16:34:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1biSVM-0005TZ-QQ for qemu-devel@nongnu.org; Fri, 09 Sep 2016 16:34:35 -0400 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:33188) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1biSVM-0005TL-Jz for qemu-devel@nongnu.org; Fri, 09 Sep 2016 16:34:32 -0400 Received: by mail-pf0-x242.google.com with SMTP id 128so4460825pfb.0 for ; Fri, 09 Sep 2016 13:34:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=3Qr+VGdEePhp20xrha3cPCcoTQNCbm4hcmVK4Fcqg9Q=; b=lKK48kzHZP3ooULxAnnmKWcjLajrqBdJHHDoGyDosxeUpevF/eK9IWMYVa9q4mokvE iutostDQNxR/gNkH+o6WVGjNZm4/FtdDXXsl+eXcRWreEBLP0Ha4SUl8PZh9TCSt9AA/ 2JRen2x3f7ZxRGDkDP6OFOukJlBrEdr/w9BNGGtAmU0yReZe1rfs3y2gJT9m2cEuwVC1 SmQFLWXGCTvx+AbguZ50ubBCzdHS4869kR5TBsaayora3WzK3f/2zpoV0nHv2hbHvE/V 3IxUipI9SH8cKNua5ONT73MpbSkjIJ+UTYyk+YlE/aDXw0yjUtBZ3lEQQ6clwGbJ7Gip UjRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=3Qr+VGdEePhp20xrha3cPCcoTQNCbm4hcmVK4Fcqg9Q=; b=XfH04Io/HGs5RBtNBxGmmsgpywfDhLyXBrJhE2MZ4d7WSJoNUDeFu3LcJfb6e/pZBJ UHkSBJXwzbbdM+BNhdoyud8cRvVcYicbWrKk7wz56vHG4PtW05mysjkjNw11xTsU8Hm2 hcU8UxLAdnGWsJmsA23OglNQnkZhxLj9OX5wXGr7RIoGWUhGpqm92wywNrqGI4P/HgnG bLQyff6t8M0n99myJqHZsxqljymF/rZVfbx9wp0vFu/LqvfcA6PFM9A9kajmzaXDUOLY uI92GNOggLfIYrnbkme1YoM4v63cTCPR+ljWIWIOdjJADJyFHfBh1X2V/ouzrSMPtJDY aypQ== X-Gm-Message-State: AE9vXwNx9qoa99yIIaCi50mbVGkdOLiOU0XXZEBaKTM5wslAZxGQZVDdUZqb7CTZa/HXdQ== X-Received: by 10.98.36.76 with SMTP id r73mr9977100pfj.27.1473453271850; Fri, 09 Sep 2016 13:34:31 -0700 (PDT) Received: from linux.local ([106.208.12.73]) by smtp.gmail.com with ESMTPSA id 24sm7268800pfr.29.2016.09.09.13.34.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Sep 2016 13:34:31 -0700 (PDT) From: Ashijeet Acharya To: quintela@redhat.com Date: Sat, 10 Sep 2016 02:03:36 +0530 Message-Id: <1473453216-529-1-git-send-email-ashijeetacharya@gmail.com> X-Mailer: git-send-email 2.6.2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c00::242 Subject: [Qemu-devel] [PATCH v2] migrate: Fix bounds check for migration parameters in migration.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: amit.shah@redhat.com, dgilbert@redhat.com, Ashijeet Acharya , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 --- 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)) {