diff options
| author | Service qcabuildsw <qcabuildsw@localhost> | 2016-07-21 15:31:00 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-07-21 15:31:00 -0700 |
| commit | 5517289868ef2ef7c502312ba40e11af448e152a (patch) | |
| tree | 361a6b952c11020553cc44667bbfe3deede91e58 | |
| parent | 0ef04dd62f66c81a60aff4a38a75c16da21b1ef9 (diff) | |
| parent | b86f62603032b7d6e1314987a9a29366202910a3 (diff) | |
Merge "qcacld-3.0: Check for NULL adapter returned from open_interface" into wlan-cld3.driver.lnx.1.1-dev
| -rw-r--r-- | core/hdd/src/wlan_hdd_main.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index efe11c71335d..50a49085632f 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -6001,9 +6001,15 @@ static inline int hdd_open_p2p_interface(struct hdd_context_t *hdd_ctx, static hdd_adapter_t *hdd_open_monitor_interface(hdd_context_t *hdd_ctx, bool rtnl_held) { - return hdd_open_adapter(hdd_ctx, QDF_MONITOR_MODE, "wlan%d", + hdd_adapter_t *adapter; + + adapter = hdd_open_adapter(hdd_ctx, QDF_MONITOR_MODE, "wlan%d", wlan_hdd_get_intf_addr(hdd_ctx), NET_NAME_UNKNOWN, rtnl_held); + if (adapter == NULL) + return ERR_PTR(-ENOSPC); + + return adapter; } /** @@ -6648,6 +6654,8 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) adapter = hdd_open_interfaces(hdd_ctx, rtnl_held); if (IS_ERR(adapter)) { + hddLog(QDF_TRACE_LEVEL_FATAL, + FL("Failed to open interface, adapter is NULL")); ret = PTR_ERR(adapter); goto err_cds_disable; } |