Commit a237f3bb authored by Jonathan Corbet's avatar Jonathan Corbet

CAPI: BKL pushdown

Put explicit lock_kernel() calls into capi_open()
Signed-off-by: default avatarJonathan Corbet <corbet@lwn.net>
parent b0061a0e
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <linux/signal.h> #include <linux/signal.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/smp_lock.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/wait.h> #include <linux/wait.h>
#ifdef CONFIG_ISDN_CAPI_MIDDLEWARE #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
...@@ -983,13 +984,17 @@ capi_ioctl(struct inode *inode, struct file *file, ...@@ -983,13 +984,17 @@ capi_ioctl(struct inode *inode, struct file *file,
static int static int
capi_open(struct inode *inode, struct file *file) capi_open(struct inode *inode, struct file *file)
{ {
if (file->private_data) int ret;
return -EEXIST;
if ((file->private_data = capidev_alloc()) == NULL)
return -ENOMEM;
return nonseekable_open(inode, file); lock_kernel();
if (file->private_data)
ret = -EEXIST;
else if ((file->private_data = capidev_alloc()) == NULL)
ret = -ENOMEM;
else
ret = nonseekable_open(inode, file);
unlock_kernel();
return ret;
} }
static int static int
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment