From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Jan Beulich" Subject: Re: [PATCH linux-2.6.18-xen] blkback: don't call vbd_size() if bd_disk is NULL Date: Wed, 25 May 2011 11:36:04 +0100 Message-ID: <4DDCF7B40200007800043721@vpn.id2.novell.com> References: <4DDCD8D9.2060404@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Return-path: In-Reply-To: <4DDCD8D9.2060404@redhat.com> Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: "xen-devel@lists.xensource.com" , Laszlo Ersek List-Id: xen-devel@lists.xenproject.org >>> On 25.05.11 at 12:24, Laszlo Ersek wrote: > ...because vbd_size() dereferences bd_disk if bd_part is NULL. >=20 > Signed-off-by: Laszlo Ersek Acked-by: Jan Beulich > --- > drivers/xen/blkback/vbd.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) >=20 > diff -r 415a9b435fef drivers/xen/blkback/vbd.c > --- a/drivers/xen/blkback/vbd.c Mon May 23 18:36:33 2011 +0100 > +++ b/drivers/xen/blkback/vbd.c Wed May 25 12:15:26 2011 +0200 > @@ -73,7 +73,6 @@ int vbd_create(blkif_t *blkif, blkif_vde > } >=20 > vbd->bdev =3D bdev; > - vbd->size =3D vbd_size(vbd); >=20 > if (vbd->bdev->bd_disk =3D=3D NULL) { > DPRINTK("vbd_creat: device %08x doesn't exist.\n", > @@ -82,6 +81,8 @@ int vbd_create(blkif_t *blkif, blkif_vde > return -ENOENT; > } >=20 > + vbd->size =3D vbd_size(vbd); > + > if (vbd->bdev->bd_disk->flags & GENHD_FL_CD || cdrom) > vbd->type |=3D VDISK_CDROM; > if (vbd->bdev->bd_disk->flags & GENHD_FL_REMOVABLE) >=20 > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xensource.com=20 > http://lists.xensource.com/xen-devel=20