From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by dpdk.org (Postfix) with ESMTP id 13A941B1C7 for ; Fri, 10 Nov 2017 17:10:23 +0100 (CET) Received: by mail-wr0-f194.google.com with SMTP id 15so9026910wrb.5 for ; Fri, 10 Nov 2017 08:10:23 -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:in-reply-to:references; bh=YdjnFsEbkQJl8iqG9G/1as6NZY3W8ICw4ffhzWyy0bw=; b=UfTSXGl8+J5aOD4Imtx+b8oQpx7T1AmEqkzqyIVGGZWlQfY3r0nWZwdU0WwwGCZ0js dStWhLmjZXwZnNAADynW7AxN8PfTpFg54fVp2oPxQuugqkSdnHsbtKFdX9tIvCj3RTCU yJ9TfyxLsZEP1sdLIA4nVhWrOIqJUZT6CN/n2YT+1gYIZNNAGCeI6Ft/BTke5Cqrx2yS 3WC+UGEHcvohiAv3VC2LtdBSwq3ugwhHC2lyML3TEeTu5NdLTxqErg8qwpZ6gRiSSwHI HB1WI1sSfe97WsvYXVhTIRS26ypSo5GzieLA5KvW6e9hrSCWITe/TYfclU3A/8jKJ7sD EBzg== 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:in-reply-to :references; bh=YdjnFsEbkQJl8iqG9G/1as6NZY3W8ICw4ffhzWyy0bw=; b=j/M+dUCpW3yd/TXPgpdi/0o0r20yOTjVDGaTbMPnq7hfvHx4sbAD04cA1rlgsvJwDR qHbnS+/JWOiM/u9Cg6PAGx21iKNSC7Z0AlqMVg1ai6NQTW1mp+Mn654xqgc7KU9d7M50 fcvbVK3RI7UbBWFPdaOpco7GtoNQojOmEWf28UgD3ZWzOq7fJzp3EUgvOIwfKM++t8Mo sAQdYQtoBxIfYLjmi8ihdMG6hr/opqQYtuLWuz/xZwtqdroQ4KPyPM5vWFU4VvgpXAPE 6cHmCBY3nNMlfpInhJ4E0nYtAQRm7Iw99nfoI4uZ4IekTDUiqbb0LsJqFckCES0DPSJS 2grQ== X-Gm-Message-State: AJaThX7YSRWPo4nBQaxa1VTULa1rakcoeIiDfLDFW+8ej1vGM6XZs+Ik Ooq6hP9GzkhL9PcyMfiUH8I= X-Google-Smtp-Source: AGs4zMY6Y1PzZuR8VnnKXgWknEEJ4eJGQyMdgfazu9tzg0CTLKJPelly5d5w2pbGjMhmlpTFBQQjHw== X-Received: by 10.223.176.220 with SMTP id j28mr671591wra.99.1510330222797; Fri, 10 Nov 2017 08:10:22 -0800 (PST) Received: from localhost ([2a00:23c5:bef3:400:4a51:b7ff:fe0b:4749]) by smtp.gmail.com with ESMTPSA id e8sm2898393wmf.46.2017.11.10.08.10.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 10 Nov 2017 08:10:21 -0800 (PST) From: luca.boccassi@gmail.com To: Stefan Baranoff Cc: Ferruh Yigit , dpdk stable Date: Fri, 10 Nov 2017 16:09:53 +0000 Message-Id: <20171110161000.15369-9-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171110161000.15369-1-luca.boccassi@gmail.com> References: <20171102120247.10565-18-luca.boccassi@gmail.com> <20171110161000.15369-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'net/pcap: fix memory leak in dumper open' has been queued to LTS release 16.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Nov 2017 16:10:23 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/12/17. So please shout if anyone has objections. Thanks. Kind regards, Luca Boccassi --- >>From d224d370495209f3eb302370516a722a646ed949 Mon Sep 17 00:00:00 2001 From: Stefan Baranoff Date: Sun, 5 Nov 2017 12:24:45 -0500 Subject: [PATCH] net/pcap: fix memory leak in dumper open [ upstream commit e59196e01c1456e8ea0e9b2056651ef64dc17b78 ] In open_single_tx_pcap there is a call to pcap_open_dead which calls malloc to create and return a pcap_t. That object is never freed in this case. Other places it is freed by passing it back similar to the way the pcap_dumper_t is in this case. The pcap_t is only used to create the pcap_dumper_t and is never used again so freeing it here is safe and much simpler than trying to pass it back to be freed in eth_dev_stop along with the other pcap_t/pcap_dumper_t objects. Fixes: 4c173302c307 ("pcap: add new driver") Signed-off-by: Stefan Baranoff Acked-by: Ferruh Yigit --- drivers/net/pcap/rte_eth_pcap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c index 1a208ffca..f6b3c10c0 100644 --- a/drivers/net/pcap/rte_eth_pcap.c +++ b/drivers/net/pcap/rte_eth_pcap.c @@ -411,11 +411,13 @@ open_single_tx_pcap(const char *pcap_filename, pcap_dumper_t **dumper) /* The dumper is created using the previous pcap_t reference */ *dumper = pcap_dump_open(tx_pcap, pcap_filename); if (*dumper == NULL) { + pcap_close(tx_pcap); RTE_LOG(ERR, PMD, "Couldn't open %s for writing.\n", pcap_filename); return -1; } + pcap_close(tx_pcap); return 0; } -- 2.11.0