From patchwork Tue Jun 9 17:45:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 224687 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=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 E21B6C433DF for ; Tue, 9 Jun 2020 17:52:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C2AC3207F9 for ; Tue, 9 Jun 2020 17:52:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591725156; bh=5hEyJv+i8lgPkzKGzA2JKa81T8owg04PWOjhCN+qqAY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wLfeGqCYMST61YeLN6URUejBqztqFZ7uiBtLDRQ9yMQESIQZEAAbDMyZrbS2Xy1mB 5dBX3Di/5ltf2Hj7VFE3AtleREielsl95dAuwcyjhsT5q6+Uqzz3jmEBa2owbn4/8n Z61e9PMwfC9xVEU8XLpTxGP1jkgMiOIPHQ/d9xys= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732914AbgFIRwf (ORCPT ); Tue, 9 Jun 2020 13:52:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:42882 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732904AbgFIRwc (ORCPT ); Tue, 9 Jun 2020 13:52:32 -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 7241A20734; Tue, 9 Jun 2020 17:52:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591725151; bh=5hEyJv+i8lgPkzKGzA2JKa81T8owg04PWOjhCN+qqAY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AowsPmHtZqw6mQ+q6hsOb9kQ/RdfJEzCrqpiMVtwxdzuCl3UBoFd4t5dbiXdRtWJf xNLe7z67cO5wuEnthYvvNGQ4cMzqDX/7LvBVU8BeGjczIaGfm8V/g0WKnUt8CMtrh+ Dl1QzBdneV2Oxk6xiJN3Mq14VSp5I562jXfPk21k= 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 5.4 09/34] vsock: fix timeout in vsock_accept() Date: Tue, 9 Jun 2020 19:45:05 +0200 Message-Id: <20200609174053.793966089@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200609174052.628006868@linuxfoundation.org> References: <20200609174052.628006868@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 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 @@ -1275,7 +1275,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 &&