From: Jeff Layton Date: Thu, 30 Jul 2015 10:57:46 +0000 (-0400) Subject: nfsd: do nfs4_check_fh in nfs4_check_file instead of nfs4_check_olstateid X-Git-Tag: omap-for-v4.3/fixes-merge-window~138^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fcd461db7c09337b6d2e22d25eb411123f379e3;p=pandora-kernel.git nfsd: do nfs4_check_fh in nfs4_check_file instead of nfs4_check_olstateid 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 Cc: stable@vger.kernel.org [bfields: moved fh check to avoid NULL deref in special stateid case] Signed-off-by: J. Bruce Fields --- Reading git-diff-tree failed