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=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 B81CAC43387 for ; Thu, 20 Dec 2018 09:32:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 85E4120449 for ; Thu, 20 Dec 2018 09:32:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545298362; bh=GN6KFNG0iujdhb5Q4B9Hn/jng225OLb7BBNWescq7c0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=N5k2BEX0hPGglDvdWiMIqE908QwzRRMvrP45rxiDOge73RwDux4AEsFjNGOUca4J7 Ml1g/6d5Sxv8e+rLfZZvV+BIXvWQ/9V2bPqh3bFMMXjGPZ8a1IL6STh2bLCAqrkEKa BSY8iq31Dd9NAl39IwB3qmXMu+6c10Mgsd+NMVcI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732976AbeLTJcl (ORCPT ); Thu, 20 Dec 2018 04:32:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:44078 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733051AbeLTJbE (ORCPT ); Thu, 20 Dec 2018 04:31:04 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 CF30E20656; Thu, 20 Dec 2018 09:31:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545298264; bh=GN6KFNG0iujdhb5Q4B9Hn/jng225OLb7BBNWescq7c0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V1aVI6oadWyC57g51A2gJrYz+izLLHtKC1a6x1hkOpNry41nrEvOKHyPGbtWWvlr6 cCPyn2+EsfhTjGsePcrFpTFAMWpgHGOsfDrvhgHPEKDMXhXZvJX9CPxZTZ6gHUKzzo eQ4DbOR4RxjLk+IbAtIHilA7Z/vhtdhb3LyMgqXI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Maximilian Riemensberger , Graham Whaley , Stefan Hajnoczi , "Michael S. Tsirkin" , Sasha Levin Subject: [PATCH 4.19 59/67] vhost/vsock: fix reset orphans race with close timeout Date: Thu, 20 Dec 2018 10:19:11 +0100 Message-Id: <20181220085905.876142437@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181220085903.562090333@linuxfoundation.org> References: <20181220085903.562090333@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit c38f57da428b033f2721b611d84b1f40bde674a8 ] If a local process has closed a connected socket and hasn't received a RST packet yet, then the socket remains in the table until a timeout expires. When a vhost_vsock instance is released with the timeout still pending, the socket is never freed because vhost_vsock has already set the SOCK_DONE flag. Check if the close timer is pending and let it close the socket. This prevents the race which can leak sockets. Reported-by: Maximilian Riemensberger Cc: Graham Whaley Signed-off-by: Stefan Hajnoczi Signed-off-by: Michael S. Tsirkin Signed-off-by: Sasha Levin --- drivers/vhost/vsock.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c index 51879ed18652..98ed5be132c6 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -563,13 +563,21 @@ static void vhost_vsock_reset_orphans(struct sock *sk) * executing. */ - if (!vhost_vsock_get(vsk->remote_addr.svm_cid)) { - sock_set_flag(sk, SOCK_DONE); - vsk->peer_shutdown = SHUTDOWN_MASK; - sk->sk_state = SS_UNCONNECTED; - sk->sk_err = ECONNRESET; - sk->sk_error_report(sk); - } + /* If the peer is still valid, no need to reset connection */ + if (vhost_vsock_get(vsk->remote_addr.svm_cid)) + return; + + /* If the close timeout is pending, let it expire. This avoids races + * with the timeout callback. + */ + if (vsk->close_work_scheduled) + return; + + sock_set_flag(sk, SOCK_DONE); + vsk->peer_shutdown = SHUTDOWN_MASK; + sk->sk_state = SS_UNCONNECTED; + sk->sk_err = ECONNRESET; + sk->sk_error_report(sk); } static int vhost_vsock_dev_release(struct inode *inode, struct file *file) -- 2.19.1