| Message ID | 20200615041459.22477-1-houtao1@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | virtio-blk: free vblk-vqs in error path of virtblk_probe() | expand |
On Mon, Jun 15, 2020 at 12:14:59PM +0800, Hou Tao wrote: > Else there will be memory leak if alloc_disk() fails. > > Fixes: 6a27b656fc02 ("block: virtio-blk: support multi virt queues per virtio-blk device") > Signed-off-by: Hou Tao <houtao1@huawei.com> > --- > drivers/block/virtio_blk.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c > index 9d21bf0f155e..980df853ee49 100644 > --- a/drivers/block/virtio_blk.c > +++ b/drivers/block/virtio_blk.c > @@ -878,6 +878,7 @@ static int virtblk_probe(struct virtio_device *vdev) > put_disk(vblk->disk); > out_free_vq: > vdev->config->del_vqs(vdev); > + kfree(vblk->vqs); > out_free_vblk: > kfree(vblk); > out_free_index: > -- > 2.25.0.4.g0ad7144999 > The patch LGTM: Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
ping ? On 2020/6/15 15:32, Stefano Garzarella wrote: > On Mon, Jun 15, 2020 at 12:14:59PM +0800, Hou Tao wrote: >> Else there will be memory leak if alloc_disk() fails. >> >> Fixes: 6a27b656fc02 ("block: virtio-blk: support multi virt queues per virtio-blk device") >> Signed-off-by: Hou Tao <houtao1@huawei.com> >> --- >> drivers/block/virtio_blk.c | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c >> index 9d21bf0f155e..980df853ee49 100644 >> --- a/drivers/block/virtio_blk.c >> +++ b/drivers/block/virtio_blk.c >> @@ -878,6 +878,7 @@ static int virtblk_probe(struct virtio_device *vdev) >> put_disk(vblk->disk); >> out_free_vq: >> vdev->config->del_vqs(vdev); >> + kfree(vblk->vqs); >> out_free_vblk: >> kfree(vblk); >> out_free_index: >> -- >> 2.25.0.4.g0ad7144999 >> > > The patch LGTM: > > Reviewed-by: Stefano Garzarella <sgarzare@redhat.com> > >
On Mon, Jun 15, 2020 at 12:14:59PM +0800, Hou Tao wrote: > Else there will be memory leak if alloc_disk() fails. > > Fixes: 6a27b656fc02 ("block: virtio-blk: support multi virt queues per virtio-blk device") > Signed-off-by: Hou Tao <houtao1@huawei.com> > --- > drivers/block/virtio_blk.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c > index 9d21bf0f155e..980df853ee49 100644 > --- a/drivers/block/virtio_blk.c > +++ b/drivers/block/virtio_blk.c > @@ -878,6 +878,7 @@ static int virtblk_probe(struct virtio_device *vdev) > put_disk(vblk->disk); > out_free_vq: > vdev->config->del_vqs(vdev); > + kfree(vblk->vqs); > out_free_vblk: > kfree(vblk); > out_free_index: > -- > 2.25.0.4.g0ad7144999 > Reviewed-by: Ming Lei <ming.lei@redhat.com>
On 6/14/20 10:14 PM, Hou Tao wrote:
> Else there will be memory leak if alloc_disk() fails.
Applied, thanks.
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 9d21bf0f155e..980df853ee49 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -878,6 +878,7 @@ static int virtblk_probe(struct virtio_device *vdev) put_disk(vblk->disk); out_free_vq: vdev->config->del_vqs(vdev); + kfree(vblk->vqs); out_free_vblk: kfree(vblk); out_free_index:
Else there will be memory leak if alloc_disk() fails. Fixes: 6a27b656fc02 ("block: virtio-blk: support multi virt queues per virtio-blk device") Signed-off-by: Hou Tao <houtao1@huawei.com> --- drivers/block/virtio_blk.c | 1 + 1 file changed, 1 insertion(+)