summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2006-02-01 12:05:09 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-01 17:53:12 +0100
commitb6557fbca805217588a412f391a65ceafcf1a1af (patch)
tree2739d606680c2f68fc33def5d107b2862b9bfe86
parent[PATCH] hrtimers: fixup itimer conversion (diff)
downloadlinux-b6557fbca805217588a412f391a65ceafcf1a1af.tar.xz
linux-b6557fbca805217588a412f391a65ceafcf1a1af.zip
[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>
-rw-r--r--kernel/posix-timers.c3
1 files changed, 2 insertions, 1 deletions
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)