Skip to content

Commit

Permalink
autofs4: autofs4_wait() vs. autofs4_catatonic_mode() race
Browse files Browse the repository at this point in the history
We need to recheck ->catatonic after autofs4_wait() got ->wq_mutex
for good, or we might end up with wq inserted into queue after
autofs4_catatonic_mode() had done its thing.  It will stick there
forever, since there won't be anything to clear its ->name.name.

A bit of a complication: validate_request() drops and regains ->wq_mutex.
It actually ends up the most convenient place to stick the check into...

Acked-by: Ian Kent <raven@themaw.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Jan 11, 2012
1 parent b3f2a92 commit 4041bcd
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion fs/autofs4/waitq.c
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,9 @@ static int validate_request(struct autofs_wait_queue **wait,
struct autofs_wait_queue *wq;
struct autofs_info *ino;

if (sbi->catatonic)
return -ENOENT;

/* Wait in progress, continue; */
wq = autofs4_find_wait(sbi, qstr);
if (wq) {
Expand Down Expand Up @@ -289,6 +292,9 @@ static int validate_request(struct autofs_wait_queue **wait,
if (mutex_lock_interruptible(&sbi->wq_mutex))
return -EINTR;

if (sbi->catatonic)
return -ENOENT;

wq = autofs4_find_wait(sbi, qstr);
if (wq) {
*wait = wq;
Expand Down Expand Up @@ -389,7 +395,7 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,

ret = validate_request(&wq, sbi, &qstr, dentry, notify);
if (ret <= 0) {
if (ret == 0)
if (ret != -EINTR)
mutex_unlock(&sbi->wq_mutex);
kfree(qstr.name);
return ret;
Expand Down

0 comments on commit 4041bcd

Please sign in to comment.