diff options
| author | Ian Kent <raven@themaw.net> | 2011-01-14 18:46:30 +0000 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-01-15 20:07:43 -0500 |
| commit | 9e3fea16ba386fa549a0b2de8a203e5d412997a0 (patch) | |
| tree | 88ee7f612240f8e33cc57d07a011a07db6280804 /fs/autofs4 | |
| parent | 6651149371b842715906311b4631b8489cebf7e8 (diff) | |
| download | linux-stable-9e3fea16ba386fa549a0b2de8a203e5d412997a0.tar.gz linux-stable-9e3fea16ba386fa549a0b2de8a203e5d412997a0.tar.bz2 linux-stable-9e3fea16ba386fa549a0b2de8a203e5d412997a0.zip | |
autofs4: Fix wait validation
It is possible for the check in wait.c:validate_request() to return
an incorrect result if the dentry that was mounted upon has changed
during the callback.
Signed-off-by: Ian Kent <raven@themaw.net>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/autofs4')
| -rw-r--r-- | fs/autofs4/waitq.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c index c5f8459c905e..56010056b2e6 100644 --- a/fs/autofs4/waitq.c +++ b/fs/autofs4/waitq.c @@ -309,6 +309,9 @@ static int validate_request(struct autofs_wait_queue **wait, * completed while we waited on the mutex ... */ if (notify == NFY_MOUNT) { + struct dentry *new = NULL; + int valid = 1; + /* * If the dentry was successfully mounted while we slept * on the wait queue mutex we can return success. If it @@ -316,8 +319,20 @@ static int validate_request(struct autofs_wait_queue **wait, * a multi-mount with no mount at it's base) we can * continue on and create a new request. */ + if (!IS_ROOT(dentry)) { + if (dentry->d_inode && d_unhashed(dentry)) { + struct dentry *parent = dentry->d_parent; + new = d_lookup(parent, &dentry->d_name); + if (new) + dentry = new; + } + } if (have_submounts(dentry)) - return 0; + valid = 0; + + if (new) + dput(new); + return valid; } return 1; |