ubus: fix invalid ipv6-prefix json

[project/odhcpd.git] / src / dhcpv4.c

diff --git a/src/dhcpv4.c b/src/dhcpv4.c
index 2b30307..3002c1e 100644 (file)
--- a/src/dhcpv4.c
+++ b/src/dhcpv4.c
@@ -113,7 +113,7 @@ int dhcpv4_setup_interface(struct interface *iface, bool enable)
                }
 
                if (setsockopt(iface->dhcpv4_event.uloop.fd, IPPROTO_IP, IP_PKTINFO,
-                                       &val, sizeof(val))) {
+                                       &val, sizeof(val)) < 0) {
                        syslog(LOG_ERR, "setsockopt(IP_PKTINFO): %m");
                        ret = -1;
                        goto out;
@@ -121,7 +121,7 @@ int dhcpv4_setup_interface(struct interface *iface, bool enable)
 
                val = IPTOS_PREC_INTERNETCONTROL;
                if (setsockopt(iface->dhcpv4_event.uloop.fd, IPPROTO_IP, IP_TOS,
-                                       &val, sizeof(val))) {
+                                       &val, sizeof(val)) < 0) {
                        syslog(LOG_ERR, "setsockopt(IP_TOS): %m");
                        ret = -1;
                        goto out;
@@ -129,20 +129,21 @@ int dhcpv4_setup_interface(struct interface *iface, bool enable)
 
                val = IP_PMTUDISC_DONT;
                if (setsockopt(iface->dhcpv4_event.uloop.fd, IPPROTO_IP, IP_MTU_DISCOVER,
-                                       &val, sizeof(val))) {
+                                       &val, sizeof(val)) < 0) {
                        syslog(LOG_ERR, "setsockopt(IP_MTU_DISCOVER): %m");
                        ret = -1;
                        goto out;
                }
 
                if (setsockopt(iface->dhcpv4_event.uloop.fd, SOL_SOCKET, SO_BINDTODEVICE,
-                                       iface->ifname, strlen(iface->ifname))) {
+                                       iface->ifname, strlen(iface->ifname)) < 0) {
                        syslog(LOG_ERR, "setsockopt(SO_BINDTODEVICE): %m");
                        ret = -1;
                        goto out;
                }
 
-               if (bind(iface->dhcpv4_event.uloop.fd, (struct sockaddr*)&bind_addr, sizeof(bind_addr))) {
+               if (bind(iface->dhcpv4_event.uloop.fd, (struct sockaddr*)&bind_addr,
+                                       sizeof(bind_addr)) < 0) {
                        syslog(LOG_ERR, "bind(): %m");
                        ret = -1;
                        goto out;
@@ -493,7 +494,9 @@ static void dhcpv4_put(struct dhcpv4_message *msg, uint8_t **cookie,
                uint8_t type, uint8_t len, const void *data)
 {
        uint8_t *c = *cookie;
-       if (*cookie + 2 + len > (uint8_t*)&msg[1])
+       uint8_t *end = (uint8_t *)msg + sizeof(*msg);
+
+       if (*cookie + 2 + len > end)
                return;
 
        *c++ = type;