linux-kernel - [PATCH] perf: fix broken perf inject -b

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20120113144731.GA5458@quad>
Date:	Fri, 13 Jan 2012 15:47:31 +0100
From:	Stephane Eranian <eranian@...gle.com>
To:	linux-kernel@...r.kernel.org
Cc:	acme@...hat.com, peterz@...radead.org, mingo@...e.hu,
	robert.richter@....com
Subject: [PATCH] perf: fix broken perf inject -b

perf inject -b was broken. It would not inject any build_ids
into the stream. Furthermore, it would strip samples from the
stream.

The reason was a missing initialization of the event attribute
structures. The perf_tool.tool.attr() callback was pointing to
a simple repipe. But there was no initialization of internal data
structures to keep track of events and event ids. That later caused
event id lookups to fail, and samples would get dropped.

The patch simply adds back the call to perf_event__process_attr()
to initialize the evlist structure. Build_ids are again injected.
The PID is also inject for PERF_RECORD_HEADER_BUILD_ID.

Signed-off-by: Stephane Eranian <eranian@...gle.com>
---

diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
index 09c1061..f38f370 100644
--- a/tools/perf/builtin-inject.c
+++ b/tools/perf/builtin-inject.c
@@ -60,6 +60,11 @@ static int perf_event__repipe_tracing_data_synth(union perf_event *event,
 static int perf_event__repipe_attr(union perf_event *event,
 				   struct perf_evlist **pevlist __used)
 {
+	int ret;
+	ret = perf_event__process_attr(event, pevlist);
+	if (ret)
+		return ret;
+
 	return perf_event__repipe_synth(NULL, event, NULL);
 }

@@ -173,6 +178,7 @@ static int perf_event__inject_buildid(struct perf_tool *tool,
 		       event->header.type);
 		goto repipe;
 	}
+	machine->pid = event->ip.pid;

 	thread__find_addr_map(thread, machine, cpumode, MAP__FUNCTION,
 			      event->ip.ip, &al);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/