From patchwork Thu Jun 24 03:08:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1870 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director13.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id yBm9OCyE1GBJewAAIUCqbw (envelope-from ) for ; Thu, 24 Jun 2021 09:10:04 -0400 Received: from proxy1.mail.ord1d.rsapps.net ([172.30.191.6]) by director13.mail.ord1d.rsapps.net with LMTP id GKtyOCyE1GDXewAA91zNiA (envelope-from ) for ; Thu, 24 Jun 2021 09:10:04 -0400 Received: from smtp5.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy1.mail.ord1d.rsapps.net with LMTPS id QJj+NyyE1GAsEgAAasrz9Q (envelope-from ) for ; Thu, 24 Jun 2021 09:10:04 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp5.gate.ord1d.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dmarc=none (p=nil; dis=none) header.from=rfc2549.org X-Suspicious-Flag: YES X-Classification-ID: 7ccaae3c-d4ed-11eb-aacb-525400d73c44-1-1 Received: from [216.105.38.7] ([216.105.38.7:45500] helo=lists.sourceforge.net) by smtp5.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 19/C9-02540-B2484D06; Thu, 24 Jun 2021 09:10:04 -0400 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.92.3) (envelope-from ) id 1lwP6C-0005s8-7l; Thu, 24 Jun 2021 13:08:52 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) (envelope-from ) id 1lwP6B-0005s1-4s for openvpn-devel@lists.sourceforge.net; Thu, 24 Jun 2021 13:08:51 +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:Message-Id: Date:Subject:To:From:Sender:Reply-To:Cc: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=uq/j024j84nIPoyllbN6Ls2gA/lwdakwVJtL/2QfFUQ=; b=O65X5i5Pg0EY8AJIF/YekEqXMs 3VBNKyVzU8IJuGGi2vNCNG7v/g0H70wHYHdODHob3sOwiuBDdgA9Sv+fAu7G92+T1tNcLuS1wSRPM RT1O1uV6yT4Mph8eT3OLz1GvEUcrwcugIVyCVZ3JaJNyk41JvfyQPjU6XipwXWLmgxsM=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:To:From: Sender:Reply-To:Cc: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=uq/j024j84nIPoyllbN6Ls2gA/lwdakwVJtL/2QfFUQ=; b=f 52djn4FfjXkTBnzuAQ0sFxP0U2woOK0T6Tyg7uH1//vqvBzreJnWrL/abW8n4jC2HhE0KvZQCgL46 0dGNhsmj/S9vkv4yYA45PvJGa9nDPmpeGoVLsAIpPZINwVRoGKSp7tISGrWGW9owwrSj6oM74GWjl H3NjRx/yGAJ53GPo=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) id 1lwP66-00065V-3y for openvpn-devel@lists.sourceforge.net; Thu, 24 Jun 2021 13:08:51 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.94.2 (FreeBSD)) (envelope-from ) id 1lwP5z-000LwK-U7 for openvpn-devel@lists.sourceforge.net; Thu, 24 Jun 2021 15:08:39 +0200 Received: (nullmailer pid 2583479 invoked by uid 10006); Thu, 24 Jun 2021 13:08:40 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Thu, 24 Jun 2021 15:08:40 +0200 Message-Id: <20210624130840.2583433-1-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Headers-End: 1lwP66-00065V-3y Subject: [Openvpn-devel] [PATCH] Ensure tls session is authenticated before sending push reply 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: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox We ensure here that the tls session is authenticated before sending a push_reply This a part of to fix CVE-2020-15078 in the master branch. Acked-by: Gert Doering --- src/openvpn/push.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/openvpn/push.c b/src/openvpn/push.c index b6f1252d2..b27f401e1 100644 --- a/src/openvpn/push.c +++ b/src/openvpn/push.c @@ -863,7 +863,8 @@ process_incoming_push_request(struct context *c) send_auth_failed(c, client_reason); ret = PUSH_MSG_AUTH_FAILURE; } - else if (c->c2.tls_multi->multi_state >= CAS_CONNECT_DONE) + else if (tls_authentication_status(c->c2.tls_multi) == TLS_AUTHENTICATION_SUCCEEDED + && c->c2.tls_multi->multi_state >= CAS_CONNECT_DONE) { time_t now;