Merge "diag: Fix possible access to freed variable"

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

View file

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