From patchwork Tue Jan 3 20:23:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 2972 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:c95:b0:82:e4b3:40a0 with SMTP id p21csp7196809dyk; Tue, 3 Jan 2023 12:23:56 -0800 (PST) X-Google-Smtp-Source: AMrXdXuvpRUEncjNhw/Mc702z+BmUr+IfiH1MlicnNhL89NYP63MXybpJqH1xLqF39iC4ib4pVhm X-Received: by 2002:a05:6a20:4e04:b0:9d:efbf:786a with SMTP id gk4-20020a056a204e0400b0009defbf786amr51038013pzb.31.1672777436430; Tue, 03 Jan 2023 12:23:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672777436; cv=none; d=google.com; s=arc-20160816; b=WHzJ3aLDcjhhFV+UIJmkxA2zdFdSzDM+5H32qQgWFjxpLJtd92q+tNqLNIP/dOpJ9u 4+gv20Lg/aHJ6+x4HLEgQNwmSCt1jy/AeoUZ/r/mLyqO4Iu6XVP6NbSsvQ7I4f+tfLLR Udh062Cyp4gnWJg8xknNa/FLW3wArQqjuPmQyV9YA2GzYPsdbX3LWWU/8HCb8f7ZdJ6Z sMIv4vGjw7QVW5r+yiISMIjs+z1so4hT/7Zf3Ba4EXFhxl0/uBAZbLe77RFKYxFFy0sx kEfjL2UGr/DMFxIL3HnQj5vTvRJUSNcNaAWMuohkNF+5DQhdEyf0K2P9zQ099hU5hJEm IHXg== 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:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature:dkim-signature; bh=vw2HVF2Qvv957CpPIOYS+FHypZPy6Q6FQua+Eptcy5A=; b=hjEKVEabConyghTNbxziZexM/LeptX/c3s6wc/h8s5Bef3gpPbYxSZ/KNaLD9DxXcd wkgeDuojSUv6ytWil5+LSEumERqiy1LL19jTy54masMECkB0W4na1IBadAj5AtnnyYYt qrl7IupzNgA3fyf6tmt1Jv9O+vU+nEDcuYnxeTYm4TAp0lqhY6o1/yrUB5oADcowM9ez 7Low1KFjEpadUCKVs4msIq90xFTUnvS09UhP8kaZdzWFZl2C3pZSrFF6fAmK0wz2Z9eI cVT3kDZM6ZDK1nkK22DCcwGl1hcDa55R4cJTg16r3LIL37aTnxVE9vqheSwEneZ0dL3/ izCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=ORwLd+kq; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=J+HhSQkb; dkim=fail header.i=@unstable.cc header.s=20220809-q8oc header.b="YRtWP/Nh"; 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 Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id e2-20020a636902000000b004771126e2f7si30575802pgc.142.2023.01.03.12.23.56 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jan 2023 12:23:56 -0800 (PST) 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=ORwLd+kq; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=J+HhSQkb; dkim=fail header.i=@unstable.cc header.s=20220809-q8oc header.b="YRtWP/Nh"; 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 Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1pCnop-00028x-KW; Tue, 03 Jan 2023 20:23:31 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pCnom-00028q-Dd for openvpn-devel@lists.sourceforge.net; Tue, 03 Jan 2023 20:23:28 +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:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=W7vkX7hQZgG5UvzydxWQovr08M+JJIwG52rBq9Y5NTM=; b=ORwLd+kqVGsKdq7uaJ3dY+JC0t 7t0Y/O5A+qhalvMl5kXkqwNLFJz5ois5dxlWbzZm81LoL1winmZ8Q/nX4YpTRtlZ/DbnqV1pQIhPg Blya0PZ4SmEDT4W/FQm1L5aC4CjNQwpHn64/26bMf7LZ/ioDHTk/EGempqkcQl2RobsQ=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=W7vkX7hQZgG5UvzydxWQovr08M+JJIwG52rBq9Y5NTM=; b=J+HhSQkbPyVuFN/8b65ufyKSmy i3woXT2SODx+D+KPY4Xhrwk1EIOVTf0T5x8hvMZYFMaSvZsLBLsXAghrXsgwulmD9pY1hOi3ZwDFK M5EG0tn5wuhPTGsZ9vP/AjM4VeNPkLAMVVJav4OtQFrZfmirTpTppQfMpZHfr0INBvPI=; Received: from wilbur.contactoffice.com ([212.3.242.68]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1pCnoe-0000lf-7R for openvpn-devel@lists.sourceforge.net; Tue, 03 Jan 2023 20:23:28 +0000 Received: from smtpauth2.co-bxl (smtpauth2.co-bxl [10.2.0.24]) by wilbur.contactoffice.com (Postfix) with ESMTP id 110DD9FA; Tue, 3 Jan 2023 21:23:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1672777393; s=20220809-q8oc; d=unstable.cc; i=a@unstable.cc; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; l=1208; bh=W7vkX7hQZgG5UvzydxWQovr08M+JJIwG52rBq9Y5NTM=; b=YRtWP/Nh5+P49S6/H3rw6c+Y01RfslAB2tSWMtbXtBf3GBw/dvh1aKqq4MKl7rbK rpMuEOKEEpZK/EwGYg3842CnGfN++ne/fDEc6ariu0dSccrY4daTTJrBKZLcYppr9Li GP9FSsiqlz28I364qWzvZzcyfmHv23NQpx4FzFWOiyMRwaAIfTfR432MwGG18m17+v0 T+j7P01VaQoWQhGdmRvxIyhA7vq8O0WCmZdNUO+mTJy8dUcFMIocfqKWJqzB/9rhcM1 8vLRUJBuuoXO3TiWyd2X2Pksjf9I+RsYz1wet34SEvfllufhHvS1AYy+PZXREtCfShO Sfp0EzaF+g== Received: by smtp.mailfence.com with ESMTPSA ; Tue, 3 Jan 2023 21:23:11 +0100 (CET) From: Antonio Quartulli To: openvpn-devel@lists.sourceforge.net Date: Tue, 3 Jan 2023 21:23:29 +0100 Message-Id: <20230103202330.1835-2-a@unstable.cc> X-Mailer: git-send-email 2.38.2 In-Reply-To: <20230103202330.1835-1-a@unstable.cc> References: <20230103202330.1835-1-a@unstable.cc> MIME-Version: 1.0 X-Spam-Flag: NO X-Spam-Status: No, hits=-2.9 required=4.7 symbols=ALL_TRUSTED, BAYES_00 device=10.2.0.20 X-ContactOffice-Account: com:375058688 X-Spam-Score: -0.9 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-1.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: multi_process_incoming_dco() is currently partly processing messages that were actually discarded. This results in a bogus message being printed: "Received packet for peer-id unknown to OpenVPN: -1, type 0, reason 2" Content analysis details: (-0.9 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [212.3.242.68 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -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.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-Headers-End: 1pCnoe-0000lf-7R Subject: [Openvpn-devel] [PATCH 2/3] dco: bail out when no peer-specific message is delivered 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: Antonio Quartulli Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1754034273212495303?= X-GMAIL-MSGID: =?utf-8?q?1754034273212495303?= multi_process_incoming_dco() is currently partly processing messages that were actually discarded. This results in a bogus message being printed: "Received packet for peer-id unknown to OpenVPN: -1, type 0, reason 2" Change the flow so that we bail out immediately when we know that no message was truly delivered by DCO. Currently this can be verified by chacking that the peed_is is greater than -1. Signed-off-by: Antonio Quartulli Acked-By: Arne Schwabe --- src/openvpn/multi.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 27676de5..b10a6d8d 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -3270,7 +3270,15 @@ multi_process_incoming_dco(struct multi_context *m) int peer_id = dco->dco_message_peer_id; - if ((peer_id >= 0) && (peer_id < m->max_clients) && (m->instances[peer_id])) + /* no peer-specific message delivered -> nothing to process. + * bail out right away + */ + if (peer_id < 0) + { + return ret > 0; + } + + if ((peer_id < m->max_clients) && (m->instances[peer_id])) { mi = m->instances[peer_id]; if (dco->dco_message_type == OVPN_CMD_PACKET)