diff options
| author | Eric Blake <eblake@redhat.com> | 2024-08-07 08:50:01 -0500 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2024-08-08 15:05:27 -0500 |
| commit | fb1c2aaa981e0a2fa6362c9985f1296b74f055ac (patch) | |
| tree | da60096e2d0e330152aab5b495e1c9ea78933aff /blockdev-nbd.c | |
| parent | c719573d71afd38e3ac774e5a331fbaa0fc9f3da (diff) | |
| download | focaccia-qemu-fb1c2aaa981e0a2fa6362c9985f1296b74f055ac.tar.gz focaccia-qemu-fb1c2aaa981e0a2fa6362c9985f1296b74f055ac.zip | |
nbd/server: Plumb in new args to nbd_client_add()
Upcoming patches to fix a CVE need to track an opaque pointer passed in by the owner of a client object, as well as request for a time limit on how fast negotiation must complete. Prepare for that by changing the signature of nbd_client_new() and adding an accessor to get at the opaque pointer, although for now the two servers (qemu-nbd.c and blockdev-nbd.c) do not change behavior even though they pass in a new default timeout value. Suggested-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru> Signed-off-by: Eric Blake <eblake@redhat.com> Message-ID: <20240807174943.771624-11-eblake@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> [eblake: s/LIMIT/MAX_SECS/ as suggested by Dan] Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'blockdev-nbd.c')
| -rw-r--r-- | blockdev-nbd.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/blockdev-nbd.c b/blockdev-nbd.c index 213012435f..267a1de903 100644 --- a/blockdev-nbd.c +++ b/blockdev-nbd.c @@ -64,8 +64,10 @@ static void nbd_accept(QIONetListener *listener, QIOChannelSocket *cioc, nbd_update_server_watch(nbd_server); qio_channel_set_name(QIO_CHANNEL(cioc), "nbd-server"); - nbd_client_new(cioc, nbd_server->tlscreds, nbd_server->tlsauthz, - nbd_blockdev_client_closed); + /* TODO - expose handshake timeout as QMP option */ + nbd_client_new(cioc, NBD_DEFAULT_HANDSHAKE_MAX_SECS, + nbd_server->tlscreds, nbd_server->tlsauthz, + nbd_blockdev_client_closed, NULL); } static void nbd_update_server_watch(NBDServerData *s) |