Skip to content

Commit 065a057

Browse files
committed
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
2 parents fe35bf2 + 96d88f6 commit 065a057

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

fs/fuse/passthrough.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ int fuse_backing_open(struct fuse_conn *fc, struct fuse_backing_map *map)
225225
goto out;
226226

227227
res = -EINVAL;
228-
if (map->flags)
228+
if (map->flags || map->padding)
229229
goto out;
230230

231231
file = fget(map->fd);

fs/fuse/virtio_fs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ static ssize_t tag_show(struct kobject *kobj,
170170
{
171171
struct virtio_fs *fs = container_of(kobj, struct virtio_fs, kobj);
172172

173-
return sysfs_emit(buf, fs->tag);
173+
return sysfs_emit(buf, "%s\n", fs->tag);
174174
}
175175

176176
static struct kobj_attribute virtio_fs_tag_attr = __ATTR_RO(tag);

0 commit comments

Comments
 (0)