linux-kernel - [PATCH] udf: udftime: prevent overflow in udf_disk_stamp_to

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240322090145.11175-1-r.smirnov@omp.ru>
Date: Fri, 22 Mar 2024 12:01:45 +0300
From: Roman Smirnov <r.smirnov@....ru>
To: Jan Kara <jack@...e.com>, <linux-kernel@...r.kernel.org>
CC: Roman Smirnov <r.smirnov@....ru>, Sergey Shtylyov <s.shtylyov@....ru>,
	Karina Yankevich <k.yankevich@....ru>, <lvc-project@...uxtesting.org>
Subject: [PATCH] udf: udftime: prevent overflow in udf_disk_stamp_to_time()

An overflow can occur in a situation where src.centiseconds
takes the value of 255. This situation is unlikely, but there
is no validation check anywere in the code. It is necessary
to convert the type of expression to 64-bit.

Found by Linux Verification Center (linuxtesting.org) with Svace.

Suggested-by: Sergey Shtylyov <s.shtylyov@....ru>
Signed-off-by: Roman Smirnov <r.smirnov@....ru>
Reviewed-by: Sergey Shtylyov <s.shtylyov@....ru>
---
 fs/udf/udftime.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fs/udf/udftime.c b/fs/udf/udftime.c
index 758163af39c2..2824b90c8288 100644
--- a/fs/udf/udftime.c
+++ b/fs/udf/udftime.c
@@ -33,6 +33,7 @@ udf_disk_stamp_to_time(struct timespec64 *dest, struct timestamp src)
 	u16 year = le16_to_cpu(src.year);
 	uint8_t type = typeAndTimezone >> 12;
 	int16_t offset;
+	int64_t nsec;
 
 	if (type == 1) {
 		offset = typeAndTimezone << 4;
@@ -46,13 +47,13 @@ udf_disk_stamp_to_time(struct timespec64 *dest, struct timestamp src)
 	dest->tv_sec = mktime64(year, src.month, src.day, src.hour, src.minute,
 			src.second);
 	dest->tv_sec -= offset * 60;
-	dest->tv_nsec = 1000 * (src.centiseconds * 10000 +
+	nsec = 1000LL * (src.centiseconds * 10000 +
 			src.hundredsOfMicroseconds * 100 + src.microseconds);
 	/*
 	 * Sanitize nanosecond field since reportedly some filesystems are
 	 * recorded with bogus sub-second values.
 	 */
-	dest->tv_nsec %= NSEC_PER_SEC;
+	dest->tv_nsec = do_div(nsec, NSEC_PER_SEC);
 }
 
 void
-- 
2.34.1