diff options
author | Bryan McLellan <btm@loftninjas.org> | 2018-03-16 12:01:57 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-16 12:01:57 -0400 |
commit | 7768b36f62cf02ba6d2318cc2927e6fc70445570 (patch) | |
tree | c5dca260ae4644d66b032c8803690d710ab9c41e | |
parent | efaf379770ca72d3acc4af1bff18c200d6d2e366 (diff) | |
parent | 2d32338f4e216341da87c8572af38667483e8181 (diff) | |
download | chef-7768b36f62cf02ba6d2318cc2927e6fc70445570.tar.gz |
Merge pull request #6991 from chef/btm/13-fix-lsa-heap-corruption
Pass pointer to LsaFreeMemory, not FFI::MemoryPointer
-rw-r--r-- | lib/chef/win32/security.rb | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/lib/chef/win32/security.rb b/lib/chef/win32/security.rb index c7d3f55a40..a58fa48399 100644 --- a/lib/chef/win32/security.rb +++ b/lib/chef/win32/security.rb @@ -113,10 +113,7 @@ class Chef with_lsa_policy(name) do |policy_handle, sid| result = LsaAddAccountRights(policy_handle.read_pointer, sid, privilege_pointer, 1) - win32_error = LsaNtStatusToWinError(result) - if win32_error != 0 - Chef::ReservedNames::Win32::Error.raise!(nil, win32_error) - end + test_and_raise_lsa_nt_status(result) end end @@ -190,15 +187,14 @@ class Chef result = LsaEnumerateAccountRights(policy_handle.read_pointer, sid, privilege_pointer, privilege_length) win32_error = LsaNtStatusToWinError(result) return [] if win32_error == 2 # FILE_NOT_FOUND - No rights assigned - if win32_error != 0 - Chef::ReservedNames::Win32::Error.raise!(nil, win32_error) - end + test_and_raise_lsa_nt_status(result) privilege_length.read_ulong.times do |i| privilege = LSA_UNICODE_STRING.new(privilege_pointer.read_pointer + i * LSA_UNICODE_STRING.size) privileges << privilege[:Buffer].read_wstring end - LsaFreeMemory(privilege_pointer) + result = LsaFreeMemory(privilege_pointer.read_pointer) + test_and_raise_lsa_nt_status(result) end privileges @@ -595,18 +591,13 @@ class Chef policy_handle = FFI::MemoryPointer.new(:pointer) result = LsaOpenPolicy(nil, LSA_OBJECT_ATTRIBUTES.new, access, policy_handle) - win32_error = LsaNtStatusToWinError(result) - if win32_error != 0 - Chef::ReservedNames::Win32::Error.raise!(nil, win32_error) - end + test_and_raise_lsa_nt_status(result) begin yield policy_handle, sid.pointer ensure - win32_error = LsaNtStatusToWinError(LsaClose(policy_handle.read_pointer)) - if win32_error != 0 - Chef::ReservedNames::Win32::Error.raise!(nil, win32_error) - end + result = LsaClose(policy_handle.read_pointer) + test_and_raise_lsa_nt_status(result) end end @@ -654,6 +645,13 @@ class Chef end Token.new(Handle.new(token.read_pointer)) end + + def test_and_raise_lsa_nt_status(result) + win32_error = LsaNtStatusToWinError(result) + if win32_error != 0 + Chef::ReservedNames::Win32::Error.raise!(nil, win32_error) + end + end end end end |