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

mtdchar: cdev lock_kernel() pushdown

Browse Source 
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
This commit is contained in:
Jonathan Corbet
2008-05-15 10:10:37 -06:00
parent ea2959a297
commit 6071239ef1
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/mtd/mtdchar.c
View File

@@ -14,6 +14,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/smp_lock.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/compatmac.h> #include <linux/mtd/compatmac.h>
@@ -86,6 +87,7 @@ static int mtd_open(struct inode *inode, struct file *file)
{ {
int minor = iminor(inode); int minor = iminor(inode);
int devnum = minor >> 1; int devnum = minor >> 1;
int ret = 0;
struct mtd_info *mtd; struct mtd_info *mtd;
struct mtd_file_info *mfi; struct mtd_file_info *mfi;
@@ -98,31 +100,39 @@ static int mtd_open(struct inode *inode, struct file *file)
if ((file->f_mode & 2) && (minor & 1)) if ((file->f_mode & 2) && (minor & 1))
return -EACCES; return -EACCES;
lock_kernel();
mtd = get_mtd_device(NULL, devnum); mtd = get_mtd_device(NULL, devnum);
if (IS_ERR(mtd)) if (IS_ERR(mtd)) {
return PTR_ERR(mtd); ret = PTR_ERR(mtd);
goto out;
}
if (MTD_ABSENT == mtd->type) { if (MTD_ABSENT == mtd->type) {
put_mtd_device(mtd); put_mtd_device(mtd);
return -ENODEV; ret = -ENODEV;
goto out;
} }
/* You can't open it RW if it's not a writeable device */ /* You can't open it RW if it's not a writeable device */
if ((file->f_mode & 2) && !(mtd->flags & MTD_WRITEABLE)) { if ((file->f_mode & 2) && !(mtd->flags & MTD_WRITEABLE)) {
put_mtd_device(mtd); put_mtd_device(mtd);
return -EACCES; ret = -EACCES;
goto out;
} }
mfi = kzalloc(sizeof(*mfi), GFP_KERNEL); mfi = kzalloc(sizeof(*mfi), GFP_KERNEL);
if (!mfi) { if (!mfi) {
put_mtd_device(mtd); put_mtd_device(mtd);
return -ENOMEM; ret = -ENOMEM;
goto out;
} }
mfi->mtd = mtd; mfi->mtd = mtd;
file->private_data = mfi; file->private_data = mfi;
return 0; out:
unlock_kernel();
return ret;
} /* mtd_open */ } /* mtd_open */
/*====================================================================*/ /*====================================================================*/