From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52956) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiK0L-0007OD-HP for qemu-devel@nongnu.org; Wed, 15 Apr 2015 05:53:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YiK0I-00024R-6s for qemu-devel@nongnu.org; Wed, 15 Apr 2015 05:53:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60465) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiK0H-00024J-U2 for qemu-devel@nongnu.org; Wed, 15 Apr 2015 05:53:06 -0400 Message-ID: <552E34FC.20808@redhat.com> Date: Wed, 15 Apr 2015 11:53:00 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1429091024-25098-1-git-send-email-stefanha@redhat.com> In-Reply-To: <1429091024-25098-1-git-send-email-stefanha@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH for-2.4] m25p80: fix s->blk usage before assignment List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Crosthwaite On 15/04/2015 11:43, Stefan Hajnoczi wrote: > Delay the call to blk_blockalign() until s->blk has been assigned. > > This never caused a crash because blk_blockalign(NULL, size) defaults to > 4096 alignment but it's technically incorrect. > > Signed-off-by: Stefan Hajnoczi > --- > hw/block/m25p80.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c > index afe243b..d6a37a5 100644 > --- a/hw/block/m25p80.c > +++ b/hw/block/m25p80.c > @@ -621,7 +621,6 @@ static int m25p80_init(SSISlave *ss) > > s->size = s->pi->sector_size * s->pi->n_sectors; > s->dirty_page = -1; > - s->storage = blk_blockalign(s->blk, s->size); > > /* FIXME use a qdev drive property instead of drive_get_next() */ > dinfo = drive_get_next(IF_MTD); > @@ -629,6 +628,7 @@ static int m25p80_init(SSISlave *ss) > if (dinfo) { > DB_PRINT_L(0, "Binding to IF_MTD drive\n"); > s->blk = blk_by_legacy_dinfo(dinfo); > + s->storage = blk_blockalign(s->blk, s->size); > > /* FIXME: Move to late init */ > if (blk_read(s->blk, 0, s->storage, > @@ -638,6 +638,7 @@ static int m25p80_init(SSISlave *ss) > } > } else { > DB_PRINT_L(0, "No BDRV - binding to RAM\n"); > + s->storage = blk_blockalign(NULL, s->size); > memset(s->storage, 0xFF, s->size); > } > > Reviewed-by: Paolo Bonzini