Browse Source

syscall: z_obj_validation_check -> k_object_validation_check

Rename z_obj_validation_check  and do not use z_ for internal APIs.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
pull/64779/head
Anas Nashif 2 years ago committed by Carles Cufí
parent
commit
d178b6a0e7
  1. 4
      include/zephyr/internal/syscall_handler.h
  2. 2
      kernel/thread.c
  3. 4
      kernel/userspace_handler.c
  4. 4
      tests/kernel/mem_protect/obj_validation/src/main.c

4
include/zephyr/internal/syscall_handler.h

@ -427,7 +427,7 @@ int z_user_string_copy(char *dst, const char *src, size_t maxlen);
#define K_SYSCALL_MEMORY_ARRAY_WRITE(ptr, nmemb, size) \ #define K_SYSCALL_MEMORY_ARRAY_WRITE(ptr, nmemb, size) \
K_SYSCALL_MEMORY_ARRAY(ptr, nmemb, size, 1) K_SYSCALL_MEMORY_ARRAY(ptr, nmemb, size, 1)
static inline int z_obj_validation_check(struct k_object *ko, static inline int k_object_validation_check(struct k_object *ko,
const void *obj, const void *obj,
enum k_objects otype, enum k_objects otype,
enum _obj_init_check init) enum _obj_init_check init)
@ -448,7 +448,7 @@ static inline int z_obj_validation_check(struct k_object *ko,
} }
#define K_SYSCALL_IS_OBJ(ptr, type, init) \ #define K_SYSCALL_IS_OBJ(ptr, type, init) \
K_SYSCALL_VERIFY_MSG(z_obj_validation_check( \ K_SYSCALL_VERIFY_MSG(k_object_validation_check( \
z_object_find((const void *)ptr), \ z_object_find((const void *)ptr), \
(const void *)ptr, \ (const void *)ptr, \
type, init) == 0, "access denied") type, init) == 0, "access denied")

2
kernel/thread.c

@ -734,7 +734,7 @@ k_tid_t z_vrfy_k_thread_create(struct k_thread *new_thread,
* object table if it isn't * object table if it isn't
*/ */
stack_object = z_object_find(stack); stack_object = z_object_find(stack);
Z_OOPS(K_SYSCALL_VERIFY_MSG(z_obj_validation_check(stack_object, stack, Z_OOPS(K_SYSCALL_VERIFY_MSG(k_object_validation_check(stack_object, stack,
K_OBJ_THREAD_STACK_ELEMENT, K_OBJ_THREAD_STACK_ELEMENT,
_OBJ_INIT_FALSE) == 0, _OBJ_INIT_FALSE) == 0,
"bad stack object")); "bad stack object"));

4
kernel/userspace_handler.c

@ -32,14 +32,14 @@ static struct k_object *validate_kernel_object(const void *obj,
return ko; return ko;
} }
static ALWAYS_INLINE struct z_object *validate_any_object(const void *obj) static ALWAYS_INLINE struct k_object *validate_any_object(const void *obj)
{ {
return validate_kernel_object(obj, K_OBJ_ANY, _OBJ_INIT_ANY); return validate_kernel_object(obj, K_OBJ_ANY, _OBJ_INIT_ANY);
} }
bool k_object_is_valid(const void *obj, enum k_objects otype) bool k_object_is_valid(const void *obj, enum k_objects otype)
{ {
struct z_object *ko; struct k_object *ko;
ko = validate_kernel_object(obj, otype, _OBJ_INIT_TRUE); ko = validate_kernel_object(obj, otype, _OBJ_INIT_TRUE);

4
tests/kernel/mem_protect/obj_validation/src/main.c

@ -31,12 +31,12 @@ static int test_object(struct k_sem *sem, int retval)
int ret; int ret;
if (retval) { if (retval) {
/* Expected to fail; bypass z_obj_validation_check() so we don't /* Expected to fail; bypass k_object_validation_check() so we don't
* fill the logs with spam * fill the logs with spam
*/ */
ret = z_object_validate(z_object_find(sem), K_OBJ_SEM, 0); ret = z_object_validate(z_object_find(sem), K_OBJ_SEM, 0);
} else { } else {
ret = z_obj_validation_check(z_object_find(sem), sem, ret = k_object_validation_check(z_object_find(sem), sem,
K_OBJ_SEM, 0); K_OBJ_SEM, 0);
} }

Loading…
Cancel
Save