diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-10-02 17:09:00 -0700 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-10-02 17:09:00 -0700 |
| commit | 807d66d80221920729a8d4abfa04246546a6d3fa (patch) | |
| tree | 8e5cdfe1030df602b8cd361c8b4236d9f9534a37 /fs/nfs | |
| parent | 25a1a6211dd2fcbf0e45a07030703e2a42d7aa87 (diff) | |
| download | op-kernel-dev-807d66d80221920729a8d4abfa04246546a6d3fa.zip op-kernel-dev-807d66d80221920729a8d4abfa04246546a6d3fa.tar.gz | |
NFSv4: nfs4_open_done first must check that GETATTR decoded a file type
...before it can check the validity of that file type.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 21cfac7..68438aa 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -1537,7 +1537,8 @@ static void nfs4_open_done(struct rpc_task *task, void *calldata) return; if (task->tk_status == 0) { - switch (data->o_res.f_attr->mode & S_IFMT) { + if (data->o_res.f_attr->valid & NFS_ATTR_FATTR_TYPE) { + switch (data->o_res.f_attr->mode & S_IFMT) { case S_IFREG: break; case S_IFLNK: @@ -1548,6 +1549,7 @@ static void nfs4_open_done(struct rpc_task *task, void *calldata) break; default: data->rpc_status = -ENOTDIR; + } } renew_lease(data->o_res.server, data->timestamp); if (!(data->o_res.rflags & NFS4_OPEN_RESULT_CONFIRM)) |
