From patchwork Mon Feb 17 02:34:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1004 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director10.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id 4BQJG8SWSl4AVAAAIUCqbw for ; Mon, 17 Feb 2020 08:36:04 -0500 Received: from proxy7.mail.ord1d.rsapps.net ([172.30.191.6]) by director10.mail.ord1d.rsapps.net with LMTP id wAXAGsSWSl7/CgAApN4f7A ; Mon, 17 Feb 2020 08:36:04 -0500 Received: from smtp19.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy7.mail.ord1d.rsapps.net with LMTP id CIsWGsSWSl7xFQAAMe1Fpw ; Mon, 17 Feb 2020 08:36:04 -0500 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: smtp19.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: 714aaafe-518a-11ea-82b7-525400d67fa8-1-1 Received: from [216.105.38.7] ([216.105.38.7:56880] helo=lists.sourceforge.net) by smtp19.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id BC/A4-23502-3C69A4E5; Mon, 17 Feb 2020 08:36:04 -0500 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.90_1) (envelope-from ) id 1j3gYK-0002dS-G9; Mon, 17 Feb 2020 13:35:12 +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.90_1) (envelope-from ) id 1j3gYJ-0002dL-2m for openvpn-devel@lists.sourceforge.net; Mon, 17 Feb 2020 13:35:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:To: From:Sender:Reply-To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding: 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=qDS1RzXbUxUrXMtbT4EgWH7PMi49qlyCyP2CD9xBlWE=; b=m+lJD1wrMGMfAqStiPs5KApSlU fF8SP1t3JIj9ogmdPWwBBaWfzy8SCX0c5sa6+I7HHp9qUP82Kvy36Wtnn8HSASDnR9FrM8FLkQv2a t7WJbQV+NjNyAPaCb2SW5WS48ZkPxetstbZeXGUuKdXdE+ez0p9LDPDkub/L5AuQ0Ssk=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc :MIME-Version:Content-Type:Content-Transfer-Encoding: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=qDS1RzXbUxUrXMtbT4EgWH7PMi49qlyCyP2CD9xBlWE=; b=Oj2eNfOnvF3B3Pc5VJiqerUv9E G3a9SKka1BS8/jTykABmuPzUjq+cFhStRx1ae+HCSYLXdBOo+u7TwAv2szxF9WNga5SdwHrvuRFzW ABzXmmqEzkNOY6XbH5TQeNhEanLKfvggY0McXZr3rURYaxpr4EOoM92TSWsPqcnKRebQ=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1j3gYH-00FQRO-G8 for openvpn-devel@lists.sourceforge.net; Mon, 17 Feb 2020 13:35:11 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.92.3 (FreeBSD)) (envelope-from ) id 1j3gY3-0004OJ-9d for openvpn-devel@lists.sourceforge.net; Mon, 17 Feb 2020 14:34:55 +0100 Received: (nullmailer pid 29346 invoked by uid 10006); Mon, 17 Feb 2020 13:34:54 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Mon, 17 Feb 2020 14:34:53 +0100 Message-Id: <20200217133453.29300-1-arne@rfc2549.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200217115522.20068-1-arne@rfc2549.org> References: <20200217115522.20068-1-arne@rfc2549.org> 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 0.1 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1j3gYH-00FQRO-G8 Subject: [Openvpn-devel] [PATCH 6/6] Use gc_arena in ncp_get_best_cipher 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: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox This avoids using the session specific gc arena to hold the temporary string returned by tls_peer_ncp_list for the whole session. --- src/openvpn/ssl_ncp.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/openvpn/ssl_ncp.c b/src/openvpn/ssl_ncp.c index 00400c1f..4c6af38d 100644 --- a/src/openvpn/ssl_ncp.c +++ b/src/openvpn/ssl_ncp.c @@ -216,10 +216,12 @@ ncp_get_best_cipher(const char *server_list, const char *server_cipher, const char *peer_info, const char *remote_cipher, struct gc_arena *gc) { - const char *peer_ncp_list = tls_peer_ncp_list(peer_info, gc); - char *tmp_ciphers = string_alloc(server_list, NULL); - char *tmp_ciphers_orig = tmp_ciphers; + struct gc_arena gc_tmp = gc_new(); + + const char *peer_ncp_list = tls_peer_ncp_list(peer_info, &gc_tmp); + + char *tmp_ciphers = string_alloc(server_list, &gc_tmp); const char *token = strsep(&tmp_ciphers, ":"); while (token) @@ -247,7 +249,7 @@ ncp_get_best_cipher(const char *server_list, const char *server_cipher, ret = string_alloc(token, gc); } - free(tmp_ciphers_orig); + gc_free(&gc_tmp); return ret; }