Commit a64d9493 authored by Gao Xiang's avatar Gao Xiang Committed by Greg Kroah-Hartman
Browse files

staging: erofs: refuse to mount images with malformed volume name 

As Richard reminder [1], A valid volume name should be
ended in NIL terminator within the length of volume_name.

Since this field currently isn't really used, let's fix
it to avoid potential bugs in the future.

[1] https://lore.kernel.org/r/1133002215.69049.1566119033047.JavaMail.zimbra@nod.at/



Reported-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarGao Xiang <gaoxiang25@huawei.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Link: https://lore.kernel.org/r/20190818102824.22330-1-hsiangkao@aol.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c6d6832c

drivers/staging/erofs/super.c

+7 −2
Original line number Diff line number Diff line
@@ -131,9 +131,14 @@ static int superblock_read(struct super_block *sb) 
	sbi->build_time_nsec = le32_to_cpu(layout->build_time_nsec);



	memcpy(&sb->s_uuid, layout->uuid, sizeof(layout->uuid));

	memcpy(sbi->volume_name, layout->volume_name,

	       sizeof(layout->volume_name));



	ret = strscpy(sbi->volume_name, layout->volume_name,

		      sizeof(layout->volume_name));

	if (ret < 0) {	/* -E2BIG */

		errln("bad volume name without NIL terminator");

		ret = -EFSCORRUPTED;

		goto out;

	}

	ret = 0;

out:

	brelse(bh);