evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "diag: Update hdlc disable protection to avoid deadlock"

Browse source
This commit is contained in:
Linux Build Service Account 2019-02-05 16:48:13 -08:00 • committed by Gerrit - the friendly Code Review server
commit 384eb39489
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/char/diag/diagchar_core.c
View file

@ -1,4 +1,4 @@
/* 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 * 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 * 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(&apps_data_mutex);
mutex_lock(&driver->hdlc_disable_mutex); mutex_lock(&driver->hdlc_disable_mutex);
hdlc_disabled = driver->p_hdlc_disabled[APPS_DATA]; hdlc_disabled = driver->p_hdlc_disabled[APPS_DATA];
mutex_unlock(&driver->hdlc_disable_mutex);
if (hdlc_disabled) if (hdlc_disabled)
ret = diag_process_apps_data_non_hdlc(user_space_data, len, ret = diag_process_apps_data_non_hdlc(user_space_data, len,
pkt_type); pkt_type);
else else
ret = diag_process_apps_data_hdlc(user_space_data, len, ret = diag_process_apps_data_hdlc(user_space_data, len,
pkt_type); pkt_type);
mutex_unlock(&driver->hdlc_disable_mutex);
mutex_unlock(&apps_data_mutex); mutex_unlock(&apps_data_mutex);
diagmem_free(driver, user_space_data, mempool); diagmem_free(driver, user_space_data, mempool);