Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[PLAT-7010 ] Fix strlen crash in bsg_ksmachgetThreadQueueName #1157

Merged
merged 2 commits into from
Jul 23, 2021
Merged

[PLAT-7010 ] Fix strlen crash in bsg_ksmachgetThreadQueueName #1157

merged 2 commits into from
Jul 23, 2021

Conversation

nickdowell
Copy link
Contributor

Goal

Fixes a (rare) crash in bsg_ksmachgetThreadQueueName when calling strlen for a dispatch queue label.

Exception Type:        EXC_BAD_ACCESS (SIGSEGV)
Exception Codes:       EXC_I386_GPFLT

Thread 0 Crashed:: Dispatch queue: com.apple.main-thread
0   libsystem_c.dylib    0x111c07172 strlen + 18
1   com.bugsnag.Bugsnag  0x12075d21a bsg_ksmachgetThreadQueueName + 442 (BSG_KSMach.c:336)
2   com.bugsnag.Bugsnag  0x12074b1a7 -[BugsnagThread initWithMachThread:backtraceAddresses:backtraceLength:errorReportingThread:index:] + 231
3   com.bugsnag.Bugsnag  0x12074aa62 +[BugsnagThread allThreadsWithCurrentThreadBacktrace:] + 690 BugsnagThread.m:247)
4   com.bugsnag.Bugsnag  0x12074a6c3 +[BugsnagThread allThreads:callStackReturnAddresses:] + 51 (BugsnagThread.m:206)
5   com.bugsnag.Bugsnag  0x120721c71 -[BugsnagClient notify:handledState:block:] + 497 (BugsnagClient.m:856)
6   com.bugsnag.Bugsnag  0x120720f01 -[BugsnagClient notifyError:] + 385 (BugsnagClient.m:766)

Analysis

When a thread is being destroyed, its dispatch_queue's memory may be deallocated (and reused for something else) while bsg_ksmachgetThreadQueueName is executing, resulting in calling dispatch_queue_get_label with an invalid pointer.

Previous fixes ensured that the dispatch_queue points to readable memory, but since dispatch_queue_get_label simply returns a pointer from an offset into the struct, an invalid pointer could be returned that would cause strlen to crash.

Changeset

vm_read_overwrite is now used to safely read from the pointer returned by dispatch_queue_get_label.

Testing

A unit test case has been added that is able to reliably reproduce the crash (without the fix in place) when MallocScribble is enabled.

See https://buildkite.com/bugsnag/bugsnag-cocoa/builds/3068 for positive detection of the crash without the fix in place.

@nickdowell nickdowell requested review from kstenerud and kattrali July 22, 2021 14:18
@github-actions
Copy link

Infer: No issues found 🎉

OCLint: No issues found 🎉

Bugsnag.framework binary size did not change - 1,133,880 bytes

Generated by 🚫 Danger

@nickdowell nickdowell merged commit 91c55d1 into next Jul 23, 2021
@nickdowell nickdowell deleted the nickdowell/fix-thread-name-crash branch July 23, 2021 12:56
@nickdowell nickdowell mentioned this pull request Aug 4, 2021
Merged
@imjoehaines imjoehaines mentioned this pull request Aug 16, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kstenerud kstenerud kstenerud approved these changes

@kattrali kattrali Awaiting requested review from kattrali

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nickdowell @kstenerud