qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH v2] migration: don't use uninitialized variables
@ 2013-07-29 23:39 Pawit Pornkitprasan
  2013-07-30 12:34 ` Eric Blake
  2013-07-30 13:31 ` Luiz Capitulino
  0 siblings, 2 replies; 3+ messages in thread
From: Pawit Pornkitprasan @ 2013-07-29 23:39 UTC (permalink / raw)
  To: qemu-devel
  Cc: Luiz Capitulino, Pawit Pornkitprasan, Ryousei Takano,
	Juan Quintela

The qmp_migrate method uses the 'blk' and 'inc' parameter without
checking if they're valid or not (they may be uninitialized if
command is received via QMP)

Signed-off-by: Pawit Pornkitprasan <p.pawit@gmail.com>
---
 migration.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/migration.c b/migration.c
index 9fc7294..57a7998 100644
--- a/migration.c
+++ b/migration.c
@@ -399,8 +399,8 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
     MigrationParams params;
     const char *p;
 
-    params.blk = blk;
-    params.shared = inc;
+    params.blk = has_blk && blk;
+    params.shared = has_inc && inc;
 
     if (s->state == MIG_STATE_ACTIVE || s->state == MIG_STATE_SETUP) {
         error_set(errp, QERR_MIGRATION_ACTIVE);
-- 
1.7.3.4

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [Qemu-devel] [PATCH v2] migration: don't use uninitialized variables
  2013-07-29 23:39 [Qemu-devel] [PATCH v2] migration: don't use uninitialized variables Pawit Pornkitprasan
@ 2013-07-30 12:34 ` Eric Blake
  2013-07-30 13:31 ` Luiz Capitulino
  1 sibling, 0 replies; 3+ messages in thread
From: Eric Blake @ 2013-07-30 12:34 UTC (permalink / raw)
  To: Pawit Pornkitprasan
  Cc: Juan Quintela, Ryousei Takano, qemu-devel, Luiz Capitulino

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

On 07/29/2013 05:39 PM, Pawit Pornkitprasan wrote:
> The qmp_migrate method uses the 'blk' and 'inc' parameter without
> checking if they're valid or not (they may be uninitialized if
> command is received via QMP)
> 
> Signed-off-by: Pawit Pornkitprasan <p.pawit@gmail.com>
> ---
>  migration.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Eric Blake <eblake@redhat.com>

> 
> diff --git a/migration.c b/migration.c
> index 9fc7294..57a7998 100644
> --- a/migration.c
> +++ b/migration.c
> @@ -399,8 +399,8 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
>      MigrationParams params;
>      const char *p;
>  
> -    params.blk = blk;
> -    params.shared = inc;
> +    params.blk = has_blk && blk;
> +    params.shared = has_inc && inc;
>  
>      if (s->state == MIG_STATE_ACTIVE || s->state == MIG_STATE_SETUP) {
>          error_set(errp, QERR_MIGRATION_ACTIVE);
> 

-- 
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: 621 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [Qemu-devel] [PATCH v2] migration: don't use uninitialized variables
  2013-07-29 23:39 [Qemu-devel] [PATCH v2] migration: don't use uninitialized variables Pawit Pornkitprasan
  2013-07-30 12:34 ` Eric Blake
@ 2013-07-30 13:31 ` Luiz Capitulino
  1 sibling, 0 replies; 3+ messages in thread
From: Luiz Capitulino @ 2013-07-30 13:31 UTC (permalink / raw)
  To: Pawit Pornkitprasan; +Cc: Ryousei Takano, qemu-devel, Juan Quintela

On Tue, 30 Jul 2013 08:39:52 +0900
Pawit Pornkitprasan <p.pawit@gmail.com> wrote:

> The qmp_migrate method uses the 'blk' and 'inc' parameter without
> checking if they're valid or not (they may be uninitialized if
> command is received via QMP)
> 
> Signed-off-by: Pawit Pornkitprasan <p.pawit@gmail.com>

Applied to the qmp branch, thanks.

> ---
>  migration.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/migration.c b/migration.c
> index 9fc7294..57a7998 100644
> --- a/migration.c
> +++ b/migration.c
> @@ -399,8 +399,8 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
>      MigrationParams params;
>      const char *p;
>  
> -    params.blk = blk;
> -    params.shared = inc;
> +    params.blk = has_blk && blk;
> +    params.shared = has_inc && inc;
>  
>      if (s->state == MIG_STATE_ACTIVE || s->state == MIG_STATE_SETUP) {
>          error_set(errp, QERR_MIGRATION_ACTIVE);

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-07-30 13:36 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-29 23:39 [Qemu-devel] [PATCH v2] migration: don't use uninitialized variables Pawit Pornkitprasan
2013-07-30 12:34 ` Eric Blake
2013-07-30 13:31 ` Luiz Capitulino

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).