Skip to content

Commit

Permalink
Merge tag 'fuse-fixes-6.9-final' of git://git.kernel.org/pub/scm/linu…
Browse files Browse the repository at this point in the history
…x/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
  • Loading branch information
Linus Torvalds committed May 8, 2024
2 parents fe35bf2 + 96d88f6 commit 065a057
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion fs/fuse/passthrough.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion fs/fuse/virtio_fs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 065a057

Please sign in to comment.