|
 |
acda74 |
From c07df2b480134357e6ecb53f61eb1d8295b2b406 Mon Sep 17 00:00:00 2001
|
|
|
acda74 |
Message-Id: <c07df2b480134357e6ecb53f61eb1d8295b2b406@dist-git>
|
|
|
acda74 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
acda74 |
Date: Wed, 15 Feb 2023 10:43:53 +0100
|
|
|
acda74 |
Subject: [PATCH] rpc: client: Don't check return value of virNetMessageNew
|
|
|
acda74 |
MIME-Version: 1.0
|
|
|
acda74 |
Content-Type: text/plain; charset=UTF-8
|
|
|
acda74 |
Content-Transfer-Encoding: 8bit
|
|
|
acda74 |
|
|
|
acda74 |
virNetServerClientDispatchRead checked the return value but it's not
|
|
|
acda74 |
necessary any more as it can't return NULL nowadays.
|
|
|
acda74 |
|
|
|
acda74 |
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
|
acda74 |
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
acda74 |
(cherry picked from commit 761cb8a0876d32445951791030c77afa147c0de1)
|
|
|
acda74 |
https://bugzilla.redhat.com/show_bug.cgi?id=2145188
|
|
|
acda74 |
---
|
|
|
acda74 |
src/rpc/virnetserverclient.c | 11 ++++-------
|
|
|
acda74 |
1 file changed, 4 insertions(+), 7 deletions(-)
|
|
|
acda74 |
|
|
|
acda74 |
diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
|
|
|
acda74 |
index c9a4eb521e..b5c764b1b0 100644
|
|
|
acda74 |
--- a/src/rpc/virnetserverclient.c
|
|
|
acda74 |
+++ b/src/rpc/virnetserverclient.c
|
|
|
acda74 |
@@ -1257,13 +1257,10 @@ static virNetMessage *virNetServerClientDispatchRead(virNetServerClient *client)
|
|
|
acda74 |
|
|
|
acda74 |
/* Possibly need to create another receive buffer */
|
|
|
acda74 |
if (client->nrequests < client->nrequests_max) {
|
|
|
acda74 |
- if (!(client->rx = virNetMessageNew(true))) {
|
|
|
acda74 |
- client->wantClose = true;
|
|
|
acda74 |
- } else {
|
|
|
acda74 |
- client->rx->bufferLength = VIR_NET_MESSAGE_LEN_MAX;
|
|
|
acda74 |
- client->rx->buffer = g_new0(char, client->rx->bufferLength);
|
|
|
acda74 |
- client->nrequests++;
|
|
|
acda74 |
- }
|
|
|
acda74 |
+ client->rx = virNetMessageNew(true);
|
|
|
acda74 |
+ client->rx->bufferLength = VIR_NET_MESSAGE_LEN_MAX;
|
|
|
acda74 |
+ client->rx->buffer = g_new0(char, client->rx->bufferLength);
|
|
|
acda74 |
+ client->nrequests++;
|
|
|
acda74 |
} else if (!client->nrequests_warning) {
|
|
|
acda74 |
client->nrequests_warning = true;
|
|
|
acda74 |
VIR_WARN("Client hit max requests limit %zd. This may result "
|
|
|
acda74 |
--
|
|
|
acda74 |
2.39.1
|
|
|
acda74 |
|