diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2009-04-24 01:33:10 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-04-28 19:54:30 +0200 |
| commit | 3d72ab8fdd44c872633b210dd1a4afd2910d0bbb (patch) | |
| tree | 78b8ffba38d32d99b518c0efba19bffacc034b22 | |
| parent | SUNRPC: Clean up one_sock_name() (diff) | |
| download | linux-3d72ab8fdd44c872633b210dd1a4afd2910d0bbb.tar.xz linux-3d72ab8fdd44c872633b210dd1a4afd2910d0bbb.zip | |
NFSD: Stricter buffer size checking in write_recoverydir()
While it's not likely a pathname will be longer than
SIMPLE_TRANSACTION_SIZE, we should be more careful about just
plopping it into the output buffer without bounds checking.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
| -rw-r--r-- | fs/nfsd/nfsctl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index b64a7fbfccf5..c4843467cfd4 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -1260,8 +1260,9 @@ static ssize_t __write_recoverydir(struct file *file, char *buf, size_t size) status = nfs4_reset_recoverydir(recdir); } - sprintf(buf, "%s\n", nfs4_recoverydir()); - return strlen(buf); + + return scnprintf(buf, SIMPLE_TRANSACTION_LIMIT, "%s\n", + nfs4_recoverydir()); } /** |