Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d3ec7a0 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/urgent' of git://github.com/acmel/linux into perf/urgent

parents 47ea91b4 8e303f20

tools/perf/util/evsel.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -449,6 +449,8 @@ int perf_event__parse_sample(const union perf_event *event, u64 type, 
	}

	}





	if (type & PERF_SAMPLE_RAW) {

	if (type & PERF_SAMPLE_RAW) {

		const u64 *pdata;



		u.val64 = *array;

		u.val64 = *array;

		if (WARN_ONCE(swapped,

		if (WARN_ONCE(swapped,

			      "Endianness of raw data not corrected!\n")) {

			      "Endianness of raw data not corrected!\n")) {
@@ -462,11 +464,12 @@ int perf_event__parse_sample(const union perf_event *event, u64 type, 
			return -EFAULT;

			return -EFAULT;





		data->raw_size = u.val32[0];

		data->raw_size = u.val32[0];

		pdata = (void *) array + sizeof(u32);





		if (sample_overlap(event, &u.val32[1], data->raw_size))

		if (sample_overlap(event, pdata, data->raw_size))

			return -EFAULT;

			return -EFAULT;





		data->raw_data = &u.val32[1];

		data->raw_data = (void *) pdata;

	}

	}





	return 0;

	return 0;