RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 04:27:44 +00:00
Code Issues Activity Actions

DHCPClient: Don't crash if DHCP options contain no gateway

Browse source 
Fixes #13879
This commit is contained in:
Patrick Meyer 2022-05-02 00:54:27 +02:00 • committed by Ali Mohammad Pur
parent 7b76bc2b49
commit 5510b98dc8
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Userland/Services/DHCPClient/DHCPv4Client.cpp
View file

@ -67,7 +67,7 @@ static bool send(InterfaceDescriptor const& iface, DHCPv4Packet const& packet, C
return true; return true;
} }
static void set_params(InterfaceDescriptor const& iface, IPv4Address const& ipv4_addr, IPv4Address const& netmask, IPv4Address const& gateway) static void set_params(InterfaceDescriptor const& iface, IPv4Address const& ipv4_addr, IPv4Address const& netmask, Optional<IPv4Address> const& gateway)
{ {
int fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP); int fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
if (fd < 0) { if (fd < 0) {
@ -99,13 +99,16 @@ static void set_params(InterfaceDescriptor const& iface, IPv4Address const& ipv4
dbgln("ERROR: ioctl(SIOCSIFNETMASK) :: {}", strerror(errno)); dbgln("ERROR: ioctl(SIOCSIFNETMASK) :: {}", strerror(errno));
} }
if (!gateway.has_value())
return;
// set the default gateway // set the default gateway
struct rtentry rt; struct rtentry rt;
memset(&rt, 0, sizeof(rt)); memset(&rt, 0, sizeof(rt));
rt.rt_dev = const_cast<char*>(iface.ifname.characters()); rt.rt_dev = const_cast<char*>(iface.ifname.characters());
rt.rt_gateway.sa_family = AF_INET; rt.rt_gateway.sa_family = AF_INET;
((sockaddr_in&)rt.rt_gateway).sin_addr.s_addr = gateway.to_in_addr_t(); ((sockaddr_in&)rt.rt_gateway).sin_addr.s_addr = gateway.value().to_in_addr_t();
rt.rt_flags = RTF_UP | RTF_GATEWAY; rt.rt_flags = RTF_UP | RTF_GATEWAY;
if (ioctl(fd, SIOCADDRT, &rt) < 0) { if (ioctl(fd, SIOCADDRT, &rt) < 0) {
@ -251,7 +254,12 @@ void DHCPv4Client::handle_ack(DHCPv4Packet const& packet, ParsedDHCPv4Options co
dhcp_discover(interface); dhcp_discover(interface);
}, },
this); this);
set_params(transaction->interface, new_ip, options.get<IPv4Address>(DHCPOption::SubnetMask).value(), options.get_many<IPv4Address>(DHCPOption::Router, 1).first());
Optional<IPv4Address> gateway;
if (auto routers = options.get_many<IPv4Address>(DHCPOption::Router, 1); !routers.is_empty())
gateway = routers.first();
set_params(transaction->interface, new_ip, options.get<IPv4Address>(DHCPOption::SubnetMask).value(), gateway);
} }
void DHCPv4Client::handle_nak(DHCPv4Packet const& packet, ParsedDHCPv4Options const& options) void DHCPv4Client::handle_nak(DHCPv4Packet const& packet, ParsedDHCPv4Options const& options)