Re: [malware-list] A few concerns about fanotify implementation ([PATCH] inside).

[Lino Sanfilippo <LinoSanfilippo@gmx.de>]

On Mon, Jun 06, 2011 at 12:27:54PM +0200, Lino Sanfilippo wrote:
> The applied patch should handle this correctly.

Should but doesnt, since access permission handling might not be
enabled.

So here is an improved version:


Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de>
---
 fs/notify/fanotify/fanotify_user.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index 9fde1c0..527fbb0 100644
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -306,8 +306,15 @@ static unsigned int fanotify_poll(struct file *file, poll_table *wait)
 	poll_wait(file, &group->notification_waitq, wait);
 	mutex_lock(&group->notification_mutex);
 	if (!fsnotify_notify_queue_is_empty(group))
-		ret = POLLIN | POLLRDNORM;
+		ret |= POLLIN | POLLRDNORM;
 	mutex_unlock(&group->notification_mutex);
+#ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
+	poll_wait(file, &group->fanotify_data.access_waitq, wait);
+	mutex_lock(&group->fanotify_data.access_mutex);
+	if (!list_empty(&group->fanotify_data.access_list))
+		ret |= POLLOUT | POLLWRNORM;
+	mutex_unlock(&group->fanotify_data.access_mutex);
+#endif
 
 	return ret;
 }
-- 
1.5.6.5