diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-08 10:33:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-08 10:33:55 -0700 |
| commit | 065a057a31353c896af2f410ae431975687b29ed (patch) | |
| tree | 3d8f8055f33ee36ff4520116ca0815438852c5ef /fs | |
| parent | fe35bf27a14ded5997d8ceee7f7b10a0982e41e4 (diff) | |
| parent | 96d88f65adfbcaca153afd7d3e20d74ba379c599 (diff) | |
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
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/fuse/passthrough.c | 2 | ||||
| -rw-r--r-- | fs/fuse/virtio_fs.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/fuse/passthrough.c b/fs/fuse/passthrough.c index 1567f0323858..9666d13884ce 100644 --- a/fs/fuse/passthrough.c +++ b/fs/fuse/passthrough.c @@ -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); diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c index 322af827a232..bb3e941b9503 100644 --- a/fs/fuse/virtio_fs.c +++ b/fs/fuse/virtio_fs.c @@ -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); |