upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-27 12:13:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

TLS: check for sock->recv_cb when handling received data

Browse source 
This commit adds a check if 'sock->recv_cb' might have been nullified
during the call to 'sock->recv_cb'. That could happen, e.g. by an
indirect call to 'isc_nmhandle_close()' from within the callback when
wrapping up.

In this case, let's close the TLS connection.

(cherry picked from commit bed5e2bb08)
This commit is contained in:
Artem Boldariev 2022-11-22 15:11:57 +02:00
parent 90b924be13
commit fc637fbdc3
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/isc/netmgr/tlsstream.c
View file

@ -519,6 +519,18 @@ tls_do_bio(isc_nmsocket_t *sock, isc_region_t *received_data,
if (sock->statichandle == NULL) {
finish = true;
break;
} else if (sock->recv_cb == NULL) {
/*
* The 'sock->recv_cb' might have been
* nullified during the call to
* 'sock->recv_cb'. That could happen,
* indirectly when wrapping up.
*
* In this case, let's close the TLS
* connection.
*/
finish = true;
break;
} else if (atomic_load(&sock->readpaused)) {
/*
* Reading has been paused from withing