It looks like nobody has sent a pull request for this fix up to now. Is
it trivial enough for qemu-trivial? And maybe qemu-stable could also
apply it to older versions.
Stefan W.
Am 10.09.24 um 04:38 schrieb Zhang, Chen:
-----Original Message-----
From: Stefan Weil<s...@weilnetz.de>
Sent: Tuesday, September 10, 2024 4:43 AM
To: Zhang, Chen<chen.zh...@intel.com>; Li Zhijian<lizhij...@fujitsu.com>;
Jason Wang<jasow...@redhat.com>
Cc:qemu-devel@nongnu.org; Stefan Weil<s...@weilnetz.de>
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<s...@weilnetz.de>
Looks good to me.
Reviewed-by: Zhang Chen<chen.zh...@intel.com>
Thanks
Chen
---
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
c4ad0ab71f..39f90c4065 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -412,8 +412,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.39.3 (Apple Git-146)
