Commit 065a057a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fuse-fixes-6.9-final' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse 

Pull fuse fixes from Miklos Szeredi:
 "Two one-liner fixes for issues introduced in -rc1"

* tag 'fuse-fixes-6.9-final' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  virtiofs: include a newline in sysfs tag
  fuse: verify zero padding in fuse_backing_map
parents fe35bf27 96d88f65

fs/fuse/passthrough.c

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ int fuse_backing_open(struct fuse_conn *fc, struct fuse_backing_map *map) 
		goto out;



	res = -EINVAL;

	if (map->flags)

	if (map->flags || map->padding)

		goto out;



	file = fget(map->fd);

fs/fuse/virtio_fs.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,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);