summaryrefslogtreecommitdiff
path: root/fs/jffs2
diff options
context:
space:
mode:
authorLi Zefan <lizefan@huawei.com>2014-02-12 12:44:57 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-04-26 17:15:36 -0700
commitcc8ece834baaac84cffafad31dc25c1f73ef6add (patch)
treed588e7f078105894402607485ac6819d8cb492e5 /fs/jffs2
parent3a196f46fc0d37392ba686df66b94a1edc0b8523 (diff)
downloadlinux-3.10-cc8ece834baaac84cffafad31dc25c1f73ef6add.tar.gz
linux-3.10-cc8ece834baaac84cffafad31dc25c1f73ef6add.tar.bz2
linux-3.10-cc8ece834baaac84cffafad31dc25c1f73ef6add.zip
jffs2: remove from wait queue after schedule()
commit 3ead9578443b66ddb3d50ed4f53af8a0c0298ec5 upstream. @wait is a local variable, so if we don't remove it from the wait queue list, later wake_up() may end up accessing invalid memory. This was spotted by eyes. Signed-off-by: Li Zefan <lizefan@huawei.com> Cc: David Woodhouse <dwmw2@infradead.org> Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Brian Norris <computersforpeace@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/jffs2')
-rw-r--r--fs/jffs2/nodemgmt.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/jffs2/nodemgmt.c b/fs/jffs2/nodemgmt.c
index 41789e6fa6f..b6bd4affd9a 100644
--- a/fs/jffs2/nodemgmt.c
+++ b/fs/jffs2/nodemgmt.c
@@ -179,6 +179,7 @@ int jffs2_reserve_space(struct jffs2_sb_info *c, uint32_t minsize,
spin_unlock(&c->erase_completion_lock);
schedule();
+ remove_wait_queue(&c->erase_wait, &wait);
} else
spin_unlock(&c->erase_completion_lock);
} else if (ret)