From patchwork Fri Dec 20 05:11:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Rozman X-Patchwork-Id: 960 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director7.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id oF6/GYDz/F1hOAAAIUCqbw for ; Fri, 20 Dec 2019 11:14:56 -0500 Received: from proxy20.mail.iad3b.rsapps.net ([172.31.255.6]) by director7.mail.ord1d.rsapps.net with LMTP id aKd0F4Dz/F3KZAAAovjBpQ ; Fri, 20 Dec 2019 11:14:56 -0500 Received: from smtp36.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy20.mail.iad3b.rsapps.net with LMTP id GLJGEoDz/F0IMAAAcDxLoQ ; Fri, 20 Dec 2019 11:14:56 -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: smtp36.gate.iad3b.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: dbe8980a-2343-11ea-a61b-5254003a7283-1-1 Received: from [216.105.38.7] ([216.105.38.7:51150] helo=lists.sourceforge.net) by smtp36.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id E0/DD-26583-F73FCFD5; Fri, 20 Dec 2019 11:14:55 -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.90_1) (envelope-from ) id 1iiKug-0006zW-MI; Fri, 20 Dec 2019 16:14:02 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1iiKuf-0006z8-3i for openvpn-devel@lists.sourceforge.net; Fri, 20 Dec 2019 16:14:01 +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: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:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=J2sFs+P82kpwS2vvb5EY4Zls6UjKsyJA1Nbv7ZPLMyM=; b=F3EekCXfIPjNt/iHiJkxPJ6CGz Zo1VwCusvxFFHD0Q6bBWh/Y1Kb+p/6nKppAFZIe35RzG+m9PTDU8qwaaor+4LpZhRsh+GJoqlAbcH oaYjFxhR5NgOXXY2z3pN3JQXgO5rTB2Tb4UTzZgvmHkqTyd7ixJtjbDtjiyMytvXoQY8=; 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: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:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=J2sFs+P82kpwS2vvb5EY4Zls6UjKsyJA1Nbv7ZPLMyM=; b=FqwuJsLyO9IAqhE4kLFiR5rVQd 5dV6fXSf4VMpLbpj6OzaghLhl1g84IwIZyl9S4rezx33t1gUttYKUUKpGsDNnvLGfIwUim1B2b4Gm XbN7EY8W90FfxKdYjkujqj28VqPeK4b4F1Ao9a2lRbfITz9GV7X+fCv5lEjPVTu2JAps=; Received: from pub5.amebis.si ([213.250.55.21]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1iiKud-00BKnG-Sd for openvpn-devel@lists.sourceforge.net; Fri, 20 Dec 2019 16:14:01 +0000 Received: by pub5.amebis.si (Postfix, from userid 1000) id DAFE51002FBC; Fri, 20 Dec 2019 17:13:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rozman.si; s=default; t=1576858420; bh=J2sFs+P82kpwS2vvb5EY4Zls6UjKsyJA1Nbv7ZPLMyM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qjumDd6+7D/nYWmhL9WVCfSN91ypoy9zxpxN//Qs3QrpJO5rGxfW+UM3Vx7qGmzvM uQVghfnhoGINZh9hbo1pvA2ZBDJC2fyh65NDYWajUM6IGRU9JhWdC1LJK5e5wT51h4 NqE8iTyAzARMB3myHwUfNtQXeAMND5B6/P9EWiN0= X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on brana.amebis.doma X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from SR6.amebis.doma (unknown [IPv6:2a00:ee2:209:164:a050:acdc:f245:eef3]) by pub5.amebis.si (Postfix) with ESMTP id 8963D1004495; Fri, 20 Dec 2019 17:13:33 +0100 (CET) From: Simon Rozman To: openvpn-devel@lists.sourceforge.net Date: Fri, 20 Dec 2019 17:11:16 +0100 Message-Id: <20191220161117.1434-6-simon@rozman.si> X-Mailer: git-send-email 2.24.1.windows.2 In-Reply-To: References: 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 0.1 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1iiKud-00BKnG-Sd Subject: [Openvpn-devel] [PATCH v2 6/7] wintun: stop sending TAP-Windows6 ioctls to NDIS device 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 Wintun doesn't have its own I/O device. Rather, it taps on existing Windows-provided NDIS device. Sending TAP-Windows6 IOCTL requests to it is risky, as TAP-Windows6 is using one of the well-known device types (FILE_DEVICE_UNKNOWN) with function IDs as 1, 2, 3 etc. raising a chance of collision as NDIS might react to one of these IOCTLs. Signed-off-by: Simon Rozman --- src/openvpn/tun.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 18f06bb6..6762402c 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -6412,7 +6412,7 @@ open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tun const char * tap_win_getinfo(const struct tuntap *tt, struct gc_arena *gc) { - if (tt && tt->hand != NULL) + if (tuntap_defined(tt) && !tt->wintun) { struct buffer out = alloc_buf_gc(256, gc); DWORD len; @@ -6430,7 +6430,7 @@ tap_win_getinfo(const struct tuntap *tt, struct gc_arena *gc) void tun_show_debug(struct tuntap *tt) { - if (tt && tt->hand != NULL) + if (tuntap_defined(tt) && !tt->wintun) { struct buffer out = alloc_buf(1024); DWORD len;