deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Bugfix: drop incoming TCP and UDP packets where port numbers are zero

Browse source
This commit is contained in:
adamdunkels 2010-02-04 11:17:42 +00:00
parent 95d0b09954
commit 13f6673d04
2 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/net/uip.c
View file

@ -41,7 +41,7 @@
* *
* This file is part of the uIP TCP/IP stack. * This file is part of the uIP TCP/IP stack.
* *
* $Id: uip.c,v 1.18 2009/10/27 23:09:58 adamdunkels Exp $ * $Id: uip.c,v 1.19 2010/02/04 11:17:42 adamdunkels Exp $
* *
*/ */
@ -1106,6 +1106,12 @@ uip_process(u8_t flag)
uip_len = uip_len - UIP_IPUDPH_LEN; uip_len = uip_len - UIP_IPUDPH_LEN;
#endif /* UIP_UDP_CHECKSUMS */ #endif /* UIP_UDP_CHECKSUMS */
/* Make sure that the UDP destination port number is not zero. */
if(UDPBUF->destport == 0) {
UIP_LOG("udp: zero port.");
goto drop;
}
/* Demultiplex this UDP packet between the UDP "connections". */ /* Demultiplex this UDP packet between the UDP "connections". */
for(uip_udp_conn = &uip_udp_conns[0]; for(uip_udp_conn = &uip_udp_conns[0];
uip_udp_conn < &uip_udp_conns[UIP_UDP_CONNS]; uip_udp_conn < &uip_udp_conns[UIP_UDP_CONNS];
@ -1221,6 +1227,12 @@ uip_process(u8_t flag)
UIP_LOG("tcp: bad checksum."); UIP_LOG("tcp: bad checksum.");
goto drop; goto drop;
} }
/* Make sure that the TCP port number is not zero. */
if(BUF->destport == 0 || BUF->srcport == 0) {
UIP_LOG("tcp: zero port.");
goto drop;
}
/* Demultiplex this segment. */ /* Demultiplex this segment. */
/* First check any active connections. */ /* First check any active connections. */

16
core/net/uip6.c
View file

@ -41,7 +41,7 @@
* *
* This file is part of the uIP TCP/IP stack. * This file is part of the uIP TCP/IP stack.
* *
* $Id: uip6.c,v 1.8 2009/11/12 14:05:42 joxe Exp $ * $Id: uip6.c,v 1.9 2010/02/04 11:17:42 adamdunkels Exp $
* *
*/ */
@ -1358,6 +1358,12 @@ uip_process(u8_t flag)
uip_len = uip_len - UIP_IPUDPH_LEN; uip_len = uip_len - UIP_IPUDPH_LEN;
#endif /* UIP_UDP_CHECKSUMS */ #endif /* UIP_UDP_CHECKSUMS */
/* Make sure that the UDP destination port number is not zero. */
if(UIP_UDP_BUF->destport == 0) {
UIP_LOG("udp: zero port.");
goto drop;
}
/* Demultiplex this UDP packet between the UDP "connections". */ /* Demultiplex this UDP packet between the UDP "connections". */
for(uip_udp_conn = &uip_udp_conns[0]; for(uip_udp_conn = &uip_udp_conns[0];
uip_udp_conn < &uip_udp_conns[UIP_UDP_CONNS]; uip_udp_conn < &uip_udp_conns[UIP_UDP_CONNS];
@ -1443,7 +1449,13 @@ uip_process(u8_t flag)
UIP_LOG("tcp: bad checksum."); UIP_LOG("tcp: bad checksum.");
goto drop; goto drop;
} }
/* Make sure that the TCP port number is not zero. */
if(UIP_TCP_BUF->destport == 0 || UIP_TCP_BUF->srcport == 0) {
UIP_LOG("tcp: zero port.");
goto drop;
}
/* Demultiplex this segment. */ /* Demultiplex this segment. */
/* First check any active connections. */ /* First check any active connections. */
for(uip_connr = &uip_conns[0]; uip_connr <= &uip_conns[UIP_CONNS - 1]; for(uip_connr = &uip_conns[0]; uip_connr <= &uip_conns[UIP_CONNS - 1];