Skip to contentSkip to conversation

timer: avoid reading uninitialized data

PATCH In review Pavel Roskin 1 participant 2 messages Jul 18, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 timer: avoid reading uninitialized data

timer->expires may be uninitialized, so check timer_pending() before touching timer->expires to pacify kmemcheck.

---
 kernel/timer.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/timer.c +1 -1
index 0b36b9e..a7f07d5 100644
@@ -714,7 +714,7 @@ int mod_timer(struct timer_list *timer, unsigned long expires)
 	 * networking code - if the timer is re-modified
 	 * to be the same thing then just return:
 	 */
-	if (timer->expires == expires && timer_pending(timer))
+	if (timer_pending(timer) && timer->expires == expires)
 		return 1;
 
 	return __mod_timer(timer, expires, false, TIMER_NOT_PINNED);
#1 lore raw

[tip:timers/urgent] timer: Avoid reading uninitialized data

Commit-ID:  4841158b26e28e1476eed84c7347c18f11317750
Gitweb:     http://git.kernel.org/tip/4841158b26e28e1476eed84c7347c18f11317750
Author:     Pavel Roskin <[email protected]>
AuthorDate: Sat, 18 Jul 2009 16:46:02 -0400
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Sat, 18 Jul 2009 23:11:43 +0200

timer: Avoid reading uninitialized data

timer->expires may be uninitialized, so check timer_pending() before touching timer->expires to pacify kmemcheck.

LKML-Reference: <[email protected]>

---
 kernel/timer.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/timer.c +1 -1
index 0b36b9e..a7f07d5 100644
@@ -714,7 +714,7 @@ int mod_timer(struct timer_list *timer, unsigned long expires)
 	 * networking code - if the timer is re-modified
 	 * to be the same thing then just return:
 	 */
-	if (timer->expires == expires && timer_pending(timer))
+	if (timer_pending(timer) && timer->expires == expires)
 		return 1;
 
 	return __mod_timer(timer, expires, false, TIMER_NOT_PINNED);