GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-02-10 00:37:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

recv_from_new_fd: update tmsg pointer

Browse Source 
This addresses issue where tmsg was free'd by the dtls_pull
function, and free'd again by the caller of recv_from_new_fd.
This commit is contained in:
Nikos Mavrogiannopoulos
2016-07-19 11:27:16 +02:00
parent c346f29860
commit 2ffd80509d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/worker-misc.c
View File

@@ -49,7 +49,7 @@
#endif
/* recv from the new file descriptor and make sure we have a valid packet */
static int recv_from_new_fd(struct worker_st *ws, int fd, UdpFdMsg *tmsg)
static int recv_from_new_fd(struct worker_st *ws, int fd, UdpFdMsg **tmsg)
{
int saved_fd, ret;
UdpFdMsg *saved_tmsg;
@@ -61,7 +61,7 @@ static int recv_from_new_fd(struct worker_st *ws, int fd, UdpFdMsg *tmsg)
saved_fd = ws->dtls_tptr.fd;
saved_tmsg = ws->dtls_tptr.msg;
ws->dtls_tptr.msg = tmsg;
ws->dtls_tptr.msg = *tmsg;
ws->dtls_tptr.fd = fd;
ret = gnutls_record_recv(ws->dtls_session, ws->buffer, ws->buffer_size);
@@ -73,6 +73,7 @@ static int recv_from_new_fd(struct worker_st *ws, int fd, UdpFdMsg *tmsg)
ret = 0;
revert:
*tmsg = ws->dtls_tptr.msg;
ws->dtls_tptr.fd = saved_fd;
ws->dtls_tptr.msg = saved_tmsg;
return ret;
@@ -131,7 +132,7 @@ int handle_commands_from_main(struct worker_st *ws)
if (has_hello == 0) {
/* check if the first packet received is a valid one -
* if not discard the new fd */
if (!recv_from_new_fd(ws, fd, tmsg)) {
if (!recv_from_new_fd(ws, fd, &tmsg)) {
oclog(ws, LOG_INFO, "received UDP fd message but its session has invalid data!");
if (tmsg)
udp_fd_msg__free_unpacked(tmsg, NULL);