hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix file descriptor assertions

Browse Source 
Zero is a valid file descriptor and no negative values other than -1 are
ever stored in the DCB::fd member.
This commit is contained in:
Markus Mäkelä
2018-12-07 11:27:30 +02:00
parent ae62cf6eb6
commit a40e2f94f3
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/core/dcb.cc
View File

@ -515,7 +515,7 @@ int dcb_read(DCB* dcb,
return dcb_read_SSL(dcb, head); return dcb_read_SSL(dcb, head);
} }
if (dcb->fd <= 0) if (dcb->fd == DCBFD_CLOSED)
{ {
MXS_ERROR("Read failed, dcb is closed."); MXS_ERROR("Read failed, dcb is closed.");
return 0; return 0;
@ -677,7 +677,7 @@ static int dcb_read_SSL(DCB* dcb, GWBUF** head)
int nsingleread = 0, nreadtotal = 0; int nsingleread = 0, nreadtotal = 0;
int start_length = gwbuf_length(*head); int start_length = gwbuf_length(*head);
if (dcb->fd <= 0) if (dcb->fd == DCBFD_CLOSED)
{ {
MXS_ERROR("Read failed, dcb is closed."); MXS_ERROR("Read failed, dcb is closed.");
return -1; return -1;
@ -867,7 +867,7 @@ static inline bool dcb_write_parameter_check(DCB* dcb, GWBUF* queue)
return false; return false;
} }
if (dcb->fd <= 0) if (dcb->fd == DCBFD_CLOSED)
{ {
MXS_ERROR("Write failed, dcb is closed."); MXS_ERROR("Write failed, dcb is closed.");
gwbuf_free(queue); gwbuf_free(queue);
@ -1172,7 +1172,7 @@ void dcb_final_close(DCB* dcb)
mxb::atomic::add(&dcb->server->stats.n_current, -1, mxb::atomic::RELAXED); mxb::atomic::add(&dcb->server->stats.n_current, -1, mxb::atomic::RELAXED);
} }
if (dcb->fd > 0) if (dcb->fd != DCBFD_CLOSED)
{ {
// TODO: How could we get this far with a dcb->fd <= 0? // TODO: How could we get this far with a dcb->fd <= 0?
@ -1746,7 +1746,7 @@ static int gw_write(DCB* dcb, GWBUF* writeq, bool* stop_writing)
errno = 0; errno = 0;
if (fd > 0) if (fd != DCBFD_CLOSED)
{ {
written = write(fd, buf, nbytes); written = write(fd, buf, nbytes);
} }
@ -3142,9 +3142,9 @@ int poll_remove_dcb(DCB* dcb)
* Only positive fds can be removed from epoll set. * Only positive fds can be removed from epoll set.
*/ */
dcbfd = dcb->fd; dcbfd = dcb->fd;
mxb_assert(dcbfd > 0 || dcb->role == DCB::Role::INTERNAL); mxb_assert(dcbfd != DCBFD_CLOSED || dcb->role == DCB::Role::INTERNAL);
if (dcbfd > 0) if (dcbfd != DCBFD_CLOSED)
{ {
rc = -1; rc = -1;

4
server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
View File

@ -196,7 +196,7 @@ static int gw_create_backend_connection(DCB* backend_dcb,
switch (rv) switch (rv)
{ {
case 0: case 0:
mxb_assert(fd > 0); mxb_assert(fd != DCBFD_CLOSED);
protocol->fd = fd; protocol->fd = fd;
protocol->protocol_auth_state = MXS_AUTH_STATE_CONNECTED; protocol->protocol_auth_state = MXS_AUTH_STATE_CONNECTED;
MXS_DEBUG("Established " MXS_DEBUG("Established "
@ -219,7 +219,7 @@ static int gw_create_backend_connection(DCB* backend_dcb,
* as it means the calls have been successful but the connection * as it means the calls have been successful but the connection
* has not yet completed and the calls are non-blocking. * has not yet completed and the calls are non-blocking.
*/ */
mxb_assert(fd > 0); mxb_assert(fd != DCBFD_CLOSED);
protocol->protocol_auth_state = MXS_AUTH_STATE_PENDING_CONNECT; protocol->protocol_auth_state = MXS_AUTH_STATE_PENDING_CONNECT;
protocol->fd = fd; protocol->fd = fd;
MXS_DEBUG("Connection " MXS_DEBUG("Connection "