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

Commit 3e951d5b 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 4a40e126 f7cac3f5

drivers/char/diag/diagchar_core.c

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

/* Copyright (c) 2008-2017, 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
@@ -441,8 +441,10 @@ static void diag_close_logging_process(const int pid) 
	driver->mask_clear = 1;

	mutex_unlock(&driver->diag_maskclear_mutex);



	mutex_lock(&driver->diagchar_mutex);

	session_peripheral_mask = session_info->peripheral_mask;

	diag_md_session_close(session_info);

	mutex_unlock(&driver->diagchar_mutex);

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

		if (MD_PERIPHERAL_MASK(i) & session_peripheral_mask)

			diag_mux_close_peripheral(DIAG_LOCAL_PROC, i);