From patchwork Tue Feb 22 02:28:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kristof Provost via Openvpn-devel X-Patchwork-Id: 2313 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director15.mail.ord1d.rsapps.net ([172.30.191.6]) by backend41.mail.ord1d.rsapps.net with LMTP id GLgIMSHnFGL3EAAAqwncew (envelope-from ) for ; Tue, 22 Feb 2022 08:37:37 -0500 Received: from proxy2.mail.ord1d.rsapps.net ([172.30.191.6]) by director15.mail.ord1d.rsapps.net with LMTP id eI1BCSLnFGJtUAAAIcMcQg (envelope-from ) for ; Tue, 22 Feb 2022 08:37:38 -0500 Received: from smtp39.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy2.mail.ord1d.rsapps.net with LMTPS id 0KDvCCLnFGKTEQAAfawv4w (envelope-from ) for ; Tue, 22 Feb 2022 08:37:38 -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: smtp39.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; dkim=fail (signature verification failed) header.d=netgate.com; dmarc=pass (p=none; dis=none) header.from=lists.sourceforge.net X-Suspicious-Flag: YES X-Classification-ID: 9923d624-93e4-11ec-b599-525400a97bbc-1-1 Received: from [216.105.38.7] ([216.105.38.7:36862] helo=lists.sourceforge.net) by smtp39.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id E9/0B-11697-127E4126; Tue, 22 Feb 2022 08:37:37 -0500 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.94.2) (envelope-from ) id 1nMVLZ-0000Bc-Am; Tue, 22 Feb 2022 13:36:52 +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.94.2) (envelope-from ) id 1nMVLZ-0000BW-1W for openvpn-devel@lists.sourceforge.net; Tue, 22 Feb 2022 13:36: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:References: In-Reply-To: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:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=pqNJz5tWYlWncGVxv/SAEYDzHKTJuGoGZH8qzJvabzM=; b=X2DAlJNGg8xX29bE7ekDvpzMxY evHuVGSO14cEOvzBkBGbXbUFvU5nKWccaJSc8ytljk3+R9xPtyR4v7e1tHXLIQyEIeqf09Ubuzt+W SXya3WKnvfIODuo2XwVnWhG+VzVz7TdmnD6jKwgqx1e0SVAMCM4iFG3Go/2wzggroE7o=; 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: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:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=pqNJz5tWYlWncGVxv/SAEYDzHKTJuGoGZH8qzJvabzM=; b=Nh9qYyAR1qW7A+viXuYpHHmFPi Z+XlCNNgAcLECQdFSStfIJvEARigcrmLMV6qNTrVys+zwUN11VpHShnDGXvYlvcsAA1fh86gLnMcV BgnaIE3Mjc/d9nTXtVMgpP8vqmSH+4jA7myneSinj8+Hjy5k+1I/qEcWicqTqK/U7fZg=; Received: from mail-ej1-f48.google.com ([209.85.218.48]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.94.2) id 1nMVLT-00BKEp-Mz for openvpn-devel@lists.sourceforge.net; Tue, 22 Feb 2022 13:36:51 +0000 Received: by mail-ej1-f48.google.com with SMTP id a8so43111272ejc.8 for ; Tue, 22 Feb 2022 05:36:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netgate.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=pqNJz5tWYlWncGVxv/SAEYDzHKTJuGoGZH8qzJvabzM=; b=ohxad5JKtiGczHdXjwWjGOcB/CFhrE+AU3SY++P+5hQhxa3W3mVQTElCkm3j1f96kq XvyVhb57XofUj2n4h8ag1a9Qh4icp/W4zR+j5nUcj8hvs34fgsIKnNeVMyCOP2GfSn09 INrU4SyJOJWW8J5BF+5ECC3NCzqB1rDvPvOMY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pqNJz5tWYlWncGVxv/SAEYDzHKTJuGoGZH8qzJvabzM=; b=wLwKEeaeexU+UWo1KdhVxgCuZmkE4YezXwzvlLx9InW5V0NFW0HC+wSEKp9fU/i4tY fDx0mvRI7qbduOHW6ABWYgU8EVkgETtWjPlVvafhw4pMyoxwsXDMtDorQakr43uL331M UzRnQT+cGETK5H0GCtEANk7Xsf/E4UsSVt7j1ZHWo0AYngp2p4TRaeElRJYLy6rugHWJ PYAAWoFmzXHblXQH7y6sqVrQpI/hBzHD/Ahm433cUw5inWFQ+BnpWlw1elI6wh5HLzye uyEzV6sbZ2A6Bq+wQW9DfGGs6ppzlKgrHh1374AiPl2J204YT1buWJTvncvw+utsEWmL ISRA== X-Gm-Message-State: AOAM531V2KQfKvHEHaAYwxBWvliQAfXc+AThEIgakCrJaSWy28OvM+WD lmEwB6NdFmBnfKUg9LbW3Xs8ICagNOsoNCea X-Google-Smtp-Source: ABdhPJwTVzHalDjwZRFHCDa+aKmrsmlxo5uAL+ykh0CayGDdHiJQaF9d+Xbiz8o321RmUHl5zUqFqA== X-Received: by 2002:a05:6402:3553:b0:412:d0aa:e7b0 with SMTP id f19-20020a056402355300b00412d0aae7b0mr19772023edd.309.1645536508378; Tue, 22 Feb 2022 05:28:28 -0800 (PST) Received: from nut.jupiter.sigsegv.be (ptr-8rgvk5277arubwggeqg.18120a2.ip6.access.telenet.be. [2a02:1811:240d:2900:f602:70ff:feae:6e98]) by smtp.googlemail.com with ESMTPSA id r3sm6366846ejd.129.2022.02.22.05.28.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 05:28:27 -0800 (PST) To: openvpn-devel Date: Tue, 22 Feb 2022 14:28:23 +0100 Message-Id: <20220222132824.18935-3-kprovost@netgate.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222132824.18935-1-kprovost@netgate.com> References: <20220222132824.18935-1-kprovost@netgate.com> MIME-Version: 1.0 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: From: Kristof Provost It seems clear that the intent here is to special case the EEXIST error, not the consider anything else (i.e. 0) to also be an error. Signed-off-by: Kristof Provost --- src/openvpn/tun.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.48 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_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's 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 -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.218.48 listed in wl.mailspike.net] X-Headers-End: 1nMVLT-00BKEp-Mz Subject: [Openvpn-devel] [PATCH 2/3] open_tun_generic(): Do not consider open_tun_dco() returning 0 to be an error 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: , X-Patchwork-Original-From: Kristof Provost via Openvpn-devel From: Kristof Provost via Openvpn-devel Reply-To: Kristof Provost Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Kristof Provost It seems clear that the intent here is to special case the EEXIST error, not the consider anything else (i.e. 0) to also be an error. Signed-off-by: Kristof Provost --- src/openvpn/tun.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index f9ba3858..d8f2dea7 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -1841,7 +1841,7 @@ open_tun_generic(const char *dev, const char *dev_type, const char *dev_node, dynamic_name); tt->persistent_if = true; } - else + else if (ret != 0) { msg(M_ERR, "Cannot open TUN/TAP dev %s: %d", dynamic_name, ret); }