diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-04-20 11:07:25 +0200 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2022-09-19 10:47:59 +0100 |
| commit | 5fd9680e1318977bb6d33a89cebbc8b8a3b66ae4 (patch) | |
| tree | c733635fa20101f8d4a52b33290127edcce36d27 | |
| parent | 0a516ae5a777aeab277da106c1ef678fe757ad96 (diff) | |
| download | dbus-5fd9680e1318977bb6d33a89cebbc8b8a3b66ae4.tar.gz | |
bus/dir-watch: Do not crash with > 128 dirs
Without this running, dbus-daemon with long XDG_DATA_DIRS
will crash on out-of-bounds write:
$ XDG_DATA_DIRS=$(seq -f "/foo/%g" -s ':' 129) dbus-daemon --session
*** stack smashing detected ***: terminated
(cherry picked from commit b551b3e9737958216a1a9d359150a4110a9d0549)
Backported-from: dbus!302
(cherry picked from commit 9e8fe0718c1abf93e92fcf98c3fe962fc524bfa8)
| -rw-r--r-- | bus/dir-watch-inotify.c | 7 | ||||
| -rw-r--r-- | bus/dir-watch-kqueue.c | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/bus/dir-watch-inotify.c b/bus/dir-watch-inotify.c index 447dc2db..4f415618 100644 --- a/bus/dir-watch-inotify.c +++ b/bus/dir-watch-inotify.c @@ -108,12 +108,17 @@ _set_watched_dirs_internal (DBusList **directories) i = 0; link = _dbus_list_get_first_link (directories); - while (link != NULL) + while (link != NULL && i < MAX_DIRS_TO_WATCH) { new_dirs[i++] = (char *)link->data; link = _dbus_list_get_next_link (directories, link); } + if (link != NULL) + { + _dbus_warn ("Too many directories to watch them all, only watching first %d.", MAX_DIRS_TO_WATCH); + } + /* Look for directories in both the old and new sets, if * we find one, move its data into the new set. */ diff --git a/bus/dir-watch-kqueue.c b/bus/dir-watch-kqueue.c index 9b1784e8..b9f4742a 100644 --- a/bus/dir-watch-kqueue.c +++ b/bus/dir-watch-kqueue.c @@ -218,12 +218,17 @@ bus_set_watched_dirs (BusContext *context, DBusList **directories) i = 0; link = _dbus_list_get_first_link (directories); - while (link != NULL) + while (link != NULL && i < MAX_DIRS_TO_WATCH) { new_dirs[i++] = (char *)link->data; link = _dbus_list_get_next_link (directories, link); } + if (link != NULL) + { + _dbus_warn ("Too many directories to watch them all, only watching first %d.", MAX_DIRS_TO_WATCH); + } + /* Look for directories in both the old and new sets, if * we find one, move its data into the new set. */ |