From 7fd407fefe92939ecb78400d22aac55590851f70 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Sat, 5 Sep 2009 10:18:12 -0400 Subject: [PATCH] Check we read off the compelte event from inotify The kernel may return a short read, so we must use read_data() to make sure we read off the full buffer. If somethign bad happens we also need to kill the inotify watch because the filedescriptor will return out of sync structures if we read only part of the data. Fixes bug #6693. --- source/smbd/notify_inotify.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/source/smbd/notify_inotify.c b/source/smbd/notify_inotify.c index 8237e4ab0bc..a12c0a6e7c1 100644 --- a/source/smbd/notify_inotify.c +++ b/source/smbd/notify_inotify.c @@ -232,6 +232,7 @@ static void inotify_handler(struct event_context *ev, struct fd_event *fde, int bufsize = 0; struct inotify_event *e0, *e; uint32_t prev_cookie=0; + NTSTATUS status; /* we must use FIONREAD as we cannot predict the length of the @@ -247,9 +248,14 @@ static void inotify_handler(struct event_context *ev, struct fd_event *fde, e0 = e = (struct inotify_event *)TALLOC_SIZE(in, bufsize); if (e == NULL) return; - if (sys_read(in->fd, e0, bufsize) != bufsize) { - DEBUG(0,("Failed to read all inotify data\n")); + status = read_data(in->fd, (char *)e0, bufsize); + if (!NT_STATUS_IS_OK(status)) { + DEBUG(0,("Failed to read all inotify data - %s\n", + nt_errstr(status))); talloc_free(e0); + /* the inotify fd will now be out of sync, + * can't keep reading data off it */ + TALLOC_FREE(fde); return; } -- 2.47.2