ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not marshal invalid capabilities on NOVA/x86 

We send a local name of ~0L instead, if this is encountered during the
unmarshalling we generate an invalid 'Native_capability' (Fixes #148).
This commit is contained in:
Sebastian Sumpf 2012-03-13 15:44:23 +01:00 committed by Norman Feske
parent c5e2fa06cb
commit bbce38cb36
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
base-nova/include/base/ipc.h
View File

@ -19,9 +19,11 @@
inline void Genode::Ipc_ostream::_marshal_capability(Genode::Native_capability const &cap)
{
long unique_id = cap.local_name();
long unique_id = cap.valid() ? cap.local_name() : ~0L;
_write_to_buf(unique_id);
_snd_msg->snd_append_pt_sel(cap.dst());
if (cap.valid())
_snd_msg->snd_append_pt_sel(cap.dst());
}
@ -29,7 +31,7 @@ inline void Genode::Ipc_istream::_unmarshal_capability(Genode::Native_capability
{
long unique_id = 0;
_read_from_buf(unique_id);
int pt_sel = _rcv_msg->rcv_pt_sel();
int pt_sel = unique_id != ~0L ? _rcv_msg->rcv_pt_sel() : 0;
cap = Native_capability(pt_sel, unique_id);
}