From: Li Zefan <[email protected]> Subject: jffs2: fix unbalanced locking
This was found by our internal debugging feature on runtime, but this bug won't lead to deadlock, as the structure that this lock is embedded in is freed on error. Signed-off-by: Li Zefan <[email protected]> Cc: David Woodhouse <[email protected]> Cc: Brian Norris <[email protected]> Cc: Artem Bityutskiy <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> --- fs/jffs2/readinode.c | 3 +++ 1 file changed, 3 insertions(+) diff -puN fs/jffs2/readinode.c~jffs2-fix-unbalanced-locking fs/jffs2/readinode.c --- a/fs/jffs2/readinode.c~jffs2-fix-unbalanced-locking +++ a/fs/jffs2/readinode.c @@ -1143,6 +1143,7 @@ static int jffs2_do_read_inode_internal( JFFS2_ERROR("cannot read nodes for ino %u, returned error is %d\n", f->inocache->ino, ret); if (f->inocache->state == INO_STATE_READING) jffs2_set_inocache_state(c, f->inocache, INO_STATE_CHECKEDABSENT); + mutex_unlock(&f->sem); return ret; } @@ -1159,6 +1160,7 @@ static int jffs2_do_read_inode_internal( jffs2_free_tmp_dnode_info(rii.mdata_tn); rii.mdata_tn = NULL; } + mutex_unlock(&f->sem); return ret; } @@ -1183,6 +1185,7 @@ static int jffs2_do_read_inode_internal( if (!rii.fds) { if (f->inocache->state == INO_STATE_READING) jffs2_set_inocache_state(c, f->inocache, INO_STATE_CHECKEDABSENT); + mutex_unlock(&f->sem); return -EIO; } JFFS2_NOTICE("but it has children so we fake some modes for it\n"); _ -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
