[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/15] qemu-nbd: introduce nbd_do_receive_request
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 07/15] qemu-nbd: introduce nbd_do_receive_request |
Date: |
Mon, 10 Oct 2011 11:37:49 +0200 |
Group the receiving of a response and the associated data into a new function.
Signed-off-by: Paolo Bonzini <address@hidden>
---
nbd.c | 68 ++++++++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 47 insertions(+), 21 deletions(-)
diff --git a/nbd.c b/nbd.c
index ec84071..898206f 100644
--- a/nbd.c
+++ b/nbd.c
@@ -613,6 +613,47 @@ static int nbd_do_send_reply(int csock, struct nbd_reply
*reply,
return rc;
}
+static int nbd_do_receive_request(int csock, struct nbd_request *request,
+ uint8_t *data)
+{
+ int rc;
+
+ if (nbd_receive_request(csock, request) == -1) {
+ rc = -EIO;
+ goto out;
+ }
+
+ if (request->len > NBD_BUFFER_SIZE) {
+ LOG("len (%u) is larger than max len (%u)",
+ request->len, NBD_BUFFER_SIZE);
+ rc = -EINVAL;
+ goto out;
+ }
+
+ if ((request->from + request->len) < request->from) {
+ LOG("integer overflow detected! "
+ "you're probably being attacked");
+ rc = -EINVAL;
+ goto out;
+ }
+
+ TRACE("Decoding type");
+
+ if ((request->type & NBD_CMD_MASK_COMMAND) == NBD_CMD_WRITE) {
+ TRACE("Reading %u byte(s)", request->len);
+
+ if (read_sync(csock, data, request->len) != request->len) {
+ LOG("reading from socket failed");
+ rc = -EIO;
+ goto out;
+ }
+ }
+ rc = 0;
+
+out:
+ return rc;
+}
+
int nbd_trip(BlockDriverState *bs, int csock, off_t size,
uint64_t dev_offset, uint32_t nbdflags,
uint8_t *data)
@@ -623,22 +664,17 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size,
TRACE("Reading request.");
- if (nbd_receive_request(csock, &request) == -1)
+ ret = nbd_do_receive_request(csock, &request, data);
+ if (ret == -EIO) {
return -1;
+ }
reply.handle = request.handle;
reply.error = 0;
- if (request.len > NBD_BUFFER_SIZE) {
- LOG("len (%u) is larger than max len (%u)",
- request.len, NBD_BUFFER_SIZE);
- goto invalid_request;
- }
-
- if ((request.from + request.len) < request.from) {
- LOG("integer overflow detected! "
- "you're probably being attacked");
- goto invalid_request;
+ if (ret < 0) {
+ reply.error = -ret;
+ goto error_reply;
}
if ((request.from + request.len) > size) {
@@ -649,8 +685,6 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size,
goto invalid_request;
}
- TRACE("Decoding type");
-
switch (request.type & NBD_CMD_MASK_COMMAND) {
case NBD_CMD_READ:
TRACE("Request type is READ");
@@ -670,14 +704,6 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size,
case NBD_CMD_WRITE:
TRACE("Request type is WRITE");
- TRACE("Reading %u byte(s)", request.len);
-
- if (read_sync(csock, data, request.len) != request.len) {
- LOG("reading from socket failed");
- errno = EINVAL;
- return -1;
- }
-
if (nbdflags & NBD_FLAG_READ_ONLY) {
TRACE("Server is read-only, return error");
reply.error = EROFS;
--
1.7.6
- [Qemu-devel] [PATCH 00/15] NBD server improvements, Paolo Bonzini, 2011/10/10
- [Qemu-devel] [PATCH 01/15] qemu-nbd: remove offset argument to nbd_trip, Paolo Bonzini, 2011/10/10
- [Qemu-devel] [PATCH 02/15] qemu-nbd: remove data_size argument to nbd_trip, Paolo Bonzini, 2011/10/10
- [Qemu-devel] [PATCH 03/15] move corking functions to osdep.c, Paolo Bonzini, 2011/10/10
- [Qemu-devel] [PATCH 04/15] qemu-nbd: simplify nbd_trip, Paolo Bonzini, 2011/10/10
- [Qemu-devel] [PATCH 06/15] qemu-nbd: more robust handling of invalid requests, Paolo Bonzini, 2011/10/10
- [Qemu-devel] [PATCH 11/15] qemu-nbd: use common main loop, Paolo Bonzini, 2011/10/10
- [Qemu-devel] [PATCH 07/15] qemu-nbd: introduce nbd_do_receive_request,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 14/15] qemu-nbd: asynchronous operation, Paolo Bonzini, 2011/10/10
- [Qemu-devel] [PATCH 08/15] qemu-nbd: introduce NBDExport, Paolo Bonzini, 2011/10/10
- [Qemu-devel] [PATCH 05/15] qemu-nbd: introduce nbd_do_send_reply, Paolo Bonzini, 2011/10/10
- [Qemu-devel] [PATCH 12/15] qemu-nbd: move client handling to nbd.c, Paolo Bonzini, 2011/10/10
- [Qemu-devel] [PATCH 10/15] link the main loop and its dependencies into the tools, Paolo Bonzini, 2011/10/10
- [Qemu-devel] [PATCH 13/15] qemu-nbd: add client pointer to NBDRequest, Paolo Bonzini, 2011/10/10
- [Qemu-devel] [PATCH 09/15] qemu-nbd: introduce NBDRequest, Paolo Bonzini, 2011/10/10
- [Qemu-devel] [PATCH 15/15] qemu-nbd: throttle requests, Paolo Bonzini, 2011/10/10
- Re: [Qemu-devel] [PATCH 00/15] NBD server improvements, Paolo Bonzini, 2011/10/11