#include <errno.h>
#include "udev.h"
+#include "udev_lib.h"
#include "udev_version.h"
+#include "logging.h"
#include "namedev.h"
#include "udevdb.h"
-#include "libsysfs/libsysfs.h"
static int delete_path(char *path)
{
/* remove if empty */
retval = rmdir(path);
+ if (errno == ENOENT)
+ retval = 0;
if (retval) {
if (errno == ENOTEMPTY)
return 0;
return 0;
}
-static int delete_node(struct udevice *dev)
+/** Remove all permissions on the device node, before
+ * unlinking it. This fixes a security issue.
+ * If the user created a hard-link to the device node,
+ * he can't use it any longer, because he lost permission
+ * to do so.
+ */
+static int secure_unlink(const char *filename)
{
- char filename[255];
int retval;
- strncpy(filename, udev_root, sizeof(filename));
- strncat(filename, dev->name, sizeof(filename));
-
- dbg("unlinking node '%s'", filename);
+ retval = chown(filename, 0, 0);
+ if (retval) {
+ dbg("chown(%s, 0, 0) failed with error '%s'",
+ filename, strerror(errno));
+ /* We continue nevertheless.
+ * I think it's very unlikely for chown
+ * to fail here, if the file exists.
+ */
+ }
+ retval = chmod(filename, 0000);
+ if (retval) {
+ dbg("chmod(%s, 0000) failed with error '%s'",
+ filename, strerror(errno));
+ /* We continue nevertheless. */
+ }
retval = unlink(filename);
+ if (errno == ENOENT)
+ retval = 0;
if (retval) {
dbg("unlink(%s) failed with error '%s'",
filename, strerror(errno));
+ }
+ return retval;
+}
+
+static int delete_node(struct udevice *dev)
+{
+ char filename[NAME_SIZE];
+ char linkname[NAME_SIZE];
+ char partitionname[NAME_SIZE];
+ int retval;
+ int i;
+ char *pos;
+ int len;
+
+ strfieldcpy(filename, udev_root);
+ strfieldcat(filename, dev->name);
+
+ info("removing device node '%s'", filename);
+ retval = secure_unlink(filename);
+ if (retval)
return retval;
+
+ /* remove partition nodes */
+ if (dev->partitions > 0) {
+ info("removing partitions '%s[1-%i]'", filename, dev->partitions);
+ for (i = 1; i <= dev->partitions; i++) {
+ strfieldcpy(partitionname, filename);
+ strintcat(partitionname, i);
+ secure_unlink(partitionname);
+ }
}
/* remove subdirectories */
if (strchr(dev->name, '/'))
delete_path(filename);
- if (*dev->symlink) {
- strncpy(filename, udev_root, sizeof(filename));
- strncat(filename, dev->symlink, sizeof(filename));
+ foreach_strpart(dev->symlink, " ", pos, len) {
+ strfieldcpymax(linkname, pos, len+1);
+ strfieldcpy(filename, udev_root);
+ strfieldcat(filename, linkname);
+
dbg("unlinking symlink '%s'", filename);
retval = unlink(filename);
+ if (errno == ENOENT)
+ retval = 0;
if (retval) {
dbg("unlink(%s) failed with error '%s'",
filename, strerror(errno));
return retval;
}
-#ifdef USE_DBUS
-/** Send out a signal that a device node is deleted
- *
- * @param name Name of the device node, e.g. /udev/sda1
- * @param path Sysfs path of device
- */
-static void sysbus_send_remove(const char* name, const char *path)
-{
- char filename[255];
- DBusMessage* message;
- DBusMessageIter iter;
-
- if (sysbus_connection == NULL)
- return;
-
- strncpy(filename, udev_root, sizeof(filename));
- strncat(filename, name, sizeof(filename));
-
- /* object, interface, member */
- message = dbus_message_new_signal("/org/kernel/udev/NodeMonitor",
- "org.kernel.udev.NodeMonitor",
- "NodeDeleted");
-
- dbus_message_iter_init(message, &iter);
- dbus_message_iter_append_string(&iter, filename);
- dbus_message_iter_append_string(&iter, path);
-
- if ( !dbus_connection_send(sysbus_connection, message, NULL) )
- dbg("error sending d-bus signal");
-
- dbus_message_unref(message);
-
- dbus_connection_flush(sysbus_connection);
-}
-#endif /* USE_DBUS */
-
/*
* Look up the sysfs path in the database to see if we have named this device
* something different from the kernel name. If we have, us it. If not, use
* the default kernel name for lack of anything else to know to do.
*/
-int udev_remove_device(char *path, char *subsystem)
+int udev_remove_device(const char *path, const char *subsystem)
{
- char name[100];
- struct udevice *dev;
+ struct udevice dev;
char *temp;
+ int retval;
- dev = udevdb_get_dev(path);
- if (dev == NULL) {
+ memset(&dev, 0x00, sizeof(dev));
+
+ retval = udevdb_get_dev(path, &dev);
+ if (retval != 0) {
dbg("'%s' not found in database, falling back on default name", path);
temp = strrchr(path, '/');
if (temp == NULL)
return -ENODEV;
- strncpy(name, &temp[1], sizeof(name));
+ strfieldcpy(dev.name, &temp[1]);
}
+ dbg("name='%s'", dev.name);
- dbg("name is '%s'", dev->name);
+ dev.type = get_device_type(path, subsystem);
+ dev_d_send(&dev, subsystem, path);
udevdb_delete_dev(path);
-#ifdef USE_DBUS
- sysbus_send_remove(name, device);
-#endif /* USE_DBUS */
-
- return delete_node(dev);
+ if (dev.type == 'b' || dev.type == 'c')
+ retval = delete_node(&dev);
+ else if (dev.type == 'n')
+ retval = 0;
+
+ return retval;
}
~ianmdlvl / elogind.git / blobdiff