diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2014-12-07 19:57:36 +0000 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2014-12-13 15:16:20 +0100 |
| commit | 6eef90fc28562f7b4fb9f7f1661da08e90673e25 (patch) | |
| tree | d03c57acfdcd27099a9e0d218da8b21bd9b64eb1 | |
| parent | a99c4d9b097701ce465042c61d7eabf1ff26b4ae (diff) | |
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>
| -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 360359998e5d..551ea92ced64 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; |