justin/jsix_import
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

[kernel] Only accept invalid handles for optional syscall args

Browse Source 
The syscall helpers.h get_handle functions should be returing
j6_err_invalid_arg if the handle they're given is j6_handle_invalid,
unless explicitly set to optional.
This commit is contained in:
Justin C. Miller
2023-02-06 01:13:55 -08:00
parent 8966380ef9
commit 359ee035d8
4 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/kernel/syscalls/helpers.h
View File

@@ -23,11 +23,11 @@ T * construct_handle(j6_handle_t *id, Args... args)
}
template <typename T>
j6_status_t get_handle(j6_handle_t id, j6_cap_t caps, T *&object)
j6_status_t get_handle(j6_handle_t id, j6_cap_t caps, T *&object, bool optional = false)
{
if (id == j6_handle_invalid) {
object = nullptr;
return j6_status_ok;
return optional ? j6_status_ok : j6_err_invalid_arg;
}
capability *capdata = g_cap_table.retain(id);
@@ -43,17 +43,17 @@ j6_status_t get_handle(j6_handle_t id, j6_cap_t caps, T *&object)
}
template <typename T>
inline j6_status_t get_handle(j6_handle_t *id, j6_cap_t caps, T *&object)
inline j6_status_t get_handle(j6_handle_t *id, j6_cap_t caps, T *&object, bool optional = false)
{
return get_handle<T>(*id, caps, object);
return get_handle<T>(*id, caps, object, optional);
}
template <>
inline j6_status_t get_handle<obj::kobject>(j6_handle_t id, j6_cap_t caps, obj::kobject *&object)
inline j6_status_t get_handle<obj::kobject>(j6_handle_t id, j6_cap_t caps, obj::kobject *&object, bool optional)
{
if (id == j6_handle_invalid) {
object = nullptr;
return j6_status_ok;
return optional ? j6_status_ok : j6_err_invalid_arg;
}
capability *capdata = g_cap_table.retain(id);