diff options
| -rw-r--r-- | share/man/man9/taskqueue.9 | 2 | ||||
| -rw-r--r-- | sys/kern/subr_taskqueue.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/share/man/man9/taskqueue.9 b/share/man/man9/taskqueue.9 index f45a149e189b..40d64af39639 100644 --- a/share/man/man9/taskqueue.9 +++ b/share/man/man9/taskqueue.9 @@ -133,7 +133,7 @@ If the task's .Va ta_pending field is non-zero, then it is simply incremented to reflect the number of times the task -was enqueued. +was enqueued, up to a cap of USHRT_MAX. Otherwise, the task is added to the list before the first task which has a lower .Va ta_priority diff --git a/sys/kern/subr_taskqueue.c b/sys/kern/subr_taskqueue.c index 4c4589901557..31ea52d1d876 100644 --- a/sys/kern/subr_taskqueue.c +++ b/sys/kern/subr_taskqueue.c @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$"); #include <sys/interrupt.h> #include <sys/kernel.h> #include <sys/kthread.h> +#include <sys/limits.h> #include <sys/lock.h> #include <sys/malloc.h> #include <sys/mutex.h> @@ -173,7 +174,8 @@ taskqueue_enqueue_locked(struct taskqueue *queue, struct task *task) * Count multiple enqueues. */ if (task->ta_pending) { - task->ta_pending++; + if (task->ta_pending < USHRT_MAX) + task->ta_pending++; return (0); } |