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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,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 9FF1EC43603 for ; Wed, 4 Dec 2019 17:58:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 669A02073B for ; Wed, 4 Dec 2019 17:58:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482296; bh=4p/gyj2qvuKUImwhJLlJyPMVzrfpz0Q0/esrhrsDW6I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=aZhLSsHIpwggKqTUPOjjW2/pn3pwExB3mBzDphs/v9x6UKl6q1/R6nLH92OnExzxQ 1A5pplwjgn3daRpqkoXNy8xry8g391h8FR7tUgF0Wp078r3WmSesxAmNZ+l3+Z5OGm fd0tOY+c8Igmk8X8Pmt9+03BFPdeqW0pvS3vV2W4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728661AbfLDR6P (ORCPT ); Wed, 4 Dec 2019 12:58:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:60562 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728629AbfLDR6N (ORCPT ); Wed, 4 Dec 2019 12:58:13 -0500 Received: from localhost (unknown [217.68.49.72]) (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 4E1CB2081B; Wed, 4 Dec 2019 17:58:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482292; bh=4p/gyj2qvuKUImwhJLlJyPMVzrfpz0Q0/esrhrsDW6I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dl4xZVkE8Tdn9o1ku+spNNRIvAbDLdTYr4W928tNJ/BNk13t8TiQ+sihQuOAtRw99 ZI+e5rFpMsd7hmCtdofNdcVBtT5Fwpvqv+2dYjk73bmoRatRJGkeELAaoDLknIuzNL biljHTFxA6JePykPRj0Z3CnDYH/Sqc1gG/hQdgdc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lepton Wu , Jorgen Hansen , "David S. Miller" , Sasha Levin Subject: [PATCH 4.4 28/92] VSOCK: bind to random port for VMADDR_PORT_ANY Date: Wed, 4 Dec 2019 18:49:28 +0100 Message-Id: <20191204174332.317108068@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204174327.215426506@linuxfoundation.org> References: <20191204174327.215426506@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Lepton Wu [ Upstream commit 8236b08cf50f85bbfaf48910a0b3ee68318b7c4b ] The old code always starts from fixed port for VMADDR_PORT_ANY. Sometimes when VMM crashed, there is still orphaned vsock which is waiting for close timer, then it could cause connection time out for new started VM if they are trying to connect to same port with same guest cid since the new packets could hit that orphaned vsock. We could also fix this by doing more in vhost_vsock_reset_orphans, but any way, it should be better to start from a random local port instead of a fixed one. Signed-off-by: Lepton Wu Reviewed-by: Jorgen Hansen Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/vmw_vsock/af_vsock.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index 7f1d166ce6128..412d56614fd5e 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -89,6 +89,7 @@ #include #include #include +#include #include #include #include @@ -483,9 +484,13 @@ out: static int __vsock_bind_stream(struct vsock_sock *vsk, struct sockaddr_vm *addr) { - static u32 port = LAST_RESERVED_PORT + 1; + static u32 port = 0; struct sockaddr_vm new_addr; + if (!port) + port = LAST_RESERVED_PORT + 1 + + prandom_u32_max(U32_MAX - LAST_RESERVED_PORT); + vsock_addr_init(&new_addr, addr->svm_cid, addr->svm_port); if (addr->svm_port == VMADDR_PORT_ANY) { -- 2.20.1