From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751776AbcF0CJZ (ORCPT ); Sun, 26 Jun 2016 22:09:25 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:35834 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751564AbcF0CJY (ORCPT ); Sun, 26 Jun 2016 22:09:24 -0400 From: Minfei Huang To: mst@redhat.com Cc: virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Minfei Huang , Minfei Huang Subject: [PATCH] virtio: Return correct errno for function init_vq's failure Date: Mon, 27 Jun 2016 10:09:18 +0800 Message-Id: <1466993358-12064-1-git-send-email-mnghuan@gmail.com> X-Mailer: git-send-email 2.7.4 (Apple Git-66) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The error number -ENOENT or 0 will be returned, if we can not allocate more memory in function init_vq. If host can support multiple virtual queues, and we fails to allocate necessary memory structures for vq, kernel may crash due to incorrect returning. To fix it, kernel will return correct value in init_vq. Signed-off-by: Minfei Huang Signed-off-by: Minfei Huang --- drivers/block/virtio_blk.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 42758b5..40ecb2b 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -393,11 +393,10 @@ static int init_vq(struct virtio_blk *vblk) if (err) num_vqs = 1; + err = -ENOMEM; vblk->vqs = kmalloc(sizeof(*vblk->vqs) * num_vqs, GFP_KERNEL); - if (!vblk->vqs) { - err = -ENOMEM; + if (!vblk->vqs) goto out; - } names = kmalloc(sizeof(*names) * num_vqs, GFP_KERNEL); if (!names) -- 2.7.4 (Apple Git-66)