From patchwork Fri Jul 22 03:46:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 2600 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director10.mail.ord1d.rsapps.net ([172.27.255.54]) by backend30.mail.ord1d.rsapps.net with LMTP id 4E63LY+q2mK5WQAAIUCqbw (envelope-from ) for ; Fri, 22 Jul 2022 09:47:59 -0400 Received: from proxy19.mail.iad3a.rsapps.net ([172.27.255.54]) by director10.mail.ord1d.rsapps.net with LMTP id EGTHLY+q2mLkMQAApN4f7A (envelope-from ) for ; Fri, 22 Jul 2022 09:47:59 -0400 Received: from smtp26.gate.iad3a ([172.27.255.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy19.mail.iad3a.rsapps.net with LMTPS id YEzXJo+q2mLkMAAAXy6Yeg (envelope-from ) for ; Fri, 22 Jul 2022 09:47:59 -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: smtp26.gate.iad3a.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: e56abe02-09c4-11ed-8b8f-52540063aac2-1-1 Received: from [216.105.38.7] ([216.105.38.7:58472] helo=lists.sourceforge.net) by smtp26.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 3A/55-30137-F8AAAD26; Fri, 22 Jul 2022 09:47:59 -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.94.2) (envelope-from ) id 1oEszg-0005dp-11; Fri, 22 Jul 2022 13:47:04 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oEszf-0005dj-1k for openvpn-devel@lists.sourceforge.net; Fri, 22 Jul 2022 13:47:03 +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=P9RBuiYhEd85lM5t6u2jrJMTx/FFFcevI3HqjlyxgCg=; b=lWr6rlvicMsPJSy8AfTf/te5PZ 5u9SZu+gy9qmoht/gqHmBxlSTp/Oj93f6fCCTDTdN+vEAPSeh0+SBUS+5vNMBBgnIRkC688Po6pgY /xMtrRKqsW/WAVKBdc+5pIa90cBkWOYIvxVxs7GZFnnvg5IsCCaipVwm++M9y03vxIeM=; 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=P9RBuiYhEd85lM5t6u2jrJMTx/FFFcevI3HqjlyxgCg=; b=i 1t1MOi/wy8cneyik63NtXhpac/Bjq+6/QL86BQp6pXfEL+1hEmOj7dvQ3R+UNfQ23TiEUT5cmQwK2 cqQNNp7WG2FAlJ42xaTVOmgsytYNjU5/ARKxGYcdRbJV3t4oLwBT/xUN7PtJCmCeLYfptTNa2Hu6y oshjjMfKvuLDM5wI=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.94.2) id 1oEszf-000354-7y for openvpn-devel@lists.sourceforge.net; Fri, 22 Jul 2022 13:47:03 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.95 (FreeBSD)) (envelope-from ) id 1oEszV-000E19-07 for openvpn-devel@lists.sourceforge.net; Fri, 22 Jul 2022 15:46:53 +0200 Received: (nullmailer pid 2446644 invoked by uid 10006); Fri, 22 Jul 2022 13:46:52 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Fri, 22 Jul 2022 15:46:52 +0200 Message-Id: <20220722134652.2446598-1-arne@rfc2549.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 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: Commit 4df5003 introduced a check against options->config but did not ensure that this varialbe is non-null. --- src/openvpn/options.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index b9de2e5d0..a68a2991f 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -3680, 7 +3680, 7 @@ options_postprocess_mutate(st [...] Content analysis details: (0.3 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record X-Headers-End: 1oEszf-000354-7y Subject: [Openvpn-devel] [PATCH] Fix segfault when no --config argument is given 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 Commit 4df5003 introduced a check against options->config but did not ensure that this varialbe is non-null. Acked-by: Gert Doering --- src/openvpn/options.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index b9de2e5d0..a68a2991f 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -3680,7 +3680,7 @@ options_postprocess_mutate(struct options *o, struct env_set *es) o->verify_hash_no_ca = true; } - if (streq(o->config, "stdin") && o->remap_sigusr1 == SIGHUP) + if (o->config && streq(o->config, "stdin") && o->remap_sigusr1 == SIGHUP) { msg(M_USAGE, "Options 'config stdin' and 'remap-usr1 SIGHUP' are " "incompatible with each other.");