diff options
| author | Eric Paris <eparis@redhat.com> | 2009-08-28 11:57:55 -0400 |
|---|---|---|
| committer | Eric Paris <eparis@redhat.com> | 2009-08-28 11:57:55 -0400 |
| commit | 83cb10f0ef3c96162be92339ccf8c0c9c9f2d13e (patch) | |
| tree | e83f71fde279bc4ed80db945b55603f653aa08e1 /fs/notify/inotify | |
| parent | b962e7312ae87006aed6f68ceee94bdf8db08338 (diff) | |
| download | linux-83cb10f0ef3c96162be92339ccf8c0c9c9f2d13e.tar.bz2 | |
inotify: fix length reporting and size checking
0db501bd0610ee0c0 introduced a regresion in that it now sends a nul
terminator but the length accounting when checking for space or
reporting to userspace did not take this into account. This corrects
all of the rounding logic.
Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'fs/notify/inotify')
| -rw-r--r-- | fs/notify/inotify/inotify_user.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c index b547ae17b461..6111670b2573 100644 --- a/fs/notify/inotify/inotify_user.c +++ b/fs/notify/inotify/inotify_user.c @@ -154,7 +154,8 @@ static struct fsnotify_event *get_one_event(struct fsnotify_group *group, event = fsnotify_peek_notify_event(group); - event_size += roundup(event->name_len, event_size); + if (event->name_len) + event_size += roundup(event->name_len + 1, event_size); if (event_size > count) return ERR_PTR(-EINVAL); @@ -327,8 +328,9 @@ static long inotify_ioctl(struct file *file, unsigned int cmd, list_for_each_entry(holder, &group->notification_list, event_list) { event = holder->event; send_len += sizeof(struct inotify_event); - send_len += roundup(event->name_len, - sizeof(struct inotify_event)); + if (event->name_len) + send_len += roundup(event->name_len + 1, + sizeof(struct inotify_event)); } mutex_unlock(&group->notification_mutex); ret = put_user(send_len, (int __user *) p); |