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

Commit 67f97d83 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

SUNRPC: Use correct type in buffer length calculations 



Use correct type signage in gss_krb5_remove_padding() when doing length
calculations.  Both xdr_buf.len and iov.iov_len are size_t, which is
unsigned; so use an unsigned type for our temporary length variable to
ensure we don't overflow it..

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatar"J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent afde94f3

net/sunrpc/auth_gss/gss_krb5_wrap.c

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ gss_krb5_remove_padding(struct xdr_buf *buf, int blocksize) 
{

	u8 *ptr;

	u8 pad;

	int len = buf->len;

	size_t len = buf->len;



	if (len <= buf->head[0].iov_len) {

		pad = *(u8 *)(buf->head[0].iov_base + len - 1);
@@ -53,9 +53,9 @@ gss_krb5_remove_padding(struct xdr_buf *buf, int blocksize) 
	} else

		len -= buf->head[0].iov_len;

	if (len <= buf->page_len) {

		int last = (buf->page_base + len - 1)

		unsigned int last = (buf->page_base + len - 1)

					>>PAGE_CACHE_SHIFT;

		int offset = (buf->page_base + len - 1)

		unsigned int offset = (buf->page_base + len - 1)

					& (PAGE_CACHE_SIZE - 1);

		ptr = kmap_atomic(buf->pages[last], KM_USER0);

		pad = *(ptr + offset);