diff options
| author | Paul Stewart <pstew@google.com> | 2015-12-08 07:45:37 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-08 07:45:37 -0800 |
| commit | 5585f1fb701b327ccfbb995610f2ae5657f390c8 (patch) | |
| tree | dd8d95354822233d77275520411e0e25e63045bc | |
| parent | b94f62ed27577f42efa44a730f1ff51c50a67cc8 (diff) | |
| parent | 075a2c508582773018e098d653a98b3004764922 (diff) | |
| download | hardware_broadcom_wlan-5585f1fb701b327ccfbb995610f2ae5657f390c8.zip hardware_broadcom_wlan-5585f1fb701b327ccfbb995610f2ae5657f390c8.tar.gz hardware_broadcom_wlan-5585f1fb701b327ccfbb995610f2ae5657f390c8.tar.bz2 | |
Fix use-after-free in wifi_cleanup() am: 2ce1c4952d
am: 075a2c5085
* commit '075a2c508582773018e098d653a98b3004764922':
Fix use-after-free in wifi_cleanup()
| -rw-r--r-- | bcmdhd/wifi_hal/wifi_hal.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bcmdhd/wifi_hal/wifi_hal.cpp b/bcmdhd/wifi_hal/wifi_hal.cpp index 28f5565..fdb7d7b 100644 --- a/bcmdhd/wifi_hal/wifi_hal.cpp +++ b/bcmdhd/wifi_hal/wifi_hal.cpp @@ -335,12 +335,12 @@ void wifi_cleanup(wifi_handle handle, wifi_cleaned_up_handler handler) pthread_mutex_unlock(&info->cb_lock); cmd->cancel(); pthread_mutex_lock(&info->cb_lock); - /* release reference added when command is saved */ - cmd->releaseRef(); if (num_cmd == info->num_cmd) { ALOGI("Cancelling command %p:%s did not work", cmd, (cmd ? cmd->getType(): "")); bad_commands++; } + /* release reference added when command is saved */ + cmd->releaseRef(); } } |