Attachment 310943 Details for Bug 453990 – Patch to fix the inotify LTP test failure

[patch] Patch to fix the inotify LTP test failure

linux-2.6.git-1c17d18e3775485bf1e0ce79575eb637a94494a2.patch (text/plain), 2.01 KB, created by Jeff Burke on 2008-07-03 17:43:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Burke

Created: 2008-07-03 17:43:30 UTC

Size: 2.01 KB

patch

obsolete

>From: Yan Zheng <yanzheng@21cn.com>
>Date: Wed, 6 Feb 2008 09:36:09 +0000 (-0800)
>Subject: A potential bug in inotify_user.c
>X-Git-Tag: v2.6.25-rc1~775
>X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=1c17d18e3775485bf1e0ce79575eb637a94494a2;hp=19c561a60ffe52df88dd63de0bff480ca094efe4
>
>A potential bug in inotify_user.c
>
>Following comment is at fs/inotify_user.c:287
>/* coalescing: drop this event if it is a dupe of the previous */
>
>I think the previous event in the comment should be the last event in the
>link list.  But inotify_dev_get_event return the first event in the list.
>In addition, it doesn't check whether the list is empty
>
>Signed-off-by: Yan Zheng<yanzheng@21cn.com>
>Acked-by: Robert Love <rlove@rlove.org>
>Cc: John McCutchan <ttb@tentacle.dhs.org>
>Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
>Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
>---
>
>diff --git a/fs/inotify_user.c b/fs/inotify_user.c
>index 5e00933..c509a81 100644
>--- a/fs/inotify_user.c
>+++ b/fs/inotify_user.c
>@@ -248,6 +248,19 @@ inotify_dev_get_event(struct inotify_device *dev)
> }
> 
> /*
>+ * inotify_dev_get_last_event - return the last event in the given dev's queue
>+ *
>+ * Caller must hold dev->ev_mutex.
>+ */
>+static inline struct inotify_kernel_event *
>+inotify_dev_get_last_event(struct inotify_device *dev)
>+{
>+	if (list_empty(&dev->events))
>+		return NULL;
>+	return list_entry(dev->events.prev, struct inotify_kernel_event, list);
>+}
>+
>+/*
>  * inotify_dev_queue_event - event handler registered with core inotify, adds
>  * a new event to the given device
>  *
>@@ -273,7 +286,7 @@ static void inotify_dev_queue_event(struct inotify_watch *w, u32 wd, u32 mask,
> 		put_inotify_watch(w); /* final put */
> 
> 	/* coalescing: drop this event if it is a dupe of the previous */
>-	last = inotify_dev_get_event(dev);
>+	last = inotify_dev_get_last_event(dev);
> 	if (last && last->event.mask == mask && last->event.wd == wd &&
> 			last->event.cookie == cookie) {
> 		const char *lastname = last->name;

Actions: View | Diff

Attachments on bug 453990: 310943