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

base-linux: fix delegation of invalid capabilities 

This patch uses a local_name of -1 to encode an invalid capability.
This commit is contained in:
Norman Feske 2013-01-03 20:25:46 +01:00
parent 693d657e6a
commit 9b24115c08
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
base-linux/include/base/ipc.h
View File

@ -19,10 +19,13 @@
inline void Genode::Ipc_ostream::_marshal_capability(Genode::Native_capability const &cap)
{
_write_to_buf(cap.local_name());
if (cap.valid()) {
_write_to_buf(cap.local_name());
if (cap.valid())
_snd_msg->append_cap(cap.dst().socket);
} else {
_write_to_buf(-1L);
}
}
@ -31,8 +34,17 @@ inline void Genode::Ipc_istream::_unmarshal_capability(Genode::Native_capability
long local_name = 0;
_read_from_buf(local_name);
int const socket = _rcv_msg->read_cap();
cap = Native_capability(Cap_dst_policy::Dst(socket), local_name);
if (local_name == -1) {
/* construct invalid capability */
cap = Genode::Native_capability();
} else {
/* construct valid capability */
int const socket = _rcv_msg->read_cap();
cap = Native_capability(Cap_dst_policy::Dst(socket), local_name);
}
}
#endif /* _INCLUDE__BASE__IPC_H_ */