GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-28 09:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SUNRPC: Refactor logic to NUL-terminate strings in pages

Browse source 
Clean up: Introduce a helper to '\0'-terminate XDR strings
that are placed in a page in the page cache.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Chuck Lever 2010-09-21 16:55:48 -04:00 • committed by Trond Myklebust
parent 38359352fc
commit b4687da7fc
5 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fs/nfs/nfs2xdr.c
View file

@ -596,7 +596,6 @@ nfs_xdr_readlinkres(struct rpc_rqst *req, __be32 *p, void *dummy)
struct kvec *iov = rcvbuf->head; struct kvec *iov = rcvbuf->head;
size_t hdrlen; size_t hdrlen;
u32 len, recvd; u32 len, recvd;
char *kaddr;
int status; int status;
if ((status = ntohl(*p++))) if ((status = ntohl(*p++)))
@ -623,10 +622,7 @@ nfs_xdr_readlinkres(struct rpc_rqst *req, __be32 *p, void *dummy)
return -EIO; return -EIO;
} }
/* NULL terminate the string we got */ xdr_terminate_string(rcvbuf, len);
kaddr = (char *)kmap_atomic(rcvbuf->pages[0], KM_USER0);
kaddr[len+rcvbuf->page_base] = '\0';
kunmap_atomic(kaddr, KM_USER0);
return 0; return 0;
} }

6
fs/nfs/nfs3xdr.c
View file

@ -824,7 +824,6 @@ nfs3_xdr_readlinkres(struct rpc_rqst *req, __be32 *p, struct nfs_fattr *fattr)
struct kvec *iov = rcvbuf->head; struct kvec *iov = rcvbuf->head;
size_t hdrlen; size_t hdrlen;
u32 len, recvd; u32 len, recvd;
char *kaddr;
int status; int status;
status = ntohl(*p++); status = ntohl(*p++);
@ -857,10 +856,7 @@ nfs3_xdr_readlinkres(struct rpc_rqst *req, __be32 *p, struct nfs_fattr *fattr)
return -EIO; return -EIO;
} }
/* NULL terminate the string we got */ xdr_terminate_string(rcvbuf, len);
kaddr = (char*)kmap_atomic(rcvbuf->pages[0], KM_USER0);
kaddr[len+rcvbuf->page_base] = '\0';
kunmap_atomic(kaddr, KM_USER0);
return 0; return 0;
} }

5
fs/nfs/nfs4xdr.c
View file

@ -4299,7 +4299,6 @@ static int decode_readlink(struct xdr_stream *xdr, struct rpc_rqst *req)
size_t hdrlen; size_t hdrlen;
u32 len, recvd; u32 len, recvd;
__be32 *p; __be32 *p;
char *kaddr;
int status; int status;
status = decode_op_hdr(xdr, OP_READLINK); status = decode_op_hdr(xdr, OP_READLINK);
@ -4330,9 +4329,7 @@ static int decode_readlink(struct xdr_stream *xdr, struct rpc_rqst *req)
* and and null-terminate the text (the VFS expects * and and null-terminate the text (the VFS expects
* null-termination). * null-termination).
*/ */
kaddr = (char *)kmap_atomic(rcvbuf->pages[0], KM_USER0); xdr_terminate_string(rcvbuf, len);
kaddr[len+rcvbuf->page_base] = '\0';
kunmap_atomic(kaddr, KM_USER0);
return 0; return 0;
out_overflow: out_overflow:
print_overflow_msg(__func__, xdr); print_overflow_msg(__func__, xdr);

1
include/linux/sunrpc/xdr.h
View file

@ -108,6 +108,7 @@ void xdr_encode_pages(struct xdr_buf *, struct page **, unsigned int,
unsigned int); unsigned int);
void xdr_inline_pages(struct xdr_buf *, unsigned int, void xdr_inline_pages(struct xdr_buf *, unsigned int,
struct page **, unsigned int, unsigned int); struct page **, unsigned int, unsigned int);
void xdr_terminate_string(struct xdr_buf *, const u32);
static inline __be32 *xdr_encode_array(__be32 *p, const void *s, unsigned int len) static inline __be32 *xdr_encode_array(__be32 *p, const void *s, unsigned int len)
{ {

17
net/sunrpc/xdr.c
View file

@ -111,6 +111,23 @@ xdr_decode_string_inplace(__be32 *p, char **sp,
} }
EXPORT_SYMBOL_GPL(xdr_decode_string_inplace); EXPORT_SYMBOL_GPL(xdr_decode_string_inplace);
/**
* xdr_terminate_string - '\0'-terminate a string residing in an xdr_buf
* @buf: XDR buffer where string resides
* @len: length of string, in bytes
*
*/
void
xdr_terminate_string(struct xdr_buf *buf, const u32 len)
{
char *kaddr;
kaddr = kmap_atomic(buf->pages[0], KM_USER0);
kaddr[buf->page_base + len] = '\0';
kunmap_atomic(kaddr, KM_USER0);
}
EXPORT_SYMBOL(xdr_terminate_string);
void void
xdr_encode_pages(struct xdr_buf *xdr, struct page **pages, unsigned int base, xdr_encode_pages(struct xdr_buf *xdr, struct page **pages, unsigned int base,
unsigned int len) unsigned int len)