commit 2038da926673dab4a84d525348fa07714c233f01
author Dave Rodgman <dave.rodgman@arm.com> Tue Dec 20 16:01:53 2022 +0000
committer GitHub <noreply@github.com> Tue Dec 20 16:01:53 2022 +0000
tree 085f1d80696811d859e3adb7b1adf34dd7cdabd9
parent 82dad10746fb54396fcc5caee6a6d79e7131e867
parent 327b69c8a25350c292f89804ffb47a560f585d9b

Merge pull request #6826 from daverodgman/fix_gettimeofday

Fix gettimeofday overflow

ChangeLog.d/fix-gettimeofday-overflow.txt

diff --git a/ChangeLog.d/fix-gettimeofday-overflow.txt b/ChangeLog.d/fix-gettimeofday-overflow.txt
new file mode 100644
index 0000000..b7e10d2
--- /dev/null
+++ b/ChangeLog.d/fix-gettimeofday-overflow.txt
@@ -0,0 +1,3 @@
+Bugfix
+   * Fix possible integer overflow in mbedtls_timing_hardclock(), which
+     could cause a crash in programs/test/benchmark.

programs/test/benchmark.c

diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c
index 6313c52..1ad2034 100644
--- a/programs/test/benchmark.c
+++ b/programs/test/benchmark.c
@@ -398,7 +398,7 @@
     }
 
     gettimeofday( &tv_cur, NULL );
-    return( ( tv_cur.tv_sec  - tv_init.tv_sec  ) * 1000000
+    return( ( tv_cur.tv_sec  - tv_init.tv_sec  ) * 1000000U
           + ( tv_cur.tv_usec - tv_init.tv_usec ) );
 }
 #endif /* !HAVE_HARDCLOCK */