chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] fix possible buffer overflow
[elogind.git]
/
udev.c
diff --git
a/udev.c
b/udev.c
index 1d66410b6c0085ba1c9c780497fb4f8f94b98bc1..38b26916c99a63eb1774b5bb41e8c3361363e683 100644
(file)
--- a/
udev.c
+++ b/
udev.c
@@
-3,8
+3,7
@@
*
* Userspace devfs
*
*
* Userspace devfs
*
- * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- *
+ * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@
-24,8
+23,6
@@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <fcntl.h>
-#include <unistd.h>
#include <errno.h>
#include <ctype.h>
#include <signal.h>
#include <errno.h>
#include <ctype.h>
#include <signal.h>
@@
-33,6
+30,7
@@
#include "udev.h"
#include "udev_version.h"
#include "udev_dbus.h"
#include "udev.h"
#include "udev_version.h"
#include "udev_dbus.h"
+#include "logging.h"
#include "namedev.h"
#include "udevdb.h"
#include "libsysfs/libsysfs.h"
#include "namedev.h"
#include "udevdb.h"
#include "libsysfs/libsysfs.h"
@@
-47,7
+45,6
@@
static void sig_handler(int signum)
switch (signum) {
case SIGINT:
case SIGTERM:
switch (signum) {
case SIGINT:
case SIGTERM:
- case SIGKILL:
sysbus_disconnect();
udevdb_exit();
exit(20 + signum);
sysbus_disconnect();
udevdb_exit();
exit(20 + signum);
@@
-81,29
+78,29
@@
static inline char *get_seqnum(void)
return seqnum;
}
return seqnum;
}
-int main(int argc, char **argv, char **envp)
+static char *subsystem_blacklist[] = {
+ "net",
+ "scsi_host",
+ "scsi_device",
+ "usb_host",
+ "pci_bus",
+ "",
+};
+
+static int udev_hotplug(int argc, char **argv)
{
char *action;
char *devpath;
char *subsystem;
int retval = -EINVAL;
{
char *action;
char *devpath;
char *subsystem;
int retval = -EINVAL;
+ int i;
- signal(SIGINT, sig_handler);
- signal(SIGTERM, sig_handler);
- signal(SIGKILL, sig_handler);
-
- main_argv = argv;
- main_envp = envp;
-
- dbg("version %s", UDEV_VERSION);
-
- if (argc != 2) {
- dbg ("unknown number of arguments");
+ action = get_action();
+ if (!action) {
+ dbg ("no action?");
goto exit;
}
goto exit;
}
- subsystem = argv[1];
-
devpath = get_devpath();
if (!devpath) {
dbg ("no devpath?");
devpath = get_devpath();
if (!devpath) {
dbg ("no devpath?");
@@
-118,24
+115,23
@@
int main(int argc, char **argv, char **envp)
goto exit;
}
goto exit;
}
- /* but we don't care about net class devices */
- if (strcmp(subsystem, "net") == 0) {
- dbg("don't care about net devices");
- goto exit;
+ /* skip blacklisted subsystems */
+ subsystem = argv[1];
+ i = 0;
+ while (subsystem_blacklist[i][0] != '\0') {
+ if (strcmp(subsystem, subsystem_blacklist[i]) == 0) {
+ dbg("don't care about '%s' devices", subsystem);
+ goto exit;
+ }
+ i++;
}
}
- action = get_action();
- if (!action) {
- dbg ("no action?");
- goto exit;
- }
+ /* connect to the system message bus */
+ sysbus_connect();
/* initialize our configuration */
udev_init_config();
/* initialize our configuration */
udev_init_config();
- /* connect to the system message bus */
- sysbus_connect();
-
/* initialize udev database */
retval = udevdb_init(UDEVDB_DEFAULT);
if (retval != 0) {
/* initialize udev database */
retval = udevdb_init(UDEVDB_DEFAULT);
if (retval != 0) {
@@
-143,6
+139,10
@@
int main(int argc, char **argv, char **envp)
goto exit_sysbus;
}
goto exit_sysbus;
}
+ /* set up a default signal handler for now */
+ signal(SIGINT, sig_handler);
+ signal(SIGTERM, sig_handler);
+
/* initialize the naming deamon */
namedev_init();
/* initialize the naming deamon */
namedev_init();
@@
-163,5
+163,20
@@
exit_sysbus:
sysbus_disconnect();
exit:
sysbus_disconnect();
exit:
- return retval;
+ if (retval > 0)
+ retval = 0;
+
+ return -retval;
}
}
+
+int main(int argc, char **argv, char **envp)
+{
+ main_argv = argv;
+ main_envp = envp;
+
+ dbg("version %s", UDEV_VERSION);
+
+ return udev_hotplug(argc, argv);
+}
+
+