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

Commit 0af78ae3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "diag: Prevent NULL pointer dereference while closing logging process"

parents 2df1fc92 401fc3a6

drivers/char/diag/diagchar_core.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -439,8 +439,10 @@ static void diag_close_logging_process(const int pid) 
	driver->mask_clear = 1;

	driver->mask_clear = 1;

	mutex_unlock(&driver->diag_maskclear_mutex);

	mutex_unlock(&driver->diag_maskclear_mutex);





	mutex_lock(&driver->diagchar_mutex);

	session_peripheral_mask = session_info->peripheral_mask;

	session_peripheral_mask = session_info->peripheral_mask;

	diag_md_session_close(session_info);

	diag_md_session_close(session_info);

	mutex_unlock(&driver->diagchar_mutex);

	for (i = 0; i < NUM_MD_SESSIONS; i++)

	for (i = 0; i < NUM_MD_SESSIONS; i++)

		if (MD_PERIPHERAL_MASK(i) & session_peripheral_mask)

		if (MD_PERIPHERAL_MASK(i) & session_peripheral_mask)

			diag_mux_close_peripheral(DIAG_LOCAL_PROC, i);

			diag_mux_close_peripheral(DIAG_LOCAL_PROC, i);