On Fri, Feb 11, 2022 at 10:42:38AM +1100, Stephen Rothwell wrote: > > > --- a/fs/btrfs/ioctl.c > > > +++ b/fs/btrfs/ioctl.c > > > @@ -5079,9 +5079,14 @@ static int btrfs_ioctl_encoded_write(struct file *file, void __user *argp, > > > } > > > args.iov = compat_ptr(args32.iov); > > > args.iovcnt = args32.iovcnt; > > > - memcpy(&args.offset, &args32.offset, > > > - sizeof(args) - > > > - offsetof(struct btrfs_ioctl_encoded_io_args, offset)); > > > + args.offset = args32.offset; > > > + args.flags = args32.flags; > > > + args.len = args32.len; > > > + args.unencoded_len = args32.unencoded_len; > > > + args.unencoded_offset = args32.unencoded_offset; > > > + args.compression = args32.compression; > > > + args.encryption = args32.encryption; > > > + memcpy(args.reserved, args32.reserved, sizeof(args.reserved)); > > > #else > > > return -ENOTTY; > > > #endif > > > > Thanks, the patchset is still in progress so I'll apply this a fixup > > until the patch gets updated. > > This has come back today ... presumably the hack was removed but the > original patch was not fixed. I've updated the patchset and thought the fixup has been applied but no. I'll fold it to the patch so it doesn't get lost again.
