tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 90cdb1a0 d479c911

+5 -4
+1 -1
fs/lockd/clntxdr.c
··· 223 223 { 224 224 __be32 *p; 225 225 226 - BUG_ON(be32_to_cpu(stat) > NLM_LCK_DENIED_GRACE_PERIOD); 226 + WARN_ON_ONCE(be32_to_cpu(stat) > NLM_LCK_DENIED_GRACE_PERIOD); 227 227 p = xdr_reserve_space(xdr, 4); 228 228 *p = stat; 229 229 }
+2 -1
fs/lockd/svcproc.c
··· 68 68 69 69 /* Obtain file pointer. Not used by FREE_ALL call. */ 70 70 if (filp != NULL) { 71 - if ((error = nlm_lookup_file(rqstp, &file, &lock->fh)) != 0) 71 + error = cast_status(nlm_lookup_file(rqstp, &file, &lock->fh)); 72 + if (error != 0) 72 73 goto no_locks; 73 74 *filp = file; 74 75
+2 -2
net/sunrpc/cache.c
··· 1409 1409 size_t count, loff_t *ppos, 1410 1410 struct cache_detail *cd) 1411 1411 { 1412 - char tbuf[20]; 1412 + char tbuf[22]; 1413 1413 unsigned long p = *ppos; 1414 1414 size_t len; 1415 1415 1416 - sprintf(tbuf, "%lu\n", convert_to_wallclock(cd->flush_time)); 1416 + snprintf(tbuf, sizeof(tbuf), "%lu\n", convert_to_wallclock(cd->flush_time)); 1417 1417 len = strlen(tbuf); 1418 1418 if (p >= len) 1419 1419 return 0;