mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-23348 vio_shutdown does not prevent later ReadFile on named pipe

Browse source 
Introduce st_vio::shutdown_flag to be checked prior to Read/WriteFile
and during wait for async.io to finish.
This commit is contained in:
Vladislav Vaintroub 2020-08-03 13:23:38 +02:00
parent 4d41f316c3
commit ccb9f673b4
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/violite.h
View file

@ -281,6 +281,7 @@ struct st_vio
OVERLAPPED overlapped;
DWORD read_timeout_ms;
DWORD write_timeout_ms;
int shutdown_flag;
#endif
};
#endif /* vio_violite_h_ */

1
vio/vio.c
View file

@ -68,6 +68,7 @@ int vio_shared_memory_shutdown(Vio *vio, int how)
int vio_pipe_shutdown(Vio *vio, int how)
{
vio->shutdown_flag= how;
return CancelIoEx(vio->hPipe, NULL);
}
#endif

17
vio/viopipe.c
View file

@ -75,6 +75,9 @@ size_t vio_read_pipe(Vio *vio, uchar *buf, size_t count)
size_t ret= (size_t) -1;
DBUG_ENTER("vio_read_pipe");
if (vio->shutdown_flag)
return ret;
disable_iocp_notification(&vio->overlapped);
/* Attempt to read from the pipe (overlapped I/O). */
@ -85,8 +88,11 @@ size_t vio_read_pipe(Vio *vio, uchar *buf, size_t count)
}
/* Read operation is pending completion asynchronously? */
else if (GetLastError() == ERROR_IO_PENDING)
{
if (vio->shutdown_flag)
CancelIo(vio->hPipe);
ret= wait_overlapped_result(vio, vio->read_timeout);
}
enable_iocp_notification(&vio->overlapped);
DBUG_RETURN(ret);
@ -99,6 +105,8 @@ size_t vio_write_pipe(Vio *vio, const uchar *buf, size_t count)
size_t ret= (size_t) -1;
DBUG_ENTER("vio_write_pipe");
if (vio->shutdown_flag == SHUT_RDWR)
return ret;
disable_iocp_notification(&vio->overlapped);
/* Attempt to write to the pipe (overlapped I/O). */
if (WriteFile(vio->hPipe, buf, (DWORD)count, &transferred, &vio->overlapped))
@ -108,8 +116,11 @@ size_t vio_write_pipe(Vio *vio, const uchar *buf, size_t count)
}
/* Write operation is pending completion asynchronously? */
else if (GetLastError() == ERROR_IO_PENDING)
{
if (vio->shutdown_flag == SHUT_RDWR)
CancelIo(vio->hPipe);
ret= wait_overlapped_result(vio, vio->write_timeout);
}
enable_iocp_notification(&vio->overlapped);
DBUG_RETURN(ret);
}
@ -129,9 +140,7 @@ int vio_close_pipe(Vio *vio)
BOOL ret;
DBUG_ENTER("vio_close_pipe");
CancelIo(vio->hPipe);
CloseHandle(vio->overlapped.hEvent);
DisconnectNamedPipe(vio->hPipe);
ret= CloseHandle(vio->hPipe);
vio->type= VIO_CLOSED;