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.
--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
