Virtualization/ipxe
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/ipxe.git synced 2025-11-03 07:59:06 +08:00
Code Issues Projects Releases Wiki Activity

Compare commits

merge into: Virtualization:efibridge
Branches Tags
Virtualization:master Virtualization:siglist Virtualization:retimeout Virtualization:rbgstart Virtualization:gve-startup-fix Virtualization:sanconnect Virtualization:ena Virtualization:riscv64 Virtualization:aqc1xx Virtualization:slash128 Virtualization:slash31 Virtualization:coverity_scan Virtualization:vetodhcp6 Virtualization:gcmassert Virtualization:snppad Virtualization:mschapv2 Virtualization:letsencrypt Virtualization:centos7 Virtualization:des Virtualization:x25519 Virtualization:mult Virtualization:assert Virtualization:8021x Virtualization:smbios3 Virtualization:srandtime Virtualization:supplicant Virtualization:netstate Virtualization:opsize Virtualization:ntpsetting Virtualization:nosyslinux Virtualization:hackesp Virtualization:keyvals Virtualization:tmpintf Virtualization:sepcode Virtualization:vbox Virtualization:dell3440b Virtualization:efivars2 Virtualization:esx Virtualization:pkcs8 Virtualization:shim5 Virtualization:shim4 Virtualization:shim3 Virtualization:shim2 Virtualization:wimboot Virtualization:tlsfrag3 Virtualization:tlsfrag2 Virtualization:initrd Virtualization:mtureset Virtualization:shim Virtualization:cleardhcp Virtualization:interpreter Virtualization:efiset Virtualization:efivars Virtualization:params Virtualization:noinitrd Virtualization:entropy Virtualization:iscsicap Virtualization:rdrand Virtualization:efiinitrd Virtualization:imagecmdline Virtualization:hyperv Virtualization:eisa Virtualization:pkgcache Virtualization:loong64 Virtualization:lldp Virtualization:ubuntu2204 Virtualization:dhcpnak Virtualization:efibridge Virtualization:loongarch64 Virtualization:nodejs Virtualization:xen Virtualization:autoexecpath Virtualization:cc Virtualization:rtlvlan Virtualization:naptest Virtualization:eficmdline Virtualization:edk2 Virtualization:tcpwindow Virtualization:udpdrop Virtualization:snploop Virtualization:pxemenuscroll Virtualization:armlinux Virtualization:processorbind Virtualization:aenq Virtualization:autovlan Virtualization:netidx Virtualization:gcc12 Virtualization:efivlan Virtualization:flr Virtualization:ioactive Virtualization:vgafix Virtualization:HEAD Virtualization:sysmac Virtualization:hwmac Virtualization:acpimac Virtualization:utf8 Virtualization:dns_primary Virtualization:fix486 Virtualization:autoexec_pxe Virtualization:uricolon Virtualization:sbat Virtualization:guid Virtualization:efi_watchdog Virtualization:shutdown_tpl_notify Virtualization:thunderbolt_workaround Virtualization:uri Virtualization:xhci_fail Virtualization:mac_passthru Virtualization:cached_proxydhcp Virtualization:realtek_hack Virtualization:peerdisc_recent Virtualization:itautec Virtualization:rndis_padding Virtualization:bigint_output_constraints Virtualization:imgextract Virtualization:xen-sg Virtualization:tmp Virtualization:kexec Virtualization:kexec2 Virtualization:kexec3 Virtualization:eficompress Virtualization:fxsr Virtualization:rpl Virtualization:cachedhcp Virtualization:usbdisk Virtualization:ci Virtualization:8d337ec Virtualization:hermon_reset Virtualization:hermon_link_poll Virtualization:freebsd Virtualization:determinism Virtualization:simpletextinputex Virtualization:asn1fix Virtualization:issue123 Virtualization:tpl Virtualization:cookie Virtualization:temp Virtualization:peerdist
Virtualization:v1.21.1 Virtualization:v1.20.1 Virtualization:v1.0.0 Virtualization:v1.0.0-rc1 Virtualization:v0.9.9 Virtualization:v0.9.8 Virtualization:v0.9.7 Virtualization:v0.9.6 Virtualization:v0.9.5 Virtualization:v0.9.4 Virtualization:v0.9.3
...
pull from: Virtualization:ubuntu2204
Branches Tags
Virtualization:master Virtualization:siglist Virtualization:retimeout Virtualization:rbgstart Virtualization:gve-startup-fix Virtualization:sanconnect Virtualization:ena Virtualization:riscv64 Virtualization:aqc1xx Virtualization:slash128 Virtualization:slash31 Virtualization:coverity_scan Virtualization:vetodhcp6 Virtualization:gcmassert Virtualization:snppad Virtualization:mschapv2 Virtualization:letsencrypt Virtualization:centos7 Virtualization:des Virtualization:x25519 Virtualization:mult Virtualization:assert Virtualization:8021x Virtualization:smbios3 Virtualization:srandtime Virtualization:supplicant Virtualization:netstate Virtualization:opsize Virtualization:ntpsetting Virtualization:nosyslinux Virtualization:hackesp Virtualization:keyvals Virtualization:tmpintf Virtualization:sepcode Virtualization:vbox Virtualization:dell3440b Virtualization:efivars2 Virtualization:esx Virtualization:pkcs8 Virtualization:shim5 Virtualization:shim4 Virtualization:shim3 Virtualization:shim2 Virtualization:wimboot Virtualization:tlsfrag3 Virtualization:tlsfrag2 Virtualization:initrd Virtualization:mtureset Virtualization:shim Virtualization:cleardhcp Virtualization:interpreter Virtualization:efiset Virtualization:efivars Virtualization:params Virtualization:noinitrd Virtualization:entropy Virtualization:iscsicap Virtualization:rdrand Virtualization:efiinitrd Virtualization:imagecmdline Virtualization:hyperv Virtualization:eisa Virtualization:pkgcache Virtualization:loong64 Virtualization:lldp Virtualization:ubuntu2204 Virtualization:dhcpnak Virtualization:efibridge Virtualization:loongarch64 Virtualization:nodejs Virtualization:xen Virtualization:autoexecpath Virtualization:cc Virtualization:rtlvlan Virtualization:naptest Virtualization:eficmdline Virtualization:edk2 Virtualization:tcpwindow Virtualization:udpdrop Virtualization:snploop Virtualization:pxemenuscroll Virtualization:armlinux Virtualization:processorbind Virtualization:aenq Virtualization:autovlan Virtualization:netidx Virtualization:gcc12 Virtualization:efivlan Virtualization:flr Virtualization:ioactive Virtualization:vgafix Virtualization:HEAD Virtualization:sysmac Virtualization:hwmac Virtualization:acpimac Virtualization:utf8 Virtualization:dns_primary Virtualization:fix486 Virtualization:autoexec_pxe Virtualization:uricolon Virtualization:sbat Virtualization:guid Virtualization:efi_watchdog Virtualization:shutdown_tpl_notify Virtualization:thunderbolt_workaround Virtualization:uri Virtualization:xhci_fail Virtualization:mac_passthru Virtualization:cached_proxydhcp Virtualization:realtek_hack Virtualization:peerdisc_recent Virtualization:itautec Virtualization:rndis_padding Virtualization:bigint_output_constraints Virtualization:imgextract Virtualization:xen-sg Virtualization:tmp Virtualization:kexec Virtualization:kexec2 Virtualization:kexec3 Virtualization:eficompress Virtualization:fxsr Virtualization:rpl Virtualization:cachedhcp Virtualization:usbdisk Virtualization:ci Virtualization:8d337ec Virtualization:hermon_reset Virtualization:hermon_link_poll Virtualization:freebsd Virtualization:determinism Virtualization:simpletextinputex Virtualization:asn1fix Virtualization:issue123 Virtualization:tpl Virtualization:cookie Virtualization:temp Virtualization:peerdist
Virtualization:v1.21.1 Virtualization:v1.20.1 Virtualization:v1.0.0 Virtualization:v1.0.0-rc1 Virtualization:v0.9.9 Virtualization:v0.9.8 Virtualization:v0.9.7 Virtualization:v0.9.6 Virtualization:v0.9.5 Virtualization:v0.9.4 Virtualization:v0.9.3

