From: David Sterba <dsterba@suse•cz>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Kees Cook <keescook@chromium•org>,
David Sterba <dsterba@suse•com>, Omar Sandoval <osandov@fb•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: build failure after merge of the btrfs tree (Was: Re: linux-next: build failure after merge of the kspp tree)
Date: Fri, 11 Feb 2022 16:38:36 +0100 [thread overview]
Message-ID: <20220211153835.GY12643@suse.cz> (raw)
In-Reply-To: <20220211104238.5da77acd@canb.auug.org.au>
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.
prev parent reply other threads:[~2022-02-11 15:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-25 0:57 linux-next: build failure after merge of the kspp tree Stephen Rothwell
2022-01-25 3:35 ` Kees Cook
2022-01-25 14:07 ` David Sterba
2022-02-10 23:42 ` linux-next: build failure after merge of the btrfs tree (Was: Re: linux-next: build failure after merge of the kspp tree) Stephen Rothwell
2022-02-11 15:38 ` David Sterba [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220211153835.GY12643@suse.cz \
--to=dsterba@suse$(echo .)cz \
--cc=dsterba@suse$(echo .)com \
--cc=keescook@chromium$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=osandov@fb$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox