Unverified Commit 8144ffc4 authored by Pete Stevenson's avatar Pete Stevenson Committed by Copybara
Browse files

Fix pem crash in socket_tracer by converting ConsumeValueOrDie() to PL_ASSIGN_OR_RETURN.


Summary: TSIA

Test Plan: Existing & tested on dev clusters.

Reviewers: #stirling, oazizi

Reviewed By: #stirling, oazizi
Signed-off-by: default avatarPete Stevenson <jps@pixielabs.ai>

Differential Revision: https://phab.corp.pixielabs.ai/D11346

GitOrigin-RevId: b55a5544a5cca22c34bba2fa2e662bbd34666f3c
Showing with 4 additions and 4 deletions
+4 -4
......@@ -269,10 +269,6 @@ StatusOr<int> UProbeManager::AttachOpenSSLUProbesOnDynamicLib(uint32_t pid) {
return 0;
}
auto reader = ElfReader::Create(container_libcrypto).ConsumeValueOrDie();
auto fptr_manager = std::unique_ptr<RawFptrManager>(
new RawFptrManager(reader.get(), proc_parser_.get(), container_libcrypto));
// Convert to host path, in case we're running inside a container ourselves.
container_libssl = sysconfig.ToHostPath(container_libssl);
container_libcrypto = sysconfig.ToHostPath(container_libcrypto);
......@@ -284,6 +280,10 @@ StatusOr<int> UProbeManager::AttachOpenSSLUProbesOnDynamicLib(uint32_t pid) {
return error::Internal("libcrypto not found [path = $0]", container_libcrypto.string());
}
PL_ASSIGN_OR_RETURN(auto reader, ElfReader::Create(container_libcrypto));
auto fptr_manager = std::unique_ptr<RawFptrManager>(
new RawFptrManager(reader.get(), proc_parser_.get(), container_libcrypto));
PL_RETURN_IF_ERROR(UpdateOpenSSLSymAddrs(fptr_manager.get(), container_libcrypto, pid));
// Only try probing .so files that we haven't already set probes on.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment