leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NFS: Fix a readdirplus bug

Browse Source 
When comparing filehandles in the helper nfs_same_file(), we should not be
using 'strncmp()': filehandles are not null terminated strings.

Instead, we should just use the existing helper nfs_compare_fh().

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Trond Myklebust 2010-11-30 12:42:34 -05:00 committed by Linus Torvalds
parent e8a7e48bb2
commit 37a09f0745
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/nfs/dir.c
View File

@ -395,13 +395,9 @@ int xdr_decode(nfs_readdir_descriptor_t *desc, struct nfs_entry *entry, struct x
static
int nfs_same_file(struct dentry *dentry, struct nfs_entry *entry)
{
struct nfs_inode *node;
if (dentry->d_inode == NULL)
goto different;
node = NFS_I(dentry->d_inode);
if (node->fh.size != entry->fh->size)
goto different;
if (strncmp(node->fh.data, entry->fh->data, node->fh.size) != 0)
if (nfs_compare_fh(entry->fh, NFS_FH(dentry->d_inode)) != 0)
goto different;
return 1;
different: