From patchwork Mon Nov 2 01:53:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: serial115200@outlook.com X-Patchwork-Id: 1391903 X-Patchwork-Delegate: daniel@makrotopia.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=outlook.com Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CPbyz5xwtz9sVM for ; Mon, 2 Nov 2020 13:12:21 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=a8WpDLRbNYlbiA7enlZfPiQxgXOPvZE5AELYbIF9hPg=; b=vw+Mb5S60OzzlnxeBeaR/4cbZG AmwJAYp5OqpadTnrtsTb27EhSycYwHEiu81ZICtH2df3V8JyhuAiqlzB396ywzEpjpvb3B9QSf+bV hls80ghgUQ4KZZqs0rBuyB4bzOAcdCKwRD6HeXe0MJqetVW+qvsgu6yDJpN3+H26U7t4Ez1BpXghV WEyBUNnUDTkOlpxSynwpuBQ50XXCOPKQ+w9cUGeV6AIW963PJ7dKCfLKnujeIuoMcHqdcEcxlkaYL RaBpROs1k3y5tM4U/B0ib332ZwfcBIKIojMnSu7yN8wt/tQB5YAkgWnbeZhcheJpaKVfcLvxNw1f4 W2nhp3HQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kZPI3-0003Ls-Vh; Mon, 02 Nov 2020 02:09:48 +0000 Received: from mail-oln040092255106.outbound.protection.outlook.com ([40.92.255.106] helo=APC01-HK2-obe.outbound.protection.outlook.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kZPI0-0003LS-OF for openwrt-devel@lists.openwrt.org; Mon, 02 Nov 2020 02:09:46 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GG9mn0jEs4Mq081lIw3fkUnPJgRAJQo+NJ+D/fpiL5EJmbRuXF82JdmHs9U03QAWe5P+yOyB3tHgc8DvEKXrZRzEFqVlIjUCYHjD5dNmxBWE9fJaUPqoG6tCpGrgNux65FqlMBWSXlsz8J3jc2bQdrJxGKTlWIkBRbIN4lFQok4SZytdEQ+PmDXzswkcpu5tUMbJMTodPCYgK8oXkkZkosMB9EK/TT7Lg3bxvnVdzotoM8D0VsLB4yvQNYMffwP0F5+QOz/kFk+5MZ0A1ypRQj4xF0/1fRPHfNHma8rm/oq7becBoHZ6hDTpA56bLKGZMe5uC/1ImkYmUrC0RHEacw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ku3a62wsjL5PPfLTI7eEYnMiFyHMPYggjX1jYAoaZEw=; b=ddO6CztIC31LIqBo/dgCtJ4NX9tSRPgWwZ6C6DAwHZzxQ3lTI7MjITNPTsJ/JlGJxNXjmfhHvyAHjD2o9MygvNXhdrOiFhzQc6BCcVsN78zaAF/lH7eNCvC+Om/6QCVXEBDpAU7N5Ft18X2S9utcu6AOa3F3NA8xZKzZHrkxh7+UE+VcOCbl8grM6mOTo8GE4htjNFRrtmL9V7jwPjKReEbBqKhun/71SXaFSLb1vRvrKolr/31VYIBESWiTWCoah23KO7PDdopU3M1ZmeUNQOW8Is6q5fwBEqttUNIMcvmIoRsq3Qraojk9t+uZZHGgulEitrPKn/N/5G0DMMjL5w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ku3a62wsjL5PPfLTI7eEYnMiFyHMPYggjX1jYAoaZEw=; b=bmUaTtYpXua2wOip+KQ0fw+cPI94hST9UiCY8haGR10BIThxGY4cVvolqNAChjdDRa5goHSCKPjN5E71map88JDNlxN/Ai2aUVZBgHlExchXOVczl+u7Gg/lG/Gbh8M7FIIHTvuPG0GRyHi01YRTXWWMVRdTmi7kx1gJ5+6gwEY01pRMPtE0Om/ooz/r1cGOe8Z+LIngNusXdKTLQVE3BQN0a55M3eeaTik1ZZJp9zffNY0QhiXCCZuufym1tOqKR7lME+xF7jjZLWAqndR7C3ht0MnOadan/hx2ezF6fcHXk99fOmOaFEG4+zshDzxyjmncwIsIP71y48NkU0DM7g== Received: from PU1APC01FT026.eop-APC01.prod.protection.outlook.com (2a01:111:e400:7ebe::50) by PU1APC01HT195.eop-APC01.prod.protection.outlook.com (2a01:111:e400:7ebe::451) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3520.15; Mon, 2 Nov 2020 01:54:15 +0000 Received: from PS1PR03MB5003.apcprd03.prod.outlook.com (2a01:111:e400:7ebe::48) by PU1APC01FT026.mail.protection.outlook.com (2a01:111:e400:7ebe::235) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3520.15 via Frontend Transport; Mon, 2 Nov 2020 01:54:15 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:9330EB1769C646477A5FE26053DE943EFFC6C1A36A081DC58D575988158188BE; UpperCasedChecksum:81853005F1E712A53454FAEFF677DDA5EC72955EA152E29804C4B4E231446F9B; SizeAsReceived:7283; Count:45 Received: from PS1PR03MB5003.apcprd03.prod.outlook.com ([fe80::38c7:d9d7:b981:8f35]) by PS1PR03MB5003.apcprd03.prod.outlook.com ([fe80::38c7:d9d7:b981:8f35%7]) with mapi id 15.20.3541.010; Mon, 2 Nov 2020 01:54:15 +0000 From: serial115200@outlook.com To: openwrt-devel@lists.openwrt.org Subject: [PATCH] ustream-ssl: openssl: fix bio memory leak Date: Mon, 2 Nov 2020 09:53:28 +0800 Message-ID: X-Mailer: git-send-email 2.24.1.windows.2 X-TMN: [qrsYSYVIpf11ZIvz15ind2JXO3cOksyq] X-ClientProxiedBy: HK2PR02CA0222.apcprd02.prod.outlook.com (2603:1096:201:20::34) To PS1PR03MB5003.apcprd03.prod.outlook.com (2603:1096:300:77::13) X-Microsoft-Original-Message-ID: <20201102015328.971-1-serial115200@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from FDM01026.cambridgeig.com (211.95.47.82) by HK2PR02CA0222.apcprd02.prod.outlook.com (2603:1096:201:20::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.27 via Frontend Transport; Mon, 2 Nov 2020 01:54:12 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 45 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 203f6e6d-7e01-4bc1-ab72-08d87ed232a5 X-MS-Exchange-SLBlob-MailProps: cR2SUrTzBEuWZa2Gr3EGFBjEUhf/p3iBLV9TiKSWHVHZYJF78c/9WVWLUQuU9H9kMLHk5/0w0CFSbYxkexnyq1ZtO6VzCIq6IOF2d2bo+Hw9CrELTdVNpFtMcL9yYgKItmq47qp+r1y9p5XGFGc6EZAwRJivBodgiBgHuz8XaX0xxCfQRRfNGbe9YNi+wzaTn3ihPzUstHlAu0ZPSNXCDl2SV291CMBd2uyubdkqJzEplSXcbHwEUYAXuK+buf9rMUDdsWcGcrnG8k22C/g1jPfBwOXD8/u0nITPFqJd37SIiL4pcfqx6Ji1IpnXl4JUO+0iHddxp/XBBOo8Sr21HyI/2LGo6dCZWOsb5SpPZQejAx46y6AkKL4RK+7II+krx4sbbkr2G5Gd5c6DNhhqUDXOvNOg3yZN7dx/G3RwFd5aUL2PCvqV2BMQL0BRqzDs6wSKevX2NKZelQDoVnFkED7EZymQsQk5OA2KuZSvcYqmDuHatoxsG7om19UwMBEBgn3htpLbeb7kxaWYudUBNzQzKQNMSyGMv60hbRBGBObUbrYa869GOVh45YxJgym0hwFUYejVv0OVCFfimJ+bFKPgxndeL6AgvTsVirHymglAWW+g0PIpXDY+qrKU1Bs9BDCoUWJauCSz7bl5urRYS5krTsnDeON4 X-MS-TrafficTypeDiagnostic: PU1APC01HT195: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CGLHEB9aVCel132fiMBMRNTVbfzBI2aVpngMxa9V+FKyc04++G6lJL6xKj+Fd87s9CcT48Zdep0lum73yAxK73i5TMv/GTLMlhnCKXfDEdu5gF4Y4m3uz4xzyxY0/3cTmBeIdFe1+YrEdThAO1MN2nGTGZkrlxa596ORcSABEysTLG+a6syuOnRkiWvyQSSDnFaA5OwtXyild7n0Xye3yQ== X-MS-Exchange-AntiSpam-MessageData: iqlleRc+MmQy5yJ9Pos17JUAKrJDOivNu16RCSDnEgDGgPFXbXK7rYGH1CRT+tMBLB1N8hMGLdesOQvqUGr5+3BlJvaeqSAosH3WzJDHPUlmt5Arct2+ipGD1J6zUw4nGiGlKWetZlQIstyuHfu25A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 203f6e6d-7e01-4bc1-ab72-08d87ed232a5 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2020 01:54:14.9574 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: PU1APC01FT026.eop-APC01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1APC01HT195 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201101_210944_966092_1CC2D0BB X-CRM114-Status: GOOD ( 11.84 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [40.92.255.106 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [40.92.255.106 listed in wl.mailspike.net] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [serial115200[at]outlook.com] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [serial115200[at]outlook.com] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.0 MSGID_FROM_MTA_HEADER Message-Id was added by a relay X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pan Chen Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Pan Chen free memory of bio method when ustream be freed Signed-off-by: Pan Chen --- openssl_bio_compat.h | 7 +++++++ ustream-io-openssl.c | 1 + 2 files changed, 8 insertions(+) diff --git a/openssl_bio_compat.h b/openssl_bio_compat.h index 9355c86..39a0455 100644 --- a/openssl_bio_compat.h +++ b/openssl_bio_compat.h @@ -28,6 +28,13 @@ static inline BIO_METHOD *BIO_meth_new(int type, const char *name) return bm; } +static inline void BIO_meth_free(BIO_METHOD *bm) +{ + if (bm != NULL) { + free(bm); + } +} + #endif /* OPENSSL_VERSION_NUMBER */ #endif /* OPENSSL_BIO_COMPAT_H */ diff --git a/ustream-io-openssl.c b/ustream-io-openssl.c index 606ed4a..c9d7fae 100644 --- a/ustream-io-openssl.c +++ b/ustream-io-openssl.c @@ -42,6 +42,7 @@ s_ustream_free(BIO *b) BIO_set_data(b, NULL); BIO_set_init(b, 0); BIO_clear_flags(b, ~0); + BIO_meth_free(b->method); return 1; }