Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp1135879ybt; Tue, 7 Jul 2020 08:32:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxLGBm9NYS9gns+nk/+tiks+5K9Mtl1+QRhVW8IZi8V8dbvh7o9f+WDmxNdPkwXmR9YAfLX X-Received: by 2002:a50:dacf:: with SMTP id s15mr64620729edj.136.1594135953032; Tue, 07 Jul 2020 08:32:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594135953; cv=none; d=google.com; s=arc-20160816; b=JRBk0DF3Bgl4gFA1ufvJNERv1H921dffvUMH4rpoS3sPW4KVy1wgpBS0vvjFduH680 IuW+IaaN1bsu0gV1EDEKEwEFlsa6u/y8jCpY/XWrx/xPevlhVVHI3WtEC1i08fBX4vq9 nvitDU4hxgaxsIOwElInv5v89rkac+erMDTdV+RrVKNKqriUcrRoYiqth6R82iYDERp6 PXUO9oqMiWzWu0ICF6NuRH37i1euzFWoIg5aPrt88IHwrc0Xsz4xoHpWfpcQOg3BN2LL xV+RT28IpilxX/myZD/L+uHl8I4gcc7P3w+1qe4capQyQM5gEi7UX9jyOVnJrHueg64e QSlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=nozF0/BuF3y/Ldpqn3PTCXuuGN+zXl69mdbAngzfPSQ=; b=VT1EMUI+orzp2JumH5tyZ70nBpz3rAmolbpTRv9SSkZhoXaA71FXNlybHJcGtv52xL QCZqd4r6NIuc0B/M5KuQmY9Re8zNvO7qXpNRBRZtHnNPGsacBiKTkGJ56AVL4kvZ47L0 cPfl6qIqbpCtvFHpq33LYV3rcyo7gtLMEfINK87Vr0wkCeEmNaaOZWz5li2Bs5lTVTuM sXxdDoP1nI3rDy072DYTqGZbNP4xHw7TdbTcH8fjza6GeI6CqlBTkQH1aU1o+UpxvAXa WuV9SCRE6xRZDVXadiBYdain1PynSDwJ8mdMXBlb3IcYpBsWtOsVp/m1FTkmMFAL5rJO NcZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=QYV6l3fi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bf17si14577645edb.78.2020.07.07.08.32.08; Tue, 07 Jul 2020 08:32:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=QYV6l3fi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729871AbgGGPWd (ORCPT + 99 others); Tue, 7 Jul 2020 11:22:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:35002 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728388AbgGGPWZ (ORCPT ); Tue, 7 Jul 2020 11:22:25 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 667112078D; Tue, 7 Jul 2020 15:22:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594135344; bh=Nm1fwMO8wXN0SEk3BOGnkRWpZBQErIOS1mTcAjnpcs4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QYV6l3fi97ecIfe/eoZ752kUrB7S/BweFo8+YLEwCXg1Iii9SvV6EH4ZrJRoLKMOF wQnqr5Pq7ZvMyJ69fCmY8DIYx1PDPUDtf/ej5tJ5TsrROq2msjJj4gnBxa3CLhe3N1 vZZnXwce8PBe8JVkkBgjRdDB8tqloEvwR7r/IdW4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hou Tao , Stefano Garzarella , Ming Lei , Jens Axboe , Sasha Levin Subject: [PATCH 5.4 39/65] virtio-blk: free vblk-vqs in error path of virtblk_probe() Date: Tue, 7 Jul 2020 17:17:18 +0200 Message-Id: <20200707145754.348233875@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200707145752.417212219@linuxfoundation.org> References: <20200707145752.417212219@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hou Tao [ Upstream commit e7eea44eefbdd5f0345a0a8b80a3ca1c21030d06 ] 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 Reviewed-by: Stefano Garzarella Reviewed-by: Ming Lei Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- 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 0cf2fe2902307..c1de270046bfe 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -990,6 +990,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.1