diff options
| author | Hangbin Liu <liuhangbin@gmail.com> | 2017-02-08 21:16:45 +0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-03-16 02:18:58 +0000 |
| commit | 688ddc50ce7300bf323ae75010ae039e796eea06 (patch) | |
| tree | cec59bae86fe83c7de39b42d67f593731337bedd /net | |
| parent | 7c906c367c7dacf6f641e70910f11acd7195e8e9 (diff) | |
igmp, mld: Fix memory leak in igmpv3/mld_del_delrec()
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 <daniel@iogearbox.net>
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/igmp.c | 1 | ||||
| -rw-r--r-- | net/ipv6/mcast.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index 79319d20a489..0a35f0846142 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@ -1118,6 +1118,7 @@ static void igmpv3_del_delrec(struct in_device *in_dev, struct ip_mc_list *im) psf->sf_crcount = im->crcount; } in_dev_put(pmc->interface); + kfree(pmc); } spin_unlock_bh(&im->lock); } diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index d21d4245305c..51a2b9c8f769 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c @@ -778,6 +778,7 @@ static void mld_del_delrec(struct inet6_dev *idev, struct ifmcaddr6 *im) psf->sf_crcount = im->mca_crcount; } in6_dev_put(pmc->idev); + kfree(pmc); } spin_unlock_bh(&im->mca_lock); } |