Skip to content

Commit

Permalink
proc connector: Delete spurious memset in proc_exit_connector()
Browse files Browse the repository at this point in the history
Upstream commit e727ca8 ("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>
  • Loading branch information
Ben Hutchings authored and Willy Tarreau committed Dec 13, 2014
1 parent a99c4d9 commit 6eef90f
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion drivers/connector/cn_proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 6eef90f

Please sign in to comment.