vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix incorrect ISR PXE calls

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-06-27 06:31:25 +02:00
parent 0ff2c51b82
commit 59b455fcea
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
grub-core/net/drivers/i386/pc/pxe.c
View file

@ -165,7 +165,10 @@ grub_pxe_recv (const struct grub_net_card *dev __attribute__ ((unused)),
isr->func_flag = GRUB_PXE_ISR_IN_START; isr->func_flag = GRUB_PXE_ISR_IN_START;
grub_pxe_call (GRUB_PXENV_UNDI_ISR, isr, pxe_rm_entry); grub_pxe_call (GRUB_PXENV_UNDI_ISR, isr, pxe_rm_entry);
if (isr->status || isr->func_flag != GRUB_PXE_ISR_OUT_OURS) if (isr->status || isr->func_flag != GRUB_PXE_ISR_OUT_OURS)
return -1; {
in_progress = 0;
return -1;
}
grub_memset (isr, 0, sizeof (*isr)); grub_memset (isr, 0, sizeof (*isr));
isr->func_flag = GRUB_PXE_ISR_IN_PROCESS; isr->func_flag = GRUB_PXE_ISR_IN_PROCESS;
grub_pxe_call (GRUB_PXENV_UNDI_ISR, isr, pxe_rm_entry); grub_pxe_call (GRUB_PXENV_UNDI_ISR, isr, pxe_rm_entry);
@ -180,7 +183,10 @@ grub_pxe_recv (const struct grub_net_card *dev __attribute__ ((unused)),
while (isr->func_flag != GRUB_PXE_ISR_OUT_RECEIVE) while (isr->func_flag != GRUB_PXE_ISR_OUT_RECEIVE)
{ {
if (isr->status || isr->func_flag == GRUB_PXE_ISR_OUT_DONE) if (isr->status || isr->func_flag == GRUB_PXE_ISR_OUT_DONE)
return -1; {
in_progress = 0;
return -1;
}
grub_memset (isr, 0, sizeof (*isr)); grub_memset (isr, 0, sizeof (*isr));
isr->func_flag = GRUB_PXE_ISR_IN_GET_NEXT; isr->func_flag = GRUB_PXE_ISR_IN_GET_NEXT;
grub_pxe_call (GRUB_PXENV_UNDI_ISR, isr, pxe_rm_entry); grub_pxe_call (GRUB_PXENV_UNDI_ISR, isr, pxe_rm_entry);
@ -198,11 +204,15 @@ grub_pxe_recv (const struct grub_net_card *dev __attribute__ ((unused)),
isr->func_flag = GRUB_PXE_ISR_IN_GET_NEXT; isr->func_flag = GRUB_PXE_ISR_IN_GET_NEXT;
grub_pxe_call (GRUB_PXENV_UNDI_ISR, isr, pxe_rm_entry); grub_pxe_call (GRUB_PXENV_UNDI_ISR, isr, pxe_rm_entry);
if (isr->status || isr->func_flag != GRUB_PXE_ISR_OUT_RECEIVE) if (isr->status || isr->func_flag != GRUB_PXE_ISR_OUT_RECEIVE)
return -1; {
in_progress = 1;
return -1;
}
grub_memcpy (ptr, LINEAR (isr->buffer), isr->buffer_len); grub_memcpy (ptr, LINEAR (isr->buffer), isr->buffer_len);
ptr += isr->buffer_len; ptr += isr->buffer_len;
} }
in_progress = 1;
return len; return len;
} }