ubusd: fix issue caused by an implicit cast
authorMihai Richard <mihairichard@live.com>
Thu, 19 Jan 2017 12:51:04 +0000 (12:51 +0000)
committerFelix Fietkau <nbd@nbd.name>
Fri, 20 Jan 2017 10:27:00 +0000 (11:27 +0100)
An -1 returned by ubus_msg_writev() will be interpreted as
UINT_MAX during a check to see how much data had could be
written on the socket.

Because sizeof() will return size_t it will promote the
comparsion to unsigned

Signed-off-by: Mihai Richard <mihairichard@live.com>
ubusd.c

diff --git a/ubusd.c b/ubusd.c
index 7279a706f47e44caf92d5433326b5b733bb1b440..5409b7f6ae57335423014d6aae0a7ee7650b3816 100644 (file)
--- a/ubusd.c
+++ b/ubusd.c
@@ -148,12 +148,13 @@ void ubus_msg_send(struct ubus_client *cl, struct ubus_msg_buf *ub, bool free)
 
        if (!cl->tx_queue[cl->txq_cur]) {
                written = ubus_msg_writev(cl->sock.fd, ub, 0);
-               if (written >= ub->len + sizeof(ub->hdr))
-                       goto out;
 
                if (written < 0)
                        written = 0;
 
+               if (written >= ub->len + sizeof(ub->hdr))
+                       goto out;
+
                cl->txq_ofs = written;
 
                /* get an event once we can write to the socket again */