Commit b2bc4782 authored Jul 04, 2011 by Goldwyn Rodrigues Committed by Linus Torvalds Jul 04, 2011

RDMA: Check for NULL mode in .devnode methods



Commits 71c29bd5 ("IB/uverbs: Add devnode method to set path/mode")
and c3af0980 ("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>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent ba466c74

drivers/infiniband/core/cm.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -3641,6 +3641,7 @@ static struct kobj_type cm_port_obj_type = {

		static char cm_devnode(struct device dev, mode_t *mode)
		{
		if (mode)
		*mode = 0666;
		return kasprintf(GFP_KERNEL, "infiniband/%s", dev_name(dev));
		}

drivers/infiniband/core/uverbs_main.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -826,6 +826,7 @@ static void ib_uverbs_remove_one(struct ib_device *device)

		static char uverbs_devnode(struct device dev, mode_t *mode)
		{
		if (mode)
		*mode = 0666;
		return kasprintf(GFP_KERNEL, "infiniband/%s", dev_name(dev));
		}