From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: vsementsov@virtuozzo.com, qemu-devel@nongnu.org
Subject: [PATCH] nbd/server: improve nbd_negotiate_send_rep_list
Date: Thu, 26 Dec 2019 11:15:21 +0300 [thread overview]
Message-ID: <20191226081521.29652-1-vsementsov@virtuozzo.com> (raw)
Don't try to write zero-lenght strings.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
nbd/server.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/nbd/server.c b/nbd/server.c
index 24ebc1a805..28a915f5a2 100644
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -392,14 +392,18 @@ static int nbd_negotiate_send_rep_list(NBDClient *client, NBDExport *exp,
return -EINVAL;
}
- if (nbd_write(ioc, name, name_len, errp) < 0) {
- error_prepend(errp, "write failed (name buffer): ");
- return -EINVAL;
+ if (name_len > 0) {
+ if (nbd_write(ioc, name, name_len, errp) < 0) {
+ error_prepend(errp, "write failed (name buffer): ");
+ return -EINVAL;
+ }
}
- if (nbd_write(ioc, desc, desc_len, errp) < 0) {
- error_prepend(errp, "write failed (description buffer): ");
- return -EINVAL;
+ if (desc_len > 0) {
+ if (nbd_write(ioc, desc, desc_len, errp) < 0) {
+ error_prepend(errp, "write failed (description buffer): ");
+ return -EINVAL;
+ }
}
return 0;
--
2.21.0
next reply other threads:[~2019-12-26 8:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-26 8:15 Vladimir Sementsov-Ogievskiy [this message]
2020-01-07 22:01 ` [PATCH] nbd/server: improve nbd_negotiate_send_rep_list Eric Blake
2020-01-09 11:28 ` Vladimir Sementsov-Ogievskiy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191226081521.29652-1-vsementsov@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.