Commit a5eac4b9 authored by Shuai Wu's avatar Shuai Wu
Browse files

virtiofs: include a newline in sysfs tag 

mainline inclusion
from mainline-v6.10
commit 96d88f65adfbcaca153afd7d3e20d74ba379c599
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IB81UH

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=96d88f65adfbcaca153afd7d3e20d74ba379c599



-------------------------------------------------

The internal tag string doesn't contain a newline. Append one when
emitting the tag via sysfs.

[Stefan] Orthogonal to the newline issue, sysfs_emit(buf, "%s", fs->tag) is
needed to prevent format string injection.

Signed-off-by: default avatarBrian Foster <bfoster@redhat.com>
Fixes: a8f62f50b4e4 ("virtiofs: export filesystem tags through sysfs")
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
Signed-off-by: default avatarShuai Wu <wushuai51@huawei.com>
parent 2b34b287

fs/fuse/virtio_fs.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static ssize_t tag_show(struct kobject *kobj, 
{

	struct virtio_fs *fs = container_of(kobj, struct virtio_fs, kobj);



	return sysfs_emit(buf, fs->tag);

	return sysfs_emit(buf, "%s\n", fs->tag);

}



static struct kobj_attribute virtio_fs_tag_attr = __ATTR_RO(tag);