Skip to content

Commit 836fa88

Browse files
LingaoMfabiobaltieri
authored andcommitted
kernel: work: Add missing ASSERT for args
Add missing ASSERT for dwork & queue. Signed-off-by: Lingao Meng <[email protected]>
1 parent 2a3b28a commit 836fa88

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

kernel/work.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -867,6 +867,8 @@ static inline int work_delayable_busy_get_locked(const struct k_work_delayable *
867867

868868
int k_work_delayable_busy_get(const struct k_work_delayable *dwork)
869869
{
870+
__ASSERT_NO_MSG(dwork != NULL);
871+
870872
k_spinlock_key_t key = k_spin_lock(&lock);
871873
int ret = work_delayable_busy_get_locked(dwork);
872874

@@ -968,6 +970,7 @@ int k_work_schedule_for_queue(struct k_work_q *queue,
968970
struct k_work_delayable *dwork,
969971
k_timeout_t delay)
970972
{
973+
__ASSERT_NO_MSG(queue != NULL);
971974
__ASSERT_NO_MSG(dwork != NULL);
972975

973976
SYS_PORT_TRACING_OBJ_FUNC_ENTER(k_work, schedule_for_queue, queue, dwork, delay);
@@ -1004,6 +1007,7 @@ int k_work_reschedule_for_queue(struct k_work_q *queue,
10041007
struct k_work_delayable *dwork,
10051008
k_timeout_t delay)
10061009
{
1010+
__ASSERT_NO_MSG(queue != NULL);
10071011
__ASSERT_NO_MSG(dwork != NULL);
10081012

10091013
SYS_PORT_TRACING_OBJ_FUNC_ENTER(k_work, reschedule_for_queue, queue, dwork, delay);

tests/kernel/workq/work/src/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1038,7 +1038,7 @@ static void handle_1cpu_basic_schedule_running(struct k_work *work)
10381038
*/
10391039
if (atomic_dec(&resubmits_left) > 0) {
10401040
/* Schedule again on current queue */
1041-
state->schedule_res = k_work_schedule_for_queue(NULL, one_dwork,
1041+
state->schedule_res = k_work_schedule_for_queue(one_dwork->work.queue, one_dwork,
10421042
K_MSEC(DELAY_MS));
10431043
} else {
10441044
/* Flag that it didn't schedule */

0 commit comments

Comments
 (0)