From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiJrP-0000aH-7o for qemu-devel@nongnu.org; Wed, 15 Apr 2015 05:43:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YiJrJ-0007AY-8I for qemu-devel@nongnu.org; Wed, 15 Apr 2015 05:43:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33870) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YiJrI-000795-SX for qemu-devel@nongnu.org; Wed, 15 Apr 2015 05:43:48 -0400 From: Stefan Hajnoczi Date: Wed, 15 Apr 2015 10:43:44 +0100 Message-Id: <1429091024-25098-1-git-send-email-stefanha@redhat.com> Subject: [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: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , Peter Crosthwaite , Stefan Hajnoczi 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); } -- 2.1.0