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=-10.1 required=3.0 tests=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 40583C33CAF for ; Thu, 16 Jan 2020 18:36:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0E2792073A for ; Thu, 16 Jan 2020 18:36:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579199811; bh=7CqdlXnpRC8VgYjYKE5c2Wwwrus8yUPi3smsv4lDifA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SVf0Ulz65IERjxu+7q7Mj56Hqja0lO06MrJG2N4b2uSoTsFaJDZEG2uxvXdzp69wd lcl9mrco3rM5KbzJj7ObmNLyHSBgMDaCCsdY8YRNY6ExDMxMvY+ualTvcNBUYE6FR5 ecrbFkhHlLI3/jAoYEJC+WQSBQOAmNEouGYPJ8HI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390629AbgAPRNB (ORCPT ); Thu, 16 Jan 2020 12:13:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:56882 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729368AbgAPRNA (ORCPT ); Thu, 16 Jan 2020 12:13:00 -0500 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 2A7F824696; Thu, 16 Jan 2020 17:12:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579194779; bh=7CqdlXnpRC8VgYjYKE5c2Wwwrus8yUPi3smsv4lDifA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xZHF415o0x0X/Sjgn89J+n/1QelroR4yTrf5z2V242KfWgk+YdrSbnkA7XdBM0WwC nG1hmGYypiXJ35J2z5apV3zHsdZO8XJHISQSbMlqE69f9Xv++8ce674C7JyFtjyIxz ELR3U8yHKnwVYZa2rc99yj+PC4wuPEq0Isg4vLJI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Michael S. Tsirkin" , Sasha Levin , kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 596/671] vhost/test: stop device before reset Date: Thu, 16 Jan 2020 12:03:54 -0500 Message-Id: <20200116170509.12787-333-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116170509.12787-1-sashal@kernel.org> References: <20200116170509.12787-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: "Michael S. Tsirkin" [ Upstream commit 245cdd9fbd396483d501db83047116e2530f245f ] When device stop was moved out of reset, test device wasn't updated to stop before reset, this resulted in a use after free. Fix by invoking stop appropriately. Fixes: b211616d7125 ("vhost: move -net specific code out") Signed-off-by: Michael S. Tsirkin Signed-off-by: Sasha Levin --- drivers/vhost/test.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c index a9be2d8e98df..55090d9f9de0 100644 --- a/drivers/vhost/test.c +++ b/drivers/vhost/test.c @@ -162,6 +162,7 @@ static int vhost_test_release(struct inode *inode, struct file *f) vhost_test_stop(n, &private); vhost_test_flush(n); + vhost_dev_stop(&n->dev); vhost_dev_cleanup(&n->dev); /* We do an extra flush before freeing memory, * since jobs can re-queue themselves. */ @@ -238,6 +239,7 @@ static long vhost_test_reset_owner(struct vhost_test *n) } vhost_test_stop(n, &priv); vhost_test_flush(n); + vhost_dev_stop(&n->dev); vhost_dev_reset_owner(&n->dev, umem); done: mutex_unlock(&n->dev.mutex); -- 2.20.1