picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libudev-enumerate.c:udev_enumerate_get_list_entry() fixed possible stale pointer 

If a realloc() happens in syspath_add(), the move_later pointer could
point to an invalid memory region.

Let move_later store the array index, instead of the pointer to the
entry.
This commit is contained in:
Harald Hoyer 2013-08-19 15:18:43 +02:00
parent 4bb3a126b7
commit 763a24a3b6
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/libudev/libudev-enumerate.c
View File

@ -270,8 +270,9 @@ _public_ struct udev_list_entry *udev_enumerate_get_list_entry(struct udev_enume
return NULL;
if (!udev_enumerate->devices_uptodate) {
unsigned int i;
int move_later = -1;
unsigned int max;
struct syspath *prev = NULL, *move_later = NULL;
struct syspath *prev = NULL;
size_t move_later_prefix = 0;
udev_list_cleanup(&udev_enumerate->devices_list);
@ -303,23 +304,25 @@ _public_ struct udev_list_entry *udev_enumerate_get_list_entry(struct udev_enume
move_later_prefix = devices_delay_later(udev_enumerate->udev, entry->syspath);
if (move_later_prefix > 0) {
move_later = entry;
move_later = i;
continue;
}
}
if (move_later &&
!strneq(entry->syspath, move_later->syspath, move_later_prefix)) {
if ((move_later >= 0) &&
!strneq(entry->syspath, udev_enumerate->devices[move_later].syspath, move_later_prefix)) {
udev_list_entry_add(&udev_enumerate->devices_list, move_later->syspath, NULL);
move_later = NULL;
udev_list_entry_add(&udev_enumerate->devices_list,
udev_enumerate->devices[move_later].syspath, NULL);
move_later = -1;
}
udev_list_entry_add(&udev_enumerate->devices_list, entry->syspath, NULL);
}
if (move_later)
udev_list_entry_add(&udev_enumerate->devices_list, move_later->syspath, NULL);
if (move_later >= 0)
udev_list_entry_add(&udev_enumerate->devices_list,
udev_enumerate->devices[move_later].syspath, NULL);
/* add and cleanup delayed devices from end of list */
for (i = max; i < udev_enumerate->devices_cur; i++) {