Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936456AbdCJMKg (ORCPT ); Fri, 10 Mar 2017 07:10:36 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:45042 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936292AbdCJMKd (ORCPT ); Fri, 10 Mar 2017 07:10:33 -0500 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Daniel Borkmann" , "Hangbin Liu" , "David S. Miller" Date: Fri, 10 Mar 2017 11:46:23 +0000 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.16 365/370] igmp, mld: Fix memory leak in igmpv3/mld_del_delrec() In-Reply-To: X-SA-Exim-Connect-IP: 82.70.136.246 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1316 Lines: 43 3.16.42-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Hangbin Liu commit 9c8bb163ae784be4f79ae504e78c862806087c54 upstream. In function igmpv3/mld_add_delrec() we allocate pmc and put it in idev->mc_tomb, so we should free it when we don't need it in del_delrec(). But I removed kfree(pmc) incorrectly in latest two patches. Now fix it. Fixes: 24803f38a5c0 ("igmp: do not remove igmp souce list info when ...") Fixes: 1666d49e1d41 ("mld: do not remove mld souce list info when ...") Reported-by: Daniel Borkmann Signed-off-by: Hangbin Liu Signed-off-by: David S. Miller Signed-off-by: Ben Hutchings --- net/ipv4/igmp.c | 1 + net/ipv6/mcast.c | 1 + 2 files changed, 2 insertions(+) --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@ -1145,6 +1145,7 @@ static void igmpv3_del_delrec(struct in_ psf->sf_crcount = im->crcount; } in_dev_put(pmc->interface); + kfree(pmc); } spin_unlock_bh(&im->lock); } --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c @@ -814,6 +814,7 @@ static void mld_del_delrec(struct inet6_ psf->sf_crcount = im->mca_crcount; } in6_dev_put(pmc->idev); + kfree(pmc); } spin_unlock_bh(&im->mca_lock); }