diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-09-06 10:59:07 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-10-23 23:10:01 -0400 |
| commit | 8ee031631546cf2f7859cc69593bd60bbdd70b46 (patch) | |
| tree | 2526c919b059f3773dc923717368ff94c9d626f6 | |
| parent | 357fdad075abb976ee43f2dd450c40dcef4b7e2d (diff) | |
fs/9p: Compare qid.path in v9fs_test_inode
Commit fd2421f54423 ("fs/9p: When doing inode lookup compare qid details
and inode mode bits.") transformed v9fs_qid_iget() to use iget5_locked()
instead of iget_locked(). However, the test() callback is not checking
fid.path at all, which means that a lookup in the inode cache can now
accidentally locate a completely wrong inode from the same inode hash
bucket if the other fields (qid.type and qid.version) match.
Fixes: fd2421f54423 ("fs/9p: When doing inode lookup compare qid details and inode mode bits.")
Cc: stable@vger.kernel.org
Reviewed-by: Latchesar Ionkov <lucho@ionkov.net>
Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/9p/vfs_inode.c | 3 | ||||
| -rw-r--r-- | fs/9p/vfs_inode_dotl.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c index 2a5de610dd8f..bdabb2765d1b 100644 --- a/fs/9p/vfs_inode.c +++ b/fs/9p/vfs_inode.c | |||
| @@ -483,6 +483,9 @@ static int v9fs_test_inode(struct inode *inode, void *data) | |||
| 483 | 483 | ||
| 484 | if (v9inode->qid.type != st->qid.type) | 484 | if (v9inode->qid.type != st->qid.type) |
| 485 | return 0; | 485 | return 0; |
| 486 | |||
| 487 | if (v9inode->qid.path != st->qid.path) | ||
| 488 | return 0; | ||
| 486 | return 1; | 489 | return 1; |
| 487 | } | 490 | } |
| 488 | 491 | ||
diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c index 70f9887c59a9..7f6ae21a27b3 100644 --- a/fs/9p/vfs_inode_dotl.c +++ b/fs/9p/vfs_inode_dotl.c | |||
| @@ -87,6 +87,9 @@ static int v9fs_test_inode_dotl(struct inode *inode, void *data) | |||
| 87 | 87 | ||
| 88 | if (v9inode->qid.type != st->qid.type) | 88 | if (v9inode->qid.type != st->qid.type) |
| 89 | return 0; | 89 | return 0; |
| 90 | |||
| 91 | if (v9inode->qid.path != st->qid.path) | ||
| 92 | return 0; | ||
| 90 | return 1; | 93 | return 1; |
| 91 | } | 94 | } |
| 92 | 95 | ||
