narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reserve space for link-layer header in pxenv_undi_transmit() when not 

handed a P_UNKNOWN packet.
pull/1/head
Michael Brown 2007-07-03 04:05:30 +01:00
parent 290280f90e
commit 5f92f0bd82
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/interface/pxe/pxe_undi.c
View File

@ -179,6 +179,7 @@ PXENV_EXIT_t pxenv_undi_transmit ( struct s_PXENV_UNDI_TRANSMIT
struct net_protocol *net_protocol; struct net_protocol *net_protocol;
char destaddr[MAX_LL_ADDR_LEN]; char destaddr[MAX_LL_ADDR_LEN];
const void *ll_dest; const void *ll_dest;
size_t ll_hlen = pxe_netdev->ll_protocol->ll_header_len;
size_t len; size_t len;
unsigned int i; unsigned int i;
int rc; int rc;
@ -190,27 +191,34 @@ PXENV_EXIT_t pxenv_undi_transmit ( struct s_PXENV_UNDI_TRANSMIT
case P_IP: net_protocol = &ipv4_protocol; break; case P_IP: net_protocol = &ipv4_protocol; break;
case P_ARP: net_protocol = &arp_protocol; break; case P_ARP: net_protocol = &arp_protocol; break;
case P_RARP: net_protocol = &rarp_protocol; break; case P_RARP: net_protocol = &rarp_protocol; break;
case P_UNKNOWN: net_protocol = NULL; break; case P_UNKNOWN:
net_protocol = NULL;
ll_hlen = 0;
break;
default: default:
undi_transmit->Status = PXENV_STATUS_UNDI_INVALID_PARAMETER; undi_transmit->Status = PXENV_STATUS_UNDI_INVALID_PARAMETER;
return PXENV_EXIT_FAILURE; return PXENV_EXIT_FAILURE;
} }
DBG ( " %s", ( net_protocol ? net_protocol->name : "UNKNOWN" ) );
/* Calculate total packet length */ /* Calculate total packet length */
copy_from_real ( &tbd, undi_transmit->TBD.segment, copy_from_real ( &tbd, undi_transmit->TBD.segment,
undi_transmit->TBD.offset, sizeof ( tbd ) ); undi_transmit->TBD.offset, sizeof ( tbd ) );
len = tbd.ImmedLength; len = tbd.ImmedLength;
DBG ( " %zd", tbd.ImmedLength );
for ( i = 0 ; i < tbd.DataBlkCount ; i++ ) { for ( i = 0 ; i < tbd.DataBlkCount ; i++ ) {
datablk = &tbd.DataBlock[i]; datablk = &tbd.DataBlock[i];
len += datablk->TDDataLen; len += datablk->TDDataLen;
DBG ( "+%zd", datablk->TDDataLen );
} }
/* Allocate and fill I/O buffer */ /* Allocate and fill I/O buffer */
iobuf = alloc_iob ( len ); iobuf = alloc_iob ( ll_hlen + len );
if ( ! iobuf ) { if ( ! iobuf ) {
undi_transmit->Status = PXENV_STATUS_OUT_OF_RESOURCES; undi_transmit->Status = PXENV_STATUS_OUT_OF_RESOURCES;
return PXENV_EXIT_FAILURE; return PXENV_EXIT_FAILURE;
} }
iob_reserve ( iobuf, ll_hlen );
copy_from_real ( iob_put ( iobuf, tbd.ImmedLength ), tbd.Xmit.segment, copy_from_real ( iob_put ( iobuf, tbd.ImmedLength ), tbd.Xmit.segment,
tbd.Xmit.offset, tbd.ImmedLength ); tbd.Xmit.offset, tbd.ImmedLength );
for ( i = 0 ; i < tbd.DataBlkCount ; i++ ) { for ( i = 0 ; i < tbd.DataBlkCount ; i++ ) {