Commit a14a6359 authored by Anna Schumaker's avatar Anna Schumaker
Browse files

NFS: Use xdr_page_pos() in NFSv4 decode_getacl() 



Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent cf1f08ca

fs/nfs/nfs4xdr.c

+1 −5
Original line number Diff line number Diff line
@@ -5308,7 +5308,6 @@ static int decode_getacl(struct xdr_stream *xdr, struct rpc_rqst *req, 
	uint32_t attrlen,

		 bitmap[3] = {0};

	int status;

	unsigned int pg_offset;



	res->acl_len = 0;

	if ((status = decode_op_hdr(xdr, OP_GETATTR)) != 0)
@@ -5316,9 +5315,6 @@ static int decode_getacl(struct xdr_stream *xdr, struct rpc_rqst *req, 


	xdr_enter_page(xdr, xdr->buf->page_len);



	/* Calculate the offset of the page data */

	pg_offset = xdr->buf->head[0].iov_len;



	if ((status = decode_attr_bitmap(xdr, bitmap)) != 0)

		goto out;

	if ((status = decode_attr_length(xdr, &attrlen, &savep)) != 0)
@@ -5331,7 +5327,7 @@ static int decode_getacl(struct xdr_stream *xdr, struct rpc_rqst *req, 
		/* The bitmap (xdr len + bitmaps) and the attr xdr len words

		 * are stored with the acl data to handle the problem of

		 * variable length bitmaps.*/

		res->acl_data_offset = xdr_stream_pos(xdr) - pg_offset;

		res->acl_data_offset = xdr_page_pos(xdr);

		res->acl_len = attrlen;



		/* Check for receive buffer overflow */