ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-19 23:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NOVA: fix invalid cap detection

Browse Source
This commit is contained in:
Alexander Boettcher
2012-08-10 10:09:42 +02:00
committed by Norman Feske
parent 8526dc4f19
commit dddd602b48
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
base-nova/include/base/native_types.h
View File

@ -70,6 +70,7 @@ namespace Genode {
class Native_capability class Native_capability
{ {
public: public:
typedef Nova::Obj_crd Dst; typedef Nova::Obj_crd Dst;
struct Raw struct Raw
@ -83,6 +84,7 @@ namespace Genode {
}; };
private: private:
struct _Raw struct _Raw
{ {
Dst dst; Dst dst;
@ -98,6 +100,7 @@ namespace Genode {
addr_t _rcv_window; addr_t _rcv_window;
enum { INVALID_INDEX = ~0UL }; enum { INVALID_INDEX = ~0UL };
protected: protected:
explicit explicit
@ -106,17 +109,26 @@ namespace Genode {
_rcv_window(INVALID_INDEX) {} _rcv_window(INVALID_INDEX) {}
public: public:
/** /**
* Constructors * Constructors
*/ */
Native_capability() Native_capability()
: _cap(), _trans_map(true), _ptr(0), : _cap(), _trans_map(true), _ptr(0), _rcv_window(INVALID_INDEX) {}
_rcv_window(INVALID_INDEX) {}
explicit explicit
Native_capability(addr_t sel, unsigned rights = 0x1f) Native_capability(addr_t sel, unsigned rights = 0x1f)
: _cap(sel, rights), _trans_map(true), _ptr(0), {
_rcv_window(INVALID_INDEX) {} if (sel == INVALID_INDEX)
_cap = _Raw();
else
_cap = _Raw(sel, rights);
_trans_map = true;
_ptr = 0;
_rcv_window = INVALID_INDEX;
}
Native_capability(const Native_capability &o) Native_capability(const Native_capability &o)
: _cap(o._cap), _trans_map(o._trans_map), _ptr(o._ptr), : _cap(o._cap), _trans_map(o._trans_map), _ptr(o._ptr),
@ -142,11 +154,7 @@ namespace Genode {
* Check whether the selector of the Native_cap and * Check whether the selector of the Native_cap and
* the capability type is valid. * the capability type is valid.
*/ */
bool valid() const bool valid() const { return !_cap.dst.is_null(); }
{
return !_cap.dst.is_null() &&
_cap.dst.base() != INVALID_INDEX;
}
Dst dst() const { return _cap.dst; } Dst dst() const { return _cap.dst; }
@ -191,7 +199,7 @@ namespace Genode {
*/ */
static Native_capability invalid_cap() static Native_capability invalid_cap()
{ {
return Native_capability(INVALID_INDEX); return Native_capability();
} }
/** /**