diff options
| author | Yan Zheng <yanzheng@21cn.com> | 2008-02-06 01:36:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 10:41:00 -0800 |
| commit | 1c17d18e3775485bf1e0ce79575eb637a94494a2 (patch) | |
| tree | 3a5d8e5d2731e7dda7ce0c43b0c00270bd01c8c4 | |
| parent | 19c561a60ffe52df88dd63de0bff480ca094efe4 (diff) | |
| download | lwn-1c17d18e3775485bf1e0ce79575eb637a94494a2.tar.gz lwn-1c17d18e3775485bf1e0ce79575eb637a94494a2.zip | |
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>
| -rw-r--r-- | fs/inotify_user.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/fs/inotify_user.c b/fs/inotify_user.c index 5e009331c01f..c509a817068f 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; |