[PATCH] ext2: fix double the double free
fix the double free of err. Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com> --- daemon/ext2.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/daemon/ext2.c b/daemon/ext2.c index 2cd3da3..5deff24 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -280,7 +280,6 @@ do_resize2fs_M (const char *device) r = command (NULL, &err, prog, "-M", device, NULL); if (r == -1) { if (strstr (err, "e2fsck -f")) { - free (err); reply_with_error ("you need to run e2fsck with the correct and/or forceall options first"); } else { reply_with_error ("%s", err); -- 1.7.9.rc0
On 01/16/2012 10:00 AM, Wanlong Gao wrote:
fix the double free of err.
Signed-off-by: Wanlong Gao<gaowanlong@cn.fujitsu.com> --- daemon/ext2.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/daemon/ext2.c b/daemon/ext2.c index 2cd3da3..5deff24 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -280,7 +280,6 @@ do_resize2fs_M (const char *device) r = command (NULL,&err, prog, "-M", device, NULL); if (r == -1) { if (strstr (err, "e2fsck -f")) { - free (err); reply_with_error ("you need to run e2fsck with the correct and/or forceall options first"); } else { reply_with_error ("%s", err);
Is the previous commit already pushed? If so, ACK. If not, could you just fix it up? Thanks, Matt -- Matthew Booth, RHCA, RHCSS Red Hat Engineering, Virtualisation Team GPG ID: D33C3490 GPG FPR: 3733 612D 2D05 5458 8A8A 1600 3441 EA19 D33C 3490
On 01/16/2012 06:05 PM, Matthew Booth wrote:
On 01/16/2012 10:00 AM, Wanlong Gao wrote:
fix the double free of err.
Signed-off-by: Wanlong Gao<gaowanlong@cn.fujitsu.com> --- daemon/ext2.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/daemon/ext2.c b/daemon/ext2.c index 2cd3da3..5deff24 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -280,7 +280,6 @@ do_resize2fs_M (const char *device) r = command (NULL,&err, prog, "-M", device, NULL); if (r == -1) { if (strstr (err, "e2fsck -f")) { - free (err); reply_with_error ("you need to run e2fsck with the correct and/or forceall options first"); } else { reply_with_error ("%s", err);
Is the previous commit already pushed? If so, ACK. If not, could you just fix it up?
It's pushed yesterday. Thanks -Wanlong Gao
Thanks,
Matt
On 01/16/2012 10:05 AM, Wanlong Gao wrote:
On 01/16/2012 06:05 PM, Matthew Booth wrote:
On 01/16/2012 10:00 AM, Wanlong Gao wrote:
fix the double free of err.
Signed-off-by: Wanlong Gao<gaowanlong@cn.fujitsu.com> --- daemon/ext2.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/daemon/ext2.c b/daemon/ext2.c index 2cd3da3..5deff24 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -280,7 +280,6 @@ do_resize2fs_M (const char *device) r = command (NULL,&err, prog, "-M", device, NULL); if (r == -1) { if (strstr (err, "e2fsck -f")) { - free (err); reply_with_error ("you need to run e2fsck with the correct and/or forceall options first"); } else { reply_with_error ("%s", err);
Is the previous commit already pushed? If so, ACK. If not, could you just fix it up?
It's pushed yesterday.
Thunderbird presented the 2 patch series out of order for some reason, so I reviewed the wrong one. Sorry about that! Matt -- Matthew Booth, RHCA, RHCSS Red Hat Engineering, Virtualisation Team GPG ID: D33C3490 GPG FPR: 3733 612D 2D05 5458 8A8A 1600 3441 EA19 D33C 3490
On 01/16/2012 06:10 PM, Matthew Booth wrote:
On 01/16/2012 10:05 AM, Wanlong Gao wrote:
On 01/16/2012 06:05 PM, Matthew Booth wrote:
On 01/16/2012 10:00 AM, Wanlong Gao wrote:
fix the double free of err.
Signed-off-by: Wanlong Gao<gaowanlong@cn.fujitsu.com> --- daemon/ext2.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/daemon/ext2.c b/daemon/ext2.c index 2cd3da3..5deff24 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -280,7 +280,6 @@ do_resize2fs_M (const char *device) r = command (NULL,&err, prog, "-M", device, NULL); if (r == -1) { if (strstr (err, "e2fsck -f")) { - free (err); reply_with_error ("you need to run e2fsck with the correct and/or forceall options first"); } else { reply_with_error ("%s", err);
Is the previous commit already pushed? If so, ACK. If not, could you just fix it up?
It's pushed yesterday.
Thunderbird presented the 2 patch series out of order for some reason, so I reviewed the wrong one. Sorry about that!
Thanks a lot for your review all the same. -Wanlong Gao
Matt
On Mon, Jan 16, 2012 at 06:00:45PM +0800, Wanlong Gao wrote:
fix the double free of err.
Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com> --- daemon/ext2.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/daemon/ext2.c b/daemon/ext2.c index 2cd3da3..5deff24 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -280,7 +280,6 @@ do_resize2fs_M (const char *device) r = command (NULL, &err, prog, "-M", device, NULL); if (r == -1) { if (strstr (err, "e2fsck -f")) { - free (err); reply_with_error ("you need to run e2fsck with the correct and/or forceall options first"); } else { reply_with_error ("%s", err); --
Sorry, I didn't see this patch until now, but in the meantime I read Matt's earlier reply and I've pushed a fix already ... Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top
participants (3)
-
Matthew Booth -
Richard W.M. Jones -
Wanlong Gao