Merge "diag: Update hdlc disable protection to avoid deadlock" (384eb394) · Commits · e / devices / android_kernel_sony_msm8998

drivers/char/diag/diagchar_core.c

+2 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2008-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2008-2019, 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
		@@ -3089,13 +3089,13 @@ static int diag_user_process_apps_data(const char __user *buf, int len,
		mutex_lock(&apps_data_mutex);
		mutex_lock(&driver->hdlc_disable_mutex);
		hdlc_disabled = driver->p_hdlc_disabled[APPS_DATA];
		mutex_unlock(&driver->hdlc_disable_mutex);
		if (hdlc_disabled)
		ret = diag_process_apps_data_non_hdlc(user_space_data, len,
		pkt_type);
		else
		ret = diag_process_apps_data_hdlc(user_space_data, len,
		pkt_type);
		mutex_unlock(&driver->hdlc_disable_mutex);
		mutex_unlock(&apps_data_mutex);

		diagmem_free(driver, user_space_data, mempool);