[Qemu-devel] [PATCH RESEND 0/2] Fix leaks on object_property_add_str() setters

[Qemu-devel] [PATCH RESEND 0/2] Fix leaks on object_property_add_str() setters

[Eduardo Habkost]

Resending two patches from the previous series which were not applied yet.


Eduardo Habkost (2):
  rng-egd: Free old chr_name value before setting new one
  hw/machine: Free old values of string properties

 backends/rng-egd.c | 1 +
 hw/core/machine.c  | 8 ++++++++
 2 files changed, 9 insertions(+)

-- 
1.9.3

[Qemu-devel] [PATCH RESEND 1/2] rng-egd: Free old chr_name value before setting new one

[Eduardo Habkost]

Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 backends/rng-egd.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backends/rng-egd.c b/backends/rng-egd.c
index 25bb3b4..2962795 100644
--- a/backends/rng-egd.c
+++ b/backends/rng-egd.c
@@ -169,6 +169,7 @@ static void rng_egd_set_chardev(Object *obj, const char *value, Error **errp)
     if (b->opened) {
         error_set(errp, QERR_PERMISSION_DENIED);
     } else {
+        g_free(s->chr_name);
         s->chr_name = g_strdup(value);
     }
 }
-- 
1.9.3

Re: [Qemu-devel] [PATCH RESEND 1/2] rng-egd: Free old chr_name value before setting new one

[Amos Kong]

On Wed, Aug 06, 2014 at 03:18:20PM -0300, Eduardo Habkost wrote:
> Reviewed-by: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
>  backends/rng-egd.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/backends/rng-egd.c b/backends/rng-egd.c
> index 25bb3b4..2962795 100644
> --- a/backends/rng-egd.c
> +++ b/backends/rng-egd.c
> @@ -169,6 +169,7 @@ static void rng_egd_set_chardev(Object *obj, const char *value, Error **errp)
>      if (b->opened) {
>          error_set(errp, QERR_PERMISSION_DENIED);
>      } else {
> +        g_free(s->chr_name);
>          s->chr_name = g_strdup(value);
>      }
>  }

Eduardo, a similar patch had been applied.

commit 5e490b6a504912225dff0e520e1c6af68295d238
Author: Amos Kong <akong@redhat.com>
Date:   Thu Nov 21 16:42:50 2013 +0800

    rng-egd: remove redundant free
    
    We didn't set default chr_name, the free is redundant.
    
    Signed-off-by: Amos Kong <akong@redhat.com>
    Message-id: 1385023371-8198-2-git-send-email-akong@redhat.com
    Signed-off-by: Anthony Liguori <aliguori@amazon.com>

> -- 
> 1.9.3

-- 
			Amos.

Re: [Qemu-devel] [PATCH RESEND 1/2] rng-egd: Free old chr_name value before setting new one

[Paolo Bonzini]

Il 07/08/2014 04:24, Amos Kong ha scritto:
> Eduardo, a similar patch had been applied.
> 
> commit 5e490b6a504912225dff0e520e1c6af68295d238
> Author: Amos Kong <akong@redhat.com>
> Date:   Thu Nov 21 16:42:50 2013 +0800
> 
>     rng-egd: remove redundant free
>     
>     We didn't set default chr_name, the free is redundant.
>     
>     Signed-off-by: Amos Kong <akong@redhat.com>
>     Message-id: 1385023371-8198-2-git-send-email-akong@redhat.com
>     Signed-off-by: Anthony Liguori <aliguori@amazon.com>
> 

What if you set chr_name twice?

Paolo

Re: [Qemu-devel] [PATCH RESEND 1/2] rng-egd: Free old chr_name value before setting new one

[Amos Kong]

On Thu, Aug 07, 2014 at 12:18:47PM +0200, Paolo Bonzini wrote:
> Il 07/08/2014 04:24, Amos Kong ha scritto:
> > Eduardo, a similar patch had been applied.
> > 
> > commit 5e490b6a504912225dff0e520e1c6af68295d238
> > Author: Amos Kong <akong@redhat.com>
> > Date:   Thu Nov 21 16:42:50 2013 +0800
> > 
> >     rng-egd: remove redundant free
> >     
> >     We didn't set default chr_name, the free is redundant.
> >     
> >     Signed-off-by: Amos Kong <akong@redhat.com>
> >     Message-id: 1385023371-8198-2-git-send-email-akong@redhat.com
> >     Signed-off-by: Anthony Liguori <aliguori@amazon.com>
> > 
> 
> What if you set chr_name twice?
 
In this case, g_free() is necessary.

So I'm fine with Eduardo's patch: [PATCH RESEND 1/2] rng-egd: Free old chr_name value

> Paolo

-- 
			Amos.

[Qemu-devel] [PATCH RESEND 2/2] hw/machine: Free old values of string properties

[Eduardo Habkost]

Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel.a@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 hw/core/machine.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/hw/core/machine.c b/hw/core/machine.c
index 7a66c57..d145aca 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -24,6 +24,7 @@ static void machine_set_accel(Object *obj, const char *value, Error **errp)
 {
     MachineState *ms = MACHINE(obj);
 
+    g_free(ms->accel);
     ms->accel = g_strdup(value);
 }
 
@@ -79,6 +80,7 @@ static void machine_set_kernel(Object *obj, const char *value, Error **errp)
 {
     MachineState *ms = MACHINE(obj);
 
+    g_free(ms->kernel_filename);
     ms->kernel_filename = g_strdup(value);
 }
 
@@ -93,6 +95,7 @@ static void machine_set_initrd(Object *obj, const char *value, Error **errp)
 {
     MachineState *ms = MACHINE(obj);
 
+    g_free(ms->initrd_filename);
     ms->initrd_filename = g_strdup(value);
 }
 
@@ -107,6 +110,7 @@ static void machine_set_append(Object *obj, const char *value, Error **errp)
 {
     MachineState *ms = MACHINE(obj);
 
+    g_free(ms->kernel_cmdline);
     ms->kernel_cmdline = g_strdup(value);
 }
 
@@ -121,6 +125,7 @@ static void machine_set_dtb(Object *obj, const char *value, Error **errp)
 {
     MachineState *ms = MACHINE(obj);
 
+    g_free(ms->dtb);
     ms->dtb = g_strdup(value);
 }
 
@@ -135,6 +140,7 @@ static void machine_set_dumpdtb(Object *obj, const char *value, Error **errp)
 {
     MachineState *ms = MACHINE(obj);
 
+    g_free(ms->dumpdtb);
     ms->dumpdtb = g_strdup(value);
 }
 
