diff options
author | Jeff Layton <jlayton@redhat.com> | 2010-07-19 18:00:17 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2010-08-02 08:40:39 -0400 |
commit | f30b9c11847cb6bf1f7aa65b5c436800621a07dd (patch) | |
tree | 753905eaaa4999d7afc82f251f8db872753fbf1e | |
parent | 9f841593ff65d2f801c7f80c4ed0955d30103f50 (diff) |
cifs: don't allow cifs_iget to match inodes of the wrong type
If the type is different from what we think it should be, then don't
match the existing inode.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
-rw-r--r-- | fs/cifs/inode.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 2d9cd2f269eb..a15b3a9bbff4 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c | |||
@@ -724,9 +724,14 @@ cifs_find_inode(struct inode *inode, void *opaque) | |||
724 | { | 724 | { |
725 | struct cifs_fattr *fattr = (struct cifs_fattr *) opaque; | 725 | struct cifs_fattr *fattr = (struct cifs_fattr *) opaque; |
726 | 726 | ||
727 | /* don't match inode with different uniqueid */ | ||
727 | if (CIFS_I(inode)->uniqueid != fattr->cf_uniqueid) | 728 | if (CIFS_I(inode)->uniqueid != fattr->cf_uniqueid) |
728 | return 0; | 729 | return 0; |
729 | 730 | ||
731 | /* don't match inode of different type */ | ||
732 | if ((inode->i_mode & S_IFMT) != (fattr->cf_mode & S_IFMT)) | ||
733 | return 0; | ||
734 | |||
730 | /* | 735 | /* |
731 | * uh oh -- it's a directory. We can't use it since hardlinked dirs are | 736 | * uh oh -- it's a directory. We can't use it since hardlinked dirs are |
732 | * verboten. Disable serverino and return it as if it were found, the | 737 | * verboten. Disable serverino and return it as if it were found, the |