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

Commit 5fd890cc authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "trace: events: scm: Use correct size when copying argument buffer"

parents b339fd6f 71efb122

include/trace/events/scm.h

+3 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016, 2018 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -35,7 +35,7 @@ TRACE_EVENT(scm_call_start, 
	TP_fast_assign(

		__entry->x0		= x0;

		__entry->arginfo	= p->arginfo;

		memcpy(__entry->args, p->args, MAX_SCM_ARGS);

		memcpy(__entry->args, p->args, sizeof(__entry->args));

		__entry->x5		= p->x5;

	),
@@ -56,7 +56,7 @@ TRACE_EVENT(scm_call_end, 
	),



	TP_fast_assign(

		memcpy(__entry->ret, p->ret, MAX_SCM_RETS);

		memcpy(__entry->ret, p->ret, sizeof(__entry->ret));

	),



	TP_printk("ret: %#llx, %#llx, %#llx",