diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-19 20:00:00 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-19 20:00:00 +0200 |
| commit | 90cdb1a0e65db31eeb9afaec7d1d3d27e15ae900 (patch) | |
| tree | aa859ee7750f7904007520087637ecf8f940cfad /net | |
| parent | USB: ehci-fsl: Return valid error in ehci_fsl_setup_phy (diff) | |
| parent | SUNRPC: Prevent kernel stack corruption on long values of flush (diff) | |
| download | linux-90cdb1a0e65db31eeb9afaec7d1d3d27e15ae900.tar.xz linux-90cdb1a0e65db31eeb9afaec7d1d3d27e15ae900.zip | |
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
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/cache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c index 2a68bb3db772..fc2f7aa4dca7 100644 --- a/net/sunrpc/cache.c +++ b/net/sunrpc/cache.c @@ -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; |