Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp1120257ybt; Tue, 7 Jul 2020 08:13:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw2pfWreRIYQWmlSfLzVGFNbDIZKrrqqBIHujUvIyTvgKBfpvspEy/Iqo45lP04QI7vMcM8 X-Received: by 2002:a17:906:c10f:: with SMTP id do15mr50101853ejc.249.1594134804117; Tue, 07 Jul 2020 08:13:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594134804; cv=none; d=google.com; s=arc-20160816; b=XEzfOWfEgg8SXDAW6T5NN8XiIpT3llkXew46nIuoCWozFM4uD15OYW6kEjLp40zhIQ mfZbv1Fsk4efiCIjRknKyzgLlawHdAK5xYgiluhrfNlsBmyxx4/l+Gpg/WiOySsjBcbQ 8q/kVLyHiz6F/vR2LCGKmId8hS7sWvv9gb40RJ/ZOZINU7s8U9w3lyhG+oNozn01RDXT aFudcARhFiii3kDSPMmDIovKGzz+xUY/Ed48NUt2dbt6sE0bfbjXkegj/+POBGodnlKi F77pwx23HBH0qTuUqgGAmnceUKCBNFVa044iICzm786LRTE3WiSIizjY6IlbIpblMJ73 IIUg== 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=qlRV6DRX6a0htcai8Dg/DufVVoZBfDVMVJrWfhi2Xvs=; b=bF8eNb2In+JeQBlmngyy4YmQiUzQEz5k7MOExf8jEDkdEzrOhnlcqsKxLABtZTUZSy seUNyPiRHTUwtR42muN2ojmQv1r/2TMMGHWot4jeNO1jLRgMD0oFb7eJ6ug7okKTe+S1 jhC0zH2Pu09mzvOvB49qZVn0sC2czD8CbB3cvlJNmLuk9x2xflFT9RstjvqeVs8a/tzu N4DrjMSYdzfvObPSzLkBVib7rm3ZlnMPqRFzIVgpApRdDfFibrZyXq4UDz3nbKN6LQ3e j3D83L4PHAJqMhmQO5eSEeib5ijtvKLkKwoPnp0Pgi1TNH1d+5ftOf+tfv1ALs7PU/v0 OF3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Su6f7jq7; 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 p14si15387016ejr.470.2020.07.07.08.12.57; Tue, 07 Jul 2020 08:13:24 -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=Su6f7jq7; 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 S1728404AbgGGPKi (ORCPT + 99 others); Tue, 7 Jul 2020 11:10:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:51342 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727079AbgGGPKf (ORCPT ); Tue, 7 Jul 2020 11:10:35 -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 B782920663; Tue, 7 Jul 2020 15:10:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594134635; bh=PYh1fCQG7WWfJwewoYwDkRwfFV62qVto3c/0VQwHKQc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Su6f7jq7fZDMtzdkxDp8n8XD7N974asHei64Y2TXk3nDZJ8xiPyAHk9923MV92d2U udhK+qPcNtVy6qaFbnF3v+KNwHWrWMzGf+7aL/qv7IvFtggwVcqKd/mdgnFK4m8OfW vyzLzSh6I3CLugGzyzbKt5bxpDq//wiLzkDXwDbs= 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 4.4 12/19] virtio-blk: free vblk-vqs in error path of virtblk_probe() Date: Tue, 7 Jul 2020 17:10:15 +0200 Message-Id: <20200707145748.120342745@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200707145747.493710555@linuxfoundation.org> References: <20200707145747.493710555@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 1e5cd39d0cc2f..bdc3efacd0d25 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -757,6 +757,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