From patchwork Tue Nov 19 08:09:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 929 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director8.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id IGyCKG8+1F2OIAAAIUCqbw for ; Tue, 19 Nov 2019 14:11:43 -0500 Received: from proxy1.mail.ord1d.rsapps.net ([172.30.191.6]) by director8.mail.ord1d.rsapps.net with LMTP id CAJBKG8+1F2SFQAAfY0hYg ; Tue, 19 Nov 2019 14:11:43 -0500 Received: from smtp32.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy1.mail.ord1d.rsapps.net with LMTP id WPliKG8+1F2ZQwAAasrz9Q ; Tue, 19 Nov 2019 14:11:43 -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: smtp32.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=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: 6bb29b54-0b00-11ea-8709-52540099eaf5-1-1 Received: from [216.105.38.7] ([216.105.38.7:52898] helo=lists.sourceforge.net) by smtp32.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id E2/B7-15844-E6E34DD5; Tue, 19 Nov 2019 14:11:43 -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 1iX8to-0005ee-Jc; Tue, 19 Nov 2019 19:10:52 +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 1iX8tn-0005eX-7u for openvpn-devel@lists.sourceforge.net; Tue, 19 Nov 2019 19:10:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: MIME-Version:Content-Type:Content-Transfer-Encoding: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=U4iJYB4i3Gf8zA4h7LwyeV7qdBne8rOvx3+xgizXKyI=; b=X9RqVp4ZVX68wMH7BnWwt8MEng I0fBqKrdv2JPDRyYwiPWmP3/Dw9VS3vh+88whk9c+rNkeZcW+lZPEiabbghzvKFStPUQU/3jzGrBi BHUdlW70ZuPZPU/8vD2EHfbh1IK8qEOq2+HHhhXyDDPxztH8kKR/oIB2UR0dXsn6Z+Ck=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version: Content-Type:Content-Transfer-Encoding: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=U4iJYB4i3Gf8zA4h7LwyeV7qdBne8rOvx3+xgizXKyI=; b=YGA10gwu05GbxlXl0WsqYXNjR0 Xf9MJLoNfnbi07BQSOc6Ztov2DjHghW0J3+jrRRNlR1f0DraBGzbN2ujUblH0kGD+lyaljIjMWUjI e7N18Sizeg+PxxlhO7cF0z7+Tq4vHAidRkKWjDqp8xbazX8dSMkSf0k2WAnNlQJjhDnQ=; Received: from mail-lf1-f68.google.com ([209.85.167.68]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1iX8tj-00CtR4-JN for openvpn-devel@lists.sourceforge.net; Tue, 19 Nov 2019 19:10:51 +0000 Received: by mail-lf1-f68.google.com with SMTP id d6so18025161lfc.0 for ; Tue, 19 Nov 2019 11:10:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=U4iJYB4i3Gf8zA4h7LwyeV7qdBne8rOvx3+xgizXKyI=; b=FnGDCycrKNlIlvT1RYoi+T4TU9x2hRMuByZq4ONL+n4IjpKE/ezuEDXqNm+XL1Uqxp 1Y9CILvJLUipagun2LRLiCivdQ3U7RZYM7nxmma0GnyCB1GZ72tD12Cs74cU42ZDB6rb kSRIc7xW9Ldo1oDaUKTYD9f95XhzMvCBIU4BAygnxYhf/wXIKjQU50XO5wU1W6hgoiqZ S7Txfso2cQRHrzP9suXue+E2NWmrIcf67ROri0qmrCTUVl7Sfkrv8GNnJs9n1HmbLB5N wB08vKfUBLZIGvTkNIKQCe62SLwuwuQOf2uRZfojy7y7PkB9hcpewiJwnAlAXc6SAUHx +IyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=U4iJYB4i3Gf8zA4h7LwyeV7qdBne8rOvx3+xgizXKyI=; b=IhDWmb0t+Awvx40t3+GwIvzvcKHJgOF8CYRA9EqW2gjWHohXJCHARdU4Lbnjkpbkyz TzuDvaWqvxbaGIR4bFy1Q07jFK8SpXO0J6ocTLqQTMrr9VG1skJ9+2QaA7SFx2Fgudra EybMnFEOUze0IKV28AdIbmkiIVJwtA0abcpkZp5RgBfM423pWsBfn7jHlO9Xk4WrhA5j GzGUPcELe0bfyvDJeV+oDk4v+F1z2j01pDEjQlFcc30MCjGAwY92Qk26o1jrN7zw1luo 3FTuj7lWKx7BTCD89U1ONFJ69yipbuwjvNbJQ+MtszuIf5PLSLUjt5fF+J9PVK2hywZz lDBw== X-Gm-Message-State: APjAAAXTIcnEGQaLLq69KJISDBTPgtIFbAXBE6deu66WyHyr9DL3SliC uNaD8/XzwJRXHlKn+7vhI73eMfd5YfA= X-Google-Smtp-Source: APXvYqwoGaeLvLSh90X+YJBscSrnmGKwK5/c2pzWUWOuvGP+iHVW4hx8rd76iIoV2vYDsLPkG08W6A== X-Received: by 2002:a19:8c05:: with SMTP id o5mr864036lfd.35.1574190640245; Tue, 19 Nov 2019 11:10:40 -0800 (PST) Received: from LAPTOP-4L3N7KFS.bb.dnainternet.fi (dc7z9pyg9zdjrqsf2tb5t-3.rev.dnainternet.fi. [2001:14ba:16e9:d600:bda0:cee6:bc96:8073]) by smtp.gmail.com with ESMTPSA id 206sm1438631lfb.20.2019.11.19.11.10.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Nov 2019 11:10:39 -0800 (PST) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Tue, 19 Nov 2019 21:09:51 +0200 Message-Id: <20191119190951.87-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.17.1 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.167.68 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (lstipakov[at]gmail.com) -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.167.68 listed in wl.mailspike.net] -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: 1iX8tj-00CtR4-JN Subject: [Openvpn-devel] [PATCH 8/7] wintun: fix ringbuffer registration call 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: , Cc: Lev Stipakov MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Lev Stipakov As MS documentation says: > If lpOverlapped is NULL, lpBytesReturned cannot be NULL While on Windows 10 passing NULL works by accident, on Windows 7 it crashes. Reported-by: kitsune1 Signed-off-by: Lev Stipakov --- src/openvpn/ring_buffer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/openvpn/ring_buffer.c b/src/openvpn/ring_buffer.c index 482e3336..d384f497 100644 --- a/src/openvpn/ring_buffer.c +++ b/src/openvpn/ring_buffer.c @@ -35,6 +35,7 @@ register_ring_buffers(HANDLE device, { struct tun_register_rings rr; BOOL res; + DWORD bytes_returned; ZeroMemory(&rr, sizeof(rr)); @@ -46,7 +47,8 @@ register_ring_buffers(HANDLE device, rr.receive.ring_size = sizeof(receive_ring->data); rr.receive.tail_moved = receive_tail_moved; - res = DeviceIoControl(device, TUN_IOCTL_REGISTER_RINGS, &rr, sizeof(rr), NULL, 0, NULL, NULL); + res = DeviceIoControl(device, TUN_IOCTL_REGISTER_RINGS, &rr, sizeof(rr), + NULL, 0, &bytes_returned, NULL); return res == TRUE; }