sambuc/codezero
1
0
Fork 0
mirror of https://github.com/drasko/codezero.git synced 2026-01-16 12:53:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplified cap id finding and destroying it.

Browse Source 
It is not very straightforward to reach a capabilities list. We
now use a single function to find out a capability by its id and
its list, since the two are used frequently together (i.e. cap
removal and destruction)
This commit is contained in:
Bahadir Balban
2009-11-09 23:50:03 +02:00
parent ff14ce4735
commit d43fa1d3ae
3 changed files with 27 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/generic/capability.c
View File

@@ -128,70 +128,35 @@ struct capability *capability_find_by_rtype(struct ktcb *task,
return 0;
}
/*
* FIXME: Make these functions pass a match function to cap_find()
* and remove all duplication. Same goes for find_rtype.
*/
struct capability *cap_find_byid(l4id_t capid)
struct capability *cap_find_by_capid(l4id_t capid, struct cap_list **cap_list)
{
struct capability *cap;
struct ktcb *task = current;
/* Search task's own list */
list_foreach_struct(cap, &task->cap_list.caps, list)
if (cap->capid == capid)
if (cap->capid == capid) {
*cap_list = &task->cap_list;
return cap;
}
/* Search space list */
list_foreach_struct(cap, &task->space->cap_list.caps, list)
if (cap->capid == capid)
if (cap->capid == capid) {
*cap_list = &task->space->cap_list;
return cap;
}
/* Search container list */
list_foreach_struct(cap, &task->container->cap_list.caps, list)
if (cap->capid == capid)
if (cap->capid == capid) {
*cap_list = &task->container->cap_list;
return cap;
}
return 0;
}
/*
* TODO: Instead of destroying, use cap_find_byid match function's
* match_args to pass a pointer to the capability list, so the
* caller may destroy it
*/
int cap_find_destroy(l4id_t capid)
{
struct capability *cap;
struct ktcb *task = current;
/* Search task's own list */
list_foreach_struct(cap, &task->cap_list.caps, list)
if (cap->capid == capid) {
cap_list_remove(cap, &task->cap_list);
free_capability(cap);
return 0;
}
/* Search space list */
list_foreach_struct(cap, &task->space->cap_list.caps, list)
if (cap->capid == capid) {
cap_list_remove(cap, &task->space->cap_list);
free_capability(cap);
return 0;
}
/* Search container list */
list_foreach_struct(cap, &task->container->cap_list.caps, list)
if (cap->capid == capid) {
cap_list_remove(cap, &task->container->cap_list);
free_capability(cap);
return 0;
}
return -EEXIST;
}
typedef struct capability *(*cap_match_func_t) \
(struct capability *cap, void *match_args);
@@ -543,7 +508,6 @@ struct capability *cap_match_thread(struct capability *cap,
if (!(cap->access & CAP_TCTRL_WAIT))
return 0;
break;
default:
/* We refuse to accept anything else */
return 0;