adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 04:06:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

inotify: fix length reporting and size checking

Browse source 
0db501bd06 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>
This commit is contained in:
Eric Paris 2009-08-28 11:57:55 -04:00
parent b962e7312a
commit 83cb10f0ef
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs/notify/inotify/inotify_user.c
View file

@ -154,7 +154,8 @@ static struct fsnotify_event *get_one_event(struct fsnotify_group *group,
event = fsnotify_peek_notify_event(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) if (event_size > count)
return ERR_PTR(-EINVAL); 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) { list_for_each_entry(holder, &group->notification_list, event_list) {
event = holder->event; event = holder->event;
send_len += sizeof(struct inotify_event); send_len += sizeof(struct inotify_event);
send_len += roundup(event->name_len, if (event->name_len)
sizeof(struct inotify_event)); send_len += roundup(event->name_len + 1,
sizeof(struct inotify_event));
} }
mutex_unlock(&group->notification_mutex); mutex_unlock(&group->notification_mutex);
ret = put_user(send_len, (int __user *) p); ret = put_user(send_len, (int __user *) p);