diff options
| author | Eric Paris <eparis@redhat.com> | 2010-12-07 15:27:57 -0500 |
|---|---|---|
| committer | Eric Paris <eparis@redhat.com> | 2010-12-15 13:58:18 -0500 |
| commit | 7d13162332f2b67a941d18cee20f1c0413e020de (patch) | |
| tree | a9e40f802579e750fbf75e025e9cee7c760ca558 /fs/notify | |
| parent | 62731fa0c893515dc6cbc3e0a2879a92793c735f (diff) | |
| download | kernel-common-7d13162332f2b67a941d18cee20f1c0413e020de.tar.gz kernel-common-7d13162332f2b67a941d18cee20f1c0413e020de.tar.bz2 kernel-common-7d13162332f2b67a941d18cee20f1c0413e020de.zip | |
fanotify: fill in the metadata_len field on struct fanotify_event_metadata
The fanotify_event_metadata now has a field which is supposed to
indicate the length of the metadata portion of the event. Fill in that
field as well.
Based-in-part-on-patch-by: Alexey Zaytsev <alexey.zaytsev@gmail.com>
Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'fs/notify')
| -rw-r--r-- | fs/notify/fanotify/fanotify_user.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c index dccd7985e65a..8b61220cffc5 100644 --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c @@ -116,6 +116,7 @@ static int fill_event_metadata(struct fsnotify_group *group, group, metadata, event); metadata->event_len = FAN_EVENT_METADATA_LEN; + metadata->metadata_len = FAN_EVENT_METADATA_LEN; metadata->vers = FANOTIFY_METADATA_VERSION; metadata->mask = event->mask & FAN_ALL_OUTGOING_EVENTS; metadata->pid = pid_vnr(event->tgid); @@ -275,10 +276,11 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group, goto out_close_fd; ret = -EFAULT; - if (copy_to_user(buf, &fanotify_event_metadata, FAN_EVENT_METADATA_LEN)) + if (copy_to_user(buf, &fanotify_event_metadata, + fanotify_event_metadata.event_len)) goto out_kill_access_response; - return FAN_EVENT_METADATA_LEN; + return fanotify_event_metadata.event_len; out_kill_access_response: remove_access_response(group, event, fd); |