585be3cc09
- util: keep track of full GSource object not source ID number - rpc: mark source returned by virEventGLibAddSocketWatch as unused - rpc: ensure temporary GSource is removed from client event loop (CVE-2024-4418)
58 lines
1.8 KiB
Diff
58 lines
1.8 KiB
Diff
From 5ab53ff977e17d20b0bf01010f2c3168781a659e Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
|
Date: Fri, 3 Sep 2021 16:36:54 +0200
|
|
Subject: [PATCH 2/3] rpc: mark source returned by virEventGLibAddSocketWatch
|
|
as unused
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Two users of virEventGLibAddSocketWatch care about the GSource
|
|
it returns.
|
|
|
|
The other three free it by assigning it to an autofreed variable.
|
|
|
|
Mark them with G_GNUC_UNUSED to make this obvious to the reader
|
|
and the compiler.
|
|
|
|
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
|
---
|
|
src/rpc/virnetclient.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
|
|
index 0a413f0153..f4bb537d50 100644
|
|
--- a/src/rpc/virnetclient.c
|
|
+++ b/src/rpc/virnetclient.c
|
|
@@ -826,7 +826,7 @@ virNetClientIOEventTLS(int fd,
|
|
static gboolean
|
|
virNetClientTLSHandshake(virNetClientPtr client)
|
|
{
|
|
- g_autoptr(GSource) source = NULL;
|
|
+ g_autoptr(GSource) G_GNUC_UNUSED source = NULL;
|
|
GIOCondition ev;
|
|
int ret;
|
|
|
|
@@ -883,7 +883,7 @@ int virNetClientSetTLSSession(virNetClientPtr client,
|
|
int ret;
|
|
char buf[1];
|
|
int len;
|
|
- g_autoptr(GSource) source = NULL;
|
|
+ g_autoptr(GSource) G_GNUC_UNUSED source = NULL;
|
|
|
|
#ifndef WIN32
|
|
sigset_t oldmask, blockedsigs;
|
|
@@ -1619,7 +1619,7 @@ static int virNetClientIOEventLoop(virNetClientPtr client,
|
|
#endif /* !WIN32 */
|
|
int timeout = -1;
|
|
virNetMessagePtr msg = NULL;
|
|
- g_autoptr(GSource) source = NULL;
|
|
+ g_autoptr(GSource) G_GNUC_UNUSED source = NULL;
|
|
GIOCondition ev = 0;
|
|
struct virNetClientIOEventData data = {
|
|
.client = client,
|
|
--
|
|
2.33.0
|
|
|