From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcelo Tosatti Subject: Re: [PATCH] Fix minor memory leak Date: Fri, 24 Apr 2009 17:42:00 -0300 Message-ID: <20090424204200.GA11672@amt.cnet> References: <1240438514.18771.36.camel@voxel> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: kvm To: Nolan Return-path: Received: from mx2.redhat.com ([66.187.237.31]:36855 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752244AbZDXUm1 (ORCPT ); Fri, 24 Apr 2009 16:42:27 -0400 Content-Disposition: inline In-Reply-To: <1240438514.18771.36.camel@voxel> Sender: kvm-owner@vger.kernel.org List-ID: On Wed, Apr 22, 2009 at 03:15:14PM -0700, Nolan wrote: > Fix a memory leak. No big deal, since it happens only a bounded # of > times at startup (as far as I can tell) but it makes valgrind complain. > > I sent this here since qemu doesn't have the code in question (it > allocates buf on the stack, and thus guess_disk_lchs() usually won't > work with O_DIRECT). Nolan, block-raw-posix.c raw_pread() handles alignment for O_DIRECT, so it seems the changes in qemu-kvm are now unnecessary. Can you send a patch to match upstream QEMU, with the buf on stack? TIA > > Signed-off-by: Nolan Leake nolan sigbus.net > > diff --git a/qemu/block.c b/qemu/block.c > index 7a469ed..3cdebcd 100644 > --- a/qemu/block.c > +++ b/qemu/block.c > @@ -771,8 +771,10 @@ static int guess_disk_lchs(BlockDriverState *bs, > bdrv_get_geometry(bs, &nb_sectors); > > ret = bdrv_read(bs, 0, buf, 1); > - if (ret < 0) > + if (ret < 0) { > + qemu_free(buf); > return -1; > + } > /* test msdos magic */ > if (buf[510] != 0x55 || buf[511] != 0xaa) { > qemu_free(buf); > > -- > To unsubscribe from this list: send the line "unsubscribe kvm" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html