i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed and simplified the user_*() team syscalls.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5331 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2003-11-12 15:37:44 +00:00
parent 9ff210a134
commit f2eb00db1e
1 changed files with 63 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/core/team.c
+55 -66
View File
@@ -23,6 +23,13 @@
#include <syscalls.h> #include <syscalls.h>
#include <tls.h> #include <tls.h>
#define TRACE_TEAM 0
#if TRACE_TEAM
# define TRACE(x) dprintf x
#else
# define TRACE(x) ;
#endif
struct team_key { struct team_key {
team_id id; team_id id;
@@ -845,105 +852,87 @@ user_wait_for_team(team_id id, status_t *_userReturnCode)
team_id team_id
user_team_create_team(const char *upath, const char *uname, char **args, int argc, char **envp, int envc, int priority) user_team_create_team(const char *userPath, const char *userName,
char **userArgs, int argCount, char **userEnv, int envCount, int priority)
{ {
char path[SYS_MAX_PATH_LEN]; char path[SYS_MAX_PATH_LEN];
char name[SYS_MAX_OS_NAME_LEN]; char name[SYS_MAX_OS_NAME_LEN];
char **kargs; char **args = NULL;
char **kenv; char **env = NULL;
int rc; int rc;
dprintf("user_team_create_team : argc=%d \n",argc); TRACE(("user_team_create_team: argc = %d\n", argCount));
if ((addr)upath >= KERNEL_BASE && (addr)upath <= KERNEL_TOP) if (!CHECK_USER_ADDRESS(userPath)
return ERR_VM_BAD_USER_MEMORY; || !CHECK_USER_ADDRESS(userName))
if ((addr)uname >= KERNEL_BASE && (addr)uname <= KERNEL_TOP) return B_BAD_ADDRESS;
return ERR_VM_BAD_USER_MEMORY;
rc = user_copy_strings_array(args, argc, &kargs); rc = user_copy_strings_array(userArgs, argCount, &args);
if (rc < 0) if (rc < 0)
goto error; goto error;
if (envp == NULL) { if (userEnv == NULL) {
envp = (char **)thread_get_current_thread()->team->user_env_base; // ToDo: this doesn't look particularly safe to me - where
for (envc = 0; envp && (envp[envc]); envc++); // is user_env_base?
userEnv = (char **)thread_get_current_thread()->team->user_env_base;
for (envCount = 0; userEnv && (userEnv[envCount]); envCount++);
} }
rc = user_copy_strings_array(envp, envc, &kenv); if (user_copy_strings_array(userEnv, envCount, &env) < B_OK
if (rc < 0) || user_strlcpy(path, userPath, SYS_MAX_PATH_LEN) < B_OK
|| user_strlcpy(name, userName, SYS_MAX_OS_NAME_LEN) < B_OK) {
rc = B_BAD_ADDRESS;
goto error; goto error;
}
rc = user_strncpy(path, upath, SYS_MAX_PATH_LEN-1); return team_create_team(path, name, args, argCount, env, envCount, priority);
if (rc < 0)
goto error;
path[SYS_MAX_PATH_LEN-1] = 0;
rc = user_strncpy(name, uname, SYS_MAX_OS_NAME_LEN-1);
if (rc < 0)
goto error;
name[SYS_MAX_OS_NAME_LEN-1] = 0;
return team_create_team(path, name, kargs, argc, kenv, envc, priority);
error: error:
kfree_strings_array(kargs, argc); kfree_strings_array(args, argCount);
kfree_strings_array(kenv, envc); kfree_strings_array(env, envCount);
return rc; return rc;
} }
status_t status_t
user_get_team_info(team_id id, team_info *info) user_get_team_info(team_id id, team_info *userInfo)
{ {
team_info kinfo; status_t status;
status_t rc = B_OK; team_info info;
status_t rc2;
if ((addr)info >= KERNEL_BASE && (addr)info <= KERNEL_TOP) if (!CHECK_USER_ADDRESS(userInfo))
return ERR_VM_BAD_USER_MEMORY; return B_BAD_ADDRESS;
rc = _get_team_info(id, &kinfo, sizeof(team_info)); status = _get_team_info(id, &info, sizeof(team_info));
if (rc != B_OK) if (status == B_OK) {
return rc; if (user_memcpy(userInfo, &info, sizeof(team_info)) < B_OK)
return B_BAD_ADDRESS;
}
rc2 = user_memcpy(info, &kinfo, sizeof(team_info)); return status;
if (rc2 < 0)
return rc2;
return rc;
} }
status_t status_t
user_get_next_team_info(int32 *cookie, team_info *info) user_get_next_team_info(int32 *userCookie, team_info *userInfo)
{ {
int32 kcookie; status_t status;
team_info kinfo; team_info info;
status_t rc = B_OK; int32 cookie;
status_t rc2;
if ((addr)cookie >= KERNEL_BASE && (addr)cookie <= KERNEL_TOP) if (!CHECK_USER_ADDRESS(userCookie)
return ERR_VM_BAD_USER_MEMORY; || !CHECK_USER_ADDRESS(userInfo)
if ((addr)info >= KERNEL_BASE && (addr)info <= KERNEL_TOP) || user_memcpy(&cookie, userCookie, sizeof(int32)) < B_OK)
return ERR_VM_BAD_USER_MEMORY; return B_BAD_ADDRESS;
rc2 = user_memcpy(&kcookie, cookie, sizeof(int32)); status = _get_next_team_info(&cookie, &info, sizeof(team_info));
if (rc2 < 0) if (status != B_OK)
return rc2; return status;
rc = _get_next_team_info(&kcookie, &kinfo, sizeof(team_info)); if (user_memcpy(userCookie, &cookie, sizeof(int32)) < B_OK
if (rc != B_OK) || user_memcpy(userInfo, &info, sizeof(team_info)) < B_OK)
return rc; return B_BAD_ADDRESS;
rc2 = user_memcpy(cookie, &kcookie, sizeof(int32)); return status;
if (rc2 < 0)
return rc2;
rc2 = user_memcpy(info, &kinfo, sizeof(team_info));
if (rc2 < 0)
return rc2;
return rc;
} }