* [1/9] driver core fixes: make_class_name() retval check
@ 2006-09-22 9:36 Cornelia Huck
2006-09-22 9:58 ` Rolf Eike Beer
0 siblings, 1 reply; 3+ messages in thread
From: Cornelia Huck @ 2006-09-22 9:36 UTC (permalink / raw)
To: Greg K-H; +Cc: linux-kernel
From: Cornelia Huck <cornelia.huck@de.ibm.com>
Make make_class_name() return NULL on error and fixup callers in the
driver core.
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---
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");
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [1/9] driver core fixes: make_class_name() retval check
2006-09-22 9:36 [1/9] driver core fixes: make_class_name() retval check Cornelia Huck
@ 2006-09-22 9:58 ` Rolf Eike Beer
2006-09-22 10:22 ` Cornelia Huck
0 siblings, 1 reply; 3+ messages in thread
From: Rolf Eike Beer @ 2006-09-22 9:58 UTC (permalink / raw)
To: Cornelia Huck; +Cc: Greg K-H, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 763 bytes --]
Cornelia Huck wrote:
> From: Cornelia Huck <cornelia.huck@de.ibm.com>
>
> 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
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [1/9] driver core fixes: make_class_name() retval check
2006-09-22 9:58 ` Rolf Eike Beer
@ 2006-09-22 10:22 ` Cornelia Huck
0 siblings, 0 replies; 3+ messages in thread
From: Cornelia Huck @ 2006-09-22 10:22 UTC (permalink / raw)
To: Rolf Eike Beer; +Cc: Greg K-H, linux-kernel
On Fri, 22 Sep 2006 11:58:02 +0200,
Rolf Eike Beer <eike-kernel@sf-tec.de> 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 <cornelia.huck@de.ibm.com>
Make make_class_name() return NULL on error and fixup callers in the
driver core.
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---
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");
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-09-22 10:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-09-22 9:36 [1/9] driver core fixes: make_class_name() retval check Cornelia Huck
2006-09-22 9:58 ` Rolf Eike Beer
2006-09-22 10:22 ` Cornelia Huck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox