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

Commit 1ebe9dad authored by Jesper Juhl's avatar Jesper Juhl Committed by Linus Torvalds
Browse files

drivers/misc/pti.c: give 'comm' function scope in pti_control_frame_built_and_sent() 



In drivers/misc/pti.c::pti_control_frame_built_and_sent() we assign 'comm'
to 'thread_name_p' if (!thread_name).  The problem is that 'comm' then
goes out of scope and later we use 'thread_name_p' which now refers to an
out-of-scope variable.  To fix that, simply move 'comm' up to have
function scope.

Signed-off-by: default avatarJesper Juhl <jj@chaosbits.net>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: J Freyensee <james_p_freyensee@linux.intel.com>
Cc: Jeremy Rocher <rocher.jeremy@gmail.com>
Cc: Sergei Trofimovich <slyfox@gentoo.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 83ede96e

drivers/misc/pti.c

+5 −7
Original line number Diff line number Diff line
@@ -165,6 +165,11 @@ static void pti_write_to_aperture(struct pti_masterchannel *mc, 
static void pti_control_frame_built_and_sent(struct pti_masterchannel *mc,

					     const char *thread_name)

{

	/*

	 * Since we access the comm member in current's task_struct, we only

	 * need to be as large as what 'comm' in that structure is.

	 */

	char comm[TASK_COMM_LEN];

	struct pti_masterchannel mccontrol = {.master = CONTROL_ID,

					      .channel = 0};

	const char *thread_name_p;
@@ -172,13 +177,6 @@ static void pti_control_frame_built_and_sent(struct pti_masterchannel *mc, 
	u8 control_frame[CONTROL_FRAME_LEN];



	if (!thread_name) {

		/*

		 * Since we access the comm member in current's task_struct,

		 * we only need to be as large as what 'comm' in that

		 * structure is.

		 */

		char comm[TASK_COMM_LEN];



		if (!in_interrupt())

			get_task_comm(comm, current);

		else