chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
inotify: properly handle multiple inotify events per read()
[elogind.git]
/
src
/
util.c
diff --git
a/src/util.c
b/src/util.c
index d09e44777671b298f02eac2f1f7beea3152e1891..434f311e71f9cdbbdafe85229fdeb653f0b22965 100644
(file)
--- a/
src/util.c
+++ b/
src/util.c
@@
-2247,26
+2247,34
@@
int acquire_terminal(const char *name, bool fail, bool force, bool ignore_tiocst
assert(notify >= 0);
for (;;) {
assert(notify >= 0);
for (;;) {
-
struct inotify_event e
;
+
uint8_t inotify_buffer[sizeof(struct inotify_event) + FILENAME_MAX]
;
ssize_t l;
ssize_t l;
+ struct inotify_event *e;
- if ((l = read(notify, &
e, sizeof(e))) != sizeof(e)
) {
+ if ((l = read(notify, &
inotify_buffer, sizeof(inotify_buffer))) < 0
) {
- if (l < 0) {
+ if (errno == EINTR)
+ continue;
- if (errno == EINTR)
- continue;
+ r = -errno;
+ goto fail;
+ }
+
+ e = (struct inotify_event*) inotify_buffer;
- r = -errno;
- } else
+ while (l > 0) {
+ size_t step;
+
+ if (e->wd != wd || !(e->mask & IN_CLOSE)) {
r = -EIO;
r = -EIO;
+ goto fail;
+ }
-
goto fail
;
- }
+
step = sizeof(struct inotify_event) + e->len
;
+ assert(step <= (size_t) l);
- if (e.wd != wd || !(e.mask & IN_CLOSE)) {
- r = -EIO;
- goto fail;
+ e = (struct inotify_event*) ((uint8_t*) e + step);
+ l -= step;
}
break;
}
break;