d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rte_virtio: use size_t/ssize_t in vhost_user_read

Browse Source 
Use the correct size types (rather than int) for values passed to and
returned from recv().

Change-Id: I2d38eed63e2d9c9f056d1053e156088fd361c88b
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/383645
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
This commit is contained in:
Daniel Verkamp 2017-10-24 12:21:02 -07:00
parent e6d053e78a
commit 22077b210b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/bdev/virtio/rte_virtio/virtio_user/vhost_user.c
View File

@ -113,11 +113,12 @@ static int
vhost_user_read(int fd, struct vhost_user_msg *msg)
{
uint32_t valid_flags = VHOST_USER_REPLY_MASK | VHOST_USER_VERSION;
int ret, sz_hdr = VHOST_USER_HDR_SIZE, sz_payload;
ssize_t ret;
size_t sz_hdr = VHOST_USER_HDR_SIZE, sz_payload;
ret = recv(fd, (void *)msg, sz_hdr, 0);
if (ret < sz_hdr) {
SPDK_WARNLOG("Failed to recv msg hdr: %d instead of %d.\n",
if ((size_t)ret != sz_hdr) {
SPDK_WARNLOG("Failed to recv msg hdr: %zd instead of %zu.\n",
ret, sz_hdr);
goto fail;
}
@ -132,8 +133,8 @@ vhost_user_read(int fd, struct vhost_user_msg *msg)
sz_payload = msg->size;
if (sz_payload) {
ret = recv(fd, (void *)((char *)msg + sz_hdr), sz_payload, 0);
if (ret < sz_payload) {
SPDK_WARNLOG("Failed to recv msg payload: %d instead of %"PRIu32".\n",
if ((size_t)ret != sz_payload) {
SPDK_WARNLOG("Failed to recv msg payload: %zd instead of %"PRIu32".\n",
ret, msg->size);
goto fail;
}