Skip to contentSkip to conversation

fs: fix lock imbalance in do_remount_sb()

PATCH In review Jiri Slaby 2 participants 2 messages May 13, 2009 VFS

lore
Share & tools
lore

Jiri Slaby

author
#0 lore raw

PATCH 1/1 fs: fix lock imbalance in do_remount_sb()

Commit "Push BKL down into do_remount_sb()" pushed un/lock_kernel into do_remount_sb but forgets to unlock it on fail paths. Fix that.

---
 fs/super.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
fs/super.c +9 -3
index e4a0c5b..a64f362 100644
@@ -548,18 +548,24 @@ int do_remount_sb(struct super_block *sb, int flags, void *data, int force)
 	if ((flags & MS_RDONLY) && !(sb->s_flags & MS_RDONLY)) {
 		if (force)
 			mark_files_ro(sb);
-		else if (!fs_may_remount_ro(sb))
+		else if (!fs_may_remount_ro(sb)) {
+			unlock_kernel();
 			return -EBUSY;
+		}
 		retval = vfs_dq_off(sb, 1);
-		if (retval < 0 && retval != -ENOSYS)
+		if (retval < 0 && retval != -ENOSYS) {
+			unlock_kernel();
 			return -EBUSY;
+		}
 	}
 	remount_rw = !(flags & MS_RDONLY) && (sb->s_flags & MS_RDONLY);
 
 	if (sb->s_op->remount_fs) {
 		retval = sb->s_op->remount_fs(sb, &flags, data);
-		if (retval)
+		if (retval) {
+			unlock_kernel();
 			return retval;
+		}
 	}
 	sb->s_flags = (sb->s_flags & ~MS_RMT_MASK) | (flags & MS_RMT_MASK);
 	unlock_kernel();
Signature · 2 lines
1.6.3
caught by stanse
#1 lore raw
Quoted 4 lines · On Wed, 13 May 2009 21:21:12 +0200 Jiri Slaby <[email protected]> wrote:

Commit "Push BKL down into do_remount_sb()" pushed un/lock_kernel into do_remount_sb but forgets to unlock it on fail paths. Fix that.

argh, how many times must we teach ourselves this lesson? Perhaps we can convert this function to have a single `return' to prevent relapses?

Quoted 12 lines
---
 fs/super.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
fs/super.c +0 -0
index e4a0c5b..a64f362 100644
@@ -548,18 +548,24 @@ int do_remount_sb(struct super_block *sb, int flags, void *data, int force)
 	if ((flags & MS_RDONLY) && !(sb->s_flags & MS_RDONLY)) {
 		if (force)
 			mark_files_ro(sb);

fs/super.c int do_remount_sb(struct super_block *sb, int flags, void *data, int force) · line 558

Quoted 10 lines
fs/super.c +5 -2
-		else if (!fs_may_remount_ro(sb))
+		else if (!fs_may_remount_ro(sb)) {
+			unlock_kernel();
 			return -EBUSY;
+		}
 		retval = vfs_dq_off(sb, 1);
-		if (retval < 0 && retval != -ENOSYS)
+		if (retval < 0 && retval != -ENOSYS) {
+			unlock_kernel();
 			return -EBUSY;

Strange that the code drops the vfs_dq_off() return value on the floor. `man(2) mount' lists a great pile of possible errnos.

Quoted 16 lines
fs/super.c +4 -1
+		}
 	}
 	remount_rw = !(flags & MS_RDONLY) && (sb->s_flags & MS_RDONLY);
 
 	if (sb->s_op->remount_fs) {
 		retval = sb->s_op->remount_fs(sb, &flags, data);
-		if (retval)
+		if (retval) {
+			unlock_kernel();
 			return retval;
+		}
 
 
 	}
fs/super.c +0 -0
 	sb->s_flags = (sb->s_flags & ~MS_RMT_MASK) | (flags & MS_RMT_MASK);
 	unlock_kernel();