lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Push BKL into do_mount()

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2009-05-08 13:31:17 -04:00
parent bbd6851a32
commit 6fac98dd21
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/alpha/kernel/osf_sys.c
View File

@@ -371,8 +371,6 @@ SYSCALL_DEFINE4(osf_mount, unsigned long, typenr, char __user *, path,
int retval = -EINVAL; int retval = -EINVAL;
char *name; char *name;
lock_kernel();
name = getname(path); name = getname(path);
retval = PTR_ERR(name); retval = PTR_ERR(name);
if (IS_ERR(name)) if (IS_ERR(name))
@@ -392,7 +390,6 @@ SYSCALL_DEFINE4(osf_mount, unsigned long, typenr, char __user *, path,
} }
putname(name); putname(name);
out: out:
unlock_kernel();
return retval; return retval;
} }

2
fs/compat.c
View File

@@ -812,10 +812,8 @@ asmlinkage long compat_sys_mount(char __user * dev_name, char __user * dir_name,
} }
} }
lock_kernel();
retval = do_mount((char*)dev_page, dir_page, (char*)type_page, retval = do_mount((char*)dev_page, dir_page, (char*)type_page,
flags, (void*)data_page); flags, (void*)data_page);
unlock_kernel();
out4: out4:
free_page(data_page); free_page(data_page);

4
fs/namespace.c
View File

@@ -1921,6 +1921,7 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
if (retval) if (retval)
goto dput_out; goto dput_out;
lock_kernel();
if (flags & MS_REMOUNT) if (flags & MS_REMOUNT)
retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags, retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
data_page); data_page);
@@ -1933,6 +1934,7 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
else else
retval = do_new_mount(&path, type_page, flags, mnt_flags, retval = do_new_mount(&path, type_page, flags, mnt_flags,
dev_name, data_page); dev_name, data_page);
unlock_kernel();
dput_out: dput_out:
path_put(&path); path_put(&path);
return retval; return retval;
@@ -2046,10 +2048,8 @@ SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
if (retval < 0) if (retval < 0)
goto out3; goto out3;
lock_kernel();
retval = do_mount((char *)dev_page, dir_page, (char *)type_page, retval = do_mount((char *)dev_page, dir_page, (char *)type_page,
flags, (void *)data_page); flags, (void *)data_page);
unlock_kernel();
free_page(data_page); free_page(data_page);
out3: out3: