* RDMA: Check for NULL mode in .devnode methods
@ 2011-07-04 16:26 Roland Dreier
0 siblings, 0 replies; only message in thread
From: Roland Dreier @ 2011-07-04 16:26 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-rdma
From: Goldwyn Rodrigues <rgoldwyn@suse.de>
Commits 71c29bd5c235 ("IB/uverbs: Add devnode method to set
path/mode") and c3af0980ce01 ("IB: Add devnode methods to cm_class and
umad_class") added devnode methods that set the mode. However, these
methods don't check for a NULL mode, and so we get a crash when
unloading modules because devtmpfs_delete_node() calls
device_get_devnode() with mode == NULL.
Add the missing checks.
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.de>
[ Also fix cm.c. - Roland ]
Signed-off-by: Roland Dreier <roland@purestorage.com>
---
Linus, please apply -- this fixes a regression introduced in 3.0-rc1.
drivers/infiniband/core/cm.c | 3 ++-
drivers/infiniband/core/uverbs_main.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index f62f52f..fc0f2bd 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -3641,7 +3641,8 @@ static struct kobj_type cm_port_obj_type = {
static char *cm_devnode(struct device *dev, mode_t *mode)
{
- *mode = 0666;
+ if (mode)
+ *mode = 0666;
return kasprintf(GFP_KERNEL, "infiniband/%s", dev_name(dev));
}
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index e49a85f..56898b6 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -826,7 +826,8 @@ static void ib_uverbs_remove_one(struct ib_device *device)
static char *uverbs_devnode(struct device *dev, mode_t *mode)
{
- *mode = 0666;
+ if (mode)
+ *mode = 0666;
return kasprintf(GFP_KERNEL, "infiniband/%s", dev_name(dev));
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-07-04 16:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-04 16:26 RDMA: Check for NULL mode in .devnode methods Roland Dreier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome