OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

slirp: Fix assertion failure on rejected DHCP requests

Browse Source 
The guest network stack might DHCPREQUEST an address that the slirp built
in dhcp server can't let it have - for example if the guest has an old
leases file from another network configuration.  In this case the dhcp
server should and does reject the request and prepares to send a DHCPNAK
to the client.

However, in this case the daddr variable in bootp_reply() is set to
0.0.0.0.  Shortly afterwards, it unconditionally attempts to pre-insert the
new client address into the ARP table.  This causes an assertion failure in
arp_address_add() because of the 0.0.0.0 address.

According to RFC2131, DHCPNAK messages for clients on the same subnet
must be sent to the broadcast address (S3.2, subpoint 2).

Cc: Jan Kiszka <jan.kiszka@siemens.com>

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
This commit is contained in:
David Gibson 2012-02-24 01:23:28 +01:00 committed by Jan Kiszka
parent b87ffa1631
commit 90d7416ab1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
slirp/bootp.c
View File

@ -200,7 +200,8 @@ static void bootp_reply(Slirp *slirp, const struct bootp_t *bp)
daddr.sin_addr = preq_addr; daddr.sin_addr = preq_addr;
memcpy(bc->macaddr, client_ethaddr, ETH_ALEN); memcpy(bc->macaddr, client_ethaddr, ETH_ALEN);
} else { } else {
daddr.sin_addr.s_addr = 0; /* DHCPNAKs should be sent to broadcast */
daddr.sin_addr.s_addr = 0xffffffff;
} }
} else { } else {
bc = find_addr(slirp, &daddr.sin_addr, bp->bp_hwaddr); bc = find_addr(slirp, &daddr.sin_addr, bp->bp_hwaddr);