Re: [PATCH] ktimers subsystem 2.6.14-rc2-kt5

[Thomas Gleixner <tglx@linutronix.de>]

On Wed, 2005-09-28 at 18:10 -0700, john stultz wrote:

> > +	/* Auto rearm the timer ? */
> > +	if (rearm && ktime_cmp_val(timer->interval, !=, KTIME_ZERO))
> > +		enqueue_ktimer(timer, base, NULL, KTIMER_REARM);
> > +}
> 
> 
> There's a couple of places like this where you pass NULL as the ktime_t
> pointer tim to enqueue_ktimer(). However in enqueue_ktimer, you
> dereference tim in a few spots w/o checking for NULL.
> 

The KTIMER_REARM case is the broken spot. I fixed this already as it was
oopsing here to, but somehow I messed up with quilt.

tglx

Index: linux-2.6.14-rc2-rt4/kernel/ktimers.c
===================================================================
--- linux-2.6.14-rc2-rt4.orig/kernel/ktimers.c
+++ linux-2.6.14-rc2-rt4/kernel/ktimers.c
@@ -242,7 +242,7 @@ static int enqueue_ktimer(struct ktimer 
 		goto nocheck;
 	case KTIMER_REARM:
 		while ktime_cmp(timer->expires, <= , now) {
-			timer->expires = ktime_add(timer->expires, *tim);
+			timer->expires = ktime_add(timer->expires, timer->interval);
 			timer->overrun++;
 		}
 		goto nocheck;