Browse Source

fix null pointer dereference in setitimer time32 compat shim

this interface permits a null pointer for where to store the old
itimerval being replaced. an early version of the time32 compat shim
code had corresponding bugs for lots of functions; apparently
setitimer was overlooked when fixing them.
Rich Felker 4 years ago
parent
commit
9432bbd4e8
1 changed files with 6 additions and 4 deletions
  1. 6 4
      compat/time32/setitimer_time32.c

+ 6 - 4
compat/time32/setitimer_time32.c

@@ -15,9 +15,11 @@ int __setitimer_time32(int which, const struct itimerval32 *restrict new32, stru
 	 * timer setting, so we can't fail on out-of-range old value.
 	 * Since these are relative times, values large enough to overflow
 	 * don't make sense anyway. */
-	old32->it_interval.tv_sec = old.it_interval.tv_sec;
-	old32->it_interval.tv_usec = old.it_interval.tv_usec;
-	old32->it_value.tv_sec = old.it_value.tv_sec;
-	old32->it_value.tv_usec = old.it_value.tv_usec;
+	if (old32) {
+		old32->it_interval.tv_sec = old.it_interval.tv_sec;
+		old32->it_interval.tv_usec = old.it_interval.tv_usec;
+		old32->it_value.tv_sec = old.it_value.tv_sec;
+		old32->it_value.tv_usec = old.it_value.tv_usec;
+	}
 	return 0;
 }