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 segfaulting udev while DRIVER matching
[elogind.git]
/
udev_utils.c
diff --git
a/udev_utils.c
b/udev_utils.c
index 60f5ad859a3e58dd7fa2950f3c9d0c83b00f8939..d572581f656b1f4822dc89fc81289a984a298c33 100644
(file)
--- a/
udev_utils.c
+++ b/
udev_utils.c
@@
-31,6
+31,7
@@
#include <sys/mman.h>
#include <sys/utsname.h>
#include <sys/mman.h>
#include <sys/utsname.h>
+#include "udev_libc_wrapper.h"
#include "udev.h"
#include "logging.h"
#include "udev_utils.h"
#include "udev.h"
#include "logging.h"
#include "udev_utils.h"
@@
-45,10
+46,10
@@
int udev_init_device(struct udevice *udev, const char* devpath, const char *subs
INIT_LIST_HEAD(&udev->symlink_list);
if (subsystem)
INIT_LIST_HEAD(&udev->symlink_list);
if (subsystem)
- str
fieldcpy(udev->subsystem, subsystem
);
+ str
lcpy(udev->subsystem, subsystem, sizeof(udev->subsystem)
);
if (devpath) {
if (devpath) {
- str
fieldcpy(udev->devpath, devpath
);
+ str
lcpy(udev->devpath, devpath, sizeof(udev->devpath)
);
no_trailing_slash(udev->devpath);
if (strncmp(udev->devpath, "/block/", 7) == 0)
no_trailing_slash(udev->devpath);
if (strncmp(udev->devpath, "/block/", 7) == 0)
@@
-63,7
+64,7
@@
int udev_init_device(struct udevice *udev, const char* devpath, const char *subs
/* get kernel name */
pos = strrchr(udev->devpath, '/');
if (pos) {
/* get kernel name */
pos = strrchr(udev->devpath, '/');
if (pos) {
- str
fieldcpy(udev->kernel_name, &pos[1]
);
+ str
lcpy(udev->kernel_name, &pos[1], sizeof(udev->kernel_name)
);
dbg("kernel_name='%s'", udev->kernel_name);
/* Some block devices have '!' in their name, change that to '/' */
dbg("kernel_name='%s'", udev->kernel_name);
/* Some block devices have '!' in their name, change that to '/' */
@@
-78,14
+79,14
@@
int udev_init_device(struct udevice *udev, const char* devpath, const char *subs
pos = &udev->kernel_name[strlen(udev->kernel_name)];
while (isdigit(pos[-1]))
pos--;
pos = &udev->kernel_name[strlen(udev->kernel_name)];
while (isdigit(pos[-1]))
pos--;
- str
fieldcpy(udev->kernel_number, pos
);
+ str
lcpy(udev->kernel_number, pos, sizeof(udev->kernel_number)
);
dbg("kernel_number='%s'", udev->kernel_number);
}
}
udev->mode = 0660;
dbg("kernel_number='%s'", udev->kernel_number);
}
}
udev->mode = 0660;
- strcpy(udev->owner, "
root
");
- strcpy(udev->group, "
root
");
+ strcpy(udev->owner, "
0
");
+ strcpy(udev->group, "
0
");
return 0;
}
return 0;
}
@@
-126,7
+127,7
@@
int kernel_release_satisfactory(unsigned int version, unsigned int patchlevel, u
int create_path(const char *path)
{
int create_path(const char *path)
{
- char p[
NAME
_SIZE];
+ char p[
PATH
_SIZE];
char *pos;
struct stat stats;
char *pos;
struct stat stats;
@@
-195,19
+196,19
@@
int parse_get_pair(char **orig_string, char **left, char **right)
return -ENODEV;
/* take the right side and strip off the '"' */
return -ENODEV;
/* take the right side and strip off the '"' */
- while (isspace(
*string
))
+ while (isspace(
string[0]
))
++string;
++string;
- if (
*string
== '"')
+ if (
string[0]
== '"')
++string;
else
return -ENODEV;
temp = strsep(&string, "\"");
++string;
else
return -ENODEV;
temp = strsep(&string, "\"");
- if (!string ||
*temp
== '\0')
+ if (!string ||
temp[0]
== '\0')
return -ENODEV;
*right = temp;
*orig_string = string;
return -ENODEV;
*right = temp;
*orig_string = string;
-
+
return 0;
}
return 0;
}
@@
-292,7
+293,7
@@
int name_list_add(struct list_head *name_list, const char *name, int sort)
return -ENOMEM;
}
return -ENOMEM;
}
- str
fieldcpy(new_name->name, name
);
+ str
lcpy(new_name->name, name, sizeof(new_name->name)
);
list_add_tail(&new_name->node, &loop_name->node);
return 0;
list_add_tail(&new_name->node, &loop_name->node);
return 0;
@@
-338,10
+339,10
@@
int call_foreach_file(int (*handler_function)(struct udevice *udev, const char *
/* call function for every file in the list */
list_for_each_entry_safe(loop_file, tmp_file, &file_list, node) {
/* call function for every file in the list */
list_for_each_entry_safe(loop_file, tmp_file, &file_list, node) {
- char filename[
NAME
_SIZE];
+ char filename[
PATH
_SIZE];
- snprintf(filename,
NAME_SIZE
, "%s/%s", dirname, loop_file->name);
- filename[
NAME_SIZE
-1] = '\0';
+ snprintf(filename,
sizeof(filename)
, "%s/%s", dirname, loop_file->name);
+ filename[
sizeof(filename)
-1] = '\0';
handler_function(udev, filename);
handler_function(udev, filename);