From patchwork Thu Oct 19 17:12:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: yatta X-Patchwork-Id: 3401 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:4f1b:b0:f2:62eb:61c1 with SMTP id t27csp672760dyr; Thu, 19 Oct 2023 10:13:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFamm7coslkWY3N+IMxcLa7mdBi4dsA/veSBWBzY7zQ50FNW3bKrixXTqz3JJdn406juHuw X-Received: by 2002:a05:6e02:3882:b0:351:54db:c1bc with SMTP id cn2-20020a056e02388200b0035154dbc1bcmr3517309ilb.0.1697735624582; Thu, 19 Oct 2023 10:13:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697735624; cv=none; d=google.com; s=arc-20160816; b=rUvvusvUcb53s9CX8kElZ+aK+vc3HfSMTNrdueCtcc0czkSTJN7dGkLCChz5Z82d8T ZxK0mpT74SQbV+vrEh4xnrpi2lqpqjcY/D4KYpsSWpOBlTbVmC4rCoze1w2hP89Jm29h DBXRY51QPOqUFPClI0WT9Gtl1S7PjVtmoNAnRJ0OOmVwhdpX5dTGRwqALP4i7cDaZ3d6 yJ+yqJumRRl2nHRQeJ9LcUvGqIQ+9EOz0nSomvyg1kNF0B0qHqiBq/oYDp3aYXQZhPYE PFaPDvminqAGWQ3lmb6bfWshTsVUKXepMVzcKI+hBXK8PVD1maZMt651o5QCQwqQbU4V FUaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:content-transfer-encoding:cc:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:date:to:from:message-id:dkim-signature:dkim-signature :dkim-signature; bh=vcciiofBkfLGplFUsXLuV2FNBm9Nkb3RX6qeQh3O95A=; fh=WUM8R4COAimz/csSVLgD/5id0qt865XGijIDhUURhfs=; b=YQdf16N+TYUNOm9+/sx6velHUkbKZ5oHpk1IrYE+dAYswUCbeu9Io+pEkV/wkXsGML LRGc33NekoKKa6EeT0y1dqlybm/HPNCLZU89D0f3e1DKVQ2GB7T/L6h74K4iER56a5sN mENmMR3g0Zlvipdi3utvl3Z4TRpPIfv0jPZ0AQ/HzzagMozc77z839Q4oRfgNtvCFNgM OaOTldg1gTS1V2LvDcFjmO6qL0k/FkCHGYmW2TNW0Bmn3b4IbwpTcqkuZVb991PJ76or y9Io1NmImic900REO6EVKCyBaeGeOFiRUM5eVAxFFqhfho25AJ1N1so83OyjOuxZJDrJ uxgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=lDDRMLuL; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=BZovzV4i; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=SRs+fdic; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id r15-20020a638f4f000000b00565f182839asi23721pgn.28.2023.10.19.10.13.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Oct 2023 10:13:44 -0700 (PDT) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=lDDRMLuL; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=BZovzV4i; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=SRs+fdic; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.0.1] (helo=sfs-ml-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1qtWZs-000332-8B; Thu, 19 Oct 2023 17:12:54 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1qtWZq-00032w-1P for openvpn-devel@lists.sourceforge.net; Thu, 19 Oct 2023 17:12:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Date:Subject :Cc:To:From:Message-ID:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=M/QPQGbdRwalKZ4sDJUS//QpRIEBUnnYPfikFWh4KA4=; b=lDDRMLuLmPOCY6kbEnJbOQ4knf sw0FL/Jq0nnjZEziOagBTP6i8D4VZTioE5C5GbuDT8yFKc/KIDYfzoY0i3XUYyC5FM8kyV3coyssV yIJyywz7fEuQaTUXa+5GZcHV6Jbq8eZGTaf292tHWDXI/Vklfily3Nz9fWtnlSSjLHvI=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Date:Subject:Cc:To:From:Message-ID :Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=M/QPQGbdRwalKZ4sDJUS//QpRIEBUnnYPfikFWh4KA4=; b=B ZovzV4iC4QmTcBcncY2n/1HqhvUy0dNyYJpXN7fW/aQyo/+dR3kFZVvZMVi3Or9Sjcq/CsbAqbIfb 4p/tz9jGQlE0KJeLIzU2zSgSrZT64eP95T1SFV1HOQSS4LEk/441+UCdSLCltNk05XjCzRCILOZ0R uM30SZMbymLmLiSc=; Received: from out203-205-221-202.mail.qq.com ([203.205.221.202]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1qtWZk-003LYq-1a for openvpn-devel@lists.sourceforge.net; Thu, 19 Oct 2023 17:12:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1697735550; bh=M/QPQGbdRwalKZ4sDJUS//QpRIEBUnnYPfikFWh4KA4=; h=From:To:Cc:Subject:Date; b=SRs+fdicAPFpfxIeQdjPMxzMOZT7l+KcWkSxjtmvLTMKhTxBGJ53nxjMH6lpV7qQb nrPhT9QOAEN+lXnRrbb3uV4tfCYdtAwRJcjcQsCjBADUtZhUcCHyRmacUInm+0hA3g L9AJq7xrhwiQs+FRD7WrHwjyom7lvgVsU13STH8I= Received: from MacBook-Pro.net ([2409:8a28:646:fc0:b9b5:9249:7aa1:8df4]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 31CA80AD; Fri, 20 Oct 2023 01:12:28 +0800 X-QQ-mid: xmsmtpt1697735548tk62dafqh Message-ID: X-QQ-XMAILINFO: MpNYbEWRz8KaSjxvYpltGWG/X+Fl7PSniH+M28ufe77XvElKXWk4OxTMJMIOIF 5+YGFAWRZgqc7cI7+U7fPL4WpBf10ZooLlgP5xmOGd7H6CIGTneEm2sqQ9UzMvVtjrLTzFZODncR Nt7ZQ91HlMA9P0HVr0YzWGCsOZ/gKso6RiMO2IAGRHD+moIFB7GXydgiLGTKBEIkpZxHq0gNUFV2 iNrejj11MUgFCzClWAs7pfQUxpXnXuYIof5GSxroli9jEAfEXtXunI/u4uEworpwJkRzPdw3LWrq OjSpeguQbGPiihR1aot2dDEr7a9hqGOsejBA9s0/0ZW7uKIOFBKpZnby1blAaD45tGXIm7CMfWSL GdeU/E+nNlWAtlMC/VkZTEeG1SHHbYJ5pkRcrckTFi881eV0yCP+1Hl9NNr1KJJSPEahPbkJc/rr 467yk/pzExccjd44sbgDfQ1Nn7GkjeKO9bR/DVtp1Lg4OVH2se+uGqUzHeGiMqH6ixGPtdr8b10n GMEUSR8cpg7MeoPTuCu75d7sMM1aUNfdQRF5RsMf840uWLtsDdIGjeCzgP7wi0GjNwqD1wyeTZbY JlEepx0mBehrr5hvKBa6wQamw/f6qfVwgGthK/aAwSXV6ZETL20u49lP8r5LniXkyyOLneaX3/Ka Qd9iCB2gmh7XP3BDApKo93c3RC4PrSqTvpMzwcKfNV5feemAyJzh8mT7axgmd1tdA4f7YZVyGIFO nwsLJt4NQlNp1/EXkker5nAkcGGI3WLRinKTz72Ba75ZOyoh1pgsloUjGgEgZyMJ7nZHQIb5gOTg KiNTJzwJz9Vmj9XYZDutPkpRSaZoBou68jV62k5UFTBImwzwWh5SJSwn0+kCHMpLig6gYzHQXIxU okdo9CRm5FNpXpTiw77JOipKFNICX/JixAZKbYM+qYGGhS4PLnwaElPOJZUDwjPCaiN9xARmDDym AAZBwx6ZckejSADP4WML9/+K1eP4Fa X-QQ-XMRINFO: OD9hHCdaPRBwq3WW+NvGbIU= From: yatta To: openvpn-devel@lists.sourceforge.net Date: Fri, 20 Oct 2023 01:12:13 +0800 X-OQ-MSGID: <20231019171213.286-1-ytzhang01@foxmail.com> X-Mailer: git-send-email 2.37.1 (Apple Git-137.1) MIME-Version: 1.0 X-Spam-Score: 3.7 (+++) X-Spam-Report: Spam detection software, running on the system "util-spamd-2.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: pushan When openvpn run in UDP server mode, if ssl connections reach the max clients, the next connection would be failed in `multi_create_instance` and the half connection will be close in `multi_close_inst [...] Content analysis details: (3.7 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [203.205.221.202 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [ytzhang01[at]foxmail.com] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [ytzhang01[at]foxmail.com] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS 3.2 HELO_DYNAMIC_IPADDR Relay HELO'd using suspicious hostname (IP addr 1) X-Headers-End: 1qtWZk-003LYq-1a Subject: [Openvpn-devel] [PATCH] fix(ssl): init peer_id when init tls_multi X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pushan <62173185+pushan01@users.noreply.github.com> Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1780204829924376637?= X-GMAIL-MSGID: =?utf-8?q?1780204829924376637?= From: pushan <62173185+pushan01@users.noreply.github.com> When openvpn run in UDP server mode, if ssl connections reach the max clients, the next connection would be failed in `multi_create_instance` and the half connection will be close in `multi_close_instance`, which may lead array `m->instances[0]` covered unexpectedly and make the first connection interrupt, this patch fix this problem by init `peer_id` with `MAX_PEER_ID` in `tils_multi_init`. Acked-By: Arne Schwabe --- src/openvpn/ssl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c index 5e6205cc..c4420b2e 100644 --- a/src/openvpn/ssl.c +++ b/src/openvpn/ssl.c @@ -64,6 +64,7 @@ #include "dco.h" #include "memdbg.h" +#include "openvpn.h" #ifdef MEASURE_TLS_HANDSHAKE_STATS @@ -1312,6 +1313,7 @@ tls_multi_init(struct tls_options *tls_options) /* get command line derived options */ ret->opt = *tls_options; ret->dco_peer_id = -1; + ret->peer_id = MAX_PEER_ID; return ret; }