Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1537693c authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: Clean up xdr_set_iov() 



Remove the 'p' argument, since that is only ever set by xdr_init_decode.
Add sanity checking of 'p' inside xdr_init_decode itself.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 76cacaab

net/sunrpc/xdr.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -554,13 +554,11 @@ void xdr_write_pages(struct xdr_stream *xdr, struct page **pages, unsigned int b 
EXPORT_SYMBOL_GPL(xdr_write_pages);

EXPORT_SYMBOL_GPL(xdr_write_pages);





static void xdr_set_iov(struct xdr_stream *xdr, struct kvec *iov,

static void xdr_set_iov(struct xdr_stream *xdr, struct kvec *iov,

		__be32 *p, unsigned int len)

		unsigned int len)

{

{

	if (len > iov->iov_len)

	if (len > iov->iov_len)

		len = iov->iov_len;

		len = iov->iov_len;

	if (p == NULL)

	xdr->p = (__be32*)iov->iov_base;

		p = (__be32*)iov->iov_base;

	xdr->p = p;

	xdr->end = (__be32*)(iov->iov_base + len);

	xdr->end = (__be32*)(iov->iov_base + len);

	xdr->iov = iov;

	xdr->iov = iov;

	xdr->page_ptr = NULL;

	xdr->page_ptr = NULL;
@@ -607,7 +605,7 @@ static void xdr_set_next_page(struct xdr_stream *xdr) 
	newbase -= xdr->buf->page_base;

	newbase -= xdr->buf->page_base;





	if (xdr_set_page_base(xdr, newbase, PAGE_SIZE) < 0)

	if (xdr_set_page_base(xdr, newbase, PAGE_SIZE) < 0)

		xdr_set_iov(xdr, xdr->buf->tail, NULL, xdr->buf->len);

		xdr_set_iov(xdr, xdr->buf->tail, xdr->buf->len);

}

}





static bool xdr_set_next_buffer(struct xdr_stream *xdr)

static bool xdr_set_next_buffer(struct xdr_stream *xdr)
@@ -616,7 +614,7 @@ static bool xdr_set_next_buffer(struct xdr_stream *xdr) 
		xdr_set_next_page(xdr);

		xdr_set_next_page(xdr);

	else if (xdr->iov == xdr->buf->head) {

	else if (xdr->iov == xdr->buf->head) {

		if (xdr_set_page_base(xdr, 0, PAGE_SIZE) < 0)

		if (xdr_set_page_base(xdr, 0, PAGE_SIZE) < 0)

			xdr_set_iov(xdr, xdr->buf->tail, NULL, xdr->buf->len);

			xdr_set_iov(xdr, xdr->buf->tail, xdr->buf->len);

	}

	}

	return xdr->p != xdr->end;

	return xdr->p != xdr->end;

}

}
@@ -633,9 +631,11 @@ void xdr_init_decode(struct xdr_stream *xdr, struct xdr_buf *buf, __be32 *p) 
	xdr->scratch.iov_base = NULL;

	xdr->scratch.iov_base = NULL;

	xdr->scratch.iov_len = 0;

	xdr->scratch.iov_len = 0;

	if (buf->head[0].iov_len != 0)

	if (buf->head[0].iov_len != 0)

		xdr_set_iov(xdr, buf->head, p, buf->len);

		xdr_set_iov(xdr, buf->head, buf->len);

	else if (buf->page_len != 0)

	else if (buf->page_len != 0)

		xdr_set_page_base(xdr, 0, buf->len);

		xdr_set_page_base(xdr, 0, buf->len);

	if (p != NULL && p > xdr->p && xdr->end >= p)

		xdr->p = p;

}

}

EXPORT_SYMBOL_GPL(xdr_init_decode);

EXPORT_SYMBOL_GPL(xdr_init_decode);