Skip to content

Commit 5a3b590

Browse files
committed
ext4: don't leak old mountpoint samples
When the first file is opened, ext4 samples the mountpoint of the filesystem in 64 bytes of the super block. It does so using strlcpy(), this means that the remaining bytes in the super block string buffer are untouched. If the mount point before had a longer path than the current one, it can be reconstructed. Consider the case where the fs was mounted to "/media/johnjdeveloper" and later to "/". The super block buffer then contains "/\x00edia/johnjdeveloper". This case was seen in the wild and caused confusion how the name of a developer ands up on the super block of a filesystem used in production... Fix this by using strncpy() instead of strlcpy(). The superblock field is defined to be a fixed-size char array, and it is already marked using __nonstring in fs/ext4/ext4.h. The consumer of the field in e2fsprogs already assumes that in the case of a 64+ byte mount path, that s_last_mounted will not be NUL terminated. Link: https://lore.kernel.org/r/X9ujIOJG/HqMr88R@mit.edu Reported-by: Richard Weinberger <richard@nod.at> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Cc: stable@kernel.org
1 parent a3f5cf1 commit 5a3b590

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

fs/ext4/file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -810,7 +810,7 @@ static int ext4_sample_last_mounted(struct super_block *sb,
810810
if (err)
811811
goto out_journal;
812812
lock_buffer(sbi->s_sbh);
813-
strlcpy(sbi->s_es->s_last_mounted, cp,
813+
strncpy(sbi->s_es->s_last_mounted, cp,
814814
sizeof(sbi->s_es->s_last_mounted));
815815
ext4_superblock_csum_set(sb);
816816
unlock_buffer(sbi->s_sbh);

0 commit comments

Comments
 (0)