mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-21 05:29:18 +00:00
b9d14ef03b
Right now, the daemon side of RPC events is hard-coded to at most one callback per eventID. But when there are hundreds of domains or networks coupled and multiple conections, then sending every event to every connection that wants an event, even for the connections that only care about events for a particular object, is inefficient. In order to track more than one callback in the server, we need to store callbacks by more than just their eventID. This patch rearranges the daemon side to store network callbacks in a dynamic array, which can eventually be used for multiple callbacks of the same eventID, although actual behavior is unchanged without further patches to the RPC protocol. For ease of review, domain events are saved for a later patch, as they touch more code. While at it, fix a bug where a malicious client could send a negative eventID to cause network event registration to access outside of array bounds (thankfully not a CVE, since domain events were already doing the bounds check, and since network events have not been released). * daemon/libvirtd.h (daemonClientPrivate): Alter the tracking of network events. * daemon/remote.c (daemonClientEventCallback): New struct. (remoteEventCallbackFree): New function. (remoteClientInitHook, remoteRelayNetworkEventLifecycle) (remoteClientFreeFunc) (remoteDispatchConnectNetworkEventRegisterAny): Track network callbacks differently. (remoteDispatchConnectNetworkEventDeregisterAny): Enforce bounds. Signed-off-by: Eric Blake <eblake@redhat.com>
79 lines
2.3 KiB
C
79 lines
2.3 KiB
C
/*
|
|
* libvirtd.h: daemon data structure definitions
|
|
*
|
|
* Copyright (C) 2006-2014 Red Hat, Inc.
|
|
* Copyright (C) 2006 Daniel P. Berrange
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see
|
|
* <http://www.gnu.org/licenses/>.
|
|
*
|
|
* Author: Daniel P. Berrange <berrange@redhat.com>
|
|
*/
|
|
|
|
|
|
#ifndef LIBVIRTD_H__
|
|
# define LIBVIRTD_H__
|
|
|
|
# define VIR_ENUM_SENTINELS
|
|
|
|
# include <rpc/types.h>
|
|
# include <rpc/xdr.h>
|
|
# include "remote_protocol.h"
|
|
# include "lxc_protocol.h"
|
|
# include "qemu_protocol.h"
|
|
# include "virlog.h"
|
|
# include "virthread.h"
|
|
# if WITH_SASL
|
|
# include "virnetsaslcontext.h"
|
|
# endif
|
|
# include "virnetserverprogram.h"
|
|
|
|
typedef struct daemonClientStream daemonClientStream;
|
|
typedef daemonClientStream *daemonClientStreamPtr;
|
|
typedef struct daemonClientPrivate daemonClientPrivate;
|
|
typedef daemonClientPrivate *daemonClientPrivatePtr;
|
|
typedef struct daemonClientEventCallback daemonClientEventCallback;
|
|
typedef daemonClientEventCallback *daemonClientEventCallbackPtr;
|
|
|
|
/* Stores the per-client connection state */
|
|
struct daemonClientPrivate {
|
|
/* Hold while accessing any data except conn */
|
|
virMutex lock;
|
|
|
|
int domainEventCallbackID[VIR_DOMAIN_EVENT_ID_LAST];
|
|
daemonClientEventCallbackPtr *networkEventCallbacks;
|
|
size_t nnetworkEventCallbacks;
|
|
|
|
# if WITH_SASL
|
|
virNetSASLSessionPtr sasl;
|
|
# endif
|
|
|
|
/* This is only valid if a remote open call has been made on this
|
|
* connection, otherwise it will be NULL. Also if remote close is
|
|
* called, it will be set back to NULL if that succeeds.
|
|
*/
|
|
virConnectPtr conn;
|
|
|
|
daemonClientStreamPtr streams;
|
|
bool keepalive_supported;
|
|
};
|
|
|
|
# if WITH_SASL
|
|
extern virNetSASLContextPtr saslCtxt;
|
|
# endif
|
|
extern virNetServerProgramPtr remoteProgram;
|
|
extern virNetServerProgramPtr qemuProgram;
|
|
|
|
#endif
|