diff options
| author | mav <mav@FreeBSD.org> | 2010-09-14 10:26:49 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2010-09-14 10:26:49 +0000 |
| commit | 6eed5acb736c5555b738654016c586393f5099d3 (patch) | |
| tree | 63e88618a61fa3fd62873b73c83de46aa285db6a /sys/kern/kern_timeout.c | |
| parent | 6c05aa4db6d1ea20da8eca83a1214b74821b32d8 (diff) | |
| download | FreeBSD-src-6eed5acb736c5555b738654016c586393f5099d3.zip FreeBSD-src-6eed5acb736c5555b738654016c586393f5099d3.tar.gz | |
Fix panic on NULL dereference possible after r212541.
Diffstat (limited to 'sys/kern/kern_timeout.c')
| -rw-r--r-- | sys/kern/kern_timeout.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index 89fe544..98f55da 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -672,7 +672,8 @@ retry: c->c_time = ticks + to_ticks; TAILQ_INSERT_TAIL(&cc->cc_callwheel[c->c_time & callwheelmask], c, c_links.tqe); - if ((c->c_time - cc->cc_firsttick) < 0) { + if ((c->c_time - cc->cc_firsttick) < 0 && + callout_new_inserted != NULL) { cc->cc_firsttick = c->c_time; (*callout_new_inserted)(cpu, to_ticks + (ticks - cc->cc_ticks)); |
