[qemu-xen stable-4.13] COLO-compare: Fix incorrect `if` logic

[patchbot@xxxxxxx]

commit aea18ef938c115f02e269ab6c8bc83dc5126db19
Author:     Fan Yang <Fan_Yang@xxxxxxxxxxx>
AuthorDate: Tue Sep 24 22:08:29 2019 +0800
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Mon Nov 4 08:25:01 2019 -0600

    COLO-compare: Fix incorrect `if` logic
    
    'colo_mark_tcp_pkt' should return 'true' when packets are the same, and
    'false' otherwise.  However, it returns 'true' when
    'colo_compare_packet_payload' returns non-zero while
    'colo_compare_packet_payload' is just a 'memcmp'.  The result is that
    COLO-compare reports inconsistent TCP packets when they are actually
    the same.
    
    Fixes: f449c9e549c ("colo: compare the packet based on the tcp sequence 
number")
    Cc: qemu-stable@xxxxxxxxxx
    Reviewed-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>
    Signed-off-by: Fan Yang <Fan_Yang@xxxxxxxxxxx>
    Signed-off-by: Jason Wang <jasowang@xxxxxxxxxx>
    (cherry picked from commit 1e907a32b77e5d418538453df5945242e43224fa)
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
---
 net/colo-compare.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/colo-compare.c b/net/colo-compare.c
index 7489840bde..7ee17f2cf8 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -319,7 +319,7 @@ static bool colo_mark_tcp_pkt(Packet *ppkt, Packet *spkt,
     *mark = 0;
 
     if (ppkt->tcp_seq == spkt->tcp_seq && ppkt->seq_end == spkt->seq_end) {
-        if (colo_compare_packet_payload(ppkt, spkt,
+        if (!colo_compare_packet_payload(ppkt, spkt,
                                         ppkt->header_size, spkt->header_size,
                                         ppkt->payload_size)) {
             *mark = COLO_COMPARE_FREE_SECONDARY | COLO_COMPARE_FREE_PRIMARY;
@@ -329,7 +329,7 @@ static bool colo_mark_tcp_pkt(Packet *ppkt, Packet *spkt,
 
     /* one part of secondary packet payload still need to be compared */
     if (!after(ppkt->seq_end, spkt->seq_end)) {
-        if (colo_compare_packet_payload(ppkt, spkt,
+        if (!colo_compare_packet_payload(ppkt, spkt,
                                         ppkt->header_size + ppkt->offset,
                                         spkt->header_size + spkt->offset,
                                         ppkt->payload_size - ppkt->offset)) {
@@ -348,7 +348,7 @@ static bool colo_mark_tcp_pkt(Packet *ppkt, Packet *spkt,
         /* primary packet is longer than secondary packet, compare
          * the same part and mark the primary packet offset
          */
-        if (colo_compare_packet_payload(ppkt, spkt,
+        if (!colo_compare_packet_payload(ppkt, spkt,
                                         ppkt->header_size + ppkt->offset,
                                         spkt->header_size + spkt->offset,
                                         spkt->payload_size - spkt->offset)) {
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.13