From patchwork Mon Apr 2 08:47:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Dedecker X-Patchwork-Id: 894138 X-Patchwork-Delegate: dedeckeh@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="SS7ElpGs"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XlJuOGWw"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40F5Ts1s7kz9s0W for ; Mon, 2 Apr 2018 18:48:17 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date: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=uQHkDaJOQUBr2HtAm/ILOwAODN3kpnZxndnxXV5EVnY=; b=SS7ElpGsHet2RM Mh9c9ja8FIxpixa7PLjxTMtR7KVpB2sQSdZBQoBMnp1xTe7phZNAAcxscMrNVk0qLDN9C1HqzFQmD FMVTOWWmSjo2CEEkKgrPELWOCEWgTtpkwisl5qHhJZBEEo3zxT+fPynUyh9dZkxPe+K/SYn1FM25i LMVGVf/tNQk0tn8ZfWeW5iEYDh7VBN3b0ZzrLtyxsan98WgVyzngYYv6ErBMZMmQNVzqmhX9gVjrR 35EiKyIp8dl/0HFTQiOl8WZc1Fj6Zeq59/cXmX6EPN9u0/hdSv0Pw6KlN4BfuMx0EMRjxvQUgEXSI 8kLNb+OTsclj8khaXBaQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f2v86-00053b-7J; Mon, 02 Apr 2018 08:47:54 +0000 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f2v83-00052W-4F for lede-dev@lists.infradead.org; Mon, 02 Apr 2018 08:47:52 +0000 Received: by mail-wm0-x243.google.com with SMTP id w2so5021231wmw.1 for ; Mon, 02 Apr 2018 01:47:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=ddTYYahWENqVUi7InlMIxjmT7zpQ/xYhYLQwlteySsY=; b=XlJuOGWwTm+1OHsn7d5u9dtF3cHqWcgeHoqZfkxXIToAzTFzsY25ek/X+M7HQX7/x8 lCEYhko8mSIdG0y8An2/bFM6AFCXZNLFMwfZhhBB5Rs3MX71iIxfm7l70S7cble7v06k EVbsNRxBGmYa4plKOihR9hCMoEYY0X45DLbT/aD1cUgX6nn3pl2od5+4kE+SUKBJbT1v P3/hHUivvvS1aJWXbA4w7IHPFGjCVv6QPTeo534copzRI1ZDcjzSbmOox+ivrRJaAN+/ BnGiGvI3AgaVhYYR2ndv2YRNMqhQduFKKxHIarWnZSv3SZXSBvDKYmvfIp1DHp+zZ2ge b84g== 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=ddTYYahWENqVUi7InlMIxjmT7zpQ/xYhYLQwlteySsY=; b=brAF7YeHBna4QZ3BS0aCEB1jjb3Zp9d6Ila4lJl0hBhhaL2NOHrNMC+kg7Q+iSIBkT jrbZA+UEOwA/ktAyjD1t1vSgqOND2kENUIUlRRxA/wABXvHcXg0v+pdxfX1ZGRON71LH b9W6t8F0mr+WFZVKR/YvaEVtF1pWuU0YxLiRMNCxyPbkd4rIc0ocxJG523kFhuplSd8+ niCwMpWiCKCrkAchL/bCiPxp/JPKyBcyHpiAi2MR9c3geoe88Shmk2b/gfcxmdrftVAr 1f5GKhe+8RcitYfglKibbqVKnvCPs+RGZX7qfIAM9ydoULvJ21iqsX+x79tC0/TTbfHE U5Qw== X-Gm-Message-State: AElRT7ErWFeqTzuNMo67riBoUu83WB2IzpwCc3kZrb/OJ/NLVsPtjWZ5 8MIAXgXn39Mr2Tg9HIXtmaE= X-Google-Smtp-Source: AIpwx4+00t6ecxbQ9IXfMZCBBXjs4I6FUXavPLjmumkdL3aNgTOpPo11i8ygXLvlOte/Yzom51veJQ== X-Received: by 10.80.140.200 with SMTP id r8mr11742322edr.310.1522658858984; Mon, 02 Apr 2018 01:47:38 -0700 (PDT) Received: from linux-5g1g.lan (78-22-198-139.access.telenet.be. [78.22.198.139]) by smtp.gmail.com with ESMTPSA id 4sm102687edx.8.2018.04.02.01.47.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Apr 2018 01:47:38 -0700 (PDT) From: Hans Dedecker To: nbd@nbd.name, lede-dev@lists.infradead.org Date: Mon, 2 Apr 2018 10:47:34 +0200 Message-Id: <20180402084734.13063-1-dedeckeh@gmail.com> X-Mailer: git-send-email 2.16.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180402_014751_193679_D12621FA X-CRM114-Status: GOOD ( 12.83 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c09:0:0:0:243 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (dedeckeh[at]gmail.com) -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [LEDE-DEV] [PATCH netifd] interface-ip: fix memory leak in interface_ip_add_target_route() X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hans Dedecker MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Commit 9c8d781 introduced a memory leak in interface_ip_add_target_route in case interface_ip_find_addr_target returns true for a given address by not freeing the previously allocated route. While at it rework the logic so a host route is only allocated when it's really required. Signed-off-by: Hans Dedecker --- interface-ip.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/interface-ip.c b/interface-ip.c index 1c84d4f..6726a69 100644 --- a/interface-ip.c +++ b/interface-ip.c @@ -229,18 +229,12 @@ interface_ip_add_target_route(union if_addr *addr, bool v6, struct interface *if { struct device_route *route, *r_next = NULL; bool defaultroute_target = false; + union if_addr addr_zero; int addrsize = v6 ? sizeof(addr->in6) : sizeof(addr->in); - route = calloc(1, sizeof(*route)); - if (!route) - return NULL; - - route->flags = v6 ? DEVADDR_INET6 : DEVADDR_INET4; - route->mask = v6 ? 128 : 32; - if (memcmp(&route->addr, addr, addrsize) == 0) + memset(&addr_zero, 0, sizeof(addr_zero)); + if (memcmp(&addr_zero, addr, addrsize) == 0) defaultroute_target = true; - else - memcpy(&route->addr, addr, addrsize); if (iface) { /* look for locally addressable target first */ @@ -262,21 +256,27 @@ interface_ip_add_target_route(union if_addr *addr, bool v6, struct interface *if } } - if (!r_next) { - free(route); + if (!r_next) return NULL; - } iface = r_next->iface; + if (defaultroute_target) + return iface; + + route = calloc(1, sizeof(*route)); + if (!route) + return NULL; + + route->flags = v6 ? DEVADDR_INET6 : DEVADDR_INET4; + route->mask = v6 ? 128 : 32; + memcpy(&route->addr, addr, addrsize); memcpy(&route->nexthop, &r_next->nexthop, sizeof(route->nexthop)); route->mtu = r_next->mtu; route->metric = r_next->metric; route->table = r_next->table; route->iface = iface; - if (defaultroute_target) - free(route); - else - vlist_add(&iface->host_routes, &route->node, route); + vlist_add(&iface->host_routes, &route->node, route); + return iface; }