From patchwork Wed Feb 5 07:38:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Rozman X-Patchwork-Id: 978 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director10.mail.ord1d.rsapps.net ([172.28.255.1]) by backend30.mail.ord1d.rsapps.net with LMTP id sLcuFAMMO17tHgAAIUCqbw for ; Wed, 05 Feb 2020 13:40:03 -0500 Received: from proxy5.mail.ord1c.rsapps.net ([172.28.255.1]) by director10.mail.ord1d.rsapps.net with LMTP id 4L/YEwMMO17LEwAApN4f7A ; Wed, 05 Feb 2020 13:40:03 -0500 Received: from smtp26.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy5.mail.ord1c.rsapps.net with LMTP id sECwEwMMO16bKwAAPBRIyg ; Wed, 05 Feb 2020 13:40:03 -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: smtp26.gate.ord1c.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=rozman.si; dmarc=fail (p=none; dis=none) header.from=rozman.si X-Suspicious-Flag: YES X-Classification-ID: eb90cf3e-4846-11ea-9655-b8ca3a5bd12c-1-1 Received: from [216.105.38.7] ([216.105.38.7:57318] helo=lists.sourceforge.net) by smtp26.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 1A/52-24550-20C0B3E5; Wed, 05 Feb 2020 13:40:03 -0500 Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1izPZj-00086t-Rm; Wed, 05 Feb 2020 18:38:59 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1izPZh-00086a-PH for openvpn-devel@lists.sourceforge.net; Wed, 05 Feb 2020 18:38:57 +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: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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=9xAs6IRYbAKe7l+QRhhJ6ToBBsg0la70j21cBzHE+U8=; b=iZr0TSl+RcBFX/Tj6awRAeQYXh qAwqKTGMpL693gi3jWK+CUitoVuLjuUNd3tmCLB4++AptfXaLwCYHX808f/Mp78aRXLXBLP3DDwOs LWrumQHGTPmTtwpFgrO1qiVTwulMXqOH7RwIBe75CDSyofe5Q/Zzq/Z0JJhK4q3bjigA=; 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: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:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=9xAs6IRYbAKe7l+QRhhJ6ToBBsg0la70j21cBzHE+U8=; b=j 0Aa7/EKjwstnUY41pVcM5+aOL5IfHXC8RNlGm8G6vshG4Fatl50Q+pEtKCL/BjmxL75Mm/MTq1heg KU0vyy+Vue55Lw61Qolf5ag88WZGz9dYrwIXvJZIyTl77uufMAEka/CWySTlz+1/o4VBMklkuVSUT Tq3WaHZb2CgBOO+g=; Received: from pub5.amebis.si ([213.250.55.21]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1izPZf-000TFR-BT for openvpn-devel@lists.sourceforge.net; Wed, 05 Feb 2020 18:38:57 +0000 Received: by pub5.amebis.si (Postfix, from userid 1000) id A43BA1002FB6; Wed, 5 Feb 2020 19:38:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rozman.si; s=default; t=1580927927; bh=9xAs6IRYbAKe7l+QRhhJ6ToBBsg0la70j21cBzHE+U8=; h=From:To:Cc:Subject:Date:From; b=IGMWg/G8j/lWJkfxNYSERaVdDG429hGpovBx9IkGT12SwwYrXVsIE+f4nfaxSvcuJ lSI/mw8gQiuyHduoVxobWIqZjNrw9XSChoYVSkgLlzQZwwidozA2QmZj73MAMH64fk gCjEhln3JwqFDSfi1kvq9bCL8udiag49Oqytlhck= X-Spam-Checker-Version: SpamAssassin 3.4.3 (2019-12-06) on brana.amebis.doma X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham autolearn_force=no version=3.4.3 Received: from SR6.amebis.doma (unknown [IPv6:2a00:ee2:209:164:dc1d:9533:3ace:bf6b]) by pub5.amebis.si (Postfix) with ESMTP id 2C71F1002FB5; Wed, 5 Feb 2020 19:38:45 +0100 (CET) From: Simon Rozman To: openvpn-devel@lists.sourceforge.net Date: Wed, 5 Feb 2020 19:38:41 +0100 Message-Id: <20200205183841.1118-1-simon@rozman.si> X-Mailer: git-send-email 2.24.1.windows.2 MIME-Version: 1.0 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: rozman.si] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-Headers-End: 1izPZf-000TFR-BT Subject: [Openvpn-devel] [PATCH] wintun: upgrade error message in case of ring registration failure 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 Rather than have the Interactive Service return a custom 0x20000004 (ERROR_REGISTER_RING_BUFFERS) error, return the true GetLastError() code that the TUN_IOCTL_REGISTER_RINGS provides. Signed-off-by: Simon Rozman Acked-by: Lev Stipakov --- src/openvpn/ring_buffer.h | 2 +- src/openvpn/tun.c | 18 +++++++++++++++--- src/openvpnserv/interactive.c | 3 +-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/openvpn/ring_buffer.h b/src/openvpn/ring_buffer.h index 3522c984..af46f106 100644 --- a/src/openvpn/ring_buffer.h +++ b/src/openvpn/ring_buffer.h @@ -92,7 +92,7 @@ struct TUN_PACKET * that data is available for reading in send ring * @param receive_tail_moved event set by openvpn to signal wintun * that data has been written to receive ring - * @return true if registration is successful, false otherwise + * @return true if registration is successful, false otherwise - use GetLastError() */ bool register_ring_buffers(HANDLE device, struct tun_ring *send_ring, diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index af09e676..27fcb785 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -5943,7 +5943,7 @@ tuntap_set_ip_addr(struct tuntap *tt, } static bool -wintun_register_ring_buffer(struct tuntap *tt) +wintun_register_ring_buffer(struct tuntap *tt, const char *device_guid) { bool ret = true; @@ -5975,7 +5975,19 @@ wintun_register_ring_buffer(struct tuntap *tt) tt->rw_handle.read, tt->rw_handle.write)) { - msg(M_NONFATAL, "Failed to register ring buffers: %lu", GetLastError()); + switch (GetLastError()) + { + case ERROR_ACCESS_DENIED: + msg(M_FATAL, "Access denied registering ring buffers. Is this process run as SYSTEM?"); + break; + + case ERROR_ALREADY_INITIALIZED: + msg(M_NONFATAL, "Adapter %s is already in use", device_guid); + break; + + default: + msg(M_NONFATAL | M_ERRNO, "Failed to register ring buffers"); + } ret = false; } if (!RevertToSelf()) @@ -6197,7 +6209,7 @@ tun_try_open_device(struct tuntap *tt, const char *device_guid, const struct dev if (tt->windows_driver == WINDOWS_DRIVER_WINTUN) { /* Wintun adapter may be considered "open" after ring buffers are successfuly registered. */ - if (!wintun_register_ring_buffer(tt)) + if (!wintun_register_ring_buffer(tt, device_guid)) { msg(D_TUNTAP_INFO, "Failed to register %s adapter ring buffers", device_guid); CloseHandle(tt->hand); diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c index 6e72a141..5b250225 100644 --- a/src/openvpnserv/interactive.c +++ b/src/openvpnserv/interactive.c @@ -51,7 +51,6 @@ #define ERROR_STARTUP_DATA 0x20000001 #define ERROR_MESSAGE_DATA 0x20000002 #define ERROR_MESSAGE_TYPE 0x20000003 -#define ERROR_REGISTER_RING_BUFFERS 0x20000004 static SERVICE_STATUS_HANDLE service; static SERVICE_STATUS status = { .dwServiceType = SERVICE_WIN32_SHARE_PROCESS }; @@ -1308,8 +1307,8 @@ HandleRegisterRingBuffers(const register_ring_buffers_message_t *rrb, HANDLE ovp if (!register_ring_buffers(ring_buffer_handles->device, send_ring, receive_ring, ring_buffer_handles->send_tail_moved, ring_buffer_handles->receive_tail_moved)) { + err = GetLastError(); MsgToEventLog(M_SYSERR, TEXT("Could not register ring buffers")); - err = ERROR_REGISTER_RING_BUFFERS; } return err;