Skip to content

Commit 2e0afa7

Browse files
committed
Merge tag 'v6.6-vfs.autofs' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs
Pull autofs fixes from Christian Brauner: "This fixes a memory leak in autofs reported by syzkaller and a missing conversion from uninterruptible to interruptible wake up when autofs is in catatonic mode" * tag 'v6.6-vfs.autofs' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs: autofs: use wake_up() instead of wake_up_interruptible(() autofs: fix memory leak of waitqueues in autofs_catatonic_mode
2 parents 475d4df + 17fce12 commit 2e0afa7

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

fs/autofs/waitq.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ void autofs_catatonic_mode(struct autofs_sb_info *sbi)
3232
wq->status = -ENOENT; /* Magic is gone - report failure */
3333
kfree(wq->name.name - wq->offset);
3434
wq->name.name = NULL;
35-
wq->wait_ctr--;
36-
wake_up_interruptible(&wq->queue);
35+
wake_up(&wq->queue);
36+
if (!--wq->wait_ctr)
37+
kfree(wq);
3738
wq = nwq;
3839
}
3940
fput(sbi->pipe); /* Close the pipe */

0 commit comments

Comments
 (0)