From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D2CCC433E7 for ; Mon, 12 Oct 2020 19:03:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 03D43221FC for ; Mon, 12 Oct 2020 19:03:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602529400; bh=BYbbrFgph4SjLhGZw4fINy6lmVuypEQSdT6k9nzquQc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=y83cRcLWO5Vs/IsFyvcw4+tn5Sxazu02bIhE6FB2yF6t3/neulo+uxtubRONmUIK3 OoDpbP6+0ZzCiLZLQAMrajDhVBCzN2UPqJonVBr9c/zcuefDW0stRILd0L4o57uV+I OS3dBU+3gtt0xZgZSLXEXtuu/2wMWlZ69N3sQxSA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389404AbgJLTDD (ORCPT ); Mon, 12 Oct 2020 15:03:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:52368 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388390AbgJLTDC (ORCPT ); Mon, 12 Oct 2020 15:03:02 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 68C8921582; Mon, 12 Oct 2020 19:02:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602529380; bh=BYbbrFgph4SjLhGZw4fINy6lmVuypEQSdT6k9nzquQc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WJXwbpDh/qNsdNwUz5wCM7EnSLBrpIEXEki7sMBgNrJrL36+0sYlnYl9RT8Jv6KkF iCm535JwpGIO3GNbGqN2mOGk7rnCXf+4VcapVjoRk1cvd9IkpaQiXB1urugrVRyy96 aUxD2NQIwyzJDe/yVpMSQulhzQ7nwaEEaRCjqVKM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mike Christie , "Michael S . Tsirkin" , Jason Wang , Sasha Levin , kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.8 16/24] vhost vdpa: fix vhost_vdpa_open error handling Date: Mon, 12 Oct 2020 15:02:31 -0400 Message-Id: <20201012190239.3279198-16-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201012190239.3279198-1-sashal@kernel.org> References: <20201012190239.3279198-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mike Christie [ Upstream commit 37787e9f81e2e586b526ff5c29c94e4f41513e80 ] We must free the vqs array in the open failure path, because vhost_vdpa_release will not be called. Signed-off-by: Mike Christie Link: https://lore.kernel.org/r/1600712588-9514-2-git-send-email-michael.christie@oracle.com Signed-off-by: Michael S. Tsirkin Acked-by: Jason Wang Signed-off-by: Sasha Levin --- drivers/vhost/vdpa.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c index a54b60d6623f0..13cdf38f8578a 100644 --- a/drivers/vhost/vdpa.c +++ b/drivers/vhost/vdpa.c @@ -760,6 +760,7 @@ static int vhost_vdpa_open(struct inode *inode, struct file *filep) err_init_iotlb: vhost_dev_cleanup(&v->vdev); + kfree(vqs); err: atomic_dec(&v->opened); return r; -- 2.25.1