2006-09-22 09:36:28

by Cornelia Huck

[permalink] [raw]

Subject: [1/9] driver core fixes: make_class_name() retval check

---

From: Cornelia Huck <[email protected]>

Make make_class_name() return NULL on error and fixup callers in the
driver core.

Signed-off-by: Cornelia Huck <[email protected]>

---
drivers/base/class.c | 12 ++++++++----
drivers/base/core.c | 7 +++++--
2 files changed, 13 insertions(+), 6 deletions(-)

--- linux-2.6-CH.orig/drivers/base/class.c
+++ linux-2.6-CH/drivers/base/class.c
@@ -362,7 +362,7 @@ char *make_class_name(const char *name,

class_name = kmalloc(size, GFP_KERNEL);
if (!class_name)
- return ERR_PTR(-ENOMEM);
+ return NULL;

strcpy(class_name, name);
strcat(class_name, ":");
@@ -409,8 +409,11 @@ static int make_deprecated_class_device_
return 0;

class_name = make_class_name(class_dev->class->name, &class_dev->kobj);
- error = sysfs_create_link(&class_dev->dev->kobj, &class_dev->kobj,
- class_name);
+ if (!class_name)
+ error = sysfs_create_link(&class_dev->dev->kobj,
+ &class_dev->kobj, class_name);
+ else
+ error = -ENOMEM;
kfree(class_name);
return error;
}
@@ -771,7 +774,8 @@ void class_device_del(struct class_devic
#ifdef CONFIG_SYSFS_DEPRECATED
class_name = make_class_name(class_dev->class->name,
&class_dev->kobj);
- sysfs_remove_link(&class_dev->dev->kobj, class_name);
+ if (class_name)
+ sysfs_remove_link(&class_dev->dev->kobj, class_name);
#endif
sysfs_remove_link(&class_dev->kobj, "device");
}
--- linux-2.6-CH.orig/drivers/base/core.c
+++ linux-2.6-CH/drivers/base/core.c
@@ -469,7 +469,9 @@ int device_add(struct device *dev)
if (parent) {
sysfs_create_link(&dev->kobj, &dev->parent->kobj, "device");
class_name = make_class_name(dev->class->name, &dev->kobj);
- sysfs_create_link(&dev->parent->kobj, &dev->kobj, class_name);
+ if (class_name)
+ sysfs_create_link(&dev->parent->kobj,
+ &dev->kobj, class_name);
}
#endif
}
@@ -600,7 +602,8 @@ void device_del(struct device * dev)
char *class_name = NULL;

class_name = make_class_name(dev->class->name, &dev->kobj);
- sysfs_remove_link(&dev->parent->kobj, class_name);
+ if (class_name)
+ sysfs_remove_link(&dev->parent->kobj, class_name);
kfree(class_name);
#endif
sysfs_remove_link(&dev->kobj, "device");

2006-09-22 09:57:46

by Rolf Eike Beer

[permalink] [raw]

Subject: Re: [1/9] driver core fixes: make_class_name() retval check

---

Cornelia Huck wrote:
> From: Cornelia Huck <[email protected]>
>
> Make make_class_name() return NULL on error and fixup callers in the
> driver core.

> @@ -409,8 +409,11 @@ static int make_deprecated_class_device_
> return 0;
>
> class_name = make_class_name(class_dev->class->name, &class_dev->kobj);
> - error = sysfs_create_link(&class_dev->dev->kobj, &class_dev->kobj,
> - class_name);
> + if (!class_name)
> + error = sysfs_create_link(&class_dev->dev->kobj,
> + &class_dev->kobj, class_name);
> + else
> + error = -ENOMEM;
> kfree(class_name);
> return error;
> }

Either this is inverse of what you wanted to do or just calling
sysfs_create_link(..., NULL) would make it clearer for readers.

Eike

---

Attachments:

(No filename) (738.00 B)
(No filename) (189.00 B)
Download all attachments

2006-09-22 10:22:00

by Cornelia Huck

[permalink] [raw]

Subject: Re: [1/9] driver core fixes: make_class_name() retval check

---

On Fri, 22 Sep 2006 11:58:02 +0200,
Rolf Eike Beer <[email protected]> wrote:

> Either this is inverse of what you wanted to do or just calling
> sysfs_create_link(..., NULL) would make it clearer for readers.

Argh, a typo crept in while rebasing (thanks for noticing). Correct
patch below.


From: Cornelia Huck <[email protected]>

Make make_class_name() return NULL on error and fixup callers in the
driver core.

Signed-off-by: Cornelia Huck <[email protected]>

---
drivers/base/class.c | 12 ++++++++----
drivers/base/core.c | 7 +++++--
2 files changed, 13 insertions(+), 6 deletions(-)

--- linux-2.6-CH.orig/drivers/base/class.c
+++ linux-2.6-CH/drivers/base/class.c
@@ -362,7 +362,7 @@ char *make_class_name(const char *name,

class_name = kmalloc(size, GFP_KERNEL);
if (!class_name)
- return ERR_PTR(-ENOMEM);
+ return NULL;

strcpy(class_name, name);
strcat(class_name, ":");
@@ -409,8 +409,11 @@ static int make_deprecated_class_device_
return 0;

class_name = make_class_name(class_dev->class->name, &class_dev->kobj);
- error = sysfs_create_link(&class_dev->dev->kobj, &class_dev->kobj,
- class_name);
+ if (class_name)
+ error = sysfs_create_link(&class_dev->dev->kobj,
+ &class_dev->kobj, class_name);
+ else
+ error = -ENOMEM;
kfree(class_name);
return error;
}
@@ -771,7 +774,8 @@ void class_device_del(struct class_devic
#ifdef CONFIG_SYSFS_DEPRECATED
class_name = make_class_name(class_dev->class->name,
&class_dev->kobj);
- sysfs_remove_link(&class_dev->dev->kobj, class_name);
+ if (class_name)
+ sysfs_remove_link(&class_dev->dev->kobj, class_name);
#endif
sysfs_remove_link(&class_dev->kobj, "device");
}
--- linux-2.6-CH.orig/drivers/base/core.c
+++ linux-2.6-CH/drivers/base/core.c
@@ -469,7 +469,9 @@ int device_add(struct device *dev)
if (parent) {
sysfs_create_link(&dev->kobj, &dev->parent->kobj, "device");
class_name = make_class_name(dev->class->name, &dev->kobj);
- sysfs_create_link(&dev->parent->kobj, &dev->kobj, class_name);
+ if (class_name)
+ sysfs_create_link(&dev->parent->kobj,
+ &dev->kobj, class_name);
}
#endif
}
@@ -600,7 +602,8 @@ void device_del(struct device * dev)
char *class_name = NULL;

class_name = make_class_name(dev->class->name, &dev->kobj);
- sysfs_remove_link(&dev->parent->kobj, class_name);
+ if (class_name)
+ sysfs_remove_link(&dev->parent->kobj, class_name);
kfree(class_name);
#endif
sysfs_remove_link(&dev->kobj, "device");