NFS: decode_dirent should use an xdr_stream
Subsystems (2)
PATCH 6/10 NFS: decode_dirent should use an xdr_stream
Convert nfs*xdr.c to use an xdr stream in decode_dirent. This will prevent a kernel oops that has been occuring when reading a vmapped page.
Signed-off-by Bryan Schumaker <[email protected]>
Signed-off-by Trond Myklebust <[email protected]>
--- fs/nfs/dir.c | 29 +++++++++++---- fs/nfs/internal.h | 6 ++-- fs/nfs/nfs2xdr.c | 39 ++++++++++++++++++-- fs/nfs/nfs3xdr.c | 93 ++++++++++++++++++++++++++++++++++++++++++++--- fs/nfs/nfs4_fs.h | 2 +- fs/nfs/nfs4xdr.c | 71 +++++++++++++++++++++++++++--------- include/linux/nfs_xdr.h | 2 +- 7 files changed, 202 insertions(+), 40 deletions(-)
fs/nfs/dir.c +21 -8
@@ -171,7 +171,7 @@ struct nfs_cache_array {#define MAX_READDIR_ARRAY ((PAGE_SIZE - sizeof(struct nfs_cache_array)) / sizeof(struct nfs_cache_array_entry)) -typedef __be32 * (*decode_dirent_t )(__be32 *,struct nfs_entry *,int ); +typedef __be32 * (*decode_dirent_t )(struct xdr_stream *,struct nfs_entry *,int ); typedef struct { struct file *file; struct page *page;
@@ -357,13 +357,11 @@ error:/* Fill in an entry based on the xdr code stored in desc->page */ static -int xdr_decode (nfs_readdir_descriptor_t *desc,struct nfs_entry *entry,__be32 **ptr) +int xdr_decode (nfs_readdir_descriptor_t *desc,struct nfs_entry *entry,struct xdr_stream *stream) { -__be32 *p = *ptr; - p = desc->decode (p, entry, desc->plus); +__be32 *p = desc->decode (stream, entry, desc->plus);if (IS_ERR (p))return PTR_ERR (p); - *ptr = p; entry->fattr->time_start = desc->timestamp; entry->fattr->gencount = desc->gencount;
@@ -438,10 +436,23 @@ out:/* Perform conversion from xdr to cache array */ static void nfs_readdir_page_filler (nfs_readdir_descriptor_t *desc,struct nfs_entry *entry, -struct page *xdr_page,struct page *page) +struct page *xdr_page,struct page *page,unsigned int buflen) { +struct xdr_stream stream; +struct xdr_buf buf;__be32 *ptr =kmap (xdr_page); -while (xdr_decode (desc, entry, &ptr) ==0 ) { + + buf.head->iov_base = xdr_page; + buf.head->iov_len = buflen; + buf.tail->iov_len =0 ; + buf.page_base =0 ; + buf.page_len =0 ; + buf.buflen = buf.head->iov_len; + buf.len = buf.head->iov_len; + +xdr_init_decode (&stream, &buf, ptr); + +while (xdr_decode (desc, entry, &stream) ==0 ) {if (nfs_readdir_add_to_array (entry, page) ==-1 )break ;if (desc->plus ==1 )
@@ -458,6 +469,7 @@ int nfs_readdir_xdr_to_array(nfs_readdir_descriptor_t *desc, struct page *page,struct file *file = desc->file;struct nfs_cache_array *array;int status =0 ; +unsigned int array_size =1 ; entry.prev_cookie =0 ; entry.cookie = *desc->dir_cookie;
@@ -476,9 +488,10 @@ int nfs_readdir_xdr_to_array(nfs_readdir_descriptor_t *desc, struct page *page, goto out_release_array;do { status =nfs_readdir_xdr_filler (xdr_page, desc, &entry, file, inode); +if (status <0 )break ; -nfs_readdir_page_filler (desc, &entry, xdr_page, page); +nfs_readdir_page_filler (desc, &entry, xdr_page, page, array_size *PAGE_SIZE ); }while (array->eof_index <0 && array->size <MAX_READDIR_ARRAY );put_page (xdr_page);
fs/nfs/internal.h +3 -3
@@ -181,15 +181,15 @@ extern void nfs_destroy_directcache(void);/* nfs2xdr.c */ extern int nfs_stat_to_errno (int );extern struct rpc_procinfo nfs_procedures[]; -extern __be32 *nfs_decode_dirent (__be32 *,struct nfs_entry *,int ); +extern __be32 *nfs_decode_dirent (struct xdr_stream *,struct nfs_entry *,int );/* nfs3xdr.c */ extern struct rpc_procinfo nfs3_procedures[]; -extern __be32 *nfs3_decode_dirent (__be32 *,struct nfs_entry *,int ); +extern __be32 *nfs3_decode_dirent (struct xdr_stream *,struct nfs_entry *,int );/* nfs4xdr.c */ #ifdef CONFIG_NFS_V4 -extern __be32 *nfs4_decode_dirent (__be32 *p,struct nfs_entry *entry,int plus); +extern __be32 *nfs4_decode_dirent (struct xdr_stream *,struct nfs_entry *entry,int plus);#endif #ifdef CONFIG_NFS_V4_1 extern const u32 nfs41_maxread_overhead;
fs/nfs/nfs2xdr.c +35 -4
@@ -500,25 +500,56 @@ err_unmap: goto out; } +static void print_overflow_msg (const char *func,const struct xdr_stream *xdr) +{ +dprintk ("nfs: %s: prematurely hit end of receive buffer. " +"Remaining buffer length is %tu words.\n" , + func, xdr->end - xdr->p); +} +__be32 * -nfs_decode_dirent (__be32 *p,struct nfs_entry *entry,int plus) +nfs_decode_dirent (struct xdr_stream *xdr,struct nfs_entry *entry,int plus) { -if (!*p++) { -if (!*p) +__be32 *p; + p =xdr_inline_decode (xdr,4 ); +if (unlikely (!p)) + goto out_overflow; +if (!ntohl (*p++)) { + p =xdr_inline_decode (xdr,4 ); +if (unlikely (!p)) + goto out_overflow; +if (!ntohl (*p++))return ERR_PTR (-EAGAIN ); entry->eof =1 ;return ERR_PTR (-EBADCOOKIE ); } + p =xdr_inline_decode (xdr,8 ); +if (unlikely (!p)) + goto out_overflow; + entry->ino =ntohl (*p++); entry->len =ntohl (*p++); + + p =xdr_inline_decode (xdr, entry->len +4 ); +if (unlikely (!p)) + goto out_overflow; entry->name = (const char *) p; p +=XDR_QUADLEN (entry->len); entry->prev_cookie = entry->cookie; entry->cookie =ntohl (*p++); - entry->eof = !p[0 ] && p[1 ]; + + p =xdr_inline_peek (xdr,8 ); +if (p !=NULL ) + entry->eof = !p[0 ] && p[1 ]; +else + entry->eof =0 ;return p; + +out_overflow: +print_overflow_msg (__func__, xdr); +return ERR_PTR (-EIO ); }/*
fs/nfs/nfs3xdr.c +87 -6
142 lines not on this page · raw message
fs/nfs/nfs4_fs.h +1 -1
@@ -331,7 +331,7 @@ extern void nfs_free_seqid(struct nfs_seqid *seqid);extern const nfs4_stateid zero_stateid;/* nfs4xdr.c */ -extern __be32 *nfs4_decode_dirent (__be32 *p,struct nfs_entry *entry,int plus); +extern __be32 *nfs4_decode_dirent (struct xdr_stream *,struct nfs_entry *entry,int plus);extern struct rpc_procinfo nfs4_procedures[];struct nfs4_mount_data ;
fs/nfs/nfs4xdr.c +54 -17
126 lines not on this page · raw message
include/linux/nfs_xdr.h +1 -1
@@ -1036,7 +1036,7 @@ struct nfs_rpc_ops {int (*pathconf) (struct nfs_server *,struct nfs_fh *,struct nfs_pathconf *);int (*set_capabilities)(struct nfs_server *,struct nfs_fh *); -__be32 *(*decode_dirent)(__be32 *,struct nfs_entry *,int plus); +__be32 *(*decode_dirent)(struct xdr_stream *,struct nfs_entry *,int plus);void (*read_setup) (struct nfs_read_data *,struct rpc_message *);int (*read_done) (struct rpc_task *,struct nfs_read_data *);void (*write_setup) (struct nfs_write_data *,struct rpc_message *);