Skip to content

Commit 275655d

Browse files
author
Al Viro
committed
afs: fix __afs_break_callback() / afs_drop_open_mmap() race
In __afs_break_callback() we might check ->cb_nr_mmap and if it's non-zero do queue_work(&vnode->cb_work). In afs_drop_open_mmap() we decrement ->cb_nr_mmap and do flush_work(&vnode->cb_work) if it reaches zero. The trouble is, there's nothing to prevent __afs_break_callback() from seeing ->cb_nr_mmap before the decrement and do queue_work() after both the decrement and flush_work(). If that happens, we might be in trouble - vnode might get freed before the queued work runs. __afs_break_callback() is always done under ->cb_lock, so let's make sure that ->cb_nr_mmap can change from non-zero to zero while holding ->cb_lock (the spinlock component of it - it's a seqlock and we don't need to mess with the counter). Acked-by: Christian Brauner <brauner@kernel.org> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
1 parent af072cf commit 275655d

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

fs/afs/file.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -417,13 +417,17 @@ static void afs_add_open_mmap(struct afs_vnode *vnode)
417417

418418
static void afs_drop_open_mmap(struct afs_vnode *vnode)
419419
{
420-
if (!atomic_dec_and_test(&vnode->cb_nr_mmap))
420+
if (atomic_add_unless(&vnode->cb_nr_mmap, -1, 1))
421421
return;
422422

423423
down_write(&vnode->volume->open_mmaps_lock);
424424

425-
if (atomic_read(&vnode->cb_nr_mmap) == 0)
425+
read_seqlock_excl(&vnode->cb_lock);
426+
// the only place where ->cb_nr_mmap may hit 0
427+
// see __afs_break_callback() for the other side...
428+
if (atomic_dec_and_test(&vnode->cb_nr_mmap))
426429
list_del_init(&vnode->cb_mmap_link);
430+
read_sequnlock_excl(&vnode->cb_lock);
427431

428432
up_write(&vnode->volume->open_mmaps_lock);
429433
flush_work(&vnode->cb_work);

0 commit comments

Comments
 (0)