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

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
...@@ -225,7 +225,7 @@ int fuse_backing_open(struct fuse_conn *fc, struct fuse_backing_map *map) ...@@ -225,7 +225,7 @@ int fuse_backing_open(struct fuse_conn *fc, struct fuse_backing_map *map)
goto out; goto out;
res = -EINVAL; res = -EINVAL;
if (map->flags) if (map->flags || map->padding)
goto out; goto out;
file = fget(map->fd); file = fget(map->fd);
......
...@@ -170,7 +170,7 @@ static ssize_t tag_show(struct kobject *kobj, ...@@ -170,7 +170,7 @@ static ssize_t tag_show(struct kobject *kobj,
{ {
struct virtio_fs *fs = container_of(kobj, struct virtio_fs, 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); static struct kobj_attribute virtio_fs_tag_attr = __ATTR_RO(tag);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment