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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 3BA48C433E2 for ; Tue, 9 Jun 2020 18:22:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1D2162067B for ; Tue, 9 Jun 2020 18:22:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591726958; bh=4ObKHEsY1sLIYWSZgAie3NuM6DBBmR8SfysgpafluGY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=00gGWhCVUJwtn+qHdnIVekY8/v/iEAkMtFeC93JOgPw61bEEkO6A5EDLIrX4TgZCr hDDxLXmgf/BvCiRq17p2KNJMpJezqP7PwixYgDgEIP18TR6vq39H2YKKi2Dghp1iSt i2cAW3y10fOzfo9vnAQQpML0CM5wWY+v3BNfwLvY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732289AbgFISWc (ORCPT ); Tue, 9 Jun 2020 14:22:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:60476 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732205AbgFIRsS (ORCPT ); Tue, 9 Jun 2020 13:48:18 -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 BB25920814; Tue, 9 Jun 2020 17:48:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591724897; bh=4ObKHEsY1sLIYWSZgAie3NuM6DBBmR8SfysgpafluGY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UzmJnzb7BkmrW5In7KyJitzMKwI2ocr2yQSAUjsoMplmEIbovN3MMZfbretr0Clty oDQMhX/0N/OBHQsWI6DRPPmAmnfdvb4jaFvPXvThcA1eXGCn+Uyk8GSrGtQpTQ7LET 15BYG2zXf3xBzaK6dwy3aSuDqTyknAAFm1lkqLXk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stefano Garzarella , Jorgen Hansen , "David S. Miller" Subject: [PATCH 4.9 26/42] vsock: fix timeout in vsock_accept() Date: Tue, 9 Jun 2020 19:44:32 +0200 Message-Id: <20200609174018.336578290@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200609174015.379493548@linuxfoundation.org> References: <20200609174015.379493548@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Stefano Garzarella [ Upstream commit 7e0afbdfd13d1e708fe96e31c46c4897101a6a43 ] The accept(2) is an "input" socket interface, so we should use SO_RCVTIMEO instead of SO_SNDTIMEO to set the timeout. So this patch replace sock_sndtimeo() with sock_rcvtimeo() to use the right timeout in the vsock_accept(). Fixes: d021c344051a ("VSOCK: Introduce VM Sockets") Signed-off-by: Stefano Garzarella Reviewed-by: Jorgen Hansen Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/vmw_vsock/af_vsock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -1296,7 +1296,7 @@ static int vsock_accept(struct socket *s /* Wait for children sockets to appear; these are the new sockets * created upon connection establishment. */ - timeout = sock_sndtimeo(listener, flags & O_NONBLOCK); + timeout = sock_rcvtimeo(listener, flags & O_NONBLOCK); prepare_to_wait(sk_sleep(listener), &wait, TASK_INTERRUPTIBLE); while ((connected = vsock_dequeue_accept(listener)) == NULL &&