aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2008-05-16 14:01:12 -0600
committerJonathan Corbet <corbet@lwn.net>2008-06-20 14:05:51 -0600
commit057e7c7ff9f91a36a761588c53826bd6a710aeba (patch)
tree001de53a930643f3b00f0cc83ea58670a9815c9f
parent65f37b790bd7ba15413838579470296a709c45e6 (diff)
infiniband: more BKL pushdown
Be extra-cautious and protect the remaining open() functions. Signed-off-by: Jonathan Corbet <corbet@lwn.net>
-rw-r--r--drivers/infiniband/core/user_mad.c7
-rw-r--r--drivers/infiniband/core/uverbs_main.c9
2 files changed, 13 insertions, 3 deletions
diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
index 3aa2db54eae..1fc17940a76 100644
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@@ -47,6 +47,7 @@
#include <linux/kref.h>
#include <linux/compat.h>
#include <linux/semaphore.h>
+#include <linux/smp_lock.h>
#include <asm/uaccess.h>
@@ -783,14 +784,17 @@ static int ib_umad_open(struct inode *inode, struct file *filp)
struct ib_umad_file *file;
int ret = 0;
+ lock_kernel();
spin_lock(&port_lock);
port = umad_port[iminor(inode) - IB_UMAD_MINOR_BASE];
if (port)
kref_get(&port->umad_dev->ref);
spin_unlock(&port_lock);
- if (!port)
+ if (!port) {
+ unlock_kernel();
return -ENXIO;
+ }
mutex_lock(&port->file_mutex);
@@ -819,6 +823,7 @@ static int ib_umad_open(struct inode *inode, struct file *filp)
out:
mutex_unlock(&port->file_mutex);
+ unlock_kernel();
return ret;
}
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index cc1afa28c18..8ede1e475ce 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -45,6 +45,7 @@
#include <linux/file.h>
#include <linux/mount.h>
#include <linux/cdev.h>
+#include <linux/smp_lock.h>
#include <asm/uaccess.h>
@@ -616,14 +617,17 @@ static int ib_uverbs_open(struct inode *inode, struct file *filp)
struct ib_uverbs_file *file;
int ret;
+ lock_kernel();
spin_lock(&map_lock);
dev = dev_table[iminor(inode) - IB_UVERBS_BASE_MINOR];
if (dev)
kref_get(&dev->ref);
spin_unlock(&map_lock);
- if (!dev)
+ if (!dev) {
+ unlock_kernel();
return -ENXIO;
+ }
if (!try_module_get(dev->ib_dev->owner)) {
ret = -ENODEV;
@@ -644,6 +648,7 @@ static int ib_uverbs_open(struct inode *inode, struct file *filp)
filp->private_data = file;
+ unlock_kernel();
return 0;
err_module:
@@ -651,7 +656,7 @@ err_module:
err:
kref_put(&dev->ref, ib_uverbs_release_dev);
-
+ unlock_kernel();
return ret;
}