mirror of
https://github.com/ipxe/ipxe
synced 2025-12-27 10:02:42 +03:00
[pxe] Treat PXENV_RESTART_TFTP as unreturnable
Microsoft WDS can end up calling PXENV_RESTART_TFTP to execute a second-stage NBP which then exits. Specifically, wdsnbp.com uses PXENV_RESTART_TFTP to execute pxeboot.com, which will exit if the user does not press F12. iPXE currently treats PXENV_RESTART_TFTP as a normal PXE API call, and so attempts to return to wdsnbp.com, which has just been vaporised by pxeboot.com. Use rmsetjmp/rmlongjmp to preserve the stack state as of the initial NBP execution, and to restore this state immediately prior to executing the NBP loaded via PXENV_RESTART_TFTP. This matches the behaviour in the PXE spec (which says that "if TFTP is restarted, control is never returned to the caller"), and allows pxeboot.com to exit relatively cleanly back to iPXE. As with all usage of setjmp/longjmp, there may be subtle corner case bugs due to not gracefully unwinding any state accumulated by the time of the longjmp call, but this seems to be the only viable way to provide the specified behaviour. Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
@@ -20,6 +20,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
|
||||
|
||||
#include <ipxe/uaccess.h>
|
||||
#include <ipxe/init.h>
|
||||
#include <setjmp.h>
|
||||
#include <registers.h>
|
||||
#include <biosint.h>
|
||||
#include <pxe.h>
|
||||
@@ -480,15 +481,24 @@ int pxe_deactivate ( void ) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
/** Jump buffer for PXENV_RESTART_TFTP */
|
||||
rmjmp_buf pxe_restart_nbp;
|
||||
|
||||
/**
|
||||
* Start PXE NBP at 0000:7c00
|
||||
*
|
||||
* @ret rc Return status code
|
||||
*/
|
||||
int pxe_start_nbp ( void ) {
|
||||
int jmp;
|
||||
int discard_b, discard_c, discard_d, discard_D;
|
||||
uint16_t rc;
|
||||
|
||||
/* Allow restarting NBP via PXENV_RESTART_TFTP */
|
||||
jmp = rmsetjmp ( pxe_restart_nbp );
|
||||
if ( jmp )
|
||||
DBG ( "Restarting NBP (%x)\n", jmp );
|
||||
|
||||
/* Far call to PXE NBP */
|
||||
__asm__ __volatile__ ( REAL_CODE ( "movw %%cx, %%es\n\t"
|
||||
"pushw %%es\n\t"
|
||||
|
||||
Reference in New Issue
Block a user