From: Benjamin Thery <benjamin.thery@bull.net>
To: linux-kernel@vger.kernel.org
Cc: "Eric W. Biederman" <ebiederm@xmission.com>,
Tejun Heo <htejun@gmail.com>, Greg Kroah-Hartman <gregkh@suse.de>,
Al Viro <viro@ftp.linux.org.uk>,
Daniel Lezcano <dlezcano@fr.ibm.com>,
"Serge E. Hallyn" <serue@us.ibm.com>,
Pavel Emelyanov <xemul@openvz.org>,
netdev@vger.kernel.org, Benjamin Thery <benjamin.thery@bull.net>
Subject: [PATCH 10/11] avoid kobject name conflict with different namespaces
Date: Tue, 06 May 2008 19:32:10 +0200 [thread overview]
Message-ID: <20080506173335.922289888@theryb.frec.bull.fr> (raw)
In-Reply-To: 20080506173030.653828076@theryb.frec.bull.fr
The renaming of a kobject will fail if there is another kobject
with the same name belonging to another namespace.
This patch makes the kobject lookup in kobject_rename to check if
the object exists _and_ belongs to the same namespace.
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Acked-by: Benjamin Thery <benjamin.thery@bull.net>
---
fs/sysfs/dir.c | 10 ++++++++++
include/linux/sysfs.h | 7 +++++++
lib/kobject.c | 2 +-
3 files changed, 18 insertions(+), 1 deletion(-)
Index: linux-vanilla/fs/sysfs/dir.c
===================================================================
--- linux-vanilla.orig/fs/sysfs/dir.c
+++ linux-vanilla/fs/sysfs/dir.c
@@ -902,6 +902,16 @@ err_out:
return error;
}
+int sysfs_tag_cmp(struct kobject *kobj1, struct kobject *kobj2)
+{
+ struct sysfs_dirent *sd1 = kobj1->sd;
+ struct sysfs_dirent *sd2 = kobj2->sd;
+ const void *tag1 = sysfs_dirent_tag(sd1);
+ const void *tag2 = sysfs_dirent_tag(sd2);
+
+ return tag1 != tag2;
+}
+
int sysfs_rename_dir(struct kobject * kobj, const char *new_name)
{
struct sysfs_dirent *sd = kobj->sd;
Index: linux-vanilla/include/linux/sysfs.h
===================================================================
--- linux-vanilla.orig/include/linux/sysfs.h
+++ linux-vanilla/include/linux/sysfs.h
@@ -95,6 +95,8 @@ int sysfs_schedule_callback(struct kobje
int __must_check sysfs_create_dir(struct kobject *kobj);
void sysfs_remove_dir(struct kobject *kobj);
+int sysfs_tag_cmp(struct kobject *kobj1, struct kobject *kobj2);
+
int __must_check sysfs_rename_dir(struct kobject *kobj, const char *new_name);
int __must_check sysfs_move_dir(struct kobject *kobj,
struct kobject *new_parent_kobj);
@@ -154,6 +156,11 @@ static inline void sysfs_remove_dir(stru
{
}
+static inline int sysfs_tag_cmp(struct kobject *kobj1, struct kobject *kobj2)
+{
+ return 0;
+}
+
static inline int sysfs_rename_dir(struct kobject *kobj, const char *new_name)
{
return 0;
Index: linux-vanilla/lib/kobject.c
===================================================================
--- linux-vanilla.orig/lib/kobject.c
+++ linux-vanilla/lib/kobject.c
@@ -401,7 +401,7 @@ int kobject_rename(struct kobject *kobj,
if (kobj->kset) {
struct kobject *temp_kobj;
temp_kobj = kset_find_obj(kobj->kset, new_name);
- if (temp_kobj) {
+ if (temp_kobj && !sysfs_tag_cmp(temp_kobj, kobj)) {
printk(KERN_WARNING "kobject '%s' cannot be renamed "
"to '%s' as '%s' is already in existence.\n",
kobject_name(kobj), new_name, new_name);
--
next prev parent reply other threads:[~2008-05-06 17:42 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-06 17:30 [RESEND][PATCH 00/11] sysfs tagged directories Benjamin Thery
2008-05-06 17:30 ` [PATCH 01/11] sysfs: Support for preventing unmounts Benjamin Thery
2008-05-06 17:30 ` [PATCH 02/11] sysfs: sysfs_get_dentry add a sb parameter Benjamin Thery
2008-05-06 17:31 ` [PATCH 03/11] sysfs: Implement __sysfs_get_dentry Benjamin Thery
2008-05-06 17:31 ` [PATCH 04/11] sysfs: Rename Support multiple superblocks Benjamin Thery
2008-05-06 17:31 ` [PATCH 05/11] sysfs: sysfs_chmod_file handle " Benjamin Thery
2008-05-06 17:31 ` [PATCH 06/11] sysfs: Implement sysfs tagged directory support Benjamin Thery
2008-05-06 17:31 ` [PATCH 07/11] sysfs: Implement sysfs_delete_link and sysfs_rename_link Benjamin Thery
2008-05-06 17:31 ` [PATCH 08/11] driver core: Implement tagged directory support for device classes Benjamin Thery
2008-05-06 17:32 ` [PATCH 09/11] netns: Enable tagging for net_class directories in sysfs Benjamin Thery
2008-05-06 17:32 ` Benjamin Thery [this message]
2008-05-07 18:49 ` [PATCH 10/11] avoid kobject name conflict with different namespaces Eric W. Biederman
2008-05-07 19:08 ` Greg KH
2008-05-07 20:54 ` Eric W. Biederman
2008-05-08 8:28 ` Cornelia Huck
2008-05-08 19:28 ` Eric W. Biederman
2008-05-09 5:35 ` Cornelia Huck
2008-05-09 18:16 ` Eric W. Biederman
2008-05-08 19:25 ` Eric W. Biederman
2008-05-08 21:30 ` [PATCH] wireless: Add missing locking to cfg80211_dev_rename Eric W. Biederman
2008-05-08 22:12 ` Serge E. Hallyn
2008-05-08 22:18 ` Johannes Berg
2008-05-08 21:41 ` [PATCH] Fix kobject_rename and !CONFIG_SYSFS Eric W. Biederman
2008-05-12 22:02 ` kobject: " Greg KH
2008-05-13 7:00 ` Eric W. Biederman
2008-05-13 14:25 ` Benjamin Thery
2008-05-13 16:44 ` Greg KH
2008-05-13 17:55 ` [PATCH] Fix kobject_rename and !CONFIG_SYSFS v2 Eric W. Biederman
2008-05-13 18:23 ` Randy.Dunlap
2008-05-13 20:43 ` Eric W. Biederman
2008-05-13 20:16 ` Greg KH
2008-05-13 20:45 ` [PATCH] Fix kobject_rename and !CONFIG_SYSFS v3 Eric W. Biederman
2008-05-13 21:18 ` Randy Dunlap
2008-05-14 4:39 ` [PATCH] Fix kobject_rename and !CONFIG_SYSFS v4 Eric W. Biederman
2008-05-14 5:03 ` Andrew Morton
2008-05-14 9:01 ` Eric W. Biederman
2008-05-14 9:20 ` Andrew Morton
2008-05-14 9:51 ` Benjamin Thery
2008-05-14 9:56 ` Andrew Morton
2008-05-13 19:33 ` kobject: Fix kobject_rename and !CONFIG_SYSFS Benjamin Thery
2008-05-13 20:42 ` Eric W. Biederman
2008-05-06 17:32 ` [PATCH 11/11] sysfs: user namespaces: add ns to user_struct Benjamin Thery
2008-05-06 19:03 ` Serge E. Hallyn
2008-05-06 17:53 ` [RESEND][PATCH 00/11] sysfs tagged directories Greg KH
2008-05-06 18:41 ` Benjamin Thery
2008-05-07 13:19 ` Daniel Lezcano
2008-05-07 13:47 ` Benjamin Thery
2008-05-14 15:07 ` Benjamin Thery
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080506173335.922289888@theryb.frec.bull.fr \
--to=benjamin.thery@bull.net \
--cc=dlezcano@fr.ibm.com \
--cc=ebiederm@xmission.com \
--cc=gregkh@suse.de \
--cc=htejun@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=serue@us.ibm.com \
--cc=viro@ftp.linux.org.uk \
--cc=xemul@openvz.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).