diff options
| author | Ariel Yin <ayin@google.com> | 2017-08-28 18:00:28 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2017-08-28 18:00:28 +0000 |
| commit | 3462d04b01d4559ea4f8b24765cbd29646d71a41 (patch) | |
| tree | b4c12596cd8a4772dbbe3fa3a98fcc63f067b2bf | |
| parent | 98bf7536e73254cece584404edb99c5b99e2562a (diff) | |
| parent | 6c2e5875292472e6fad48443ad9843e3d5ccadda (diff) | |
Merge "diag: dci: Add protection while querying event status" into mnc-dr-dev-qcom-legoandroid-lego-7.1.1_r0.8
| -rw-r--r-- | drivers/char/diag/diagchar_core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/diag/diagchar_core.c b/drivers/char/diag/diagchar_core.c index 62c88ab6738a..6dbade43cfec 100644 --- a/drivers/char/diag/diagchar_core.c +++ b/drivers/char/diag/diagchar_core.c @@ -1784,7 +1784,9 @@ long diagchar_ioctl(struct file *filp, result = diag_ioctl_dci_log_status(ioarg); break; case DIAG_IOCTL_DCI_EVENT_STATUS: + mutex_lock(&driver->dci_mutex); result = diag_ioctl_dci_event_status(ioarg); + mutex_unlock(&driver->dci_mutex); break; case DIAG_IOCTL_DCI_CLEAR_LOGS: if (copy_from_user((void *)&client_id, (void __user *)ioarg, |