ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui: fix return type for VNC I/O functions to be ssize_t 

Various VNC server I/O functions return 'long' and then
also pass this to a method accepting 'int'. All these
should be ssize_t to match the signature of read/write
APIs and thus avoid potential for integer truncation /
wraparound.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Daniel P. Berrange 2015-08-06 15:35:55 +01:00
parent d321e1e526
commit fdd1ab6ad5
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ui/vnc.c
View File

@ -1268,7 +1268,7 @@ void vnc_disconnect_finish(VncState *vs)
g_free(vs); g_free(vs);
} }
int vnc_client_io_error(VncState *vs, int ret, int last_errno) ssize_t vnc_client_io_error(VncState *vs, ssize_t ret, int last_errno)
{ {
if (ret == 0 || ret == -1) { if (ret == 0 || ret == -1) {
if (ret == -1) { if (ret == -1) {
@ -1284,7 +1284,7 @@ int vnc_client_io_error(VncState *vs, int ret, int last_errno)
} }
} }
VNC_DEBUG("Closing down client sock: ret %d, errno %d\n", VNC_DEBUG("Closing down client sock: ret %zd, errno %d\n",
ret, ret < 0 ? last_errno : 0); ret, ret < 0 ? last_errno : 0);
vnc_disconnect_start(vs); vnc_disconnect_start(vs);
@ -1301,11 +1301,11 @@ void vnc_client_error(VncState *vs)
} }
#ifdef CONFIG_VNC_TLS #ifdef CONFIG_VNC_TLS
static long vnc_client_write_tls(gnutls_session_t *session, static ssize_t vnc_client_write_tls(gnutls_session_t *session,
const uint8_t *data, const uint8_t *data,
size_t datalen) size_t datalen)
{ {
long ret = gnutls_write(*session, data, datalen); ssize_t ret = gnutls_write(*session, data, datalen);
if (ret < 0) { if (ret < 0) {
if (ret == GNUTLS_E_AGAIN) { if (ret == GNUTLS_E_AGAIN) {
errno = EAGAIN; errno = EAGAIN;
@ -1333,9 +1333,9 @@ static long vnc_client_write_tls(gnutls_session_t *session,
* the requested 'datalen' if the socket would block. Returns * the requested 'datalen' if the socket would block. Returns
* -1 on error, and disconnects the client socket. * -1 on error, and disconnects the client socket.
*/ */
long vnc_client_write_buf(VncState *vs, const uint8_t *data, size_t datalen) ssize_t vnc_client_write_buf(VncState *vs, const uint8_t *data, size_t datalen)
{ {
long ret; ssize_t ret;
#ifdef CONFIG_VNC_TLS #ifdef CONFIG_VNC_TLS
if (vs->tls.session) { if (vs->tls.session) {
ret = vnc_client_write_tls(&vs->tls.session, data, datalen); ret = vnc_client_write_tls(&vs->tls.session, data, datalen);
@ -1360,9 +1360,9 @@ long vnc_client_write_buf(VncState *vs, const uint8_t *data, size_t datalen)
* the buffered output data if the socket would block. Returns * the buffered output data if the socket would block. Returns
* -1 on error, and disconnects the client socket. * -1 on error, and disconnects the client socket.
*/ */
static long vnc_client_write_plain(VncState *vs) static ssize_t vnc_client_write_plain(VncState *vs)
{ {
long ret; ssize_t ret;
#ifdef CONFIG_VNC_SASL #ifdef CONFIG_VNC_SASL
VNC_DEBUG("Write Plain: Pending output %p size %zd offset %zd. Wait SSF %d\n", VNC_DEBUG("Write Plain: Pending output %p size %zd offset %zd. Wait SSF %d\n",
@ -1436,10 +1436,10 @@ void vnc_read_when(VncState *vs, VncReadEvent *func, size_t expecting)
} }
#ifdef CONFIG_VNC_TLS #ifdef CONFIG_VNC_TLS
static long vnc_client_read_tls(gnutls_session_t *session, uint8_t *data, static ssize_t vnc_client_read_tls(gnutls_session_t *session, uint8_t *data,
size_t datalen) size_t datalen)
{ {
long ret = gnutls_read(*session, data, datalen); ssize_t ret = gnutls_read(*session, data, datalen);
if (ret < 0) { if (ret < 0) {
if (ret == GNUTLS_E_AGAIN) { if (ret == GNUTLS_E_AGAIN) {
errno = EAGAIN; errno = EAGAIN;
@ -1467,9 +1467,9 @@ static long vnc_client_read_tls(gnutls_session_t *session, uint8_t *data,
* the requested 'datalen' if the socket would block. Returns * the requested 'datalen' if the socket would block. Returns
* -1 on error, and disconnects the client socket. * -1 on error, and disconnects the client socket.
*/ */
long vnc_client_read_buf(VncState *vs, uint8_t *data, size_t datalen) ssize_t vnc_client_read_buf(VncState *vs, uint8_t *data, size_t datalen)
{ {
long ret; ssize_t ret;
#ifdef CONFIG_VNC_TLS #ifdef CONFIG_VNC_TLS
if (vs->tls.session) { if (vs->tls.session) {
ret = vnc_client_read_tls(&vs->tls.session, data, datalen); ret = vnc_client_read_tls(&vs->tls.session, data, datalen);
@ -1492,9 +1492,9 @@ long vnc_client_read_buf(VncState *vs, uint8_t *data, size_t datalen)
* Returns the number of bytes read. Returns -1 on error, and * Returns the number of bytes read. Returns -1 on error, and
* disconnects the client socket. * disconnects the client socket.
*/ */
static long vnc_client_read_plain(VncState *vs) static ssize_t vnc_client_read_plain(VncState *vs)
{ {
int ret; ssize_t ret;
VNC_DEBUG("Read plain %p size %zd offset %zd\n", VNC_DEBUG("Read plain %p size %zd offset %zd\n",
vs->input.buffer, vs->input.capacity, vs->input.offset); vs->input.buffer, vs->input.capacity, vs->input.offset);
buffer_reserve(&vs->input, 4096); buffer_reserve(&vs->input, 4096);
@ -1520,7 +1520,7 @@ static void vnc_jobs_bh(void *opaque)
void vnc_client_read(void *opaque) void vnc_client_read(void *opaque)
{ {
VncState *vs = opaque; VncState *vs = opaque;
long ret; ssize_t ret;
#ifdef CONFIG_VNC_SASL #ifdef CONFIG_VNC_SASL
if (vs->sasl.conn && vs->sasl.runSSF) if (vs->sasl.conn && vs->sasl.runSSF)

6
ui/vnc.h
View File

@ -513,8 +513,8 @@ enum {
void vnc_client_read(void *opaque); void vnc_client_read(void *opaque);
void vnc_client_write(void *opaque); void vnc_client_write(void *opaque);
long vnc_client_read_buf(VncState *vs, uint8_t *data, size_t datalen); ssize_t vnc_client_read_buf(VncState *vs, uint8_t *data, size_t datalen);
long vnc_client_write_buf(VncState *vs, const uint8_t *data, size_t datalen); ssize_t vnc_client_write_buf(VncState *vs, const uint8_t *data, size_t datalen);
/* Protocol I/O functions */ /* Protocol I/O functions */
void vnc_write(VncState *vs, const void *data, size_t len); void vnc_write(VncState *vs, const void *data, size_t len);
@ -533,7 +533,7 @@ uint32_t read_u32(uint8_t *data, size_t offset);
/* Protocol stage functions */ /* Protocol stage functions */
void vnc_client_error(VncState *vs); void vnc_client_error(VncState *vs);
int vnc_client_io_error(VncState *vs, int ret, int last_errno); ssize_t vnc_client_io_error(VncState *vs, ssize_t ret, int last_errno);
void start_client_init(VncState *vs); void start_client_init(VncState *vs);
void start_auth_vnc(VncState *vs); void start_auth_vnc(VncState *vs);