Skip to contentSkip to conversation

jffs2: unlock f->sem on error in jffs2_new_inode()

PATCH RESEND New Wang Nan 1 participant 1 message Dec 27, 2013

Subsystems (2)
Memory technology devices (MTD) Journalling flash file system V2 (JFFS2)
lore
Share & tools
lore

Wang Nan

author
#0 lore raw

PATCH RESEND 1/1 jffs2: unlock f->sem on error in jffs2_new_inode()

Hi Andrew,

Could you please have a look at the following patch?

This patch fixes an obvious bug in jffs2. I have already sent it to mtd list, but Woodhouse hasn't been responsive.

Thanks.

===================

Quoted 1 line

From 1e5e695840fbb5b4a0583e20789fae76c6119d48 Mon Sep 17 00:00:00 2001

From: Wang Guoli <[email protected]>
Date: Wed, 18 Dec 2013 10:14:54 +0800
Subject: [PATCH] jffs2: unlock f->sem on error in jffs2_new_inode()

If jffs2_new_inode() succeeds, it returns with f->sem held, and the caller is responsible for releasing the lock. If it fails, it still returns with the lock held, but the caller won't release the lock, which will lead to deadlock.

Fix it by releasing the lock in jffs2_new_inode() on error.

Cc <[email protected]> # 2.6.34+
Cc Andrew Morton <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Wang Guoli <[email protected]>
Signed-off-by Wang Guoli <[email protected]>
Signed-off-by Wang Nan <[email protected]>
---
 fs/jffs2/fs.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
fs/jffs2/fs.c +6 -3
index fe3c052..2f30fae 100644
@@ -456,12 +456,14 @@ struct inode *jffs2_new_inode (struct inode *dir_i, umode_t mode, struct jffs2_r
 	   The umask is only applied if there's no default ACL */
 	ret = jffs2_init_acl_pre(dir_i, inode, &mode);
 	if (ret) {
-	    make_bad_inode(inode);
-	    iput(inode);
-	    return ERR_PTR(ret);
+		mutex_unlock(&f->sem);
+		make_bad_inode(inode);
+		iput(inode);
+		return ERR_PTR(ret);
 	}
 	ret = jffs2_do_new_inode (c, f, mode, ri);
 	if (ret) {
+		mutex_unlock(&f->sem);
 		make_bad_inode(inode);
 		iput(inode);
 		return ERR_PTR(ret);

@@ -478,6 +480,7 @@ struct inode *jffs2_new_inode (struct inode *dir_i, umode_t mode, struct jffs2_r
 	inode->i_size = 0;
 
 	if (insert_inode_locked(inode) < 0) {
+		mutex_unlock(&f->sem);
 		make_bad_inode(inode);
 		iput(inode);
 		return ERR_PTR(-EINVAL);
Signature · 1 line
1.8.4