dhcpv6-ia: fix dereference after freeing assignment
authorHans Dedecker <dedeckeh@gmail.com>
Thu, 5 Jan 2017 15:03:35 +0000 (16:03 +0100)
committerHans Dedecker <dedeckeh@gmail.com>
Thu, 5 Jan 2017 16:03:11 +0000 (17:03 +0100)
Fix assignment dereference by dhcpv6_log in case
the assignment is freed when nothing has been
assigned.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
src/dhcpv6-ia.c

index 4e30faa927c56baea7e7a49b67b2f5c2e9f71da6..4c077db8730e3f2c99260d42de47c9166186e3c6 100644 (file)
@@ -1051,7 +1051,7 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
                                        ((is_pd && c->length <= 64) || (is_na && c->length == 128))) {
                                a = c;
 
-                               // Reset state
+                               /* Reset state */
                                apply_lease(iface, a, false);
                                memcpy(a->clid_data, clid_data, clid_len);
                                a->clid_len = clid_len;
@@ -1151,10 +1151,11 @@ ssize_t dhcpv6_handle_ia(uint8_t *buf, size_t buflen, struct interface *iface,
                                a->accept_reconf = accept_reconf;
                                a->flags |= OAF_BOUND;
                                apply_lease(iface, a, true);
-                       } else if (!assigned && a && a->managed_size == 0)
+                       } else if (!assigned && a && a->managed_size == 0) {
                                /* Cleanup failed assignment */
                                free_dhcpv6_assignment(a);
-
+                               a = NULL;
+                       }
                } else if (hdr->msg_type == DHCPV6_MSG_RENEW ||
                                hdr->msg_type == DHCPV6_MSG_RELEASE ||
                                hdr->msg_type == DHCPV6_MSG_REBIND ||