Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp1124997ybt; Tue, 7 Jul 2020 08:19:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw8MwEKBjOHhRX6sk0hq5NJlu3s51qKwXzFmRlFZELBnBp13Kz8s8q1kZbIYAJSLKIQAXY6 X-Received: by 2002:a17:906:a892:: with SMTP id ha18mr48865174ejb.462.1594135150390; Tue, 07 Jul 2020 08:19:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594135150; cv=none; d=google.com; s=arc-20160816; b=b1lT1j7a42+Jm+AQ7h8sCX7HuhiwbE9zEdETRnaVmus6qFznpT0U88oUrSeZtL1cq5 hfwICMFRz6E8+T5VT9zFOgo5Kz+v/OV0GerEqpli5X6mkgfITWPe1NH3OkEOwnGXhy7h Ha6XdBT2iYAwwGMgi5I2oMXn1i7/ZwLszZzaaLVc0K97Z62TDRYeQevdm00mVuMc5cbb 7p3HDlpswlnOCn07xf1EXwV3YeM754qX69uD02/K5cwixAvjnJdjM8Qg5rwWjbkvkspw c0LwSRHpL28C8W86WBo7Hs8ieueOMNVSCYvJRxMmymXqQ9FEVJQTaBEne5eiYQnGF7wI OAoA== 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=TiAvDU3kKsmVUMeZSjzHzVHtxIKVluApGekeQCNj/cc=; b=ochZnnbee+8tZXjZBg6Kd7r2NLo51tLKydAhYUfP+t6QYSYLATGf0eTRrq06h3186l cjz5uzn2fDAQNV3GPOQT5vLRE+utixV/5ySEOB99tKAJZtaSlYFfPDTKM7B3PxIcUk+I Cuc7yVpitdXsM9yJP+mpPjO7P3eGk7dO5A3lHv8+v9vswnSVV0yTxlmwYa869zm4WSGl E9QlYSeEWtg07dxR+AqcDqe/lrXSRpmMfL6WtpdL4hp1u/BwPqCbHZWzoiNO+4f77cZ1 FacZsqPAl29RfB+6NXHVKiRFzfZziqZPs52ZMnzxn3+i/e6Vj1C/TVZNIsuastMjStDk gQVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=v6D31zI1; 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 rn15si15733224ejb.513.2020.07.07.08.18.47; Tue, 07 Jul 2020 08:19:10 -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=v6D31zI1; 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 S1728647AbgGGPPf (ORCPT + 99 others); Tue, 7 Jul 2020 11:15:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:53640 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728519AbgGGPOV (ORCPT ); Tue, 7 Jul 2020 11:14:21 -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 75D722065D; Tue, 7 Jul 2020 15:14:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594134860; bh=2G3BIuTU/HhHkQyqAuE2BMwJlaSOPZWt+5/kKJe2Nek=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v6D31zI1Qc2j/jNytIvyxE8y+jWwQ/gOdJhaLfYNZE4JnSb38Bj/64nyLr8LI1ykU tJs3ZYOcjpKu++PTMDAzT+HT+nGZcIt3cQbPYpPAPkpk4IRahCpwqIFhiazRMJgfwm 6nO/5/sfwPfERMxHHsuDsGytv+UA82WzyjtGXrDE= 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.9 16/24] virtio-blk: free vblk-vqs in error path of virtblk_probe() Date: Tue, 7 Jul 2020 17:13:48 +0200 Message-Id: <20200707145749.756714344@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200707145748.952502272@linuxfoundation.org> References: <20200707145748.952502272@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 f287eec36b282..e57a1f6e39d5c 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -749,6 +749,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