| Message ID | 20190306030601.21986-2-david@gibson.dropbear.id.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | virtio-balloon: Several fixes to recent rework | expand |
On 06.03.19 04:05, David Gibson wrote: > ed48c59875b6 "virtio-balloon: Safely handle BALLOON_PAGE_SIZE < host > page size" introduced a new temporary data structure which tracks 4kiB > chunks which have been inserted into the balloon by the guest but > don't yet form a full host page which we can discard. > > Unfortunately, I had a thinko and allocated that structure with > g_malloc0() but freed it with a plain free() rather than g_free(). > This corrects the problem. > > Fixes: ed48c59875b6 > Reported-by: Peter Maydell <peter.maydell@linaro.org> > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> > --- > hw/virtio/virtio-balloon.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c > index d3f2913a85..127289ae0e 100644 > --- a/hw/virtio/virtio-balloon.c > +++ b/hw/virtio/virtio-balloon.c > @@ -81,7 +81,7 @@ static void balloon_inflate_page(VirtIOBalloon *balloon, > /* We've partially ballooned part of a host page, but now > * we're trying to balloon part of a different one. Too hard, > * give up on the old partial page */ > - free(balloon->pbp); > + g_free(balloon->pbp); > balloon->pbp = NULL; > } > > @@ -106,7 +106,7 @@ static void balloon_inflate_page(VirtIOBalloon *balloon, > * has already reported them, and failing to discard a balloon > * page is not fatal */ > > - free(balloon->pbp); > + g_free(balloon->pbp); > balloon->pbp = NULL; > } > } > Reviewed-by: David Hildenbrand <david@redhat.com>
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index d3f2913a85..127289ae0e 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -81,7 +81,7 @@ static void balloon_inflate_page(VirtIOBalloon *balloon, /* We've partially ballooned part of a host page, but now * we're trying to balloon part of a different one. Too hard, * give up on the old partial page */ - free(balloon->pbp); + g_free(balloon->pbp); balloon->pbp = NULL; } @@ -106,7 +106,7 @@ static void balloon_inflate_page(VirtIOBalloon *balloon, * has already reported them, and failing to discard a balloon * page is not fatal */ - free(balloon->pbp); + g_free(balloon->pbp); balloon->pbp = NULL; } }
ed48c59875b6 "virtio-balloon: Safely handle BALLOON_PAGE_SIZE < host page size" introduced a new temporary data structure which tracks 4kiB chunks which have been inserted into the balloon by the guest but don't yet form a full host page which we can discard. Unfortunately, I had a thinko and allocated that structure with g_malloc0() but freed it with a plain free() rather than g_free(). This corrects the problem. Fixes: ed48c59875b6 Reported-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: David Gibson <david@gibson.dropbear.id.au> --- hw/virtio/virtio-balloon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)