renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-03 19:24:02 +08:00
Code

Merge branch 'for-3.17' of git://linux-nfs.org/~bfields/linux

Browse Source 
Pull nfsd bugfixes from Bruce Fields:
 "A couple minor nfsd bugfixes"

* 'for-3.17' of git://linux-nfs.org/~bfields/linux:
  lockd: fix rpcbind crash on lockd startup failure
  nfsd4: fix rd_dircount enforcement
This commit is contained in:
Linus Torvalds 2014-09-08 15:18:06 -07:00
commit 861b7102b5
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/lockd/svc.c
View File

@ -253,13 +253,11 @@ static int lockd_up_net(struct svc_serv *serv, struct net *net)
error = make_socks(serv, net); error = make_socks(serv, net);
if (error < 0) if (error < 0)
goto err_socks; goto err_bind;
set_grace_period(net); set_grace_period(net);
dprintk("lockd_up_net: per-net data created; net=%p\n", net); dprintk("lockd_up_net: per-net data created; net=%p\n", net);
return 0; return 0;
err_socks:
svc_rpcb_cleanup(serv, net);
err_bind: err_bind:
ln->nlmsvc_users--; ln->nlmsvc_users--;
return error; return error;

14
fs/nfsd/nfs4xdr.c
View File

@ -2657,6 +2657,7 @@ nfsd4_encode_dirent(void *ccdv, const char *name, int namlen,
struct xdr_stream *xdr = cd->xdr; struct xdr_stream *xdr = cd->xdr;
int start_offset = xdr->buf->len; int start_offset = xdr->buf->len;
int cookie_offset; int cookie_offset;
u32 name_and_cookie;
int entry_bytes; int entry_bytes;
__be32 nfserr = nfserr_toosmall; __be32 nfserr = nfserr_toosmall;
__be64 wire_offset; __be64 wire_offset;
@ -2718,7 +2719,14 @@ nfsd4_encode_dirent(void *ccdv, const char *name, int namlen,
cd->rd_maxcount -= entry_bytes; cd->rd_maxcount -= entry_bytes;
if (!cd->rd_dircount) if (!cd->rd_dircount)
goto fail; goto fail;
cd->rd_dircount--; /*
* RFC 3530 14.2.24 describes rd_dircount as only a "hint", so
* let's always let through the first entry, at least:
*/
name_and_cookie = 4 * XDR_QUADLEN(namlen) + 8;
if (name_and_cookie > cd->rd_dircount && cd->cookie_offset)
goto fail;
cd->rd_dircount -= min(cd->rd_dircount, name_and_cookie);
cd->cookie_offset = cookie_offset; cd->cookie_offset = cookie_offset;
skip_entry: skip_entry:
cd->common.err = nfs_ok; cd->common.err = nfs_ok;
@ -3321,6 +3329,10 @@ nfsd4_encode_readdir(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4
} }
maxcount = min_t(int, maxcount-16, bytes_left); maxcount = min_t(int, maxcount-16, bytes_left);
/* RFC 3530 14.2.24 allows us to ignore dircount when it's 0: */
if (!readdir->rd_dircount)
readdir->rd_dircount = INT_MAX;
readdir->xdr = xdr; readdir->xdr = xdr;
readdir->rd_maxcount = maxcount; readdir->rd_maxcount = maxcount;
readdir->common.err = 0; readdir->common.err = 0;