Skip to contentSkip to conversation

target: allow release() to be called on NULL

PATCH In review Dan Carpenter 2 participants 2 messages Jan 26, 2011

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 target: allow release() to be called on NULL

This is a cleanup and not a bugfix.

container_of() does pointer math and the result of that math can basically not be NULL here so "se_dev" is non-NULL.

Normally release() type functions accept a NULL parameter. I don't think target_core_dev_release() is ever called with a NULL parameter but it's a cleaner to allow that.

So instead of checking "se_dev", I've changed it to check "item".

drivers/target/target_core_configfs.c +1 -1
index 2764510..d9dcd9d 100644
@@ -1973,7 +1973,7 @@ static void target_core_dev_release(struct config_item *item)
 				struct se_subsystem_dev, se_dev_group);
 	struct config_group *dev_cg;
 
-	if (!(se_dev))
+	if (!item)
 		return;
 
 	dev_cg = &se_dev->se_dev_group;
#1 lore raw
Quoted 18 lines · Dan Carpenter

This is a cleanup and not a bugfix.

container_of() does pointer math and the result of that math can basically not be NULL here so "se_dev" is non-NULL.

Normally release() type functions accept a NULL parameter. I don't think target_core_dev_release() is ever called with a NULL parameter but it's a cleaner to allow that.

So instead of checking "se_dev", I've changed it to check "item".

drivers/target/target_core_configfs.c +0 -0
index 2764510..d9dcd9d 100644

drivers/target/target_core_configfs.c static void target_core_dev_release(struct config_item *item) · line 1979

Quoted 8 lines
drivers/target/target_core_configfs.c +1 -1
@@ -1973,7 +1973,7 @@ static void target_core_dev_release(struct config_item *item)
 				struct se_subsystem_dev, se_dev_group);
 	struct config_group *dev_cg;
 
-	if (!(se_dev))
+	if (!item)
 		return;
 
 	dev_cg = &se_dev->se_dev_group;

Yeah, these types of NULL pointer checks from container_of() in struct configfs_item_operations->release() callbacks to free the extra foo->default_groups allocation are left-over paranoia. This is the only one of these left in target_core_configfs.c code, and the callback will never be null from fs/configfs/item.c:config_item_cleanup() anyways.

Ill go ahead and commit the following:

drivers/target/target_core_configfs.c +1 -5
index 99e07ba..30ae3af 100644
@@ -2003,12 +2003,8 @@ static void target_core_dev_release(struct config_item *item)
 {
        struct se_subsystem_dev *se_dev = container_of(to_config_group(item),
                                struct se_subsystem_dev, se_dev_group);
-       struct config_group *dev_cg;
+       struct config_group *dev_cg = &se_dev->se_dev_group;
 
-       if (!(se_dev))
-               return;
-
-       dev_cg = &se_dev->se_dev_group;
        kfree(dev_cg->default_groups);
 }