mirror of
https://github.com/joel16/android_kernel_sony_msm8994.git
synced 2024-12-12 06:49:34 +00:00
CAPI: BKL pushdown
Put explicit lock_kernel() calls into capi_open() Signed-off-by: Jonathan Corbet <corbet@lwn.net>
This commit is contained in:
parent
b0061a0ec4
commit
a237f3bbaa
@ -20,6 +20,7 @@
|
||||
#include <linux/signal.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/mm.h>
|
||||
#include <linux/smp_lock.h>
|
||||
#include <linux/timer.h>
|
||||
#include <linux/wait.h>
|
||||
#ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
|
||||
@ -983,13 +984,17 @@ capi_ioctl(struct inode *inode, struct file *file,
|
||||
static int
|
||||
capi_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
int ret;
|
||||
|
||||
lock_kernel();
|
||||
if (file->private_data)
|
||||
return -EEXIST;
|
||||
|
||||
if ((file->private_data = capidev_alloc()) == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
return nonseekable_open(inode, file);
|
||||
ret = -EEXIST;
|
||||
else if ((file->private_data = capidev_alloc()) == NULL)
|
||||
ret = -ENOMEM;
|
||||
else
|
||||
ret = nonseekable_open(inode, file);
|
||||
unlock_kernel();
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int
|
||||
|
Loading…
Reference in New Issue
Block a user