github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-24 23:22:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

fs/ntfs3: terminate the cached volume label after UTF-8 conversion

Browse Source 
ntfs_fill_super() loads the on-disk volume label with utf16s_to_utf8s()
and stores the result in sbi->volume.label. The converted label is later
exposed through ntfs3_label_show() using %s, but utf16s_to_utf8s() only
returns the number of bytes written and does not add a trailing NUL.

If the converted label fills the entire fixed buffer,
ntfs3_label_show() can read past the end of sbi->volume.label while
looking for a terminator.

Terminate the cached label explicitly after a successful conversion and
clamp the exact-full case to the last byte of the buffer.

Fixes: 82cae269cf ("fs/ntfs3: Add initialization of super block")
Signed-off-by: Pengpeng Hou <pengpeng@iscas.ac.cn>
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
This commit is contained in:
Pengpeng Hou 2026-03-27 14:19:55 +08:00 committed by Konstantin Komarov
parent d1062683bf
commit a6cd43fe9b
No known key found for this signature in database
GPG Key ID: A9B0331F832407B6
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/ntfs3/super.c
View File

@ -1339,8 +1339,13 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)
le32_to_cpu(attr->res.data_size) >> 1,
UTF16_LITTLE_ENDIAN, sbi->volume.label,
sizeof(sbi->volume.label));
if (err < 0)
if (err < 0) {
sbi->volume.label[0] = 0;
} else if (err >= sizeof(sbi->volume.label)) {
sbi->volume.label[sizeof(sbi->volume.label) - 1] = 0;
} else {
sbi->volume.label[err] = 0;
}
} else {
/* Should we break mounting here? */
//err = -EINVAL;