Received: by 10.223.185.116 with SMTP id b49csp1065120wrg; Fri, 23 Feb 2018 11:16:41 -0800 (PST) X-Google-Smtp-Source: AH8x227Aoe8Zy5XLPQPnJZxll1iP9h+Hf3x3rRSzBjT4jfhsDmft5cVguD6NJnqGpiTkLjJ8isfK X-Received: by 2002:a17:902:8b85:: with SMTP id ay5-v6mr2679547plb.329.1519413400924; Fri, 23 Feb 2018 11:16:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519413400; cv=none; d=google.com; s=arc-20160816; b=JTQUtddYMku7HGJVxNZGOrudg/nm2MZxX71oEzlaFmD5bHtt3qvD3SFU8m0rESmTRx 7x3WiHCWCpfXUt0Xozw0C+5yVM05ZdlEpuJ7CPKtUxxQyKroNL0psVHMm8D5NtZvyXWZ 5tCmJIrPnIY0wQYmIKFVc7++b4aiRd6BCTTOd/aKr8sg2F0KqqKziJsV+JzkQHtkHHuz dsDqsDj0Rx4cm7GSsgTt3D6/DMteNZYTkxygYTFYu9I2NugO4W0uBjrLGoa8n3nPonAQ tKV1Igh8QXJCmFWdXWVhYKkEBSW4VZN8TceBAYjqprcg/3hh5plruACmDYv7tG2bRk7y WDMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=pFiNDA89ownhVZutObJX/IjjRsxBiFLWWat7tSsukOk=; b=l/9g7rQqL42mHdUGbKLM9Q9a4ru638waQoA0AQOf3Drkv0cb8KYu9PyrGmiZ46lECP jiAWGQxRf68x59QxDHwD8faLqStEil7GwXDlPYvgsOkJJv1PhPACALvaAewTqrdGayE/ OFV3PMgp//ZAEfWVc1YtcujjuQV1Db1P8cqjDzkql5Wxra3/RcLpI1djxcng/tL9hQ11 4y8lHuCm/ANyY4JR1rdMfi4dT9NHrmJlXCBrMQgPrWaPjac5iPUwFS5vHifoxFChLCZR NBmlhI2uaHQaCJEOcaSpCLUFnzVQ7Bvp7u4Fc3iDfjMMMtY2T3qnkIMW6DNd56CYGn1J d3hQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w124si2242718pfw.55.2018.02.23.11.16.26; Fri, 23 Feb 2018 11:16:40 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965139AbeBWSzU (ORCPT + 99 others); Fri, 23 Feb 2018 13:55:20 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:48116 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964838AbeBWSzS (ORCPT ); Fri, 23 Feb 2018 13:55:18 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 594031225; Fri, 23 Feb 2018 18:55:17 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dexuan Cui , Cathy Avery , Stefan Hajnoczi , Jorgen Hansen , "David S. Miller" , Sasha Levin Subject: [PATCH 4.14 114/159] VSOCK: fix outdated sk_state value in hvs_release() Date: Fri, 23 Feb 2018 19:27:02 +0100 Message-Id: <20180223170757.120018791@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170743.086611315@linuxfoundation.org> References: <20180223170743.086611315@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Stefan Hajnoczi [ Upstream commit c9d3fe9da094a9a7a3d3cd365b334b822e05f5e8 ] Since commit 3b4477d2dcf2709d0be89e2a8dced3d0f4a017f2 ("VSOCK: use TCP state constants for sk_state") VSOCK has used TCP_* constants for sk_state. Commit b4562ca7925a3bedada87a3dd072dd5bad043288 ("hv_sock: add locking in the open/close/release code paths") reintroduced the SS_DISCONNECTING constant. This patch replaces the old SS_DISCONNECTING with the new TCP_CLOSING constant. CC: Dexuan Cui CC: Cathy Avery Signed-off-by: Stefan Hajnoczi Reviewed-by: Jorgen Hansen Signed-off-by: David S. Miller Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- net/vmw_vsock/hyperv_transport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/vmw_vsock/hyperv_transport.c +++ b/net/vmw_vsock/hyperv_transport.c @@ -488,7 +488,7 @@ static void hvs_release(struct vsock_soc lock_sock(sk); - sk->sk_state = SS_DISCONNECTING; + sk->sk_state = TCP_CLOSING; vsock_remove_sock(vsk); release_sock(sk);