This is an archive of the discontinued LLVM Phabricator instance.

Differential D61218

Fix a stack-smasher in PlatformMacOSX::GetSDKDirectory()
ClosedPublic

Authored by aprantl on Apr 26 2019, 5:10 PM.

Details

Reviewers
jingham
jasonmolenda
Commits
rGa93e77c1c711: Fix a stack-smasher in PlatformMacOSX::GetSDKDirectory()
rLLDB359471: Fix a stack-smasher in PlatformMacOSX::GetSDKDirectory()
rL359471: Fix a stack-smasher in PlatformMacOSX::GetSDKDirectory()
Summary

GetSDKVersion expects the number of version fields not their byte size and will happily overwrite later contents of the stack.

I just found this by accident while stepping through the function and noticing that the backtrace disappears halfway through the function.

Diff Detail

Event Timeline

aprantl created this revision.Apr 26 2019, 5:10 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 26 2019, 5:10 PM
aprantl added a child revision: D61219: [WIP] Enable std module import tests on Darwin.Apr 26 2019, 5:16 PM
jasonmolenda accepted this revision.Apr 26 2019, 5:27 PM

LGTM.

This revision is now accepted and ready to land.Apr 26 2019, 5:27 PM
teemperor mentioned this in D61233: Refactor ObjectFile::GetSDKVersion.Apr 27 2019, 12:56 PM
Closed by commit rL359471: Fix a stack-smasher in PlatformMacOSX::GetSDKDirectory() (authored by adrian). · Explain WhyApr 29 2019, 10:26 AM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptApr 29 2019, 10:26 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
teemperor mentioned this in rGe0afcd8d266e: Refactor ObjectFile::GetSDKVersion.Jul 3 2019, 3:25 PM
teemperor mentioned this in rL365090: Refactor ObjectFile::GetSDKVersion.

Revision Contents

PathSize
lldb/
source/
Plugins/
Platform/
MacOSX/
2 lines

Diff 196931

lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp

Show First 20 Lines • Show All 158 Lines • ▼ Show 20 LinesConstString PlatformMacOSX::GetSDKDirectory(lldb_private::Target &target) {
ModuleSP exe_module_sp(target.GetExecutableModule()); ModuleSP exe_module_sp(target.GetExecutableModule());
if (exe_module_sp) { if (exe_module_sp) {
ObjectFile *objfile = exe_module_sp->GetObjectFile(); ObjectFile *objfile = exe_module_sp->GetObjectFile();
if (objfile) { if (objfile) {
std::string xcode_contents_path; std::string xcode_contents_path;
std::string default_xcode_sdk; std::string default_xcode_sdk;
FileSpec fspec; FileSpec fspec;
uint32_t versions[2]; uint32_t versions[2];
if (objfile->GetSDKVersion(versions, sizeof(versions))) { if (objfile->GetSDKVersion(versions, 2)) {
fspec = HostInfo::GetShlibDir(); fspec = HostInfo::GetShlibDir();
if (fspec) { if (fspec) {
std::string path; std::string path;
xcode_contents_path = fspec.GetPath(); xcode_contents_path = fspec.GetPath();
size_t pos = xcode_contents_path.find("/Xcode.app/Contents/"); size_t pos = xcode_contents_path.find("/Xcode.app/Contents/");
if (pos != std::string::npos) { if (pos != std::string::npos) {
// LLDB.framework is inside an Xcode app bundle, we can locate the // LLDB.framework is inside an Xcode app bundle, we can locate the
// SDK from here // SDK from here
▲ Show 20 Lines • Show All 163 Lines • Show Last 20 Lines