Skip to contentSkip to conversation

romfs: Fix uninitialized memory leak in romfs_dev_read()

PATCH Applied Jann Horn 2 participants 2 messages Aug 18, 2020

lore
Share & tools
lore

Jann Horn

author
#0 lore raw

PATCH 1/1 romfs: Fix uninitialized memory leak in romfs_dev_read()

romfs has a superblock field that limits the size of the filesystem; data beyond that limit is never accessed.

romfs_dev_read() fetches a caller-supplied number of bytes from the backing device. It returns 0 on success or an error code on failure; therefore, its API can't represent short reads, it's all-or-nothing.

However, when romfs_dev_read() detects that the requested operation would cross the filesystem size limit, it currently silently truncates the requested number of bytes. This e.g. means that when the content of a file with size 0x1000 starts one byte before the filesystem size limit, ->readpage() will only fill a single byte of the supplied page while leaving the rest uninitialized, leaking that uninitialized memory to userspace.

Fix it by returning an error code instead of truncating the read when the requested read operation would go beyond the end of the filesystem.

Fixes da4458bda237 ("NOMMU: Make it possible for RomFS to use MTD devices directly")
---
 fs/romfs/storage.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
fs/romfs/storage.c +1 -3
index 6b2b4362089e..b57b3ffcbc32 100644
@@ -217,10 +217,8 @@ int romfs_dev_read(struct super_block *sb, unsigned long pos,
 	size_t limit;
 
 	limit = romfs_maxsize(sb);
-	if (pos >= limit)
+	if (pos >= limit || buflen > limit - pos)
 		return -EIO;
-	if (buflen > limit - pos)
-		buflen = limit - pos;
 
 #ifdef CONFIG_ROMFS_ON_MTD
 	if (sb->s_mtd)

base-commit: bcf876870b95592b52519ed4aafcf9d95999bc9c

Signature · 1 line
2.28.0.220.ged08abb693-goog
Reviewed-by on v1 1/1
#1 lore raw
Quoted 15 lines · Jann Horn

romfs has a superblock field that limits the size of the filesystem; data beyond that limit is never accessed.

romfs_dev_read() fetches a caller-supplied number of bytes from the backing device. It returns 0 on success or an error code on failure; therefore, its API can't represent short reads, it's all-or-nothing.

However, when romfs_dev_read() detects that the requested operation would cross the filesystem size limit, it currently silently truncates the requested number of bytes. This e.g. means that when the content of a file with size 0x1000 starts one byte before the filesystem size limit, ->readpage() will only fill a single byte of the supplied page while leaving the rest uninitialized, leaking that uninitialized memory to userspace.

Quoted 6 lines

Fix it by returning an error code instead of truncating the read when the requested read operation would go beyond the end of the filesystem.

Fixes da4458bda237 ("NOMMU: Make it possible for RomFS to use MTD devices directly")