Date: Fri, 1 Mar 2013 21:12:21 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r247581 - projects/calloutng/sys/kern Message-ID: <201303012112.r21LCLgc094166@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Fri Mar 1 21:12:20 2013 New Revision: 247581 URL: http://svnweb.freebsd.org/changeset/base/247581 Log: Fix a stupid nasty bug that could cause silent memory corruptions. Modified: projects/calloutng/sys/kern/kern_timeout.c Modified: projects/calloutng/sys/kern/kern_timeout.c ============================================================================== --- projects/calloutng/sys/kern/kern_timeout.c Fri Mar 1 21:01:45 2013 (r247580) +++ projects/calloutng/sys/kern/kern_timeout.c Fri Mar 1 21:12:20 2013 (r247581) @@ -948,7 +948,7 @@ callout_reset_sbt_on(struct callout *c, */ if (c->c_flags & CALLOUT_LOCAL_ALLOC) cpu = c->c_cpu; - direct = c->c_flags & CALLOUT_DIRECT; + direct = !!(c->c_flags & CALLOUT_DIRECT); KASSERT(!direct || c->c_lock == NULL, ("%s: direct callout %p has lock", __func__, c)); cc = callout_lock(c); @@ -1057,7 +1057,7 @@ _callout_stop_safe(c, safe) } } else use_lock = 0; - direct = c->c_flags & CALLOUT_DIRECT; + direct = !!(c->c_flags & CALLOUT_DIRECT); sq_locked = 0; old_cc = NULL; again:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303012112.r21LCLgc094166>