libvncserver: serialize WebSocket SSL teardown#718
Open
marcofortina wants to merge 1 commit into
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This is a conservative WSS disconnect race mitigation.
The issue reports intermittent crashes when a secure WebSocket client disconnects while the output thread is still sending framebuffer updates. The reported OpenSSL backtrace shows
SSL_write()using SSL state that was already freed byrfbCloseClient()from the input thread. The GnuTLS backtrace shows the same class of issue aroundrfbssl_destroy()/ credential teardown.Changes
rfbWriteExact()by takingcl->outputMutexwhile destroyingcl->sslctx.rfbssl_destroy()idempotent by returning early for NULL context and clearingcl->sslctxbefore freeing backend objects.rfbssl_destroy()idempotent in the same way.cl->wspathafter freeing it.Validation
Local build and tests without TLS:
cmake -S . -B build-665-patch \ -DWITH_EXAMPLES=OFF \ -DWITH_TESTS=ON \ -DWITH_OPENSSL=OFF \ -DWITH_GNUTLS=OFF \ -DWITH_GCRYPT=OFF \ -DWITH_SDL=OFF \ -DWITH_GTK=OFF \ -DWITH_QT=OFF \ -DWITH_FFMPEG=OFF \ -DWITH_XCB=OFF \ -DWITH_LIBSSHTUNNEL=OFF \ -DWITH_SYSTEMD=OFF \ -DCMAKE_BUILD_TYPE=Debug cmake --build build-665-patch --parallel 1 ctest --test-dir build-665-patch --output-on-failureResult:
Local build and tests with OpenSSL enabled:
cmake -S . -B build-665-openssl \ -DWITH_EXAMPLES=OFF \ -DWITH_TESTS=ON \ -DWITH_OPENSSL=ON \ -DWITH_GNUTLS=OFF \ -DWITH_GCRYPT=OFF \ -DWITH_SDL=OFF \ -DWITH_GTK=OFF \ -DWITH_QT=OFF \ -DWITH_FFMPEG=OFF \ -DWITH_XCB=OFF \ -DWITH_LIBSSHTUNNEL=OFF \ -DWITH_SYSTEMD=OFF \ -DCMAKE_BUILD_TYPE=Debug cmake --build build-665-openssl --parallel 1 ctest --test-dir build-665-openssl --output-on-failureResult:
WSS disconnect stress smoke
Validated with an OpenSSL-enabled AddressSanitizer build using
examples/server/camera with WSS enabled and a Python stress client that performs
TLS connect, WebSocket upgrade, RFB 3.8 handshake, SetEncodings, framebuffer
update requests, and abrupt disconnects in parallel.
Stress result:
Notes
Closes #665.