From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 1 Feb 2006 11:05:09 +0000 (-0800)
Subject: [PATCH] hrtimers: fix possible use of NULL pointer in posix-timers
X-Git-Tag: v2.6.16-rc2~133
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=b6557fbca805217588a412f391a65ceafcf1a1af;p=linux-2.6-block.git

[PATCH] hrtimers: fix possible use of NULL pointer in posix-timers

Fixup the conversion of posix-timers to hrtimers.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
index 197208b3aa2a..3b606d361b52 100644
--- a/kernel/posix-timers.c
+++ b/kernel/posix-timers.c
@@ -290,7 +290,8 @@ void do_schedule_next_timer(struct siginfo *info)
 		info->si_overrun = timr->it_overrun_last;
 	}
 
-	unlock_timer(timr, flags);
+	if (timr)
+		unlock_timer(timr, flags);
 }
 
 int posix_timer_event(struct k_itimer *timr,int si_private)