From: Olga Kornievskaia <olga.kornievskaia@gmail.com>
To: "J. Bruce Fields" <bfields@fieldses.org>
Cc: "J. Bruce Fields" <bfields@redhat.com>,
linux-nfs <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH v1 07/13] NFSD add ca_source_server<> to COPY
Date: Fri, 2 Nov 2018 12:36:03 -0400 [thread overview]
Message-ID: <CAN-5tyFifYcHe5e5PLERBsZxgrbcPjV=DrQu4u=+N16XK2=3wA@mail.gmail.com> (raw)
In-Reply-To: <20181102140336.GB19655@fieldses.org>
On Fri, Nov 2, 2018 at 10:04 AM J. Bruce Fields <bfields@fieldses.org> wrote:
>
> On Fri, Oct 19, 2018 at 11:28:59AM -0400, Olga Kornievskaia wrote:
> > @@ -1762,8 +1810,24 @@ static __be32 nfsd4_decode_reclaim_complete(struct nfsd4_compoundargs *argp, str
> > p = xdr_decode_hyper(p, ©->cp_count);
> > p++; /* ca_consecutive: we always do consecutive copies */
> > copy->cp_synchronous = be32_to_cpup(p++);
> > - tmp = be32_to_cpup(p); /* Source server list not supported */
> > + count = be32_to_cpup(p++);
> > +
> > + if (count == 0) /* intra-server copy */
> > + goto intra;
> >
> > + /* decode all the supplied server addresses but use first */
> > + copy->cp_src = kmalloc(count * sizeof(struct nl4_server), GFP_KERNEL);
>
> The client could pass an arbitrarily large count here. I don't know if
> the ability to force the server to attempt a large kmalloc() is really
> useful to an attacker, but I'd definitely rather not allow it.
>
> Possibly more serious: if that multiplication overflows, then in theory
> it might be possible to make the kmalloc() succeed and allocate too
> little memory, after which the following loop could overwrite memory
> past the end of the allocation.
>
> As long as we're only using the first address, maybe it's simplest just
> not to bother allocating memory for the rest. Just copy the first one,
> and for the rest call nfsd4_decode_nl4_server() with a dummy struct
> nl4_server.
Ok will try.
>
> --b.
>
> > + if (copy->cp_src == NULL)
> > + return nfserrno(-ENOMEM);
> > +
> > + ns = copy->cp_src;
> > + for (i = 0; i < count; i++) {
> > + status = nfsd4_decode_nl4_server(argp, ns);
> > + if (status)
> > + return status;
> > + ns++;
> > + }
> > +intra:
> > DECODE_TAIL;
> > }
> >
> > @@ -4273,6 +4337,9 @@ static __be32 nfsd4_encode_readv(struct nfsd4_compoundres *resp,
> > p = xdr_reserve_space(&resp->xdr, 4 + 4);
> > *p++ = xdr_one; /* cr_consecutive */
> > *p++ = cpu_to_be32(copy->cp_synchronous);
> > +
> > + /* allocated in nfsd4_decode_copy */
> > + kfree(copy->cp_src);
> > return 0;
> > }
> >
> > diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h
> > index feeb6d4..b4d1140 100644
> > --- a/fs/nfsd/xdr4.h
> > +++ b/fs/nfsd/xdr4.h
> > @@ -521,6 +521,7 @@ struct nfsd4_copy {
> > u64 cp_src_pos;
> > u64 cp_dst_pos;
> > u64 cp_count;
> > + struct nl4_server *cp_src;
> >
> > /* both */
> > bool cp_synchronous;
> > --
> > 1.8.3.1
next prev parent reply other threads:[~2018-11-02 16:36 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-19 15:28 [PATCH v1 00/13] server-side support for "inter" SSC copy Olga Kornievskaia
2018-10-19 15:28 ` [PATCH v1 01/13] fs: Don't copy beyond the end of the file Olga Kornievskaia
2018-10-31 16:54 ` J. Bruce Fields
2018-10-31 17:07 ` Olga Kornievskaia
2018-10-31 17:54 ` J. Bruce Fields
2018-10-31 18:01 ` Olga Kornievskaia
2018-10-31 18:29 ` J. Bruce Fields
2018-10-19 15:28 ` [PATCH v1 02/13] VFS permit cross device vfs_copy_file_range Olga Kornievskaia
2018-10-19 15:28 ` [PATCH v1 03/13] NFS NFSD defining nl4_servers structure needed by both Olga Kornievskaia
2018-10-19 15:28 ` [PATCH v1 04/13] NFS inter ssc open Olga Kornievskaia
2018-10-31 18:40 ` J. Bruce Fields
2018-10-31 18:54 ` Olga Kornievskaia
2018-11-01 20:12 ` J. Bruce Fields
2018-11-01 20:30 ` Olga Kornievskaia
2018-10-19 15:28 ` [PATCH v1 05/13] NFS skip recovery of copy open on dest server Olga Kornievskaia
2018-11-01 20:19 ` J. Bruce Fields
2018-11-01 20:38 ` Olga Kornievskaia
2018-11-01 21:24 ` J. Bruce Fields
2018-10-19 15:28 ` [PATCH v1 06/13] NFSD fill-in netloc4 structure Olga Kornievskaia
2018-11-01 20:37 ` J. Bruce Fields
2018-11-01 20:55 ` Olga Kornievskaia
2018-10-19 15:28 ` [PATCH v1 07/13] NFSD add ca_source_server<> to COPY Olga Kornievskaia
2018-11-01 20:48 ` J. Bruce Fields
2018-11-01 21:00 ` Olga Kornievskaia
2018-11-02 13:53 ` J. Bruce Fields
2018-11-02 14:03 ` J. Bruce Fields
2018-11-02 16:36 ` Olga Kornievskaia [this message]
2018-11-02 15:46 ` J. Bruce Fields
2018-11-02 16:35 ` Olga Kornievskaia
2018-11-02 16:49 ` J. Bruce Fields
2018-11-02 17:04 ` Olga Kornievskaia
2018-10-19 15:29 ` [PATCH v1 08/13] NFSD return nfs4_stid in nfs4_preprocess_stateid_op Olga Kornievskaia
2018-11-02 19:05 ` J. Bruce Fields
2018-11-02 19:25 ` Olga Kornievskaia
2018-11-02 19:53 ` J. Bruce Fields
2018-10-19 15:29 ` [PATCH v1 09/13] NFSD add COPY_NOTIFY operation Olga Kornievskaia
2018-11-05 17:50 ` J. Bruce Fields
2018-11-08 18:29 ` Olga Kornievskaia
2018-11-08 18:46 ` J. Bruce Fields
2018-10-19 15:29 ` [PATCH v1 10/13] NFSD check stateids against copy stateids Olga Kornievskaia
2018-11-05 21:33 ` J. Bruce Fields
2018-11-08 18:43 ` Olga Kornievskaia
2018-10-19 15:29 ` [PATCH v1 11/13] NFSD generalize nfsd4_compound_state flag names Olga Kornievskaia
2018-10-19 15:29 ` [PATCH v1 12/13] NFSD: allow inter server COPY to have a STALE source server fh Olga Kornievskaia
2018-11-07 18:57 ` J. Bruce Fields
2018-11-08 18:51 ` Olga Kornievskaia
2018-11-08 19:25 ` J. Bruce Fields
2018-11-08 19:27 ` J. Bruce Fields
2018-11-08 19:31 ` Olga Kornievskaia
2018-11-08 19:32 ` Olga Kornievskaia
2018-10-19 15:29 ` [PATCH v1 13/13] NFSD add nfs4 inter ssc to nfsd4_copy Olga Kornievskaia
2018-11-07 21:48 ` J. Bruce Fields
2018-11-08 19:16 ` Olga Kornievskaia
2018-11-09 16:23 ` J. Bruce Fields
2018-10-25 16:07 ` [PATCH v1 00/13] server-side support for "inter" SSC copy J. Bruce Fields
2018-10-29 17:54 ` Olga Kornievskaia
2018-10-29 20:53 ` J. Bruce Fields
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='CAN-5tyFifYcHe5e5PLERBsZxgrbcPjV=DrQu4u=+N16XK2=3wA@mail.gmail.com' \
--to=olga.kornievskaia@gmail.com \
--cc=bfields@fieldses.org \
--cc=bfields@redhat.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).