Commit fd1e194f authored by Tomek Mrugalski's avatar Tomek Mrugalski 🛰
Browse files

Relay no longer crashes, when DHCP packet is received over interface without

any IPv4 address assigned. [ISC-Bugs #22409]
parent 29dce0da
......@@ -141,6 +141,9 @@ work on other platforms. Please report any problems and suggested fixes to
[ISC-Bugs #19615] update the includes in dhcpctl/dhcpctl.3 to be more correct
[ISC-Bugs #20676] update dhcpd.conf.5 to include the RFC numbers for DDNS
- Relay no longer crashes, when DHCP packet is received over interface without
any IPv4 address assigned. [ISC-Bugs #22409]
Changes since 4.1-ESV-R1
! In dhclient check the data for some string options for
......
......@@ -597,6 +597,12 @@ do_relay4(struct interface_info *ip, struct dhcp_packet *packet,
return;
}
if (ip->address_count < 1 || ip->addresses == NULL) {
log_info("Discarding packet received on %s interface that "
"has no IPv4 address assigned.", ip->name);
return;
}
/* Find the interface that corresponds to the giaddr
in the packet. */
if (packet->giaddr.s_addr) {
......@@ -1296,7 +1302,7 @@ setup_streams(void) {
break;
}
if (i == dp->ifp->v6address_count)
log_fatal("Can't find link address for interface '%s'.",
log_fatal("Interface %s does not have global IPv6 address assigned.",
dp->ifp->name);
if (!link_is_set)
memcpy(&dp->link.sin6_addr,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment