portugalfuturista/seL4
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SELFOUR-421: added device check to sameObjectAs

Browse source
This commit is contained in:
Joel Beeren 2016-02-29 16:58:10 +11:00 committed by Adrian Danis
parent 2d74ae7eb8
commit 2ffb8d0089
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/arch/arm/32/object/objecttype.c
View file

@ -471,8 +471,10 @@ Arch_sameObjectAs(cap_t cap_a, cap_t cap_b)
{
if (cap_get_capType(cap_a) == cap_small_frame_cap) {
if (cap_get_capType(cap_b) == cap_small_frame_cap) {
return (cap_small_frame_cap_get_capFBasePtr(cap_a) ==
cap_small_frame_cap_get_capFBasePtr(cap_b));
return ((cap_small_frame_cap_get_capFBasePtr(cap_a) ==
cap_small_frame_cap_get_capFBasePtr(cap_b)) &&
(cap_small_frame_cap_get_capFIsDevice(cap_a) ==
cap_small_frame_cap_get_capFIsDevice(cap_b)));
} else if (cap_get_capType(cap_b) == cap_frame_cap) {
return false;
}
@ -482,7 +484,9 @@ Arch_sameObjectAs(cap_t cap_a, cap_t cap_b)
return ((cap_frame_cap_get_capFBasePtr(cap_a) ==
cap_frame_cap_get_capFBasePtr(cap_b)) &&
(cap_frame_cap_get_capFSize(cap_a) ==
cap_frame_cap_get_capFSize(cap_b)));
cap_frame_cap_get_capFSize(cap_b)) &&
(cap_frame_cap_get_capFIsDevice(cap_a) ==
cap_frame_cap_get_capFIsDevice(cap_b)));
} else if (cap_get_capType(cap_b) == cap_small_frame_cap) {
return false;
}