diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2014-12-07 19:57:36 +0000 |
|---|---|---|
| committer | Stefan Bader <stefan.bader@canonical.com> | 2014-12-15 15:00:59 +0100 |
| commit | f78cd4af8aed88951fbc944e58f702c350983761 (patch) | |
| tree | 306f196706f9d97ac0733a2438b078909597bbfd | |
| parent | 9126993c54283db9e76f6e5f453a42168c96d593 (diff) | |
| download | linux-2.6.32.y-drm33.z-f78cd4af8aed88951fbc944e58f702c350983761.tar.gz | |
proc connector: Delete spurious memset in proc_exit_connector()
Upstream commit e727ca82e0e9 ("proc connector: fix info leaks")
changed many functions that don't exist in 2.6.32.y. When it was
cherry-picked into 2.6.32.61, one extra memset() calls was inserted
into proc_exit_connector(). This results in clearing the cpu
field of exit events.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Acked-by: Mathias Krause <minipli@googlemail.com>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
| -rw-r--r-- | drivers/connector/cn_proc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c index 360359998e5df8..551ea92ced6423 100644 --- a/drivers/connector/cn_proc.c +++ b/drivers/connector/cn_proc.c @@ -187,7 +187,6 @@ void proc_exit_connector(struct task_struct *task) memset(&ev->event_data, 0, sizeof(ev->event_data)); get_seq(&msg->seq, &ev->cpu); ktime_get_ts(&ts); /* get high res monotonic timestamp */ - memset(&ev->event_data, 0, sizeof(ev->event_data)); put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); ev->what = PROC_EVENT_EXIT; ev->event_data.exit.process_pid = task->pid; |