diff mbox series

[V5] net/colo-compare.c: Fix memory leak and code style issue.

Message ID 20190722171828.11322-1-chen.zhang@intel.com
State New
Headers show
Series [V5] net/colo-compare.c: Fix memory leak and code style issue. | expand

Commit Message

Zhang, Chen July 22, 2019, 5:18 p.m. UTC 
From: Zhang Chen <chen.zhang@intel.com>

This patch to fix the origin "char *data" memory leak, code style issue
and add necessary check here.
Reported-by: Coverity (CID 1402785)

Signed-off-by: Zhang Chen <chen.zhang@intel.com>
---
 net/colo-compare.c | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

Comments

Peter Maydell July 22, 2019, 5:24 p.m. UTC | #1 
On Mon, 22 Jul 2019 at 18:23, Zhang Chen <chen.zhang@intel.com> wrote:
>
> From: Zhang Chen <chen.zhang@intel.com>
>
> This patch to fix the origin "char *data" memory leak, code style issue
> and add necessary check here.
> Reported-by: Coverity (CID 1402785)
>
> Signed-off-by: Zhang Chen <chen.zhang@intel.com>
> ---
>  net/colo-compare.c | 27 ++++++++++++++++++++-------
>  1 file changed, 20 insertions(+), 7 deletions(-)

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

Thanks for your patience in sending out all these versions
as we worked through the code review process.

thanks
-- PMM
Zhang, Chen July 22, 2019, 6:38 p.m. UTC | #2 
> -----Original Message-----
> From: Peter Maydell [mailto:peter.maydell@linaro.org]
> Sent: Tuesday, July 23, 2019 1:25 AM
> To: Zhang, Chen <chen.zhang@intel.com>
> Cc: Li Zhijian <lizhijian@cn.fujitsu.com>; Jason Wang <jasowang@redhat.com>;
> qemu-dev <qemu-devel@nongnu.org>; Zhang Chen <zhangckid@gmail.com>
> Subject: Re: [PATCH V5] net/colo-compare.c: Fix memory leak and code style
> issue.
> 
> On Mon, 22 Jul 2019 at 18:23, Zhang Chen <chen.zhang@intel.com> wrote:
> >
> > From: Zhang Chen <chen.zhang@intel.com>
> >
> > This patch to fix the origin "char *data" memory leak, code style
> > issue and add necessary check here.
> > Reported-by: Coverity (CID 1402785)
> >
> > Signed-off-by: Zhang Chen <chen.zhang@intel.com>
> > ---
> >  net/colo-compare.c | 27 ++++++++++++++++++++-------
> >  1 file changed, 20 insertions(+), 7 deletions(-)
> 
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> 
> Thanks for your patience in sending out all these versions as we worked
> through the code review process.

Thank you too~
Maybe you or Jason can pick up this patch?

Thanks
Zhang Chen

> 
> thanks
> -- PMM
Jason Wang July 23, 2019, 3:23 a.m. UTC | #3 
On 2019/7/23 上午2:38, Zhang, Chen wrote:
>
>
>> -----Original Message-----
>> From: Peter Maydell [mailto:peter.maydell@linaro.org]
>> Sent: Tuesday, July 23, 2019 1:25 AM
>> To: Zhang, Chen <chen.zhang@intel.com>
>> Cc: Li Zhijian <lizhijian@cn.fujitsu.com>; Jason Wang <jasowang@redhat.com>;
>> qemu-dev <qemu-devel@nongnu.org>; Zhang Chen <zhangckid@gmail.com>
>> Subject: Re: [PATCH V5] net/colo-compare.c: Fix memory leak and code style
>> issue.
>>
>> On Mon, 22 Jul 2019 at 18:23, Zhang Chen <chen.zhang@intel.com> wrote:
>>> From: Zhang Chen <chen.zhang@intel.com>
>>>
>>> This patch to fix the origin "char *data" memory leak, code style
>>> issue and add necessary check here.
>>> Reported-by: Coverity (CID 1402785)
>>>
>>> Signed-off-by: Zhang Chen <chen.zhang@intel.com>
>>> ---
>>>   net/colo-compare.c | 27 ++++++++++++++++++++-------
>>>   1 file changed, 20 insertions(+), 7 deletions(-)
>> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
>>
>> Thanks for your patience in sending out all these versions as we worked
>> through the code review process.
> Thank you too~
> Maybe you or Jason can pick up this patch?
>
> Thanks
> Zhang Chen


Applied.

Thanks


