sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add a flag to grants system indicating a slot is VALID; so a slot

Browse source 
can be reserved (USED), while toggling VALID on and off.
This commit is contained in:
Ben Gras 2006-06-27 12:19:45 +00:00
parent a587273c56
commit 607fb6bf7f
3 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/minix/safecopies.h
View file

@ -62,6 +62,7 @@ struct vscp_vec {
#define CPF_DIRECT 0x000200 /* Grant from this process to another. */ #define CPF_DIRECT 0x000200 /* Grant from this process to another. */
#define CPF_INDIRECT 0x000400 /* Grant from grant to another. */ #define CPF_INDIRECT 0x000400 /* Grant from grant to another. */
#define CPF_MAGIC 0x000800 /* Grant from any to any. */ #define CPF_MAGIC 0x000800 /* Grant from any to any. */
#define CPF_VALID 0x001000 /* Grant slot contains valid grant. */
/* Prototypes for functions in libsys. */ /* Prototypes for functions in libsys. */
_PROTOTYPE( cp_grant_id_t cpf_grant_direct, (endpoint_t, vir_bytes, size_t, int)); _PROTOTYPE( cp_grant_id_t cpf_grant_direct, (endpoint_t, vir_bytes, size_t, int));
@ -78,6 +79,7 @@ _PROTOTYPE( int cpf_setgrant_indirect, (cp_grant_id_t g, endpoint_t who_to,
endpoint_t who_from, cp_grant_id_t his_g)); endpoint_t who_from, cp_grant_id_t his_g));
_PROTOTYPE( int cpf_setgrant_magic, (cp_grant_id_t g, endpoint_t who_to, _PROTOTYPE( int cpf_setgrant_magic, (cp_grant_id_t g, endpoint_t who_to,
endpoint_t who_from, vir_bytes addr, size_t bytes, int access)); endpoint_t who_from, vir_bytes addr, size_t bytes, int access));
_PROTOTYPE( int cpf_setgrant_disable, (cp_grant_id_t grant_id));
/* Set a process' grant table location and size (in-kernel only). */ /* Set a process' grant table location and size (in-kernel only). */
#define _K_SET_GRANT_TABLE(rp, ptr, entries) \ #define _K_SET_GRANT_TABLE(rp, ptr, entries) \

4
kernel/system/do_safecopy.c
View file

@ -90,8 +90,8 @@ endpoint_t *e_granter; /* new granter (magic grants) */
phys_copy(phys_grant, vir2phys(&g), sizeof(g)); phys_copy(phys_grant, vir2phys(&g), sizeof(g));
/* Check validity. */ /* Check validity. */
if(!(g.cp_flags & CPF_USED)) { if((g.cp_flags & (CPF_USED | CPF_VALID)) != (CPF_USED | CPF_VALID)) {
kprintf("grant verify failed: invalid\n"); kprintf("grant verify failed: unused or invalid\n");
return EPERM; return EPERM;
} }

18
lib/syslib/safecopies.c
View file

@ -305,7 +305,7 @@ int access;
GID_CHECK(gid); GID_CHECK(gid);
ACCESS_CHECK(access); ACCESS_CHECK(access);
grants[gid].cp_flags = access | CPF_DIRECT | CPF_USED; grants[gid].cp_flags = access | CPF_DIRECT | CPF_USED | CPF_VALID;
grants[gid].cp_u.cp_direct.cp_who_to = who; grants[gid].cp_u.cp_direct.cp_who_to = who;
grants[gid].cp_u.cp_direct.cp_start = addr; grants[gid].cp_u.cp_direct.cp_start = addr;
grants[gid].cp_u.cp_direct.cp_len = bytes; grants[gid].cp_u.cp_direct.cp_len = bytes;
@ -322,7 +322,7 @@ cp_grant_id_t his_gid;
GID_CHECK(gid); GID_CHECK(gid);
/* Fill in new slot data. */ /* Fill in new slot data. */
grants[gid].cp_flags = CPF_USED | CPF_INDIRECT; grants[gid].cp_flags = CPF_USED | CPF_INDIRECT | CPF_VALID;
grants[gid].cp_u.cp_indirect.cp_who_to = who_to; grants[gid].cp_u.cp_indirect.cp_who_to = who_to;
grants[gid].cp_u.cp_indirect.cp_who_from = who_from; grants[gid].cp_u.cp_indirect.cp_who_from = who_from;
grants[gid].cp_u.cp_indirect.cp_grant = his_gid; grants[gid].cp_u.cp_indirect.cp_grant = his_gid;
@ -342,7 +342,7 @@ int access;
ACCESS_CHECK(access); ACCESS_CHECK(access);
/* Fill in new slot data. */ /* Fill in new slot data. */
grants[gid].cp_flags = CPF_USED | CPF_MAGIC | access; grants[gid].cp_flags = CPF_USED | CPF_MAGIC | CPF_VALID | access;
grants[gid].cp_u.cp_magic.cp_who_to = who_to; grants[gid].cp_u.cp_magic.cp_who_to = who_to;
grants[gid].cp_u.cp_magic.cp_who_from = who_from; grants[gid].cp_u.cp_magic.cp_who_from = who_from;
grants[gid].cp_u.cp_magic.cp_start = addr; grants[gid].cp_u.cp_magic.cp_start = addr;
@ -351,3 +351,15 @@ int access;
return 0; return 0;
} }
PUBLIC int
cpf_setgrant_disable(gid)
cp_grant_id_t gid;
{
GID_CHECK(gid);
/* Grant is now no longer valid, but still in use. */
grants[gid].cp_flags = CPF_USED;
return 0;
}