diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-10-24 16:52:31 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-10-30 21:52:33 -0700 |
| commit | 34358c26a2c96b2a068dc44e0ac602106a466bce (patch) | |
| tree | 36820739660152337e8e6fcbf4f21d97d1525208 | |
| parent | fcd239d3d5575e5cc63aab5c33cf6dc66904f6d6 (diff) | |
| download | op-kernel-dev-34358c26a2c96b2a068dc44e0ac602106a466bce.zip op-kernel-dev-34358c26a2c96b2a068dc44e0ac602106a466bce.tar.gz | |
kobject: check for duplicate names in kobject_rename
This should catch any duplicate names before we try to tell sysfs to
rename the object. This happens a lot with older versions of udev and
the network rename scripts.
Cc: David Miller <davem@davemloft.net>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Tejun Heo <htejun@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | lib/kobject.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/lib/kobject.c b/lib/kobject.c index 03d4036..a7e3bf4 100644 --- a/lib/kobject.c +++ b/lib/kobject.c @@ -308,6 +308,19 @@ int kobject_rename(struct kobject * kobj, const char *new_name) if (!kobj->parent) return -EINVAL; + /* see if this name is already in use */ + if (kobj->kset) { + struct kobject *temp_kobj; + temp_kobj = kset_find_obj(kobj->kset, new_name); + if (temp_kobj) { + printk(KERN_WARNING "kobject '%s' can not be renamed " + "to '%s' as '%s' is already in existance.\n", + kobject_name(kobj), new_name, new_name); + kobject_put(temp_kobj); + return -EINVAL; + } + } + devpath = kobject_get_path(kobj, GFP_KERNEL); if (!devpath) { error = -ENOMEM; |
