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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 873F4C433F5 for ; Tue, 16 Nov 2021 00:01:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6F9E560ED5 for ; Tue, 16 Nov 2021 00:01:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353390AbhKPAEj (ORCPT ); Mon, 15 Nov 2021 19:04:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:45396 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344892AbhKOTZk (ORCPT ); Mon, 15 Nov 2021 14:25:40 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5D4F4636DD; Mon, 15 Nov 2021 19:06:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1637003186; bh=2FAVq0cSXkIby1CZISilZb0CiTX22xuvyVOj3IO7wn8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E81l5DocFSbf6NyA8Kvb+1SQiv+dqyOKqvQwKhXWz+WOt8Ckn4p6wET7DrLIEjDk7 wLwVLrujXCKm/fWDeC4iYMXOmyqR88iEw9r36FGarqxxHJ1omJFvINxtgGY8tYH/NT nw4NQ8TvqP15gHarUDzOnOOLZGRuCBfDfT0lphiY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stefano Garzarella , Eiichi Tsukata , "David S. Miller" , Sasha Levin Subject: [PATCH 5.15 841/917] vsock: prevent unnecessary refcnt inc for nonblocking connect Date: Mon, 15 Nov 2021 18:05:36 +0100 Message-Id: <20211115165457.563639774@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211115165428.722074685@linuxfoundation.org> References: <20211115165428.722074685@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eiichi Tsukata [ Upstream commit c7cd82b90599fa10915f41e3dd9098a77d0aa7b6 ] Currently vosck_connect() increments sock refcount for nonblocking socket each time it's called, which can lead to memory leak if it's called multiple times because connect timeout function decrements sock refcount only once. Fixes it by making vsock_connect() return -EALREADY immediately when sock state is already SS_CONNECTING. Fixes: d021c344051a ("VSOCK: Introduce VM Sockets") Reviewed-by: Stefano Garzarella Signed-off-by: Eiichi Tsukata Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/vmw_vsock/af_vsock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index e2c0cfb334d20..fa8c1b623fa21 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -1322,6 +1322,8 @@ static int vsock_connect(struct socket *sock, struct sockaddr *addr, * non-blocking call. */ err = -EALREADY; + if (flags & O_NONBLOCK) + goto out; break; default: if ((sk->sk_state == TCP_LISTEN) || -- 2.33.0