summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-11-28 14:19:03 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-11-28 14:30:50 -0500
commitfddf1a3189aa6e2ea641e0a9f995344c14e8d1e0 (patch)
tree3dd1cd24ba964cfc15f43a700dc08da510d7c627
parent90598531b0bb79626ae5471f7c7c9e82954050c9 (diff)
mount: deal with inotify queue overflow
Overflow is very unlikely, since we are watching a privileged directory, but could be triggered if thousands of mounts are suddently executed.
-rw-r--r--src/core/mount.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/mount.c b/src/core/mount.c
index 61bc3e3392..fc160b6b1d 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -1662,8 +1662,8 @@ static int mount_dispatch_io(sd_event_source *source, int fd, uint32_t revents,
/* The manager calls this for every fd event happening on the
* /proc/self/mountinfo file, which informs us about mounting
- * table changes
- * This may also be called for /run/mount events */
+ * table changes, and for /run/mount events which we watch
+ * for mount options. */
if (fd == m->utab_inotify_fd) {
char inotify_buffer[sizeof(struct inotify_event) + NAME_MAX + 1];
@@ -1671,18 +1671,18 @@ static int mount_dispatch_io(sd_event_source *source, int fd, uint32_t revents,
char *p;
int rescan = 0;
- while ((r = read(fd, inotify_buffer, sizeof(inotify_buffer))) > 0) {
+ while ((r = read(fd, inotify_buffer, sizeof(inotify_buffer))) > 0)
for (p = inotify_buffer; p < inotify_buffer + r; ) {
event = (struct inotify_event *) p;
/* only care about changes to utab, but we have
* to monitor the directory to reliably get
* notifications about when utab is replaced
* using rename(2) */
- if (strcmp(event->name, "utab") == 0)
+ if ((event->mask & IN_Q_OVERFLOW) || streq(event->name, "utab"))
rescan = 1;
p += sizeof(struct inotify_event) + event->len;
}
- }
+
if (!rescan)
return 0;
}