1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-28 16:01:18 +01:00

Merge pull request #10366 from crest42/gnrc_udp_use_after_free

gnrc_sock_[udp|ip]: read return value for _recv after release
This commit is contained in:
Martine Lenders 2018-11-12 17:01:10 +01:00 committed by GitHub
commit 685efc4f5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

View File

@ -120,8 +120,9 @@ ssize_t sock_ip_recv(sock_ip_t *sock, void *data, size_t max_len,
return -EPROTO;
}
memcpy(data, pkt->data, pkt->size);
res = (int)pkt->size;
gnrc_pktbuf_release(pkt);
return (int)pkt->size;
return res;
}
ssize_t sock_ip_send(sock_ip_t *sock, const void *data, size_t len,

View File

@ -215,8 +215,9 @@ ssize_t sock_udp_recv(sock_udp_t *sock, void *data, size_t max_len,
return -EPROTO;
}
memcpy(data, pkt->data, pkt->size);
res = (int)pkt->size;
gnrc_pktbuf_release(pkt);
return (int)pkt->size;
return res;
}
ssize_t sock_udp_send(sock_udp_t *sock, const void *data, size_t len,