mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nbd/server: use errp instead of LOG

Browse Source 
Move to modern errp scheme from just LOGging errors.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20170707152918.23086-4-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2017-07-07 18:29:11 +03:00 committed by Eric Blake
parent 76ff081d91
commit 2fd2c8407e
1 changed files with 160 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

260
nbd/server.c
View File

@ -134,7 +134,7 @@ static void nbd_client_receive_next_request(NBDClient *client);
/* Send a reply header, including length, but no payload. /* Send a reply header, including length, but no payload.
* Return -errno on error, 0 on success. */ * Return -errno on error, 0 on success. */
static int nbd_negotiate_send_rep_len(QIOChannel *ioc, uint32_t type, static int nbd_negotiate_send_rep_len(QIOChannel *ioc, uint32_t type,
uint32_t opt, uint32_t len) uint32_t opt, uint32_t len, Error **errp)
{ {
uint64_t magic; uint64_t magic;
@ -142,23 +142,26 @@ static int nbd_negotiate_send_rep_len(QIOChannel *ioc, uint32_t type,
type, opt, len); type, opt, len);
magic = cpu_to_be64(NBD_REP_MAGIC); magic = cpu_to_be64(NBD_REP_MAGIC);
if (nbd_write(ioc, &magic, sizeof(magic), NULL) < 0) { if (nbd_write(ioc, &magic, sizeof(magic), errp) < 0) {
LOG("write failed (rep magic)"); error_prepend(errp, "write failed (rep magic): ");
return -EINVAL; return -EINVAL;
} }
opt = cpu_to_be32(opt); opt = cpu_to_be32(opt);
if (nbd_write(ioc, &opt, sizeof(opt), NULL) < 0) { if (nbd_write(ioc, &opt, sizeof(opt), errp) < 0) {
LOG("write failed (rep opt)"); error_prepend(errp, "write failed (rep opt): ");
return -EINVAL; return -EINVAL;
} }
type = cpu_to_be32(type); type = cpu_to_be32(type);
if (nbd_write(ioc, &type, sizeof(type), NULL) < 0) { if (nbd_write(ioc, &type, sizeof(type), errp) < 0) {
LOG("write failed (rep type)"); error_prepend(errp, "write failed (rep type): ");
return -EINVAL; return -EINVAL;
} }
len = cpu_to_be32(len); len = cpu_to_be32(len);
if (nbd_write(ioc, &len, sizeof(len), NULL) < 0) { if (nbd_write(ioc, &len, sizeof(len), errp) < 0) {
LOG("write failed (rep data length)"); error_prepend(errp, "write failed (rep data length): ");
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
@ -166,16 +169,17 @@ static int nbd_negotiate_send_rep_len(QIOChannel *ioc, uint32_t type,
/* Send a reply header with default 0 length. /* Send a reply header with default 0 length.
* Return -errno on error, 0 on success. */ * Return -errno on error, 0 on success. */
static int nbd_negotiate_send_rep(QIOChannel *ioc, uint32_t type, uint32_t opt) static int nbd_negotiate_send_rep(QIOChannel *ioc, uint32_t type, uint32_t opt,
Error **errp)
{ {
return nbd_negotiate_send_rep_len(ioc, type, opt, 0); return nbd_negotiate_send_rep_len(ioc, type, opt, 0, errp);
} }
/* Send an error reply. /* Send an error reply.
* Return -errno on error, 0 on success. */ * Return -errno on error, 0 on success. */
static int GCC_FMT_ATTR(4, 5) static int GCC_FMT_ATTR(5, 6)
nbd_negotiate_send_rep_err(QIOChannel *ioc, uint32_t type, nbd_negotiate_send_rep_err(QIOChannel *ioc, uint32_t type,
uint32_t opt, const char *fmt, ...) uint32_t opt, Error **errp, const char *fmt, ...)
{ {
va_list va; va_list va;
char *msg; char *msg;
@ -188,16 +192,17 @@ nbd_negotiate_send_rep_err(QIOChannel *ioc, uint32_t type,
len = strlen(msg); len = strlen(msg);
assert(len < 4096); assert(len < 4096);
TRACE("sending error message \"%s\"", msg); TRACE("sending error message \"%s\"", msg);
ret = nbd_negotiate_send_rep_len(ioc, type, opt, len); ret = nbd_negotiate_send_rep_len(ioc, type, opt, len, errp);
if (ret < 0) { if (ret < 0) {
goto out; goto out;
} }
if (nbd_write(ioc, msg, len, NULL) < 0) { if (nbd_write(ioc, msg, len, errp) < 0) {
LOG("write failed (error message)"); error_prepend(errp, "write failed (error message): ");
ret = -EIO; ret = -EIO;
} else { } else {
ret = 0; ret = 0;
} }
out: out:
g_free(msg); g_free(msg);
return ret; return ret;
@ -205,7 +210,8 @@ out:
/* Send a single NBD_REP_SERVER reply to NBD_OPT_LIST, including payload. /* Send a single NBD_REP_SERVER reply to NBD_OPT_LIST, including payload.
* Return -errno on error, 0 on success. */ * Return -errno on error, 0 on success. */
static int nbd_negotiate_send_rep_list(QIOChannel *ioc, NBDExport *exp) static int nbd_negotiate_send_rep_list(QIOChannel *ioc, NBDExport *exp,
Error **errp)
{ {
size_t name_len, desc_len; size_t name_len, desc_len;
uint32_t len; uint32_t len;
@ -217,53 +223,60 @@ static int nbd_negotiate_send_rep_list(QIOChannel *ioc, NBDExport *exp)
name_len = strlen(name); name_len = strlen(name);
desc_len = strlen(desc); desc_len = strlen(desc);
len = name_len + desc_len + sizeof(len); len = name_len + desc_len + sizeof(len);
ret = nbd_negotiate_send_rep_len(ioc, NBD_REP_SERVER, NBD_OPT_LIST, len); ret = nbd_negotiate_send_rep_len(ioc, NBD_REP_SERVER, NBD_OPT_LIST, len,
errp);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
len = cpu_to_be32(name_len); len = cpu_to_be32(name_len);
if (nbd_write(ioc, &len, sizeof(len), NULL) < 0) { if (nbd_write(ioc, &len, sizeof(len), errp) < 0) {
LOG("write failed (name length)"); error_prepend(errp, "write failed (name length): ");
return -EINVAL; return -EINVAL;
} }
if (nbd_write(ioc, name, name_len, NULL) < 0) {
LOG("write failed (name buffer)"); if (nbd_write(ioc, name, name_len, errp) < 0) {
error_prepend(errp, "write failed (name buffer): ");
return -EINVAL; return -EINVAL;
} }
if (nbd_write(ioc, desc, desc_len, NULL) < 0) {
LOG("write failed (description buffer)"); if (nbd_write(ioc, desc, desc_len, errp) < 0) {
error_prepend(errp, "write failed (description buffer): ");
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
} }
/* Process the NBD_OPT_LIST command, with a potential series of replies. /* Process the NBD_OPT_LIST command, with a potential series of replies.
* Return -errno on error, 0 on success. */ * Return -errno on error, 0 on success. */
static int nbd_negotiate_handle_list(NBDClient *client, uint32_t length) static int nbd_negotiate_handle_list(NBDClient *client, uint32_t length,
Error **errp)
{ {
NBDExport *exp; NBDExport *exp;
if (length) { if (length) {
if (nbd_drop(client->ioc, length, NULL) < 0) { if (nbd_drop(client->ioc, length, errp) < 0) {
return -EIO; return -EIO;
} }
return nbd_negotiate_send_rep_err(client->ioc, return nbd_negotiate_send_rep_err(client->ioc,
NBD_REP_ERR_INVALID, NBD_OPT_LIST, NBD_REP_ERR_INVALID, NBD_OPT_LIST,
errp,
"OPT_LIST should not have length"); "OPT_LIST should not have length");
} }
/* For each export, send a NBD_REP_SERVER reply. */ /* For each export, send a NBD_REP_SERVER reply. */
QTAILQ_FOREACH(exp, &exports, next) { QTAILQ_FOREACH(exp, &exports, next) {
if (nbd_negotiate_send_rep_list(client->ioc, exp)) { if (nbd_negotiate_send_rep_list(client->ioc, exp, errp)) {
return -EINVAL; return -EINVAL;
} }
} }
/* Finish with a NBD_REP_ACK. */ /* Finish with a NBD_REP_ACK. */
return nbd_negotiate_send_rep(client->ioc, NBD_REP_ACK, NBD_OPT_LIST); return nbd_negotiate_send_rep(client->ioc, NBD_REP_ACK, NBD_OPT_LIST, errp);
} }
static int nbd_negotiate_handle_export_name(NBDClient *client, uint32_t length) static int nbd_negotiate_handle_export_name(NBDClient *client, uint32_t length,
Error **errp)
{ {
char name[NBD_MAX_NAME_SIZE + 1]; char name[NBD_MAX_NAME_SIZE + 1];
@ -272,11 +285,11 @@ static int nbd_negotiate_handle_export_name(NBDClient *client, uint32_t length)
*/ */
TRACE("Checking length"); TRACE("Checking length");
if (length >= sizeof(name)) { if (length >= sizeof(name)) {
LOG("Bad length received"); error_setg(errp, "Bad length received");
return -EINVAL; return -EINVAL;
} }
if (nbd_read(client->ioc, name, length, NULL) < 0) { if (nbd_read(client->ioc, name, length, errp) < 0) {
LOG("read failed"); error_prepend(errp, "read failed: ");
return -EINVAL; return -EINVAL;
} }
name[length] = '\0'; name[length] = '\0';
@ -285,7 +298,7 @@ static int nbd_negotiate_handle_export_name(NBDClient *client, uint32_t length)
client->exp = nbd_export_find(name); client->exp = nbd_export_find(name);
if (!client->exp) { if (!client->exp) {
LOG("export not found"); error_setg(errp, "export not found");
return -EINVAL; return -EINVAL;
} }
@ -298,7 +311,8 @@ static int nbd_negotiate_handle_export_name(NBDClient *client, uint32_t length)
/* Handle NBD_OPT_STARTTLS. Return NULL to drop connection, or else the /* Handle NBD_OPT_STARTTLS. Return NULL to drop connection, or else the
* new channel for all further (now-encrypted) communication. */ * new channel for all further (now-encrypted) communication. */
static QIOChannel *nbd_negotiate_handle_starttls(NBDClient *client, static QIOChannel *nbd_negotiate_handle_starttls(NBDClient *client,
uint32_t length) uint32_t length,
Error **errp)
{ {
QIOChannel *ioc; QIOChannel *ioc;
QIOChannelTLS *tioc; QIOChannelTLS *tioc;
@ -307,23 +321,24 @@ static QIOChannel *nbd_negotiate_handle_starttls(NBDClient *client,
TRACE("Setting up TLS"); TRACE("Setting up TLS");
ioc = client->ioc; ioc = client->ioc;
if (length) { if (length) {
if (nbd_drop(ioc, length, NULL) < 0) { if (nbd_drop(ioc, length, errp) < 0) {
return NULL; return NULL;
} }
nbd_negotiate_send_rep_err(ioc, NBD_REP_ERR_INVALID, NBD_OPT_STARTTLS, nbd_negotiate_send_rep_err(ioc, NBD_REP_ERR_INVALID, NBD_OPT_STARTTLS,
errp,
"OPT_STARTTLS should not have length"); "OPT_STARTTLS should not have length");
return NULL; return NULL;
} }
if (nbd_negotiate_send_rep(client->ioc, NBD_REP_ACK, if (nbd_negotiate_send_rep(client->ioc, NBD_REP_ACK,
NBD_OPT_STARTTLS) < 0) { NBD_OPT_STARTTLS, errp) < 0) {
return NULL; return NULL;
} }
tioc = qio_channel_tls_new_server(ioc, tioc = qio_channel_tls_new_server(ioc,
client->tlscreds, client->tlscreds,
client->tlsaclname, client->tlsaclname,
NULL); errp);
if (!tioc) { if (!tioc) {
return NULL; return NULL;
} }
@ -342,7 +357,7 @@ static QIOChannel *nbd_negotiate_handle_starttls(NBDClient *client,
g_main_loop_unref(data.loop); g_main_loop_unref(data.loop);
if (data.error) { if (data.error) {
object_unref(OBJECT(tioc)); object_unref(OBJECT(tioc));
error_free(data.error); error_propagate(errp, data.error);
return NULL; return NULL;
} }
@ -352,14 +367,16 @@ static QIOChannel *nbd_negotiate_handle_starttls(NBDClient *client,
/* nbd_negotiate_options /* nbd_negotiate_options
* Process all NBD_OPT_* client option commands. * Process all NBD_OPT_* client option commands.
* Return: * Return:
* -errno on error * -errno on error, errp is set
* 0 on successful negotiation * 0 on successful negotiation, errp is not set
* 1 if client sent NBD_OPT_ABORT, i.e. on valid disconnect * 1 if client sent NBD_OPT_ABORT, i.e. on valid disconnect,
* errp is not set
*/ */
static int nbd_negotiate_options(NBDClient *client) static int nbd_negotiate_options(NBDClient *client, Error **errp)
{ {
uint32_t flags; uint32_t flags;
bool fixedNewstyle = false; bool fixedNewstyle = false;
Error *local_err = NULL;
/* Client sends: /* Client sends:
[ 0 .. 3] client flags [ 0 .. 3] client flags
@ -375,8 +392,8 @@ static int nbd_negotiate_options(NBDClient *client)
... Rest of request ... Rest of request
*/ */
if (nbd_read(client->ioc, &flags, sizeof(flags), NULL) < 0) { if (nbd_read(client->ioc, &flags, sizeof(flags), errp) < 0) {
LOG("read failed"); error_prepend(errp, "read failed: ");
return -EIO; return -EIO;
} }
TRACE("Checking client flags"); TRACE("Checking client flags");
@ -392,7 +409,7 @@ static int nbd_negotiate_options(NBDClient *client)
flags &= ~NBD_FLAG_C_NO_ZEROES; flags &= ~NBD_FLAG_C_NO_ZEROES;
} }
if (flags != 0) { if (flags != 0) {
TRACE("Unknown client flags 0x%" PRIx32 " received", flags); error_setg(errp, "Unknown client flags 0x%" PRIx32 " received", flags);
return -EIO; return -EIO;
} }
@ -401,26 +418,25 @@ static int nbd_negotiate_options(NBDClient *client)
uint32_t clientflags, length; uint32_t clientflags, length;
uint64_t magic; uint64_t magic;
if (nbd_read(client->ioc, &magic, sizeof(magic), NULL) < 0) { if (nbd_read(client->ioc, &magic, sizeof(magic), errp) < 0) {
LOG("read failed"); error_prepend(errp, "read failed: ");
return -EINVAL; return -EINVAL;
} }
TRACE("Checking opts magic"); TRACE("Checking opts magic");
if (magic != be64_to_cpu(NBD_OPTS_MAGIC)) { if (magic != be64_to_cpu(NBD_OPTS_MAGIC)) {
LOG("Bad magic received"); error_setg(errp, "Bad magic received");
return -EINVAL; return -EINVAL;
} }
if (nbd_read(client->ioc, &clientflags, if (nbd_read(client->ioc, &clientflags,
sizeof(clientflags), NULL) < 0) sizeof(clientflags), errp) < 0) {
{ error_prepend(errp, "read failed: ");
LOG("read failed");
return -EINVAL; return -EINVAL;
} }
clientflags = be32_to_cpu(clientflags); clientflags = be32_to_cpu(clientflags);
if (nbd_read(client->ioc, &length, sizeof(length), NULL) < 0) { if (nbd_read(client->ioc, &length, sizeof(length), errp) < 0) {
LOG("read failed"); error_prepend(errp, "read failed: ");
return -EINVAL; return -EINVAL;
} }
length = be32_to_cpu(length); length = be32_to_cpu(length);
@ -430,12 +446,12 @@ static int nbd_negotiate_options(NBDClient *client)
client->ioc == (QIOChannel *)client->sioc) { client->ioc == (QIOChannel *)client->sioc) {
QIOChannel *tioc; QIOChannel *tioc;
if (!fixedNewstyle) { if (!fixedNewstyle) {
TRACE("Unsupported option 0x%" PRIx32, clientflags); error_setg(errp, "Unsupported option 0x%" PRIx32, clientflags);
return -EINVAL; return -EINVAL;
} }
switch (clientflags) { switch (clientflags) {
case NBD_OPT_STARTTLS: case NBD_OPT_STARTTLS:
tioc = nbd_negotiate_handle_starttls(client, length); tioc = nbd_negotiate_handle_starttls(client, length, errp);
if (!tioc) { if (!tioc) {
return -EIO; return -EIO;
} }
@ -445,16 +461,17 @@ static int nbd_negotiate_options(NBDClient *client)
case NBD_OPT_EXPORT_NAME: case NBD_OPT_EXPORT_NAME:
/* No way to return an error to client, so drop connection */ /* No way to return an error to client, so drop connection */
TRACE("Option 0x%x not permitted before TLS", clientflags); error_setg(errp, "Option 0x%x not permitted before TLS",
clientflags);
return -EINVAL; return -EINVAL;
default: default:
if (nbd_drop(client->ioc, length, NULL) < 0) { if (nbd_drop(client->ioc, length, errp) < 0) {
return -EIO; return -EIO;
} }
ret = nbd_negotiate_send_rep_err(client->ioc, ret = nbd_negotiate_send_rep_err(client->ioc,
NBD_REP_ERR_TLS_REQD, NBD_REP_ERR_TLS_REQD,
clientflags, clientflags, errp,
"Option 0x%" PRIx32 "Option 0x%" PRIx32
"not permitted before TLS", "not permitted before TLS",
clientflags); clientflags);
@ -470,7 +487,7 @@ static int nbd_negotiate_options(NBDClient *client)
} else if (fixedNewstyle) { } else if (fixedNewstyle) {
switch (clientflags) { switch (clientflags) {
case NBD_OPT_LIST: case NBD_OPT_LIST:
ret = nbd_negotiate_handle_list(client, length); ret = nbd_negotiate_handle_list(client, length, errp);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
@ -480,25 +497,33 @@ static int nbd_negotiate_options(NBDClient *client)
/* NBD spec says we must try to reply before /* NBD spec says we must try to reply before
* disconnecting, but that we must also tolerate * disconnecting, but that we must also tolerate
* guests that don't wait for our reply. */ * guests that don't wait for our reply. */
nbd_negotiate_send_rep(client->ioc, NBD_REP_ACK, clientflags); nbd_negotiate_send_rep(client->ioc, NBD_REP_ACK, clientflags,
&local_err);
if (local_err != NULL) {
TRACE("Reply to NBD_OPT_ABORT request failed: %s",
error_get_pretty(local_err));
error_free(local_err);
}
return 1; return 1;
case NBD_OPT_EXPORT_NAME: case NBD_OPT_EXPORT_NAME:
return nbd_negotiate_handle_export_name(client, length); return nbd_negotiate_handle_export_name(client, length, errp);
case NBD_OPT_STARTTLS: case NBD_OPT_STARTTLS:
if (nbd_drop(client->ioc, length, NULL) < 0) { if (nbd_drop(client->ioc, length, errp) < 0) {
return -EIO; return -EIO;
} }
if (client->tlscreds) { if (client->tlscreds) {
ret = nbd_negotiate_send_rep_err(client->ioc, ret = nbd_negotiate_send_rep_err(client->ioc,
NBD_REP_ERR_INVALID, NBD_REP_ERR_INVALID,
clientflags, clientflags, errp,
"TLS already enabled"); "TLS already enabled");
} else { } else {
ret = nbd_negotiate_send_rep_err(client->ioc, ret = nbd_negotiate_send_rep_err(client->ioc,
NBD_REP_ERR_POLICY, NBD_REP_ERR_POLICY,
clientflags, clientflags, errp,
"TLS not configured"); "TLS not configured");
} }
if (ret < 0) { if (ret < 0) {
@ -506,12 +531,12 @@ static int nbd_negotiate_options(NBDClient *client)
} }
break; break;
default: default:
if (nbd_drop(client->ioc, length, NULL) < 0) { if (nbd_drop(client->ioc, length, errp) < 0) {
return -EIO; return -EIO;
} }
ret = nbd_negotiate_send_rep_err(client->ioc, ret = nbd_negotiate_send_rep_err(client->ioc,
NBD_REP_ERR_UNSUP, NBD_REP_ERR_UNSUP,
clientflags, clientflags, errp,
"Unsupported option 0x%" "Unsupported option 0x%"
PRIx32, PRIx32,
clientflags); clientflags);
@ -527,10 +552,10 @@ static int nbd_negotiate_options(NBDClient *client)
*/ */
switch (clientflags) { switch (clientflags) {
case NBD_OPT_EXPORT_NAME: case NBD_OPT_EXPORT_NAME:
return nbd_negotiate_handle_export_name(client, length); return nbd_negotiate_handle_export_name(client, length, errp);
default: default:
TRACE("Unsupported option 0x%" PRIx32, clientflags); error_setg(errp, "Unsupported option 0x%" PRIx32, clientflags);
return -EINVAL; return -EINVAL;
} }
} }
@ -539,11 +564,12 @@ static int nbd_negotiate_options(NBDClient *client)
/* nbd_negotiate /* nbd_negotiate
* Return: * Return:
* -errno on error * -errno on error, errp is set
* 0 on successful negotiation * 0 on successful negotiation, errp is not set
* 1 if client sent NBD_OPT_ABORT, i.e. on valid disconnect * 1 if client sent NBD_OPT_ABORT, i.e. on valid disconnect,
* errp is not set
*/ */
static coroutine_fn int nbd_negotiate(NBDClient *client) static coroutine_fn int nbd_negotiate(NBDClient *client, Error **errp)
{ {
char buf[8 + 8 + 8 + 128]; char buf[8 + 8 + 8 + 128];
int ret; int ret;
@ -585,21 +611,23 @@ static coroutine_fn int nbd_negotiate(NBDClient *client)
stq_be_p(buf + 16, client->exp->size); stq_be_p(buf + 16, client->exp->size);
stw_be_p(buf + 26, client->exp->nbdflags | myflags); stw_be_p(buf + 26, client->exp->nbdflags | myflags);
if (nbd_write(client->ioc, buf, sizeof(buf), NULL) < 0) { if (nbd_write(client->ioc, buf, sizeof(buf), errp) < 0) {
LOG("write failed"); error_prepend(errp, "write failed: ");
return -EINVAL; return -EINVAL;
} }
} else { } else {
stq_be_p(buf + 8, NBD_OPTS_MAGIC); stq_be_p(buf + 8, NBD_OPTS_MAGIC);
stw_be_p(buf + 16, NBD_FLAG_FIXED_NEWSTYLE | NBD_FLAG_NO_ZEROES); stw_be_p(buf + 16, NBD_FLAG_FIXED_NEWSTYLE | NBD_FLAG_NO_ZEROES);
if (nbd_write(client->ioc, buf, 18, NULL) < 0) { if (nbd_write(client->ioc, buf, 18, errp) < 0) {
LOG("write failed"); error_prepend(errp, "write failed: ");
return -EINVAL; return -EINVAL;
} }
ret = nbd_negotiate_options(client); ret = nbd_negotiate_options(client, errp);
if (ret != 0) { if (ret != 0) {
LOG("option negotiation failed"); if (ret < 0) {
error_prepend(errp, "option negotiation failed: ");
}
return ret; return ret;
} }
@ -608,9 +636,9 @@ static coroutine_fn int nbd_negotiate(NBDClient *client)
stq_be_p(buf + 18, client->exp->size); stq_be_p(buf + 18, client->exp->size);
stw_be_p(buf + 26, client->exp->nbdflags | myflags); stw_be_p(buf + 26, client->exp->nbdflags | myflags);
len = client->no_zeroes ? 10 : sizeof(buf) - 18; len = client->no_zeroes ? 10 : sizeof(buf) - 18;
ret = nbd_write(client->ioc, buf + 18, len, NULL); ret = nbd_write(client->ioc, buf + 18, len, errp);
if (ret < 0) { if (ret < 0) {
LOG("write failed"); error_prepend(errp, "write failed: ");
return ret; return ret;
} }
} }
@ -620,13 +648,14 @@ static coroutine_fn int nbd_negotiate(NBDClient *client)
return 0; return 0;
} }
static int nbd_receive_request(QIOChannel *ioc, NBDRequest *request) static int nbd_receive_request(QIOChannel *ioc, NBDRequest *request,
Error **errp)
{ {
uint8_t buf[NBD_REQUEST_SIZE]; uint8_t buf[NBD_REQUEST_SIZE];
uint32_t magic; uint32_t magic;
int ret; int ret;
ret = nbd_read(ioc, buf, sizeof(buf), NULL); ret = nbd_read(ioc, buf, sizeof(buf), errp);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
@ -652,7 +681,7 @@ static int nbd_receive_request(QIOChannel *ioc, NBDRequest *request)
magic, request->flags, request->type, request->from, request->len); magic, request->flags, request->type, request->from, request->len);
if (magic != NBD_REQUEST_MAGIC) { if (magic != NBD_REQUEST_MAGIC) {
LOG("invalid magic (got 0x%" PRIx32 ")", magic); error_setg(errp, "invalid magic (got 0x%" PRIx32 ")", magic);
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
@ -998,13 +1027,14 @@ static int nbd_co_send_reply(NBDRequestData *req, NBDReply *reply, int len)
* the client (although the caller may still need to disconnect after reporting * the client (although the caller may still need to disconnect after reporting
* the error). * the error).
*/ */
static int nbd_co_receive_request(NBDRequestData *req, NBDRequest *request) static int nbd_co_receive_request(NBDRequestData *req, NBDRequest *request,
Error **errp)
{ {
NBDClient *client = req->client; NBDClient *client = req->client;
g_assert(qemu_in_coroutine()); g_assert(qemu_in_coroutine());
assert(client->recv_coroutine == qemu_coroutine_self()); assert(client->recv_coroutine == qemu_coroutine_self());
if (nbd_receive_request(client->ioc, request) < 0) { if (nbd_receive_request(client->ioc, request, errp) < 0) {
return -EIO; return -EIO;
} }
@ -1026,27 +1056,29 @@ static int nbd_co_receive_request(NBDRequestData *req, NBDRequest *request)
* checks as possible until after reading any NBD_CMD_WRITE * checks as possible until after reading any NBD_CMD_WRITE
* payload, so we can try and keep the connection alive. */ * payload, so we can try and keep the connection alive. */
if ((request->from + request->len) < request->from) { if ((request->from + request->len) < request->from) {
LOG("integer overflow detected, you're probably being attacked"); error_setg(errp,
"integer overflow detected, you're probably being attacked");
return -EINVAL; return -EINVAL;
} }
if (request->type == NBD_CMD_READ || request->type == NBD_CMD_WRITE) { if (request->type == NBD_CMD_READ || request->type == NBD_CMD_WRITE) {
if (request->len > NBD_MAX_BUFFER_SIZE) { if (request->len > NBD_MAX_BUFFER_SIZE) {
LOG("len (%" PRIu32" ) is larger than max len (%u)", error_setg(errp, "len (%" PRIu32" ) is larger than max len (%u)",
request->len, NBD_MAX_BUFFER_SIZE); request->len, NBD_MAX_BUFFER_SIZE);
return -EINVAL; return -EINVAL;
} }
req->data = blk_try_blockalign(client->exp->blk, request->len); req->data = blk_try_blockalign(client->exp->blk, request->len);
if (req->data == NULL) { if (req->data == NULL) {
error_setg(errp, "No memory");
return -ENOMEM; return -ENOMEM;
} }
} }
if (request->type == NBD_CMD_WRITE) { if (request->type == NBD_CMD_WRITE) {
TRACE("Reading %" PRIu32 " byte(s)", request->len); TRACE("Reading %" PRIu32 " byte(s)", request->len);
if (nbd_read(client->ioc, req->data, request->len, NULL) < 0) { if (nbd_read(client->ioc, req->data, request->len, errp) < 0) {
LOG("reading from socket failed"); error_prepend(errp, "reading from socket failed: ");
return -EIO; return -EIO;
} }
req->complete = true; req->complete = true;
@ -1054,18 +1086,18 @@ static int nbd_co_receive_request(NBDRequestData *req, NBDRequest *request)
/* Sanity checks, part 2. */ /* Sanity checks, part 2. */
if (request->from + request->len > client->exp->size) { if (request->from + request->len > client->exp->size) {
LOG("operation past EOF; From: %" PRIu64 ", Len: %" PRIu32 error_setg(errp, "operation past EOF; From: %" PRIu64 ", Len: %" PRIu32
", Size: %" PRIu64, request->from, request->len, ", Size: %" PRIu64, request->from, request->len,
(uint64_t)client->exp->size); (uint64_t)client->exp->size);
return request->type == NBD_CMD_WRITE ? -ENOSPC : -EINVAL; return request->type == NBD_CMD_WRITE ? -ENOSPC : -EINVAL;
} }
if (request->flags & ~(NBD_CMD_FLAG_FUA | NBD_CMD_FLAG_NO_HOLE)) { if (request->flags & ~(NBD_CMD_FLAG_FUA | NBD_CMD_FLAG_NO_HOLE)) {
LOG("unsupported flags (got 0x%x)", request->flags); error_setg(errp, "unsupported flags (got 0x%x)", request->flags);
return -EINVAL; return -EINVAL;
} }
if (request->type != NBD_CMD_WRITE_ZEROES && if (request->type != NBD_CMD_WRITE_ZEROES &&
(request->flags & NBD_CMD_FLAG_NO_HOLE)) { (request->flags & NBD_CMD_FLAG_NO_HOLE)) {
LOG("unexpected flags (got 0x%x)", request->flags); error_setg(errp, "unexpected flags (got 0x%x)", request->flags);
return -EINVAL; return -EINVAL;
} }
@ -1083,6 +1115,7 @@ static coroutine_fn void nbd_trip(void *opaque)
int ret; int ret;
int flags; int flags;
int reply_data_len = 0; int reply_data_len = 0;
Error *local_err = NULL;
TRACE("Reading request."); TRACE("Reading request.");
if (client->closing) { if (client->closing) {
@ -1091,7 +1124,7 @@ static coroutine_fn void nbd_trip(void *opaque)
} }
req = nbd_request_get(client); req = nbd_request_get(client);
ret = nbd_co_receive_request(req, &request); ret = nbd_co_receive_request(req, &request, &local_err);
client->recv_coroutine = NULL; client->recv_coroutine = NULL;
nbd_client_receive_next_request(client); nbd_client_receive_next_request(client);
if (ret == -EIO) { if (ret == -EIO) {
@ -1122,7 +1155,7 @@ static coroutine_fn void nbd_trip(void *opaque)
if (request.flags & NBD_CMD_FLAG_FUA) { if (request.flags & NBD_CMD_FLAG_FUA) {
ret = blk_co_flush(exp->blk); ret = blk_co_flush(exp->blk);
if (ret < 0) { if (ret < 0) {
LOG("flush failed"); error_setg_errno(&local_err, -ret, "flush failed");
reply.error = -ret; reply.error = -ret;
break; break;
} }
@ -1131,7 +1164,7 @@ static coroutine_fn void nbd_trip(void *opaque)
ret = blk_pread(exp->blk, request.from + exp->dev_offset, ret = blk_pread(exp->blk, request.from + exp->dev_offset,
req->data, request.len); req->data, request.len);
if (ret < 0) { if (ret < 0) {
LOG("reading from file failed"); error_setg_errno(&local_err, -ret, "reading from file failed");
reply.error = -ret; reply.error = -ret;
break; break;
} }
@ -1158,7 +1191,7 @@ static coroutine_fn void nbd_trip(void *opaque)
ret = blk_pwrite(exp->blk, request.from + exp->dev_offset, ret = blk_pwrite(exp->blk, request.from + exp->dev_offset,
req->data, request.len, flags); req->data, request.len, flags);
if (ret < 0) { if (ret < 0) {
LOG("writing to file failed"); error_setg_errno(&local_err, -ret, "writing to file failed");
reply.error = -ret; reply.error = -ret;
} }
@ -1167,7 +1200,7 @@ static coroutine_fn void nbd_trip(void *opaque)
TRACE("Request type is WRITE_ZEROES"); TRACE("Request type is WRITE_ZEROES");
if (exp->nbdflags & NBD_FLAG_READ_ONLY) { if (exp->nbdflags & NBD_FLAG_READ_ONLY) {
TRACE("Server is read-only, return error"); error_setg(&local_err, "Server is read-only, return error");
reply.error = EROFS; reply.error = EROFS;
break; break;
} }
@ -1184,7 +1217,7 @@ static coroutine_fn void nbd_trip(void *opaque)
ret = blk_pwrite_zeroes(exp->blk, request.from + exp->dev_offset, ret = blk_pwrite_zeroes(exp->blk, request.from + exp->dev_offset,
request.len, flags); request.len, flags);
if (ret < 0) { if (ret < 0) {
LOG("writing to file failed"); error_setg_errno(&local_err, -ret, "writing to file failed");
reply.error = -ret; reply.error = -ret;
} }
@ -1198,7 +1231,7 @@ static coroutine_fn void nbd_trip(void *opaque)
ret = blk_co_flush(exp->blk); ret = blk_co_flush(exp->blk);
if (ret < 0) { if (ret < 0) {
LOG("flush failed"); error_setg_errno(&local_err, -ret, "flush failed");
reply.error = -ret; reply.error = -ret;
} }
@ -1208,21 +1241,35 @@ static coroutine_fn void nbd_trip(void *opaque)
ret = blk_co_pdiscard(exp->blk, request.from + exp->dev_offset, ret = blk_co_pdiscard(exp->blk, request.from + exp->dev_offset,
request.len); request.len);
if (ret < 0) { if (ret < 0) {
LOG("discard failed"); error_setg_errno(&local_err, -ret, "discard failed");
reply.error = -ret; reply.error = -ret;
} }
break; break;
default: default:
LOG("invalid request type (%" PRIu32 ") received", request.type); error_setg(&local_err, "invalid request type (%" PRIu32 ") received",
request.type);
reply.error = EINVAL; reply.error = EINVAL;
} }
reply: reply:
if (local_err) {
/* If we are here local_err is not fatal error, already stored in
* reply.error */
error_report_err(local_err);
local_err = NULL;
}
if (nbd_co_send_reply(req, &reply, reply_data_len) < 0) {
error_setg(&local_err, "Failed to send reply");
goto disconnect;
}
/* We must disconnect after NBD_CMD_WRITE if we did not /* We must disconnect after NBD_CMD_WRITE if we did not
* read the payload. * read the payload.
*/ */
if (nbd_co_send_reply(req, &reply, reply_data_len) < 0 || !req->complete) { if (!req->complete) {
error_setg(&local_err, "Request handling failed in intermediate state");
goto disconnect; goto disconnect;
} }
@ -1234,6 +1281,9 @@ done:
return; return;
disconnect: disconnect:
if (local_err) {
error_reportf_err(local_err, "Disconnect client, due to: ");
}
nbd_request_put(req); nbd_request_put(req);
client_close(client, true); client_close(client, true);
nbd_client_put(client); nbd_client_put(client);
@ -1252,6 +1302,7 @@ static coroutine_fn void nbd_co_client_start(void *opaque)
{ {
NBDClient *client = opaque; NBDClient *client = opaque;
NBDExport *exp = client->exp; NBDExport *exp = client->exp;
Error *local_err = NULL;
if (exp) { if (exp) {
nbd_export_get(exp); nbd_export_get(exp);
@ -1259,7 +1310,10 @@ static coroutine_fn void nbd_co_client_start(void *opaque)
} }
qemu_co_mutex_init(&client->send_lock); qemu_co_mutex_init(&client->send_lock);
if (nbd_negotiate(client)) { if (nbd_negotiate(client, &local_err)) {
if (local_err) {
error_report_err(local_err);
}
client_close(client, false); client_close(client, false);
return; return;
} }