2017-02-16 6:41 GMT+08:00 Ben Hutchings <[email protected]>: > 3.2.85-rc1 review patch. If anyone has any objections, please let me know. > > ------------------ > > From: Hangbin Liu <[email protected]> > > commit 24803f38a5c0b6c57ed800b47e695f9ce474bc3a upstream. > > In commit 24cf3af3fed5 ("igmp: call ip_mc_clear_src..."), we forgot to remove > igmpv3_clear_delrec() in ip_mc_down(), which also called ip_mc_clear_src(). > This make us clear all IGMPv3 source filter info after NETDEV_DOWN. > Move igmpv3_clear_delrec() to ip_mc_destroy_dev() and then no need > ip_mc_clear_src() in ip_mc_destroy_dev(). > > On the other hand, we should restore back instead of free all source filter > info in igmpv3_del_delrec(). Or we will not able to restore IGMPv3 source > filter info after NETDEV_UP and NETDEV_POST_TYPE_CHANGE. > > Fixes: 24cf3af3fed5 ("igmp: call ip_mc_clear_src() only when ...") > Signed-off-by: Hangbin Liu <[email protected]> > Signed-off-by: David S. Miller <[email protected]> > [bwh: Backported to 3.2: > - Use IGMP_Unsolicited_Report_Count instead of sysctl_igmp_qrv > - Adjust context] > Signed-off-by: Ben Hutchings <[email protected]>
Hi Ben, There is a bug fix for this patch, please consider drop this patch or include the fix. commit 9c8bb163ae784be4f79ae504e78c862806087c54 Author: Hangbin Liu <[email protected]> Date: Wed Feb 8 21:16:45 2017 +0800 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 <[email protected]> Signed-off-by: Hangbin Liu <[email protected]> Signed-off-by: David S. Miller <[email protected]> Thanks Hangbin