2 Commits
efibridge ... ubuntu2204

Author SHA1 Message Date
Michael Brown
6c0335adf6 [ci] Update to ubuntu-22.04 GitHub actions runner 
Signed-off-by: Michael Brown <mcb30@ipxe.org>
 2023-02-03 20:08:16 +00:00
Michael Brown
8450fa4a7b [dhcp] Ignore DHCPNAK unless originating from the selected DHCP server 
RFC 2131 leaves undefined the behaviour of the client in response to a
DHCPNAK that comes from a server other than the selected DHCP server.

A substantial amount of online documentation suggests using multiple
independent DHCP servers with non-overlapping ranges in the same
subnet in order to provide some minimal redundancy.  Experimentation
shows that in this setup, at least ISC dhcpd will send a DHCPNAK in
response to the client's DHCPREQUEST for an address that is not within
the range defined on that server.  (Since the requested address does
lie within the subnet defined on that server, this will happen
regardless of the "authoritative" parameter.)  The client will
therefore receive a DHCPACK from the selected DHCP server along with
one or more DHCPNAKs from each of the non-selected DHCP servers.

Filter out responses from non-selected DHCP servers before checking
for a DHCPNAK, so that these arguably spurious DHCPNAKs will not cause
iPXE to return to the discovery state.

Continue to check for DHCPNAK before filtering out responses for
non-selected lease addresses, since experimentation shows that the
DHCPNAK will usually have an empty yiaddr field.

Reported-by: Anders Blomdell <anders.blomdell@control.lth.se>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
 2023-02-03 19:51:58 +00:00
3 changed files with 8 additions and 6 deletions
Expand all files Collapse all files

6
.github/workflows/build.yml vendored
View File

@ -6,7 +6,7 @@ jobs:
x86:
name: x86
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Check out code
uses: actions/checkout@v3
@ -32,7 +32,7 @@ jobs:
arm32:
name: ARM32
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Check out code
uses: actions/checkout@v3
@ -52,7 +52,7 @@ jobs:
arm64:
name: ARM64
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Check out code
uses: actions/checkout@v3

2
.github/workflows/coverity.yml vendored
View File

@ -8,7 +8,7 @@ on:
jobs:
submit:
name: Submit
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Check out code
uses: actions/checkout@v3

6
src/net/udp/dhcp.c
View File

@ -571,6 +571,10 @@ static void dhcp_request_rx ( struct dhcp_session *dhcp,
if ( peer->sin_port != htons ( BOOTPS_PORT ) )
return;
/* Filter out non-selected servers */
if ( server_id.s_addr != dhcp->server.s_addr )
return;
/* Handle DHCPNAK */
if ( msgtype == DHCPNAK ) {
dhcp_defer ( dhcp );
@ -580,8 +584,6 @@ static void dhcp_request_rx ( struct dhcp_session *dhcp,
/* Filter out unacceptable responses */
if ( msgtype /* BOOTP */ && ( msgtype != DHCPACK ) )
return;
if ( server_id.s_addr != dhcp->server.s_addr )
return;
if ( ip.s_addr != dhcp->offer.s_addr )
return;