kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-28 07:51:19 +01:00
Code Releases Activity

Merge pull request #8867 from miri64/gnrc_ipv6/fix/possible-null-ptr-deref

Browse Source 
gnrc_ipv6: fix possible NULL pointer dereference
This commit is contained in:
Martine Lenders 2018-04-12 14:26:22 +02:00 committed by GitHub
commit 3be4b51209
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c
View File

@ -197,7 +197,7 @@ ipv6_hdr_t *gnrc_ipv6_get_header(gnrc_pktsnip_t *pkt)
{
ipv6_hdr_t *hdr = NULL;
gnrc_pktsnip_t *tmp = gnrc_pktsnip_search_type(pkt, GNRC_NETTYPE_IPV6);
if ((tmp) && ipv6_hdr_is(tmp->data)) {
if ((tmp != NULL) && (tmp->data != NULL) && ipv6_hdr_is(tmp->data)) {
hdr = ((ipv6_hdr_t*) tmp->data);
}
@ -715,7 +715,7 @@ static void _receive(gnrc_pktsnip_t *pkt)
for (ipv6 = pkt; ipv6 != NULL; ipv6 = ipv6->next) { /* find IPv6 header if already marked */
if ((ipv6->type == GNRC_NETTYPE_IPV6) && (ipv6->size == sizeof(ipv6_hdr_t)) &&
(ipv6_hdr_is(ipv6->data))) {
(ipv6->data != NULL) && (ipv6_hdr_is(ipv6->data))) {
break;
}
@ -723,7 +723,7 @@ static void _receive(gnrc_pktsnip_t *pkt)
}
if (ipv6 == NULL) {
if (!ipv6_hdr_is(pkt->data)) {
if ((pkt->data == NULL) || !ipv6_hdr_is(pkt->data)) {
DEBUG("ipv6: Received packet was not IPv6, dropping packet\n");
gnrc_pktbuf_release(pkt);
return;