From b277f588fb5582f5e396a290f0d87febe1088c5e Mon Sep 17 00:00:00 2001
From: Meatballs <eat_meatballs@hotmail.co.uk>
Date: Sun, 10 Aug 2014 21:52:12 +0100
Subject: [PATCH] Use railgun helper functions

---
 lib/msf/core/exploit/local/windows_kernel.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/msf/core/exploit/local/windows_kernel.rb b/lib/msf/core/exploit/local/windows_kernel.rb
index 5917334220..5346946254 100644
--- a/lib/msf/core/exploit/local/windows_kernel.rb
+++ b/lib/msf/core/exploit/local/windows_kernel.rb
@@ -48,23 +48,23 @@ module Exploit::Local::WindowsKernel
   # @return [nil] If the name specified could not be found.
   #
   def find_sys_base(drvname)
-    if sysinfo['Architecture'] =~ /(x86|wow64)/i
-      ptr_size = 4
+    if session.railgun.util.pointer_size == 8
+      ptr = '<Q'
     else
-      ptr_size = 8
+      ptr = 'V'
     end
 
-    results = session.railgun.psapi.EnumDeviceDrivers(0, 0, ptr_size)
+    results = session.railgun.psapi.EnumDeviceDrivers(0, 0, session.railgun.util.pointer_size)
     unless results['return']
       print_error("EnumDeviceDrivers failed (error: #{results['GetLastError']} #{results['ErrorMessage']})")
       return nil
     end
-    results = session.railgun.psapi.EnumDeviceDrivers(results['lpcbNeeded'], results['lpcbNeeded'], ptr_size)
+    results = session.railgun.psapi.EnumDeviceDrivers(results['lpcbNeeded'], results['lpcbNeeded'], session.railgun.util.pointer_size)
     unless results['return']
       print_error("EnumDeviceDrivers failed (error: #{results['GetLastError']} #{results['ErrorMessage']})")
       return nil
     end
-    addresses = results['lpImageBase'][0..results['lpcbNeeded'] - 1].unpack((ptr_size == 4 ? 'V' : 'Q') + '*')
+    addresses = results['lpImageBase'][0..results['lpcbNeeded'] - 1].unpack("#{ptr}*")
 
     addresses.each do |address|
       results = session.railgun.psapi.GetDeviceDriverBaseNameA(address, 48, 48)