Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
4fe19777
Commit
4fe19777
authored
10 years ago
by
Chip Davis
Committed by
Alexandre Julliard
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
server: Use mach_vm_* functions instead of the old vm_* functions.
parent
f3c34daa
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
server/mach.c
+28
-25
28 additions, 25 deletions
server/mach.c
with
28 additions
and
25 deletions
server/mach.c
+
28
−
25
View file @
4fe19777
...
@@ -48,6 +48,7 @@
...
@@ -48,6 +48,7 @@
#include
<mach/mach.h>
#include
<mach/mach.h>
#include
<mach/mach_error.h>
#include
<mach/mach_error.h>
#include
<mach/thread_act.h>
#include
<mach/thread_act.h>
#include
<mach/mach_vm.h>
#include
<servers/bootstrap.h>
#include
<servers/bootstrap.h>
static
mach_port_t
server_mach_port
;
static
mach_port_t
server_mach_port
;
...
@@ -277,9 +278,10 @@ int read_process_memory( struct process *process, client_ptr_t ptr, data_size_t
...
@@ -277,9 +278,10 @@ int read_process_memory( struct process *process, client_ptr_t ptr, data_size_t
{
{
kern_return_t
ret
;
kern_return_t
ret
;
mach_msg_type_number_t
bytes_read
;
mach_msg_type_number_t
bytes_read
;
vm_offset_t
offset
,
data
;
mach_vm_offset_t
offset
;
vm_address_t
aligned_address
;
vm_offset_t
data
;
vm_size_t
aligned_size
;
mach_vm_address_t
aligned_address
;
mach_vm_size_t
aligned_size
;
unsigned
int
page_size
=
get_page_size
();
unsigned
int
page_size
=
get_page_size
();
mach_port_t
process_port
=
get_process_port
(
process
);
mach_port_t
process_port
=
get_process_port
(
process
);
...
@@ -288,7 +290,7 @@ int read_process_memory( struct process *process, client_ptr_t ptr, data_size_t
...
@@ -288,7 +290,7 @@ int read_process_memory( struct process *process, client_ptr_t ptr, data_size_t
set_error
(
STATUS_ACCESS_DENIED
);
set_error
(
STATUS_ACCESS_DENIED
);
return
0
;
return
0
;
}
}
if
((
vm_address_t
)
ptr
!=
ptr
)
if
((
mach_
vm_address_t
)
ptr
!=
ptr
)
{
{
set_error
(
STATUS_ACCESS_DENIED
);
set_error
(
STATUS_ACCESS_DENIED
);
return
0
;
return
0
;
...
@@ -301,15 +303,15 @@ int read_process_memory( struct process *process, client_ptr_t ptr, data_size_t
...
@@ -301,15 +303,15 @@ int read_process_memory( struct process *process, client_ptr_t ptr, data_size_t
}
}
offset
=
ptr
%
page_size
;
offset
=
ptr
%
page_size
;
aligned_address
=
(
vm_address_t
)(
ptr
-
offset
);
aligned_address
=
(
mach_
vm_address_t
)(
ptr
-
offset
);
aligned_size
=
(
size
+
offset
+
page_size
-
1
)
/
page_size
*
page_size
;
aligned_size
=
(
size
+
offset
+
page_size
-
1
)
/
page_size
*
page_size
;
ret
=
vm_read
(
process_port
,
aligned_address
,
aligned_size
,
&
data
,
&
bytes_read
);
ret
=
mach_
vm_read
(
process_port
,
aligned_address
,
aligned_size
,
&
data
,
&
bytes_read
);
if
(
ret
!=
KERN_SUCCESS
)
mach_set_error
(
ret
);
if
(
ret
!=
KERN_SUCCESS
)
mach_set_error
(
ret
);
else
else
{
{
memcpy
(
dest
,
(
char
*
)
data
+
offset
,
size
);
memcpy
(
dest
,
(
char
*
)
data
+
offset
,
size
);
vm_deallocate
(
mach_task_self
(),
data
,
bytes_read
);
mach_
vm_deallocate
(
mach_task_self
(),
data
,
bytes_read
);
}
}
task_resume
(
process_port
);
task_resume
(
process_port
);
return
(
ret
==
KERN_SUCCESS
);
return
(
ret
==
KERN_SUCCESS
);
...
@@ -319,11 +321,12 @@ int read_process_memory( struct process *process, client_ptr_t ptr, data_size_t
...
@@ -319,11 +321,12 @@ int read_process_memory( struct process *process, client_ptr_t ptr, data_size_t
int
write_process_memory
(
struct
process
*
process
,
client_ptr_t
ptr
,
data_size_t
size
,
const
char
*
src
)
int
write_process_memory
(
struct
process
*
process
,
client_ptr_t
ptr
,
data_size_t
size
,
const
char
*
src
)
{
{
kern_return_t
ret
;
kern_return_t
ret
;
vm_address_t
aligned_address
,
region_address
;
mach_
vm_address_t
aligned_address
,
region_address
;
vm_size_t
aligned_size
,
region_size
;
mach_
vm_size_t
aligned_size
,
region_size
;
mach_msg_type_number_t
info_size
,
bytes_read
;
mach_msg_type_number_t
info_size
,
bytes_read
;
vm_offset_t
offset
,
task_mem
=
0
;
mach_vm_offset_t
offset
;
struct
vm_region_basic_info
info
;
vm_offset_t
task_mem
=
0
;
struct
vm_region_basic_info_64
info
;
mach_port_t
dummy
;
mach_port_t
dummy
;
unsigned
int
page_size
=
get_page_size
();
unsigned
int
page_size
=
get_page_size
();
mach_port_t
process_port
=
get_process_port
(
process
);
mach_port_t
process_port
=
get_process_port
(
process
);
...
@@ -333,14 +336,14 @@ int write_process_memory( struct process *process, client_ptr_t ptr, data_size_t
...
@@ -333,14 +336,14 @@ int write_process_memory( struct process *process, client_ptr_t ptr, data_size_t
set_error
(
STATUS_ACCESS_DENIED
);
set_error
(
STATUS_ACCESS_DENIED
);
return
0
;
return
0
;
}
}
if
((
vm_address_t
)
ptr
!=
ptr
)
if
((
mach_
vm_address_t
)
ptr
!=
ptr
)
{
{
set_error
(
STATUS_ACCESS_DENIED
);
set_error
(
STATUS_ACCESS_DENIED
);
return
0
;
return
0
;
}
}
offset
=
ptr
%
page_size
;
offset
=
ptr
%
page_size
;
aligned_address
=
(
vm_address_t
)(
ptr
-
offset
);
aligned_address
=
(
mach_
vm_address_t
)(
ptr
-
offset
);
aligned_size
=
(
size
+
offset
+
page_size
-
1
)
/
page_size
*
page_size
;
aligned_size
=
(
size
+
offset
+
page_size
-
1
)
/
page_size
*
page_size
;
if
((
ret
=
task_suspend
(
process_port
))
!=
KERN_SUCCESS
)
if
((
ret
=
task_suspend
(
process_port
))
!=
KERN_SUCCESS
)
...
@@ -349,7 +352,7 @@ int write_process_memory( struct process *process, client_ptr_t ptr, data_size_t
...
@@ -349,7 +352,7 @@ int write_process_memory( struct process *process, client_ptr_t ptr, data_size_t
return
0
;
return
0
;
}
}
ret
=
vm_read
(
process_port
,
aligned_address
,
aligned_size
,
&
task_mem
,
&
bytes_read
);
ret
=
mach_
vm_read
(
process_port
,
aligned_address
,
aligned_size
,
&
task_mem
,
&
bytes_read
);
if
(
ret
!=
KERN_SUCCESS
)
if
(
ret
!=
KERN_SUCCESS
)
{
{
mach_set_error
(
ret
);
mach_set_error
(
ret
);
...
@@ -357,7 +360,7 @@ int write_process_memory( struct process *process, client_ptr_t ptr, data_size_t
...
@@ -357,7 +360,7 @@ int write_process_memory( struct process *process, client_ptr_t ptr, data_size_t
}
}
region_address
=
aligned_address
;
region_address
=
aligned_address
;
info_size
=
sizeof
(
info
);
info_size
=
sizeof
(
info
);
ret
=
vm_region
(
process_port
,
&
region_address
,
&
region_size
,
VM_REGION_BASIC_INFO
,
ret
=
mach_
vm_region
(
process_port
,
&
region_address
,
&
region_size
,
VM_REGION_BASIC_INFO
_64
,
(
vm_region_info_t
)
&
info
,
&
info_size
,
&
dummy
);
(
vm_region_info_t
)
&
info
,
&
info_size
,
&
dummy
);
if
(
ret
!=
KERN_SUCCESS
)
if
(
ret
!=
KERN_SUCCESS
)
{
{
...
@@ -371,7 +374,7 @@ int write_process_memory( struct process *process, client_ptr_t ptr, data_size_t
...
@@ -371,7 +374,7 @@ int write_process_memory( struct process *process, client_ptr_t ptr, data_size_t
set_error
(
ERROR_ACCESS_DENIED
);
set_error
(
ERROR_ACCESS_DENIED
);
goto
failed
;
goto
failed
;
}
}
ret
=
vm_protect
(
process_port
,
aligned_address
,
aligned_size
,
0
,
VM_PROT_READ
|
VM_PROT_WRITE
);
ret
=
mach_
vm_protect
(
process_port
,
aligned_address
,
aligned_size
,
0
,
VM_PROT_READ
|
VM_PROT_WRITE
);
if
(
ret
!=
KERN_SUCCESS
)
if
(
ret
!=
KERN_SUCCESS
)
{
{
mach_set_error
(
ret
);
mach_set_error
(
ret
);
...
@@ -385,19 +388,19 @@ int write_process_memory( struct process *process, client_ptr_t ptr, data_size_t
...
@@ -385,19 +388,19 @@ int write_process_memory( struct process *process, client_ptr_t ptr, data_size_t
memcpy
(
(
char
*
)
task_mem
+
offset
,
src
,
size
);
memcpy
(
(
char
*
)
task_mem
+
offset
,
src
,
size
);
ret
=
vm_write
(
process_port
,
aligned_address
,
task_mem
,
bytes_read
);
ret
=
mach_
vm_write
(
process_port
,
aligned_address
,
task_mem
,
bytes_read
);
if
(
ret
!=
KERN_SUCCESS
)
mach_set_error
(
ret
);
if
(
ret
!=
KERN_SUCCESS
)
mach_set_error
(
ret
);
else
else
{
{
vm_deallocate
(
mach_task_self
(),
task_mem
,
bytes_read
);
mach_
vm_deallocate
(
mach_task_self
(),
task_mem
,
bytes_read
);
/* restore protection */
/* restore protection */
vm_protect
(
process_port
,
aligned_address
,
aligned_size
,
0
,
info
.
protection
);
mach_
vm_protect
(
process_port
,
aligned_address
,
aligned_size
,
0
,
info
.
protection
);
task_resume
(
process_port
);
task_resume
(
process_port
);
return
1
;
return
1
;
}
}
failed:
failed:
if
(
task_mem
)
vm_deallocate
(
mach_task_self
(),
task_mem
,
bytes_read
);
if
(
task_mem
)
mach_
vm_deallocate
(
mach_task_self
(),
task_mem
,
bytes_read
);
task_resume
(
process_port
);
task_resume
(
process_port
);
return
0
;
return
0
;
}
}
...
@@ -427,11 +430,11 @@ void get_selector_entry( struct thread *thread, int entry, unsigned int *base,
...
@@ -427,11 +430,11 @@ void get_selector_entry( struct thread *thread, int entry, unsigned int *base,
if
((
ret
=
task_suspend
(
process_port
))
==
KERN_SUCCESS
)
if
((
ret
=
task_suspend
(
process_port
))
==
KERN_SUCCESS
)
{
{
vm_offset_t
offset
=
process
->
ldt_copy
%
page_size
;
mach_
vm_offset_t
offset
=
process
->
ldt_copy
%
page_size
;
vm_address_t
aligned_address
=
(
vm_address_t
)(
process
->
ldt_copy
-
offset
);
mach_
vm_address_t
aligned_address
=
(
mach_
vm_address_t
)(
process
->
ldt_copy
-
offset
);
vm_size_t
aligned_size
=
(
total_size
+
offset
+
page_size
-
1
)
/
page_size
*
page_size
;
mach_
vm_size_t
aligned_size
=
(
total_size
+
offset
+
page_size
-
1
)
/
page_size
*
page_size
;
ret
=
vm_read
(
process_port
,
aligned_address
,
aligned_size
,
&
data
,
&
bytes_read
);
ret
=
mach_
vm_read
(
process_port
,
aligned_address
,
aligned_size
,
&
data
,
&
bytes_read
);
if
(
ret
!=
KERN_SUCCESS
)
mach_set_error
(
ret
);
if
(
ret
!=
KERN_SUCCESS
)
mach_set_error
(
ret
);
else
else
{
{
...
@@ -439,7 +442,7 @@ void get_selector_entry( struct thread *thread, int entry, unsigned int *base,
...
@@ -439,7 +442,7 @@ void get_selector_entry( struct thread *thread, int entry, unsigned int *base,
memcpy
(
base
,
ldt
+
entry
,
sizeof
(
int
)
);
memcpy
(
base
,
ldt
+
entry
,
sizeof
(
int
)
);
memcpy
(
limit
,
ldt
+
entry
+
8192
,
sizeof
(
int
)
);
memcpy
(
limit
,
ldt
+
entry
+
8192
,
sizeof
(
int
)
);
memcpy
(
flags
,
(
char
*
)(
ldt
+
2
*
8192
)
+
entry
,
1
);
memcpy
(
flags
,
(
char
*
)(
ldt
+
2
*
8192
)
+
entry
,
1
);
vm_deallocate
(
mach_task_self
(),
data
,
bytes_read
);
mach_
vm_deallocate
(
mach_task_self
(),
data
,
bytes_read
);
}
}
task_resume
(
process_port
);
task_resume
(
process_port
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment