* [Qemu-devel] [PATCH 0/2] vmdk: fix leaks in vmdk_parse_extents()
@ 2014-09-04 20:04 Stefan Hajnoczi
2014-09-04 20:04 ` [Qemu-devel] [PATCH 1/2] vmdk: fix vmdk_parse_extents() extent_file leaks Stefan Hajnoczi
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Stefan Hajnoczi @ 2014-09-04 20:04 UTC (permalink / raw)
To: qemu-devel; +Cc: Kevin Wolf, Fam Zheng, Stefan Hajnoczi
See patches for the specific leaks.
Stefan Hajnoczi (2):
vmdk: fix vmdk_parse_extents() extent_file leaks
vmdk: fix buf leak in vmdk_parse_extents()
block/vmdk.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
1.9.3
^ permalink raw reply [flat|nested] 8+ messages in thread* [Qemu-devel] [PATCH 1/2] vmdk: fix vmdk_parse_extents() extent_file leaks 2014-09-04 20:04 [Qemu-devel] [PATCH 0/2] vmdk: fix leaks in vmdk_parse_extents() Stefan Hajnoczi @ 2014-09-04 20:04 ` Stefan Hajnoczi 2014-09-04 20:11 ` Max Reitz 2014-09-05 4:52 ` Fam Zheng 2014-09-04 20:04 ` [Qemu-devel] [PATCH 2/2] vmdk: fix buf leak in vmdk_parse_extents() Stefan Hajnoczi 2014-09-05 9:44 ` [Qemu-devel] [PATCH 0/2] vmdk: fix leaks " Stefan Hajnoczi 2 siblings, 2 replies; 8+ messages in thread From: Stefan Hajnoczi @ 2014-09-04 20:04 UTC (permalink / raw) To: qemu-devel; +Cc: Kevin Wolf, Fam Zheng, Stefan Hajnoczi Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> --- block/vmdk.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block/vmdk.c b/block/vmdk.c index 07cb62c..9bf28f3 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -834,6 +834,7 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, ret = vmdk_add_extent(bs, extent_file, true, sectors, 0, 0, 0, 0, 0, &extent, errp); if (ret < 0) { + bdrv_unref(extent_file); return ret; } extent->flat_start_offset = flat_offset << 9; @@ -853,6 +854,7 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, extent = &s->extents[s->num_extents - 1]; } else { error_setg(errp, "Unsupported extent type '%s'", type); + bdrv_unref(extent_file); return -ENOTSUP; } extent->type = g_strdup(type); -- 1.9.3 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH 1/2] vmdk: fix vmdk_parse_extents() extent_file leaks 2014-09-04 20:04 ` [Qemu-devel] [PATCH 1/2] vmdk: fix vmdk_parse_extents() extent_file leaks Stefan Hajnoczi @ 2014-09-04 20:11 ` Max Reitz 2014-09-05 4:52 ` Fam Zheng 1 sibling, 0 replies; 8+ messages in thread From: Max Reitz @ 2014-09-04 20:11 UTC (permalink / raw) To: Stefan Hajnoczi, qemu-devel; +Cc: Kevin Wolf, Fam Zheng On 04.09.2014 22:04, Stefan Hajnoczi wrote: > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > --- > block/vmdk.c | 2 ++ > 1 file changed, 2 insertions(+) Reviewed-by: Max Reitz <mreitz@redhat.com> ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH 1/2] vmdk: fix vmdk_parse_extents() extent_file leaks 2014-09-04 20:04 ` [Qemu-devel] [PATCH 1/2] vmdk: fix vmdk_parse_extents() extent_file leaks Stefan Hajnoczi 2014-09-04 20:11 ` Max Reitz @ 2014-09-05 4:52 ` Fam Zheng 1 sibling, 0 replies; 8+ messages in thread From: Fam Zheng @ 2014-09-05 4:52 UTC (permalink / raw) To: Stefan Hajnoczi; +Cc: Kevin Wolf, qemu-devel On Thu, 09/04 21:04, Stefan Hajnoczi wrote: > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > --- > block/vmdk.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/block/vmdk.c b/block/vmdk.c > index 07cb62c..9bf28f3 100644 > --- a/block/vmdk.c > +++ b/block/vmdk.c > @@ -834,6 +834,7 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, > ret = vmdk_add_extent(bs, extent_file, true, sectors, > 0, 0, 0, 0, 0, &extent, errp); > if (ret < 0) { > + bdrv_unref(extent_file); > return ret; > } > extent->flat_start_offset = flat_offset << 9; > @@ -853,6 +854,7 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, > extent = &s->extents[s->num_extents - 1]; > } else { > error_setg(errp, "Unsupported extent type '%s'", type); > + bdrv_unref(extent_file); > return -ENOTSUP; > } > extent->type = g_strdup(type); > -- > 1.9.3 > Reviewed-by: Fam Zheng <famz@redhat.com> ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Qemu-devel] [PATCH 2/2] vmdk: fix buf leak in vmdk_parse_extents() 2014-09-04 20:04 [Qemu-devel] [PATCH 0/2] vmdk: fix leaks in vmdk_parse_extents() Stefan Hajnoczi 2014-09-04 20:04 ` [Qemu-devel] [PATCH 1/2] vmdk: fix vmdk_parse_extents() extent_file leaks Stefan Hajnoczi @ 2014-09-04 20:04 ` Stefan Hajnoczi 2014-09-04 20:13 ` Max Reitz 2014-09-05 4:52 ` Fam Zheng 2014-09-05 9:44 ` [Qemu-devel] [PATCH 0/2] vmdk: fix leaks " Stefan Hajnoczi 2 siblings, 2 replies; 8+ messages in thread From: Stefan Hajnoczi @ 2014-09-04 20:04 UTC (permalink / raw) To: qemu-devel; +Cc: Kevin Wolf, Fam Zheng, Stefan Hajnoczi vmdk_open_sparse() does not take ownership of buf so the caller always needs to free it. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> --- block/vmdk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/vmdk.c b/block/vmdk.c index 9bf28f3..a1cb911 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -846,8 +846,8 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, } else { ret = vmdk_open_sparse(bs, extent_file, bs->open_flags, buf, errp); } + g_free(buf); if (ret) { - g_free(buf); bdrv_unref(extent_file); return ret; } -- 1.9.3 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH 2/2] vmdk: fix buf leak in vmdk_parse_extents() 2014-09-04 20:04 ` [Qemu-devel] [PATCH 2/2] vmdk: fix buf leak in vmdk_parse_extents() Stefan Hajnoczi @ 2014-09-04 20:13 ` Max Reitz 2014-09-05 4:52 ` Fam Zheng 1 sibling, 0 replies; 8+ messages in thread From: Max Reitz @ 2014-09-04 20:13 UTC (permalink / raw) To: Stefan Hajnoczi, qemu-devel; +Cc: Kevin Wolf, Fam Zheng On 04.09.2014 22:04, Stefan Hajnoczi wrote: > vmdk_open_sparse() does not take ownership of buf so the caller always > needs to free it. > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > --- > block/vmdk.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Max Reitz <mreitz@redhat.com> ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH 2/2] vmdk: fix buf leak in vmdk_parse_extents() 2014-09-04 20:04 ` [Qemu-devel] [PATCH 2/2] vmdk: fix buf leak in vmdk_parse_extents() Stefan Hajnoczi 2014-09-04 20:13 ` Max Reitz @ 2014-09-05 4:52 ` Fam Zheng 1 sibling, 0 replies; 8+ messages in thread From: Fam Zheng @ 2014-09-05 4:52 UTC (permalink / raw) To: Stefan Hajnoczi; +Cc: Kevin Wolf, qemu-devel On Thu, 09/04 21:04, Stefan Hajnoczi wrote: > vmdk_open_sparse() does not take ownership of buf so the caller always > needs to free it. > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > --- > block/vmdk.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/block/vmdk.c b/block/vmdk.c > index 9bf28f3..a1cb911 100644 > --- a/block/vmdk.c > +++ b/block/vmdk.c > @@ -846,8 +846,8 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, > } else { > ret = vmdk_open_sparse(bs, extent_file, bs->open_flags, buf, errp); > } > + g_free(buf); > if (ret) { > - g_free(buf); > bdrv_unref(extent_file); > return ret; > } > -- > 1.9.3 > Reviewed-by: Fam Zheng <famz@redhat.com> ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH 0/2] vmdk: fix leaks in vmdk_parse_extents() 2014-09-04 20:04 [Qemu-devel] [PATCH 0/2] vmdk: fix leaks in vmdk_parse_extents() Stefan Hajnoczi 2014-09-04 20:04 ` [Qemu-devel] [PATCH 1/2] vmdk: fix vmdk_parse_extents() extent_file leaks Stefan Hajnoczi 2014-09-04 20:04 ` [Qemu-devel] [PATCH 2/2] vmdk: fix buf leak in vmdk_parse_extents() Stefan Hajnoczi @ 2014-09-05 9:44 ` Stefan Hajnoczi 2 siblings, 0 replies; 8+ messages in thread From: Stefan Hajnoczi @ 2014-09-05 9:44 UTC (permalink / raw) To: Stefan Hajnoczi; +Cc: Kevin Wolf, Fam Zheng, qemu-devel [-- Attachment #1: Type: text/plain, Size: 431 bytes --] On Thu, Sep 04, 2014 at 09:04:41PM +0100, Stefan Hajnoczi wrote: > See patches for the specific leaks. > > Stefan Hajnoczi (2): > vmdk: fix vmdk_parse_extents() extent_file leaks > vmdk: fix buf leak in vmdk_parse_extents() > > block/vmdk.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > -- > 1.9.3 > > Applied to my block tree: https://github.com/stefanha/qemu/commits/block Stefan [-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2014-09-05 9:44 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-09-04 20:04 [Qemu-devel] [PATCH 0/2] vmdk: fix leaks in vmdk_parse_extents() Stefan Hajnoczi 2014-09-04 20:04 ` [Qemu-devel] [PATCH 1/2] vmdk: fix vmdk_parse_extents() extent_file leaks Stefan Hajnoczi 2014-09-04 20:11 ` Max Reitz 2014-09-05 4:52 ` Fam Zheng 2014-09-04 20:04 ` [Qemu-devel] [PATCH 2/2] vmdk: fix buf leak in vmdk_parse_extents() Stefan Hajnoczi 2014-09-04 20:13 ` Max Reitz 2014-09-05 4:52 ` Fam Zheng 2014-09-05 9:44 ` [Qemu-devel] [PATCH 0/2] vmdk: fix leaks " Stefan Hajnoczi
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).