diff options
| author | Etan Cohen <etancohen@google.com> | 2017-06-19 13:58:38 -0700 |
|---|---|---|
| committer | Etan Cohen <etancohen@google.com> | 2017-06-19 13:58:38 -0700 |
| commit | 337510e659aa5d5f220fe613896335bd4136c94c (patch) | |
| tree | ac1e5d1d90146f87bdb9a7af69dc4642240a90bd | |
| parent | 37f39c7dac1445e02c81c93448d5c8b78b174eff (diff) | |
| download | android_hardware_qcom_wlan-337510e659aa5d5f220fe613896335bd4136c94c.tar.gz android_hardware_qcom_wlan-337510e659aa5d5f220fe613896335bd4136c94c.tar.bz2 android_hardware_qcom_wlan-337510e659aa5d5f220fe613896335bd4136c94c.zip | |
[QC-HAL] Check for null nl socket before passing commands
Disabling NAN results in a crash due to a null command socket. Add
null check first.
Bug: 62782588
Test: crash no longer observed, NAN functionality still available
Change-Id: I6d94007d34f532d6cc5c015b504f68aaa3a4cda1
| -rw-r--r-- | qcwcn/wifi_hal/nan_req.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/qcwcn/wifi_hal/nan_req.cpp b/qcwcn/wifi_hal/nan_req.cpp index 53287b3..ab94bfd 100644 --- a/qcwcn/wifi_hal/nan_req.cpp +++ b/qcwcn/wifi_hal/nan_req.cpp @@ -1355,6 +1355,12 @@ int NanCommand::requestEvent() goto out; } + if (!mInfo->cmd_sock) { + ALOGE("%s: Command socket is null",__func__); + res = -1; + goto out; + } + /* send message */ ALOGV("%s:Handle:%p Socket Value:%p", __func__, mInfo, mInfo->cmd_sock); res = nl_send_auto_complete(mInfo->cmd_sock, mMsg.getMessage()); |