diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-10-13 00:30:28 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-28 10:14:13 -0700 |
| commit | 08eaf6a4ee82eb566c188f71b33f52e780fab57d (patch) | |
| tree | 5542ba56a9cd7feccae5af3bbde61248537ba5bf /fs/lockd/svcproc.c | |
| parent | 75383fac9206c9dc57a5f153ffabcd5341ad0c28 (diff) | |
| download | linux-3.10-08eaf6a4ee82eb566c188f71b33f52e780fab57d.tar.gz linux-3.10-08eaf6a4ee82eb566c188f71b33f52e780fab57d.tar.bz2 linux-3.10-08eaf6a4ee82eb566c188f71b33f52e780fab57d.zip | |
NLM: nlm_lookup_file() may return NLMv4-specific error codes
commit cd0b16c1c3cda12dbed1f8de8f1a9b0591990724 upstream.
If the filehandle is stale, or open access is denied for some reason,
nlm_fopen() may return one of the NLMv4-specific error codes nlm4_stale_fh
or nlm4_failed. These get passed right through nlm_lookup_file(),
and so when nlmsvc_retrieve_args() calls the latter, it needs to filter
the result through the cast_status() machinery.
Failure to do so, will trigger the BUG_ON() in encode_nlm_stat...
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Reported-by: Larry McVoy <lm@bitmover.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/lockd/svcproc.c')
| -rw-r--r-- | fs/lockd/svcproc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c index d27aab11f32..d413af338da 100644 --- a/fs/lockd/svcproc.c +++ b/fs/lockd/svcproc.c @@ -67,7 +67,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; |