36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
|
From f6ad72a5b215bc5b2d8df86cd537bf1c0f468108 Mon Sep 17 00:00:00 2001
|
||
|
|
From: zhangchujun <zhangchujun@cmss.chinamobile.com>
|
||
|
|
Date: Wed, 30 Oct 2024 13:33:58 +0800
|
||
|
|
Subject: [PATCH] Fix calculation of minimum in colo_compare_tcp
|
||
|
|
|
||
|
|
GitHub's CodeQL reports a critical error which is fixed by using the MIN macro:
|
||
|
|
|
||
|
|
Unsigned difference expression compared to zero
|
||
|
|
|
||
|
|
Signed-off-by: Stefan Weil <sw@weilnetz.de>
|
||
|
|
Cc: qemu-stable@nongnu.org
|
||
|
|
Reviewed-by: Zhang Chen <chen.zhang@intel.com>
|
||
|
|
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
||
|
|
Signed-off-by: zhangchujun <zhangchujun_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
net/colo-compare.c | 3 +--
|
||
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/net/colo-compare.c b/net/colo-compare.c
|
||
|
|
index 7f9e6f89ce..d4e51cb306 100644
|
||
|
|
--- a/net/colo-compare.c
|
||
|
|
+++ b/net/colo-compare.c
|
||
|
|
@@ -413,8 +413,7 @@ static void colo_compare_tcp(CompareState *s, Connection *conn)
|
||
|
|
* can ensure that the packet's payload is acknowledged by
|
||
|
|
* primary and secondary.
|
||
|
|
*/
|
||
|
|
- uint32_t min_ack = conn->pack - conn->sack > 0 ?
|
||
|
|
- conn->sack : conn->pack;
|
||
|
|
+ uint32_t min_ack = MIN(conn->pack, conn->sack);
|
||
|
|
|
||
|
|
pri:
|
||
|
|
if (g_queue_is_empty(&conn->primary_list)) {
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|