| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1239892078-6039-1-git-send-email-abogani@texware.it>
Date: Thu, 16 Apr 2009 16:27:58 +0200
From: Alessio Igor Bogani <abogani@...ware.it>
To: Ingo Molnar <mingo@...e.hu>
Cc: Frederic Weisbecker <fweisbec@...il.com>,
Peter Zijlstra <a.p.zijlstra@...llo.nl>,
LKML <linux-kernel@...r.kernel.org>,
Jonathan Corbet <corbet@....net>,
Alessio Igor Bogani <abogani@...ware.it>
Subject: [PATCH -tip] remove the BKL: Replace BKL in mount/umount syscalls with a mutex
Replace ths BKL in sys_mount()/sys_umount() syscalls with a regular mutex.
Signed-off-by: Alessio Igor Bogani <abogani@...ware.it>
---
fs/namespace.c | 16 +++++++++-------
fs/super.c | 9 ++++-----
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/fs/namespace.c b/fs/namespace.c
index c6f54e4..fcebca1 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -11,7 +11,7 @@
#include <linux/syscalls.h>
#include <linux/slab.h>
#include <linux/sched.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/acct.h>
@@ -51,6 +51,8 @@ static struct rw_semaphore namespace_sem;
struct kobject *fs_kobj;
EXPORT_SYMBOL_GPL(fs_kobj);
+DEFINE_MUTEX(mount_lock);
+
static inline unsigned long hash(struct vfsmount *mnt, struct dentry *dentry)
{
unsigned long tmp = ((unsigned long)mnt / L1_CACHE_BYTES);
@@ -1073,9 +1075,9 @@ static int do_umount(struct vfsmount *mnt, int flags)
*/
if (flags & MNT_FORCE && sb->s_op->umount_begin) {
- lock_kernel();
+ mutex_lock(&mount_lock);
sb->s_op->umount_begin(sb);
- unlock_kernel();
+ mutex_unlock(&mount_lock);
}
/*
@@ -1094,9 +1096,9 @@ static int do_umount(struct vfsmount *mnt, int flags)
*/
down_write(&sb->s_umount);
if (!(sb->s_flags & MS_RDONLY)) {
- lock_kernel();
+ mutex_lock(&mount_lock);
retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
- unlock_kernel();
+ mutex_unlock(&mount_lock);
}
up_write(&sb->s_umount);
return retval;
@@ -2078,10 +2080,10 @@ SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
if (retval < 0)
goto out3;
- lock_kernel();
+ mutex_lock(&mount_lock);
retval = do_mount((char *)dev_page, dir_page, (char *)type_page,
flags, (void *)data_page);
- unlock_kernel();
+ mutex_unlock(&mount_lock);
free_page(data_page);
out3:
diff --git a/fs/super.c b/fs/super.c
index d9903a3..c503758 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -23,7 +23,6 @@
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/init.h>
-#include <linux/smp_lock.h>
#include <linux/acct.h>
#include <linux/blkdev.h>
#include <linux/quotaops.h>
@@ -46,6 +45,8 @@
LIST_HEAD(super_blocks);
DEFINE_SPINLOCK(sb_lock);
+extern struct mutex mount_lock;
+
/**
* alloc_super - create new superblock
* @type: filesystem type superblock should belong to
@@ -684,13 +685,11 @@ static void do_emergency_remount(struct work_struct *work)
down_read(&sb->s_umount);
if (sb->s_root && sb->s_bdev && !(sb->s_flags & MS_RDONLY)) {
/*
- * ->remount_fs needs lock_kernel().
- *
* What lock protects sb->s_flags??
*/
- lock_kernel();
+ mutex_lock(&mount_lock);
do_remount_sb(sb, MS_RDONLY, NULL, 1);
- unlock_kernel();
+ mutex_unlock(&mount_lock);
}
drop_super(sb);
spin_lock(&sb_lock);
--
1.6.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists