From: Stephen Hemminger <shemminger@osdl.org>
To: Greg KH <greg@kroah.com>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] restrict class names to valid file names
Date: Mon, 12 Jan 2004 15:13:57 -0800 [thread overview]
Message-ID: <20040112151357.5c9702b7.shemminger@osdl.org> (raw)
It is possible to name network devices with names like "my/bogus" or "." or ".."
which leaves /sys/class/net/ a mess. Since other subsystems could have the same
problem, it made sense to me to enforce some restrictions in the class device
layer.
A lateer patch fixes the network device registration path because the
sysfs registration takes place after the register_netdevice call has taken place.
diff -Nru a/drivers/base/class.c b/drivers/base/class.c
--- a/drivers/base/class.c Mon Jan 12 15:11:55 2004
+++ b/drivers/base/class.c Mon Jan 12 15:11:55 2004
@@ -87,10 +87,24 @@
subsys_put(&cls->subsys);
}
+/* Restrict class names to valid file names */
+int
+class_name_valid(const char *name)
+{
+ return !(name[0] == '\0'
+ || (name[0] == '.'
+ && (name[1] == '\0'
+ || (name[1] == '.' && (name[2] == '\0'))))
+ || strchr(name, '/'));
+}
+
int class_register(struct class * cls)
{
pr_debug("device class '%s': registering\n",cls->name);
+ if (!class_name_valid(cls->name))
+ return -EINVAL;
+
INIT_LIST_HEAD(&cls->children);
INIT_LIST_HEAD(&cls->interfaces);
kobject_set_name(&cls->subsys.kset.kobj,cls->name);
@@ -267,6 +281,9 @@
struct list_head * entry;
int error;
+ if (!class_name_valid(class_dev->class_id))
+ return -EINVAL;
+
class_dev = class_device_get(class_dev);
if (!class_dev || !strlen(class_dev->class_id))
return -EINVAL;
@@ -348,6 +365,9 @@
int class_device_rename(struct class_device *class_dev, char *new_name)
{
+ if (!class_name_valid(new_name))
+ return -EINVAL;
+
class_dev = class_device_get(class_dev);
if (!class_dev)
return -EINVAL;
diff -Nru a/include/linux/device.h b/include/linux/device.h
--- a/include/linux/device.h Mon Jan 12 15:11:55 2004
+++ b/include/linux/device.h Mon Jan 12 15:11:55 2004
@@ -157,6 +157,7 @@
void (*release)(struct class_device *dev);
};
+extern int class_name_valid(const char *);
extern int class_register(struct class *);
extern void class_unregister(struct class *);
next reply other threads:[~2004-01-12 23:17 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-01-12 23:13 Stephen Hemminger [this message]
2004-01-13 0:05 ` [PATCH] restrict class names to valid file names Greg KH
2004-01-13 0:13 ` Stephen Hemminger
2004-01-13 0:18 ` Greg KH
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=20040112151357.5c9702b7.shemminger@osdl.org \
--to=shemminger@osdl.org \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.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).