<div class="zcontentRow" style="font-size:14px;font-family:宋体,SimSun;"> >On 09/26/2017 03:54 PM, ZhiPeng Lu wrote:<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">>> In learnIPAddressThread()the @inetaddr may be leaked.<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">>> <br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">> Signed-off-by: ZhiPeng Lu <lu.zhipeng@zte.com.cn><br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">> ---<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">> src/nwfilter/nwfilter_learnipaddr.c | 4 +++-<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">> 1 file changed, 3 insertions(+), 1 deletion(-)<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">> <br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">> diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">> index cfd92d9..5dc212e 100644<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">> --- a/src/nwfilter/nwfilter_learnipaddr.c<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">> +++ b/src/nwfilter/nwfilter_learnipaddr.c<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">> @@ -625,6 +625,7 @@ learnIPAddressThread(void *arg)<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">> if (virNWFilterIPAddrMapAddIPAddr(req->ifname, inetaddr) < 0) {<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">>> VIR_ERROR(_("Failed to add IP address %s to IP address "<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">>> "cache for interface %s"), inetaddr, req->ifname);<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">>> + VIR_FREE(inetaddr);<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">>> }<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">>> <br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">>> ret = virNWFilterInstantiateFilterLate(req->driver,<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">>> @@ -636,7 +637,8 @@ learnIPAddressThread(void *arg)<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">>> req->filtername,<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">>> req->filterparams);<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">>> VIR_DEBUG("Result from applying firewall rules on "<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">>> - "%s with IP addr %s : %d", req->ifname, inetaddr, ret);<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">>> + "%s with IP addr %s : %d", req->ifname, NULLSTR(inetaddr), ret);> +<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);"><br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">>Still not quite right... VIR_FREE() only happens if<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">>virNWFilterIPAddrMapAddIPAddr() < 0.<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);"><br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">>Not sure what the purpose of a VIR_FREE in the upper condition and then<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">>NULLSTR() below would be... We're still calling<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">>virNWFilterInstantiateFilterLate regardless and still want the VIR_DEBUG<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">>printed.<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);"><br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">>Perhaps just a VIR_FREE() after the VIR_DEBUG would seem to be<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">>sufficient since there's no escape clause. The VIR_ERROR may help us<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">>understand why/if ret != 0 though... I didn't put much thought into that<br style="box-sizing: border-box; font-family: Arial, 宋体, 'Microsoft Yahei', 'Lucida Grande', Verdana, Lucida, Helvetica, sans-serif; line-height: 20px; white-space: normal; outline: 0px !important; background-color: rgb(255, 255, 255);">>though. we can't free inetaddr if virNWFilterIPAddrMapAddIPAddr() ==0 because it is used by ipAddressMap.So i free inetaddr only if virNWFilterIPAddrMapAddIPAddr < 0. I will add a variable to save the return value of virNWFilterIPAddrMapAddIPAddr. Free inetaddr if virNWFilterIPAddrMapAddIPAddr< 0 after VIR_ERROR print. <div class="zMailSign"><div><div><div><div><div><div><div><div>为了让您的VPlat虚拟机故障和docker故障得到高效的处理，请上报故障到: $VPlat技术支持。芦志朋 luzhipeng IT开发工程师 IT Development Engineer 操作系统产品部/中心研究院/系统产品 OS Product Dept./Central R＆D Institute/System Product <table style="color: rgb(0, 0, 0); font-family: 宋体; widows: 1;"><tbody><tr class="firstRow"><td valign="top" width="100"><img id="sign-icon" src="cid:9ae3e214c17d49ed935d87c674ba3ee2" width="130" height="120"></td><td valign="top" width="500" style="word-break: break-all;"><img id="sign-logo" src="cid:24242e5637af428891c4db731e7765ad" width="115" height="38"> 四川省成都市天府大道中段800号 E: <a href="mailto:lu.zhipeng@zte.com.cn">lu.zhipeng@zte.com.cn</a> <a href="http://www.zte.com.cn/" target="_blank">www.zte.com.cn</a></td></tr></tbody></table></div></div></div></div></div></div></div></div></div><div><div class="zhistoryRow" style="display:block"><div class="zhistoryDes" style="width: 100%; height: 28px; line-height: 28px; background-color: #E0E5E9; color: #1388FF; text-align: center;" language-data="HistoryOrgTxt">原始邮件</div><div id="zwriteHistoryContainer"><div class="control-group zhistoryPanel"><div class="zhistoryHeader" style="padding: 8px; background-color: #F5F6F8;"><div>发件人： <jferlan@redhat.com>;</div><div>收件人：芦志朋10108272; <libvir-list@redhat.com>;</div><div>日期：2017年09月27日 07:46</div><div>主题：Re: [libvirt] [PATCH v2] nwfilter: Don't leak @inetaddr</div></div> <div> On 09/26/2017 03:54 PM, ZhiPeng Lu wrote: > In learnIPAddressThread()the @inetaddr may be leaked. > > Signed-off-by: ZhiPeng Lu <lu.zhipeng@zte.com.cn> > --- > src/nwfilter/nwfilter_learnipaddr.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c > index cfd92d9..5dc212e 100644 > --- a/src/nwfilter/nwfilter_learnipaddr.c > +++ b/src/nwfilter/nwfilter_learnipaddr.c > @@ -625,6 +625,7 @@ learnIPAddressThread(void *arg) > if (virNWFilterIPAddrMapAddIPAddr(req->ifname, inetaddr) < 0) { > VIR_ERROR(_("Failed to add IP address %s to IP address " > "cache for interface %s"), inetaddr, req->ifname); > + VIR_FREE(inetaddr); > } > > ret = virNWFilterInstantiateFilterLate(req->driver, > @@ -636,7 +637,8 @@ learnIPAddressThread(void *arg) > req->filtername, > req->filterparams); > VIR_DEBUG("Result from applying firewall rules on " > - "%s with IP addr %s : %d", req->ifname, inetaddr, ret); > + "%s with IP addr %s : %d", req->ifname, NULLSTR(inetaddr), ret);> + Still not quite right... VIR_FREE() only happens if virNWFilterIPAddrMapAddIPAddr() < 0. Not sure what the purpose of a VIR_FREE in the upper condition and then NULLSTR() below would be... We're still calling virNWFilterInstantiateFilterLate regardless and still want the VIR_DEBUG printed. Perhaps just a VIR_FREE() after the VIR_DEBUG would seem to be sufficient since there's no escape clause. The VIR_ERROR may help us understand why/if ret != 0 though... I didn't put much thought into that though. John > } > } else { > if (showError) > </div> </div></div></div></div> </div>