@@ -176,6 +182,7 @@ static void machine_set_dt_compatible(Object *obj, const char *value, Error **er
 {
     MachineState *ms = MACHINE(obj);
 
+    g_free(ms->dt_compatible);
     ms->dt_compatible = g_strdup(value);
 }
 
@@ -232,6 +239,7 @@ static void machine_set_firmware(Object *obj, const char *value, Error **errp)
 {
     MachineState *ms = MACHINE(obj);
 
+    g_free(ms->firmware);
     ms->firmware = g_strdup(value);
 }
 
-- 
1.9.3

Re: [Qemu-devel] [PATCH RESEND 2/2] hw/machine: Free old values of string properties

[Amos Kong]

On Wed, Aug 06, 2014 at 03:18:21PM -0300, Eduardo Habkost wrote:
> Reviewed-by: Markus Armbruster <armbru@redhat.com>
> Reviewed-by: Marcel Apfelbaum <marcel.a@redhat.com>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>


Reviewed-by: Amos Kong <akong@redhat.com>

> ---
>  hw/core/machine.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 7a66c57..d145aca 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -24,6 +24,7 @@ static void machine_set_accel(Object *obj, const char *value, Error **errp)
>  {
>      MachineState *ms = MACHINE(obj);
>  
> +    g_free(ms->accel);
>      ms->accel = g_strdup(value);
>  }
>  
> @@ -79,6 +80,7 @@ static void machine_set_kernel(Object *obj, const char *value, Error **errp)
>  {
>      MachineState *ms = MACHINE(obj);
>  
> +    g_free(ms->kernel_filename);
>      ms->kernel_filename = g_strdup(value);
>  }
>  
> @@ -93,6 +95,7 @@ static void machine_set_initrd(Object *obj, const char *value, Error **errp)
>  {
>      MachineState *ms = MACHINE(obj);
>  
> +    g_free(ms->initrd_filename);
>      ms->initrd_filename = g_strdup(value);
>  }
>  
> @@ -107,6 +110,7 @@ static void machine_set_append(Object *obj, const char *value, Error **errp)
>  {
>      MachineState *ms = MACHINE(obj);
>  
> +    g_free(ms->kernel_cmdline);
>      ms->kernel_cmdline = g_strdup(value);
>  }
>  
> @@ -121,6 +125,7 @@ static void machine_set_dtb(Object *obj, const char *value, Error **errp)
>  {
>      MachineState *ms = MACHINE(obj);
>  
> +    g_free(ms->dtb);
>      ms->dtb = g_strdup(value);
>  }
>  
> @@ -135,6 +140,7 @@ static void machine_set_dumpdtb(Object *obj, const char *value, Error **errp)
>  {
>      MachineState *ms = MACHINE(obj);
>  
> +    g_free(ms->dumpdtb);
>      ms->dumpdtb = g_strdup(value);
>  }
>  
> @@ -176,6 +182,7 @@ static void machine_set_dt_compatible(Object *obj, const char *value, Error **er
>  {
>      MachineState *ms = MACHINE(obj);
>  
> +    g_free(ms->dt_compatible);
>      ms->dt_compatible = g_strdup(value);
>  }
>  
> @@ -232,6 +239,7 @@ static void machine_set_firmware(Object *obj, const char *value, Error **errp)
>  {
>      MachineState *ms = MACHINE(obj);
>  
> +    g_free(ms->firmware);
>      ms->firmware = g_strdup(value);
>  }
>  
> -- 
> 1.9.3
> 

-- 
			Amos.

Re: [Qemu-devel] [PATCH RESEND 2/2] hw/machine: Free old values of string properties

[Michael S. Tsirkin]

On Wed, Aug 06, 2014 at 03:18:21PM -0300, Eduardo Habkost wrote:
> Reviewed-by: Markus Armbruster <armbru@redhat.com>
> Reviewed-by: Marcel Apfelbaum <marcel.a@redhat.com>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

Applied, thanks!

> ---
>  hw/core/machine.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 7a66c57..d145aca 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -24,6 +24,7 @@ static void machine_set_accel(Object *obj, const char *value, Error **errp)
>  {
>      MachineState *ms = MACHINE(obj);
>  
> +    g_free(ms->accel);
>      ms->accel = g_strdup(value);
>  }
>  
> @@ -79,6 +80,7 @@ static void machine_set_kernel(Object *obj, const char *value, Error **errp)
>  {
>      MachineState *ms = MACHINE(obj);
>  
> +    g_free(ms->kernel_filename);
>      ms->kernel_filename = g_strdup(value);
>  }
>  
> @@ -93,6 +95,7 @@ static void machine_set_initrd(Object *obj, const char *value, Error **errp)
>  {
>      MachineState *ms = MACHINE(obj);
>  
> +    g_free(ms->initrd_filename);
>      ms->initrd_filename = g_strdup(value);
>  }
>  
> @@ -107,6 +110,7 @@ static void machine_set_append(Object *obj, const char *value, Error **errp)
>  {
>      MachineState *ms = MACHINE(obj);
>  
> +    g_free(ms->kernel_cmdline);
>      ms->kernel_cmdline = g_strdup(value);
>  }
>  
> @@ -121,6 +125,7 @@ static void machine_set_dtb(Object *obj, const char *value, Error **errp)
>  {
>      MachineState *ms = MACHINE(obj);
>  
> +    g_free(ms->dtb);
>      ms->dtb = g_strdup(value);
>  }
>  
> @@ -135,6 +140,7 @@ static void machine_set_dumpdtb(Object *obj, const char *value, Error **errp)
>  {
>      MachineState *ms = MACHINE(obj);
>  
> +    g_free(ms->dumpdtb);
>      ms->dumpdtb = g_strdup(value);
>  }
>  
> @@ -176,6 +182,7 @@ static void machine_set_dt_compatible(Object *obj, const char *value, Error **er
>  {
>      MachineState *ms = MACHINE(obj);
>  
> +    g_free(ms->dt_compatible);
>      ms->dt_compatible = g_strdup(value);
>  }
>  
> @@ -232,6 +239,7 @@ static void machine_set_firmware(Object *obj, const char *value, Error **errp)
>  {
>      MachineState *ms = MACHINE(obj);
>  
> +    g_free(ms->firmware);
>      ms->firmware = g_strdup(value);
>  }
>  
> -- 
> 1.9.3
> 

Re: [Qemu-devel] [PATCH RESEND 0/2] Fix leaks on object_property_add_str() setters

[Eduardo Habkost]

Ping? Who can apply these?

On Wed, Aug 06, 2014 at 03:18:19PM -0300, Eduardo Habkost wrote:
> Resending two patches from the previous series which were not applied yet.
> 
> 
> Eduardo Habkost (2):
>   rng-egd: Free old chr_name value before setting new one
>   hw/machine: Free old values of string properties
> 
>  backends/rng-egd.c | 1 +
>  hw/core/machine.c  | 8 ++++++++
>  2 files changed, 9 insertions(+)
> 
> -- 
> 1.9.3
> 
> 

-- 
Eduardo

Re: [Qemu-devel] [PATCH RESEND 0/2] Fix leaks on object_property_add_str() setters

[Michael S. Tsirkin]

Are these appropriate for 2.1.1?
Add Cc stable?

On Fri, Aug 22, 2014 at 04:35:24PM -0300, Eduardo Habkost wrote:
> Ping? Who can apply these?
> 
> On Wed, Aug 06, 2014 at 03:18:19PM -0300, Eduardo Habkost wrote:
> > Resending two patches from the previous series which were not applied yet.
> > 
> > 
> > Eduardo Habkost (2):
> >   rng-egd: Free old chr_name value before setting new one
> >   hw/machine: Free old values of string properties
> > 
> >  backends/rng-egd.c | 1 +
> >  hw/core/machine.c  | 8 ++++++++
> >  2 files changed, 9 insertions(+)
> > 
> > -- 
> > 1.9.3
> > 
> > 
> 
> -- 
> Eduardo

Re: [Qemu-devel] [PATCH RESEND 0/2] Fix leaks on object_property_add_str() setters

[Paolo Bonzini]

Il 24/08/2014 13:16, Michael S. Tsirkin ha scritto:
> 
> Are these appropriate for 2.1.1?
> Add Cc stable?

I think so.

Paolo

Re: [Qemu-devel] [PATCH RESEND 0/2] Fix leaks on object_property_add_str() setters

[Eduardo Habkost]

On Mon, Aug 25, 2014 at 01:44:18PM +0200, Paolo Bonzini wrote:
> Il 24/08/2014 13:16, Michael S. Tsirkin ha scritto:
> > 
> > Are these appropriate for 2.1.1?
> > Add Cc stable?
> 
> I think so.

I agree it can go to -stable, but just getting it applied to master is
being difficult enough. :(

Repeating my question from 2 weeks ago: who can apply these?

-- 
Eduardo

Re: [Qemu-devel] [PATCH RESEND 0/2] Fix leaks on object_property_add_str() setters

[Michael S. Tsirkin]

On Thu, Sep 04, 2014 at 12:08:53PM -0300, Eduardo Habkost wrote:
> On Mon, Aug 25, 2014 at 01:44:18PM +0200, Paolo Bonzini wrote:
> > Il 24/08/2014 13:16, Michael S. Tsirkin ha scritto:
> > > 
> > > Are these appropriate for 2.1.1?
> > > Add Cc stable?
> > 
> > I think so.
> 
> I agree it can go to -stable, but just getting it applied to master is
> being difficult enough. :(
> 
> Repeating my question from 2 weeks ago: who can apply these?

I applied 2/2, 1/2 is no longer needed IIUC?

> -- 
> Eduardo

Re: [Qemu-devel] [PATCH RESEND 0/2] Fix leaks on object_property_add_str() setters

[Michael S. Tsirkin]

On Thu, Sep 04, 2014 at 06:29:01PM +0300, Michael S. Tsirkin wrote:
> On Thu, Sep 04, 2014 at 12:08:53PM -0300, Eduardo Habkost wrote:
> > On Mon, Aug 25, 2014 at 01:44:18PM +0200, Paolo Bonzini wrote:
> > > Il 24/08/2014 13:16, Michael S. Tsirkin ha scritto:
> > > > 
> > > > Are these appropriate for 2.1.1?
> > > > Add Cc stable?
> > > 
> > > I think so.
> > 
> > I agree it can go to -stable, but just getting it applied to master is
> > being difficult enough. :(
> > 
> > Repeating my question from 2 weeks ago: who can apply these?
> 
> I applied 2/2, 1/2 is no longer needed IIUC?

Added Cc: qemu-stable@nongnu.org as well.

> > -- 
> > Eduardo

Re: [Qemu-devel] [PATCH RESEND 0/2] Fix leaks on object_property_add_str() setters

[Eduardo Habkost]

On Thu, Sep 04, 2014 at 06:29:01PM +0300, Michael S. Tsirkin wrote:
> On Thu, Sep 04, 2014 at 12:08:53PM -0300, Eduardo Habkost wrote:
> > On Mon, Aug 25, 2014 at 01:44:18PM +0200, Paolo Bonzini wrote:
> > > Il 24/08/2014 13:16, Michael S. Tsirkin ha scritto:
> > > > 
> > > > Are these appropriate for 2.1.1?
> > > > Add Cc stable?
> > > 
> > > I think so.
> > 
> > I agree it can go to -stable, but just getting it applied to master is
> > being difficult enough. :(
> > 
> > Repeating my question from 2 weeks ago: who can apply these?
> 
> I applied 2/2, 1/2 is no longer needed IIUC?

It is still needed. The "similar patch" Amos mentioned (commit
5e490b6a504912225dff0e520e1c6af68295d238) is actually the one that
introduces the bug I am fixing (I just didn't use git-revert because I
wasn't aware of that commit).

-- 
Eduardo

Re: [Qemu-devel] [PATCH RESEND 0/2] Fix leaks on object_property_add_str() setters

[Michael S. Tsirkin]

On Thu, Sep 04, 2014 at 12:34:13PM -0300, Eduardo Habkost wrote:
> On Thu, Sep 04, 2014 at 06:29:01PM +0300, Michael S. Tsirkin wrote:
> > On Thu, Sep 04, 2014 at 12:08:53PM -0300, Eduardo Habkost wrote:
> > > On Mon, Aug 25, 2014 at 01:44:18PM +0200, Paolo Bonzini wrote:
> > > > Il 24/08/2014 13:16, Michael S. Tsirkin ha scritto:
> > > > > 
> > > > > Are these appropriate for 2.1.1?
> > > > > Add Cc stable?
> > > > 
> > > > I think so.
> > > 
> > > I agree it can go to -stable, but just getting it applied to master is
> > > being difficult enough. :(
> > > 
> > > Repeating my question from 2 weeks ago: who can apply these?
> > 
> > I applied 2/2, 1/2 is no longer needed IIUC?
> 
> It is still needed. The "similar patch" Amos mentioned (commit
> 5e490b6a504912225dff0e520e1c6af68295d238) is actually the one that
> introduces the bug I am fixing (I just didn't use git-revert because I
> wasn't aware of that commit).

OK will apply as revert.

> -- 
> Eduardo