From patchwork Wed Sep 12 01:07:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 460 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director9.mail.ord1d.rsapps.net ([172.27.255.56]) by backend30.mail.ord1d.rsapps.net (Dovecot) with LMTP id q9sgGv74mFsmXwAAIUCqbw for ; Wed, 12 Sep 2018 07:31:10 -0400 Received: from proxy10.mail.iad3a.rsapps.net ([172.27.255.56]) by director9.mail.ord1d.rsapps.net with LMTP id GFoNF/74mFsAdQAAalYnBA ; Wed, 12 Sep 2018 07:31:10 -0400 Received: from smtp9.gate.iad3a ([172.27.255.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy10.mail.iad3a.rsapps.net with LMTP id mAFlEP74mFv2cwAAnQ/bqA ; Wed, 12 Sep 2018 07:31:10 -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: smtp9.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: 579979e8-b67f-11e8-b643-52540097fc8c-1-1 Received: from [216.105.38.7] ([216.105.38.7:23563] helo=lists.sourceforge.net) by smtp9.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 53/9A-26685-CF8F89B5; Wed, 12 Sep 2018 07:31:09 -0400 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 1g03Lf-0004Hj-T3; Wed, 12 Sep 2018 11:30:19 +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 1g03Le-0004Hd-8U for openvpn-devel@lists.sourceforge.NET; Wed, 12 Sep 2018 11:30:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: 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=UXgSOJSifb0IUc1bsurtziFqZyqGOB90WmQG/VgRVPE=; b=doCnv4Ji2xfByiJV0a1nyKg5Kg Gxz4O0oUhL10B8tlCAXj6HOvIB/FfhWpRCvuFroWg8EIawEgwAFnFL6TsvJarm5j9G62AcB4u7uXb CfOfBqqe4AzaRbaurIQP/l3stdxkmxgPdG+6lnN3WXSoZ/pR9UfGq70aZYjJxe0t1kWE=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: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=UXgSOJSifb0IUc1bsurtziFqZyqGOB90WmQG/VgRVPE=; b=XoFamy/sTszSjMcKZWTWNn18Ur wUMr3UjS+hHynZPXklKN7F5OsaaF5CObW4IGje5LDFna9KDsUJlkrfNPTgh5Xtu0lb/HIRba60ehK N6K12dAqXioxGxmxiYzoToYtkY98rDaApiAk2I3TDv3wgnBaMXaZrhRopyxFLfyFfYZ4=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) id 1g03LU-00F0hp-TG for openvpn-devel@lists.sourceforge.NET; Wed, 12 Sep 2018 11:30:18 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.91 (FreeBSD)) (envelope-from ) id 1g02z8-000Bih-0q for openvpn-devel@lists.sourceforge.net; Wed, 12 Sep 2018 13:07:02 +0200 Received: (nullmailer pid 31653 invoked by uid 10006); Wed, 12 Sep 2018 11:07:01 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Wed, 12 Sep 2018 13:07:01 +0200 Message-Id: <20180912110701.31609-1-arne@rfc2549.org> 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.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different X-Headers-End: 1g03LU-00F0hp-TG Subject: [Openvpn-devel] [PATCH] Properly free tuntap struct on android when emulating persist-tun 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: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox Trac-Ticket: #851 Acked-by: Gert Doering --- src/openvpn/init.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 2933d555..b1f4320a 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -1680,6 +1680,9 @@ do_open_tun(struct context *c) if (c->c1.tuntap) { oldtunfd = c->c1.tuntap->fd; + free(c->c1.tuntap); + c->c1.tuntap = NULL; + c->c1.tuntap_owned = false; } #endif