diff options
author | Jeff Layton <jlayton@poochiereds.net> | 2015-07-30 13:57:46 +0300 |
---|---|---|
committer | Sasha Levin <sasha.levin@oracle.com> | 2015-08-27 20:25:38 +0300 |
commit | 9048f810342cc1b4e49a84a98a596e0d36834eeb (patch) | |
tree | 1708193bce21ccee769e87126973f10c7980ef2f /init | |
parent | 493a50c6b1d428b1f2bee4356ef073c4d19e4c8e (diff) | |
download | linux-9048f810342cc1b4e49a84a98a596e0d36834eeb.tar.xz |
nfsd: do nfs4_check_fh in nfs4_check_file instead of nfs4_check_olstateid
[ Upstream commit 1ccdd6c6e9a342c2ed4ced38faa67303226a2a6a ]
commit 8fcd461db7c09337b6d2e22d25eb411123f379e3 upstream.
Currently, preprocess_stateid_op calls nfs4_check_olstateid which
verifies that the open stateid corresponds to the current filehandle in the
call by calling nfs4_check_fh.
If the stateid is a NFS4_DELEG_STID however, then no such check is done.
This could cause incorrect enforcement of permissions, because the
nfsd_permission() call in nfs4_check_file uses current the current
filehandle, but any subsequent IO operation will use the file descriptor
in the stateid.
Move the call to nfs4_check_fh into nfs4_check_file instead so that it
can be done for all stateid types.
Signed-off-by: Jeff Layton <jeff.layton@primarydata.com>
[bfields: moved fh check to avoid NULL deref in special stateid case]
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions