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

Commit 90cdb1a0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull nfsd bugfixes from J Bruce Fields.

* 'for-3.7' of git://linux-nfs.org/~bfields/linux:
  SUNRPC: Prevent kernel stack corruption on long values of flush
  NLM: nlm_lookup_file() may return NLMv4-specific error codes
parents d479c911 212ba906

fs/lockd/clntxdr.c

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static void encode_nlm_stat(struct xdr_stream *xdr, 
{

	__be32 *p;



	BUG_ON(be32_to_cpu(stat) > NLM_LCK_DENIED_GRACE_PERIOD);

	WARN_ON_ONCE(be32_to_cpu(stat) > NLM_LCK_DENIED_GRACE_PERIOD);

	p = xdr_reserve_space(xdr, 4);

	*p = stat;

}

fs/lockd/svcproc.c

+2 −1
Original line number Diff line number Diff line
@@ -68,7 +68,8 @@ nlmsvc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp, 


	/* Obtain file pointer. Not used by FREE_ALL call. */

	if (filp != NULL) {

		if ((error = nlm_lookup_file(rqstp, &file, &lock->fh)) != 0)

		error = cast_status(nlm_lookup_file(rqstp, &file, &lock->fh));

		if (error != 0)

			goto no_locks;

		*filp = file;

net/sunrpc/cache.c

+2 −2
Original line number Diff line number Diff line
@@ -1409,11 +1409,11 @@ static ssize_t read_flush(struct file *file, char __user *buf, 
			  size_t count, loff_t *ppos,

			  struct cache_detail *cd)

{

	char tbuf[20];

	char tbuf[22];

	unsigned long p = *ppos;

	size_t len;



	sprintf(tbuf, "%lu\n", convert_to_wallclock(cd->flush_time));

	snprintf(tbuf, sizeof(tbuf), "%lu\n", convert_to_wallclock(cd->flush_time));

	len = strlen(tbuf);

	if (p >= len)

		return 0;