diff options
author | Hangbin Liu <liuhangbin@gmail.com> | 2017-02-08 08:16:45 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-02-09 16:43:45 -0500 |
commit | 9c8bb163ae784be4f79ae504e78c862806087c54 (patch) | |
tree | 3a4f8ad0efffb2d1c63347819245ffd0dc59d273 | |
parent | e2e004acc7cbe3c531e752a270a74e95cde3ea48 (diff) |
igmp, mld: Fix memory leak in igmpv3/mld_del_delrec()
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>
-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 5b15459955f8..44fd86de2823 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c | |||
@@ -1172,6 +1172,7 @@ static void igmpv3_del_delrec(struct in_device *in_dev, struct ip_mc_list *im) | |||
1172 | psf->sf_crcount = im->crcount; | 1172 | psf->sf_crcount = im->crcount; |
1173 | } | 1173 | } |
1174 | in_dev_put(pmc->interface); | 1174 | in_dev_put(pmc->interface); |
1175 | kfree(pmc); | ||
1175 | } | 1176 | } |
1176 | spin_unlock_bh(&im->lock); | 1177 | spin_unlock_bh(&im->lock); |
1177 | } | 1178 | } |
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index 7139fffd61b6..1bdc703cb966 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c | |||
@@ -779,6 +779,7 @@ static void mld_del_delrec(struct inet6_dev *idev, struct ifmcaddr6 *im) | |||
779 | psf->sf_crcount = im->mca_crcount; | 779 | psf->sf_crcount = im->mca_crcount; |
780 | } | 780 | } |
781 | in6_dev_put(pmc->idev); | 781 | in6_dev_put(pmc->idev); |
782 | kfree(pmc); | ||
782 | } | 783 | } |
783 | spin_unlock_bh(&im->mca_lock); | 784 | spin_unlock_bh(&im->mca_lock); |
784 | } | 785 | } |