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

Merge "diag: Fix possible access to freed variable"

Browse source
This commit is contained in:
Linux Build Service Account 2016-11-28 23:57:28 -08:00 • committed by Gerrit - the friendly Code Review server
commit 09f47a9c14
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/char/diag/diagfwd.c
View file

@ -1275,6 +1275,7 @@ static uint8_t hdlc_reset;
static void hdlc_reset_timer_start(struct diag_md_session_t *info) static void hdlc_reset_timer_start(struct diag_md_session_t *info)
{ {
mutex_lock(&driver->md_session_lock);
if (!hdlc_timer_in_progress) { if (!hdlc_timer_in_progress) {
hdlc_timer_in_progress = 1; hdlc_timer_in_progress = 1;
if (info) if (info)
@ -1284,6 +1285,7 @@ static void hdlc_reset_timer_start(struct diag_md_session_t *info)
mod_timer(&driver->hdlc_reset_timer, mod_timer(&driver->hdlc_reset_timer,
jiffies + msecs_to_jiffies(200)); jiffies + msecs_to_jiffies(200));
} }
mutex_unlock(&driver->md_session_lock);
} }
static void hdlc_reset_timer_func(unsigned long data) static void hdlc_reset_timer_func(unsigned long data)