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

Correct some packet ownership and freeing bugs.

pull/1/head
Michael Brown 2006-08-09 14:27:07 +00:00
parent 43d601b678
commit 09688cb3b5
1 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/net/tcp.c
View File

@ -636,9 +636,13 @@ int tcp_senddata ( struct tcp_connection *conn ) {
*/ */
int tcp_send ( struct tcp_connection *conn, const void *data, size_t len ) { int tcp_send ( struct tcp_connection *conn, const void *data, size_t len ) {
struct sockaddr_tcpip *peer = &conn->peer; struct sockaddr_tcpip *peer = &conn->peer;
struct pk_buff *pkb = conn->tx_pkb; struct pk_buff *pkb;
int slen; int slen;
/* Take ownership of the TX buffer from the connection */
pkb = conn->tx_pkb;
conn->tx_pkb = NULL;
/* Determine the amount of data to be sent */ /* Determine the amount of data to be sent */
slen = len < conn->snd_win ? len : conn->snd_win; slen = len < conn->snd_win ? len : conn->snd_win;
/* Copy payload */ /* Copy payload */
@ -694,11 +698,13 @@ static int tcp_rx ( struct pk_buff *pkb,
struct tcp_header *tcphdr; struct tcp_header *tcphdr;
uint32_t acked, toack; uint32_t acked, toack;
int hlen; int hlen;
int rc;
/* Sanity check */ /* Sanity check */
if ( pkb_len ( pkb ) < sizeof ( *tcphdr ) ) { if ( pkb_len ( pkb ) < sizeof ( *tcphdr ) ) {
DBG ( "Packet too short (%d bytes)\n", pkb_len ( pkb ) ); DBG ( "Packet too short (%d bytes)\n", pkb_len ( pkb ) );
return -EINVAL; rc = -EINVAL;
goto done;
} }
@ -713,7 +719,8 @@ static int tcp_rx ( struct pk_buff *pkb,
DBG ( "TCP options sent\n" ); DBG ( "TCP options sent\n" );
} else { } else {
DBG ( "Bad header length (%d bytes)\n", hlen ); DBG ( "Bad header length (%d bytes)\n", hlen );
return -EINVAL; rc = -EINVAL;
goto done;
} }
} }
@ -728,7 +735,8 @@ static int tcp_rx ( struct pk_buff *pkb,
} }
DBG ( "No connection found on port %d\n", ntohs ( tcphdr->dest ) ); DBG ( "No connection found on port %d\n", ntohs ( tcphdr->dest ) );
return 0; rc = 0;
goto done;
found_conn: found_conn:
/* Stop the timer */ /* Stop the timer */
@ -743,7 +751,8 @@ static int tcp_rx ( struct pk_buff *pkb,
case TCP_CLOSED: case TCP_CLOSED:
DBG ( "tcp_rx(): Invalid state %s\n", DBG ( "tcp_rx(): Invalid state %s\n",
tcp_states[conn->tcp_state] ); tcp_states[conn->tcp_state] );
return -EINVAL; rc = -EINVAL;
goto done;
case TCP_LISTEN: case TCP_LISTEN:
if ( tcphdr->flags & TCP_SYN ) { if ( tcphdr->flags & TCP_SYN ) {
tcp_trans ( conn, TCP_SYN_RCVD ); tcp_trans ( conn, TCP_SYN_RCVD );
@ -776,7 +785,8 @@ static int tcp_rx ( struct pk_buff *pkb,
conn->tcp_op->connected ( conn ); conn->tcp_op->connected ( conn );
conn->tcp_flags |= TCP_ACK; conn->tcp_flags |= TCP_ACK;
tcp_senddata ( conn ); tcp_senddata ( conn );
return; rc = 0;
goto done;
} else { } else {
tcp_trans ( conn, TCP_SYN_RCVD ); tcp_trans ( conn, TCP_SYN_RCVD );
conn->tcp_flags |= TCP_SYN; conn->tcp_flags |= TCP_SYN;
@ -789,7 +799,8 @@ static int tcp_rx ( struct pk_buff *pkb,
if ( tcphdr->flags & TCP_RST ) { if ( tcphdr->flags & TCP_RST ) {
tcp_trans ( conn, TCP_LISTEN ); tcp_trans ( conn, TCP_LISTEN );
conn->tcp_op->closed ( conn, CONN_RESTART ); conn->tcp_op->closed ( conn, CONN_RESTART );
return 0; rc = 0;
goto done;
} }
if ( tcphdr->flags & TCP_ACK ) { if ( tcphdr->flags & TCP_ACK ) {
tcp_trans ( conn, TCP_ESTABLISHED ); tcp_trans ( conn, TCP_ESTABLISHED );
@ -799,7 +810,8 @@ static int tcp_rx ( struct pk_buff *pkb,
*/ */
conn->snd_una = tcphdr->ack - 1; conn->snd_una = tcphdr->ack - 1;
conn->tcp_op->connected ( conn ); conn->tcp_op->connected ( conn );
return 0; rc = 0;
goto done;
} }
/* Unexpected packet */ /* Unexpected packet */
goto unexpected; goto unexpected;
@ -849,7 +861,8 @@ static int tcp_rx ( struct pk_buff *pkb,
if ( tcphdr->flags & TCP_ACK ) { if ( tcphdr->flags & TCP_ACK ) {
tcp_trans ( conn, TCP_TIME_WAIT ); tcp_trans ( conn, TCP_TIME_WAIT );
start_timer ( &conn->timer ); start_timer ( &conn->timer );
return 0; rc = 0;
goto done;
} }
/* Unexpected packet */ /* Unexpected packet */
goto unexpected; goto unexpected;
@ -862,7 +875,8 @@ static int tcp_rx ( struct pk_buff *pkb,
case TCP_LAST_ACK: case TCP_LAST_ACK:
if ( tcphdr->flags & TCP_ACK ) { if ( tcphdr->flags & TCP_ACK ) {
tcp_trans ( conn, TCP_CLOSED ); tcp_trans ( conn, TCP_CLOSED );
return 0; rc = 0;
goto done;
} }
/* Unexpected packet */ /* Unexpected packet */
goto unexpected; goto unexpected;
@ -900,7 +914,8 @@ static int tcp_rx ( struct pk_buff *pkb,
acked = ntohl ( tcphdr->ack ) - conn->snd_una; acked = ntohl ( tcphdr->ack ) - conn->snd_una;
if ( acked < 0 ) { /* TODO: Replace all uint32_t arith */ if ( acked < 0 ) { /* TODO: Replace all uint32_t arith */
DBG ( "Previously ACKed (%d)\n", tcphdr->ack ); DBG ( "Previously ACKed (%d)\n", tcphdr->ack );
return 0; rc = 0;
goto done;
} }
/* Advance snd stream */ /* Advance snd stream */
conn->snd_una += acked; conn->snd_una += acked;
@ -922,24 +937,30 @@ static int tcp_rx ( struct pk_buff *pkb,
} }
/* Otherwise, the packet has been ACKed already */ /* Otherwise, the packet has been ACKed already */
} }
return 0; rc = 0;
goto done;
send_tcp_nomsg: send_tcp_nomsg:
free_pkb ( conn->tx_pkb ); free_pkb ( conn->tx_pkb );
conn->tx_pkb = alloc_pkb ( MIN_PKB_LEN ); conn->tx_pkb = alloc_pkb ( MIN_PKB_LEN );
pkb_reserve ( conn->tx_pkb, MAX_HDR_LEN ); pkb_reserve ( conn->tx_pkb, MAX_HDR_LEN );
int rc;
if ( ( rc = tcp_send ( conn, TCP_NOMSG, TCP_NOMSG_LEN ) ) != 0 ) { if ( ( rc = tcp_send ( conn, TCP_NOMSG, TCP_NOMSG_LEN ) ) != 0 ) {
DBG ( "Error sending TCP message (rc = %d)\n", rc ); DBG ( "Error sending TCP message (rc = %d)\n", rc );
} }
return 0; goto done;
unexpected: unexpected:
DBG ( "Unexpected packet received in %s with flags = %#hx\n", DBG ( "Unexpected packet received in %s with flags = %#hx\n",
tcp_states[conn->tcp_state], tcphdr->flags & TCP_MASK_FLAGS ); tcp_states[conn->tcp_state], tcphdr->flags & TCP_MASK_FLAGS );
tcp_close ( conn ); tcp_close ( conn );
free_pkb ( conn->tx_pkb ); free_pkb ( conn->tx_pkb );
return -EINVAL; conn->tx_pkb = NULL;
rc = -EINVAL;
goto done;
done:
free_pkb ( pkb );
return rc;
} }
/** TCP protocol */ /** TCP protocol */