>
>> thanks
>> -- PMM
Peter Maydell July 25, 2019, 9:27 a.m. UTC | #4 
On Tue, 23 Jul 2019 at 04:24, Jason Wang <jasowang@redhat.com> wrote:
>
>
> On 2019/7/23 上午2:38, Zhang, Chen wrote:
> >
> >
> >> -----Original Message-----
> >> From: Peter Maydell [mailto:peter.maydell@linaro.org]
> >> Sent: Tuesday, July 23, 2019 1:25 AM
> >> To: Zhang, Chen <chen.zhang@intel.com>
> >> Cc: Li Zhijian <lizhijian@cn.fujitsu.com>; Jason Wang <jasowang@redhat.com>;
> >> qemu-dev <qemu-devel@nongnu.org>; Zhang Chen <zhangckid@gmail.com>
> >> Subject: Re: [PATCH V5] net/colo-compare.c: Fix memory leak and code style
> >> issue.
> >>
> >> On Mon, 22 Jul 2019 at 18:23, Zhang Chen <chen.zhang@intel.com> wrote:
> >>> From: Zhang Chen <chen.zhang@intel.com>
> >>>
> >>> This patch to fix the origin "char *data" memory leak, code style
> >>> issue and add necessary check here.
> >>> Reported-by: Coverity (CID 1402785)
> >>>
> >>> Signed-off-by: Zhang Chen <chen.zhang@intel.com>
> >>> ---
> >>>   net/colo-compare.c | 27 ++++++++++++++++++++-------
> >>>   1 file changed, 20 insertions(+), 7 deletions(-)
> >> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> >>
> >> Thanks for your patience in sending out all these versions as we worked
> >> through the code review process.
> > Thank you too~
> > Maybe you or Jason can pick up this patch?

> Applied.

Thanks. This is now our last outstanding coverity issue --
are you planning to send this in for rc3 ?

-- PMM
Jason Wang July 25, 2019, 9:31 a.m. UTC | #5 
----- Original Message -----
> On Tue, 23 Jul 2019 at 04:24, Jason Wang <jasowang@redhat.com> wrote:
> >
> >
> > On 2019/7/23 上午2:38, Zhang, Chen wrote:
> > >
> > >
> > >> -----Original Message-----
> > >> From: Peter Maydell [mailto:peter.maydell@linaro.org]
> > >> Sent: Tuesday, July 23, 2019 1:25 AM
> > >> To: Zhang, Chen <chen.zhang@intel.com>
> > >> Cc: Li Zhijian <lizhijian@cn.fujitsu.com>; Jason Wang
> > >> <jasowang@redhat.com>;
> > >> qemu-dev <qemu-devel@nongnu.org>; Zhang Chen <zhangckid@gmail.com>
> > >> Subject: Re: [PATCH V5] net/colo-compare.c: Fix memory leak and code
> > >> style
> > >> issue.
> > >>
> > >> On Mon, 22 Jul 2019 at 18:23, Zhang Chen <chen.zhang@intel.com> wrote:
> > >>> From: Zhang Chen <chen.zhang@intel.com>
> > >>>
> > >>> This patch to fix the origin "char *data" memory leak, code style
> > >>> issue and add necessary check here.
> > >>> Reported-by: Coverity (CID 1402785)
> > >>>
> > >>> Signed-off-by: Zhang Chen <chen.zhang@intel.com>
> > >>> ---
> > >>>   net/colo-compare.c | 27 ++++++++++++++++++++-------
> > >>>   1 file changed, 20 insertions(+), 7 deletions(-)
> > >> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> > >>
> > >> Thanks for your patience in sending out all these versions as we worked
> > >> through the code review process.
> > > Thank you too~
> > > Maybe you or Jason can pick up this patch?
> 
> > Applied.
> 
> Thanks. This is now our last outstanding coverity issue --
> are you planning to send this in for rc3 ?
> 
> -- PMM
> 
> 

Yes.

Thanks
diff mbox series

Patch

diff --git a/net/colo-compare.c b/net/colo-compare.c
index 909dd6c6eb..7489840bde 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -127,6 +127,17 @@  static int compare_chr_send(CompareState *s,
                             uint32_t vnet_hdr_len,
                             bool notify_remote_frame);
 
+static bool packet_matches_str(const char *str,
+                               const uint8_t *buf,
+                               uint32_t packet_len)
+{
+    if (packet_len != strlen(str)) {
+        return false;
+    }
+
+    return !memcmp(str, buf, strlen(str));
+}
+
 static void notify_remote_frame(CompareState *s)
 {
     char msg[] = "DO_CHECKPOINT";
@@ -1008,21 +1019,23 @@  static void compare_notify_rs_finalize(SocketReadState *notify_rs)
 {
     CompareState *s = container_of(notify_rs, CompareState, notify_rs);
 
-    /* Get Xen colo-frame's notify and handle the message */
-    char *data = g_memdup(notify_rs->buf, notify_rs->packet_len);
-    char msg[] = "COLO_COMPARE_GET_XEN_INIT";
+    const char msg[] = "COLO_COMPARE_GET_XEN_INIT";
     int ret;
 
-    if (!strcmp(data, "COLO_USERSPACE_PROXY_INIT")) {
+    if (packet_matches_str("COLO_USERSPACE_PROXY_INIT",
+                           notify_rs->buf,
+                           notify_rs->packet_len)) {
         ret = compare_chr_send(s, (uint8_t *)msg, strlen(msg), 0, true);
         if (ret < 0) {
             error_report("Notify Xen COLO-frame INIT failed");
         }
-    }
-
-    if (!strcmp(data, "COLO_CHECKPOINT")) {
+    } else if (packet_matches_str("COLO_CHECKPOINT",
+                                  notify_rs->buf,
+                                  notify_rs->packet_len)) {
         /* colo-compare do checkpoint, flush pri packet and remove sec packet */
         g_queue_foreach(&s->conn_list, colo_flush_packets, s);
+    } else {
+        error_report("COLO compare got unsupported instruction");
     }
 }