Commit c3dfc280 authored Apr 13, 2011 by Bryan Schumaker Committed by Trond Myklebust Apr 13, 2011

NFS: Use correct variable for page bounds checking



While decoding a secinfo reply, I store the list of supported sec
flavors on a page accessible through res->flavors.  Before reading
each new flavor, I do some math to determine if there is enough
space left on this page, and I break out of my read look if there
isn't.  In order to perform this check correctly, I need to use the
address of res->flavors, rather than the address of res.

When this loop was broken early I lied to the caller and told them
that the entire list had been decoded.  This could lead to problems
if the caller tries to use any the garbage data claiming to be a
valid sec flavor.  I fixed this by using res->flavors->num_flavors
as a counter, incrementing it every time a sec flavor is
successfully decoded.

Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

parent 9b7160c5

fs/nfs/nfs4xdr.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -4838,17 +4838,19 @@ static int decode_secinfo(struct xdr_stream xdr, struct nfs4_secinfo_res res)
		struct nfs4_secinfo_flavor *sec_flavor;
		int status;
		__be32 *p;
		int i;
		int i, num_flavors;

		status = decode_op_hdr(xdr, OP_SECINFO);
		p = xdr_inline_decode(xdr, 4);
		if (unlikely(!p))
		goto out_overflow;
		res->flavors->num_flavors = be32_to_cpup(p);

		for (i = 0; i < res->flavors->num_flavors; i++) {
		res->flavors->num_flavors = 0;
		num_flavors = be32_to_cpup(p);

		for (i = 0; i < num_flavors; i++) {
		sec_flavor = &res->flavors->flavors[i];
		if ((char )&sec_flavor[1] - (char )res > PAGE_SIZE)
		if ((char )&sec_flavor[1] - (char )res->flavors > PAGE_SIZE)
		break;

		p = xdr_inline_decode(xdr, 4);
		@@ -4860,6 +4862,7 @@ static int decode_secinfo(struct xdr_stream xdr, struct nfs4_secinfo_res res)
		if (decode_secinfo_gss(xdr, sec_flavor))
		break;
		}
		res->flavors->num_flavors++;
		}

		return 0;

Admin message